1675 files changed, 23 insertions, 302345 deletions

diff --git a/COPYING b/COPYING
deleted file mode 100644
index 94a9ed024..000000000
--- a/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If 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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/COPYING.LGPL b/COPYING.LGPL
deleted file mode 100644
index fc8a5de7e..000000000
--- a/COPYING.LGPL
+++ /dev/null
@@ -1,165 +0,0 @@
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  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 that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU 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 as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/COPYING.MPL b/COPYING.MPL
deleted file mode 100644
index 7714141d1..000000000
--- a/COPYING.MPL
+++ /dev/null
@@ -1,470 +0,0 @@
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
diff --git a/GNUmakefile.mk b/GNUmakefile.mk
deleted file mode 100644
index d2cbe23b1..000000000
--- a/GNUmakefile.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2009 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-ifeq ($(strip $(SOLARENV)),)
-$(error No environment set!)
-endif
-
-GBUILDDIR := $(SOLARENV)/gbuild
-include $(GBUILDDIR)/gbuild.mk
-
-$(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(wildcard $(repo)/RepositoryModule_*.mk))))
-
-# vim: set noet sw=4 ts=4:
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index dcc7b86d4..000000000
--- a/Makefile.in
+++ /dev/null
@@ -1,203 +0,0 @@
-# @configure_input@
-
-SHELL=/usr/bin/env bash
-
-ifeq ($(USE_GMAKE),)
-GBUILD_OPT:=
-else
-GBUILD_OPT:=--gmake
-endif
-
-ifeq (@CROSS_COMPILING@,YES)
-all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded cross-build-toolset
-else
-all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded
-endif
-	@. ./Env.Host.sh && \
-        cd instsetoo_native && \
-        build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
-
-ifeq (@CROSS_COMPILING@,YES)
-cross-build-toolset:
-# Build necessary modules for the *build* platform, i.e. those needed
-# by tools run at build time. Sure, in many of these modules only a
-# part of the produced binaries are actually used then in the build.
-# Once everything is handled by gbuild, this can hopefully be streamlined.
-	. ./Env.Build.sh && \
-	for D in \
-	  solenv \
-	  soltools \
-	  boost \
-	  external \
-	  cppunit \
-	  xml2cmp \
-	  lucene \
-	  sal \
-	  cosv \
-	  udm \
-	  autodoc \
-	  store \
-	  salhelper \
-	  registry \
-	  idlc \
-	  icu \
-	  codemaker \
-	  udkapi \
-	  expat \
-	  libxml2 \
-	  xml2cmp \
-	  libxslt \
-	  offapi \
-	  oovbaapi \
-	  cppu \
-	  cppuhelper \
-	  rdbmaker \
-	  cpputools \
-	  xmlreader \
-	  i18nutil \
-	  ridljar \
-	  jurt \
-	  jvmaccess \
-	  bridges \
-	  ucbhelper \
-	  comphelper \
-	  jvmfwk \
-	  regexp \
-	  berkeleydb \
-	  sax \
-	  stoc \
-	  i18npool \
-	  unodevtools \
-	  gettext \
-	  dictionaries \
-	  o3tl \
-	  basegfx \
-	  tools \
-	  idl \
-	  l10ntools \
-	  rsc \
-	  setup_native \
-	  icc \
-	  unoil \
-	  javaunohelper \
-	  unotools \
-	  xmlhelp \
-	  shell; do \
-	    if grep -q gb_Module_add_targets $$D/Module_$$D.mk 2>/dev/null; then \
-	      (cd $$D && make -sr -j@BUILD_MAX_JOBS@) || exit 1; \
-	    else \
-	      (cd $$D && build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ -- -P@BUILD_MAX_JOBS@ && deliver.pl) || exit 1; \
-	    fi; \
-	done
-endif
-
-install:
-	@. ./Env.Host.sh && \
-	echo "Installing in @INSTALLDIR@..." && \
-	ooinstall "@INSTALLDIR@" && \
-	echo "" && \
-	echo "Installation finished, you can now execute:" && \
-	echo "@INSTALLDIR@/program/soffice"
-
-distro-pack-install: install
-	./bin/distro-install-clean-up
-	./bin/distro-install-desktop-integration
-	./bin/distro-install-sdk
-	./bin/distro-install-file-lists
-
-dev-install:
-	@. ./Env.Host.sh && \
-	cd smoketestoo_native && \
-		export SAL_USE_VCLPLUGIN="svp" && \
-		build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all:instsetoo_native -- -P@BUILD_MAX_JOBS@ && \
-		cd @abs_builddir@ && ln -s $$SOLARVER/$$INPATH/installation/opt/ install && \
-		echo "" && \
-	$$SOLARENV/bin/linkoo $$SRC_ROOT/install $$SRC_ROOT && \
-	echo && echo "Developer installation finished, you can now execute:" && echo && \
-	if test `uname -s` = Darwin; then \
-		echo open install/LibreOffice.app; \
-	else \
-		echo "cd @abs_builddir@/install/program" && \
-		echo ". ./ooenv" && \
-		echo "./soffice.bin"; \
-	fi
-
-distclean:
-	-rm config.cache
-	-rm config.log
-ifeq (@BUILD_DMAKE@,YES)
-	-$(GNUMAKE) -C dmake distclean
-endif
-
-clean:
-	. ./Env.Host.sh && \
-	rm -rf */$$INPATH && \
-	rm -rf solver/*/$$INPATH && \
-	rm -rf workdir && \
-	rm -rf install
-ifeq (@BUILD_DMAKE@,YES)
-	. ./Env.Host.sh && \
-	(if [ -f dmake/Makefile ] ; then $$GNUMAKE -C dmake clean; fi) && \
-	rm -f solenv/*/bin/dmake*
-endif
-ifeq (@CROSS_COMPILING@,YES)
-	. ./Env.Host.sh && \
-	rm -rf */$$INPATH_FOR_BUILD && \
-	rm -rf solver/*/$$INPATH_FOR_BUILD
-endif
-
-dmake/dmake@EXEEXT_FOR_BUILD@:
-	./bootstrap
-
-src.downloaded: ooo.lst download
-ifeq (@DO_FETCH_TARBALLS@,YES)
-	@. ./Env.Host.sh && \
-	$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
-else
-	@echo "Automatic fetching of external tarballs is disabled."
-endif
-
-fetch: src.downloaded
-
-Makefile: configure.in ooo.lst.in set_soenv.in Makefile.in
-	./autogen.sh
-
-check: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ fetch
-	@. ./Env.Host.sh && \
-	cd smoketestoo_native && \
-	export SAL_USE_VCLPLUGIN="svp" && \
-        build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
-	@. ./Env.Host.sh && $$SOLARENV/bin/subsequenttests
-
-id:
-	@. ./Env.Host.sh && \
-		create-ids
-
-tags:
-	@. ./Env.Host.sh && \
-		create-tags
-
-docs:
-	@. ./Env.Host.sh && \
-		mkdocs.sh $$SRC_ROOT/docs $$SOLARENV/inc/doxygen.cfg
-
-findunusedcode:
-# experimental callcatcher target
-# http://www.skynet.ie/~caolan/Packages/callcatcher.html
-	@which callcatcher > /dev/null 2>&1 || \
-	 (echo "callcatcher not installed" && false)
-	@. ./Env.Host.sh && \
-	   source <(sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) && \
-	   . ./solenv/bin/callcatchEnv.Set.sh && \
-	   cd instsetoo_native && \
-	   build.pl $(GBUILD_OPT) --all
-	@. ./Env.Host.sh && \
-	   source <(sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) && \
-	   callanalyse \
-	       $$WORKDIR/LinkTarget/*/* \
-	       */$$OUTPATH/bin/* \
-	       */$$OUTPATH/lib/* > unusedcode.all
-#because non-c++ symbols could be dlsymed lets make a list of class level
-#unused methods which don't require much effort to determine if they need
-#to be just removed, or put behind appropiate platform or debug level ifdefs
-	@grep ::.*\( unusedcode.all | grep -v cppu::bootstrap > unusedcode.easy
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
deleted file mode 100644
index 6002046a3..000000000
--- a/Module_tail_build.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Norbert Thiebaud <nthiebaud@gmail.com> (C) 2011, All Rights Reserved.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-
-$(eval $(call gb_Module_Module,tail_end))
-
-$(eval $(call gb_Module_add_moduledirs,tail_end,\
-    chart2 \
-    cui \
-    dbaccess \
-    fileaccess \
-    formula \
-    hwpfilter \
-    lotuswordpro \
-    padmin \
-    reportdesign \
-    sc \
-    sd \
-    slideshow \
-    starmath \
-    sw \
-    unoxml \
-	wizards \
-    writerfilter \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/README b/README
new file mode 100644
index 000000000..2f046a7a9
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+
+This git repository is part of the "bootstrap" family of Libreoffice repos.
+It is obsolete and its only useful content are the LibreOffice 3.3
+and 3.4 release branches.
+
+If you are interested in the latest and greatest development branch "master",
+or in release branches of LibreOffice versions newer than 3.4, please
+check out the "core" git repository, as described on the Wiki:
+
+  http://wiki.documentfoundation.org/Development/Native_Build
+
+If you want to build the 3.3 or 3.4 release, you need to switch to the
+corresponding release branch:
+
+  ./g checkout libreoffice-3-4
+
+If for some reason you want to look at obsolete in-development code,
+check out the "master-backup" branch in this repository; this is most likely
+to be a complete waste of time though.
+
diff --git a/README.cross b/README.cross
deleted file mode 100644
index 095a419bb..000000000
--- a/README.cross
+++ /dev/null
@@ -1,258 +0,0 @@
-Cross-compiling LibreOffice
-===========================
-
-Notes on cross-compiling LibreOffice, written by Tor Lillqvist
-<tlillqvist@novell.com> <tml@iki.fi> in May, 2011.
-
-Cross-compilation of LibreOffice is not possible yet. Some initial
-work is done, "baby steps", but a lot remains. This work is highly
-experimental and done mostly in my own spare time just for the hacking
-pleasure. No promise, explicit or implied, is given that it will ever
-be finished.
-
-Searching for information about cross-compilation of OpenOffice.org
-(the predecessor of LibreOffice) you will find information about what
-actually was not cross-compilation, but using QEMU.
-
-My cross-compilation experimentation is going on for four platforms:
-Windows, iOS, Android and PowerPC Mac OS X. I work on the master
-branch of LibreOffice. Some other people have talked about setting up
-a separate branch for Android work, or even separate clones at
-github. I am not interested in that.
-
-
-General
--------
-
-In GNU Autoconf terminology, "build" is the platform on which you are
-running a build on some software and "host" is the platform on which
-the software you are building will run. Only in the specific case of
-building compilers and other programming tools is the term "target"
-used to indicate the platform for which the tools your are building
-will produce code. As LibreOffice is not a compiler, the "target" term
-should not be used in the context of cross-compilation.
-
-(For a case where all three of "build", "host" and "target" are
-different: consider a gcc cross-compiler running on Windows, producing
-code for Android, where the cross-compiler itself was built on
-Linux. (This is a real case.) An interesting tidbit is that such
-configurations are called "Canadian Cross".)
-
-Even though the LibreOffice build mechanism is highly unorthodox, the
-configure script takes the normal --build and --host options like any
-GNU Autoconf -based configure script. To cross-compile, you basically
-need just to specify a suitable --host option and things should work
-out nicely. In practise, some more details might be needed. See
-examples below.
-
-
-What is so hard, then?
-----------------------
-
-Despite the fact that the configure script takes normal --build and
---host options, that is just the beginning. In practise a lot of work
-was necessary to separate tests for "host" and "build" platforms in
-the configure script. See the git log for details. And the reasonably
-"standard" configure.in is just the top level; when we get down to the
-actual makefilery used to build the bits of LibreOffice, it gets much
-worse.
-
-
-Windows
--------
-
-There is some support in LibreOffice already (from OpenOffice.org) for
-building it locally on Windows but with the GNU tool-chain, i.e. what
-is commonly known as MinGW. But as far as I know, that work has never
-attempted cross-compilation.
-
-This OOo-originated MinGW support attempts to support both running
-Cygwin gcc in its -mno-cygwin mode, and a native MinGW compiler.  The
--mno-cygwin mechanism in the Cygwin gcc is rapidly being obsoleted, if
-it isn't already, and I have not attempted to check that it keeps
-working. Ditto for native MinGW; if one compiles natively on Windows,
-why not use Microsoft's compiler, as OOo/LO has been build for Windows
-all the time using that and it works fine.
-
-In my opinion, the only case where it makes sense to use MinGW is for
-cross-compilation. There is just too much crack on Windows anyway, and
-it is a semi-miracle (well, make that the result of years of work)
-that the MSVC build under Cygwin works as nicely as it does.
-
-MinGW is available as cross-build toolchains pre-packaged in more or
-less official packages for many Linux distros including Debian, Fedora
-and openSUSE. Personally I use the mingw32 packages in the openSUSE
-Build Service, running on openSUSE.
-
-It is somewhat unclear how well thought-out the conditionals and code
-for MinGW inside the OOo-originated code in LibreOffice actually
-is. The little I have seen of it seems a bit randomish, with
-copy-pasting having been preferred to factoring out differences.
-
-The autogen.lastrun I use for my MinGW cross-compilation experimentation is:
-
-CC=ccache i686-w64-mingw32-gcc
-CXX=ccache i686-w64-mingw32-g++
-CC_FOR_BUILD=ccache gcc
-CXX_FOR_BUILD=ccache g++
---build=x86_64-unknown-linux-gnu
---host=i686-w64-mingw32
---with-distro=LibreOfficeWin32
---disable-binfilter
---disable-build-mozilla
---disable-directx
---disable-ext-nlpsolver
---disable-ext-pdfimport
---disable-ext-presenter-console
---disable-ext-presenter-minimizer
---disable-ext-report-builder
---disable-ext-scripting-beanshell
---disable-ext-scripting-javascript
---disable-ext-wiki-publisher
---disable-ext-wiki-publisher
---disable-mozilla
---disable-zenity
---enable-python=system
---with-external-tar=/mnt/hemulen/ooo/git/master/src
---with-num-cpus=1
---with-max-jobs=1
---with-system-altlinuxhyph
---with-system-boost
---with-system-cairo
---with-system-cppunit
---with-system-curl
---with-system-db
---with-system-expat
---with-system-gettext
---with-system-hunspell
---with-system-icu
---with-system-libpng
---with-system-libwpd
---with-system-libwpg
---with-system-libwps
---with-system-libxml
---with-system-libxslt
---with-system-lpsolve
---with-system-mythes
---with-system-neon
---with-system-openssl
---with-system-redland
---with-vendor=no
-
-
-iOS
----
-
-iOS is the operating system of Apple's mobile devices. Clearly for a
-device like the iPad it would be totally unacceptable to run a normal
-LibreOffice application with a overlapping windows and mouse-oriented
-GUI widgets. No work has been done (at least publicly) to design a
-touch GUI for LibreOffice, so the work on cross-compiling LibreOffice
-for iOS is extremely experimental, and of course partly pointless;)
-But it is interesting and fun nonetheless.
-
-Obviously it will make sense to build only a part of LibreOffice's
-code for iOS. Most likely all GUI-oriented code should be left out,
-and some iOS app that eventually wants to use the remaining bits will
-handle all its GUI in a platform-dependent manner. How well it will be
-possible to do such a split remains to be seen. As I said, this is
-highly experimental and just in its baby steps phase.
-
-Technically, one important special aspect of iOS is that apps are not
-allowed to load own dynamic libraries. (System libraries are used in
-the form of dynamic libraries, just like on MacOSX, of which iOS is a
-variant.) So all the libraries in LibreOffice that normally are shared
-libraries (DLLs on Windows, shared objects (.so) on Linux, dynamic
-libraries on MacOSX (.dylib)) need to be built as static archives
-instead. Obviously this will have some interesting consequences for
-how UNO is implemented and used. None of that has been spared much
-thought yet.
-
-The Apple tool-chain for iOS cross-building is available only for
-MacOSX, so that is where I have been doing it.
-
-Here is my autogen.lastrun for iOS (device):
-CXX=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
-CC=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
-CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
-CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
---with-distro=LibreOfficeiOS
---with-external-tar=/Volumes/ooo/git/master/src
---with-num-cpus=1
---with-max-jobs=1
-
-And here for the iOS simulator:
-CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++-4.2 -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
-CC=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc-4.2 -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
-CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
-CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
---with-distro=LibreOfficeiOS
---with-external-tar=/Volumes/ooo/git/master/src
---with-num-cpus=1
---with-max-jobs=1
---disable-librsvg
---enable-debug
-
-
-Android
--------
-
-I don't know much about Android, but from a technical point of view it
-is a kind of Linux, of course. As far as I know it is allowed for an
-Android app to use shared objects, but if it isn't, then just the same
-approach as used on iOS will need to be used.
-
-As for the GUI, the same holds as said above for iOS.
-
-I have done my Android cross-compilation work on Linux (openSUSE in
-particular), but it could as well be done on MacOSX. The Android
-cross-buld tool-chain (the "Native Development Kit", or NDK) is
-available for Linux, MacOSX and Windows. (Trying to cross-compile from
-Windows will probably drive you insane.)
-
-Here is my autogen.lastrun for Android:
-SYSBASE=/home/tml/android-ndk-r5c/platforms/android-9/arch-arm
-CC=ccache /home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r5c/platforms/android-9/arch-arm
-CXX=ccache /home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r5c/platforms/android-9/arch-arm -I /home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
-AR=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
-NM=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
-OBJDUMP=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
-RANLIB=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ranlib
-STRIP=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-strip
-CC_FOR_BUILD=ccache gcc
-CXX_FOR_BUILD=ccache g++
---build=x86_64-unknown-linux-gnu
---disable-zenity
---with-distro=LibreOfficeAndroid
---with-external-tar=/mnt/hemulen/ooo/git/master/src
---disable-python
---with-num-cpus=1
---with-max-jobs=1
-
-
-PowerPC Mac OS X
-----------------
-
-Cross-compiling for PowerPC Mac OS X from Intel Mac OS X will probably
-be easy. The APIs available should after all be closely identical to
-those on Intel Mac OS X, and LibreOffice builds fine natively on
-PowerPC Mac already. I have just started experimenting with it. My
-autogen.lastrun looks like this:
-
-CC=ccache /Xcode3/usr/bin/gcc-4.0 -arch ppc
-CXX=ccache /Xcode3/usr/bin/g++-4.0 -arch ppc
-CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
-CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
---build=i386-apple-darwin10.7.0
---host=powerpc-apple-darwin10
---disable-mozilla
---disable-build-mozilla
---with-external-tar=/Volumes/ooo/git/master/src
-
-
-
-That's all, thank you, and have a nice day. People with commit access,
-feel free to edit this document, and add yourself below. Sorry for
-writing now initially from such a personal point of view.
-
---Tor Lillqvist <tlillqvist@novell.com>, <tml@iki.fi>
diff --git a/Repository.mk b/Repository.mk
deleted file mode 100644
index 590fd7ff6..000000000
--- a/Repository.mk
+++ /dev/null
@@ -1,221 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2009 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Helper_register_repository,SRCDIR))
-
-
-$(eval $(call gb_Helper_register_executables,NONE, \
-    bmp \
-    bmpsum \
-    g2g \
-    mkunroll \
-    rscdep \
-    so_checksum \
-))
-
-$(eval $(call gb_Helper_register_executables,OOO, \
-    spadmin.bin \
-))
-
-$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-	adabas \
-	adabasui \
-	agg \
-	analysis \
-	animcore \
-	basctl \
-	basebmp \
-	canvastools \
-	date \
-	forui \
-	odbc \
-	odbcbase \
-	oox \
-	ooxml \
-	sdbc \
-    AppleRemote \
-    avmedia \
-    basegfx \
-    chartcontroller \
-    chartmodel \
-    charttools \
-    chartview \
-    cppcanvas \
-    cui \
-    dba \
-    dbaxml \
-    dbmm \
-    dbtools \
-    dbu \
-    desktop_detector \
-    doctok \
-    drawinglayer \
-    editeng \
-    for \
-    frm \
-    fwe \
-    fwi \
-    fwk \
-    fwl \
-    fwm \
-    hwp \
-    i18npaper \
-    i18nregexp \
-    lng \
-    lwpft \
-    msfilter \
-    msword \
-	msworks \
-    qstart_gtk \
-    resourcemodel \
-    rpt \
-    rptui \
-    rptxml \
-	rtftok \
-    sax \
-    sb \
-    sc \
-    scd \
-    scfilt \
-    scui \
-    sd \
-    sdbt \
-    sdd \
-    sdfilt \
-    sdui \
-    sfx \
-    sm \
-    smd \
-	solver \
-    sot \
-    spa \
-    svl \
-    svt \
-    svx \
-    svxcore \
-    sw \
-    swd \
-    swui \
-    textconversiondlgs \
-    tk \
-    tl \
-    unordf \
-    unoxml \
-    utl \
-    vbahelper \
-    vcl \
-    vclplug_gen \
-    vclplug_gtk \
-    vclplug_gtk3 \
-    vclplug_kde \
-    vclplug_kde4 \
-    vclplug_svp \
-	visioimport \
-	wpft \
-	wpgimport \
-    writerfilter \
-    xcr \
-    xo \
-    xof \
-))
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
-	xmlreader \
-))
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	test \
-    fileacc \
-))
-
-ifeq ($(OS),IOS)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-    sal_textenc \
-))
-endif
-
-$(eval $(call gb_Helper_register_libraries,RTLIBS, \
-    comphelper \
-    i18nisolang1 \
-    i18nutil \
-    jvmaccess \
-    ucbhelper \
-))
-
-$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
-    cppuhelper \
-    salhelper \
-))
-
-$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
-	cairocanvas \
-	canvasfactory \
-	directx5canvas \
-	directx9canvas \
-	expwrap \
-	fastsax \
-    fsstorage \
-	gdipluscanvas \
-    hatchwindowfactory \
-    lomenubar \
-        msforms \
-	mtfrenderer \
-	nullcanvas \
-    OGLTrans \
-    passwordcontainer \
-    productregistration \
-	simplecanvas \
-    slideshow \
-    vbaobj \
-    vbaswobj \
-	vclcanvas \
-    writerfilter_uno \
-	writerfilter_debug \
-))
-
-
-$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
-    cppu \
-    jvmfwk \
-    sal \
-))
-
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-	app \
-	basegfx_s \
-    libeay32 \
-    ssleay32 \
-    ooopathutils \
-	sample \
-    salcpprt \
-    toolshelpers \
-	vclmain \
-	writerperfect \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
deleted file mode 100644
index 03151b80e..000000000
--- a/RepositoryExternal.mk
+++ /dev/null
@@ -1,661 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2009 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# this file describes all the external libraries
-# depending on the configure options these may be taken from the system,
-# or the internal/bundled copy may be built.
-
-# for every external, a function gb_LinkTarget_use__FOO is defined,
-# once for the system case, once for the internal case.
-
-# in the system case, no libraries should be registered, but the target-local
-# variable LIBS should be set to FOO_LIBS, and INCLUDES to FOO_CFLAGS.
-
-ifeq ($(SYSTEM_CPPUNIT),YES)
-
-define gb_LinkTarget__use_cppunit
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-    $(CPPUNIT_CFLAGS) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),\
-    $(CPPUNIT_LIBS) \
-)
-
-endef
-
-else
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-    cppunit \
-))
-
-define gb_LinkTarget__use_cppunit
-$(call gb_LinkTarget_add_linked_libs,$(1),\
-    cppunit \
-)
-
-endef
-
-endif
-
-ifeq ($(SYSTEM_ZLIB),YES)
-
-define gb_LinkTarget__use_zlib
-$(call gb_LinkTarget_add_defs,$(1),\
-	-DSYSTEM_ZLIB \
-)
-$(call gb_LinkTarget_add_libs,$(1),-lz)
-
-endef
-
-else # !SYSTEM_ZLIB
-
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-	zlib \
-))
-
-define gb_LinkTarget__use_zlib
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
-	zlib \
-)
-
-endef
-
-endif # SYSTEM_ZLIB
-
-
-ifeq ($(SYSTEM_JPEG),YES)
-
-define gb_LinkTarget__use_jpeg
-$(call gb_LinkTarget_add_libs,$(1),-ljpeg)
-$(call gb_LinkTarget_set_ldflags,$(1),\
-	$$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \
-)
-
-endef
-
-else # !SYSTEM_JPEG
-
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-	jpeglib \
-))
-
-define gb_LinkTarget__use_jpeg
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
-	jpeglib \
-)
-
-endef
-
-endif # SYSTEM_JPEG
-
-
-ifeq ($(SYSTEM_EXPAT),YES)
-
-define gb_LinkTarget__use_expat
-$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
-
-$(call gb_LinkTarget_add_defs,$(1),\
-	-DSYSTEM_EXPAT \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),-lexpat)
-
-endef
-
-else # !SYSTEM_EXPAT
-
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-	ascii_expat_xmlparse \
-	expat_xmlparse \
-	expat_xmltok \
-))
-
-define gb_LinkTarget__use_expat
-$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
-
-$(if $(filter-out ascii_expat_xmlparse,$(2)),\
-	$(call gb_LinkTarget_add_defs,$(1),\
-		-DXML_UNICODE \
-))
-
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
-	$(2) \
-	expat_xmltok \
-)
-
-endef
-
-endif # SYSTEM_EXPAT
-
-# now define 2 wrappers that select which internal static library to use...
-define gb_LinkTarget__use_expat_utf8
-$(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse)
-
-endef
-
-define gb_LinkTarget__use_expat_utf16
-$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse)
-
-endef
-
-
-ifeq ($(SYSTEM_LIBXML),YES)
-
-define gb_LinkTarget__use_libxml2
-$(call gb_LinkTarget_add_defs,$(1),\
-	-DSYSTEM_LIBXML \
-)
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(LIBXML_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(LIBXML_LIBS))
-
-endef
-
-else # !SYSTEM_LIBXML
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
-	xml2 \
-))
-
-define gb_LinkTarget__use_libxml2
-$(call gb_LinkTarget_add_linked_libs,$(1),\
-	xml2 \
-)
-
-endef
-
-endif # SYSTEM_LIBXML
-
-
-ifeq ($(SYSTEM_LIBXSLT),YES)
-
-define gb_LinkTarget__use_libxslt
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(LIBXSLT_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(LIBXSLT_LIBS))
-
-endef
-
-else # !SYSTEM_LIBXSLT
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	xslt \
-))
-
-define gb_LinkTarget__use_libxslt
-$(call gb_LinkTarget_add_linked_libs,$(1),\
-	xslt \
-)
-
-endef
-
-endif # SYSTEM_LIBXSLT
-
-
-ifeq ($(SYSTEM_REDLAND),YES)
-
-define gb_LinkTarget__use_librdf
-$(call gb_LinkTarget_add_defs,$(1),\
-	-DSYSTEM_REDLAND \
-)
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(REDLAND_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(REDLAND_LIBS))
-
-endef
-
-else # !SYSTEM_REDLAND
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	rdf \
-))
-
-define gb_LinkTarget__use_librdf
-$(call gb_LinkTarget_add_linked_libs,$(1),\
-	rdf \
-)
-
-endef
-
-endif # SYSTEM_REDLAND
-
-
-ifeq ($(SYSTEM_CAIRO),YES)
-
-# FREETYPE_CLAGS from environment if ENABLE_CAIRO is used
-define gb_LinkTarget__use_cairo
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(FREETYPE_CFLAGS) \
-	$(CAIRO_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS))
-
-endef
-
-else # !SYSTEM_CAIRO
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	cairo \
-))
-ifneq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	pixman-1 \
-))
-endif # WNT
-
-define gb_LinkTarget__use_cairo
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/cairo \
-	$(FREETYPE_CFLAGS) \
-)
-$(call gb_LinkTarget_add_linked_libs,$(1),\
-	cairo \
-)
-ifneq ($(OS),WNT)
-ifeq ($(OS),MACOSX)
-$(call gb_LinkTarget_add_static_libs,$(1),\
-	pixman-1 \
-)
-else
-$(call gb_LinkTarget_add_linked_libs,$(1),\
-	pixman-1 \
-)
-endif
-endif
-
-endef
-
-endif # SYSTEM_CAIRO
-
-define gb_LinkTarget__use_freetype
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(FREETYPE_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
-
-endef
-
-define gb_LinkTarget__use_fontconfig
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(FONTCONFIG_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS))
-
-endef
-
-ifeq ($(SYSTEM_GRAPHITE),YES)
-
-define gb_LinkTarget__use_graphite
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(GRAPHITE_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(GRAPHITE_LIBS))
-
-endef
-
-else # !SYSTEM_GRAPHITE
-
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-	graphite2_off \
-))
-define gb_LinkTarget__use_graphite
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
-    graphite2_off \
-)
-
-endef
-
-endif # SYSTEM_GRAPHITE
-
-
-ifeq ($(SYSTEM_ICU),YES)
-
-define gb_LinkTarget__use_icui18n
-$(call gb_LinkTarget_add_libs,$(1),-licui18n)
-endef
-define gb_LinkTarget__use_icule
-$(call gb_LinkTarget_add_libs,$(1),-licule)
-
-endef
-define gb_LinkTarget__use_icuuc
-$(call gb_LinkTarget_add_libs,$(1),-licuuc)
-
-endef
-
-else # !SYSTEM_ICU
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	icui18n \
-	icule \
-	icuuc \
-))
-
-define gb_LinkTarget__use_icui18n
-$(call gb_LinkTarget_add_linked_libs,$(1),\
-	icui18n \
-)
-endef
-define gb_LinkTarget__use_icule
-$(call gb_LinkTarget_add_linked_libs,$(1),\
-	icule \
-)
-
-endef
-define gb_LinkTarget__use_icuuc
-$(call gb_LinkTarget_add_linked_libs,$(1),\
-	icuuc \
-)
-
-endef
-
-endif # SYSTEM_ICU
-
-
-ifeq ($(SYSTEM_OPENSSL),YES)
-
-define gb_LinkTarget__use_openssl
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(OPENSSL_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
-
-endef
-
-else # !SYSTEM_OPENSSL
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-    crypto \
-    ssl \
-))
-else
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-    crypto \
-    ssl \
-))
-endif
-
-define gb_LinkTarget__use_openssl
-ifeq ($(OS),WNT)
-$(call gb_LinkTarget_add_linked_libs,$(1),\
-	crypto \
-	ssl \
-)
-else
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
-	crypto \
-	ssl \
-)
-ifeq ($(OS),SOLARIS)
-$(call gb_LinkTarget_add_libs,$(1),\
-	-lnsl \
-	-lsocket \
-)
-endif
-endif
-
-endef
-
-endif # SYSTEM_OPENSSL
-
-
-ifeq ($(SYSTEM_LIBVISIO),YES)
-
-define gb_LinkTarget__use_visio
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-    $(LIBVISIO_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(LIBVISIO_LIBS))
-
-endef
-
-else # !SYSTEM_LIBVISIO
-
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-	visiolib \
-))
-
-define gb_LinkTarget__use_visio
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
-	visiolib \
-)
-
-endef
-
-endif # SYSTEM_LIBVISIO
-
-
-ifeq ($(SYSTEM_LIBWPD),YES)
-
-define gb_LinkTarget__use_wpd
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-    $(LIBWPD_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(LIBWPD_LIBS))
-
-endef
-
-else # !SYSTEM_LIBWPD
-
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-	wpdlib \
-))
-
-define gb_LinkTarget__use_wpd
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
-	wpdlib \
-)
-
-endef
-
-endif # SYSTEM_LIBWPD
-
-
-ifeq ($(SYSTEM_LIBWPG),YES)
-
-define gb_LinkTarget__use_wpg
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-    $(LIBWPG_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(LIBWPG_LIBS))
-
-endef
-
-else # !SYSTEM_LIBWPG
-
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-	wpglib \
-))
-
-define gb_LinkTarget__use_wpg
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
-	wpglib \
-)
-
-endef
-
-endif # SYSTEM_LIBWPG
-
-
-ifeq ($(SYSTEM_LIBWPS),YES)
-
-define gb_LinkTarget__use_wps
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-    $(LIBWPS_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(LIBWPS_LIBS))
-
-endef
-
-else # !SYSTEM_LIBWPS
-
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-	wpslib \
-))
-
-define gb_LinkTarget__use_wps
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
-	wpslib \
-)
-
-endef
-
-endif # SYSTEM_LIBWPS
-
-
-ifeq ($(SYSTEM_LPSOLVE),YES)
-
-define gb_LinkTarget__use_lpsolve55
-$(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
-
-endef
-
-else # !SYSTEM_LPSOLVE
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	lpsolve55 \
-))
-
-define gb_LinkTarget__use_lpsolve55
-$(call gb_LinkTarget_add_linked_libs,$(1),\
-	lpsolve55 \
-)
-
-endef
-
-endif # SYSTEM_LPSOLVE
-
-
-define gb_LinkTarget__use_gtk
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(GTK_CFLAGS) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),$(GTK_LIBS))
-
-endef
-
-define gb_LinkTarget__use_gthread
-$(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))
-
-endef
-
-define gb_LinkTarget__use_dbusmenugtk
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(DBUSMENUGTK_CFLAGS) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),$(DBUSMENUGTK_LIBS))
-
-endef
-
-# MacOSX-only frameworks
-# (in alphabetical order)
-
-define gb_LinkTarget__use_carbon
-$(call gb_LinkTarget_add_libs,$(1), \
-	-framework Carbon \
-)
-
-endef
-
-define gb_LinkTarget__use_cocoa
-$(call gb_LinkTarget_add_libs,$(1), \
-	-framework Cocoa \
-)
-
-endef
-
-define gb_LinkTarget__use_quicktime
-$(call gb_LinkTarget_add_libs,$(1), \
-	-framework QuickTime \
-)
-
-endef
-
-# Common MacOSX and iOS frameworks
-
-define gb_LinkTarget__use_corefoundation
-$(call gb_LinkTarget_add_libs,$(1), \
-	-framework CoreFoundation \
-)
-
-endef
-
-define gb_LinkTarget__use_coregraphics
-$(call gb_Library_add_libs,$(1), \
-	-framework CoreGraphics \
-)
-
-endef
-
-define gb_LinkTarget__use_coretext
-$(call gb_Library_add_libs,$(1), \
-	-framework CoreText \
-)
-
-endef
-
-define gb_LinkTarget__use_foundation
-$(call gb_LinkTarget_add_libs,$(1), \
-	-framework Foundation \
-)
-
-endef
-
-# iOS-only frameworks
-
-define gb_LinkTarget__use_uikit
-$(call gb_LinkTarget_add_libs,$(1), \
-	-framework UIKit \
-)
-
-endef
-
-# vim: set noet sw=4 ts=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
deleted file mode 100644
index eb390a5bb..000000000
--- a/RepositoryFixes.mk
+++ /dev/null
@@ -1,163 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# fixes for all the libraries that are named with too much creativity and do
-# not follow any of the established nameschemes
-
-# Make has no support for 'or' clauses in conditionals,
-# we use a filter expression instead.
-ifneq (,$(filter LINUX-GCC MACOSX-GCC WNT-GCC DRAGONFLY-GCC OPENBSD-GCC FREEBSD-GCC NETBSD-GCC IOS-GCC ANDROID-GCC, $(OS)-$(COM)))
-# Could we in fact just check for $(COM) == "GCC" here?
-gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-endif
-
-ifeq ($(OS),SOLARIS)
-gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-endif
-
-ifeq ($(OS),WNT)
-
-ifeq ($(COM),GCC)
-gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst graphite2_off:%.dll.a,graphite2_off:%.a,$(gb_Library_FILENAMES))
-gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
-
-
-# handle libraries in msvc format that don't use an "i" prefix for their import library
-# these are libraries built by OOo, but only a few of them
-# all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library
-# we link against their dlls in gcc format directly
-
-# Libraries not provided by mingw(-w64), available only in the Windows
-# SDK. So if these actually are liked with somewhere, we can't
-# cross-compile that module then using MinGW. That needs to be fixed
-# then, and we need to use these libraries through run-time lookup of
-# APIs. Or something.
-gb_Library_SDKLIBFILENAMES:=\
-    unicows \
-
-# some Windows platform libraries are missing in mingw library set
-# we have to use them from the PSDK by linking against their ilibs
-gb_Library_ILIBFILENAMES:=\
-    unicows \
-    uuid \
-    winmm \
-
-gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib).lib)
-
-gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst crypto:crypto%,crypto:libeay32%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst ssl:ssl%,ssl:ssleay32%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-
-else #ifneq ($(USE_MINGW),)
-
-gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:cairo%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst lpsolve55:ilpsolve55%,lpsolve55:lpsolve55%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ssl:libssl%,ssl:libssl_static%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
-gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
-
-
-# change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
-gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
-gb_Library_NOILIBFILENAMES += icule icuuc \
-    graphite2_off \
-    msvcprt \
-    shlwapi \
-    version \
-
-gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
-gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
-gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES))
-
-ifneq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES))
-endif
-
-gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-
-endif # ifneq ($(USE_MINGW),)
-
-endif # ifeq ($(OS),WNT)
-
-# Some external libraries get built as static libraries for Android
-# because we haven't bothered fixing their configury to recognize that
-# shared libraries can be built for the platform.
-ifeq ($(OS),ANDROID)
-gb_Library_FILENAMES := $(patsubst cppunit:%.so,cppunit:%.a,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xml2:%.so,xml2:%.a,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst rdf:%.so,rdf:%.a,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst xslt:%.so,xslt:%.a,$(gb_Library_FILENAMES))
-
-endif
-
-
-ifeq ($(SYSTEM_CAIRO),YES)
-gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
deleted file mode 100644
index e8b5533e2..000000000
--- a/RepositoryModule_ooo.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Module_Module,ooo))
-
-$(eval $(call gb_Module_add_moduledirs,ooo,\
-    animations \
-    basctl \
-    basebmp \
-    basegfx \
-    basic \
-    canvas \
-    chart2 \
-    comphelper \
-    cppcanvas \
-    cui \
-    dbaccess \
-    drawinglayer \
-    editeng \
-    fileaccess \
-    forms \
-    formula \
-    framework \
-    hwpfilter \
-    i18nutil \
-    idl \
-    linguistic \
-    lotuswordpro \
-    o3tl \
-    offapi \
-    oovbaapi \
-    oox \
-    padmin \
-    psprint_config \
-    regexp \
-    reportdesign \
-    sax \
-    sc \
-    scaddins \
-    sccomp \
-    sd \
-    sfx2 \
-    slideshow \
-    sot \
-    starmath \
-    svl \
-    svtools \
-    svx \
-    sw \
-    toolkit \
-    tools \
-    ucbhelper \
-    udkapi \
-    unotools \
-    unoxml \
-    vbahelper \
-    vcl \
-    wizards \
-    writerfilter \
-    writerperfect \
-    xmloff \
-    xmlreader \
-    xmlscript \
-))
-
-# these have only migrated subsequentcheck for now
-$(eval $(call gb_Module_add_moduledirs,ooo,\
-    configmgr \
-    qadevOOo \
-    sal \
-    ucb \
-))
-
-# vim: set noet ts=4 sw=4:
diff --git a/TEMPLATE.SOURCECODE.HEADER b/TEMPLATE.SOURCECODE.HEADER
deleted file mode 100644
index 974b3219b..000000000
--- a/TEMPLATE.SOURCECODE.HEADER
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       [ insert your name / company etc. here eg. Jim Bob <jim@bob.org> ]
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Major Contributor(s): 
- * Ted <ted@bear.com>
- * Portions created by the Ted are Copyright (C) 2010 Ted. All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index a42a0f1ce..000000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,120 +0,0 @@
-dnl @synopsis AX_FUNC_WHICH_GETSPNAM_R
-dnl
-dnl Determines which historical variant of the getspnam_r() call
-dnl (taking four or five arguments) is available on the system
-dnl and sets NEW_SHADOW_API=YES if there are five arguments.
-dnl
-dnl Originally named "AX_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten
-dnl for AX_FUNC_WHICH_GETSPNAM_R
-dnl
-dnl @author Caolan McNamara <caolan@skynet.ie>
-dnl @author Daniel Richard G. <skunk@iskunk.org>
-dnl @version 2006-05-01
-dnl @license LGPL
-
-AC_DEFUN([AX_FUNC_WHICH_GETSPNAM_R], [
-
-    AC_LANG_PUSH(C)
-    AC_MSG_CHECKING([how many arguments getspnam_r() takes])
-
-    AC_CACHE_VAL(ac_cv_func_which_getspnam_r, [
-
-################################################################
-
-ac_cv_func_which_getspnam_r=unknown
-
-#
-# ONE ARGUMENT (sanity check)
-#
-
-# This should fail, as there is no variant of getspnam_r() that takes
-# a single argument. If it actually compiles, then we can assume that
-# netdb.h is not declaring the function, and the compiler is thereby
-# assuming an implicit prototype. In which case, we're out of luck.
-#
-AC_COMPILE_IFELSE(
-    AC_LANG_PROGRAM(
-	[[
-	    #include <sys/types.h>
-	    #include <shadow.h>
-	]],
-	[[
-	    const char *name = "myname";
-	    getspnam_r(name) /* ; */
-	]]),
-    ac_cv_func_which_getspnam_r=no)
-
-#
-# FIVE ARGUMENTS
-#
-
-if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
-
-AC_COMPILE_IFELSE(
-    AC_LANG_PROGRAM(
-	[[
-	    #include <sys/types.h>
-	    #include <shadow.h>
-	]],
-	[[
-	    char buffer[[]] = { '\0' };
-	    struct spwd spwdStruct;
-	    const char *name = "myname";
-	    getspnam_r(name, &spwdStruct, buffer, sizeof buffer, 0) /* ; */
-	]]),
-    ac_cv_func_which_getspnam_r=five)
-
-fi
-
-#
-# FOUR ARGUMENTS
-#
-
-if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
-
-AC_COMPILE_IFELSE(
-    AC_LANG_PROGRAM(
-	[[
-	    #include <sys/types.h>
-	    #include <shadow.h>
-	]],
-	[[
-	    char buffer[[]] = { '\0' };
-	    struct spwd spwdStruct;
-	    const char *name = "myname";
-	    getspnam_r(name, &spwdStruct, buffer, sizeof buffer) /* ; */
-	]]),
-    ac_cv_func_which_getspnam_r=four)
-
-fi
-
-################################################################
-
-]) dnl end AC_CACHE_VAL
-
-case "$ac_cv_func_which_getspnam_r" in
-    five)
-    AC_MSG_RESULT([five])
-    NEW_SHADOW_API=YES
-    ;;
-
-    four)
-    AC_MSG_RESULT([four])
-    ;;
-
-    no)
-    AC_MSG_RESULT([cannot find function declaration in shadow.h])
-    ;;
-
-    unknown)
-    AC_MSG_RESULT([can't tell])
-    ;;
-
-    *)
-    AC_MSG_ERROR([internal error])
-    ;;
-esac
-
-AC_LANG_POP(C)
-
-]) dnl end AC_DEFUN
diff --git a/autogen.sh b/autogen.sh
index 30b1ae409..9adcc8385 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,161 +1,3 @@
-:
-    eval 'exec perl -S $0 ${1+"$@"}'
-        if 0;
-
-use strict;
-
-sub clean()
-{
-    system ("rm -Rf autom4te.cache");
-    system ("rm -f missing install-sh mkinstalldirs libtool ltmain.sh");
-    print "cleaned the build tree\n";
-}
-
-my $aclocal;
-
-# check we have various vital tools
-sub sanity_checks($)
-{
-    my $system = shift;
-    my @path = split (':', $ENV{'PATH'});
-    my %required =
-      (
-       'pkg-config' => "pkg-config is required to be installed",
-       'autoconf'   => "autoconf is required",
-       $aclocal     => "$aclocal is required",
-      );
-
-    for my $elem (@path) {
-        for my $app (keys %required) {
-            if (-f "$elem/$app") {
-                delete $required{$app};
-            }
-        }
-    }
-    if ((keys %required) > 0) {
-        print ("Various low-level dependencies are missing, please install them:\n");
-        for my $app (keys %required) {
-            print "\t $app: " . $required{$app} . "\n";
-        }
-        exit (1);
-    }
-}
-
-# one argument per line
-sub read_args($)
-{
-    my $file = shift;
-    my $fh;
-    my @lst;
-    open ($fh, $file) || die "can't open file: $file";
-    while (<$fh>) {
-        chomp();
-        # migrate from the old system
-        if ( substr($_, 0, 1) eq "'" ) {
-            print "Migrating options from the old autogen.lastrun format, using:\n";
-            my @opts;
-            @opts = split(/'/);
-            foreach my $opt (@opts) {
-                if ( substr($opt, 0, 1) eq "-" ) {
-                    push @lst, $opt;
-                    print "  $opt\n";
-                }
-            }
-        } else {
-            push @lst, $_;
-        }
-    }
-    close ($fh);
-    # print "read args from file '$file': @lst\n";
-    return @lst;
-}
-
-sub invalid_distro($$)
-{
-    my ($config, $distro) = @_;
-    print STDERR "Can't find distro option set: $config\nThis is not necessarily a problem.\n";
-    print STDERR "Distros with distro option sets are:\n";
-    my $dirh;
-    opendir ($dirh, "distro-configs");
-    while (($_ = readdir ($dirh))) {
-        /(.*)\.conf$/ || next;
-        print STDERR "\t$1\n";
-    }
-    closedir ($dirh);
-}
-
-my @cmdline_args = ();
-if (!@ARGV) {
-    my $lastrun = "autogen.lastrun";
-    @cmdline_args = read_args ($lastrun) if (-f $lastrun);
-} else {
-    @cmdline_args = @ARGV;
-}
-
-my @args;
-for my $arg (@cmdline_args) {
-    if ($arg eq '--clean') {
-        clean();
-    } elsif ($arg =~ m/--with-distro=(.*)$/) {
-        my $config = "distro-configs/$1.conf";
-        if (! -f $config) {
-            invalid_distro ($config, $1);
-            } else {
-                push @args, read_args ($config);
-            }
-        } else {
-        push @args, $arg;
-    }
-}
-for my $arg (@args) {
-    if ($arg =~ /^([A-Z]+)=(.*)/) {
-        $ENV{$1} = $2;
-    }
-}
-
-# Alloc $ACLOCAL to specify which aclocal to use
-$aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal';
-
-my $system = `uname -s`;
-chomp $system;
-
-sanity_checks ($system) unless($system eq 'Darwin');
-
-my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
-
-$aclocal_flags = "-I ./m4/mac" if (($aclocal_flags eq "") && ($system eq 'Darwin'));
-
-$ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 'Darwin'));
-
-system ("$aclocal $aclocal_flags") && die "Failed to run aclocal";
-unlink ("configure");
-system ("autoconf") && die "Failed to run autoconf";
-die "failed to generate configure" if (! -x "configure");
-
-if (defined $ENV{NOCONFIGURE}) {
-    print "Skipping configure process.";
-} else {
-    # Save autogen.lastrun only if we did get some arguments on the command-line
-    if (@ARGV) {
-        if ($#cmdline_args > 0) {
-            # print "writing args to autogen.lastrun\n";
-            my $fh;
-            open ($fh, ">autogen.lastrun") || die "can't open autogen.lastrun: $!";
-            for my $arg (@cmdline_args) {
-                print $fh "$arg\n";
-            }
-            close ($fh);
-        }
-    }
-    print "running ./configure with '" . join ("' '", @args), "'\n";
-    system ("./configure", @args);
-}
-
-# Local Variables:
-# mode: perl
-# cperl-indent-level: 4
-# tab-width: 4
-# indent-tabs-mode: nil
-# End:
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab: #
+#!/bin/sh
+cat README
+exit 1
diff --git a/bin/bash-completion.in b/bin/bash-completion.in
deleted file mode 100644
index 77087c593..000000000
--- a/bin/bash-completion.in
+++ /dev/null
@@ -1,90 +0,0 @@
-# Programmable bash_completion file for the main office applications
-# It is based on /etc/profile.d/complete.bash from SUSE Linux 10.1
-
-_def=; _dir=; _file=; _nosp=
-if complete -o default _nullcommand &> /dev/null ; then
-    _def="-o default"
-    _dir="-o dirnames"
-    _file="-o filenames"
-fi
-_minusdd="-d ${_dir}"
-_minusdf="-d ${_file}"
-if complete -o nospace _nullcommand &> /dev/null ; then
-    _nosp="-o nospace"
-    _minusdd="${_nosp} ${_dir}"
-    _minusdf="${_nosp} ${_dir}"
-fi
-complete -r _nullcommand &> /dev/null
-
-# General expanding shell function
-@OFFICE_SHELL_FUNCTION@ ()
-{
-    # bash `complete' is broken because you can not combine
-    # -d, -f, and -X pattern without missing directories.
-    local c=${COMP_WORDS[COMP_CWORD]}
-    local a="${COMP_LINE}"
-    local e s g=0 cd dc t=""
-    local IFS
-
-    shopt -q extglob && g=1
-    test $g -eq 0 && shopt -s extglob
-    # Don't be fooled by the bash parser if extglob is off by default
-    cd='*-?(c)d*'
-    dc='*-d?(c)*'
-
-    case "${1##*/}" in
-@BASH_COMPLETION_SUFFIXES_CHECKS@
-    *)			e='!*'
-    esac
-
-    case "$(complete -p ${1##*/} 2> /dev/null)" in
-	*-d*)	;;
-	*) s="-S/"
-    esac
-
-    IFS='
-'
-    case "$c" in
-    \$\(*\))	   eval COMPREPLY=\(${c}\) ;;
-    \$\(*)		COMPREPLY=($(compgen -c -P '$(' -S ')'  -- ${c#??}))	;;
-    \`*\`)	   eval COMPREPLY=\(${c}\) ;;
-    \`*)		COMPREPLY=($(compgen -c -P '\`' -S '\`' -- ${c#?}))	;;
-    \$\{*\})	   eval COMPREPLY=\(${c}\) ;;
-    \$\{*)		COMPREPLY=($(compgen -v -P '${' -S '}'  -- ${c#??}))	;;
-    \$*)		COMPREPLY=($(compgen -v -P '$'          -- ${c#?}))	;;
-    \~*/*)		COMPREPLY=($(compgen -f -X "$e"         -- ${c}))	;;
-    \~*)		COMPREPLY=($(compgen -u ${s}	 	-- ${c}))	;;
-    *@*)		COMPREPLY=($(compgen -A hostname -P '@' -S ':' -- ${c#*@})) ;;
-    *[*?[]*)		COMPREPLY=($(compgen -G "${c}"))			;;
-    *[?*+\!@]\(*\)*)
-	if test $g -eq 0 ; then
-			COMPREPLY=($(compgen -f -X "$e" -- $c))
-			test $g -eq 0 && shopt -u extglob
-			return
-	fi
-			COMPREPLY=($(compgen -G "${c}"))			;;
-    *)
-	if test "$c" = ".." ; then
-			COMPREPLY=($(compgen -d -X "$e" -S / ${_nosp} -- $c))
-	else
-			for s in $(compgen -f -X "$e" -- $c) ; do
-			    if test -d $s ; then
-				COMPREPLY=(${COMPREPLY[@]} $(compgen -f -X "$e" -S / -- $s))
-			    elif test -z "$t" ; then
-				COMPREPLY=(${COMPREPLY[@]} $s)
-			    else
-				case "$(file -b $s 2> /dev/null)" in
-				$t) COMPREPLY=(${COMPREPLY[@]} $s)		;;
-				esac
-			    fi
-			done
-	fi									;;
-    esac
-    test $g -eq 0 && shopt -u extglob
-}
-
-
-complete -d -X '.[^./]*' -F @OFFICE_SHELL_FUNCTION@ ${_file} \
-@BASH_COMPLETION_OOO_APPS@
-
-unset _def _dir _file _nosp _minusdd _minusdf
diff --git a/bin/create_bootstrap_links b/bin/create_bootstrap_links
deleted file mode 100755
index a42f7b803..000000000
--- a/bin/create_bootstrap_links
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-BIN_DIR=$(dirname $0)
-REPOS=$(cat ${BIN_DIR?}/repo-list)
-cd ${BIN_DIR?}/..
-BOOTSTRAP_DIR=$(pwd)
-
-for repo in $REPOS ; do
-    for link in $(ls clone/${repo}) ; do
-        if [ ! -e "$link" ] ; then
-            echo "Creating missing link $link"
-            ln -s "clone/${repo}/$link" "$link"
-        fi
-    done
-done
diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up
deleted file mode 100755
index df7ac9d91..000000000
--- a/bin/distro-install-clean-up
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-. ./*[Ee]nv.[Ss]et.sh
-
-echo "Cleaning up ...";
-
-remove_help_localization()
-{
-    lang=$1
-
-    # nothing to be done if the localization is en-US if it does not exist
-    # or if it is already removed
-    test "$lang" = "en-US" -o \
-          ! -e $DESTDIR$INSTALLDIR/help/$lang -o \
-	  -L $DESTDIR$INSTALLDIR/help/$lang && return;
-
-    echo "... remove \"$lang\""
-
-    rm -rf $DESTDIR$INSTALLDIR/help/$lang
-    grep -v "$INSTALLDIR/help/$lang" $DESTDIR/gid_Module_Root.$lang >$DESTDIR/gid_Module_Root.$lang.new
-    mv -f $DESTDIR/gid_Module_Root.$lang.new $DESTDIR/gid_Module_Root.$lang
-    # FIXME: the following code could be used without the condition
-    #        and should replace the lines above after only the milestones
-    #	     providing gid_Module_Helppack_Help and fixed gid_Module_Root.$lang
-    #        are supported
-    # Note: The problem with gid_Module_Root.$lang is that it still includes
-    #       %dir */help/* entries.
-    # Note: It was still necessary on ppc with gcj (OOo-2.0.2). Strange. Have to
-    # investigate it later.
-    if test -f $DESTDIR/gid_Module_Helppack_Help.$lang ; then
-	grep -v "$INSTALLDIR/help/$lang" $DESTDIR/gid_Module_Helppack_Help.$lang >$DESTDIR/gid_Module_Helppack_Help.$lang.new
-	mv -f $DESTDIR/gid_Module_Helppack_Help.$lang.new $DESTDIR/gid_Module_Helppack_Help.$lang
-    fi
-
-    # Note: We created a compat symlink in the past. It is no longer necessary.
-    # We do not want it because RPM has problems with update when we remove
-    # poor localizations in never packages
-}
-
-# Check if the English help is installed and is in the main package (is first on the list)
-# Note that Java-disabled builds do not create help at all.
-if test -f $DESTDIR$INSTALLDIR/help/en/sbasic.cfg -a \
-        "`for lang in $WITH_LANG_LIST ; do echo $lang ; break ; done`" = "en-US" ; then
-
-    echo "Removing duplicated English help..."
-
-    for lang in $WITH_LANG_LIST ; do
-	test ! -f $DESTDIR$INSTALLDIR/help/en/sbasic.cfg -o ! -f $DESTDIR$INSTALLDIR/help/$lang/sbasic.cfg && continue;
-	if diff $DESTDIR$INSTALLDIR/help/en/sbasic.cfg $DESTDIR$INSTALLDIR/help/$lang/sbasic.cfg >/dev/null 2>&1 ; then
-	    remove_help_localization $lang
-	fi
-    done
-
-    echo "Removing poor help localizations..."
-
-    for lang in $WITH_POOR_HELP_LOCALIZATIONS ; do
-	remove_help_localization $lang
-    done
-fi
-
-echo "Fixing permissions..."
-for dir in $DOCDIR $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/examples ; do
-    if test -d $dir -a -w $dir ; then
-	find "$dir" -type f \( -name "*.txt" -o -name "*.java" -o -name "*.xml"    -o \
-			       -name "*.xcu" -o -name "*.xcs"  -o -name "*.html"   -o \
-			       -name "*.pdf" -o -name "*.ps"   -o -name "*.gif"    -o \
-			       -name "*.png" -o -name "*.jpg"  -o -name "Makefile" -o \
-			       -name "manifest.mf" \) -exec chmod 644 {} \;
-    fi
-done
-
-if test "z$DESTDIR" != "z" ; then
-    echo "Checking for DESTDIR inside installed files..."
-    found_destdir=
-    for file in `find $DESTDIR -type f` ; do
-	grep -q "$DESTDIR" $file && echo "$file: includes the string \"$DESTDIR\"" && found_destdir=1
-    done
-    if test "z$found_destdir" != "z" ; then
-	echo "!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!"
-	echo "The path DESTDIR:$DESTDIR was found inside some"
-	echo "installed files. It is probably a bug."
-	echo
-	echo "Especially, if the DESTDIR is set to \$RPM_BUILD_ROOT"
-	echo "when creating RPM packages. Even it could be a security hole"
-	echo "if the application searches /var/tmp for binaries or"
-	echo "config files because the directory is world-writable."
-	echo "!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!"
-    fi
-fi
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
deleted file mode 100755
index 6bacb1b7c..000000000
--- a/bin/distro-install-desktop-integration
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/bin/sh
-
-. ./*[Ee]nv.[Ss]et.sh
-
-PRODUCTVERSION_NODOT=`echo $PRODUCTVERSION | sed -e "s/\.//"`
-
-mkdir -p $DESTDIR$PREFIXDIR/bin
-
-
-create_wrapper()
-{
-    echo "Install $PREFIXDIR/bin/$1"
-
-    mkdir -p $DESTDIR$PREFIXDIR/bin
-    cat <<EOT >$DESTDIR$PREFIXDIR/bin/$1
-#!/bin/sh
-$INSTALLDIR/program/$2 $3 "\$@"
-EOT
-    chmod 755 $DESTDIR$PREFIXDIR/bin/$1
-    # put into file list
-    test -f "$DESTDIR/$4" && echo "$PREFIXDIR/bin/$1" >>$DESTDIR/$4
-}
-
-create_man_link()
-{
-    echo "Install $MANDIR/man1/$1.1.gz"
-
-    mkdir -p $DESTDIR$MANDIR/man1
-    echo ".so man1/$2.1" >| $DESTDIR$MANDIR/man1/$1.1
-    gzip -f $DESTDIR$MANDIR/man1/$1.1
-    test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$3"
-}
-
-install_man()
-{
-    echo "Install $MANDIR/man1/$1.1.gz"
-
-    mkdir -p $DESTDIR$MANDIR/man1
-    cp sysui/desktop/man/$1.1 $DESTDIR$MANDIR/man1 || exit 1;
-    gzip -f $DESTDIR$MANDIR/man1/$1.1
-    test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$2"
-}
-
-
-add_wrapper()
-{
-    lowrapper_name="$1"
-    target_binary="$2"
-    target_option_1="$3"
-    used_man_page="$4"
-    desktop_file="$5"
-    file_list="$6"
-
-    # do we want compat oowrapper?
-    oowrapper_name=""
-    if test "$WITH_COMPAT_OOWRAPPERS" == 'YES' ; then
-        oowrapper_name=`echo "$lowrapper_name" | sed -e "s/^lo/oo/"`
-        # "oo" prefix only for wrappers stating with "lo" prefix
-        test "$oowrapper_name" = "$lowrapper_name" && oowrapper_name=
-    fi
-
-    # wrappers
-    create_wrapper "$lowrapper_name" "$target_binary" "$target_option_1" "$file_list"
-    test -n "$oowrapper_name" && create_wrapper "$oowrapper_name" "$target_binary" "$target_option_1" "$file_list"
-
-    # man pages
-    if test "$used_man_page" = "$lowrapper_name" ; then
-        # need to install the manual page
-        install_man "$lowrapper_name" "$file_list"
-    else
-        # just link the manual page
-        create_man_link "$lowrapper_name" "$used_man_page" "$file_list"
-    fi
-    test -n "$oowrapper_name" && create_man_link "$oowrapper_name" "$used_man_page" "$file_list"
-
-    # add desktop file to the right file list
-    test -n "$desktop_file" -a -f "$DESTDIR/$file_list" && echo "/usr/share/applications/$desktop_file" >>"$DESTDIR/$file_list"
-}
-
-# install desktop integration from plain packages
-sysui_temp=`mktemp -d /tmp/distro-pack-desktop-integration-XXXXXX`
-cp -a sysui/unxlng*/misc/libreoffice/* "$sysui_temp"
-cp -a sysui/desktop/share/create_tree.sh "$sysui_temp"
-builddir=`pwd`
-cd $sysui_temp
-# we want non-versioned stuff in the distro packages
-for file in * ; do
-    sed -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
-        -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-        -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
-        "$file" >"$file.new"
-    mv "$file.new" "$file"
-done
-# call in subshell to do not malfrom PRODUCTVERSION, ...
-(
-    export OFFICE_PREFIX=$LIBDIR
-    export PREFIX=$INSTALLDIRNAME
-    export ICON_PREFIX=$INSTALLDIRNAME
-    export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons
-    export PRODUCTVERSION=
-    export KDEMAINDIR=/usr
-    export GNOMEDIR=/usr
-    export GNOME_MIME_THEME=hicolor
-    /bin/bash ./create_tree.sh
-)
-cd -
-rm -rf $sysui_temp
-
-# we do not want some stuff from the plain packages
-rm -f $DESTDIR/$PREFIXDIR/bin/$INSTALLDIRNAME*
-rm -f $DESTDIR/usr/share/applications/libreoffice-javafilter.desktop
-rm -f $DESTDIR/usr/share/applications/libreoffice-printeradmin.desktop
-if test -d $DESTDIR/opt ; then
-    rm -f $DESTDIR/opt/$INSTALLDIRNAME
-    rmdir --ignore-fail-on-non-empty $DESTDIR/opt
-fi
-
-# we want non-versioned desktop files
-cd $DESTDIR/$INSTALLDIR/share/xdg
-# we want non-versioned stuff in the distro packages
-for file in *.desktop ; do
-    sed -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
-        -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-        -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
-        "$file" >"$file.new"
-    mv -f "$file.new" "$file"
-done
-cd -
-
-# put the stuff installed by create_tree.sh into the right file lists
-# desktop files will be added by the corresponding add_wrapper command
-if test -f $DESTDIR/gid_Module_Root_Brand ; then
-    for dir in /usr/share/application-registry \
-               /usr/share/mimelnk/application \
-               /usr/share/mime/packages \
-               /usr/share/mime-info \
-               /usr/share/icons ; do
-        find "$DESTDIR$dir" \( -type f -o -type l \) -printf "$dir/%P\n" >>$DESTDIR/gid_Module_Root_Brand
-    done
-fi
-
-# wrappers and man pages
-# FIXME: do not have desktop file and MIME icon for unopkg
-add_wrapper lobase         soffice "--base"       "libreoffice" "libreoffice-base.desktop"        "gid_Module_Brand_Prg_Base"
-add_wrapper localc         soffice "--calc"       "libreoffice" "libreoffice-calc.desktop"        "gid_Module_Brand_Prg_Calc"
-add_wrapper lodraw         soffice "--draw"       "libreoffice" "libreoffice-draw.desktop"        "gid_Module_Brand_Prg_Draw"
-add_wrapper lomath         soffice "--math"       "libreoffice" "libreoffice-math.desktop"        "gid_Module_Brand_Prg_Math"
-add_wrapper loimpress      soffice "--impress"    "libreoffice" "libreoffice-impress.desktop"     "gid_Module_Brand_Prg_Impress"
-add_wrapper loweb          soffice "--web"        "libreoffice" ""                                "gid_Module_Brand_Prg_Wrt"
-add_wrapper lowriter       soffice "--writer"     "libreoffice" "libreoffice-writer.desktop"      "gid_Module_Brand_Prg_Wrt"
-add_wrapper lofromtemplate soffice ".uno:NewDoc"  "libreoffice" ""                                "gid_Module_Root_Brand"
-add_wrapper libreoffice    soffice ""            "libreoffice" "libreoffice-startcenter.desktop" "gid_Module_Root_Brand"
-add_wrapper loffice        soffice ""            "libreoffice" ""                                "gid_Module_Root_Brand"
-add_wrapper unopkg         unopkg  ""            "unopkg"      ""                                "gid_Module_Root_Brand"
-
-# /usr/bin/ooffice symlink is necessary by java UNO components to find
-# the UNO installation using $PATH, see
-# http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html
-# Note: if you want to support parallel installation of more OOo versions
-#       you cannot include this link directly into the package
-#       For example, the Novell package mark this symlink as %ghost
-#	and update it in %post and %postun
-ln -sf $INSTALLDIR/program/soffice $DESTDIR$PREFIXDIR/bin/soffice
-test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" >>$DESTDIR/gid_Module_Root_Brand
-
-# create bash completion
-mkdir -p $DESTDIR/etc/bash_completion.d
-./bin/generate-bash-completion bin/bash-completion.in $DESTDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh
-test -f $DESTDIR/gid_Module_Root_Brand && echo "/etc/bash_completion.d/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
-if test "$WITH_COMPAT_OOWRAPPERS" = "YES" ; then
-    ./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR/etc/bash_completion.d/ooffice.sh
-    test -f $DESTDIR/gid_Module_Root_Brand && echo "/etc/bash_completion.d/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
-fi
-
-echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath";
-mkdir -p $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program
-sed -e "s|@INSTALLDIR@|$INSTALLDIR|g" bin/java-set-classpath.in >| "$DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath" || exit 1;
-chmod 755 "$DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath"
-test -f $DESTDIR/gid_Module_Root_Brand && echo "$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath" >>$DESTDIR/gid_Module_Root_Brand
-
-exit 0
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
deleted file mode 100755
index f3a8bbf67..000000000
--- a/bin/distro-install-file-lists
+++ /dev/null
@@ -1,555 +0,0 @@
-#!/bin/sh
-
-. ./*[Ee]nv.[Ss]et.sh
-
-BUILDDIR=`pwd`
-FILELISTSDIR="$BUILDDIR/file-lists"
-
-# remove installed file even from the file list
-# Params: file_list file_to_remove
-remove_file()
-{
-    rm -f "$DESTDIR/$2"
-    perl -pi -e "s|^$2$||" "$1"
-}
-
-# move one file from one list of files to a second one
-# Params: target_file_list source_file_list file_to_move
-mv_file_between_flists()
-{
-    if grep "^$3\$" $2 >/dev/null 2>&1 ; then
-        # \$3 can be regular expression
-        grep "^$3\$" $2 >>$1
-        perl -pi -e "s|^$3$||" $2
-    fi
-}
-# add the directories from the source list of files to the target list of
-# file which are used in the target list of files but are missing there
-# Params: target_file_list source_file_list
-add_used_directories()
-{
-    sort -u -r $2 | sed -n "s|^%dir \(.*\)\$|s%^\\\\(\1\\\\).*%\\\\1%p|p" >$2.pattern
-    sed -n -f $2.pattern $1 | sort -u | sed "s|^|%dir |" >>$1
-    rm $2.pattern
-    sort -u $1 >$1.unique
-    mv $1.unique $1
-}
-
-# remove a duplicity between two filelist
-# Params: filelist_with_original filelist_with_duplicity duplicit_path
-remove_duplicity_from_flists()
-{
-    if grep "$3" "$1" >/dev/null 2>&1 && \
-        grep "$3" "$2" >/dev/null 2>&1 ; then
-        perl -pi -e "s|^$3$||" $2
-    fi
-}
-
-# merges one file list into another one
-# Params: source_filelist dest_filelist replace_dest
-merge_flists()
-{
-    if test -f "$1" ; then
-        cat "$1" >>"$2"
-        sort -u "$2" >"$2".sorted
-        mv "$2".sorted "$2"
-    fi
-}
-
-if ! test -f $DESTDIR/gid_Module_Root; then
-    echo "Error: Failed to generate package file lists";
-    echo "       Have you defined DESTDIR?"
-    exit 1;
-fi
-
-
-rm -rf "$FILELISTSDIR"
-mkdir -p "$FILELISTSDIR"
-
-cd $DESTDIR
-
-if test "z$OOO_VENDOR" != "zDebian" ; then
-
-    echo "Generating package file lists for $OOO_VENDOR..."
-
-    rm -f common_list.txt
-    for module in gid_Module_Root gid_Module_Root_Brand \
-        gid_Module_Root_Files_Images \
-        gid_Module_Root_Files_[0-9] \
-        gid_Module_Root_Hack \
-        gid_Module_Oo_Linguistic \
-        gid_Module_Root_Ure_Hidden ; do
-        merge_flists $module $FILELISTSDIR/common_list.txt
-    done
-
-    if test "$SPLIT_APP_MODULES" = "YES" ; then
-        merge_flists gid_Module_Prg_Base_Bin      $FILELISTSDIR/base_list.txt
-        merge_flists gid_Module_Prg_Calc_Bin      $FILELISTSDIR/calc_list.txt
-        merge_flists gid_Module_Prg_Draw_Bin      $FILELISTSDIR/draw_list.txt
-        merge_flists gid_Module_Prg_Math_Bin      $FILELISTSDIR/math_list.txt
-        merge_flists gid_Module_Prg_Impress_Bin   $FILELISTSDIR/impress_list.txt
-        merge_flists gid_Module_Prg_Wrt_Bin       $FILELISTSDIR/writer_list.txt
-        merge_flists gid_Module_Brand_Prg_Base    $FILELISTSDIR/base_list.txt
-        merge_flists gid_Module_Brand_Prg_Calc    $FILELISTSDIR/calc_list.txt
-        merge_flists gid_Module_Brand_Prg_Draw    $FILELISTSDIR/draw_list.txt
-        merge_flists gid_Module_Brand_Prg_Math    $FILELISTSDIR/math_list.txt
-        merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/impress_list.txt
-        merge_flists gid_Module_Brand_Prg_Wrt     $FILELISTSDIR/writer_list.txt
-        # FIXME: small; low dependencies; why optional module?
-        merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/impress_list.txt
-    else
-        merge_flists gid_Module_Prg_Base_Bin      $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Prg_Calc_Bin      $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Prg_Draw_Bin      $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Prg_Math_Bin      $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Prg_Impress_Bin   $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Prg_Wrt_Bin       $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Brand_Prg_Base    $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Brand_Prg_Calc    $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Brand_Prg_Draw    $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Brand_Prg_Math    $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Brand_Prg_Wrt     $FILELISTSDIR/common_list.txt
-        # FIXME: small; low dependencies; why optional module?
-        merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt
-    fi
-
-    if test "$SPLIT_OPT_FEATURES" = "YES" ; then
-        if test "z$OOO_VENDOR" = "zMandriva" ; then
-            merge_flists gid_Module_Optional_Binfilter         $FILELISTSDIR/filter-binfilter_list.txt
-            merge_flists gid_Module_Langpack_Binfilter_en_US   $FILELISTSDIR/filter-binfilter_list.txt
-            merge_flists gid_Module_Optional_Grfflt            $FILELISTSDIR/draw_list.txt
-            merge_flists gid_Module_Optional_Headless          $FILELISTSDIR/common_list.txt
-            merge_flists gid_Module_Optional_Javafilter        $FILELISTSDIR/common_list.txt
-            merge_flists gid_Module_Optional_Pymailmerge       $FILELISTSDIR/pyuno_list.txt
-            merge_flists gid_Module_Optional_Pyuno             $FILELISTSDIR/pyuno_list.txt
-            merge_flists gid_Module_Optional_Testtool          $FILELISTSDIR/testtool_list.txt
-            merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt
-        else
-            merge_flists gid_Module_Optional_Binfilter         $FILELISTSDIR/filters_list.txt
-            merge_flists gid_Module_Optional_Grfflt            $FILELISTSDIR/common_list.txt
-            merge_flists gid_Module_Optional_Headless          $FILELISTSDIR/common_list.txt
-            merge_flists gid_Module_Optional_Javafilter        $FILELISTSDIR/filters_list.txt
-            merge_flists gid_Module_Optional_Pymailmerge       $FILELISTSDIR/mailmerge_list.txt
-            merge_flists gid_Module_Optional_Pyuno             $FILELISTSDIR/pyuno_list.txt
-            merge_flists gid_Module_Optional_Testtool          $FILELISTSDIR/testtool_list.txt
-            merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/filters_list.txt
-        fi
-    else
-        merge_flists gid_Module_Optional_Binfilter         $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Langpack_Binfilter         $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Optional_Grfflt            $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Optional_Headless          $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Optional_Javafilter        $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Optional_Pymailmerge       $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Optional_Pyuno             $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Optional_Testtool          $FILELISTSDIR/common_list.txt
-        merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt
-    fi
-
-    # lang packs
-    for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
-        lang_lists=
-        if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "Novell, Inc." -a "$SPLIT_APP_MODULES" = "YES" \) ; then
-            test -f gid_Module_Langpack_Basis_$lang     && lang_lists="$lang_lists gid_Module_Langpack_Basis_$lang" || :
-            test -f gid_Module_Langpack_Brand_$lang     && lang_lists="$lang_lists gid_Module_Langpack_Brand_$lang" || :
-            test -f gid_Module_Langpack_Resource_$lang  && lang_lists="$lang_lists gid_Module_Langpack_Resource_$lang" || :
-            test -f gid_Module_Langpack_Impress_$lang   && lang_lists="$lang_lists gid_Module_Langpack_Impress_$lang" || :
-            test -f gid_Module_Langpack_Draw_$lang      && lang_lists="$lang_lists gid_Module_Langpack_Draw_$lang" || :
-            test -f gid_Module_Langpack_Math_$lang      && lang_lists="$lang_lists gid_Module_Langpack_Math_$lang" || :
-            test -f gid_Module_Langpack_Calc_$lang      && lang_lists="$lang_lists gid_Module_Langpack_Calc_$lang" || :
-            test -f gid_Module_Langpack_Base_$lang      && lang_lists="$lang_lists gid_Module_Langpack_Base_$lang" || :
-            test -f gid_Module_Langpack_Writer_$lang    && lang_lists="$lang_lists gid_Module_Langpack_Writer_$lang" || :
-            test -f gid_Module_Langpack_Binfilter_$lang && lang_lists="$lang_lists gid_Module_Langpack_Binfilter_$lang" || :
-            # Place helps on dedicated packages.
-            test -f gid_Module_Helppack_Help_$lang      && sort -u gid_Module_Helppack_Help_$lang > $FILELISTSDIR/help_${lang}_list.txt || :
-        else
-            test -f gid_Module_Langpack_Basis_$lang     && lang_lists="$lang_lists gid_Module_Langpack_Basis_$lang" || :
-            test -f gid_Module_Langpack_Brand_$lang     && lang_lists="$lang_lists gid_Module_Langpack_Brand_$lang" || :
-            test -f gid_Module_Langpack_Resource_$lang  && lang_lists="$lang_lists gid_Module_Langpack_Resource_$lang" || :
-            test -f gid_Module_Langpack_Impress_$lang   && lang_lists="$lang_lists gid_Module_Langpack_Impress_$lang" || :
-            test -f gid_Module_Langpack_Draw_$lang      && lang_lists="$lang_lists gid_Module_Langpack_Draw_$lang" || :
-            test -f gid_Module_Langpack_Math_$lang      && lang_lists="$lang_lists gid_Module_Langpack_Math_$lang" || :
-            test -f gid_Module_Langpack_Calc_$lang      && lang_lists="$lang_lists gid_Module_Langpack_Calc_$lang" || :
-            test -f gid_Module_Langpack_Base_$lang      && lang_lists="$lang_lists gid_Module_Langpack_Base_$lang" || :
-            test -f gid_Module_Langpack_Writer_$lang    && lang_lists="$lang_lists gid_Module_Langpack_Writer_$lang" || :
-            test -f gid_Module_Langpack_Binfilter_$lang && lang_lists="$lang_lists gid_Module_Langpack_Binfilter_$lang" || :
-            test -f gid_Module_Helppack_Help_$lang      && lang_lists="$lang_lists gid_Module_Helppack_Help_$lang" || :
-        fi
-        if test -n "$lang_lists" ; then
-            # all files are installed below $INSTALLDIR/basis; we want to own also $INSTALLDIR
-            echo "%dir $INSTALLDIR" >$FILELISTSDIR/lang_${lang}_list.txt
-            cat $lang_lists | sort -u >>$FILELISTSDIR/lang_${lang}_list.txt
-        fi
-        # some help files are in _Langpack_{Writer,Impress,...}_<lang>
-        # move them from -l10n to -help
-        if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "Novell, Inc." -a "$SPLIT_APP_MODULES" = "YES" \) ; then
-            for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
-                test -f $FILELISTSDIR/help_${lang}_list.txt || continue;
-                mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt $FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/basis$PRODUCTVERSION/help/.*
-                add_used_directories $FILELISTSDIR/help_${lang}_list.txt $FILELISTSDIR/lang_${lang}_list.txt
-            done
-        fi
-    done
-
-    if test -f $FILELISTSDIR/lang_en_US_list.txt -a "$OOO_VENDOR" = "Novell, Inc." -a "$SPLIT_APP_MODULES" != "YES" ; then
-        cat $FILELISTSDIR/lang_en_US_list.txt >>$FILELISTSDIR/common_list.txt
-        rm $FILELISTSDIR/lang_en_US_list.txt
-    fi
-
-    if test -f gid_Module_Root_SDK ; then
-        cp gid_Module_Root_SDK $FILELISTSDIR/sdk_list.txt
-    fi
-
-    cd $FILELISTSDIR
-
-    # kde subpackage
-    test -f $DESTDIR/gid_Module_Optional_Kde && cp $DESTDIR/gid_Module_Optional_Kde kde_list.txt || :
-    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/kdefilepicker
-    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/fps_kde.uno.so
-    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libvclplug_kdel..so
-    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libkabdrv1.so
-    add_used_directories kde_list.txt common_list.txt
-
-    # create kde4 subpackage
-    mv_file_between_flists kde4_list.txt kde_list.txt    $INSTALLDIR/basis$PRODUCTVERSION/program/kde4be1.uno.so
-    mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libvclplug_kde4l..so
-    mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/fps_kde4.uno.so
-    add_used_directories kde4_list.txt common_list.txt
-
-    # gnome subpackage
-    test -f $DESTDIR/gid_Module_Optional_Gnome && cp $DESTDIR/gid_Module_Optional_Gnome gnome_list.txt || :
-    mv_file_between_flists gnome_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libevoab2.so
-    mv_file_between_flists gnome_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/fps_gnome.uno.so
-    mv_file_between_flists gnome_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libvclplug_gtk[0-9]*l..so
-    mv_file_between_flists common_list.txt gnome_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/ucpgvfs1.uno.so
-    add_used_directories gnome_list.txt common_list.txt
-
-    # mono subpackage
-    mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/cli_.*.dll
-    mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/cli_.*.dll.config
-    mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/policy.*.cli_.*.dll
-    mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/cli_.*.dll
-    mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/cli_.*.dll.config
-    mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/policy.*.cli_.*.dll
-    mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/libcli_.*.so
-    add_used_directories mono_list.txt common_list.txt
-    # add the files from GAC if it was installed
-    test -f mono_gac && cat mono_gac >>mono_list.txt
-
-    # mailmerge
-    if test "$SPLIT_OPT_FEATURES" = "YES" ; then
-        if test "z$OOO_VENDOR" = "zMandriva" ; then
-            flist=pyuno_list.txt
-        else
-            flist=mailmerge_list.txt
-        fi
-        mv_file_between_flists $flist common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/mailmerge.py
-        add_used_directories $flist common_list.txt
-    fi
-
-    if test "z$OOO_VENDOR" = "zNovell" ; then
-        # officebean subpackage
-        mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/classes/officebean.jar
-        mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libofficebean.so
-        add_used_directories officebean_list.txt common_list.txt
-    fi
-
-    if test -f sdk_list.txt ; then
-        # in this case we move all entries including directories
-        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "%dir $DOCDIRBASE/sdk/docs.*"
-        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$DOCDIRBASE/sdk/docs.*"
-        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$DOCDIRBASE/sdk/examples"
-        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$DOCDIRBASE/sdk/index.html"
-        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "%dir $INSTALLDIR/basis$PRODUCTVERSION/sdk/examples.*"
-        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/sdk/docs"
-        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/sdk/examples.*"
-        mv_file_between_flists sdk_doc_list.txt sdk_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/sdk/index.html"
-        add_used_directories sdk_doc_list.txt sdk_list.txt
-    fi
-
-    if test "$OOO_VENDOR" = "Novell, Inc." -a "$SPLIT_APP_MODULES" = "YES" ; then
-        # move the prebuilt icons into a hacky temporary package
-        # we want to repack them into a noarch package as soon as possible
-        # without the build dependency on the huge devel package
-        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_classic8.zip
-        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_crystal.zip
-        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_hicontrast.zip
-        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_industrial.zip
-        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_tango.zip
-        mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images.zip
-    fi
-
-    # Mandriva packaging
-    if test "$OOO_VENDOR" = "Mandriva"; then
-        # Not used
-        remove_file common_list.txt $INSTALLDIR/share/gallery/htmltheme.orig
-        remove_file common_list.txt $INSTALLDIR/share/dict/ooo/dictionary.lst
-
-        # And these are in -draw package
-        mv_file_between_flists draw_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_drawgraphics_filters.xcu
-        mv_file_between_flists draw_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_drawgraphics_types.xcu
-
-        # And these are in -impress package
-        mv_file_between_flists impress_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_impressgraphics_filters.xcu
-        mv_file_between_flists impress_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_impressgraphics_types.xcu
-
-        # Split out the gallery
-        mv_file_between_flists gallery_list.txt common_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/share/gallery.*"
-        test -r galleries.txt && cat galleries.txt >> gallery_list.txt
-
-        # Split out dtd-officedocument1.0
-        mv_file_between_flists dtd_list.txt common_list.txt "$INSTALLDIR/share/dtd/officedocument.*"
-
-        # Split out java stuff
-        mv_file_between_flists java_common_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/JREProperties.class
-        mv_file_between_flists java_common_list.txt common_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/program/classes.*"
-        mv_file_between_flists java_common_list.txt common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libofficebean.so
-        mv_file_between_flists java_common_list.txt common_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/share/Scripts/java.*"
-        mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/classes/aportisdoc.jar
-        mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/classes/pocketword.jar
-        mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/classes/pexcel.jar
-        mv_file_between_flists java_common_list.txt writer_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/classes/writer2latex.jar
-
-        # Move arch-dependent/dup files from common to core
-        for f in \
-            ".*\.so" \
-            ".*\.so\..*" \
-            "program/.*\.rdb" \
-            program/configimport.bin \
-            program/javaldx \
-            program/msfontextract \
-            program/nsplugin \
-            program/oosplash.bin \
-            program/pagein \
-            program/pagein-calc \
-            program/pagein-common \
-            program/pagein-draw \
-            program/pagein-impress \
-            program/pagein-writer \
-            program/pkgchk.bin \
-            program/pluginapp.bin \
-            program/setofficelang.bin \
-            program/soffice.bin \
-            program/spadmin.bin \
-            program/uno.bin \
-            program/unopkg.bin \
-            program/uri-encode
-        do
-            mv_file_between_flists core_list.txt common_list.txt "$INSTALLDIR/basis$PRODUCTVERSION/$f"
-        done
-
-        # Put gtk/gnome stuff into gnome package
-        mv_file_between_flists gnome_list.txt core_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/gnome-open-url.bin
-        mv_file_between_flists gnome_list.txt core_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/fps_gnome.uno.so
-        mv_file_between_flists gnome_list.txt core_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/ucpgvfs1.uno.so
-        mv_file_between_flists gnome_list.txt core_list.txt $INSTALLDIR/basis$PRODUCTVERSION/program/libeggtray680li.so
-
-        # Ship ooqstart for gnome in gnome package
-        mv_file_between_flists gnome_list.txt core_list.txt "$INSTALLDIR/program/libqstart_gtk680.*"
-
-        # themes are included in other packages
-        # don't use remove_file as we don't want them removed from the buildroot.
-        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_crystal.zip
-        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_hicontrast.zip
-        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_industrial.zip
-        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images_tango.zip
-        mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/basis$PRODUCTVERSION/share/config/images.zip
-    fi
-
-    # remove known duplicities to do not have files packaged in two packages
-    # the Bulgarian fixes can be removed after the issue #54110 is fixed
-    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/arrowhd.soe
-    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/classic.sog
-    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/hatching.soh
-    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/modern.sog
-    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/palette.soc
-    remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/styles.sod
-    # the British fixes can be removed after the issue #54113 is fixed
-    remove_duplicity_from_flists common_list.txt lang_en-GB_list.txt $INSTALLDIR/basis$PRODUCTVERSION/presets/config/standard.sog
-
-else
-
-    echo "Creating package directories..."
-
-    test -d pkg && rm -r pkg || :
-
-    # Create package tree (needed by Debian's dpkg)
-    # create_package_directory <list_file> <directory_name>
-    create_package_directory()
-    {
-        listfile=$1
-        directory="$2"
-        perl -nl \
-            -e " if(/^%dir (.*)/)
-                    {system('mkdir', '-p', '-m', '755', \"$directory\".\$1);}
-                else
-                    {rename('./'.\$_, \"$directory\".\$_);}
-                " \
-            $listfile
-    }
-
-    create_package_directory gid_Module_Root_Ure_Hidden        pkg/ure
-
-    create_package_directory gid_Module_Root                        pkg/libreoffice-common
-    create_package_directory gid_Module_Root_Brand                  pkg/libreoffice-common
-    create_package_directory gid_Module_Root_Files_Images           pkg/libreoffice-common
-    create_package_directory gid_Module_Oo_Linguistic               pkg/libreoffice-common
-    create_package_directory gid_Module_Optional_Xsltfiltersamples  pkg/libreoffice-common
-    create_package_directory gid_Module_Optional_Javafilter         pkg/libreoffice-common
-    if [ -f gid_Module_Optional_Binfilter ]; then
-        create_package_directory gid_Module_Optional_Binfilter      pkg/libreoffice-filter-binfilter
-    fi
-    create_package_directory gid_Module_Optional_Grfflt             pkg/libreoffice-draw
-    create_package_directory gid_Module_Prg_Calc_Bin                pkg/libreoffice-calc
-    create_package_directory gid_Module_Prg_Math_Bin                pkg/libreoffice-math
-    create_package_directory gid_Module_Prg_Draw_Bin                pkg/libreoffice-draw
-    create_package_directory gid_Module_Prg_Wrt_Bin                 pkg/libreoffice-writer
-    create_package_directory gid_Module_Prg_Impress_Bin             pkg/libreoffice-impress
-    create_package_directory gid_Module_Prg_Base_Bin                pkg/libreoffice-base
-    create_package_directory gid_Module_Brand_Prg_Calc              pkg/libreoffice-calc
-    create_package_directory gid_Module_Brand_Prg_Math              pkg/libreoffice-math
-    create_package_directory gid_Module_Brand_Prg_Draw              pkg/libreoffice-draw
-    create_package_directory gid_Module_Brand_Prg_Wrt               pkg/libreoffice-writer
-    create_package_directory gid_Module_Brand_Prg_Impress           pkg/libreoffice-impress
-    create_package_directory gid_Module_Brand_Prg_Base              pkg/libreoffice-base
-    create_package_directory gid_Module_Optional_Pyuno              pkg/python-uno
-    create_package_directory gid_Module_Optional_Gnome              pkg/libreoffice-gnome
-    create_package_directory gid_Module_Optional_Kde                pkg/libreoffice-kde
-
-    create_package_directory gid_Module_Root_Files_2                pkg/libreoffice-common
-    create_package_directory gid_Module_Root_Files_3                pkg/libreoffice-common
-    create_package_directory gid_Module_Root_Files_4                pkg/libreoffice-common
-    create_package_directory gid_Module_Root_Files_5                pkg/libreoffice-common
-    create_package_directory gid_Module_Root_Files_6                pkg/libreoffice-common
-    create_package_directory gid_Module_Root_Files_7                pkg/libreoffice-common
-    create_package_directory gid_Module_Optional_Testtool           pkg/libreoffice-qa-tools
-    if [ -e gid_Module_Optional_Pymailmerge ]; then
-        create_package_directory gid_Module_Optional_Pymailmerge    pkg/libreoffice-emailmerge
-    else # post m26
-        mkdir -p pkg/libreoffice-emailmerge/$INSTALLDIR/basis$PRODUCTVERSION/program
-        mv pkg/libreoffice-common/$INSTALLDIR/basis$PRODUCTVERSION/program/mailmerge.py \
-            pkg/libreoffice-emailmerge/$INSTALLDIR/basis$PRODUCTVERSION/program/mailmerge.py
-    fi
-    create_package_directory gid_Module_Optional_OGLTrans           pkg/libreoffice-ogltrans
-
-    create_package_directory gid_Module_Root_SDK                    pkg/libreoffice-dev
-
-    for l in `echo $WITH_LANG_LIST`; do
-        for p in Impress Draw Math Calc Base Writer; do
-            create_package_directory  gid_Module_Langpack_${p}_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l
-        done
-        create_package_directory gid_Module_Langpack_Basis_`echo $l | sed -e s/-/_/g`     pkg/libreoffice-l10n-$l
-        create_package_directory gid_Module_Langpack_Brand_`echo $l | sed -e s/-/_/g`     pkg/libreoffice-l10n-$l
-        create_package_directory gid_Module_Langpack_Resource_`echo $l | sed -e s/-/_/g`  pkg/libreoffice-l10n-$l
-        create_package_directory gid_Module_Helppack_Help_`echo $l | sed -e s/-/_/g`      pkg/libreoffice-help-$l
-        if [ -f gid_Module_Optional_Binfilter ]; then
-            if [ "$l" = "en-US" ]; then
-                create_package_directory gid_Module_Langpack_Binfilter_en_US    pkg/libreoffice-filter-binfilter
-            else
-                create_package_directory gid_Module_Langpack_Binfilter_`echo $l | sed -e s/-/_/g`    pkg/libreoffice-l10n-$l
-            fi
-        fi
-        # some help files are in _Langpack_{Writer,Impress,...}_<lang>
-        # move them from -l10n to -help
-        if [ "$l" = "en-US" ]; then d=en; else d=$l; fi
-        mv pkg/libreoffice-l10n-$l/$INSTALLDIR/basis$PRODUCTVERSION/help/$d/* \
-            pkg/libreoffice-help-$l/$INSTALLDIR/basis$PRODUCTVERSION/help/$d && \
-        rmdir pkg/libreoffice-l10n-$l/$INSTALLDIR/basis$PRODUCTVERSION/help/$d
-    done
-
-    # move_wrappers <directory_name> <name> [...]
-    move_wrappers()
-    {
-        directory=$1
-        shift
-        mkdir -m755 -p "$directory"/usr/bin
-        while test -n "$1"; do
-            mv usr/*bin/"$1$BINSUFFIX" "$directory"/usr/bin
-            shift
-        done
-    }
-    move_wrappers pkg/libreoffice-common soffice unopkg
-    if test "$COMPAT_OOWRAPPERS" = "YES" ; then
-        move_wrappers pkg/libreoffice-common ooffice oofromtemplate
-        move_wrappers pkg/libreoffice-base oobase
-        move_wrappers pkg/libreoffice-writer oowriter ooweb
-        move_wrappers pkg/libreoffice-calc oocalc
-        move_wrappers pkg/libreoffice-impress ooimpress
-        move_wrappers pkg/libreoffice-math oomath
-        move_wrappers pkg/libreoffice-draw oodraw
-    fi
-    move_wrappers pkg/libreoffice-common libreoffice lofromtemplate
-    move_wrappers pkg/libreoffice-base lobase
-    move_wrappers pkg/libreoffice-writer lowriter loweb
-    move_wrappers pkg/libreoffice-calc localc
-    move_wrappers pkg/libreoffice-impress loimpress
-    move_wrappers pkg/libreoffice-math lomath
-    move_wrappers pkg/libreoffice-draw lodraw
-
-    # Move all libraries, binaries, *.rdb from -common to -core
-    for d in $INSTALLDIR/basis$PRODUCTVERSION/program $INSTALLDIR/program; do \
-      if [ ! -d $DESTDIR/pkg/libreoffice-core/$d ]; then \
-      mkdir -p $DESTDIR/pkg/libreoffice-core/$d; \
-      fi &&
-      ( cd pkg/libreoffice-common/$d
-        find -maxdepth 1 \
-           -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
-           -exec mv {} $DESTDIR/pkg/libreoffice-core/$d \;
-      ); \
-    done
-
-    # install additional ooo-build scripts & misc stuff
-    mkdir -p pkg/libreoffice-common/usr/share/man/man1
-    if test "$COMPAT_OOWRAPPERS" = "YES" ; then
-        mv usr/share/man/man1/openoffice$BINSUFFIX.1 \
-            pkg/libreoffice-common/usr/share/man/man1
-    fi
-    mv usr/share/man/man1/libreoffice$BINSUFFIX.1 \
-        pkg/libreoffice-common/usr/share/man/man1
-    mkdir -p pkg/libreoffice-common/etc/bash_completion.d
-    if test "$COMPAT_OOWRAPPERS" = "YES" ; then
-        mv etc/bash_completion.d/ooffice$BINSUFFIX.sh \
-            pkg/libreoffice-common/etc/bash_completion.d
-    fi
-    mv etc/bash_completion.d/libreoffice$BINSUFFIX.sh \
-        pkg/libreoffice-common/etc/bash_completion.d
-    mv .$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath \
-        pkg/libreoffice-common/$INSTALLDIR/program
-    if echo $WITH_LANG_LIST | grep -q en-US; then
-        for i in forms/resume.ott officorr/project-proposal.ott; do \
-            mkdir -p pkg/libreoffice-common/$INSTALLDIR/basis$PRODUCTVERSION/share/template/en-US/`dirname $i`; \
-            mv .$INSTALLDIR/basis$PRODUCTVERSION/share/template/en-US/$i \
-                pkg/libreoffice-common/$INSTALLDIR/basis$PRODUCTVERSION/share/template/en-US/$i; \
-        done; \
-    fi
-    # Warn for any remaining files
-    find . -path './pkg' -prune -o -not -name 'gid_Module_*' -not -type d -exec echo "File not packaged: {}" \;
-fi
-
-# mark the config files
-RPM_CONFIG_FILE_TAGS=
-if test "$OOO_VENDOR" = "Novell, Inc." -o "$OOO_VENDOR" = "RedHat"; then
-    RPM_CONFIG_FILE_TAGS="%config"
-elif test "$OOO_VENDOR" = "PLD" ; then
-    RPM_CONFIG_FILE_TAGS="%config(noreplace) %verify(not md5 size mtime)"
-fi
-
-if test "z$RPM_CONFIG_FILE_TAGS" != "z" ; then
-    cd $FILELISTSDIR
-    perl -pi -e "s|^($INSTALLDIR/help/.*\.xsl)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-	    -e "s|^($INSTALLDIR/help/.*\.css)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-	    -e "s|^($INSTALLDIR/program/[a-zA-Z0-9_\.]*rc)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-	    -e "s|^($INSTALLDIR/program/.*\.xsl)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-	    -e "s|^($INSTALLDIR/share/config/[a-zA-Z0-9]*rc)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-	    -e "s|^($INSTALLDIR/share/dict/ooo/.*\.lst)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-	    -e "s|^($INSTALLDIR/share/psprint/.*\.conf)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-	    -e "s|^($INSTALLDIR/share/registry/.*\.xcu)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-	    -e "s|^($INSTALLDIR/share/registry/.*\.properties)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-	    -e "s|^($INSTALLDIR/share/registry/.*\.xcs)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-	    -e "s|^($INSTALLDIR/user/config/.*\.so.)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-	*_list.txt
-fi
-
-mkdir -p $FILELISTSDIR/orig
-mv -f $DESTDIR/gid_Module_* $FILELISTSDIR/orig
diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
deleted file mode 100755
index 3dca2affe..000000000
--- a/bin/distro-install-sdk
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-. ./*[Ee]nv.[Ss]et.sh
-
-if test -d $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk ; then
-
-    echo "SDK installation clean up"
-
-    # bin potential .orig files
-    find $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk -name "*.orig" -exec rm -f {} \;
-
-    # move some SDK directories to the right place according to FHS
-    # note that examples must stay in $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk because there are used
-    # relative paths to $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/setting and it does not work via
-    # a symlink
-    mkdir -p $DESTDIR$PREFIXDIR/include
-    mkdir -p $DESTDIR$DATADIR/idl
-    mkdir -p $DESTDIR$DATADIR/$INSTALLDIRNAME/sdk
-    mkdir -p $DESTDIR$DOCDIR/sdk
-    mv $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/include      $DESTDIR$PREFIXDIR/include/$INSTALLDIRNAME
-    if [ -d $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/classes ]; then
-        mv $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/classes      $DESTDIR$DATADIR/$INSTALLDIRNAME/sdk/classes
-    fi
-    mv $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/idl          $DESTDIR$DATADIR/idl/$INSTALLDIRNAME
-    mv $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/docs         $DESTDIR$DOCDIR/sdk
-    mv $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/share/readme $DESTDIR$DOCDIR/sdk/readme
-    mv $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/index.html   $DESTDIR$DOCDIR/sdk
-
-    # compat symlinks
-    ln -sf $PREFIXDIR/include/$INSTALLDIRNAME                        $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/include
-    ln -sf $DATADIR/$INSTALLDIRNAME/sdk/classes                      $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/classes
-    ln -sf $DATADIR/idl/$INSTALLDIRNAME                              $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/idl
-    ln -sf $DOCDIR/sdk/docs                                          $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/
-    ln -sf $DOCDIR/sdk/index.html                                    $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/index.html
-    ln -sf $INSTALLDIR/basis$PRODUCTVERSION/sdk/examples         $DESTDIR$DOCDIR/sdk/examples
-
-    # fix file list
-    sed -e "s|^\(%dir \)\?$INSTALLDIR/basis$PRODUCTVERSION/sdk/include|\1$PREFIXDIR/include/$INSTALLDIRNAME|" \
-	-e "s|^\(%dir \)\?$INSTALLDIR/basis$PRODUCTVERSION/sdk/classes|\1$DATADIR/$INSTALLDIRNAME/sdk/classes|" \
-	-e "s|^\(%dir \)\?$INSTALLDIR/basis$PRODUCTVERSION/sdk/idl|\1$DATADIR/idl/$INSTALLDIRNAME|" \
-	-e "s|^\(%dir \)\?$INSTALLDIR/basis$PRODUCTVERSION/sdk/docs|\1$DOCDIR/sdk/docs|" \
-	-e "s|^\(%dir \)\?$INSTALLDIR/basis$PRODUCTVERSION/sdk/share/readme|\1$DOCDIR/sdk/readme|" \
-	-e "s|^$INSTALLDIR/basis$PRODUCTVERSION/sdk/index.html$|$DOCDIR/sdk/index.html|" \
-	-e "s|^\(%dir \)\?$INSTALLDIR/basis$PRODUCTVERSION/sdk/share.*$||" \
-	-e "/\.orig$/D" \
-	-e "/^$/D" \
-	$DESTDIR/gid_Module_Root_SDK | sort -u \
-	>$DESTDIR/gid_Module_Root_SDK.new
-    mv $DESTDIR/gid_Module_Root_SDK.new $DESTDIR/gid_Module_Root_SDK
-    #
-    echo "%dir $DATADIR/$INSTALLDIRNAME/sdk"                    >>$DESTDIR/gid_Module_Root_SDK
-    echo "%dir $DATADIR/$INSTALLDIRNAME"                        >>$DESTDIR/gid_Module_Root_SDK
-    echo "%dir $DATADIR/idl"                                    >>$DESTDIR/gid_Module_Root_SDK
-    echo "%dir $DOCDIR/sdk/docs"                                >>$DESTDIR/gid_Module_Root_SDK
-    echo "%dir $DOCDIR/sdk"                                     >>$DESTDIR/gid_Module_Root_SDK
-    echo "%dir $DOCDIR"                                         >>$DESTDIR/gid_Module_Root_SDK
-    echo "$INSTALLDIR/basis$PRODUCTVERSION/sdk/include"     >>$DESTDIR/gid_Module_Root_SDK
-    echo "$INSTALLDIR/basis$PRODUCTVERSION/sdk/classes"     >>$DESTDIR/gid_Module_Root_SDK
-    echo "$INSTALLDIR/basis$PRODUCTVERSION/sdk/idl"         >>$DESTDIR/gid_Module_Root_SDK
-    echo "$INSTALLDIR/basis$PRODUCTVERSION/sdk/docs"        >>$DESTDIR/gid_Module_Root_SDK
-    echo "$INSTALLDIR/basis$PRODUCTVERSION/sdk/index.html"  >>$DESTDIR/gid_Module_Root_SDK
-    echo "$DOCDIR/sdk/examples"                                 >>$DESTDIR/gid_Module_Root_SDK
-
-    # generate default profiles
-    for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
-        sed -e "s,@OO_SDK_NAME@,openoffice.org${PRODUCTVERSION}_sdk," \
-	    -e "s,@OO_SDK_HOME@,$INSTALLDIR/basis$PRODUCTVERSION/sdk," \
-	    -e "s,@OFFICE_HOME@,$INSTALLDIR," \
-	    -e "s,@OFFICE_BASE_HOME@,$INSTALLDIR/basis$PRODUCTVERSION," \
-	    -e "s,@OO_SDK_URE_HOME@,$INSTALLDIR/basis$PRODUCTVERSION/ure-link," \
-	    -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
-	    -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
-	    -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
-	    -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
-	    -e "s,@OO_SDK_JAVA_HOME@,$JAVA_HOME," \
-	    -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
-	    -e "s,@SDK_AUTO_DEPLOYMENT@,NO," \
-            $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/$file.in \
-	    > $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/$file
-	chmod 755 $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/$file
-	echo $INSTALLDIR/basis$PRODUCTVERSION/sdk/$file >>$DESTDIR/gid_Module_Root_SDK
-    done
-
-    # FIXME: I rather set this file to be non-world-writttable for now, i#64812
-    chmod go-w $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/settings/component.uno.map
-fi
diff --git a/bin/doubleNewlines.pl b/bin/doubleNewlines.pl
deleted file mode 100755
index c1f66e57e..000000000
--- a/bin/doubleNewlines.pl
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/perl
-################################################################################
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Michael Koch <miko@gmx.ch>
-#
-# Major Contributor(s):
-#       <name>
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-################################################################################
-# Usage: "Usage: doubleNewlines.pl <directory>"
-#        It is possible to enter more than one directory separated by spaces.
-#        Instead of a directory you can also use one or more files as arguments.
-################################################################################
-
-use strict;
-use warnings;
-
-use File::Find;
-use Cwd 'abs_path';
-
-my $total = 0;
-
-die "Usage: doubleNewlines.pl <directory>\n" unless (@ARGV);
-
-# if path is relative, make it absolute
-foreach (@ARGV){
-    $_ = abs_path($_);
-}
-
-print "Following code files (.hxx and .cxx) are suspicious:\n";
-find(\&processFile, @ARGV);     # processes all files in dir and subdirs
-print "Found $total suspicious files.\n";
-
-sub processFile {
-    my $file = $File::Find::name;
-    return unless $file =~ /(.cxx$)|(.hxx$)/;
-    open FILE, $file or die "Can't open '$file': $!";
-    my $lines = join '', <FILE>;
-    if ($lines =~ /(\n{2,}.+){10}/) {    # ten consecutive occurrences of [empty line(s) - code line)]
-        my $relPath = substr($file, index($file, "clone")+6);   # relative path beginning with repo name
-        print "$relPath\n";
-        $total++;
-    }
-}
diff --git a/bin/find-german-comments b/bin/find-german-comments
deleted file mode 100755
index 1538c6d57..000000000
--- a/bin/find-german-comments
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/usr/bin/env python
-########################################################################
-#
-#  Copyright (c) 2010 Jonas Jensen, Miklos Vajna
-#
-#  Permission is hereby granted, free of charge, to any person
-#  obtaining a copy of this software and associated documentation
-#  files (the "Software"), to deal in the Software without
-#  restriction, including without limitation the rights to use,
-#  copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  copies of the Software, and to permit persons to whom the
-#  Software is furnished to do so, subject to the following
-#  conditions:
-#
-#  The above copyright notice and this permission notice shall be
-#  included in all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-#  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-#  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-#  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-#  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-#  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-#  OTHER DEALINGS IN THE SOFTWARE.
-#
-########################################################################
-
-
-import sys, re, subprocess, os, optparse, string
-
-class Parser:
-    """
-    This parser extracts comments from source files, tries to guess
-    their language and then prints out the german ones.
-    """
-    def __init__(self):
-        self.strip = string.punctuation + " \n"
-        op = optparse.OptionParser()
-        op.set_usage("%prog [options] <rootdir>\n\n" +
-            "Searches for german comments in cxx/hxx source files inside a given root\n" +
-            "directory recursively.")
-        op.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False,
-            help="Turn on verbose mode (print progress to stderr)")
-        self.options, args = op.parse_args()
-        try:
-            dir = args[0]
-        except IndexError:
-            dir = "."
-        self.check_source_files(dir)
-
-    def get_comments(self, filename):
-        """
-        Extracts the source code comments.
-        """
-        linenum = 0
-        if self.options.verbose:
-            sys.stderr.write("processing file '%s'...\n" % filename)
-        sock = open(filename)
-        # add an empty line to trigger the output of collected oneliner
-        # comment group
-        lines = sock.readlines() + ["\n"]
-        sock.close()
-
-        in_comment = False
-        buf = []
-        count = 1
-        for i in lines:
-            if "//" in i and not in_comment:
-                # if we find a new //-style comment, then we
-                # just append it to a previous one if: there is
-                # only whitespace before the // mark that is
-                # necessary to make comments longer, giving
-                # more reliable output
-                if not len(re.sub("(.*)//.*", r"\1", i).strip(self.strip)):
-                    s = re.sub(".*// ?", "", i).strip(self.strip)
-                    if len(s):
-                        buf.append(s)
-                else:
-                    # otherwise it's an independent //-style comment in the next line
-                    yield (count, "\n    ".join(buf))
-                    buf = [re.sub(".*// ?", "", i.strip(self.strip))]
-            elif "//" not in i and not in_comment and len(buf) > 0:
-                # first normal line after a // block
-                yield (count, "\n    ".join(buf))
-                buf = []
-            elif "/*" in i and "*/" not in i and not in_comment:
-                # start of a real multiline comment
-                in_comment = True
-                linenum = count
-                s = re.sub(".*/\*+", "", i.strip(self.strip))
-                if len(s):
-                    buf.append(s.strip(self.strip))
-            elif in_comment and not "*/" in i:
-                # in multiline comment
-                s = re.sub("^( |\|)*\*?", "", i)
-                if len(s.strip(self.strip)):
-                    buf.append(s.strip(self.strip))
-            elif "*/" in i and in_comment:
-                # end of multiline comment
-                in_comment = False
-                s = re.sub(r"\*+/.*", "", i.strip(self.strip))
-                if len(s):
-                    buf.append(s)
-                yield (count, "\n    ".join(buf))
-                buf = []
-            elif "/*" in i and "*/" in i:
-                # c-style oneliner comment
-                yield (count, re.sub(".*/\*(.*)\*/.*", r"\1", i).strip(self.strip))
-            count += 1
-
-    def get_lang(self, s):
-        """ the output is 'german' or 'english' or 'german or english'. when
-        unsure, just don't warn, there are strings where you just can't
-        teremine the results reliably, like '#110680#' """
-        cwd = os.getcwd()
-        # change to our directory
-        os.chdir(os.path.split(os.path.abspath(sys.argv[0]))[0])
-        sock = subprocess.Popen(["text_cat/text_cat", "-d", "text_cat/LM"], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-        sock.stdin.write(s)
-        sock.stdin.close()
-        lang = sock.stdout.read().strip()
-        sock.stdout.close()
-        os.chdir(cwd)
-        return lang
-
-    def is_german(self, s):
-        """
-        determines if a string is german or not
-        """
-        # for short strings we can't do reliable recognition, so skip
-        # short strings and less than 4 words
-        s = s.replace('\n', ' ')
-        if len(s) < 32 or len(s.split()) < 4:
-            return False
-        return "german" == self.get_lang(s)
-
-    def check_file(self, path):
-        """
-        checks each comment in a file
-        """
-        for linenum, s in self.get_comments(path):
-            if self.is_german(s):
-                print "%s:%s: %s" % (path, linenum, s)
-
-    def check_source_files(self, dir):
-        """
-        checks each _tracked_ file in a directory recursively
-        """
-        sock = os.popen(r"git ls-files '%s' |egrep '\.(c|h)xx$'" % dir)
-        lines = sock.readlines()
-        sock.close()
-        for path in lines:
-            self.check_file(path.strip())
-
-try:
-    Parser()
-except KeyboardInterrupt:
-    print "Interrupted!"
-    sys.exit(0)
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/bin/find-undocumented-classes b/bin/find-undocumented-classes
deleted file mode 100755
index 8bab72bc9..000000000
--- a/bin/find-undocumented-classes
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# finds undocumented classes in the current directory (recursive)
-
-type -p doxygen >/dev/null || exit
-
-filter=
-quiet=n
-if [ "$1" = "-q" ]; then
-    filter=">/dev/null"
-    quiet=y
-    shift
-fi
-
-doxygen=$(mktemp -d)
-eval doxygen -g $doxygen/doxygen.cfg $filter
-sed -i "/HTML_OUTPUT/s|html|$doxygen/html|" $doxygen/doxygen.cfg
-sed -i '/GENERATE_LATEX/s/= YES/= NO/' $doxygen/doxygen.cfg
-sed -i '/RECURSIVE/s/= NO/= YES/' $doxygen/doxygen.cfg
-# do we have any arguments?
-if [ -n "$*" ]; then
-    sed -i "/^INPUT[^_]/s|=.*|= $*|" $doxygen/doxygen.cfg
-fi
-eval doxygen $doxygen/doxygen.cfg $filter 2> $doxygen/errors.txt
-if [ "$quiet" == "n" ]; then
-    echo
-    echo "The following classes are undocumented:"
-    echo
-fi
-cat $doxygen/errors.txt|grep -i 'Warning: Compound.*is not documented'
-rm -rf $doxygen
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/bin/generate-bash-completion b/bin/generate-bash-completion
deleted file mode 100755
index ed34b1808..000000000
--- a/bin/generate-bash-completion
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/usr/bin/env perl
-# script to generate LibreOffice bash_completion file for the main applications
-# written by Rene Engelhard <rene@debian.org>, Public Domain
-# updated for libreoffice-build by Petr Mladek <pmladek@suse.cz>, Public Domain
-# yes, this script probably is not real good code :) but still easier
-# to maintain than adding those entries statically many times in
-# a file...
-
-use strict;
-
-my @DRAWDOCS=("sxd", "std", "dxf", "emf", "eps", "met", "pct", "sgf", "sgv", "sda",
-	   "sdd", "vor", "svm", "wmf", "bmp", "gif", "jpg", "jpeg", "jfif", "fif",
-	   "jpe", "pcd", "pcx", "pgm", "png", "ppm", "psd", "ras", "tga", "tif",
-	   "tiff", "xbm", "xpm", "odg", "otg", "fodg", "odc", "odi", "sds",
-	   "wpg", "svg");
-
-my @IMPRESSDOCS=("sxi", "sti", "ppt", "pps", "pot", "sxd", "sda", "sdd", "sdp",
-	      "vor", "cgm", "odp", "otp", "fodp", "ppsm", "ppsx", "pptm", "pptx",
-	      "potm", "potx");
-
-my @TEMPLATES=("stw", "dot", "vor", "stc", "xlt", "sti", "pot", "std", "stw",
-	      "dotm", "dotx", "potm", "potx", "xltm", "xltx");
-
-my @MATHDOCS=("sxm", "smf", "mml", "odf");
-
-my @MASTERDOCS=("sxg", "odm", "sgl");
-
-my @WRITERDOCS=("doc", "dot", "rtf", "sxw", "stw", "sdw", "vor", "txt", "htm?",
-	     "xml", "wp", "wpd", "wps", "odt", "ott", "fodt", "docm", "docx",
-	     "dotm", "dotx");
-
-my @WEBDOCS=("htm", "html", "stw", "txt", "vor", "oth");
-
-my @BASEDOCS=("odb");
-
-my @CALCDOCS=("sxc", "stc", "dif", "dbf", "xls", "xlw", "xlt", "rtf", "sdc", "vor",
-	   "slk", "txt", "htm", "html", "wk1", "wks", "123", "xml", "ods", "ots",
-	   "fods", "csv", "xlsb", "xlsm", "xlsx", "xltm", "xltx");
-
-my @EXTENSIONS=("oxt");
-
-# default names of lowrappers
-# use "" if you want to disable any wrapper
-my %APPS = (
-	office		=> "libreoffice",
-	master		=> "",
-	base		=> "lobase",
-	calc		=> "localc",
-	draw		=> "lodraw",
-	impress		=> "loimpress",
-	math		=> "lomath",
-	template	=> "lofromtemplate",
-	unopkg		=> "unopkg",
-	web		=> "loweb",
-	writer		=> "lowriter",
-);
-
-my $office_shell_function = "_loexp_";
-
-sub usage()
-{
-    print "Script to Generate bash completion for LO wrappers\n\n";
-
-    print "Usage: $0 --help\n";
-    print "       $0 [--binsuffix=suffix]\n";
-    print "\t\t[--compat-oowrappers]\n";
-    print "\t\t[--office=wrapper_name]\n";
-    print "\t\t[--master=wrapper_name]\n";
-    print "\t\t[--base=wrapper_name]\n";
-    print "\t\t[--calc=wrapper_name]\n";
-    print "\t\t[--draw=wrapper_name]\n";
-    print "\t\t[--impress=wrapper_name]\n";
-    print "\t\t[--math=wrapper_name]\n";
-    print "\t\t[--template=wrapper_name]\n";
-    print "\t\t[--unopkg=wrapper_name]\n";
-    print "\t\t[--web=wrapper_name]\n";
-    print "\t\t[--writer=wrapper_name]\n";
-    print "\t\tinput_file\n";
-    print "\t\toutput_file\n\n";
-
-    print "Options:\n";
-    print "\t--help\t\tprint this help\n";
-    print "\t--binsuffix\tdefines a suffix that is added after each wrapper\n";
-    print "\t--compat-oowrappers\tset wrapper names to the old default oo* wrapper names\n";
-
-    print "The other options allows to redefine the wrapper names.\n";
-    print "The value \"\" can be used to disable any wrapper.\n\n";
-}
-
-my $infilename;
-my $outfilename;
-my $binsuffix = '';
-
-my $opt;
-foreach my $arg (@ARGV) {
-	if ( $arg =~ /--help/ ) {
-		usage();
-		exit 0;
-        } elsif ( $arg =~ /--compat-oowrappers/ ) {
-                $APPS{'office'}   = "ooffice";
-                $APPS{'master'}   = "";
-                $APPS{'base'}     = "oobase";
-                $APPS{'calc'}     = "oocalc";
-                $APPS{'draw'}     = "oodraw";
-                $APPS{'impress'}  = "ooimpress";
-                $APPS{'math'}     = "oomath";
-                $APPS{'template'} = "oofromtemplate";
-                $APPS{'unopkg'}   = "unopkg";
-                $APPS{'web'}      = "ooweb";
-                $APPS{'writer'}   = "oowriter";
-                $office_shell_function = "_ooexp_";
-	} elsif ( $arg =~ /--binsuffix=(.*)/ ) {
-		$binsuffix = "$1";
-	} elsif ( $arg =~ /--office=(.*)/ ) {
-		$APPS{'office'} = "$1";
-	} elsif ( $arg =~ /--master=(.*)/ ) {
-		$APPS{'master'} = "$1";
-	} elsif ( $arg =~ /--base=(.*)/ ) {
-		$APPS{'base'} = "$1";
-	} elsif ( $arg =~ /--calc=(.*)/ ) {
-		$APPS{'calc'} = "$1";
-	} elsif ( $arg =~ /--draw=(.*)/ ) {
-		$APPS{'draw'} = "$1";
-	} elsif ( $arg =~ /--impress=(.*)/ ) {
-		$APPS{'impress'} = "$1"
-	} elsif ( $arg =~ /--math=(.*)/ ) {
-		$APPS{'math'} = "$1";
-	} elsif ( $arg =~ /--template=(.*)/ ) {
-		$APPS{'template'} = "$1";
-	} elsif ( $arg =~ /--unopkg=(.*)/ ) {
-		$APPS{'unopkg'} = "$1";
-	} elsif ( $arg =~ /--web=(.*)/ ) {
-		$APPS{'web'} = "$1";
-	} elsif ( $arg =~ /--writer=(.*)/ ) {
-		$APPS{'writer'} = "$1"
-	} elsif ( $arg =~ /^-.*/ ) {
-		printf STDERR "Error: invalid option \"$arg\", try --help\n";
-		exit 1;
-	} elsif ( $outfilename ) {
-		printf STDERR "Error: too much arguments, try --help\n";
-		exit 1;
-	} else {
-		if ($infilename) {
-		    $outfilename = "$arg";
-		} else {
-		    $infilename = "$arg";
-		}
-	}
-}
-
-unless ( $infilename ) {
-	printf STDERR "Error: undefined input file, try --help\n";
-	exit 1;
-}
-
-unless ( $outfilename ) {
-	printf STDERR "Error: undefined output file, try --help\n";
-	exit 1;
-}
-
-#add binsuffix
-foreach my $app (keys %APPS) {
-    $APPS{$app} .= "$binsuffix" unless ( "$APPS{$app}" eq "" );
-}
-
-sub print_suffixes_check {
-    my $app = shift(@_);
-    my $first_suffix = shift(@_);
-
-    ($first_suffix) || die "Error: No suffix defined for $app\n";
-
-    print BCOUTFILE "    $app)\t\te=\'!*.+(" . $first_suffix . "|" . uc($first_suffix);
-    foreach my $suffix (@_) {
-	print BCOUTFILE "|" . $suffix;
-	print BCOUTFILE "|" . uc($suffix);
-    }
-    print BCOUTFILE ")\' ;;\n";
-}
-
-sub print_suffixes_checks {
-    foreach my $app (keys %APPS) {
-	# skip the disabled wrapper
-	next if ( $APPS{$app} eq "" );
-
-	if ($app eq "draw" ) { print_suffixes_check ($APPS{$app}, @DRAWDOCS); }
-	if ($app eq "writer") { print_suffixes_check ($APPS{$app}, @WRITERDOCS, @MASTERDOCS); }
-	if ($app eq "web") { print_suffixes_check ($APPS{$app}, @WEBDOCS); }
-	if ($app eq "math") { print_suffixes_check ($APPS{$app}, @MATHDOCS); }
-	if ($app eq "impress") { print_suffixes_check ($APPS{$app}, @IMPRESSDOCS); }
-	if ($app eq "base") { print_suffixes_check ($APPS{$app}, @BASEDOCS); }
-	if ($app eq "calc") { print_suffixes_check ($APPS{$app}, @CALCDOCS); }
-	if ($app eq "master") { print_suffixes_check ($APPS{$app}, @MASTERDOCS); }
-	if ($app eq "template") { print_suffixes_check ($APPS{$app}, @TEMPLATES); }
-	# libreoffice should contain all...
-	if ($app eq "office") { print_suffixes_check ($APPS{$app}, @DRAWDOCS, @WRITERDOCS, @MATHDOCS, @IMPRESSDOCS, @BASEDOCS, @CALCDOCS, @MASTERDOCS, @TEMPLATES, @WEBDOCS); }
-	# unopkg is a standalone tool
-	if ($app eq "unopkg") { print_suffixes_check ($APPS{$app}, @EXTENSIONS); }
-    }
-}
-
-sub print_apps {
-    my $app_to_print;
-    foreach my $app (keys %APPS) {
-	# skip the disabled wrapper
-	next if ( $APPS{$app} eq "" );
-
-	print BCOUTFILE "\t\t\t\t\t$app_to_print \\\n" if ($app_to_print);
-	$app_to_print = $APPS{$app};
-    }
-    # the last app will be printed without the final backslash
-    ($app_to_print) || die "Error: No LO wrapper was selected\n";
-    print BCOUTFILE "\t\t\t\t\t$app_to_print\n";
-}
-
-
-open (BCINFILE, "$infilename") || die "Error: can't open $infilename for reading: $!\n";
-open (BCOUTFILE, "> $outfilename") || die "Error: can't open $outfilename for writing: $!\n";
-
-while (my $line = <BCINFILE>) {
-    chomp $line;
-
-    $line =~ s/\@OFFICE_SHELL_FUNCTION\@/$office_shell_function/;
-
-    if ($line =~ m/\@BASH_COMPLETION_SUFFIXES_CHECKS\@/) {
-	print_suffixes_checks();
-    } elsif ($line =~ m/\@BASH_COMPLETION_OOO_APPS\@/) {
-	print_apps();
-    } else {
-	print BCOUTFILE "$line\n";
-    }
-}
-
-close (BCINFILE);
-close (BCOUTFILE);
diff --git a/bin/git-new-workdir b/bin/git-new-workdir
deleted file mode 100755
index 3ad2c0cea..000000000
--- a/bin/git-new-workdir
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-usage () {
-	echo "usage:" $@
-	exit 127
-}
-
-die () {
-	echo $@
-	exit 128
-}
-
-if test $# -lt 2 || test $# -gt 3
-then
-	usage "$0 <repository> <new_workdir> [<branch>]"
-fi
-
-orig_git=$1
-new_workdir=$2
-branch=$3
-
-# want to make sure that what is pointed to has a .git directory ...
-git_dir=$(cd "$orig_git" 2>/dev/null &&
-  git rev-parse --git-dir 2>/dev/null) ||
-  die "Not a git repository: \"$orig_git\""
-
-case "$git_dir" in
-.git)
-	git_dir="$orig_git/.git"
-	;;
-.)
-	git_dir=$orig_git
-	;;
-esac
-
-# don't link to a configured bare repository
-isbare=$(git --git-dir="$git_dir" config --bool --get core.bare)
-if test ztrue = z$isbare
-then
-	die "\"$git_dir\" has core.bare set to true," \
-		" remove from \"$git_dir/config\" to use $0"
-fi
-
-# don't link to a workdir
-if test -L "$git_dir/config"
-then
-	die "\"$orig_git\" is a working directory only, please specify" \
-		"a complete repository."
-fi
-
-# don't recreate a workdir over an existing repository
-if test -e "$new_workdir"
-then
-	die "destination directory '$new_workdir' already exists."
-fi
-
-# make sure the links use full paths
-git_dir=$(cd "$git_dir"; pwd)
-
-# create the workdir
-mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!"
-
-# create the links to the original repo.  explicitly exclude index, HEAD and
-# logs/HEAD from the list since they are purely related to the current working
-# directory, and should not be shared.
-for x in config refs logs/refs objects info hooks packed-refs remotes rr-cache svn
-do
-	case $x in
-	*/*)
-		mkdir -p "$(dirname "$new_workdir/.git/$x")"
-		;;
-	esac
-	ln -s "$git_dir/$x" "$new_workdir/.git/$x"
-done
-
-# now setup the workdir
-cd "$new_workdir"
-# copy the HEAD from the original repository as a default branch
-cp "$git_dir/HEAD" .git/HEAD
-# checkout the branch (either the same as HEAD from the original repository, or
-# the one that was asked for)
-git checkout -f $branch
diff --git a/bin/git-ps1 b/bin/git-ps1
deleted file mode 100755
index 8a0980091..000000000
--- a/bin/git-ps1
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-r=
-b=
-g="$(git rev-parse --git-dir 2>/dev/null)"
-
-if [ -n "$g" ]; then
-    if [ -d "$g/../.dotest" ]
-        then
-        if test -f "$g/../.dotest/rebasing"
-            then
-            r="|REBASE"
-        elif test -f "$g/../.dotest/applying"
-            then
-            r="|AM"
-        else
-            r="|AM/REBASE"
-        fi
-        b="$(git symbolic-ref HEAD 2>/dev/null)"
-    elif [ -f "$g/.dotest-merge/interactive" ]
-        then
-        r="|REBASE-i"
-        b="$(cat "$g/.dotest-merge/head-name")"
-    elif [ -d "$g/.dotest-merge" ]
-        then
-        r="|REBASE-m"
-        b="$(cat "$g/.dotest-merge/head-name")"
-    elif [ -f "$g/MERGE_HEAD" ]
-        then
-        r="|MERGING"
-        b="$(git symbolic-ref HEAD 2>/dev/null)"
-    else
-        if [ -f "$g/BISECT_LOG" ]
-            then
-            r="|BISECTING"
-        fi
-        if ! b="$(git symbolic-ref HEAD 2>/dev/null)"
-            then
-            if ! b="$(git describe --exact-match HEAD 2>/dev/null)"
-                then
-                b="$(cut -c1-7 "$g/HEAD")..."
-            fi
-        fi
-    fi
-
-    if [ -n "$1" ]; then
-        printf "$1" "${b##refs/heads/}$r"
-    else
-        printf "%s" "${b##refs/heads/}$r"
-    fi
-else
-    printf "not-in-git"
-fi
diff --git a/bin/java-set-classpath.in b/bin/java-set-classpath.in
deleted file mode 100644
index 672463e16..000000000
--- a/bin/java-set-classpath.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-#*****************************************************************************
-#
-#  java-set-classpath - Utility to update the default CLASSPATH for OpenOffice.org
-#
-#  Initial version by: Petr Mladek <pmladek@suse.cz>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License version 2, as
-#  published by the Free Software Foundation.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#*****************************************************************************
-
-if test "z$1" = "z" ; then
-    echo "Update the default CLASSPATH for OpenOffice.org"
-    echo ""
-    echo "Usage: $0 [dir|jar]..."
-    echo ""
-    echo "The utility updates the OpenOffice.org system setting. It adds or removes"
-    echo "the given directories and jar-files to or from the default CLASSPATH"
-    echo "depending on if they are available on the system or not."
-    echo ""
-    echo "Parameters:"
-    echo "        dir - absolute path to a directory"
-    echo "        jar - absolute path to a jar-file"
-    exit 0;
-fi
-
-JVM_CONFIG_FILE=@OOINSTBASE@/basis-link/program/fundamentalbasisrc
-
-for path in $@ ; do
-    if test "z${path%%/*}" != "z" ; then
-	echo "Warning: the path "$path" is not absolute and will be ignored"
-	continue
-    fi
-    if test -e $path ; then
-	# the file exist
-	grep "URE_MORE_JAVA_CLASSPATH_URLS.*file:/*$path\([[:space:]].*\)\?$" $JVM_CONFIG_FILE >/dev/null && continue
-	# it is not registered
-	TMP_FILE=`mktemp /tmp/ooset-java-class.XXXXXXXXXX` || exit 1
-	sed -e "s|^\(.*URE_MORE_JAVA_CLASSPATH_URLS.*\)$|\1 file://$path|" $JVM_CONFIG_FILE >$TMP_FILE
-	mv -f $TMP_FILE $JVM_CONFIG_FILE
-	chmod 644 $JVM_CONFIG_FILE
-    else
-	# the file does not exist, remove it from the configuration
-	TMP_FILE=`mktemp /tmp/ooset-java-class.XXXXXXXXXX` || exit 1;
-	sed -e "s|^\(.*URE_MORE_JAVA_CLASSPATH_URLS.*\)file:/*$path\([[:space:]].*\)\?$|\1\2|" \
-	    -e "s/\(URE_MORE_JAVA_CLASSPATH_URLS=\)[[:space:]]\+/\1/" \
-	    -e "/^.*URE_MORE_JAVA_CLASSPATH_URLS/s/[[:space:]]\+/ /g" \
-	    -e "/^.*URE_MORE_JAVA_CLASSPATH_URLS/s/[[:space:]]*$//" $JVM_CONFIG_FILE >$TMP_FILE
-	mv -f $TMP_FILE $JVM_CONFIG_FILE
-	chmod 644 $JVM_CONFIG_FILE
-    fi
-done
diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
deleted file mode 100755
index 24bcb891b..000000000
--- a/bin/lo-commit-stat
+++ /dev/null
@@ -1,403 +0,0 @@
-#!/usr/bin/perl
-    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-        if $running_under_some_shell;
-#!/usr/bin/perl
-
-use strict;
-
-my $main_repo="bootstrap";
-my @pieces=("artwork", "base", "calc", "components",
-            "extensions", "extras", "filters", "help", "impress",
-            "libs-core", "libs-extern", "libs-extern-sys", "libs-gui",
-            "translations", "postprocess", "sdk", "testing", "ure", "writer");
-
-sub search_bugs($$$$)
-{
-    my ($pdata, $piece, $commit_id, $line) = @_;
-
-    my $bug = "";
-    my $bug_orig;
-    while (defined $bug) {
-
-        # match fdo#123, rhz#123, i#123
-        if ( $line =~ m/(\w*\#+\d+)/ ) {
-            $bug_orig = $1;
-            $bug = $1;
-        # match #i123#
-        } elsif ( $line =~ m/(\#i)(\d+)(\#)/ ) {
-            $bug_orig = $1 . $2 . $3;
-            $bug = "i#$2";
-        } else {
-            $bug = undef;
-            next;
-        }
-
-#        print "   found $bug\n";
-        # remove bug number from the comment; it will be added later a standardized way
-        $bug_orig =~ s/\#/\\#/;
-        $line =~ s/[Rr]esolves:\s*$bug_orig\s*//;
-        $line =~ s/\s*-\s*$bug_orig\s*//;
-        $line =~ s/\(?$bug_orig\)?[:,]?\s*//;
-
-        # bnc# is preferred over n# for novell bugs
-        $bug =~ s/^n\#/bnc#/;
-        # save the bug number
-        %{$pdata->{$piece}{$commit_id}{'bugs'}} = () if (! defined %{$pdata->{$piece}{$commit_id}{'bugs'}});
-        $pdata->{$piece}{$commit_id}{'bugs'}{$bug} = 1;
-        $pdata->{$piece}{$commit_id}{'flags'}{'bug'} = 1;
-    }
-
-    return $line;
-}
-
-sub standardize_summary($)
-{
-    my $line = shift;
-
-    $line =~ s/^\s*//;
-    $line =~ s/\s*$//;
-
-    # lower first letter
-    $line =~ m/(^.)/;
-    my $first_char = lc($1);
-    $line =~ s/^./$first_char/;
-
-    # FIXME: remove do at the end of line
-    #        remove bug numbers
-    return $line;
-}
-
-sub load_git_log($$$$$) 
-{
-    my ($pdata, $repo_dir, $piece, $branch_name, $git_command) = @_;
-
-    my $cmd = "cd $repo_dir; $git_command";
-    my $commit_id;
-    my $summary;
-
-    print STDERR "Analyzing log from the git repo: $piece...\n";
-
-    my $repo_branch_name = get_branch_name($repo_dir);
-    if ( $branch_name ne $repo_branch_name ) {
-        die "Error: mismatch of branches:\n" .
-            "       main repo is on the branch: $branch_name\n" .
-            "       $piece repo is on the branch: $repo_branch_name\n";
-    }
-
-    open (GIT, "$cmd 2>&1|") || die "Can't run $cmd: $!";
-    %{$pdata->{$piece}} = ();
-
-    while (my $line = <GIT>) {
-        chomp $line;
-
-        if ( $line =~ m/^commit ([0-9a-z]{20})/ ) {
-            $commit_id = "$1";
-            $summary=undef;
-            %{$pdata->{$piece}{"$commit_id"}} = ();
-            %{$pdata->{$piece}{"$commit_id"}{'flags'}} = ();
-            next;
-        }
-
-        if ( $line =~ /^Author:\s*([^\<]*)\<([^\>]*)>/ ) {
-            # get rid of extra empty spaces;
-            my $name = "$1";
-            $name =~ s/\s+$//;
-            die "Error: Author already defined for the commit {$commit_id}\n" if defined ($pdata->{$piece}{$commit_id}{'author'});
-            %{$pdata->{$piece}{$commit_id}{'author'}} = ();
-            $pdata->{$piece}{$commit_id}{'author'}{'name'} = "$name";
-            $pdata->{$piece}{$commit_id}{'author'}{'email'} = "$2";
-            next;
-        }
-
-        if ( $line =~ /^Date:\s+/ ) {
-            # ignore date line
-            next;
-        }
-
-        if ( $line =~ /^\s*$/ ) {
-            # ignore empty line
-            next;
-        }
-
-        $line = search_bugs($pdata, $piece, $commit_id, $line);
-        # FIXME: need to be implemented
-#        search_keywords($pdata, $line);
-
-        unless (defined $pdata->{$piece}{$commit_id}{'summary'}) {
-            $summary = standardize_summary($line);
-            $pdata->{$piece}{$commit_id}{'summary'} = $summary;
-        }
-    }
-
-    close GIT;
-}
-
-sub get_repo_name($)
-{
-    my $repo_dir = shift;
-    
-    open (GIT_CONFIG, "$repo_dir/.git/config") ||
-        die "can't open \"$$repo_dir/.git/config\" for reading: $!\n";
-
-    while (my $line = <GIT_CONFIG>) {
-        chomp $line;
-
-        if ( $line =~ /^\s*url\s*=\s*(\S+)$/ ) {
-            my $repo_name = "$1";
-            $repo_name = s/.*\///g;
-            return "$repo_name";
-        }
-    }
-    die "Error: can't find repo name in \"$$repo_dir/.git/config\"\n";
-}
-
-sub load_data($$$$$)
-{
-    my ($pdata, $top_dir, $piece, $branch_name, $git_command) = @_;
-
-    if (defined $piece) {
-        my $piece_dir;
-        if ("$piece" eq "$main_repo") {
-            $piece_dir = "$top_dir";
-        } else {
-            $piece_dir = "$top_dir/clone/$piece";
-        }
-        load_git_log($pdata, $piece_dir, $piece, $branch_name, $git_command);
-    } else {
-        load_git_log($pdata, $top_dir, $main_repo, $branch_name, $git_command);
-        foreach my $piece (@pieces) {
-            load_git_log($pdata, "$top_dir/clone/$piece", $piece, $branch_name, $git_command);
-        }
-    }
-}
-
-sub get_branch_name($)
-{
-    my ($top_dir) = @_;
-
-    my $branch;
-    my $cmd = "cd $top_dir && git branch";
-
-    open (GIT, "$cmd 2>&1|") || die "Can't run $cmd: $!";
-
-    while (my $line = <GIT>) {
-        chomp $line;
-
-        if ( $line =~ m/^\*\s*(\S+)/ ) {
-            $branch = "$1";
-        }
-    }
-
-    close GIT;
-    
-    die "Error: did not detect git branch name in $top_dir\n" unless defined ($branch);
-
-    return $branch;
-}
-
-sub open_log_file($$$$$)
-{
-    my ($log_dir, $log_prefix, $log_suffix, $top_dir, $branch_name) = @_;
-
-    my $logfilename = "$log_prefix-$branch_name-$log_suffix.log";
-    $logfilename = "$log_dir/$logfilename" if (defined $log_dir);
-
-    if (-f $logfilename) {
-        print "WARNING: The log file already exists: $logfilename\n";
-        print "Do you want to overwrite it? (Y/n)?\n";
-        my $answer = <STDIN>;
-        chomp $answer;
-        $answer = "y" unless ($answer);
-        die "Please, rename the file or choose another log suffix\n" if ( lc($answer) ne "y" );
-    }
-    
-    my $log;
-    open($log, '>', $logfilename) || die "Can't open \"$logfilename\" for writing: $!\n";
-    
-    return $log;
-}
-
-sub print_summary_in_stat($$$$$$$$$)
-{
-    my ($summary, $pprint_filters, $print_mode, $ppiece_title, $pflags, $pbugs, $pauthors, $prefix, $log) = @_;
-
-    return if ( $summary eq "" );
-
-    # do we want to print this summary at all?
-    my $print;
-    if (%{$pprint_filters}) {
-        foreach my $flag (keys %{$pprint_filters}) {
-            $print = 1 if (defined $pflags->{$flag});
-        }
-    } else {
-        $print = 1;
-    }
-    return unless (defined $print);
-
-    # print piece title if not done yet
-    if ( defined ${$ppiece_title} && $print_mode ne "bugnumbers" ) {
-        printf $log "${$ppiece_title}\n";
-        ${$ppiece_title} = undef;
-    }
-
-    # finally print the summary line
-    my $bugs = "";
-    if ( %{$pbugs} ) {
-        if ( $print_mode eq "bugnumbers" ) {
-            $bugs = join ("\n", keys %{$pbugs}) . "\n";
-        } else {
-            $bugs = " (" . join (", ", keys %{$pbugs}) . ")";
-        }
-    }
-
-    my $authors = "";
-    if ( %{$pauthors} ) {
-        $authors = " [" . join (", ", keys %{$pauthors}) . "]";
-    }
-
-    if ( $print_mode eq "bugnumbers" ) {
-        printf $log $bugs;
-    } else {
-        printf $log $prefix . $summary . $bugs . $authors . "\n";
-    }
-}
-
-sub print_stat($$$$)
-{
-    my ($pdata, $pprint_filters, $print_mode, $log) = @_;
-
-    foreach my $piece ( sort { $a cmp $b } keys %{$pdata}) {
-        # check if this piece has any entries at all
-        my $piece_title = "+ $piece";
-        if ( %{$pdata->{$piece}} ) {
-            my $old_summary="";
-            my %authors = ();
-            my %bugs = ();
-            my %flags = ();
-            foreach my $id ( sort { $pdata->{$piece}{$a}{'summary'} cmp $pdata->{$piece}{$b}{'summary'} } keys %{$pdata->{$piece}}) {
-                my $summary = $pdata->{$piece}{$id}{'summary'};
-                if ($summary ne $old_summary) {
-                    print_summary_in_stat($old_summary, $pprint_filters, $print_mode, \$piece_title, \%flags, \%bugs, \%authors, "    + ", $log);
-                    $old_summary = $summary;
-                    %authors = ();
-                    %bugs = ();
-                    %flags = ();
-                }
-                # collect bug numbers
-                if (defined $pdata->{$piece}{$id}{'bugs'}) {
-                    foreach my $bug (keys %{$pdata->{$piece}{$id}{'bugs'}}) {
-                        $bugs{$bug} = 1;
-                    }
-                }
-                # collect author names
-                my $author = $pdata->{$piece}{$id}{'author'}{'name'};
-                $authors{$author} = 1;
-                # collect flags
-                foreach my $flag ( keys %{$pdata->{$piece}{$id}{'flags'}} ) {
-                    $flags{$flag} = 1;
-                }
-            }
-            print_summary_in_stat($old_summary, $pprint_filters, $print_mode, \$piece_title, \%flags, \%bugs, \%authors, "    + ", $log);
-        }
-    }
-}
-
-########################################################################
-# help
-
-sub usage()
-{
-    print "This script generates LO git commit summary\n\n" .
-          
-          "Usage: lo-commit-stat [--help] [--no-pieces] [--piece=<piece>] --log-dir=<dir> --log-suffix=<string> topdir [git_arg...]\n\n" .
-
-          "Options:\n" .
-          "     --help          print this help\n" .
-          "     --no-pieces     read changes just from the main repository, ignore other cloned repos\n" .
-          "     --piece=<piece> summarize just changes from the given piece\n" .
-          "     --log-dir=<dir> directory where to put the generated log\n" .
-          "     --log-suffix=<string> suffix of the log file name; the result will be\n" .
-          "                     commit-log-<branch>-<log-name-suffix>.log; the branch name\n" .
-          "                     is detected automatically\n" .
-          "     --bugs          print just bug fixes\n" .
-          "     --bug-numbers   print just fixed bug numbers\n" .
-          "     --rev-list      use \"git rev-list\" instead of \"git log\"; useful to check\n" .
-          "                     differences between branches\n" .
-          "      topdir         directory with the libreoffice/bootstrap clone; the piece repos\n" .
-          "                     must be cloned in the main-repo-root/clone/<piece> subdirectories\n" .
-          "      git_arg        extra parameters passed to the git command to define\n" .
-          "                     the area of interest; The default command is \"git log\" and\n" .
-          "                     parameters might be, for example, --after=\"2010-09-27\" or\n" .
-          "                     TAG..HEAD; with the option --rev-list, useful might be, for\n" .
-          "                     example origin/master ^origin/libreoffice-3-3\n";
-}
-
-
-#######################################################################
-#######################################################################
-# MAIN
-#######################################################################
-#######################################################################
-
-
-my $piece;
-my $top_dir;
-my $log_prefix = "commit-log";
-my $log_dir;
-my $log_suffix;
-my $log;
-my $branch_name;
-my $git_command = "git log";
-my $branch_name;
-my @git_args;
-my %data;
-my %print_filters = ();
-my $print_mode = "normal";
-
-foreach my $arg (@ARGV) {
-    if ($arg eq '--help') {
-        usage();
-        exit;
-    } elsif ($arg eq '--no-pieces') {
-        $piece = "bootstrap";
-    } elsif ($arg =~ m/--piece=(.*)/) {
-	$piece = $1;
-    } elsif ($arg =~ m/--log-suffix=(.*)/) {
-	$log_suffix = "$1";
-    } elsif ($arg =~ m/--log-dir=(.*)/) {
-	$log_dir = "$1";
-    } elsif ($arg eq '--bugs') {
-        $print_filters{'bug'} = 1;
-        $log_prefix = "bugfixes"
-    } elsif ($arg eq '--bug-numbers') {
-        $print_filters{'bug'} = 1;
-        $log_prefix = "bugnumbers";
-        $print_mode = "bugnumbers";
-    } elsif ($arg eq '--rev-list') {
-        $git_command = "git rev-list --pretty=medium"
-    } else {
-        if (! defined $top_dir) {
-            $top_dir=$arg;
-        } else {
-            push @git_args, $arg;
-        }
-    }
-}
-
-$git_command .= " " . join ' ', @git_args if (@git_args);
-
-(defined $top_dir) || die "Error: top directory is not defined\n";
-(-d "$top_dir") || die "Error: not a directory: $top_dir\n";
-(-f "$top_dir/.git/config") || die "Error: can't find $top_dir/.git/config\n";
-
-(!defined $log_dir) || (-d $log_dir) || die "Error: directory does no exist: $log_dir\n";
-
-(defined $log_suffix) || die "Error: define log suffix using --log-suffix=<string>\n";
-
-$branch_name = get_branch_name($top_dir);
-
-load_data(\%data, $top_dir, $piece, $branch_name, $git_command);
-
-$log = open_log_file($log_dir, $log_prefix, $log_suffix, $top_dir, $branch_name);
-print_stat(\%data, \%print_filters, $print_mode, $log);
-close $log;
diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
deleted file mode 100755
index f2c081873..000000000
--- a/bin/lo-pack-sources
+++ /dev/null
@@ -1,655 +0,0 @@
-#!/usr/bin/perl
-    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-        if $running_under_some_shell;
-#!/usr/bin/perl
-
-use strict;
-use File::Copy;
-use File::Temp qw/ tempfile tempdir /;
-
-# get libreoffice-build version from the given libreoffice-build sources
-sub get_config_version($)
-{
-    my ($lo_build_dir) = @_;
-    my $version;
-
-    open (CONFIGURE, "$lo_build_dir/configure.in") ||
-        die "can't open \"$lo_build_dir/configure.in\" for reading: $!\n";
-
-    while (my $line = <CONFIGURE>) {
-        chomp $line;
-
-        if ($line =~ /AC_INIT\s*\(\s*libreoffice-build\s*,\s*([\w\.]*)\)/) {
-            $version="$1";
-        }
-    }
-    close (CONFIGURE);
-    return $version;
-}
-
-# set libreoffice-build version in the given libreoffice-build sources
-sub set_config_version($$)
-{
-    my ($lo_build_dir, $version) = @_;
-    my $configure = "$lo_build_dir/configure.in";
-
-    open (CONFIGURE, "$configure") ||
-        die "can't open \"$configure\" for reading: $!\n";
-
-    my ( $tmp_fh, $tmp_filename ) = tempfile( "$configure.XXXXXX" );
-    if ( !defined $tmp_fh ) {
-        close (CONFIGURE);
-        die "Error: can't create temporary file: \"$configure.XXXXXX\"\n";
-    }
-
-    while (my $line = <CONFIGURE>) {
-        chomp $line;
-
-        if ($line =~ /^(\s*AC_INIT\s*\(\s*libreoffice-build\s*,\s*)([\w\.]*)(\s*\)\s*)$/) {
-            print ${tmp_fh} "$1$version$3\n";
-        } else {
-            print ${tmp_fh} "$line\n";
-        }
-    }
-    close (CONFIGURE);
-    close (${tmp_fh});
-
-    # preserve permissions on target file by applying them to temp file
-    my ( $mode, $uid, $gid ) = ( stat($configure) )[ 2, 4, 5 ];
-    $mode = $mode & 07777;
-
-    chmod $mode, $tmp_filename;
-    chown $uid, $gid, $tmp_filename;
-
-    rename ($tmp_filename, $configure) ||
-        die "Can't rename \"$tmp_filename\" to \"$configure\": $!\n";
-}
-
-# increment the version for a test build:
-#        + add 'a' if the version ended with a number
-#       + bump the letter otherwise
-sub inc_test_version($)
-{
-    my ($version) = @_;
-
-    my $lastchar = chop $version;
-    my $new_version;
-
-    if ($lastchar =~ /\d/) {
-        return "$version" . "$lastchar" . "a";
-    } elsif ($lastchar =~ /\w/) {
-        # select next letter alhabeticaly: a->b, b->c, ...
-        $lastchar =~ tr/0a-zA-Z/a-zA-Z0/;
-        return "$version" . "$lastchar";
-    } else {
-        die "Can't generate test version from \"$version$lastchar\n";
-    }
-}
-
-sub get_release_version($$$$)
-{
-    my ($config_version, $state_config_version, $state_release_version, $inc_version) = @_;
-    my $release_version;
-
-    if (defined $state_config_version &&
-        defined $state_release_version &&
-        "$state_config_version" eq "$config_version") {
-        $release_version = "$state_release_version";
-    } else {
-        $release_version = "$config_version";
-    }
-
-    if ( defined $inc_version ) {
-        $release_version = inc_test_version($release_version);
-    }
-
-    return $release_version;
-}
-
-
-sub generate_lo_build_blacklist($)
-{
-    my ($blacklist) = @_;
-
-    # FIXME: crazy hacks to copy libreoffice-build without too big and useless subdirectories and to show a progress
-    open (BLACKLIST, ">$blacklist") || die "Can't open $blacklist: $!\n";
-
-    # IMPORTANT: Do not remove .git directories because "git log" is called during "make dist"
-    print BLACKLIST "*/.svn\n";
-    print BLACKLIST "rawbuild/*\n";
-    print BLACKLIST "build/*\n";
-    print BLACKLIST "clone/*\n";
-    print BLACKLIST "src/libreoffice-*.tar.bz2\n";
-    print BLACKLIST "src/????????????????????????????????-*\n";
-
-    close BLACKLIST;
-}
-
-sub generate_lo_piece_blacklist($)
-{
-    my ($blacklist) = @_;
-
-    # FIXME: crazy hacks to copy libreoffice-build without too big and useless subdirectories and to show a progress
-    open (BLACKLIST, ">$blacklist") || die "Can't open $blacklist: $!\n";
-
-    # IMPORTANT: Do not remove .git directories because "git log" is called during "make dist"
-    print BLACKLIST ".git\n";
-    print BLACKLIST ".gitignore\n";
-    print BLACKLIST ".gitattributes\n";
-    print BLACKLIST "autom4te.cache/*\n";
-    print BLACKLIST "autom4te.cache\n";
-    print BLACKLIST "autogen.lastrun\n";
-    print BLACKLIST "clone/*\n";
-    print BLACKLIST "config.log\n";
-    print BLACKLIST "config.parms\n";
-    print BLACKLIST "git-hooks\n";
-    print BLACKLIST "Env.Host.sh\n";
-    print BLACKLIST "src/tmp*\n";
-    print BLACKLIST "src/fetch.log\n";
-    print BLACKLIST "src/libreoffice-*.tar.bz2\n";
-    print BLACKLIST "src/????????????????????????????????-*\n";
-    print BLACKLIST "warn\n";
-
-    close BLACKLIST;
-}
-
-# remove symlinks to clone subdir
-sub remove_module_symlinks($$)
-{
-    my ($tempdir, $piece_tarball_name) = @_;
-
-    print STDERR "find $tempdir/$piece_tarball_name -mindepth 1 -maxdepth 1 -type l -exec rm {} \\;\n";
-    system ("find $tempdir/$piece_tarball_name -mindepth 1 -maxdepth 1 -type l -exec rm {} \\;") &&
-        die "Error: can't delete symlinks to clone dir in $tempdir: $!\n";
-}
-
-
-# copy files to temp dir; showing a progress; using a black list
-sub copy_dir_filter_and_show_progress($$$)
-{
-    my ($source_dir, $target_dir, $blacklist) = @_;
-
-    print "Copying \"$source_dir\" -> \"$target_dir\"...";
-    # FIXME: crazy hacks to copy dir with a blacklist and showing a progress
-    system ("tar -cf - -C $source_dir -X $blacklist \.\/ | " .
-            "tar -xf - -C $target_dir --checkpoint 2>&1 | " .
-            "awk '{ ORS=\"\" ; if (++nlines\%50 == 0) printf \".\"; fflush() }'") &&
-        die "Error: copying failed: $!\n";
-    print "\n";
-}
-
-# copy the local version of libreoffice-build into a tmp directory
-# omit the .svn subdirectories
-sub copy_lo_build_to_tempdir($)
-{
-    my ($lo_build_dir) = @_;
-
-    my $tempdir = tempdir( 'libreoffice-XXXXXX', DIR => File::Spec->tmpdir );
-    my $blacklist = "$tempdir/libreoffice-build.copy.blacklist";
-
-    generate_lo_build_blacklist($blacklist);
-    copy_dir_filter_and_show_progress($lo_build_dir, $tempdir, $blacklist);
-
-    unlink $blacklist;
-
-    return $tempdir;
-}
-
-# copy the piece lo source directory into a tmp directory
-# omit the .git subdirectories
-sub copy_lo_piece_to_tempdir($$$)
-{
-    my ($piece_dir, $piece, $piece_tarball_name) = @_;
-
-
-    my $tempdir = tempdir( 'libreoffice-XXXXXX', DIR => File::Spec->tmpdir );
-    my $blacklist = "$tempdir/libreoffice-$piece.copy.blacklist";
-
-    mkdir "$tempdir/$piece_tarball_name" || die "Can't create directory \"$tempdir/$piece_tarball_name\": $!\n";
-
-    generate_lo_piece_blacklist($blacklist);
-    copy_dir_filter_and_show_progress("$piece_dir", "$tempdir/$piece_tarball_name", $blacklist);
-    remove_module_symlinks($tempdir, $piece_tarball_name);
-
-    unlink $blacklist;
-
-    return $tempdir;
-}
-
-sub generate_lo_piece_changelog($$$)
-{
-    my ($lo_piece_clone, $lo_piece_release_dir, $piece) = @_;
-    print "Generating changelog for $piece...\n";
-    print "1:$lo_piece_clone, 2:$lo_piece_release_dir, 3:$piece\n";
-    # FIXME: crazy hacks to copy dir with a blacklist and showing a progress
-    system ("cd $lo_piece_clone && " .
-            "git log --date=short --pretty='format:@%cd  %an  <%ae>  [%H]%n%n%s%n%n%e%b' | " .
-            "  sed -e 's|^\([^@]\)|\t\1|' -e 's|^@||' >$lo_piece_release_dir/ChangeLog" ) &&
-        die "Error: generating failed: $!\n";
-}
-
-sub run_autoreconf($$)
-{
-    my ($dir, $piece) = @_;
-
-    print "Running autoreconf for $piece...\n";
-    system ("cd $dir && " .
-            "autoreconf -f -i && " .
-            "rm -rf autom4te.cache && " .
-            "cd - >/dev/null 2>&1") && die "Error: autoreconf failed: $!\n";
-}
-
-sub generate_version_file($$$)
-{
-    my ($dir, $piece, $release_version) = @_;
-
-    # FIXME: crazy hacks to copy libreoffice-build without too big and useless subdirectories and to show a progress
-    open (VERFILE, ">$dir/$piece.ver") || die "Can't open $dir/lo-$piece.ver: $!\n";
-
-    print VERFILE "lo_bootstrap_ver=$release_version\n";
-
-    close VERFILE;
-}
-
-sub release_lo_build($)
-{
-    my ($lo_build_dir) = @_;
-
-    print "Creating libreoffice-build tarball...\n";
-    system ("cd $lo_build_dir && " .
-            "./autogen.sh --with-distro=GoOoLinux && " .
-            "make dist && " .
-            "cd - >/dev/null 2>&1") && die "Error: releasing failed: $!\n";
-}
-
-sub release_lo_piece($$)
-{
-    my ($lo_piece_dir, $piece_tarball_name) = @_;
-
-    print "Creating $piece_tarball_name.tar.bz2...";
-    system ("cd $lo_piece_dir && " .
-            "tar -cjf $piece_tarball_name.tar.bz2 --checkpoint * 2>&1 | awk '{ ORS=\"\" ; if (++nlines\%50 == 0) printf \".\"; fflush() }' && " .
-            "cd - >/dev/null 2>&1") && die "Error: releasing failed: $!\n";
-    print "\n";
-}
-
-sub generate_md5($$$)
-{
-    my ($dir, $tarball_name, $tarball_suffix) = @_;
-
-    print "Generating MD5...\n";
-    system ("cd $dir && " .
-            "md5sum $tarball_name$tarball_suffix >$tarball_name$tarball_suffix.md5 && " .
-            "cd - >/dev/null 2>&1") && die "Error: releasing failed: $!\n";
-}
-
-sub default_releases_state_file($)
-{
-    my ($lo_build_dir) = @_;
-
-    my $rootdir = $lo_build_dir;
-    $rootdir =~ s/^(.*?)\/?[^\/]+\/?$/$1/;
-
-    my $releases_state_file;
-    if ($rootdir) {
-        $releases_state_file = "$rootdir/.releases";
-    } else {
-        $releases_state_file = ".releases";
-    }
-
-    return "$releases_state_file";
-}
-
-sub default_releases_archive($)
-{
-    my ($lo_build_dir) = @_;
-
-    my $rootdir = $lo_build_dir;
-    $rootdir =~ s/^(.*?)\/?[^\/]+\/?$/$1/;
-
-    my $releases_archive_dir;
-    if ($rootdir) {
-        $releases_archive_dir = "$rootdir/archive";
-    } else {
-        $releases_archive_dir = "archive";
-    }
-
-    return "$releases_archive_dir";
-}
-
-sub load_releases_state($)
-{
-    my ($releases_state_file) = @_;
-
-    my $state_config_version;
-    my $state_release_version;
-
-    if (open (STATE, "$releases_state_file")) {
-
-        while (my $line = <STATE>) {
-            chomp $line;
-
-            if ($line =~ /^\s*configure_version\s*=\s*(.*)$/) {
-                $state_config_version = "$1";
-            } elsif ($line =~ /^\s*released_version\s*=\s*(.*)$/) {
-                $state_release_version = "$1";
-            }
-        }
-            close (STATE);
-    }
-
-    return $state_config_version, $state_release_version;
-}
-
-sub save_releases_state($$$)
-{
-    my ($releases_state_file, $config_version, $release_version) = @_;
-
-    open (STATE, '>', "$releases_state_file") ||
-        die "Can't open \"$releases_state_file\" for writing: $!\n";
-
-    print STATE "configure_version = $config_version\n";
-    print STATE "released_version  = $release_version\n";
-
-    close (STATE);
-}
-
-sub remove_tempdir($)
-{
-    my ($tempdir) = @_;
-
-#    print "Cleaning $tempdir...\n";
-    system ("rm -rf $tempdir") && die "Error: rm failed: $!\n";
-}
-
-sub save_file($$$)
-{
-    my ($source_dir, $target_dir, $file) = @_;
-
-    unless ( -d "$target_dir" ) {
-        mkdir ("$target_dir") ||
-            die "Can't create directory \"$target_dir\": $!\n";
-    }
-
-    if ( -f "$target_dir/$file" ) {
-        print "Warning: $target_dir/$file already exists and will be replaced\n";
-        unlink ("$target_dir/$file");
-    }
-
-    print "Copying into archive: $target_dir/$file ...\n";
-    copy ("$source_dir/$file", "$target_dir/$file") ||
-        die "Error: Can't copy $source_dir/$file to $target_dir/$file: $!\n";
-}
-
-sub check_if_file_exists($$)
-{
-    my ($file, $force) = @_;
-
-    if (-e $file) {
-        if (defined $force) {
-            print "Warning: $file already exists and will be replaced!\n";
-        } else {
-            die "Error: $file alrady exists.\n".
-                "       Use --force if you want to replace it.\n";
-        }
-    }
-}
-
-sub check_if_tarball_already_released($$$)
-{
-    my ($tarball, $releases_archive_dir, $force) = @_;
-
-    check_if_file_exists($tarball, $force);
-    check_if_file_exists("$releases_archive_dir/$tarball", $force) if (defined $releases_archive_dir);
-}
-
-sub check_if_already_released($$$$$$)
-{
-    my ($lo_build_tarball_name, $p_piece_tarball_name, $releases_archive_dir, $force, $pack_lo_build, $pack_lo_pieces) = @_;
-
-    check_if_tarball_already_released("$lo_build_tarball_name.tar.gz", $releases_archive_dir, $force) if ($pack_lo_build);
-
-    if ($pack_lo_pieces) {
-        foreach my $tarball_name ( values %{$p_piece_tarball_name} ) {
-            check_if_tarball_already_released("$tarball_name.tar.bz2", $releases_archive_dir, $force);
-        }
-    }
-}
-
-sub prepare_lo_build_tarball($$$$)
-{
-    my ($lo_build_dir, $release_version, $md5, $lo_build_tarball_name) = @_;
-
-    my $temp_dir = copy_lo_build_to_tempdir("$lo_build_dir");
-    set_config_version($temp_dir, $release_version);
-    release_lo_build($temp_dir);
-    generate_md5($temp_dir, $lo_build_tarball_name, ".tar.gz") if (defined $md5);
-
-    return $temp_dir;
-}
-
-sub prepare_lo_piece_tarball($$$$$)
-{
-    my ($piece_dir, $release_version, $md5, $piece, $piece_tarball_name) = @_;
-
-    my $temp_dir = copy_lo_piece_to_tempdir($piece_dir, $piece, $piece_tarball_name);
-    generate_lo_piece_changelog($piece_dir, "$temp_dir/$piece_tarball_name", $piece);
-    run_autoreconf("$temp_dir/$piece_tarball_name", $piece) if ($piece eq 'bootstrap');
-    generate_version_file("$temp_dir/$piece_tarball_name", $piece, $release_version) if ($piece eq 'bootstrap');
-    release_lo_piece($temp_dir, $piece_tarball_name);
-    generate_md5($temp_dir, $piece_tarball_name, ".tar.bz2") if (defined $md5);
-
-    return $temp_dir;
-}
-
-sub move_tarball_to_final_location($$$$)
-{
-    my ($temp_dir, $releases_archive_dir, $md5, $tarball) = @_;
-
-    save_file($temp_dir, ".", "$tarball");
-    save_file($temp_dir, ".", "$tarball.md5") if (defined $md5);
-    if ( defined $releases_archive_dir ) {
-        save_file($temp_dir, $releases_archive_dir, "$tarball");
-        save_file($temp_dir, $releases_archive_dir, "$tarball.md5") if (defined $md5);
-    }
-
-    remove_tempdir($temp_dir);
-}
-
-
-sub generate_tarballs($$$$$$$$$)
-{
-    my ($source_dir, $releases_archive_dir, $release_version, $md5, $lo_build_tarball_name, $p_piece_tarball_name, $pack_lo_build, $pack_lo_pieces, $is_lo_build_dir) = @_;
-
-    if ($pack_lo_build) {
-#        my $temp_dir=prepare_lo_build_tarball($source_dir, $release_version, $md5, $lo_build_tarball_name);
-#        move_tarball_to_final_location($temp_dir, $releases_archive_dir, $md5, "$lo_build_tarball_name.tar.gz");
-        my $temp_dir=prepare_lo_piece_tarball($source_dir, $release_version, $md5, "bootstrap", $lo_build_tarball_name);
-        move_tarball_to_final_location($temp_dir, $releases_archive_dir, $md5, "$lo_build_tarball_name.tar.bz2");
-    }
-
-    if ($pack_lo_pieces) {
-        my $piece_dir = $source_dir;
-        foreach my $piece ( keys %{$p_piece_tarball_name} ) {
-            print "\n--- Generating $piece ---\n";
-            $piece_dir = "$source_dir/clone/$piece" if ($is_lo_build_dir);
-            my $temp_dir=prepare_lo_piece_tarball($piece_dir, $release_version, $md5, $piece, $p_piece_tarball_name->{$piece});
-            move_tarball_to_final_location($temp_dir, $releases_archive_dir, $md5, "$p_piece_tarball_name->{$piece}.tar.bz2");
-        }
-    }
-
-}
-
-
-sub usage()
-{
-    print "This tool helps to pack the libreoffice-build and piece sources\n\n" .
-
-          "Usage:\n".
-          "\tlo-pack-sources [--help] [--force] [--version]\n" .
-          "\t [--set-version=<ver>] [--inc-version] [--md5]\n" .
-          "\t [--no-lo-build] [--no-lo-pieces] [--piece=<piece>]\n" .
-          "\t [dir]\n\n" .
-
-          "Options:\n\n" .
-          "\t--help: print this help\n" .
-          "\t--force: replace an already existing release of the same version\n" .
-          "\t--version: just print version of the released package but do not\n" .
-          "\t\trelease it; the version is affected by the other options, e.g.\n" .
-          "\t\t--inc-version\n" .
-          "\t--set-version: force another version\n" .
-          "\t--inc-version: increment the latest version; there is a difference\n" .
-          "\t\tbetween test release (default) and final (not yet supported)\n" .
-          "\t--md5: generate md5 sum for the final tarball\n" .
-          "\t--no-lo-build: do not pack the libreoffice-build tarball\n" .
-          "\t--no-lo-pieces: do not pack the libreoffice-build piece sources\n" .
-          "\t--piece=<piece>: pack just a single piece, .e.g. \"writer\",\n" .
-          "\tdir: path of the source directory, either libreoffice-build or piece\n";
-}
-
-
-my $ptf;
-my $md5;
-my $inc_version;
-my $config_version;
-my $set_version;
-my $get_config_version;
-my $release_version;
-my $pack_lo_build=1;
-my $pack_lo_pieces=1;
-my $source_dir;
-my $releases_archive_dir;
-my $releases_state_file;
-my $state_config_version;
-my $state_release_version;
-my $lo_build_tarball_name;
-my $lo_build_tempdir;
-my $force;
-my $verbose=1;
-my $is_lo_build_dir=0;
-my @pieces=("artwork", "base", "calc", "components",
-            "extensions", "extras", "filters", "help", "impress",
-            "libs-core", "libs-extern", "libs-extern-sys", "libs-gui",
-            "postprocess", "sdk", "testing", "translations", "ure", "writer");
-my %piece_tarball_name;
-
-###################
-# Arguments parsing
-###################
-
-for my $arg (@ARGV) {
-    if ($arg eq '--help' || $arg eq '-h') {
-        usage;
-        exit 0;
-    } elsif ($arg eq '--force') {
-        $force=1;
-    } elsif ($arg eq '--md5') {
-        $md5=1;
-    } elsif ($arg eq '--version') {
-        $get_config_version=1;
-        $verbose = undef;
-    } elsif ($arg eq '--inc-version') {
-        $inc_version=1
-    } elsif ($arg =~ m/--set-version=(.*)/) {
-          $set_version="$1";
-    } elsif ($arg eq '--no-lo-build') {
-        $pack_lo_build=0;
-    } elsif ($arg eq '--no-lo-pieces') {
-        $pack_lo_pieces=0;
-    } elsif ($arg =~ m/--piece=(.*)/) {
-          # process just one piece and do not pack libreoffice-build
-          @pieces=();
-          push @pieces, "$1";
-          $pack_lo_build=0;
-    } elsif ($arg =~ /^-/ ) {
-        die "Error: unknown option: $arg\n";
-    } else {
-        if (! defined $source_dir) {
-            $source_dir = $arg;
-        } else {
-            die "Error: Too many arguments $arg\n";
-        }
-    }
-}
-
-###################
-# Initial checks
-###################
-
-unless ( defined $source_dir ) {
-    die "Error: undefined source directory, try --help\n";
-}
-
-unless ( -d "$source_dir" ) {
-    die "Error: is not a directory: $source_dir\n";
-}
-
-# check if it is a valid libreoffice-bootstrap directory
-$is_lo_build_dir=1 if (-f "$source_dir/autogen.sh" && -f "$source_dir/set_soenv.in");
-
-# all tarballs are generated from the libreoffice-bootstrap directory
-if (@pieces > 1 && $is_lo_build_dir == 0 ) {
-    die "Error: \"$source_dir\" is not a valid libreoffice-bootstrap directory\n";
-}
-
-# just a single piece tarball can be generated from piece directory; version must be explicitely set in this case
-if (@pieces == 1  &&  $is_lo_build_dir == 0  &&  ! defined $set_version ) {
-    die "Error: version must be set using the --set-version=<version> option\n" unless (defined $set_version);
-}
-
-if (defined $set_version && defined $inc_version) {
-    die "Error: --set-version and --inc-version options can't be used together\n";
-}
-
-
-###################
-# Main logic
-###################
-
-
-print "Source: $source_dir\n" if ($verbose);
-
-if ($is_lo_build_dir) {
-    # detect some paths
-    $releases_state_file = default_releases_state_file($source_dir) unless (defined $releases_state_file);
-    $releases_archive_dir = default_releases_archive($source_dir) unless (defined $releases_archive_dir);
-
-    # detect versions
-    $config_version = get_config_version($source_dir);
-    ($state_config_version, $state_release_version) = load_releases_state($releases_state_file);
-    if (defined $set_version) {
-        $release_version = "$set_version";
-    } else {
-        $release_version = get_release_version($config_version, $state_config_version, $state_release_version, $inc_version);
-    }
-} else {
-    # must be single piece release with predefined version
-    $release_version = "$set_version";
-}
-
-# define tarball names
-$lo_build_tarball_name = "libreoffice-bootstrap-$release_version";
-foreach my $piece (@pieces) {
-    $piece_tarball_name{$piece} = "libreoffice-$piece-$release_version";
-}
-
-print "Default version   : $config_version\n" if ($verbose && defined $config_version);
-print "Last used version : $state_release_version\n" if ($verbose && defined $state_release_version);
-print "New version       : $release_version\n" if ($verbose);
-
-# do the real job
-if ( defined $get_config_version ) {
-    print "$release_version\n";
-} else {
-    check_if_already_released($lo_build_tarball_name, \%piece_tarball_name, $releases_archive_dir, $force, $pack_lo_build, $pack_lo_pieces);
-
-    # give a chance to stop the process
-    print ("\nWaiting 3 seconds...\n");
-    sleep 3;
-
-    generate_tarballs($source_dir, $releases_archive_dir, $release_version, $md5, $lo_build_tarball_name, \%piece_tarball_name, $pack_lo_build, $pack_lo_pieces, $is_lo_build_dir);
-
-    if ( defined $releases_state_file ) {
-        save_releases_state($releases_state_file, $config_version, $release_version);
-    }
-}
diff --git a/bin/mkworkdir b/bin/mkworkdir
deleted file mode 100755
index 9691ee1bd..000000000
--- a/bin/mkworkdir
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname $0)
-GIT_NEW_WORKDIR=`which git-new-workdir 2>/dev/null`
-if [ -z $GIT_NEW_WORKDIR ] ; then
-   GIT_NEW_WORKDIR="$BASEDIR/git-new-workdir"
-fi
-
-print_help() {
-    echo "Usage: $1 [-s | --source bootstrap_reference_repo_path] [ -d | --workdir-base-path path] [ --as alias_name] [branch name]"
-    echo "--source is optional if you are currently in a bootstrap git repository, in which case that repository is used as source"
-    echo "--workdir-base-path is optional if you have defined LO_BASE_WORKDIR in your environement"
-    echo "--as is the name of the directory that will be the bootstrap of your new workdir ensemble. the default is the branch name used to create the workdir"
-    echo "the branch name is optional, the default is 'master'"
-}
-
-die() {
-    echo $1
-    exit 1
-}
-
-BOOTSTRAP_DIR=
-DEST_DIR=${LO_BASE_WORKDIR:-}
-BRANCH="master"
-
-while [ "${1:-}" != "" ] ; do
-      case $1 in
-	  -s | --source )
-	      shift
-	      BOOTSTRAP_DIR="$1"
-	      ;;
-	  -d | --workdir-base-path )
-	      shift
-	      DEST_DIR="$1"
-	      ;;
-	  --as )
-	      shift
-	      WKDIR_NAME="$1"
-	      ;;
-	  -h | --help )
-	      print_help $0
-	      exit 0
-	      ;;
-	  -* )
-	      die "invalid option $1"
-	      ;;
-	  *)
-	      if [ -z "$BRANCH" ] ; then
-		  BRANCH="$1"
-	      else
-		  die "Too many arguments"
-	      fi
-	      ;;
-      esac
-      shift
-done
-
-
-if [ -z "$BOOTSTRAP_DIR" ]; then
-    BOOTSTRAP_DIR=$(git rev-parse --show-toplevel 2>/dev/null) || die "Cannot use the current working directory as implicit source: Not a git repository"
-    if [ -n "$BOOTSTRAP_DIR" ] ; then
-	if [ "$(basename $(git config remote.origin.url))" != "bootstrap" ] ; then
-	    die "Cannot use the current working directory as implicit source: Not a bootstrap git repository"
-	fi
-    fi
-fi
-if [ -z "$DEST_DIR" ]; then
-    echo "destination directory is missing."
-    print_help $0
-    exit 1
-fi
-
-if [ -z "$WKDIR_NAME" ]; then
-    WKDIR_NAME="$BRANCH"
-fi
-
-if [ -e "$DEST_DIR/$WKDIR_NAME" ]; then
-    die "$DEST_DIR/$WKDIR_NAME already exists."
-fi
-
-echo "===== bootstrap ====="
-$GIT_NEW_WORKDIR $BOOTSTRAP_DIR "$DEST_DIR/$WKDIR_NAME" $BRANCH
-
-echo "creating directory $DEST_DIR/$WKDIR_NAME/clone"
-mkdir -p "$DEST_DIR/$WKDIR_NAME/clone" || die "failed to create $DEST_DIR/$WKDIR_NAME/clone"
-
-REPOS=$(cat ${BASEDIR}/repo-list)
-
-cd "$DEST_DIR/$WKDIR_NAME"
-
-for repo in $REPOS; do
-    repo_path="${BOOTSTRAP_DIR}/clone/$repo"
-    echo "===== $repo ====="
-    $GIT_NEW_WORKDIR $repo_path "$DEST_DIR/$WKDIR_NAME/clone/$repo" $BRANCH
-    for link in $(ls ./clone/$repo) ; do
-        if [ ! -e "$link" ] ; then
-            echo "Creating link $link"
-            ln -s "./clone/$repo/$link" "$link"
-        fi
-    done
-
-done
-
diff --git a/bin/repo-list.in b/bin/repo-list.in
deleted file mode 100644
index 15bad770b..000000000
--- a/bin/repo-list.in
+++ /dev/null
@@ -1 +0,0 @@
-@GIT_REPO_NAMES@
\ No newline at end of file
diff --git a/bin/text_cat/COPYING b/bin/text_cat/COPYING
deleted file mode 100644
index 5ab7695ab..000000000
--- a/bin/text_cat/COPYING
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  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.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  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.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/bin/text_cat/Copyright b/bin/text_cat/Copyright
deleted file mode 100644
index c1e75d3af..000000000
--- a/bin/text_cat/Copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (c) 1994, 1995, 1996, 1997 by Gertjan van Noord.
-
-    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., 
-    51 Franklin Street, Fifth Floor, Boston, 
-    MA  02110-1301  USA
-
-cf. the file COPYING
-
-
diff --git a/bin/text_cat/LM/english.lm b/bin/text_cat/LM/english.lm
deleted file mode 100644
index ab71632c6..000000000
--- a/bin/text_cat/LM/english.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 20326
-e	 6617
-t	 4843
-o	 3834
-n	 3653
-i	 3602
-a	 3433
-s	 2945
-r	 2921
-h	 2507
-e_	 2000
-d	 1816
-_t	 1785
-c	 1639
-l	 1635
-th	 1535
-he	 1351
-_th	 1333
-u	 1309
-f	 1253
-m	 1175
-p	 1151
-_a	 1145
-the	 1142
-_the	 1060
-s_	 978
-er	 968
-_o	 967
-he_	 928
-d_	 888
-t_	 885
-the_	 844
-_the_	 843
-on	 842
-in	 817
-y	 783
-n_	 773
-b	 761
-re	 754
-,	 734
-,_	 732
-an	 732
-g	 728
-w	 718
-_i	 707
-en	 676
-f_	 599
-y_	 595
-of	 594
-_of	 592
-es	 589
-ti	 587
-v	 580
-_of_	 575
-of_	 575
-nd	 568
-at	 549
-r_	 540
-_w	 534
-it	 522
-ed	 496
-_p	 494
-nt	 485
-_c	 462
-o_	 457
-io	 450
-_an	 439
-te	 432
-or	 425
-_b	 418
-nd_	 407
-to	 406
-st	 402
-is	 401
-_s	 396
-_in	 389
-ion	 385
-and	 385
-de	 384
-ve	 382
-ha	 375
-ar	 366
-_m	 361
-and_	 360
-_and	 360
-_and_	 358
-se	 353
-_to	 347
-me	 346
-to_	 344
-ed_	 339
-.	 330
-be	 329
-_f	 329
-._	 329
-_to_	 320
-co	 317
-ic	 316
-ns	 308
-al	 307
-le	 304
-ou	 304
-ce	 293
-ent	 279
-l_	 278
-_co	 277
-tio	 275
-on_	 274
-_d	 274
-tion	 268
-ri	 266
-_e	 264
-ng	 253
-hi	 251
-er_	 249
-ea	 246
-as	 245
-_be	 242
-pe	 242
-h_	 234
-_r	 232
-ec	 227
-ch	 223
-ro	 222
-ct	 220
-_h	 219
-pr	 217
-in_	 217
-ne	 214
-ll	 214
-rt	 213
-s,_	 210
-s,	 210
-li	 209
-ra	 208
-T	 207
-wh	 204
-a_	 203
-ac	 201
-_wh	 199
-_n	 196
-ts	 196
-di	 196
-es_	 195
-si	 194
-re_	 193
-at_	 192
-nc	 192
-ie	 190
-_a_	 188
-_in_	 185
-ing	 184
-us	 182
-_re	 182
-g_	 179
-ng_	 178
-op	 178
-con	 177
-tha	 175
-_l	 174
-_tha	 174
-ver	 173
-ma	 173
-ion_	 171
-_con	 171
-ci	 170
-ons	 170
-_it	 170
-po	 169
-ere	 168
-is_	 167
-ta	 167
-la	 166
-_pr	 165
-fo	 164
-ho	 164
-ir	 162
-ss	 161
-men	 160
-be_	 160
-un	 159
-ty	 159
-_be_	 158
-ing_	 157
-om	 156
-ot	 156
-hat	 155
-ly	 155
-_g	 155
-em	 153
-_T	 151
-rs	 150
-mo	 148
-ch_	 148
-wi	 147
-we	 147
-ad	 147
-ts_	 145
-res	 143
-_wi	 143
-I	 143
-hat_	 142
-ei	 141
-ly_	 141
-ni	 140
-os	 140
-ca	 139
-ur	 139
-A	 138
-ut	 138
-that	 138
-_that	 137
-ati	 137
-_fo	 137
-st_	 137
-il	 136
-or_	 136
-for	 136
-pa	 136
-ul	 135
-ate	 135
-ter	 134
-it_	 134
-nt_	 133
-that_	 132
-_ha	 129
-al_	 128
-el	 128
-as_	 127
-ll_	 127
-_ma	 125
-no	 124
-ment	 124
-an_	 124
-tion_	 122
-su	 122
-bl	 122
-_de	 122
-nce	 120
-pl	 120
-fe	 119
-tr	 118
-so	 118
-int	 115
-ov	 114
-e,	 114
-e,_	 114
-_u	 113
-ent_	 113
-Th	 113
-her	 113
-j	 112
-atio	 112
-ation	 112
-_Th	 111
-le_	 110
-ai	 110
-_it_	 110
-_on	 110
-_for	 109
-ect	 109
-k	 109
-hic	 108
-est	 108
-der	 107
-tu	 107
-na	 106
-_by_	 106
-by_	 106
-E	 106
-by	 106
-_by	 106
-ve_	 106
-_di	 106
-en_	 104
-vi	 104
-m_	 103
-_whi	 102
-iv	 102
-whi	 102
-ns_	 102
-_A	 101
-ich	 100
-ge	 100
-pro	 99
-ess	 99
-_whic	 99
-ers	 99
-hich	 99
-ce_	 99
-which	 99
-whic	 99
-all	 98
-ove	 98
-_is	 98
-ich_	 97
-ee	 97
-hich_	 97
-n,_	 96
-n,	 96
-im	 95
-ir_	 94
-hei	 94
-ions	 94
-sti	 94
-se_	 94
-per	 93
-The	 93
-_pa	 93
-heir	 93
-id	 93
-eir	 93
-eir_	 93
-ig	 93
-heir_	 93
-_no	 93
-ev	 93
-era	 92
-_int	 92
-ted	 91
-_The	 91
-ies	 91
-art	 91
-thei	 90
-_ar	 90
-_thei	 90
-their	 90
-_pro	 90
-et	 89
-_pe	 88
-_mo	 88
-ther	 88
-x	 87
-gh	 87
-S	 87
-_is_	 87
-ol	 87
-ty_	 87
-_I	 86
-nde	 86
-am	 86
-rn	 86
-nte	 86
-mp	 85
-_su	 84
-_we	 84
-par	 84
-_v	 84
-pu	 82
-his	 82
-ow	 82
-mi	 82
-go	 81
-N	 81
-ue	 81
-ple	 81
-ep	 80
-ab	 80
-;_	 80
-;	 80
-ex	 80
-ain	 80
-over	 80
-_un	 79
-q	 79
-qu	 79
-pp	 79
-ith	 79
-ry	 79
-_as	 79
-ber	 79
-ub	 78
-av	 78
-uc	 78
-s._	 77
-s.	 77
-enc	 77
-are	 77
-iti	 77
-gr	 76
-his_	 76
-ua	 76
-part	 76
-ff	 75
-eve	 75
-O	 75
-rea	 74
-ous	 74
-ia	 74
-The_	 73
-ag	 73
-mb	 73
-_go	 73
-fa	 72
-on,_	 72
-ern	 72
-t,_	 72
-on,	 72
-t,	 72
-_me	 71
diff --git a/bin/text_cat/LM/german.lm b/bin/text_cat/LM/german.lm
deleted file mode 100644
index 6f14f51ef..000000000
--- a/bin/text_cat/LM/german.lm
+++ /dev/null
@@ -1,400 +0,0 @@
-_	 31586
-e	 15008
-n	 9058
-i	 7299
-r	 6830
-t	 5662
-s	 5348
-a	 4618
-h	 4176
-d	 4011
-er	 3415
-en	 3412
-u	 3341
-l	 3266
-n_	 2848
-c	 2636
-ch	 2460
-g	 2407
-o	 2376
-e_	 2208
-r_	 2128
-m	 2077
-_d	 1948
-de	 1831
-en_	 1786
-ei	 1718
-er_	 1570
-in	 1568
-te	 1505
-ie	 1505
-b	 1458
-t_	 1425
-f	 1306
-k	 1176
-ge	 1144
-s_	 1137
-un	 1113
-,	 1104
-,_	 1099
-w	 1099
-z	 1060
-nd	 1039
-he	 1004
-st	 989
-_s	 952
-_de	 949
-.	 909
-_e	 906
-ne	 906
-der	 880
-._	 847
-be	 841
-es	 829
-ic	 796
-_a	 791
-ie_	 779
-is	 769
-ich	 763
-an	 755
-re	 749
-di	 732
-ein	 730
-se	 730
-"	 720
-ng	 709
-_i	 706
-sc	 683
-sch	 681
-it	 673
-der_	 652
-h_	 651
-ch_	 642
-S	 630
-le	 609
-p	 609
-ä	 607
-ü	 603
-au	 603
-v	 602
-che	 599
-_w	 596
-d_	 585
-die	 576
-_di	 572
-m_	 562
-_die	 559
-el	 548
-_S	 540
-_der	 529
-li	 527
-_der_	 523
-si	 515
-al	 514
-ns	 507
-on	 501
-or	 495
-ti	 490
-ten	 487
-ht	 486
-die_	 485
-_die_	 483
-D	 479
-rt	 478
-nd_	 476
-_u	 470
-nt	 468
-A	 466
-in_	 464
-den	 461
-cht	 447
-und	 443
-me	 440
-_z	 429
-ung	 426
-ll	 423
-_un	 421
-_ei	 419
-_n	 415
-hr	 412
-ine	 412
-_A	 408
-_ein	 405
-ar	 404
-ra	 403
-_v	 400
-_g	 400
-as	 395
-zu	 392
-et	 389
-em	 385
-_D	 380
-eine	 376
-gen	 376
-g_	 376
-da	 368
-we	 366
-K	 365
-lt	 360
-B	 354
-_"	 353
-nde	 349
-ni	 347
-und_	 345
-E	 345
-ur	 345
-_m	 342
-ri	 341
-ha	 340
-eh	 339
-ten_	 338
-es_	 336
-_K	 336
-_und	 335
-ig	 335
-_b	 335
-hen	 334
-_und_	 332
-_au	 329
-_B	 327
-_da	 325
-_zu	 324
-_in	 322
-at	 321
-us	 318
-wi	 307
-n,	 305
-n,_	 304
-nn	 304
-te_	 301
-eit	 301
-_h	 300
-ter	 299
-M	 298
-n.	 295
-ß	 294
-ng_	 289
-sche	 289
--	 283
-rs	 282
-den_	 282
-_si	 280
-G	 280
-im	 278
-_ge	 277
-chen	 276
-rd	 273
-_E	 273
-n._	 270
-icht	 270
-rn	 268
-uf	 267
-isch	 264
-isc	 264
-nen	 263
-_in_	 262
-_M	 260
-_er	 257
-ich_	 255
-ac	 253
-lic	 252
-_G	 252
-ber	 252
-la	 251
-vo	 251
-eb	 250
-ke	 249
-F	 248
-as_	 248
-hen_	 248
-ach	 245
-en,	 244
-ung_	 243
-lich	 243
-ste	 243
-en,_	 243
-_k	 241
-ben	 241
-_f	 241
-en.	 241
-_be	 239
-it_	 239
-L	 238
-_se	 237
-mi	 236
-ve	 236
-na	 236
-on_	 236
-P	 235
-ss	 234
-ist	 234
-ö	 234
-ht_	 233
-ru	 233
-st_	 229
-_F	 229
-ts	 227
-ab	 226
-W	 226
-ol	 225
-_eine	 225
-hi	 225
-so	 224
-em_	 223
-"_	 223
-ren	 222
-en._	 221
-chen_	 221
-R	 221
-ta	 221
-ere	 220
-ische	 219
-ers	 218
-ert	 217
-_P	 217
-tr	 217
-ed	 215
-ze	 215
-eg	 215
-ens	 215
-ür	 213
-ah	 212
-_vo	 212
-ne_	 211
-cht_	 210
-uc	 209
-_wi	 209
-nge	 208
-lle	 208
-fe	 207
-_L	 207
-ver	 206
-hl	 205
-V	 204
-ma	 203
-wa	 203
-auf	 201
-H	 198
-_W	 195
-T	 195
-nte	 193
-uch	 193
-l_	 192
-sei	 192
-nen_	 190
-u_	 189
-_den	 189
-_al	 189
-_V	 188
-t.	 188
-lte	 187
-ut	 186
-ent	 184
-sich	 183
-sic	 183
-il	 183
-ier	 182
-am	 181
-gen_	 180
-sen	 179
-fü	 178
-um	 178
-t._	 177
-f_	 174
-he_	 174
-ner	 174
-nst	 174
-ls	 174
-_sei	 173
-ro	 173
-ir	 173
-ebe	 173
-mm	 173
-ag	 172
-ern	 169
-t,_	 169
-t,	 169
-eu	 169
-ft	 168
-icht_	 167
-hre	 167
-Be	 166
-nz	 165
-nder	 165
-_T	 164
-_den_	 164
-iche	 163
-tt	 163
-zu_	 162
-and	 162
-J	 161
-rde	 160
-rei	 160
-_we	 159
-_H	 159
-ige	 159
-_Be	 158
-rte	 157
-hei	 156
-das	 155
-aus	 155
-che_	 154
-_das	 154
-_zu_	 154
-tz	 154
-_ni	 153
-das_	 153
-_R	 153
-N	 153
-des	 153
-_ve	 153
-_J	 152
-I	 152
-_das_	 152
-men	 151
-_so	 151
-_ver	 151
-_auf	 150
-ine_	 150
-_ha	 150
-rg	 149
-ind	 148
-eben	 148
-kt	 147
-mit	 147
-_an	 147
-her	 146
-Ge	 146
-Sc	 145
-_sich	 145
-U	 145
-Sch	 145
-_sic	 145
-end	 145
-Di	 144
-abe	 143
-ck	 143
-sse	 142
-ür_	 142
-ell	 142
-ik	 141
-o_	 141
-nic	 141
-nich	 141
-sa	 141
-_fü	 140
-hn	 140
-zi	 140
-no	 140
-nicht	 140
-im_	 139
-von_	 139
-von	 139
-_nic	 139
-_nich	 139
-eine_	 139
-oc	 138
-wei	 138
-io	 138
-schen	 138
-gt	 138
diff --git a/bin/text_cat/text_cat b/bin/text_cat/text_cat
deleted file mode 100755
index 6c6b0d1d1..000000000
--- a/bin/text_cat/text_cat
+++ /dev/null
@@ -1,229 +0,0 @@
-#!/usr/bin/perl -w
-# © Gertjan van Noord, 1997.
-# mailto:vannoord@let.rug.nl
-
-use strict;
-use vars qw($opt_d $opt_f $opt_h $opt_i $opt_l $opt_n $opt_s $opt_t $opt_v $opt_u $opt_a);
-use Getopt::Std;
-use Benchmark;
-
-my $non_word_characters='0-9\s';
-
-# OPTIONS
-getopts('a:d:f:hi:lnst:u:v');
-
-# defaults: set $opt_X unless already defined (Perl Cookbook p. 6):
-$opt_a ||= 10;
-$opt_d ||= '/users1/vannoord/Perl/TextCat/LM';
-$opt_f ||= 0;
-$opt_t ||= 400;
-$opt_u ||= 1.05;
-
-sub help {
-    print <<HELP
-Text Categorization. Typically used to determine the language of a
-given document. 
-
-Usage
------
-
-* print help message:
-
-$0 -h
-
-* for guessing: 
-
-$0 [-a Int] [-d Dir] [-f Int] [-i N] [-l] [-t Int] [-u Int] [-v]
-
-    -a    the program returns the best-scoring language together
-          with all languages which are $opt_u times worse (cf option -u). 
-          If the number of languages to be printed is larger than the value 
-          of this option (default: $opt_a) then no language is returned, but
-          instead a message that the input is of an unknown language is
-          printed. Default: $opt_a.
-    -d    indicates in which directory the language models are 
-          located (files ending in .lm). Currently only a single 
-          directory is supported. Default: $opt_d.
-    -f    Before sorting is performed the Ngrams which occur this number 
-          of times or less are removed. This can be used to speed up
-          the program for longer inputs. For short inputs you should use
-          -f 0.
-          Default: $opt_f.
-    -i N  only read first N lines
-    -l    indicates that input is given as an argument on the command line,
-          e.g. text_cat -l "this is english text"
-          Cannot be used in combination with -n.
-    -s    Determine language of each line of input. Not very efficient yet,
-          because language models are re-loaded after each line.
-    -t    indicates the topmost number of ngrams that should be used. 
-          If used in combination with -n this determines the size of the 
-          output. If used with categorization this determines
-          the number of ngrams that are compared with each of the language
-          models (but each of those models is used completely). 
-    -u    determines how much worse result must be in order not to be 
-          mentioned as an alternative. Typical value: 1.05 or 1.1. 
-          Default: $opt_u.
-    -v    verbose. Continuation messages are written to standard error.
-
-* for creating new language model, based on text read from standard input:
-
-$0 -n [-v]
-
-    -v    verbose. Continuation messages are written to standard error.
-
-
-HELP
-}
-
-if ($opt_h) { help(); exit 0; };
-
-if ($opt_n) { 
-    my %ngram=();
-    my @result = create_lm(input(),\%ngram);
-    print join("\n",map { "$_\t $ngram{$_}" ; } @result),"\n";
-} elsif ($opt_l) {
-    classify($ARGV[0]);
-} elsif ($opt_s) {
-    while (<>) {
-	chomp;
-	classify($_);
-    }
-} else { 
-    classify(input()); 
-}
-
-# CLASSIFICATION
-sub classify {
-  my ($input)=@_;
-  my %results=();
-  my $maxp = $opt_t;
-  # open directory to find which languages are supported
-  opendir DIR, "$opt_d" or die "directory $opt_d: $!\n";
-  my @languages = sort(grep { s/\.lm// && -r "$opt_d/$_.lm" } readdir(DIR));
-  closedir DIR;
-  @languages or die "sorry, can't read any language models from $opt_d\n" .
-    "language models must reside in files with .lm ending\n";
-
-
-  # create ngrams for input. Note that hash %unknown is not used;
-  # it contains the actual counts which are only used under -n: creating
-  # new language model (and even then they are not really required).
-  my @unknown=create_lm($input);
-  # load model and count for each language.
-  my $language;
-  my $t1 = new Benchmark;
-  foreach $language (@languages) {
-    # loads the language model into hash %$language.
-    my %ngram=();
-    my $rang=1;
-    open(LM,"$opt_d/$language.lm") || die "cannot open $language.lm: $!\n";
-    while (<LM>) {
-      chomp;
-      # only use lines starting with appropriate character. Others are
-      # ignored.
-      if (/^[^$non_word_characters]+/o) {
-	$ngram{$&} = $rang++;
-      } 
-    }
-    close(LM);
-    #print STDERR "loaded language model $language\n" if $opt_v;
-    
-    # compares the language model with input ngrams list
-    my ($i,$p)=(0,0);
-    while ($i < @unknown) {
-      if ($ngram{$unknown[$i]}) {
-	$p=$p+abs($ngram{$unknown[$i]}-$i);
-      } else { 
-	$p=$p+$maxp; 
-      }
-      ++$i;
-    }
-    #print STDERR "$language: $p\n" if $opt_v;
-    
-    $results{$language} = $p;
-  }
-  print STDERR "read language models done (" . 
-    timestr(timediff(new Benchmark, $t1)) . 
-      ".\n" if $opt_v;
-  my @results = sort { $results{$a} <=> $results{$b} } keys %results;
-  
-  print join("\n",map { "$_\t $results{$_}"; } @results),"\n" if $opt_v;
-  my $a = $results{$results[0]};
-  
-  my @answers=(shift(@results));
-  while (@results && $results{$results[0]} < ($opt_u *$a)) {
-    @answers=(@answers,shift(@results));
-  }
-  if (@answers > $opt_a) {
-    print "I don't know; " .
-      "Perhaps this is a language I haven't seen before?\n";
-  } else {
-    print join(" or ", @answers), "\n";
-  }
-}
-
-# first and only argument is reference to hash.
-# this hash is filled, and a sorted list (opt_n elements)
-# is returned.
-sub input {
-    my $read="";
-    if ($opt_i) {
-	while(<>) {
-	    if ($. == $opt_i) {
-		return $read . $_;
-	    }
-	    $read = $read . $_;
-	}
-	return $read;
-    } else {
-	local $/;     # so it doesn't affect $/ elsewhere
-	undef $/;
-	$read = <>;      # swallow input.
-	$read || die "determining the language of an empty file is hard...\n";
-	return $read;
-    }
-}
-
-
-sub create_lm {
-  my $t1 = new Benchmark;
-  my $ngram;
-  ($_,$ngram) = @_;  #$ngram contains reference to the hash we build
-    # then add the ngrams found in each word in the hash
-  my $word;
-  foreach $word (split("[$non_word_characters]+")) {
-    $word = "_" . $word . "_";
-    my $len = length($word);
-    my $flen=$len;
-    my $i;
-    for ($i=0;$i<$flen;$i++) {
-      $$ngram{substr($word,$i,5)}++ if $len > 4;
-      $$ngram{substr($word,$i,4)}++ if $len > 3;
-      $$ngram{substr($word,$i,3)}++ if $len > 2;
-      $$ngram{substr($word,$i,2)}++ if $len > 1;
-      $$ngram{substr($word,$i,1)}++;
-      $len--;
-    }
-  }
-  ###print "@{[%$ngram]}";
-  my $t2 = new Benchmark;
-  print STDERR "count_ngrams done (". 
-    timestr(timediff($t2, $t1)) .").\n" if $opt_v;
-
-  # as suggested by Karel P. de Vos, k.vos@elsevier.nl, we speed up
-  # sorting by removing singletons
-  map { my $key=$_; if ($$ngram{$key} <= $opt_f) 
-             { delete $$ngram{$key}; }; } keys %$ngram;
-  #however I have very bad results for short inputs, this way
-
-  
-  # sort the ngrams, and spit out the $opt_t frequent ones.
-  # adding  `or $a cmp $b' in the sort block makes sorting five
-  # times slower..., although it would be somewhat nicer (unique result)
-  my @sorted = sort { $$ngram{$b} <=> $$ngram{$a} } keys %$ngram;
-  splice(@sorted,$opt_t) if (@sorted > $opt_t); 
-  print STDERR "sorting done (" . 
-    timestr(timediff(new Benchmark, $t2)) . 
-      ").\n" if $opt_v;
-  return @sorted;
-}
diff --git a/bin/text_cat/version b/bin/text_cat/version
deleted file mode 100644
index e6ba9d571..000000000
--- a/bin/text_cat/version
+++ /dev/null
@@ -1,2 +0,0 @@
-1.10
-
diff --git a/bin/unpack-sources b/bin/unpack-sources
deleted file mode 100755
index 130c9a293..000000000
--- a/bin/unpack-sources
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/env bash
-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Petr Mladek <pmladek@suse.cz>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-# Ted <ted@bear.com>
-# Portions created by the Ted are Copyright (C) 2010 Ted. All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-usage()
-{
-    echo "Helper script to unpack the LO source tarbals"
-    echo
-    echo "Usage: ${0##*/} [--help] start-dir tarball..."
-    echo
-    echo "Options:"
-    echo
-    echo "	--help 		 this help"
-    echo "	start-dir	 path where the sources are unpacked (bootstrap directory)"
-    echo "      tarball          list of LO source tarball that need to be unpacked"
-}
-
-start_dir=
-tarballs=
-
-while test -n "$1" ; do
-    case "$1" in
-	--help)
-	    usage
-	    exit 0;
-	    ;;
-	--download)
-	    download="yes"
-	    ;;
-	-*)
-	    echo "Error: unknown option: $1"
-	    exit 1;
-	    ;;
-	*)
-	    if test -z "$start_dir" ; then
-		start_dir="$1"
-	    else
-	        tarballs="$tarballs $1"
-	    fi
-	    ;;
-    esac
-    shift
-done
-
-if test -z "$start_dir" ; then
-    echo "Error: Please, define where to unpack sources, try --help"
-fi
-
-if ! test -d $start_dir/src -a -f $start_dir/solenv/inc/target.mk ; then
-    echo "Error: $start_dir is not a valid bootstrap directory"
-    exit 1;
-fi
-
-if test ! -f $start_dir/bootstrap.ver -o -d $start_dir/.git ; then
-    echo "Warning: bootstrap sources are from git and not from tarball"
-    echo "         Do nothing."
-    exit 0;
-fi
-
-source $start_dir/bootstrap.ver
-lo_src_dir="$start_dir/src"
-mkdir -p "$lo_src_dir"
-
-for tarball in $tarballs ; do
-    tarname=`basename $tarball | sed -e "s/.tar.bz2//"`
-    if test -d $lo_src_dir/$tarname ; then
-        echo "Warning: $lo_src_dir/$tarname already exists => skipping"
-        continue;
-    fi
-
-    echo "Unpacking $tarname..."
-    tar -xjf "$tarball" -C "$lo_src_dir"
-
-    # create symlinks
-    for dir in `find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d -printf "$tarname/%f\n"` ; do
-        ln -sf "src/$dir" "$start_dir"
-    done
-done
diff --git a/bootstrap.1 b/bootstrap.1
deleted file mode 100755
index 069b9951d..000000000
--- a/bootstrap.1
+++ /dev/null
@@ -1,84 +0,0 @@
-
-if test -z "${SOLARENV}"; then
-    if test -f ./Env.Host.sh; then . ./Env.Host.sh; fi
-fi
-if test -z "${SOLARENV}"; then
-    echo "bootstrap: No environment set!"
-    exit 1
-fi
-
-# remove aliases set by Env.Host.sh
-unalias mkout
-unalias deliver
-unalias build
-unalias build_client
-unalias zipdep
-
-# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
-# Use spawn instead of fork when building dmake on cygwin. 
-if test "$GUI_FOR_BUILD" = "WNT"; then
-    EXEEXT=".exe"
-    DMAKE_CONF="--enable-spawn"
-else
-    EXEEXT=""
-    DMAKE_CONF=""
-fi
-export EXEEXT
-
-# ------------------------------------------------------------------------------
-# Build dmake
-
-if test "$BUILD_DMAKE" != "NO"; then
-    if test ! -x "$SRC_ROOT/dmake/dmake$EXEEXT"; then
-        cd "$SRC_ROOT/dmake" || exit
-
-        # If cross-compiling then don't use the cross compilers to build dmake.
-        if test "$GUI_FOR_BUILD" = "WNT"; then
-            # Let the Cygwin gcc be found
-            unset CC CXX AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
-        elif test "$CROSS_COMPILING" = "YES"; then
-            export CC="$CC_FOR_BUILD"
-            export CXX="$CXX_FOR_BUILD"
-            unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
-        fi
-
-        # For normal unixy systems
-        if test -f "Makefile" ; then
-            $GNUMAKE distclean || exit
-        fi
-
-        ./configure $DMAKE_CONF || exit
-
-        ## invoke the gnu make command set by configure.
-        $GNUMAKE || exit
-
-        echo ""
-        echo "dmake has been successfully built"
-
-        cd ..
-    else
-        echo "dmake/dmake already built"
-    fi
-fi
-
-mkdir -p "$SOLARENV/$OUTPATH_FOR_BUILD/bin"
-if test "$BUILD_DMAKE" != "NO"; then
-    cp -f "$SRC_ROOT/dmake/dmake$EXEEXT" "$SOLARENV/$OUTPATH_FOR_BUILD/bin" || exit
-    echo ""
-    echo "dmake copied to $SOLARENV/$OUTPATH_FOR_BUILD/bin/dmake$EXEEXT"
-fi
-
-#make sure build.pl is executable 
-
-chmod +x "$SRC_ROOT/solenv/bin/build.pl"
-chmod +x "$SRC_ROOT/solenv/bin/build_client.pl"
-chmod +x "$SRC_ROOT/solenv/bin/zipdep.pl"
-chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
-
-# Local Variables:
-# mode: shell-script
-# tab-width: 4
-# indent-tabs-mode: nil
-# End:
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/config.guess b/config.guess
deleted file mode 100755
index c2246a4f7..000000000
--- a/config.guess
+++ /dev/null
@@ -1,1502 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
-
-timestamp='2009-12-30'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[456])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config.sub b/config.sub
deleted file mode 100755
index b3e0dd40d..000000000
--- a/config.sub
+++ /dev/null
@@ -1,1714 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
-
-timestamp='2010-01-22'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
-		os=
-		basic_machine=$1
-		;;
-        -bluegene*)
-	        os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-        cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-        microblaze)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-        # This must be matched before tile*.
-        tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-        -nacl*)
-	        ;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-        mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/configure.in b/configure.in
deleted file mode 100755
index 841156ace..000000000
--- a/configure.in
+++ /dev/null
@@ -1,9023 +0,0 @@
-dnl -*- Mode: Autoconf; tab-width: 8; indent-tabs-mode: nil -*-
-dnl configure.in serves as input for the GNU autoconf package
-dnl in order to create a configure script.
-
-AC_INIT([LibreOffice], [3.5],,, [http://documentfoundation.org/])
-AC_PREREQ(2.50)
-echo "$@" >config.parms
-
-dnl ===================================================================
-dnl Optional Features (--enable/disable-)
-dnl ===================================================================
-
-dnl ---------- Extensions ----------
-
-AC_ARG_ENABLE(ext-barcode,
-    AS_HELP_STRING([--enable-ext-barcode],
-        [Enables the Barcode extension.]),
-,)
-
-AC_ARG_ENABLE(ext-diagram,
-    AS_HELP_STRING([--enable-ext-diagram],
-        [Enables the Diagram extension.]),
-,)
-
-AC_ARG_ENABLE(ext-google-docs,
-    AS_HELP_STRING([--enable-ext-google-docs],
-        [Download and enables the Google Documents extension.]),
-,)
-
-AC_ARG_ENABLE(ext-hunart,
-    AS_HELP_STRING([--enable-ext-hunart],
-        [Enables the Hungarian Cross-reference Toolbar extension.]),
-,)
-
-AC_ARG_ENABLE(ext-lightproof,
-    AS_HELP_STRING([--enable-ext-lightproof],
-        [Enables the Lightproof extension.]),
-,)
-
-AC_ARG_ENABLE(ext-mysql-connector,
-    AS_HELP_STRING([--enable-ext-mysql-connector],
-        [Enables the build of the MySQL Connector/LibreOffice extension. This requires
-         access to the MySQL Connector/C (aka libmysql) to be given, too, with
-         either the --with-system-mysql or --with-libmysql-path option.]),
-,)
-
-AC_ARG_ENABLE(ext-nlpsolver,
-    AS_HELP_STRING([--enable-ext-nlpsolver],
-        [Download and enables the NLPSolver extension.]),
-,)
-
-AC_ARG_ENABLE(ext-ct2n,
-    AS_HELP_STRING([--enable-ext-ct2n],
-        [Enables the ConvertTextToNumber extension.]),
-,)
-
-AC_ARG_ENABLE(ext-numbertext,
-    AS_HELP_STRING([--enable-ext-numbertext],
-        [Enables the Numbertext extension.]),
-,)
-
-AC_ARG_ENABLE(ext-oooblogger,
-    AS_HELP_STRING([--enable-ext-oooblogger],
-        [Download and enables the OOo Blogger extension.]),
-,)
-
-AC_ARG_ENABLE(ext-pdfimport,
-    AS_HELP_STRING([--enable-ext-pdfimport],
-        [Enables the PDF Import extension and xpdf.]),
-,)
-
-AC_ARG_ENABLE(ext-presenter-console,
-    AS_HELP_STRING([--enable-ext-presenter-console],
-        [Enables the Presenter Console extension.]),
-,)
-
-AC_ARG_ENABLE(ext-presenter-minimizer,
-    AS_HELP_STRING([--enable-ext-presenter-minimizer],
-        [Enables the Presentation Minimizer extension.]),
-,)
-
-AC_ARG_ENABLE(ext-report-builder,
-    AS_HELP_STRING([--enable-ext-report-builder],
-        [Enables the build of the Report Builder extension.]),
-,)
-
-AC_ARG_ENABLE(ext-scripting-beanshell,
-    AS_HELP_STRING([--enable-ext-scripting-beanshell],
-        [Enables support for scripts in BeanShell.]),
-,)
-
-AC_ARG_ENABLE(ext-scripting-javascript,
-    AS_HELP_STRING([--enable-ext-scripting-javascript],
-        [Enables support for scripts in JavaScript.]),
-,)
-
-AC_ARG_ENABLE(ext-typo,
-    AS_HELP_STRING([--enable-ext-typo],
-        [Enables the Typography Toolbar extension.]),
-,)
-
-AC_ARG_ENABLE(ext-validator,
-    AS_HELP_STRING([--enable-ext-validator],
-        [Enables the Validator extension.]),
-,)
-
-AC_ARG_ENABLE(ext-watch-window,
-    AS_HELP_STRING([--enable-ext-watch-window],
-        [Enables the Watch Window extension to Calc.]),
-,)
-
-AC_ARG_ENABLE(ext-wiki-publisher,
-    AS_HELP_STRING([--enable-ext-wiki-publisher],
-        [Enables the Wiki Publisher extension.]),
-,)
-
-dnl ---------- *** ----------
-
-AC_ARG_ENABLE(graphite,
-    AS_HELP_STRING([--enable-graphite],
-        [Enables the compilation of Graphite smart font rendering.]),
-,)
-
-AC_ARG_ENABLE(ldap,
-    AS_HELP_STRING([--disable-ldap],
-        [Disables the use of LDAP backend via Netscape/Mozilla or OpenLDAP LDAP SDK]),
-,)
-
-AC_ARG_ENABLE(fetch-external,
-    AS_HELP_STRING([--disable-fetch-external],
-        [Disables fetching external tarballs from web sources.]),
-,)
-
-AC_ARG_ENABLE(lockdown,
-    AS_HELP_STRING([--disable-lockdown],
-        [Disables the gconf integration work in LibreOffice.]),
-,enable_lockdown=yes)
-
-AC_ARG_ENABLE(vba,
-    AS_HELP_STRING([--disable-vba],
-        [Disables the vba compatibility feature.]),
-,)
-
-AC_ARG_ENABLE(pch,
-    AS_HELP_STRING([--enable-pch],
-        [EXPERIMENTAL: Enables precompiled header support for C++.]),
-,)
-
-AC_ARG_ENABLE(mozilla,
-    AS_HELP_STRING([--disable-mozilla],
-        [LibreOffice usually includes a strangely hacked up Mozilla binary for your
-         platform, to build without this version, use this option.]),
-,enable_mozilla=yes)
-
-AC_ARG_ENABLE(epm,
-    AS_HELP_STRING([--enable-epm],
-        [LibreOffice includes self-packaging code, that requires epm, however epm is
-         useless for large scale package building.]),
-,enable_epm=no)
-
-AC_ARG_ENABLE(activex_component,
-    AS_HELP_STRING([--disable-activex-component],
-        [Remove support for ActiveX embedding of LibreOffice.]),
-,enable_activex_component=yes)
-
-AC_ARG_ENABLE(odk,
-    AS_HELP_STRING([--disable-odk],
-        [LibreOffice includes an ODK, office development kit which some packagers may
-         wish to build without.]),
-,enable_odk=yes)
-
-AC_ARG_ENABLE(mathmldtd,
-    AS_HELP_STRING([--disable-mathmldtd],
-        [Disable mathmldtd (useful for distributions that want to avoid
-         packaging it).]),
-,enable_mathmldtd=yes)
-
-AC_ARG_ENABLE(evolution2,
-    AS_HELP_STRING([--enable-evolution2],
-        [Allows the built-in evolution 2 addressbook connectivity build to be
-         enabled.]))
-
-AC_ARG_ENABLE(cups,
-    AS_HELP_STRING([--disable-cups],
-        [Disable cups support in the psprint project.]))
-
-AC_ARG_ENABLE(directx,
-    AS_HELP_STRING([--disable-directx],
-        [Remove DirectX implementation for the new XCanvas interface.
-         The DirectX support requires more stuff installed on Windows to
-         compile. (DirectX SDK, GDI+ libs)]),
-,enable_directx=yes)
-
-AC_ARG_ENABLE(activex,
-    AS_HELP_STRING([--disable-activex],
-        [Disable the use of ActiveX for a Windows build.])
-    [
-                          This switch is mandatory when using VC++ 2008 Express.
-    ],
-,)
-
-AC_ARG_ENABLE(atl,
-    AS_HELP_STRING([--disable-atl],
-        [Disable the use of ATL for a Windows build.])
-    [
-                          This switch is mandatory when using VC++ 2008 Express.
-    ],
-,)
-
-AC_ARG_ENABLE(symbols,
-    AS_HELP_STRING([--enable-symbols],
-        [Include debugging symbols in output. WARNING - a complete build needs
-         8 Gb of space and takes much longer (enables -g compiler flag).])
-    [
-                          Enabling symbols disables the stripping of the solver
-                          (--disable-strip-solver).
-    ],
-,)
-
-AC_ARG_ENABLE(strip-solver,
-    AS_HELP_STRING([--disable-strip-solver],
-        [Disable the stripping of the solver. By default the solver is stripped
-         unless a build with debugging symbols (--enable-symbols) is requested.])
-    [
-                          This switch allows to override this setting.
-    ],
-,)
-
-AC_ARG_ENABLE(werror,
-    AS_HELP_STRING([--enable-werror],
-        [Turn warnings to errors. (Has no effect in modules where the treating
-         of warnings as errors is disabled explicitly.)]),
-,)
-
-AC_ARG_ENABLE(debug,
-    AS_HELP_STRING([--enable-debug],
-        [Include debugging symbols from --enable-symbols plus extra debugging
-         code. Extra large build! (enables -g compiler flag and dmake debug=true)
-         If you need even more verbose output, build a module with
-         "build -- debug=true dbglevel=2".]))
-
-AC_ARG_ENABLE(dbgutil,
-    AS_HELP_STRING([--enable-dbgutil],
-        [Include additional debugging utilities, such as assertions, object
-         counting, etc. Larger build. Independent from --enable-debug]))
-
-AC_ARG_ENABLE(crashdump,
-    AS_HELP_STRING([--enable-crashdump],
-        [Enable the crashdump feature.]))
-
-AC_ARG_ENABLE(python,
-    AS_HELP_STRING([--enable-python=<no/auto/system/internal>],
-        [Enables or disables Python support at run-time and build-time.
-         Also specifies what Python to use. 'auto' is the
-         default. Note that Python can be disabled with
-         --disable-python or --enable-python=no only if no
-         translations are required.]))
-
-AC_ARG_ENABLE(gtk,
-    AS_HELP_STRING([--disable-gtk],
-        [Determines whether to use Gtk+ vclplug on platforms where Gtk+ is available.]),
-,enable_gtk=yes)
-
-AC_ARG_ENABLE(gtk3,
-    AS_HELP_STRING([--disable-gtk3],
-        [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]),
-,enable_gtk3=no)
-
-AC_ARG_ENABLE(systray,
-    AS_HELP_STRING([--disable-systray],
-        [Determines whether to build the systray quickstarter.]),
-,enable_systray=yes)
-
-AC_ARG_ENABLE(split-app-modules,
-    AS_HELP_STRING([--enable-split-app-modules],
-        [Split file lists for app modules, e.g. base, calc.
-         Has effect only with make distro-pack-install]),
-,)
-
-AC_ARG_ENABLE(split-opt-features,
-    AS_HELP_STRING([--enable-split-opt-features],
-        [Split file lists for some optional features, .e.g. pyuno, testtool.
-         Has effect only with make distro-pack-install]),
-,)
-
-AC_ARG_ENABLE(cairo-canvas,
-[  --disable-cairo-canvas  Determines whether to build the Cairo canvas on
-                          platforms where Cairo is available.
-],,enable_cairo_canvas=yes)
-
-AC_ARG_ENABLE(librsvg,
-    AS_HELP_STRING([--enable-librsvg=<no/auto/system/internal>],
-        [Enables or disables use of librsvg to render SVG at run-time.
-         Also specificed what librsvg to use. 'auto' is the default.]))
-
-AC_ARG_ENABLE(opengl,
-    AS_HELP_STRING([--disable-opengl],
-        [Determines whether to build the OpenGL 3D slide transitions component.]),
-,enable_opengl=yes)
-
-AC_ARG_ENABLE(dbus,
-    AS_HELP_STRING([--enable-dbus],
-        [Determines whether to enable presentation mode screensaver control
-         under GNOME via DBUS.]),
-,enable_dbus=no)
-
-AC_ARG_ENABLE(gconf,
-    AS_HELP_STRING([--disable-gconf],
-        [Determines whether to use the GConf support.]),
-,enable_gconf=yes)
-
-AC_ARG_ENABLE(gnome-vfs,
-    AS_HELP_STRING([--disable-gnome-vfs],
-        [Determines whether to use the Gnome Virtual Filing System on platforms
-         where that VFS is available.]),
-,enable_gnome_vfs=yes)
-
-AC_ARG_ENABLE(gio,
-    AS_HELP_STRING([--enable-gio],
-        [Determines whether to use the GIO support.]),
-,enable_gio=no)
-
-AC_ARG_ENABLE(static-gtk,
-    AS_HELP_STRING([--enable-static-gtk],
-        [Modules that are linked against GTK+ libraries use the static libraries
-         instead of the dynamic ones. (Enables -Bstatic linker flag for GTK+ libraries.)]),
-,)
-
-AC_ARG_ENABLE(layout,
-    AS_HELP_STRING([--enable-layout],
-        [Enable the compilation and use of layout dialogs.]),
-,)
-
-AC_ARG_ENABLE(build-mozilla,
-    AS_HELP_STRING([--disable-build-mozilla],
-        [Use this option if you do not want to build the Mozilla components from
-         the Mozilla source code but take precompiled zips.]),
-,)
-
-AC_ARG_ENABLE(nss-module,
-    AS_HELP_STRING([--disable-nss-module],
-        [Whether to use provided NSS module.]),
-,enable_nss_module=yes)
-
-AC_ARG_ENABLE(kde,
-    AS_HELP_STRING([--enable-kde],
-        [Determines whether to use Qt3/KDE3 vclplug on platforms where Qt3 and
-         KDE3 are available.]),
-,)
-
-AC_ARG_ENABLE(kdeab,
-    AS_HELP_STRING([--disable-kdeab],
-        [Disable the KDE3 address book support.]),
-,
-    if test "$enable_kde" = "yes"; then
-        enable_kdeab=yes;
-    fi
-)
-
-AC_ARG_ENABLE(kde4,
-    AS_HELP_STRING([--enable-kde4],
-        [Determines whether to use Qt4/KDE4 vclplug on platforms where Qt4 and
-         KDE4 are available. May be used with --enable-kde if you want to support
-         both KDE3 and KDE4.]),
-,)
-
-AC_ARG_ENABLE(unix-qstart-libpng,
-    AS_HELP_STRING([--disable-unix-qstart-libpng],
-        [On UNIX systems, we have a faster splash app, that can use libpng to
-         render its splash, if we can safely link to the system libpng then
-         enabling this is a good idea (ie. for Linux Distro packaging).]),
-,enable_unix_libpng=yes)
-
-AC_ARG_ENABLE(binfilter,
-    AS_HELP_STRING([--enable-binfilter],
-        [Enable legacy binary file formats filters build.]),
-,enable_binfilter=no
-)
-
-AC_ARG_ENABLE(ugly,
-    AS_HELP_STRING([--enable-ugly],
-        [Enables ugly pieces of functionality.]),
-,enable_ugly=no
-)
-
-AC_ARG_ENABLE(rpath,
-    AS_HELP_STRING([--disable-rpath],
-        [Disable the use of relative paths in shared libraries.]),
-,)
-
-AC_ARG_ENABLE(xrender-link,
-    AS_HELP_STRING([--enable-xrender-link],
-        [Link with libXrender instead of dynamically open it.]),
-,)
-
-AC_ARG_ENABLE(randr,
-    AS_HELP_STRING([--disable-randr],
-        [Disable RandR support in the vcl project.]),
-,enable_randr=yes)
-
-AC_ARG_ENABLE(randr-link,
-    AS_HELP_STRING([--disable-randr-link],
-        [Disable linking with libXrandr, instead dynamically open it at runtime.]),
-,enable_randr_link=yes)
-
-AC_ARG_ENABLE(gstreamer,
-    AS_HELP_STRING([--disable-gstreamer],
-        [Disable building the gstreamer avmedia backend.]),
-,enable_gstreamer=yes)
-
-AC_ARG_ENABLE(neon,
-    AS_HELP_STRING([--disable-neon],
-        [Disable neon and the compilation of webdav binding.]),
-,)
-
-AC_ARG_ENABLE(build-unowinreg,
-    AS_HELP_STRING([--enable-build-unowinreg],
-        [Do not use the prebuilt unowinreg.dll. Build it instead. The MinGW C++
-         compiler is needed on Linux.])
-    [
-                          Usage:     --enable-build-unowinreg
-    ],
-,)
-
-AC_ARG_ENABLE(verbose,
-    AS_HELP_STRING([--enable-verbose],
-        [Increase build verbosity.])[
-  --disable-verbose       Decrease build verbosity.],
-,)
-
-AC_ARG_ENABLE(dependency-tracking,
-    AS_HELP_STRING([--enable-dependency-tracking],
-        [Do not reject slow dependency extractors.])[
-  --disable-dependency-tracking
-                          Disables generation of dependency information.
-                          Speed up one-time builds.],
-,)
-
-AC_ARG_ENABLE(icecream,
-    AS_HELP_STRING([--enable-icecream],
-        [Use the 'icecream' distributed compiling tool to speedup the compilation.
-         It defaults to /opt/icecream for the location of the icecream gcc/g++
-         wrappers, you can override that using --with-gcc-home=/the/path switch.]),
-,)
-
-AC_ARG_ENABLE(zenity,
-    AS_HELP_STRING([--disable-zenity],
-        [Do not display a build icon in the notification area (on unix) during build.]),
-,enable_zenity=yes)
-
-AC_ARG_ENABLE(cl-x64,
-    AS_HELP_STRING([--enable-cl-x64],
-        [Build a 64-bit LibreOffice using the Microsoft C/C++ x64 compiler.]),
-,)
-
-AC_ARG_ENABLE(extra-gallery,
-    AS_HELP_STRING([--enable-extra-gallery],
-        [Add extra gallery content.]),
-,)
-
-AC_ARG_ENABLE(extra-template,
-    AS_HELP_STRING([--enable-extra-template],
-        [Add extra template content.]),
-,)
-
-AC_ARG_ENABLE(extra-sample,
-    AS_HELP_STRING([--enable-extra-sample],
-        [Add extra sample content.]),
-,)
-
-AC_ARG_ENABLE(extra-font,
-    AS_HELP_STRING([--enable-extra-font],
-        [Add extra font content.]),
-,)
-
-AC_ARG_ENABLE(lomenubar,
-    AS_HELP_STRING([--enable-lomenubar],
-        [Enable global menu support.]),
-,)
-
-AC_ARG_ENABLE(online-update,
-    AS_HELP_STRING([--enable-online-update],
-        [Enable the online update service that will check for new versions of
-         LibreOffice. By default, it is on on Windows and Mac, and off on Linux.]),
-,)
-
-AC_ARG_ENABLE(release-build,
-    AS_HELP_STRING([--enable-release-build],
-        [Enable release build.
-         See http://wiki.documentfoundation.org/DevBuild]),
-,)
-
-dnl ===================================================================
-dnl Optional Packages (--with/without-)
-dnl ===================================================================
-AC_ARG_WITH(gnu-patch,
-    AS_HELP_STRING([--with-gnu-patch],
-        [Specify location of GNU patch on Solaris or FreeBSD.]),
-,)
-
-AC_ARG_WITH(gnu-cp,
-    AS_HELP_STRING([--with-gnu-cp],
-        [Specify location of GNU cp on Solaris or FreeBSD.]),
-,)
-
-AC_ARG_WITH(system-graphite,
-    AS_HELP_STRING([--with-system-graphite],
-        [Use graphite library already installed on system.]),
-,)
-
-AC_ARG_WITH(external-tar,
-    AS_HELP_STRING([--with-external-tar=<TARFILE PATH>],
-        [Specify path to tarfiles manually.]),
-    TARFILE_LOCATION=$withval ,
-)
-
-AC_ARG_WITH(linked-git,
-    AS_HELP_STRING([--with-linked-git=<OTHER_CLONE_DIR>],
-        [Specify another checkout's clonedir to re-use. This makes use of
-                 git-new-workdir, and saves a lot of diskspace when having multiple
-                 trees side-by-side.]),
-    GIT_LINK_SRC=$withval ,
-)
-
-AC_ARG_WITH(openldap,
-    AS_HELP_STRING([--with-openldap],
-        [Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one.]),
-,)
-
-AC_ARG_WITH(vba-package-format,
-    AS_HELP_STRING([--with-vba-package-format],
-        [Specify package format for vba compatibility api. Specifying  "builtin"
-         means the api component and associated type library are  part of the
-         installation set. Specifying "extn" creates an uno extension that is
-         part of the installation set (located in the program directory) that
-         MUST be optionly registered using either the unopkg executeable or the
-         extension manager gui.])
-    [
-                          Note: "builtin" is the default, "extn" can cause
-                          problems.
-
-                          Usage:     --with-vba-package-format="builtin" or
-                                     --with-vba-package-format="extn"
-    ],
-,)
-
-AC_ARG_WITH(theme,
-    AS_HELP_STRING([--with-theme="theme1 theme2..."],
-        [Choose which themes to include. By default those themes with an '*' are included.
-         Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
-,)
-
-AC_ARG_WITH(extension-integration,
-    AS_HELP_STRING([--with-extension-integration],
-        [It will integrate the builded extensions to the installer of the product.
-         Please use this switch to include any extension.]),
-,)
-
-AC_ARG_WITH(helppack-integration,
-[
-  --without-helppack-integration      It will not integrate the helppacks to the installer
-                          of the product.
-                          Please use this switch to use the online help or separate help packages.],
-,)
-
-AC_ARG_WITH(fonts,
-    AS_HELP_STRING([--without-fonts],
-        [LibreOffice includes some third-party fonts to provide a reliable basis for
-         help content, templates, samples, etc. When these fonts are already
-         known to be available on the system then you should use this option.]),
-,)
-
-AC_ARG_WITH(ppds,
-    AS_HELP_STRING([--without-ppds],
-        [Removes Postscript Printer definition files from LibreOffice
-         installation set, for people building for specific distributions where
-         PPDs are known to be already available (every recent distro with CUPS backend).]),
-,)
-
-AC_ARG_WITH(afms,
-    AS_HELP_STRING([--without-afms],
-        [Removes bitmap font files from LibreOffice installation set, for people
-         building for specific distributions where AFM files or TrueType Fonts
-         are known to be available.]),
-,)
-
-AC_ARG_WITH(agfa-monotype-fonts,
-     AS_HELP_STRING([--with-agfa-monotype-fonts],
-          [This switch should only be enabled for those who have the right
-           to use or distribute the proprietary Agfa Monotype
-           fonts.])
-,)
-
-AC_ARG_WITH(epm,
-    AS_HELP_STRING([--with-epm],
-        [Decides which epm to use. Default is to use the one from the system if
-         one is built. When either this is not there or you say =internal epm
-         will be built.]),
-,)
-
-AC_ARG_WITH(package-format,
-    AS_HELP_STRING([--with-package-format],
-        [Specify package format(s) for LibreOffice installsets. Default is the
-         "normal" one of the OS/Distribution. Possible values: aix, bsd, deb,
-         inst, tardist, osx, pkg, rpm, setld, native, portable, archive, dmg,
-          installed, msi. Example: --with-package-format="deb dmg"]),
-,)
-
-AC_ARG_WITH(system-stdlibs,
-    AS_HELP_STRING([--with-system-stdlibs],
-        [Use libstdc++/libgcc_s already on system.]),
-,)
-
-AC_ARG_WITH(system-cairo,
-    AS_HELP_STRING([--with-system-cairo],
-        [Use Cairo libraries already on system.]),
-,)
-
-AC_ARG_WITH(mozilla-version,
-    AS_HELP_STRING([--with-mozilla-version],
-        [Choose which version of Mozilla to use while building Mozilla.
-         (default=1.7.5) Note that not all versions are supported.]),
-,)
-
-AC_ARG_WITH(mozilla-toolkit,
-    AS_HELP_STRING([--with-mozilla-toolkit],
-        [Choose which GUI toolkit to use while building Mozilla components. (default=gtk2)]),
-,)
-
-AC_ARG_WITH(myspell-dicts,
-    AS_HELP_STRING([--without-myspell-dicts],
-        [Removes myspell dictionaries from LibreOffice installation set, for
-         people building for specific distributions where the myspell dictionaries
-         are installed from other sources.]),
-,)
-
-AC_ARG_WITH(system-dicts,
-    AS_HELP_STRING([--with-system-dicts],
-        [Use dictionaries from system paths- Specify them via
-         --with-{dict,hyph,thes}-path=/path if you want to override the default ones.]),
-,)
-
-AC_ARG_WITH(external-dict-dir,
-    AS_HELP_STRING([--with-external-dict-dir],
-        [Specify external dictionary dir.]),
-,)
-
-AC_ARG_WITH(external-hyph-dir,
-    AS_HELP_STRING([--with-external-hyph-dir],
-        [Specify external hyphenation pattern dir.]),
-,)
-
-AC_ARG_WITH(external-thes-dir,
-    AS_HELP_STRING([--with-external-thes-dir],
-        [Specify external thesaurus dir.]),
-,)
-
-AC_ARG_WITH(system-libs,
-    AS_HELP_STRING([--with-system-libs],
-        [Use libs already on system -- enables all --with-system-* flags except
-         mozilla and odbc/sane/xrender-header(s).]),
-,)
-
-AC_ARG_WITH(system-headers,
-    AS_HELP_STRING([--with-system-headers],
-        [Use headers already on system -- enables all --with-system-* flags for
-         external packages whose headers are the only entities used i.e.
-         boost/vigra/odbc/sane/xrender-header(s).]),
-,)
-
-AC_ARG_WITH(system-jars,
-    AS_HELP_STRING([--without-system-jars],
-        [When building with --with-system-libs, also the needed jars are expected
-         on the system. Use this to disable that (except for the db case where
-         --with-system-db *has to* imply using the db.jar from there, too).]),
-,)
-
-AC_ARG_WITH(system-zlib,
-    AS_HELP_STRING([--with-system-zlib],
-        [Use zlib already on system.]),
-,)
-
-AC_ARG_WITH(system-openssl,
-    AS_HELP_STRING([--with-system-openssl],
-        [Use OpenSSL already on system.]),
-,)
-
-AC_ARG_WITH(system-jpeg,
-    AS_HELP_STRING([--with-system-jpeg],
-        [Use jpeg already on system.]),
-,)
-
-AC_ARG_WITH(system-expat,
-    AS_HELP_STRING([--with-system-expat],
-        [Use expat already on system.]),
-,)
-
-AC_ARG_WITH(system-libvisio,
-    AS_HELP_STRING([--with-system-libvisio],
-        [Use libvisio already on system.]),
-,)
-
-AC_ARG_WITH(system-libwpd,
-    AS_HELP_STRING([--with-system-libwpd],
-        [Use libwpd already on system.]),
-,)
-
-AC_ARG_WITH(system-libwps,
-    AS_HELP_STRING([--with-system-libwps],
-        [Use libwps already on system.]),
-,)
-
-AC_ARG_WITH(system-libwpg,
-    AS_HELP_STRING([--with-system-libwpg],
-        [Use libwpg already on system.]),
-,)
-
-AC_ARG_WITH(system-libxml,
-    AS_HELP_STRING([--with-system-libxml],
-        [Use libxml already on system.]),
-,)
-
-AC_ARG_WITH(system-translate-toolkit,
-    AS_HELP_STRING([--with-system-translate-toolkit],
-        [Use translate-toolkit already on system.]))
-
-AC_ARG_WITH(system-icu,
-    AS_HELP_STRING([--with-system-icu],
-        [Use icu already on system.]))
-
-AC_ARG_WITH(system-poppler,
-    AS_HELP_STRING([--with-system-poppler],
-        [Use system poppler. (only needed for pdfimport extension)]))
-
-AC_ARG_WITH(system-db,
-    AS_HELP_STRING([--with-system-db],
-        [Use Berkeley db already on system.]))
-
-AC_ARG_WITH(system-lucene,
-    AS_HELP_STRING([--with-system-lucene],
-        [Use Lucene already on system.]))
-
-AC_ARG_WITH(system-apache-commons,
-    AS_HELP_STRING([--with-system-apache-commons],
-        [Use Apache commons libraries already on system.]))
-
-AC_ARG_WITH(lucene-core-jar,
-    AS_HELP_STRING([--with-lucene-core-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    LUCENE_CORE_JAR=$withval)
-
-AC_ARG_WITH(lucene-analyzers-jar,
-    AS_HELP_STRING([--with-lucene-analyzers-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    LUCENE_ANALYZERS_JAR=$withval ,)
-
-AC_ARG_WITH(system-mysql,
-    AS_HELP_STRING([--with-system-mysql],
-        [Use MySQL libraries already on system, for building the MySQL Connector/LibreOffice
-         extension. Requires MYSQLCONFIG to point to the mysql_config executable.]))
-
-AC_ARG_WITH(libmysql-path,
-    AS_HELP_STRING([--with-libmysql-path],
-        [Use Connector/C (libmysql) installation for building the MySQL
-         Connector/LibreOffice extension.])
-    [
-                          Usage:     --with-libmysql-path=<absolute path to
-                                                  your Connector/C installation>
-    ],
-,)
-
-AC_ARG_WITH(system-mysql-cppconn,
-    AS_HELP_STRING([--with-system-mysql-cppconn],
-        [Use MySQL C++ Connector libraries already on system.]))
-
-AC_ARG_WITH(system-hsqldb,
-    AS_HELP_STRING([--with-system-hsqldb],
-        [Use hsqldb already on system.]))
-
-AC_ARG_WITH(hsqldb-jar,
-    AS_HELP_STRING([--with-hsqldb-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    HSQLDB_JAR=$withval)
-
-AC_ARG_WITH(system-beanshell,
-    AS_HELP_STRING([--with-system-beanshell],
-        [Use beanshell already on system.]))
-
-AC_ARG_WITH(beanshell-jar,
-    AS_HELP_STRING([--with-beanshell-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    BSH_JAR=$withval)
-
-AC_ARG_WITH(commons-codec-jar,
-    AS_HELP_STRING([--with-commons-codec-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    COMMONS_CODEC_JAR=$withval)
-
-AC_ARG_WITH(commons-lang-jar,
-    AS_HELP_STRING([--with-commons-lang-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    COMMONS_LANG_JAR=$withval)
-
-AC_ARG_WITH(commons-httpclient-jar,
-    AS_HELP_STRING([--with-commons-httpclient-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    COMMONS_HTTPCLIENT_JAR=$withval)
-
-AC_ARG_WITH(commons-logging-jar,
-    AS_HELP_STRING([--with-commons-logging-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    COMMONS_LOGGING_JAR=$withval)
-
-AC_ARG_WITH(servlet-api-jar,
-    AS_HELP_STRING([--with-servlet-api-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    SERVLETAPI_JAR=$withval)
-
-AC_ARG_WITH(system-jfreereport,
-    AS_HELP_STRING([--with-system-jfreereport],
-        [Use JFreeReport already on system.]))
-
-AC_ARG_WITH(sac-jar,
-    AS_HELP_STRING([--with-sac-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    SAC_JAR=$withval)
-
-AC_ARG_WITH(libxml-jar,
-    AS_HELP_STRING([--with-libxml-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    LIBXML_JAR=$withval)
-
-AC_ARG_WITH(flute-jar,
-    AS_HELP_STRING([--with-flute-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    FLUTE_JAR=$withval)
-
-AC_ARG_WITH(jfreereport-jar,
-    AS_HELP_STRING([--with-jfreereport-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    JFREEREPORT_JAR=$withval)
-
-AC_ARG_WITH(liblayout-jar,
-    AS_HELP_STRING([--with-liblayout-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    LIBLAYOUT_JAR=$withval)
-
-AC_ARG_WITH(libloader-jar,
-    AS_HELP_STRING([--with-libloader-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    LIBLOADER_JAR=$withval)
-
-AC_ARG_WITH(libloader-jar,
-    AS_HELP_STRING([--with-libloader-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    LIBLOADER_JAR=$withval)
-
-AC_ARG_WITH(libformula-jar,
-    AS_HELP_STRING([--with-libformula-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    LIBFORMULA_JAR=$withval)
-
-AC_ARG_WITH(librepository-jar,
-    AS_HELP_STRING([--with-librepository-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    LIBREPOSITORY_JAR=$withval)
-
-AC_ARG_WITH(libfonts-jar,
-    AS_HELP_STRING([--with-libfonts-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    LIBFONTS_JAR=$withval)
-
-AC_ARG_WITH(libserializer-jar,
-    AS_HELP_STRING([--with-libserializer-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    LIBSERIALIZER_JAR=$withval)
-
-AC_ARG_WITH(libbase-jar,
-    AS_HELP_STRING([--with-libbase-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    LIBBASE_JAR=$withval)
-
-AC_ARG_WITH(system-saxon,
-    AS_HELP_STRING([--with-system-saxon],
-        [Use saxon already on system.]))
-
-AC_ARG_WITH(saxon-jar,
-    AS_HELP_STRING([--with-saxon-jar=JARFILE],
-        [Specify path to jarfile manually.]),
-    SAXON_JAR=$withval)
-
-AC_ARG_WITH(system-libxslt,
-    AS_HELP_STRING([--with-system-libxslt],
-        [Use libxslt already on system.]))
-
-AC_ARG_WITH(system-odbc,
-    AS_HELP_STRING([--with-system-odbc],
-        [Use the odbc headers already on system.]))
-
-AC_ARG_WITH(system-sane,
-    AS_HELP_STRING([--with-system-sane-header],
-        [Use sane.h already on system.]))
-
-AC_ARG_WITH(system-xrender-headers,
-    AS_HELP_STRING([--with-system-xrender-headers],
-        [Use XRender headers already on system.]))
-
-AC_ARG_WITH(system-mesa-headers,
-    AS_HELP_STRING([--with-system-mesa-headers],
-        [Use Mesa headers already on system.]))
-
-AC_ARG_WITH(system-curl,
-    AS_HELP_STRING([--with-system-curl],
-        [Use curl already on system.]))
-
-AC_ARG_WITH(system-boost,
-    AS_HELP_STRING([--with-system-boost],
-        [Use boost already on system.]))
-
-AC_ARG_WITH(system-mdds,
-    AS_HELP_STRING([--with-system-mdds],
-        [Use mdds already on system.]))
-
-AC_ARG_WITH(system-vigra,
-    AS_HELP_STRING([--with-system-vigra],
-        [Use vigra already on system.]))
-
-AC_ARG_WITH(system-neon,
-    AS_HELP_STRING([--with-system-neon],
-        [Use neon already on system.]))
-
-AC_ARG_WITH(system-hunspell,
-    AS_HELP_STRING([--with-system-hunspell],
-        [Use libhunspell already on system.]))
-
-AC_ARG_WITH(system-mythes,
-    AS_HELP_STRING([--with-system-mythes],
-        [Use mythes already on system.]))
-
-AC_ARG_WITH(system-altlinuxhyph,
-    AS_HELP_STRING([--with-system-altlinuxhyph],
-        [Use ALTLinuxhyph already on system.]))
-
-AC_ARG_WITH(system-lpsolve,
-    AS_HELP_STRING([--with-system-lpsolve],
-        [Use lpsolve already on system.]))
-
-AC_ARG_WITH(system-libtextcat,
-    AS_HELP_STRING([--with-system-libtextcat],
-        [Use libtextcat already on system.]))
-
-AC_ARG_WITH(external-libtextcat-data,
-    AS_HELP_STRING([--with-external-libtextcat-data],
-        [Use libtextcat data already on system.]))
-
-AC_ARG_WITH(system-cppunit,
-    AS_HELP_STRING([--with-system-cppunit],
-        [Use cppunit already on system.]))
-
-AC_ARG_WITH(system-redland,
-    AS_HELP_STRING([--with-system-redland],
-        [Use redland library already on system.]))
-
-AC_ARG_WITH(system-mozilla,
-    AS_HELP_STRING([--with-system-mozilla],
-        [Use Mozilla already on system. Note that some components cannot be built
-         against a contemporary Mozilla. The flavour used can be specified by
-         --with-system-mozilla=<flavour>. Supported are: libxul (default),
-         xulrunner, firefox, seamonkey, mozilla.]),
-    WITH_SYSTEM_MOZILLA=$withval ,
-WITH_SYSTEM_MOZILLA=no)
-
-AC_ARG_WITH(system-gettext,
-    AS_HELP_STRING([--with-system-gettext],
-        [Use gettext runtime library already on system.]))
-
-AC_ARG_WITH(system-libpng,
-    AS_HELP_STRING([--with-system-libpng],
-        [Use libpng already on system.]))
-
-AC_ARG_WITH(linker-hash-style,
-    AS_HELP_STRING([--with-linker-hash-style],
-        [Use linker with --hash-style=<style> when linking shared objects.
-         Possible values: "sysv", "gnu", "both". The default value is "gnu"
-         if supported on the build system, and "sysv" otherwise.]))
-
-AC_ARG_WITH(stlport,
-    AS_HELP_STRING([--with-stlport],
-        [Build the STLPort library for compatibility with old extensions for
-         architectures where STLPort used to be used.]),
-    with_stlport=$withval ,
-with_stlport=auto)
-
-AC_ARG_WITH(jdk-home,
-    AS_HELP_STRING([--with-jdk-home],
-        [If you have installed JDK 1.3 or later on your system please supply the
-         path here. Note that this is not the location of the java command but the
-         location of the entire distribution.])
-    [
-                          Usage:     --with-jdk-home=<absolute path to JDK home>
-    ],
-,)
-
-AC_ARG_WITH(gxx_include_path,
-    AS_HELP_STRING([--with-gxx-include-path],
-        [If you want to override the autodetected g++ include path.])
-    [
-                          Usage:     --with-gxx-include-path=<absolute path to
-                                                                g++ include dir>
-    ],
-,)
-
-AC_ARG_WITH(java,
-    AS_HELP_STRING([--with-java],
-        [Specify the name of the Java interpreter command. Typically "java"
-         which is the default.
-
-         To build without support for Java components, applets, accessibility
-         or the XML filters written in Java, use --without-java or --with-java=no.])
-    [
-                          Usage:     --with-java==<java command>
-                                     --without-java
-    ],
-    [ test -z "$with_java" -o "$with_java" = "yes" && with_java=java ],
-    [ with_java=java ]
-)
-
-AC_ARG_WITH(java_target_version,
-    AS_HELP_STRING([--with-java-target-version],
-        [Generate class files that will work on JVMs with the specified version.
-         For example, use --with-java-target-version=1.4 to make sure that the
-         application will work with JVM 1.4 even when compiled with JDK 1.5.])
-    [
-                          This option is ignored when you compile with gcj/gij.
-
-                          Usage:     --with-java-target-version=<jvm version>
-    ],
-,)
-
-AC_ARG_WITH(jvm-path,
-    AS_HELP_STRING([--with-jvm-path],
-        [Use a specific JVM search path at runtime.])
-    [
-                          Usage:     --with-jvm-path=<absolute path to parent of jvm home>
-
-                          e. g.: --with-jvm-path=/usr/lib/
-                                 to find JRE/JDK in /usr/lib/jvm/
-    ],
-,)
-
-AC_ARG_WITH(ant-home,
-    AS_HELP_STRING([--with-ant-home],
-        [If you have installed Jakarta Ant on your system, please supply the path here.
-         Note that this is not the location of the Ant binary but the location
-         of the entire distribution.])
-    [
-                          Usage:     --with-ant-home=<absolute path to Ant home>
-    ],
-,)
-
-AC_ARG_WITH(junit,
-    AS_HELP_STRING([--with-junit],
-        [Specifies the JUnit 4 jar file to use for JUnit-based tests.
-         --without-junit disables those tests. Not relevant in the --without-java case.])
-    [
-                          Usage:     --with-junit=<absolute path to JUnit 4 jar>
-    ],
-,with_junit=yes)
-
-AC_ARG_WITH(perl-home,
-    AS_HELP_STRING([--with-perl-home],
-        [If you have installed Perl 5 Distribution, on your system, please
-         supply the path here. Note that this is not the location of the Perl
-         binary but the location of the entire distribution.])
-    [
-                          Usage:     --with-perl-home=<abs. path to Perl 5 home>
-    ],
-,)
-
-AC_ARG_WITH(cl-home,
-    AS_HELP_STRING([--with-cl-home],
-        [For Windows NT users, please supply the path for the Microsoft C/C++
-         compiler. Note that this is not the location of the compiler binary but
-         the location of the entire distribution.])
-    [
-                          Usage:     --with-cl-home=<absolute path to Microsoft
-                                                            C/C++ compiler home>
-    ],
-,)
-
-AC_ARG_WITH(mspdb-path,
-    AS_HELP_STRING([--with-mspdb-path],
-        [For Microsoft C/C++ compiler users, please supply the path pointing to
-         the mspdb80.dll (if using Visual Studio 2008) or mspdb100.dl (if using
-         Visual Studio 2010).])
-    [
-                          Usage:     --with-mspdb-path=<path to
-                                                       mspdb80.dll/mspdb100.dll>
-    ],
-,)
-
-AC_ARG_WITH(midl-path,
-    AS_HELP_STRING([--with-midl-path],
-        [For Microsoft compiler users, please supply the path pointing to the midl.exe.])
-    [
-                          Usage:     --with-midl-path=<abs. path to midl.exe>
-    ],
-,)
-
-AC_ARG_WITH(csc-path,
-    AS_HELP_STRING([--with-csc-path],
-        [For Windows builds, please supply the path pointing to the csc.exe.
-         Usually found automatically when building on Windows.])
-    [
-                          Usage:     --with-csc-path=<abs. path to csc.exe>
-    ],
-,)
-
-AC_ARG_WITH(nsis-path,
-    AS_HELP_STRING([--with-nsis-path],
-        [For Windows builds, please supply the directory where makensis
-         is located. If makensis is found in PATH or this option is
-         properly supplied a self-contained executable installer for
-         LibreOffice will be created.])
-    [
-                          Usage:     --with-nsis-path=<path to directory containing makensis>
-    ],
-,)
-
-AC_ARG_WITH(dotnet-framework-home,
-    AS_HELP_STRING([--with-dotnet-framework-home],
-        [For Microsoft compiler users, please supply the path pointing to
-         lib/mscoree.lib, usually something like:
-         "/cygdrive/c/Program Files/Windows SDKs/Windows/v7.0"])
-    [
-                          Note that in most cases it will be automatically
-                          found, though.
-
-                          Usage:     --with-dotnet-framework-home=<absolute path to .NET
-                                                          Framework>
-    ],
-,)
-
-AC_ARG_WITH(windows-sdk-home,
-    AS_HELP_STRING([--with-windows-sdk-home],
-        [For Windows builds, please supply the path to the Windows SDK.
-         Usually found automatically when building on Windows.])
-    [
-                          Usage:     --with-windows-sdk-home=<absolute path to Windows SDK>
-    ],
-,)
-
-AC_ARG_WITH(directx-home,
-    AS_HELP_STRING([--with-directx-home],
-        [For Windows users, please supply the path to the Microsoft DirectX SDK.])
-    [
-                          Usage:     --with-directx-home=<absolute path to
-                                                          Microsoft DirectX SDK>
-    ],
-,)
-
-AC_ARG_WITH(mozilla-build,
-    AS_HELP_STRING([--with-mozilla-build],
-        [For Windows users, please supply the path to the Mozilla build tools.])
-    [
-                          Usage:     --with-mozilla-build=<absolute path to
-                                                          Mozilla build tools>
-
-                          At the moment of this writing, an installer for the
-                          mozilla build tools can be obtained from http://ftp.
-                          mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
-    ],
-    MOZILLABUILD=$withval ,
-)
-
-AC_ARG_WITH(local-solver,
-    AS_HELP_STRING([--with-local-solver],
-        [If you have solver in a location other than ./solver, please supply the path here.])
-    [
-                          Usage:     --with-local-solver=<abs. path to solver>
-    ],
-,)
-
-AC_ARG_WITH(lang,
-    AS_HELP_STRING([--with-lang],
-        [Use this option to build LibreOffice with additional language support.
-         English (US) is always included by default.
-         Separate multiple languages with space.
-         For all languages, use --with-lang=ALL.])
-    [
-                          Usage:     --with-lang="es sw tu cs sk"
-    ],
-,)
-
-AC_ARG_WITH(intro-bitmap,
-[  --with-intro-bitmap    Prefer the specified intro bitmap over the
-                          the default one.
-
-                          Usage:     --with-intro-bitmap=/path/my_ooo_intro.png
-],,)
-
-AC_ARG_WITH(about-bitmap,
-[  --with-about-bitmap    Similarly to --with-intro-bitmap, this allows
-                          specification of bitmap for the About box.
-
-                          Usage:     --with-about-bitmap=/path/my_ooo_about.png
-],,)
-
-AC_ARG_WITH(vendor,
-    AS_HELP_STRING([--with-vendor],
-        [Set vendor of the build.])
-    [
-                          Usage:     --with-vendor="John the Builder"
-    ],
-,)
-
-AC_ARG_WITH(unix-wrapper,
-    AS_HELP_STRING([--with-unix-wrapper],
-        [Redefines the name of the UNIX wrapper that will be used in the desktop
-         files and in the desktop-integration RPMs.])
-    [
-                          Usage:     --with-unix-wrapper=ooffice
-    ],
-,)
-
-AC_ARG_WITH(compat-oowrappers,
-    AS_HELP_STRING([--with-compat-oowrappers],
-        [Install oo* wrappers in parallel with
-         lo* ones to keep backward compatibility.
-         Has effect only with make distro-pack-install]),
-,)
-
-AC_ARG_WITH(asm-home,
-    AS_HELP_STRING([--with-asm-home],
-        [For Windows, please supply the path for the ml.exe or ml64.exe assembler.])
-    [
-                          Usage:     --with-asm-home=<path to assembler directory>
-    ],
-,)
-
-AC_ARG_WITH(os-version,
-    AS_HELP_STRING([--with-os-version],
-        [For FreeBSD users, use this option option to override the detected OSVERSION.])
-    [
-                          Usage:     --with-os-version=<OSVERSION>
-    ],
-,)
-
-AC_ARG_WITH(mingw-cross-compiler,
-    AS_HELP_STRING([--with-mingw-cross-compiler],
-        [Specify the MinGW cross-compiler to use.])
-    [
-                          Usage:     --with-mingw-cross-compiler=<mingw32-g++ command>
-
-                          When building on the ODK on Unix and building unowinreg.dll,
-                          specify the MinGW C++ cross-compiler.
-    ],
-,)
-
-AC_ARG_WITH(build-version,
-    AS_HELP_STRING([--with-build-version],
-        [Allows the builder to add a custom version tag that will appear in the
-         Help/About box for QA purposes.])
-    [
-                          Usage:     --with-build-version="Built by Jim"
-    ],
-    with_build_version=$withval ,
-)
-
-AC_ARG_WITH(alloc,
-    AS_HELP_STRING([--with-alloc],
-        [Define which allocator to build with (choices are oo, system, tcmalloc, jemalloc).
-         Note that on FreeBSD/NetBSD system==jemalloc]),
-,)
-
-AC_ARG_WITH(sun-templates,
-    AS_HELP_STRING([--with-sun-templates],
-        [Integrate Sun template packages.]),
-,)
-
-AC_ARG_WITH(num-cpus,
-    AS_HELP_STRING([--with-num-cpus],
-        [Number of build processes/cpus to use (number of projects that will build at the same time).
-         Multi-process/multi-cpu builds can save a lot of time on multi-cpu machines.
-         Defaults to the number of CPUs on the machine.]),
-,)
-
-AC_ARG_WITH(max-jobs,
-    AS_HELP_STRING([--with-max-jobs],
-        [Maximum number of jobs per one CPU that will be issued at the same time by dmake.
-         The real number of the jobs is affected by the --with-num-cpus too, it can get up to CPUS*max_jobs.
-         Defaults to 1, unless you configure --enable-icecream - then to 10.]),
-,)
-
-dnl ===================================================================
-dnl MacOSX build and runtime environment options
-dnl ===================================================================
-
-AC_ARG_WITH(macosx-sdk,
-    AS_HELP_STRING([--with-macosx-sdk],
-        [Use a specific SDK for building.])
-    [
-                          Usage:     --with-macosx-sdk=<version>
-
-                          e. g.: --with-macosx-sdk=10.4
-
-                          there are 3 options to controle the MacOSX build:
-                          --with-macosx-sdk (refered as 'sdl' below)
-                          --with-macosx-version-min-required (refered as 'min' below)
-                          --with-macosx-version-max-allowed (refered as 'max' below)
-
-                          the connection between these value and the default they take is as follow:
-                          ( ? means not specified on the command line, constraint: x <= y <= z)
-
-                          ==========================================
-                           command line      || config result
-                          ==========================================
-                          min  | max  | sdk  || min  | max  | sdk  |
-                          ?    | ?    | ?    || 10.4 | 10.4 | 10.4 |
-                          ?    | ?    | 10.x || 10.4 | 10.4 | 10.x |
-                          ?    | 10.x | ?    || 10.4 | 10.x | 10.x |
-                          ?    | 10.x | 10.y || 10.4 | 10.x | 10.y |
-                          10.x | ?    | ?    || 10.x | 10.x | 10.x |
-                          10.x | ?    | 10.y || 10.x | 10.x | 10.y |
-                          10.x | 10.y | ?    || 10.x | 10.y | 10.y |
-                          10.x | 10.y | 10.z || 10.x | 10.y | 10.z |
-
-
-                          see: http://developer.apple.com/library/mac/#technotes/tn2064/_index.html
-                          for a detailled technical explanation of these variables
-
-                          Note: MACOSX_DEPLOYMENT_TARGET will be set to the value of 'min'.
-
-    ],
-,)
-
-AC_ARG_WITH(macosx-version-min-required,
-    AS_HELP_STRING([--with-macosx-version-min-required],
-        [set the minimum version needed to run])
-    [
-                          Usage:     --with-macosx-version-min-required=<version>
-
-                          e. g.: --with-macos-version-min-required=10.4
-                          see --with-macosx-sdk for more info
-    ],
-,)
-
-AC_ARG_WITH(macosx-version-max-allowed,
-    AS_HELP_STRING([--with-macosx-version-max-allowed],
-        [set the minimum version needed to run])
-    [
-                          Usage:     --with-macosx-version-max-allowed=<version>
-
-                          e. g.: --with-macos-version-max-allowed=10.6
-                          see --with-macosx-sdk for more info
-    ],
-,)
-
-
-BUILD_TYPE="LibO"
-SCPDEFS=""
-
-echo "********************************************************************"
-echo "*"
-echo "*   Running ${PACKAGE_NAME} build configuration."
-echo "*"
-echo "********************************************************************"
-echo ""
-
-dnl ===================================================================
-dnl checks build and host OSes
-dnl ===================================================================
-AC_CANONICAL_SYSTEM
-
-if test "$cross_compiling" = "yes"; then
-    CROSS_COMPILING=YES
-else
-    CROSS_COMPILING=
-    BUILD_TYPE="$BUILD_TYPE NATIVE"
-fi
-AC_SUBST(CROSS_COMPILING)
-
-if test "$build_os" = "cygwin"; then
-    EXEEXT_FOR_BUILD=.exe
-else
-    EXEEXT_FOR_BUILD=
-fi
-AC_SUBST(EXEEXT_FOR_BUILD)
-
-dnl ===================================================================
-dnl check for required programs (grep, awk, sed, bash)
-dnl ===================================================================
-cat /dev/null > warn
-
-if test "z$EUID" = "z0" -a "z`uname -o 2>/dev/null`" = "zCygwin"; then
-    AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an administrative account])
-fi
-
-save_CC=$CC
-save_CXX=$CXX
-
-AC_PROG_EGREP
-AC_PROG_AWK
-AC_PATH_PROG( AWK, $AWK)
-if test -z "$AWK"; then
-    AC_MSG_ERROR([install awk to run this script])
-fi
-
-AC_PATH_PROGS(SED, sed )
-if test -z "$SED"; then
-    AC_MSG_ERROR([install sed to run this script])
-fi
-
-AC_PATH_PROG(BASH, bash)
-if test -z "$BASH"; then
-    AC_MSG_ERROR([bash not found in \$PATH])
-fi
-AC_SUBST(BASH)
-
-AC_MSG_CHECKING([for GNU or BSD tar])
-for a in $GNUTAR gtar gnutar tar; do
-    $a --version 2> /dev/null | egrep "GNU|bsdtar"  2>&1 > /dev/null
-    if test $? -eq 0;  then
-        GNUTAR=$a
-        break
-    fi
-done
-AC_MSG_RESULT($GNUTAR)
-if test -z "$GNUTAR"; then
-    AC_MSG_ERROR([not found. install GNU or BSD tar.])
-fi
-AC_SUBST(GNUTAR)
-
-dnl ===================================================================
-dnl The following is a list of supported systems.
-dnl Sequential to keep the logic very simple
-dnl These values may be checked and reset later.
-dnl ===================================================================
-#defaults unless the os test overrides this:
-test_randr=yes
-test_cups=yes
-test_fontconfig=yes
-
-case "$host_os" in
-
-solaris*)
-    test_gtk=yes
-    build_gstreamer=yes
-    test_kde=yes
-    test_freetype=yes
-    test_gstreamer=yes
-    _os=SunOS
-    AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
-    if test -z "$GNUTAR"; then
-        AC_MSG_ERROR([gtar (GNU tar) not found but needed. Install it (Sun Freeware package).])
-    fi
-    AC_SUBST(GNUTAR)
-
-    dnl ===========================================================
-    dnl Check whether we're using Solaris 6,7,8 - SPARC or Intel.
-    dnl ===========================================================
-    AC_MSG_CHECKING([the Solaris operating system release])
-    _os_release=`echo $host_os | $SED -e s/solaris2\.//`
-    if test "$_os_release" -lt "6"; then
-        AC_MSG_ERROR([use Solaris >= 6 to build LibreOffice])
-    else
-        AC_MSG_RESULT([ok ($_os_release)])
-    fi
-
-    dnl Check whether we're using a SPARC or i386 processor
-    AC_MSG_CHECKING([the processor type])
-    if test "$host_cpu" = "sparc" -o "$host_cpu" = "i386"; then
-        AC_MSG_RESULT([ok ($host_cpu)])
-    else
-        AC_MSG_ERROR([only SPARC and i386 processors are supported])
-    fi
-    ;;
-
-linux-gnu*|k*bsd*-gnu*)
-    test_gtk=yes
-    build_gstreamer=yes
-    test_kde=yes
-    test_kde4=yes
-    test_freetype=yes
-    test_unix_quickstarter=yes
-    _os=Linux
-    ;;
-
-gnu)
-    test_randr=no
-    test_cups=no
-    _os=GNU
-     ;;
-
-cygwin*|interix*|mingw32*)
-
-    # When building on Windows normally with MSVC under Cygwin,
-    # configure thinks that the host platform (the platform the
-    # built code will run on) is Cygwin, even if it obviously is
-    # Windows, which in Autoconf terminology is called
-    # "mingw32". (Which is misleading as MinGW is the name of the
-    # tool-chain, not an operating system.)
-
-    # Somewhat confusing, yes. But this configure script doesn't
-    # look at $host etc that much, it mostly uses its own $_os
-    # variable, set here in this case statement.
-
-    # When cross-compiling to Windows from Unix, the host platform
-    # is "mingw32" (because in that case it is the MinGW
-    # tool-chain that is used).
-
-    test_cups=no
-    test_randr=no
-    test_freetype=no
-    test_fontconfig=no
-    _os=WINNT
-    # Confusingly, if the host OS matches "mingw32*", that means
-    # we are using the MinGW compiler, either natively (unlikely)
-    # or cross-compiling. We use WITH_MINGW to indicate
-    # use of MinGW in both cases.
-    case "$host_os" in
-
-    mingw32*)
-        WITH_MINGW=yes
-        ;;
-    esac
-    ;;
-
-darwin*) # Mac OS X or iOS
-    test_gtk=yes
-    test_randr=no
-    test_freetype=no
-    test_fontconfig=no
-    if test "$host_cpu" = "arm"; then
-        _os=iOS
-        test_gtk=no
-    else
-        _os=Darwin
-    fi
-    enable_systray=no
-;;
-
-freebsd*)
-    test_gtk=yes
-    build_gstreamer=yes
-    test_kde=yes
-    test_kde4=yes
-    test_freetype=yes
-    AC_MSG_CHECKING([the FreeBSD operating system release])
-    if test -n "$with_os_version"; then
-        OSVERSION="$with_os_version"
-    else
-        OSVERSION=`/sbin/sysctl -n kern.osreldate`
-    fi
-    AC_MSG_RESULT([found OSVERSION=$OSVERSION])
-    AC_MSG_CHECKING([which thread library to use])
-    if test "$OSVERSION" -lt "500016"; then
-        PTHREAD_CFLAGS="-D_THREAD_SAFE"
-        PTHREAD_LIBS="-pthread"
-    elif test "$OSVERSION" -lt "502102"; then
-        PTHREAD_CFLAGS="-D_THREAD_SAFE"
-        PTHREAD_LIBS="-lc_r"
-    else
-        PTHREAD_CFLAGS=""
-        PTHREAD_LIBS="-pthread"
-    fi
-    AC_MSG_RESULT([$PTHREAD_LIBS])
-    _os=FreeBSD
-    ;;
-
-*netbsd*)
-    test_gtk=yes
-    build_gstreamer=yes
-    test_kde=no
-    test_kde4=yes
-    test_freetype=yes
-    PTHREAD_LIBS="-pthread -lpthread"
-    _os=NetBSD
-    ;;
-
-aix*)
-    test_cups=no
-    test_randr=no
-    test_freetype=yes
-    PTHREAD_LIBS=-pthread
-    _os=AIX
-    ;;
-
-openbsd*)
-    test_gtk=yes
-    test_kde=yes
-    test_freetype=yes
-    PTHREAD_CFLAGS="-D_THREAD_SAFE"
-    PTHREAD_LIBS="-pthread"
-    _os=OpenBSD
-    ;;
-
-dragonfly*)
-    test_gtk=yes
-    build_gstreamer=yes
-    test_kde=yes
-    test_kde4=yes
-    test_freetype=yes
-    PTHREAD_LIBS="-pthread"
-    _os=DragonFly
-    ;;
-
-androideabi*)
-    build_gstreamer=no
-    test_cups=no
-    test_fontconfig=no
-    test_freetype=no
-    test_gtk=no
-    test_kde=no
-    test_kde4=no
-    test_randr=no
-    test_unix_quickstarter=no
-    _os=Android
-    ;;
-
-*)
-    AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice!])
-    ;;
-esac
-
-if test "$_os" = "AIX"; then
-    AC_PATH_PROG(GAWK, gawk)
-    if test -z "$GAWK"; then
-        AC_MSG_ERROR([gawk not found in \$PATH])
-    fi
-fi
-
-AC_SUBST(WITH_MINGW)
-AC_SUBST(OSVERSION)
-AC_SUBST(PTHREAD_CFLAGS)
-AC_SUBST(PTHREAD_LIBS)
-
-dnl It is useful to have a BUILD_TYPE keyword to distinguish "normal"
-dnl desktop OSes from "mobile" ones.
-
-dnl We assume that a non-DESKTOP build type is also a non-NATIVE one.
-dnl In other words, that when building for an OS that is not a
-dnl "desktop" one but a "mobile" one, we are always cross-compiling.
-
-dnl Note the direction of the implication; there is no assumption that
-dnl cross-compiling would imply a non-desktop OS.
-
-if test $_os != iOS -a $_os != Android; then
-    BUILD_TYPE="$BUILD_TYPE DESKTOP"
-fi
-
-if test $build_os = "cygwin"; then
-    dnl ===================================================================
-    dnl If $CC is set to a MinGW compiler, set WITH_MINGW
-    dnl ===================================================================
-    if test "$WITH_MINGW" != "yes" -a -n "$CC" -a "`$CC -dumpmachine 2>/dev/null | $SED -e 's/^.*-//'`" = "mingw32"; then
-        WITH_MINGW="yes"
-    fi
-fi
-
-dnl ===================================================================
-dnl Extra check for Windows. Cygwin builds need gcc to build dmake
-dnl and g++ to build guw.exe although MSVC or MinGW is used to
-dnl build LibreOffice.
-dnl ===================================================================
-if test "build_os" = "cygwin" ; then
-    AC_MSG_CHECKING([for Cygwin gcc/g++])
-    if which gcc > /dev/null && which g++ > /dev/null ; then
-        AC_MSG_RESULT([found])
-    else
-        AC_MSG_ERROR([Cygwin gcc and g++ are needed, please install them.])
-    fi
-fi
-
-dnl ===================================================================
-dnl  Checks for C compiler,
-dnl  The check for the C++ compiler is later on.
-dnl ===================================================================
-GCC_HOME_SET="true"
-AC_MSG_CHECKING([gcc home])
-if test -z "$with_gcc_home"; then
-    if test -n "$enable_icecream" && test "$enable_icecream" != "no" ; then
-        GCC_HOME="/opt/icecream"
-    else
-        GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
-        GCC_HOME_SET="false"
-    fi
-else
-    GCC_HOME="$with_gcc_home"
-fi
-AC_MSG_RESULT($GCC_HOME)
-AC_SUBST(GCC_HOME)
-
-if test "$GCC_HOME_SET" = "true" ; then
-    if test -z "$CC"; then
-        CC="$GCC_HOME/bin/gcc"
-    fi
-    if test -z "$CXX"; then
-        CXX="$GCC_HOME/bin/g++"
-    fi
-fi
-
-dnl The following checks for gcc, cc and then cl (if it weren't guarded for win32)
-if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
-    AC_PROG_CC
-fi
-
-COMPATH=`dirname "$CC"`
-if test "$COMPATH" = "." ; then
-    AC_PATH_PROGS(COMPATH, $CC)
-    dnl double square bracket to get single because of M4 quote...
-    COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`;
-fi
-COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`;
-
-dnl ===================================================================
-dnl  Test MacOSX sdk and version requirement
-dnl ===================================================================
-if test "$_os" = "Darwin" ; then
-
-    if test "$with_macosx_version_min_required" = "" ; then
-        with_macosx_version_min_required="10.4"
-    fi
-
-    if test "$with_macosx_version_max_allowed" = "" ; then
-        with_macosx_version_max_allowed="$with_macosx_version_min_required"
-    fi
-
-    if test "$with_macosx_sdk" = "" ; then
-        with_macosx_sdk="$with_macosx_version_max_allowed"
-    fi
-
-    case "$with_macosx_sdk" in
-
-    10.4)
-        MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.4u.sdk"
-        if test ! -d "$MACOSX_SDK_PATH"; then
-          MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.4u.sdk"
-        fi
-        macosx_sdk_value="1040"
-        ;;
-    10.5)
-        MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.5.sdk"
-        if test ! -d "$MACOSX_SDK_PATH"; then
-          MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.5.sdk"
-        fi
-        macosx_sdk_value="1050"
-        AC_MSG_WARN([Building with a SDK > 10.4 is experimental])
-        echo "Building with a SDK > 10.4 is experimental" >> warn
-        ;;
-    10.6)
-        MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.6.sdk"
-        macosx_sdk_value="1060"
-        AC_MSG_WARN([Building with a SDK > 10.4 is experimental])
-        echo "Building with a SDK > 10.4 is experimental" >> warn
-        ;;
-    10.7)
-        MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.7.sdk"
-        macosx_sdk_value="1070"
-        AC_MSG_WARN([Building with a SDK > 10.4 is experimental])
-        echo "Building with a SDK > 10.4 is experimental" >> warn
-        ;;
-    *)
-        AC_MSG_ERROR([$with_macosx_sdk is not a supported SDK value, supported value are 10.4, 10.5, 10.6 and 10.7])
-        ;;
-    esac
-    AC_MSG_CHECKING([the presence of the SDK $with_macosx_sdk])
-    if test -d "$MACOSX_SDK_PATH" ; then
-        AC_MSG_RESULT([$MACOSX_SDK_PATH ok])
-    else
-        AC_MSG_ERROR([$MACOSX_SDK_PATH not found])
-    fi
-    MACOSX_DEPLOYMENT_TARGET="$with_macosx_version_min_required"
-
-    case "$with_macosx_version_min_required" in
-
-    10.4)
-        MAC_OS_X_VERSION_MIN_REQUIRED="1040"
-        ;;
-    10.5)
-        MAC_OS_X_VERSION_MIN_REQUIRED="1050"
-        AC_MSG_WARN([Building with a minimum version requirement > 10.4 break 10.4 compatibility. do not use for deliverable build])
-        echo "Building with a minimum version requirement > 10.4 break 10.4 compatibility. do not use for deliverable build" >>warn
-        ;;
-    10.6)
-        MAC_OS_X_VERSION_MIN_REQUIRED="1060"
-        AC_MSG_WARN([Building with a minimum version requirement > 10.4 break 10.4 compatibility. do not use for deliverable build])
-        echo "Building with a minimum version requirement > 10.4 break 10.4 compatibility. do not use for deliverable build" >>warn
-        ;;
-    10.7)
-        MAC_OS_X_VERSION_MIN_REQUIRED="1070"
-        AC_MSG_WARN([Building with a minimum version requirement > 10.4 break 10.4 compatibility. do not use for deliverable build])
-        echo "Building with a minimum version requirement > 10.4 break 10.4 compatibility. do not use for deliverable build" >>warn
-        ;;
-    *)
-        AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported value are 10.4, 10.5, 10.6 and 10.7])
-        ;;
-    esac
-
-    case "$with_macosx_version_max_allowed" in
-
-    10.4)
-        MAC_OS_X_VERSION_MAX_ALLOWED="1040"
-        ;;
-    10.5)
-        MAC_OS_X_VERSION_MAX_ALLOWED="1050"
-        ;;
-    10.6)
-        MAC_OS_X_VERSION_MAX_ALLOWED="1060"
-        ;;
-    10.7)
-        MAC_OS_X_VERSION_MAX_ALLOWED="1070"
-        ;;
-    *)
-        AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported value are 10.4, 10.5, 10.6 and 10.7])
-        ;;
-    esac
-
-    AC_MSG_CHECKING([that macosx-verion-min-required is coherent with macosx-version-max-allowed])
-    if test $MAC_OS_X_VERSION_MIN_REQUIRED -gt $MAC_OS_X_VERSION_MAX_ALLOWED ; then
-        AC_MSG_ERROR([the version minimumn required must be inferior or equal to the version maximum allowed])
-    else
-        AC_MSG_RESULT([ok])
-    fi
-
-    AC_MSG_CHECKING([that macosx-verion-max-allowed is coherent macos-with-sdk])
-    if test $MAC_OS_X_VERSION_MAX_ALLOWED -gt $macosx_sdk_value ; then
-        AC_MSG_ERROR([the version maximum allowed cannot be greater thatn the sdk level])
-    else
-        AC_MSG_RESULT([ok])
-    fi
-    AC_MSG_NOTICE([MAC_OS_X_VERSION_MIN_REQUIRED=$MAC_OS_X_VERSION_MIN_REQUIRED])
-    AC_MSG_NOTICE([MAC_OS_X_VERSION_MAX_ALLOWED=$MAC_OS_X_VERSION_MAX_ALLOWED])
-fi
-AC_SUBST(MACOSX_SDK_PATH)
-AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
-AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED)
-AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED)
-
-dnl ===================================================================
-dnl  Test the gcc version,  3 is OK
-dnl ===================================================================
-if test \( "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" \) -a "$GCC" = "yes"; then
-    AC_MSG_CHECKING([the GNU C compiler version])
-    _gcc_version=`$CC -dumpversion`
-    _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
-    GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-
-    if test "$_os" = "Darwin" -a "$with_macosx_sdk" = "10.4" -a "$GCCVER" -ge "040100" ; then
-        if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0" ; then
-            export CC=$GCC_HOME/bin/gcc-4.0
-            dnl  export CC to have it available in set_soenv -> config.guess
-            GCCVER2=`"$CC" -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-            if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100" ; then
-                GCCVER=$GCCVER2
-            fi
-        fi
-        if test "$GCCVER" -ge "040100" ; then
-            AC_MSG_ERROR([You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly])
-        else
-            AC_MSG_RESULT([implicitly using CC=$CC])
-        fi
-    else
-        AC_MSG_RESULT([checked (gcc $_gcc_version)])
-    fi
-fi
-
-HAVE_LD_BSYMBOLIC_FUNCTIONS=
-if test "$GCC" = "yes"; then
-    AC_MSG_CHECKING( for -Bsymbolic-functions linker support )
-    bsymbolic_functions_ldflags_save=$LDFLAGS
-    LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo"
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([
-#include <stdio.h>
-        ],[
-printf ("hello world\n");
-        ])], HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE, [])
-    if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then
-        AC_MSG_RESULT( found )
-    else
-        AC_MSG_RESULT( not found )
-    fi
-    LDFLAGS=$bsymbolic_functions_ldflags_save
-fi
-AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
-
-dnl ===================================================================
-dnl Set up a different compiler to produce tools to run on the build
-dnl machine when doing cross-compilation
-dnl ===================================================================
-
-m4_pattern_allow([PKG_CONFIG_FOR_BUILD])
-if test "$cross_compiling" = "yes"; then
-    AC_MSG_CHECKING([for BUILD platform configuration])
-    echo
-    rm -rf CONF-FOR-BUILD Env.Build.sh
-    mkdir CONF-FOR-BUILD
-    tar cf - \
-        configure \
-        config.guess \
-        oowintool \
-        solenv/inc/minor.mk \
-        solenv/inc/postset.mk \
-        solenv/inc/langlist.mk \
-        set_soenv.in \
-        bootstrap.1 \
-        post_download.in \
-        ooo.lst.in \
-        Makefile.in \
-        bin/repo-list.in | (cd CONF-FOR-BUILD && tar xf -)
-    (
-    unset COM GUI GUIBASE OS CPU CPUNAME
-    unset CC CXX SYSBASE CFLAGS
-    unset PYTHON_CFLAGS PYTHON_LIBS
-    unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
-    test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD"
-    test -n "$CXX_FOR_BUILD" && export CXX="$CXX_FOR_BUILD"
-    test -n "$PKG_CONFIG_FOR_BUILD" && export PKG_CONFIG="$PKG_CONFIG_FOR_BUILD"
-    cd CONF-FOR-BUILD
-    sub_conf_opts=""
-    test -n "$with_ant_home" && sub_conf_opts="$sub_conf_opts --with-ant-home=$with_ant_home"
-    test $with_junit = no && sub_conf_opts="$sub_conf_opts --without-junit"
-    test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts --with-external-tar=$TARFILE_LOCATION"
-    ./configure \
-        --disable-mozilla \
-        --disable-build-mozilla \
-        --disable-zenity \
-        $sub_conf_opts \
-        2>&1 | sed -e 's/^/    /'
-    test -f ./Env.Host.sh 2>/dev/null || exit
-    cp Env.Host.sh ../Env.Build.sh
-    . ./Env.Host.sh
-    for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
-             SYSTEM_LIBXSLT; do
-        VV='$'$V
-        VV=`eval "echo $VV"`
-        if test -n "$VV"; then
-            line=${V}_FOR_BUILD='${'${V}_FOR_BUILD:-$VV'}'
-            echo "$line" >>build-config
-        fi
-    done
-
-    for V in OUTDIR PATH SOLARINC SOLARLIB WORKDIR; do
-        VV='$'$V
-        VV=`eval "echo $VV"`
-        VV=`echo $VV | sed -e 's,/CONF-FOR-BUILD,,g'`
-        if test -n "$VV"; then
-            line="${V}_FOR_BUILD='$VV'"
-            echo "$line" >>build-config
-        fi
-    done
-    )
-    test -f CONF-FOR-BUILD/build-config || AC_MSG_ERROR([Running configure script for BUILD system failed, see CONF-FOR-BUILD/config.log])
-    test -f Env.Build.sh || AC_MSG_ERROR([A file called Env.Build.sh was supposed to have been copied here, but it isn't found])
-    perl -pi -e 's,/CONF-FOR-BUILD,,g' Env.Build.sh
-    eval `cat CONF-FOR-BUILD/build-config`
-    AC_MSG_RESULT([checking for BUILD platform configuration... done])
-    rm -rf CONF-FOR-BUILD
-else
-    CC_FOR_BUILD="$CC"
-    CXX_FOR_BUILD="$CXX"
-fi
-AC_SUBST(COM_FOR_BUILD)
-AC_SUBST(GUI_FOR_BUILD)
-AC_SUBST(GUIBASE_FOR_BUILD)
-AC_SUBST(OS_FOR_BUILD)
-AC_SUBST(CPU_FOR_BUILD)
-AC_SUBST(CPUNAME_FOR_BUILD)
-AC_SUBST(CC_FOR_BUILD)
-AC_SUBST(CXX_FOR_BUILD)
-AC_SUBST(GXX_INCLUDE_PATH_FOR_BUILD)
-AC_SUBST(INPATH_FOR_BUILD)
-AC_SUBST(OUTPATH_FOR_BUILD)
-AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD)
-AC_SUBST(SYSTEM_LIBXSLT_FOR_BUILD)
-
-AC_SUBST(OUTDIR_FOR_BUILD)
-AC_SUBST(PATH_FOR_BUILD)
-AC_SUBST(SOLARINC_FOR_BUILD)
-AC_SUBST(SOLARLIB_FOR_BUILD)
-AC_SUBST(WORKDIR_FOR_BUILD)
-
-if test -e solenv/inc/minor.mk; then
-    # Get UPD number from ./solenv/inc/minor.mk
-    UPD="`grep RSCVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
-    AC_SUBST(UPD)
-    SOURCEVERSION="`grep SOURCEVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
-    AC_SUBST(SOURCEVERSION)
-else
-    AC_MSG_ERROR([solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation...])
-fi
-
-dnl ===================================================================
-dnl Set the ENABLE_CRASHDUMP variable.
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable crashdump feature])
-if test "$enable_crashdump" = "yes"; then
-    ENABLE_CRASHDUMP="TRUE"
-    BUILD_TYPE="$BUILD_TYPE CRASHREP"
-    AC_MSG_RESULT([yes])
-else
-    ENABLE_CRASHDUMP=""
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_CRASHDUMP)
-
-
-dnl ===================================================================
-dnl Windows specific tests and stuff
-dnl ===================================================================
-if test "$_os" = "WINNT"; then
-
-    dnl Include twain scanners
-    BUILD_TYPE="$BUILD_TYPE TWAIN"
-
-    dnl Set the CL_X64 variable if we are building a 64-bit LibreOffice.
-    AC_MSG_CHECKING([whether to build a 64-bit LibreOffice])
-    if test "z$enable_cl_x64" = "z" -o "$enable_cl_x64" = "no"; then
-        CL_X64=""
-        AC_MSG_RESULT([no])
-    else
-        CL_X64="TRUE"
-        AC_MSG_RESULT([yes])
-    fi
-    AC_SUBST(CL_X64)
-
-    AC_MSG_CHECKING([whether to use DirectX])
-    if test "$enable_directx" = "yes" -o "$enable_directx" = ""; then
-        ENABLE_DIRECTX="TRUE"
-        AC_MSG_RESULT([yes])
-    else
-        ENABLE_DIRECTX=""
-        AC_MSG_RESULT([no])
-    fi
-    AC_SUBST(ENABLE_DIRECTX)
-
-    AC_MSG_CHECKING([whether to use ActiveX])
-    if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
-        DISABLE_ACTIVEX=""
-        AC_MSG_RESULT([yes])
-    else
-        DISABLE_ACTIVEX="TRUE"
-        AC_MSG_RESULT([no])
-    fi
-    AC_SUBST(DISABLE_ACTIVEX)
-
-    AC_MSG_CHECKING([whether to use ATL])
-    if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE"; then
-        DISABLE_ATL=""
-        AC_MSG_RESULT([yes])
-    elif test "$enable_atl" = ""; then
-        if test "$WITH_MINGW" = "yes"; then
-            DISABLE_ATL="TRUE"
-            AC_MSG_RESULT([no])
-        else
-            DISABLE_ATL=""
-            AC_MSG_RESULT([yes])
-        fi
-    else
-        DISABLE_ATL="TRUE"
-        AC_MSG_RESULT([no])
-    fi
-    AC_SUBST(DISABLE_ATL)
-fi
-
-dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
-dnl ===================================================================
-AC_MSG_CHECKING([whether to turn warnings to errors])
-if test -n "$enable_werror" && test "$enable_werror" != "no"; then
-    ENABLE_WERROR="TRUE"
-    AC_MSG_RESULT([yes])
-    AC_MSG_WARN([Turning warnings to errors has no effect in modules or])
-    AC_MSG_WARN([on platforms where it has been disabled explicitly])
-    echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitly" >> warn
-else
-    ENABLE_WERROR="FALSE"
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_WERROR)
-
-dnl Set the ENABLE_DEBUG variable. (Activate --enable-symbols)
-dnl ===================================================================
-AC_MSG_CHECKING([whether to do a debug build])
-if test -n "$enable_debug" && test "$enable_debug" != "no"; then
-    ENABLE_DEBUG="TRUE"
-    enable_symbols="yes"
-    AC_MSG_RESULT([yes])
-else
-    ENABLE_DEBUG="FALSE"
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_DEBUG)
-
-dnl Set the ENABLE_DBGUTIL variable
-dnl ===================================================================
-AC_MSG_CHECKING([whether to build with additional debug utilities])
-if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
-    PROEXT=""
-    PRODUCT=""
-    PROFULLSWITCH=""
-    AC_MSG_RESULT([yes])
-else
-    PRODUCT="full"
-    PROFULLSWITCH="product=full"
-    PROEXT=".pro"
-    AC_MSG_RESULT([no, full product build])
-fi
-AC_SUBST(PRODUCT)
-AC_SUBST(PROFULLSWITCH)
-AC_SUBST(PROEXT)
-
-dnl whether to include symbols into final build.
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include symbols])
-if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
-    ENABLE_SYMBOLS="TRUE"
-    AC_MSG_RESULT([yes])
-else
-    ENABLE_SYMBOLS=
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_SYMBOLS)
-
-dnl Determine if the solver is to be stripped or not.
-dnl ===================================================================
-AC_MSG_CHECKING([whether to strip the solver or not.])
-if test "z$enable_strip_solver" = "zno"; then
-    DISABLE_STRIP="TRUE"
-    AC_MSG_RESULT([no])
-else
-    if test -n "$ENABLE_SYMBOLS"; then
-        DISABLE_STRIP="TRUE"
-        AC_MSG_RESULT([no])
-    else
-        DISABLE_STRIP=
-        AC_MSG_RESULT([yes])
-    fi
-fi
-AC_SUBST(DISABLE_STRIP)
-
-dnl check for cups support
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable native cups support])
-if test "$test_cups" = "yes" -a "z$enable_cups" != "zno"; then
-    ENABLE_CUPS="TRUE"
-    AC_MSG_RESULT([yes])
-    AC_CHECK_LIB(cups, cupsPrintFiles)
-    AC_CHECK_HEADER(cups/cups.h, AC_DEFINE(HAVE_CUPS_H))
-    if test "$ac_cv_lib_cups_cupsPrintFiles" != "yes" -a "$ac_cv_header_cups_cups_h" != "yes"; then
-        AC_MSG_ERROR([Could not find CUPS. Install libcupsys2-dev or cups???-devel.])
-    fi
-else
-    ENABLE_CUPS=""
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_CUPS)
-
-
-# check for fontconfig support
-AC_MSG_CHECKING([whether we need fontconfig])
-if test "z$test_fontconfig" = "zyes"; then
-    ENABLE_FONTCONFIG="TRUE"
-    AC_MSG_RESULT([yes])
-    PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
-else
-    ENABLE_FONTCONFIG=""
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_FONTCONFIG)
-AC_SUBST(FONTCONFIG_CFLAGS)
-AC_SUBST(FONTCONFIG_LIBS)
-
-dnl whether to find & fetch external tarballs?
-dnl ===================================================================
-if test -z "$TARFILE_LOCATION"; then
-    TARFILE_LOCATION="DEFAULT"
-fi
-AC_SUBST(TARFILE_LOCATION)
-
-if test "z$enable_fetch_external" != "zno" ; then
-    DO_FETCH_TARBALLS="YES"
-fi
-AC_SUBST(DO_FETCH_TARBALLS)
-
-
-dnl git-new-workdir
-dnl ===================================================================
-AC_SUBST(GIT_LINK_SRC)
-
-dnl Disable legacy binary file formats filters
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable filters for legacy binary file formats (StarOffice 5.2)])
-if test "$enable_binfilter" = "no"; then
-    WITH_BINFILTER="NO"
-    AC_MSG_RESULT([no])
-else
-    WITH_BINFILTER="YES"
-    BUILD_TYPE="$BUILD_TYPE BINFILTER"
-    AC_MSG_RESULT([yes])
-fi
-AC_SUBST(WITH_BINFILTER)
-
-dnl Enable ugly pieces of code we're better off without
-dnl ===================================================================
-if test "$enable_ugly" = "yes"; then
-    BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
-    SCPDEFS="$SCPDEFS -DWITH_UGLY"
-    ENABLE_UGLY=YES
-else
-    ENABLE_UGLY=NO
-fi
-AC_SUBST(ENABLE_UGLY)
-
-dnl ===================================================================
-dnl Disable rpath in shared libraries?
-dnl ===================================================================
-AC_MSG_CHECKING([whether to use RPATH in shared libraries])
-if test "$enable_rpath" = "no"; then
-    ENABLE_RPATH="no"
-else
-    ENABLE_RPATH="yes"
-fi
-AC_MSG_RESULT([$ENABLE_RPATH])
-AC_SUBST(ENABLE_RPATH)
-
-dnl Test whether to include MySpell dictionaries
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include MySpell dictionaries])
-if test -z "$with_myspell_dicts" || test "$with_myspell_dicts" = "yes"; then
-    AC_MSG_RESULT([yes])
-    WITH_MYSPELL_DICTS=YES
-    BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
-else
-    AC_MSG_RESULT([no])
-    WITH_MYSPELL_DICTS=NO
-fi
-AC_SUBST(WITH_MYSPELL_DICTS)
-
-AC_MSG_CHECKING([whether to use dicts from external paths])
-if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then
-    AC_MSG_RESULT([yes])
-    SYSTEM_DICTS=YES
-    AC_MSG_CHECKING([for spelling dictionary directory])
-    if test -n "$with_external_dict_dir"; then
-        DICT_SYSTEM_DIR=file://$with_external_dict_dir
-    else
-        DICT_SYSTEM_DIR=file:///usr/share/hunspell
-    fi
-    AC_MSG_RESULT([$DICT_SYSTEM_DIR])
-    AC_MSG_CHECKING([for hyphenation patterns directory])
-    if test -n "$with_external_hyph_dir"; then
-        HYPH_SYSTEM_DIR=file://$with_external_hyph_dir
-    else
-        HYPH_SYSTEM_DIR=file:///usr/share/hyphen
-    fi
-    AC_MSG_RESULT([$HYPH_SYSTEM_DIR])
-    AC_MSG_CHECKING([for thesaurus directory])
-    if test -n "$with_external_thes_dir"; then
-        THES_SYSTEM_DIR=file://$with_external_thes_dir
-    else
-        THES_SYSTEM_DIR=file:///usr/share/mythes
-    fi
-    AC_MSG_RESULT([$THES_SYSTEM_DIR])
-else
-    AC_MSG_RESULT([no])
-    SYSTEM_DICTS=NO
-fi
-AC_SUBST(SYSTEM_DICTS)
-AC_SUBST(DICT_SYSTEM_DIR)
-AC_SUBST(HYPH_SYSTEM_DIR)
-AC_SUBST(THES_SYSTEM_DIR)
-
-dnl ===================================================================
-dnl Set the ENABLE_PCH variable. (Activate --enable-pch)
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable pch feature])
-if test -n "$enable_pch" && test "$enable_pch" != "no"; then
-    if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
-        ENABLE_PCH="TRUE"
-        AC_MSG_RESULT([yes])
-dnl There is no PCH support in GCC versions prior to this
-    elif test "$GCC" = "yes"; then
-        ENABLE_PCH="TRUE"
-        AC_MSG_RESULT([yes])
-    else
-        ENABLE_PCH=""
-        AC_MSG_WARN([Precompiled header not yet supported for your platform/compiler])
-    fi
-else
-    ENABLE_PCH=""
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_PCH)
-
-dnl ===================================================================
-dnl Search all the common names for GNU make
-dnl ===================================================================
-AC_MSG_CHECKING([for GNU make])
-for a in "$MAKE" $GNUMAKE make gmake gnumake; do
-    $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
-    if test $? -eq 0;  then
-        GNUMAKE=$a
-        break
-    fi
-done
-AC_MSG_RESULT($GNUMAKE)
-if test -z "$GNUMAKE"; then
-    AC_MSG_ERROR([not found. install GNU make.])
-fi
-
-AC_MSG_CHECKING([the GNU make version])
-_make_version=`$GNUMAKE --version | grep GNU | grep -v GPL | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
-_make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-if test "$_make_longver" -ge "038100" ; then
-    AC_MSG_RESULT([$GNUMAKE $_make_version])
-else
-    AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
-fi
-AC_SUBST(GNUMAKE)
-
-dnl ===================================================================
-dnl  Test the Solaris compiler version
-dnl ===================================================================
-if test "$_os" = "SunOS"; then
-    if test "$CC" = "cc"; then
-        AC_PATH_PROGS(_cc, cc)
-        COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
-        AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
-        dnl cc -V outputs to standard error!!!!
-        _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | $SED -e 's/.* C //'`
-        _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
-        _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
-        if test "$_sunstudio_major" != "5"; then
-            AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
-        else
-            _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'`
-            if test "$_sunstudio_minor" = "false"; then
-                AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
-            else
-                dnl compiler will do
-                AC_MSG_RESULT([checked])
-            fi
-        fi
-    fi
-fi
-
-HAVE_LD_HASH_STYLE=FALSE
-WITH_LINKER_HASH_STYLE=
-AC_MSG_CHECKING( for --hash-style gcc linker support )
-if test "$GCC" = "yes" ; then
-    if test -z "$with_linker_hash_style" -o "$with_linker_hash_style" = "yes" ; then
-        hash_styles="gnu sysv"
-    elif test "$with_linker_hash_style" = "no" ; then
-        hash_styles=
-    else
-        hash_styles="$with_linker_hash_style"
-    fi
-
-    for hash_style in $hash_styles ; do
-        test "$HAVE_LD_HASH_STYLE" = "TRUE" && continue
-        hash_style_ldflags_save=$LDFLAGS
-        LDFLAGS="$LDFLAGS -Wl,--hash-style=$hash_style"
-
-        AC_LINK_IFELSE([AC_LANG_PROGRAM(
-            [
-#include <stdio.h>
-            ],[
-printf ("");
-            ])],
-            [ if ./conftest$EXEEXT; then
-                  HAVE_LD_HASH_STYLE=TRUE
-                  WITH_LINKER_HASH_STYLE=$hash_style
-              fi],
-            [HAVE_LD_HASH_STYLE=FALSE])
-        LDFLAGS=$hash_style_ldflags_save
-    done
-
-    if test "$HAVE_LD_HASH_STYLE" = "TRUE"; then
-        AC_MSG_RESULT( $WITH_LINKER_HASH_STYLE )
-    else
-        AC_MSG_RESULT( no )
-    fi
-    LDFLAGS=$hash_style_ldflags_save
-else
-    AC_MSG_RESULT( no )
-fi
-AC_SUBST(HAVE_LD_HASH_STYLE)
-AC_SUBST(WITH_LINKER_HASH_STYLE)
-
-dnl ===================================================================
-dnl Check whether there's a Perl version available.
-dnl ===================================================================
-if test -z "$with_perl_home"; then
-    AC_PATH_PROG(PERL, perl)
-else
-    test "$build_os" = "cygwin" && with_perl_home=`cygpath -u "$with_perl_home"`
-    _perl_path="$with_perl_home/bin/perl"
-    if test -x "$_perl_path"; then
-        PERL=$_perl_path
-    else
-        AC_MSG_ERROR([$_perl_path not found])
-    fi
-fi
-
-dnl ===================================================================
-dnl Testing for Perl version 5 or greater.
-dnl $] is the Perl version variable, it is returned as an integer
-dnl ===================================================================
-if test "$PERL"; then
-    AC_MSG_CHECKING([the Perl version])
-    ${PERL} -e "exit($]);"
-    _perl_version=$?
-    if test "$_perl_version" -lt 5; then
-        AC_MSG_ERROR([found Perl version "$_perl_version", use version 5 of Perl])
-    fi
-    AC_MSG_RESULT([checked (perl $_perl_version)])
-else
-    AC_MSG_ERROR([Perl not found, install version 5 of Perl])
-fi
-AC_SUBST(PERL)
-
-dnl ===================================================================
-dnl Testing for required Perl modules
-dnl ===================================================================
-
-AC_MSG_CHECKING([for required Perl modules])
-if `$PERL -e 'use Archive::Zip; use Cwd;'`; then
-    AC_MSG_RESULT([all modules found])
-else
-    AC_MSG_ERROR([Failed to find some modules])
-fi
-
-dnl ===================================================================
-dnl  Check which Microsoft C/C++ or MinGW compiler is used for WINNT
-dnl ===================================================================
-SHOWINCLUDES_PREFIX=
-if test "$_os" = "WINNT"; then
-    if test "$WITH_MINGW" != "yes"; then
-        AC_MSG_CHECKING([for a friendly Microsoft C/C++ compiler installation path])
-        if test -z "$with_cl_home"; then
-            vctest=`./oowintool --msvc-productdir`;
-            if test "$CL_X64" = ""; then
-                if test -x "$vctest/bin/cl.exe"; then
-                    with_cl_home=$vctest;
-                fi
-            else
-                if test -x "$vctest/bin/amd64/cl.exe"; then
-                    with_cl_home=$vctest;
-                fi
-            fi
-        else
-            with_cl_home=`cygpath -u "$with_cl_home"`
-        fi
-        with_cl_home=`cygpath -d "$with_cl_home"`
-        with_cl_home=`cygpath -u "$with_cl_home"`
-        AC_MSG_RESULT([$with_cl_home])
-
-        dnl ===========================================================
-        dnl  Check for mspdb80.dll/mspdb100.dll
-        dnl ===========================================================
-        dnl MSVS 2008/10 Compiler
-        if test -n "$with_mspdb_path";then
-            with_mspdb_path=`cygpath -u "$with_mspdb_path"`
-        fi
-        if test -e "$with_mspdb_path/mspdb80.dll" -o -e "$with_mspdb_path/mspdb100.dll"; then
-            MSPDB_PATH="$with_mspdb_path"
-        fi
-        dnl MSVS 2008 case
-        if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb80.dll"; then
-            MSPDB_PATH="$with_cl_home/../Common7/IDE"
-        fi
-        dnl Windows SDK 6.0 case
-        if test -z "$MSPDB_PATH" -a -e "$with_cl_home/bin/mspdb80.dll"; then
-            MSPDB_PATH="$with_cl_home/bin"
-        fi
-        dnl MSVS 2010 case
-        if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb100.dll"; then
-            MSPDB_PATH="$with_cl_home/../Common7/IDE"
-        fi
-
-        if test -z "$MSPDB_PATH";then
-            dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty
-            AC_PATH_PROG(MSPDB_PATH, mspdb80.dll)
-            AC_PATH_PROG(MSPDB_PATH, mspdb100.dll)
-            MSPDB_PATH=`dirname "$MSPDB_PATH"`
-        fi
-
-        if test -z "$MSPDB_PATH"; then
-            AC_MSG_ERROR([You need a mspdb80.dllor mspdb100.dll, make sure it is in the path or use --with-mspdb-path])
-        fi
-        MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
-        MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
-        dnl The path needs to be added before cl is called
-        PATH="$MSPDB_PATH:$PATH"
-
-        AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
-        if test -z "$CC"; then
-            if test "$CL_X64" = ""; then
-                if test -x "$with_cl_home/bin/cl.exe"; then
-                    CC="$with_cl_home/bin/cl.exe"
-                fi
-            else
-                if test -x "$with_cl_home/bin/amd64/cl.exe"; then
-                    CC="$with_cl_home/bin/amd64/cl.exe"
-                fi
-            fi
-            if test -z "$CC"; then
-                AC_PATH_PROG(CC, cl.exe)
-            fi
-            # This gives us a posix path with 8.3 filename restrictions
-            CC=`cygpath -d "$CC"`
-            CC=`cygpath -u "$CC"`
-        fi
-
-        if test -n "$CC"; then
-            # Remove /cl.exe from CC case insensitive
-            AC_MSG_RESULT([found ($CC)])
-            if test "$CL_X64" = ""; then
-                COMPATH=`echo $CC | $SED -e 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]].*@@' -e 's@^.* @@'`
-            else
-                if test -n "$with_cl_home"; then
-                    COMPATH=`echo $with_cl_home`
-                fi
-            fi
-            export INCLUDE=`cygpath -d "$COMPATH/Include"`
-            dnl  Check which Microsoft C/C++ compiler is found
-            AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
-            # The following finds Microsoft, matches nn.nn.nnnn then pulls numbers out.
-            CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
-                            x = match( \\\$0, /..\\...\\...../ )
-                            CCversion = substr( \\\$0, RSTART, RLENGTH)
-                            tokencount = split (CCversion,vertoken,\".\")
-                            for ( i = 1 ; i <= tokencount ; i++ ) {
-                                printf (\"%04d\",vertoken[[i]] )
-                            }
-                            }"`
-            if test "$CCNUMVER" -ge "001600000000"; then
-                COMEX=13
-                MSVSVER=2010
-            elif test "$CCNUMVER" -ge "001500000000"; then
-                COMEX=12
-                MSVSVER=2008
-            else
-                AC_MSG_ERROR([Compiler too old. Use Microsoft Visual Studio 2008 or 2010.])
-            fi
-            AC_MSG_RESULT([found compiler version $CCNUMVER (MSVS $MSVSVER).])
-        else
-            AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
-        fi
-
-        dnl We need to guess the prefix of the -showIncludes output, it can be
-        dnl localized
-        AC_MSG_CHECKING([the dependency generation prefix (cl.exe -showIncludes)])
-        echo "#include <stdlib.h>" > conftest.c
-        SHOWINCLUDES_PREFIX=`$CC -c -showIncludes conftest.c 2>/dev/null | \
-            grep 'stdlib\.h' | head -n1 | sed 's/ [[[:alpha:]]]:.*//'`
-        rm -f conftest.c conftest.obj
-        if test -z "$SHOWINCLUDES_PREFIX" ; then
-            AC_MSG_ERROR([cannot determine the -showIncludes prefix])
-        else
-            AC_MSG_RESULT(["$SHOWINCLUDES_PREFIX"])
-        fi
-
-        # Check for 64-bit (cross-)compiler to use to build the 64-bit
-        # version of the Explorer extension (and maybe other small
-        # bits, too) needed when installing a 32-bit LibreOffice on a
-        # 64-bit OS. The 64-bit Explorer extension is a feature that
-        # has been present since long in OOo. Don't confuse it with
-        # building LibreOffice itself as 64-bit code, which is
-        # unfished work and highly experimental.
-
-        BUILD_X64=
-        CC_X64_BINARY=
-        LINK_X64_BINARY=
-        LIBMGR_X64_BINARY=
-
-        if test "$CL_X64" = ""; then
-            AC_MSG_CHECKING([for a x64 compiler])
-
-            # Prefer native x64 compiler to cross-compiler, in case we are running
-            # the build on a 64-bit OS.
-            if "$with_cl_home/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
-                BUILD_X64=TRUE
-                CC_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
-                CXX_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
-                LINK_X64_BINARY="$with_cl_home/bin/amd64/link.exe"
-                LIBMGR_X64_BINARY="$with_cl_home/bin/amd64/lib.exe"
-            elif "$with_cl_home/bin/x86_amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
-                BUILD_X64=TRUE
-                CC_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
-                CXX_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
-                LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
-                LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
-            fi
-            if test "$BUILD_X64" = TRUE; then
-                AC_MSG_RESULT([found])
-            else
-                AC_MSG_RESULT([not found])
-                AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension])
-            fi
-        fi
-        AC_SUBST(BUILD_X64)
-
-        # These are passed to the environment through set_soenv.in as usual, and then
-        # used in set_wntx64.mk
-        AC_SUBST(CC_X64_BINARY)
-        AC_SUBST(CXX_X64_BINARY)
-        AC_SUBST(LINK_X64_BINARY)
-        AC_SUBST(LIBMGR_X64_BINARY)
-
-    else
-        AC_MSG_CHECKING([the compiler is MinGW])
-        MACHINE_PREFIX=`$CC -dumpmachine`
-        if echo $MACHINE_PREFIX | grep -q mingw32; then
-            AC_MSG_RESULT([yes])
-            if $CC -dumpspecs | grep -q "mno-cygwin"; then
-                USE_MINGW="cygwin"
-            else
-                USE_MINGW="pure-mingw"
-            fi
-        else
-            AC_MSG_ERROR([Compiler is not MinGW.])
-        fi
-    fi
-fi
-AC_SUBST(COMEX)
-AC_SUBST(MSPDB_PATH)
-AC_SUBST(USE_MINGW)
-AC_SUBST(SHOWINCLUDES_PREFIX)
-
-dnl ===================================================================
-dnl Check for pkg-config
-dnl ===================================================================
-if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
-    PKG_PROG_PKG_CONFIG
-fi
-
-if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
-
-    # If you use CC=/path/to/compiler/foo-gcc or even CC="ccache
-    # /path/to/compiler/foo-gcc" you need to set the AR etc env vars
-    # explicitly. Or put /path/to/compiler in PATH yourself.
-
-    AC_CHECK_TOOL(AR,ar)
-    AC_CHECK_TOOL(NM,nm)
-    AC_CHECK_TOOL(OBJDUMP,objdump)
-    AC_CHECK_TOOL(RANLIB,ranlib)
-    AC_CHECK_TOOL(STRIP,strip)
-    if test "$_os" = "WINNT"; then
-        AC_CHECK_TOOL(DLLTOOL,dlltool)
-        AC_CHECK_TOOL(WINDRES,windres)
-    fi
-fi
-AC_SUBST(AR)
-AC_SUBST(DLLTOOL)
-AC_SUBST(NM)
-AC_SUBST(OBJDUMP)
-AC_SUBST(PKG_CONFIG)
-AC_SUBST(RANLIB)
-AC_SUBST(STRIP)
-AC_SUBST(WINDRES)
-
-dnl ===================================================================
-dnl pkg-config checks on Mac OS X
-dnl ===================================================================
-
-if test $_os = Darwin; then
-    AC_MSG_CHECKING([for bogus pkg-config])
-    if test -n "$PKG_CONFIG"; then
-        if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l /usr/bin/pkg-config | grep -q Mono.framework; then
-            AC_MSG_RESULT([yes, from Mono])
-        else
-            AC_MSG_RESULT([yes, from unknown origin])
-        fi
-        AC_MSG_WARN([This might have unexpected consequences, please consider hiding $PKG_CONFIG])
-        echo "Having a $PKG_CONFIG might have unexpected consequences, please consider hiding it" >>warn
-    else
-        AC_MSG_RESULT([no])
-    fi
-fi
-
-dnl ===================================================================
-dnl  .NET needs special treatment
-dnl (does the above comment really mean .NET, or is it misusing
-dnl that to mean Visual Studio .NET 2003 ? And does this also
-dnl in fact apply equally to what we actually support, i.e.
-dnl Visual Studio 2008 and 2010?)
-dnl ===================================================================
-if test "$build_os" = "cygwin"; then
-    dnl Check midl.exe
-    AC_PATH_PROG(MIDL_PATH, midl.exe)
-    if test -n "$MIDL_PATH";then
-        MIDL_PATH=`dirname "$MIDL_PATH"`
-    fi
-    if test -n "$with_midl_path";then
-        with_midl_path=`cygpath -u "$with_midl_path"`
-    fi
-    if test -x "$with_midl_path/midl.exe"; then
-        MIDL_PATH="$with_midl_path"
-    fi
-    if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then
-        MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
-    fi
-    if test -z "$MIDL_PATH" ; then
-        vstest=`./oowintool --msvs-productdir`;
-        if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then
-            MIDL_PATH="$vstest/Common7/Tools/Bin"
-        fi
-    fi
-    if test -z "$MIDL_PATH" ; then
-        winsdktest=`./oowintool --windows-sdk-home`
-        if test -x "$winsdktest/Bin/midl.exe" ; then
-            MIDL_PATH="$winsdktest/Bin"
-        fi
-    fi
-    if test ! -x "$MIDL_PATH/midl.exe"; then
-        AC_MSG_ERROR([midl.exe not found. Make sure it's in PATH or use --with-midl-path])
-    fi
-    # Convert to posix path with 8.3 filename restrictions ( No spaces )
-    MIDL_PATH=`cygpath -d "$MIDL_PATH"`
-    MIDL_PATH=`cygpath -u "$MIDL_PATH"`
-
-    dnl Check csc.exe
-    AC_PATH_PROG(CSC_PATH, csc.exe)
-    if test -n "$CSC_PATH";then
-        CSC_PATH=`dirname "$CSC_PATH"`
-    fi
-    if test -n "$with_csc_path";then
-        with_csc_path=`cygpath -u "$with_csc_path"`
-    fi
-    if test -x "$with_csc_path/csc.exe"; then
-        CSC_PATH="$with_csc_path"
-    else
-       csctest=`./oowintool --csc-compilerdir`;
-       if test -x "$csctest/csc.exe"; then
-           CSC_PATH="$csctest"
-       fi
-    fi
-    if test ! -x "$CSC_PATH/csc.exe"; then
-        AC_MSG_ERROR([csc.exe not found. Make sure it's in the path or use --with-csc-path])
-    fi
-    # Convert to posix path with 8.3 filename restrictions ( No spaces )
-    CSC_PATH=`cygpath -d "$CSC_PATH"`
-    CSC_PATH=`cygpath -u "$CSC_PATH"`
-
-    dnl Check mscoree.lib / .NET Framework dir
-    AC_MSG_CHECKING(.NET Framework)
-    if test -n "$with_dotnet_framework_home"; then
-        with_dotnet_framework_home=`cygpath -u "$with_dotnet_framework_home"`
-    fi
-    if test -f "$with_dotnet_framework_home/lib/mscoree.lib"; then
-        DOTNET_FRAMEWORK_HOME="$with_dotnet_framework_home"
-    fi
-    if test -z "$DOTNET_FRAMEWORK_HOME" ; then
-        frametest=`./oowintool --dotnetsdk-dir`
-        if test -f "$frametest/lib/mscoree.lib"; then
-            DOTNET_FRAMEWORK_HOME="$frametest"
-        else
-            frametest=`./oowintool --windows-sdk-home`
-            if test -f "$frametest/lib/mscoree.lib"; then
-                DOTNET_FRAMEWORK_HOME="$frametest"
-            fi
-        fi
-    fi
-    if test ! -f "$DOTNET_FRAMEWORK_HOME/lib/mscoree.lib"; then
-        AC_MSG_ERROR([mscoree.lib (.NET Framework) not found. Make sure you use --with-dotnet-framework-home])
-    fi
-    AC_MSG_RESULT(found)
-    # Convert to posix path with 8.3 filename restrictions ( No spaces )
-    DOTNET_FRAMEWORK_HOME=`cygpath -d "$DOTNET_FRAMEWORK_HOME"`
-    DOTNET_FRAMEWORK_HOME=`cygpath -u "$DOTNET_FRAMEWORK_HOME"`
-    AC_SUBST(MIDL_PATH)
-    AC_SUBST(CSC_PATH)
-    AC_SUBST(DOTNET_FRAMEWORK_HOME)
-fi
-
-dnl ===================================================================
-dnl Check if stdc headers are available excluding MSVC.
-dnl ===================================================================
-if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
-    AC_HEADER_STDC
-fi
-
-if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
-    dnl ===================================================================
-    dnl Find pre-processors.
-    dnl ===================================================================
-
-    AC_PROG_CXXCPP
-
-    dnl Check whether there's a C pre-processor.
-    dnl ===================================================================
-    dnl When using SunStudio compiler, there is a bug with the cc
-    dnl preprocessor, so use CC preprocessor as the cc preprocessor
-    dnl See Issuezilla #445.
-    dnl ===================================================================
-    if test "$_os" = "SunOS"; then
-        CPP=$CXXCPP
-    else
-        AC_PROG_CPP
-    fi
-
-    dnl Find integral type sizes and alignments
-
-    AC_CHECK_SIZEOF(long)
-    AC_CHECK_SIZEOF(short)
-    AC_CHECK_SIZEOF(int)
-    AC_CHECK_SIZEOF(long long)
-    AC_CHECK_SIZEOF(double)
-    AC_CHECK_SIZEOF(void*)
-
-    SIZEOF_SHORT=$ac_cv_sizeof_short
-    SIZEOF_INT=$ac_cv_sizeof_int
-    SIZEOF_LONG=$ac_cv_sizeof_long
-    SIZEOF_LONGLONG=$ac_cv_sizeof_long_long
-    SIZEOF_DOUBLE=$ac_cv_sizeof_double
-    SIZEOF_POINTER=$ac_cv_sizeof_voidp
-
-    dnl Allow build without AC_CHECK_ALIGNOF, grrr
-    m4_pattern_allow([AC_CHECK_ALIGNOF])
-    m4_ifdef([AC_CHECK_ALIGNOF],
-      ,
-      [
-         dnl We know that the ALIGNOF_ variables are used only when cross-compiling
-         dnl in sal/typesconfig/makefile.mk...
-         if test "$cross_compiling" = "yes"; then
-            AC_MSG_ERROR([When cross-compiling you must use a recent Autoconf with [AC_][CHECK_ALIGNOF]])
-         fi
-         m4_define([AC_CHECK_ALIGNOF],
-            [
-               AC_MSG_WARN([Cannot determine alignment of $1])
-               AS_TR_SH([ac_cv_alignof_$3])=unknown
-            ])
-      ])
-
-    AC_CHECK_ALIGNOF(short,[#include <stddef.h>])
-    AC_CHECK_ALIGNOF(int,[#include <stddef.h>])
-    AC_CHECK_ALIGNOF(long,[#include <stddef.h>])
-    AC_CHECK_ALIGNOF(double,[#include <stddef.h>])
-
-    ALIGNOF_SHORT=$ac_cv_alignof_short
-    ALIGNOF_INT=$ac_cv_alignof_int
-    ALIGNOF_LONG=$ac_cv_alignof_long
-    ALIGNOF_DOUBLE=$ac_cv_alignof_double
-
-    AC_C_BIGENDIAN
-    WORDS_BIGENDIAN=$ac_cv_c_bigendian
-
-    dnl Check for large file support
-    AC_SYS_LARGEFILE
-    if test -n "$ac_cv_sys_file_offset_bits"; then
-        LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-    fi
-    if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; then
-        LFS_CFLAGS="$LFS_CFLAGS -D_LARGE_FILES"
-    fi
-else
-    # Hardcode for MSVC
-    SIZEOF_SHORT=2
-    SIZEOF_INT=4
-    SIZEOF_LONG=4
-    SIZEOF_LONGLONG=8
-    if test "$CL_X64" = ""; then
-        SIZEOF_POINTER=4
-    else
-        SIZEOF_POINTER=8
-    fi
-    ALIGNOF_SHORT=2
-    ALIGNOF_INT=4
-    ALIGNOF_LONG=4
-    ALIGNOF_DOUBLE=8
-    WORDS_BIGENDIAN=no
-    LFS_CFLAGS=''
-fi
-AC_SUBST(WORDS_BIGENDIAN)
-AC_SUBST(LFS_CFLAGS)
-
-AC_SUBST(SIZEOF_SHORT)
-AC_SUBST(SIZEOF_INT)
-AC_SUBST(SIZEOF_LONG)
-AC_SUBST(SIZEOF_LONGLONG)
-AC_SUBST(SIZEOF_DOUBLE)
-AC_SUBST(SIZEOF_POINTER)
-AC_SUBST(ALIGNOF_SHORT)
-AC_SUBST(ALIGNOF_INT)
-AC_SUBST(ALIGNOF_LONG)
-AC_SUBST(ALIGNOF_DOUBLE)
-
-dnl ===================================================================
-dnl Check if valgrind.h is available
-dnl ===================================================================
-if test "$cross_compiling" != "yes" -a "$enable_dbgutil" != "no"; then
-    dnl Test $prefix (currently only testing for /usr and /usr/local)
-    dnl so that VALGRIND_CFLAGS = -I$prefix/include/valgrind
-    VALGRIND_CFLAGS=""
-    prev_cppflags=$CPPFLAGS
-    if test -z "$VALGRIND_CFLAGS"; then
-        CPPFLAGS="-I/usr/include/valgrind"
-        AC_CHECK_HEADER([valgrind.h], [VALGRIND_CFLAGS=$CPPFLAGS], [unset ac_cv_header_valgrind_h])
-    fi
-    if test -z "$VALGRIND_CFLAGS"; then
-        CPPFLAGS="-I/usr/local/include/valgrind"
-        AC_CHECK_HEADER([valgrind.h], [VALGRIND_CFLAGS=$CPPFLAGS], [])
-    fi
-    if test -n "$VALGRIND_CFLAGS"; then
-        CPPFLAGS=$VALGRIND_CFLAGS
-        AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=""])
-    fi
-    CPPFLAGS=$prev_cppflags
-fi
-AC_SUBST([VALGRIND_CFLAGS])
-
-dnl ===================================================================
-dnl Testing for C++ compiler and version...
-dnl ===================================================================
-if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
-    if test -n "$CC" -a -z "$CXX"; then
-        CXX="$CC"
-    fi
-fi
-
-dnl Autoconf 2.53 can do this test for cl.exe, 2.13 can't!
-if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
-    AC_PROG_CXX
-fi
-
-dnl check if we are using a buggy version of g++ (currently 3.4.0, 3.4.1 and trunk)
-if test "$GXX" = "yes"; then
-    AC_MSG_CHECKING([the GNU C++ compiler version])
-
-    _gpp_version=`$CXX -dumpversion`
-    _gpp_majmin=`echo $_gpp_version | $AWK -F. '{ print \$1*100+\$2 }'`
-
-    if test "$_os" = "Darwin" -a "$with_macosx_sdk" = "10.4" -a "$_gpp_majmin" -ge "401" ; then
-        if test -z "$save_CXX" -a -x "$GCC_HOME/bin/g++-4.0" ; then
-            CXX=$GCC_HOME/bin/g++-4.0
-            _gpp_majmin_2=`"$CXX" -dumpversion | $AWK -F. '{ print \$1*100+\$2 }'`
-            if test "$_gpp_majmin_2" -ge "400" -a "$_gpp_majmin_2" -lt "401" ; then
-                _gpp_majmin=$_gpp_majmin_2
-            fi
-        fi
-        if test "$_gpp_majmin" -ge "401" ; then
-            AC_MSG_ERROR([You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly])
-        else
-            AC_MSG_RESULT([implicitly using CXX=$CXX])
-        fi
-    else
-        AC_MSG_RESULT([checked (g++ $_gpp_version)])
-    fi
-
-    if test "$_gpp_majmin" = "304"; then
-        AC_MSG_CHECKING([whether $CXX has the enum bug])
-        AC_TRY_RUN([
-            extern "C" void abort (void);
-            extern "C" void exit (int status);
-
-            enum E { E0, E1, E2, E3, E4, E5 };
-
-            void test (enum E e)
-            {
-                if (e == E2 || e == E3 || e == E1)
-                    exit (1);
-            }
-
-            int main (void)
-            {
-                test (E4);
-                test (E5);
-                test (E0);
-                return 0;
-            }
-            ],
-            [AC_MSG_ERROR([your version of the GNU C++ compile has a bug which prevents LibreOffice from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details.])], [AC_MSG_RESULT([no])])
-    fi
-fi
-
-dnl ===================================================================
-dnl Set the gcc/gxx include directories
-dnl ===================================================================
-# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
-# often contains an i386 which is expanded as a macro.
-if test "$GXX" = "yes"; then
-    AC_MSG_CHECKING([for g++ include path])
-    if test -z "$with_gxx_include_path"; then
-        with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-        if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
-            with_gxx_include_path="/usr/include"
-        fi
-        if test "$build_os" = "cygwin" -a "$WITH_MINGW" = "yes"; then
-            with_gxx_include_path=`cygpath -d "$with_gxx_include_path"`
-            with_gxx_include_path=`cygpath -u "$with_gxx_include_path"`
-        fi
-        if echo $with_gxx_include_path | grep -q linux; then
-            # workaround for Mandriva - issue 100049
-            with_gxx_include_path=`cd $with_gxx_include_path && pwd`
-        fi
-    fi
-    dnl This is the original code...
-    dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
-    if test -z "$with_gxx_include_path"; then
-        with_gxx_include_path="NO_GXX_INCLUDE"
-        AC_MSG_RESULT([none])
-    else
-        AC_MSG_RESULT([$with_gxx_include_path])
-    fi
-else
-    with_gxx_include_path="NO_GXX_INCLUDE"
-fi
-GXX_INCLUDE_PATH="$with_gxx_include_path"
-AC_SUBST(GXX_INCLUDE_PATH)
-
-dnl ===================================================================
-dnl Set the MinGW include directories
-dnl ===================================================================
-if test "$WITH_MINGW" = "yes"; then
-    AC_MSG_CHECKING([for MinGW runtime include path])
-    cat >conftest.$ac_ext <<_ACEOF
-#include <stddef.h>
-#include <bits/c++config.h>
-_ACEOF
-    _mingw_lib_include_path=`$CXX -E -xc++ conftest.$ac_ext | $SED -n -e '/.*1*"\(.*\)\/stddef.h".*/s//\1/p' -e '/.*1*"\(.*\)\/bits\/c++config.h".*/s//\1/p' | sort -u | xargs echo`
-    rm conftest.$ac_ext
-    if test "$build_os" = "cygwin" -a -n "$_mingw_lib_include_path"; then
-        _temp=""
-        for a in $_mingw_lib_include_path
-        do
-            a=`cygpath -d "$a"`
-            _temp="$_temp "`cygpath -u "$a"`
-        done
-        _mingw_lib_include_path=$_temp
-    fi
-    if test -z "$_mingw_lib_include_path"; then
-        _mingw_lib_include_path="NO_LIB_INCLUDE"
-        AC_MSG_RESULT([no MinGW include path])
-    else
-        AC_MSG_RESULT([$_mingw_lib_include_path])
-    fi
-    MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path"
-    AC_SUBST(MINGW_LIB_INCLUDE_PATH)
-    dnl mingw gcc 4.4.0 needs backward in include path to use hash_set/hash_map
-    AC_MSG_CHECKING([for MinGW C++ backward include path])
-    cat >conftest.$ac_ext <<_ACEOF
-#include <hash_set>
-_ACEOF
-    _mingw_backward_include_path=`$CXX -E -xc++ -Wno-deprecated conftest.$ac_ext 2>&5| $SED -n -e '/.*1*"\(.*\)\/hash_set".*/s//\1/p' | sort -u | xargs echo`
-    rm conftest.$ac_ext
-    if test "$build_os" = "cygwin" -a -n "$_mingw_backward_include_path"; then
-        _mingw_backward_include_path=`cygpath -d $_mingw_backward_include_path`
-        _mingw_backward_include_path=`cygpath -u $_mingw_backward_include_path`
-        AC_MSG_RESULT([$_mingw_backward_include_path])
-    else
-        _mingw_backward_include_path="NO_BACKWARD_INCLUDE"
-        AC_MSG_RESULT([no MinGW C++ backward includes])
-    fi
-    MINGW_BACKWARD_INCLUDE_PATH="$_mingw_backward_include_path"
-    AC_SUBST(MINGW_BACKWARD_INCLUDE_PATH)
-    mingw_crtbegin=`$CC -print-file-name=crtbegin.o`
-    MINGW_CLIB_DIR=`dirname $mingw_crtbegin`
-
-    # How to do this crack when cross-compiling?
-    AC_MSG_CHECKING([whether to use dynamic libgcc])
-    if test "$build_os" = "cygwin" -a -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
-        AC_MSG_CHECKING([dynamic libgcc name])
-        MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | $SED -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | $SED -e 's@_@?@g'`
-        MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
-        if test -n "$MINGW_GCCDLL"; then
-            MINGW_SHARED_GCCLIB=YES
-            AC_MSG_RESULT([use $MINGW_GCCDLL])
-        else
-            AC_MSG_RESULT([no])
-        fi
-    else
-        AC_MSG_RESULT([no])
-    fi
-    if test -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then
-        MINGW_GCCLIB_EH=YES
-    fi
-
-    AC_MSG_CHECKING([whether to use dynamic libstdc++])
-    MINGW_SHARED_LIBSTDCPP=
-    if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
-        MINGW_SHARED_LIBSTDCPP=stdc++_s
-    fi
-    if test -e "$MINGW_CLIB_DIR/libstdc++.dll.a" ; then
-        MINGW_SHARED_LIBSTDCPP=stdc++.dll
-    fi
-    if test "$build_os" = "cygwin" -a -n "$MINGW_SHARED_LIBSTDCPP" ; then
-        AC_MSG_CHECKING([dynamic libstdc++ name])
-        MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/lib$MINGW_SHARED_LIBSTDCPP.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
-        MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
-        if test -n "$MINGW_GXXDLL"; then
-            MINGW_SHARED_LIBSTDCPP=-l$MINGW_SHARED_LIBSTDCPP
-            MINGW_SHARED_GXXLIB=YES
-            AC_MSG_RESULT([use $MINGW_GXXDLL])
-        else
-            MINGW_SHARED_LIBSTDCPP=
-            AC_MSG_RESULT([no])
-        fi
-    else
-        AC_MSG_RESULT([no])
-    fi
-    test "$build_os" = "cygwin" && MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR`
-    AC_SUBST(MINGW_CLIB_DIR)
-    AC_SUBST(MINGW_SHARED_GCCLIB)
-    AC_SUBST(MINGW_GCCLIB_EH)
-    AC_SUBST(MINGW_SHARED_GXXLIB)
-    AC_SUBST(MINGW_SHARED_LIBSTDCPP)
-    AC_SUBST(MINGW_GCCDLL)
-    AC_SUBST(MINGW_GXXDLL)
-fi
-
-dnl ===================================================================
-dnl Extra checking for the SunOS compiler
-dnl ===================================================================
-if test "$_os" = "SunOS"; then
-    dnl SunStudio C++ compiler packaged with SunStudio C compiler
-    if test "$CC" = "cc"; then
-    AC_MSG_CHECKING([SunStudio C++ Compiler])
-        if test "$CXX" != "CC"; then
-            AC_MSG_WARN([SunStudio C++ was not found])
-            echo "SunStudio C++ was not found" >> warn
-        else
-            AC_MSG_RESULT([checked])
-        fi
-    fi
-fi
-
-dnl *************************************************************
-dnl Testing for exception handling - dwarf2 or sjlj exceptions...
-dnl *************************************************************
-if test "$WITH_MINGW" = "yes"; then
-    AC_MSG_CHECKING([exception type])
-    AC_LANG_PUSH([C++])
-    AC_TRY_LINK(
-        [#include <iostream>
-
-        extern "C" void _Unwind_SjLj_RaiseException(void) __attribute__ ((__noreturn__));
-
-        ],
-        [_Unwind_SjLj_RaiseException() ],
-        [exceptions_type="sjlj"],
-        [exceptions_type="dwarf2"]
-    )
-    AC_MSG_RESULT($exceptions_type)
-    AC_LANG_POP([C++])
-fi
-
-EXCEPTIONS="$exceptions_type"
-AC_SUBST(EXCEPTIONS)
-
-dnl ===================================================================
-dnl Checks for what the default STL should be
-dnl ===================================================================
-AC_MSG_CHECKING([Whether building STLPort library makes sense])
-BUILD_STLPORT="no"
-if test "$_os" = "Linux"; then
-    case "$host_cpu" in
-    i?86)
-        case "$host_os" in
-        k*bsd*-gnu*)
-            BUILD_STLPORT="no"
-            ;;
-        *)
-            BUILD_STLPORT="yes"
-            ;;
-        esac
-        ;;
-    *)
-        BUILD_STLPORT="no"
-        ;;
-    esac
-elif test "$_os" = "SunOS"; then
-    BUILD_STLPORT="yes"
-elif test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
-    BUILD_STLPORT="yes"
-elif test "$_os" = "FreeBSD"; then
-    BUILD_STLPORT="yes"
-fi
-if test "$BUILD_STLPORT" = "yes" ; then
-    AC_MSG_RESULT([yes])
-else
-    AC_MSG_RESULT([no])
-fi
-
-AC_MSG_CHECKING([Whether STLPort library will be actually built])
-if test "$with_stlport" = "auto" -o "$BUILD_STLPORT" = "no"; then
-    with_stlport=$BUILD_STLPORT
-fi
-if test "$with_stlport" = "yes" ; then
-    AC_MSG_RESULT([yes])
-    WITH_STLPORT=YES
-    SCPDEFS="$SCPDEFS -DWITH_STLPORT"
-    BUILD_TYPE="$BUILD_TYPE STLPORT"
-else
-    WITH_STLPORT=NO
-    AC_MSG_RESULT([no])
-fi
-
-AC_SUBST(WITH_STLPORT)
-
-dnl ===================================================================
-dnl visibility and c++0x features
-dnl ===================================================================
-if test "$GCC" = "yes"; then
-    AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -Werror -fvisibility=hidden"
-    AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_VISIBILITY_FEATURE=TRUE ], [])
-    CFLAGS=$save_CFLAGS
-    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-    fi
-
-    AC_MSG_CHECKING([whether $CC supports -Wno-long-double])
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -Werror -Wno-long-double"
-    AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_NO_LONG_DOUBLE=TRUE ], [])
-    CFLAGS=$save_CFLAGS
-    if test "$HAVE_GCC_NO_LONG_DOUBLE" = "TRUE"; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-    fi
-
-    AC_MSG_CHECKING([whether $CC supports -mno-avx])
-    save_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -Werror -mno-avx"
-    AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_AVX=TRUE ], [])
-    CFLAGS=$save_CFLAGS
-    if test "$HAVE_GCC_AVX" = "TRUE"; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-    fi
-
-    AC_MSG_CHECKING([whether $CC supports -std=c++0x without Language Defect 757])
-    save_CXXFLAGS=$CFLAGS
-    CXXFLAGS="$CXXFLAGS -std=c++0x"
-    AC_LANG_PUSH([C++])
-
-    AC_TRY_COMPILE([
-#include <stddef.h>
-
-template <typename T, size_t S> char (&sal_n_array_size( T(&)[S] ))[S];
-
-namespace
-{
-        struct b
-        {
-                int i;
-                int j;
-        };
-}
-],[
-struct a
-{
-        int i;
-        int j;
-};
-a thinga[]={{0,0}, {1,1}};
-b thingb[]={{0,0}, {1,1}};
-size_t i = sizeof(sal_n_array_size(thinga));
-size_t j = sizeof(sal_n_array_size(thingb));
-return !(i != 0 && j != 0);
-], HAVE_CXX0X=TRUE,)
-
-    AC_LANG_POP([C++])
-    CXXFLAGS=$save_CXXFLAGS
-    if test "$HAVE_CXX0X" = "TRUE"; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-    fi
-fi
-
-AC_SUBST(HAVE_CXX0X)
-AC_SUBST(HAVE_GCC_NO_LONG_DOUBLE)
-AC_SUBST(HAVE_GCC_AVX)
-
-# ===================================================================
-# use ccache?
-# ===================================================================
-dnl need to check for ccache version: otherwise prevents
-dnl caching of the results (like "-x objective-c++" for Mac)
-AC_MSG_CHECKING([whether we are able to use --ccache-skip])
-if test $_os != Darwin -a $_os != iOS; then
-    AC_MSG_RESULT([only needed on Mac and iOS currently, skipping])
-else
-    # checking for ccache presence/version
-    AC_MSG_RESULT([probing...])
-    AC_PATH_PROG([CCACHE],[ccache],[not_found])
-    if test "$CCACHE" = "not_found" ; then
-        AC_MSG_NOTICE([not enabling --ccache-skip (ccache not found)])
-    else
-        # check ccache version
-        AC_MSG_CHECKING([whether version of ccache is suitable])
-        CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'`
-        CCACHE_NUMVER=`echo $CCACHE_VERSION | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-        if test "$CCACHE_VERSION" = "2.4_OOo" -o "$CCACHE_NUMVER" -ge "030100"; then
-            AC_MSG_RESULT([yes])
-            AC_MSG_CHECKING([whether ccache is actually used for the build])
-            AC_LANG_PUSH([C++])
-            save_CXXFLAGS=$CXXFLAGS
-            CXXFLAGS="$CXXFLAGS --ccache-skip -O2"
-            dnl an empty program will do, we're checking the compiler flags
-            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
-                [use_ccache=yes], [use_ccache=no])
-            if test $use_ccache = yes ; then
-                AC_MSG_RESULT([yes, will enable --ccache-skip])
-                AC_SUBST([USE_CCACHE], [YES])
-            else
-                AC_MSG_RESULT([no, will not enable --ccache-skip])
-            fi
-            CXXFLAGS=$save_CXXFLAGS
-            AC_LANG_POP([C++])
-        else
-            AC_MSG_RESULT([no])
-            AC_MSG_NOTICE([ccache version $CCACHE_VERSION not accepted. ccache will not be used.])
-        fi
-    fi
-fi
-
-dnl ===================================================================
-dnl system stl sanity tests
-dnl ===================================================================
-HAVE_GCC_VISIBILITY_BROKEN=
-if test \( "$_os" != "WINNT" -o "$WITH_MINGW" = "yes" \) ; then
-
-    AC_LANG_PUSH([C++])
-
-    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-        AC_MSG_CHECKING([if STL headers are visibility safe])
-        AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
-        AC_MSG_RESULT([$stlvisok])
-        if test "$stlvisok" = "no"; then
-            AC_MSG_WARN([Your gcc STL headers are not visibility safe. Disabling visibility])
-            echo "Your gcc STL headers are not visibility safe. Disabling visibility" >> warn
-            unset HAVE_GCC_VISIBILITY_FEATURE
-        fi
-    fi
-
-    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-        sharedlink_ldflags_save=$LDFLAGS
-        LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared"
-
-        AC_MSG_CHECKING([if gcc is -fvisibility-inlines-hidden safe with STL headers])
-        AC_TRY_LINK(
-            [
-#include <sstream>
-using namespace std;
-            ],[
-istringstream strm( "test" ); return 0;
-            ],
-            $EGREP -q  unresolvable conftest.err;
-            if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi,
-            gccvisok=no
-        )
-        AC_MSG_RESULT([$gccvisok])
-        if test "$gccvisok" = "no"; then
-            AC_MSG_WARN([Your gcc is not -fvisibility-inlines-hidden safe, disabling that.])
-            echo "Your gcc is not -fvisibility-inlines-hidden safe, disabling that." >> warn
-            HAVE_GCC_VISIBILITY_BROKEN="TRUE"
-        fi
-
-        LDFLAGS=$sharedlink_ldflags_save
-    fi
-
-    if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
-        AC_MSG_CHECKING([if gcc has a visibility bug with class-level attributes (GCC bug 26905)])
-        cat >visibility.cxx <<_ACEOF
-#pragma GCC visibility push(hidden)
-struct __attribute__ ((visibility ("default"))) TestStruct {
-  static void Init();
-};
-__attribute__ ((visibility ("default"))) void TestFunc() {
-  TestStruct::Init();
-}
-_ACEOF
-        if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
-            gccvisbroken=yes
-        else
-            case "$host_cpu" in
-            i?86|x86_64)
-                if test "$_os" = "Darwin"; then
-                    gccvisbroken=no
-                else
-                    if $EGREP -q '@PLT' visibility.s; then
-                        gccvisbroken=no
-                    else
-                        gccvisbroken=yes
-                    fi
-                fi
-                ;;
-            *)
-                gccvisbroken=no
-                ;;
-            esac
-        fi
-        rm -f visibility.s
-
-        AC_MSG_RESULT([$gccvisbroken])
-        if test "$gccvisbroken" = "yes"; then
-            AC_MSG_WARN([Your gcc is not -fvisibility=hidden safe. Disabling visibility])
-            echo "Your gcc is not -fvisibility=hidden safe. Disabling visibility" >> warn
-            unset HAVE_GCC_VISIBILITY_FEATURE
-        fi
-    fi
-
-    AC_LANG_POP([C++])
-fi
-
-AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
-AC_SUBST(HAVE_GCC_VISIBILITY_BROKEN)
-
-dnl ===================================================================
-dnl allocator
-dnl ===================================================================
-AC_MSG_CHECKING([which memory allocator to use])
-if test "$with_alloc" = "system"; then
-    AC_MSG_RESULT([system])
-    ALLOC="SYS_ALLOC";
-    AC_CHECK_FUNCS([malloc realloc calloc free])
-fi
-if test "$with_alloc" = "tcmalloc"; then
-    AC_MSG_RESULT(tcmalloc)
-    if ! echo $host_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
-        AC_MSG_ERROR([tcmalloc only available/usable on ix86])
-    fi
-    AC_CHECK_LIB(tcmalloc, malloc, [],
-        [AC_MSG_ERROR(tcmalloc not found or functional. Install the Google Profiling Tools)], [])
-    ALLOC="TCMALLOC";
-fi
-if test "$with_alloc" = "jemalloc"; then
-    if test "$_os" != "FreeBSD" -o "$_os" != "NetBSD"; then
-        AC_MSG_RESULT(jemalloc)
-        save_CFLAGS=$CFLAGS
-        CFLAGS="$CFLAGS -pthread"
-        AC_CHECK_LIB(jemalloc, malloc, [],
-            [AC_MSG_ERROR(jemalloc not found or functional. Install the jemalloc allocator.)], [])
-        ALLOC="JEMALLOC";
-        CFLAGS=$save_CFLAGS
-    else
-        AC_MSG_RESULT([system])
-        ALLOC="SYS_ALLOC";
-        AC_CHECK_FUNCS([malloc realloc calloc free])
-    fi
-fi
-if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
-    AC_MSG_RESULT([internal])
-fi
-AC_SUBST(ALLOC)
-
-dnl ===================================================================
-dnl Custom build version
-dnl ===================================================================
-
-AC_MSG_CHECKING([whether to add custom build version])
-if test "z$with_build_version" != "z"; then
-    BUILD_VER_STRING=$with_build_version
-    AC_MSG_RESULT([yes, $BUILD_VER_STRING])
-else
-    BUILD_VER_STRING=
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(BUILD_VER_STRING)
-
-dnl ===================================================================
-dnl Java support enable
-dnl ===================================================================
-AC_MSG_CHECKING([whether to build with Java support])
-if test "$with_java" != "no"; then
-    AC_MSG_RESULT([yes])
-    SOLAR_JAVA="TRUE"
-else
-    AC_MSG_RESULT([no])
-    SOLAR_JAVA=""
-fi
-
-AC_SUBST(SOLAR_JAVA)
-
-dnl SOLAR_JAVA="YES" (yes, silly name, should rename) indicates whether we
-dnl want there to be *run-time* (and build-time) support for Java extensions in the
-dnl built LibreOffice.
-dnl SOLAR_JAVA="BUILD" indicate build-time only support (no runtime support)
-dnl SOLAR_JAVA="" indicate no java support at all
-
-if test "$_os" = "Linux" && test "$host_cpu" = "powerpc"; then
-    # IBMs JDK needs this...
-    JITC_PROCESSOR_TYPE=6
-    export JITC_PROCESSOR_TYPE
-fi
-
-if test $_os = "WINNT"; then
-    WITH_VC_REDIST="TRUE"
-fi
-AC_SUBST(WITH_VC_REDIST)
-
-dnl ===================================================================
-dnl Checks for Java
-dnl ===================================================================
-if test "$SOLAR_JAVA" != ""; then
-
-    # Windows-specific tests
-    if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
-        if test "$CL_X64" != ""; then
-            bitness="64-bit"
-            otherbitness="32-bit"
-        else
-            bitness="32-bit"
-            otherbitness="64-bit"
-        fi
-
-        if test -z "$with_jdk_home"; then
-
-            # Unfortunately apparently no way to find, if needed, the 64-bit
-            # JDK in the Registry from the 32-bit Perl oowintool
-
-            _jdk_home=`./oowintool --jdk-home`
-            if test -f "$_jdk_home/lib/jvm.lib" -a -f "$_jdk_home/bin/java.exe"; then
-                with_jdk_home="$_jdk_home"
-                howfound="found by oowintool"
-            else
-                AC_MSG_ERROR([No JDK found by oowintool, pass the --with-jdk-home option pointing to a $bitness JDK])
-            fi
-        else
-            test "$build_os" = "cygwin" && with_jdk_home=`cygpath -u "$with_jdk_home"`
-            howfound="you passed"
-        fi
-    fi
-
-    JAVA_HOME=; export JAVA_HOME
-    if test -z "$with_jdk_home"; then
-        AC_PATH_PROG(JAVAINTERPRETER, $with_java)
-    else
-        _java_path="$with_jdk_home/bin/$with_java"
-        dnl Check if there is a Java interpreter at all.
-        if test -x "$_java_path"; then
-            JAVAINTERPRETER=$_java_path
-        else
-            AC_MSG_ERROR([$_java_path not found, pass --with-jdk-home])
-        fi
-    fi
-
-    if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
-        # Check that the JDK found is correct architecture
-        # Why is this necessary, we don't link with any library from the JDK I think,
-
-        shortjdkhome=`cygpath -d "$with_jdk_home"`
-        if test "$CL_X64" != "" -a -f "$with_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" = "" >/dev/null; then
-            AC_MSG_WARN([You are building 64-bit binaries but the JDK $howfound is 32-bit])
-            AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a 64-bit JDK])
-        elif test "$CL_X64" = "" -a -f "$_jdk_home/bin/java.exe" -a "`$shortjdkhome/bin/java.exe -version 2>&1 | grep -i 64-bit`" != ""  >/dev/null; then
-            AC_MSG_WARN([You are building 32-bit binaries but the JDK $howfound is 64-bit])
-            AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a (32-bit) JDK])
-        fi
-
-        if test x`echo "$JAVAINTERPRETER" | grep -i '\.exe$'` = x; then
-            JAVAINTERPRETER="${JAVAINTERPRETER}.exe"
-        fi
-        JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
-        JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
-    elif test "$_os" = "Darwin"; then
-        dnl HACK:  There currently is only a 32 bit version of LibreOffice for Mac OS X,
-        dnl and Tiger Java complains about -d32 while Snow Leopard Java needs it
-        dnl to run in 32 bit mode and be able to load LibreOffice jnilibs:
-        AC_MSG_CHECKING([whether to pass -d32 to Java interpreter])
-        if "$JAVAINTERPRETER" -d32 >&5 2>&5; then
-            AC_MSG_RESULT([yes])
-            JAVAIFLAGS=-d32
-        else
-            AC_MSG_RESULT([no])
-        fi
-    fi
-fi
-
-dnl ===================================================================
-dnl Checks for JDK.
-dnl ===================================================================
-if test "$SOLAR_JAVA" != ""; then
-    _gij_longver=0
-    AC_MSG_CHECKING([the installed JDK])
-    if test -n "$JAVAINTERPRETER"; then
-        dnl java -version sends output to stderr!
-        if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
-            AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
-        elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
-            JDK=gcj
-            AC_MSG_RESULT([checked (gcj)])
-            _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
-            _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-
-        elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "BEA"` -gt 0; then
-            AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
-        elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "IBM"` -gt 0; then
-            JDK=ibm
-
-            dnl IBM JDK specific tests
-            _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
-            _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-
-            if test "$_jdk_ver" -lt 10500; then
-                AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5])
-            fi
-
-            AC_MSG_RESULT([checked (IBM JDK $_jdk)])
-
-            if test "$with_jdk_home" = ""; then
-                AC_MSG_ERROR([In order to successfully build LibreOffice using the IBM JDK,
-you must use the "--with-jdk-home" configure option explicitly])
-            fi
-
-           JAVA_HOME=$with_jdk_home
-
-        else
-            JDK=sun
-
-            dnl Sun JDK specific tests
-            _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
-            _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-
-            if test "$_jdk_ver" -lt 10500; then
-                AC_MSG_ERROR([JDK is too old, you need at least 1.5])
-            fi
-            AC_MSG_RESULT([checked (JDK $_jdk)])
-            JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
-            if test "$_os" = "WINNT"; then
-                JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[[eE]][[xX]][[eE]]$,,"`
-            fi
-        fi
-    else
-        AC_MSG_ERROR([Java not found. You need at least jdk-1.5, or gcj-4])
-    fi
-else
-    dnl Java disabled
-    JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
-fi
-
-_java_target_ver="1.5"
-dnl ===================================================================
-dnl Check for target Java bytecode version
-dnl ===================================================================
-if test "$SOLAR_JAVA" != ""; then
-    AC_MSG_CHECKING([for target Java bytecode version])
-    if test "$JDK" = "gcj" -o "$JDK" = "kaffe"; then
-    AC_MSG_RESULT([default by $JDK])
-    if test -n "$with_java_target_version" -a "$with_java_target_version" != "no" ; then
-        AC_MSG_WARN([Value defined by --with-java-target-version is ignored!])
-    fi
-    else
-    if test -n "$with_java_target_version" -a "$with_java_target_version" != "no" ; then
-        _java_target_ver="$with_java_target_version"
-        AC_MSG_RESULT([$_java_target_ver])
-    elif test $_jdk_ver -gt 10000 ; then
-        _java_target_ver=`echo "$_jdk_ver" | $AWK '{ maj=substr($0,1,1); min=substr($0,2,2); print int(maj)"."int(min) }'`
-        AC_MSG_RESULT([$_java_target_ver])
-    else
-        AC_MSG_ERROR([Unable to guess Java bytecode version from Java version!])
-    fi
-    fi
-
-    if ! test -z "$_java_target_ver" -o \
-        "$_java_target_ver" = "1.1" -o \
-            "$_java_target_ver" = "1.2" -o \
-        "$_java_target_ver" = "1.3" -o \
-        "$_java_target_ver" = "1.4" -o \
-        "$_java_target_ver" = "1.5" -o \
-        "$_java_target_ver" = "1.6" -o \
-        "$_java_target_ver" = "5" ; then
-        AC_MSG_ERROR([$_java_target_ver is not a supported Java bytecode version!])
-    fi
-
-    JAVA_SOURCE_VER="$_java_target_ver"
-    JAVA_TARGET_VER="$_java_target_ver"
-fi
-
-dnl ===================================================================
-dnl Checks for javac
-dnl ===================================================================
-if test "$SOLAR_JAVA" != ""; then
-    if test "$JDK" = "gcj"; then
-        javacompiler=`echo $with_java | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
-    else
-        javacompiler="javac"
-    fi
-    if test -z "$with_jdk_home"; then
-        AC_PATH_PROG(JAVACOMPILER, $javacompiler)
-    else
-        _javac_path="$with_jdk_home/bin/$javacompiler"
-        dnl Check if there is a Java compiler at all.
-        if test -x "$_javac_path"; then
-            JAVACOMPILER=$_javac_path
-        fi
-    fi
-    if test -z "$JAVACOMPILER"; then
-        AC_MSG_ERROR([$javacompiler not found set with_jdk_home])
-    fi
-    if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
-        if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
-            JAVACOMPILER="${JAVACOMPILER}.exe"
-        fi
-        JAVACOMPILER=`cygpath -d "$JAVACOMPILER"`
-        JAVACOMPILER=`cygpath -u "$JAVACOMPILER"`
-    fi
-
-    if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then
-        AC_MSG_CHECKING([re-checking JDK])
-        JDK=gcj
-        AC_MSG_RESULT([checked (ecj)])
-        #TODO: what's to do here? some switch to do 1.5 compiling?
-        JAVAFLAGS="-source 1.5 -target 1.5"
-        _gij_longver="40200"
-    fi
-fi
-
-JAVACISGCJ=""
-dnl ===================================================================
-dnl Checks that javac is gcj
-dnl ===================================================================
-if test "$SOLAR_JAVA" != ""; then
-    if test `$JAVACOMPILER --version 2>&1 | grep -c "GCC"` -gt 0; then
-        JAVACISGCJ="yes"
-    fi
-fi
-AC_SUBST(JAVACISGCJ)
-
-JAVACISKAFFE=""
-dnl ===================================================================
-dnl Checks that javac is kaffe
-dnl ===================================================================
-if test "$SOLAR_JAVA" != ""; then
-    if test `$JAVACOMPILER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
-        JAVACISKAFFE="yes"
-    fi
-fi
-AC_SUBST(JAVACISKAFFE)
-
-dnl ===================================================================
-dnl Checks for javadoc
-dnl ===================================================================
-if test "$SOLAR_JAVA" != ""; then
-    if test -z "$with_jdk_home"; then
-        AC_PATH_PROG(JAVADOC, javadoc)
-    else
-        _javadoc_path="$with_jdk_home/bin/javadoc"
-        dnl Check if there is a javadoc at all.
-        if test -x "$_javadoc_path"; then
-            JAVADOC=$_javadoc_path
-        else
-            AC_PATH_PROG(JAVADOC, javadoc)
-        fi
-    fi
-    if test -z "$JAVADOC"; then
-        AC_MSG_ERROR([$_javadoc_path not found set with_jdk_home])
-    fi
-    if test "$build_os" = "cygwin" -a "$_os" = "WINNT"; then
-        if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then
-            JAVADOC="${JAVADOC}.exe"
-        fi
-        JAVADOC=`cygpath -d "$JAVADOC"`
-        JAVADOC=`cygpath -u "$JAVADOC"`
-    fi
-fi
-
-if test "$SOLAR_JAVA" != ""; then
-    # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
-    if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
-        if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 2>/dev/null; then
-           # try to recover first by looking whether we have a alternatives
-           # system as in Debian or newer SuSEs where following /usr/bin/javac
-           # over /etc/alternatives/javac leads to the right bindir where we
-           # just need to strip a bit away to get a valid JAVA_HOME
-           JAVA_HOME=$(readlink $(readlink $JAVACOMPILER))
-        elif readlink $JAVACOMPILER >/dev/null 2>/dev/null; then
-            # maybe only one level of symlink (e.g. on Mac)
-            JAVA_HOME=$(readlink $JAVACOMPILER)
-            if test "$(dirname $JAVA_HOME)" = "."; then
-                # we've got no path to trim back
-                JAVA_HOME=""
-            fi
-        else
-            # else warn
-            AC_MSG_WARN([JAVA_HOME is set to /usr - this is very likely to be incorrect])
-            AC_MSG_WARN([if this is the case, please inform the correct JAVA_HOME with --with-jdk-home])
-            echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn
-            echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn
-        fi
-        dnl now that we have the path to the real javac, make a JAVA_HOME out of it..
-        if test "$JAVA_HOME" != "/usr"; then
-            if test "$_os" = "Darwin"; then
-                dnl Leopard returns a non-suitable path with readlink - points to "Current" only
-                JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/Current/Commands/javac$,/CurrentJDK/Home,)
-                dnl Tiger already returns a JDK path..
-                JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/CurrentJDK/Commands/javac$,/CurrentJDK/Home,)
-            else
-                JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/bin/javac$,,)
-            fi
-        fi
-    fi
-    # as we drop out of this, JAVA_HOME may have been set to the empty string by readlink
-
-    dnl now if JAVA_HOME has been set to empty, then call findhome to find it
-    if test -z "$JAVA_HOME"; then
-        if test "x$with_jdk_home" = "x"; then
-            cat > findhome.java <<_ACEOF
-[import java.io.File;
-
-class findhome
-{
-    public static void main(String args[])
-    {
-        String jrelocation = System.getProperty("java.home");
-        File jre = new File(jrelocation);
-        System.out.println(jre.getParent());
-    }
-}]
-_ACEOF
-            AC_MSG_CHECKING([if javac works])
-            javac_cmd="$JAVACOMPILER findhome.java 1>&2"
-            AC_TRY_EVAL(javac_cmd)
-            if test $? = 0 && test -f ./findhome.class ; then
-                AC_MSG_RESULT([javac works])
-            else
-                echo "configure: javac test failed" >&5
-                cat findhome.java >&5
-                AC_MSG_ERROR([javac does not work - java projects will not build!])
-            fi
-
-            AC_MSG_CHECKING([if gij knows its java.home])
-            JAVA_HOME=`$JAVAINTERPRETER findhome`
-            if test $? = 0 && test "$JAVA_HOME" != "" ; then
-                AC_MSG_RESULT([$JAVA_HOME])
-            else
-                echo "configure: java test failed" >&5
-                cat findhome.java >&5
-                AC_MSG_ERROR([gij does not know its java.home - use --with-jdk-home])
-            fi
-        else
-            JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$with_java,,p"`
-        fi
-    fi
-
-    dnl second sanity check JAVA_HOME if possible
-    if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
-        # now check if $JAVA_HOME is really valid
-        if test "$_os" = "Darwin"; then
-            if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then
-                JAVA_HOME_OK="NO"
-            fi
-        elif test ! -d "$JAVA_HOME/jre" -a "x$with_jdk_home" = "x"; then
-            JAVA_HOME_OK="NO"
-        fi
-        if test "$JAVA_HOME_OK" = "NO"; then
-            AC_MSG_WARN([JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script])
-            AC_MSG_WARN([attempted to find JAVA_HOME automatically, but apparently it failed])
-            AC_MSG_WARN([in case JAVA_HOME is incorrectly set, some projects with not be built correctly])
-            echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
-            echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
-            echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
-        fi
-    fi
-    AC_MSG_NOTICE([JAVA_HOME=$JAVA_HOME])
-fi
-
-AWTLIB=
-
-if test "$SOLAR_JAVA" != ""; then
-    AC_MSG_CHECKING([for jawt lib name])
-    if test "$JDK" = "gcj"; then
-        save_CFLAGS=$CFLAGS
-        save_LDFLAGS=$LDFLAGS
-        CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-        LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
-        exec 6>/dev/null # no output
-        AC_CHECK_HEADER(jni.h, [],
-                    [AC_MSG_ERROR([jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?])], [])
-        AC_CHECK_LIB(gcjawt, JAWT_GetAWT, [ AWTLIB="-lgcjawt -lgcj"] )
-        exec 6>&1 # output on again
-        CFLAGS=$save_CFLAGS
-        LDFLAGS=$save_LDFLAGS
-    fi
-    # IBM SDK 1.5.0-sr5 includes libjawt.so with unresolved symbols.
-    # A workaround is to link also against libpmawt.so
-    if test "$JDK" = "ibm" ; then
-        save_CFLAGS=$CFLAGS
-        save_LDFLAGS=$LDFLAGS
-        save_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-        CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-        LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin"
-        LD_LIBRARY_PATH=$JAVA_HOME/jre/bin:$JAVA_HOME/jre/bin/classic:$JAVA_HOME/jre/bin/xawt:$LD_LIBRARY_PATH
-        export LD_LIBRARY_PATH
-        exec 6>/dev/null # no output
-        AC_CHECK_HEADER(jni.h, [],
-                    [AC_MSG_ERROR([jni.h could not be found.])], [])
-        AC_CHECK_LIB(jawt, JAWT_GetAWT, [ AWTLIB="-ljawt"] )
-        if test -z "$AWTLIB"; then
-            LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin/xawt -ljawt"
-            AC_CHECK_LIB(mawt, JAWT_GetAWT, [ AWTLIB="-L$JAVA_HOME/jre/bin/xawt -ljawt -lmawt"])
-        fi
-        exec 6>&1 # output on again
-        CFLAGS=$save_CFLAGS
-        LDFLAGS=$save_LDFLAGS
-        LD_LIBRARY_PATH=$save_LD_LIBRARY_PATH
-    fi
-    if test -z "$AWTLIB"; then
-        AWTLIB=-ljawt
-    fi
-    AC_MSG_RESULT([$AWTLIB])
-    AC_SUBST(AWTLIB)
-fi
-
-AC_SUBST(JAVA_HOME)
-AC_SUBST(JDK)
-AC_SUBST(JAVAFLAGS)
-AC_SUBST(JAVA_SOURCE_VER)
-AC_SUBST(JAVA_TARGET_VER)
-AC_SUBST(JAVAINTERPRETER)
-AC_SUBST(JAVAIFLAGS)
-AC_SUBST(JAVACOMPILER)
-AC_SUBST(JAVADOC)
-
-dnl ===================================================================
-dnl Checks for specific files.
-dnl ===================================================================
-
-dnl ===================================================================
-dnl Checks for programs.
-dnl ===================================================================
-
-dnl ===================================================================
-dnl Check whether we already have dmake
-dnl ===================================================================
-AC_PATH_PROG(DMAKE, dmake, no)
-if test "$DMAKE" = "no"; then
-    BUILD_DMAKE=YES
-    echo "dmake will be built on ./bootstrap"
-else
-    AC_MSG_CHECKING([whether the found dmake is the right dmake])
-    # we need to find out whether that dmake we found is "our" dmake
-    # or the dmake from Sun's SunStudio Compiler which is something
-    # different
-    # This test _should_ work because the one accepts -V (ours) and one
-    # (the other) not...
-    $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
-    if test $? -eq 0; then
-        BUILD_DMAKE=NO
-        AC_MSG_RESULT([yes])
-        AC_MSG_CHECKING([the dmake version])
-        DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
-        if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
-            AC_MSG_RESULT([OK, >= 4.11])
-        elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \
-            test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
-            AC_MSG_RESULT([OK, >= 4.11])
-        else
-            AC_MSG_RESULT([too old. >= 4.11 is needed])
-            echo "A newer dmake will be built on ./bootstrap"
-            BUILD_DMAKE=YES
-        fi
-    else
-        AC_MSG_RESULT([no])
-        echo "dmake will be built on ./bootstrap"
-        BUILD_DMAKE=YES
-    fi
-fi
-AC_SUBST(BUILD_DMAKE)
-
-AC_MSG_CHECKING([whether to enable EPM for packing])
-BUILD_EPM=NO
-if test "$enable_epm" = "yes"; then
-    AC_MSG_RESULT([yes])
-    dnl ===================================================================
-    dnl Check for epm - not needed for Windows
-    dnl ===================================================================
-    if test "$_os" != "WINNT"; then
-        if test -n "$with_epm"; then
-            EPM=$with_epm
-        else
-            AC_PATH_PROG(EPM, epm, no)
-        fi
-        if test "$EPM" = "no" || test "$EPM" = "internal"; then
-            echo "EPM will be built."
-            BUILD_EPM=YES
-            BUILD_TYPE="$BUILD_TYPE EPM"
-        else
-            # Gentoo has some epm which is something different...
-            AC_MSG_CHECKING([whether the found epm is the right epm])
-            if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then
-                AC_MSG_RESULT([yes])
-            else
-                AC_MSG_ERROR([no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm])
-            fi
-            AC_MSG_CHECKING([epm version])
-            EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
-            if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
-               test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
-                AC_MSG_RESULT([OK, >= 3.7])
-                BUILD_EPM=NO
-                if test "$_os" = "Darwin"; then
-                    AC_MSG_CHECKING([which PackageMaker EPM thinks to use])
-                    _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
-                    if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
-                        AC_MSG_ERROR([$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)])
-                    elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
-                        AC_MSG_RESULT([$_pm, ok])
-                    else # we never should get here, but go safe
-                        AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)])
-                    fi
-                fi
-            else
-                AC_MSG_RESULT([too old. epm >= 3.7 is required.])
-                echo "EPM will be built."
-                BUILD_EPM=YES
-                BUILD_TYPE="$BUILD_TYPE EPM"
-            fi
-        fi
-    fi
-
-    # test which package format to use
-    AC_MSG_CHECKING([which package format to use])
-
-    # defaults
-    case "$_os" in
-    Darwin)
-        PKGFORMAT=dmg
-        ;;
-    SunOS)
-        PKGFORMAT=pkg
-        ;;
-    Linux)
-        # if building on Debian, default should be deb...
-        if test -e /etc/debian_version; then
-            PKGFORMAT=deb
-        else
-            PKGFORMAT=rpm
-        fi
-        ;;
-    AIX)
-        PKGFORMAT=rpm
-        ;;
-    OpenBSD|DragonFly)
-        PKGFORMAT=portable
-        ;;
-    *BSD)
-        PKGFORMAT=bsd
-        ;;
-    WINNT)
-        PKGFORMAT=msi
-        ;;
-    # we never should get here since we check the arciecture/os at the beginning,
-    # but go sure...
-    *)
-        AC_MSG_ERROR([unknown system])
-    esac
-    if test -n "$with_package_format"; then
-        for i in $with_package_format; do
-            case "$i" in
-            aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi)
-                ;;
-            *)
-                AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
-aix - AIX software distribution
-bsd - FreeBSD, NetBSD, or OpenBSD software distribution
-depot or swinstall - HP-UX software distribution
-deb - Debian software distribution
-inst or tardist - IRIX software distribution
-osx - MacOS X software distribution
-pkg - Solaris software distribution
-rpm - RedHat software distribution
-setld - Tru64 (setld) software distribution
-native - "Native" software distribution for the platform
-portable - Portable software distribution
-LibreOffice additionally supports:
-archive - .tar.gz or .zip
-dmg - Mac OS X .dmg
-installed - installation tree
-msi - Windows .msi
-            ])
-                ;;
-            esac
-        done
-        PKGFORMAT="$with_package_format"
-    fi
-    AC_MSG_RESULT([$PKGFORMAT])
-    if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then
-        AC_MSG_CHECKING([for rpm])
-        for a in "$RPM" rpmbuild rpm; do
-            $a --usage >/dev/null 2> /dev/null
-            if test $? -eq 0; then
-                RPM=$a
-                break
-            else
-                $a --version >/dev/null 2> /dev/null
-                if test $? -eq 0; then
-                    RPM=$a
-                    break
-                fi
-            fi
-        done
-        if test -z "$RPM" ; then
-            AC_MSG_ERROR([not found])
-        elif "$RPM" --help 2>&1 | $EGREP buildroot >/dev/null; then
-            RPM_PATH=`which $RPM`
-            AC_MSG_RESULT([$RPM_PATH])
-        else
-            AC_MSG_ERROR([cannot build packages. Try installing rpmbuild.])
-        fi
-    fi
-    if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then
-        AC_PATH_PROG(DPKG, dpkg, no)
-        if test "$DPKG" = "no"; then
-            AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.])
-        fi
-    fi
-    if echo "PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then
-        if test "$_os" = "Darwin"; then
-            AC_MSG_CHECKING([for PackageMaker availability])
-            if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then
-                AC_MSG_ERROR([not installed. Please install Apples Dev Tools])
-            else
-                AC_MSG_RESULT([ok])
-            fi
-        else
-            AC_MSG_ERROR([PackageMaker needed to build OSX packages and you are not on OSX...])
-        fi
-    fi
-    if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
-       echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
-        if test "$EPM" != "no" && test "$EPM" != "internal"; then
-            if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
-                AC_MSG_CHECKING([whether epm is patched for LibreOffice's needs])
-                if grep "Patched for LibreOffice" $EPM >/dev/null 2>/dev/null; then
-                    AC_MSG_RESULT([yes])
-                else
-                    AC_MSG_RESULT([no])
-                    if echo "$PKGFORMAT" | grep -q rpm; then
-                        _pt="rpm"
-                        AC_MSG_WARN([the rpms will need to be installed with --nodeps])
-                        echo "the rpms will need to be installed with --nodeps" >> warn
-                    else
-                        _pt="pkg"
-                    fi
-                    AC_MSG_WARN([the ${_pt}s will not be relocateable])
-                    echo "the ${_pt}s will not be relocateable" >> warn
-                    AC_MSG_WARN([if you want to make sure installation without --nodeps and
-                                 relocation will work, you need to patch your epm with the
-                                 patch in epm/epm-3.7.patch or build with
-                                 --with-epm=internal which will build a suitable epm])
-                fi
-            fi
-        fi
-    fi
-    if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
-        AC_PATH_PROG(PKGMK, pkgmk, no)
-        if test "$PKGMK" = "no"; then
-            AC_MSG_ERROR([pkgmk needed for Solaris pkg creation. Install it.])
-        fi
-    fi
-    AC_SUBST(RPM)
-    AC_SUBST(DPKG)
-    AC_SUBST(PKGMK)
-else
-    AC_MSG_RESULT([no])
-    EPM=NO
-    PKGFORMAT=native
-fi
-AC_SUBST(EPM)
-AC_SUBST(BUILD_EPM)
-AC_SUBST(PKGFORMAT)
-
-dnl ===================================================================
-dnl Check for gperf
-dnl ===================================================================
-AC_PATH_PROG(GPERF, gperf)
-if test -z "$GPERF"; then
-    AC_MSG_ERROR([gperf not found but needed. Install it.])
-fi
-AC_MSG_CHECKING([gperf version])
-if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then
-    AC_MSG_RESULT([OK])
-else
-    AC_MSG_ERROR([too old, you need at least 3.0.0])
-fi
-AC_SUBST(GPERF)
-
-dnl ===================================================================
-dnl Check for building stax
-dnl ===================================================================
-AC_MSG_CHECKING([whether to build the stax])
-if test -f "./stax/download/jsr173_1.0_api.jar"; then
-    BUILD_STAX=NO
-    AC_MSG_RESULT([no, will use the prebuilt stax/download/jsr173_1.0_api.jar])
-else
-    BUILD_STAX=YES
-    AC_MSG_RESULT([yes])
-fi
-AC_SUBST(BUILD_STAX)
-
-dnl ===================================================================
-dnl Check for building ODK
-dnl ===================================================================
-AC_MSG_CHECKING([whether to build the ODK])
-if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then
-    AC_MSG_RESULT([yes])
-
-    if test "$with_java" != "no"; then
-        AC_MSG_CHECKING([whether to build unowinreg.dll])
-        if test "$_os" = "WINNT" -a "z$enable_build_unowinreg" = "z" ; then
-            # build on Win by default
-            enable_build_unowinreg=yes
-        fi
-        if test "z$enable_build_unowinreg" = "z" -o "$enable_build_unowinreg" = "no"; then
-            AC_MSG_RESULT([no])
-            BUILD_UNOWINREG=NO
-        else
-            AC_MSG_RESULT([yes])
-            BUILD_UNOWINREG=YES
-        fi
-        if test "$_os" != "WINNT" -a "$BUILD_UNOWINREG" = "YES"; then
-            if test -z "$with_mingw_cross_compiler"; then
-                dnl Guess...
-                AC_CHECK_PROGS(MINGWCXX,i386-mingw32msvc-g++ i586-pc-mingw32-g++ i686-pc-mingw32-g++ i686-w64-mingw32-g++,false)
-            elif test -x "$with_mingw_cross_compiler"; then
-                 MINGWCXX="$with_mingw_cross_compiler"
-            else
-                AC_CHECK_TOOL(MINGWCXX, "$with_mingw_cross_compiler", false)
-            fi
-
-            if test "$MINGWCXX" = "false"; then
-                AC_MSG_ERROR([MinGW32 C++ cross-compiler not found.])
-            fi
-
-            mingwstrip_test="`echo $MINGWCXX | $SED -e s/g++/strip/`"
-            if test -x "$mingwstrip_test"; then
-                MINGWSTRIP="$mingwstrip_test"
-            else
-                AC_CHECK_TOOL(MINGWSTRIP, "$mingwstrip_test", false)
-            fi
-
-            if test "$MINGWSTRIP" = "false"; then
-                AC_MSG_ERROR(MinGW32 binutils not found.)
-            fi
-        fi
-    fi
-    BUILD_TYPE="$BUILD_TYPE ODK"
-else
-    AC_MSG_RESULT([no])
-    BUILD_UNOWINREG=NO
-fi
-AC_SUBST(BUILD_UNOWINREG)
-AC_SUBST(MINGWCXX)
-AC_SUBST(MINGWSTRIP)
-
-dnl ===================================================================
-dnl Check for system stdlibs
-dnl ===================================================================
-AC_MSG_CHECKING([whether to provide libstdc++/libgcc_s in the installset])
-if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \
-    test "$with_system_stdlibs" != "no"; then
-    AC_MSG_RESULT([no])
-    SYSTEM_STDLIBS=YES
-else
-    AC_MSG_RESULT([yes])
-    SYSTEM_STDLIBS=NO
-fi
-AC_SUBST(SYSTEM_STDLIBS)
-
-dnl ===================================================================
-dnl Check for system zlib
-dnl ===================================================================
-AC_MSG_CHECKING([which zlib to use])
-if test -n "$with_system_zlib" -o -n "$with_system_libs" -o \
-        "$_os" != "WINNT" && \
-    test "$with_system_zlib" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_ZLIB=YES
-    AC_CHECK_HEADER(zlib.h, [],
-        [AC_MSG_ERROR(zlib.h not found. install zlib)], [])
-    AC_CHECK_LIB(z, deflate, [ ZLIB=-lz ],
-        [AC_MSG_ERROR(zlib not found or functional)], [])
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_ZLIB=NO
-    BUILD_TYPE="$BUILD_TYPE ZLIB"
-fi
-AC_SUBST(SYSTEM_ZLIB)
-
-dnl ===================================================================
-dnl Check for system jpeg
-dnl ===================================================================
-AC_MSG_CHECKING([which jpeg to use])
-if test -n "$with_system_jpeg" -o -n "$with_system_libs" -o \
-        "$_os" = "Linux" && \
-    test "$with_system_jpeg" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_JPEG=YES
-    AC_CHECK_HEADER(jpeglib.h, [],
-        [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
-    AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
-    [AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_JPEG=NO
-    BUILD_TYPE="$BUILD_TYPE JPEG"
-fi
-AC_SUBST(SYSTEM_JPEG)
-
-dnl ===================================================================
-dnl Check for system expat
-dnl ===================================================================
-AC_MSG_CHECKING([which expat to use])
-if test -n "$with_system_expat" -o -n "$with_system_libs" && \
-    test "$with_system_expat" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_EXPAT=YES
-    AC_CHECK_HEADER(expat.h, [],
-        [AC_MSG_ERROR(expat.h not found. install expat)], [])
-    AC_CHECK_LIB(expat, XML_ParserCreate, [],
-    [AC_MSG_RESULT(expat library not found or functional.)], [])
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_EXPAT=NO
-    BUILD_TYPE="$BUILD_TYPE EXPAT"
-fi
-AC_SUBST(SYSTEM_EXPAT)
-
-dnl ===================================================================
-dnl Check for system libvisio
-dnl ===================================================================
-AC_MSG_CHECKING([which libvisio to use])
-if test -n "$with_system_libvisio" -a "$with_system_libvisio" = "yes"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_LIBVISIO=YES
-    PKG_CHECK_MODULES( LIBVISIO, libvisio-0.0 )
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_LIBVISIO=NO
-    BUILD_TYPE="$BUILD_TYPE LIBVISIO"
-fi
-AC_SUBST(SYSTEM_LIBVISIO)
-AC_SUBST(LIBVISIO_CFLAGS)
-AC_SUBST(LIBVISIO_LIBS)
-
-
-dnl ===================================================================
-dnl Check for system libwpd
-dnl ===================================================================
-AC_MSG_CHECKING([which libwpd to use])
-if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
-        test "$with_system_libwpd" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_LIBWPD=YES
-    PKG_CHECK_MODULES( LIBWPD, libwpd-0.9 libwpd-stream-0.9 )
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_LIBWPD=NO
-    BUILD_TYPE="$BUILD_TYPE LIBWPD"
-fi
-AC_SUBST(SYSTEM_LIBWPD)
-AC_SUBST(LIBWPD_CFLAGS)
-AC_SUBST(LIBWPD_LIBS)
-
-dnl ===================================================================
-dnl Check for system cppunit
-dnl ===================================================================
-AC_MSG_CHECKING([which cppunit to use])
-if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
-        test "$with_system_cppunit" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_CPPUNIT=YES
-    # might work for earlier, too but go sure:
-    PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.0 )
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_CPPUNIT=NO
-    BUILD_TYPE="$BUILD_TYPE CPPUNIT"
-fi
-AC_SUBST(SYSTEM_CPPUNIT)
-AC_SUBST(CPPUNIT_CFLAGS)
-AC_SUBST(CPPUNIT_LIBS)
-
-dnl ===================================================================
-dnl Check whether freetype is available
-dnl ===================================================================
-if test  "$test_freetype" = "yes"; then
-    AC_MSG_CHECKING([whether freetype is available])
-    PKG_CHECK_MODULES( FREETYPE, freetype2 >= 2.0 )
-fi
-AC_SUBST(FREETYPE_CFLAGS)
-AC_SUBST(FREETYPE_LIBS)
-
-dnl ===================================================================
-dnl Check for system libwps
-dnl ===================================================================
-AC_MSG_CHECKING([which libwps to use])
-if test -n "$with_system_libwps" -o -n "$with_system_libs" && \
-        test "$with_system_libwps" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_LIBWPS=YES
-    PKG_CHECK_MODULES( LIBWPS, libwps-0.2 )
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_LIBWPS=NO
-    BUILD_TYPE="$BUILD_TYPE LIBWPS"
-fi
-AC_SUBST(SYSTEM_LIBWPS)
-AC_SUBST(LIBWPS_CFLAGS)
-AC_SUBST(LIBWPS_LIBS)
-
-dnl ===================================================================
-dnl Check for system libwpg
-dnl ===================================================================
-AC_MSG_CHECKING([which libwpg to use])
-if test -n "$with_system_libwpg" -o -n "$with_system_libs" && \
-        test "$with_system_libwpg" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_LIBWPG=YES
-    PKG_CHECK_MODULES( LIBWPG, libwpg-0.2 )
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_LIBWPG=NO
-    BUILD_TYPE="$BUILD_TYPE LIBWPG"
-fi
-AC_SUBST(SYSTEM_LIBWPG)
-AC_SUBST(LIBWPG_CFLAGS)
-AC_SUBST(LIBWPG_LIBS)
-
-dnl ===================================================================
-dnl Check whether freetype2 supports emboldening
-dnl ===================================================================
-if test  "$test_freetype" = "yes"; then
-    save_CPPFLAGS="$CPPFLAGS"
-    save_LDFLAGS="$LDFLAGS"
-    save_LIBS="$LIBS"
-    CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
-    LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
-    AC_CHECK_LIB(freetype, FT_GlyphSlot_Embolden,
-                 [USE_FT_EMBOLDEN="YES"], [USE_FT_EMBOLDEN="NO"], [])
-    LDFLAGS="$save_LDFLAGS"
-    CPPFLAGS="$save_CPPFLAGS"
-    LIBS="$save_LIBS"
-fi
-AC_SUBST(USE_FT_EMBOLDEN)
-
-if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
-       test "$with_system_libxslt" != "no"; then
-    if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
-           test "$with_system_libxml" = "no"; then
-        # somehow AC_MSG_WARN won't work...
-        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
-        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
-        with_system_libxml=yes
-    fi
-fi
-if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
-       test "$with_system_libxml" != "no"; then
-    if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
-           test "$with_system_libxslt" = "no"; then
-        # somehow AC_MSG_WARN won't work...
-        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
-        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
-        with_system_libxslt=yes
-    fi
-fi
-
-# ===================================================================
-# Check for system libxslt
-# ===================================================================
-AC_MSG_CHECKING([which libxslt to use])
-if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \
-       "$_os" = "Darwin" && \
-       test "$with_system_libxslt" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_LIBXSLT=YES
-    if test "$_os" = "Darwin"; then
-        dnl make sure to use SDK path
-        LIBXSLT_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2"
-        dnl omit -L/usr/lib
-        LIBXSLT_LIBS="-lxslt -lxml2 -lz -lpthread -liconv -lm"
-    else
-        PKG_CHECK_MODULES(LIBXSLT, libxslt)
-    fi
-
-    dnl Check for xsltproc
-    AC_PATH_PROG(XSLTPROC, xsltproc, no)
-    if test "$XSLTPROC" = "no"; then
-        AC_MSG_ERROR([xsltproc is required])
-    fi
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_LIBXSLT=NO
-    BUILD_TYPE="$BUILD_TYPE LIBXSLT"
-
-    if test "$cross_compiling" = "yes"; then
-        AC_PATH_PROG(XSLTPROC, xsltproc, no)
-        if test "$XSLTPROC" = "no"; then
-            AC_MSG_ERROR([xsltproc is required])
-        fi
-    fi
-fi
-AC_SUBST(SYSTEM_LIBXSLT)
-AC_SUBST(LIBXSLT_CFLAGS)
-AC_SUBST(LIBXSLT_LIBS)
-AC_SUBST(XSLTPROC)
-
-# ===================================================================
-# Check for system libxml
-# ===================================================================
-AC_MSG_CHECKING([which libxml to use])
-if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
-            "$_os" = "Darwin" -o $_os = iOS && \
-        test "$with_system_libxml" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_LIBXML=YES
-    if test "$_os" = "Darwin"; then
-        dnl make sure to use SDK path
-        LIBXML_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2"
-        dnl omit -L/usr/lib
-        LIBXML_LIBS="-lxml2 -lz -lpthread -liconv -lm"
-    elif test $_os = iOS; then
-        dnl make sure to use SDK path
-        usr=`echo '#include <stdlib.h>' | $CC -E -MD - | grep usr/include/stdlib.h | head -1 | sed -e 's,# 1 ",,' -e 's,/usr/include/.*,/usr,'`
-        LIBXML_CFLAGS="-I$usr/include/libxml2"
-        LIBXML_LIBS="-L$usr/lib -lxml2 -liconv"
-    else
-        PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.0)
-    fi
-    BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_LIBXML=NO
-    BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC"
-fi
-AC_SUBST(SYSTEM_LIBXML)
-AC_SUBST(LIBXML_CFLAGS)
-AC_SUBST(LIBXML_LIBS)
-
-dnl ===================================================================
-dnl Checks for Python
-dnl ===================================================================
-
-AC_MSG_CHECKING([which Python to use])
-
-case "$enable_python" in
-no|disable)
-    enable_python=no
-    AC_MSG_RESULT([none])
-    DISABLE_PYTHON=TRUE
-    ;;
-""|yes|auto)
-    if test $build_os = cygwin; then
-        dnl When building on Windows we don't attempt to use any installed
-        dnl "system"  Python.
-        dnl
-        dnl (When cross-compiling to Windows from Linux using the mingw32-cross
-        dnl compiler from OBS, use mingw32-python from OBS, and ditto for other
-        dnl MinGW cross-compilation setups.)
-        AC_MSG_RESULT([internal])
-        enable_python=internal
-    elif test $_os = Darwin; then
-        AC_MSG_RESULT([internal, neither 10.4's nor 10.5's Python is compatible with Python3-ified pyuno])
-        enable_python=internal
-    else
-        AC_MSG_RESULT([checking below])
-        enable_python=auto
-    fi
-    ;;
-internal)
-    AC_MSG_RESULT([internal])
-    ;;
-system)
-    AC_MSG_RESULT([system])
-    ;;
-*)
-    AC_MSG_ERROR([Incorrect --enable-python option])
-    ;;
-esac
-
-AC_SUBST(DISABLE_PYTHON)
-
-if test $_os = WINNT -a "$WITH_MINGW" != yes -a $enable_python = system; then
-    AC_MSG_ERROR([Must use internal Python when building with MSVC])
-fi
-
-if test $enable_python != no; then
-    BUILD_TYPE="$BUILD_TYPE PYUNO"
-fi
-
-if test "$cross_compiling" != yes; then
-    if test $enable_python = system; then
-        dnl This causes an error if no Python found
-        AM_PATH_PYTHON([2.6])
-    elif test $enable_python = auto; then
-        dnl This allows lack of system Python
-        AM_PATH_PYTHON([2.6],, [:])
-
-        if test "$PYTHON" = :; then
-            enable_python=internal
-        else
-            enable_python=system
-        fi
-    fi
-fi
-
-if test $enable_python = system; then
-    if test $_os = Darwin; then
-        #TODO: conditionalize for chosen Mac-SDK (configure switch not yet available)
-        AC_MSG_ERROR([system python is not compatible with pyuno anymore, you need to compile against Mac OSX 10.6 or later (needs Python 2.6 or newer)])
-        PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.6/System/Library/Frameworks/Python.framework/Versions/2.6/include/python2.6"
-        PYTHON_LIBS="-framework Python"
-    fi
-    if test -n "$PYTHON_CFLAGS" -a -n "$PYTHON_LIBS"; then
-        dnl Fallback: Accept these in the environment.
-      :
-    elif test "$cross_compiling" != yes; then
-        python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
-        python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
-        python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`
-        python_libdir=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR'));"`
-	if $PKG_CONFIG --exists python-$python_version; then
-		PYTHON_CFLAGS="`$PKG_CONFIG --cflags python-$python_version`"
-		PYTHON_LIBS="`$PKG_CONFIG --libs python-$python_version`"
-	else
-        	PYTHON_CFLAGS="-I$python_include"
-        	PYTHON_LIBS="-L$python_libdir -lpython$python_version $python_libs"
-	fi
-    elif test "$cross_compiling" = yes; then
-        dnl How to find out the cross-compilation Python installation path?
-        dnl Let's hardocode what we know for different distributions for now...
-
-        for python_sysroot in /usr/i686-w64-mingw32/sys-root/mingw ; do
-            for python_version in 2.6 ; do
-                if test -f ${python_sysroot}/include/python${python_version}/Python.h; then
-                    PYTHON_CFLAGS="-I ${python_sysroot}/include/python$python_version"
-                    PYTHON_LIBS="-L ${python_sysroot}lib -lpython$python_version $python_libs"
-                    break
-                fi
-            done
-            test -n "$PYTHON_CFLAGS" && break
-        done
-    fi
-fi
-
-dnl By now enable_python should be "system", "internal" or "no"
-case $enable_python in
-system)
-    SYSTEM_PYTHON=YES
-
-    dnl Check if the headers really work
-    save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-    AC_CHECK_HEADER(Python.h, [],
-       [AC_MSG_ERROR([Python headers not found. You probably want to set both the PYTHON_CFLAGS and PYTHON_LIBS environment variables.])],
-       [])
-    CPPFLAGS="$save_CPPFLAGS"
-
-    dnl FIXME Check if the Python library can be linked with, too?
-    ;;
-
-internal)
-    SYSTEM_PYTHON=NO
-    BUILD_TYPE="$BUILD_TYPE PYTHON"
-    # Embedded Python dies without Home set
-    if test "z$HOME" = "z"; then
-        export HOME="";
-    fi
-    # bz2 tarball and bzip2 is not standard
-    if test -z "$BZIP2"; then
-        AC_PATH_PROG( BZIP2, bzip2)
-        if test -z "$BZIP2"; then
-            AC_MSG_ERROR([the internal Python module has a .tar.bz2. You need bzip2])
-        fi
-    fi
-    ;;
-no)
-    SYSTEM_PYTHON=NO
-    ;;
-*)
-    AC_MSG_ERROR([Internal configure script error, invalid enable_python value "$enable_python"])
-    ;;
-esac
-
-AC_SUBST(SYSTEM_PYTHON)
-AC_SUBST(PYTHON_CFLAGS)
-AC_SUBST(PYTHON_LIBS)
-
-dnl ===================================================================
-dnl Check for system translate-toolkit
-dnl ===================================================================
-AC_MSG_CHECKING([which translate-toolkit to use])
-if test "$with_system_translate_toolkit" = "yes" ; then
-    AC_MSG_RESULT([system])
-    SYSTEM_TRANSLATE_TOOLKIT=YES
-
-    AC_PATH_PROGS(OO2PO, oo2po)
-    if test -z "$OO2PO"; then
-        AC_MSG_ERROR([install translate-toolkit or use --without-system-translate-toolkit])
-    fi
-
-    AC_PATH_PROGS(PO2OO, po2oo)
-    if test -z "$PO2OO"; then
-        AC_MSG_ERROR([install translate-toolkit or use --without-system-translate-toolkit])
-    fi
-
-    $PO2OO --help | grep -q '\-\-skipsource'
-    if test $? -ne 0 ;  then
-        AC_MSG_ERROR([$PO2OO does not support --skipsource; use translate-toolkit >= 1.9 or use --without-system-translate-toolkit])
-    fi
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_TRANSLATE_TOOLKIT=NO
-    BUILD_TYPE="$BUILD_TYPE TRANSLATE_TOOLKIT"
-fi
-AC_SUBST(SYSTEM_TRANSLATE_TOOLKIT)
-
-dnl ===================================================================
-dnl Check for system Berkeley db
-dnl ===================================================================
-AC_MSG_CHECKING([which db to use])
-if test -n "$with_system_db" -o -n "$with_system_libs" && \
-    test "$with_system_db" != "no"; then
-    SYSTEM_DB=YES
-    AC_MSG_RESULT([external])
-
-    db_header=
-    for dbver in 5.1 5.0 5 4.8 4.7 4; do
-        for dash in - ''; do
-            AC_CHECK_HEADER([db$dash$dbver/db.h],
-                [ db_header="db$dash$dbver/db.h"; break ])
-        done
-    done
-
-    if test -z "$db_header"; then
-        AC_CHECK_HEADER([db/db.h], [db_header='db/db.h'])
-    fi
-
-    if test -z "$db_header"; then
-       AC_CHECK_HEADER(db.h, [ db_header='db.h' ])
-    fi
-
-    if test -z "$db_header"; then
-        AC_MSG_ERROR([db.h not found. Use the correct -I flag, or install the Berkeley db development package.])
-    fi
-
-    AC_MSG_CHECKING([whether db is at least 4.1])
-    AC_TRY_COMPILE([#include <$db_header>],
-        [int array[(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))-1];],
-        [AC_MSG_RESULT([yes])],
-        [AC_MSG_ERROR([no. you need at least db 4.1])])
-
-    SYSTEM_DB_CFLAGS="-DSYSTEM_DB_HEADER='<$db_header>'"
-
-    DB_LIB=
-    for dbver in 5.1 5.0 5 4.8 4.7 4 ''; do
-        for dash in - ''; do
-            AC_CHECK_LIB(db$dash$dbver, dbopen,
-                [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
-            AC_CHECK_LIB(db$dash$dbver, __db185_open,
-                [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
-        done
-        test -n "$DB_LIB" && break
-    done
-
-    if test -z "$DB_LIB"; then
-        AC_CHECK_LIB(db, dbopen,
-            [ DB_LIB="db"; DB_CPPLIB="db_cxx" ])
-    fi
-
-    if test -z "$DB_LIB" ; then
-        AC_MSG_ERROR([db library not found. Use the correct -L flag,
-or install the Berkeley db development package.])
-    fi
-
-    SCPDEFS="$SCPDEFS -DSYSTEM_DB"
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_DB=NO
-    BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
-fi
-AC_SUBST(SYSTEM_DB)
-AC_SUBST(SYSTEM_DB_CFLAGS)
-AC_SUBST(DB_LIB)
-AC_SUBST(DB_CPPLIB)
-
-dnl ===================================================================
-dnl Check for system lucene
-dnl ===================================================================
-AC_MSG_CHECKING([which lucene to use])
-if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
-        test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_LUCENE=YES
-    if test -z $LUCENE_CORE_JAR; then
-         AC_CHECK_FILE(/usr/share/java/lucene-core-2.3.jar,
-            [ LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar ],
-            [
-              AC_CHECK_FILE(/usr/share/java/lucene-core.jar,
-                [ LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar ],
-                [ AC_CHECK_FILE(/usr/share/java/lucene.jar,
-                   [ LUCENE_CORE_JAR=/usr/share/java/lucene.jar ],
-                   [ AC_MSG_ERROR(lucene-core.jar replacement not found)]
-                  )
-                ]
-              )
-            ]
-         )
-    else
-        AC_CHECK_FILE($LUCENE_CORE_JAR, [],
-               [AC_MSG_ERROR(lucene-core.jar not found.)], [])
-    fi
-
-    if test -z $LUCENE_ANALYZERS_JAR; then
-        AC_CHECK_FILE(/usr/share/java/lucene-analyzers-2.3.jar,
-            [ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar ],
-            [
-              AC_CHECK_FILE(/usr/share/java/lucene-contrib/lucene-analyzers.jar,
-                [ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar ],
-                [ AC_MSG_ERROR(lucene-analyzers.jar replacement not found.)]
-              )
-            ]
-        )
-    else
-        AC_CHECK_FILE($LUCENE_CORE_JAR, [],
-               [ AC_MSG_ERROR(lucene-analyzers.jar not found.)], [])
-    fi
-    AC_MSG_CHECKING([whether lucene is version 2.x])
-    export LUCENE_CORE_JAR
-    if $PERL -e 'use Archive::Zip;
-            my $file = "$ENV{'LUCENE_CORE_JAR'}";
-            my $zip = Archive::Zip->new( $file );
-            my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
-            if ( $mf =~ m/Specification-Version: 2.*/ ) {
-                exit 0;
-            } else {
-                exit 1;
-            }'; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_ERROR([no, you need lucene 2])
-    fi
-
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_LUCENE=NO
-    BUILD_TYPE="$BUILD_TYPE LUCENE"
-fi
-AC_SUBST(SYSTEM_LUCENE)
-AC_SUBST(LUCENE_CORE_JAR)
-AC_SUBST(LUCENE_ANALYZERS_JAR)
-
-AC_MSG_CHECKING([whether to build the MySQL Connector extension])
-if test -n "$enable_ext_mysql_connector" -a "$enable_ext_mysql_connector" != "no"; then
-    AC_MSG_RESULT([yes])
-    ENABLE_MYSQLC=YES
-    AC_MSG_CHECKING([for mysqlc module])
-    if test -d mysqlc; then
-        AC_MSG_RESULT([OK])
-    else
-        AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
-    fi
-    BUILD_TYPE="$BUILD_TYPE MYSQLC"
-else
-    AC_MSG_RESULT([no])
-    ENABLE_MYSQLC=NO
-fi
-AC_SUBST(ENABLE_MYSQLC)
-
-if test "$ENABLE_MYSQLC" = "YES"; then
-
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MYSQLC"
-
-    dnl ===================================================================
-    dnl Check for system MySQL
-    dnl ===================================================================
-    AC_MSG_CHECKING([for mysql pre-requisites])
-    if test -n "$with_system_mysql" -o -n "$with_system_libs" && \
-           test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then
-        AC_MSG_RESULT([external MySQL])
-        SYSTEM_MYSQL=YES
-        AC_PATH_PROG( MYSQLCONFIG, mysql_config)
-        AC_MSG_CHECKING([MySQL version])
-        MYSQL_VERSION=`$MYSQLCONFIG --version`
-        MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
-        if test "$MYSQL_MAJOR" -ge "5"; then
-            AC_MSG_RESULT([OK])
-        else
-            AC_MSG_ERROR([too old, use 5.0.x or 5.1.x])
-        fi
-        AC_MSG_CHECKING([for MySQL Client library])
-        MYSQL_INC=`$MYSQLCONFIG --include`
-        MYSQL_LIB=`$MYSQLCONFIG --libs`
-        MYSQL_DEFINES=`$MYSQLCONFIG --cflags | $SED -e s,$MYSQL_INC,,`
-        AC_MSG_RESULT([includes $MYSQL_INC, libraries $MYSQL_LIB])
-    else
-        SYSTEM_MYSQL=NO
-        if test -n "$with_libmysql_path"; then
-            AC_MSG_RESULT([external Connector/C (libmysql)])
-            LIBMYSQL=libmysql.so
-            if test "$_os" = "Darwin"; then
-                LIBMYSQL=libmysql.dylib
-            elif test "$_os" = "WINNT"; then
-                LIBMYSQL=libmysql.dll
-            fi
-            AC_MSG_CHECKING([for $LIBMYSQL])
-            if test -e "$with_libmysql_path/lib/$LIBMYSQL"; then
-                AC_MSG_RESULT([found.])
-                LIBMYSQL_PATH=$with_libmysql_path
-            else
-                AC_MSG_ERROR([not found. Please specify proper path in --with-libmysql-path.])
-            fi
-        else
-            AC_MSG_ERROR([not given. Please specify either --with-system-mysql or --with-libmysql-path])
-        fi
-    fi
-    AC_SUBST(SYSTEM_MYSQL)
-    AC_SUBST(MYSQL_INC)
-    AC_SUBST(MYSQL_LIB)
-    AC_SUBST(MYSQL_DEFINES)
-    AC_SUBST(LIBMYSQL_PATH)
-
-    AC_LANG_PUSH([C++])
-    dnl ===================================================================
-    dnl Check for system MySQL C++ Connector
-    dnl ===================================================================
-    # FIXME!
-    # who thought this too-generic cppconn dir was a good idea?
-    AC_MSG_CHECKING([MySQL Connector/C++])
-    if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \
-            test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then
-        AC_MSG_RESULT([external])
-        SYSTEM_MYSQL_CPPCONN=YES
-        AC_LANG_PUSH([C++])
-        AC_CHECK_HEADER(mysql_driver.h, [],
-                    [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
-        AC_CHECK_LIB(mysqlcppconn, main, [],
-                    [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], [])
-        AC_MSG_CHECKING([version])
-        AC_TRY_RUN([
-#include <mysql_driver.h>
-
-int main(int argc, char **argv) {
-    sql::Driver *driver;
-    driver = get_driver_instance();
-    if (driver->getMajorVersion() > 1 || \
-       (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \
-       (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 && driver->getPatchVersion() >= 6))
-        return 0;
-      else
-        return 1;
-}
-      ], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, we need >= 1.0.6])])
-
-        AC_LANG_POP([C++])
-
-    else
-        AC_MSG_RESULT([internal])
-        AC_MSG_CHECKING([for mysqlcppconn module])
-        if test -d mysqlcppconn; then
-            AC_MSG_RESULT([OK])
-        else
-            AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
-        fi
-        BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
-        SYSTEM_MYSQL_CPPCONN=NO
-    fi
-    AC_LANG_POP([C++])
-    AC_SUBST(SYSTEM_MYSQL_CPPCONN)
-fi
-
-dnl ===================================================================
-dnl Check for system hsqldb
-dnl ===================================================================
-AC_MSG_CHECKING([which hsqldb to use])
-if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
-       test "$with_system_hsqldb" != "no" && test "$with_system_jars" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_HSQLDB=YES
-    if test -z $HSQLDB_JAR; then
-        HSQLDB_JAR=/usr/share/java/hsqldb.jar
-    fi
-    AC_CHECK_FILE($HSQLDB_JAR, [],
-               [AC_MSG_ERROR(hsqldb.jar not found.)], [])
-    AC_MSG_CHECKING([whether hsqldb is 1.8.0.x])
-    export HSQLDB_JAR
-    if $PERL -e 'use Archive::Zip;
-            my $file = "$ENV{'HSQLDB_JAR'}";
-            my $zip = Archive::Zip->new( $file );
-            my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
-            if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
-               push @l, split(/\n/, $mf);
-               foreach my $line (@l) {
-                  if ($line =~ m/Specification-Version:/) {
-                      ($t, $version) = split (/:/,$line);
-                      $version =~ s/^\s//;
-                      ($a, $b, $c, $d) = split (/\./,$version);
-                      if ($c == "0" && $d > "8")  {
-                          exit 0;
-                      } else {
-                          exit 1;
-                      }
-                  }
-               }
-            } else {
-                exit 1;
-            }'; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_ERROR([no, you need hsqldb >= 1.8.0.9 but < 1.8.1])
-    fi
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_HSQLDB=NO
-    BUILD_TYPE="$BUILD_TYPE HSQLDB"
-fi
-AC_SUBST(SYSTEM_HSQLDB)
-AC_SUBST(HSQLDB_JAR)
-
-dnl ===================================================================
-dnl Check for system beanshell
-dnl ===================================================================
-AC_MSG_CHECKING([which beanshell to use])
-if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
-       test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_BSH=YES
-    if test -z $BSH_JAR; then
-        BSH_JAR=/usr/share/java/bsh.jar
-    fi
-    AC_CHECK_FILE($BSH_JAR, [],
-               [AC_MSG_ERROR(bsh.jar not found.)], [])
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_BSH=NO
-    BUILD_TYPE="$BUILD_TYPE BSH"
-fi
-AC_SUBST(SYSTEM_BSH)
-AC_SUBST(BSH_JAR)
-
-
-dnl ===================================================================
-dnl Check for system saxon
-dnl ===================================================================
-AC_MSG_CHECKING([which saxon to use])
-if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
-       test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_SAXON=YES
-    if test -z $SAXON_JAR; then
-        AC_CHECK_FILE(/usr/share/java/saxon9.jar,
-            [ SAXON_JAR=/usr/share/java/saxon9.jar ],
-            [
-              AC_CHECK_FILE(/usr/share/java/saxon.jar,
-                [ SAXON_JAR=/usr/share/java/saxon.jar ],
-                [ AC_CHECK_FILE(/usr/share/java/saxon9.jar,
-                    [ SAXON_JAR=/usr/share/java/saxon9.jar ],
-                    [ AC_MSG_ERROR(saxon.jar replacement not found)]
-                  )
-                ]
-              )
-            ]
-          )
-    else
-        AC_CHECK_FILE($SAXON_JAR, [],
-               [AC_MSG_ERROR(saxon.jar replacement not found.)], [])
-    fi
-    if test -n "$SERIALIZER_JAR"; then
-        AC_CHECK_FILE($SERIALIZER_JAR, [],
-               [AC_MSG_ERROR(serializer.jar not found.)], [])
-        AC_SUBST(SERIALIZER_JAR)
-    fi
-
-    dnl Saxon comes in two practically available versions, the out-of-date saxonb which
-    dnl supports the Java extensions that LibreOffice uses, and the up-to-date saxon he
-    dnl "home edition" version, which is crippled to not support those Java extensions.
-    dnl And as an aside the he one also needs to be tweaked to include
-    dnl a META-INF/services to broadcast that it supports the jaxp transform factory
-
-    AC_MSG_CHECKING([if saxon works])
-    cat > saxontest.java <<_ACEOF
-[import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.stream.StreamSource;
-import java.io.*;
-
-import net.sf.saxon.FeatureKeys;
-
-class saxontest {
-    public static void main(String[] args) {
-      System.setProperty("javax.xml.transform.TransformerFactory",
-        "net.sf.saxon.TransformerFactoryImpl");
-      try {
-        TransformerFactory tfactory = TransformerFactory.newInstance();
-    // some external saxons (Debian, Ubuntu, ...) have this disabled
-    // per default
-    tfactory.setAttribute(FeatureKeys.ALLOW_EXTERNAL_FUNCTIONS, new Boolean(true));
-        System.out.println("TransformerFactory is" +
-          tfactory.getClass().getName());
-        Transformer transformer = tfactory.newTransformer(
-          new StreamSource(new File(args[0])));
-      } catch(Exception e){
-        e.printStackTrace(System.err);
-        System.exit(-1);
-      }
-      System.exit(0);
-    }
-}
-]
-_ACEOF
-
-    cat > saxontest.xsl<<_ACEOF
-[<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:template match="/">
-  <xsl:value-of select="math:sqrt(1)" xmlns:math="java:java.lang.Math"/>
- </xsl:template>
-</xsl:stylesheet>
-]
-_ACEOF
-
-    javac_cmd="$JAVACOMPILER -cp $SAXON_JAR saxontest.java 1>&2"
-    AC_TRY_EVAL(javac_cmd)
-    if test $? = 0 && test -f ./saxontest.class ; then
-        java_cmd="$JAVAINTERPRETER -cp $SAXON_JAR:. saxontest saxontest.xsl 1>&2"
-        AC_TRY_EVAL(java_cmd)
-        if test $? = 0; then
-            AC_MSG_RESULT([yes])
-        else
-            cat saxontest.java >&5
-            AC_MSG_RESULT([no])
-            AC_MSG_ERROR([Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb])
-        fi
-    else
-        AC_MSG_RESULT([no])
-        cat saxontest.java >&5
-        AC_MSG_ERROR([saxontest could not be compiled, non-functional saxon jar])
-    fi
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_SAXON=NO
-    NEED_SAXON=TRUE
-fi
-AC_SUBST(SYSTEM_SAXON)
-AC_SUBST(SAXON_JAR)
-
-if test -n "$NEED_SAXON"; then
-    BUILD_TYPE="$BUILD_TYPE SAXON"
-fi
-
-dnl ===================================================================
-dnl Check for system curl
-dnl ===================================================================
-if test "$_os" = "Darwin" -a "$with_system_curl" != "no"; then
-    with_system_curl=yes
-fi
-AC_MSG_CHECKING([which libcurl to use])
-if test -n "$with_system_curl" -o -n "$with_system_libs" && \
-    test "$with_system_curl" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_CURL=YES
-
-    curl_version=""
-    if test "$cross_compiling" = "yes"; then
-        dnl At least the OBS mingw32-libcurl-devel package
-        dnl comes with a proper .pc file
-        PKG_CHECK_MODULES(CURL, libcurl,, [:])
-        if test -n "CURL_PKG_ERRORS"; then
-            AC_MSG_RESULT([no])
-        else
-            curl_version=`$PKG_CONFIG --modversion libcurl`
-        fi
-    fi
-    if test -z "$curl_version"; then
-        AC_PATH_PROG(CURLCONFIG, curl-config)
-        if test -z "$CURLCONFIG"; then
-            AC_MSG_ERROR([install the libcurl development package])
-        fi
-        CURL_LIBS=`$CURLCONFIG --libs`
-        CURL_CFLAGS=`$CURLCONFIG --cflags`
-        curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'`
-    fi
-
-    AC_MSG_CHECKING([whether libcurl is >= 7.13.1])
-
-    case $curl_version in
-    dnl brackets doubled below because Autoconf uses them as m4 quote characters,
-    dnl so they need to be doubled to end up in the configure script
-    7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
-        AC_MSG_RESULT([yes, you have $curl_version])
-        ;;
-    *)
-        AC_MSG_ERROR([no, you have $curl_version])
-        ;;
-    esac
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_CURL=NO
-    BUILD_TYPE="$BUILD_TYPE CURL"
-fi
-AC_SUBST(SYSTEM_CURL)
-AC_SUBST(CURL_CFLAGS)
-AC_SUBST(CURL_LIBS)
-
-dnl ===================================================================
-dnl Check for system boost
-dnl ===================================================================
-AC_MSG_CHECKING([which boost to use])
-if test -n "$with_system_boost" -o -n "$with_system_headers" && \
-        test "$with_system_boost" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_BOOST=YES
-    AC_LANG_PUSH([C++])
-    AC_CHECK_HEADER(boost/shared_ptr.hpp, [],
-       [AC_MSG_ERROR(boost/shared_ptr.hpp not found. install boost)], [])
-    AC_CHECK_HEADER(boost/spirit/include/classic_core.hpp, [],
-       [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.36)], [])
-    AC_CHECK_HEADER(boost/function.hpp, [],
-       [AC_MSG_ERROR(boost/function.hpp not found. install boost)], [])
-    AC_CHECK_HEADER([boost/unordered_map.hpp], [HAVE_BOOST_UNORDERED_MAP=TRUE],
-                   [AC_MSG_WARN([boost/unordered_map.hpp not found])], [])
-
-    save_CXXFLAGS=$CXXFLAGS
-    CXXFLAGS="$CXXFLAGS -fno-exceptions"
-    AC_MSG_CHECKING([whether boost/function.hpp compiles with -fno-exceptions])
-    AC_TRY_COMPILE([#include <boost/function.hpp>
-], [], ac_cv_cxx_boost_no_exceptions_broken=no, ac_cv_cxx_boost_no_exceptions_broken=yes)
-
-    if test "$ac_cv_cxx_boost_no_exceptions_broken" = "yes"; then
-        AC_MSG_ERROR([no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131])
-    else
-        AC_MSG_RESULT([yes])
-    fi
-    CXXFLAGS=$save_CXXFLAGS
-    AC_LANG_POP([C++])
-else
-    AC_MSG_RESULT([internal])
-    BUILD_TYPE="$BUILD_TYPE BOOST"
-    SYSTEM_BOOST=NO
-    HAVE_BOOST_UNORDERED_MAP=TRUE
-fi
-AC_SUBST([HAVE_BOOST_UNORDERED_MAP])
-AC_SUBST(SYSTEM_BOOST)
-
-dnl ===================================================================
-dnl Check for system mdds
-dnl ===================================================================
-AC_MSG_CHECKING([which mdds to use])
-if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
-        test "$with_system_mdds" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_MDDS=YES
-
-    dnl ===================================================================
-    dnl Determine which hash container mdds shall use
-    dnl ===================================================================
-    AC_MSG_CHECKING([which hash container mdds shall use])
-    if test "x$HAVE_CXX0X" = "xTRUE"; then
-        MDDS_CPPFLAGS="-std=c++0x"
-        AC_MSG_RESULT([std::unordered_map])
-    else
-        MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST"
-        AC_MSG_RESULT([boost::unordered_map])
-    fi
-
-    AC_LANG_PUSH([C++])
-    save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $MDDS_CPPFLAGS"
-    AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [],
-        [AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], [])
-    AC_CHECK_HEADER(mdds/mixed_type_matrix.hpp, [],
-        [AC_MSG_ERROR(mdds/mixed_type_matrix.hpp not found. install mdds >= 0.4.0)], [])
-    CPPFLAGS="$save_CPPFLAGS"
-    save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="$CXXFLAGS $MDDS_CPPFLAGS"
-    AC_MSG_CHECKING([for correct signature of ::mdds::flat_segment_tree])
-    AC_TRY_RUN([#include <mdds/flat_segment_tree.hpp>
-
-    int main(int argc, char **argv) {
-        ::mdds::flat_segment_tree<long, short> db(0, 100, 0);
-        short val;
-        if (!db.search(5, val).second)
-            return 1;
-        return 0;
-    }
-], ac_cv_cxx_mdds_flat_segment_tree_correct=yes, ac_cv_cxx_mdds_flat_segment_tree_correct=no)
-
-    if test "$ac_cv_cxx_mdds_flat_segment_tree_correct" = "yes"; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_ERROR([no, install mdds >= 0.5.0])
-    fi
-    CXXFLAGS=$save_CXXFLAGS
-    AC_LANG_POP([C++])
-else
-    AC_MSG_RESULT([internal])
-    BUILD_TYPE="$BUILD_TYPE MDDS"
-    SYSTEM_MDDS=NO
-
-    dnl ===================================================================
-    dnl Determine which hash container mdds shall use
-    dnl ===================================================================
-    AC_MSG_CHECKING([which hash container mdds shall use])
-    MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST"
-    AC_MSG_RESULT([boost::unordered_map])
-fi
-AC_SUBST(SYSTEM_MDDS)
-AC_SUBST([MDDS_CPPFLAGS])
-
-dnl ===================================================================
-dnl Check for system vigra
-dnl ===================================================================
-AC_MSG_CHECKING([which vigra to use])
-if test -n "$with_system_vigra" -o -n "$with_system_headers" && \
-        test "$with_system_vigra" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_VIGRA=YES
-    AC_LANG_PUSH([C++])
-    AC_CHECK_HEADER(vigra/copyimage.hxx, [],
-       [AC_MSG_ERROR(vigra/copyimage.hxx not found. install vigra)], [])
-    AC_LANG_POP([C++])
-else
-    AC_MSG_RESULT([internal])
-    BUILD_TYPE="$BUILD_TYPE VIGRA"
-    SYSTEM_VIGRA=NO
-fi
-AC_SUBST(SYSTEM_VIGRA)
-
-dnl ===================================================================
-dnl Check for system odbc
-dnl ===================================================================
-AC_MSG_CHECKING([which odbc headers to use])
-if test -n "$with_system_odbc" -o -n "$with_system_headers" && \
-        test "$with_system_odbc" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_ODBC_HEADERS=YES
-
-    AC_CHECK_HEADER(sqlext.h, [],
-      [AC_MSG_ERROR(odbc not found. install odbc)], [])
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_ODBC_HEADERS=NO
-    BUILD_TYPE="$BUILD_TYPE UNIXODBC"
-fi
-AC_SUBST(SYSTEM_ODBC_HEADERS)
-
-AC_MSG_CHECKING([whether to enable build of Mozilla/Mozilla NSS-using components])
-if test "$enable_mozilla" = "no"; then
-    AC_MSG_RESULT([no])
-    WITH_MOZILLA=NO
-    ENABLE_NSS_MODULE=NO
-else
-    AC_MSG_RESULT([yes])
-    WITH_MOZILLA=YES
-fi
-AC_SUBST(WITH_MOZILLA)
-
-AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity])
-if test "$enable_mozilla" = "no"; then
-    AC_MSG_RESULT([no])
-elif test "$with_system_mozilla" = "yes"; then
-    AC_MSG_RESULT([no, not possible with system-mozilla])
-else
-    AC_MSG_RESULT([yes])
-fi
-
-AC_MSG_CHECKING([whether to build XML Security support])
-if test "$enable_mozilla" = "no"; then
-    AC_MSG_RESULT([no, since Mozilla (NSS) disabled but needed])
-else
-    AC_MSG_RESULT([yes])
-fi
-
-AC_MSG_CHECKING([whether to build LDAP configuration backend])
-if test -z "$enable_ldap" || test "$enable_ldap" = "yes"; then
-    if test "$enable_mozilla" = "yes" || test "$with_openldap" = "yes"; then
-        AC_MSG_RESULT([yes])
-        WITH_LDAP=YES
-    else
-        AC_MSG_RESULT([no. Either Mozilla or OpenLDAP needed])
-        WITH_LDAP=NO
-    fi
-else
-    AC_MSG_RESULT([no])
-    WITH_LDAP=NO
-fi
-
-if test "$WITH_LDAP" = "YES"; then
-    dnl ===================================================================
-    dnl Test whether we want to use the Mozilla or the OpenLDAP LDAP SDK
-    dnl ===================================================================
-    AC_MSG_CHECKING([which LDAP SDK to use])
-    if test -n "$with_openldap" && test "$with_openldap" != "no"; then
-        AC_MSG_RESULT([OpenLDAP])
-        WITH_OPENLDAP=YES
-        AC_CHECK_HEADERS(ldap.h, [],
-           [AC_MSG_ERROR(ldap.h not found. install openldap libs)], [])
-        AC_CHECK_LIB(ldap, ldap_simple_bind_s, [],
-           [AC_MSG_ERROR(openldap lib not found or functional)], [])
-        # rumours say that OpenLDAP doesn't have that function. I looked and
-        # it has it. Test for it to be sure
-        AC_CHECK_LIB(ldap, ldap_set_option, [],
-                [AC_MSG_ERROR(openldap lib not found or functional)], [])
-    else
-        AC_MSG_RESULT([Netscape/Mozilla])
-        # TODO. Actually do a sanity check and check for
-        # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT
-        WITH_OPENLDAP=NO
-    fi
-fi
-AC_SUBST(WITH_LDAP)
-AC_SUBST(WITH_OPENLDAP)
-
-AC_OUTPUT([ooo.lst])
-
-dnl ===================================================================
-dnl Check for system mozilla
-dnl ===================================================================
-AC_MSG_CHECKING([which Mozilla to use])
-if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_MOZILLA=YES
-    ENABLE_NSS_MODULE=NO
-    enable_nss_module=no
-    AC_MSG_CHECKING([which Mozilla flavour to use])
-    if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then
-        MOZ_FLAVOUR=libxul
-    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
-        MOZ_FLAVOUR=xulrunner
-    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
-        MOZ_FLAVOUR=seamonkey
-    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox"; then
-        MOZ_FLAVOUR=firefox
-    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
-        MOZ_FLAVOUR=mozilla
-    else
-        MOZ_FLAVOUR=libxul
-    fi
-    tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
-    AC_MSG_RESULT($tmp)
-
-    PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
-    if test -z "$STANDALONENSS"; then
-        PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
-    else
-        NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
-        AC_SUBST(NSS_LIB)
-    fi
-
-    if $PKG_CONFIG --exists nspr ; then
-        PKG_CHECK_MODULES( MOZ_NSPR, nspr )
-        NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
-        AC_SUBST(NSPR_LIB)
-    else
-        PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
-    fi
-
-    if test "$MOZ_FLAVOUR" != "libxul"; then
-        PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom, HASXPCOM="TRUE", HASXPCOM="" )
-        MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
-        MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
-    fi
-
-    if test -z "$HASXPCOM"; then
-        PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
-        MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
-        MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
-        if ! test -e "$MOZ_LIB/libxul.so"; then
-            MOZ_LIB=`$PKG_CONFIG --variable=sdkdir libxul`
-            if test -e "$MOZ_LIB/sdk/lib/libxul.so"; then
-                MOZ_LIB="$MOZ_LIB/sdk/lib"
-            fi
-        fi
-    fi
-
-    save_CPPFLAGS="$CPPFLAGS"
-    save_LDFLAGS="$LDFLAGS"
-    save_LIBS="$LIBS"
-    CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS"
-    LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS"
-    AC_CHECK_LIB(nss3, PK11_GetCertFromPrivateKey, [],
-      [AC_MSG_ERROR(PK11_GetCertFromPrivateKey missing but needed.
-See https://bugzilla.mozilla.org/show_bug.cgi?id=262274.
-Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5))], [])
-    LDFLAGS="$save_LDFLAGS"
-    CPPFLAGS="$save_CPPFLAGS"
-    LIBS="$save_LIBS"
-
-    MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
-    if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
-        AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
-        if test -d "$MOZ_INC/ldap"; then
-            AC_MSG_RESULT([yes])
-            MOZ_LDAP_CFLAGS="-I$MOZ_INC"
-        else
-            AC_MSG_ERROR([no.
-Could not find LDAP header include files in $MOZ_INC/ldap.
-Please recompile $tmp with --enable-ldap or use --with-openldap.])
-        fi
-    fi
-
-    #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
-    #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
-    if test "$MOZ_FLAVOUR" = "libxul"; then
-        MOZ_FLAVOUR="mozilla"
-    fi
-
-elif test "$enable_mozilla" = "no"; then
-    AC_MSG_RESULT([none])
-    WITH_MOZILLA=NO
-    ENABLE_NSS_MODULE=NO
-    enable_nss_module=no
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_MOZILLA=NO
-    BUILD_TYPE="$BUILD_TYPE MOZ"
-if test -z "$with_mozilla_version"; then
-    MOZILLA_VERSION=
-else
-    AC_MSG_CHECKING([which Mozilla version to build])
-    MOZILLA_VERSION=$with_mozilla_version
-    enable_build_mozilla=1
-    AC_MSG_RESULT([$MOZILLA_VERSION])
-fi
-
-AC_SUBST(MOZILLA_VERSION)
-
-AC_MSG_CHECKING([for toolkit Mozilla should use])
-if test -z "$with_mozilla_toolkit"; then
-    if test "$_os" != "WINNT" ; then
-        if test "$_os" = "Darwin" ; then
-            MOZILLA_TOOLKIT=mac
-            AC_MSG_RESULT([mac])
-        else
-            MOZILLA_TOOLKIT=gtk2
-            AC_MSG_RESULT([gtk2])
-        fi
-    fi
-else
-    MOZILLA_TOOLKIT=$with_mozilla_toolkit
-    enable_build_mozilla=1
-    AC_MSG_RESULT([$MOZILLA_TOOLKIT])
-fi
-#if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then
-#   #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not
-#   #available using fink, mac (carbon) doesn't work because xcode installs conflicting headers
-#   AC_MSG_ERROR([Only gtk2 toolkit supported on Mac, sorry.])
-#fi
-
-AC_SUBST(MOZILLA_TOOLKIT)
-
-# default to enabling build mozilla
-if test "$enable_build_mozilla" != "no"; then
-    enable_build_mozilla=yes
-else
-    enable_build_mozilla=
-fi
-
-AC_MSG_CHECKING([whether to build Mozilla/SeaMonkey])
-if test -n "$enable_build_mozilla"; then
-    BUILD_MOZAB="TRUE"
-    AC_MSG_RESULT([yes])
-else
-    BUILD_MOZAB=""
-    AC_MSG_RESULT([no])
-fi
-
-AC_MSG_CHECKING([whether to build provided NSS module])
-if test "$enable_nss_module" != "no"; then
-    ENABLE_NSS_MODULE="YES"
-    BUILD_TYPE="$BUILD_TYPE NSS"
-    AC_MSG_RESULT([yes])
-    if test "$build_os" = "cygwin"; then
-        AC_MSG_CHECKING([for Mozilla build tooling])
-        if test -z "$MOZILLABUILD" ; then
-            AC_MSG_ERROR([Mozilla build tooling not found.
-Use the --with-mozilla-build option after installing the tools obtained
-from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
-        else
-            if test \( "$WITH_MINGW" = "yes" \) ; then
-                if test ! -d "$MOZILLABUILD" ; then
-                    AC_MSG_ERROR([Mozilla build tooling incomplete!])
-                else
-                    AC_MSG_RESULT([ok])
-                fi
-            else
-                if test ! -d "$MOZILLABUILD/moztools" \
-                        -o ! -d "$MOZILLABUILD/msys" ; then
-                    AC_MSG_ERROR([Mozilla build tooling incomplete!])
-                else
-                    AC_MSG_RESULT([ok])
-                fi
-            fi
-        fi
-    fi
-else
-    ENABLE_NSS_MODULE="NO"
-    AC_MSG_RESULT([no])
-fi
-
-
-if test "$BUILD_MOZAB" = "TRUE"; then
-    if test "$_os" = "WINNT"; then
-        if test "$WITH_MINGW" != "yes"; then
-            # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
-            if test "$MSVSVER" != "2005"; then
-                AC_MSG_ERROR([Building SeaMonkey is supported with Microsoft Visual Studio 2005 only.])
-            fi
-        else
-            AC_MSG_WARN([Building SeaMonkey with MinGW is not tested, and likely to break.])
-            echo "Building SeaMonkey with MinGW is not tested, and likely to break." >> warn
-        fi
-    fi
-
-    if test -z "$MOZILLA_VERSION"; then
-        MOZILLA_VERSION=1.1.14
-    fi
-    MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
-    MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst`
-    AC_MSG_CHECKING([for Mozilla sources])
-    if test -z "$MOZILLA_FETCH_FILE"; then
-        AC_MSG_RESULT([not found])
-        HAVE_MOZILLA_TARBALL=n
-    else
-        AC_MSG_CHECKING([for $MOZILLA_FETCH_FILE])
-        if test ! -e "$TARFILE_LOCATION/$MOZILLA_FETCH_FILE"; then
-            if test -z "$DO_FETCH"; then
-                AC_MSG_RESULT([will be fetched])
-                HAVE_MOZILLA_TARBALL=y
-            else
-                AC_MSG_RESULT([not found])
-                HAVE_MOZILLA_TARBALL=n
-            fi
-        else
-            AC_MSG_RESULT([found])
-            HAVE_MOZILLA_TARBALL=y
-        fi
-    fi
-    if test "$HAVE_MOZILLA_TARBALL" != "y"; then
-        AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found.
-Use "./download" to download.])
-    fi
-    if test "$_os" = "WINNT"; then
-        AC_MSG_CHECKING([for moztools binaries])
-        if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then
-            AC_MSG_ERROR([The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
-(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)])
-        else
-            AC_MSG_RESULT([ok])
-        fi
-    elif test "$_os" = "Darwin"; then
-        if test "$MOZILLA_TOOLKIT" = "gtk2"; then
-            AC_MSG_NOTICE([checking whether Mozilla can be built...])
-            PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build Mozilla]), AC_MSG_ERROR([Prerequisites to build Mozilla not met. Either use the precompiled Mozilla binaries or install the missing packages]))
-        else
-            PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.6.3,  MOZIDL="TRUE", MOZIDL="")
-            if test -z "$MOZIDL"; then
-                AC_MSG_ERROR([libIDL 0.6.3 or newer is needed to build Mozilla with Mac toolkit.])
-            fi
-        fi
-    else
-        # Generic Unix/Linux section
-        if test "$MOZILLA_TOOLKIT" = "gtk2"; then
-            PKG_CHECK_MODULES(MOZLIBREQ, gtk+-2.0, MOZGTK="TRUE", MOZGTK="")
-            if test -z "$MOZGTK"; then
-                AC_MSG_ERROR([GTK2 is needed to build Mozilla.])
-            fi
-            PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.8.0, MOZIDL="TRUE", MOZIDL="")
-            if test -z "$MOZIDL"; then
-                AC_MSG_ERROR([libIDL >= 0.8.0 is needed when using GTK2 to build Mozilla.])
-            fi
-        else
-            PKG_CHECK_MODULES(MOZLIBREQ, gtk+ >= 1.2.3, MOZGTK="TRUE", MOZGTK="")
-            if test -z "$MOZGTK"; then
-                AC_MSG_ERROR([GTK+ 1.2 is needed when not using GTK2 to build Mozilla.])
-            fi
-            PKG_CHECK_MODULES(MOZLIBREQ, libidl >= 0.6.3 libidl <= 0.6.8, MOZIDL="TRUE", MOZIDL="")
-            if test -z "$MOZIDL"; then
-                AC_MSG_ERROR([libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build Mozilla.])
-            fi
-        fi
-    fi
-fi
-
-AC_SUBST(BUILD_MOZAB)
-
-fi
-AC_SUBST(ENABLE_NSS_MODULE)
-AC_SUBST(MOZILLABUILD)
-AC_SUBST(SYSTEM_MOZILLA)
-AC_SUBST(MOZ_FLAVOUR)
-AC_SUBST(MOZ_INC)
-AC_SUBST(MOZ_LIB)
-AC_SUBST(MOZ_LIB_XPCOM)
-AC_SUBST(MOZ_NSPR_CFLAGS)
-AC_SUBST(MOZ_NSS_CFLAGS)
-AC_SUBST(MOZ_LDAP_CFLAGS)
-
-dnl ===================================================================
-dnl Check for system sane
-dnl ===================================================================
-AC_MSG_CHECKING([which sane header to use])
-if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \
-        test "$with_system_sane_header" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_SANE_HEADER=YES
-    AC_CHECK_HEADER(sane/sane.h, [],
-      [AC_MSG_ERROR(sane not found. install sane)], [])
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_SANE_HEADER=NO
-    BUILD_TYPE="$BUILD_TYPE SANE"
-fi
-AC_SUBST(SYSTEM_SANE_HEADER)
-
-dnl ===================================================================
-dnl Check for system icu
-dnl ===================================================================
-AC_MSG_CHECKING([which icu to use])
-if test -n "$with_system_icu" -o -n "$with_system_libs" && \
-        test "$with_system_icu" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_ICU=YES
-    AC_LANG_PUSH([C++])
-    AC_MSG_CHECKING([for unicode/rbbi.h])
-    AC_TRY_CPP(unicode/rbbi.h, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([icu headers not found.]))
-    AC_LANG_POP([C++])
-    AC_PATH_PROG(SYSTEM_GENBRK, genbrk, [], [$PATH:/usr/sbin:/sbin])
-    if test -z "$SYSTEM_GENBRK"; then
-        AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk\"])
-    fi
-    AC_PATH_PROG(SYSTEM_GENCCODE, genccode, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
-    if test -z "$SYSTEM_GENCCODE"; then
-        AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode\"])
-    fi
-    AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
-    if test -z "$SYSTEM_GENCMN"; then
-        AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn\"])
-    fi
-
-    AC_PATH_PROG( ICUCONFIG, icu-config)
-    AC_MSG_CHECKING([ICU version])
-    ICU_VERSION=`$ICUCONFIG --version`
-    ICU_MAJOR=`$ICUCONFIG --version | cut -d"." -f1`
-    ICU_MINOR=`$ICUCONFIG --version | cut -d"." -f2`
-    ICU_MICRO=`$ICUCONFIG --version | cut -d"." -f3`
-
-    if test "$ICU_MAJOR" -ge "4"; then
-        AC_MSG_RESULT([OK])
-    else
-        AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])
-    fi
-
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_ICU=NO
-    BUILD_TYPE="$BUILD_TYPE ICU"
-fi
-AC_SUBST(SYSTEM_ICU)
-AC_SUBST(SYSTEM_GENBRK)
-AC_SUBST(SYSTEM_GENCCODE)
-AC_SUBST(SYSTEM_GENCMN)
-AC_SUBST(ICU_MAJOR)
-AC_SUBST(ICU_MINOR)
-AC_SUBST(ICU_MICRO)
-
-dnl ===================================================================
-dnl Graphite
-dnl ===================================================================
-
-AC_MSG_CHECKING([whether to enable graphite support])
-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then
-    AC_MSG_RESULT([yes])
-    ENABLE_GRAPHITE="TRUE"
-    AC_MSG_CHECKING([which graphite to use])
-    if test -n "$with_system_graphite" -o -n "$with_system_libs" && \
-        test "$with_system_graphite" != "no"; then
-        AC_MSG_RESULT([external])
-        SYSTEM_GRAPHITE=YES
-        PKG_CHECK_MODULES( GRAPHITE, graphite2 >= 0.9.3 )
-    else
-        AC_MSG_RESULT([internal])
-        SYSTEM_GRAPHITE=NO
-        BUILD_TYPE="$BUILD_TYPE GRAPHITE"
-    fi
-else
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_GRAPHITE)
-AC_SUBST(SYSTEM_GRAPHITE)
-AC_SUBST(GRAPHITE_LIBS)
-AC_SUBST(GRAPHITE_CFLAGS)
-
-dnl ===================================================================
-dnl Checks for libraries.
-dnl ===================================================================
-dnl Check for Mac OS X native GUI, which may is now required; the X11 build is no longer supported
-dnl See if we have the AppKit framework for building with Quartz graphics.
-
-if test  "$_os" = "Darwin"; then
-    if test "x$with_x" = "xyes"; then
-        AC_MSG_ERROR([X11 build is no longer supported on MacOSX, please use the native aqua build])
-    else
-        AC_MSG_CHECKING([for /System/Library/Frameworks/AppKit.framework])
-        if test -d "/System/Library/Frameworks/AppKit.framework/"; then
-            AC_MSG_RESULT([yes])
-            x_includes="no_x_includes"
-            x_libraries="no_x_libraries"
-            dnl disable some things used on other Unix versions but not on the aqua build
-            enable_gtk=no
-            enable_cups=no
-            ENABLE_CUPS=""
-            AC_SUBST(ENABLE_CUPS)
-        else
-            AC_MSG_ERROR([No AppKit.framewrok found])
-        fi
-    fi
-fi
-
-if test $_os = iOS -o $_os = Android; then
-    enable_gtk=no
-fi
-
-dnl ***************************************
-dnl testing for X libraries and includes...
-dnl ***************************************
-if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then
-    dnl Mac OS X using Aqua graphics. Don't check for X11.
-    :
-elif test "$_os" != "WINNT" -a "$_os" != "Android" -a "$_os" != "iOS"; then
-    AC_PATH_X
-    AC_PATH_XTRA
-    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-
-    if test "x$x_includes" = "x"; then
-        x_includes="default_x_includes"
-    fi
-    if test "x$x_libraries" = "x"; then
-        x_libraries="default_x_libraries"
-    fi
-    dnl The variables $x_libraries and $x_includes are set.
-    if test -z "$x_libraries"; then
-        AC_MSG_ERROR([No X libraries found]) # Exit
-    fi
-    if test -z "$x_includes"; then
-        AC_MSG_ERROR([No X includes found]) # Exit
-    fi
-    CFLAGS="$CFLAGS $X_CFLAGS"
-    LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
-    AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
-    dnl Check if the XauDisposeAuth symbol is provided by libXau.
-    AC_CHECK_LIB(Xau, XauDisposeAuth, XAU_LIBS="-lXau", [])
-else
-    x_includes="no_x_includes"
-    x_libraries="no_x_libraries"
-fi
-if test -z "$x_includes"; then
-    x_includes="no_x_includes"
-fi
-if test -z "$x_libraries"; then
-    x_libraries="no_x_libraries"
-fi
-if test "$x_includes" = "default_x_includes"; then
-    XINC="/usr/include"
-else
-    XINC="$x_includes"
-fi
-AC_SUBST(XINC)
-if test "$x_libraries" = "default_x_libraries"; then
-    XLIB=`$PKG_CONFIG --variable=libdir x11`
-    if test "x$XLIB" = x; then
-        XLIB="/usr/lib"
-    fi
-else
-    XLIB="$x_libraries"
-fi
-AC_SUBST(XLIB)
-AC_SUBST(XAU_LIBS)
-
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "Android" -a "$_os" != "iOS"; then
-    dnl ===================================================================
-    dnl Check for Composite.h for Mozilla plugin
-    dnl ===================================================================
-    AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt headers not found])],
-     [#include <X11/Intrinsic.h>])
-fi
-
-
-dnl ===================================================================
-dnl Check for system Xrender
-dnl ===================================================================
-AC_MSG_CHECKING([whether to link to Xrender])
-if test -n "$enable_xrender_link" -a "$enable_xrender_link" != "no"; then
-    AC_MSG_RESULT([yes])
-    XRENDER_LINK=YES
-    with_system_xrender_headers=yes
-else
-    AC_MSG_RESULT([no, dynamically open it])
-    XRENDER_LINK=NO
-fi
-AC_MSG_CHECKING([which Xrender headers to use])
-if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \
-        test "$with_system_xrender_headers" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_XRENDER_HEADERS=YES
-    AC_CHECK_HEADER(X11/extensions/Xrender.h, [],
-      [AC_MSG_ERROR(Xrender not found. install X)], [])
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_XRENDER_HEADERS=NO
-    BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS"
-fi
-if test "$XRENDER_LINK" = "YES"; then
-    AC_CHECK_LIB(Xrender, XRenderQueryVersion, [],
-      [AC_MSG_ERROR(libXrender not found or functional)], [])
-fi
-AC_SUBST(SYSTEM_XRENDER_HEADERS)
-AC_SUBST(XRENDER_LINK)
-
-dnl ===================================================================
-dnl Check for XRandr
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable RandR support])
-if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \) ; then
-    if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
-        XRANDR_DLOPEN="TRUE"
-        AC_MSG_RESULT([configured to dlopen libXrandr at runtime])
-    else
-        AC_MSG_RESULT([yes])
-        XRANDR_DLOPEN="FALSE"
-        PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2, ENABLE_RANDR="TRUE", ENABLE_RANDR="")
-        if test "$ENABLE_RANDR" != "TRUE"; then
-            AC_CHECK_HEADER(X11/extensions/Xrandr.h, [],
-                        [AC_MSG_ERROR([X11/extensions/Xrandr.h could not be found. X11 dev missing?])], [])
-            XRANDR_CFLAGS=" "
-            AC_CHECK_LIB(Xrandr, XRRQueryExtension, [],
-              [ AC_MSG_ERROR(libXrandr not found or functional) ], [])
-            XRANDR_LIBS="-lXrandr "
-            ENABLE_RANDR="TRUE"
-        fi
-    fi
-else
-    ENABLE_RANDR=""
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(XRANDR_DLOPEN)
-AC_SUBST(XRANDR_CFLAGS)
-AC_SUBST(XRANDR_LIBS)
-AC_SUBST(ENABLE_RANDR)
-
-dnl ===================================================================
-dnl Check for building neon
-dnl ===================================================================
-AC_MSG_CHECKING([whether to use neon])
-if test "$enable_neon" = "no"; then
-    AC_MSG_RESULT([no])
-    DISABLE_NEON=TRUE
-    AC_SUBST(DISABLE_NEON)
-else
-    AC_MSG_RESULT([yes])
-dnl ===================================================================
-dnl Check for system neon
-dnl ===================================================================
-AC_MSG_CHECKING([which neon to use])
-if test -n "$with_system_neon" -o -n "$with_system_libs" && \
-        test "$with_system_neon" != "no"; then
-    AC_MSG_RESULT([external])
-    PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
-    NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
-    NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
-    SYSTEM_NEON=YES
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_NEON=NO
-    NEON_LIBS=-lneon
-    NEON_CFLAGS=
-    BUILD_TYPE="$BUILD_TYPE NEON"
-fi
-AC_SUBST(SYSTEM_NEON)
-AC_SUBST(NEON_VERSION)
-AC_SUBST(NEON_LIBS)
-AC_SUBST(NEON_CFLAGS)
-fi
-
-dnl ===================================================================
-dnl Check for system openssl
-dnl ===================================================================
-if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \
-        "$_os" = "DragonFly" && test "$with_system_openssl" != "no"; then
-    with_system_openssl=yes
-fi
-AC_MSG_CHECKING([which libssl to use])
-if test -n "$with_system_openssl" -o -n "$with_system_libs" && \
-        test "$with_system_openssl" != "no"; then
-    AC_MSG_RESULT([external])
-    # Mac OS builds should get out without extra stuff is the Mac porters'
-    # wish. And pkg-config is although Xcode ships a .pc for openssl
-    if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \
-            "$_os" = "DragonFly"; then
-        OPENSSL_CFLAGS=
-        OPENSSL_LIBS="-lssl -lcrypto"
-    else
-        PKG_CHECK_MODULES( OPENSSL, openssl )
-    fi
-    SYSTEM_OPENSSL=YES
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_OPENSSL=NO
-    BUILD_TYPE="$BUILD_TYPE OPENSSL"
-fi
-AC_SUBST(SYSTEM_OPENSSL)
-AC_SUBST(OPENSSL_CFLAGS)
-AC_SUBST(OPENSSL_LIBS)
-
-dnl ===================================================================
-dnl Check for system redland
-dnl ===================================================================
-AC_MSG_CHECKING([which redland library to use])
-if test -n "$with_system_redland" -o -n "$with_system_libs" && \
-        test "$with_system_redland" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_REDLAND=YES
-    dnl versions before 1.0.8 write RDF/XML that is useless for ODF (@xml:base)
-    PKG_CHECK_MODULES(REDLAND, redland >= 1.0.8)
-else
-    AC_MSG_RESULT([internal])
-    BUILD_TYPE="$BUILD_TYPE REDLAND"
-    SYSTEM_REDLAND=NO
-fi
-AC_SUBST(SYSTEM_REDLAND)
-AC_SUBST(REDLAND_CFLAGS)
-AC_SUBST(REDLAND_LIBS)
-
-dnl ===================================================================
-dnl Check for system hunspell
-dnl ===================================================================
-AC_MSG_CHECKING([which libhunspell to use])
-if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \
-        test "$with_system_hunspell" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_HUNSPELL=YES
-    AC_LANG_PUSH([C++])
-    PKG_CHECK_MODULES(HUNSPELL, hunspell, HUNSPELL_PC="TRUE", HUNSPELL_PC="" )
-    if test "$HUNSPELL_PC" != "TRUE"; then
-        AC_CHECK_HEADER(hunspell.hxx, [],
-            [
-            AC_CHECK_HEADER(hunspell/hunspell.hxx, [ HUNSPELL_CFLAGS=-I/usr/include/hunspell ],
-            [AC_MSG_ERROR(hunspell headers not found.)], [])
-            ], [])
-        AC_CHECK_LIB(hunspell, main, [],
-           [ AC_MSG_ERROR(hunspell library not found.) ], [])
-        HUNSPELL_LIBS=-lhunspell
-    fi
-    AC_LANG_POP([C++])
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_HUNSPELL=NO
-    BUILD_TYPE="$BUILD_TYPE HUNSPELL"
-fi
-AC_SUBST(SYSTEM_HUNSPELL)
-AC_SUBST(HUNSPELL_CFLAGS)
-AC_SUBST(HUNSPELL_LIBS)
-
-dnl ===================================================================
-dnl Checking for altlinuxhyph
-dnl ===================================================================
-AC_MSG_CHECKING([which altlinuxhyph to use])
-if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
-        test "$with_system_altlinuxhyph" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_HYPH=YES
-    AC_CHECK_HEADER(hyphen.h, [],
-       [ AC_MSG_ERROR(altlinuxhyph headers not found.)], [])
-    AC_CHECK_MEMBER(struct _HyphenDict.cset, [],
-       [ AC_MSG_ERROR(no. You are sure you have altlinuyhyph headers?)],
-       [#include <hyphen.h>])
-    AC_CHECK_LIB(hyphen, hnj_hyphen_hyphenate2, [HYPHEN_LIB=-lhyphen],
-        [ AC_MSG_ERROR(altlinuxhyph library not found or too old.)], [])
-    if test -z "$HYPHEN_LIB"; then
-        AC_CHECK_LIB(hyph, hnj_hyphen_hyphenate2, [HYPHEN_LIB=-lhyph],
-           [ AC_MSG_ERROR(altlinuxhyph library not found or too old.)], [])
-    fi
-    if test -z "$HYPHEN_LIB"; then
-        AC_CHECK_LIB(hnj, hnj_hyphen_hyphenate2, [HYPHEN_LIB=-lhnj],
-           [ AC_MSG_ERROR(altlinuxhyph library not found or too old.)], [])
-    fi
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_HYPH=NO
-    BUILD_TYPE="$BUILD_TYPE HYPHEN"
-fi
-AC_SUBST(SYSTEM_HYPH)
-AC_SUBST(HYPHEN_LIB)
-
-dnl ===================================================================
-dnl Checking for mythes
-dnl ===================================================================
-AC_MSG_CHECKING([which mythes to use])
-if test -n "$with_system_mythes" -o -n "$with_system_libs" && \
-       test "$with_system_mythes" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_MYTHES=YES
-    AC_LANG_PUSH([C++])
-    PKG_CHECK_MODULES(MYTHES, mythes, MYTHES_PKGCONFIG=yes, MYTHES_PKGCONFIG=no)
-    if test "$MYTHES_PKGCONFIG" = "no"; then
-        AC_CHECK_HEADER(mythes.hxx, [],
-            [ AC_MSG_ERROR(mythes.hxx headers not found.)], [])
-        AC_CHECK_LIB(mythes-1.2, main, [],
-            [ MYTHES_FOUND=no], [])
-    if test "$MYTHES_FOUND" = "no"; then
-        AC_CHECK_LIB(mythes, main, [MYTHES_FOUND=yes],
-                [ MYTHES_FOUND=no], [])
-    fi
-    if test "$MYTHES_FOUND" = "no"; then
-        AC_MSG_ERROR([mythes library not found!.])
-    fi
-    fi
-    AC_LANG_POP([C++])
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_MYTHES=NO
-    BUILD_TYPE="$BUILD_TYPE MYTHES"
-fi
-AC_SUBST(SYSTEM_MYTHES)
-AC_SUBST(MYTHES_CFLAGS)
-AC_SUBST(MYTHES_LIBS)
-
-dnl ===================================================================
-dnl Checking for lpsolve
-dnl ===================================================================
-AC_MSG_CHECKING([which lpsolve to use])
-if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
-        test "$with_system_lpsolve" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_LPSOLVE=YES
-    AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
-       [ AC_MSG_ERROR(lpsolve headers not found.)], [])
-    # some systems need this. Like Ubuntu....
-    AC_CHECK_LIB(m, floor)
-    AC_CHECK_LIB(dl, dlopen)
-    AC_CHECK_LIB(lpsolve55, make_lp, ,
-        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_LPSOLVE=NO
-    BUILD_TYPE="$BUILD_TYPE LPSOLVE"
-fi
-AC_SUBST(SYSTEM_LPSOLVE)
-
-dnl ===================================================================
-dnl Checking for libtextcat
-dnl ===================================================================
-AC_MSG_CHECKING([which libtextcat to use])
-if test -n "$with_system_libtextcat" && test "$with_system_libtextcat" != "no"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_LIBTEXTCAT=YES
-    AC_CHECK_HEADER(libtextcat/textcat.h, [],
-       [ AC_MSG_ERROR(libtextcat headers not found.)], [])
-    AC_CHECK_LIB(textcat, special_textcat_Init, ,
-        [ AC_MSG_ERROR(libtextcat library not found or not suitable. libtextcat typically needs to be patched)], [])
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_LIBTEXTCAT=NO
-    BUILD_TYPE="$BUILD_TYPE LIBTEXTCAT"
-fi
-AC_SUBST(SYSTEM_LIBTEXTCAT)
-
-AC_MSG_CHECKING([which libtextcat data directory to use])
-if test -n "$with_external_libtextcat_data" && test "$with_external_libtextcat_data" != "no"; then
-    if test "$with_external_libtextcat_data" = "yes"; then
-        SYSTEM_LIBTEXTCAT_DATA=file:///usr/share/libtextcat
-    else
-        SYSTEM_LIBTEXTCAT_DATA=file://$with_external_libtextcat_data
-    fi
-    AC_MSG_RESULT([$SYSTEM_LIBTEXTCAT_DATA])
-else
-    AC_MSG_RESULT([internal])
-    BUILD_TYPE="$BUILD_TYPE LIBTEXTCATDATA"
-fi
-AC_SUBST(SYSTEM_LIBTEXTCAT_DATA)
-
-dnl ***************************************
-dnl testing libc version for Linux...
-dnl ***************************************
-if test "$_os" = "Linux"; then
-    AC_MSG_CHECKING([whether libc is >= 2.1.1])
-    exec 6>/dev/null # no output
-    AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
-    exec 6>&1 # output on again
-    if test "$HAVE_LIBC"; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_ERROR([no, upgrade libc])
-    fi
-fi
-
-if test "$_os" != "WINNT"; then
-    AC_CHECK_FUNCS(getopt, HAVE_GETOPT=YES, [HAVE_GETOPT=NO])
-    AC_CHECK_FUNCS(readdir_r, HAVE_READDIR_R=YES, [HAVE_READDIR_R=NO])
-    if test "$HAVE_GETOPT" = "YES" -a "$HAVE_READDIR_R" = "YES"; then
-        SYSTEM_LIBC=YES
-    fi
-else
-    HAVE_GETOPT=NO
-    HAVE_READDIR_R=NO
-    SYSTEM_LIBC=YES
-fi
-AC_SUBST(HAVE_GETOPT)
-AC_SUBST(HAVE_READDIR_R)
-AC_SUBST(SYSTEM_LIBC)
-
-dnl =========================================
-dnl Check for the Windows  SDK.
-dnl =========================================
-dnl FIXME: I don't know yet if the Windows SDK works with MinGW, keep it until I know better,
-dnl and add "-a \( "$WITH_MINGW" != "yes" \)" then
-if test "$_os" = "WINNT"; then
-    AC_MSG_CHECKING([for Windows SDK])
-    if test "$build_os" = "cygwin"; then
-        if test -z "$with_windows_sdk_home"; then
-            # This first line will detect a February 2003 Microsoft Platform SDK
-            WINDOWS_SDK_HOME=`./oowintool --windows-sdk-home`
-            # But there might be also an April 2005 PSDK, unfortunately MS changed
-            # the registry entry. (we prefer the old version!?)
-            if test -z "$WINDOWS_SDK_HOME"; then
-                WINDOWS_SDK_HOME=`cat /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install\ Dir 2> /dev/null | tr '\000' '\n' | head -n 1`
-            fi
-            # normalize if found
-            if test -n "$WINDOWS_SDK_HOME"; then
-                WINDOWS_SDK_HOME=`cygpath -d "$WINDOWS_SDK_HOME"`
-                WINDOWS_SDK_HOME=`cygpath -u "$WINDOWS_SDK_HOME"`
-            fi
-        else
-            WINDOWS_SDK_HOME=`cygpath -u "$with_windows_sdk_home"`
-        fi
-    fi
-    if test -n "$WINDOWS_SDK_HOME"; then
-        # Remove a possible trailing backslash
-        WINDOWS_SDK_HOME=`echo $WINDOWS_SDK_HOME | $SED 's/\/$//'`
-        # Problem with current PSDK (iz 49865)
-        # (What "current" does that mean?)
-        if test -f "$WINDOWS_SDK_HOME/Lib/libcp.lib"; then
-            AC_MSG_ERROR([
-Some modules do not build correctly with MS Platform SDK - April 2005
-Edition if the library ($WINDOWS_SDK_HOME/Lib/libcp.lib) is found.
-Remove/rename/backup that file and restart configure. Details about this
-problem can be found in issue 49856.])
-        fi
-
-        if test -f "$WINDOWS_SDK_HOME/Include/adoint.h" \
-             -a -f "$WINDOWS_SDK_HOME/Include/SqlUcode.h" \
-             -a -f "$WINDOWS_SDK_HOME/Include/usp10.h"; then
-            HAVE_PSDK_H="yes"
-        else
-            HAVE_PSDK_H="no"
-        fi
-        if test -f "$WINDOWS_SDK_HOME/lib/user32.lib"; then
-            HAVE_PSDK_LIB="yes"
-        else
-            HAVE_PSDK_LIB="no"
-        fi
-
-        if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then
-            AC_MSG_ERROR([Some (all?) Windows SDK files not found, please check if all needed parts of
-the  Windows SDK are installed.])
-        fi
-
-        if test ! -x "$WINDOWS_SDK_HOME/bin/msiinfo.exe" \
-             -o ! -x "$WINDOWS_SDK_HOME/bin/msidb.exe" \
-             -o ! -x "$WINDOWS_SDK_HOME/bin/uuidgen.exe" \
-             -o ! -x "$WINDOWS_SDK_HOME/bin/msitran.exe" ; then
-            AC_MSG_ERROR([Some (all) files of the Windows Installer SDK are missing, please install.])
-        fi
-    fi
-
-    if test -z "$WINDOWS_SDK_HOME"; then
-        AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway])
-    elif echo $WINDOWS_SDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then
-        AC_MSG_RESULT([found Windows SDK 6.1 ($WINDOWS_SDK_HOME)])
-    elif echo $WINDOWS_SDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
-        AC_MSG_RESULT([found Windows SDK 6.0 ($WINDOWS_SDK_HOME)])
-    elif echo $WINDOWS_SDK_HOME | grep "v7" >/dev/null 2>/dev/null; then
-        AC_MSG_RESULT([found Windows SDK 7 ($WINDOWS_SDK_HOME)])
-    else
-        AC_MSG_ERROR([Found legacy Windows Platform SDK ($WINDOWS_SDK_HOME)])
-    fi
-fi
-AC_SUBST(WINDOWS_SDK_HOME)
-
-dnl =========================================
-dnl Check for the Microsoft DirectX SDK.
-dnl =========================================
-if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then
-    AC_MSG_CHECKING([for DirectX SDK])
-    if test "$build_os" = "cygwin"; then
-        if test -z "$with_directx_home"; then
-            dnl A standard installation of the DirectX SDK sets $DXSDK_DIR
-            if test -n "$DXSDK_DIR"; then
-                DIRECTXSDK_HOME=`cygpath -d "$DXSDK_DIR"`
-                DIRECTXSDK_HOME=`cygpath -u "$DIRECTXSDK_HOME"`
-            fi
-            # At this point $DIRECTXSDK_HOME might still be undefined. This will lead to
-            # the "DirectX SDK not found" error later
-        else
-            DIRECTXSDK_HOME=`cygpath -u "$with_directx_home"`
-        fi
-        # Remove a possible trailing backslash
-        DIRECTXSDK_HOME=`echo $DIRECTXSDK_HOME | $SED 's/\/$//'`
-    elif test -n "$with_directx_home"; then
-        DIRECTXSDK_HOME="$with_directx_home"
-    fi
-
-    if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" -o -f "$DIRECTXSDK_HOME/Include/d3d9.h" ; then
-        HAVE_DIRECTXSDK_H="yes"
-    else
-        HAVE_DIRECTXSDK_H="no"
-    fi
-
-    # MS changed the location of the libraries with Dec 2004 DirectX SDK
-    if test -d "$DIRECTXSDK_HOME/lib/x86" ; then
-        DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib/x86"
-    else
-        DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib"
-    fi
-
-    if test -f "$DIRECTXSDK_LIB/ddraw.lib" -o -f "$DIRECTXSDK_LIB/d3d9.lib" ; then
-        HAVE_DIRECTXSDK_LIB="yes"
-    else
-        HAVE_DIRECTXSDK_LIB="no"
-    fi
-
-    if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then
-        AC_MSG_RESULT([found])
-    else
-        AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway])
-    fi
-fi
-AC_SUBST(DIRECTXSDK_HOME)
-AC_SUBST(DIRECTXSDK_LIB)
-
-dnl ============================================
-dnl Check for Nullsoft Scriptable Install System
-dnl ============================================
-NSIS_PATH=""
-if test "$_os" = "WINNT" ; then
-    if test -z "$with_nsis_path"; then
-        AC_PATH_PROG(NSIS_PATH, makensis)
-        if test -n "$NSIS_PATH"; then
-            NSIS_PATH=`dirname "$NSIS_PATH"`
-        elif test "$build_os" = "cygwin"; then
-            AC_MSG_CHECKING([for NSIS])
-            nsistest=`./oowintool --nsis-dir`;
-            nsistest=`cygpath -d -m "$nsistest"`
-            nsistest=`cygpath -u "$nsistest"`
-            if test -x "$nsistest/nsis.exe"; then
-                NSIS_PATH="$nsistest"
-                AC_MSG_RESULT([found ($NSIS_PATH)])
-            else
-                AC_MSG_RESULT([no, no self-contained installer will be built.])
-            fi
-        fi
-    else
-        AC_MSG_CHECKING([for NSIS])
-        if test "$build_os" = "cygwin"; then
-            with_nsis_path=`cygpath -u "$with_nsis_path"`
-        fi
-        if test -e "$with_nsis_path/makensis$EXEEXT_FOR_BUILD"; then
-            NSIS_PATH="$with_nsis_path"
-        fi
-        if test -z "$NSIS_PATH"; then
-            AC_MSG_RESULT([no, no self-contained installer will be built.])
-        else
-            if test "$build_os" = "cygwin"; then
-                NSIS_PATH=`cygpath -d "$NSIS_PATH"`
-                NSIS_PATH=`cygpath -u "$NSIS_PATH"`
-            fi
-            AC_MSG_RESULT([found ($NSIS_PATH)])
-        fi
-    fi
-fi
-AC_SUBST(NSIS_PATH)
-
-dnl ***************************************
-dnl Checking for bison and flex
-dnl ***************************************
-AC_PATH_PROG(BISON, bison)
-if test -z "$BISON"; then
-    AC_MSG_ERROR([no bison found in \$PATH, install it])
-else
-    AC_MSG_CHECKING([the bison version])
-    _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
-    _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'`
-    # Accept newer than 1.875 or older(equal) than 1.75
-    if test "$_bison_longver" -ge 1875 -o "$_bison_longver" -le 1075; then
-        if test "$_bison_version" = "1.875" ; then
-            AC_MSG_WARN([suspect ($BISON $_bison_version)])
-            echo "Suspect ($BISON $_bison_version) suggest upgrade" >> warn
-        else
-            AC_MSG_RESULT([checked ($BISON $_bison_version)])
-        fi
-    else
-        AC_MSG_ERROR([failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))])
-    fi
-fi
-AC_PATH_PROG(FLEX, flex)
-if test -z "$FLEX"; then
-    AC_MSG_ERROR([no flex found in \$PATH, install it])
-fi
-dnl ***************************************
-dnl Checking for patch
-dnl ***************************************
-AC_PATH_PROG(PATCH, patch)
-if test -z "$PATCH"; then
-    AC_MSG_ERROR([\"patch\" not found in \$PATH, install it])
-fi
-
-dnl On Solaris, FreeBSD or MacOS X, check if --with-gnu-patch was used
-if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
-    if test -z "$with_gnu_patch"; then
-        GNUPATCH=$PATCH
-    else
-        if test -x "$with_gnu_patch"; then
-            GNUPATCH=$with_gnu_patch
-        else
-            AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
-        fi
-    fi
-
-    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
-    if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
-    fi
-fi
-
-dnl We also need to check for --with-gnu-cp
-
-if test -z "$with_gnu_cp"; then
-    # check the place where the good stuff is hidden on Solaris...
-    if test -x /usr/gnu/bin/cp; then
-        GNUCP=/usr/gnu/bin/cp
-    else
-        AC_PATH_PROGS(GNUCP, gnucp cp)
-    fi
-    if test -z $GNUCP; then
-        AC_MSG_ERROR([Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it])
-    fi
-else
-    if test -x "$with_gnu_cp"; then
-        GNUCP=$with_gnu_cp
-    else
-        AC_MSG_ERROR([--with-gnu-cp did not point to an executable])
-    fi
-fi
-
-AC_MSG_CHECKING([whether $GNUCP is GNU cp from coreutils with preserve= support])
-if $GNUCP --version 2>/dev/null | grep "coreutils" >/dev/null 2>/dev/null; then
-    AC_MSG_RESULT([yes])
-elif $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
-    AC_MSG_RESULT([yes])
-else
-    case "$build_os" in
-    darwin*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*)
-        GNUCP=''
-        AC_MSG_RESULT([no gnucp found - using the system's cp command])
-        ;;
-    *)
-        AC_MSG_ERROR([no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it])
-        ;;
-    esac
-fi
-
-AC_SUBST(GNUPATCH)
-AC_SUBST(GNUCP)
-
-dnl ***************************************
-dnl testing assembler path
-dnl ***************************************
-if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
-    if test "$CL_X64" = ""; then
-        assembler=ml.exe
-        assembler_bin=bin
-    else
-        assembler=ml64.exe
-        assembler_bin=bin/amd64
-    fi
-    if test -n "$with_asm_home"; then
-        with_asm_home=`cygpath -u "$with_asm_home"`
-    fi
-    if test -x "$with_asm_home/$assembler"; then
-        AC_MSG_CHECKING([$assembler assembler path])
-        AC_MSG_RESULT([$with_asm_home/$assembler])
-    else
-        AC_PATH_PROG(ML_EXE, $assembler)
-        if test -z "$ML_EXE"; then
-            AC_MSG_CHECKING([$with_cl_home/$assembler_bin/$assembler])
-            if test -x "$with_cl_home/$assembler_bin/$assembler"; then
-                with_asm_home=$with_cl_home/$assembler_bin
-                AC_MSG_RESULT([found])
-            else
-                AC_MSG_ERROR([Configure did not find $assembler assembler.])
-            fi
-        else
-            with_asm_home="ASM_IN_PATH"
-        fi
-    fi
-else
-    with_asm_home="NO_ASM_HOME"
-fi
-ASM_HOME="$with_asm_home"
-AC_SUBST(ASM_HOME)
-
-dnl ===================================================================
-dnl We need zip and unzip
-dnl ===================================================================
-AC_PATH_PROG(ZIP, zip)
-test -z "$ZIP" && AC_MSG_ERROR([zip is required])
-if ! "$ZIP" --filesync < /dev/null 2>/dev/null > /dev/null; then
-    AC_MSG_ERROR([Zip version 3.0 or newer is required to build, please install or use --with-zip-home],,)
-fi
-
-AC_PATH_PROG(UNZIP, unzip)
-test -z "$UNZIP" && AC_MSG_ERROR([unzip is required])
-
-dnl ===================================================================
-dnl Zip must be a specific type for different build types.
-dnl ===================================================================
-if test $build_os = cygwin; then
-    if test -n "`$ZIP -h | grep -i WinNT`" ; then
-        AC_MSG_ERROR([$ZIP is not the required Cygwin version of Info-ZIP's zip.exe.])
-    fi
-fi
-
-dnl ===================================================================
-dnl Test which vclplugs have to be built.
-dnl ===================================================================
-R=""
-GTK3_CFLAGS=""
-GTK3_LIBS=""
-ENABLE_GTK3=""
-if test "x$enable_gtk3" = "xyes"; then
-    if test "$with_system_cairo" != yes; then
-        echo "System cairo required for gtk3 support, please use --system-cairo"
-    fi
-    PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
-    if test "x$ENABLE_GTK3" = "xTRUE"; then
-        R="gtk3"
-    fi
-fi
-AC_SUBST(GTK3_LIBS)
-AC_SUBST(GTK3_CFLAGS)
-AC_SUBST(ENABLE_GTK3)
-
-AC_MSG_CHECKING([which VCLplugs shall be built])
-ENABLE_GTK=""
-if test "x$enable_gtk" = "xyes"; then
-    ENABLE_GTK="TRUE"
-    R="gtk $R"
-fi
-AC_SUBST(ENABLE_GTK)
-
-ENABLE_KDE=""
-if test "x$enable_kde" = "xyes"; then
-    ENABLE_KDE="TRUE"
-    R="$R kde"
-fi
-AC_SUBST(ENABLE_KDE)
-
-ENABLE_KDE4=""
-if test "x$enable_kde4" = "xyes"; then
-    ENABLE_KDE4="TRUE"
-    R="$R kde4"
-fi
-AC_SUBST(ENABLE_KDE4)
-
-if test -z "$R"; then
-    AC_MSG_RESULT([none])
-else
-    AC_MSG_RESULT([$R])
-fi
-
-dnl ===================================================================
-dnl GCONF check
-dnl ===================================================================
-
-ENABLE_GCONF=""
-AC_MSG_CHECKING([whether to enable GConf support])
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gconf" = "yes"; then
-    ENABLE_GCONF="TRUE"
-    AC_MSG_RESULT([yes])
-    PKG_CHECK_MODULES( GCONF, gconf-2.0 )
-else
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_GCONF)
-
-dnl ===================================================================
-dnl Gnome VFS check
-dnl ===================================================================
-
-ENABLE_GNOMEVFS=""
-AC_MSG_CHECKING([whether to enable GNOME VFS support])
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then
-    ENABLE_GNOMEVFS="TRUE"
-    AC_MSG_RESULT([yes])
-    PKG_CHECK_MODULES( GNOMEVFS, gnome-vfs-2.0 >= 2.6.0 )
-    if test "$ENABLE_GCONF" != "TRUE"; then
-        PKG_CHECK_MODULES( GCONF, gconf-2.0 )
-    fi
-else
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_GNOMEVFS)
-
-dnl ===================================================================
-dnl Check whether the gtk 2.0 libraries are available.
-dnl ===================================================================
-
-GTK_CFLAGS=""
-GTK_LIBS=""
-ENABLE_SYSTRAY_GTK=""
-ENABLE_DBUS=""
-if test  "$test_gtk" = "yes"; then
-
-    if test "$ENABLE_GTK" = "TRUE" ; then
-        PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
-        PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
-        BUILD_TYPE="$BUILD_TYPE GTK"
-
-        if test "x$enable_systray" = "xyes"; then
-            PKG_CHECK_MODULES( GTK210, gtk+-2.0 >= 2.10.0,
-                            [ ENABLE_SYSTRAY_GTK="TRUE" ],
-                            [ ENABLE_SYSTRAY_GTK="" ])
-        fi
-
-        AC_MSG_CHECKING([whether to enable DBUS support])
-        if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_dbus" = "yes"; then
-            ENABLE_DBUS="TRUE"
-            AC_MSG_RESULT([yes])
-            PKG_CHECK_MODULES( DBUS, dbus-glib-1 >= 0.70 )
-        else
-            AC_MSG_RESULT([no])
-        fi
-
-        AC_MSG_CHECKING([whether to enable GIO support])
-        if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
-            if test "$ENABLE_GNOMEVFS" = "TRUE" ; then
-                AC_MSG_ERROR([please use --enable-gio only together with --disable-gnome-vfs.])
-            fi
-            ENABLE_GIO="TRUE"
-            AC_MSG_RESULT([yes])
-            PKG_CHECK_MODULES( GIO, gio-2.0 )
-        else
-            AC_MSG_RESULT([no])
-        fi
-    fi
-fi
-AC_SUBST(ENABLE_GIO)
-AC_SUBST(ENABLE_DBUS)
-AC_SUBST(ENABLE_SYSTRAY_GTK)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-AC_SUBST(GTHREAD_CFLAGS)
-AC_SUBST(GTHREAD_LIBS)
-
-PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG="TRUE", ENABLE_QUICKSTART_LIBPNG="" )
-AC_SUBST(LIBPNG_LIBS)
-AC_SUBST(LIBPNG_CFLAGS)
-
-AC_MSG_CHECKING([whether to enable libpng linking in quickstarter])
-if test "x$enable_unix_libpng" = "xyes"; then
-    AC_MSG_RESULT([yes])
-else
-    AC_MSG_RESULT([no])
-    ENABLE_QUICKSTART_LIBPNG=""
-fi
-AC_SUBST(ENABLE_QUICKSTART_LIBPNG)
-
-SPLIT_APP_MODULES=""
-if test "$enable_split_app_modules" = "yes"; then
-    SPLIT_APP_MODULES="YES"
-fi
-AC_SUBST(SPLIT_APP_MODULES)
-
-SPLIT_OPT_FEATURES=""
-if test "$enable_split_opt_features" = "yes"; then
-    SPLIT_OPT_FEATURES="YES"
-fi
-AC_SUBST(SPLIT_OPT_FEATURES)
-
-ENABLE_CAIRO_CANVAS="FALSE"
-if test "$enable_cairo_canvas" = "yes" ; then
-   ENABLE_CAIRO_CANVAS="TRUE"
-fi
-AC_SUBST(ENABLE_CAIRO_CANVAS)
-
-dnl ===================================================================
-dnl Check whether the GStreamer libraries are available.
-dnl ===================================================================
-
-ENABLE_GSTREAMER=""
-
-if test  "$build_gstreamer" = "yes"; then
-
-    AC_MSG_CHECKING([whether to enable the GStreamer avmedia backend])
-    if test "x$enable_gstreamer" != "xno" ; then
-        ENABLE_GSTREAMER="TRUE"
-        AC_MSG_RESULT([yes])
-        PKG_CHECK_MODULES( GSTREAMER, gstreamer-0.10 gstreamer-plugins-base-0.10 )
-    else
-        AC_MSG_RESULT([no])
-    fi
-fi
-
-AC_SUBST(ENABLE_GSTREAMER)
-
-dnl ===================================================================
-dnl Check whether the OpenGL libraries are available
-dnl ===================================================================
-
-AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
-ENABLE_OPENGL=
-
-if test "$_os" = "Darwin" ; then
-    # We use frameworks on Mac OS X, no need for detail checks
-    ENABLE_OPENGL=TRUE
-    AC_MSG_RESULT([yes])
-else
-    if test "x$enable_opengl" != "xno" ; then
-        if test "$_os" != "WINNT"; then
-            save_LDFLAGS=$LDFLAGS
-            LDFLAGS="$LDFLAGS -lm"
-            AC_MSG_RESULT([yes])
-            AC_CHECK_LIB(GL, main, [],
-                      [AC_MSG_ERROR(libGL not installed or functional)], [])
-            AC_CHECK_LIB(GLU, main, [],
-                      [AC_MSG_ERROR(libGLU not installed or functional)], [])
-            ENABLE_OPENGL=TRUE
-            LDFLAGS=$save_LDFLAGS
-
-            dnl ===================================================================
-            dnl Check for system Mesa
-            dnl ===================================================================
-            AC_MSG_CHECKING([which Mesa headers to use])
-            if test -n "$with_system_mesa_headers" -o -n "$with_system_headers" && \
-                    test "$with_system_mesa_headers" != "no"; then
-                AC_MSG_RESULT([external])
-                SYSTEM_MESA_HEADERS=YES
-                AC_LANG_PUSH(C)
-                AC_CHECK_HEADER(GL/glxext.h, [],
-                   [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
-                AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
-                AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
-                AC_LANG_POP(C)
-            else
-                AC_MSG_RESULT([internal])
-                SYSTEM_MESA_HEADERS=NO
-                BUILD_TYPE="$BUILD_TYPE MESA"
-            fi
-        else
-            AC_MSG_RESULT([not on Windows])
-        fi
-    else
-       AC_MSG_RESULT([no])
-    fi
-fi
-
-AC_SUBST(SYSTEM_MESA_HEADERS)
-AC_SUBST(ENABLE_OPENGL)
-
-# presenter minimizer extension?
-AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
-AS_IF([test "x$enable_ext_presenter_minimizer" = "xyes"], [
-   AC_MSG_RESULT([yes])
-   ENABLE_MINIMIZER=YES
-],[
-   AC_MSG_RESULT([no])
-   ENABLE_MINIMIZER=NO
-   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER"
-])
-AC_SUBST(ENABLE_MINIMIZER)
-
-# presenter console extension?
-AC_MSG_CHECKING([whether to build the Presenter Console extension])
-AS_IF([test "x$enable_ext_presenter_console" = "xyes"], [
-   AC_MSG_RESULT([yes])
-   ENABLE_PRESENTER_SCREEN=YES
-],[
-   AC_MSG_RESULT([no])
-   ENABLE_PRESENTER_SCREEN=NO
-   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PRESENTER_SCREEN"
-])
-AC_SUBST(ENABLE_PRESENTER_SCREEN)
-
-# pdf import extension?
-AC_MSG_CHECKING([whether to build the PDF Import extension])
-AS_IF([test "x$enable_ext_pdfimport" = "xyes"], [
-  AC_MSG_RESULT([yes])
-  ENABLE_PDFIMPORT=YES
-
-  dnl ===================================================================
-  dnl Check for system poppler
-  dnl ===================================================================
-  AC_MSG_CHECKING([which pdf backend to use])
-  if test -n "$with_system_poppler" -o -n "$with_system_libs" && \
-       test "$with_system_poppler" != "no"; then
-      AC_MSG_RESULT([external])
-      SYSTEM_POPPLER=YES
-      PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
-  else
-      AC_MSG_RESULT([internal])
-      SYSTEM_POPPLER=NO
-      BUILD_TYPE="$BUILD_TYPE XPDF"
-  fi
-],[
-  AC_MSG_RESULT([no])
-  ENABLE_PDFIMPORT=NO
-  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PDFIMPORT"
-])
-AC_SUBST(ENABLE_PDFIMPORT)
-AC_SUBST(SYSTEM_POPPLER)
-AC_SUBST(POPPLER_CFLAGS)
-AC_SUBST(POPPLER_LIBS)
-
-
-if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
-   AC_MSG_CHECKING([for sdext module])
-   BUILD_TYPE="$BUILD_TYPE SDEXT"
-fi
-
-AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
-AS_IF([test "x$enable_ext_wiki_publisher" = "xyes"], [
-  AC_MSG_RESULT([yes])
-  AC_MSG_CHECKING([for swext module])
-  ENABLE_MEDIAWIKI=YES
-  BUILD_TYPE="$BUILD_TYPE SWEXT"
-  if test  "x$with_java" = "xno"; then
-    AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.])
-  fi
-],[
-  AC_MSG_RESULT([no])
-  ENABLE_MEDIAWIKI=NO
-  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI"
-])
-AC_SUBST(ENABLE_MEDIAWIKI)
-
-if test "$ENABLE_MEDIAWIKI" = "YES"; then
-    AC_MSG_CHECKING([which Servlet API Jar to use])
-    if test -n "$with_system_servlet_api"; then
-        AC_MSG_RESULT([external])
-        SYSTEM_SERVLETAPI=YES
-        if test -z "$SERVLETAPI_JAR"; then
-            SERVLETAPI_JAR=/usr/share/java/servlet-api.jar
-        fi
-        AC_CHECK_FILE($SERVLETAPI_JAR, [],
-              [AC_MSG_ERROR(servlet-api.jar not found.)], [])
-    else
-        AC_MSG_RESULT([internal])
-        SYSTEM_SERVLETAPI=NO
-        BUILD_TYPE="$BUILD_TYPE TOMCAT"
-    fi
-fi
-AC_SUBST(SYSTEM_SERVLETAPI)
-AC_SUBST(SERVLETAPI_JAR)
-
-AC_MSG_CHECKING([whether to build the Report Builder extension])
-if test -n "$enable_ext_report_builder" -a "$enable_ext_report_builder" != "no" && test "$with_java" != "no"; then
-    AC_MSG_RESULT([yes])
-    ENABLE_REPORTBUILDER=YES
-    AC_MSG_CHECKING([for reportbuilder module])
-    AC_MSG_CHECKING([which jfreereport libs to use])
-    if test "$with_system_jfreereport" = "yes"; then
-        SYSTEM_JFREEREPORT=YES
-        AC_MSG_RESULT([external])
-        if test -z $SAC_JAR; then
-            SAC_JAR=/usr/share/java/sac.jar
-        fi
-        AC_CHECK_FILE($SAC_JAR, [],
-             [AC_MSG_ERROR(sac.jar not found.)], [])
-
-        if test -z $LIBXML_JAR; then
-            AC_CHECK_FILE(/usr/share/java/libxml-1.0.0.jar,
-                [ LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar ],
-                [
-                    AC_CHECK_FILE(/usr/share/java/libxml.jar,
-                       [ LIBXML_JAR=/usr/share/java/libxml.jar ],
-                       [AC_MSG_ERROR(libxml.jar replacement not found.)]
-                    )
-                ]
-            )
-        else
-            AC_CHECK_FILE($LIBXML_JAR, [],
-                 [AC_MSG_ERROR(libxml.jar not found.)], [])
-        fi
-
-        if test -z $FLUTE_JAR; then
-            AC_CHECK_FILE(/usr/share/java/flute-1.3.0.jar,
-                [ FLUTE_JAR=/usr/share/java/flute-1.3.0.jar ],
-                [
-                    AC_CHECK_FILE(/usr/share/java/flute.jar,
-                        [ FLUTE_JAR=/usr/share/java/flute.jar ],
-                        [ AC_MSG_ERROR(flute-1.3.0.jar replacement not found.)]
-                    )
-                ]
-            )
-        else
-            AC_CHECK_FILE($FLUTE_JAR, [],
-                 [AC_MSG_ERROR(flute-1.3.0.jar not found.)], [])
-        fi
-
-        if test -z $JFREEREPORT_JAR; then
-            AC_CHECK_FILE(/usr/share/java/flow-engine-0.9.2.jar,
-                [ JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar ],
-                [
-                    AC_CHECK_FILE(/usr/share/java/flow-engine.jar,
-                        [ JFREEREPORT_JAR=/usr/share/java/flow-engine.jar ],
-                        [AC_MSG_ERROR(jfreereport.jar replacement not found.)]
-                    )
-                ]
-            )
-        else
-            AC_CHECK_FILE($JFREEREPORT_JAR, [],
-                 [AC_MSG_ERROR(jfreereport.jar not found.)], [])
-        fi
-
-        if test -z $LIBLAYOUT_JAR; then
-            AC_CHECK_FILE(/usr/share/java/liblayout-0.2.9.jar,
-                [ LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.9.jar ],
-                [
-                    AC_CHECK_FILE(/usr/share/java/liblayout.jar,
-                        [ LIBLAYOUT_JAR=/usr/share/java/liblayout.jar ],
-                        [AC_MSG_ERROR(liblayout.jar replacement not found.)]
-                    )
-                ]
-            )
-        else
-            AC_CHECK_FILE($LIBLAYOUT_JAR, [],
-                 [AC_MSG_ERROR(liblayout.jar not found.)], [])
-        fi
-
-        if test -z $LIBLOADER_JAR; then
-            AC_CHECK_FILE(/usr/share/java/libloader-1.0.0.jar,
-                [ LIBLOADER_JAR=/usr/share/java/libloader-1.0.0.jar ],
-                [
-                    AC_CHECK_FILE(/usr/share/java/libloader.jar,
-                       [ LIBLOADER_JAR=/usr/share/java/libloader.jar ],
-                       [AC_MSG_ERROR(libloader.jar replacement not found.)]
-                    )
-                ]
-            )
-        else
-            AC_CHECK_FILE($LIBLOADER_JAR, [],
-                [AC_MSG_ERROR(libloader.jar not found.)], [])
-        fi
-
-        if test -z $LIBFORMULA_JAR; then
-            AC_CHECK_FILE(/usr/share/java/libformula-0.2.0.jar,
-                 [ LIBFORMULA_JAR=/usr/share/java/libformula-0.2.0.jar ],
-                 [
-                     AC_CHECK_FILE(/usr/share/java/libformula.jar,
-                         [ LIBFORMULA_JAR=/usr/share/java/libformula.jar ],
-                         [AC_MSG_ERROR(libformula.jar replacement not found.)]
-                     )
-                 ]
-            )
-        else
-            AC_CHECK_FILE($LIBFORMULA_JAR, [],
-                [AC_MSG_ERROR(libformula.jar not found.)], [])
-        fi
-
-        if test -z $LIBREPOSITORY_JAR; then
-            AC_CHECK_FILE(/usr/share/java/librepository-1.0.0.jar,
-                [ LIBREPOSITORY_JAR=/usr/share/java/librepository-1.0.0.jar ],
-                [
-                    AC_CHECK_FILE(/usr/share/java/librepository.jar,
-                        [ LIBREPOSITORY_JAR=/usr/share/java/librepository.jar ],
-                        [AC_MSG_ERROR(librepository.jar replacement not found.)]
-                    )
-                ]
-            )
-        else
-            AC_CHECK_FILE($LIBREPOSITORY_JAR, [],
-                [AC_MSG_ERROR(librepository.jar not found.)], [])
-        fi
-
-        if test -z $LIBFONTS_JAR; then
-            AC_CHECK_FILE(/usr/share/java/libfonts-1.0.0.jar,
-                [ LIBFONTS_JAR=/usr/share/java/libfonts-1.0.0.jar ],
-                [
-                    AC_CHECK_FILE(/usr/share/java/libfonts.jar,
-                        [ LIBFONTS_JAR=/usr/share/java/libfonts.jar ],
-                        [AC_MSG_ERROR(libfonts.jar replacement not found.)]
-                    )
-                ]
-            )
-        else
-            AC_CHECK_FILE($LIBFONTS_JAR, [],
-                [AC_MSG_ERROR(libfonts.jar not found.)], [])
-        fi
-
-        if test -z $LIBSERIALIZER_JAR; then
-            AC_CHECK_FILE(/usr/share/java/libserializer-1.0.0.jar,
-                [ LIBSERIALIZER_JAR=/usr/share/java/libserializer-1.0.0.jar ],
-                [
-                    AC_CHECK_FILE(/usr/share/java/libserializer.jar,
-                        [ LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar ],
-                        [AC_MSG_ERROR(libserializer.jar replacement not found.)]
-                    )
-                ]
-            )
-        else
-            AC_CHECK_FILE($LIBSERIALIZER_JAR, [],
-                [AC_MSG_ERROR(libserializer.jar not found.)], [])
-        fi
-
-
-        if test -z $LIBBASE_JAR; then
-            AC_CHECK_FILE(/usr/share/java/libbase-1.0.0.jar,
-                [ LIBBASE_JAR=/usr/share/java/libbase-1.0.0.jar ],
-                [
-                    AC_CHECK_FILE(/usr/share/java/libbase.jar,
-                        [ LIBBASE_JAR=/usr/share/java/libbase.jar ],
-                        [AC_MSG_ERROR(libbase.jar replacement not found.)]
-                    )
-                ]
-            )
-        else
-            AC_CHECK_FILE($LIBBASE_JAR, [],
-                [AC_MSG_ERROR(libbase.jar not found.)], [])
-        fi
-
-    else
-        AC_MSG_RESULT([internal])
-        AC_MSG_CHECKING([for jfreereport module])
-        SYSTEM_JFREEREPORT=NO
-        BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
-    fi
-    BUILD_TYPE="$BUILD_TYPE REPORTBUILDER"
-else
-    AC_MSG_RESULT([no])
-    ENABLE_REPORTBUILDER=NO
-    SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_REPORTDESIGN"
-    SYSTEM_JFREEREPORT=NO
-fi
-AC_SUBST(ENABLE_REPORTBUILDER)
-AC_SUBST(SYSTEM_JFREEREPORT)
-AC_SUBST(SAC_JAR)
-AC_SUBST(LIBXML_JAR)
-AC_SUBST(FLUTE_JAR)
-AC_SUBST(JFREEREPORT_JAR)
-AC_SUBST(LIBBASE_JAR)
-AC_SUBST(LIBLAYOUT_JAR)
-AC_SUBST(LIBLOADER_JAR)
-AC_SUBST(LIBFORMULA_JAR)
-AC_SUBST(LIBREPOSITORY_JAR)
-AC_SUBST(LIBFONTS_JAR)
-AC_SUBST(LIBSERIALIZER_JAR)
-
-# this has to be here because both the Wiki Publisher and the SRB use
-# commons-logging
-if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
-    AC_MSG_CHECKING([which Apache commons-* libs to use])
-    if test "$with_system_apache_commons" = "yes"; then
-        SYSTEM_APACHE_COMMONS=YES
-        AC_MSG_RESULT([external])
-        if test "$ENABLE_MEDIAWIKI" = "YES"; then
-            if test -z $COMMONS_CODEC_JAR; then
-                AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar,
-                    [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ],
-                    [
-                        AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
-                            [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
-                            [AC_MSG_ERROR(commons-codec.jar replacement not found.)]
-                        )
-                    ]
-                )
-            else
-                AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
-                    [AC_MSG_ERROR(commons-codec.jar not found.)], [])
-            fi
-
-            if test -z $COMMONS_LANG_JAR; then
-                AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar,
-                    [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar ],
-                    [
-                        AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
-                            [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
-                            [AC_MSG_ERROR(commons-lang.jar replacement not found.)]
-                            )
-                    ]
-                )
-            else
-                AC_CHECK_FILE($COMMONS_LANG_JAR, [],
-                    [AC_MSG_ERROR(commons-lang.jar not found.)], [])
-            fi
-
-            if test -z $COMMONS_HTTPCLIENT_JAR; then
-                AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar,
-                    [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar ],
-                    [
-                        AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar,
-                            [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar ],
-                            [AC_MSG_ERROR(commons-httpclient.jar replacement not found.)]
-                        )
-                    ]
-                )
-            else
-                AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
-                    [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
-            fi
-        fi
-        if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
-            if test -z $COMMONS_LOGGING_JAR; then
-                AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar,
-                   [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ],
-                   [
-                        AC_CHECK_FILE(/usr/share/java/commons-logging.jar,
-                            [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
-                            [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
-                        )
-                    ]
-                )
-            else
-                AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
-                    [AC_MSG_ERROR(commons-logging.jar not found.)], [])
-            fi
-        fi
-    else
-        AC_MSG_RESULT([internal])
-        SYSTEM_APACHE_COMMONS=NO
-        BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
-    fi
-fi
-AC_SUBST(SYSTEM_APACHE_COMMONS)
-AC_SUBST(COMMONS_CODEC_JAR)
-AC_SUBST(COMMONS_LANG_JAR)
-AC_SUBST(COMMONS_HTTPCLIENT_JAR)
-AC_SUBST(COMMONS_LOGGING_JAR)
-
-# scripting provider for BeanShell extension?
-AC_MSG_CHECKING([whether to build extension for support of scripts in BeanShell])
-AS_IF([test "x$enable_ext_scripting_beanshell" = "xyes"], [
-   AC_MSG_RESULT([yes])
-   ENABLE_SCRIPTING_BEANSHELL=YES
-],[
-   AC_MSG_RESULT([no])
-   ENABLE_SCRIPTING_BEANSHELL=NO
-   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_BEANSHELL"
-])
-AC_SUBST(ENABLE_SCRIPTING_BEANSHELL)
-
-# scripting provider for JavaScript extension?
-AC_MSG_CHECKING([whether to build extension for support of scripts in JavaScript])
-AS_IF([test "x$enable_ext_scripting_javascript" = "xyes"], [
-   AC_MSG_RESULT([yes])
-   ENABLE_SCRIPTING_JAVASCRIPT=YES
-],[
-   AC_MSG_RESULT([no])
-   ENABLE_SCRIPTING_JAVASCRIPT=NO
-   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT"
-])
-AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT)
-
-dnl Scripting provider for Python extension?
-dnl We always provide this unless we have disabled Python completely
-if test $enable_python = no; then
-    ENABLE_SCRIPTING_PYTHON=NO
-else
-    ENABLE_SCRIPTING_PYTHON=YES
-fi
-AC_SUBST(ENABLE_SCRIPTING_PYTHON)
-
-supports_multilib=
-case "$host_cpu" in
-x86_64 | powerpc64 | s390x)
-    if test "$SIZEOF_LONG" = "8"; then
-        supports_multilib="yes"
-    fi
-    ;;
-*)
-    ;;
-esac
-
-dnl ===================================================================
-dnl Check whether the Qt3 and KDE3 libraries are available.
-dnl ===================================================================
-
-KDE_CFLAGS=""
-KDE_LIBS=""
-if test "$_os" != "OpenBSD"; then
-    MOC="moc"
-fi
-if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
-    dnl Search paths for Qt3 and KDE3
-    if test -z "$supports_multilib" ; then
-        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include /usr/local/include/X11/qt3 $x_includes"
-        qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/lib/qt3 $x_libraries"
-    else
-        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include /usr/local/include/X11/qt3 $x_includes"
-        qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/lib/qt3 $x_libraries"
-    fi
-    if test -n "$QTDIR" ; then
-        qt_incdirs="$QTDIR/include $qt_incdirs"
-        if test -z "$supports_multilib" ; then
-            qt_libdirs="$QTDIR/lib $qt_libdirs"
-        else
-            qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
-        fi
-    fi
-    if test -z "$supports_multilib" ; then
-        kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
-        kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib $x_libraries"
-    else
-        kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
-        kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib64 $x_libraries"
-    fi
-    if test -n "$KDEDIR" ; then
-        kde_incdirs="$KDEDIR/include $kde_incdirs"
-        if test -z "$supports_multilib" ; then
-            kde_libdirs="$KDEDIR/lib $kde_libdirs"
-        else
-            kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde_libdirs"
-        fi
-    fi
-
-    dnl What to test
-    qt_test_include="qstyle.h"
-    kde_test_include="kapp.h"
-
-    if test "$_os" != "OpenBSD"; then
-        qt_test_library="libqt-mt.so"
-        kde_test_library="libDCOP.so"
-    else
-        qt_test_library="libqt-mt.so*"
-        kde_test_library="libDCOP.so*"
-    fi
-
-    dnl Check for Qt3 headers
-    AC_MSG_CHECKING([for Qt3 headers])
-    qt_incdir="no"
-    for kde_check in $qt_incdirs ; do
-        if test -r "$kde_check/$qt_test_include" ; then
-            qt_incdir="$kde_check"
-            break
-        fi
-    done
-    AC_MSG_RESULT([$qt_incdir])
-    if test "x$qt_incdir" = "xno" ; then
-        AC_MSG_ERROR([Qt3 headers not found.  Please specify the root of
-your Qt3 installation by exporting QTDIR before running "configure".])
-    fi
-
-    dnl Check for Qt3 libraries
-    AC_MSG_CHECKING([for Qt3 libraries])
-    qt_libdir="no"
-    for qt_check in $qt_libdirs ; do
-        if test -r "`ls $qt_check/$qt_test_library 2>/dev/null | head -1`" ; then
-            qt_libdir="$qt_check"
-            break
-        fi
-    done
-    AC_MSG_RESULT([$qt_libdir])
-    if test "x$qt_libdir" = "xno" ; then
-        AC_MSG_ERROR([Qt3 libraries not found.  Please specify the root of
-your Qt3 installation by exporting QTDIR before running "configure".])
-    fi
-
-    dnl Check for Meta Object Compiler
-    AC_PATH_PROG( MOC, moc, no, [`dirname $qt_libdir`/bin:$QTDIR/bin:$PATH] )
-    if test "$MOC" = "no" ; then
-        AC_MSG_ERROR([Qt3 Meta Object Compiler not found.  Please specify
-the root of your Qt3 installation by exporting QTDIR before running "configure".])
-    fi
-
-    dnl Check for KDE3 headers
-    AC_MSG_CHECKING([for KDE3 headers])
-    kde_incdir="no"
-    for kde_check in $kde_incdirs ; do
-        if test -r "$kde_check/$kde_test_include" ; then
-            kde_incdir="$kde_check"
-            break
-        fi
-    done
-    AC_MSG_RESULT([$kde_incdir])
-    if test "x$kde_incdir" = "xno" ; then
-        AC_MSG_ERROR([KDE3 headers not found.  Please specify the root of
-your KDE3 installation by exporting KDEDIR before running "configure".])
-    fi
-
-    dnl Check for KDE3 libraries
-    AC_MSG_CHECKING([for KDE3 libraries])
-    kde_libdir="no"
-    for kde_check in $kde_libdirs ; do
-        if test -r "`ls $kde_check/$kde_test_library 2>/dev/null | head -1`" ; then
-            kde_libdir="$kde_check"
-            break
-        fi
-    done
-    AC_MSG_RESULT([$kde_libdir])
-    if test "x$kde_libdir" = "xno" ; then
-        AC_MSG_ERROR([KDE3 libraries not found.  Please specify the root of
-your KDE3 installation by exporting KDEDIR before running "configure".])
-    fi
-
-    dnl Set the variables
-    KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
-    KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt"
-fi
-AC_SUBST(KDE_CFLAGS)
-AC_SUBST(KDE_LIBS)
-AC_SUBST(MOC)
-
-dnl ===================================================================
-dnl KDE4 Integration
-dnl ===================================================================
-
-KDE4_CFLAGS=""
-KDE4_LIBS=""
-MOC4="moc"
-KDE_GLIB_CFLAGS=""
-KDE_GLIB_LIBS=""
-KDE_HAVE_GLIB=""
-if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
-    qt_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes"
-    qt_libdirs="$QT4LIB /usr/lib/qt4 /usr/lib $x_libraries"
-
-    kde_incdirs="/usr/include /usr/include/kde4 $x_includes"
-    kde_libdirs="/usr/lib /usr/lib/kde4 /usr/lib/kde4/devel $x_libraries"
-
-    if test -n "$supports_multilib" ; then
-        qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
-        kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4 /usr/lib64/kde4/devel"
-    fi
-
-    if test -n "$QTDIR" ; then
-        qt_incdirs="$QTDIR/include $qt_incdirs"
-        if test -z "$supports_multilib" ; then
-            qt_libdirs="$QTDIR/lib $qt_libdirs"
-        else
-            qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
-        fi
-    fi
-    if test -n "$QT4DIR" ; then
-        qt_incdirs="$QT4DIR/include $qt_incdirs"
-        if test -z "$supports_multilib" ; then
-            qt_libdirs="$QT4DIR/lib $qt_libdirs"
-        else
-            qt_libdirs="$QT4DIR/lib64 $QT4DIR/lib $qt_libdirs"
-        fi
-    fi
-
-    if test -n "$KDEDIR" ; then
-        kde_incdirs="$KDEDIR/include $kde_incdirs"
-        if test -z "$supports_multilib" ; then
-            kde_libdirs="$KDEDIR/lib $kde_libdirs"
-        else
-            kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde_libdirs"
-        fi
-    fi
-    if test -n "$KDE4DIR" ; then
-        kde_incdirs="$KDE4DIR/include $KDE4DIR/include/kde4 $kde_incdirs"
-        if test -z "$supports_multilib" ; then
-            kde_libdirs="$KDE4DIR/lib $kde_libdirs"
-        else
-            kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs"
-        fi
-    fi
-
-    qt_test_include="Qt/qobject.h"
-    qt_test_library="libQtCore.so"
-    kde_test_include="kwindowsystem.h"
-    kde_test_library="libsolid.so"
-
-    AC_MSG_CHECKING([for Qt4 headers])
-    qt_header_dir="no"
-    for inc_dir in $qt_incdirs ; do
-        if test -r "$inc_dir/$qt_test_include" ; then
-            qt_header_dir="$inc_dir"
-            break
-        fi
-    done
-
-    AC_MSG_RESULT([$qt_header_dir])
-    if test "x$qt_header_dir" = "xno" ; then
-        AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
-    fi
-
-    AC_MSG_CHECKING([for Qt4 libraries])
-    qt_lib_dir="no"
-    for lib_dir in $qt_libdirs ; do
-        if test -r "$lib_dir/$qt_test_library" ; then
-            qt_lib_dir="$lib_dir"
-            PKG_CONFIG_PATH="$qt_lib_dir"/pkgconfig:$PKG_CONFIG_PATH
-            break
-        fi
-    done
-
-    AC_MSG_RESULT([$qt_lib_dir])
-
-    if test "x$qt_lib_dir" = "xno" ; then
-        AC_MSG_ERROR([Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
-    fi
-
-    dnl Check for Meta Object Compiler
-
-    AC_PATH_PROG( MOCQT4, moc-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
-    MOC4="$MOCQT4"
-    if test "$MOC4" = "no" ; then
-        AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
-        if test "$MOC4" = "no" ; then
-            AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
-the root of your Qt installation by exporting QT4DIR before running "configure".])
-        fi
-    fi
-
-    dnl Check for KDE4 headers
-    AC_MSG_CHECKING([for KDE4 headers])
-    kde_incdir="no"
-    for kde_check in $kde_incdirs ; do
-        if test -r "$kde_check/$kde_test_include" ; then
-            kde_incdir="$kde_check"
-            break
-        fi
-    done
-    AC_MSG_RESULT([$kde_incdir])
-    if test "x$kde_incdir" = "xno" ; then
-        AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
-    fi
-
-    dnl Check for KDE4 libraries
-    AC_MSG_CHECKING([for KDE4 libraries])
-    kde_libdir="no"
-    for kde_check in $kde_libdirs ; do
-        if test -r "$kde_check/$kde_test_library" ; then
-            kde_libdir="$kde_check"
-            break
-        fi
-    done
-
-    AC_MSG_RESULT([$kde_libdir])
-    if test "x$kde_libdir" = "xno" ; then
-        AC_MSG_ERROR([KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
-    fi
-
-    KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
-    KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui"
-
-    AC_LANG_PUSH([C++])
-    save_CXXFLAGS=$CXXFLAGS
-    CXXFLAGS="$CXXFLAGS $KDE4_CFLAGS"
-    AC_MSG_CHECKING([whether KDE is >= 4.2])
-       AC_TRY_RUN([
-#include <kdeversion.h>
-
-int main(int argc, char **argv) {
-       if (KDE_VERSION_MAJOR == 4 && KDE_VERSION_MINOR >= 2) return 0;
-       else return 1;
-}
-       ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([KDE version too old])])
-    CXXFLAGS=$save_CXXFLAGS
-    AC_LANG_POP([C++])
-
-   # Glib is needed for properly handling Qt event loop with Qt's Glib integration enabled
-    PKG_CHECK_MODULES(KDE_GLIB,[glib-2.0 >= 2.4],
-        [KDE_HAVE_GLIB=1],
-        AC_MSG_WARN([[No Glib found, KDE4 support will not integrate with Qt's Glib event loop support]]))
-fi
-AC_SUBST(KDE4_CFLAGS)
-AC_SUBST(KDE4_LIBS)
-AC_SUBST(MOC4)
-AC_SUBST(KDE_GLIB_CFLAGS)
-AC_SUBST(KDE_GLIB_LIBS)
-AC_SUBST(KDE_HAVE_GLIB)
-
-dnl ===================================================================
-dnl Test for the enabling the lockdown pieces
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable the lockdown pieces])
-ENABLE_LOCKDOWN=""
-if test -n "$enable_lockdown" && test "$enable_lockdown" != "no"; then
-    ENABLE_LOCKDOWN=YES
-    AC_MSG_RESULT([yes])
-else
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_LOCKDOWN)
-
-dnl ===================================================================
-dnl Test whether to include Evolution 2 support
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable evolution 2 support])
-if test "$enable_evolution2" = "yes" -o "$enable_evolution2" = "TRUE"; then
-    AC_MSG_RESULT([yes])
-    PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
-    ENABLE_EVOAB2="TRUE"
-else
-    ENABLE_EVOAB2=""
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_EVOAB2)
-AC_SUBST(GOBJECT_CFLAGS)
-AC_SUBST(GOBJECT_LIBS)
-
-dnl ===================================================================
-dnl Test whether to include KDE AB support
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable KDE address book support])
-if test "$enable_kdeab" = "yes" && test "$enable_kde" = "yes"; then
-    AC_MSG_RESULT([yes])
-    AC_LANG_PUSH([C++])
-    save_CXXFLAGS=$CXXFLAGS
-    CXXFLAGS="$CXXFLAGS $KDE_CFLAGS"
-    AC_MSG_CHECKING([whether KDE is between 3.2 and 3.6])
-       AC_TRY_RUN([
-#include <kdeversion.h>
-
-int main(int argc, char **argv) {
-       if (KDE_VERSION_MAJOR == 3 && 2 <= KDE_VERSION_MINOR && KDE_VERSION_MINOR <= 6) return 0;
-       else return 1;
-}
-       ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([KDE version too old or too recent, please use another version of KDE or disable KDE address book support])])
-    CXXFLAGS=$save_CXXFLAGS
-    AC_LANG_POP([C++])
-    ENABLE_KAB=TRUE
-else
-    AC_MSG_RESULT([no])
-    ENABLE_KAB=
-fi
-AC_SUBST(ENABLE_KAB)
-
-dnl ===================================================================
-dnl Test whether to include MathMLDTD
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include MathMLDTD])
-if test -n "$enable_mathmldtd"; then
-    if test "$enable_mathmldtd" = "no"; then
-        AC_MSG_RESULT([no])
-        SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
-    else
-        AC_MSG_RESULT([yes])
-        BUILD_TYPE="$BUILD_TYPE MATHMLDTD"
-    fi
-else
-    AC_MSG_RESULT([no])
-    SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
-fi
-
-dnl ===================================================================
-dnl Test which themes to include
-dnl ===================================================================
-AC_MSG_CHECKING([which themes to include])
-# if none given, use all available themes
-if test "z$enable_theme" = "z" -o "z$enable_theme" = "zyes"; then
-    enable_theme="default crystal hicontrast oxygen tango"
-fi
-
-WITH_THEMES=""
-for theme in $enable_theme
-do
-    WITH_THEMES="$WITH_THEMES $theme"
-    SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[a-z]' '[A-Z]'`"
-done
-AC_MSG_RESULT([$WITH_THEMES])
-AC_SUBST(WITH_THEMES)
-
-dnl ===================================================================
-dnl Test whether to integrate helppacks into the product's installer
-dnl ===================================================================
-AC_MSG_CHECKING([for helppack integration])
-if test "z$with_helppack_integration" = "zno" ; then
-    WITH_HELPPACK_INTEGRATION=NO
-    AC_MSG_RESULT([no integration])
-else
-    WITH_HELPPACK_INTEGRATION=YES
-    SCPDEFS="$SCPDEFS -DWITH_HELPPACK_INTEGRATION"
-    AC_MSG_RESULT([integration])
-fi
-AC_SUBST(WITH_HELPPACK_INTEGRATION)
-
-dnl ===================================================================
-dnl Test whether to integrate extensions into the product's installer
-dnl ===================================================================
-AC_MSG_CHECKING([for extensions integration])
-if test "z$with_extension_integration" = "z" -o "z$with_extension_integration" = "zno" ; then
-    WITH_EXTENSION_INTEGRATION=NO
-    AC_MSG_RESULT([no integration])
-else
-    WITH_EXTENSION_INTEGRATION=YES
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_INTEGRATION"
-    AC_MSG_RESULT([integration])
-fi
-AC_SUBST(WITH_EXTENSION_INTEGRATION)
-
-dnl ===================================================================
-dnl Test whether to include Lightproof extensions
-dnl ===================================================================
-AC_MSG_CHECKING([for Lightproof extensions integration (only supported languages displayed)])
-if test "z$enable_ext_lightproof" = "z" -o "z$enable_ext_lightproof" = "zno" ; then
-    LIGHTPROOF_LANG=""
-    AC_MSG_RESULT([no integration])
-else
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF"
-    lightproof_supported_langs="en-US hu"
-    if test "z$enable_ext_lightproof" = "zyes" ; then
-        wanted_lightproof="$lightproof_supported_langs"
-    else
-    # check whether the langs are supported by Lightproof
-    wanted_lightproof=
-    for lang in $enable_ext_lightproof ; do
-        if test -n "`echo $lightproof_supported_langs | grep "$lang"`" ; then
-            wanted_lightproof="$wanted_lightproof $lang"
-        fi
-    done
-    fi
-    LIGHTPROOF_LANG=
-    LIGHTPROOF_HU_PACK=
-    LIGHTPROOF_EN_US_PACK=
-    # check whether the langs are requested at all
-    for lang in $wanted_lightproof ; do
-        if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
-            LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
-            case $lang in
-            "hu") LIGHTPROOF_HU_PACK="324ddcb9ef45c3bc055fcc002bc4e556-lightproof-hu_1.2.oxt";;
-            "en-US") LIGHTPROOF_EN_US_PACK="942541da5f5498214518c8b459ae4524-lightproof-en-US_0.1.oxt";;
-            esac
-        fi
-    done
-    AC_MSG_RESULT([$LIGHTPROOF_LANG])
-fi
-AC_SUBST(LIGHTPROOF_LANG)
-AC_SUBST(LIGHTPROOF_HU_PACK)
-AC_SUBST(LIGHTPROOF_EN_US_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Watch Window extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Watch Window extension integration])
-if test "z$enable_ext_watch_window" = "z" -o "z$enable_ext_watch_window" = "zno" ; then
-    AC_MSG_RESULT([no])
-    WATCH_WINDOW_EXTENSION_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_WATCH_WINDOW"
-    WATCH_WINDOW_EXTENSION_PACK="23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt"
-fi
-AC_SUBST(WATCH_WINDOW_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Diagram extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Diagram extension integration])
-if test "z$enable_ext_diagram" = "z" -o "z$enable_ext_diagram" = "zno" ; then
-    AC_MSG_RESULT([no])
-    DIAGRAM_EXTENSION_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_DIAGRAM"
-    DIAGRAM_EXTENSION_PACK="41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt"
-fi
-AC_SUBST(DIAGRAM_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Validator extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Validator extension integration])
-if test "z$enable_ext_validator" = "z" -o "z$enable_ext_validator" = "zno" ; then
-    AC_MSG_RESULT([no])
-    VALIDATOR_EXTENSION_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_VALIDATOR"
-    VALIDATOR_EXTENSION_PACK="bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt"
-fi
-AC_SUBST(VALIDATOR_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Barcode extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Barcode extension integration])
-if test "z$enable_ext_barcode" = "z" -o "z$enable_ext_barcode" = "zno" ; then
-    AC_MSG_RESULT([no])
-    BARCODE_EXTENSION_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_BARCODE"
-    BARCODE_EXTENSION_PACK="7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt"
-fi
-AC_SUBST(BARCODE_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include ConvertTextToNumber extension
-dnl ===================================================================
-AC_MSG_CHECKING([for ConvertTextToNumber extension integration])
-if test "z$enable_ext_ct2n" = "z" -o "z$enable_ext_ct2n" = "zno" ; then
-    AC_MSG_RESULT([no])
-    CT2N_EXTENSION_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    BUILD_TYPE="$BUILD_TYPE CT2N"
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
-    CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt"
-fi
-AC_SUBST(CT2N_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Numbertext extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Numbertext extension integration])
-if test "z$enable_ext_numbertext" = "z" -o "z$enable_ext_numbertext" = "zno" ; then
-    AC_MSG_RESULT([no])
-    NUMBERTEXT_EXTENSION_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NUMBERTEXT"
-    NUMBERTEXT_EXTENSION_PACK="b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt"
-fi
-AC_SUBST(NUMBERTEXT_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Hungarian Cross-reference Toolbar extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Hungarian Cross-reference Toolbar extension integration])
-if test "z$enable_ext_hunart" = "z" -o "z$enable_ext_hunart" = "zno" ; then
-    AC_MSG_RESULT([no])
-    HUNART_EXTENSION_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_HUNART"
-    HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt"
-fi
-AC_SUBST(HUNART_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Typography Toolbar extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Typography Toolbar extension integration])
-if test "z$enable_ext_typo" = "z" -o "z$enable_ext_typo" = "zno" ; then
-    AC_MSG_RESULT([no])
-    TYPO_EXTENSION_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_TYPO"
-    TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt"
-fi
-AC_SUBST(TYPO_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Google Docs extension
-dnl ===================================================================
-AC_MSG_CHECKING([for Google Docs extension integration])
-if test "z$enable_ext_google_docs" = "z" -o "z$enable_ext_google_docs" = "zno" ; then
-    AC_MSG_RESULT([no])
-    GOOGLE_DOCS_EXTENSION_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS"
-    GOOGLE_DOCS_EXTENSION_PACK="dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt"
-fi
-AC_SUBST(GOOGLE_DOCS_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include NLPSolver extension
-dnl ===================================================================
-AC_MSG_CHECKING([for NLPSolver extension integration])
-if test "z$enable_ext_nlpsolver" = "z" -o "z$enable_ext_nlpsolver" = "zno" ; then
-    AC_MSG_RESULT([no])
-else
-    AC_MSG_RESULT([yes])
-    BUILD_TYPE="$BUILD_TYPE NLPSOLVER"
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER"
-fi
-
-dnl ===================================================================
-dnl Test whether to include LanguageTool extension
-dnl ===================================================================
-AC_MSG_CHECKING([for LanguageTool extension integration])
-if test "z$with_languagetool" = "z" -o "z$with_languagetool" = "zno" ; then
-    AC_MSG_RESULT([no])
-else
-    AC_MSG_RESULT([yes])
-    BUILD_TYPE="$BUILD_TYPE LANGUAGETOOL"
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL"
-fi
-
-dnl ===================================================================
-dnl Test whether to include oooblogger extension
-dnl ===================================================================
-AC_MSG_CHECKING([for oooblogger extension integration])
-if test "z$enable_ext_oooblogger" = "z" -o "z$enable_ext_oooblogger" = "zno" ; then
-    AC_MSG_RESULT([no])
-    OOOBLOGGER_EXTENSION_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_OOOBLOGGER"
-    OOOBLOGGER_EXTENSION_PACK="b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt"
-fi
-AC_SUBST(OOOBLOGGER_EXTENSION_PACK)
-
-dnl ===================================================================
-dnl Test whether to include Sun Professional Template Pack
-dnl ===================================================================
-AC_MSG_CHECKING([for Sun Professional Template Pack integration (only supported languages displayed)])
-if test "z$with_sun_templates" = "z" -o "z$with_sun_templates" = "zno" ; then
-    SUNTEMPLATES_LANG=""
-    AC_MSG_RESULT([no integration])
-else
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_SUN_TEMPLATE_PACK"
-    sun_supported_langs="en-US de it fr es hu"
-    if test "z$with_sun_templates" = "zyes" ; then
-        wanted_sun_templates="$sun_supported_langs"
-    else
-        # check whether the langs are supported by Sun
-        wanted_sun_templates=
-        for lang in $with_sun_templates ; do
-            if test -n "`echo $sun_supported_langs | grep "$lang"`" ; then
-                wanted_sun_templates="$wanted_sun_templates $lang"
-            fi
-        done
-    fi
-    SUNTEMPLATES_LANG=
-    SUNTEMPLATES_DE_PACK=
-    SUNTEMPLATES_EN_US_PACK=
-    SUNTEMPLATES_ES_PACK=
-    SUNTEMPLATES_FR_PACK=
-    SUNTEMPLATES_HU_PACK=
-    SUNTEMPLATES_IT_PACK=
-    # check whether the langs are requested at all
-    for lang in $wanted_sun_templates ; do
-    if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
-        SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
-        case $lang in
-        "de") SUNTEMPLATES_DE_PACK="53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt";;
-        "en-US") SUNTEMPLATES_EN_US_PACK="472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt";;
-        "es") SUNTEMPLATES_ES_PACK="4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt";;
-        "fr") SUNTEMPLATES_FR_PACK="a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt";;
-        "hu") SUNTEMPLATES_HU_PACK="09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt";;
-        "it") SUNTEMPLATES_IT_PACK="b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt";;
-        esac
-    fi
-    done
-    AC_MSG_RESULT([$SUNTEMPLATES_LANG])
-fi
-AC_SUBST(SUNTEMPLATES_LANG)
-AC_SUBST(SUNTEMPLATES_DE_PACK)
-AC_SUBST(SUNTEMPLATES_EN_US_PACK)
-AC_SUBST(SUNTEMPLATES_ES_PACK)
-AC_SUBST(SUNTEMPLATES_FR_PACK)
-AC_SUBST(SUNTEMPLATES_HU_PACK)
-AC_SUBST(SUNTEMPLATES_IT_PACK)
-
-dnl ===================================================================
-dnl Test whether to include fonts
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include third-party fonts])
-if test "$with_fonts" != "no" ; then
-    AC_MSG_RESULT([yes])
-    WITH_FONTS=YES
-    BUILD_TYPE="$BUILD_TYPE MORE_FONTS"
-else
-    AC_MSG_RESULT([no])
-    WITH_FONTS=NO
-    SCPDEFS="$SCPDEFS -DWITHOUT_FONTS"
-fi
-AC_SUBST(WITH_FONTS)
-
-AC_MSG_CHECKING([whether to include Agfa Monotype fonts])
-if test "$with_agfa_monotype_fonts" = "yes" ; then
-    AC_MSG_RESULT([yes])
-    WITH_AGFA_MONOTYPE_FONTS=YES
-    SCPDEFS="$SCPDEFS -DWITH_AGFA_MONOTYPE_FONTS"
-    BUILD_TYPE="$BUILD_TYPE AGFA_MONOTYPE_FONTS"
-else
-    AC_MSG_RESULT([no])
-    WITH_AGFA_MONOTYPE_FONTS=NO
-fi
-AC_SUBST(WITH_AGFA_MONOTYPE_FONTS)
-
-dnl ===================================================================
-dnl Test whether to include ppds
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include PPDs])
-if test "$with_ppds" != "no"; then
-    AC_MSG_RESULT([yes])
-else
-    AC_MSG_RESULT([no])
-    WITHOUT_PPDS=YES
-    SCPDEFS="$SCPDEFS -DWITHOUT_PPDS"
-fi
-AC_SUBST(WITHOUT_PPDS)
-
-dnl ===================================================================
-dnl Test whether to include afms
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include AFMs])
-if test "$with_afms" != "no"; then
-    AC_MSG_RESULT([yes])
-    BUILD_TYPE="$BUILD_TYPE AFMS"
-else
-    AC_MSG_RESULT([no])
-    WITHOUT_AFMS=YES
-    SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
-fi
-AC_SUBST(WITHOUT_AFMS)
-
-dnl ===================================================================
-dnl Test whether to include extra galleries
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include extra galleries])
-if test "z$enable_extra_gallery" = "z" -o "z$enable_extra_gallery" = "zno" ; then
-    AC_MSG_RESULT([no])
-    WITH_EXTRA_GALLERY=NO
-    OOOP_GALLERY_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    WITH_EXTRA_GALLERY=YES
-    BUILD_TYPE="$BUILD_TYPE EXTRA_GALLERY"
-    SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY"
-    OOOP_GALLERY_PACK="af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip"
-fi
-AC_SUBST(WITH_EXTRA_GALLERY)
-AC_SUBST(OOOP_GALLERY_PACK)
-
-dnl ===================================================================
-dnl Test whether to include extra templates
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include extra templates])
-if test "z$enable_extra_template" = "z" -o "z$enable_extra_template" = "zno" ; then
-    AC_MSG_RESULT([no])
-    WITH_EXTRA_TEMPLATE=NO
-    OOOP_TEMPLATES_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    WITH_EXTRA_TEMPLATE=YES
-    BUILD_TYPE="$BUILD_TYPE EXTRA_TEMPLATE"
-    SCPDEFS="$SCPDEFS -DWITH_EXTRA_TEMPLATE"
-    OOOP_TEMPLATES_PACK="1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip"
-fi
-AC_SUBST(WITH_EXTRA_TEMPLATE)
-AC_SUBST(OOOP_TEMPLATES_PACK)
-
-dnl ===================================================================
-dnl Test whether to include extra samples
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include extra samples])
-if test "z$enable_extra_sample" = "z" -o "z$enable_extra_sample" = "zno" ; then
-    AC_MSG_RESULT([no])
-    WITH_EXTRA_SAMPLE=NO
-    OOOP_SAMPLES_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    WITH_EXTRA_SAMPLE=YES
-    BUILD_TYPE="$BUILD_TYPE EXTRA_SAMPLE"
-    SCPDEFS="$SCPDEFS -DWITH_EXTRA_SAMPLE"
-    OOOP_SAMPLES_PACK="a6bccacf44914969e6e7b2f8faf4132c-OOOP-samples-pack-2.7.0.0.zip"
-fi
-AC_SUBST(WITH_EXTRA_SAMPLE)
-AC_SUBST(OOOP_SAMPLES_PACK)
-
-dnl ===================================================================
-dnl Test whether to include extra fonts
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include extra fonts])
-if test "z$enable_extra_font" = "z" -o "z$enable_extra_font" = "zno" ; then
-    AC_MSG_RESULT([no])
-    WITH_EXTRA_FONT=NO
-    OOOP_FONTS_PACK=""
-else
-    AC_MSG_RESULT([yes])
-    WITH_EXTRA_FONT=YES
-    BUILD_TYPE="$BUILD_TYPE EXTRA_FONT"
-    SCPDEFS="$SCPDEFS -DWITH_EXTRA_FONT"
-    OOOP_FONTS_PACK="a10aa597411643326e27d7fc128af12d-OOOP-fonts-pack-2.9.0.0.zip"
-fi
-AC_SUBST(WITH_EXTRA_FONT)
-AC_SUBST(OOOP_FONTS_PACK)
-
-dnl ===================================================================
-dnl Test whether to build global menu support
-dnl ===================================================================
-AC_MSG_CHECKING([whether to build global menu support])
-if test "z$enable_lomenubar" = "z" -o "z$enable_lomenubar" = "zno" ; then
-    AC_MSG_RESULT([no])
-    ENABLE_LOMENUBAR="FALSE"
-else
-    AC_MSG_RESULT([yes])
-    PKG_CHECK_MODULES(DBUSMENUGTK, dbusmenu-gtk-0.4,, AC_MSG_ERROR([requirements to build lo-menubar not met. Use --disable-lomenubar or install the missing packages]))
-    ENABLE_LOMENUBAR="TRUE"
-fi
-AC_SUBST(ENABLE_LOMENUBAR)
-
-dnl ===================================================================
-dnl Test whether to enable online update service
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable online update])
-ENABLE_ONLINE_UPDATE=
-if test "z$enable_online_update" = "z" ; then
-    if test "$_os" = "WINNT" -o "$_os" = "Darwin" ; then
-        AC_MSG_RESULT([yes])
-        ENABLE_ONLINE_UPDATE="TRUE"
-    else
-        AC_MSG_RESULT([no])
-    fi
-else
-    if test "z$enable_online_update" = "zyes" ; then
-        AC_MSG_RESULT([yes])
-        ENABLE_ONLINE_UPDATE="TRUE"
-    else
-        AC_MSG_RESULT([no])
-    fi
-fi
-AC_SUBST(ENABLE_ONLINE_UPDATE)
-
-dnl ===================================================================
-dnl Test whether build target is Release Build
-dnl ===================================================================
-AC_MSG_CHECKING([whether build target is Release Build])
-if test "z$enable_release_build" = "z" -o "z$enable_release_build" = "zno" ; then
-    AC_MSG_RESULT([no])
-    ENABLE_RELEASE_BUILD="FALSE"
-else
-    AC_MSG_RESULT([yes])
-    ENABLE_RELEASE_BUILD="TRUE"
-fi
-AC_SUBST(ENABLE_RELEASE_BUILD)
-
-dnl ===================================================================
-dnl Test whether to enable ActiveX embedding
-dnl ===================================================================
-if test "$_os" = "WINNT"; then
-    AC_MSG_CHECKING([whether to enable ActiveX embedding of LibreOffice components])
-    if test "$enable_activex_component" = "yes" -o "$enable_activex_component" = "TRUE" -o "$enable_activex_component" = ""; then
-        ENABLE_ACTIVEX_COMPONENT="TRUE"
-        AC_MSG_RESULT([yes])
-        SCPDEFS="$SCPDEFS -DWITH_ACTIVEX_COMPONENT"
-    else
-        ENABLE_ACTIVEX_COMPONENT=""
-        AC_MSG_RESULT([no])
-    fi
-    AC_SUBST(ENABLE_ACTIVEX_COMPONENT)
-    AC_SUBST(SCPDEFS)
-fi
-
-AC_MSG_CHECKING([whether and how to use Xinerama])
-if test "$_os" = "Darwin"; then
-    USE_XINERAMA=YES
-    XINERAMA_LINK=dynamic
-    AC_MSG_RESULT([yes])
-elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
-    if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
-        # we have both versions, let the user decide but use the dynamic one
-        # per default
-        USE_XINERAMA=YES
-        if test -z "$with_static_xinerama" -o -n "$with_system_libs"; then
-            XINERAMA_LINK=dynamic
-        else
-            XINERAMA_LINK=static
-        fi
-    elif test -e "$XLIB/libXinerama.so" -a ! -e "$XLIB/libXinerama.a"; then
-        # we have only the dynamic version
-        USE_XINERAMA=YES
-        XINERAMA_LINK=dynamic
-    elif test -e "$XLIB/libXinerama.a"; then
-        # static version
-        if echo $host_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
-            USE_XINERAMA=YES
-            XINERAMA_LINK=static
-        else
-            USE_XINERAMA=NO
-            XINERAMA_LINK=none
-        fi
-    else
-        # no Xinerama
-        USE_XINERAMA=NO
-        XINERAMA_LINK=none
-    fi
-    if test "$USE_XINERAMA" = "YES"; then
-        AC_MSG_RESULT([yes, with $XINERAMA_LINK linking])
-        AC_CHECK_HEADER(X11/extensions/Xinerama.h, [],
-            [AC_MSG_ERROR(Xinerama header not found.)], [])
-        XINERAMA_EXTRA_LIBS="-L$XLIB -lXext"
-        if test "$_os" = "FreeBSD"; then
-            XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -lXt"
-        fi
-        if test "$_os" = "Linux"; then
-            XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl"
-        fi
-        AC_CHECK_LIB(Xinerama, XineramaIsActive, [],
-            [AC_MSG_ERROR(Xinerama not functional?)], [$XINERAMA_EXTRA_LIBS])
-    else
-        AC_MSG_RESULT([no, libXinerama not found or wrong architecture.])
-    fi
-else
-    USE_XINERAMA=NO
-    XINERAMA_LINK=none
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(USE_XINERAMA)
-AC_SUBST(XINERAMA_LINK)
-
-dnl ===================================================================
-dnl Checks for librsvg
-dnl ===================================================================
-
-dnl ENABLE_LIBRSVG is set to "" (for NO), SYSTEM or INTERNAL. The
-dnl SYSTEM_LIBRSVG, SYSTEM_GDKPIXBUF etc are redundant.
-
-ENABLE_LIBRSVG=""
-LIBRSVG_CFLAGS=""
-LIBRSVG_LIBS=""
-
-AC_MSG_CHECKING([what librsvg to use])
-
-case "$enable_librsvg" in
-no|disable)
-    AC_MSG_RESULT([none])
-    enable_librsvg=no
-    ;;
-
-""|yes|auto)
-    if test $build_os = cygwin -o \
-           $_os = Darwin; then
-        dnl When building on/for these OSes always use the internal one,
-        dnl if at all. Add more OSes above as needed.
-        AC_MSG_RESULT([internal])
-        enable_librsvg=internal
-    elif test  $_os = iOS -o $_os = Android; then
-        AC_MSG_RESULT([none])
-        enable_librsvg=no
-    else
-        if test "$with_system_libs" = yes; then
-            AC_MSG_RESULT([system])
-            PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14)
-            enable_librsvg=system
-        elif test "$with_system_libs" = no; then
-            AC_MSG_RESULT([internal])
-            enable_librsvg=internal
-        else
-            AC_MSG_RESULT([checking further])
-            PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14,, [:])
-            if test -z "$LIBRSVG_PKG_ERRORS"; then
-                enable_librsvg=system
-            else
-                enable_librsvg=internal
-            fi
-        fi
-    fi
-    ;;
-
-internal)
-    AC_MSG_RESULT([internal])
-    ;;
-
-system)
-    if test $_os = WINNT -a "$WITH_MINGW" != yes; then
-        AC_MSG_ERROR([Must use internal librsvg when building with MSVC])
-    fi
-    AC_MSG_RESULT([system])
-    PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14)
-    ;;
-
-*)
-    AC_MSG_ERROR([Incorrect --enable-librsvg option])
-    ;;
-esac
-
-dnl By now enable_librsvg should be "system", "internal" or "no"
-case $enable_librsvg in
-system)
-    ENABLE_LIBRSVG=SYSTEM
-    SYSTEM_LIBRSVG=YES
-    ;;
-
-internal)
-    ENABLE_LIBRSVG=INTERNAL
-    SYSTEM_LIBRSVG=NO
-    BUILD_TYPE="$BUILD_TYPE LIBRSVG"
-    ;;
-
-no)
-    ENABLE_LIBRSVG=NO
-    SYSTEM_LIBRSVG=NO
-    ;;
-
-*)
-    AC_MSG_ERROR([Internal configure script error, invalid enable_librsvg value "$enable_librsvg"])
-    ;;
-esac
-
-AC_SUBST(ENABLE_LIBRSVG)
-AC_SUBST(LIBRSVG_CFLAGS)
-AC_SUBST(LIBRSVG_LIBS)
-AC_SUBST(SYSTEM_LIBRSVG)
-
-dnl ===================================================================
-dnl Test whether to build cairo or rely on the system version
-dnl ===================================================================
-
-SYSTEM_CAIRO=""
-
-AC_MSG_CHECKING([whether to use the system cairo])
-
-if test "$with_system_cairo" = yes -o \( "$with_system_libs" = yes -a "$with_system_cairo" != no \); then
-    SYSTEM_CAIRO=YES
-    AC_MSG_RESULT([yes])
-
-    PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
-
-    if test "$with_system_xrender_headers" = "yes"; then
-         AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
-         AC_TRY_RUN([
-#include <X11/extensions/Xrender.h>
-
-int main(int argc, char **argv) {
-#ifdef PictStandardA8
-      return 0;
-#else
-      return 1;
-#endif
-}
-        ],
-        [AC_MSG_RESULT([yes])],
-        [AC_MSG_ERROR([no, X headers too old.])]
-        )
-    fi
-else
-    AC_MSG_RESULT([no])
-
-    if test $_os = Android; then
-        dnl For Android cairo isn't
-        dnl buildable yet.
-        :
-    elif test $_os = WINNT; then
-        dnl We only need cairo for Windows if we
-        dnl build librsvg
-        if test "$ENABLE_LIBRSVG" != NO; then
-            BUILD_TYPE="$BUILD_TYPE CAIRO"
-        fi
-    else
-        BUILD_TYPE="$BUILD_TYPE CAIRO"
-    fi
-fi
-
-AC_SUBST(SYSTEM_CAIRO)
-AC_SUBST(CAIRO_CFLAGS)
-AC_SUBST(CAIRO_LIBS)
-
-
-dnl ===================================================================
-dnl Test whether to build gdk-pixbuf or rely on the system version
-dnl ===================================================================
-
-AC_MSG_CHECKING([whether to use the system gdk-pixbuf])
-
-dnl As long as the only thing we need gdk-pixbuf for is below
-dnl librsvg, use the same --enable-librsvg (possibly implied
-dnl by --with-system-libs) to override this.
-
-if test "$SYSTEM_LIBRSVG" = YES; then
-    SYSTEM_GDKPIXBUF=YES
-    AC_MSG_RESULT([yes])
-else
-    case "$_os" in
-    WINNT|Darwin|iOS|Android)
-        SYSTEM_GDKPIXBUF=NO
-        AC_MSG_RESULT([no])
-        ;;
-    *)
-        SYSTEM_GDKPIXBUF=YES
-        AC_MSG_RESULT([yes])
-        ;;
-    esac
-fi
-AC_SUBST(SYSTEM_GDKPIXBUF)
-
-dnl ===================================================================
-dnl Test whether to build GLib or rely on the system version
-dnl ===================================================================
-
-AC_MSG_CHECKING([whether to use the system GLib])
-
-dnl As long as the only thing we need GLib for is below
-dnl librsvg, use the same --enable-librsvg (possibly implied
-dnl by --with-system-libs) to override this.
-
-if test "$SYSTEM_LIBRSVG" = YES; then
-    SYSTEM_GLIB=YES
-    AC_MSG_RESULT([yes])
-else
-    case "$_os" in
-    WINNT|Darwin|iOS|Android)
-        SYSTEM_GLIB=NO
-        AC_MSG_RESULT([no])
-        ;;
-    *)
-        SYSTEM_GLIB=YES
-        AC_MSG_RESULT([yes])
-        ;;
-    esac
-fi
-AC_SUBST(SYSTEM_GLIB)
-
-dnl ===================================================================
-dnl Test whether to build gettext runtime (libintl) or rely on the
-dnl system version
-dnl ===================================================================
-
-AC_MSG_CHECKING([whether to use the system gettext runtime])
-
-if test "$with_system_gettext" = yes -o \( "$with_system_libs" = yes -a "$with_system_gettext" != no \); then
-    SYSTEM_GETTEXT=YES
-    AC_MSG_RESULT([yes])
-else
-    case "$_os" in
-    WINNT|Darwin|iOS|Android)
-        SYSTEM_GETTEXT=NO
-        AC_MSG_RESULT([no])
-        ;;
-    *)
-        SYSTEM_GETTEXT=YES
-        AC_MSG_RESULT([yes])
-        ;;
-    esac
-fi
-AC_SUBST(SYSTEM_GETTEXT)
-
-dnl ===================================================================
-dnl Test whether to build libcroco or rely on the system version
-dnl ===================================================================
-
-AC_MSG_CHECKING([whether to use the system libcroco])
-
-dnl As long as the only thing we need libcroco for is below
-dnl librsvg, use the same --enable-librsvg (possibly implied
-dnl by --with-system-libs) to override this.
-
-if test "$SYSTEM_LIBRSVG" = YES; then
-    SYSTEM_LIBCROCO=YES
-    AC_MSG_RESULT([yes])
-else
-    case "$_os" in
-    WINNT|Darwin|iOS|Android)
-        SYSTEM_LIBCROCO=NO
-        AC_MSG_RESULT([no])
-        ;;
-    *)
-        SYSTEM_LIBCROCO=YES
-        AC_MSG_RESULT([yes])
-        ;;
-    esac
-fi
-AC_SUBST(SYSTEM_LIBCROCO)
-
-dnl ===================================================================
-dnl Test whether to build Pango or rely on the system version
-dnl ===================================================================
-
-AC_MSG_CHECKING([whether to use the system pango])
-
-dnl As long as the only thing we need Pango for is below
-dnl librsvg, use the same --enable-librsvg (possibly implied
-dnl by --with-system-libs) to override this.
-
-if test "$SYSTEM_LIBRSVG" = YES; then
-    SYSTEM_PANGO=YES
-    AC_MSG_RESULT([yes])
-else
-    case "$_os" in
-    WINNT|Darwin|iOS|Android)
-        SYSTEM_PANGO=NO
-        AC_MSG_RESULT([no])
-        ;;
-    *)
-        SYSTEM_PANGO=YES
-        AC_MSG_RESULT([yes])
-        ;;
-    esac
-fi
-AC_SUBST(SYSTEM_PANGO)
-
-dnl ===================================================================
-dnl Test whether to build libgsf or rely on the system version
-dnl ===================================================================
-
-AC_MSG_CHECKING([whether to use the system libgsf])
-
-dnl As long as the only thing we need libgsf for is below librsvg (is
-dnl it?), use the same --enable-librsvg (possibly implied by
-dnl --with-system-libs) to override this.
-
-if test "$SYSTEM_LIBRSVG" = YES; then
-    SYSTEM_LIBGSF=YES
-    AC_MSG_RESULT([yes])
-else
-    case "$_os" in
-    WINNT|Darwin|iOS|Android)
-        SYSTEM_LIBGSF=NO
-        AC_MSG_RESULT([no])
-        ;;
-    *)
-        SYSTEM_LIBGSF=YES
-        AC_MSG_RESULT([yes])
-        ;;
-    esac
-fi
-AC_SUBST(SYSTEM_LIBGSF)
-
-dnl ===================================================================
-dnl Test whether to build libpng or rely on the system version
-dnl ===================================================================
-
-AC_MSG_CHECKING([whether to use the system libpng])
-
-dnl How should and does this interact with the checks for libpng
-dnl related to use of libpng in the quickstarter above? This needs to
-dnl be unified.
-
-if test "$with_system_libpng" = yes -o \( "$with_system_libs" = yes -a "$with_system_libpng" != no \); then
-    SYSTEM_LIBPNG=YES
-    AC_MSG_RESULT([yes])
-else
-    case "$_os" in
-    WINNT|Darwin|iOS|Android)
-        SYSTEM_LIBPNG=NO
-        AC_MSG_RESULT([no])
-        ;;
-    *)
-        SYSTEM_LIBPNG=YES
-        AC_MSG_RESULT([no])
-        ;;
-    esac
-fi
-AC_SUBST(SYSTEM_LIBPNG)
-
-dnl ===================================================================
-dnl Test whether to build libjpeg or rely on the system version
-dnl ===================================================================
-dnl FIXME: this is currently because we have jpeg-6b for our filters
-dnl        and jpeg-8 as dependency for librsvg
-dnl        this should be unified into using only one version for both
-
-AC_MSG_CHECKING([whether to use the system libjpeg])
-
-if test "$SYSTEM_JPEG" == "YES"; then
-    SYSTEM_LIBJPEG=YES
-    AC_MSG_RESULT([yes])
-else
-    case "$_os" in
-    WINNT|Darwin|iOS|Android)
-        SYSTEM_LIBJPEG=NO
-        AC_MSG_RESULT([no])
-        ;;
-    *)
-        SYSTEM_LIBJPEG=YES
-        AC_MSG_RESULT([yes])
-        ;;
-    esac
-fi
-AC_SUBST(SYSTEM_LIBJPEG)
-
-dnl ===================================================================
-dnl Check for runtime JVM search path
-dnl ===================================================================
-if test "$SOLAR_JAVA" != ""; then
-    AC_MSG_CHECKING([whether to use specific JVM search path at runtime])
-    if test -n "$with_jvm_path" && test "$with_jvm_path" != "no"; then
-        AC_MSG_RESULT([yes])
-        if ! test -d "$with_jvm_path"; then
-            AC_MSG_ERROR(["$with_jvm_path" not a directory])
-        fi
-        if ! test -d "$with_jvm_path"jvm; then
-            AC_MSG_ERROR(["$with_jvm_path"jvm not found, point with_jvm_path to \[/path/to/\]jvm])
-        fi
-        JVM_ONE_PATH_CHECK="$with_jvm_path"
-        AC_SUBST(JVM_ONE_PATH_CHECK)
-    else
-        AC_MSG_RESULT([no])
-    fi
-fi
-
-dnl ===================================================================
-dnl Test for the presence of Ant and that it works
-dnl ===================================================================
-
-if test "$SOLAR_JAVA" != ""; then
-    ANT_HOME=; export ANT_HOME
-    WITH_ANT_HOME=; export WITH_ANT_HOME
-    if test -z "$with_ant_home"; then
-        AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd])
-    else
-        if test "$_os" = "WINNT"; then
-            with_ant_home=`cygpath -u "$with_ant_home"`
-        fi
-        AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd],,$with_ant_home/bin:$PATH)
-        WITH_ANT_HOME=$with_ant_home
-        ANT_HOME=$with_ant_home
-    fi
-
-    if test -z "$ANT"; then
-        AC_MSG_ERROR([Ant not found - Make sure it's in the path or use --with-ant-home])
-    else
-        # resolve relative or absolute symlink
-        while test -h "$ANT"; do
-            a_cwd=`pwd`
-            a_basename=`basename "$ANT"`
-            a_script=`ls -l "$ANT" | $SED "s/.*${a_basename} -> //g"`
-            cd "`dirname "$ANT"`"
-            cd "`dirname "$a_script"`"
-            ANT="`pwd`"/"`basename "$a_script"`"
-            cd "$a_cwd"
-        done
-
-        AC_MSG_CHECKING([if $ANT works])
-        cat > conftest.java << EOF
-        public class conftest {
-            int testmethod(int a, int b) {
-                    return a + b;
-            }
-        }
-EOF
-
-        cat > conftest.xml << EOF
-        <project name="conftest" default="conftest">
-        <target name="conftest">
-            <javac srcdir="." includes="conftest.java">
-            </javac>
-        </target>
-        </project>
-EOF
-
-        oldJAVA_HOME=$JAVA_HOME
-        if test "$JAVACISGCJ" = "yes"; then
-            JAVA_HOME=; export JAVA_HOME
-            ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
-        else
-            ant_cmd="$ANT -buildfile conftest.xml 1>&2"
-        fi
-        AC_TRY_EVAL(ant_cmd)
-        if test $? = 0 && test -f ./conftest.class ; then
-            AC_MSG_RESULT([Ant works])
-            if test -z "$WITH_ANT_HOME"; then
-                ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"`
-                if test -z "$ANT_HOME"; then
-                    ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"`
-                fi
-            else
-                ANT_HOME="$WITH_ANT_HOME"
-            fi
-        else
-            echo "configure: Ant test failed" >&5
-            cat conftest.java >&5
-            cat conftest.xml >&5
-            AC_MSG_WARN([Ant does not work - Some Java projects will not build!])
-            ANT_HOME=""
-            echo "Ant does not work - Some Java projects will not build!" >>warn
-        fi
-        JAVA_HOME=$oldJAVA_HOME
-        rm -f conftest* core core.* *.core
-    fi
-    if test -z "$ANT_HOME"; then
-        ANT_HOME="NO_ANT_HOME"
-    fi
-    AC_SUBST(ANT_HOME)
-
-    dnl Checking for ant.jar
-    if test "$ANT_HOME" != "NO_ANT_HOME"; then
-        AC_MSG_CHECKING([Ant lib directory])
-        if test -f $ANT_HOME/lib/ant.jar; then
-            ANT_LIB="$ANT_HOME/lib"
-        else
-            if test -f $ANT_HOME/ant.jar; then
-                ANT_LIB="$ANT_HOME"
-            else
-                if test -f /usr/share/java/ant.jar; then
-                    ANT_LIB=/usr/share/java
-                else
-                    if test -f /usr/share/ant-core/lib/ant.jar; then
-                        ANT_LIB=/usr/share/ant-core/lib
-                    else
-                        if test -f $ANT_HOME/lib/ant/ant.jar; then
-                            ANT_LIB="$ANT_HOME/lib/ant"
-                        else
-                            if test -f /usr/share/lib/ant/ant.jar; then
-                                ANT_LIB=/usr/share/lib/ant
-                            else
-                                AC_MSG_ERROR([Ant libraries not found!])
-                            fi
-                        fi
-                    fi
-                fi
-            fi
-        fi
-        AC_MSG_RESULT([Ant lib directory found.])
-    fi
-    AC_SUBST(ANT_LIB)
-
-    ant_minver=1.6.0
-    ant_minminor1=`echo $ant_minver | cut -d"." -f2`
-
-    AC_MSG_CHECKING([whether Ant is >= $ant_minver])
-    ant_version=`$ANT -version | $AWK '{ print $4; }'`
-    ant_version_major=`echo $ant_version | cut -d. -f1`
-    ant_version_minor=`echo $ant_version | cut -d. -f2`
-    echo "configure: ant_version $ant_version " >&5
-    echo "configure: ant_version_major $ant_version_major " >&5
-    echo "configure: ant_version_minor $ant_version_minor " >&5
-    if test "$ant_version_major" -ge "2"; then
-        AC_MSG_RESULT([yes, $ant_version])
-    elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
-        AC_MSG_RESULT([yes, $ant_version])
-    else
-        AC_MSG_ERROR([no, you need at least Ant >= $ant_minver])
-    fi
-
-    if test "$ENABLE_MEDIAWIKI" = "YES"; then
-        AC_MSG_CHECKING([whether Ant supports mapper type="regexp"])
-        rm -rf confdir
-        mkdir confdir
-        cat > conftest.java << EOF
-            public class conftest {
-                int testmethod(int a, int b) {
-                    return a + b;
-                }
-            }
-EOF
-
-        cat > conftest.xml << EOF
-            <project name="conftest" default="conftest">
-            <target name="conftest" depends="copytest">
-                <javac srcdir="." includes="conftest.java">
-                </javac>
-            </target>
-            <target name="copytest">
-                 <copy todir="confdir">
-                 <fileset dir="confdir" includes="**/*.abc" casesensitive="yes"/>
-                 <filterset/>
-                 <mapper type="regexp" from="^(.*[/\\])foo([/\\].*)" to="\1baa\2"/>
-                 </copy>
-            </target>
-            </project>
-EOF
-
-        if test "$JAVACISGCJ" = "yes"; then
-            JAVA_HOME=; export JAVA_HOME
-            ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
-        else
-            ant_cmd="$ANT -buildfile conftest.xml 1>&2"
-        fi
-        AC_TRY_EVAL(ant_cmd)
-        if test $? = 0 && test -f ./conftest.class ; then
-            AC_MSG_RESULT([yes])
-            rm -rf confdir
-        else
-            echo "configure: Ant test failed" >&5
-            cat conftest.java >&5
-            cat conftest.xml >&5
-            rm -rf confdir
-            AC_MSG_ERROR([no. Did you install ant-apache-regexp?])
-        fi
-    fi
-    rm -f conftest* core core.* *.core
-fi
-
-OOO_JUNIT_JAR=
-if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
-    AC_MSG_CHECKING([for JUnit 4])
-    if test "$with_junit" = "yes"; then
-        if test -e /usr/share/java/junit4.jar; then
-            OOO_JUNIT_JAR=/usr/share/java/junit4.jar
-        else
-           if test -e /usr/share/lib/java/junit.jar; then
-              OOO_JUNIT_JAR=/usr/share/lib/java/junit.jar
-           else
-              OOO_JUNIT_JAR=/usr/share/java/junit.jar
-           fi
-        fi
-    else
-        OOO_JUNIT_JAR=$with_junit
-    fi
-    if test "$_os" = "WINNT"; then
-        OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"`
-    fi
-    "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" 2>&5 | \
-        grep org/junit/Before.class > /dev/null 2>&5
-    if test $? -eq 0; then
-        # check if either class-path entry is available for hamcrest or
-        # it's bundled
-        if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |grep hamcrest || \
-            "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |grep -q 'Class-Path: hamcrest'; then
-            AC_MSG_RESULT([$OOO_JUNIT_JAR])
-        else
-            AC_MSG_ERROR([your junit jar neither sets a classpath nor includes hamcrest; please
-provide a full junit jar or use --without-junit])
-        fi
-    else
-        AC_MSG_RESULT([no])
-        AC_MSG_ERROR([cannot find JUnit 4 jar; please install one in the default
-location (/usr/share/java), specify its pathname via
---with-junit=..., or disable it via --without-junit])
-    fi
-fi
-AC_SUBST(OOO_JUNIT_JAR)
-
-dnl ===================================================================
-dnl Product version
-dnl ===================================================================
-AC_MSG_CHECKING([for product version])
-[eval $(sed -n -e 's/ //g' -e '/PRODUCTVERSION=/p' solenv/inc/productversion.mk)]
-AC_MSG_RESULT([$PRODUCTVERSION])
-AC_SUBST(PRODUCTVERSION)
-
-dnl ===================================================================
-dnl Dealing with l10n options
-dnl ===================================================================
-GIT_REPO_NAMES="artwork base calc components extensions extras filters help impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing ure writer"
-AC_MSG_CHECKING([which languages to be built])
-# get list of all languages
-# generate shell variable from completelangiso= from solenv/inc/langlist.mk
-# the sed command does the following:
-#   + if a line ends with a backslash, append the next line to it
-#   + adds " on the beginning of the value (after =)
-#   + adds " at the end of the value
-#   + removes en-US; we want to put it on the beginning
-#   + prints just the section starting with 'completelangiso=' and ending with the " at the end of line
-[eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e 's/=/="/;s/\([^\\]\)$/\1"/;s/en-US//;/^completelangiso/p' solenv/inc/langlist.mk)]
-ALL_LANGS="en-US $completelangiso"
-# check the configured localizations
-WITH_LANG="$with_lang"
-if test -z "$WITH_LANG"; then
-    AC_MSG_RESULT([en-US])
-else
-    AC_MSG_RESULT([$WITH_LANG])
-    GIT_REPO_NAMES="$GIT_REPO_NAMES translations"
-fi
-# check that the list is valid
-for lang in $WITH_LANG ; do
-    test "$lang" = "ALL" && continue;
-    test "$lang" = "kid" && continue;
-    # need to check for the exact string, so add space before and after the list of all languages
-    all_langs=" $ALL_LANGS "
-    test `echo "$all_langs" | sed "s|.* $lang .*|found|"` = "found" && continue;
-    AC_MSG_ERROR([invalid language: $lang; supported languages are: $ALL_LANGS])
-done
-# list with substituted ALL
-WITH_LANG_LIST=`echo $WITH_LANG | sed "s/ALL/$ALL_LANGS/"`
-# this variable is used only by bin/distro-install-* helper scripts
-# they need a real list of languages
-test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US"
-AC_SUBST(ALL_LANGS)
-AC_SUBST(WITH_LANG)
-AC_SUBST(WITH_LANG_LIST)
-AC_SUBST(GIT_REPO_NAMES)
-
-AC_MSG_CHECKING([for another 'intro' bitmap])
-INTRO_BITMAP=
-if test -z "$with_intro_bitmap" -o "$with_intro_bitmap" = "no" ; then
-    INTRO_BITMAP=
-    AC_MSG_RESULT([none])
-else
-    case "$with_intro_bitmap" in
-    *.png) INTRO_BITMAP="$with_intro_bitmap" ;;
-    *)     AC_MSG_WARN([Intro bitmap should be a .png file!]) ;;
-    esac
-    AC_MSG_RESULT([$INTRO_BITMAP])
-fi
-AC_SUBST(INTRO_BITMAP)
-
-AC_MSG_CHECKING([for another 'about' bitmap])
-ABOUT_BITMAP=
-if test -z "$with_about_bitmap" -o "$with_about_bitmap" = "no" ; then
-    ABOUT_BITMAP=
-    AC_MSG_RESULT([none])
-else
-   case "$with_about_bitmap" in
-   *.png) ABOUT_BITMAP="$with_about_bitmap" ;;
-   *)     AC_MSG_WARN([About bitmap should be a .png file!]) ;;
-   esac
-   AC_MSG_RESULT([$ABOUT_BITMAP])
-fi
-AC_SUBST(ABOUT_BITMAP)
-
-OOO_VENDOR=
-AC_MSG_CHECKING([for vendor])
-if test -z "$with_vendor" -o "$with_vendor" = "no" ; then
-    AC_MSG_RESULT([not set])
-else
-    OOO_VENDOR="$with_vendor"
-    AC_MSG_RESULT([$OOO_VENDOR])
-fi
-AC_SUBST(OOO_VENDOR)
-
-UNIXWRAPPERNAME=
-AC_MSG_CHECKING([for UNIX wrapper name])
-if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no"  -o "$with_unix_wrapper" = "yes" ; then
-    AC_MSG_RESULT([not set])
-else
-    UNIXWRAPPERNAME="$with_unix_wrapper"
-    AC_MSG_RESULT([$UNIXWRAPPERNAME])
-fi
-AC_SUBST(UNIXWRAPPERNAME)
-
-AC_MSG_CHECKING([whether to install the compat oo* wrappers])
-if test "$with_compat_oowrappers" = "yes" ; then
-    WITH_COMPAT_OOWRAPPERS=YES
-    AC_MSG_RESULT(yes)
-else
-    WITH_COMPAT_OOWRAPPERS=
-    AC_MSG_RESULT(no)
-fi
-AC_SUBST(WITH_COMPAT_OOWRAPPERS)
-
-AC_MSG_CHECKING([for product name])
-PRODUCTNAME=AC_PACKAGE_NAME
-AC_MSG_RESULT([$PRODUCTNAME])
-AC_SUBST(PRODUCTNAME)
-
-INSTALLDIRNAME=`echo AC_PACKAGE_NAME | tr [[:upper:]] [[:lower:]]`
-AC_MSG_CHECKING([for install dirname])
-if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a "$with_install_dirname" != "yes" ; then
-   INSTALLDIRNAME="$with_install_dirname"
-fi
-AC_MSG_RESULT([$INSTALLDIRNAME])
-AC_SUBST(INSTALLDIRNAME)
-
-AC_MSG_CHECKING([for prefix])
-PREFIXDIR="$prefix"
-AC_MSG_RESULT([$PREFIXDIR])
-AC_SUBST(PREFIXDIR)
-
-AC_MSG_CHECKING([for libdir])
-LIBDIR=[$(eval echo $(eval echo $libdir))]
-AC_MSG_RESULT([$LIBDIR])
-AC_SUBST(LIBDIR)
-
-AC_MSG_CHECKING([for data dir])
-DATADIR=[$(eval echo $(eval echo $datadir))]
-AC_MSG_RESULT([$DATADIR])
-AC_SUBST(DATADIR)
-
-AC_MSG_CHECKING([for man dir])
-MANDIR=[$(eval echo $(eval echo $mandir))]
-AC_MSG_RESULT([$MANDIR])
-AC_SUBST(MANDIR)
-
-AC_MSG_CHECKING([for doc dir])
-DOCDIR=[$(eval echo $(eval echo $docdir))]
-AC_MSG_RESULT([$DOCDIR])
-AC_SUBST(DOCDIR)
-
-AC_MSG_CHECKING([for install dir])
-INSTALLDIR="$LIBDIR/$INSTALLDIRNAME"
-AC_MSG_RESULT([$INSTALLDIR])
-AC_SUBST(INSTALLDIR)
-
-AC_MSG_CHECKING([whether to statically link to Gtk])
-if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then
-    ENABLE_STATIC_GTK="TRUE"
-    AC_MSG_RESULT([yes])
-else
-    ENABLE_STATIC_GTK="FALSE"
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_STATIC_GTK)
-
-AC_MSG_CHECKING([whether to use layout dialogs])
-if test -n "$enable_layout" && test "$enable_layout" != "no"; then
-    ENABLE_LAYOUT="TRUE"
-    AC_MSG_RESULT([yes])
-else
-    ENABLE_LAYOUT="FALSE"
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_LAYOUT)
-
-# ===================================================================
-# De- or increase default verbosity of build process
-# ===================================================================
-AC_MSG_CHECKING([build verbosity])
-if test -n "$enable_verbose"; then
-    if test "$enable_verbose" = "yes"; then
-        VERBOSE="TRUE"
-        AC_MSG_RESULT([high])
-    fi
-    if test "$enable_verbose" = "no"; then
-        VERBOSE="FALSE"
-        AC_MSG_RESULT([low])
-    fi
-else
-    AC_MSG_RESULT([not set])
-fi
-AC_SUBST(VERBOSE)
-
-dnl ===================================================================
-dnl Use zenity during build
-dnl ===================================================================
-AC_MSG_CHECKING([whether to use zenity during build])
-if test "$enable_zenity" = "yes"; then
-    AC_MSG_RESULT([yes])
-    AC_PATH_PROGS( ZNTY, zenity )
-    if test -z "$ZNTY"; then
-        ENABLE_ZENITY=FALSE
-    else
-        ENABLE_ZENITY=TRUE
-    fi
-else
-    ENABLE_ZENITY=FALSE
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_ZENITY)
-
-
-dnl ===================================================================
-dnl Hook up LibreOffice's nodep environmental variable to automake's equivalent
-dnl --enable-dependency-tracking configure option
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable dependency tracking])
-if test "$enable_dependency_tracking" = "no"; then
-    nodep=TRUE
-    AC_MSG_RESULT([no])
-else
-    AC_MSG_RESULT([yes])
-fi
-AC_SUBST(nodep)
-
-dnl ===================================================================
-dnl Number of CPUs to use during the build
-dnl ===================================================================
-AC_MSG_CHECKING([for number of processors to use])
-if test -n "$with_num_cpus"; then
-    BUILD_NCPUS=$with_num_cpus
-else
-    case `uname -s` in
-
-    Darwin|FreeBSD|NetBSD|OpenBSD)
-        BUILD_NCPUS=`sysctl -n hw.ncpu`
-        ;;
-
-    *)
-        BUILD_NCPUS=`grep $'^processor\t*:' /proc/cpuinfo | wc -l`
-        ;;
-    esac
-
-    # If we hit the catch-all case, but /proc/cpuinfo doesn't exist or has an
-    # unexpected format, 'wc -l' will have returned 0.
-    if test "$BUILD_NCPUS" -eq 0; then
-        BUILD_NCPUS=1
-    fi
-fi
-AC_MSG_RESULT([$BUILD_NCPUS])
-AC_SUBST(BUILD_NCPUS)
-
-dnl ===================================================================
-dnl Number of parallel jobs to be executed by dmake
-dnl ===================================================================
-AC_MSG_CHECKING([for maximum of jobs per processor])
-BUILD_MAX_JOBS="1"
-if test "z$with_max_jobs" != "z"; then
-    BUILD_MAX_JOBS="$with_max_jobs"
-else
-    if test -n "$enable_icecream" && test "$enable_icecream" != "no" ; then
-        BUILD_MAX_JOBS="10"
-    fi
-fi
-AC_MSG_RESULT([$BUILD_MAX_JOBS])
-AC_SUBST(BUILD_MAX_JOBS)
-
-dnl ===================================================================
-dnl Setting up the environment.
-dnl ===================================================================
-echo "setting up the build environment variables..."
-
-if test -z "$COMPATH"; then
-    AC_MSG_ERROR([No compiler found.])
-fi
-AC_SUBST(COMPATH)
-
-AC_MSG_CHECKING([solver path])
-if test -z "$with_local_solver"; then
-    LOCAL_SOLVER="DEFAULT"
-    AC_MSG_RESULT([default])
-else
-    LOCAL_SOLVER=$with_local_solver
-    AC_MSG_RESULT([$with_local_solver])
-fi
-AC_SUBST(LOCAL_SOLVER)
-
-AC_SUBST(BUILD_TYPE)
-
-# make sure config.guess is +x; we execute config.guess, so it has to be so;
-chmod +x ./config.guess
-
-dnl Setting up the post_download check script
-dnl Using autoconf here, so that the migration from the previous state
-dnl (checks for the additional Windows downloads were directly in
-dnl configure.in) is as easy as possible
-echo "setting up the post_download check script"
-autoconf post_download.in > post_download
-chmod +x post_download
-
-# Generate a configuration timestamp we can use for deps
-if test -f set_soenv; then
-    mv -f set_soenv set_soenv.last
-else
-    echo > set_soenv.last
-fi
-
-AC_OUTPUT([set_soenv Makefile bin/repo-list])
-
-# touch the config timestamp file set_soenv.stamp
-if test ! -f set_soenv.stamp; then
-    echo > set_soenv.stamp
-elif diff set_soenv set_soenv.last >/dev/null 2>&1; then
-    echo "Configuration unchanged - avoiding scp2 stamp update"
-else
-    echo > set_soenv.stamp
-fi
-
-dnl Run the set_soenv script to setup the Env.Host.sh script that sets
-dnl environment variables for the build.
-chmod +x set_soenv
-
-./set_soenv
-
-dnl vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
deleted file mode 100644
index 90d710b3d..000000000
--- a/distro-configs/LibreOfficeAndroid.conf
+++ /dev/null
@@ -1,20 +0,0 @@
---host=arm-linux-androideabi
---disable-cups
---disable-gconf
---disable-gnome-vfs
---disable-gstreamer
---disable-lockdown
---disable-mozilla
---disable-nss-module
---disable-odk
---disable-opengl
---disable-python
---disable-randr
---disable-randr-link
---disable-systray
---enable-python=internal
---without-fonts
---without-java
---without-junit
---without-ppds
---without-stlport
diff --git a/distro-configs/LibreOfficeDragonFly.conf b/distro-configs/LibreOfficeDragonFly.conf
deleted file mode 100644
index c65d16290..000000000
--- a/distro-configs/LibreOfficeDragonFly.conf
+++ /dev/null
@@ -1,23 +0,0 @@
---enable-symbols
---disable-epm
---disable-mozilla
---disable-neon
---disable-nss-module
---disable-odk
---disable-opengl
---disable-systray
---with-alloc=system
---with-fonts
---with-system-headers
---with-system-libs
---with-system-libtextcat
---with-system-python
---with-vendor=DragonFly BSD
---without-java
---without-system-altlinuxhyph
---without-system-boost
---without-system-db
---without-system-jars
---without-system-mdds
---without-system-mythes
---x-includes=/usr/pkg/include
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
deleted file mode 100644
index 4fe332556..000000000
--- a/distro-configs/LibreOfficeLinux.conf
+++ /dev/null
@@ -1,48 +0,0 @@
---with-vendor=The Document Foundation
---with-system-dicts
---without-unix-wrapper
---without-system-xrender-headers
---without-system-zlib
---without-system-stdlibs
---without-system-poppler
---without-system-openssl
---without-system-mozilla
---without-system-mesa-headers
---without-system-libxslt
---without-system-libxml
---without-system-jpeg
---without-system-jars
---without-system-cairo
---without-openldap
---without-junit
---without-helppack-integration
---with-linker-hash-style=both
---with-java-target-version=1.5
---with-fonts
---with-external-thes-dir=/usr/share/mythes
---with-external-hyph-dir=/usr/share/hyphen
---with-external-dict-dir=/usr/share/hunspell
---with-extension-integration
---enable-opengl
---enable-odk
---enable-lockdown
---enable-kde
---enable-gstreamer
---enable-gnome-vfs
---enable-ext-wiki-publisher
---enable-ext-report-builder
---enable-ext-presenter-minimizer
---enable-ext-presenter-console
---enable-ext-pdfimport
---enable-ext-scripting-beanshell
---enable-ext-scripting-javascript
---enable-ext-nlpsolver
---enable-epm
---enable-cairo
---enable-binfilter
---enable-python=internal
---disable-xrender-link
---disable-unix-qstart-libpng
---disable-randr-link
---disable-kde4
---disable-dbus
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
deleted file mode 100644
index 01142b908..000000000
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ /dev/null
@@ -1,14 +0,0 @@
---with-vendor=The Document Foundation
---enable-epm
---enable-binfilter
---with-java-target-version=1.5
---disable-online-update
---enable-ext-presenter-minimizer
---enable-ext-presenter-console
---enable-ext-pdfimport
---enable-ext-wiki-publisher
---enable-ext-report-builder
---enable-ext-scripting-beanshell
---enable-ext-scripting-javascript
---enable-ext-nlpsolver
---with-extension-integration
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
deleted file mode 100644
index 5b6eefd0c..000000000
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ /dev/null
@@ -1,56 +0,0 @@
---disable-build-mozilla
---disable-dbus
---disable-epm
---disable-gnome-vfs
---disable-kde
---disable-kde4
---disable-mozilla
---disable-nss-module
---disable-odk
---disable-opengl
---disable-randr-link
---disable-unix-qstart-libpng
---disable-xrender-link
---enable-binfilter
---enable-gstreamer
---enable-lockdown
---enable-ext-presenter-minimizer
---enable-ext-pdfimport
---enable-ext-presenter-console
---enable-ext-report-builder
---enable-ext-wiki-publisher
---enable-python=system
---with-alloc=system
---with-ant-home=/usr/local/ant
---with-extension-integration
---with-fonts
---with-java
---with-java-target-version=1.5
---with-jdk-home=/usr/local/jdk-1.5.0
---with-myspell-dicts
---with-system-boost
---with-system-cairo
---with-system-cppunit
---with-system-curl
---with-system-db
---with-system-expat
---with-system-hunspell
---with-system-icu
---with-system-jars
---with-system-jpeg
---with-system-libxml
---with-system-libxslt
---with-system-mesa-headers
---with-system-neon
---with-system-openssl
---with-system-poppler
---with-system-redland
---with-system-stdlibs
---with-system-xrender-headers
---with-system-zlib
---with-vendor=The OpenBSD project
---without-junit
---without-openldap
---without-system-mozilla
---without-unix-wrapper
---without-system-libwpd
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
deleted file mode 100644
index 600ec23d8..000000000
--- a/distro-configs/LibreOfficeWin32.conf
+++ /dev/null
@@ -1,19 +0,0 @@
---with-vendor=The Document Foundation
---without-system-mesa-headers
---without-junit
---without-helppack-integration
---without-agfa-monotype-fonts
---with-extension-integration
---with-java-target-version=1.5
---disable-xrender-link
---disable-activex-component
---disable-online-update
---enable-binfilter
---enable-ext-scripting-beanshell
---enable-ext-scripting-javascript
---enable-ext-wiki-publisher
---enable-ext-report-builder
---enable-ext-presenter-minimizer
---enable-ext-presenter-console
---enable-ext-pdfimport
---enable-ext-nlpsolver
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
deleted file mode 100644
index 3e22a283f..000000000
--- a/distro-configs/LibreOfficeWin64.conf
+++ /dev/null
@@ -1,8 +0,0 @@
---with-vendor=The Document Foundation
---without-agfa-monotype-fonts
---with-java-target-version=1.5
---enable-cl-x64
---disable-xrender-link
---disable-activex-component
---enable-ext-scripting-beanshell
---enable-ext-scripting-javascript
diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
deleted file mode 100644
index bd2b60cac..000000000
--- a/distro-configs/LibreOfficeiOS.conf
+++ /dev/null
@@ -1,24 +0,0 @@
---build=i386-apple-darwin10.7.0
---host=arm-apple-darwin10
---disable-cairo
---disable-cups
---disable-fontconfig
---disable-gconf
---disable-gnome-vfs
---disable-gstreamer
---disable-librsvg
---disable-lockdown
---disable-mozilla
---disable-nss-module
---disable-odk
---disable-opengl
---disable-python
---disable-randr
---disable-randr-link
---disable-systray
---without-fonts
---without-java
---without-junit
---without-ppds
---without-stlport
---without-system-python
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
deleted file mode 100644
index 7cb36c937..000000000
--- a/distro-configs/OxygenOfficeLinux.conf
+++ /dev/null
@@ -1,78 +0,0 @@
---with-vendor=OxygenOffice Professional Team
---with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0
---with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png
---with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png
---enable-binfilter
---enable-vba
---enable-build-mozilla
---without-system-mozilla
---with-package-format=rpm deb
---enable-epm
---enable-cups
---disable-symbols
---enable-systray
---with-epm=internal
---disable-kde
---disable-kde4
---enable-gtk
---enable-evolution2
---enable-lockdown
---without-unix-wrapper
---with-fonts
---enable-extra-gallery
---enable-extra-template
---enable-extra-sample
---enable-extra-font
---with-lang=en-US hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs ko sl
---enable-opengl
---enable-dbus
---enable-gnome-vfs
---with-extension-integration
---enable-ext-wiki-publisher
---enable-ext-report-builder
---enable-ext-presenter-minimizer
---enable-ext-presenter-console
---enable-ext-pdfimport
---enable-ext-scripting-beanshell
---enable-ext-scripting-javascript
---enable-ext-google-docs
---enable-ext-hunart
---enable-ext-lightproof
---enable-ext-nlpsolver
---enable-ext-numbertext
---enable-ext-typo
---enable-ext-watch-window
---enable-ext-diagram
---enable-ext-validator
---enable-ext-barcode
---disable-ext-oooblogger
---with-sun-templates
---without-system-poppler
---enable-neon
---without-system-stdlibs
---with-jdk-home=/usr/local/jdk1.6.0_23/
---without-system-dicts
---without-system-xrender-headers
---without-system-zlib
---without-system-stdlibs
---without-system-poppler
---without-system-openssl
---without-system-mozilla
---without-system-mesa-headers
---without-system-libxslt
---without-system-libxml
---without-system-jpeg
---without-system-jars
---without-system-cairo
---without-junit
---with-helppack-integration
---with-linker-hash-style=both
---enable-odk
---enable-gstreamer
---enable-cairo
---enable-graphite
---enable-dependency-tracking
---enable-mozilla
---enable-python=internal
---with-system-mozilla=mozilla
---with-openldap
diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf
deleted file mode 100644
index 2fba46c2a..000000000
--- a/distro-configs/OxygenOfficeWin32.conf
+++ /dev/null
@@ -1,45 +0,0 @@
---with-vendor=OxygenOffice Professional Team
---with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0
---with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png
---with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png
---enable-binfilter
---enable-vba
---disable-build-mozilla
---disable-symbols
---enable-systray
---with-fonts
---enable-extra-gallery
---enable-extra-template
---enable-extra-sample
---enable-extra-font
---with-lang=hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs ko sl
---with-extension-integration
---enable-ext-wiki-publisher
---enable-ext-report-builder
---enable-ext-presenter-minimizer
---enable-ext-presenter-console
---enable-ext-pdfimport
---enable-ext-scripting-beanshell
---enable-ext-scripting-javascript
---enable-ext-google-docs
---enable-ext-hunart
---enable-ext-lightproof
---enable-ext-nlpsolver
---enable-ext-numbertext
---enable-ext-typo
---enable-ext-watch-window
---enable-ext-diagram
---enable-ext-validator
---enable-ext-barcode
---disable-ext-oooblogger
---with-sun-templates
---disable-cairo
---with-jdk-home=/usr/local/jdk1.6.0_23/
---without-junit
---with-helppack-integration
---enable-cairo
---enable-graphite
---enable-dependency-tracking
---enable-mozilla
---with-system-mozilla=mozilla
---with-openldap
diff --git a/dmake/.gitignore b/dmake/.gitignore
deleted file mode 100644
index addefdaae..000000000
--- a/dmake/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-Makefile
-.deps
-*.o
-/config.h
-/config.log
-/config.status
-/dmake
-/dmakeroot.h
-/stamp-h1
-/startup/config.mk
-/*/.dirstamp
diff --git a/dmake/AUTHORS b/dmake/AUTHORS
deleted file mode 100755
index e69de29bb..000000000
--- a/dmake/AUTHORS
+++ /dev/null
diff --git a/dmake/COPYING b/dmake/COPYING
deleted file mode 100755
index e5b17204a..000000000
--- a/dmake/COPYING
+++ /dev/null
@@ -1,37 +0,0 @@
---
--- SYNOPSIS
---      
--- 
--- DESCRIPTION
---      
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@wticorp.com
---      Web Tools International, Long Beach, CA, USA
---      http://dmake.wticorp.com/
---
--- WWW
---      Public:   http://dmake.wticorp.com/
---      Private:  http://software.wticorp.com/dmake/
---
--- COPYRIGHT
---      Copyright (c) 1992,1994 by Dennis Vadura.  All rights reserved.
---      Copyright (c) 1996 by WTI Corp.  All rights reserved.
--- 
---      This program is free software; you can redistribute it and/or
---      modify it under the terms of the GNU General Public License
---      (version 1), as published by the Free Software Foundation, and
---      found in the file 'license.txt' included with this distribution.
--- 
---      This program is distributed in the hope that it will be useful,
---      but WITHOUT ANY WARRANTY; without even the implied warrant of
---      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---      GNU General Public License for more details.
--- 
---      You should have received a copy of the GNU General Public License
---      along with this program in readme/license.txt;  if not, write to
---      the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
---      Boston, MA 02111-1307, USA.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
diff --git a/dmake/ChangeLog b/dmake/ChangeLog
deleted file mode 100755
index f5a680eed..000000000
--- a/dmake/ChangeLog
+++ /dev/null
@@ -1,4259 +0,0 @@
-2008-02-26 18:37  vq
-
-	* Makefile.in, NEWS, configure, configure.in, man/dmake.tf,
-	  win95/microsft/config.h, winnt/microsft/config.h, man/dmake.nc:
-
-	#i83497# Release dmake 4.12.
-
-2008-02-07 14:50  vq
-
-	* function.c, sysintf.c, man/dmake.nc, man/dmake.tf:
-
-	#i83940# Make the result of $(mktmp ..) aware of the .WINPATH setting.
-
-2008-02-07 10:42  vq
-
-	* dmake.c:
-
-	#i85136# The content of INCFILENAME needs no further expansion.
-
-2008-02-07 10:28  vq
-
-	* dmake.c:
-
-	#i85136# Prevent filenames from being expanded if they already are.
-
-2008-02-06 17:22  vq
-
-	* dmake.c:
-
-	#i85136# Do not expand ABSMAKECMD and MAKECMD macros.
-
-2008-02-05 17:02  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-30:
-
-	#i84800# Add testcase.
-
-2008-02-04 16:05  vq
-
-	* make.c:
-
-	#i85381# Fix possible heap corruption for the cygwin dmake version.
-
-2008-01-22 00:34  vq
-
-	* unix/runargv.c:
-
-	#i83540# Separate error handling from pid.
-
-2008-01-07 20:36  vq
-
-	* unix/runargv.c:
-
-	#i83540# Add diagnostics for WaitForMultipleObjects() calls.
-
-2008-01-07 19:31  vq
-
-	* quit.c:
-
-	#i83540# Prevent possible invinite loop when aborting.
-
-2008-01-07 01:07  vq
-
-	* path.c:
-
-	#i84800# Do not collaps the foo/.. entries if foo is '.' or '..'.
-
-2008-01-06 16:21  vq
-
-	* make.c, unix/runargv.c:
-
-	#i85014# Let master targets for targets with multiple (::) rules inherit
-	the newest time stamp of their "sub"-rules.
-	Make runargv() indicate that it finished the command when it had to wait
-	for its completion.
-
-2007-11-28 15:18  vq
-
-	* win95/microsft/config.mk:
-
-	#i83540# Fix dmake's own makefile to build itself.
-
-2007-11-27 23:08  vq
-
-	* Makefile.am, Makefile.in, msdos/rmprq.c,
-	  win95/microsft/vpp40/mk.bat:
-
-	#i83540# A parallel runargv needs a corresponding rmprq.
-
-2007-11-26 09:23  vq
-
-	* unix/runargv.c:
-
-	#i83540# Return the pid that was waited for.
-
-2007-11-25 22:37  vq
-
-	* unix/runargv.c:
-
-	#i83540# Fix handle inheritance for native W32 process spawning.
-
-2007-11-25 12:53  vq
-
-	* NEWS:
-
-	#i83540# Add NEWS entry about parallel builds with native W32 dmake.
-
-2007-11-22 10:27  vq
-
-	* unix/runargv.c:
-
-	#i83540# Avoid conflict on solaris, rename NOPID to DMNOPID.
-
-2007-11-11 19:12  vq
-
-	* dag.c, extern.h, imacs.c, sysintf.c, unix/runargv.c,
-	  win95/microsft/config.mk, win95/microsft/ruletab.c,
-	  win95/microsft/vpp40/mk.bat:
-
-	#i83540# Make dmake buildable with .NET 2003 again.
-
-2007-11-11 18:05  vq
-
-	* Makefile.am, Makefile.in, dag.c, dmake.c, extern.h, imacs.c,
-	  sysintf.c, msdos/runargv.c, unix/runargv.c,
-	  win95/microsft/ruletab.c:
-
-	#i83540# Enable parallel builds with native W32 dmake. (First MinGW only.)
-
-2007-11-10 19:19  vq
-
-	* sysintf.c:
-
-	#i83523# Post-rename clean up.
-
-2007-11-10 19:03  vq
-
-	* extern.h, function.c, msdos/borland/bcc30/config.h,
-	  msdos/borland/bcc40/config.h, msdos/borland/bcc45/config.h,
-	  msdos/borland/bcc50/config.h, msdos/borland/tcc20/config.h,
-	  msdos/microsft/config.h, msdos/zortech/config.h,
-	  os2/ibm/config.h, win95/borland/bcc50/config.h,
-	  win95/microsft/config.h, winnt/borland/bcc50/config.h,
-	  winnt/microsft/config.h:
-
-	#i83523# Rename macro PVOID to DMPVOID to avoid problems when including
-	windows.h.
-
-2007-11-09 20:54  vq
-
-	* unix/runargv.c:
-
-	#i10000# Small clean up.
-
-2007-11-09 10:50  vq
-
-	* NEWS, configure, configure.in, man/dmake.nc, man/dmake.tf,
-	  readme/read1st.txt, win95/microsft/config.h,
-	  winnt/microsft/config.h:
-
-	#i83497# Bump version to 4.12-cvs.
-
-2007-10-13 19:43  vq
-
-	* Makefile.in, NEWS, configure, configure.in, man/dmake.nc,
-	  man/dmake.tf, win95/microsft/config.h, winnt/microsft/config.h:
-
-	#i79271# Release dmake 4.11.
-
-2007-10-13 18:27  vq
-
-	* tests/misc-20:
-
-	#i10000# Fix typo.
-
-2007-10-13 18:21  vq
-
-	* tests/: Makefile.am, Makefile.in, misc-21:
-
-	#i81252# Add testcase.
-
-2007-10-11 16:57  vq
-
-	* tests/: function_macros-9, misc-9, targets-21, targets-26,
-	  targets-27:
-
-	#i50092# Work around Solaris and nfs timing issues.
-	Patch from hjs@openoffice.org.
-
-2007-10-11 16:36  vq
-
-	* make.cmd:
-
-	#i81855# Add a comment about building dmake on OS/2.
-
-2007-10-06 10:33  vq
-
-	* msdos/runargv.c, tests/recipes-9, unix/runargv.c:
-
-	#i80598# Always issue a warning if the actual execution of a recipe line
-	(this does not include sucessfully executed, but failing programs) fails.
-
-2007-09-24 17:45  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-29:
-
-	#i80012# Add testcase.
-
-2007-09-24 13:51  vq
-
-	* unix/runargv.c:
-
-	#i80012# Fix crash when deleting intermediate targets.
-
-2007-09-23 18:12  vq
-
-	* Makefile.in, configure:
-
-	#i81855# Regenerate configure and friends.
-
-2007-09-23 18:05  vq
-
-	* configure.in, dmake.c, expand.c, extern.h, make.cmd, path.c,
-	  sysintf.c, startup/unix/os2/Makefile.am,
-	  startup/unix/os2/Makefile.in, startup/unix/os2/macros.mk,
-	  unix/os2/public.h:
-
-	#i81855# More changes for the OS/2 port.
-	Patch provided by Yuri Dario.
-
-2007-09-22 19:11  vq
-
-	* configure:
-
-	#i81855# Regenerate configure and friends.
-
-2007-09-22 19:05  vq
-
-	* NEWS, imacs.c, os2/sysintf.h, unix/dcache.c, unix/dirbrk.c,
-	  unix/sysintf.h:
-
-	#i81855# Clean-up merge from CWS os2port01.
-
-2007-09-22 18:27  vq
-
-	* make.cmd:
-
-	#i81855# Revert change to make.cmd as it refers to a non-existing script
-	in dmake\os2\gcc\emx\mk.cmd.
-
-2007-09-22 18:08  vq
-
-	* unix/runargv.c:
-
-	RESYNC: (1.11-1.12); FILE MERGED
-
-2007-09-22 18:08  vq
-
-	* os2/ruletab.c:
-
-	RESYNC: (1.2-1.3); FILE MERGED
-
-2007-09-22 18:08  vq
-
-	* expand.c:
-
-	RESYNC: (1.6-1.7); FILE MERGED
-
-2007-09-22 18:08  vq
-
-	* dmake.c, sysintf.c:
-
-	RESYNC: (1.10-1.11); FILE MERGED
-
-2007-09-22 18:08  vq
-
-	* configure.in:
-
-	RESYNC: (1.29-1.30); FILE MERGED
-
-2007-09-21 20:46  vq
-
-	* NEWS:
-
-	#i79271# Update NEWS file.
-
-2007-09-21 19:14  vq
-
-	* dmake.c:
-
-	#i81296# Change comment.
-
-2007-09-19 21:50  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i81252# Restore alphabetical order.
-
-2007-09-18 21:03  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i81252# Add documentation for the SHELLCMDQUOTE macro.
-
-2007-09-18 20:34  vq
-
-	* getinp.c, imacs.c, make.c, sysintf.c, vextern.h, mac/public.h,
-	  msdos/runargv.c, msdos/spawn.c, msdos/borland/bcc30/public.h,
-	  msdos/borland/bcc40/public.h, msdos/borland/bcc45/public.h,
-	  msdos/borland/bcc50/public.h, msdos/borland/tcc20/public.h,
-	  msdos/microsft/msc51/public.h, msdos/microsft/msc60/public.h,
-	  msdos/zortech/public.h, os2/ibm/icc/public.h,
-	  os2/ibm/icc3/public.h, qssl/public.h, qssl/runargv.c,
-	  startup/win95/macros.mk, startup/winnt/macros.mk, tos/public.h,
-	  unix/runargv.c, unix/386ix/public.h, unix/bsd43/public.h,
-	  unix/bsd43/uw/public.h, unix/bsd43/vf/public.h,
-	  unix/bsdarm32/public.h, unix/coherent/ver40/public.h,
-	  unix/coherent/ver42/public.h, unix/cygwin/public.h,
-	  unix/linux/gnu/public.h, unix/macosx/gnu/public.h,
-	  unix/solaris/public.h, unix/solaris/gnu/public.h,
-	  unix/sysvr1/public.h, unix/sysvr3/public.h,
-	  unix/sysvr3/gnu/public.h, unix/sysvr3/pwd/public.h,
-	  unix/sysvr4/public.h, unix/xenix/public.h,
-	  unix/xenix/pwd/public.h, win95/borland/bcc50/public.h,
-	  win95/microsft/vpp40/public.h, winnt/borland/bcc50/public.h,
-	  winnt/microsft/vpp40/public.h, winnt/mingw/public.h,
-	  winnt/msvc6/public.h:
-
-	#i81252# Add a new SHELLCMDQUOTE control macro.
-
-2007-09-17 18:24  vq
-
-	* tests/: function_macros-8, macros-7:
-
-	#i78776# Fix testcases for non-cygwin OS.
-
-2007-09-16 12:35  vq
-
-	* tests/: Makefile.am, Makefile.in, misc-20:
-
-	#i81296# Add testcases.
-
-2007-09-16 00:10  vq
-
-	* tests/macros-11:
-
-	#i74007# Change testcase.
-
-2007-09-15 23:57  vq
-
-	* dmake.c, mac/ruletab.c, man/dmake.nc, man/dmake.tf,
-	  msdos/ruletab.c, os2/ruletab.c, unix/ruletab.c,
-	  win95/borland/ruletab.c, win95/microsft/ruletab.c,
-	  winnt/borland/ruletab.c, winnt/microsft/ruletab.c:
-
-	#i74007# Revert the part of the previous patch that lets OOODMAKEMODE
-	always be imported from the environment. Instead move the definition
-	of targets from the command line after the evaluation of the startup
-	makefile.
-
-2007-09-15 23:16  vq
-
-	* tests/macros-11:
-
-	#i74007# Add testcase.
-
-2007-09-15 23:06  vq
-
-	* man/dmake.nc:
-
-	#i74007# Update text version of the man page.
-
-2007-09-15 23:03  vq
-
-	* dmake.c, mac/ruletab.c, man/dmake.tf, msdos/ruletab.c,
-	  os2/ruletab.c, unix/ruletab.c, win95/borland/ruletab.c,
-	  win95/microsft/ruletab.c, winnt/borland/ruletab.c,
-	  winnt/microsft/ruletab.c:
-
-	#i74007# Always import OOODMAKEMODE from the environment. Define targets from
-	the command line after the macros from the command line and OOODMAKEMODE
-	from the environment are set.
-
-2007-09-13 23:40  vq
-
-	* dmake.c, extern.h, make.c, rulparse.c:
-
-	#i81296# Clear flags indicating that targets that infered makefiles (and
-	their prerequisites) were previously build.
-
-2007-09-13 20:08  vq
-
-	* dmake.h, rulparse.c:
-
-	#i81296# Remove bit recycling for F_VISITED/F_USED. Use only F_VISITED.
-
-2007-09-09 15:11  vq
-
-	* quit.c:
-
-	#i81273# Fixed another MinGW build problem.
-
-2007-09-08 14:20  vq
-
-	* make.c, rulparse.c:
-
-	#i10000# Add some output for .INCLUDE operations when the -vf verbose
-	flag is given.
-
-2007-09-06 10:53  vq
-
-	* quit.c:
-
-	#i81273# Fix MinGW build problem.
-
-2007-09-02 06:57  vq
-
-	* tests/: Makefile.am, Makefile.in, misc-19:
-
-	#i67911# Add testcase.
-
-2007-09-02 06:44  vq
-
-	* make.c, sysintf.c, msdos/runargv.c, qssl/runargv.c,
-	  unix/runargv.c, win95/microsft/vpp40/runargv.c,
-	  winnt/microsft/vpp40/runargv.c:
-
-	#i67911# Wait with the deletion of temporary files until the target is
-	completely made.
-
-2007-08-31 01:24  vq
-
-	* sysintf.c, man/dmake.nc, man/dmake.tf, tests/targets-21,
-	  tests/targets-28:
-
-	#i64572# Issue a warning for virtual targets with corresponding files.
-	Update testcases.
-
-2007-08-30 05:13  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i64572# Add documentation.
-
-2007-08-28 22:27  vq
-
-	* tests/Makefile.am:
-
-	#i64234# Also change Makefile.am.
-
-2007-08-28 22:25  vq
-
-	* tests/: Makefile.in, function_macros-10:
-
-	#i64234# Add testcase.
-
-2007-08-28 14:28  vq
-
-	* function.c, man/dmake.nc, man/dmake.tf:
-
-	#i64234# Fix $(mktmp ..) handling of leading spaces.
-
-2007-08-26 18:22  vq
-
-	* tests/: Makefile.am, Makefile.in, macros-11:
-
-	#i74007# Add testcase.
-
-2007-08-25 16:50  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-28:
-
-	#i64572# Add testcases.
-
-2007-08-25 15:34  vq
-
-	* make.c, sysintf.c:
-
-	#i64572# If a target without recipes has an existing file use its time
-	stamp only if the time is newer than the one of the its newest prerequisite.
-
-2007-08-22 10:02  vq
-
-	* sysintf.c:
-
-	#i64572# Fix the F_RULES problem mentioned before.
-
-2007-08-21 11:09  vq
-
-	* make.c, sysintf.c:
-
-	#i64572# To keep the dependency chains intact targets without recipes inherit
-	the time of their newest prerequisite. (Additional patches are needed as
-	currently the F_RULES flag is not always set correctly.)
-
-2007-08-19 20:05  vq
-
-	* sysintf.c:
-
-	#i64572# Assumes that targets without recipe lines have a current time
-	stamp after they were made (independent of the actual time stamp of the
-	file.
-
-2007-08-18 18:23  vq
-
-	* make.c, sysintf.c:
-
-	#i64572# Make dmake warn if the time stamp of a target is not updated
-	after making the target. This warning can be silenced using the
-	.SILENT attribute.
-
-2007-08-17 23:21  vq
-
-	* make.c:
-
-	#i10000# Remove unused variable.
-
-2007-08-17 23:16  vq
-
-	* dmake.h, make.c, sysintf.c:
-
-	#i10000# Add some comments.
-
-2007-08-15 17:46  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-27:
-
-	#i80687# Add testcase.
-
-2007-08-15 17:25  vq
-
-	* make.c:
-
-	#i80687# Fix building of inferred phony prerequisites.
-
-2007-08-14 13:55  vq
-
-	* make.c:
-
-	#i64572# Revert previous patch.
-
-2007-08-13 11:33  vq
-
-	* make.c:
-
-	#i64572# Make dmake warn if the time stamp of a target is not updated
-	after making the target.
-
-2007-08-11 17:23  vq
-
-	* tests/: Makefile.am, Makefile.in, recipes-9:
-
-	#i80598# Add testcase.
-
-2007-08-11 16:52  vq
-
-	* unix/runargv.c:
-
-	#i80598# Fix handling of ignored errors in the spawn enabled version
-	of dmake.
-
-2007-08-10 13:59  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-26:
-
-	#i66751# Add testcase.
-
-2007-08-10 13:39  vq
-
-	* infer.c:
-
-	#i66751# Make sure that infered phony %-targets do not have a time stamp.
-
-2007-08-10 11:42  vq
-
-	* infer.c, man/dmake.nc, man/dmake.tf:
-
-	#i66751# Accept .PHONY attribute in %-targets.
-
-2007-08-09 15:46  vq
-
-	* macparse.c:
-
-
-	#i69510# Change error on assignment to an empty macro name to a warning.
-
-2007-08-08 22:00  vq
-
-	* tests/: Makefile.am, Makefile.in, recipes-8:
-
-	#i67709# Add testcase.
-
-2007-08-08 21:43  vq
-
-	* parse.c, rulparse.c:
-
-	#i67709# Improve parsing of group recipes.
-
-2007-08-08 13:49  vq
-
-	* tests/: Makefile.am, Makefile.in, macros-10:
-
-	#i69510# Add testcase.
-
-2007-08-08 12:54  vq
-
-	* macparse.c:
-
-	#i69510# Improve error message.
-
-2007-08-08 12:52  vq
-
-	* macparse.c:
-
-	#i69510# Improve macro name syntax check during assignment.
-
-2007-08-06 21:54  vq
-
-	* rulparse.c, man/dmake.nc, man/dmake.tf:
-
-	#i66448# Clarify prerequisites for %-targets.
-
-2007-08-05 17:10  vq
-
-	* function.c, tests/Makefile.am, tests/Makefile.in,
-	  tests/function_macros-9:
-
-	#i50092# Enhance $(shell,expand .. ) parsing. Add testcase.
-
-2007-08-05 14:55  vq
-
-	* make.c:
-
-	#i70168# Clear F_MARK flag after dynamic prerequisite expansion is done.
-
-2007-08-05 13:51  vq
-
-	* infer.c:
-
-	#i80144# Clean-up.
-
-2007-08-05 13:03  vq
-
-	* infer.c, tests/targets-24:
-
-	#i80144# Change error about ambigous inference targets to warning.
-
-2007-08-04 14:56  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-25:
-
-	#i80352# Add testcase.
-
-2007-08-04 14:42  vq
-
-	* make.c:
-
-	#i80352# Fix .PRECIOUS attribute.
-
-2007-08-04 00:15  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-23, targets-24:
-
-	#i80144# Add testcases.
-
-2007-07-31 20:45  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-22:
-
-	#i80143# Add testcase.
-
-2007-07-31 20:29  vq
-
-	* infer.c:
-
-	#i80143# Fix problem marking some intermediate targets removable.
-
-2007-07-30 22:23  vq
-
-	* expand.c:
-
-	#i80009# Add missing string initialization.
-
-2007-07-29 22:28  vq
-
-	* infer.c:
-
-	#i80144# Improve check for ambiguous inference chains.
-
-2007-07-29 12:10  vq
-
-	* infer.c, stat.c:
-
-	#i10000# Add comments to documents aspects of the inference mechanism.
-
-2007-07-28 13:12  vq
-
-	* configure, configure.in:
-
-	#i79815# Fix default DMAKEROOT macro value.
-
-2007-07-27 22:03  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-21:
-
-	#i78837# Add testcase.
-
-2007-07-27 21:37  vq
-
-	* tests/: Makefile.am, Makefile.in, macros-9:
-
-	#i80010# Add testcase.
-
-2007-07-27 15:47  vq
-
-	* expand.c:
-
-	#i80010# Keep quotes for :1 and :i macro extensions.
-
-2007-07-27 15:16  vq
-
-	* tests/: Makefile.am, Makefile.in, macros-8:
-
-	#i80009# Add testcase.
-
-2007-07-27 13:06  vq
-
-	* NEWS, man/dmake.nc, man/dmake.tf:
-
-	#i78776# Document new normalizing function macro and macro extension.
-
-2007-07-26 18:27  vq
-
-	* expand.c:
-
-	#i80009# Fix handling of quoted filenames for :b :d :e :f macro expansions.
-
-2007-07-24 20:31  vq
-
-	* tests/: Makefile.am, Makefile.in, function_macros-8, macros-7:
-
-	#i78776# Add testcases.
-
-2007-07-24 19:00  vq
-
-	* dag.c, dmake.h, expand.c, extern.h, function.c, path.c:
-
-	#i78776# New function macro $(normpath[,para] list) to normalise the
-	elements of list and a macro extension $(macro_name:n) to normalise
-	the content of macro_name. The normalization is done token-wise and
-	quotes are preserved.
-	On cygwin the result honors the setting of .WINPATH to determine the
-	output format.  If the optional parameter para is given in the
-	$(normpath ...) case its expanded value is used to override the
-	.WINPATH setting for the output of the function macro.
-
-2007-07-12 18:59  vq
-
-	* make.c, tests/Makefile.am, tests/Makefile.in, tests/targets-20:
-
-	#i69462# Do not assume that non-existing prerequisites for %-targets have
-	the same time stamp as the parent target. Testcase added.
-
-2007-07-05 17:17  vq
-
-	* getinp.c:
-
-	#i79200# Remove unneeded error on defined or DEFINED after .IF expression.
-
-2007-07-05 11:58  vq
-
-	* Makefile.in, NEWS, configure, configure.in, man/dmake.nc,
-	  man/dmake.tf, readme/read1st.txt, win95/microsft/config.h,
-	  winnt/microsft/config.h:
-
-	#i79271# Bump version to 4.11-cvs.
-
-2007-06-25 18:11  vq
-
-	* Makefile.in, NEWS, configure, configure.in, man/dmake.nc,
-	  man/dmake.tf, readme/read1st.txt, win95/microsft/config.h,
-	  winnt/microsft/config.h:
-
-	#i78508# Release dmake 4.9.
-
-2007-06-22 16:47  vq
-
-	* man/dmake.nc, man/dmake.tf, tests/Makefile.am, tests/Makefile.in,
-	  tests/targets-19:
-
-	#i78061# Add testcase and documentation.
-
-2007-06-22 13:36  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i74007# Add documentation to manpage.
-
-2007-06-21 16:28  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-18:
-
-	#i74007#  Add testcase.
-
-2007-06-20 18:26  vq
-
-	* dag.c, imacs.c, path.c, vextern.h:
-
-	#i74700# Add a new special macro OOODMAKEMODE that is used to toggle
-	OOo build specific behavior. If OOODMAKEMODE is set (i.e. it begins with y)
-	the leading ./ of a path will no longer be removed.
-	This patch also fixes iz78061.
-
-2007-06-20 18:07  vq
-
-	* configure.in:
-
-	#i78152# Make dmake buildable on GNU/kFreeBSD.
-
-2007-06-17 23:56  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i78033# Document :i macro expansion.
-
-2007-04-24 13:42  vq
-
-	* Makefile.in, NEWS, configure, configure.in, man/dmake.nc,
-	  man/dmake.tf, win95/microsft/config.h, winnt/microsft/config.h:
-
-	#i73700# Release dmake 4.8.
-
-2007-04-09 09:22  vq
-
-	* tests/misc-18:
-
-	#i73499# Fix bash syntax typo.
-
-2007-04-08 23:27  vq
-
-	* tests/misc-18:
-
-	#i73499# Make test work on Solaris.
-
-2007-04-08 23:06  vq
-
-	* make.c:
-
-	#i73499# Fix potential problem with m_at getting freed without being
-	initalized first.
-
-2007-03-27 13:21  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i10000# Fix typos in manual.
-	This patch was provided by shay@openoffice.org.
-
-2007-03-24 00:29  vq
-
-	* make.c, man/dmake.nc, man/dmake.tf:
-
-	#i75697# Document the special treatment of $? for the :! ruleop.
-
-2007-03-23 16:40  vq
-
-	* NEWS, man/dmake.nc, man/dmake.tf, tests/Makefile.am,
-	  tests/Makefile.in, tests/misc-18:
-
-	#i73499# Add documentation and testcase.
-
-2007-03-19 00:58  vq
-
-	* sysintf.c:
-
-	#i73499# Restrict function to cygwin only use.
-
-2007-03-18 11:02  vq
-
-	* sysintf.c:
-
-	#i73499# Add missing include statement.
-
-2007-03-17 15:00  vq
-
-	* dag.c, dmake.c, dmake.h, dmdump.c, extern.h, getinp.c, imacs.c,
-	  infer.c, make.c, rulparse.c, sysintf.c, vextern.h:
-
-	#i73499# Add new .WINPATH attribute to generate Windows style paths
-	(with regular slashes) instead of the default cygwin style (POSIX)
-	paths for dmake's dynamic macros.
-
-	This attribute is specific for cygwin dmake executables and non-cygwin
-	environments ignore this attribute.
-
-	The windows style paths use regular slashes ('/') instead of the
-	usual windows backslash ('\') as directory separator to avoid quoting
-	problems (It still is a cygwin dmake!) and cygwin as well as native
-	windows programs should have no problems using this (c:/foo/bar) path
-	representation.
-
-	The affected macros are $@, $*, $>, $?, $<, $&, $^ and $(PWD),
-	$(MAKEDIR) and $(TMD).
-
-	Examples:
-
-	Content of $(PWD) without .WINPATH (default):  /cygdrive/c/temp
-
-	Content of $(PWD) with .WINPATH set:           c:/temp
-
-2007-03-16 22:36  vq
-
-	* sysintf.c:
-
-	#i10000# Trivial fix.
-
-2007-03-13 20:51  vq
-
-	* sysintf.c, unix/rmprq.c:
-
-	#i10000# No real change, only comments were added or modified.
-
-2007-01-29 23:24  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i73996# Update man page.
-
-2007-01-29 21:39  vq
-
-	* make.c, path.c, sysintf.c, vextern.h:
-
-	#i73996# Avoid relative paths going up to the root directory.
-
-2007-01-26 19:51  vq
-
-	* dag.c, imacs.c, make.c:
-
-	#i739183 Mark the internal macros PWD, MAKEDIR and TMD as precious.
-	Also commit some small macro relates clean ups and comment changes.
-
-2007-01-22 21:49  vq
-
-	* dag.c:
-
-	#i10000# Remove warning and add error handling.
-
-2007-01-22 21:25  vq
-
-	* getinp.c, make.c:
-
-	#i10000# Small cosmetic changes.
-
-2007-01-21 18:21  vq
-
-	* configure, configure.in, path.c, man/dmake.nc, man/dmake.tf,
-	  unix/dcache.c:
-
-	#i73661# Improve case insensitive directory caching on case sensitive
-	file systems but it is *not* recommended to to so. A comment was added
-	to the man page emphasizing this.
-
-2007-01-20 22:00  vq
-
-	* Makefile.in, configure, configure.in, man/dmake.nc, man/dmake.tf,
-	  readme/read1st.txt, win95/microsft/config.h,
-	  winnt/microsft/config.h:
-
-	#i73700# Bump version to 4.8-cvs.
-
-2007-01-27 20:53  vq
-
-	* configure, configure.in:
-
-	Masterfix from SRC680_m200. This patch fixes a MacOSX problem
-	encountered after integration into the OOo SRC680 master.
-
-2007-01-15 21:36  vq
-
-	* msdos/runargv.c:
-
-	#i61856# There is currently no parallel processing for the native W32 dmake.
-	Let Wait_for_child() always return -1 indicating that there is nothing to
-	wait for on this OS.
-
-2006-12-21 23:45  vq
-
-	* NEWS:
-
-	#i69952# Release dmake 4.7
-	(Some extra changes were done in CWS dmake47.)
-
-2006-12-21 23:36  vq
-
-	* unix/runargv.c:
-
-	#i61856# Remove another verbose debugging statement.
-
-2006-12-20 22:16  vq
-
-	* quit.c, sysintf.c, unix/runargv.c:
-
-	#i61856# Child process handling improvements.
-
-2006-12-06 17:09  vq
-
-	* dmake.c:
-
-	#i72337# Make dmake -V tell whether fork/exec or spawn is used.
-
-2006-12-02 14:35  vq
-
-	* tests/Makefile.am:
-
-	#i72210# Missed an autotool bit.
-
-2006-12-02 14:10  vq
-
-	* tests/Makefile.in, tests/recipes-7, unix/runargv.c:
-
-	#i72210# Add missing detail and a testcase.
-
-2006-12-02 13:25  vq
-
-	* unix/runargv.c:
-
-	#i72210# Teach spawn enabled dmake to honor the '-' recipe switch.
-
-2006-11-30 20:16  vq
-
-	* unix/runargv.c:
-
-	#i61856# Fix "Internal Error: Child is missing .." problem.
-
-2006-11-27 17:23  vq
-
-	* unix/runargv.c:
-
-	#i61856# Improve (dmake internal) process handling.
-
-2006-11-23 11:58  vq
-
-	* Makefile.in, NEWS, configure, configure.in, man/dmake.nc,
-	  man/dmake.tf, win95/microsft/config.h, winnt/microsft/config.h:
-
-	#i69952# Release dmake 4.7.
-
-2006-11-21 06:50  hjs
-
-	* tests/: macros-6, misc-13:
-
-	small cleanup
-
-2006-11-20 20:32  vq
-
-	* tests/misc-13:
-
-	#i71777# Fix testcase - Only test the directory cache for case
-	insensitivity if the FS is also case insensitive.
-
-2006-11-20 12:16  vq
-
-	* tests/: misc-15, recipes-5, recipes-6:
-
-	#i71777# Solaris testcase fixes.
-
-2006-11-20 11:58  vq
-
-	* tests/macros-6:
-
-	#i71777# Fix testcase.
-
-2006-11-20 11:38  vq
-
-	* tests/recipes-6:
-
-	#i71422# Fix testcase.
-
-2006-11-19 16:10  vq
-
-	* man/dmake.nc, man/dmake.tf, tests/Makefile.am, tests/Makefile.in,
-	  tests/misc-17:
-
-	#i71704# Add testcase and documentation.
-
-2006-11-19 00:27  vq
-
-	* dag.c, dmake.c, imacs.c, make.c, unix/runargv.c:
-
-	#i71704# Let the global .SEQUENTIAL attribute implicitely set MAXPROCESS=1
-	and disallow MAXPROCESS to be changed if the global .SEQUENTIAL is set.
-
-2006-11-17 18:09  vq
-
-	* tests/: Makefile.am, Makefile.in, misc-16:
-
-	#i61856# Add testcase.
-
-2006-11-17 16:56  vq
-
-	* dmake.h, sysintf.c, unix/runargv.c:
-
-	#i61856# Implement better way to wait for a process queue to finish
-	without obstructing other process queues during parallel makefile
-	processing.
-
-2006-11-15 14:43  vq
-
-	* configure, configure.in, unix/runargv.c:
-
-	#i71582# Make dmake usable on OpenBSD. (Patch separated from CWS openbsd01)
-
-2006-11-13 15:39  vq
-
-	* tests/: Makefile.am, Makefile.in, recipes-5, recipes-6:
-
-	#i71422# Add testcases.
-
-2006-11-13 14:08  vq
-
-	* NEWS, man/dmake.nc, man/dmake.tf:
-
-	#i71422# Document new @@ recipe property.
-
-2006-11-12 00:25  vq
-
-	* Makefile.in, config.h.in, configure, configure.in,
-	  startup/Makefile.in, startup/unix/Makefile.in,
-	  startup/unix/cygwin/Makefile.in, startup/unix/linux/Makefile.in,
-	  startup/unix/macosx/Makefile.in,
-	  startup/unix/solaris/Makefile.in,
-	  startup/unix/sysvr4/Makefile.in, startup/winnt/Makefile.in,
-	  startup/winnt/mingw/Makefile.in, startup/winnt/msvc6/Makefile.in,
-	  tests/Makefile.in:
-
-	#i71422# Remove unused macro and regenerate autotools files.
-
-2006-11-12 00:06  vq
-
-	* dag.c, dmake.c, dmake.h, extern.h, function.c, getinp.c, make.c,
-	  rulparse.c, sysintf.c, vextern.h, mac/public.h, msdos/runargv.c,
-	  msdos/borland/bcc30/public.h, msdos/borland/bcc40/public.h,
-	  msdos/borland/bcc45/public.h, msdos/borland/bcc50/public.h,
-	  msdos/borland/tcc20/public.h, msdos/microsft/msc51/public.h,
-	  msdos/microsft/msc60/public.h, msdos/zortech/public.h,
-	  os2/ibm/icc/public.h, os2/ibm/icc3/public.h, qssl/public.h,
-	  qssl/runargv.c, tos/public.h, unix/runargv.c,
-	  unix/386ix/public.h, unix/bsd43/public.h, unix/bsd43/uw/public.h,
-	  unix/bsd43/vf/public.h, unix/bsdarm32/public.h,
-	  unix/coherent/ver40/public.h, unix/coherent/ver42/public.h,
-	  unix/cygwin/public.h, unix/linux/gnu/public.h,
-	  unix/macosx/gnu/public.h, unix/solaris/public.h,
-	  unix/solaris/gnu/public.h, unix/sysvr1/public.h,
-	  unix/sysvr3/public.h, unix/sysvr3/gnu/public.h,
-	  unix/sysvr3/pwd/public.h, unix/sysvr4/public.h,
-	  unix/xenix/public.h, unix/xenix/pwd/public.h,
-	  win95/borland/bcc50/public.h, win95/microsft/vpp40/public.h,
-	  winnt/borland/bcc50/public.h, winnt/microsft/vpp40/public.h,
-	  winnt/mingw/public.h, winnt/msvc6/public.h:
-
-	#i71422# Add a new feature: Using @@ as a recipe prefix redirects the
-	output (stdout and stderr) of a recipe to /dev/null (or NUL on W32)
-	completely suppressing the output of that recipe to the terminal.
-	As for the @ prefix this can be disabled using the -v[r] switch.
-
-2006-11-09 22:25  vq
-
-	* tests/: Makefile.am, Makefile.in, misc-15:
-
-	#i69943# Add testcase to check directory caching with DOS style path
-	targets on cygwin dmake.
-
-2006-11-09 17:33  vq
-
-	* make.c, path.c:
-
-	#i69821# Fix/improve $(TMD) handling.
-
-2006-11-09 16:31  vq
-
-	* tests/: Makefile.am, Makefile.in, macros-6:
-
-	#i69821# Add testcase to verify that .SETDIR works (with drive letters
-	on cygwin) and sets TMD correctly.
-
-2006-11-09 13:16  vq
-
-	* make.c:
-
-	#i69821# Add comment where TMD is detecting different drive letters for
-	native W32 dmake versions.
-
-2006-10-08 19:27  vq
-
-	* NEWS, make.c, tests/Makefile.am, tests/Makefile.in,
-	  tests/targets-17:
-
-	#i70210# Fix dmakes handling of empty dynamic prerequisites.
-
-2006-10-08 18:57  vq
-
-	* make.c:
-
-	#i70168# Remove FIXME.
-
-2006-10-08 18:49  vq
-
-	* NEWS, imacs.c, make.c, rulparse.c, vextern.h, man/dmake.nc,
-	  man/dmake.tf, tests/Makefile.am, tests/Makefile.in,
-	  tests/targets-16:
-
-	#i70168# Improve $ handling in targets/prerequisites.
-
-2006-10-07 16:23  vq
-
-	* parse.c, tests/Makefile.am, tests/Makefile.in, tests/misc-14:
-
-	#i70027# Fix diagnostic output and add a testcase.
-
-2006-10-07 15:30  vq
-
-	* NEWS, man/dmake.nc, man/dmake.tf:
-
-	#i69742# Add NEWS file entry and mention normalization in the man page.
-
-2006-10-07 14:34  vq
-
-	* dag.c:
-
-	#i69742# Never normalize cells that contain a $ in the pathname.
-
-2006-10-06 22:28  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-15:
-
-	#i69742# Add testcase.
-
-2006-10-06 00:02  vq
-
-	* dag.c, make.c:
-
-	#i69742# Don't targets with $ in the filepath as dynamic macros. ($$ means
-	a single $ in the filepath.)
-
-2006-10-03 23:17  vq
-
-	* dag.c, sysintf.c:
-
-	#i69742# Enable normalization of targets and non-dynamic prerequisites.
-	(Dynamic prerequisites are prerequisites with not expanded macros.)
-
-2006-10-02 20:46  vq
-
-	* path.c:
-
-	#i69742# Fix problem when removing multiple '/'.
-
-2006-10-01 15:18  vq
-
-	* dmake.c, extern.h, path.c:
-
-	#i69742# Create Clean_path() function.
-
-2006-10-01 12:23  vq
-
-	* path.c, unix/dirbrk.c:
-
-	#i69742# Clean up/speed up Build_path().
-
-2006-09-30 11:01  vq
-
-	* mac/sysintf.h, msdos/sysintf.h, os2/sysintf.h, qssl/sysintf.h,
-	  tos/sysintf.h, unix/sysintf.h, win95/borland/sysintf.h,
-	  win95/microsft/sysintf.h, winnt/borland/sysintf.h,
-	  winnt/microsft/sysintf.h, winnt/mingw/sysintf.h,
-	  winnt/msvc6/sysintf.h:
-
-	#i69814# Remove the unused DMSTRLWR macro.
-
-2006-09-29 17:20  vq
-
-	* Makefile.in, autogen.sh, config.h.in, configure, configure.in,
-	  extern.h, function.c, make.c, sysintf.c:
-
-	#i69953# Remove NO_DRIVE_LETTERS, use HAVE_DRIVE_LETTERS instead.
-
-2006-09-29 14:55  vq
-
-	* tests/macros-5:
-
-	#i69821# Fix testcase.
-
-2006-09-29 14:50  vq
-
-	* dmstring.c, extern.h, imacs.c, make.c, stat.c, man/dmake.nc,
-	  man/dmake.tf, tests/Makefile.am, tests/Makefile.in,
-	  tests/misc-13, unix/dcache.c, win95/microsft/config.h:
-
-	#i69814# Add/fix option to make directory cache case insensitive. (Make
-	this the default for Windows and Mac OS X.) Added testcase.
-
-2006-09-28 17:42  vq
-
-	* imacs.c, make.c, tests/Makefile.am, tests/Makefile.in,
-	  tests/macros-5:
-
-	#i69821# Fix TMD macro and add testcase.
-
-2006-09-28 17:16  vq
-
-	* Makefile.am, Makefile.in, aclocal.m4, autogen.sh, compile,
-	  config.guess, config.h.in, configure, configure.in, depcomp,
-	  install-sh, missing, mkinstalldirs, msdos/Makefile.am,
-	  msdos/Makefile.in, startup/Makefile.in, startup/unix/Makefile.in,
-	  startup/unix/cygwin/Makefile.in, startup/unix/linux/Makefile.in,
-	  startup/unix/macosx/Makefile.in,
-	  startup/unix/solaris/Makefile.in,
-	  startup/unix/sysvr4/Makefile.in, startup/winnt/Makefile.in,
-	  startup/winnt/mingw/Makefile.in, startup/winnt/msvc6/Makefile.in,
-	  tests/Makefile.in, win95/Makefile.am, win95/Makefile.in,
-	  win95/microsft/Makefile.am, win95/microsft/Makefile.in:
-
-	#i69953# Clean up of the autotooling.
-
-2006-09-28 13:33  vq
-
-	* Makefile.in, configure, configure.in, man/dmake.nc, man/dmake.tf,
-	  readme/read1st.txt, win95/microsft/config.h,
-	  winnt/microsft/config.h:
-
-	#i69952#  Bump version to 4.7-cvs.
-
-2006-09-24 19:57  vq
-
-	* tests/targets-12:
-
-	#i69818# Fix testcase.
-
-2006-09-21 16:57  vq
-
-	* Makefile.in, NEWS, configure, configure.in, man/dmake.nc,
-	  man/dmake.tf, win95/microsft/config.h, winnt/microsft/config.h:
-
-	#i67689# Release dmake 4.6.
-
-2006-09-21 12:24  vq
-
-	* expand.c:
-
-	#i69743# Optimize expand.c:Apply_edit().
-
-2006-09-20 13:32  vq
-
-	* rulparse.c:
-
-	#i66567# Show the ".SUFFIXES target has no special meaning" warning only
-	if the -v[w] verbose flag is given.
-
-2006-09-14 12:40  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i69536# Make clear that .SUFFIXES is not supported by dmake.
-
-2006-08-29 13:08  vq
-
-	* function.c, sysintf.c:
-
-	#i69071# Don't use umask for the native W32 dmake.
-
-2006-08-21 00:22  vq
-
-	* dmake.h, make.c, rulparse.c, unix/runargv.c:
-
-	#i10000# Add some code comments.
-
-2006-08-20 13:30  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i64569# Improve documentation of the handling of continued makefile lines.
-
-2006-08-15 14:12  vq
-
-	* tests/: Makefile.am, Makefile.in, macros-4:
-
-	#i44961# Add testcase.
-
-2006-08-15 14:11  vq
-
-	* expand.c:
-
-	#i44961# Reject single letter macros with (, {, ), } and : .
-
-2006-08-15 11:07  vq
-
-	* expand.c:
-
-	#i44961# Throw error if inclosed macro brackets are encountered.
-
-2006-08-14 16:35  vq
-
-	* unix/ruletab.c:
-
-	#i52590# Increase limit of parallel jobs for *NIX dmakes to 64.
-
-2006-07-30 23:35  vq
-
-	* function.c:
-
-	#i67585# Remove unneeded variable definitions.
-
-2006-07-30 22:47  vq
-
-	* function.c, sysintf.c, mac/public.h,
-	  msdos/borland/bcc30/public.h, msdos/borland/bcc40/public.h,
-	  msdos/borland/bcc45/public.h, msdos/borland/bcc50/public.h,
-	  msdos/borland/tcc20/public.h, msdos/microsft/msc51/public.h,
-	  msdos/microsft/msc60/public.h, msdos/zortech/public.h,
-	  os2/ibm/icc/public.h, os2/ibm/icc3/public.h, qssl/public.h,
-	  tos/public.h, unix/386ix/public.h, unix/bsd43/public.h,
-	  unix/bsd43/uw/public.h, unix/bsd43/vf/public.h,
-	  unix/bsdarm32/public.h, unix/coherent/ver40/public.h,
-	  unix/coherent/ver42/public.h, unix/cygwin/public.h,
-	  unix/linux/gnu/public.h, unix/macosx/gnu/public.h,
-	  unix/solaris/public.h, unix/solaris/gnu/public.h,
-	  unix/sysvr1/public.h, unix/sysvr3/public.h,
-	  unix/sysvr3/gnu/public.h, unix/sysvr3/pwd/public.h,
-	  unix/sysvr4/public.h, unix/xenix/public.h,
-	  unix/xenix/pwd/public.h, win95/borland/bcc50/public.h,
-	  win95/microsft/vpp40/public.h, winnt/borland/bcc50/public.h,
-	  winnt/microsft/vpp40/public.h, winnt/mingw/public.h,
-	  winnt/msvc6/public.h:
-
-	#i64583# Remove unused parameter from Create_temp() and Get_temp().
-
-2006-07-29 21:47  vq
-
-	* tests/: Makefile.am, Makefile.in, recipes-3, recipes-4:
-
-	#i67589# Add testcases for builtin commands.
-
-2006-07-28 21:55  vq
-
-	* NEWS, man/dmake.nc, man/dmake.tf:
-
-	#i67589# Add documentation and NEWS file entry for builtin commands noop
-	and echo.
-
-2006-07-28 17:19  vq
-
-	* make.c, sysintf.c, unix/runargv.c:
-
-	#i67589# Add the internal commands noop and echo to the *nix version of
-	dmake. This functionality already existed for the native windows version.
-
-2006-07-26 21:10  vq
-
-	* sysintf.c, msdos/runargv.c, msdos/spawn.c:
-
-	#i67808# Fix the internal echo command of the native Windows dmake version.
-	The patch also moves the usage of the global variable Packed_shell to
-	msdos/runargv.c and msdos/spawn.c.
-
-2006-07-25 20:47  vq
-
-	* unix/runargv.c:
-
-	#i10000# Oops, the previous patch should not change this part.
-
-2006-07-25 20:20  vq
-
-	* sysintf.c, unix/runargv.c:
-
-	#i10000# Comment and whitespace changes only.
-
-2006-07-24 18:13  vq
-
-	* tests/: Makefile.am, Makefile.in, function_macros-7, recipes-2:
-
-	#i64583# Add testcase for $(mktmp ...) function macro and group recipe.
-
-2006-07-24 17:43  vq
-
-	* dag.c, function.c, sysintf.c:
-
-	#i64583# Let tempfiles generated by $(mktmp ..) always have 600 permissions.
-	Generate unique and secure tempfiles if a suffix is requested. (Needed for
-	group recipes.)
-
-2006-07-23 00:27  vq
-
-	* Makefile.in, configure, configure.in, man/dmake.nc, man/dmake.tf,
-	  readme/read1st.txt, win95/microsft/config.h,
-	  winnt/microsft/config.h:
-
-	#i67689# Bump version to 4.6-cvs.
-
-2006-07-23 00:05  vq
-
-	* NEWS:
-
-	#i67166# Mention the new warning in the NEWS file.
-
-2006-07-22 23:41  vq
-
-	* tests/: Makefile.am, Makefile.in, function_macros-6:
-
-	#i67585# Add a testcase.
-
-2006-07-22 23:17  vq
-
-	* function.c, man/dmake.nc, man/dmake.tf:
-
-	#i67585# Fix $(nil ...) function macro.
-	The patch also removes some unneeded code from _exec_call() and adds some
-	extra documentation about function macros to the dmake man page.
-
-2006-07-21 23:48  vq
-
-	* dag.c, hash.c:
-
-	#i10000# Add some comments.
-
-2006-07-19 22:41  vq
-
-	* make.c, sysintf.c, msdos/runargv.c, unix/runargv.c:
-
-	#i10000# No code changes. Only comments were added/improved.
-
-2006-07-16 23:13  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-13, targets-14:
-
-	#i67166# Add testcases.
-
-2006-07-16 23:10  vq
-
-	* dag.c, dmake.c, dmake.h, expand.c, macparse.c:
-
-	#i67166# Make dmake issue a warning if a previously unset macro (i.e. it is
-	assumed to be empty) is used and later set to a different value.
-
-2006-07-10 17:01  vq
-
-	* NEWS, tests/Makefile.am, tests/Makefile.in, tests/targets-12:
-
-	#i66567# Add testcase and mention the new warning in the NEWS file.
-
-2006-07-10 16:46  vq
-
-	* rulparse.c, man/dmake.nc, man/dmake.tf:
-
-	#i66567# Deprecate the obsolete special target .SUFFIXES as it has no
-	special meaning.
-
-2006-07-09 21:38  vq
-
-	* NEWS, tests/Makefile.am, tests/Makefile.in, tests/targets-11:
-
-	#i67025# Add testcase and mention this bugfix in the NEWS file as it was
-	a regression in dmake 4.5 with respect to older versions.
-
-2006-07-09 21:08  vq
-
-	* rulparse.c:
-
-	#i67025# Fix problem of %-targets with attribute .SILENT and -vr verbose
-	flag.
-
-2006-06-22 16:48  vq
-
-	* NEWS:
-
-	#i66522# Release dmake 4.5
-	(Two more issues were added and fixed in CWS dmake45.)
-
-2006-06-22 16:45  vq
-
-	* tests/: infra-0, macros-1, macros-2, macros-3, misc-1, misc-10,
-	  misc-11, misc-2, misc-3, misc-4, misc-5, misc-7, misc-8, misc-9,
-	  recipes-1, targets-1, targets-10, targets-2, targets-3,
-	  targets-4, targets-5, targets-6, targets-7, targets-8, targets-9:
-
-	#i66650# Make dmake testsuite more portable. (Usable with Solaris.)
-	Patch by hjs.
-
-2006-06-22 16:14  vq
-
-	* getinp.c, rulparse.c, tests/Makefile.am, tests/Makefile.in,
-	  tests/misc-1, tests/misc-12:
-
-	#i66659# Fix evaluation of line continuations in conditional expressions
-	and add testcase.
-
-2006-06-20 10:20  vq
-
-	* Makefile.in, configure, configure.in, win95/microsft/config.h,
-	  winnt/microsft/config.h:
-
-	#i66522# Release dmake 4.5.
-
-2006-06-17 13:08  vq
-
-	* Makefile.in, configure, configure.in, readme/intro.txt,
-	  readme/read1st.txt, win95/microsft/config.h,
-	  winnt/microsft/config.h:
-
-	#i66522# Increase version number in documentation files and set preliminary
-	dmake version to 4.5-cvs.
-
-2006-06-16 20:41  vq
-
-	* NEWS:
-
-	#i66522# Update NEWS file.
-
-2006-06-16 16:38  vq
-
-	* makefile.mk:
-
-	#i66509# Fix bug in makefile.
-
-2006-06-16 16:24  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i66522# Update manpage.
-
-2006-06-16 14:46  vq
-
-	* tests/: Makefile.am, Makefile.in, misc-11:
-
-	#i65281# Add testcase.
-
-2006-06-16 14:31  vq
-
-	* getinp.c, man/dmake.nc, man/dmake.tf:
-
-	#i65281# Fix comparison with empty string.
-
-2006-06-14 22:42  vq
-
-	* unix/ruletab.c, win95/borland/ruletab.c,
-	  win95/microsft/ruletab.c, winnt/borland/ruletab.c,
-	  winnt/microsft/ruletab.c:
-
-	#i64889# Increase the default MAXLINELENGTH for all "modern" target OSs.
-
-	This patch was submitted by shay@openoffice.org.
-
-2006-06-14 18:43  vq
-
-	* man/dmake.nc, man/dmake.tf, tests/Makefile.am, tests/Makefile.in,
-	  tests/targets-10, tests/targets-7, tests/targets-9:
-
-	#i48087# Add testcases and change man page.
-
-2006-06-13 19:52  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-8:
-
-	#i64331# Add testcase.
-
-2006-06-13 19:31  vq
-
-	* infer.c:
-
-	#i64431# Fix .SETDIR problem with percent targets.
-
-2006-06-13 15:06  vq
-
-	* Makefile.in, configure, configure.in:
-
-	#i64795# Fix typo in configure.in.
-
-2006-06-13 14:33  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-7:
-
-	#i65122# Add testcase.
-
-2006-06-13 13:14  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-6:
-
-	#i66385# Add testcase.
-
-2006-06-13 12:58  vq
-
-	* rulparse.c, man/dmake.nc, man/dmake.tf:
-
-	#i66385# Handle .<suffix> targets regardless of the AUGMAKE (-A) status.
-	Document this and regenerate man page.
-
-2006-06-13 11:03  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-5:
-
-	#i66083# Add testcase.
-
-2006-06-13 01:28  vq
-
-	* rulparse.c:
-
-	#i66083# Check that AUGMAKE meta targets are not mixed with normal targets.
-
-2006-06-03 23:30  vq
-
-	* rulparse.c:
-
-	#i48087# Only warn once about multiple prerequisites for %-targets.
-
-2006-06-03 21:55  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-4:
-
-	#i65360# Add testcase to check for message about empty recipe for
-	special or meta targets.
-
-2006-06-03 21:37  vq
-
-	* rulparse.c:
-
-	#i65360# Improve output of warning for special or meta targets without
-	recipe.
-
-2006-06-03 21:17  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-3:
-
-	#i65360# Add testcase that checks that a warning is issued when .<suffix>
-	targets are ignored.
-
-2006-06-03 20:34  vq
-
-	* tests/: Makefile.am, Makefile.in, targets-1, targets-2:
-
-	#i64869# Add testcases and regenerate autotools files.
-
-2006-05-17 17:44  vq
-
-	* Makefile.in, tests/Makefile.am, tests/Makefile.in,
-	  tests/macros-3:
-
-	#i65333# Add testcase and regenerate autotools files.
-
-2006-05-17 00:04  vq
-
-	* man/dmake.tf:
-
-	#i65333# Elaborate on .<suffix> vs. special targets and .INIT and .DONE
-	that also begin with a dot.
-
-2006-05-15 23:43  vq
-
-	* man/dmake.tf:
-
-	#i65333# Collect .<suffix> description at one place in the man page.
-
-2006-05-15 18:50  vq
-
-	* man/dmake.tf:
-
-	#i48087# Document the current %-target handling.
-
-2006-05-14 13:06  vq
-
-	* rulparse.c:
-
-	#i65360# Fix typo.
-
-2006-05-14 12:58  vq
-
-	* rulparse.c:
-
-	#i65360# Warn if dmake ignores an illegal .<suffix> target but keep the
-	behavior of dmake 4.4 and earlier.
-
-2006-05-12 13:36  vq
-
-	* rulparse.c:
-
-	#i48087# Fix typo.
-
-2006-05-12 12:59  vq
-
-	* rulparse.c:
-
-	#i65333# Prevent .ROOT, .TARGETS, .INIT and .DONE from being treates as
-	special .<suffix> targets.
-
-2006-05-10 23:38  vq
-
-	* Makefile.in, man/dmake.nc, tests/Makefile.in:
-
-	#i65281# Regenerate autotools files and plain text version of manpage.
-
-2006-05-10 23:31  vq
-
-	* getinp.c, man/dmake.tf, tests/Makefile.am, tests/misc-10:
-
-	#i65281# Fix crash on numeric comparison and add testcase.
-
-2006-05-10 13:46  vq
-
-	* dmdump.c, rulparse.c, struct.h:
-
-	#i48087# Correct parsing of target definitions with multiple % targets and
-	prerequisites. Also add some comments.
-
-2006-05-05 17:33  vq
-
-	* dmake.h, infer.c, rulparse.c, struct.h, man/dmake.tf:
-
-	#i65122# Fix problem with "non-documented" handling of multiple %-targets
-	plus several improved comments and a man page correction.
-
-2006-05-03 17:47  vq
-
-	* dag.c, dmake.c, getinp.c, imacs.c, parse.c, rulparse.c,
-	  vextern.h:
-
-	#i64869# Fix various parsing problems of target definitions and
-	add code comments.
-
-2006-03-31 11:04  vq
-
-	* Makefile.in, NEWS, configure, configure.in, readme/intro.txt,
-	  readme/read1st.txt, readme/release.txt, win95/microsft/config.h:
-
-	#i63874# Release dmake 4.4
-	Update version numbers and regenerate autotool files.
-
-2006-03-15 09:43  vq
-
-	* unix/runargv.c:
-
-	#i61940# Add and correct some comments.
-
-2006-03-14 18:23  vq
-
-	* tests/: Makefile.am, Makefile.in, function_macros-5:
-
-	#i61940# Add testcase to check that $(shell ..) does not pick up output from
-	concurrent processes.
-
-2006-03-13 18:21  vq
-
-	* function.c, getinp.c, state.c, unix/arlib.c:
-
-	#i61390# Make dmake (gcc) build -Wall warning free.
-
-2006-03-01 22:46  vq
-
-	* rulparse.c:
-
-	#i61969# Clean F_MADE and F_STAT when recipes or prerequisites are changed
-	so that the target gets rebuild even if it was already build. (As a
-	generated .INCLUDE makefile.)
-
-2006-03-01 22:37  vq
-
-	* tests/: Makefile.am, Makefile.in, misc-9:
-
-	#i61969# Commit testcase for this issue.
-
-2006-02-26 18:33  vq
-
-	* dmake.c:
-
-	#i62118# Fix invalid detection of circular dependencies arising from F_VISITED
-	and F_USED both having the same value but being used in different contexts.
-
-2006-02-26 17:46  vq
-
-	* tests/: Makefile.am, Makefile.in, misc-8:
-
-	#i62118# Add testcase for issue 62118.
-
-2006-02-26 17:23  vq
-
-	* tests/macros-2:
-
-	#i61170# Fix testcase to remove the created "dirwith space" directory.
-
-2006-02-21 18:06  vq
-
-	* unix/runargv.c:
-
-	#i61940# Remove the #undef that unconditionally disabled the use of spawn.
-
-2006-02-11 19:47  vq
-
-	* config.h.in, configure, configure.in, unix/runargv.c:
-
-	#i61940# Enable the alternative use of spawn instead of fork/exec for
-	dmake. Add the configure option --enable-spawn. Regenerate autotool files.
-
-2006-02-06 18:06  vq
-
-	* Makefile.in, man/dmake.tf, tests/Makefile.am, tests/Makefile.in,
-	  tests/misc-7:
-
-	#i61714# Correct manpage to state that the usage of .SETDIR like
-	`.SETDIR=foo : targets` is valid and add a testcase to verify this.
-
-2006-02-04 23:02  vq
-
-	* man/dmake.nc:
-
-	#i61170# Regenerate plain text version of the dmake man page.
-
-2006-02-03 14:46  vq
-
-	* NEWS, make.c, makefile.mk, man/dmake.tf:
-
-	#i61170# Let $(TMD)/somedir always be a valid path.
-	Adjust the dmake bootstrap makefile to this change.
-
-2006-02-01 23:50  vq
-
-	* dmake.c:
-
-	#i47919# Fix typo.
-
-2006-02-01 23:39  vq
-
-	* dmake.c, quit.c, sysintf.c, mac/public.h,
-	  msdos/borland/bcc30/public.h, msdos/borland/bcc40/public.h,
-	  msdos/borland/bcc45/public.h, msdos/borland/bcc50/public.h,
-	  msdos/borland/tcc20/public.h, msdos/microsft/msc51/public.h,
-	  msdos/microsft/msc60/public.h, msdos/zortech/public.h,
-	  os2/ibm/icc/public.h, os2/ibm/icc3/public.h, qssl/public.h,
-	  tos/public.h, unix/386ix/public.h, unix/bsd43/public.h,
-	  unix/bsd43/uw/public.h, unix/bsd43/vf/public.h,
-	  unix/bsdarm32/public.h, unix/coherent/ver40/public.h,
-	  unix/coherent/ver42/public.h, unix/cygwin/public.h,
-	  unix/linux/gnu/public.h, unix/macosx/gnu/public.h,
-	  unix/solaris/public.h, unix/solaris/gnu/public.h,
-	  unix/sysvr1/public.h, unix/sysvr3/public.h,
-	  unix/sysvr3/gnu/public.h, unix/sysvr3/pwd/public.h,
-	  unix/sysvr4/public.h, unix/xenix/public.h,
-	  unix/xenix/pwd/public.h, win95/borland/bcc50/public.h,
-	  win95/microsft/vpp40/public.h, winnt/borland/bcc50/public.h,
-	  winnt/microsft/vpp40/public.h, winnt/mingw/public.h,
-	  winnt/msvc6/public.h:
-
-	#i47919# Use the correct handler function for the signal() handling.
-
-2006-02-01 18:37  vq
-
-	* man/dmake.nc:
-
-	#i60948# Regenerate plain text version of the dmake man page.
-
-2006-02-01 18:28  vq
-
-	* Makefile.in, NEWS, config.h.in, configure, configure.in, dmake.c,
-	  dmake.h, function.c, make.c, sysintf.c, vextern.h, mac/public.h,
-	  man/dmake.tf, msdos/runargv.c, msdos/borland/bcc30/public.h,
-	  msdos/borland/bcc40/public.h, msdos/borland/bcc45/public.h,
-	  msdos/borland/bcc50/public.h, msdos/borland/tcc20/public.h,
-	  msdos/microsft/msc51/public.h, msdos/microsft/msc60/public.h,
-	  msdos/zortech/public.h, os2/ibm/icc/public.h,
-	  os2/ibm/icc3/public.h, qssl/public.h, tos/public.h,
-	  unix/runargv.c, unix/386ix/public.h, unix/bsd43/public.h,
-	  unix/bsd43/uw/public.h, unix/bsd43/vf/public.h,
-	  unix/bsdarm32/public.h, unix/coherent/ver40/public.h,
-	  unix/coherent/ver42/public.h, unix/cygwin/public.h,
-	  unix/linux/gnu/public.h, unix/macosx/gnu/public.h,
-	  unix/solaris/public.h, unix/solaris/gnu/public.h,
-	  unix/sysvr1/public.h, unix/sysvr3/public.h,
-	  unix/sysvr3/gnu/public.h, unix/sysvr3/pwd/public.h,
-	  unix/sysvr4/public.h, unix/xenix/public.h,
-	  unix/xenix/pwd/public.h, win95/borland/bcc50/public.h,
-	  win95/microsft/vpp40/public.h, winnt/borland/bcc50/public.h,
-	  winnt/microsft/vpp40/public.h, winnt/mingw/public.h,
-	  winnt/msvc6/public.h:
-
-	#i60948# Add -m option family to generate timing information for targets
-	and/or recipes. (Autotools files were regenerated.)
-
-2006-02-01 17:08  vq
-
-	* tos/public.h, unix/arlib.c, unix/386ix/public.h,
-	  unix/bsd43/public.h, unix/bsd43/uw/public.h,
-	  unix/bsd43/vf/public.h, unix/bsdarm32/public.h,
-	  unix/coherent/ver40/public.h, unix/coherent/ver42/public.h,
-	  unix/cygwin/public.h, unix/linux/gnu/public.h,
-	  unix/macosx/gnu/public.h, unix/solaris/public.h,
-	  unix/solaris/gnu/public.h, unix/sysvr1/public.h,
-	  unix/sysvr3/public.h, unix/sysvr3/gnu/public.h,
-	  unix/sysvr3/pwd/public.h, unix/sysvr4/public.h,
-	  unix/xenix/public.h, unix/xenix/pwd/public.h:
-
-	#i61390# Add missing prototypes.
-
-2006-01-31 23:18  vq
-
-	* man/dmake.tf:
-
-	#i10000# Small documentation fix.
-
-2006-01-30 15:28  vq
-
-	* quit.c, unix/cygwin/public.h:
-
-	#i61390# Add some missing prototypes to dmake/unix/cygwin/public.h and
-	also revert the copyright disclaimer to the original version. This file
-	is supposed to be auto generated and identical to:
-	dmake/unix/linux/gnu/cygwin/public.h.
-
-2006-01-26 20:22  vq
-
-	* tests/: Makefile.am, Makefile.in, macros-2:
-
-	#i61170# Add testcase and regenerate autotools files.
-
-2006-01-26 20:16  vq
-
-	* make.c:
-
-	#i61170# Add micro optimization as usually PWD is equal to MAKEDIR.
-
-2006-01-25 21:54  vq
-
-	* Makefile.in, config.h.in, configure, configure.in, make.c:
-
-	#i61170# Fix TMD macro and regenerate autotool files.
-
-2006-01-25 21:09  vq
-
-	* configure.in:
-
-	#i53148# Treat MinGW build like MSVC build.
-
-2006-01-11 12:46  rene
-
-	* config.guess, config.sub:
-
-	#i60375# update config.{sub,guess}
-
-2006-01-08 17:20  vq
-
-	* Makefile.in, configure, configure.in:
-
-	#i60168# Expand internal configure variable before using it and
-	regenerate autotool files.
-
-2006-01-08 16:44  vq
-
-	* Makefile.in, configure:
-
-	#i60168# Regenerate autotool files.
-
-2006-01-08 16:37  vq
-
-	* configure.in:
-
-	#i60168# Use the --datadir swich to determine where the startup dir is
-	placed and adapt the default DMAKEROOT macro setting accordingly.
-
-2006-01-05 20:35  vq
-
-	* tests/Makefile.in:
-
-	#i58259# Regenerate autotool files.
-
-2006-01-05 20:24  vq
-
-	* tests/: misc-6, Makefile.am:
-
-	#i58259# Add testcase.
-
-2006-01-03 23:07  vq
-
-	* make.c:
-
-	#i58259# Fix thinko and solve the problems with all testcases from the
-	issue.
-
-2006-01-03 21:13  vq
-
-	* make.c, dmake.h:
-
-	#i58259# Partial fix. This fixes the use of dp after it was freed.
-
-2005-12-15 15:04  vq
-
-	* sysintf.c:
-
-	#i58391# Create better temporary filenames when .NET2003 or newer are used.
-
-2005-10-25 13:19  vq
-
-	* Makefile.in, config.h.in, configure, configure.in, function.c:
-
-	#i53148# Restore old behaviour for non-*NIX dmake versions.
-
-2005-10-11 14:01  vq
-
-	* Makefile.in, tests/Makefile.am, tests/Makefile.in, tests/README,
-	  tests/misc-4:
-
-	#i39248# Add testcase and regenerate configure and other autotools files.
-
-2005-10-11 13:48  vq
-
-	* tests/misc-5:
-
-	#i54938# Add testcase for .INCLUDE generation in parallel builds.
-
-2005-10-11 13:39  vq
-
-	* function.c, getinp.c, make.c, vextern.h, unix/runargv.c:
-
-	#i54938# Fix problem when building infered .INCLUDE makefiles and doing
-	parallel builds.
-
-2005-10-04 00:33  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i10000# Fix markup error in man page source and regenerate the ascii version.
-
-2005-09-25 20:43  vq
-
-	* dbug/dbug/: dbug.txt, example1.c, example2.c, example3.c,
-	  factorial.c, main.c, makeman.sh, readme, user.r:
-
-	#i55070# Restore the documentation for Fred Fish's "C Program Debugging
-	Package" DBUG.
-
-2005-09-25 20:33  vq
-
-	* Makefile.am, Makefile.in, configure, configure.in, extern.h,
-	  dbug/dbug/dbug.c, msdos/Makefile.in, startup/Makefile.in,
-	  startup/unix/Makefile.in, startup/unix/cygwin/Makefile.in,
-	  startup/unix/linux/Makefile.in, startup/unix/macosx/Makefile.in,
-	  startup/unix/solaris/Makefile.in,
-	  startup/unix/sysvr4/Makefile.in, startup/winnt/Makefile.in,
-	  startup/winnt/mingw/Makefile.in, startup/winnt/msvc6/Makefile.in,
-	  tests/Makefile.in, unix/Makefile.in, win95/Makefile.in,
-	  win95/microsft/Makefile.in:
-
-	#i55070# Fix Fred Fishes DBUG macros and add --enable-dbug to enable them
-	in a configure type build. Also regenerate autotool files.
-
-2005-09-21 21:46  vq
-
-	* tempnam.c:
-
-	#i52899# Remove unused file.
-
-2005-09-19 20:50  vq
-
-	* Makefile.in, aclocal.m4, configure, msdos/Makefile.in,
-	  startup/Makefile.in, startup/unix/Makefile.in,
-	  startup/unix/cygwin/Makefile.in, startup/unix/linux/Makefile.in,
-	  startup/unix/macosx/Makefile.in,
-	  startup/unix/solaris/Makefile.in,
-	  startup/unix/sysvr4/Makefile.in, startup/winnt/Makefile.in,
-	  startup/winnt/mingw/Makefile.in, startup/winnt/msvc6/Makefile.in,
-	  tests/Makefile.am, tests/Makefile.in, tests/misc-3,
-	  unix/Makefile.in, win95/Makefile.in, win95/microsft/Makefile.in:
-
-	#i49461# Add testcase and regenerate configure and other autotools files.
-
-2005-09-19 20:01  vq
-
-	* NEWS, man/dmake.nc, man/dmake.tf:
-
-	#i53148# Update NEWS file and man page.
-
-2005-09-19 19:48  vq
-
-	* unix/runargv.c:
-
-	#i53148# Move include directive to get some macros defined before using
-	them.
-
-2005-09-17 19:25  vq
-
-	* unix/runargv.c:
-
-	#i53148# Make sure that the command started from _exec_shell really
-	finished before returning.
-
-2005-09-17 15:47  vq
-
-	* Makefile.in:
-
-	RESYNC: (1.11-1.12); FILE MERGED
-
-2005-09-17 15:47  vq
-
-	* Makefile.am:
-
-	RESYNC: (1.8-1.9); FILE MERGED
-
-2005-09-08 14:00  rt
-
-	* unix/cygwin/public.h:
-
-	INTEGRATION: CWS ooo19126 (1.4.34); FILE MERGED
-	2005/09/05 17:12:52 rt 1.4.34.1: #i54170# Change license header: remove SISSL
-
-2005-09-06 21:39  vq
-
-	* unix/runargv.c:
-
-	#i53148# Make sure _attach_cmd can not be used for _exec_shell calls.
-
-2005-09-05 17:10  vq
-
-	* tests/: Makefile.am, function_macros-3, function_macros-4:
-
-	#i53148# Add another testcase.
-
-2005-09-05 16:56  vq
-
-	* dmake.c, function.c, vextern.h, unix/runargv.c:
-
-	#i53148# Move redirection of stdout from parent to child and avoid
-	capturing spurious output from other process queues.
-
-2005-09-05 13:23  vq
-
-	* dmake.c, function.c, vextern.h, unix/runargv.c:
-
-	#i53148# Additional patch to make sure that the shell escapes is executed
-	after all previous recipe lines from the same target have finished.
-
-2005-09-04 23:17  vq
-
-	* tests/: Makefile.am, function_macros-3, misc-2:
-
-	#i53148# Add testcase.
-
-2005-09-04 15:38  vq
-
-	* dmake.c, function.c, sysintf.c, vextern.h, unix/runargv.c:
-
-	#i53148# Fix $(shell ...) handling for parallel builds with MAXPROCESS > 1.
-	This certainly includes the -P# switch with # > 1.
-
-2005-09-01 20:25  vq
-
-	* Makefile.in, aclocal.m4, autogen.sh, msdos/Makefile.in,
-	  startup/Makefile.in, startup/unix/Makefile.in,
-	  startup/unix/cygwin/Makefile.in, startup/unix/linux/Makefile.in,
-	  startup/unix/macosx/Makefile.in,
-	  startup/unix/solaris/Makefile.in,
-	  startup/unix/sysvr4/Makefile.in, startup/winnt/Makefile.in,
-	  startup/winnt/mingw/Makefile.in, startup/winnt/msvc6/Makefile.in,
-	  tests/Makefile.in, unix/Makefile.in, win95/Makefile.in,
-	  win95/microsft/Makefile.in:
-
-	#i52238# Regenerate configure and other autotools files.
-
-2005-09-01 19:27  vq
-
-	* tests/: Makefile.am, misc-2:
-
-	#i52238# Add a testcase.
-
-2005-06-04 14:07  vq
-
-	* Makefile.in, startup/Makefile.am, startup/Makefile.in,
-	  startup/unix/Makefile.am, startup/unix/Makefile.in,
-	  startup/winnt/Makefile.am, startup/winnt/Makefile.in,
-	  tests/Makefile.am, tests/Makefile.in, tests/misc-1:
-
-	#i39248# Add another testcase.
-
-2005-06-01 23:58  vq
-
-	* NEWS:
-
-	#i39248# Add entry to NEWS file.
-
-2005-06-01 23:41  vq
-
-	* Makefile.am, Makefile.in, configure, configure.in,
-	  tests/Makefile.am, tests/Makefile.in, tests/function_macros-1,
-	  tests/function_macros-2, tests/infra-0, tests/macros-1,
-	  tests/recipes-1:
-
-	#i39248# Add testsuite for dmake (only tor targets using the autotools).
-
-2005-06-01 19:48  vq
-
-	* function.c:
-
-	#i50091# Echo shell function macro commands.
-
-2005-05-31 22:51  vq
-
-	* unix/dcache.c:
-
-	#i50142# Remove an unneeded warning that was introduced with issue 47135.
-
-2005-05-31 22:27  vq
-
-	* parse.c:
-
-	#i50053# Fix bogus check.
-
-2005-05-31 18:13  vq
-
-	* parse.c:
-
-	#i50053# Fix typo.
-
-2005-05-30 14:37  vq
-
-	* parse.c:
-
-	#i50053# Fix dmake correctly parsing empty makefile lines. This was a
-	regression introduced by issue 44959 and worked before only because
-	the trailing \n of empty lines were accidentally not removed.
-
-2005-05-20 14:18  vq
-
-	* getinp.c:
-
-	#i49461# Fix fall-out from issue 44959. Continued comment lines were not
-	ended if the following line was empty.
-
-2005-05-05 19:12  vq
-
-	* Makefile.in:
-
-	#i47851# Regenerate configure and other autotools files.
-
-2005-05-05 19:06  vq
-
-	* Makefile.am:
-
-	#i47851# Fix dependency checking for subdirectories.
-
-2005-05-05 17:59  vq
-
-	* posix.h:
-
-	#i47135# Leave a comment that the _POSIX_*_MAX values should be set in
-	the architecture dependent sysintf.h files instead of clobbering them
-	in posix.h
-
-2005-05-05 17:45  vq
-
-	* dmake.c, tempnam.c:
-
-	Issue number: 38830
-	Submitted by: waratah@openoffice.org
-	Change dmake's diagnosic output to use "Warning:" or "Error:". Adding the
-	colon makes it easier grep for these diagnostics in long logfiles.
-
-2005-05-05 17:27  vq
-
-	* infer.c, make.c, rulparse.c, sysintf.c:
-
-	#i43310# Fix dmakes handling of multiple (::) targets concerning attributes
-	and flags. Note: An attribute given for a subtarget will also be applied for
-	all other subtargets. (Also add a few comments.)
-
-2005-04-22 00:22  vq
-
-	* stdmacs.h, win95/microsft/config.h, winnt/microsft/config.h:
-
-	Issue number: 47866
-	Submitted by: shay@openoffice.org, vq@openoffice.org
-	Fix MSVC compiler warnings.
-
-2005-04-21 21:27  vq
-
-	* Makefile.in, aclocal.m4, configure, msdos/Makefile.in,
-	  startup/Makefile.in, startup/unix/Makefile.in,
-	  startup/unix/cygwin/Makefile.in, startup/unix/linux/Makefile.in,
-	  startup/unix/macosx/Makefile.in,
-	  startup/unix/solaris/Makefile.in,
-	  startup/unix/sysvr4/Makefile.in, startup/winnt/Makefile.in,
-	  startup/winnt/mingw/Makefile.in, startup/winnt/msvc6/Makefile.in,
-	  unix/Makefile.in, win95/Makefile.in, win95/microsft/Makefile.in:
-
-	#i47851# Regenerate configure and other autotools files.
-
-2005-04-21 21:17  vq
-
-	* infer.c:
-
-	#i43310# Fix cast.
-
-2005-04-21 21:04  vq
-
-	* NEWS, acinclude.m4, autogen.sh, config.h.in, configure.in,
-	  dmake.c, dmakeroot.h.in, win95/microsft/config.h,
-	  winnt/microsft/config.h:
-
-	#i47851# Increase the version number to 4.4-cvs and slightly rearrange the
-	output of "dmake -V".
-	Remove the hardcoded (in autotools builds) OS macro. It had the wrong value
-	to be usable with the startup/*.mk and is not mentioned in the man page.
-	Clean up configure.in and friends.
-
-2005-04-21 00:31  vq
-
-	* expand.c:
-
-	#i37053# Fix (unreached) typo.
-
-2005-04-20 11:26  vq
-
-	* NEWS, dmdump.c, infer.c:
-
-	#i43310# Fix percent (%) rules to recognize prerequisites that are defined
-	with the multiple target rule operator (::).
-	This implicitly fixes the similar problem for .<suffix>.<suffix> targets.
-
-2005-04-18 18:08  vq
-
-	* unix/dcache.c:
-
-	#i47135# Fix variable name.
-
-2005-04-18 18:03  vq
-
-	* sysintf.c, unix/dcache.c:
-
-	#i47135# Add code to warn if a filename is longer than NAMEMAX permits.
-
-2005-04-17 12:47  vq
-
-	* win95/borland/sysintf.h, win95/microsft/sysintf.h,
-	  winnt/borland/sysintf.h, winnt/microsft/sysintf.h,
-	  winnt/mingw/sysintf.h:
-
-	Issue number: 47135
-	Submitted by: shay@openoffice.org
-	Define _POSIX_NAME_MAX and _POSIX_PATH_MAX using the compiler defaults.
-
-2005-04-16 19:05  vq
-
-	* Makefile.in, aclocal.m4, configure, msdos/Makefile.in,
-	  startup/Makefile.in, startup/unix/Makefile.in,
-	  startup/unix/cygwin/Makefile.in, startup/unix/linux/Makefile.in,
-	  startup/unix/macosx/Makefile.in,
-	  startup/unix/solaris/Makefile.in,
-	  startup/unix/sysvr4/Makefile.in, startup/winnt/Makefile.in,
-	  startup/winnt/mingw/Makefile.in, startup/winnt/msvc6/Makefile.in,
-	  unix/Makefile.in, win95/Makefile.in, win95/microsft/Makefile.in:
-
-	#i47578# Regenerate configure and other autotools files.
-
-2005-04-16 18:53  vq
-
-	* startup/Makefile.am:
-
-	#i47578# Install startup/config.mk instead of the unused startup/template.mk.
-
-2005-04-16 18:29  vq
-
-	* configure.in, startup/config.mk.in:
-
-	#i47578# Generate startup/config.mk during build with autotools.
-
-2005-04-16 12:53  vq
-
-	* NEWS, expand.c, man/dmake.nc, man/dmake.tf:
-
-	#i46987# Fix $(mktmp ...) documentation and add the map escape codes
-	$(macro:m) macro expansion.
-
-2005-04-15 19:55  vq
-
-	* win95/borland/ruletab.c, win95/microsft/ruletab.c,
-	  winnt/borland/ruletab.c, winnt/microsft/ruletab.c:
-
-	Issue number: 47137
-	Submitted by: shay@openoffice.org
-	Increase default MAXLINELENGHT to 8190.
-
-2005-04-15 19:34  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i47135# Fix the documentation of the NAMEMAX macro. (Not .NAMEMAX)
-
-2005-04-11 18:16  vq
-
-	* expand.c:
-
-	#i36027# Fix sanity check for end of macro.
-
-2005-04-11 17:13  vq
-
-	* dag.c:
-
-	#i47137# Elaborate a comment.
-
-2005-04-11 16:41  vq
-
-	* getinp.c:
-
-	#i47137# Report and abort when makefile lines are read that are longer than
-	MAXLINELENGTH.
-
-2005-04-10 23:38  vq
-
-	* man/dmake.nc:
-
-	#i43252# Regenerate typeset version of the manual page.
-
-2005-04-10 23:28  vq
-
-	* NEWS, dmake.c, dmake.h, sysintf.c, vextern.h, man/dmake.tf,
-	  win95/startup.h, winnt/startup.h:
-
-	#i43252# Introduce the macro ABSMAKECMD that's value for a native Windows
-	dmake executable (compiled with MS Visual C++ or MinGW) is the absolute
-	filename and NULL for other operating systems or dmake build with other
-	compilers.
-	If DMAKEROOT is not changed and only for native Windows dmake versions the
-	value of DMAKEROOT now defaults to "$(ABSMAKECMD:d)startup".
-
-2005-04-09 17:41  vq
-
-	* startup/startup.mk:
-
-	Issue number: 43254
-	Submitted by: shay@openoffice.org
-	Don't import OS, OSRELEASE and OSENVIRONMENT from environment in startup.mk.
-
-2005-04-09 17:22  vq
-
-	* dmake.c, mac/ruletab.c, msdos/ruletab.c, msdos/startup.h,
-	  msdos/zortech/startup.mk, os2/ruletab.c, qssl/ruletab.c,
-	  qssl/startup.h, startup/msdos/macros.mk, startup/os2/macros.mk,
-	  startup/win95/macros.mk, startup/winnt/macros.mk, tos/ruletab.c,
-	  tos/startup.h, unix/ruletab.c, win95/startup.h,
-	  win95/borland/ruletab.c, win95/microsft/ruletab.c,
-	  winnt/startup.h, winnt/borland/ruletab.c,
-	  winnt/microsft/ruletab.c:
-
-	#i43254# Make the usage of DMAKEROOT consistent with the man page for
-	all OSs. This includes the removal of "SOLARVER UPD INPATH OS UPDMINOREXT"
-	from the list of macros that are always imported from the environment.
-	Patch inspired in part by shay@openoffice.org.
-
-2005-04-08 11:26  vq
-
-	* msdos/zortech/startup.mk, startup/msdos/macros.mk,
-	  startup/os2/macros.mk, startup/win95/macros.mk,
-	  startup/winnt/macros.mk:
-
-	Issue number: 47004
-	Submitted by: shay@openoffice
-	Fix syntax errors (warnings) in subst macros.
-
-2005-04-08 11:18  vq
-
-	* NEWS, readme/read1st.txt:
-
-	Issue number: 43241
-	Submitted by: shay@openoffice.org, vq@openoffice.org
-	Add documentation and update NEWS file.
-
-2005-04-07 18:30  vq
-
-	* makefile.mk, win95/microsft/config.mk,
-	  win95/microsft/vpp40/mk.bat:
-
-	Issue number: 43241
-	Submitted by: shay@openoffice.org
-	Allow dmake to be build on windows without 4NT.
-
-2005-03-27 10:42  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i43147# Fix man page.
-
-2005-03-16 00:25  vq
-
-	* NEWS:
-
-	#i44959# Update NEWS file.
-
-2005-03-15 01:02  vq
-
-	* getinp.c:
-
-	#i44959# Comment fix.
-
-2005-03-15 00:55  vq
-
-	* getinp.c:
-
-	#i44959# Make sure not to strip the wrong \n.
-
-2005-03-15 00:20  vq
-
-	* getinp.c:
-
-	#i44959# Fix dmake problems for makefiles when continued lines are
-	followed by empty lines.
-
-2005-03-13 22:21  vq
-
-	* dag.c, expand.c, getinp.c, make.c:
-
-	#i37053# Fix continuation char handling.
-
-2005-02-19 15:41  vq
-
-	* NEWS:
-
-	#i36027#, #i37053#, #i37491# Update NEWS file to mention the latest changes.
-
-2004-11-25 11:12  vq
-
-	* getinp.c:
-
-	#i37053# Treat continuation chars as whitespace.
-
-2004-11-25 11:09  vq
-
-	* function.c:
-
-	#i36027# Fix MSVC compilation problem.
-
-2004-11-23 14:57  vq
-
-	* man/: dmake.nc, dmake.tf:
-
-	#i37491# Add documentation for SPACECHAR macro.
-
-2004-11-21 13:00  vq
-
-	* expand.c:
-
-	#i36027# Certainly closing brackets are only accepted when no
-	closing separator is found. fixed.
-
-2004-11-21 12:40  vq
-
-	* function.c:
-
-	#i36027# Improve parsing for dmake function macros.
-
-2004-11-21 12:07  vq
-
-	* expand.c:
-
-	#i36027# Relax the syntax check for closing seperator for subst modifiers.
-
-2004-11-19 20:05  vq
-
-	* imacs.c, vextern.h:
-
-	#i37491# Add a predefined SPACECHAR macro.
-
-2004-11-19 19:31  vq
-
-	* expand.c:
-
-	#i36027# This fixes the problems with the :s#pat#rep# modifier and also
-	handles a missing closing braket for macros with macro modifiers in general.
-
-2004-11-11 22:45  vq
-
-	* dag.c, getinp.c, make.c:
-
-	#i37053# dmake line continuation fix.
-
-2004-10-22 04:11  rt
-
-	* win95/microsft/config.h:
-
-	INTEGRATION: CWS dmake43 (1.5.2); FILE MERGED
-	2004/10/12 19:07:26 vq 1.5.2.1: #i31647# Update version number for the "native" MS compiler build.
-
-2004-10-22 04:11  rt
-
-	* win95/microsft/Makefile.in:
-
-	INTEGRATION: CWS dmake43 (1.3.18); FILE MERGED
-	2004/10/12 18:47:52 vq 1.3.18.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:10  rt
-
-	* unix/Makefile.in:
-
-	INTEGRATION: CWS dmake43 (1.8.18); FILE MERGED
-	2004/10/12 18:47:51 vq 1.8.18.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:09  rt
-
-	* startup/winnt/msvc6/Makefile.in, win95/Makefile.in:
-
-	INTEGRATION: CWS dmake43 (1.3.18); FILE MERGED
-	2004/10/12 18:47:51 vq 1.3.18.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:09  rt
-
-	* startup/winnt/: Makefile.in, mingw/Makefile.in:
-
-	INTEGRATION: CWS dmake43 (1.3.18); FILE MERGED
-	2004/10/12 18:47:50 vq 1.3.18.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:09  rt
-
-	* startup/unix/sysvr4/Makefile.in:
-
-	INTEGRATION: CWS dmake43 (1.3.18); FILE MERGED
-	2004/10/12 18:47:49 vq 1.3.18.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:08  rt
-
-	* startup/unix/solaris/Makefile.in:
-
-	INTEGRATION: CWS dmake43 (1.6.18); FILE MERGED
-	2004/10/12 18:47:49 vq 1.6.18.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:08  rt
-
-	* startup/unix/macosx/Makefile.in:
-
-	INTEGRATION: CWS dmake43 (1.6.18); FILE MERGED
-	2004/10/12 18:47:48 vq 1.6.18.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:08  rt
-
-	* startup/unix/linux/Makefile.in:
-
-	INTEGRATION: CWS dmake43 (1.8.18); FILE MERGED
-	2004/10/12 18:47:48 vq 1.8.18.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:08  rt
-
-	* startup/unix/cygwin/Makefile.in:
-
-	INTEGRATION: CWS dmake43 (1.3.18); FILE MERGED
-	2004/10/12 18:47:48 vq 1.3.18.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:07  rt
-
-	* startup/: Makefile.in, unix/Makefile.in:
-
-	INTEGRATION: CWS dmake43 (1.8.18); FILE MERGED
-	2004/10/12 18:47:47 vq 1.8.18.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:07  rt
-
-	* readme/: intro.txt, read1st.txt:
-
-	INTEGRATION: CWS dmake43 (1.1.1.1.130); FILE MERGED
-	2004/10/07 21:57:37 vq 1.1.1.1.130.1: #i31647# Bump the dmake version number to 4.3 plus some small cleanups.
-
-	Note: The _head file was renamed to COPYING, COPYING is not a new file,
-	      but was empty befor.
-
-2004-10-22 04:06  rt
-
-	* msdos/Makefile.in:
-
-	INTEGRATION: CWS dmake43 (1.3.18); FILE MERGED
-	2004/10/12 18:47:47 vq 1.3.18.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:06  rt
-
-	* man/dmake.tf:
-
-	INTEGRATION: CWS dmake43 (1.4.2); FILE MERGED
-	2004/10/07 22:02:56 vq 1.4.2.1: #i31647# Change the man page also to version 4.3.
-
-2004-10-22 04:06  rt
-
-	* man/dmake.nc:
-
-	INTEGRATION: CWS dmake43 (1.2.2); FILE MERGED
-	2004/10/07 22:02:56 vq 1.2.2.1: #i31647# Change the man page also to version 4.3.
-
-2004-10-22 04:05  rt
-
-	* sysintf.c:
-
-	INTEGRATION: CWS dmake43 (1.5.28); FILE MERGED
-	2004/10/07 22:18:47 vq 1.5.28.1: #i34746# Fix timestamp of phony targets with prerequisites.
-
-2004-10-22 04:05  rt
-
-	* makefile.mk:
-
-	INTEGRATION: CWS dmake43 (1.2.78); FILE MERGED
-	2004/10/07 21:57:36 vq 1.2.78.1: #i31647# Bump the dmake version number to 4.3 plus some small cleanups.
-
-	Note: The _head file was renamed to COPYING, COPYING is not a new file,
-	      but was empty befor.
-
-2004-10-22 04:04  rt
-
-	* imacs.c:
-
-	INTEGRATION: CWS dmake43 (1.1.1.1.130); FILE MERGED
-	2004/10/07 21:57:36 vq 1.1.1.1.130.1: #i31647# Bump the dmake version number to 4.3 plus some small cleanups.
-
-	Note: The _head file was renamed to COPYING, COPYING is not a new file,
-	      but was empty befor.
-
-2004-10-22 04:04  rt
-
-	* dmake.c:
-
-	INTEGRATION: CWS dmake43 (1.4.2); FILE MERGED
-	2004/10/07 21:57:36 vq 1.4.2.1: #i31647# Bump the dmake version number to 4.3 plus some small cleanups.
-
-	Note: The _head file was renamed to COPYING, COPYING is not a new file,
-	      but was empty befor.
-
-2004-10-22 04:04  rt
-
-	* configure.in:
-
-	INTEGRATION: CWS dmake43 (1.21.16); FILE MERGED
-	2004/10/12 19:07:26 vq 1.21.16.2: #i31647# Update version number for the "native" MS compiler build.
-	2004/10/07 21:57:36 vq 1.21.16.1: #i31647# Bump the dmake version number to 4.3 plus some small cleanups.
-
-	Note: The _head file was renamed to COPYING, COPYING is not a new file,
-	      but was empty befor.
-
-2004-10-22 04:04  rt
-
-	* configure:
-
-	INTEGRATION: CWS dmake43 (1.14.16); FILE MERGED
-	2004/10/12 18:47:46 vq 1.14.16.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:03  rt
-
-	* config.h.in:
-
-	INTEGRATION: CWS dmake43 (1.11.16); FILE MERGED
-	2004/10/12 18:47:46 vq 1.11.16.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:03  rt
-
-	* aclocal.m4:
-
-	INTEGRATION: CWS dmake43 (1.7.18); FILE MERGED
-	2004/10/12 18:47:45 vq 1.7.18.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:02  rt
-
-	* NEWS:
-
-	INTEGRATION: CWS dmake43 (1.2.78); FILE MERGED
-	2004/10/07 22:18:47 vq 1.2.78.2: #i34746# Fix timestamp of phony targets with prerequisites.
-	2004/10/07 21:57:35 vq 1.2.78.1: #i31647# Bump the dmake version number to 4.3 plus some small cleanups.
-
-	Note: The _head file was renamed to COPYING, COPYING is not a new file,
-	      but was empty befor.
-
-2004-10-22 04:02  rt
-
-	* Makefile.in:
-
-	INTEGRATION: CWS dmake43 (1.10.18); FILE MERGED
-	2004/10/12 18:47:45 vq 1.10.18.1: #i31647# Regenerate the autotools files with autogen.sh.
-
-2004-10-22 04:01  rt
-
-	* COPYING, acinclude.m4:
-
-	INTEGRATION: CWS dmake43 (1.1.118); FILE MERGED
-	2004/10/07 21:57:35 vq 1.1.118.1: #i31647# Bump the dmake version number to 4.3 plus some small cleanups.
-
-	Note: The _head file was renamed to COPYING, COPYING is not a new file,
-	      but was empty befor.
-
-2004-09-08 12:10  rt
-
-	* unix/linux/gnu/public.h, win95/microsft/config.h:
-
-	INTEGRATION: CWS ooo20040704 (1.4.22); FILE MERGED
-	2004/07/15 19:47:39 vq 1.4.22.1: #i30887# Remove the wrongly added LGPL/SISSL license headers.
-
-2004-09-08 12:09  rt
-
-	* unix/runargv.c:
-
-	INTEGRATION: CWS ooo20040704 (1.7.68); FILE MERGED
-	2004/07/15 19:47:38 vq 1.7.68.1: #i30887# Remove the wrongly added LGPL/SISSL license headers.
-
-2004-09-08 12:09  rt
-
-	* unix/: dcache.c, rmprq.c, ruletab.c:
-
-	INTEGRATION: CWS ooo20040704 (1.3.68); FILE MERGED
-	2004/07/15 19:47:38 vq 1.3.68.1: #i30887# Remove the wrongly added LGPL/SISSL license headers.
-
-2004-09-08 12:08  rt
-
-	* man/readme:
-
-	INTEGRATION: CWS ooo20040704 (1.1.1.1.120); FILE MERGED
-	2004/07/11 15:15:18 vq 1.1.1.1.120.1: #i31255#, #i17992# Update the documentation of dmake to the new features.
-
-2004-09-08 12:08  rt
-
-	* man/dmake.tf:
-
-	INTEGRATION: CWS ooo20040704 (1.3.22); FILE MERGED
-	2004/07/11 15:15:17 vq 1.3.22.1: #i31255#, #i17992# Update the documentation of dmake to the new features.
-
-2004-09-08 12:07  rt
-
-	* man/dmake.nc:
-
-	INTEGRATION: CWS ooo20040704 (1.1.1.1.120); FILE MERGED
-	2004/07/11 15:15:17 vq 1.1.1.1.120.1: #i31255#, #i17992# Update the documentation of dmake to the new features.
-
-2004-09-08 12:07  rt
-
-	* rulparse.c:
-
-	INTEGRATION: CWS ooo20040704 (1.5.68); FILE MERGED
-	2004/07/15 19:47:37 vq 1.5.68.3: #i30887# Remove the wrongly added LGPL/SISSL license headers.
-	2004/07/11 14:48:37 vq 1.5.68.2: #i31255# Add verbose recipe echoing option (-vr) to dmake.
-	2004/07/06 00:03:43 vq 1.5.68.1: #i30779# Fix to allow dmake to echo recipe lines when inference is used
-	to create files that are be read by .INCLUDE.
-
-	Note that this only fixes the possibility to do so. Recipes that start
-	with @ are still not echoed, but dmake -n now shows the recipes.
-
-2004-09-08 12:06  rt
-
-	* parse.c, quit.c, stdmacs.h, unix/arlib.c:
-
-	INTEGRATION: CWS ooo20040704 (1.3.68); FILE MERGED
-	2004/07/15 19:47:37 vq 1.3.68.1: #i30887# Remove the wrongly added LGPL/SISSL license headers.
-
-2004-09-08 12:06  rt
-
-	* make.c:
-
-	INTEGRATION: CWS ooo20040704 (1.4.24); FILE MERGED
-	2004/07/15 19:47:36 vq 1.4.24.1: #i30887# Remove the wrongly added LGPL/SISSL license headers.
-
-2004-09-08 12:06  rt
-
-	* function.c:
-
-	INTEGRATION: CWS ooo20040704 (1.6.22); FILE MERGED
-	2004/07/15 19:47:36 vq 1.6.22.1: #i30887# Remove the wrongly added LGPL/SISSL license headers.
-
-2004-09-08 12:06  rt
-
-	* extern.h:
-
-	INTEGRATION: CWS ooo20040704 (1.7.68); FILE MERGED
-	2004/07/15 19:47:36 vq 1.7.68.1: #i30887# Remove the wrongly added LGPL/SISSL license headers.
-
-2004-09-08 12:05  rt
-
-	* expand.c, infer.c:
-
-	INTEGRATION: CWS ooo20040704 (1.3.68); FILE MERGED
-	2004/07/15 19:47:36 vq 1.3.68.1: #i30887# Remove the wrongly added LGPL/SISSL license headers.
-
-2004-09-08 12:05  rt
-
-	* dmake.h:
-
-	INTEGRATION: CWS ooo20040704 (1.1.1.1.120); FILE MERGED
-	2004/07/11 14:48:37 vq 1.1.1.1.120.1: #i31255# Add verbose recipe echoing option (-vr) to dmake.
-
-2004-09-08 12:05  rt
-
-	* dag.c, dmake.c:
-
-	INTEGRATION: CWS ooo20040704 (1.3.68); FILE MERGED
-	2004/07/15 19:47:35 vq 1.3.68.2: #i30887# Remove the wrongly added LGPL/SISSL license headers.
-	2004/07/11 14:48:36 vq 1.3.68.1: #i31255# Add verbose recipe echoing option (-vr) to dmake.
-
-2004-09-08 12:04  rt
-
-	* INSTALL:
-
-	INTEGRATION: CWS ooo20040704 (1.1.108); FILE MERGED
-	2004/07/11 15:15:16 vq 1.1.108.1: #i31255#, #i17992# Update the documentation of dmake to the new features.
-
-2004-04-21 10:10  svesik
-
-	* itypes.h:
-
-	INTEGRATION: CWS ooo20040329 (1.2.54); FILE MERGED
-	2004/03/19 12:41:09 waratah 1.2.54.1: #i13620# extra definitions to use internal types defined in AIX
-
-2004-04-21 10:10  svesik
-
-	* getinp.c:
-
-	INTEGRATION: CWS ooo20040329 (1.4.8); FILE MERGED
-	2004/04/01 16:24:25 mmeeks 1.4.8.1: #27319
-
-2004-04-21 10:10  svesik
-
-	* configure.in:
-
-	INTEGRATION: CWS ooo20040329 (1.20.14); FILE MERGED
-	2004/03/19 12:36:41 waratah 1.20.14.1: #i13620# allow configure to pick up on types defined by AIX and also allow AIX to work in configure
-
-2004-04-21 10:09  svesik
-
-	* configure:
-
-	INTEGRATION: CWS ooo20040329 (1.13.4); FILE MERGED
-	2004/03/19 12:37:40 waratah 1.13.4.1: #i13620# allow configure to pick up on types defined by AIX and also allow AIX to work in configure
-
-2004-04-21 10:09  svesik
-
-	* config.h.in:
-
-	INTEGRATION: CWS ooo20040329 (1.10.4); FILE MERGED
-	2004/03/19 12:40:18 waratah 1.10.4.1: #i13620# Extra defines as used by configure
-
-2004-02-25 08:56  kz
-
-	* win95/: Makefile.in, microsft/Makefile.am, microsft/Makefile.in:
-
-	INTEGRATION: CWS geordi2q15 (1.2.48); FILE MERGED
-	2004/02/20 12:29:04 hr 1.2.48.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:56  kz
-
-	* win95/Makefile.am:
-
-	INTEGRATION: CWS geordi2q15 (1.2.48); FILE MERGED
-	2004/02/20 12:29:03 hr 1.2.48.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:56  kz
-
-	* unix/Makefile.in:
-
-	INTEGRATION: CWS geordi2q15 (1.7.48); FILE MERGED
-	2004/02/20 12:29:03 hr 1.7.48.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:56  kz
-
-	* unix/Makefile.am:
-
-	INTEGRATION: CWS geordi2q15 (1.4.66); FILE MERGED
-	2004/02/20 12:29:03 hr 1.4.66.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:55  kz
-
-	* startup/winnt/: mingw/Makefile.in, msvc6/Makefile.in:
-
-	INTEGRATION: CWS geordi2q15 (1.2.48); FILE MERGED
-	2004/02/20 12:29:02 hr 1.2.48.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:55  kz
-
-	* startup/: unix/sysvr4/Makefile.in, winnt/Makefile.in:
-
-	INTEGRATION: CWS geordi2q15 (1.2.48); FILE MERGED
-	2004/02/20 12:29:01 hr 1.2.48.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:54  kz
-
-	* startup/unix/: macosx/Makefile.in, solaris/Makefile.in:
-
-	INTEGRATION: CWS geordi2q15 (1.5.48); FILE MERGED
-	2004/02/20 12:29:00 hr 1.5.48.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:54  kz
-
-	* startup/unix/linux/Makefile.in:
-
-	INTEGRATION: CWS geordi2q15 (1.7.48); FILE MERGED
-	2004/02/20 12:28:59 hr 1.7.48.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:54  kz
-
-	* startup/unix/cygwin/Makefile.in:
-
-	INTEGRATION: CWS geordi2q15 (1.2.48); FILE MERGED
-	2004/02/20 12:28:59 hr 1.2.48.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:54  kz
-
-	* startup/: Makefile.in, unix/Makefile.in:
-
-	INTEGRATION: CWS geordi2q15 (1.7.48); FILE MERGED
-	2004/02/20 12:28:58 hr 1.7.48.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:53  kz
-
-	* msdos/Makefile.in:
-
-	INTEGRATION: CWS geordi2q15 (1.2.48); FILE MERGED
-	2004/02/20 12:28:58 hr 1.2.48.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:53  kz
-
-	* msdos/Makefile.am:
-
-	INTEGRATION: CWS geordi2q15 (1.2.48); FILE MERGED
-	2004/02/20 12:28:57 hr 1.2.48.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:53  kz
-
-	* configure:
-
-	INTEGRATION: CWS geordi2q15 (1.12.10); FILE MERGED
-	2004/02/20 12:28:56 hr 1.12.10.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:53  kz
-
-	* config.h.in:
-
-	INTEGRATION: CWS geordi2q15 (1.9.10); FILE MERGED
-	2004/02/20 12:28:56 hr 1.9.10.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:52  kz
-
-	* aclocal.m4:
-
-	INTEGRATION: CWS geordi2q15 (1.6.48); FILE MERGED
-	2004/02/20 12:28:56 hr 1.6.48.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:52  kz
-
-	* Makefile.in:
-
-	INTEGRATION: CWS geordi2q15 (1.9.48); FILE MERGED
-	2004/02/20 12:28:56 hr 1.9.48.1: #111934#: merge CWS ooo111fix3
-
-2004-02-25 08:52  kz
-
-	* Makefile.am:
-
-	INTEGRATION: CWS geordi2q15 (1.7.48); FILE MERGED
-	2004/02/20 12:28:56 hr 1.7.48.1: #111934#: merge CWS ooo111fix3
-
-2004-01-28 08:21  hjs
-
-	* getinp.c:
-
-	#i17992# applied patch to enable komplex logic in .IF statements
-
-2003-12-17 11:19  vg
-
-	* winnt/msvc6/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.2.38); FILE MERGED
-	2003/12/16 11:17:47 hr 1.2.38.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:18  vg
-
-	* winnt/mingw/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.2.38); FILE MERGED
-	2003/12/16 11:17:46 hr 1.2.38.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:18  vg
-
-	* winnt/microsft/vpp40/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:46 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:18  vg
-
-	* winnt/borland/bcc50/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:45 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:17  vg
-
-	* win95/microsft/vpp40/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.3.38); FILE MERGED
-	2003/12/16 11:17:44 hr 1.3.38.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:17  vg
-
-	* win95/microsft/vpp40/mk.bat:
-
-	INTEGRATION: CWS geordi2q11 (1.2.38); FILE MERGED
-	2003/12/16 11:17:44 hr 1.2.38.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:17  vg
-
-	* win95/microsft/config.h:
-
-	INTEGRATION: CWS geordi2q11 (1.3.38); FILE MERGED
-	2003/12/16 11:17:43 hr 1.3.38.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:16  vg
-
-	* win95/borland/bcc50/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:43 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:16  vg
-
-	* unix/xenix/pwd/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:42 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:15  vg
-
-	* unix/xenix/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:41 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:15  vg
-
-	* unix/: sysvr3/pwd/public.h, sysvr4/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:40 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:14  vg
-
-	* unix/sysvr3/gnu/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:39 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:14  vg
-
-	* unix/sysvr3/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:38 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:13  vg
-
-	* unix/: solaris/gnu/public.h, sysvr1/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:37 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:13  vg
-
-	* unix/solaris/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.2.46); FILE MERGED
-	2003/12/16 11:17:36 hr 1.2.46.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:12  vg
-
-	* unix/macosx/gnu/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.3.38); FILE MERGED
-	2003/12/16 11:17:35 hr 1.3.38.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:12  vg
-
-	* unix/linux/gnu/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.3.38); FILE MERGED
-	2003/12/16 11:17:33 hr 1.3.38.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:11  vg
-
-	* unix/cygwin/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.3.38); FILE MERGED
-	2003/12/16 11:17:32 hr 1.3.38.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:11  vg
-
-	* unix/coherent/ver42/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:31 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:10  vg
-
-	* unix/: bsdarm32/public.h, coherent/ver40/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:30 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:10  vg
-
-	* unix/bsd43/vf/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:29 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:09  vg
-
-	* unix/bsd43/: public.h, uw/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:28 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:08  vg
-
-	* unix/386ix/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:27 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:07  vg
-
-	* qssl/public.h, tos/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:26 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:07  vg
-
-	* os2/ibm/icc3/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:25 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:06  vg
-
-	* os2/ibm/icc/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:24 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:05  vg
-
-	* msdos/: microsft/msc60/public.h, zortech/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:23 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:05  vg
-
-	* msdos/microsft/msc51/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:22 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:04  vg
-
-	* msdos/borland/: bcc50/public.h, tcc20/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:21 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:03  vg
-
-	* msdos/borland/bcc45/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:20 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:02  vg
-
-	* msdos/borland/: bcc30/public.h, bcc40/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:19 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:02  vg
-
-	* man/dmake.tf:
-
-	INTEGRATION: CWS geordi2q11 (1.2.56); FILE MERGED
-	2003/12/16 11:17:18 hr 1.2.56.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:02  vg
-
-	* mac/public.h:
-
-	INTEGRATION: CWS geordi2q11 (1.4.30); FILE MERGED
-	2003/12/16 11:17:17 hr 1.4.30.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:01  vg
-
-	* sysintf.c:
-
-	INTEGRATION: CWS geordi2q11 (1.4.52); FILE MERGED
-	2003/12/16 11:17:16 hr 1.4.52.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:01  vg
-
-	* function.c:
-
-	INTEGRATION: CWS geordi2q11 (1.5.8); FILE MERGED
-	2003/12/16 11:17:16 hr 1.5.8.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:00  vg
-
-	* configure.in:
-
-	INTEGRATION: CWS geordi2q11 (1.19.38); FILE MERGED
-	2003/12/16 11:17:15 hr 1.19.38.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 11:00  vg
-
-	* configure:
-
-	INTEGRATION: CWS geordi2q11 (1.11.38); FILE MERGED
-	2003/12/16 11:17:15 hr 1.11.38.1: #111934#: join CWS ooo111fix1
-
-2003-12-17 10:59  vg
-
-	* config.h.in:
-
-	INTEGRATION: CWS geordi2q11 (1.8.38); FILE MERGED
-	2003/12/16 11:17:14 hr 1.8.38.1: #111934#: join CWS ooo111fix1
-
-2003-12-01 12:58  rt
-
-	* make.c:
-
-	INTEGRATION: CWS ooo20031110 (1.3.24); FILE MERGED
-	2003/10/19 22:38:29 waratah 1.3.24.1: #i20504#  Correct processing of library code, not always built
-
-2003-08-18 11:04  hjs
-
-	* function.c:
-
-	INTEGRATION: CWS geordi2q01 (1.4.22); FILE MERGED
-	2003/08/18 12:53:30 hr 1.4.22.1: #i18350#: join changes from CWS ooo11rc3
-
-2003-06-12 06:56  vg
-
-	* winnt/microsft/vpp40/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:27 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:56  vg
-
-	* winnt/borland/bcc50/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:26 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:56  vg
-
-	* win95/borland/bcc50/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:25 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:56  vg
-
-	* unix/xenix/pwd/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:24 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:55  vg
-
-	* unix/: sysvr4/public.h, xenix/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:23 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:55  vg
-
-	* unix/sysvr3/pwd/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:22 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:54  vg
-
-	* unix/sysvr3/: public.h, gnu/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:21 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:54  vg
-
-	* unix/sysvr1/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:20 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:54  vg
-
-	* unix/solaris/gnu/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:19 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:54  vg
-
-	* unix/coherent/: ver40/public.h, ver42/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:18 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:54  vg
-
-	* unix/bsdarm32/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:17 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:53  vg
-
-	* unix/bsd43/vf/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:16 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:53  vg
-
-	* unix/bsd43/uw/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:15 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:53  vg
-
-	* unix/: 386ix/public.h, bsd43/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:14 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:53  vg
-
-	* tos/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:13 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:52  vg
-
-	* qssl/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:12 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:52  vg
-
-	* os2/ibm/icc3/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:11 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:52  vg
-
-	* os2/ibm/icc/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:10 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:52  vg
-
-	* msdos/zortech/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:09 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:52  vg
-
-	* msdos/microsft/msc60/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:08 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:51  vg
-
-	* msdos/microsft/msc51/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:07 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:51  vg
-
-	* msdos/borland/tcc20/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:06 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:51  vg
-
-	* msdos/borland/bcc50/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:05 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:51  vg
-
-	* msdos/borland/bcc45/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:04 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:51  vg
-
-	* msdos/borland/bcc40/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:03 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:50  vg
-
-	* msdos/borland/bcc30/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:02 mh 1.3.8.1: join: from beta2
-
-2003-06-12 06:50  vg
-
-	* mac/public.h:
-
-	INTEGRATION: CWS mh11rc (1.3.8); FILE MERGED
-	2003/06/06 09:59:01 mh 1.3.8.1: join: from beta2
-
-2003-03-25 09:02  hr
-
-	* Makefile.am, Makefile.in, NEWS, aclocal.m4, autogen.sh,
-	  config.h.in, configure, configure.in, dag.c, dmake.c,
-	  dmakeroot.h.in, expand.c, extern.h, function.c, infer.c,
-	  itypes.h, make.c, makefile.mk, parse.c, posix.h, quit.c,
-	  rulparse.c, stdmacs.h, tempnam.c, mac/main.c, mac/public.h,
-	  msdos/Makefile.am, msdos/Makefile.in,
-	  msdos/borland/bcc30/public.h, msdos/borland/bcc40/public.h,
-	  msdos/borland/bcc45/public.h, msdos/borland/bcc50/public.h,
-	  msdos/borland/tcc20/public.h, msdos/microsft/msc51/public.h,
-	  msdos/microsft/msc60/public.h, msdos/zortech/public.h,
-	  os2/ibm/icc/public.h, os2/ibm/icc3/public.h, qssl/public.h,
-	  startup/Makefile.am, startup/Makefile.in,
-	  startup/unix/Makefile.in, startup/unix/cygwin/Makefile.in,
-	  startup/unix/linux/Makefile.in, startup/unix/macosx/Makefile.in,
-	  startup/unix/solaris/Makefile.in,
-	  startup/unix/sysvr4/Makefile.in, startup/winnt/Makefile.am,
-	  startup/winnt/Makefile.in, startup/winnt/mingw/Makefile.am,
-	  startup/winnt/mingw/Makefile.in, startup/winnt/mingw/macros.mk,
-	  startup/winnt/msvc6/Makefile.am, startup/winnt/msvc6/Makefile.in,
-	  startup/winnt/msvc6/macros.mk, tos/public.h, unix/Makefile.in,
-	  unix/arlib.c, unix/dcache.c, unix/rmprq.c, unix/ruletab.c,
-	  unix/runargv.c, unix/386ix/public.h, unix/bsd43/public.h,
-	  unix/bsd43/uw/public.h, unix/bsd43/vf/public.h,
-	  unix/bsdarm32/public.h, unix/coherent/ver40/public.h,
-	  unix/coherent/ver42/public.h, unix/cygwin/public.h,
-	  unix/linux/gnu/public.h, unix/macosx/gnu/public.h,
-	  unix/solaris/gnu/public.h, unix/sysvr1/public.h,
-	  unix/sysvr3/public.h, unix/sysvr3/gnu/public.h,
-	  unix/sysvr3/pwd/public.h, unix/sysvr4/public.h,
-	  unix/xenix/public.h, unix/xenix/pwd/public.h, win95/Makefile.am,
-	  win95/Makefile.in, win95/borland/bcc50/public.h,
-	  win95/microsft/Makefile.am, win95/microsft/Makefile.in,
-	  win95/microsft/config.h, win95/microsft/ruletab.c,
-	  win95/microsft/vpp40/mk.bat, win95/microsft/vpp40/obj.rsp,
-	  win95/microsft/vpp40/public.h, winnt/borland/bcc50/public.h,
-	  winnt/microsft/vpp40/public.h, winnt/mingw/public.h,
-	  winnt/mingw/sysintf.h, winnt/msvc6/public.h,
-	  winnt/msvc6/sysintf.h:
-
-	MWS_SRX644: migrate branch mws_srx644 -> HEAD
-
-2003-01-13 09:27  waratah
-
-	* mac/main.c, mac/public.h, msdos/borland/bcc30/public.h,
-	  msdos/borland/bcc40/public.h, msdos/borland/bcc45/public.h,
-	  msdos/borland/bcc50/public.h, msdos/borland/tcc20/public.h,
-	  msdos/microsft/msc51/public.h, msdos/microsft/msc60/public.h,
-	  msdos/zortech/public.h, os2/ibm/icc/public.h,
-	  os2/ibm/icc3/public.h, qssl/public.h, tos/public.h,
-	  unix/386ix/public.h, unix/bsd43/public.h, unix/bsd43/uw/public.h,
-	  unix/bsd43/vf/public.h, unix/bsdarm32/public.h,
-	  unix/coherent/ver40/public.h, unix/coherent/ver42/public.h,
-	  unix/cygwin/public.h, unix/solaris/public.h,
-	  unix/solaris/gnu/public.h, unix/sysvr1/public.h,
-	  unix/sysvr3/public.h, unix/sysvr3/gnu/public.h,
-	  unix/sysvr3/pwd/public.h, unix/sysvr4/public.h,
-	  unix/xenix/public.h, unix/xenix/pwd/public.h,
-	  win95/borland/bcc50/public.h, win95/microsft/vpp40/public.h,
-	  winnt/borland/bcc50/public.h, winnt/microsft/vpp40/public.h:
-
-	dmake:  Remove the incorrect definition of main to void
-
-2003-01-04 08:08  waratah
-
-	* unix/macosx/gnu/public.h:
-
-	Remove main definition, it is wrong and it is failing compile on the mac platform
-
-2003-01-04 08:02  waratah
-
-	* unix/runargv.c:
-
-	Implement a test around wait so it is not included when the platform does not define it
-
-2003-01-04 07:53  waratah
-
-	* config.h.in, configure, configure.in:
-
-	Implement a test for wait.h, failing build on mac under gcc
-
-2002-10-15 08:27  waratah
-
-	* config.guess:
-
-	dmake: Implement the latest config.guess, not working on ppc64
-
-2002-10-11 09:42  waratah
-
-	* Makefile.in, config.h.in, configure, configure.in, dag.c,
-	  dmake.c, expand.c, extern.h, function.c, getinp.c, infer.c,
-	  make.c, parse.c, quit.c, rulparse.c, sysintf.c, unix/arlib.c,
-	  unix/dcache.c, unix/rmprq.c, unix/runargv.c,
-	  unix/linux/gnu/public.h:
-
-	dmake: Implement fix for Lost child problem. Correct some checks for functions (assumed present) and also fix up all gcc warnings using -Wall.
-
-2002-10-08 05:21  waratah
-
-	* win95/microsft/config.h:
-
-	dmake: Volker 4nt patches
-
-2002-10-07 09:40  waratah
-
-	* startup/unix/cygwin/: Makefile.am, Makefile.in, macros.mk:
-
-	dmake: Add the cygwin configure files
-
-2002-10-07 09:36  waratah
-
-	* extern.h:
-
-	dmake:  Correct some undefined functions in some modules
-
-2002-10-07 09:34  waratah
-
-	* configure:
-
-	dmake: Additional header checks for better source control, add cygwin support, GNU hurd support
-
-2002-10-07 09:33  waratah
-
-	* config.h.in:
-
-	dmake: Additional header checks for better source control
-
-2002-10-07 08:09  waratah
-
-	* configure.in:
-
-	dmake:  Add gnu hurd and some additional header checks, and the cygwin makefiles
-
-2002-10-04 10:34  waratah
-
-	* configure:
-
-	dmake: Patches for the osf1 operating system
-
-2002-10-04 10:14  waratah
-
-	* startup/unix/sysvr4/Makefile.in:
-
-	dmake:  Add osf1 support
-
-2002-10-04 10:01  haggai
-
-	* startup/unix/sysvr4/Makefile.am, configure.in:
-
-	Fix build for OSF1.  Approved by Ken.
-
-2002-10-04 09:31  waratah
-
-	* Makefile.in, aclocal.m4, config.h.in, configure, configure.in,
-	  extern.h, function.c, startup/Makefile.in,
-	  startup/unix/Makefile.in, startup/unix/linux/Makefile.in,
-	  startup/unix/macosx/Makefile.in,
-	  startup/unix/solaris/Makefile.in, unix/Makefile.in:
-
-	Dmake:  Convert the configure to a better configure process without individual conf.h files for every platform
-
-2002-10-03 08:59  waratah
-
-	* configure, configure.in, depcomp:
-
-	dmake:  remove cygwin makefile temporarily and implement depcomp
-
-2002-10-03 08:29  waratah
-
-	* Makefile.in, aclocal.m4, configure, configure.in, stdmacs.h,
-	  man/dmake.tf, startup/Makefile.in, startup/unix/Makefile.in,
-	  startup/unix/linux/Makefile.in, startup/unix/macosx/Makefile.in,
-	  startup/unix/solaris/Makefile.in, unix/Makefile.in:
-
-	dmake:  This is a reworked version of the configure process, without automake and aclocal
-
-2002-10-02 09:42  waratah
-
-	* Makefile.am, Makefile.in, aclocal.m4, autogen.sh, config.h.in,
-	  configure, configure.in, startup/Makefile.in,
-	  startup/unix/Makefile.in, startup/unix/linux/Makefile.in,
-	  startup/unix/macosx/Makefile.in,
-	  startup/unix/solaris/Makefile.in, unix/Makefile.am,
-	  unix/Makefile.in:
-
-	dmake:  Allow the whole configure process to work,  not needs update to bootstrap to activate
-
-2002-10-01 11:08  waratah
-
-	* Makefile.in, startup/Makefile.in, startup/unix/Makefile.in,
-	  startup/unix/linux/Makefile.in, startup/unix/macosx/Makefile.in,
-	  startup/unix/solaris/Makefile.in, unix/Makefile.in:
-
-	dmake:  Add all the automake files, premade so developers do not require automake installed
-
-2002-07-11 04:53  mh
-
-	* Makefile.am, configure.in, extern.h, rulparse.c,
-	  startup/unix/Makefile.am, startup/unix/macosx/Makefile.am,
-	  unix/Makefile.am, unix/tempnam.c:
-
-	join: from OOO_STABLE_1
-
-2002-07-11 04:44  mh
-
-	* autogen.sh:
-
-	join: from OOO_STABLE_1
-
-2002-04-10 11:40  hjs
-
-	* rulparse.c:
-
-	don't search INCLUDEDIRS if filename of include starts at fs-root
-
-2002-04-09 13:21  mh
-
-	* configure.in:
-
-	fixed typo for FreeBSD
-
-2002-04-09 13:10  hjs
-
-	* Makefile.am, configure.in:
-
-	cygwin support
-
-2002-03-26 09:23  mh
-
-	* configure.in:
-
-	add: cygwin
-
-2002-03-26 09:22  mh
-
-	* unix/cygwin/public.h:
-
-	add for cygwin
-
-2001-10-16 08:11  mh
-
-	* configure.in:
-
-	add: FreeBSD
-
-2001-10-16 08:10  mh
-
-	* autogen.sh:
-
-	fix: for non writable aclocal.m4 and missing README
-
-2001-08-20 05:57  mh
-
-	* configure.in:
-
-	del: AC_CONFIG_HEADERS
-
-2001-06-14 13:31  mh
-
-	* configure.in:
-
-	don't check C++
-
-2001-06-13 09:34  mh
-
-	* Makefile.am, configure.in, unix/Makefile.am:
-
-	add: OS_VERSION to differ the Unix's
-
-2001-06-13 09:13  mh
-
-	* startup/unix/solaris/Makefile.am:
-
-	add: startup/unix/solaris/
-
-2001-05-29 18:43  pluby
-
-	* unix/runargv.c:
-
-	Added forceful exit to avoid infinite loop that sometimes occurs when there is a fatal error.
-
-2001-05-07 08:47  mh
-
-	* unix/runargv.c:
-
-	add: CYGWIN changes
-
-2001-05-04 06:47  mh
-
-	* Makefile.am, aclocal.m4, config.h.in, configure:
-
-	chg: comments
-
-2001-04-23 08:41  mh
-
-	* unix/Makefile.in, startup/Makefile.in, startup/unix/Makefile.in,
-	  startup/unix/linux/Makefile.in:
-
-	del:
-
-2001-04-23 08:24  mh
-
-	* Makefile.in:
-
-	del:
-
-2001-04-23 08:22  mh
-
-	* Makefile.in:
-
-	del
-
-2001-04-23 08:10  mh
-
-	* configure.in:
-
-	add: PACKAGE
-
-2001-04-23 07:06  mh
-
-	* unix/Makefile.am:
-
-	add: Makefile.am
-
-2001-04-23 07:01  mh
-
-	* aclocal.m4:
-
-	add: acloacl.m4
-
-2001-04-23 06:50  mh
-
-	* unix/Makefile.in, startup/Makefile.in, startup/unix/Makefile.in,
-	  startup/unix/linux/Makefile.in:
-
-	add: Makefile.in
-
-2001-04-23 06:50  mh
-
-	* Makefile.in:
-
-	add Makefile.in
-
-2001-04-20 10:24  mh
-
-	* startup/: Makefile.am, unix/Makefile.am, unix/linux/Makefile.am:
-
-	add: Makefile.am
-
-2001-04-20 10:23  mh
-
-	* unix/ruletab.c:
-
-	use installation directory from configure for DMAKEROOT, DMAKEROOT can still be overridden by environment
-
-2001-04-20 10:21  mh
-
-	* extern.h:
-
-	avoid clash with autoconf config.h
-
-2001-04-20 10:15  mh
-
-	* AUTHORS, COPYING, INSTALL, Makefile.am, NEWS, acinclude.m4,
-	  autogen.sh, config.guess, config.h.in, config.sub, configure,
-	  configure.in, dmakeroot.h.in, install-sh, missing, mkinstalldirs,
-	  stamp-h:
-
-	preparation for autoconf and automake for dmake
-
-2001-02-22 22:44  pluby
-
-	* unix/macosx/: tempnam.c, gnu/make.sh:
-
-	Correct Mac OS X "tempnam" bug
-
-2001-02-19 11:08  hjs
-
-	* sysintf.c:
-
-	remove useless part of change
-
-2001-02-13 07:43  hjs
-
-	* sysintf.c:
-
-	fixed left tmpfiles when building group targets
-
-2000-11-01 07:27  hjs
-
-	* unix/runargv.c:
-
-	FreeBSD patch
-
-2000-10-20 07:12  hjs
-
-	* getinp.c:
-
-	has an extraneous ; after the function closure
-
-2000-09-22 11:33  hr
-
-	* dag.c, dmake.c, dmake.h, expand.c, extern.h, function.c,
-	  getinp.c, imacs.c, infer.c, itypes.h, make.c, makefile.mk,
-	  parse.c, posix.h, quit.c, rulparse.c, stdmacs.h, sysintf.c,
-	  tempnam.c, mac/main.c, mac/public.h, man/dmake.nc, man/dmake.tf,
-	  man/readme, msdos/borland/bcc30/public.h,
-	  msdos/borland/bcc40/public.h, msdos/borland/bcc45/public.h,
-	  msdos/borland/bcc50/public.h, msdos/borland/tcc20/public.h,
-	  msdos/microsft/msc51/public.h, msdos/microsft/msc60/public.h,
-	  msdos/zortech/public.h, os2/ibm/icc/public.h,
-	  os2/ibm/icc3/public.h, qssl/public.h, readme/intro.txt,
-	  readme/read1st.txt, tos/public.h, unix/arlib.c, unix/dcache.c,
-	  unix/rmprq.c, unix/ruletab.c, unix/runargv.c,
-	  unix/386ix/public.h, unix/bsd43/public.h, unix/bsd43/uw/public.h,
-	  unix/bsd43/vf/public.h, unix/bsdarm32/public.h,
-	  unix/coherent/ver40/public.h, unix/coherent/ver42/public.h,
-	  unix/linux/gnu/make.sh, unix/linux/gnu/public.h,
-	  unix/macosx/gnu/make.sh, unix/macosx/gnu/public.h,
-	  unix/solaris/public.h, unix/solaris/gnu/public.h,
-	  unix/sysvr1/public.h, unix/sysvr3/public.h,
-	  unix/sysvr3/gnu/public.h, unix/sysvr3/pwd/public.h,
-	  unix/sysvr4/public.h, unix/xenix/public.h,
-	  unix/xenix/pwd/public.h, win95/borland/bcc50/public.h,
-	  win95/microsft/config.h, win95/microsft/ruletab.c,
-	  win95/microsft/vpp40/mk.bat, win95/microsft/vpp40/obj.rsp,
-	  win95/microsft/vpp40/public.h, winnt/borland/bcc50/public.h,
-	  winnt/microsft/vpp40/public.h:
-
-	Initial revision
-
-2000-09-22 11:33  hr
-
-	* alloc.h, db.h, dmdump.c, dmstring.c, dstdarg.h, hash.c,
-	  macparse.c, make.bat, make.cmd, path.c, percent.c, rcsclean.awk,
-	  stat.c, state.c, struct.h, vextern.h, dbug/dbug.mk, dbug/getwd.c,
-	  dbug/readme, dbug/dbug/dbug.c, dbug/dbug/dbug.h,
-	  dbug/dbug/dbug.uue, dbug/dbug/readme, dbug/malloc/_changes,
-	  dbug/malloc/_readme, dbug/malloc/calloc.c, dbug/malloc/debug.h,
-	  dbug/malloc/dump.c, dbug/malloc/free.c, dbug/malloc/m_init.c,
-	  dbug/malloc/m_perror.c, dbug/malloc/makefile,
-	  dbug/malloc/malloc.3, dbug/malloc/malloc.c, dbug/malloc/malloc.h,
-	  dbug/malloc/mallopt.c, dbug/malloc/memory.c,
-	  dbug/malloc/mlc_chk.c, dbug/malloc/mlc_chn.c,
-	  dbug/malloc/patchlev, dbug/malloc/realloc.c,
-	  dbug/malloc/string.c, dbug/malloc/testmem.c,
-	  dbug/malloc/testmlc.c, dbug/malloc/tostring.c,
-	  dbug/malloc/tostring.h, mac/arlib.c, mac/make_mac.sh,
-	  mac/bogus.c, mac/config.mk, mac/dirbrk.c, mac/directry.c,
-	  mac/dompwmak, mac/environ.c, mac/eold.c, mac/make.sh,
-	  mac/rmprq.c, mac/ruletab.c, mac/startup.h, mac/sysintf.h,
-	  mac/template.mk, mac/tempnam.c, mac/tomacfil.c, msdos/arlib.c,
-	  msdos/config.mk, msdos/dchdir.c, msdos/dirbrk.c, msdos/dirent.h,
-	  msdos/dirlib.c, msdos/dosdta.h, msdos/dstrlwr.c, msdos/exec.asm,
-	  msdos/exec.h, msdos/exec.uue, msdos/find.c, msdos/rmprq.c,
-	  msdos/ruletab.c, msdos/runargv.c, msdos/spawn.c, msdos/startup.h,
-	  msdos/switchar.c, msdos/sysintf.h, msdos/tee.c,
-	  msdos/borland/config.mk, msdos/borland/tempnam.c,
-	  msdos/borland/utime.c, msdos/borland/bcc30/config.h,
-	  msdos/borland/bcc30/config.mk, msdos/borland/bcc30/lib.rsp,
-	  msdos/borland/bcc30/libswp.rsp, msdos/borland/bcc30/mkswp.bat,
-	  msdos/borland/bcc30/obj.rsp, msdos/borland/bcc30/objswp.rsp,
-	  msdos/borland/bcc30/template.mk, msdos/borland/bcc40/config.h,
-	  msdos/borland/bcc40/config.mk, msdos/borland/bcc40/lib.rsp,
-	  msdos/borland/bcc40/libswp.rsp, msdos/borland/bcc40/mkswp.bat,
-	  msdos/borland/bcc40/obj.rsp, msdos/borland/bcc40/objswp.rsp,
-	  msdos/borland/bcc40/template.mk, msdos/borland/bcc45/config.h,
-	  msdos/borland/bcc45/config.mk, msdos/borland/bcc45/lib.rsp,
-	  msdos/borland/bcc45/libswp.rsp, msdos/borland/bcc45/mkswp.bat,
-	  msdos/borland/bcc45/obj.rsp, msdos/borland/bcc45/objswp.rsp,
-	  msdos/borland/bcc45/template.mk, msdos/borland/bcc50/config.h,
-	  msdos/borland/bcc50/config.mk, msdos/borland/bcc50/lib.rsp,
-	  msdos/borland/bcc50/libswp.rsp, msdos/borland/bcc50/mkswp.bat,
-	  msdos/borland/bcc50/obj.rsp, msdos/borland/bcc50/objswp.rsp,
-	  msdos/borland/bcc50/template.mk, msdos/borland/tcc20/config.h,
-	  msdos/borland/tcc20/config.mk, msdos/borland/tcc20/libswp.rsp,
-	  msdos/borland/tcc20/mkswp.bat, msdos/borland/tcc20/objswp.rsp,
-	  msdos/borland/tcc20/template.mk, msdos/microsft/config.h,
-	  msdos/microsft/config.mk, msdos/microsft/optoff.h,
-	  msdos/microsft/tempnam.c, msdos/microsft/msc51/config.mk,
-	  msdos/microsft/msc51/lib.rsp, msdos/microsft/msc51/libswp.rsp,
-	  msdos/microsft/msc51/mk.bat, msdos/microsft/msc51/mkswp.bat,
-	  msdos/microsft/msc51/obj.rsp, msdos/microsft/msc51/objswp.rsp,
-	  msdos/microsft/msc51/template.mk, msdos/microsft/msc60/config.mk,
-	  msdos/microsft/msc60/lib.rsp, msdos/microsft/msc60/libswp.rsp,
-	  msdos/microsft/msc60/mk.bat, msdos/microsft/msc60/mkswp.bat,
-	  msdos/microsft/msc60/obj.rsp, msdos/microsft/msc60/objswp.rsp,
-	  msdos/microsft/msc60/template.mk, msdos/zortech/config.h,
-	  msdos/zortech/config.mk, msdos/zortech/environ.c,
-	  msdos/zortech/lib.rsp, msdos/zortech/libswp.rsp,
-	  msdos/zortech/mkswp.bat, msdos/zortech/obj.rsp,
-	  msdos/zortech/objswp.rsp, msdos/zortech/startup.mk,
-	  msdos/zortech/tempnam.c, os2/config.mk, os2/dchdir.c,
-	  os2/dirent.h, os2/ruletab.c, os2/startup.h, os2/switchar.c,
-	  os2/sysintf.h, os2/ibm/config.h, os2/ibm/config.mk,
-	  os2/ibm/tempnam.c, os2/ibm/icc/config.mk, os2/ibm/icc/lib.rsp,
-	  os2/ibm/icc/mk.cmd, os2/ibm/icc/obj.rsp, os2/ibm/icc/template.mk,
-	  os2/ibm/icc3/config.mk, os2/ibm/icc3/lib.rsp,
-	  os2/ibm/icc3/mk.cmd, os2/ibm/icc3/obj.rsp,
-	  os2/ibm/icc3/template.mk, qssl/config.mk, qssl/make.sh,
-	  qssl/ruletab.c, qssl/runargv.c, qssl/setup, qssl/startup.h,
-	  qssl/stdlib.h, qssl/sysintf.h, qssl/template.mk, qssl/tempnam.c,
-	  qssl/time.h, readme/license.txt, readme/release.txt,
-	  readme/public/install.txt, readme/public/mac.txt,
-	  readme/public/msdos.txt, readme/public/os2.txt,
-	  readme/public/qssl-qnx.txt, readme/public/srcorg.txt,
-	  readme/public/tos.txt, readme/public/unix.txt,
-	  startup/startup.mk, startup/summary, startup/template.mk,
-	  startup/mac/macros.mk, startup/msdos/macros.mk,
-	  startup/msdos/recipes.mk, startup/msdos/borland/macros.mk,
-	  startup/msdos/borland/bcc30/macros.mk,
-	  startup/msdos/borland/bcc40/macros.mk,
-	  startup/msdos/borland/bcc45/macros.mk,
-	  startup/msdos/borland/bcc50/macros.mk,
-	  startup/msdos/borland/bcc50.32/macros.mk,
-	  startup/msdos/borland/tcc20/macros.mk,
-	  startup/msdos/microsft/macros.mk,
-	  startup/msdos/zortech/macros.mk, startup/os2/macros.mk,
-	  startup/os2/ibm/macros.mk, startup/qssl/macros.mk,
-	  startup/qssl/recipes.mk, startup/qssl/qnx/macros.mk,
-	  startup/qssl/qnx/recipes.mk, startup/templates/mac/template.mk,
-	  startup/templates/msdos/borland/bcc30/template.mk,
-	  startup/templates/msdos/borland/bcc40/template.mk,
-	  startup/templates/msdos/borland/bcc45/template.mk,
-	  startup/templates/msdos/borland/bcc50/template.mk,
-	  startup/templates/msdos/borland/tcc20/template.mk,
-	  startup/templates/msdos/microsft/msc51/template.mk,
-	  startup/templates/msdos/microsft/msc60/template.mk,
-	  startup/templates/os2/ibm/icc/template.mk,
-	  startup/templates/qssl/template.mk,
-	  startup/templates/tos/template.mk,
-	  startup/templates/unix/386ix/template.mk,
-	  startup/templates/unix/bsd43/template.mk,
-	  startup/templates/unix/bsd43/uw/template.mk,
-	  startup/templates/unix/bsd43/vf/template.mk,
-	  startup/templates/unix/coherent/ver40/template.mk,
-	  startup/templates/unix/coherent/ver42/template.mk,
-	  startup/templates/unix/linux/gnu/template.mk,
-	  startup/templates/unix/solaris/template.mk,
-	  startup/templates/unix/solaris/gnu/template.mk,
-	  startup/templates/unix/sysvr1/template.mk,
-	  startup/templates/unix/sysvr3/template.mk,
-	  startup/templates/unix/sysvr3/pwd/template.mk,
-	  startup/templates/unix/sysvr4/template.mk,
-	  startup/templates/unix/xenix/template.mk,
-	  startup/templates/unix/xenix/pwd/template.mk,
-	  startup/templates/win95/borland/bcc50/template.mk,
-	  startup/templates/win95/microsft/vpp40/template.mk,
-	  startup/templates/winnt/borland/bcc50/template.mk,
-	  startup/templates/winnt/microsft/vpp40/template.mk,
-	  startup/tos/macros.mk, startup/unix/macros.mk,
-	  startup/unix/recipes.mk, startup/unix/386ix/macros.mk,
-	  startup/unix/bsd43/macros.mk, startup/unix/bsd43/recipes.mk,
-	  startup/unix/coherent/macros.mk,
-	  startup/unix/coherent/recipes.mk, startup/unix/linux/macros.mk,
-	  startup/unix/linux/gnu/macros.mk, startup/unix/macosx/macros.mk,
-	  startup/unix/macosx/gnu/macros.mk,
-	  startup/unix/solaris/macros.mk, startup/unix/sysvr1/macros.mk,
-	  startup/unix/sysvr3/macros.mk, startup/unix/sysvr3/gnu/macros.mk,
-	  startup/unix/sysvr4/macros.mk, startup/unix/xenix/macros.mk,
-	  startup/win95/macros.mk, startup/win95/recipes.mk,
-	  startup/win95/borland/macros.mk,
-	  startup/win95/microsft/macros.mk, startup/winnt/macros.mk,
-	  startup/winnt/recipes.mk, startup/winnt/borland/macros.mk,
-	  startup/winnt/microsft/macros.mk, tos/config.mk, tos/make.sh,
-	  tos/putenv.c, tos/ruletab.c, tos/startup.h, tos/sysintf.h,
-	  tos/template.mk, tos/tempnam.c, unix/config.mk, unix/dirbrk.c,
-	  unix/startup.h, unix/sysintf.h, unix/386ix/ar.h,
-	  unix/386ix/config.mk, unix/386ix/make.sh, unix/386ix/stdlib.h,
-	  unix/386ix/template.mk, unix/386ix/time.h, unix/bsd43/config.mk,
-	  unix/bsd43/dirent.h, unix/bsd43/limits.h, unix/bsd43/make.sh,
-	  unix/bsd43/template.mk, unix/bsd43/putenv.c,
-	  unix/bsd43/setvbuf.c, unix/bsd43/stdlib.h, unix/bsd43/string.h,
-	  unix/bsd43/tempnam.c, unix/bsd43/utime.c,
-	  unix/bsd43/uw/config.mk, unix/bsd43/uw/make.sh,
-	  unix/bsd43/uw/template.mk, unix/bsd43/vf/config.mk,
-	  unix/bsd43/vf/ctype.h, unix/bsd43/vf/make.sh,
-	  unix/bsd43/vf/memcpy.c, unix/bsd43/vf/template.mk,
-	  unix/bsd43/vf/vfprintf.c, unix/bsdarm32/config.mk,
-	  unix/bsdarm32/dirent.h, unix/bsdarm32/limits.h,
-	  unix/bsdarm32/make.sh, unix/bsdarm32/putenv.c,
-	  unix/bsdarm32/stdlib.h, unix/bsdarm32/string.h,
-	  unix/bsdarm32/template.mk, unix/bsdarm32/tempnam.c,
-	  unix/bsdarm32/utime.c, unix/coherent/config.mk,
-	  unix/coherent/stdlib.h, unix/coherent/time.h,
-	  unix/coherent/ver40/config.mk, unix/coherent/ver40/getcwd.c,
-	  unix/coherent/ver40/make.sh, unix/coherent/ver40/template.mk,
-	  unix/coherent/ver40/vfprintf.c, unix/coherent/ver42/config.mk,
-	  unix/coherent/ver42/template.mk, unix/coherent/ver42/make.sh,
-	  unix/linux/config.mk, unix/linux/gnu/config.mk,
-	  unix/linux/gnu/template.mk, unix/macosx/config.mk,
-	  unix/macosx/gnu/config.mk, unix/macosx/gnu/template.mk,
-	  unix/solaris/config.mk, unix/solaris/getcwd.c,
-	  unix/solaris/make.sh, unix/solaris/template.mk,
-	  unix/solaris/tempnam.c, unix/solaris/gnu/config.mk,
-	  unix/solaris/gnu/make.sh, unix/solaris/gnu/template.mk,
-	  unix/sysvr1/config.mk, unix/sysvr1/make.sh, unix/sysvr1/putenv.c,
-	  unix/sysvr1/stdlib.h, unix/sysvr1/template.mk,
-	  unix/sysvr1/time.h, unix/sysvr1/vfprintf.c,
-	  unix/sysvr3/config.mk, unix/sysvr3/make.sh, unix/sysvr3/stdlib.h,
-	  unix/sysvr3/template.mk, unix/sysvr3/time.h,
-	  unix/sysvr3/pwd/config.mk, unix/sysvr3/pwd/template.mk,
-	  unix/sysvr3/pwd/getcwd.c, unix/sysvr3/pwd/make.sh,
-	  unix/sysvr4/config.mk, unix/sysvr4/make.sh,
-	  unix/sysvr4/template.mk, unix/xenix/config.mk,
-	  unix/xenix/make.sh, unix/xenix/stdlib.h, unix/xenix/template.mk,
-	  unix/xenix/time.h, unix/xenix/pwd/config.mk,
-	  unix/xenix/pwd/getcwd.c, unix/xenix/pwd/make.sh,
-	  unix/xenix/pwd/template.mk, win95/config.mk, win95/dchdir.c,
-	  win95/startup.h, win95/switchar.c, win95/borland/config.mk,
-	  win95/borland/ruletab.c, win95/borland/sysintf.h,
-	  win95/borland/tempnam.c, win95/borland/bcc50/config.h,
-	  win95/borland/bcc50/config.mk, win95/borland/bcc50/lib.rsp,
-	  win95/borland/bcc50/mk.bat, win95/borland/bcc50/obj.rsp,
-	  win95/borland/bcc50/template.mk, win95/microsft/config.mk,
-	  win95/microsft/optoff.h, win95/microsft/sysintf.h,
-	  win95/microsft/tempnam.c, win95/microsft/vpp40/config.mk,
-	  win95/microsft/vpp40/lib.rsp, win95/microsft/vpp40/runargv.c,
-	  win95/microsft/vpp40/template.mk, win95/microsft/vpp40/tempnam.c,
-	  winnt/config.mk, winnt/dchdir.c, winnt/startup.h,
-	  winnt/borland/config.mk, winnt/borland/ruletab.c,
-	  winnt/borland/sysintf.h, winnt/borland/tempnam.c,
-	  winnt/borland/bcc50/config.h, winnt/borland/bcc50/config.mk,
-	  winnt/borland/bcc50/lib.rsp, winnt/borland/bcc50/mk.bat,
-	  winnt/borland/bcc50/mk.cmd, winnt/borland/bcc50/obj.rsp,
-	  winnt/borland/bcc50/template.mk, winnt/microsft/config.h,
-	  winnt/microsft/config.mk, winnt/microsft/optoff.h,
-	  winnt/microsft/ruletab.c, winnt/microsft/sysintf.h,
-	  winnt/microsft/tempnam.c, winnt/microsft/vpp40/config.mk,
-	  winnt/microsft/vpp40/lib.rsp, winnt/microsft/vpp40/mk.bat,
-	  winnt/microsft/vpp40/mk.cmd, winnt/microsft/vpp40/obj.rsp,
-	  winnt/microsft/vpp40/runargv.c, winnt/microsft/vpp40/template.mk,
-	  winnt/microsft/vpp40/tempnam.c:
-
-	initial import
-
diff --git a/dmake/INSTALL b/dmake/INSTALL
deleted file mode 100755
index d28a93684..000000000
--- a/dmake/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-All installation and configuration information has been moved to the
-readme directory, please refer to the files found there for more
-information.
diff --git a/dmake/Makefile.am b/dmake/Makefile.am
deleted file mode 100755
index 801ee2967..000000000
--- a/dmake/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-AUTOMAKE_OPTIONS = foreign subdir-objects 1.9
-
-
-bin_PROGRAMS = dmake
-dmake_SOURCES = \
-	infer.c make.c stat.c expand.c dmstring.c hash.c dag.c dmake.c\
-	path.c imacs.c sysintf.c parse.c getinp.c quit.c state.c\
-	dmdump.c macparse.c rulparse.c percent.c function.c
-
-# set the include path found by configure
-INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
-           -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@ -I$(top_srcdir)/@OS_TYPE@
-
-if DBUG
-dmake_SOURCES += dbug/dbug/dbug.c
-endif
-
-if OSTYPEUNIX
-dmake_SOURCES += unix/arlib.c unix/dcache.c unix/dirbrk.c unix/rmprq.c\
-                 unix/ruletab.c unix/runargv.c unix/tempnam.c
-INCLUDES += -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@/gnu \
-            -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@ \
-            -I$(top_srcdir)/@OS_TYPE@ 
-endif
-
-if OSTYPEWIN32
-dmake_SOURCES += win95/dchdir.c win95/switchar.c \
-                 msdos/dstrlwr.c msdos/arlib.c \
-                 msdos/dirbrk.c unix/runargv.c \
-                 unix/rmprq.c \
-                 win95/microsft/ruletab.c
-INCLUDES += -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@ -I$(top_srcdir)/@OS_TYPE@
-endif
-
-SUBDIRS = startup tests
-
-EXTRA_DIST = NEWS ChangeLog
diff --git a/dmake/Makefile.in b/dmake/Makefile.in
deleted file mode 100755
index c25cc18ef..000000000
--- a/dmake/Makefile.in
+++ /dev/null
@@ -1,869 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-bin_PROGRAMS = dmake$(EXEEXT)
-@DBUG_TRUE@am__append_1 = dbug/dbug/dbug.c
-@OSTYPEUNIX_TRUE@am__append_2 = unix/arlib.c unix/dcache.c unix/dirbrk.c unix/rmprq.c\
-@OSTYPEUNIX_TRUE@                 unix/ruletab.c unix/runargv.c unix/tempnam.c
-
-@OSTYPEUNIX_TRUE@am__append_3 = -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@/gnu \
-@OSTYPEUNIX_TRUE@            -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@ \
-@OSTYPEUNIX_TRUE@            -I$(top_srcdir)/@OS_TYPE@ 
-
-@OSTYPEWIN32_TRUE@am__append_4 = win95/dchdir.c win95/switchar.c \
-@OSTYPEWIN32_TRUE@                 msdos/dstrlwr.c msdos/arlib.c \
-@OSTYPEWIN32_TRUE@                 msdos/dirbrk.c unix/runargv.c \
-@OSTYPEWIN32_TRUE@                 unix/rmprq.c \
-@OSTYPEWIN32_TRUE@                 win95/microsft/ruletab.c
-
-@OSTYPEWIN32_TRUE@am__append_5 = -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@ -I$(top_srcdir)/@OS_TYPE@
-DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/dmakeroot.h.in $(top_srcdir)/configure AUTHORS \
-	COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \
-	depcomp install-sh missing mkinstalldirs
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = dmakeroot.h
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am__dmake_SOURCES_DIST = infer.c make.c stat.c expand.c dmstring.c \
-	hash.c dag.c dmake.c path.c imacs.c sysintf.c parse.c getinp.c \
-	quit.c state.c dmdump.c macparse.c rulparse.c percent.c \
-	function.c dbug/dbug/dbug.c unix/arlib.c unix/dcache.c \
-	unix/dirbrk.c unix/rmprq.c unix/ruletab.c unix/runargv.c \
-	unix/tempnam.c win95/dchdir.c win95/switchar.c msdos/dstrlwr.c \
-	msdos/arlib.c msdos/dirbrk.c win95/microsft/ruletab.c
-am__dirstamp = $(am__leading_dot)dirstamp
-@DBUG_TRUE@am__objects_1 = dbug/dbug/dbug.$(OBJEXT)
-@OSTYPEUNIX_TRUE@am__objects_2 = unix/arlib.$(OBJEXT) \
-@OSTYPEUNIX_TRUE@	unix/dcache.$(OBJEXT) unix/dirbrk.$(OBJEXT) \
-@OSTYPEUNIX_TRUE@	unix/rmprq.$(OBJEXT) unix/ruletab.$(OBJEXT) \
-@OSTYPEUNIX_TRUE@	unix/runargv.$(OBJEXT) unix/tempnam.$(OBJEXT)
-@OSTYPEWIN32_TRUE@am__objects_3 = win95/dchdir.$(OBJEXT) \
-@OSTYPEWIN32_TRUE@	win95/switchar.$(OBJEXT) \
-@OSTYPEWIN32_TRUE@	msdos/dstrlwr.$(OBJEXT) \
-@OSTYPEWIN32_TRUE@	msdos/arlib.$(OBJEXT) msdos/dirbrk.$(OBJEXT) \
-@OSTYPEWIN32_TRUE@	unix/runargv.$(OBJEXT) unix/rmprq.$(OBJEXT) \
-@OSTYPEWIN32_TRUE@	win95/microsft/ruletab.$(OBJEXT)
-am_dmake_OBJECTS = infer.$(OBJEXT) make.$(OBJEXT) stat.$(OBJEXT) \
-	expand.$(OBJEXT) dmstring.$(OBJEXT) hash.$(OBJEXT) \
-	dag.$(OBJEXT) dmake.$(OBJEXT) path.$(OBJEXT) imacs.$(OBJEXT) \
-	sysintf.$(OBJEXT) parse.$(OBJEXT) getinp.$(OBJEXT) \
-	quit.$(OBJEXT) state.$(OBJEXT) dmdump.$(OBJEXT) \
-	macparse.$(OBJEXT) rulparse.$(OBJEXT) percent.$(OBJEXT) \
-	function.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
-	$(am__objects_3)
-dmake_OBJECTS = $(am_dmake_OBJECTS)
-dmake_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(dmake_SOURCES)
-DIST_SOURCES = $(am__dmake_SOURCES_DIST)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
-OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
-OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
-OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-AUTOMAKE_OPTIONS = foreign subdir-objects 1.9
-dmake_SOURCES = infer.c make.c stat.c expand.c dmstring.c hash.c dag.c \
-	dmake.c path.c imacs.c sysintf.c parse.c getinp.c quit.c \
-	state.c dmdump.c macparse.c rulparse.c percent.c function.c \
-	$(am__append_1) $(am__append_2) $(am__append_4)
-
-# set the include path found by configure
-INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
-	-I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@ \
-	-I$(top_srcdir)/@OS_TYPE@ $(am__append_3) $(am__append_5)
-SUBDIRS = startup tests
-EXTRA_DIST = NEWS ChangeLog
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-dmakeroot.h: $(top_builddir)/config.status $(srcdir)/dmakeroot.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-dbug/dbug/$(am__dirstamp):
-	@$(mkdir_p) dbug/dbug
-	@: > dbug/dbug/$(am__dirstamp)
-dbug/dbug/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) dbug/dbug/$(DEPDIR)
-	@: > dbug/dbug/$(DEPDIR)/$(am__dirstamp)
-dbug/dbug/dbug.$(OBJEXT): dbug/dbug/$(am__dirstamp) \
-	dbug/dbug/$(DEPDIR)/$(am__dirstamp)
-unix/$(am__dirstamp):
-	@$(mkdir_p) unix
-	@: > unix/$(am__dirstamp)
-unix/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) unix/$(DEPDIR)
-	@: > unix/$(DEPDIR)/$(am__dirstamp)
-unix/arlib.$(OBJEXT): unix/$(am__dirstamp) \
-	unix/$(DEPDIR)/$(am__dirstamp)
-unix/dcache.$(OBJEXT): unix/$(am__dirstamp) \
-	unix/$(DEPDIR)/$(am__dirstamp)
-unix/dirbrk.$(OBJEXT): unix/$(am__dirstamp) \
-	unix/$(DEPDIR)/$(am__dirstamp)
-unix/rmprq.$(OBJEXT): unix/$(am__dirstamp) \
-	unix/$(DEPDIR)/$(am__dirstamp)
-unix/ruletab.$(OBJEXT): unix/$(am__dirstamp) \
-	unix/$(DEPDIR)/$(am__dirstamp)
-unix/runargv.$(OBJEXT): unix/$(am__dirstamp) \
-	unix/$(DEPDIR)/$(am__dirstamp)
-unix/tempnam.$(OBJEXT): unix/$(am__dirstamp) \
-	unix/$(DEPDIR)/$(am__dirstamp)
-win95/$(am__dirstamp):
-	@$(mkdir_p) win95
-	@: > win95/$(am__dirstamp)
-win95/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) win95/$(DEPDIR)
-	@: > win95/$(DEPDIR)/$(am__dirstamp)
-win95/dchdir.$(OBJEXT): win95/$(am__dirstamp) \
-	win95/$(DEPDIR)/$(am__dirstamp)
-win95/switchar.$(OBJEXT): win95/$(am__dirstamp) \
-	win95/$(DEPDIR)/$(am__dirstamp)
-msdos/$(am__dirstamp):
-	@$(mkdir_p) msdos
-	@: > msdos/$(am__dirstamp)
-msdos/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) msdos/$(DEPDIR)
-	@: > msdos/$(DEPDIR)/$(am__dirstamp)
-msdos/dstrlwr.$(OBJEXT): msdos/$(am__dirstamp) \
-	msdos/$(DEPDIR)/$(am__dirstamp)
-msdos/arlib.$(OBJEXT): msdos/$(am__dirstamp) \
-	msdos/$(DEPDIR)/$(am__dirstamp)
-msdos/dirbrk.$(OBJEXT): msdos/$(am__dirstamp) \
-	msdos/$(DEPDIR)/$(am__dirstamp)
-win95/microsft/$(am__dirstamp):
-	@$(mkdir_p) win95/microsft
-	@: > win95/microsft/$(am__dirstamp)
-win95/microsft/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) win95/microsft/$(DEPDIR)
-	@: > win95/microsft/$(DEPDIR)/$(am__dirstamp)
-win95/microsft/ruletab.$(OBJEXT): win95/microsft/$(am__dirstamp) \
-	win95/microsft/$(DEPDIR)/$(am__dirstamp)
-dmake$(EXEEXT): $(dmake_OBJECTS) $(dmake_DEPENDENCIES) 
-	@rm -f dmake$(EXEEXT)
-	$(LINK) $(dmake_LDFLAGS) $(dmake_OBJECTS) $(dmake_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-	-rm -f dbug/dbug/dbug.$(OBJEXT)
-	-rm -f msdos/arlib.$(OBJEXT)
-	-rm -f msdos/dirbrk.$(OBJEXT)
-	-rm -f msdos/dstrlwr.$(OBJEXT)
-	-rm -f unix/arlib.$(OBJEXT)
-	-rm -f unix/dcache.$(OBJEXT)
-	-rm -f unix/dirbrk.$(OBJEXT)
-	-rm -f unix/rmprq.$(OBJEXT)
-	-rm -f unix/ruletab.$(OBJEXT)
-	-rm -f unix/runargv.$(OBJEXT)
-	-rm -f unix/tempnam.$(OBJEXT)
-	-rm -f win95/dchdir.$(OBJEXT)
-	-rm -f win95/microsft/ruletab.$(OBJEXT)
-	-rm -f win95/switchar.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dag.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dmake.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dmdump.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dmstring.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/function.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getinp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imacs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/macparse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/path.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/percent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rulparse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/state.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysintf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@dbug/dbug/$(DEPDIR)/dbug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@msdos/$(DEPDIR)/arlib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@msdos/$(DEPDIR)/dirbrk.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@msdos/$(DEPDIR)/dstrlwr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@unix/$(DEPDIR)/arlib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@unix/$(DEPDIR)/dcache.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@unix/$(DEPDIR)/dirbrk.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@unix/$(DEPDIR)/rmprq.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@unix/$(DEPDIR)/ruletab.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@unix/$(DEPDIR)/runargv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@unix/$(DEPDIR)/tempnam.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@win95/$(DEPDIR)/dchdir.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@win95/$(DEPDIR)/switchar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@win95/microsft/$(DEPDIR)/ruletab.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/startup
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(PROGRAMS) config.h
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-rm -f dbug/dbug/$(DEPDIR)/$(am__dirstamp)
-	-rm -f dbug/dbug/$(am__dirstamp)
-	-rm -f msdos/$(DEPDIR)/$(am__dirstamp)
-	-rm -f msdos/$(am__dirstamp)
-	-rm -f unix/$(DEPDIR)/$(am__dirstamp)
-	-rm -f unix/$(am__dirstamp)
-	-rm -f win95/$(DEPDIR)/$(am__dirstamp)
-	-rm -f win95/$(am__dirstamp)
-	-rm -f win95/microsft/$(DEPDIR)/$(am__dirstamp)
-	-rm -f win95/microsft/$(am__dirstamp)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR) dbug/dbug/$(DEPDIR) msdos/$(DEPDIR) unix/$(DEPDIR) win95/$(DEPDIR) win95/microsft/$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR) dbug/dbug/$(DEPDIR) msdos/$(DEPDIR) unix/$(DEPDIR) win95/$(DEPDIR) win95/microsft/$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-binPROGRAMS clean-generic clean-recursive \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/NEWS b/dmake/NEWS
deleted file mode 100755
index bff5353be..000000000
--- a/dmake/NEWS
+++ /dev/null
@@ -1,316 +0,0 @@
-News file for the dmake version that is hosted on the OpenOffice.org
-cvs. #i<number># denote issues tracked by the OpenOffice.org issue tracking
-system, see <http://qa.openoffice.org/issue_handling/project_issues.html>.
-
-Version 4.12
-============
-
-Volker Quetschke (vq@openoffice.org)
-#i83540# Add parallel building mode, see the MULTI PROCESSING section in
-the dmake man page, for native W32 dmake (MSVC 6, and newer and MinGW)
-versions.
-
-Version 4.11
-============
-
-Yuri Dario (ydario@openoffice.org)
-#i81855, CWS os2port01# Port dmake to OS/2.
-
-Volker Quetschke (vq@openoffice.org)
-#i81252# Add a new control macro SHELLCMDQUOTE that can be used to add
-additional characters before and after the command string if the recipe is
-executed using a shell. This macro is used to avoid problems with quoting
-when using cmd.exe or command.com.
-
-Volker Quetschke (vq@openoffice.org)
-#i81296, i64572# Improve dependency handling of prerequisites.
-
-Volker Quetschke (vq@openoffice.org)
-#i80687, i66751# Allow the use of .PHONY for %-targets.
-
-Volker Quetschke (vq@openoffice.org)
-#i80010, i80009# Fix handling of quoted filenames for :1 :b :d :e :f
-and :i macro expansions.
-
-Volker Quetschke (vq@openoffice.org)
-#i78776# Add a new function macro $(normpath[,para] data) and a new macro
-extension to normalise the given data or macro content. The normalization
-is done element-wise (whitespace separated) on the given data. Quotes can
-be used to normalize filenames that contain whitespace characters.
-On cygwin the result honors the setting of .WINPATH to determine the output
-format. If the optional parameter para is given for the function macro its
-expanded value is used to override the .WINPATH setting for the output.
-
-Version 4.10 (skipped)
-======================
-
-This number was skipped to avoid confusion with Version 4.1, patch level 0
-which identified itself as "Version 4.10, PL 0".
-
-Version 4.9
-===========
-
-Volker Quetschke (vq@openoffice.org)
-#i74700#  Add a new special macro OOODMAKEMODE that is used to toggle
-OOo build specific behavior. If OOODMAKEMODE is set (i.e. it begins with y)
-a possible leading ./ of a path will no longer be removed during target
-normalization.
-
-
-Version 4.8
-===========
-
-Volker Quetschke (vq@openoffice.org)
-#i73499#  Add new .WINPATH attribute to generate Windows style paths (with
-regular slashes) instead of the default cygwin style (POSIX) paths for
-dmake's dynamic macros.
-
-This attribute is specific for cygwin dmake executables and non-cygwin
-environments ignore this attribute. This feature can be used to create DOS
-style path parameters for native W32 programs from dynamic macros.
-
-The windows style paths use regular slashes ('/') instead of the usual
-windows backslash ('\') as directory separator to avoid quoting problems
-(It still is a cygwin dmake feature!) and cygwin as well as native windows
-programs should have no problems using this (c:/foo/bar) path
-representation.
-
-The affected macros are $@, $*, $>, $?, $<, $&, $^ and $(PWD), $(MAKEDIR)
-and $(TMD).
-
-Examples:
-  Content of $(PWD) without .WINPATH (default):  /cygdrive/c/temp
-
-  Content of $(PWD) with .WINPATH set:           c:/temp
-
-
-Version 4.7
-===========
-
-Volker Quetschke (vq@openoffice.org)
-#i71422# Add @@ as a new recipe line property. This new property is a
-stronger version of the already existing @ recipe property.  The recipe
-line and the output (stdout and stderr) of the executed recipe are suppressed
-and *NOT* shown on the terminal.
-Note: Previously the second @ sign was ignored, that means that using this
-new feature doesn't break backwards compatibility but the command output
-is naturally not suppressed in older versions.
-
-Volker Quetschke (vq@openoffice.org)
-#i70210# Dmake now works correctly with empty dynamic prerequisites.
-
-Volker Quetschke (vq@openoffice.org)
-#i70168# Improve dmakes handling of literal $ characters in target and
-prerequisite filenames. This was not working before and is working now
-but the use of literal $ characters in filenames is still strongly
-discouraged. See the man page for details.
-
-Volker Quetschke (vq@openoffice.org)
-#i69742# Normalize the pathnames of targets and prerequisites to the shortest
-(or most natural, see below for the cygwin case) representation.
-Now "./foo", "bar/../foo" and foo are recognized as the same file.
-
-For cygwin this allows the use of target and prerequisite names with DOS
-like pathnames with drive letters (with / and \ as possible path seperators)
-and cygwin POSIX pathnames. As the internal format uses cygwin's natural
-POSIX representation runtime macros will result in POSIX paths.
-
-Version 4.6
-===========
-
-Volker Quetschke (vq@openoffice.org)
-#i67589# Implement the internal dmake commands noop and echo. These commands
-were already existing for the native Windows version but only partially
-documented.
-
-Volker Quetschke (vq@openoffice.org)
-#i67166# Issue a warning when a previously unset macro (i.e. assumed to be
-empty) is used and later set to a different value.
-
-Volker Quetschke (vq@openoffice.org)
-#i66567# Issue a warning when .SUFFIXES is used. This special target had no
-special meaning (anymore?) and was always (at least since version 4.2)
-ignored.
-
-Volker Quetschke (vq@openoffice.org)
-#i67025# Fix a bug that was introduced in dmake 4.5 and led dmake to falsely
-issue an error if a %-target was defined with the .SILENT attribute and dmake
-was started with the -vr (included in -v) verbose flag.
-
-Version 4.5
-===========
-
-Volker Quetschke (vq@openoffice.org)
-#i66385# Fix the handling of .<suffix> targets. Always treat these targets
-as meta targets regardless of the AUGMAKE (-A) status. Previously this was
-enabled when the AUGMAKE was *not* set to 'yes' or the -A switch was given.
-
-#i66083# We now stop with an error if AUGMAKE meta targets and regular
-targets are used in one rule definition. As the syntax of these target
-definitions is slightly different this hints to an error in the makefile,
-most probably a misspelled attribute or special target.
-
-#i48087#, #i64869# The parsing of %-target definitions was fixed and
-enhanced. Prior to dmake 4.5 only one %-target per target-definition worked
-reliably, now this works well, but to help projects that still use older
-versions a warning was added.
-
-It's not very nice to issue a warning for something that works now but
-didn't before. This was only done to aid development and will probably
-be removed in future versions.
-
-There was, and still is, that for a bug in dmake for %-targets with more
-than one (not indirect) prerequisite only the first prerequisite is used.
-This will be fixed in future versions but until this happens we issue a
-warning that prerequisites are ignored.
-
-#i65122# The :| rule operator was handled differently from what the man
-page said. The man page was adapted to reflect reality. Changing dmakes
-behavior to match the man page would have introduced a lot of compatibility
-issues.
-
-Version 4.4
-===========
-
-2006/02/03 Volker Quetschke (vq@openoffice.org)
-#i61170# Fix the TMD macro. Up to now the TMD macro appended a directory
-separator if it ended in "..", but most of the time it was not set correctly
-at all and/or without a trailing slash.
-Note: If your application relies on TMD please check the dmake manual page
-for its definition and fix your makefiles if needed.
-
-2006/02/01 Volker Quetschke (vq@openoffice.org)
-#i60948# Add -m option family to generate timing information for targets
-and/or recipes.
-
-2005/09/19 Volker Quetschke (vq@openoffice.org)
-#i53148# Fix $(shell ...) macro picking up the output of earlier
-recipe lines in parallel builds.
-#i54766# Ensure that all previous recipe lines to a recipe
-line containing a $(shell ...) macro have finished before executing
-the macro in parallel builds.
-
-2005/06/01 Volker Quetschke (vq@openoffice.org)
-#i39248# Add a testsuite to test some dmake features (only for autotools
-builds). Start the tests with "make check".
-
-2005/04/21 Volker Quetschke (vq@openoffice.org)
-#i47851# Increase the version number to 4.4-cvs and slightly rearrange the
-output of "dmake -V".
-Remove the hard-coded (in autotools builds) OS macro. It had the wrong value
-to be usable with the startup/*.mk and is not mentioned in the man page.
-Clean up configure.in and friends.
-
-2005/04/20 Volker Quetschke (vq@openoffice.org)
-#i43310# Fix percent (%) rules to recognize prerequisites that are defined
-with the multiple target rule operator (::). 
-This implicitly fixes the similar problem for .<suffix>.<suffix> targets.
-
-2005/04/16 Volker Quetschke (vq@openoffice.org)
-#i46987# Fix the documentation of the $(mktmp ...) function macro. This is
-not necessarily a new feature as the macro works this way since dmake was
-imported into the OpenOffice.org cvs but mentioning it here might help users
-of dmake upgrading from very old versions.
-
-Add the "map escape codes" $(...:m) macro expansion that allows to expand
-escape codes in macros.  It can also be used to reproduce the former (pre
-OpenOffice.org cvs) $(mktmp ...) behavior.
-
-2005/04/10 Volker Quetschke (vq@openoffice.org)
-#i43252# Introduce the macro ABSMAKECMD that's value for a native Windows
-dmake executable (compiled with MS Visual C++ or MinGW) is the absolute
-filename and NULL for other operating systems or dmake build with other
-compilers.
-If DMAKEROOT is not changed and only for native Windows dmake versions the
-value of DMAKEROOT now defaults to "$(ABSMAKECMD:d)startup".
-This allows to use the startup files from the startup directory from the
-same location where the dmake.exe is located.
-
-2005/04/08 Steve Hay (shay@openoffice.org)
-#i43241# Fix build problems with VC++ (in non-OOo environment) and fix
-the dmake makefiles so that dmake can rebuild itself (VC++ only).
-
-2005/03/14 Volker Quetschke (vq@openoffice.org)
-#i44959# Fix problems when a continued line is followed by an empty
-or comment line.
-
-2005/03/13 Volker Quetschke (vq@openoffice.org)
-#i37053# Fix function macro problems with continued lines.
-
-2004/11/23 Volker Quetschke (vq@openoffice.org)
-#i37491# Predefine dmake macro containing one space (SPACECHAR).
-
-2004/11/21 Volker Quetschke (vq@openoffice.org)
-#i36027# Improve function macro parameter parsing.
-
-Version 4.3
-===========
-
-2004/10/07 Volker Quetschke (vq@openoffice.org)
-#i34746# Fix timestamp of phony targets with prerequisites.
-
-2004/07/11 Volker Quetschke (vq@openoffice.org)
-#i31255# Add verbose recipe echoing option (-vr).
-
-2004/07/06 Volker Quetschke (vq@openoffice.org)
-#i30779# Fix to allow dmake to echo recipe lines when inference is used
-to create files that are to be read by .INCLUDE.
-
-2004/04/01 Michael Meeks (mmeeks@openoffice.org)
-#i27319#, #i27981# Don't handle environment variables that begin with a
-'!', they are used by Cygwin internally and confuse dmake.
-
-2004/01/09 Dan Williams (fa@openoffice.org)
-#i17992# Allows the nesting of expressions and a much more complex syntax
-for dmake. It is now possible to nest expressions with () and any
-combination of || and &&.
-Example:
-.IF (("$(OS)"=="MACOSX"&&"$(COM)"=="GCC")||"$(OS)"=="LINUX") && "$(GUIBASE)"=="unx"
-...
-.ENDIF
-
-2003/10/19 Ken Foskey (waratah@openoffice.org)
-#i20504# Correct processing of .LIBRARY targets.
-
-2003/10/08 Chris Halls (haggai@openoffice.org)
-#i7800# Fix tempnam security problem.
-
-2003/03/08 Volker Quetschke (vq@openoffice.org)
-#i10910# Use the build-in tempnam function for MS VC6.
-
-2003/03/05 Volker Quetschke (vq@openoffice.org)
-#i11861# Switch to newer autotools autoconf 2.5x and automake 1.5 and
-add MinGW and MSVC to the configure buildable targets.
-
-2002/10/11 Ken Foskey (waratah@openoffice.org)
-Fix the "lost a child" problem. (Part II)
-
-2002/10/04 Ken Foskey (waratah@openoffice.org)
-Rework the configure process.
-
-2002/04/10 Hans-Joachim Lankenau (hjs@openoffice.org)
-Don't search INCLUDEDIRS if the filename to be included starts at fs-root.
-
-2001/05/29 Patrick Luby (pluby@openoffice.org)
-Added forceful exit to avoid infinite loop that sometimes occurs when
-there is a fatal error. Lost a child problem. (Part I)
-
-Version 4.2
-===========
-(Note, the dmake -V output was not changed and still said
-"Version 4.10, PL 0". This probably should have been 4.1)
-
-2001/04/20 Martin Hollmichel (mh@openoffice.org)
-First autoconfiscation of dmake.
-
-2001/02/13 Hans-Joachim Lankenau (hjs@openoffice.org)
-Fix for leaving tmpfiles when building group targets.
-
-2000/09/22 Jens-Heiner Rechtien (hr@openoffice.org)
-Initial import of dmake into OpenOffice.org cvs
-
-before 2000/09/22 ?
-Add smaller/greater arithmetic for .IF conditions.
-
-1999/03/18 Hans-Joachim Lankenau (hjs@openoffice.org)
-Implement boolean expression "or".
diff --git a/dmake/acinclude.m4 b/dmake/acinclude.m4
deleted file mode 100755
index 6b7e9291c..000000000
--- a/dmake/acinclude.m4
+++ /dev/null
@@ -1,3 +0,0 @@
-##   -*- autoconf -*-
-
-dnl Currently no local macros are needed.
diff --git a/dmake/aclocal.m4 b/dmake/aclocal.m4
deleted file mode 100755
index 00176eea1..000000000
--- a/dmake/aclocal.m4
+++ /dev/null
@@ -1,908 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Copyright (C) 1999, 2000, 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([acinclude.m4])
diff --git a/dmake/alloc.h b/dmake/alloc.h
deleted file mode 100644
index 6b1f14fc2..000000000
--- a/dmake/alloc.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* RCS  $Id: alloc.h,v 1.1.1.1 2000-09-22 15:33:25 hr Exp $
---
--- SYNOPSIS
---      Macros for allocating memory.
--- 
--- DESCRIPTION
---	A somewhat nicer interface to malloc and calloc.
---	Here we standardise the calling convention with a common macro
---	interface.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef ALLOC_h
-#define ALLOC_h
-
-/* DO NOT CHANGE these!  These are the definitions that the make source
- * uses for allocating memory.  They must be defined for make to compile
- * properly.
- */
-
-/* This is the only place that we define size_t now.  This should be more
- * than enough! */
-#if __STDC__
-#else
-#   if !defined(_TYPES_) && !defined(M_XENIX) && !defined(atarist) && !defined(_MPW) && !defined(_SIZE_T) && !defined(_SIZE_T_) && !defined(__size_t) && !defined(_WIN32)
-#      if defined(MSDOS) || defined(__MSDOS__)
-#         undef size_t
-          typedef unsigned size_t;
-#      else
-          typedef long size_t;
-#      endif
-#   endif
-#endif
-
-#define	usizeof(t)	(size_t)sizeof(t)
-
-#define FREE(p)         free((char*)(p))
-#define MALLOC(n, t)    (t*) malloc((unsigned int)(n)*usizeof(t))
-#define CALLOC(n, t)    (t*) calloc((unsigned int)(n), usizeof(t))
-
-#define TALLOC(p, n, t)	if ((p = CALLOC(n, t)) == (t*)0) {No_ram();}
-
-#endif
-
diff --git a/dmake/autogen.sh b/dmake/autogen.sh
deleted file mode 100755
index 4a51f63b6..000000000
--- a/dmake/autogen.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=dmake
-TEST_TYPE=-f
-FILE=make.c
-
-DIE=0
-
-# cvs may leave some files unwritable
-(chmod -Rf u+rw $srcdir) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have owner permissions for all files and subdirectories"
-    echo "in $srcdir"
-    DIE=1
-}
-
-(autoconf --version ) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have autoconf installed to compile $PROJECT."
-    DIE=1
-}
-
-(automake --version ) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have automake installed to compile $PROJECT."
-    DIE=1
-}
-
-if test "$DIE" -eq 1; then
-    exit 1
-fi
-
-test $TEST_TYPE $FILE || {
-    echo "You must run this script in the top-level $PROJECT directory"
-    exit 1
-}
-
-if test -z "$*"; then
-    echo "I am going to run ./configure with no arguments - if you wish "
-        echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-# needed when autotools version changed
-aclocal
-
-# After the first run of autoconf a configure file exists.
-# 'configure --enable-maintainer-mode' will start all other needed autotool helpers.
-autoconf
-
-#automake -a -c -f
-
-cd $ORIGDIR
-
-$srcdir/configure --enable-maintainer-mode  --prefix=/usr/local "$@"
-
-echo 
-echo "Now execute GNU make to compile $PROJECT."
diff --git a/dmake/compile b/dmake/compile
deleted file mode 100755
index 1b1d23216..000000000
--- a/dmake/compile
+++ /dev/null
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/dmake/config.guess b/dmake/config.guess
deleted file mode 100755
index 917bbc50f..000000000
--- a/dmake/config.guess
+++ /dev/null
@@ -1,1463 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-07-08'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/dmake/config.h.in b/dmake/config.h.in
deleted file mode 100644
index ed639aa99..000000000
--- a/dmake/config.h.in
+++ /dev/null
@@ -1,187 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Build info string */
-#undef BUILDINFO
-
-/* Assume case insensitive file system. */
-#undef CASE_INSENSITIVE_FS
-
-/* Enables the use of spawn instead of fork/exec if it is supported. */
-#undef ENABLE_SPAWN
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the `getcwd' function. */
-#undef HAVE_GETCWD
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define to 1 if you have the `getwd' function. */
-#undef HAVE_GETWD
-
-/* Define to 1 if the system has the type `int16'. */
-#undef HAVE_INT16
-
-/* Define to 1 if the system has the type `int32'. */
-#undef HAVE_INT32
-
-/* Define to 1 if the system has the type `int8'. */
-#undef HAVE_INT8
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
-/* Define to 1 if you have the `setenv' function. */
-#undef HAVE_SETENV
-
-/* Define to 1 if you have the `settz' function. */
-#undef HAVE_SETTZ
-
-/* Define to 1 if you have the `setvbuf' function. */
-#undef HAVE_SETVBUF
-
-/* Define to 1 if you have the <spawn.h> header file. */
-#undef HAVE_SPAWN_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strlwr' function. */
-#undef HAVE_STRLWR
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_DIR_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_NDIR_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <sys/wait.h> header file. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define to 1 if you have the `tempnam' function. */
-#undef HAVE_TEMPNAM
-
-/* Define to 1 if you have the `tzset' function. */
-#undef HAVE_TZSET
-
-/* Define to 1 if the system has the type `uint16'. */
-#undef HAVE_UINT16
-
-/* Define to 1 if the system has the type `uint32'. */
-#undef HAVE_UINT32
-
-/* Define to 1 if the system has the type `uint8'. */
-#undef HAVE_UINT8
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the <utime.h> header file. */
-#undef HAVE_UTIME_H
-
-/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
-#undef HAVE_UTIME_NULL
-
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
-
-/* Define to 1 if you have the <wait.h> header file. */
-#undef HAVE_WAIT_H
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `long int' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
diff --git a/dmake/config.sub b/dmake/config.sub
deleted file mode 100755
index 1c366dfde..000000000
--- a/dmake/config.sub
+++ /dev/null
@@ -1,1579 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-07-08'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| ms1 \
-	| msp430 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| ms1-* \
-	| msp430-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	m32c-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16c)
-		basic_machine=cr16c-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/dmake/configure b/dmake/configure
deleted file mode 100755
index 840207bbb..000000000
--- a/dmake/configure
+++ /dev/null
@@ -1,9000 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for dmake 4.12.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='dmake'
-PACKAGE_TARNAME='dmake'
-PACKAGE_VERSION='4.12'
-PACKAGE_STRING='dmake 4.12'
-PACKAGE_BUGREPORT=''
-
-ac_unique_file="man/dmake.tf"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_header_list=
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-build
-build_cpu
-build_vendor
-build_os
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-MAINTAINER_MODE_TRUE
-MAINTAINER_MODE_FALSE
-MAINT
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-CPP
-LN_S
-RANLIB
-OSTYPEUNIX_TRUE
-OSTYPEUNIX_FALSE
-OSTYPEWIN32_TRUE
-OSTYPEWIN32_FALSE
-OS_TYPE
-OS_VERSION
-DBUG_TRUE
-DBUG_FALSE
-DMAKEROOT_H_LINE1
-GREP
-EGREP
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures dmake 4.12 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/dmake]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of dmake 4.12:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-dbug:          Enable build with dbug macros.
-
-  --enable-spawn:         Enables the use of spawn instead of fork/exec
-                          if it is supported.
-
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-dmake configure 4.12
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by dmake $as_me 4.12, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-ac_header_list="$ac_header_list utime.h"
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-BUILDINFO="$build"
-
-
-am__api_version="1.9"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='dmake'
- VERSION='4.12'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-if test "x$CC" != xcc; then
-  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
-fi
-set dummy $CC; ac_cc=`echo $2 |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-   test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_MINUS_C_MINUS_O 1
-_ACEOF
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-# Check whether --enable-dbug was given.
-if test "${enable_dbug+set}" = set; then
-  enableval=$enable_dbug;
-fi
-
-
-# Check whether --enable-spawn was given.
-if test "${enable_spawn+set}" = set; then
-  enableval=$enable_spawn;
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
-fi
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-
-{ echo "$as_me:$LINENO: checking the operating system" >&5
-echo $ECHO_N "checking the operating system... $ECHO_C" >&6; }
-
-_os=`uname`
-
-if test `echo $_os | $AWK -F_ '{ print $1 }'` = "CYGWIN"; then
-   if test "$GCC" = "yes"; then
-      if test `$CC -dumpmachine | $AWK -F- '{ print $3 }'` = "mingw32"; then
-         _os="MINGW"
-      else
-         _os="CYGWIN"
-      fi
-   else
-      _os="MSVC6"
-   fi
-fi
-
-
-## At the moment all except mingw builds are OS_TYPE unix
-OS_TYPE=unix
-
-## The following allows like systems to share settings this is not meant to
-## Imply that these OS are the same thing.
-case "$_os" in
-	"OS/2")
-	  OS_VERSION=os2
-	  CASE_INSENSITIVE_FS=true
-	  ;;
-	"SunOS")
-	  OS_VERSION=solaris
-	  ;;
-	Linux|GNU|GNU/*)
-	  OS_VERSION=linux
-	  ;;
-	"CYGWIN")
-	  OS_VERSION=cygwin
-	  CASE_INSENSITIVE_FS=true
-	  ;;
-	"MINGW")
-	  OS_VERSION=mingw
-	  OS_TYPE=winnt
-	  BUILDINFO="Windows / MinGW"
-	  CASE_INSENSITIVE_FS=true
-	  ;;
-	"MSVC6")
-	  OS_VERSION=msvc6
-	  OS_TYPE=winnt
-	  BUILDINFO="Windows / MS Visual C++"
-	  CASE_INSENSITIVE_FS=true
-	  ;;
-	"Darwin")
-	  OS_VERSION=macosx
-# MacOSX is not garuanteed to be case insensitive, assume it's case
-# sensitive, see issue 73661 for details.
-	  ;;
-	"FreeBSD")
-	  OS_VERSION=linux
-	  ;;
-	"OSF1")
-	  OS_VERSION=sysvr4
-	  ;;
-	"NetBSD")
-	  OS_VERSION=linux
-	  ;;
-	"IRIX")
-	  OS_VERSION=sysvr4
-	  ;;
-	"IRIX64")
-	  OS_VERSION=sysvr4
-	  ;;
-	"AIX")
-	  OS_VERSION=sysvr4
-	  ;;
-	"OpenBSD"|DragonFly)
-	  OS_VERSION=linux
-	  ;;
-   *)
-      { { echo "$as_me:$LINENO: error: $_os operating system is not suitable to build dmake!" >&5
-echo "$as_me: error: $_os operating system is not suitable to build dmake!" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-esac
-
-{ echo "$as_me:$LINENO: result: checked ($_os)" >&5
-echo "${ECHO_T}checked ($_os)" >&6; }
-
-
-
-if test x$OS_TYPE = xunix; then
-  OSTYPEUNIX_TRUE=
-  OSTYPEUNIX_FALSE='#'
-else
-  OSTYPEUNIX_TRUE='#'
-  OSTYPEUNIX_FALSE=
-fi
-
-
-
-if test x$OS_TYPE = xwinnt; then
-  OSTYPEWIN32_TRUE=
-  OSTYPEWIN32_FALSE='#'
-else
-  OSTYPEWIN32_TRUE='#'
-  OSTYPEWIN32_FALSE=
-fi
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define BUILDINFO "$BUILDINFO"
-_ACEOF
-
-
-if test x$CASE_INSENSITIVE_FS = xtrue; then
-
-cat >>confdefs.h <<\_ACEOF
-#define CASE_INSENSITIVE_FS 1
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking whether to do a build with dbug macros" >&5
-echo $ECHO_N "checking whether to do a build with dbug macros... $ECHO_C" >&6; }
-if test -n "$enable_dbug" && test "$enable_dbug" != "no"; then
-   DBUG="1"
-   CPPFLAGS="$CPPFLAGS -DDBUG=1 -I\$(top_srcdir)/dbug/dbug"
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-   DBUG=""
-   { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-if test -n "$DBUG"; then
-  DBUG_TRUE=
-  DBUG_FALSE='#'
-else
-  DBUG_TRUE='#'
-  DBUG_FALSE=
-fi
-
-
-{ echo "$as_me:$LINENO: checking if spawn shall be used" >&5
-echo $ECHO_N "checking if spawn shall be used... $ECHO_C" >&6; }
-if test -n "$enable_spawn" && test "$enable_spawn" != "no"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_SPAWN 1
-_ACEOF
-
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-   { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-eval dmakerootprefix="$datarootdir"
-# $datadir is ${prefix}/share if not overridden
-test "x$dmakerootprefix" != "x${dmakerootprefix##NONE}" && dmakerootprefix=${ac_default_prefix}/share
-
-if test x$OS_TYPE = xunix; then
-DMAKEROOT_H_LINE1='"DMAKEROOT := '${dmakerootprefix}'/startup",'
-fi
-
-
-ac_config_files="$ac_config_files dmakeroot.h Makefile startup/config.mk startup/Makefile startup/unix/Makefile startup/unix/linux/Makefile startup/unix/solaris/Makefile startup/unix/macosx/Makefile startup/unix/sysvr4/Makefile startup/unix/cygwin/Makefile startup/unix/os2/Makefile startup/winnt/Makefile startup/winnt/mingw/Makefile startup/winnt/msvc6/Makefile tests/Makefile"
-
-
-
-#AM_PROG_LIBTOOL
-
-
-
-
-
-
-
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <$ac_hdr>
-
-int
-main ()
-{
-if ((DIR *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-_ACEOF
-
-ac_header_dirent=$ac_hdr; break
-fi
-
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
-  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' dir; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_search_opendir=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
-else
-  ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-else
-  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' x; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_search_opendir=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
-else
-  ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_GREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_EGREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-
-   fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset cs;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *pcpcc;
-  char **ppc;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  pcpcc = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++pcpcc;
-  ppc = (char**) pcpcc;
-  pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-    if (s) return 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-    if (!foo) return 0;
-  }
-  return !cs[0] && !zero.x;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_c_const=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_const=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef off_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_off_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_off_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
-if test $ac_cv_type_off_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_size_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for int8" >&5
-echo $ECHO_N "checking for int8... $ECHO_C" >&6; }
-if test "${ac_cv_type_int8+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int8 ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_int8=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int8=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int8" >&5
-echo "${ECHO_T}$ac_cv_type_int8" >&6; }
-if test $ac_cv_type_int8 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INT8 1
-_ACEOF
-
-
-fi
-
-{ echo "$as_me:$LINENO: checking for uint8" >&5
-echo $ECHO_N "checking for uint8... $ECHO_C" >&6; }
-if test "${ac_cv_type_uint8+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef uint8 ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_uint8=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_uint8=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uint8" >&5
-echo "${ECHO_T}$ac_cv_type_uint8" >&6; }
-if test $ac_cv_type_uint8 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UINT8 1
-_ACEOF
-
-
-fi
-
-{ echo "$as_me:$LINENO: checking for int16" >&5
-echo $ECHO_N "checking for int16... $ECHO_C" >&6; }
-if test "${ac_cv_type_int16+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int16 ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_int16=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int16=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int16" >&5
-echo "${ECHO_T}$ac_cv_type_int16" >&6; }
-if test $ac_cv_type_int16 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INT16 1
-_ACEOF
-
-
-fi
-
-{ echo "$as_me:$LINENO: checking for uint16" >&5
-echo $ECHO_N "checking for uint16... $ECHO_C" >&6; }
-if test "${ac_cv_type_uint16+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef uint16 ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_uint16=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_uint16=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uint16" >&5
-echo "${ECHO_T}$ac_cv_type_uint16" >&6; }
-if test $ac_cv_type_uint16 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UINT16 1
-_ACEOF
-
-
-fi
-
-{ echo "$as_me:$LINENO: checking for int32" >&5
-echo $ECHO_N "checking for int32... $ECHO_C" >&6; }
-if test "${ac_cv_type_int32+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int32 ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_int32=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int32=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int32" >&5
-echo "${ECHO_T}$ac_cv_type_int32" >&6; }
-if test $ac_cv_type_int32 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INT32 1
-_ACEOF
-
-
-fi
-
-{ echo "$as_me:$LINENO: checking for uint32" >&5
-echo $ECHO_N "checking for uint32... $ECHO_C" >&6; }
-if test "${ac_cv_type_uint32+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef uint32 ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_uint32=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_uint32=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uint32" >&5
-echo "${ECHO_T}$ac_cv_type_uint32" >&6; }
-if test $ac_cv_type_uint32 = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UINT32 1
-_ACEOF
-
-
-fi
-
-{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
-if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_time=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_time=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6; }
-if test "${ac_cv_type_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef short ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_short=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_short=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_short=$ac_lo;;
-'') if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_short=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_short=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_short=0
-   fi
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
-
-
-{ echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
-
-{ echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-
-{ echo "$as_me:$LINENO: checking for working memcmp" >&5
-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
-if test "${ac_cv_func_memcmp_working+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_memcmp_working=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-  /* Some versions of memcmp are not 8-bit clean.  */
-  char c0 = '\100', c1 = '\200', c2 = '\201';
-  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-    return 1;
-
-  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-     or more and with at least one buffer not starting on a 4-byte boundary.
-     William Lewis provided this test program.   */
-  {
-    char foo[21];
-    char bar[21];
-    int i;
-    for (i = 0; i < 4; i++)
-      {
-	char *a = foo + i;
-	char *b = bar + i;
-	strcpy (a, "--------01111111");
-	strcpy (b, "--------10000000");
-	if (memcmp (a, b, 16) >= 0)
-	  return 1;
-      }
-    return 0;
-  }
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_memcmp_working=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_memcmp_working=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
-test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
-  *" memcmp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
- ;;
-esac
-
-
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_signal=int
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_signal=void
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-
-
-
-
-for ac_header in $ac_header_list
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-
-{ echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5
-echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6; }
-if test "${ac_cv_func_utime_null+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  rm -f conftest.data; >conftest.data
-# Sequent interprets utime(file, 0) to mean use start of epoch.  Wrong.
-if test "$cross_compiling" = yes; then
-  ac_cv_func_utime_null=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-	       #ifdef HAVE_UTIME_H
-	       # include <utime.h>
-	       #endif
-int
-main ()
-{
-struct stat s, t;
-  return ! (stat ("conftest.data", &s) == 0
-	    && utime ("conftest.data", 0) == 0
-	    && stat ("conftest.data", &t) == 0
-	    && t.st_mtime >= s.st_mtime
-	    && t.st_mtime - s.st_mtime < 120);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_utime_null=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_utime_null=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5
-echo "${ECHO_T}$ac_cv_func_utime_null" >&6; }
-if test $ac_cv_func_utime_null = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UTIME_NULL 1
-_ACEOF
-
-fi
-rm -f conftest.data
-
-
-for ac_func in vprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-{ echo "$as_me:$LINENO: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
-if test "${ac_cv_func__doprnt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define _doprnt innocuous__doprnt
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef _doprnt
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char _doprnt ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub__doprnt || defined __stub____doprnt
-choke me
-#endif
-
-int
-main ()
-{
-return _doprnt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func__doprnt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func__doprnt=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
-if test $ac_cv_func__doprnt = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOPRNT 1
-_ACEOF
-
-fi
-
-fi
-done
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in getcwd getwd strerror setvbuf tzset settz mkstemp tempnam gettimeofday setenv
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-# Usefull, but special to newlib/MSVC
-
-for ac_func in strlwr
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${OSTYPEUNIX_TRUE}" && test -z "${OSTYPEUNIX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"OSTYPEUNIX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"OSTYPEUNIX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${OSTYPEWIN32_TRUE}" && test -z "${OSTYPEWIN32_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"OSTYPEWIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"OSTYPEWIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${DBUG_TRUE}" && test -z "${DBUG_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"DBUG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"DBUG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by dmake $as_me 4.12, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-dmake config.status 4.12
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "dmakeroot.h") CONFIG_FILES="$CONFIG_FILES dmakeroot.h" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "startup/config.mk") CONFIG_FILES="$CONFIG_FILES startup/config.mk" ;;
-    "startup/Makefile") CONFIG_FILES="$CONFIG_FILES startup/Makefile" ;;
-    "startup/unix/Makefile") CONFIG_FILES="$CONFIG_FILES startup/unix/Makefile" ;;
-    "startup/unix/linux/Makefile") CONFIG_FILES="$CONFIG_FILES startup/unix/linux/Makefile" ;;
-    "startup/unix/solaris/Makefile") CONFIG_FILES="$CONFIG_FILES startup/unix/solaris/Makefile" ;;
-    "startup/unix/macosx/Makefile") CONFIG_FILES="$CONFIG_FILES startup/unix/macosx/Makefile" ;;
-    "startup/unix/sysvr4/Makefile") CONFIG_FILES="$CONFIG_FILES startup/unix/sysvr4/Makefile" ;;
-    "startup/unix/cygwin/Makefile") CONFIG_FILES="$CONFIG_FILES startup/unix/cygwin/Makefile" ;;
-    "startup/unix/os2/Makefile") CONFIG_FILES="$CONFIG_FILES startup/unix/os2/Makefile" ;;
-    "startup/winnt/Makefile") CONFIG_FILES="$CONFIG_FILES startup/winnt/Makefile" ;;
-    "startup/winnt/mingw/Makefile") CONFIG_FILES="$CONFIG_FILES startup/winnt/mingw/Makefile" ;;
-    "startup/winnt/msvc6/Makefile") CONFIG_FILES="$CONFIG_FILES startup/winnt/msvc6/Makefile" ;;
-    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-MAINT!$MAINT$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-CPP!$CPP$ac_delim
-LN_S!$LN_S$ac_delim
-RANLIB!$RANLIB$ac_delim
-OSTYPEUNIX_TRUE!$OSTYPEUNIX_TRUE$ac_delim
-OSTYPEUNIX_FALSE!$OSTYPEUNIX_FALSE$ac_delim
-OSTYPEWIN32_TRUE!$OSTYPEWIN32_TRUE$ac_delim
-OSTYPEWIN32_FALSE!$OSTYPEWIN32_FALSE$ac_delim
-OS_TYPE!$OS_TYPE$ac_delim
-OS_VERSION!$OS_VERSION$ac_delim
-DBUG_TRUE!$DBUG_TRUE$ac_delim
-DBUG_FALSE!$DBUG_FALSE$ac_delim
-DMAKEROOT_H_LINE1!$DMAKEROOT_H_LINE1$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
-  if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
-    fi
-  else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
-  fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-
diff --git a/dmake/configure.in b/dmake/configure.in
deleted file mode 100755
index c196413f9..000000000
--- a/dmake/configure.in
+++ /dev/null
@@ -1,220 +0,0 @@
-
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
-
-dnl Set the package version
-dnl Don't forget to update the PACKAGE, VERSION and BUILDINFO macros in
-dnl dmake/win95/microsft/config.h to keep the native Microsoft C++
-dnl compiler build happy. 
-AC_INIT(dmake, 4.12)
-AC_CANONICAL_BUILD
-BUILDINFO="$build"
-
-AC_CONFIG_SRCDIR(man/dmake.tf)
-AM_INIT_AUTOMAKE
-
-AM_MAINTAINER_MODE
-dnl Use this instead of AC_PROG_.. version
-AM_PROG_CC_C_O
-
-AC_CONFIG_HEADER(config.h)
-
-dnl Extra parameters
-AC_ARG_ENABLE(dbug,
-[  --enable-dbug:          Enable build with dbug macros.
-],,)
-
-AC_ARG_ENABLE(spawn,
-[  --enable-spawn:         Enables the use of spawn instead of fork/exec
-                          if it is supported.
-],,)
-dnl Checks for programs.
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-dnl Checks for utilities.
-AC_PROG_AWK
-
-dnl Checks for OS
-AC_MSG_CHECKING([the operating system])
-
-_os=`uname`
-
-if test `echo $_os | $AWK -F_ '{ print $1 }'` = "CYGWIN"; then
-   if test "$GCC" = "yes"; then
-      if test `$CC -dumpmachine | $AWK -F- '{ print $3 }'` = "mingw32"; then
-         _os="MINGW"
-      else
-         _os="CYGWIN"
-      fi
-   else
-      _os="MSVC6"
-   fi
-fi
-
-
-## At the moment all except mingw builds are OS_TYPE unix
-OS_TYPE=unix
-
-## The following allows like systems to share settings this is not meant to
-## Imply that these OS are the same thing.
-case "$_os" in
-	"OS/2")
-	  OS_VERSION=os2
-	  CASE_INSENSITIVE_FS=true
-	  ;;
-	"SunOS")
-	  OS_VERSION=solaris  
-	  ;;
-	Linux|GNU|GNU/*)
-	  OS_VERSION=linux
-	  ;;
-	"CYGWIN")
-	  OS_VERSION=cygwin
-	  CASE_INSENSITIVE_FS=true
-	  ;;
-	"MINGW")
-	  OS_VERSION=mingw
-	  OS_TYPE=winnt
-	  BUILDINFO="Windows / MinGW"
-	  CASE_INSENSITIVE_FS=true
-	  ;;
-	"MSVC6")
-	  OS_VERSION=msvc6
-	  OS_TYPE=winnt
-	  BUILDINFO="Windows / MS Visual C++"
-	  CASE_INSENSITIVE_FS=true
-	  ;;
-	"Darwin")
-	  OS_VERSION=macosx
-# MacOSX is not garuanteed to be case insensitive, assume it's case
-# sensitive, see issue 73661 for details.
-	  ;;
-	"FreeBSD")
-	  OS_VERSION=linux
-	  ;;
-	"OSF1")
-	  OS_VERSION=sysvr4
-	  ;;
-	"NetBSD")
-	  OS_VERSION=linux
-	  ;;
-	"IRIX")
-	  OS_VERSION=sysvr4
-	  ;;
-	"IRIX64")
-	  OS_VERSION=sysvr4
-	  ;;
-	"AIX")
-	  OS_VERSION=sysvr4
-	  ;;
-	"OpenBSD"|DragonFly)
-	  OS_VERSION=linux
-	  ;;
-   *)
-      AC_MSG_ERROR([$_os operating system is not suitable to build dmake!])
-      ;;
-esac
-
-AC_MSG_RESULT([checked ($_os)])
-
-dnl Set OS dependent settings
-AM_CONDITIONAL(OSTYPEUNIX, test x$OS_TYPE = xunix)
-AM_CONDITIONAL(OSTYPEWIN32, test x$OS_TYPE = xwinnt)
-
-AC_SUBST(OS_TYPE)
-AC_SUBST(OS_VERSION)
-AC_DEFINE_UNQUOTED(BUILDINFO, "$BUILDINFO", [Build info string])
-
-if test x$CASE_INSENSITIVE_FS = xtrue; then
-dnl Mac OSX with HFS+ and Windows FS are case insensitive (although case
-dnl preserving).
-AC_DEFINE(CASE_INSENSITIVE_FS, 1, [Assume case insensitive file system.])
-fi
-
-dnl =============================================
-dnl Enable dbug
-dnl =============================================
-AC_MSG_CHECKING([whether to do a build with dbug macros])
-if test -n "$enable_dbug" && test "$enable_dbug" != "no"; then
-   DBUG="1"
-   CPPFLAGS="$CPPFLAGS -DDBUG=1 -I\$(top_srcdir)/dbug/dbug"
-   AC_MSG_RESULT([yes])
-else
-   DBUG=""
-   AC_MSG_RESULT([no])
-fi
-AM_CONDITIONAL(DBUG, test -n "$DBUG")
-
-dnl =============================================
-dnl Enable spawn
-dnl =============================================
-AC_MSG_CHECKING([if spawn shall be used])
-if test -n "$enable_spawn" && test "$enable_spawn" != "no"; then
-   AC_DEFINE(ENABLE_SPAWN, 1, [Enables the use of spawn instead of fork/exec if it is supported.])
-   AC_MSG_RESULT([yes])
-else
-   AC_MSG_RESULT([no])
-fi
-
-dnl Predefine the DMAKEROOT macro for unix targets.
-eval dmakerootprefix="$datarootdir"
-# $datadir is ${prefix}/share if not overridden
-test "x$dmakerootprefix" != "x${dmakerootprefix##NONE}" && dmakerootprefix=${ac_default_prefix}/share
-
-if test x$OS_TYPE = xunix; then
-DMAKEROOT_H_LINE1='"DMAKEROOT := '${dmakerootprefix}'/startup",'
-fi
-AC_SUBST(DMAKEROOT_H_LINE1)
-
-dnl List (all possible) *.in files
-AC_CONFIG_FILES(dmakeroot.h Makefile startup/config.mk \
-		startup/Makefile startup/unix/Makefile \
-		startup/unix/linux/Makefile startup/unix/solaris/Makefile \
-		startup/unix/macosx/Makefile startup/unix/sysvr4/Makefile \
-		startup/unix/cygwin/Makefile \
-		startup/unix/os2/Makefile \
-		startup/winnt/Makefile startup/winnt/mingw/Makefile \
-		startup/winnt/msvc6/Makefile \
-		tests/Makefile)
-
-dnl Checks for libraries.
-
-dnl Initialize libtool
-#AM_PROG_LIBTOOL
-
-dnl Checks for header files.
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_OFF_T
-AC_TYPE_SIZE_T
-AC_CHECK_TYPES(int8)
-AC_CHECK_TYPES(uint8)
-AC_CHECK_TYPES(int16)
-AC_CHECK_TYPES(uint16)
-AC_CHECK_TYPES(int32)
-AC_CHECK_TYPES(uint32)
-AC_HEADER_TIME
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-
-dnl Checks for library functions.
-AC_FUNC_MEMCMP
-AC_TYPE_SIGNAL
-AC_FUNC_UTIME_NULL
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(getcwd getwd strerror setvbuf tzset settz mkstemp tempnam gettimeofday setenv)
-# Usefull, but special to newlib/MSVC
-AC_CHECK_FUNCS(strlwr)
-
-dnl *** output to disk ***
-AC_OUTPUT
-
diff --git a/dmake/dag.c b/dmake/dag.c
deleted file mode 100644
index a1e114576..000000000
--- a/dmake/dag.c
+++ /dev/null
@@ -1,697 +0,0 @@
-/* $RCSfile: dag.c,v $
--- $Revision: 1.12 $
--- last change: $Author: kz $ $Date: 2008-03-05 18:27:48 $
---
--- SYNOPSIS
---      Routines to construct the internal dag.
--- 
--- DESCRIPTION
---	This file contains all the routines that are responsible for
---	defining and manipulating all objects used by the make facility.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-
-static void
-set_macro_value(hp)/*
-=====================
-  Set the macro according to its type. In addition to the string value
-  in hp->ht_value a macro can stores a value casted with its type.
-*/
-HASHPTR hp;
-{
-   switch( hp->ht_flag & M_VAR_MASK )	/* only one var type per var */
-   {
-      case M_VAR_STRING:
-     *hp->MV_SVAR = hp->ht_value;
-     /* Add special treatment for PWD/MAKEDIR for .WINPATH. */
-     if( hp->MV_SVAR == &Pwd_macval ) {
-        if( Pwd )
-           FREE(Pwd);
-        Pwd = hp->ht_value;
-        /* Use the "DOSified" path for the macro. */
-        *hp->MV_SVAR = hp->ht_value = DmStrDup(DO_WINPATH(hp->ht_value));
-        DB_PRINT( "smv", ("PWD: %s/%s", Pwd_macval, Pwd) );
-     } else if( hp->MV_SVAR == &Makedir_macval ) {
-        if( Makedir )
-           FREE(Makedir);
-        Makedir = hp->ht_value;
-        /* Use the "DOSified" path for the macro. */
-        *hp->MV_SVAR = hp->ht_value = DmStrDup(DO_WINPATH(hp->ht_value));
-        DB_PRINT( "smv", ("MAKEDIR: %s/%s", Makedir_macval, Makedir) );
-     }
-     /* No special treatment for TMD needed. */
-     break;
-
-      case M_VAR_CHAR:
-         *hp->MV_CVAR = (hp->ht_value == NIL(char)) ? '\0':*hp->ht_value;
-         break;
-         
-      case M_VAR_INT: {
-         int tvalue;
-         if( hp->MV_IVAR == NIL(int) ) break;	/* first time */
-         
-         tvalue = atoi(hp->ht_value);
-         if( hp->MV_IVAR == &Buffer_size ) {
-        /* If Buffer_size (MAXLINELENGTH) is modified then make sure
-         * you change the size of the real buffer as well. As the
-         * value will at least be BUFSIZ this might lead to the
-         * situation that the (string) value of MAXLINELENGTH is
-         * smaller than the integer value. */
-            tvalue = (tvalue < (BUFSIZ-2)) ? BUFSIZ : tvalue+2;
-            if( Buffer_size == tvalue ) break;
-            if( Buffer ) FREE(Buffer);
-            if((Buffer=MALLOC(tvalue, char)) == NIL(char)) No_ram();
-            *Buffer = '\0';
-         }
-         *hp->MV_IVAR = tvalue;
-         
-         if( hp->MV_IVAR == &Max_proc || hp->MV_IVAR == &Max_proclmt ) {
-            if( tvalue < 1 )
-               Fatal( "Process limit value must be > 1" );
-
-#if defined(USE_CREATEPROCESS)
-            if( Max_proclmt > MAXIMUM_WAIT_OBJECTS )
-               Fatal( "Specified maximum # of processes (MAXPROCESSLIMIT)"
-              " exceeds OS limit of [%d].", MAXIMUM_WAIT_OBJECTS );
-#endif
-            
-            if( Max_proc > Max_proclmt )
-               Fatal( "Specified # of processes exceeds limit of [%d]",
-                      Max_proclmt );
-
-        /* Don't change MAXPROCESS value if .SEQUENTIAL is set. */
-        if( (Glob_attr & A_SEQ) && (Max_proc != 1) ) {
-           Warning( "Macro MAXPROCESS set to 1 because .SEQUENTIAL is set." );
-           Max_proc = 1;
-           if( hp->ht_value != NIL(char) ) FREE(hp->ht_value);
-           hp->ht_value = DmStrDup( "1" );
-        }
-         }
-      } break;
-      
-      case M_VAR_BIT:
-         /* Bit variables are set to 1 if ht_value is not NULL and 0
-          * otherwise */
-         
-         if( hp->ht_value == NIL(char) )
-            *hp->MV_BVAR &= ~hp->MV_MASK;
-         else {
-            *hp->MV_BVAR |= hp->MV_MASK;
-        /* If we're setting .SEQUENTIAL set MAXPROCESS=1. */
-        if( (hp->MV_MASK & A_SEQ) && (Max_proc != 1) )
-           Def_macro( "MAXPROCESS", "1", M_MULTI|M_EXPANDED);
-     }
-
-#if defined(__CYGWIN__)
-     /* Global .WINPATH change. Only needed for cygwin. */
-     if(hp->MV_MASK & A_WINPATH) {
-        UseWinpath = ((Glob_attr&A_WINPATH) != 0);
-        /* Change MAKEDIR, PWD according to .WINPATH. During
-         * makefile evaluation this cannot change TMD (it is "."
-         * and later TMD is set in Make() according to the
-         * .WINPATH attribute. */
-        Def_macro( "MAKEDIR", Makedir, M_FORCE | M_EXPANDED );
-        Def_macro( "PWD", Pwd, M_FORCE | M_EXPANDED );
-     }
-#endif
-     break;
-   }
-}
-
-
-PUBLIC HASHPTR
-Get_name( name, tab, define )/*
-===============================
-    Look to see if the name is defined, if it is then return
-    a pointer to its node, if not return NIL(HASH).
-    If define is TRUE and the name is not found it will be added. */
-
-char    *name;			/* name we are looking for   */
-HASHPTR *tab;			/* the hash table to look in */
-int	define;			/* TRUE => add to table      */
-{
-   register HASHPTR hp;
-   register char    *p;
-   uint16           hv;
-   uint32           hash_key;
-
-   DB_ENTER( "Get_name" );
-   DB_PRINT( "name", ("Looking for %s", name) );
-
-   hp = Search_table( tab, name, &hv, &hash_key );
-
-   if( hp == NIL(HASH) && define ) {
-      /* Check to make sure that CELL name contains only printable chars */
-      for( p=name; *p; p++ )
-     if( !isprint(*p) && !iswhite(*p) && *p != '\n' )
-        Fatal( "Name contains non-printable character [0x%02x]", *p );
-
-      TALLOC( hp, 1, HASH );		/* allocate a cell and add it in */
-
-      hp->ht_name  = DmStrDup( name );
-      hp->ht_hash  = hash_key;
-      hp->ht_next  = tab[ hv ];
-      tab[ hv ]    = hp;
-
-      DB_PRINT( "name", ("Adding %s", name) );
-   }
-
-   DB_PRINT( "name",("Returning: [%s,%lu]",
-         (hp == NIL(HASH)) ? "":hp->ht_name, hv) );
-   DB_RETURN( hp );
-}
-
-
-PUBLIC HASHPTR
-Search_table( tab, name, phv, phkey )
-HASHPTR *tab;
-char    *name;
-uint16  *phv;
-uint32  *phkey;
-{
-   HASHPTR hp;
-
-   *phv = Hash( name, phkey );
-
-   for( hp = tab[ *phv ]; hp != NIL(HASH); hp = hp->ht_next )
-      if(    hp->ht_hash == *phkey
-      && !strcmp(hp->ht_name, name) )
-         break;
-
-   return( hp );
-}
-
-
-PUBLIC HASHPTR
-Push_macro(hp)/*
-================
-  This function pushes hp into the hash of all macros. If a previous
-  instance of the macro exists it is hidden by the new one. If one
-  existed before the new instance inherits some values from the preexisting
-  macro (see below for details).
-*/
-HASHPTR hp;
-{
-   HASHPTR cur,prev;
-   uint16  hv;
-   uint32  key;
-
-   hv = Hash(hp->ht_name, &key);
-
-   /* Search for an existing instance of hp->ht_name, if found cur will point
-    * to it. */
-   for(prev=NIL(HASH),cur=Macs[hv]; cur!=NIL(HASH); prev=cur,cur=cur->ht_next)
-      if(    cur->ht_hash == key
-      && !strcmp(cur->ht_name, hp->ht_name) )
-         break;
-
-   if (cur == NIL(HASH) || prev == NIL(HASH)) {
-      /* If no match or was found or the first element of Macs[hv] was
-       * the match insert hp at the beginning. */
-      hp->ht_next  = Macs[hv];
-      Macs[hv] = hp;
-   }
-   else {
-      /* otherwise insert hp in the chain. */
-      hp->ht_next = prev->ht_next;
-      prev->ht_next = hp;
-   }
-
-   /* Inherit some parts of the former instance. Copying cur->var to hp->var
-    * copies the old value. Keeping the M_VAR_MASK (variable type) makes sure
-    * the type stays the same keeping M_PRECIOUS assures that the old values
-    * cannot be overridden if it is/was set. */
-   if (cur) {
-      memcpy((void *)&hp->var, (void *)&cur->var, sizeof(hp->var));
-      hp->ht_flag |= ((M_VAR_MASK|M_PRECIOUS) & cur->ht_flag);
-   }
-   
-   return(hp);   
-}
-
-
-PUBLIC HASHPTR
-Pop_macro(hp)/*
-================
-  This function pops (removes) hp from the hash of all macros. If a previous
-  instance of the macro existed it becomes accessible again.
-*/
-
-HASHPTR hp;
-{
-   HASHPTR cur,prev;
-   uint16  hv;
-   uint32  key;
-
-   hv = Hash(hp->ht_name, &key);
-
-   /* Try to find hp. */ 
-   for(prev=NIL(HASH),cur=Macs[hv]; cur != NIL(HASH);prev=cur,cur=cur->ht_next)
-      if (cur == hp)
-     break;
-
-   /* If cur == NIL macros was not found. */
-   if (cur == NIL(HASH))
-      return(NIL(HASH));
-
-   /* Remove hp from the linked list. */
-   if (prev)
-      prev->ht_next = cur->ht_next;
-   else
-      Macs[hv] = cur->ht_next;
-
-   /* Look for a previous (older) instance of hp->ht_name. */
-   for(cur=cur->ht_next; cur != NIL(HASH); cur=cur->ht_next)
-      if(    cur->ht_hash == key
-      && !strcmp(cur->ht_name, hp->ht_name) )
-         break;
-
-   /* If one was found we restore the typecast values. */
-   if (cur)
-      set_macro_value(cur);
-
-   hp->ht_next = NIL(HASH);
-   return(hp);   
-}
-
-
-
-PUBLIC HASHPTR
-Def_macro( name, value, flags )/*
-=================================
-   This routine is used to define a macro, and it's value. A copy of
-   the content of value is stored and not the pointer to the value.
-   The flags indicates if it is a permanent macro or if it's value
-   can be redefined.  A flags of M_PRECIOUS means it is a precious
-   macro and cannot be further redefined unless M_FORCE is used.
-   If the flags flag contains the M_MULTI bit it means that the macro
-   can be redefined multiple times and no warning of the redefinitions
-   should be issued.
-   Once a macro's VAR flags are set they are preserved through all future
-   macro definitions.
-   
-   Macro definitions that have one of the variable bits set are treated
-   specially.  In each case the hash table entry var field points at the
-   global variable that can be set by assigning to the macro.
-   
-   bit valued global vars must be computed when the macro value is changed.
-   char valued global vars must have the first char of ht_value copied to
-   them.  string valued global vars have the same value as ht_value and should
-   just have the new value of ht_value copied to them.  */
-
-char    *name;			/* macro name to define	*/
-char    *value;			/* macro value to set	*/
-int     flags;			/* initial ht_flags	*/
-{
-   register HASHPTR   hp;
-   register char      *p, *q;
-
-   DB_ENTER( "Def_macro" );
-   DB_PRINT( "mac", ("Defining macro %s = %s, %x", name, value, flags) );
-
-   /* check to see if name is in the table, if so then just overwrite
-      the previous definition.  Otherwise allocate a new node, and
-      stuff it in the hash table, at the front of any linked list */
-
-   if( Readenv ) flags |= M_LITERAL|M_EXPANDED;
-
-   hp = Get_name( name, Macs, TRUE );
-
-   if ((flags & M_PUSH) && hp->ht_name != NIL(char)) {
-      HASHPTR thp=hp;
-      TALLOC(hp,1,HASH);
-      hp->ht_name  = DmStrDup(thp->ht_name);
-      hp->ht_hash  = thp->ht_hash;
-      Push_macro(hp);
-      flags |= hp->ht_flag;
-   }
-   flags &= ~M_PUSH;
-
-   if( (hp->ht_flag & M_PRECIOUS) && !(flags & M_FORCE) ) {
-      if  (Verbose & V_WARNALL)
-         Warning( "Macro `%s' cannot be redefined", name );
-      DB_RETURN( hp );
-   }
-
-   /* Make sure we don't export macros whose names contain legal macro
-    * assignment operators, since we can't do proper quoting in the
-    * environment. */
-   if( *DmStrPbrk(name, "*+:=") != '\0' ) flags |= M_NOEXPORT;
-
-   if( hp->ht_value != NIL(char) ) FREE( hp->ht_value );
-
-   if( (hp->ht_flag & M_USED) && !((flags | hp->ht_flag) & M_MULTI) )
-      Warning( "Macro `%s' redefined after use", name );
-
-   /* If an empty string ("") is given set ht_value to NIL(char) */
-   if( (value != NIL(char)) && (*value) ) {
-
-      if( !(flags & M_LITERAL) ) {
-     q = DmStrDup(value);
-     /* strip out any \<nl> combinations where \ is the current
-      * CONTINUATION char */
-     for(p=q; (p=strchr(p,CONTINUATION_CHAR))!=NIL(char); )
-        if( p[1] == '\n' ) {
-           size_t len = strlen(p+2)+1;
-           memmove ( p, p+2, len );
-        }
-        else
-           p++;
-
-     p = DmStrSpn(q ," \t");	/* Strip white space before ... */
-     if( p != q ) {
-        size_t len = strlen(p)+1;
-        memmove( q, p, len );
-        p = q;
-     }
-
-     if( *p ) {			/* ... and after the value. */
-        for(q=p+strlen(p)-1; ((*q == ' ')||(*q == '\t')); q--);
-        *++q = '\0';
-     }
-     flags &= ~M_LITERAL;
-      }
-      else
-     p = DmStrDup( value );	   		/* take string literally   */
-      
-      if( !*p )	{				/* check if result is ""   */
-         FREE( p );
-         p = NIL(char);
-     flags |= M_EXPANDED;
-      }
-      else if( *DmStrPbrk( p, "${}" ) == '\0' )
-     flags |= M_EXPANDED;
-
-      hp->ht_value = p;
-   }
-   else {
-      hp->ht_value = NIL(char);
-      flags |= M_EXPANDED;
-   }
-
-   /* Assign the hash table flag less the M_MULTI flag, it is used only
-    * to silence the warning.  But carry it over if it was previously
-    * defined in ht_flag, as this is a permanent M_MULTI variable. Keep
-    * the M_PRECIOUS flag and strip the M_INIT flag. */
-
-   hp->ht_flag = ((flags & ~(M_MULTI|M_FORCE)) |
-          (hp->ht_flag & (M_VAR_MASK|M_MULTI|M_PRECIOUS))) & ~M_INIT;
-   
-   /* Check for macro variables and make the necessary adjustment in the
-    * corresponding global variables */
-    
-   if( hp->ht_flag & M_VAR_MASK ) {
-      if( !(flags & M_EXPANDED) )
-     Error( "Macro variable '%s' must be assigned with :=", name );
-      else
-         set_macro_value(hp);
-   }
-
-   DB_RETURN( hp );
-}
-
-
-
-PUBLIC CELLPTR
-Def_cell( name )/*
-==================
-   Check if a cell for "name" already exists, if not create a new cell.
-   The value of name is normalized before checking/creating the cell to
-   avoid creating multiple cells for the same target file.
-   The function returns a pointer to the cell. */
-char    *name;
-{
-   register HASHPTR  hp;
-   register CELLPTR  cp;
-   register CELLPTR  lib;
-   char		     *member;
-   char		     *end;
-
-   DB_ENTER( "Def_cell" );
-
-   /* Check to see if the cell is a member of the form lib(member) or
-    * lib((symbol)) and handle the cases appropriately.
-    * What we do is we look at the target, if it is of the above two
-    * forms we get the lib, and add the member/symbol to the list of
-    * prerequisites for the library.  If this is a symbol name def'n
-    * we additionally add the attribute A_SYMBOL, so that stat can
-    * try to do the right thing.  */
-
-   if( ((member = strchr(name, '('))     != NIL(char)) &&
-       ((end    = strrchr(member,  ')')) != NIL(char)) &&
-       (member > name) && (member[-1] != '$') &&
-       (end > member+1)  && (end[1] == '\0') )
-   {
-      *member++ = *end = '\0';
-
-      if( (*member == '(') && (member[strlen(member)-1] == ')') ) {
-     member[ strlen(member)-1 ] = '\0';
-     cp = Def_cell( member+1 );
-     cp->ce_attr |= A_SYMBOL;
-      }
-      else
-     cp = Def_cell( member );
-
-      lib  = Def_cell( name );
-
-      Add_prerequisite( lib, cp, FALSE, FALSE );
-      lib->ce_attr |= A_LIBRARY | A_COMPOSITE;
-
-      if( !Def_targets ) cp = lib;
-   }
-   else {
-      /* Normalize the name. */
-      DB_PRINT( "path", ("Normalizing [%s]", name) );
-
-      /* The normalizing function returns a pointer to a static buffer. */
-      name = normalize_path(name);
-
-      hp = Get_name( name, Defs, TRUE );/* get the name from hash table */
-
-      if( hp->CP_OWNR == NIL(CELL) )	/* was it previously defined    */
-      {					/* NO, so define a new cell	*/
-     DB_PRINT( "cell", ("Defining cell [%s]", name) );
-
-     TALLOC( cp, 1, CELL );
-     hp->CP_OWNR = cp;
-     cp->ce_name = hp;
-     cp->ce_fname = hp->ht_name;
-     cp->ce_all.cl_prq = cp;
-      }
-      else 				/* YES, so return the old cell	*/
-      {
-     DB_PRINT( "cell", ("Getting cell [%s]", hp->ht_name) );
-     cp = hp->CP_OWNR;
-      }
-   }
-
-   DB_RETURN( cp );
-}
-
-
-
-
-PUBLIC LINKPTR
-Add_prerequisite( cell, prq, head, force )/*
-============================================
-    Add a dependency node to the dag.  It adds it to the prerequisites,
-    if any, of the cell and makes certain they are in linear order.
-    If head == 1, then add to head of the prerequisite list, else
-    add to tail. */
-CELLPTR cell;
-CELLPTR prq;
-int     head;
-int     force;
-{
-   register LINKPTR lp, tlp;
-
-   DB_ENTER( "Add_prerequisite" );
-   DB_PRINT( "cell", ("Defining prerequisite %s", prq->CE_NAME) );
-
-   if( (prq->ce_flag & (F_MAGIC | F_PERCENT)) && !force )
-      Fatal( "Special target [%s] cannot be a prerequisite",
-             prq->CE_NAME );
-
-   if( cell->ce_prq == NIL(LINK) ) {	/* it's the first one	*/
-      TALLOC( lp, 1, LINK );
-      lp->cl_prq   = prq;
-      cell->ce_prq = lp;
-   }
-   else	{	/* search the list, checking for duplicates	*/
-      for( lp = cell->ce_prq;
-       (lp->cl_next != NIL(LINK)) && (lp->cl_prq != prq);
-       lp = lp->cl_next );
-
-      /* If the prq is not found and we are at the last prq in the list,
-       * allocate a new prq and place it into the list, insert it at the
-       * head if head == 1, else we add it to the end. */
-
-      if( lp->cl_prq != prq ) {
-     TALLOC( tlp, 1, LINK );
-     tlp->cl_prq = prq;
-
-     if( head ) {
-        tlp->cl_next = cell->ce_prq;
-        cell->ce_prq = tlp;
-     }
-     else
-        lp->cl_next  = tlp;
-
-     lp = tlp;
-      }
-   }
-
-   DB_RETURN( lp );
-}
-
-
-
-PUBLIC void
-Clear_prerequisites( cell )/*
-=============================
-    Clear out the list of prerequisites, freeing all of the LINK nodes,
-    and setting the list to NULL */
-CELLPTR cell;
-{
-   LINKPTR lp, tlp;
-
-   DB_ENTER( "Clear_prerequisites" );
-   DB_PRINT( "cell", ("Nuking prerequisites") );
-
-   if( cell == NIL(CELL) ) { DB_VOID_RETURN; }
-
-   for( lp=cell->ce_prq; lp != NIL(LINK); lp=tlp ) {
-      tlp=lp->cl_next;
-      FREE( lp );
-   }
-
-   cell->ce_prq = NIL(LINK);
-
-   DB_VOID_RETURN;
-}
-
-
-PUBLIC int
-Test_circle( cp, fail )/*
-=========================
-    Actually run through the graph */
-CELLPTR cp;
-int     fail;
-{
-   register LINKPTR lp;
-   int res = 0;
-
-   DB_ENTER( "Test_circle" );
-   DB_PRINT( "tc", ("checking [%s]", cp->CE_NAME) );
-
-   if( cp->ce_flag & F_MARK ) {
-      if( fail )
-     Fatal("Detected circular dependency in graph at [%s]", cp->CE_NAME);
-      else
-     DB_RETURN( 1 );
-   }
-
-   cp->ce_flag |= F_MARK;
-   for( lp = cp->ce_prq; !res && lp != NIL(LINK); lp = lp->cl_next )
-      res = Test_circle( lp->cl_prq, fail );
-   cp->ce_flag ^= F_MARK;
-
-   DB_RETURN( res );
-}
-
-
-
-PUBLIC STRINGPTR
-Def_recipe( rcp, sp, white_too, no_check )/*
-=============================================
-   Take the recipe (rcp) and add it to the list of recipes pointed to by
-   sp (sp points to the last element).  If white_too == TRUE add the recipe
-   even if it contains only white space or an empty string.
-   Return a pointer to the new recipe (or sp if it was discarded).
-   If no_check is true then don't look for -@ at the start of the recipe
-   line. */
-char      *rcp;
-STRINGPTR sp;
-int       white_too;
-int       no_check;
-{
-   register STRINGPTR nsp;
-   register char      *rp;
-
-   DB_ENTER( "Def_recipe" );
-   DB_PRINT( "rul", ("Defining recipe %s", rcp) );
-
-   if( !white_too ) rcp = DmStrSpn( rcp, " \t" );
-   if( (rcp == NIL(char)) || (*rcp == 0 && !white_too) )
-      DB_RETURN( sp );	     /* return last recipe when new recipe not added */
-
-   rp = no_check ? rcp : DmStrSpn( rcp, " \t@-+%" );
-
-   TALLOC(nsp, 1, STRING);
-   nsp->st_string = DmStrDup( rp );
-
-   if( sp != NIL(STRING) ) sp->st_next = nsp;
-   nsp->st_next = NIL(STRING);
-
-   if( !no_check ) nsp->st_attr |= Rcp_attribute( rcp );
-
-   DB_RETURN( nsp );
-}
-
-
-PUBLIC t_attr
-Rcp_attribute( rp )/*
-======================
-   Look at the recipe and return the set of attributes that it defines. */
-char *rp;
-{
-   t_attr flag = A_DEFAULT;
-   int    done = FALSE;
-   int atcount = 0;
-
-   while( !done )
-      switch( *rp++ )
-      {
-     case '@' : ++atcount;        break;
-     case '-' : flag |= A_IGNORE; break;
-     case '+' : flag |= A_SHELL;  break;
-     case '%' :
-#if defined(MSDOS)
-        /* Ignore % in the non-MSDOS case. */
-        flag |= A_SWAP;
-#endif
-        break;
-
-     case ' ' :
-     case '\t': break;
-
-     default: done = TRUE; break;
-      }
-
-   if( !(Verbose & V_FORCEECHO) && atcount-- ) {
-      flag |= A_SILENT;
-      /* hide output if more than one @ are encountered. */
-      if( atcount )
-     flag |= A_MUTE;
-   }
-
-   return(flag);
-}
diff --git a/dmake/db.h b/dmake/db.h
deleted file mode 100644
index d0bae7f58..000000000
--- a/dmake/db.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* RCS  $Id: db.h,v 1.1.1.1 2000-09-22 15:33:25 hr Exp $
---
--- SYNOPSIS
---      Front end to DBUG macros.
--- 
--- DESCRIPTION
---	This is a front end to Fred Fish's DBUG macros.  The intent was
---	to provide an interface so that if you don't have the DBUG code
---	you can still compile dmake, by undefining DBUG, if you do have
---	the code then you can use Fred Fish's DBUG package.  Originally
---	the DBUG stuff was copyrighted, it is now in the public domain
---	so the need for this is not as apparent.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef	DB_h
-#define	DB_h
-
-#ifdef DBUG
-
-#  include "dbug.h"
-
-#  define DB_ENTER(a1)                DBUG_ENTER(a1)
-#  define DB_RETURN(a1)               DBUG_RETURN(a1)
-#  define DB_VOID_RETURN              DBUG_VOID_RETURN
-#  define DB_EXECUTE(keyword, a1)     DBUG_EXECUTE(keyword,a1)
-#  define DB_PRINT(keyword,arglist)   DBUG_PRINT(keyword,arglist)
-#  define DB_PUSH(a1)                 DBUG_PUSH(a1)
-#  define DB_POP()                    DBUG_POP()
-#  define DB_PROCESS(a1)              DBUG_PROCESS(a1)
-#  define DB_FILE(file)               DBUG_FILE(file)
-#  define DB_SETJMP                   DBUG_SETJMP
-#  define DB_LONGJMP                  DBUG_LONGJMP
-
-#else
-
-#  define DB_ENTER(a1)
-#  define DB_RETURN(a1)               return (a1)
-#  define DB_VOID_RETURN              return
-#  define DB_EXECUTE(keyword, a1)
-#  define DB_PRINT(keyword,arglist)
-#  define DB_PUSH(a1)
-#  define DB_POP()
-#  define DB_PROCESS(a1)
-#  define DB_FILE(file)
-#  define DB_SETJMP                   setjmp
-#  define DB_LONGJMP                  longjmp
-
-#endif
-#endif
-
diff --git a/dmake/dbug/dbug.mk b/dmake/dbug/dbug.mk
deleted file mode 100644
index 09aa82d7f..000000000
--- a/dmake/dbug/dbug.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# Set the proper macros based on whether we are making the debugging version
-# or not.  The valid parameters to this file are:
-#
-#	DEBUG=1		==> enable the making of the DBUG version
-#	DBMALLOC=1	==> enable DBUG version with extensive MALLOC checking
-#
-#	DB_CFLAGS	==> CFLAGS is set to this value at the end if DEBUG=1
-#	DB_LDFLAGS	==> LDFLAGS is set to this at the end if DEBUG=1
-#	DB_LDLIBS       ==> LDLIBS is set to this at end if DEBUG=1
-#
-# The non debug versions of the above three macros are:
-#
-#	NDB_CFLAGS
-#	NDB_LDFLAGS
-#	NDB_LDLIBS
-#
-# One of the set of three should have values set appropriately prior to
-# sourcing this file.
-
-.IF $(DEBUG)
-   DBUG_SRC	+= dbug.c
-   DB_CFLAGS    += -Idbug/dbug
-
-   .SETDIR=dbug/dbug : $(DBUG_SRC)
-
-   # If DBMALLOC is requested (ie non-NULL) then include the sources for
-   # compilation.  BSD 4.3 needs the getwd.c source compiled in due to a bug
-   # in the clib getwd routine.
-   .IF $(DBMALLOC)
-      # Serious bug in bsd43 getwd.c would free a string and then use its
-      # value.  The DBMALLOC code clears a string when it is free'd so the
-      # value was no longer valid and the returned path for the current
-      # directory was now completely wrong.
-      .IF $(OSRELEASE) == bsd43
-     GETWD_SRC += getwd.c
-     .SETDIR=dbug : $(GETWD_SRC)
-      .END
-
-      MLC_SRC   += malloc.c free.c realloc.c calloc.c string.c\
-           mlc_chk.c mlc_chn.c memory.c tostring.c m_perror.c\
-           m_init.c mallopt.c dump.c
-
-      .SETDIR=dbug/malloc : $(MLC_SRC)
-
-      DB_CFLAGS += -Idbug/malloc
-   .END
-
-   SRC          += $(DBUG_SRC) $(MLC_SRC) $(GETWD_SRC)
-   HDR		+= db.h 
-
-   LDFLAGS	+= $(DB_LDFLAGS)
-   LDLIBS	+= $(DB_LDLIBS)
-
-   __.SILENT	!:= $(.SILENT)
-   .SILENT	!:= yes
-   TARGET	:= db$(TARGET)
-   OBJDIR	:= $(OBJDIR).dbg
-   .SILENT	!:= $(__.SILENT)
-
-   CFLAGS	+= $(DB_CFLAGS)
-   .KEEP_STATE  := _dbstate.mk
-.ELSE
-   CFLAGS       += $(NDB_CFLAGS)
-   LDFLAGS      += $(NDB_LDFLAGS)
-   LDLIBS       += $(NDB_LDLIBS)
-.END
diff --git a/dmake/dbug/dbug/dbug.c b/dmake/dbug/dbug/dbug.c
deleted file mode 100644
index c866cf7a3..000000000
--- a/dmake/dbug/dbug/dbug.c
+++ /dev/null
@@ -1,1806 +0,0 @@
-/******************************************************************************
- *									      *
- *	                           N O T I C E				      *
- *									      *
- *	              Copyright Abandoned, 1987, Fred Fish		      *
- *									      *
- *									      *
- *	This previously copyrighted work has been placed into the  public     *
- *	domain  by  the  author  and  may be freely used for any purpose,     *
- *	private or commercial.						      *
- *									      *
- *	Because of the number of inquiries I was receiving about the  use     *
- *	of this product in commercially developed works I have decided to     *
- *	simply make it public domain to further its unrestricted use.   I     *
- *	specifically  would  be  most happy to see this material become a     *
- *	part of the standard Unix distributions by AT&T and the  Berkeley     *
- *	Computer  Science  Research Group, and a standard part of the GNU     *
- *	system from the Free Software Foundation.			      *
- *									      *
- *	I would appreciate it, as a courtesy, if this notice is  left  in     *
- *	all copies and derivative works.  Thank you.			      *
- *									      *
- *	The author makes no warranty of any kind  with  respect  to  this     *
- *	product  and  explicitly disclaims any implied warranties of mer-     *
- *	chantability or fitness for any particular purpose.		      *
- *									      *
- ******************************************************************************
- */
-
-
-/*
- *  FILE
- *
- *	dbug.c   runtime support routines for dbug package
- *
- *  SCCS
- *
- *	@(#)dbug.c	1.19 9/5/87
- *
- *  DESCRIPTION
- *
- *	These are the runtime support routines for the dbug package.
- *	The dbug package has two main components; the user include
- *	file containing various macro definitions, and the runtime
- *	support routines which are called from the macro expansions.
- *
- *	Externally visible functions in the runtime support module
- *	use the naming convention pattern "_db_xx...xx_", thus
- *	they are unlikely to collide with user defined function names.
- *
- *  AUTHOR(S)
- *
- *	Fred Fish		(base code)
- *	(Currently at Motorola Computer Division, Tempe, Az.)
- *	hao!noao!mcdsun!fnf
- *	(602) 438-3614
- *
- *	Binayak Banerjee	(profiling enhancements)
- *	seismo!bpa!sjuvax!bbanerje
- */
-
-
-#include <stdio.h>
-#ifdef amiga
-#define AMIGA
-#endif
-
-#ifdef AMIGA
-#define HZ (50)			/* Probably in some header somewhere */
-#endif
-
-/*
- *	Manifest constants that should not require any changes.
- */
-
-#define FALSE		0	/* Boolean FALSE */
-#define TRUE		1	/* Boolean TRUE */
-#define EOS		'\000'	/* End Of String marker */
-
-/*
- *	Manifest constants which may be "tuned" if desired.
- */
-
-#define PRINTBUF	1024	/* Print buffer size */
-#define INDENT		4	/* Indentation per trace level */
-#define MAXDEPTH	200	/* Maximum trace depth default */
-
-/*
- *	The following flags are used to determine which
- *	capabilities the user has enabled with the state
- *	push macro.
- */
-
-#define TRACE_ON	000001	/* Trace enabled */
-#define DEBUG_ON	000002	/* Debug enabled */
-#define FILE_ON 	000004	/* File name print enabled */
-#define LINE_ON		000010	/* Line number print enabled */
-#define DEPTH_ON	000020	/* Function nest level print enabled */
-#define PROCESS_ON	000040	/* Process name print enabled */
-#define NUMBER_ON	000100	/* Number each line of output */
-#define PROFILE_ON	000200	/* Print out profiling code */
-
-#define TRACING (stack -> flags & TRACE_ON)
-#define DEBUGGING (stack -> flags & DEBUG_ON)
-#define PROFILING (stack -> flags & PROFILE_ON)
-#define STREQ(a,b) (strcmp(a,b) == 0)
-
-/*
- *	Typedefs to make things more obvious.
- */
-
-#define VOID void		/* Can't use typedef for most compilers */
-typedef int BOOLEAN;
-
-/*
- *	Make it easy to change storage classes if necessary.
- */
-
-#define LOCAL static		/* Names not needed by outside world */
-#define IMPORT extern		/* Names defined externally */
-#define EXPORT			/* Allocated here, available globally */
-#define AUTO auto		/* Names to be allocated on stack */
-#define REGISTER register	/* Names to be placed in registers */
-
-/*
- *	The following define is for the variable arguments kluge, see
- *	the comments in _db_doprnt_().
- *
- *	Also note that the longer this list, the less prone to failing
- *	on long argument lists, but the more stuff that must be moved
- *	around for each call to the runtime support routines.  The
- *	length may really be critical if the machine convention is
- *	to pass arguments in registers.
- *
- *	Note that the default define allows up to 16 integral arguments,
- *	or 8 floating point arguments (doubles), on most machines.
- *
- *	Someday this may be replaced with true varargs support, when
- *	ANSI C has had time to take root.
- */
-
-#define ARGLIST a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15
-
-/*
- * The default file for profiling.  Could also add another flag
- * (G?) which allowed the user to specify this.
- */
-
-#define PROF_FILE	"dbugmon.out"
-
-/*
- *	Variables which are available externally but should only
- *	be accessed via the macro package facilities.
- */
-
-EXPORT FILE *_db_fp_ = (FILE *)0;	/* Output stream, default is set to
-                     * stderr later */
-EXPORT FILE *_db_pfp_ = (FILE *)0;	/* Profile stream, 'dbugmon.out' */
-EXPORT char *_db_process_ = "dbug";	/* Pointer to process name; argv[0] */
-EXPORT BOOLEAN _db_on_ = FALSE;		/* TRUE if debugging currently on */
-EXPORT BOOLEAN _db_pon_ = FALSE;	/* TRUE if debugging currently on */
-
-/*
- *	Externally supplied functions.
- */
-
-/*
- *	The user may specify a list of functions to trace or 
- *	debug.  These lists are kept in a linear linked list,
- *	a very simple implementation.
- */
-
-struct link {
-    char *string;		/* Pointer to link's contents */
-    struct link *next_link;	/* Pointer to the next link */
-};
-
-
-/*
- *	Debugging states can be pushed or popped off of a
- *	stack which is implemented as a linked list.  Note
- *	that the head of the list is the current state and the
- *	stack is pushed by adding a new state to the head of the
- *	list or popped by removing the first link.
- */
-
-struct state {
-    int flags;				/* Current state flags */
-    int maxdepth;			/* Current maximum trace depth */
-    unsigned int delay;			/* Delay after each output line */
-    int level;				/* Current function nesting level */
-    FILE *out_file;			/* Current output stream */
-    FILE *prof_file;			/* Current profiling stream */
-    struct link *functions;		/* List of functions */
-    struct link *p_functions;		/* List of profiled functions */
-    struct link *keywords;		/* List of debug keywords */
-    struct link *processes;		/* List of process names */
-    struct state *next_state;		/* Next state in the list */
-};
-
-LOCAL struct state *stack = NULL;	/* Linked list of stacked states */
-
-/*
- *	Local variables not seen by user.
- */
-
-LOCAL int lineno = 0;		/* Current debugger output line number */
-LOCAL char *func = "?func";	/* Name of current user function */
-LOCAL char *file = "?file";	/* Name of current user file */
-LOCAL BOOLEAN init_done = FALSE;/* Set to TRUE when initialization done */
-
-/*#if unix || AMIGA || M_I86*/
-LOCAL int jmplevel;		/* Remember nesting level at setjmp () */
-LOCAL char *jmpfunc;		/* Remember current function for setjmp */
-LOCAL char *jmpfile;		/* Remember current file for setjmp */
-/*#endif*/
-
-LOCAL struct link *ListParse ();/* Parse a debug command string */
-LOCAL char *StrDup ();		/* Make a fresh copy of a string */
-LOCAL VOID OpenFile ();		/* Open debug output stream */
-LOCAL VOID OpenProfile ();	/* Open profile output stream */
-LOCAL VOID CloseFile ();	/* Close debug output stream */
-LOCAL VOID PushState ();	/* Push current debug state */
-LOCAL VOID ChangeOwner ();	/* Change file owner and group */
-LOCAL BOOLEAN DoTrace ();	/* Test for tracing enabled */
-LOCAL BOOLEAN Writable ();	/* Test to see if file is writable */
-LOCAL unsigned long Clock ();	/* Return current user time (ms) */
-LOCAL char *DbugMalloc ();	/* Allocate memory for runtime support */
-LOCAL char *BaseName ();	/* Remove leading pathname components */
-LOCAL VOID DoPrefix ();		/* Print debugger line prefix */
-LOCAL VOID FreeList ();		/* Free memory from linked list */
-LOCAL VOID Indent ();		/* Indent line to specified indent */
-LOCAL int DelayArg (int value); /* Convert D flag argument */
-LOCAL BOOLEAN DoProfile ();	/* Check if profiling is enabled */
-
-                /* Supplied in Sys V runtime environ */
-LOCAL char *strtok ();		/* Break string into tokens */
-LOCAL char *strrchr ();		/* Find last occurrence of char */
-
-/*
- *	The following local variables are used to hold the state information
- *	between the call to _db_pargs_() and _db_doprnt_(), during
- *	expansion of the DBUG_PRINT macro.  This is the only macro
- *	that currently uses these variables.  The DBUG_PRINT macro
- *	and the new _db_doprnt_() routine replace the older DBUG_N macros
- *	and their corresponding runtime support routine _db_printf_().
- *
- *	These variables are currently used only by _db_pargs_() and
- *	_db_doprnt_().
- */
-
-LOCAL int u_line = 0;		/* User source code line number */
-LOCAL char *u_keyword = "?";	/* Keyword for current macro */
-
-/*
- *	Miscellaneous printf format strings.
- */
- 
-#define ERR_MISSING_RETURN "%s: missing DBUG_RETURN or DBUG_VOID_RETURN macro in function \"%s\"\n"
-#define ERR_OPEN "%s: can't open debug output stream \"%s\": "
-#define ERR_CLOSE "%s: can't close debug file: "
-#define ERR_ABORT "%s: debugger aborting because %s\n"
-#define ERR_CHOWN "%s: can't change owner/group of \"%s\": "
-#define ERR_PRINTF "%s: obsolete object file for '%s', please recompile!\n"
-
-/*
- *	Macros and defines for testing file accessibility under UNIX.
- */
-
-#ifdef unix
-#  define A_EXISTS	00		/* Test for file existance */
-#  define A_EXECUTE	01		/* Test for execute permission */
-#  define A_WRITE	02		/* Test for write access */
-#  define A_READ	03		/* Test for read access */
-#  define EXISTS(pathname) (access (pathname, A_EXISTS) == 0)
-#  define WRITABLE(pathname) (access (pathname, A_WRITE) == 0)
-#else
-#  define EXISTS(pathname) (FALSE)	/* Assume no existance */
-#endif
-
-/*
- *	Translate some calls among different systems.
- */
-
-#ifdef unix
-# define XDelay sleep
-IMPORT unsigned int sleep ();	/* Pause for given number of seconds */
-#endif
-
-#ifdef AMIGA
-IMPORT int XDelay ();		/* Pause for given number of ticks */
-#endif
-
-
-/*
- *  FUNCTION
- *
- *	_db_push_    push current debugger state and set up new one
- *
- *  SYNOPSIS
- *
- *	VOID _db_push_ (control)
- *	char *control;
- *
- *  DESCRIPTION
- *
- *	Given pointer to a debug control string in "control", pushes
- *	the current debug state, parses the control string, and sets
- *	up a new debug state.
- *
- *	The only attribute of the new state inherited from the previous
- *	state is the current function nesting level.  This can be
- *	overridden by using the "r" flag in the control string.
- *
- *	The debug control string is a sequence of colon separated fields
- *	as follows:
- *
- *		<field_1>:<field_2>:...:<field_N>
- *
- *	Each field consists of a mandatory flag character followed by
- *	an optional "," and comma separated list of modifiers:
- *
- *		flag[,modifier,modifier,...,modifier]
- *
- *	The currently recognized flag characters are:
- *
- *		d	Enable output from DBUG_<N> macros for
- *			for the current state.  May be followed
- *			by a list of keywords which selects output
- *			only for the DBUG macros with that keyword.
- *			A null list of keywords implies output for
- *			all macros.
- *
- *		D	Delay after each debugger output line.
- *			The argument is the number of tenths of seconds
- *			to delay, subject to machine capabilities.
- *			I.E.  -#D,20 is delay two seconds.
- *
- *		f	Limit debugging and/or tracing, and profiling to the
- *			list of named functions.  Note that a null list will
- *			disable all functions.  The appropriate "d" or "t"
- *			flags must still be given, this flag only limits their
- *			actions if they are enabled.
- *
- *		F	Identify the source file name for each
- *			line of debug or trace output.
- *
- *		g	Enable profiling.  Create a file called 'dbugmon.out'
- *			containing information that can be used to profile
- *			the program.  May be followed by a list of keywords
- *			that select profiling only for the functions in that
- *			list.  A null list implies that all functions are
- *			considered.
- *
- *		L	Identify the source file line number for
- *			each line of debug or trace output.
- *
- *		n	Print the current function nesting depth for
- *			each line of debug or trace output.
- *	
- *		N	Number each line of dbug output.
- *
- *		p	Limit debugger actions to specified processes.
- *			A process must be identified with the
- *			DBUG_PROCESS macro and match one in the list
- *			for debugger actions to occur.
- *
- *		P	Print the current process name for each
- *			line of debug or trace output.
- *
- *		r	When pushing a new state, do not inherit
- *			the previous state's function nesting level.
- *			Useful when the output is to start at the
- *			left margin.
- *
- *		t	Enable function call/exit trace lines.
- *			May be followed by a list (containing only
- *			one modifier) giving a numeric maximum
- *			trace level, beyond which no output will
- *			occur for either debugging or tracing
- *			macros.  The default is a compile time
- *			option.
- *
- *	Some examples of debug control strings which might appear
- *	on a shell command line (the "-#" is typically used to
- *	introduce a control string to an application program) are:
- *
- *		-#d:t
- *		-#d:f,main,subr1:F:L:t,20
- *		-#d,input,output,files:n
- *
- *	For convenience, any leading "-#" is stripped off.
- *
- */
-
-
-VOID _db_push_ (control)
-char *control;
-{
-    REGISTER char *scan;
-    REGISTER struct link *temp;
-
-    if (!_db_fp_)
-    _db_fp_ = stderr;	/* Output stream, default stderr */
-
-    if (control && *control == '-') {
-    if (*++control == '#') {
-        control++;
-    }	
-    }
-    control = StrDup (control);
-    PushState ();
-    scan = strtok (control, ":");
-    for (; scan != NULL; scan = strtok ((char *)NULL, ":")) {
-    switch (*scan++) {
-        case 'd': 
-        _db_on_ = TRUE;
-        stack -> flags |= DEBUG_ON;
-        if (*scan++ == ',') {
-            stack -> keywords = ListParse (scan);
-        }
-            break;
-        case 'D': 
-        stack -> delay = 0;
-        if (*scan++ == ',') {
-            temp = ListParse (scan);
-            stack -> delay = DelayArg (atoi (temp -> string));
-            FreeList (temp);
-        }
-        break;
-        case 'f': 
-        if (*scan++ == ',') {
-            stack -> functions = ListParse (scan);
-        }
-        break;
-        case 'F': 
-        stack -> flags |= FILE_ON;
-        break;
-        case 'g': 
-        _db_pon_ = TRUE;
-        OpenProfile(PROF_FILE);
-        stack -> flags |= PROFILE_ON;
-        if (*scan++ == ',') {
-            stack -> p_functions = ListParse (scan);
-        }
-        break;
-        case 'L': 
-        stack -> flags |= LINE_ON;
-        break;
-        case 'n': 
-        stack -> flags |= DEPTH_ON;
-        break;
-        case 'N':
-        stack -> flags |= NUMBER_ON;
-        break;
-        case 'o': 
-        if (*scan++ == ',') {
-            temp = ListParse (scan);
-            OpenFile (temp -> string);
-            FreeList (temp);
-        } else {
-            OpenFile ("-");
-        }
-        break;
-        case 'p':
-        if (*scan++ == ',') {
-            stack -> processes = ListParse (scan);
-        }
-        break;
-        case 'P': 
-        stack -> flags |= PROCESS_ON;
-        break;
-        case 'r': 
-        stack -> level = 0;
-        break;
-        case 't': 
-        stack -> flags |= TRACE_ON;
-        if (*scan++ == ',') {
-            temp = ListParse (scan);
-            stack -> maxdepth = atoi (temp -> string);
-            FreeList (temp);
-        }
-        break;
-    }
-    }
-    free (control);
-}
-
-
-
-/*
- *  FUNCTION
- *
- *	_db_pop_    pop the debug stack
- *
- *  DESCRIPTION
- *
- *	Pops the debug stack, returning the debug state to its
- *	condition prior to the most recent _db_push_ invocation.
- *	Note that the pop will fail if it would remove the last
- *	valid state from the stack.  This prevents user errors
- *	in the push/pop sequence from screwing up the debugger.
- *	Maybe there should be some kind of warning printed if the
- *	user tries to pop too many states.
- *
- */
-
-VOID _db_pop_ ()
-{
-    REGISTER struct state *discard;
-
-    discard = stack;
-    if (discard != NULL && discard -> next_state != NULL) {
-    stack = discard -> next_state;
-    _db_fp_ = stack -> out_file;
-    _db_pfp_ = stack -> prof_file;
-    if (discard -> keywords != NULL) {
-        FreeList (discard -> keywords);
-    }
-    if (discard -> functions != NULL) {
-        FreeList (discard -> functions);
-    }
-    if (discard -> processes != NULL) {
-        FreeList (discard -> processes);
-    }
-    if (discard -> p_functions != NULL) {
-        FreeList (discard -> p_functions);
-    }
-    CloseFile (discard -> out_file);
-    CloseFile (discard -> prof_file);
-    free ((char *) discard);
-    }
-}
-
-
-/*
- *  FUNCTION
- *
- *	_db_enter_    process entry point to user function
- *
- *  SYNOPSIS
- *
- *	VOID _db_enter_ (_func_, _file_, _line_, _sfunc_, _sfile_, _slevel_)
- *	char *_func_;		points to current function name
- *	char *_file_;		points to current file name
- *	int _line_;		called from source line number
- *	char **_sfunc_;		save previous _func_
- *	char **_sfile_;		save previous _file_
- *	int *_slevel_;		save previous nesting level
- *
- *  DESCRIPTION
- *
- *	Called at the beginning of each user function to tell
- *	the debugger that a new function has been entered.
- *	Note that the pointers to the previous user function
- *	name and previous user file name are stored on the
- *	caller's stack (this is why the ENTER macro must be
- *	the first "executable" code in a function, since it
- *	allocates these storage locations).  The previous nesting
- *	level is also stored on the callers stack for internal
- *	self consistency checks.
- *
- *	Also prints a trace line if tracing is enabled and
- *	increments the current function nesting depth.
- *
- *	Note that this mechanism allows the debugger to know
- *	what the current user function is at all times, without
- *	maintaining an internal stack for the function names.
- *
- */
-
-VOID _db_enter_ (_func_, _file_, _line_, _sfunc_, _sfile_, _slevel_)
-char *_func_;
-char *_file_;
-int _line_;
-char **_sfunc_;
-char **_sfile_;
-int *_slevel_;
-{
-    if (!init_done) {
-    _db_push_ ("");
-    }
-    *_sfunc_ = func;
-    *_sfile_ = file;
-    func = _func_;
-    file = BaseName (_file_);
-    stack -> level++;
-    *_slevel_ = stack -> level;
-    if (DoProfile ()) {
-    (VOID) fprintf (_db_pfp_, "%s\tE\t%ld\n",func, Clock());
-    (VOID) fflush (_db_pfp_);
-    }
-    if (DoTrace ()) {
-    DoPrefix (_line_);
-    Indent (stack -> level);
-    (VOID) fprintf (_db_fp_, ">%s\n", func);
-    (VOID) fflush (_db_fp_);
-    (VOID) XDelay (stack -> delay);
-    }
-}
-
-
-/*
- *  FUNCTION
- *
- *	_db_return_    process exit from user function
- *
- *  SYNOPSIS
- *
- *	VOID _db_return_ (_line_, _sfunc_, _sfile_, _slevel_)
- *	int _line_;		current source line number
- *	char **_sfunc_;		where previous _func_ is to be retrieved
- *	char **_sfile_;		where previous _file_ is to be retrieved
- *	int *_slevel_;		where previous level was stashed
- *
- *  DESCRIPTION
- *
- *	Called just before user function executes an explicit or implicit
- *	return.  Prints a trace line if trace is enabled, decrements
- *	the current nesting level, and restores the current function and
- *	file names from the defunct function's stack.
- *
- */
-
-VOID _db_return_ (_line_, _sfunc_, _sfile_, _slevel_)
-int _line_;
-char **_sfunc_;
-char **_sfile_;
-int *_slevel_;
-{
-    if (!init_done) {
-    _db_push_ ("");
-    }
-    if (stack -> level != *_slevel_ && (TRACING || DEBUGGING || PROFILING)) {
-    (VOID) fprintf (_db_fp_, ERR_MISSING_RETURN, _db_process_, func);
-        (VOID) XDelay (stack -> delay);
-    } else if (DoProfile ()) {
-    (VOID) fprintf (_db_pfp_, "%s\tX\t%ld\n", func, Clock());
-        (VOID) XDelay (stack -> delay);
-    } else if (DoTrace ()) {
-    DoPrefix (_line_);
-    Indent (stack -> level);
-    (VOID) fprintf (_db_fp_, "<%s\n", func);
-        (VOID) XDelay (stack -> delay);
-    }
-    (VOID) fflush (_db_fp_);
-    stack -> level = *_slevel_ - 1;
-    func = *_sfunc_;
-    file = *_sfile_;
-}
-
-
-/*
- *  FUNCTION
- *
- *	_db_pargs_    log arguments for subsequent use by _db_doprnt_()
- *
- *  SYNOPSIS
- *
- *	VOID _db_pargs_ (_line_, keyword)
- *	int _line_;
- *	char *keyword;
- *
- *  DESCRIPTION
- *
- *	The new universal printing macro DBUG_PRINT, which replaces
- *	all forms of the DBUG_N macros, needs two calls to runtime
- *	support routines.  The first, this function, remembers arguments
- *	that are used by the subsequent call to _db_doprnt_().
-*
- */
-
-VOID _db_pargs_ (_line_, keyword)
-int _line_;
-char *keyword;
-{
-    u_line = _line_;
-    u_keyword = keyword;
-}
-
-
-/*
- *  FUNCTION
- *
- *	_db_doprnt_    handle print of debug lines
- *
- *  SYNOPSIS
- *
- *	VOID _db_doprnt_ (format, ARGLIST)
- *	char *format;
- *	long ARGLIST;
- *
- *  DESCRIPTION
- *
- *	When invoked via one of the DBUG macros, tests the current keyword
- *	set by calling _db_pargs_() to see if that macro has been selected
- *	for processing via the debugger control string, and if so, handles
- *	printing of the arguments via the format string.  The line number
- *	of the DBUG macro in the source is found in u_line.
- *
- *	Note that the format string SHOULD NOT include a terminating
- *	newline, this is supplied automatically.
- *
- *  NOTES
- *
- *	This runtime support routine replaces the older _db_printf_()
- *	routine which is temporarily kept around for compatibility.
- *
- *	The rather ugly argument declaration is to handle some
- *	magic with respect to the number of arguments passed
- *	via the DBUG macros.  The current maximum is 3 arguments
- *	(not including the keyword and format strings).
- *
- *	The new <varargs.h> facility is not yet common enough to
- *	convert to it quite yet...
- *
- */
-
-/*VARARGS1*/
-VOID _db_doprnt_ (format, ARGLIST)
-char *format;
-long ARGLIST;
-{
-    if (_db_keyword_ (u_keyword)) {
-    DoPrefix (u_line);
-    if (TRACING) {
-        Indent (stack -> level + 1);
-    } else {
-        (VOID) fprintf (_db_fp_, "%s: ", func);
-    }
-    (VOID) fprintf (_db_fp_, "%s: ", u_keyword);
-    (VOID) fprintf (_db_fp_, format, ARGLIST);
-    (VOID) fprintf (_db_fp_, "\n");
-    (VOID) fflush (_db_fp_);
-    (VOID) XDelay (stack -> delay);
-    }
-}
-
-/*
- *	The following routine is kept around temporarily for compatibility
- *	with older objects that were compiled with the DBUG_N macro form
- *	of the print routine.  It will print a warning message on first
- *	usage.  It will go away in subsequent releases...
- */
-
-/*VARARGS3*/
-VOID _db_printf_ (_line_, keyword, format, ARGLIST)
-int _line_;
-char *keyword,  *format;
-long ARGLIST;
-{
-    static BOOLEAN firsttime = TRUE;
-
-    if (firsttime) {
-    (VOID) fprintf (stderr, ERR_PRINTF, _db_process_, file);
-    firsttime = FALSE;
-    }
-    _db_pargs_ (_line_, keyword);
-    _db_doprnt_ (format, ARGLIST);
-}
-
-
-/*
- *  FUNCTION
- *
- *	ListParse    parse list of modifiers in debug control string
- *
- *  SYNOPSIS
- *
- *	LOCAL struct link *ListParse (ctlp)
- *	char *ctlp;
- *
- *  DESCRIPTION
- *
- *	Given pointer to a comma separated list of strings in "cltp",
- *	parses the list, building a list and returning a pointer to it.
- *	The original comma separated list is destroyed in the process of
- *	building the linked list, thus it had better be a duplicate
- *	if it is important.
- *
- *	Note that since each link is added at the head of the list,
- *	the final list will be in "reverse order", which is not
- *	significant for our usage here.
- *
- */
-
-LOCAL struct link *ListParse (ctlp)
-char *ctlp;
-{
-    REGISTER char *start;
-    REGISTER struct link *new;
-    REGISTER struct link *head;
-
-    head = NULL;
-    while (*ctlp != EOS) {
-    start = ctlp;
-    while (*ctlp != EOS && *ctlp != ',') {
-        ctlp++;
-    }
-    if (*ctlp == ',') {
-        *ctlp++ = EOS;
-    }
-    new = (struct link *) DbugMalloc (sizeof (struct link));
-    new -> string = StrDup (start);
-    new -> next_link = head;
-    head = new;
-    }
-    return (head);
-}
-
-
-/*
- *  FUNCTION
- *
- *	InList    test a given string for member of a given list
- *
- *  SYNOPSIS
- *
- *	LOCAL BOOLEAN InList (linkp, cp)
- *	struct link *linkp;
- *	char *cp;
- *
- *  DESCRIPTION
- *
- *	Tests the string pointed to by "cp" to determine if it is in
- *	the list pointed to by "linkp".  Linkp points to the first
- *	link in the list.  If linkp is NULL then the string is treated
- *	as if it is in the list (I.E all strings are in the null list).
- *	This may seem rather strange at first but leads to the desired
- *	operation if no list is given.  The net effect is that all
- *	strings will be accepted when there is no list, and when there
- *	is a list, only those strings in the list will be accepted.
- *
- */
-
-LOCAL BOOLEAN InList (linkp, cp)
-struct link *linkp;
-char *cp;
-{
-    REGISTER struct link *scan;
-    REGISTER BOOLEAN accept;
-
-    if (linkp == NULL) {
-    accept = TRUE;
-    } else {
-    accept = FALSE;
-    for (scan = linkp; scan != NULL; scan = scan -> next_link) {
-        if (STREQ (scan -> string, cp)) {
-        accept = TRUE;
-        break;
-        }
-    }
-    }
-    return (accept);
-}
-
-
-/*
- *  FUNCTION
- *
- *	PushState    push current state onto stack and set up new one
- *
- *  SYNOPSIS
- *
- *	LOCAL VOID PushState ()
- *
- *  DESCRIPTION
- *
- *	Pushes the current state on the state stack, and initializes
- *	a new state.  The only parameter inherited from the previous
- *	state is the function nesting level.  This action can be
- *	inhibited if desired, via the "r" flag.
- *
- *	The state stack is a linked list of states, with the new
- *	state added at the head.  This allows the stack to grow
- *	to the limits of memory if necessary.
- *
- */
-
-LOCAL VOID PushState ()
-{
-    REGISTER struct state *new;
-
-    new = (struct state *) DbugMalloc (sizeof (struct state));
-    new -> flags = 0;
-    new -> delay = 0;
-    new -> maxdepth = MAXDEPTH;
-    if (stack != NULL) {
-    new -> level = stack -> level;
-    } else {
-    new -> level = 0;
-    }
-    new -> out_file = stderr;
-    new -> functions = NULL;
-    new -> p_functions = NULL;
-    new -> keywords = NULL;
-    new -> processes = NULL;
-    new -> next_state = stack;
-    stack = new;
-    init_done = TRUE;
-}
-
-
-/*
- *  FUNCTION
- *
- *	DoTrace    check to see if tracing is current enabled
- *
- *  SYNOPSIS
- *
- *	LOCAL BOOLEAN DoTrace ()
- *
- *  DESCRIPTION
- *
- *	Checks to see if tracing is enabled based on whether the
- *	user has specified tracing, the maximum trace depth has
- *	not yet been reached, the current function is selected,
- *	and the current process is selected.  Returns TRUE if
- *	tracing is enabled, FALSE otherwise.
- *
- */
-
-LOCAL BOOLEAN DoTrace ()
-{
-    REGISTER BOOLEAN trace;
-
-    trace = FALSE;
-    if (TRACING) {
-    if (stack -> level <= stack -> maxdepth) {
-        if (InList (stack -> functions, func)) {
-        if (InList (stack -> processes, _db_process_)) {
-            trace = TRUE;
-        }
-        }
-    }
-    }
-    return (trace);
-}
-
-
-/*
- *  FUNCTION
- *
- *	DoProfile    check to see if profiling is current enabled
- *
- *  SYNOPSIS
- *
- *	LOCAL BOOLEAN DoProfile ()
- *
- *  DESCRIPTION
- *
- *	Checks to see if profiling is enabled based on whether the
- *	user has specified profiling, the maximum trace depth has
- *	not yet been reached, the current function is selected,
- *	and the current process is selected.  Returns TRUE if
- *	profiling is enabled, FALSE otherwise.
- *
- */
-
-LOCAL BOOLEAN DoProfile ()
-{
-    REGISTER BOOLEAN profile;
-
-    profile = FALSE;
-    if (PROFILING) {
-    if (stack -> level <= stack -> maxdepth) {
-        if (InList (stack -> p_functions, func)) {
-        if (InList (stack -> processes, _db_process_)) {
-            profile = TRUE;
-        }
-        }
-    }
-    }
-    return (profile);
-}
-
-
-/*
- *  FUNCTION
- *
- *	_db_keyword_    test keyword for member of keyword list
- *
- *  SYNOPSIS
- *
- *	BOOLEAN _db_keyword_ (keyword)
- *	char *keyword;
- *
- *  DESCRIPTION
- *
- *	Test a keyword to determine if it is in the currently active
- *	keyword list.  As with the function list, a keyword is accepted
- *	if the list is null, otherwise it must match one of the list
- *	members.  When debugging is not on, no keywords are accepted.
- *	After the maximum trace level is exceeded, no keywords are
- *	accepted (this behavior subject to change).  Additionally,
- *	the current function and process must be accepted based on
- *	their respective lists.
- *
- *	Returns TRUE if keyword accepted, FALSE otherwise.
- *
- */
-
-BOOLEAN _db_keyword_ (keyword)
-char *keyword;
-{
-    REGISTER BOOLEAN accept;
-
-    if (!init_done) {
-    _db_push_ ("");
-    }
-    accept = FALSE;
-    if (DEBUGGING) {
-    if (stack -> level <= stack -> maxdepth) {
-        if (InList (stack -> functions, func)) {
-        if (InList (stack -> keywords, keyword)) {
-            if (InList (stack -> processes, _db_process_)) {
-            accept = TRUE;
-            }
-        }
-        }
-    }
-    }
-    return (accept);
-}
-
-
-/*
- *  FUNCTION
- *
- *	Indent    indent a line to the given indentation level
- *
- *  SYNOPSIS
- *
- *	LOCAL VOID Indent (indent)
- *	int indent;
- *
- *  DESCRIPTION
- *
- *	Indent a line to the given level.  Note that this is
- *	a simple minded but portable implementation.
- *	There are better ways.
- *
- *	Also, the indent must be scaled by the compile time option
- *	of character positions per nesting level.
- *
- */
-
-LOCAL VOID Indent (indent)
-int indent;
-{
-    REGISTER int count;
-    AUTO char buffer[PRINTBUF];
-
-    indent *= INDENT;
-    for (count = 0; (count < (indent - INDENT)) && (count < (PRINTBUF - 1)); count++) {
-    if ((count % INDENT) == 0) {
-        buffer[count] = '|';
-    } else {
-        buffer[count] = ' ';
-    }
-    }
-    buffer[count] = EOS;
-    (VOID) fprintf (_db_fp_, buffer);
-    (VOID) fflush (_db_fp_);
-}
-
-
-/*
- *  FUNCTION
- *
- *	FreeList    free all memory associated with a linked list
- *
- *  SYNOPSIS
- *
- *	LOCAL VOID FreeList (linkp)
- *	struct link *linkp;
- *
- *  DESCRIPTION
- *
- *	Given pointer to the head of a linked list, frees all
- *	memory held by the list and the members of the list.
- *
- */
-
-LOCAL VOID FreeList (linkp)
-struct link *linkp;
-{
-    REGISTER struct link *old;
-
-    while (linkp != NULL) {
-    old = linkp;
-    linkp = linkp -> next_link;
-    if (old -> string != NULL) {
-        free (old -> string);
-    }
-    free ((char *) old);
-    }
-}
-
-
-/*
- *  FUNCTION
- *
- *	StrDup   make a duplicate of a string in new memory
- *
- *  SYNOPSIS
- *
- *	LOCAL char *StrDup (string)
- *	char *string;
- *
- *  DESCRIPTION
- *
- *	Given pointer to a string, allocates sufficient memory to make
- *	a duplicate copy, and copies the string to the newly allocated
- *	memory.  Failure to allocated sufficient memory is immediately
- *	fatal.
- *
- */
-
-
-LOCAL char *StrDup (string)
-char *string;
-{
-    REGISTER char *new;
-
-    new = DbugMalloc (strlen (string) + 1);
-    (VOID) strcpy (new, string);
-    return (new);
-}
-
-
-/*
- *  FUNCTION
- *
- *	DoPrefix    print debugger line prefix prior to indentation
- *
- *  SYNOPSIS
- *
- *	LOCAL VOID DoPrefix (_line_)
- *	int _line_;
- *
- *  DESCRIPTION
- *
- *	Print prefix common to all debugger output lines, prior to
- *	doing indentation if necessary.  Print such information as
- *	current process name, current source file name and line number,
- *	and current function nesting depth.
- *
- */
-  
- 
-LOCAL VOID DoPrefix (_line_)
-int _line_;
-{
-    lineno++;
-    if (stack -> flags & NUMBER_ON) {
-    (VOID) fprintf (_db_fp_, "%5d: ", lineno);
-    }
-    if (stack -> flags & PROCESS_ON) {
-    (VOID) fprintf (_db_fp_, "%s: ", _db_process_);
-    }
-    if (stack -> flags & FILE_ON) {
-    (VOID) fprintf (_db_fp_, "%14s: ", file);
-    }
-    if (stack -> flags & LINE_ON) {
-    (VOID) fprintf (_db_fp_, "%5d: ", _line_);
-    }
-    if (stack -> flags & DEPTH_ON) {
-    (VOID) fprintf (_db_fp_, "%4d: ", stack -> level);
-    }
-    (VOID) fflush (_db_fp_);
-}
-
-
-/*
- *  FUNCTION
- *
- *	OpenFile    open new output stream for debugger output
- *
- *  SYNOPSIS
- *
- *	LOCAL VOID OpenFile (name)
- *	char *name;
- *
- *  DESCRIPTION
- *
- *	Given name of a new file (or "-" for stdout) opens the file
- *	and sets the output stream to the new file.
- *
- */
-
-LOCAL VOID OpenFile (name)
-char *name;
-{
-    REGISTER FILE *fp;
-    REGISTER BOOLEAN newfile;
-
-    if (name != NULL) {
-    if (strcmp (name, "-") == 0) {
-        _db_fp_ = stdout;
-        stack -> out_file = _db_fp_;
-    } else {
-        if (!Writable (name)) {
-        (VOID) fprintf (_db_fp_, ERR_OPEN, _db_process_, name);
-        perror ("");
-        (VOID) fflush (_db_fp_);
-        (VOID) XDelay (stack -> delay);
-        } else {
-        if (EXISTS (name)) {
-            newfile = FALSE;
-        } else {
-            newfile = TRUE;
-        }
-        fp = fopen (name, "a");
-        if (fp == NULL) {
-             (VOID) fprintf (_db_fp_, ERR_OPEN, _db_process_, name);
-            perror ("");
-            (VOID) fflush (_db_fp_);
-            (VOID) XDelay (stack -> delay);
-        } else {
-            _db_fp_ = fp;
-            stack -> out_file = fp;
-            if (newfile) {
-            ChangeOwner (name);
-            }
-        }
-        }
-    }
-    }
-}
-
-
-/*
- *  FUNCTION
- *
- *	OpenProfile    open new output stream for profiler output
- *
- *  SYNOPSIS
- *
- *	LOCAL VOID OpenProfile (name)
- *	char *name;
- *
- *  DESCRIPTION
- *
- *	Given name of a new file, opens the file
- *	and sets the profiler output stream to the new file.
- *
- *	It is currently unclear whether the prefered behavior is
- *	to truncate any existing file, or simply append to it.
- *	The latter behavior would be desirable for collecting
- *	accumulated runtime history over a number of separate
- *	runs.  It might take some changes to the analyzer program
- *	though, and the notes that Binayak sent with the profiling
- *	diffs indicated that append was the normal mode, but this
- *	does not appear to agree with the actual code. I haven't
- *	investigated at this time [fnf; 24-Jul-87].
- */
-
-LOCAL VOID OpenProfile (name)
-char *name;
-{
-    REGISTER FILE *fp;
-    REGISTER BOOLEAN newfile;
-
-    if (name != NULL) {
-    if (!Writable (name)) {
-        (VOID) fprintf (_db_fp_, ERR_OPEN, _db_process_, name);
-        perror ("");
-        (VOID) fflush (_db_fp_);
-        (VOID) XDelay (stack -> delay);
-    } else {
-        if (EXISTS (name)) {
-        newfile = FALSE;
-        } else {
-        newfile = TRUE;
-        }
-        fp = fopen (name, "w");
-        if (fp == NULL) {
-        (VOID) fprintf (_db_fp_, ERR_OPEN, _db_process_, name);
-        perror ("");
-        (VOID) fflush (_db_fp_);
-        (VOID) XDelay (stack -> delay);
-        } else {
-        _db_pfp_ = fp;
-        stack -> prof_file = fp;
-        if (newfile) {
-            ChangeOwner (name);
-        }
-        }
-    }
-    }
-}
-
-
-/*
- *  FUNCTION
- *
- *	CloseFile    close the debug output stream
- *
- *  SYNOPSIS
- *
- *	LOCAL VOID CloseFile (fp)
- *	FILE *fp;
- *
- *  DESCRIPTION
- *
- *	Closes the debug output stream unless it is standard output
- *	or standard error.
- *
- */
-
-LOCAL VOID CloseFile (fp)
-FILE *fp;
-{
-    if (fp != stderr && fp != stdout) {
-    if (fclose (fp) == EOF) {
-        (VOID) fprintf (stderr, ERR_CLOSE, _db_process_);
-        perror ("");
-        (VOID) fflush (stderr);
-        (VOID) XDelay (stack -> delay);
-    }
-    }
-}
-
-
-/*
- *  FUNCTION
- *
- *	DbugExit    print error message and exit
- *
- *  SYNOPSIS
- *
- *	LOCAL VOID DbugExit (why)
- *	char *why;
- *
- *  DESCRIPTION
- *
- *	Prints error message using current process name, the reason for
- *	aborting (typically out of memory), and exits with status 1.
- *	This should probably be changed to use a status code
- *	defined in the user's debugger include file.
- *
- */
- 
-LOCAL VOID DbugExit (why)
-char *why;
-{
-    (VOID) fprintf (stderr, ERR_ABORT, _db_process_, why);
-    (VOID) fflush (stderr);
-    (VOID) XDelay (stack -> delay);
-    exit (1);
-}
-
-
-/*
- *  FUNCTION
- *
- *	DbugMalloc    allocate memory for debugger runtime support
- *
- *  SYNOPSIS
- *
- *	LOCAL char *DbugMalloc (size)
- *	int size;
- *
- *  DESCRIPTION
- *
- *	Allocate more memory for debugger runtime support functions.
- *	Failure to to allocate the requested number of bytes is
- *	immediately fatal to the current process.  This may be
- *	rather unfriendly behavior.  It might be better to simply
- *	print a warning message, freeze the current debugger state,
- *	and continue execution.
- *
- */
- 
-LOCAL char *DbugMalloc (size)
-int size;
-{
-    register char *new;
-
-    new = malloc ( size );
-    if (new == NULL) {
-    DbugExit ("out of memory");
-    }
-    return (new);
-}
-
-
-/*
- *	This function may be eliminated when strtok is available
- *	in the runtime environment (missing from BSD4.1).
- */
-
-LOCAL char *strtok (s1, s2)
-char *s1, *s2;
-{
-    static char *end = NULL;
-    REGISTER char *rtnval;
-
-    rtnval = NULL;
-    if (s2 != NULL) {
-    if (s1 != NULL) {
-        end = s1;
-        rtnval = strtok ((char *) NULL, s2);
-    } else if (end != NULL) {
-        if (*end != EOS) {
-        rtnval = end;
-        while (*end != *s2 && *end != EOS) {end++;}
-        if (*end != EOS) {
-            *end++ = EOS;
-        }
-        }
-    }
-    }
-    return (rtnval);
-}
-
-
-/*
- *  FUNCTION
- *
- *	BaseName    strip leading pathname components from name
- *
- *  SYNOPSIS
- *
- *	LOCAL char *BaseName (pathname)
- *	char *pathname;
- *
- *  DESCRIPTION
- *
- *	Given pointer to a complete pathname, locates the base file
- *	name at the end of the pathname and returns a pointer to
- *	it.
- *
- */
-
-LOCAL char *BaseName (pathname)
-char *pathname;
-{
-    register char *base;
-
-    base = strrchr (pathname, '/');
-    if (base++ == NULL) {
-    base = pathname;
-    }
-    return (base);
-}
-
-
-/*
- *  FUNCTION
- *
- *	Writable    test to see if a pathname is writable/creatable
- *
- *  SYNOPSIS
- *
- *	LOCAL BOOLEAN Writable (pathname)
- *	char *pathname;
- *
- *  DESCRIPTION
- *
- *	Because the debugger might be linked in with a program that
- *	runs with the set-uid-bit (suid) set, we have to be careful
- *	about opening a user named file for debug output.  This consists
- *	of checking the file for write access with the real user id,
- *	or checking the directory where the file will be created.
- *
- *	Returns TRUE if the user would normally be allowed write or
- *	create access to the named file.  Returns FALSE otherwise.
- *
- */
-
-LOCAL BOOLEAN Writable (pathname)
-char *pathname;
-{
-    REGISTER BOOLEAN granted;
-#ifdef unix
-    REGISTER char *lastslash;
-#endif
-
-#ifndef unix
-    granted = TRUE;
-#else
-    granted = FALSE;
-    if (EXISTS (pathname)) {
-    if (WRITABLE (pathname)) {
-        granted = TRUE;
-    }
-    } else {
-    lastslash = strrchr (pathname, '/');
-    if (lastslash != NULL) {
-        *lastslash = EOS;
-    } else {
-        pathname = ".";
-    }
-    if (WRITABLE (pathname)) {
-        granted = TRUE;
-    }
-    if (lastslash != NULL) {
-        *lastslash = '/';
-    }
-    }
-#endif
-    return (granted);
-}
-
-
-/*
- *	This function may be eliminated when strrchr is available
- *	in the runtime environment (missing from BSD4.1).
- *	Alternately, you can use rindex() on BSD systems.
- */
-
-LOCAL char *strrchr (s, c)
-char *s;
-char c;
-{
-    REGISTER char *scan;
-
-    for (scan = s; *scan != EOS; scan++) {;}
-    while (scan > s && *--scan != c) {;}
-    if (*scan != c) {
-    scan = NULL;
-    }
-    return (scan);
-}
-
-
-/*
- *  FUNCTION
- *
- *	ChangeOwner    change owner to real user for suid programs
- *
- *  SYNOPSIS
- *
- *	LOCAL VOID ChangeOwner (pathname)
- *
- *  DESCRIPTION
- *
- *	For unix systems, change the owner of the newly created debug
- *	file to the real owner.  This is strictly for the benefit of
- *	programs that are running with the set-user-id bit set.
- *
- *	Note that at this point, the fact that pathname represents
- *	a newly created file has already been established.  If the
- *	program that the debugger is linked to is not running with
- *	the suid bit set, then this operation is redundant (but
- *	harmless).
- *
- */
-
-LOCAL VOID ChangeOwner (pathname)
-char *pathname;
-{
-#ifdef unix
-    if (chown (pathname, getuid (), getgid ()) == -1) {
-    (VOID) fprintf (stderr, ERR_CHOWN, _db_process_, pathname);
-    perror ("");
-    (VOID) fflush (stderr);
-    (VOID) XDelay (stack -> delay);
-    }
-#endif
-}
-
-
-/*
- *  FUNCTION
- *
- *	_db_setjmp_    save debugger environment
- *
- *  SYNOPSIS
- *
- *	VOID _db_setjmp_ ()
- *
- *  DESCRIPTION
- *
- *	Invoked as part of the user's DBUG_SETJMP macro to save
- *	the debugger environment in parallel with saving the user's
- *	environment.
- *
- */
-
-VOID _db_setjmp_ ()
-{
-   jmplevel = stack -> level;
-   jmpfunc = func;
-   jmpfile = file;
-}
-
-
-/*
- *  FUNCTION
- *
- *	_db_longjmp_    restore previously saved debugger environment
- *
- *  SYNOPSIS
- *
- *	VOID _db_longjmp_ ()
- *
- *  DESCRIPTION
- *
- *	Invoked as part of the user's DBUG_LONGJMP macro to restore
- *	the debugger environment in parallel with restoring the user's
- *	previously saved environment.
- *
- */
-
-VOID _db_longjmp_ ()
-{
-    stack -> level = jmplevel;
-    if (jmpfunc) {
-    func = jmpfunc;
-    }
-    if (jmpfile) {
-    file = jmpfile;
-    }
-}
-
-
-/*
- *  FUNCTION
- *
- *	DelayArg   convert D flag argument to appropriate value
- *
- *  SYNOPSIS
- *
- *	LOCAL int DelayArg (value)
- *	int value;
- *
- *  DESCRIPTION
- *
- *	Converts delay argument, given in tenths of a second, to the
- *	appropriate numerical argument used by the system to delay
- *	that that many tenths of a second.  For example, on the
- *	AMIGA, there is a system call "Delay()" which takes an
- *	argument in ticks (50 per second).  On unix, the sleep
- *	command takes seconds.  Thus a value of "10", for one
- *	second of delay, gets converted to 50 on the amiga, and 1
- *	on unix.  Other systems will need to use a timing loop.
- *
- */
-
-LOCAL int DelayArg (value)
-int value;
-{
-    int delayarg = 0;
-    
-#ifdef unix
-    delayarg = value / 10;		/* Delay is in seconds for sleep () */
-#endif
-#ifdef AMIGA
-    delayarg = (HZ * value) / 10;	/* Delay in ticks for XDelay () */
-#endif
-    return (delayarg);
-}
-
-
-/*
- *	A dummy delay stub for systems that do not support delays.
- *	With a little work, this can be turned into a timing loop.
- */
-
-#ifndef unix
-#ifndef AMIGA
-XDelay ()
-{
-}
-#endif
-#endif
-
-
-/*
- *  FUNCTION
- *
- *	perror    perror simulation for systems that don't have it
- *
- *  SYNOPSIS
- *
- *	LOCAL VOID perror (s)
- *	char *s;
- *
- *  DESCRIPTION
- *
- *	Perror produces a message on the standard error stream which
- *	provides more information about the library or system error
- *	just encountered.  The argument string s is printed, followed
- *	by a ':', a blank, and then a message and a newline.
- *
- *	An undocumented feature of the unix perror is that if the string
- *	's' is a null string (NOT a NULL pointer!), then the ':' and
- *	blank are not printed.
- *
- *	This version just complains about an "unknown system error".
- *
- */
-
-#if !unix && !(AMIGA || LATTICE || __TURBOC__ )
-LOCAL VOID perror (s)
-#if __STDC__
-const char *s;
-#else
-char *s;
-#endif
-{
-    if (s && *s != EOS) {
-    (VOID) fprintf (stderr, "%s: ", s);
-    }
-    (VOID) fprintf (stderr, "<unknown system error>\n");
-}
-#endif	/* !unix && !(AMIGA && LATTICE) */
-
-/*
- * Here we need the definitions of the clock routine.  Add your
- * own for whatever system that you have.
- */
-
-#if unix
-
-# include <sys/param.h>
-# if !defined(Solaris) && (BSD4_3 || sun)
-
-/*
- * Definition of the Clock() routine for 4.3 BSD.
- */
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-
-/*
- * Returns the user time in milliseconds used by this process so
- * far.
- */
-
-LOCAL unsigned long Clock ()
-{
-    struct rusage ru;
-
-    (VOID) getrusage (RUSAGE_SELF, &ru);
-    return ((ru.ru_utime.tv_sec * 1000) + (ru.ru_utime.tv_usec / 1000));
-}
-
-#else
-
-LOCAL unsigned long Clock ()
-{
-    return (0);
-}
-
-# endif
-
-#else
-
-#if AMIGA
-
-struct DateStamp {		/* Yes, this is a hack, but doing it right */
-    long ds_Days;		/* is incredibly ugly without splitting this */
-    long ds_Minute;		/* off into a separate file */
-    long ds_Tick;
-};
-
-static int first_clock = TRUE;
-static struct DateStamp begin;
-static struct DateStamp elapsed;
-
-LOCAL unsigned long Clock ()
-{
-    register struct DateStamp *now;
-    register unsigned long millisec = 0;
-    extern VOID *AllocMem ();
-
-    now = (struct DateStamp *) AllocMem ((long) sizeof (struct DateStamp), 0L);
-    if (now != NULL) {
-    if (first_clock == TRUE) {
-        first_clock = FALSE;
-        (VOID) DateStamp (now);
-        begin = *now;
-    }
-    (VOID) DateStamp (now);
-    millisec = 24 * 3600 * (1000 / HZ) * (now -> ds_Days - begin.ds_Days);
-    millisec += 60 * (1000 / HZ) * (now -> ds_Minute - begin.ds_Minute);
-    millisec += (1000 / HZ) * (now -> ds_Tick - begin.ds_Tick);
-    (VOID) FreeMem (now, (long) sizeof (struct DateStamp));
-    }
-    return (millisec);
-}
-
-#else
-
-LOCAL unsigned long Clock ()
-{
-    return (0);
-}
-
-#endif	/* AMIGA */
-
-#endif	/* unix */
-
-#ifdef AMIGA
-XDelay(x)
-int x;
-{
-    if (x) Delay(x);	/* fix Delay bug in AmigaDOS */
-}
-#endif
-
diff --git a/dmake/dbug/dbug/dbug.h b/dmake/dbug/dbug/dbug.h
deleted file mode 100644
index a3f526db7..000000000
--- a/dmake/dbug/dbug/dbug.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/******************************************************************************
- *									      *
- *	                           N O T I C E				      *
- *									      *
- *	              Copyright Abandoned, 1987, Fred Fish		      *
- *									      *
- *									      *
- *	This previously copyrighted work has been placed into the  public     *
- *	domain  by  the  author  and  may be freely used for any purpose,     *
- *	private or commercial.						      *
- *									      *
- *	Because of the number of inquiries I was receiving about the  use     *
- *	of this product in commercially developed works I have decided to     *
- *	simply make it public domain to further its unrestricted use.   I     *
- *	specifically  would  be  most happy to see this material become a     *
- *	part of the standard Unix distributions by AT&T and the  Berkeley     *
- *	Computer  Science  Research Group, and a standard part of the GNU     *
- *	system from the Free Software Foundation.			      *
- *									      *
- *	I would appreciate it, as a courtesy, if this notice is  left  in     *
- *	all copies and derivative works.  Thank you.			      *
- *									      *
- *	The author makes no warranty of any kind  with  respect  to  this     *
- *	product  and  explicitly disclaims any implied warranties of mer-     *
- *	chantability or fitness for any particular purpose.		      *
- *									      *
- ******************************************************************************
- */
-
-
-/*
- *  FILE
- *
- *	dbug.h    user include file for programs using the dbug package
- *
- *  SYNOPSIS
- *
- *	#include <local/dbug.h>
- *
- *  SCCS ID
- *
- *	@(#)dbug.h	1.11 9/5/87
- *
- *  DESCRIPTION
- *
- *	Programs which use the dbug package must include this file.
- *	It contains the appropriate macros to call support routines
- *	in the dbug runtime library.
- *
- *	To disable compilation of the macro expansions define the
- *	preprocessor symbol "DBUG_OFF".  This will result in null
- *	macros expansions so that the resulting code will be smaller
- *	and faster.  (The difference may be smaller than you think
- *	so this step is recommended only when absolutely necessary).
- *	In general, tradeoffs between space and efficiency are
- *	decided in favor of efficiency since space is seldom a
- *	problem on the new machines).
- *
- *	All externally visible symbol names follow the pattern
- *	"_db_xxx..xx_" to minimize the possibility of a dbug package
- *	symbol colliding with a user defined symbol.
- *	
- *	The DBUG_<N> style macros are obsolete and should not be used
- *	in new code.  Macros to map them to instances of DBUG_PRINT
- *	are provided for compatibility with older code.  They may go
- *	away completely in subsequent releases.
- *
- *  AUTHOR
- *
- *	Fred Fish
- *	(Currently employed by Motorola Computer Division, Tempe, Az.)
- *	hao!noao!mcdsun!fnf
- *	(602) 438-3614
- *
- */
-
-
-/*
- *	Internally used dbug variables which must be global.
- */
-
-#ifndef DBUG_OFF
-    extern int _db_on_;			/* TRUE if debug currently enabled */
-    extern FILE *_db_fp_;		/* Current debug output stream */
-    extern char *_db_process_;		/* Name of current process */
-    extern int _db_keyword_ ();		/* Accept/reject keyword */
-    extern void _db_push_ ();		/* Push state, set up new state */
-    extern void _db_pop_ ();		/* Pop previous debug state */
-    extern void _db_enter_ ();		/* New user function entered */
-    extern void _db_return_ ();		/* User function return */
-    extern void _db_pargs_ ();		/* Remember args for line */
-    extern void _db_doprnt_ ();		/* Print debug output */
-    extern void _db_setjmp_ ();		/* Save debugger environment */
-    extern void _db_longjmp_ ();	/* Restore debugger environment */
-# endif
-
-
-/*
- *	These macros provide a user interface into functions in the
- *	dbug runtime support library.  They isolate users from changes
- *	in the MACROS and/or runtime support.
- *
- *	The symbols "__LINE__" and "__FILE__" are expanded by the
- *	preprocessor to the current source file line number and file
- *	name respectively.
- *
- *	WARNING ---  Because the DBUG_ENTER macro allocates space on
- *	the user function's stack, it must precede any executable
- *	statements in the user function.
- *
- */
-
-# ifdef DBUG_OFF
-#    define DBUG_ENTER(a1)
-#    define DBUG_MALLOC(a1)
-#    define DBUG_RETURN(a1) return(a1)
-#    define DBUG_VOID_RETURN return
-#    define DBUG_EXECUTE(keyword,a1)
-#    define DBUG_PRINT(keyword,arglist)
-#    define DBUG_2(keyword,format)		/* Obsolete */
-#    define DBUG_3(keyword,format,a1)		/* Obsolete */
-#    define DBUG_4(keyword,format,a1,a2)	/* Obsolete */
-#    define DBUG_5(keyword,format,a1,a2,a3)	/* Obsolete */
-#    define DBUG_PUSH(a1)
-#    define DBUG_POP()
-#    define DBUG_PROCESS(a1)
-#    define DBUG_FILE (stderr)
-#    define DBUG_SETJMP setjmp
-#    define DBUG_LONGJMP longjmp
-# else
-#    define DBUG_ENTER(a) \
-    auto char *_db_func_, *_db_file_; \
-    int _db_level_; \
-    _db_enter_ (a,__FILE__,__LINE__,&_db_func_,&_db_file_,&_db_level_)
-#    define DBUG_MALLOC(a) \
-    auto char *_db_func_, *_db_file_; \
-    int _db_level_; \
-    malloc_init();\
-    _db_enter_ (a,__FILE__,__LINE__,&_db_func_,&_db_file_,&_db_level_)
-#    define DBUG_LEAVE \
-    (_db_return_ (__LINE__, &_db_func_, &_db_file_, &_db_level_))
-#    define DBUG_RETURN(a1) return (DBUG_LEAVE, (a1))
-/*   define DBUG_RETURN(a1) {DBUG_LEAVE; return(a1);}  Alternate form */
-#    define DBUG_VOID_RETURN DBUG_LEAVE; return
-#    define DBUG_EXECUTE(keyword,a1) \
-    {if (_db_on_) {if (_db_keyword_ (keyword)) { a1 }}}
-#    define DBUG_PRINT(keyword,arglist) \
-    {if (_db_on_) {_db_pargs_(__LINE__,keyword); _db_doprnt_ arglist;}}
-#    define DBUG_2(keyword,format) \
-    DBUG_PRINT(keyword,(format))		/* Obsolete */
-#    define DBUG_3(keyword,format,a1) \
-    DBUG_PRINT(keyword,(format,a1))		/* Obsolete */
-#    define DBUG_4(keyword,format,a1,a2) \
-    DBUG_PRINT(keyword,(format,a1,a2))	/* Obsolete */
-#    define DBUG_5(keyword,format,a1,a2,a3) \
-    DBUG_PRINT(keyword,(format,a1,a2,a3))	/* Obsolete */
-#    define DBUG_PUSH(a1) _db_push_ (a1)
-#    define DBUG_POP() _db_pop_ ()
-#    define DBUG_PROCESS(a1) (_db_process_ = a1)
-#    define DBUG_FILE (_db_fp_)
-#    define DBUG_SETJMP(a1) (_db_setjmp_ (), setjmp (a1))
-#    define DBUG_LONGJMP(a1,a2) (_db_longjmp_ (), longjmp (a1, a2))
-# endif
-
diff --git a/dmake/dbug/dbug/dbug.txt b/dmake/dbug/dbug/dbug.txt
deleted file mode 100755
index ec032f61e..000000000
--- a/dmake/dbug/dbug/dbug.txt
+++ /dev/null
@@ -1,1452 +0,0 @@
-       
-
-
-
-
-
-                                 D B U G
-
-                       C Program Debugging Package
-
-                                    by
-                                Fred Fish
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                   - 1 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-                               INTRODUCTION
-
-
-            Almost  every program development environment worthy of
-       the name provides some sort of debugging facility.   Usually
-       this  takes  the  form  of  a  program  which  is capable of
-       controlling execution of other programs  and  examining  the
-       internal  state of other executing programs.  These types of
-       programs will be referred to as external debuggers since the
-       debugger  is not part of the executing program.  Examples of
-       this type of debugger include  the  adb  and  sdb  debuggers
-       provided with the UNIX1 operating system.
-
-
-            One of the problems associated with developing programs
-       in an environment  with  good  external  debuggers  is  that
-       developed  programs  tend  to  have  little  or  no internal
-       instrumentation.  This is usually  not  a  problem  for  the
-       developer  since  he  is,  or at least should be, intimately
-       familiar with the internal  organization,  data  structures,
-       and  control  flow  of  the program being debugged.  It is a
-       serious  problem  for  maintenance  programmers,   who   are
-       unlikely  to  have  such  familiarity with the program being
-       maintained, modified, or ported to another environment.   It
-       is  also a problem, even for the developer, when the program
-       is moved to an environment with a  primitive  or  unfamiliar
-       debugger, or even no debugger.
-
-
-            On  the  other  hand, dbug is an example of an internal
-       debugger.  Because it requires internal instrumentation of a
-       program,  and  its  usage  does  not  depend  on any special
-       capabilities of the  execution  environment,  it  is  always
-       available  and  will  execute  in  any  environment that the
-       program itself will execute in.  In addition, since it is  a
-       complete   package  with  a  specific  user  interface,  all
-       programs  which  use  it  will  be  provided  with   similar
-       debugging  capabilities.  This is in sharp contrast to other
-       forms of internal instrumentation where each  developer  has
-       their  own, usually less capable, form of internal debugger.
-       In summary, because dbug is an internal debugger it provides
-       consistency across operating environments, and because it is
-       available to all developers it provides  consistency  across
-       all programs in the same environment.
-
-
-            The dbug package imposes only a slight speed penalty on
-       executing programs, typically much less than 10 percent, and
-       a  modest  size  penalty,  typically  10  to 20 percent.  By
-       defining a specific C preprocessor symbol both of these  can
-       be  reduced  to  zero with no changes required to the source
-
-       ____________________
-
-       1. UNIX is a trademark of AT&T Bell Laboratories.
-
-                                   - 2 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-       code.
-
-
-            The  following  list  is  a  quick   summary   of   the
-       capabilities  of  the  dbug package.  Each capability can be
-       individually enabled or disabled at the time  a  program  is
-       invoked   by   specifying   the   appropriate  command  line
-       arguments.
-
-               o Execution trace  showing  function  level  control
-                 flow    in   a   semi-graphically   manner   using
-                 indentation to indicate nesting depth.
-
-               o Output the values of all, or any  subset  of,  key
-                 internal variables.
-
-               o Limit   actions   to   a  specific  set  of  named
-                 functions.
-
-               o Limit function trace to a specified nesting depth.
-
-               o Label  each  output line with source file name and
-                 line number.
-
-               o Label  each  output  line  with  name  of  current
-                 process.
-
-               o Push  or  pop  internal  debugging  state to allow
-                 execution with built in debugging defaults.
-
-               o Redirect  the  debug  output  stream  to  standard
-                 output  (stdout)  or  a  named  file.  The default
-                 output stream is  standard  error  (stderr).   The
-                 redirection mechanism is completely independent of
-                 normal command line redirection  to  avoid  output
-                 conflicts.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                   - 3 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-       PRIMITIVE DEBUGGING TECHNIQUES
-
-
-            Internal  instrumentation is already a familiar concept
-       to most programmers, since it is usually the first debugging
-       technique   learned.    Typically,   "print statements"  are
-       inserted in the source code at interesting points, the  code
-       is  recompiled  and  executed,  and  the resulting output is
-       examined in an attempt to determine where the problem is.
-
-       The procedure is iterative,  with  each  iteration  yielding
-       more  and  more  output,  and  hopefully  the  source of the
-       problem is discovered before the output becomes too large to
-       deal  with  or  previously  inserted  statements  need to be
-       removed.  Figure 1 is an example of this type  of  primitive
-       debugging technique.
-
-
-
-                 #include <stdio.h>
-
-                 main (argc, argv)
-                 int argc;
-                 char *argv[];
-                 {
-                     printf ("argv[0] = %d\n", argv[0]);
-                     /*
-                      *    Rest of program
-                      */
-                     printf ("== done ==\n");
-                 }
-
-
-                                        Figure 1
-                              Primitive Debugging Technique
-
-
-
-
-
-            Eventually,   and   usually   after  at  least  several
-       iterations, the problem will be  found  and  corrected.   At
-       this  point,  the  newly  inserted  print statements must be
-       dealt with.  One obvious solution is to simply  delete  them
-       all.   Beginners usually do this a few times until they have
-       to repeat the entire process every time a new bug  pops  up.
-       The  second  most obvious solution is to somehow disable the
-       output, either through the  source  code  comment  facility,
-       creation of a debug variable to be switched on or off, or by
-       using the C preprocessor.  Figure 2 is  an  example  of  all
-       three techniques.
-
-
-
-
-
-                                   - 4 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-                 #include <stdio.h>
-
-                 int debug = 0;
-
-                 main (argc, argv)
-                 int argc;
-                 char *argv[];
-                 {
-                     /* printf ("argv = %x\n", argv) */
-                     if (debug) printf ("argv[0] = %d\n", argv[0]);
-                     /*
-                      *    Rest of program
-                      */
-                 #ifdef DEBUG
-                     printf ("== done ==\n");
-                 #endif
-                 }
-
-
-                                        Figure 2
-                                Debug Disable Techniques
-
-
-
-
-
-            Each  technique  has  its  advantages and disadvantages
-       with respect to dynamic vs static  activation,  source  code
-       overhead,  recompilation  requirements, ease of use, program
-       readability, etc.   Overuse  of  the  preprocessor  solution
-       quickly  leads  to problems with source code readability and
-       maintainability when  multiple  #ifdef  symbols  are  to  be
-       defined  or  undefined  based  on  specific  types  of debug
-       desired.  The source code can be made slightly more readable
-       by suitable indentation of the #ifdef arguments to match the
-       indentation of the code, but not all C  preprocessors  allow
-       this.    The  only  requirement  for  the  standard  UNIX  C
-       preprocessor is for the '#' character to appear in the first
-       column,   but   even   this  seems  like  an  arbitrary  and
-       unreasonable restriction.  Figure 3 is an  example  of  this
-       usage.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                   - 5 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-                 #include <stdio.h>
-
-                 main (argc, argv)
-                 int argc;
-                 char *argv[];
-                 {
-                 #   ifdef DEBUG
-                     printf ("argv[0] = %d\n", argv[0]);
-                 #   endif
-                     /*
-                      *    Rest of program
-                      */
-                 #   ifdef DEBUG
-                     printf ("== done ==\n");
-                 #   endif
-                 }
-
-
-                                        Figure 3
-                            More Readable Preprocessor Usage
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                   - 6 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-       FUNCTION TRACE EXAMPLE
-
-
-            We  will  start  off learning about the capabilities of
-       the dbug package by using  a  simple  minded  program  which
-       computes  the  factorial  of  a  number.  In order to better
-       demonstrate the function trace mechanism,  this  program  is
-       implemented  recursively.  Figure 4 is the main function for
-       this factorial program.
-
-
-
-                 #include <stdio.h>
-                 /* User programs should use <local/dbug.h> */
-                 #include "dbug.h"
-
-                 int main (argc, argv)
-                      int argc;
-                      char *argv[];
-                 {
-                   register int result, ix;
-                   extern int factorial (), atoi ();
-
-                   DBUG_ENTER ("main");
-                   DBUG_PROCESS (argv[0]);
-                   for (ix = 1; ix < argc && argv[ix][0] == '-'; ix++) {
-                     switch (argv[ix][1]) {
-                     case '#':
-                       DBUG_PUSH (&(argv[ix][2]));
-                       break;
-                     }
-                   }
-                   for (; ix < argc; ix++) {
-                     DBUG_PRINT ("args", ("argv[%d] = %s", ix, argv[ix]));
-                     result = factorial (atoi (argv[ix]));
-                     printf ("%d\n", result);
-                   }
-                   DBUG_RETURN (0);
-                 }
-
-
-                                        Figure 4
-                               Factorial Program Mainline
-
-
-
-
-
-            The main function is  responsible  for  processing  any
-       command   line  option  arguments  and  then  computing  and
-       printing the factorial of each non-option argument.
-
-            First of all, notice that all of the debugger functions
-       are  implemented  via  preprocessor  macros.   This does not
-
-
-                                   - 7 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-       detract from the readability of the code and makes disabling
-       all debug compilation trivial (a single preprocessor symbol,
-       DBUG_OFF, forces the macro expansions to be null).
-
-            Also notice the inclusion of  the  header  file  dbug.h
-       from the local header file directory.  (The version included
-       here is the test version in  the  dbug  source  distribution
-       directory).   This file contains all the definitions for the
-       debugger macros, which all have the form DBUG_XX...XX.
-
-
-            The DBUG_ENTER macro informs that debugger that we have
-       entered  the function named main.  It must be the very first
-       "executable" line in a function, after all declarations  and
-       before any other executable line.  The DBUG_PROCESS macro is
-       generally used only once per program to inform the  debugger
-       what name the program was invoked with.  The DBUG_PUSH macro
-       modifies the current debugger state by saving  the  previous
-       state  and  setting  a new state based on the control string
-       passed as its argument.  The DBUG_PRINT  macro  is  used  to
-       print  the  values of each argument for which a factorial is
-       to be computed.  The DBUG_RETURN macro  tells  the  debugger
-       that  the  end  of the current function has been reached and
-       returns a value to  the  calling  function.   All  of  these
-       macros will be fully explained in subsequent sections.
-
-            To  use  the debugger, the factorial program is invoked
-       with a command line of the form:
-
-                          factorial -#d:t 1 2 3
-
-       The  main  function  recognizes  the  "-#d:t"  string  as  a
-       debugger  control  string, and passes the debugger arguments
-       ("d:t")  to  the  dbug  runtime  support  routines  via  the
-       DBUG_PUSH macro.  This particular string enables output from
-       the DBUG_PRINT macro with the 'd' flag and enables  function
-       tracing  with  the 't' flag.  The factorial function is then
-       called three times, with the arguments "1",  "2",  and  "3".
-       Note  that  the DBUG_PRINT takes exactly two arguments, with
-       the second argument (a format string and list  of  printable
-       values) enclosed in parenthesis.
-
-            Debug  control  strings  consist of a header, the "-#",
-       followed by a colon separated list  of  debugger  arguments.
-       Each  debugger  argument is a single character flag followed
-       by an optional comma separated list of arguments specific to
-       the given flag.  Some examples are:
-
-                          -#d:t:o
-                          -#d,in,out:f,main:F:L
-
-       Note   that  previously  enabled  debugger  actions  can  be
-       disabled by the control string "-#".
-
-
-
-                                   - 8 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-            The definition of the factorial function, symbolized as
-       "N!", is given by:
-
-                         N! = N * N-1 * ... 2 * 1
-
-       Figure  5  is  the  factorial function which implements this
-       algorithm recursively.  Note that this  is  not  necessarily
-       the  best  way  to  do  factorials  and error conditions are
-       ignored completely.
-
-
-
-                 #include <stdio.h>
-                 /* User programs should use <local/dbug.h> */
-                 #include "dbug.h"
-
-                 int factorial (value)
-                      register int value;
-                 {
-                   DBUG_ENTER ("factorial");
-                   DBUG_PRINT ("find", ("find %d factorial", value));
-                   if (value > 1) {
-                     value *= factorial (value - 1);
-                   }
-                   DBUG_PRINT ("result", ("result is %d", value));
-                   DBUG_RETURN (value);
-                 }
-
-
-                                        Figure 5
-                                   Factorial Function
-
-
-
-
-
-            One advantage (some may not consider it  so)  to  using
-       the  dbug  package  is  that  it  strongly  encourages fully
-       structured coding with only one entry and one exit point  in
-       each  function.  Multiple exit points, such as early returns
-       to escape a loop, may be used, but each such point  requires
-       the  use  of  an appropriate DBUG_RETURN or DBUG_VOID_RETURN
-       macro.
-
-
-            To build  the  factorial  program  on  a  UNIX  system,
-       compile and link with the command:
-
-                cc -o factorial main.c factorial.c -ldbug
-
-       The  "-ldbug"  argument  tells  the  loader  to  link in the
-       runtime support modules for the dbug package.  Executing the
-       factorial program with a command of the form:
-
-
-
-                                   - 9 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-                           factorial 1 2 3 4 5
-
-       generates the output shown in figure 6.
-
-
-
-                 1
-                 2
-                 6
-                 24
-                 120
-                                        Figure 6
-                                   factorial 1 2 3 4 5
-
-
-
-
-
-            Function  level  tracing  is  enabled  by  passing  the
-       debugger the 't' flag in the debug control string.  Figure 7
-       is     the     output    resulting    from    the    command
-       "factorial -#t:o 3 2".
-
-
-
-                 |   >factorial
-                 |   |   >factorial
-                 |   |   <factorial
-                 |   <factorial
-                 2
-                 |   >factorial
-                 |   |   >factorial
-                 |   |   |   >factorial
-                 |   |   |   <factorial
-                 |   |   <factorial
-                 |   <factorial
-                 6
-                 <main
-
-
-                                        Figure 7
-                                   factorial -#t:o 3 2
-
-
-
-
-
-            Each entry to or return from a function is indicated by
-       '>'  for  the  entry  point  and  '<'  for  the  exit point,
-       connected by vertical bars to allow matching  points  to  be
-       easily found when separated by large distances.
-
-
-            This  trace  output indicates that there was an initial
-
-
-                                  - 10 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-       call to factorial from main (to compute 2!), followed  by  a
-       single  recursive call to factorial to compute 1!.  The main
-       program then  output  the  result  for  2!  and  called  the
-       factorial  function  again  with  the  second  argument,  3.
-       Factorial called itself recursively to compute  2!  and  1!,
-       then returned control to main, which output the value for 3!
-       and exited.
-
-
-            Note that there is no matching entry point "main>"  for
-       the  return point "<main" because at the time the DBUG_ENTER
-       macro was reached in main, tracing was not enabled yet.   It
-       was  only  after  the  macro  DBUG_PUSH  was  executing that
-       tracing became enabled.  This implies that the argument list
-       should  be  processed  as  early  as possible since all code
-       preceding  the  first  call  to  DBUG_PUSH  is   essentially
-       invisible  to dbug (this can be worked around by inserting a
-       temporary   DBUG_PUSH(argv[1])   immediately    after    the
-       DBUG_ENTER("main") macro.
-
-
-            One  last  note, the trace output normally comes out on
-       the standard error.  Since the factorial program prints  its
-       result  on  the standard output, there is the possibility of
-       the output on  the  terminal  being  scrambled  if  the  two
-       streams  are not synchronized.  Thus the debugger is told to
-       write its output on the standard output instead, via the 'o'
-       flag  character.   Note  that  no  'o'  implies  the default
-       (standard error), a 'o' with  no  arguments  means  standard
-       output,  and  a  'o'  with  an argument means used the named
-       file.  I.E, "factorial -#t:o,logfile 3 2"  would  write  the
-       trace  output  in "logfile".  Because of UNIX implementation
-       details, programs usually run faster when writing to  stdout
-       rather than stderr, though this is not a prime consideration
-       in this example.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                  - 11 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-       USE OF DBUG_PRINT MACRO
-
-
-            The mechanism used to produce "printf" style output  is
-       the DBUG_PRINT macro.
-
-
-            To  allow selection of output from specific macros, the
-       first argument to every DBUG_PRINT macro is a dbug  keyword.
-       When  this  keyword  appears in the argument list of the 'd'
-       flag    in    a    debug    control    string,     as     in
-       "-#d,keyword1,keyword2,...:t", output from the corresponding
-       macro is enabled.  The default when there is no 'd' flag  in
-       the  control  string is to enable output from all DBUG_PRINT
-       macros.
-
-
-            Typically, a program will be run once, with no keywords
-       specified,  to  determine  what keywords are significant for
-       the current problem (the keywords are printed in  the  macro
-       output  line).  Then the program will be run again, with the
-       desired  keywords,  to  examine  only  specific   areas   of
-       interest.
-
-
-            The second argument to a DBUG_PRINT macro is a standard
-       printf style format string and  one  or  more  arguments  to
-       print, all enclosed in parenthesis so that they collectively
-       become a  single  macro  argument.   This  is  how  variable
-       numbers  of  printf arguments are supported.  Also note that
-       no explicit newline is required at the  end  of  the  format
-       string.  As a matter of style, two or three small DBUG_PRINT
-       macros are preferable to a single macro with a  huge  format
-       string.   Figure  8 shows the output for default tracing and
-       debug.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                  - 12 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-                 |   args: argv[2] = 3
-                 |   >factorial
-                 |   |   find: find 3 factorial
-                 |   |   >factorial
-                 |   |   |   find: find 2 factorial
-                 |   |   |   >factorial
-                 |   |   |   |   find: find 1 factorial
-                 |   |   |   |   result: result is 1
-                 |   |   |   <factorial
-                 |   |   |   result: result is 2
-                 |   |   <factorial
-                 |   |   result: result is 6
-                 |   <factorial
-                 6
-                 <main
-
-
-                                        Figure 8
-                                   factorial -#d:t:o 3
-
-
-
-
-
-            The output from the DBUG_PRINT  macro  is  indented  to
-       match  the  trace output for the function in which the macro
-       occurs.  When debugging  is  enabled,  but  not  trace,  the
-       output starts at the left margin, without indentation.
-
-
-            To demonstrate selection of specific macros for output,
-       figure 9 shows the result  when  the  factorial  program  is
-       invoked with the debug control string "-#d,result:o".
-
-
-
-                 factorial: result: result is 1
-                 factorial: result: result is 2
-                 factorial: result: result is 6
-                 factorial: result: result is 24
-                 24
-                                        Figure 9
-                                factorial -#d,result:o 4
-
-
-
-
-
-            It  is  sometimes  desirable  to restrict debugging and
-       trace actions to a specific function or list  of  functions.
-       This  is  accomplished  with  the  'f' flag character in the
-       debug control string.   Figure  10  is  the  output  of  the
-       factorial   program   when   run  with  the  control  string
-       "-#d:f,factorial:F:L:o".  The 'F' flag enables  printing  of
-
-
-                                  - 13 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-       the  source  file  name and the 'L' flag enables printing of
-       the source file line number.
-
-
-
-                    factorial.c:     9: factorial: find: find 3 factorial
-                    factorial.c:     9: factorial: find: find 2 factorial
-                    factorial.c:     9: factorial: find: find 1 factorial
-                    factorial.c:    13: factorial: result: result is 1
-                    factorial.c:    13: factorial: result: result is 2
-                    factorial.c:    13: factorial: result: result is 6
-                 6
-
-
-                                        Figure 10
-                            factorial -#d:f,factorial:F:L:o 3
-
-
-
-
-
-            The output in figure 10 shows that the "find" macro  is
-       in  file  "factorial.c"  at  source  line 8 and the "result"
-       macro is in the same file at source line 12.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                  - 14 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-       SUMMARY OF MACROS
-
-
-            This section summarizes  the  usage  of  all  currently
-       defined  macros in the dbug package.  The macros definitions
-       are found in the user include file dbug.h from the  standard
-       include directory.
-
-
-
-               DBUG_ENTER  Used  to tell the runtime support module
-                           the name of the function being  entered.
-                           The argument must be of type "pointer to
-                           character".  The DBUG_ENTER  macro  must
-                           precede  all  executable  lines  in  the
-                           function just  entered,  and  must  come
-                           after   all  local  declarations.   Each
-                           DBUG_ENTER macro must  have  a  matching
-                           DBUG_RETURN or DBUG_VOID_RETURN macro at
-                           the function  exit  points.   DBUG_ENTER
-                           macros    used    without   a   matching
-                           DBUG_RETURN  or  DBUG_VOID_RETURN  macro
-                           will  cause  warning  messages  from the
-                           dbug package runtime support module.
-
-                           EX: DBUG_ENTER ("main");
-
-              DBUG_RETURN  Used at each exit point  of  a  function
-                           containing  a  DBUG_ENTER  macro  at the
-                           entry point.  The argument is the  value
-                           to  return.   Functions  which return no
-                           value    (void)    should    use     the
-                           DBUG_VOID_RETURN  macro.  It is an error
-                           to     have     a     DBUG_RETURN     or
-                           DBUG_VOID_RETURN  macro  in  a  function
-                           which has no matching DBUG_ENTER  macro,
-                           and  the  compiler  will complain if the
-                           macros are actually used (expanded).
-
-                           EX: DBUG_RETURN (value);
-                           EX: DBUG_VOID_RETURN;
-
-             DBUG_PROCESS  Used to name the current  process  being
-                           executed.   A  typical argument for this
-                           macro is "argv[0]", though  it  will  be
-                           perfectly happy with any other string.
-
-                           EX: DBUG_PROCESS (argv[0]);
-
-                DBUG_PUSH  Sets a new debugger state by pushing the
-                           current  dbug  state  onto  an  internal
-                           stack and setting up the new state using
-                           the debug control string passed  as  the
-                           macro  argument.   The most common usage
-
-
-                                  - 15 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-                           is to set the state specified by a debug
-                           control   string   retrieved   from  the
-                           argument list.  Note  that  the  leading
-                           "-#" in a debug control string specified
-                           as a command line argument must  not  be
-                           passed  as  part  of the macro argument.
-                           The proper usage is to pass a pointer to
-                           the   first  character  after  the  "-#"
-                           string.
-
-                           EX: DBUG_PUSH ((argv[i][2]));
-                           EX: DBUG_PUSH ("d:t");
-                           EX: DBUG_PUSH ("");
-
-                 DBUG_POP  Restores the previous debugger state  by
-                           popping  the state stack.  Attempting to
-                           pop more  states  than  pushed  will  be
-                           ignored  and  no  warning will be given.
-                           The DBUG_POP macro has no arguments.
-
-                           EX: DBUG_POP ();
-
-                DBUG_FILE  The  DBUG_FILE  macro  is  used  to   do
-                           explicit I/O on the debug output stream.
-                           It is used in the  same  manner  as  the
-                           symbols  "stdout"  and  "stderr"  in the
-                           standard I/O package.
-
-                           EX: fprintf (DBUG_FILE, "Doing  my   own
-                           I/O!\n");
-
-             DBUG_EXECUTE  The   DBUG_EXECUTE   macro  is  used  to
-                           execute any arbitrary C code.  The first
-                           argument  is  the debug keyword, used to
-                           trigger execution of the code  specified
-                           as the second argument.  This macro must
-                           be used  cautiously  because,  like  the
-                           DBUG_PRINT  macro,  it  is automatically
-                           selected by  default  whenever  the  'd'
-                           flag  has  no  argument  list  (I.E.,  a
-                           "-#d:t" control string).
-
-                           EX: DBUG_EXECUTE ("abort", abort ());
-
-                   DBUG_N  These macros, where N is  in  the  range
-                           2-5,  are currently obsolete and will be
-                           removed in a future  release.   Use  the
-                           new DBUG_PRINT macro.
-
-               DBUG_PRINT  Used  to  do  printing via the "fprintf"
-                           library function on  the  current  debug
-                           stream,  DBUG_FILE.   The first argument
-                           is a debug  keyword,  the  second  is  a
-                           format   string  and  the  corresponding
-
-
-                                  - 16 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-                           argument list.   Note  that  the  format
-                           string  and  argument  list  are all one
-                           macro argument and must be  enclosed  in
-                           parenthesis.
-
-                           EX: DBUG_PRINT ("eof", ("end of file found"));
-                           EX: DBUG_PRINT ("type", ("type is %x",
-                           type));
-                           EX: DBUG_PRINT ("stp", ("%x -> %s", stp,
-                           stp -> name));
-
-              DBUG_SETJMP  Used in place of the  setjmp()  function
-                           to first save the current debugger state
-                           and then  execute  the  standard  setjmp
-                           call.   This  allows  to the debugger to
-                           restore it's state when the DBUG_LONGJMP
-                           macro  is  used  to  invoke the standard
-                           longjmp() call.  Currently all instances
-                           of  DBUG_SETJMP  must  occur  within the
-                           same function and at the  same  function
-                           nesting level.
-
-                           EX: DBUG_SETJMP (env);
-
-             DBUG_LONGJMP  Used  in place of the longjmp() function
-                           to first restore the  previous  debugger
-                           state   at   the   time   of   the  last
-                           DBUG_SETJMP   and   then   execute   the
-                           standard   longjmp()  call.   Note  that
-                           currently   all   DBUG_LONGJMP    macros
-                           restore  the  state  at  the time of the
-                           last DBUG_SETJMP.  It would be  possible
-                           to  maintain  separate  DBUG_SETJMP  and
-                           DBUG_LONGJMP   pairs   by   having   the
-                           debugger  runtime support module use the
-                           first  argument  to  differentiate   the
-                           pairs.
-
-                           EX: DBUG_LONGJMP (env,val);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                  - 17 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-       DEBUG CONTROL STRING
-
-
-            The  debug  control  string is used to set the state of
-       the  debugger  via  the  DBUG_PUSH  macro.    This   section
-       summarizes  the currently available debugger options and the
-       flag characters which  enable  or  disable  them.   Argument
-       lists enclosed in '[' and ']' are optional.
-
-
-                d[,keywords] Enable   output   from   macros   with
-                             specified keywords.  A  null  list  of
-                             keywords implies that all keywords are
-                             selected.
-
-                    D[,time] Delay for specified  time  after  each
-                             output  line,  to  let  output  drain.
-                             Time is given in tenths  of  a  second
-                             (value  of 10 is one second).  Default
-                             is zero.
-
-               f[,functions] Limit   debugger   actions   to    the
-                             specified  list  of functions.  A null
-                             list of  functions  implies  that  all
-                             functions are selected.
-
-                           F Mark  each  debugger  output line with
-                             the name of the source file containing
-                             the macro causing the output.
-
-                           L Mark  each  debugger  output line with
-                             the source file  line  number  of  the
-                             macro causing the output.
-
-                           n Mark  each  debugger  output line with
-                             the current function nesting depth.
-
-                           N Sequentially  number   each   debugger
-                             output  line  starting  at 1.  This is
-                             useful  for  reference  purposes  when
-                             debugger  output  is interspersed with
-                             program output.
-
-                    o[,file] Redirect the debugger output stream to
-                             the   specified   file.   The  default
-                             output  stream  is  stderr.   A   null
-                             argument  list  causes  output  to  be
-                             redirected to stdout.
-
-               p[,processes] Limit   debugger   actions   to    the
-                             specified   processes.   A  null  list
-                             implies all processes.  This is useful
-                             for    processes   which   run   child
-                             processes.  Note  that  each  debugger
-
-
-                                  - 18 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-                             output  line  can  be  marked with the
-                             name of the current  process  via  the
-                             'P' flag.  The process name must match
-                             the    argument    passed    to    the
-                             DBUG_PROCESS macro.
-
-                           P Mark  each  debugger  output line with
-                             the name of the current process.  Most
-                             useful  when used with a process which
-                             runs child  processes  that  are  also
-                             being  debugged.  Note that the parent
-                             process must arrange for the  debugger
-                             control  string  to  be  passed to the
-                             child processes.
-
-                           r Used in conjunction with the DBUG_PUSH
-                             macro to reset the current indentation
-                             level back to zero.  Most useful  with
-                             DBUG_PUSH  macros  used to temporarily
-                             alter the debugger state.
-
-                       t[,N] Enable function control flow  tracing.
-                             The maximum nesting depth is specified
-                             by N, and defaults to 200.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                  - 19 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-       HINTS AND MISCELLANEOUS
-
-
-            One of the most useful capabilities of the dbug package
-       is  to  compare  the  executions  of  a given program in two
-       different environments.  This is typically done by executing
-       the program in the environment where it behaves properly and
-       saving the debugger output in a reference file.  The program
-       is  then  run with identical inputs in the environment where
-       it  misbehaves  and  the  output  is  again  captured  in  a
-       reference  file.   The  two  reference  files  can  then  be
-       differentially compared to determine exactly where execution
-       of the two processes diverges.
-
-
-            A   related  usage  is  regression  testing  where  the
-       execution  of  a  current  version   is   compared   against
-       executions  of  previous versions.  This is most useful when
-       there are only minor changes.
-
-
-            It is not difficult to modify an existing  compiler  to
-       implement  some  of  the  functionality  of the dbug package
-       automatically, without source code changes  to  the  program
-       being debugged.  In fact, such changes were implemented in a
-       version of the Portable C Compiler by  the  author  in  less
-       than  a  day.   However,  it is strongly encouraged that all
-       newly developed code continue to use the debugger macros for
-       the   portability   reasons  noted  earlier.   The  modified
-       compiler should be used only for testing existing  programs.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                  - 20 -
-
-
-
-
-
-       DBUG User Manual                            October 29, 1986
-
-
-
-       CAVEATS
-
-
-            The  dbug  package  works best with programs which have
-       "line oriented" output, such  as  text  processors,  general
-       purpose  utilities,  etc.   It can be interfaced with screen
-       oriented programs such as visual editors by  redefining  the
-       appropriate  macros to call special functions for displaying
-       the  debugger  results.   Of  course,  this  caveat  is  not
-       applicable  if  the  debugger output is simply dumped into a
-       file for post-execution examination.
-
-
-            Programs which use memory  allocation  functions  other
-       than  malloc  will  usually have problems using the standard
-       dbug package.  The most common problem is multiply allocated
-       memory.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                  - 21 -
-
-
-
-
-
-
-
-
-                                 D B U G
-                       C Program Debugging Package
-
-                                    by
-                                Fred Fish
-
-
-
-                                 ABSTRACT
-
-
-       This  document  introduces  dbug,  a macro based C debugging
-       package which has proven to be a very  flexible  and  useful
-       tool for debugging, testing, and porting C programs.
-
-
-            All  of the features of the dbug package can be enabled
-       or disabled dynamically at execution time.  This means  that
-       production  programs will run normally when debugging is not
-       enabled, and eliminates the need to  maintain  two  separate
-       versions of a program.
-
-
-            Many   of   the   things   easily   accomplished   with
-       conventional debugging tools, such  as  symbolic  debuggers,
-       are  difficult  or  impossible  with  this package, and vice
-       versa.  Thus the dbug package should not be thought of as  a
-       replacement  or  substitute  for  other debugging tools, but
-       simply as a useful addition to the program  development  and
-       maintenance environment.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                  - 22 -
-
-
diff --git a/dmake/dbug/dbug/dbug.uue b/dmake/dbug/dbug/dbug.uue
deleted file mode 100644
index da8743b7e..000000000
--- a/dmake/dbug/dbug/dbug.uue
+++ /dev/null
@@ -1,368 +0,0 @@
-begin 650 dbug.Z
-M'YV,"@*"&$BPH,&#" T2 2$$1!401P0FG&AP" @H<MZ<D1.F#0@B9<34.7,F
-MC9LS%\.,61/F3!F)%&/*!"$F#\R9. <:D5.&# @C:>:@"4@481($1Y,Z0;"T
-M*14$3Z-*03"UZA,$5[,20;"U:Q4$7\,.03"V;%2H4),B19H5*]:F3)D6C1F$
-M39LW<^B *&.GC)P\(.!DW-@1!!F^9=B\@=.FC!N]CNVDR>BF\6,0=][(H8,&
-M,(@W9A0@Y%QFH)N.I06_D7QX#H@Y;QJ_UJP7M.&0(TN>!&%&91HV:>CD<3&P
-MRIPZ8=BPL3D:35 0=,*L*>.:]$ SFCU^-C,PS$#5A+7?<3X&S<#G(,:$@1-&
-M#)O2VT4?'//F<4;E)E'NQ5-F3!TZ:=0WD&V?D29'8(-QU(9K8;CA4QEX=&12
-M?M"A\1)")M'AUVELO!:=AML5:.&!$/;W'X7@*3@'<2!08>$<I0D'!W4#AH90
-MBAVY=L=O'8I1&D]F^,633W2\ 4(8KD&HH1P<WB8227ZY-H=)8\1HH7P&'?:D
-M2P<^Y\8;>K&W68C6E>@?@+OAV :+1438!ASON19?<^C)"!^!6N;FUWENC,%&
-M'8<-9%T8"!!J*!D((*JH& @PZNB1#KZ&P!R33JIHHHDZVFBC3NHIQQQ8%J0:
-M:SUA%IQYUH4%%EAP-:564E@@$.NL&^ 0 P*WYKI!#I_-R!&:*,V11UYEK#D7
-M14^X49IMUJGF7K$,S@';&&F$H:%/.W)V6U^*P8%B@CF&2I!)W;DQ4&23U6>9
-M7J9J"\(9;[SATWY+-MDIE)^"\!QGUHH[T&'<+E:JFG)J&"ET1H* 1AA]#00<
-M'72\-^"!('S)9[W)^:NO&WG)4<>ZU@;H!HLM.B<G>G4<E]QRIH'9'8)O/.L1
-M=@>2IC' B0E\X)1]EF:AOG.P\-F!UCI<!I+L"O5&'6S,ZZ/0&P/8AK6),7=0
-M;VW\5BW%V9I7(7P9;IC<T&<TF(8>(=<G-!G6>M=Q'6/040=/06O<H$_TV?=&
-MAV8H=@>9/ZM)4QD4WNL2&20GP2YZ86@,HQP!IDR0L^]IQYMF TT=]FD]?P=N
-M&XU]"O5X"8?!D\9UN '<="P7J3##I1U7'F\2 F=Z<)YU+>C/,(<WD(_Y::SY
-M8V&8U!/4=Y&1AAEI'#]T8+25ZGJ#8(ZXEQN24;8NBXIK_%QRL!T)L\Q"(V8N
-MS5]OF[.O0H_G6/J]*^B]G'?U-:_KD%Z?O;J.Z:6[=X))0]8 U##,I0YK6C/=
-MS7"#+Z%ASGP5,U*>\.6"8TTD6>FKWIX6YB"A?2%1'Q3#!^OP091\SUP0Z@B<
-M[L2=_$5-;&Q8X);\PB(A]"<,*2M-<$# DSC483(T"AN3QF:2MX$,0 *R3>-N
-M]#FAW4U?=)!3REH"'S*\@4819-=A9G0P 4'*,W.8$;4RAA#UL$<,6@,0%@ED
-MG?V8"(GFTE^Z*M,_J.WP>VRX0QB&93<[%(\-[9'8$W>DG'/QYTQ@BV.#/(,N
-M[?5O=T7[FL8$!T48L8$[A.R0F?ZCPY$-) GF"@,9E ='H?&L2E $VI$T1I\W
-MO0=$@5$)2UPR$-V)[S5B7%X:QC"0'%),B+VI$M2.I)Q)?DY.F"&/UW)X'G9E
-M\G?P&54:#C,O6TXI:X"4@PQS0R$SMB>-S5O10%STG'*:2RBF@T-ZZD,'CN0%
-M80,RD 4)\H5ZVO.>-RE(#(A3!2<D 0NJ]$X[15DLTZTA1$&@@@FHP)#$=(@)
-M[=&,M303S@H216,YD4D+0! #$+3@HA=%"!&$4(4C..1Q(&A"@Y#3H8S&Y EQ
-MB]F>9) #H<4@!SBP04BOEAW7V$:(32IB.S_6O[29RWT\V8M*O(:S;NWI=:!J
-M#N$H]H8[N$%H*6,IR^+D&F\^2V@T\\A/'P-#P]%08Z!\S<>F]A>A^4@]S/P@
-M&4(XPA(&U%Q '=L$N91*:;:&E?69$K'Z!!B59$1:O?)+R';32/X])FB0\LE;
-M<0BC5 :ECW\,9(R,M#+U.35?._0K%O,F6(.-P3.&Q4M4#])9@FTL?7- C1P=
-M^1B+8K0@+BJ-7.F* !(B "7L60D5]?4FO-"H/BQS&W#.@ :]A+$, W-,<H3S
-M&3=H;)/ BE^.A":C7:X,,&V FWFX6J$&<10&@?%+E1[C1 ?9#03)HXYSSY8:
-MZ;)!.%#KKGJ4XYD8H!>>()#!?WVU7CJ03 A6RU(9F.>&PKDME\SCI44$4P;5
-M5$E:F!-6&\2P-YI4#W#4*8UZK(L0'_&P)W"3GI'TX!<CZ<YBY6F02US3PQ\.
-M25 ):R-LYE8EP![&MC+)[77VYK?" >>=JKRE#W=YT($<!W2F\TR(=G>A^:SG
-MFP\+9XVH/)#=-JJNOXVE<%W"IJ6FY\IH?!A@1CPX[SDH#:S1*F"D^RR?8$YY
-ML:WSD?1B':G!QSO:U<YE,82]-TQG7C21\G.I988\% Y^1X*#:@)(M8&T<FH'
-M XZR[":',Q#UL1;-B9':]$:108<CJ'P-&JI:.#.D+FZF!L%[N&5I=M[GM@GI
-M6U4+0JZ7.;E8:6@!8>! GN\2!-/*HA@(4A8\EYKD,,2#(SR?[5T0*2LO%-HB
-M9T*-$R,]X3]P^$_Z_/BGXW)G90XDFAO 6 <QP(A=H(':=!*,D[QVR(^0T^R*
-M\DD1(S%!@#L\$JP#BV-?+UJ7O/PUNZ9<,=20 =<(<76?X+AOB!?$WP#7B\0'
-M;JZ!HG)ZN.R/+DMU[>QJ&PW<GHF_VY,8I<YN:70(MUXT71K=[5@.J&2>Q!HN
-MF\A:W" TK]C'?"2'E,MDY3YJZ=%F]QEPBUO6QJOEJ4PCVRG[1PX\><S/1961
-M"U=<U!=)F7DP!X?%7*RLABM<7BH-X)55=>L$P:ZI=2>2W^B%7'O-]H)Q>-^O
-M=QL$4N@)$./&Y7L-R.E):^?1M(._M3O(= ]W*<QE/A 4Y,6*_TG!Q'Q]FL;,
-M2^=E8)&0#],;IM$![H>/N;@[MO@D.YYM<IB7D# ' LO3X3!83P')<HOZ$RN/
-M)QR';W\X&!2//*>5*]00RYY=8<= NS8VRNB7Y#"U#EWZB4$?TN"EW78[O&&:
-MJ9=Y[_/6MUU&T;;S=*E& ^Q1D*;_(R0UJ7'VI%(WL%3]R(HIT0-<4X[B5*?O
-M!P4((( $6!54016O@A1-@  +V( )F 1G$14/: 4(0($66 0(@($:^!%<T8%$
-MH($9F(%"@  C6(*J$A9'@  IN((KJ((J^("MPA0MN((M@A91 8(:6!9D019(
-M@  ]^(,QZ$]KD111@ !%>(0G"!8XF(%3@ !-^(3O9Q"@A#$=(E0><T2FAD<\
-M(4J%13O8M#6UUC-P<'JC821W\4YJ$CJ0=4HZ='>ND57&9AW,\REZD7<GH3$:
-M4AX-YD/P\1ZFHRR(@UMYX"W[M1S#) (!=!EKIR'K,@<B0!"F4V4&441^<2U\
-M EM+@W,B)B^E431")%\H\GV/Q5T_0Q^',3\GAGR_42I/A%W.$UF%1S>F5SB3
-M]W2#=A IE#6 ^%KF92V,.(;P=!A+HHLU-R)6DAH9(3- 8W0$(606AF))54Y+
-M$C)],3I3YW)>$QR*Q7V.EAC*<X<(<1=)!8OPI1EW@GA0\T0*(S"NQE^%=W.H
-MQ"Q7PD0Q4SFJA&?TT1<WYB,T<XQ-IWIZ\5:Q02-%8B391$M%LD!CTRY>0WL4
-M)AE+,P<LLS&/8XD>0C6-:!K0121&XB,:PQ/UTQ,L A2>EE0==4+[H4(2(X_[
-M,H@LY#D9!V>26!!VB!)YB 9[6 >AMU,Y,0)4\B>!P@.7%R N@ 8^P&\Q,3RU
-M9SIG, 9.U&EVD *]ER%'TFECL /CMS 'H@),:0=;T 58Z5)[T'M<ER'<@0(B
-MT)5;  -=  (]  (E0 9<X 8B\)1GX)5LF0)AB7\@\ (J0)8%H0(#$7CO9!MJ
-M I@$H0(O@)@(8I:U)P(]\)96I"QNV0-S*0)ZV7M]$(5\B1 D.3>E$0.,61 8
-M$9,- Q);0B%4,'PY^1(@)1-%T!>/(6?I>#!PZ(Y'8@9+ HD+YX=(]AJ(P1$Q
-MA"'32''YQ3N44RQ25TB#<SFIXQ-/1!]8UQ_7PB)!0(8'P1G/47890HJEH2QW
-M,)&4N!FETIB7<9&,V#_TDS+LXI$(<1C3)77;1A#)LBQB )&2 QM_(FW[8B37
-M!"> <1BO=(QM8#?*44-EH!O)]H8JXXY65"'?PQME\#=^]H:/\1M?XQD+TQ=X
-MF# \,2.15"87FE3/B%C!"1A^)C[@21,C 3UP\(9P4$$((60PDC<^<8:U<9^1
-M(R5[<R("TI^ST1BK]C>&$12:164:4XMT #6$8R"[DQ$CX34ZEHFH9(J;"#J/
-M%$QIE <LP$I;*&U*9'CX5BW/ D\F-@?94AZEDD0' AIFD&Z)ACH\HQ]M9!$(
-M4F%=1QVP470$\9E))0-WE9*NM"SG5DS-P1,QPIIIP(<5AY2=>1 ;-0/MYWX:
-M,U(E=5+TMU(+^:@% 5-%LG\T95/_YWXNY9-] I2E(92W1Y1&Z:@30943Y)8@
-M  -8V7M*B0),Z915>9=2Z6R7D:M[F1,QMI5J"9:]-Y:=Z9?F20=GF990*:LE
-M@ >7:9=1"0**R9C+4WL3I'F)R*R/J99L":UR29?4NI9=D)G)^I>/*IB )U\A
-M<ICKNIBENCRD]Q%%$'^,V:W-&IF&41^E$9F7B:X9-0+.MSR:R9F<VJ=I4)*E
-M(0.CJ1 ,]!%&6J:KJ8>+JI.@\IHQ401F=I.M"57-)">BY$?$,V/E,B]X-K(-
-M$ATSIC&V1#=BQ"[X0P9YT'F[! )V("4?<K,J04!&94I4NHFGB!"KX1<6(DI"
-M WRQX2V )&TU!D2-6#Y(0JB]!"-0 Z\'L85LDV:XPZ1T, 8D\P3ZR$Q3UD84
-M5J)[.AO[*3(:LV0KL55'0P;5823)N2 ,.1L\)K3PH;58ACLG*SS%0SPFT;?4
-ME4SO U^SN$(#,0((P+B.FP8( +F2:P8(0+F6>RF*4@8(H+F<:[F56[E.E@<;
-MMC<B.XZNXYX'07K&8V<4\YP+MKJ_,[7SXD4'%V&"XI)R@B<,M$!3,B2B]S/P
-MJ+=G9BXF-C6!(I$+VUPL(XX_$K>:I3$UH5;!<:3,%VVF)H^EX;B-V[B2&[F1
-MZ[F7BRF9N[GDNV"?:[F[^FE1!$]3\[6H,H\'4;T[ZT5L5(J<Z%;B]B5ZT5D3
-M]J%YBF'YXG9W@(<FLWN\@UR>\;0@^4B70S$Z%AV/%WO%L2IA$80/."NR(BL$
-M,03&A*=OX'68\QSH8QTG, (GD!Y:V;-[,CV2=C1=TG$_,X=Y 5A_T@97]3M/
-M!T$0*B<P BT.DP;3 8EQ5)5H-%!_(<21=Q"ILX6P<1IE>F(=8WXB0S)^"A^2
-MBI*YJ+@LN5H&,45D1JD:F[ )L5$T,*FD>A"6*G\H57_W)\8#X:DR=2"AZG\Y
-M=<8]^9. DJI#^09%>92V&KA+:974VJL9197 FI6F8ZW%&JPX@:P#.RYF4*\?
-MB*^=J:_?"I7F*J[3NJMX>:Z,/!,C$'=O%GWXYY>CR:Z$"7V!=LKR^LCG$<D+
-M9J^4S)>6C);\.IG_:IET*; ]*<K*0\HXL9FNZL95# (S\+!-8([M*DI'BA$>
-M#,('8AQ4!,;47,UV[,8&L5$U8,9A7!!IC*D'PL:;*L9P#*K]=U-U_'Y&@ #K
-MW,Y)V$]QT10Z:!8VF!9#R!9ND15!6(,1:(!5$00( - "/<]DL81%  (&C<&S
-M(M !'= -R( ,2( #.(!,@  5?=$&C; #<04UQR,7.29N*FLNW&"[$5%/UT9>
-M!4YK!,P$T49>)D*]95=B-DOP$;W+-J<O\Y\2HXO4%&C)M$M#449+RTG5$<,]
-M2U%C$Z9"MV$T1!!I-32X5W"# S%^L4!WP3$#!4MMM''<YW&ET1@QUF!ST :D
-MN)V? S3>,ZCK4BK -S=3PBW#H1,+"YH@4,;[\C-*R=6Q1C,$+,)'G6\=HB;H
-M-Z^GFL<@H*K*P\>MZE+*.G\'XEI*PS0^P4P\H!C[]0)D\"1];*VM?,>%'2@B
-MD-DC490B,,SA",BX*LB<3,@Y8<A6^<DR,:R*C,G&*I:,R1,E02POK!>R>%]"
-MDP9X -LYH20;$C6T$U. 77LIX$1%D@;*7:N=F<9?4 1.0 5%( 6/.3R8*=PX
-M(=U0( 5/, 1%, 53$,AW::Z\K'[H@P+ +:LQL /Z@@>'O:N\9 (FP,E; -Q=
-MD,G\>@(M< +P#=PKL *:Y\B<BJ;!,3NI?=[ZO04Q<*X@8.!NK!Z55<(GH ,/
-M2Q'>7053@ 2U9P(+[I4-+@/GFM[8_#M;N ;<[5*;V9DMSI?K'>#RS0/T+>,#
-M7N 9#G\E]07?G035?<EGX(A"@Y9J&9=M^98E(.3Q7:[ZG0(FSI>]K1=O&4Q%
-MDMRXVMSF+>)X4.(KGE&U+ )QN<E1_N0Y\>+X)]U24 144 52X 2U!P-D3A'"
-MG.,44<PT0.=&\-?5TB$8H1$*DE*!2W/7G!!"U@8(8.B(;BB%4BC=*[EN@ "/
-M'NF\\6K\*2<P&UAI\,3H S->YV#K!EA0=C!01YF]PGU,J;XB>S"D$4?(=R*[
-MX7-,E"$4(H=ZGM3<L73F\25NT *+(6VGOCT\>>($L5$VP,W!3A#?[-B ;G_C
-MG+#E/%/G/*H:_1.349B%R@9"H[^[9"5%TUG8:U8'HM>!Q6E@H];]4YZ2 6AG
-M^[]I"U^I)4[C9#+]2B/ZNT >IW$9X1'6P;=<2UW?;J6P.#73X1HIZQ[-QEJ%
-M%*NJV+2FUDYPMN=+^1KY(3'K_L%ZFF&BRV'87JD>R!4E2((D^,XSJ((?5/((
-M\ 5MD17MS,[LO/+M#%::<6'I,S5CD!'[P1X<(S)SVYSVIQRZ9]H@4!?AH^T?
-M]S-X/"5)U$)M=+11S1NK^"_BFRF;XBAUT%M6/Q*_E?5GX ((P/5>CP8( /9B
-MKS%FD._I8]ECP_1[ GI%"GQ5'M>U)V3ZB/1X]=D]H3'&J$I]YJYSGX5QU$:B
-MK1_!^R]!X? B 4<WLWV:D0>ZUXSRSO9Y$QU%1$P=8AVJVV 4U\"2])X,Q%<T
-M?UCMHTR4_SH-(X?9P8%=X?$@;X(4#!8C?P0F7_(*+2NSCP5>W_5=?_M>K_M=
-M7_NU#V0Q(62IWQ4?S_HG^/JQ?_(&'801"!4&[<]4X>XU;R0F$59%731[M<(+
-MXS\^ SO7158WEC[B;BZ=5RJ(?NB'KNB&TNB1&^F0#NG<HQ?A]4XF9AWZ"!@R
-MC)T&(0+8I5F/&'3DXAWC[T2ZN2>==1A^8CI&E>I);!#\J,R+)")[TO]E2G._
-M6QK#K_K%+_(NN(+)S^,378 ':!7YC!4$+=XAJ(%/Z(1.^(1.Z(32;_.W:! N
-MD6S&ED-VICJ 41^HY"L^[3K5?_J W_E5C1#C433EGSZ"HT>N81+>=V@,^;NE
-M,?RJ7_PB[X(KF/P\/M$$^,Y/Z(1.^(,^Z(/2GQ'"(R\C5]0B-C=95X>=OR>+
-M6!K1&UN2\>IFRQ/XR<4%L8A_=C#OEETJ.J'H61IB(+O5E3Z1?Q\> CG@>!#L
-M(2VLZ!K!P2"=IKZ_6QK#K_K%+_(NN(+)S^,378 '6!4P&,],T?P,)?TVGV0Y
-M=#]O8$Q4"3_DAK$A@NOINRZ:/QY +3Y4CM15R,4%<;I7*G,B&>^E,?RJ7_PB
-M[X(KF/Q? /UI'H(:V/QKWOIL?H!5L<^?GV,.53"\D_W:U!PARCO.MV76<759
-MIW&4;FH+XQH^\CY;J*;0Z5X(P1-RPR0,@K/)H9, AM(KTVJ4/L4$41<M5;\A
-M!KC3KR,>;6+MR#(0 B>!6RKD<ASN5@9\J(C4J?/,.*-&PDR6W_E^X9W'7>40
-M3TGH81+>=V@N.W7><7V1$G3?'E883N=4CM0=T@(C0 8ZH!<=!:C'K#%"!E_H
-MG^B+OO[>Z^CO+^F3/G&QIK1GT& L5C"\(P(M, )DH -T\(@> CFOCB3=L4WX
-M$H;MU&$> CDGT5X^P1[20I _D_U$TVFHKC%H208Z0 >8*=4N#4)?%M-AQD.I
-MDZ)J)6FT,1!0BB98E.Y(*E(=/U*K'_*M7U(NN(+)S^,338#O_(1.Z(0_Z(,^
-M*/T9\;O;:3H XA_9Y"&0PUA.'"?_2'EE'QL$7!K#K_K%+_(NN(+)S^,378 '
-M6!4P&,],T?P,]?DN-G4D3 8GW#<M 8MT%B?70>EL.QJH5CBV1,)T<,)]TQ*_
-M6QI4CM1\0^E96-2.P4HK(SUH@*C0(4#4T3Y3-RB=ANH@( (Q4)<#(0(R4)<G
-M.Q B, ,B(*,'X01@ A_\(K,_X]U2X.,,%1T#GY)QTSH(0 <(0 <(0 =W@ !W
-M@ !W@ "9@0!O@ !O@ "<U6FHWCZG0L"QTQ_U 9V=IKX1'U9%$\4E'2E'!F\M
-MU*W/BQ#DAK&:YQA^8EP^02YBTC\O$A3,*%(1&_GWX2&0<Q)=A>G6?DMJ+P?'
-M"1\BT (C4)=D3V1559XV#6CTH1CG5&&F0S4^<62JG/U$TVFH+J,'P;&SD_U$
-MTVGJ&U 2?Q(2,ZPJ3#%]TQ)#IAQ5=?<E5ECFTNLB,S;7!YQB0C4^<62J_.OJ
-M&7*,=K,)*57O(I/G TA;/Q!3,)""ND(,PA,8WLW"[E$@< /&_G[)OL::VE)N
-M_.QR'.WI#/0XT0(C0 8Z0 <Z\ 9TW@(C0 8L8!(L ',Z\*;#HP-&H -,@)1.
-M ";PP2_L\I [.I%T]AXHV_E/U;,Z;VGF!4V)GV?O(5DH:K]ZTR%1O!LBT (C
-M( + 3Q&C][J8?[W<0>O(#?'C;TH9OS?T!9U<7! BX 0A4)>J5!*RF6@8GN-.
-M$ *RZN:"Z00MT%&"Z0(N0!R *IBBJ3'%O,UW71I4CM0M-?ZU)/K$M4(9N<,&
-M"B^0PQG:T=:?(I/+03). ";PP2]\)N]>XC+*XG6WLQP$7!H^\DYZA*()\Z#'
-M7>5[GNJRAW6T9Z/!H?/=<3H8<@;35RK(-Z#+,=@#B\=!N<=]W'N-C5*0O6J2
-M?=.IBO9L@-F:;92<W7NFZB>&'=J:C0:E/9670>5(W2$H0&XZR=HX@=N%OR=4
-M26XZV>4((>$N)=W4;=W8C994CM1LL-V,Z=U2X.,,A98,1@9U^9@,YA-Q>=Q5
-MON=UB;/)H9-.WN4QD:TH0&XZ"0(^P%$X+L;DII/6.N6UWB$H0&XZZ5$<%><S
-M8>;JY]U2X.,,A9917I>/&>6J%)=UB;/)H9-.WN4Q@>9JSN9NC@+DII-Q/A%S
-M+NP'4<PU0.<%D>?(#?%&0.ELV\T)49]'0@8DR[*E87D#Z>Z H;_KE/-1'7"P
-MH7D QFS@F)V\\])@IA_!1=/G43#;WTQ.UD[U<083Z1CT,3=4Y!KMN!R.,U1Q
-M YIX(R\4HCL(7%VET3]'_$3^NA^A)8J+0V*X:&:3/G%3/!!-D+@2 R&A)8I1
-M9$KB=21)8CHLPQ-RPR1<7!"N0QUFU(FR%B]P(#13 Q@FED-D@+^086:R8Q[<
-M>9X*3!T$#!]D2R"]*&D906D@,ORJ7_PB[X(KF/Q? /UI'H(:V/QKWOIL?H!5
-ML<^8,_RJ7_PB[X(KF/Q?8($56($ICQ4/./Q<D?Q? /UI'H(:V/QKWOIL?H!5
-M$82 ._WH1^=C# (X8.SOE^QKK*DMY<;/+L?1GLY 3P4=^4--4WA4CM0M14E>
-M!&CO;,'W_$\9/"NA2RQD#>I,VXF1HFD'I3O6<7T.@N&H-P:\Q.O'7>40/SPN
-MP$M4CM1LX *\U )-\R1(*60BT )-\R2/^.L,K'QL4#"\HQ@$Y< )HVE-UFLV
-M@Q ><Z&R<1R21AOE2 9,0R,C_#,O#6; )4M4Q":'Y.HV";\&0>5('=AG_3_K
-M%.IVQAVF3WT83N?'7>40WU& *JEE7 -(Z1+)1C5%O2R(IVI55?=.S[ @8 .#
-MG5&BZ5(.ZU(ZY5(R<.<N%0,"-NV<6LPZ)>S'7>40WU& *JEE7 .#[IF4'FNS
-MUG*GYANOCAYT]AY.XQGL(2V%8S.</T,U\S,G0 <GW#<M\5J6'[&1?Q\> CDG
-M,9)SG50W@(KPHZ0#$>6M9O;P<WT'(P)4CM0=\E$(,0)TH -&(JDR( +H9\V4
-M*NS9# *\\E&4*E+Q!\[+WL9N_.QR'.WI?.PRP0<$X0-4CM3#F5%\0!!\0! ^
-M0.5(/9P9Q0<$P0<$P0-4CM3#F5%\0! \0.5(/9P9Y; NQ0<$X0-4CM3#F5%\
-M0!!\0! ^0.5(/9P9Q0<$P0<$P0<$X0-4CM3#F5%\0!!\0!!\0! \0.5(/9P9
-MQ0<$P0<$P0-4CM3#F5%\0! \0.5(/9P9I5,NQ0/#,^V<6LPW0.<%0>5(W2$M
-M, )TH -&(JD.V\T)P;&STS]'[#J8PQ-RPR2\8?;>,?ZJ1&WJ88DUH3$GX ,G
-MK/GPTS]'##U428XGP ,GK/GP R&A)8I+"EANH"QQ4RK1JX\ LE\T83H[+\#N
-M[KZ%PYV/)=6H:Q!',R4L@QW/:;CG5&&F0S62!1@'61IX!L$7!OP404[5@6K+
-M@G@;HSSJH2'7SV=YKT>ISB?!L>>LU%D 1N5(S3=F?ZNNT^H@(@,AL-R7HQQ5
-M52K1NT0',:<2T]:?(I-G5DBN0^5(7?E&TNH@$@,A\+OP,3S&Y.>%\35QI*2Q
-M2!VF-V04(P,A<+*6MC+2 [\&0>5(W5+CWQUETVNVI&/]41_S\NMU-! S(*,'
-MD>?(#?%GIASE&1R6U$)M_2DRV3I&TNH@(@,A (LQ$ )=*E7FPA-RPR2E$OGW
-MP;Z!&_I _8^49__)H9.:/P,A8#>1 B':B#C3[@1@PNU\EO=>8H;64AX4TC]'
-MS)V7(0+#XP./V, $O+=E(#=, CU4*0(\H-V# U>5531])D#^./RJ7_PB[X(K
-MF/S3'8(:R/SU;-TAJ('0+P6 ._V8@20GME2E0B[#PUVH1B%ZY!KZ>SV:Y1-Y
-M4 8&YM3Z7Q!ZE+NJ@UJZ^51M]/D),_RJ7_PB[X(KF/P\/M$$^,Y/Z(1.^(,^
-MZ(.UA"2&5&J[P2_Z7Q >1R&3)1MT]AZ!6#+EY$I:QB]\]C.__DA'IO\%$=E-
-M TV>8_'24IY(<BZF,Y%( CW2DND2PX:C;Z4=7"7?2*>\D_^6UED -ORJ7_PB
-M[X(KF/P\/M$$^,Y/Z(1.^(,^Z(/G@4QZVC][OAQN)AE3\L2N@[E2KRDB<?6]
-M=09:'V8HH)U=95XFEAER<&A5N321$KWCF5U+E)W%4G8<<<0#,?RJ7_PB[X(K
-MF/P\/M$$^,Y/Z(1.^(,^Z(,H@  H@  H@ "XNNB&(@<(( <(( <(T&E:_UMV
-M@ !V@ !V@ !>B0!;@ !;@  .CBNX@BM=@ !=@ !=@ #GB@ I@  I@ ":=QY8
-MJCQ4,Y'=H9M/A:0BU?$CM?HAW_HEY8(KF/S3'8(:R/SU;-TAJ('0+P4H@  H
-M@  H@ !HB0 B@  B@  B</Z)ONCK[[V._OZ1+@((( ((( ((@)D(D ((D ((
-MH'F?S\?=+.P>=5[&_G[)OL::VE)N_.QR'.WI#/3U*6M(DT5EX)VGIA++@G@1
-M1'W&UDIK]'3U0<#P\7J0MQ=8IQDL,@54XH]4CM2!?=;=ZAK!P<4%$>75!5L0
-M#'MVAHY?$XU%'4VJE>E;6B,$?(X .2!_SSO#.+@M!3RO/@<UWQ%ZIB_<T6>9
-MX3B*ER-5^9TN(RQ]@@:405^!6#*28_F=OR?]V30XYK*0 R+!X5.(5UVP!<&P
-M9V>(1Y$:@K0X6RWI<P)O< )D#T@H,:PJS*<#X01@ A_\PBX6 P(G\ 8G3%QP
-MHF7P0WI\I_\%87MW WGG@G6:L=R^=@)O<,)W:S&_KI["UR Z>S>0EZ3H"(O>
-M<0)O<,+_HTB=IKZ9<S0<4[7EV4;EG\0& 7J)XP)% #4B0.5(W2$M, )TH -O
-MP **<09L+ZDR\(B8L31-@QF0 R(V,QJHMBR(]UHBH!AG 'HB@*!P55D$\LX6
-M?,__E,&S<A[F;KWU8>]_!%F!QJ!RQD.I0SNZ;;A'!3G9Y3J7!W,?:2W6PR_G
-M='M"0HI+PUP[K$KZ*SX!)!ND-4W;R+:$ML."ND+H9\W6;,W'+NP;%0,=]5&4
-M*E+Q!\[+WL9N_.QR'.WIC)3O_(1.Z(0&#0(ICQ4NS\ZH[X'%'_*M7U(NN(+)
-MS^,378 '6!4P&,],T?P,]= -R- #O8-E ?W@G<]8,>V%/GQF,]8WK6(P0P8I
-M!@*("#F/80:/F!=YL)*(=QY<7!#6,?RJ7_PB[X(KF/P\/M$%>(!5 8/QS!3-
-MSU"?S\?33@6<I1R[9DG4>;W<H:2\8?:U>[.?CQ?'.9,$D?_=T6GJ"T\GBOH>
-M6/PAW_HEY8(KF/P\/M$%>(!5 8/QS!3-SU"?3_T, @(O#68H,6^9$7LR>A!7
-M8"$P_!SSEAD2O!X@"EHPW(F=IKY0AV3U"Q\G0 8G0/: I!^7"(DT&;$$$?GW
-M01!1?!+#A"3C,L0B\%$(,0)DP +SEAFQ%P,L,&^9$7LRP (NX (NH -T4)?_
-M2'EE'QN%)YV7_F;@>!"?GS#/06?O$8@E4QJDQW?^8R$P[!<ZY!H6<P)D<,)]
-MTQ(;0\";J#<=$L6[ :1TMI*(QQMF/_JH[X'%'_*M7U(NN(+)S^,378 '6!4P
-M&,],T?Q4 +C3WZA!-HC>Q5].Y-//9&(>8R[U(4QW:S'SEAFQQ\4%4;O-0P;Y
-ME3#"Z!?$6$O;#P+SEAFQQR!)-25GT& 1MK(-3, B-C=9%R;):(\H8!WSEAFQ
-MQR D"CEDY1.]UD:?_P9)BG@_K"R-7S+OTRQG_4PFYC&A5#8FT3Y39S.<W[OE
-M.6^9$7N0!6"Y&'75-9&U>[/=P<0$ 1INMB3R!?P40:/]41_0V6GJ"T_>,?RJ
-M7_PB[X(KF/P\/M$%>(!5 8/QS!3-SU"?3_T,<I$1G,0&8<D>D@<[%U:1%,6O
-MKH[^^CS,F[X9F9"QSEZC[QA^8EP^02YBTC\O\ASAPR]\9B%K1F34*9/+ ;W]
-M,9 &-_'P\?FETVGJ:\#H@1Y#BK.W\[P(87],G2^&"3F/<6Z=ANI5&3MU(&G1
-M$XA!SP;ADT7PP2_Z7Q 6<_/ 02WL IY!EV0*S(I\]C/.!V(-W+Z.X_ G89T,
-MXNY4W:;<D1=Y\![<E1G/PQF(^AK5UR'#K_K%+_(NN(+)S^,378 '6!4P&,],
-MT?Q4 +C37[K1!"2*5:8@-Z<[G5IWZQUH,!*E$5;]@A!1?!(C.==)A0.J5E5%
-MO2R(I_FDQW<RBVJ>GL0*IMG63,W"GLT<!:@?1:DB%7_@O.QM[,;/+L?1GL['
-M+A-\ (F=-@<Z@-\D+JO'[%)\0! ^0.5(/9P9Q0<$P0<$P6!DH -.'RF22N5(
-M/9P9Q0<$P0<$X0-4CM3#F5%\0!!\0!!\0! ,1@8ZX/21 JA4CM3#F5%\0!!\
-M0!!\0! ^0.5(/9P9Q0<$P0<$P0<$P0<$P6!DH -.'RD=1>5(/9P9Q0<$P0<$
-MP0<$P0<$$>4Z ,6FITJBZ5)\0!!\0!!\0! \0.5(/9P9Q0<$P0<$P0<$$>4Z
-M ,6FITH.ZU)\0!!\0! \0.5(/9P9Q0<$P0<$$>4Z ,6FITHZY5)\0! \0.5(
-M/9P9I5,NQ0/#,^V<6LPX0.<%0>5(W2$M, )DH -TH -&<LS=3.@_HZ2\8?;6
-M,?RJ7_PB[X(KF/P\/M$%>(!5 8/QS!3-SU#2;_-))K_EF9"G[;Z%Y]7_2'DC
-M',.4[O<_/3O6\?EOD*1C<'7P?@468BXU>1YR0F?O0090<_@M([.H5@;'.9,$
-MH:0?O;Y%8QWOH9ONWFDFT3ZG G,;\WQ&!?P400425"R!E=6QDQC4>;W<4;LW
-M^_EXH?E*VJ41-]?CR"NJ5E4%PSM17DL6 L.E0>5('=AG?8N36&B'=K>6'[&1
-M?Q\> CF[(0(M, )DP )1K@-O( *#G5%4CM1LH -0;'HZ ,6FITJBZ5)4CM1L
-MH -0;'HZ ,6FITH.ZU)4CM1LH -0;'HZ ,6FITHZY5)4CM1LH -0;'HZ ,6F
-MITHR<.<N)0-W#O2<6LPY0.?'7>40WP(C0 8L$.4Z8"1W3JG"GLT<):D?1:DB
-M%7_@O.QM[,;/+L?1GLY KSBJ!!N-4:&WT;M'"F!TX_"$EW:O?C=XB&I_QG$%
-MPUDAQV@W._[/<V2J//[[-J/R_CUC@'Q'9B'8,G5M= )F<,*\ 4CZ,:PJ_$M_
-M#[\*]B1AV$X=YB&0<Q)4/-?CZ%_G43 'C'@@1O:U'MAG;;AQY#%Q9$LH;6L=
-MYB&0\^HB\%$(,0)DH -O2N5(S08Z8 0ZP 0Z\ 8B\+NE<0)&<,)]TQ+7HV_+
-M2B'8ZSA!Z_024_ZP2,),<,)]TQ+7HV\P>:&O7K\S21"#S_9!9W],773'GA-4
-MCM1LX )CH ,&D0,Z<-Q5ON<ZX/0.H@-.'RF22N5(/9SX1^5(S08N, 8Z8! Y
-MH /'7>5[K@-.[R ZX/21 JA4CM3#B7]4CM1LX )CH ,&D0,Z<-Q5ON<ZX/0.
-MH@-.'RD=1>5(/9SX1^5(S08N, 8ZH$\SH /'7>5[K@-0;'HZ ,6FITJB">.U
-MS@8N, 8ZH$\SH /'7>5[K@-0;'HZ ,6FITH."^.US@8N, 8ZH$\SH /'7>5[
-MK@-0;'HZ ,6FITHZY5( 2.<34<S^];!4CM0=T@(C0 8Z\*94CM1LH -&H -,
-MH -&<LS=3.@_HZ2OQ3P,>UZJ5E77SV<_(P(,1@:/^/D)<XN3&$=L#P(B0.5(
-MS08N, :/N&=.%K0_3)DX (O6(0)17MJG/?VJ1"[6$5NRP?9%,_A!%P,R@'[6
-M7,W"GLT<5<8?1:DB%7_@O.QM[,;/+L?1GLY(^81.Z(3O_- -^- -R- "#?U2
-MD 4(D 4(D 4(D 4@D/)8X?+LG%(0W8 ,/= [6!;0#][YC!5/Z(1...WD)"74
-M:6I/QE;T53"\X\4O.?KI,3=9%S'T1A"77YZ?CQ>O91TO#6; )4M4]+M?_>ZW
-MP6#!H?/D[IR10B[6X4L;XR>&S?:8*_6:(A)7WUMGH/6_Q?M%&?9A'_:\8?8/
-M?#>0YV9^8MB_1YV+/]C='7_37=W771PPPI'0X5#IXS$7*AO'(6FTD3GRPC0S
-MR:EM5/X@-ND39VK PUC@+Y)T7C*=V&GJB[CT3[5V @*(*(J[F9#8/*PJ+ <B
-M8,#P(=W4;=W8_?EFR)YT?J=5$BBC[T9G<J2CCD6]9C/8//X#H0;L>2[@_XKJ
-M./]ZT4HSR:EAH)M/U5FR]L$+>1A^8CI&!>\#P;'E0><Z#OO4;=W8+?TVC[A(
-MMJ&=Z.[N>_!BC.9JSN9NCCG2;05/D 1$\ 5ION9M+OTVWR_8O-64'FL0$G#<
-M"6H#(=W4;=U20.?2?U@$D4.(UC4P5Q" ECG64AX'+\9HKN9L[N;/H^.P;P5/
-MD 1$\ 5ION9MGCFI1>>F4DAP55F8\8>%TQC20D5R4O:Q@:38_-)@!ERR-%P>
-M<Z&R<1R21AOE2 9,LY-TCM!8H ,Z#OO4;=W8C9;:G9E;A^9JSN9NCJG0"1EF
-M!B&A)8KPUD* -OYTODZ"2]+Z 6C23=W6C=W2;_-[MOENW#]'S)VU%>^=V&GJ
-MJ_>\0VXZ2>< QA-RPR143.DZ7TNBSQ-RPR011.<XFQPZ61 HX'W3I'D$$=E-
-M4Q!DV]+P*\;2;05/D 1$\ 5ION9MGCFI%?^!.GO:A,WX0Q ;"A^0J!#Q]P5I
-MON9M;A":0><Z#OM6\ 1)0 1?D.9KWN:9DUJ7>$OC3^<_/3L+XQH6T[[E02'2
-M3=W6C=W2GQ%=BLWJB-)+NXI<X]'(!TCDDJTV@\V?CQ=5V8EQ(V<W72HH "$X
-M3TT_3^<(C04ZH..PG^9KWN:U1VXZ&>?X5P18H ,Z#OM6\ 1)0 1?D.9KWN;0
-M+1/>#=[B3=[% 2,<R7/^>'59QRYH"TT'+\:N&(@#$02W2XAC\^M9BCG:R<4)
-M^_G4[QK.>MYL69<5LC3,U4S+V5*H*\:^$B1QPS(+(VF \3_K)B)[$L4GP8R/
-M6@18H ,Z#OO?'=[C7=XACM[0G1,;WN$#,05EL+[>L:+9OS,?4AK1&VY",>OP
-M*\97EW5:%/69/?6-4O557_58?P9:[V0?<B>/43IQ9&_'+NP;%0/;_%&4*E+Q
-M!\[+WL9N_.QR'.WI#/0YL78K 8OOEEUUH$[6L:*+6!K,!HYN#/@1NTYZTR%1
-MG"9( B/06=0SR:F?SUF=IKZ_^]5XP2Z7YD5>/).<"J3O!EL?$CL0UCR2U843
-M1.?KI#<M%<6O?F(.CQB(5O:QT=+P*\:_SL!'9F $X01@ A_\PF<_XX??> 9T
-M#@(BT (C\(CDXAT*;VL=%L6[4;O-D\1BC"2^=GV1$G2__DCSKQ?N'^EO@ !O
-M@ !O@ !@@@!T@ !T@  !.9.<RA[2PHJN(2:J##^?7SJ=IKXRZL;.F!&^<M/#
-M!:3L@5@ )(J[F9#8O-75SB[#JL(4H_Z% KZ52P<(0 <(0 <(H"'EN[ER@ !R
-M@ !R@  .S#L@( (M, *EC<U1?!+,^*A%@ 4ZH..P#P4<[N$H$.+YO=\D[N1=
-M[E)%@ 4ZH..P#P4<[N%H208Z0 ?;3><(C04ZH..P#P4<[N%HN=U KQ#QQ^-/
-M  6#*5_F6-3(R!<["N[H6=/TQJEE)VF%8QV+&#O1L1+62=5ODET)B<UEIT[,
-MZV0?@D7\$D?A)A3E^4QMALT+.WWEJ8X6@QE_2"'/9&(E(9LRZL;"'W\\_@10
-M(/TVOS"N83&_KI[,^*A%@ 4ZH..P#P5/  7/#?3>'']?8 1)P 0'73+P(=U&
-MD 1,<-#2;_-)ED/WDS#]2N<W#QS4HA=)\ )/4%WI$ZM*ZB%;:"S8K#BJE$,^
-M02XZ5G7(]E1(@J38K&$:+R<B<'DP]XCD* *7)R2/^%HV@\VO!WD@D 0O\ 0S
-M347,^*A%@ 4ZP!NU+-U&D 1,4 1"(P)$((KZT0925E4DYL9)\ )/$ )P#MTR
-M(=U%@ 5%, 158-WQ#A_270184 1#4 76G3FI=1[(E$.(EI#8[(I?1,3!P1%'
-M;!%6^KNED?]TGK[KHO<_$ZOSEAFQ!S4Y=#]O0.>GMK!\Y49G<KW<81T 7[O-
-MD\1BC"2PU1_U 9V=IKZ_^QR?;X;L2>?->=/E"5=(E#(3.5DY!#6K<XQTKN.P
-MW^,__OEO8$>+([+_$1LA4XCT=N")09WE:=.DQW?.9"'*HH]<=@)D< )TSAN 
-MA!(+XQH6\^N/=&3L@@))X )%X +I.! B\%'8/ )DH -T\(B1?Q\> CDG\?-T
-MCM!8H ,Z#OM%@ 5%, 158-W?RF&;49='PF%C@@).#MWJ)]UN7C(A)OV@;[A)
-MY>;HT6MMQ!$G,9.<*@,M4 /IF%17EW41 Q@QHY]E "*#Y-&H*\8@6;0^02[>
-MX6IR,XX\X9NA1Q#SAZ38O*+>+04^SE"?S\?'+NP;%0/%_E&4*E+Q!\[+WL9N
-M_.QR'.WI#/3('G\\+@4^SE"8RI']NJR%D^Z%)P)FH*^EC<W (08<<<23/G&Q
-MYD76<7595X>[B\VLUQ%"(]U&D 1,4 2_"Q_YWQV=IKYTGF2 %JL@,&^9$7O'
-M"1\U6A\^\3UTWL#MZV0._^KJV$;K-)UA5!_?> 9TGK[K\L-Y03). ";PP2\R
-M&\/9T2_8',4E'2F_SL!'QBZ1V!W,Z:]T+OTVG[[K<K+PA?Z(7O557_4I4RF4
-MDA<(0 <(0 <($)"EX1A^8EP^81)T'DM91QJ"Q8R/6@18H ,Z#OL]_N-H60:@
-M49>/Z7PAPO;8\9R8&>?X5P18H ,Z#OL]_N-H:2=U^9AVHDK16I=T#ATNZ>1=
-M[E)%@ 4ZH..PW^,_CI9Y 0=U^9C1ZE$^ )=*GA=PT*78G!?JU (^P'-EX.30
-M/1/2/05JK@1-  7% 2,^02YPHA)4JV-E0 =J\"8HH'F3/G%LB\VND_^O 3OI
-M<W595X>=OR>+.).<^D2K;DAO!!\/?#>0IW!J\"9T?F8'ZOB,HQQ553!&8OF=
-MO\)O0.=07.5M> (Z6VGN \.E(=U,\ 1.< 1*T 100.?2;_-)ED/WDS FX7U!
-M;!VO!WET+FOU<09J\"8HH'F%R")#,#=9%S&%54A"U2 71N=3)MU3H.9*T 10
-MD#GL.2!C<'7RZ1PP/),'+EOC#XM%HV-5-_YT7C&@N!NSEAC,^*A%@ 4ZH..P
-M/P5JK@1-  6U%QF9^7/2S01/X 1'H 1-  7% 2,^02YPHA)4:QV*<1)J\"8H
-MH'F3/G%LB\WXD_\#03=5[H\/N:/@3N?H^6<+UT;0(4#PP7!M)&M(0^<Z#OM3
-MH.9*T 10@,0M;2%#[(HM#;]B_'J0YS#U<09J\"8HH'EG=J $X01@ A_EI?\)
-M>W59%S%2-OH#(=U,\ 1.< 1*T 10<&SO3N=07.7^N(B=*+.\DZ)E"[]B#$A(
-M)MU3H.9*T 10$/^8L31-TYQE)RV9_AYT#F##(_EQ!"-BPG;2/05JK@1-  5_
-MB\W2S01/X 1'H 1-  634SSY\CM2MJ&/9C/8G/T'XC$7*AO'(6FT48YDP#2E
-M0;8V@\WY#XF=IKY2_<M!DG4 PG8V@\WL4>W,^*A%@ 4ZH..PSP1/X 1'H 1-
-M  6U%QDL0&Z96<W"GLT<=0/&_G[)OL::VE)N_.QR'.WIC)3#SQ4&7?PAW_HE
-MY8(T2-!#D/)O$<],T?Q4 /W@G<]8<=$6;=$@\(1.Z(3-3P70+P4P&,\RZ((K
-M..VC%[&1?Q\> CF[\1PYQ)' *;.\LX@L1,#P >X$D>Z%-_RJ7_PB[X(KF/P\
-M/M$$^,Y/Z(1.^(,^Z(.9DUH&C!XUBO@(\61L15]%+6)SDW414UA^]!M'FOUM
-M.H8Z3XXV$W& I!_#JL+Y\M-,1V<[1WL%+S&DL28#$02=IKX:<V3KZQA^8EP^
-M02XGL 4G_$0GT 4G'(FE+C+) ?PX009;P +SEAFQ-P=M601.O'/_2'G78?:9
-M\^X$T35T3A"UVSSS,F^9$7OP'O2FP30=<F301^<$,6^9$7NN(4!PHF7\LK^%
-M-&^9$7L,<CK";DG4*9) GQ!$L 4LX&=M"1* A/\9!F'-<S\"]&>Z^52X3N<$
-MH:0_K"SYE3"O%'Y/1P8<81(R>N)4($ ZY!HE(9NO93"<D;LM!&@U6A])C,TH
-M0&XZN67^I4K^"IPVVO@?L7>F1^?CXAHLEA',2!%FL 4L,/YST);_-D $D?W*
-MUK,ZW]()@Z3"7KO-,R]'!F_<,?[P'@1"9Z@G?F2J/.D3I_/GX4I:5E[LLC)T
-M3A#CSR!)94G4*9) GQ-& .AR<%"X#N[A]W1!QY!TWM(_4_X@AK>:Z/02$_F!
-M>_#8;!V?;R1PA=/6H:3,^*A, .AR<%"X#N[A]W1!QY!TWM*\,_A.OW-!M]3[
-MA[UT?FRI=6;,MAO6H:3,^*CFHE)R<%"X#N[A]W1!QY!TWM*E.#=9IW&4;FHE
-MIW=CB') GQ-N/@5EP(<7:FQ+O7_G8F;_TOE5+>Q*^L.DOG:;X6!ZL4_Q7DY<
-M[,8YU(Y#1C% XA>.D6KA)@=E!R-RXCXD=N+93U6(=QZN(43/]2FETC5T/CEG
-MK:3,*&I;P *@UY:!]WO4F3[9WZ:(YR%;J.]O0.<MS3LAQVC-@VB@9\!5M'>F
-M1^<$H:1.IGB%X7JW)R0D$P0$T?/#>>*_SL!'QBYP!2.YBWA2C;K8K'UNKV(>
-M@GD&!O23LP4L@+;4T9;_-D $D?W*UK,ZW]()@Z3"7KO-@VAH2QTD$P2FP30M
-M=62G-^V/NE$Q@ /&_G[)OL::VE)N_.QR'.WI#/3.YDI:UEKL3AV_6TX,NF!,
-M0^<$L>F>8_'2@D4_S70\E#H$41Z_D<38C+;4P2). ";PP2_L@NO_TOE5+>Q*
-M^L.DSF;-Z>YR<&AW:S/"7OX@EAYSDW7L@K8#D>Y(*NPG  4GW#<M\;O(:/&(
-M5?Z(^T[M6QYTWM*\TQV=IKZB@B0P@F@ AJ3"/ORJ7_PB[X(KF/P\/M$%>(!6
-MD<]80=#B'8(:^(1.Z(1/Z(1.*/T9P8R/"@6 +@<'A>O@'GY/%W0,2><M_3/E
-M#V+I,3=9%R;LSB+)/,/"GD/M:+CFDD/8,G4 Q.ZUI$QT3A >PS&6YAQ-XSD6
-M+RU8Q"_L$HG$!!MT3A# LQO9'X@@X 1@PNU\AIR1J'7"CK:9PYY5R1$G41HC
-M_#/9KTW"'OGWX2&0LQOX8V*Q)"WEB3\V(^SE\1L^@;;4P8R/&LTPXA/DDC=J
-M0.ES-W76,?RJ7_PB[X(KF/P\/M$$^,Y/Z(1.^(,^Z(-T?FRI!4]T4P9\5HIS
-MDW5WYR!%A?C"/FLM)P:R!$\LEA$LDLSOE$/M*)]!?>+#K_K%+_(NN(+)S^,3
-M38#O_(1.Z(0_Z(,^F#GO7K4J!AW%4G8< 3G+0>>0>%_:7QK9OS,?LI,/2P=;
-MP ).T)9%X,02,_[KI#=\XS>"@FKY(:,G7NAA@ <"]#$5 XJ[<7*J5+O-D\38
-M'+U.T%X^07I\M[ZN(V P@'[6;,U _Z@;=5/&_G[)OL::VE)N_.QR'.WIC)0_
-MZ(,^"(/QS!3-3P5/Z(1.&/0-+=!!./Q<D5(0[8#WG 1/Z(1.2-#B'8(:>-$6
-M;=$7;=$6S= "'80&G?)8\<Y/Z(1...WU"6+E^$XYU(YG=D8J[5/<81TO#6; 
-M)4O3C"$%DS#(%XF%)W<$-V7>41*RZ=/D0@>9D?AF$"19!QG8,T>-^+OE5!V#
-MZ%T.ZJ^)YD9G<O &T2QG32XBNC]T=!E(U8:#LZ$T,FE^D5SNA1"Q)1F[8?F=
-MOR=*RHLG%B19EW.K^+O(Z.<=@8I?$T<><U13-TW]XUU5Z 8RYQKD(J+[0T>7
-M@50S.2[LDC5SX",;BD7JV$9*>AXB6S:]9D9R$_Z]MD19NV!^X1BI!GH&#!]T
-MD!D# 21^X1BI!GIRPF9?$T>HFR7+$R19!R#&AGR1R)&W,8Q1ET)QPS)(51IR
-M5Q])RAU]EAF<KJ<THCSZ.&/ 3Q%!,! \T;3EZ<5@8^D)2C=T+RB@^.I(!1^;
-MCXN'Y*-#3""WE!YSDW7LTO=>A![(%XGSTA*!.\,((7<$9Y@\@9^NT?>!];OE
-MY!HX6K4+QC2U9"$DEIUY'XG5M;PF@3EA/6/ 3Q&*HTKZ6Z1F$&&FQ[[RLCR%
-MA4)X4/B%L_!/E9 88N[G"1L]5[_P,?[)X;<@!@(O#6; )4O3C! X5"3MZUW\
-MU3ZG G-XJXGK%"AA;;( 9K:? [V$LQO9'X@@D%94;DKBA<(R1B-WX!<Z9.YD
-MY1/DLD0'T?=)GSY00!M':A%#L+2K>" VW48XQ!FTUVM<1<#F=4ML _<@@ 15
-M%9QVY(8>0AEGP#*.01]S0T5$LOV4KS'@R3)-)3!XPXGK=*'VMUDW[8_9?R"?
-MCQ<-3,#P 3V;0;A2QL0$ET7EZ<+ T=3Q#A_),W));! +OR>1W33-F4-VICKX
-MCSD:@FV,A0>%_RU^GB/H9\W5+.S9'&#H]5&4*E+Q!\[+WL9N_.QR'.WIC)0$
-M/00,+= 66($5:- ,+=#-3P5/Z(1...U"]M)@!ERR-%R9(0=KX!H^\DZVY%H_
-MS70;.I,$(0)!1U'G3@:/^(\R!S6RXS5((BA*PND7+SKOXAB*-9P'$6YR4':5
-M=2)91AWE\[7Q/[S-^4)R$$SE:4TU#UTD=A 4=>[SXEIJ-3M(@K-!<7^"5^6N
-M$;U#\KHD;9/P:Q#K,6GY!B*?CQ?P5(@A-T9\0^DZK_E%&D: Y&C@F)V\D_T4
-M$^7P#@)/T$+TX=9E<)SHH1Y]$4GH4>\(L1YPXEUEFJV6W_E[HJ2JI-.>008?
-M,R/SDB&E0_9/CSYEEQ<M('<"DHN#"T? 3Q%]'AXZ(OK,U!CBB%K*\<%&=1V4
-MKO/Q-"($;%[PA?Z)ONB&P@8(P 8(P 8(H!P(P 8(P 8(H!@(\ 8(\ 8(\,$(
-M, 8(, 8(D'#/=--R1OK(6(\^S&R[81VO!WD:\])@!ERR1$6_^]5XH1>7)B!U
-6JTKA=5]I *"4_\%4D\0&T1CB.!Q$ 1VO
- 
-end
diff --git a/dmake/dbug/dbug/example1.c b/dmake/dbug/dbug/example1.c
deleted file mode 100755
index f58046ae8..000000000
--- a/dmake/dbug/dbug/example1.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-main (argc, argv)
-int argc;
-char *argv[];
-{
-    printf ("argv[0] = %d\n", argv[0]);
-    /*
-     *	Rest of program
-     */
-    printf ("== done ==\n");
-}
diff --git a/dmake/dbug/dbug/example2.c b/dmake/dbug/dbug/example2.c
deleted file mode 100755
index 7bb605fac..000000000
--- a/dmake/dbug/dbug/example2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-int debug = 0;
-
-main (argc, argv)
-int argc;
-char *argv[];
-{
-    /* printf ("argv = %x\n", argv) */
-    if (debug) printf ("argv[0] = %d\n", argv[0]);
-    /*
-     *	Rest of program
-     */
-#ifdef DEBUG
-    printf ("== done ==\n");
-#endif
-}
diff --git a/dmake/dbug/dbug/example3.c b/dmake/dbug/dbug/example3.c
deleted file mode 100755
index 189e67132..000000000
--- a/dmake/dbug/dbug/example3.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-main (argc, argv)
-int argc;
-char *argv[];
-{
-#   ifdef DEBUG
-    printf ("argv[0] = %d\n", argv[0]);
-#   endif
-    /*
-     *	Rest of program
-     */
-#   ifdef DEBUG
-    printf ("== done ==\n");
-#   endif
-}
diff --git a/dmake/dbug/dbug/factorial.c b/dmake/dbug/dbug/factorial.c
deleted file mode 100755
index 42a4d8480..000000000
--- a/dmake/dbug/dbug/factorial.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-/* User programs should use <local/dbug.h> */
-#include "dbug.h"
-
-int factorial (value)
-     register int value;
-{
-  DBUG_ENTER ("factorial");
-  DBUG_PRINT ("find", ("find %d factorial", value));
-  if (value > 1) {
-    value *= factorial (value - 1);
-  }
-  DBUG_PRINT ("result", ("result is %d", value));
-  DBUG_RETURN (value);
-}
diff --git a/dmake/dbug/dbug/main.c b/dmake/dbug/dbug/main.c
deleted file mode 100755
index d7c4267d4..000000000
--- a/dmake/dbug/dbug/main.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <stdio.h>
-/* User programs should use <local/dbug.h> */
-#include "dbug.h"
-
-int main (argc, argv)
-     int argc;
-     char *argv[];
-{
-  register int result, ix;
-  extern int factorial (), atoi ();
-
-  DBUG_ENTER ("main");
-  DBUG_PROCESS (argv[0]);
-  for (ix = 1; ix < argc && argv[ix][0] == '-'; ix++) {
-    switch (argv[ix][1]) {
-    case '#':
-      DBUG_PUSH (&(argv[ix][2]));
-      break;
-    }
-  }
-  for (; ix < argc; ix++) {
-    DBUG_PRINT ("args", ("argv[%d] = %s", ix, argv[ix]));
-    result = factorial (atoi (argv[ix]));
-    printf ("%d\n", result);
-  }
-  DBUG_RETURN (0);
-}
diff --git a/dmake/dbug/dbug/makeman.sh b/dmake/dbug/dbug/makeman.sh
deleted file mode 100755
index b2aca44b8..000000000
--- a/dmake/dbug/dbug/makeman.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-gcc -o factorial main.c factorial.c dbug.c
-
-for i in example?.c main.c factorial.c ;
-do
-  sed -e 's!\\!\\\\!g' $i > ${i/\.c/\.r}
-done
-
-./factorial 1 2 3 4 5 | cat > output1.r
-./factorial -\#t:o 2 3 | cat > output2.r
-./factorial -\#d:t:o 3 | cat > output3.r
-./factorial -\#d,result:o 4 | cat > output4.r
-./factorial -\#d:f,factorial:F:L:o 3 | cat >output5.r
-
-#nroff -mm user.r > user.t
-#groff -mm user.r > user.ps
-groff -mm -rcR=0 -Tlatin1 -P -bcu user.r > dbug.txt
diff --git a/dmake/dbug/dbug/readme b/dmake/dbug/dbug/readme
deleted file mode 100644
index 8d7c2ed6a..000000000
--- a/dmake/dbug/dbug/readme
+++ /dev/null
@@ -1,52 +0,0 @@
-This directory contains DBUG the "C Program Debugging Package" by Fred Fish.
-
-/******************************************************************************
- *									      *
- *	                           N O T I C E				      *
- *									      *
- *	              Copyright Abandoned, 1987, Fred Fish		      *
- *									      *
- *									      *
- *	This previously copyrighted work has been placed into the  public     *
- *	domain  by  the  author  and  may be freely used for any purpose,     *
- *	private or commercial.						      *
- *									      *
- *	Because of the number of inquiries I was receiving about the  use     *
- *	of this product in commercially developed works I have decided to     *
- *	simply make it public domain to further its unrestricted use.   I     *
- *	specifically  would  be  most happy to see this material become a     *
- *	part of the standard Unix distributions by AT&T and the  Berkeley     *
- *	Computer  Science  Research Group, and a standard part of the GNU     *
- *	system from the Free Software Foundation.			      *
- *									      *
- *	I would appreciate it, as a courtesy, if this notice is  left  in     *
- *	all copies and derivative works.  Thank you.			      *
- *									      *
- *	The author makes no warranty of any kind  with  respect  to  this     *
- *	product  and  explicitly disclaims any implied warranties of mer-     *
- *	chantability or fitness for any particular purpose.		      *
- *									      *
- ******************************************************************************
- */
-
-The original package is no longer mainained, but copies can found here
-  <http://sourceforge.net/projects/dbug/>
-or in the dbug directory of the MySQL 4.0 (and older)
-  <http://dev.mysql.com/downloads/>
-sources.
-
-The files found here are:
-
-  dbug.c     - runtime support routines for dbug package
-  dbug.h     - user include file for programs using the dbug package
-  user.r     - nroff source for the manual page.
-  dbug.txt   - a typeset version of the manual page containing no control
-               characters. Generated with makeman.sh:
-               Copy it as dbug.1 into a directory in your search path for
-               man pages to be able to view it with the man command. 
-  makeman.sh - helper script to generate the documentation
-  example1.c - Additional/demo sources for the documentation.
-  example2.c
-  example3.c
-  main.c
-  factorial.c
diff --git a/dmake/dbug/dbug/user.r b/dmake/dbug/dbug/user.r
deleted file mode 100755
index 1d58d28a8..000000000
--- a/dmake/dbug/dbug/user.r
+++ /dev/null
@@ -1,938 +0,0 @@
-.\"           @(#)user.r      1.13 10/29/86
-.\"
-.\"           DBUG (Macro Debugger Package) nroff source
-.\"
-.\"           nroff -mm user.r >user.t
-.\"
-.\" ===================================================
-.\"
-.\"           === Some sort of black magic, but I forget...
-.tr ~
-.\"           === Hyphenation control (1 = on)
-.\".nr Hy 1
-.\"           === Force all first level headings to start on new page
-.nr Ej 1
-.\"           === Set for breaks after headings for levels 1-3
-.nr Hb 3
-.\"           === Set for space after headings for levels 1-3
-.nr Hs 3
-.\"           === Set standard indent for one/half inch
-.nr Si 10
-.\"           === Set page header - set date to source date
-.\".PH "/DBUG User Manual//\*(DT/"
-.PH "/DBUG User Manual//October 29, 1986"
-.\"           === Set page footer
-.PF "// - % - //"
-.\"           === Set page offset
-.\".po 0.60i
-.\"           === Set line length
-.\".ll 6.5i
-.TL
-D B U G
-.P 0
-C Program Debugging Package
-.P 0
-by
-.AU "Fred Fish"
-.AF ""
-.SA 1
-.\"           === All paragraphs indented.
-.nr Pt 1
-.AS 1
-This document introduces
-.I dbug ,
-a macro based C debugging
-package which has proven to be a very flexible and useful tool
-for debugging, testing, and porting C programs.
-
-.P
-All of the features of the
-.I dbug
-package can be enabled or disabled dynamically at execution time.
-This means that production programs will run normally when
-debugging is not enabled, and eliminates the need to maintain two
-separate versions of a program.
-
-.P
-Many of the things easily accomplished with conventional debugging
-tools, such as symbolic debuggers, are difficult or impossible with this
-package, and vice versa.
-Thus the
-.I dbug
-package should 
-.I not
-be thought of as a replacement or substitute for
-other debugging tools, but simply as a useful
-.I addition
-to the
-program development and maintenance environment.
-
-.AE
-.MT 4
-.SK
-.B
-INTRODUCTION
-.R
-
-.P
-Almost every program development environment worthy of the name
-provides some sort of debugging facility.
-Usually this takes the form of a program which is capable of
-controlling execution of other programs and examining the internal
-state of other executing programs.
-These types of programs will be referred to as external debuggers
-since the debugger is not part of the executing program.
-Examples of this type of debugger include the
-.B adb
-and
-.B sdb
-debuggers provided with the 
-.B UNIX\*F
-.FS
-UNIX is a trademark of AT&T Bell Laboratories.
-.FE
-operating system.
-
-.P
-One of the problems associated with developing programs in an environment
-with good external debuggers is that developed programs tend to have 
-little or no internal instrumentation.
-This is usually not a problem for the developer since he is,
-or at least should be, intimately familiar with the internal organization,
-data structures, and control flow of the program being debugged.
-It is a serious problem for maintenance programmers, who
-are unlikely to have such familiarity with the program being
-maintained, modified, or ported to another environment.
-It is also a problem, even for the developer, when the program is
-moved to an environment with a primitive or unfamiliar debugger,
-or even no debugger.
-
-.P
-On the other hand,
-.I dbug
-is an example of an internal debugger.
-Because it requires internal instrumentation of a program,
-and its usage does not depend on any special capabilities of
-the execution environment, it is always available and will
-execute in any environment that the program itself will
-execute in.
-In addition, since it is a complete package with a specific
-user interface, all programs which use it will be provided
-with similar debugging capabilities.
-This is in sharp contrast to other forms of internal instrumentation
-where each developer has their own, usually less capable, form
-of internal debugger.
-In summary,
-because 
-.I dbug
-is an internal debugger it provides consistency across operating
-environments, 
-and because it is available to all developers it provides
-consistency across all programs in the same environment.
-
-.P
-The
-.I dbug
-package imposes only a slight speed penalty on executing
-programs, typically much less than 10 percent, and a modest size
-penalty, typically 10 to 20 percent.
-By defining a specific C preprocessor symbol both of these
-can be reduced to zero with no changes required to the
-source code.
-
-.P
-The following list is a quick summary of the capabilities
-of the
-.I dbug
-package.
-Each capability can be individually enabled or disabled
-at the time a program is invoked by specifying the appropriate
-command line arguments.
-.SP 1
-.ML o 1i
-.LI
-Execution trace showing function level control flow in a
-semi-graphically manner using indentation to indicate nesting
-depth.
-.LI
-Output the values of all, or any subset of, key internal variables.
-.LI
-Limit actions to a specific set of named functions.
-.LI
-Limit function trace to a specified nesting depth.
-.LI
-Label each output line with source file name and line number.
-.LI
-Label each output line with name of current process.
-.LI
-Push or pop internal debugging state to allow execution with
-built in debugging defaults.
-.LI
-Redirect the debug output stream to standard output (stdout)
-or a named file.
-The default output stream is standard error (stderr).
-The redirection mechanism is completely independent of
-normal command line redirection to avoid output conflicts.
-.LE
-
-.SK
-.B
-PRIMITIVE DEBUGGING TECHNIQUES
-.R
-
-.P
-Internal instrumentation is already a familiar concept
-to most programmers, since it is usually the first debugging
-technique learned.
-Typically, "print\ statements" are inserted in the source
-code at interesting points, the code is recompiled and executed,
-and the resulting output is examined in an attempt to determine
-where the problem is.
-
-The procedure is iterative, with each iteration yielding more
-and more output, and hopefully the source of the problem is
-discovered before the output becomes too large to deal with
-or previously inserted statements need to be removed.
-Figure 1 is an example of this type of primitive debugging
-technique.
-.DS I N
-.SP 2
-.so example1.r
-.SP 2
-.ll -5
-.ce
-Figure 1
-.ce
-Primitive Debugging Technique
-.ll +5
-.SP 2
-.DE
-
-.P
-Eventually, and usually after at least several iterations, the
-problem will be found and corrected.
-At this point, the newly inserted print statements must be 
-dealt with.
-One obvious solution is to simply delete them all.
-Beginners usually do this a few times until they have to
-repeat the entire process every time a new bug pops up.
-The second most obvious solution is to somehow disable
-the output, either through the source code comment facility,
-creation of a debug variable to be switched on or off, or by using the
-C preprocessor.
-Figure 2 is an example of all three techniques.
-.DS I N
-.SP 2
-.so example2.r
-.SP 2
-.ll -5
-.ce
-Figure 2
-.ce
-Debug Disable Techniques
-.ll +5
-.SP 2
-.DE
-
-.P
-Each technique has its advantages and disadvantages with respect
-to dynamic vs static activation, source code overhead, recompilation
-requirements, ease of use, program readability, etc.
-Overuse of the preprocessor solution quickly leads to problems with
-source code readability and maintainability when multiple 
-.B #ifdef
-symbols are to be defined or undefined based on specific types
-of debug desired.
-The source code can be made slightly more readable by suitable indentation
-of the 
-.B #ifdef
-arguments to match the indentation of the code, but
-not all C preprocessors allow this.
-The only requirement for the standard 
-.B UNIX
-C preprocessor is for the '#' character to appear
-in the first column, but even this seems
-like an arbitrary and unreasonable restriction.
-Figure 3 is an example of this usage.
-.DS I N
-.SP 2
-.so example3.r
-.SP 2
-.ll -5
-.ce
-Figure 3
-.ce
-More Readable Preprocessor Usage
-.ll +5
-.SP 2
-.DE
-
-.SK
-.B
-FUNCTION TRACE EXAMPLE
-.R
-
-.P
-We will start off learning about the capabilities of the
-.I dbug
-package by using a simple minded program which computes the
-factorial of a number.
-In order to better demonstrate the function trace mechanism, this
-program is implemented recursively.
-Figure 4 is the main function for this factorial program.
-.DS I N
-.SP 2
-.so main.r
-.SP 2
-.ll -5
-.ce
-Figure 4
-.ce
-Factorial Program Mainline
-.ll +5
-.SP 2
-.DE
-
-.P
-The 
-.B main
-function is responsible for processing any command line
-option arguments and then computing and printing the factorial of
-each non-option argument.
-.P
-First of all, notice that all of the debugger functions are implemented
-via preprocessor macros.
-This does not detract from the readability of the code and makes disabling
-all debug compilation trivial (a single preprocessor symbol, 
-.B DBUG_OFF ,
-forces the macro expansions to be null).
-.P
-Also notice the inclusion of the header file
-.B dbug.h
-from the local header file directory.
-(The version included here is the test version in the dbug source
-distribution directory).
-This file contains all the definitions for the debugger macros, which
-all have the form 
-.B DBUG_XX...XX .
-
-.P
-The 
-.B DBUG_ENTER 
-macro informs that debugger that we have entered the
-function named 
-.B main .
-It must be the very first "executable" line in a function, after
-all declarations and before any other executable line.
-The 
-.B DBUG_PROCESS
-macro is generally used only once per program to
-inform the debugger what name the program was invoked with.
-The
-.B DBUG_PUSH
-macro modifies the current debugger state by
-saving the previous state and setting a new state based on the
-control string passed as its argument.
-The
-.B DBUG_PRINT
-macro is used to print the values of each argument
-for which a factorial is to be computed.
-The 
-.B DBUG_RETURN
-macro tells the debugger that the end of the current
-function has been reached and returns a value to the calling
-function.
-All of these macros will be fully explained in subsequent sections.
-.P
-To use the debugger, the factorial program is invoked with a command
-line of the form:
-.DS CB N
-factorial -#d:t 1 2 3
-.DE
-The 
-.B main
-function recognizes the "-#d:t" string as a debugger control
-string, and passes the debugger arguments ("d:t") to the 
-.I dbug
-runtime support routines via the
-.B DBUG_PUSH 
-macro.
-This particular string enables output from the
-.B DBUG_PRINT
-macro with the 'd' flag and enables function tracing with the 't' flag.
-The factorial function is then called three times, with the arguments
-"1", "2", and "3".
-Note that the DBUG_PRINT takes exactly
-.B two
-arguments, with the second argument (a format string and list
-of printable values) enclosed in parenthesis.
-.P
-Debug control strings consist of a header, the "-#", followed
-by a colon separated list of debugger arguments.
-Each debugger argument is a single character flag followed
-by an optional comma separated list of arguments specific
-to the given flag.
-Some examples are:
-.DS CB N
--#d:t:o
--#d,in,out:f,main:F:L
-.DE
-Note that previously enabled debugger actions can be disabled by the
-control string "-#".
-
-.P
-The definition of the factorial function, symbolized as "N!", is
-given by:
-.DS CB N
-N! = N * N-1 * ... 2 * 1
-.DE
-Figure 5 is the factorial function which implements this algorithm
-recursively.
-Note that this is not necessarily the best way to do factorials
-and error conditions are ignored completely.
-.DS I N
-.SP 2
-.so factorial.r
-.SP 2
-.ll -5
-.ce
-Figure 5
-.ce
-Factorial Function
-.ll +5
-.SP 2
-.DE
-
-.P
-One advantage (some may not consider it so) to using the
-.I dbug
-package is that it strongly encourages fully structured coding
-with only one entry and one exit point in each function.
-Multiple exit points, such as early returns to escape a loop,
-may be used, but each such point requires the use of an
-appropriate 
-.B DBUG_RETURN
-or
-.B DBUG_VOID_RETURN
-macro.
-
-.P
-To build the factorial program on a 
-.B UNIX
-system, compile and
-link with the command:
-.DS CB N
-cc -o factorial main.c factorial.c -ldbug
-.DE
-The "-ldbug" argument tells the loader to link in the
-runtime support modules for the
-.I dbug
-package.
-Executing the factorial program with a command of the form:
-.DS CB N
-factorial 1 2 3 4 5
-.DE
-generates the output shown in figure 6.
-.DS I N
-.SP 2
-.so output1.r
-.SP 2
-.ll -5
-.ce
-Figure 6
-.ce
-factorial 1 2 3 4 5
-.ll +5
-.SP 2
-.DE
-
-.P
-Function level tracing is enabled by passing the debugger
-the 't' flag in the debug control string.
-Figure 7 is the output resulting from the command
-"factorial\ -#t:o\ 3\ 2".
-.DS I N
-.SP 2
-.so output2.r
-.SP 2
-.ll -5
-.ce
-Figure 7
-.ce
-factorial -#t:o 3 2
-.ll +5
-.SP 2
-.DE
-
-.P
-Each entry to or return from a function is indicated by '>' for the
-entry point and '<' for the exit point, connected by
-vertical bars to allow matching points to be easily found
-when separated by large distances.
-
-.P
-This trace output indicates that there was an initial call
-to factorial from main (to compute 2!), followed by
-a single recursive call to factorial to compute 1!.
-The main program then output the result for 2! and called the
-factorial function again with the second argument, 3.
-Factorial called itself recursively to compute 2! and 1!, then
-returned control to main, which output the value for 3! and exited.
-
-.P
-Note that there is no matching entry point "main>" for the
-return point "<main" because at the time the 
-.B DBUG_ENTER
-macro was reached in main, tracing was not enabled yet.
-It was only after the macro
-.B DBUG_PUSH
-was executing that tracing became enabled.
-This implies that the argument list should be processed as early as
-possible since all code preceding the first call to
-.B DBUG_PUSH 
-is
-essentially invisible to 
-.B dbug
-(this can be worked around by
-inserting a temporary 
-.B DBUG_PUSH(argv[1])
-immediately after the
-.B DBUG_ENTER("main")
-macro.
-
-.P
-One last note,
-the trace output normally comes out on the standard error.
-Since the factorial program prints its result on the standard
-output, there is the possibility of the output on the terminal
-being scrambled if the two streams are not synchronized.
-Thus the debugger is told to write its output on the standard
-output instead, via the 'o' flag character.
-Note that no 'o' implies the default (standard error), a 'o' 
-with no arguments means standard output, and a 'o' 
-with an argument means used the named file.
-I.E, "factorial\ -#t:o,logfile\ 3\ 2" would write the trace
-output in "logfile".
-Because of 
-.B UNIX
-implementation details, programs usually run
-faster when writing to stdout rather than stderr, though this
-is not a prime consideration in this example.
-
-.SK
-.B
-USE OF DBUG_PRINT MACRO
-.R
-
-.P
-The mechanism used to produce "printf" style output is the
-.B DBUG_PRINT
-macro.
-
-.P
-To allow selection of output from specific macros, the first argument
-to every 
-.B DBUG_PRINT
-macro is a 
-.I dbug
-keyword.
-When this keyword appears in the argument list of the 'd' flag in
-a debug control string, as in "-#d,keyword1,keyword2,...:t",
-output from the corresponding macro is enabled.
-The default when there is no 'd' flag in the control string is to
-enable output from all 
-.B DBUG_PRINT
-macros.
-
-.P
-Typically, a program will be run once, with no keywords specified,
-to determine what keywords are significant for the current problem
-(the keywords are printed in the macro output line).
-Then the program will be run again, with the desired keywords,
-to examine only specific areas of interest.
-
-.P
-The second argument to a
-.B DBUG_PRINT 
-macro is a standard printf style
-format string and one or more arguments to print, all
-enclosed in parenthesis so that they collectively become a single macro
-argument.
-This is how variable numbers of printf arguments are supported.
-Also note that no explicit newline is required at the end of the format string.
-As a matter of style, two or three small 
-.B DBUG_PRINT
-macros are preferable
-to a single macro with a huge format string.
-Figure 8 shows the output for default tracing and debug.
-.DS I N
-.SP 2
-.so output3.r
-.SP 2
-.ll -5
-.ce
-Figure 8
-.ce
-factorial -#d:t:o 3
-.ll +5
-.SP 2
-.DE
-
-.P
-The output from the 
-.B DBUG_PRINT
-macro is indented to match the trace output
-for the function in which the macro occurs.
-When debugging is enabled, but not trace, the output starts at the left
-margin, without indentation.
-
-.P
-To demonstrate selection of specific macros for output, figure
-9 shows the result when the factorial program is invoked with
-the debug control string "-#d,result:o".
-.DS I N
-.SP 2
-.so output4.r
-.SP 2
-.ll -5
-.ce
-Figure 9
-.ce
-factorial -#d,result:o 4
-.ll +5
-.SP 2
-.DE
-
-.P
-It is sometimes desirable to restrict debugging and trace actions
-to a specific function or list of functions.
-This is accomplished with the 'f' flag character in the debug
-control string.
-Figure 10 is the output of the factorial program when run with the
-control string "-#d:f,factorial:F:L:o".
-The 'F' flag enables printing of the source file name and the 'L'
-flag enables printing of the source file line number.
-.DS I N
-.SP 2
-.so output5.r
-.SP 2
-.ll -5
-.ce
-Figure 10
-.ce
-factorial -#d:f,factorial:F:L:o 3
-.ll +5
-.SP 2
-.DE
-
-.P
-The output in figure 10 shows that the "find" macro is in file
-"factorial.c" at source line 8 and the "result" macro is in the same
-file at source line 12.
-
-.SK
-.B
-SUMMARY OF MACROS
-.R
-
-.P
-This section summarizes the usage of all currently defined macros
-in the 
-.I dbug
-package.
-The macros definitions are found in the user include file
-.B dbug.h
-from the standard include directory.
-
-.SP 2
-.BL 20
-.LI DBUG_ENTER\ 
-Used to tell the runtime support module the name of the function
-being entered.
-The argument must be of type "pointer to character".
-The 
-DBUG_ENTER
-macro must precede all executable lines in the
-function just entered, and must come after all local declarations.
-Each 
-DBUG_ENTER
-macro must have a matching 
-DBUG_RETURN 
-or
-DBUG_VOID_RETURN
-macro 
-at the function exit points.
-DBUG_ENTER 
-macros used without a matching 
-DBUG_RETURN 
-or 
-DBUG_VOID_RETURN
-macro 
-will cause warning messages from the 
-.I dbug
-package runtime support module.
-.SP 1
-EX:\ DBUG_ENTER\ ("main");
-.SP 1
-.LI DBUG_RETURN\ 
-Used at each exit point of a function containing a 
-DBUG_ENTER 
-macro
-at the entry point.
-The argument is the value to return.
-Functions which return no value (void) should use the 
-DBUG_VOID_RETURN
-macro.
-It 
-is an error to have a 
-DBUG_RETURN 
-or 
-DBUG_VOID_RETURN 
-macro in a function
-which has no matching 
-DBUG_ENTER 
-macro, and the compiler will complain
-if the macros are actually used (expanded).
-.SP 1
-EX:\ DBUG_RETURN\ (value);
-.br
-EX:\ DBUG_VOID_RETURN;
-.SP 1
-.LI DBUG_PROCESS\ 
-Used to name the current process being executed.
-A typical argument for this macro is "argv[0]", though
-it will be perfectly happy with any other string.
-.SP 1
-EX:\ DBUG_PROCESS\ (argv[0]);
-.SP 1
-.LI DBUG_PUSH\ 
-Sets a new debugger state by pushing the current
-.B dbug
-state onto an
-internal stack and setting up the new state using the debug control
-string passed as the macro argument.
-The most common usage is to set the state specified by a debug
-control string retrieved from the argument list.
-Note that the leading "-#" in a debug control string specified
-as a command line argument must
-.B not
-be passed as part of the macro argument.
-The proper usage is to pass a pointer to the first character
-.B after
-the "-#" string.
-.SP 1
-EX:\ DBUG_PUSH\ (\&(argv[i][2]));
-.br
-EX:\ DBUG_PUSH\ ("d:t");
-.br
-EX:\ DBUG_PUSH\ ("");
-.SP 1
-.LI DBUG_POP\ 
-Restores the previous debugger state by popping the state stack.
-Attempting to pop more states than pushed will be ignored and no
-warning will be given.
-The 
-DBUG_POP 
-macro has no arguments.
-.SP 1
-EX:\ DBUG_POP\ ();
-.SP 1
-.LI DBUG_FILE\ 
-The 
-DBUG_FILE 
-macro is used to do explicit I/O on the debug output
-stream.
-It is used in the same manner as the symbols "stdout" and "stderr"
-in the standard I/O package.
-.SP 1
-EX:\ fprintf\ (DBUG_FILE,\ "Doing my own I/O!\\n");
-.SP 1
-.LI DBUG_EXECUTE\ 
-The DBUG_EXECUTE macro is used to execute any arbitrary C code.
-The first argument is the debug keyword, used to trigger execution
-of the code specified as the second argument.
-This macro must be used cautiously because, like the 
-DBUG_PRINT 
-macro,
-it is automatically selected by default whenever the 'd' flag has
-no argument list (I.E., a "-#d:t" control string).
-.SP 1
-EX:\ DBUG_EXECUTE\ ("abort",\ abort\ ());
-.SP 1
-.LI DBUG_N\ 
-These macros, where N is in the range 2-5, are currently obsolete
-and will be removed in a future release.
-Use the new DBUG_PRINT macro.
-.LI DBUG_PRINT\ 
-Used to do printing via the "fprintf" library function on the
-current debug stream,
-DBUG_FILE.
-The first argument is a debug keyword, the second is a format string
-and the corresponding argument list.
-Note that the format string and argument list are all one macro argument
-and
-.B must
-be enclosed in parenthesis.
-.SP 1
-EX:\ DBUG_PRINT\ ("eof",\ ("end\ of\ file\ found"));
-.br
-EX:\ DBUG_PRINT\ ("type",\ ("type\ is\ %x", type));
-.br
-EX:\ DBUG_PRINT\ ("stp",\ ("%x\ ->\ %s", stp, stp\ ->\ name));
-.LI DBUG_SETJMP\ 
-Used in place of the setjmp() function to first save the current
-debugger state and then execute the standard setjmp call.
-This allows to the debugger to restore it's state when the
-DBUG_LONGJMP macro is used to invoke the standard longjmp() call.
-Currently all instances of DBUG_SETJMP must occur within the
-same function and at the same function nesting level.
-.SP 1
-EX:\ DBUG_SETJMP\ (env);
-.LI DBUG_LONGJMP\ 
-Used in place of the longjmp() function to first restore the
-previous debugger state at the time of the last DBUG_SETJMP
-and then execute the standard longjmp() call.
-Note that currently all DBUG_LONGJMP macros restore the state
-at the time of the last DBUG_SETJMP.
-It would be possible to maintain separate DBUG_SETJMP and DBUG_LONGJMP
-pairs by having the debugger runtime support module use the first
-argument to differentiate the pairs.
-.SP 1
-EX:\ DBUG_LONGJMP\ (env,val);
-.LE
-
-.SK
-.B
-DEBUG CONTROL STRING
-.R
-
-.P
-The debug control string is used to set the state of the debugger
-via the 
-.B DBUG_PUSH 
-macro.
-This section summarizes the currently available debugger options
-and the flag characters which enable or disable them.
-Argument lists enclosed in '[' and ']' are optional.
-.SP 2
-.BL 22
-.LI d[,keywords]
-Enable output from macros with specified keywords.
-A null list of keywords implies that all keywords are selected.
-.LI D[,time]
-Delay for specified time after each output line, to let output drain.
-Time is given in tenths of a second (value of 10 is one second).
-Default is zero.
-.LI f[,functions]
-Limit debugger actions to the specified list of functions.
-A null list of functions implies that all functions are selected.
-.LI F
-Mark each debugger output line with the name of the source file
-containing the macro causing the output.
-.LI L
-Mark each debugger output line with the source file line number of
-the macro causing the output.
-.LI n
-Mark each debugger output line with the current function nesting depth.
-.LI N
-Sequentially number each debugger output line starting at 1.
-This is useful for reference purposes when debugger output is
-interspersed with program output.
-.LI o[,file]
-Redirect the debugger output stream to the specified file.
-The default output stream is stderr.
-A null argument list causes output to be redirected to stdout.
-.LI p[,processes]
-Limit debugger actions to the specified processes.
-A null list implies all processes.
-This is useful for processes which run child processes.
-Note that each debugger output line can be marked with the name of
-the current process via the 'P' flag.
-The process name must match the argument passed to the
-.B DBUG_PROCESS
-macro.
-.LI P
-Mark each debugger output line with the name of the current process.
-Most useful when used with a process which runs child processes that
-are also being debugged.
-Note that the parent process must arrange for the debugger control
-string to be passed to the child processes.
-.LI r
-Used in conjunction with the 
-.B DBUG_PUSH 
-macro to reset the current
-indentation level back to zero.
-Most useful with 
-.B DBUG_PUSH 
-macros used to temporarily alter the
-debugger state.
-.LI t[,N]
-Enable function control flow tracing.
-The maximum nesting depth is specified by N, and defaults to
-200.
-.LE
-.SK
-.B
-HINTS AND MISCELLANEOUS
-.R
-
-.P
-One of the most useful capabilities of the 
-.I dbug 
-package is to compare the executions of a given program in two
-different environments.
-This is typically done by executing the program in the environment
-where it behaves properly and saving the debugger output in a
-reference file.
-The program is then run with identical inputs in the environment where 
-it misbehaves and the output is again captured in a reference file.
-The two reference files can then be differentially compared to
-determine exactly where execution of the two processes diverges.
-
-.P
-A related usage is regression testing where the execution of a current
-version is compared against executions of previous versions.
-This is most useful when there are only minor changes.
-
-.P
-It is not difficult to modify an existing compiler to implement
-some of the functionality of the 
-.I dbug
-package automatically, without source code changes to the
-program being debugged.
-In fact, such changes were implemented in a version of the
-Portable C Compiler by the author in less than a day.
-However, it is strongly encouraged that all newly
-developed code continue to use the debugger macros
-for the portability reasons noted earlier.
-The modified compiler should be used only for testing existing
-programs.
-
-.SK
-.B
-CAVEATS
-.R
-
-.P
-The 
-.I dbug
-package works best with programs which have "line\ oriented"
-output, such as text processors, general purpose utilities, etc.
-It can be interfaced with screen oriented programs such as
-visual editors by redefining the appropriate macros to call
-special functions for displaying the debugger results.
-Of course, this caveat is not applicable if the debugger output
-is simply dumped into a file for post-execution examination.
-
-.P
-Programs which use memory allocation functions other than
-.B malloc
-will usually have problems using the standard
-.I dbug
-package.
-The most common problem is multiply allocated memory.
-.SP 2
-.\" .DE nroff dident like this. davida 900108
-.CS
-
-
diff --git a/dmake/dbug/getwd.c b/dmake/dbug/getwd.c
deleted file mode 100644
index 56e1a03ab..000000000
--- a/dmake/dbug/getwd.c
+++ /dev/null
@@ -1,6 +0,0 @@
-char *
-getwd(pathname)
-char *pathname;
-{
-   return("delete this code if your getwd.c works correctly");
-}
diff --git a/dmake/dbug/malloc/_changes b/dmake/dbug/malloc/_changes
deleted file mode 100644
index 888a47a8d..000000000
--- a/dmake/dbug/malloc/_changes
+++ /dev/null
@@ -1,9 +0,0 @@
-I made the following changes to the malloc package as found in
-comp.sources.unix:
-
-	1. created this file _changes.
-	2. moved README to _readme (facilitates transfer to DOS and back to
-	   unix)
-	3. renamed testmalloc.c, malloc_chk.c, and malloc_chn.c to testmlc.c,
-	   mlc_chk.c, and mlc_chn.c respectively.  Again DOS has trouble with
-	   long basenames in filenames.
diff --git a/dmake/dbug/malloc/_readme b/dmake/dbug/malloc/_readme
deleted file mode 100644
index b78b1fd6b..000000000
--- a/dmake/dbug/malloc/_readme
+++ /dev/null
@@ -1,133 +0,0 @@
-# (c) Copyright 1990 Conor P. Cahill. (uunet!virtech!cpcahil) 
-# You may copy, distribute, and use this software as long as this
-# copyright statement is not removed.
-
-This package is a collection of routines which are a drop-in replacement
-for the malloc(3), memory(3), string(3), and bstring(3) library functions.
-
-The purpose of these programs is to aid the development and/or debugging
-of programs using these functions by providing a high level of consistancy
-checking whenever a malloc pointer is used.  Due to this increased 
-level of consistancy checking, these functions have a considerably larger
-overhead than the standard functions, but the extra checking should be
-well worth it in a development environment.
-
-To use these functions all you need to do is compile the library and
-include it on your loader command line.  You do not need to recompile
-your code, only a relink is necessary.  
-
-Features of this library:
-
- 1. The malloced area returned from each call to malloc is filled with
-    non-null bytes.  This should catch any use of uninitialized malloc
-    area.  The fill pattern for malloced area is 0x01.
-
- 2. When free is called numerous validity checks are made on the 
-    pointer it is passed.  In addition, the data in the malloc block
-    beyound the size requested on the initial malloc is checked to 
-    verify that it is still filled with the original fill characters.
-
-	This is usefull for catching things like:
-
-		ptr = malloc(5);
-		ptr[5] = '\0';
-
-		/*
-		 * You should not that this will be caught when it is
-		 * freed not when it is done
-		 */
-
-    And finally, the freed block is filled with a different fill pattern
-    so that you can easily determine if you are still using free'd space.
-    The fill pattern for free'd areas is 0x02.
-
-	This is usefull for catching things like:
-
-		ptr = malloc(20);
-
-		bptr = ptr+10;
-
-		/* do something usefule with bptr */
-
-		free(ptr);
-
-		/* 
-		 * now try to do something useful with bptr, it should
-		 * be trashed enough that it would cause real problems
-		 * and when you went to debug the problem it would be
-		 * filled with 0x02's and you would then know to look 
-		 * for something free'ing what bptr points to.
-		 */
-		
-
- 3. Whenever a bstring(3)/string(3)/memory(3) function is called, it's 
-    parameters are checked as follows:
-
-	If they point somewhere in the malloc arena
-		If the operation goes beyond requested malloc space
-			call malloc_warning()
-
-	This is usefull for catching things like:
-
-		ptr = malloc(5);
-		strcpy(ptr,"abcde");
-			
-	
- 4. Malloc_warning() and malloc_fatal() are used when an error condition
-    is detected.  If the error is severe, malloc_fatal is called.  
-    Malloc_warning is used otherwise.  The decision about what is fatal
-    and what is a warning was made somewhat arbitrarily.
-
-    Warning messages include:
-
-	Calling free with a bad pointer
-        Calling a bstring/string/memory (3) function which will go beyond
-	    the end of a malloc block (Note that the library function is
-            not modified to refuse the operation.  If malloc warnings are
-	    in the default IGNORE case, the operation will continue and 
-	    at some point cause a real problem).
-
-    Fatal errors are:
-
-	Detectable corruption to the malloc chain.
-	
-
- 5. The operations to perform when an error is detected are specified at
-    run time by the use of environment variables.
-
-	MALLOC_WARN - specifies the warning error message handling
-	MALLOC_FATAL - specifies the fatal error handling
-
-
-	When one of these error conditions occur you will get an error
-	message and the handler will execute based upon what setting
-	is in the environment variables.  Currently understood settings
-	are as follows:
-
-		  0 - continue operations
-		  1 - drop core and exit
-		  2 - just exit
-		  3 - drop core, but continue executing.  Core files will
-	 		be placed into core.[PID].[counter] i.e: core.00123.001
-		128 - dump malloc chain and continue
-		129 - dump malloc chain, dump core, and exit
-		130 - dump malloc chain, exit
-		131 - dump malloc chain, dump core, continue processing
-		
-
-	There is an additional environment variable MALLOC_ERRFILE which
-	is used to indicate the name of the file for error message output.
-
-	For example, to set up the session to generate a core file for
-	every malloc warning, to drop core and exit on a malloc fatal, and 
-	to log all messages to the file "malloc_log" do the following:
-
-		MALLOC_WARN=131
-		MALLOC_FATAL=1
-		MALLOC_ERRFILE=malloc_log
-
-		export MALLOC_WARN MALLOC_FATAL MALLOC_ERRFILE
-
- 6. The function malloc_dump() is available to dump the malloc chain whenever
-    you might want.  It's only argument is a file descriptor to use to write
-    the data.  Review the code if you need to know what data is printed.
diff --git a/dmake/dbug/malloc/calloc.c b/dmake/dbug/malloc/calloc.c
deleted file mode 100644
index 12cd93393..000000000
--- a/dmake/dbug/malloc/calloc.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-#include <stdio.h>
-
-/*
- * Function:	calloc()
- *
- * Purpose:	to allocate and nullify a data area
- *
- * Arguments:	nelem	- number of elements
- *		elsize	- size of each element
- *
- * Returns:	NULL	- if malloc fails
- *		or pointer to allocated space
- *
- * Narrative:	determine size of area to malloc
- *		malloc area.
- *		if malloc succeeds
- *		    fill area with nulls
- *		return ptr to malloc'd region
- */
-#ifndef lint
-static char rcs_header[] = "$Id: calloc.c,v 1.2 2006-07-25 10:07:11 rt Exp $";
-#endif
-
-char *
-calloc(nelem,elsize)
-    unsigned int 	  nelem;
-    unsigned int 	  elsize;
-{
-    char		* malloc();
-    char		* memset();
-    char		* ptr;
-    unsigned int	  size;
-
-    size = elsize * nelem;
-
-    if( (ptr = malloc(size)) != NULL)
-    {
-        (void) memset(ptr,'\0',(int)size);
-    }
-
-    return(ptr);
-}
-
-
diff --git a/dmake/dbug/malloc/debug.h b/dmake/dbug/malloc/debug.h
deleted file mode 100644
index 0cc1c5ca4..000000000
--- a/dmake/dbug/malloc/debug.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-/************************************************************************/
-/*									*/
-/* this include sets up some macro functions which can be used while	*/
-/* debugging the program, and then left in the code, but turned of by	*/
-/* just not defining "DEBUG".  This way your production version of 	*/
-/* the program will not be filled with bunches of debugging junk	*/
-/*									*/
-/************************************************************************/
-/*
- * $Id: debug.h,v 1.2 2006-07-25 10:07:24 rt Exp $
- */
-
-#ifdef DEBUG
-
-#if DEBUG == 1			/* if default level			*/
-#undef DEBUG
-#define DEBUG	100		/*   use level 100			*/
-#endif
-
-#include <stdio.h>
-
-#define DEBUG0(val,str)\
-                {\
-                  if( DEBUG > val ) \
-                    fprintf(stderr,"%s(%d): %s\n",\
-                        __FILE__,__LINE__,str);\
-                }
-#define DEBUG1(val,str,a1)\
-                    {\
-                  char _debugbuf[100];\
-                  if( DEBUG > val )\
-                   {\
-                    sprintf(_debugbuf,str,a1);\
-                    fprintf(stderr,"%s(%d): %s\n",\
-                        __FILE__,__LINE__,_debugbuf);\
-                   }\
-                       }
-
-#define DEBUG2(val,str,a1,a2)\
-                    {\
-                 char _debugbuf[100];\
-                  if( DEBUG > val )\
-                   {\
-                    sprintf(_debugbuf,str,a1,a2);\
-                    fprintf(stderr,"%s(%d): %s\n",\
-                        __FILE__,__LINE__,_debugbuf);\
-                   }\
-                       }
-
-#define DEBUG3(val,str,a1,a2,a3)\
-                    {\
-                  char _debugbuf[100];\
-                  if( DEBUG > val )\
-                   {\
-                    sprintf(_debugbuf,str,a1,a2,a3);\
-                    fprintf(stderr,"%s(%d): %s\n",\
-                        __FILE__,__LINE__,_debugbuf);\
-                   }\
-                       }
-
-#define DEBUG4(val,str,a1,a2,a3,a4)\
-                     {\
-                  char _debugbuf[100];\
-                  if( DEBUG > val )\
-                   {\
-                    sprintf(_debugbuf,str,a1,a2,a3,a4);\
-                    fprintf(stderr,"%s(%d): %s\n",\
-                        __FILE__,__LINE__,_debugbuf);\
-                   }\
-                       }
-
-#define DEBUG5(val,str,a1,a2,a3,a4,a5)\
-                     {\
-                  char _debugbuf[100];\
-                  if( DEBUG > val )\
-                   {\
-                    sprintf(_debugbuf,str,a1,a2,a3,a4,a5);\
-                    fprintf(stderr,"%s(%d): %s\n",\
-                        __FILE__,__LINE__,_debugbuf);\
-                   }\
-                       }
-
-#else
-
-#define DEBUG0(val,s)
-#define DEBUG1(val,s,a1)
-#define DEBUG2(val,s,a1,a2)
-#define DEBUG3(val,s,a1,a2,a3)
-#define DEBUG4(val,s,a1,a2,a3,a4)
-#define DEBUG5(val,s,a1,a2,a3,a4,a5)
-
-#endif /* DEBUG */
-
-
diff --git a/dmake/dbug/malloc/dump.c b/dmake/dbug/malloc/dump.c
deleted file mode 100644
index 3e4fe6af4..000000000
--- a/dmake/dbug/malloc/dump.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-#include <stdio.h>
-#include "malloc.h"
-#include "tostring.h"
-
-/*
- * Function:	malloc_dump()
- *
- * Purpose:	to dump a printed copy of the malloc chain and
- *		associated data elements
- *
- * Arguments:	fd	- file descriptor to write data to
- *
- * Returns:	nothing of any use
- *
- * Narrative:	Just print out all the junk
- *
- * Notes:	This function is implemented using low level calls because
- * 		of the likelyhood that the malloc tree is damaged when it
- *		is called.  (Lots of things in the c library use malloc and
- *		we don't want to get into a catch-22).
- *
- */
-
-#ifndef lint
-static
-char rcs_hdr[] = "$Id: dump.c,v 1.2 2006-07-25 10:07:38 rt Exp $";
-#endif
-
-
-#define ERRSTR	"I/O Error on malloc dump file descriptor\n"
-
-#define WRITEOUT(fd,str,len)	if( write(fd,str,(unsigned)len) != len ) \
-                { \
-                    (void) write(2,ERRSTR,\
-                             (unsigned)strlen(ERRSTR));\
-                    exit(120); \
-                }
-
-void
-malloc_dump(fd)
-    int		fd;
-{
-    char			  buffer[512];
-    void			  exit();
-    int			  i;
-    extern char		* malloc_data_end;
-    extern char		* malloc_data_start;
-    extern struct mlist 	* malloc_end;
-    extern struct mlist	  malloc_start;
-    struct mlist 		* ptr;
-
-    WRITEOUT(fd,"MALLOC CHAIN:\n",14);
-    WRITEOUT(fd,"-------------------- START ----------------\n",44);
-
-    for(i=0; i < 80; i++)
-    {
-        buffer[i] = ' ';
-    }
-
-    for(ptr = &malloc_start; ptr; ptr = ptr->next)
-    {
-        (void) tostring(buffer,	   (int)ptr,	     8,	B_HEX,	'0');
-        (void) tostring(buffer+9,  (int)ptr->next,   8,	B_HEX,	'0');
-        (void) tostring(buffer+18, (int)ptr->prev,   8,	B_HEX,	'0');
-        (void) tostring(buffer+27, (int)ptr->flag,  10,	B_HEX,	'0');
-        (void) tostring(buffer+38, (int)ptr->s.size, 8,	B_DEC,	' ');
-        (void) tostring(buffer+47, (int)ptr->s.size, 8,	B_HEX,	'0');
-        (void) tostring(buffer+57, (int)ptr->data,   8,	B_HEX,	'0');
-        buffer[46] = '(';
-        buffer[55] = ')';
-        buffer[65] = '\n';
-        WRITEOUT(fd,buffer,66);
-    }
-    WRITEOUT(fd,"-------------------- DONE -----------------\n",44);
-
-    WRITEOUT(fd,"Malloc start:      ",19);
-    (void) tostring(buffer, (int) &malloc_start, 8, B_HEX, '0');
-    buffer[8] = '\n';
-    WRITEOUT(fd,buffer,9);
-
-    WRITEOUT(fd,"Malloc end:        ", 19);
-    (void) tostring(buffer, (int) malloc_end, 8, B_HEX, '0');
-    buffer[8] = '\n';
-    WRITEOUT(fd,buffer,9);
-
-    WRITEOUT(fd,"Malloc data start: ", 19);
-    (void) tostring(buffer, (int) malloc_data_start, 8, B_HEX, '0');
-    buffer[8] = '\n';
-    WRITEOUT(fd,buffer,9);
-
-    WRITEOUT(fd,"Malloc data end:   ", 19);
-    (void) tostring(buffer, (int) malloc_data_end, 8, B_HEX, '0');
-    buffer[8] = '\n';
-    WRITEOUT(fd,buffer,9);
-    
-} /* malloc_dump(... */
-
-
diff --git a/dmake/dbug/malloc/free.c b/dmake/dbug/malloc/free.c
deleted file mode 100644
index e1b639da2..000000000
--- a/dmake/dbug/malloc/free.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-#include <stdio.h>
-#include "malloc.h"
-#include "debug.h"
-
-/*
- * Function:	free()
- *
- * Purpose:	to deallocate malloced data
- *
- * Arguments:	ptr	- pointer to data area to deallocate
- *
- * Returns:	nothing of any value
- *
- * Narrative:
- *		verify pointer is within malloc region
- *		get mlist pointer from passed address
- *		verify magic number
- *		verify inuse flag
- *		verify pointer connections with surrounding segments
- *		turn off inuse flag
- *		verify no data overrun into non-malloced area at end of segment
- *		IF possible join segment with next segment
- *		IF possible join segment with previous segment
- *		Clear all data in segment (to make sure it isn't reused)
- *
- */
-#ifndef lint
-static
-char rcs_hdr[] = "$Id: free.c,v 1.2 2006-07-25 10:07:53 rt Exp $";
-#endif
-
-void
-free(cptr)
-    char	* cptr;
-{
-    char			* func = "free";
-    int			  i;
-    extern int		  malloc_checking;
-    extern struct mlist	* malloc_end;
-    extern int		  malloc_errno;
-    extern char		* malloc_data_end;
-    extern char		* malloc_data_start;
-    void			  malloc_join();
-    void			  malloc_memset();
-    struct mlist		* oldptr;
-    struct mlist		* ptr;
-
-    /*
-     * IF malloc chain checking is on, go do it.
-     */
-    if( malloc_checking )
-    {
-        (void) malloc_chain_check(1);
-    }
-
-    /*
-     * verify that cptr is within the malloc region...
-     */
-    if( cptr < malloc_data_start || cptr > malloc_data_end )
-    {
-        malloc_errno = M_CODE_BAD_PTR;
-        malloc_warning(func);
-        return;
-    }
-
-    /* 
-     * convert pointer to mlist struct pointer.  To do this we must 
-     * move the pointer backwards the correct number of bytes...
-     */
-    
-    ptr = (struct mlist *) (cptr - M_SIZE);
-    
-    if( (ptr->flag&M_MAGIC) != M_MAGIC )
-    {
-        malloc_errno = M_CODE_BAD_MAGIC;
-        malloc_warning(func);
-        return;
-    }
-
-    if( ! (ptr->flag & M_INUSE) )
-    {
-        malloc_errno = M_CODE_NOT_INUSE;
-        malloc_warning(func);
-        return;
-    }
-
-     if( (ptr->prev && (ptr->prev->next != ptr) ) ||
-        (ptr->next && (ptr->next->prev != ptr) ) ||
-        ((ptr->next == NULL) && (ptr->prev == NULL)) )
-    {
-        malloc_errno = M_CODE_BAD_CONNECT;
-        malloc_warning(func);
-        return;
-    }
-
-    ptr->flag &= ~M_INUSE;
-
-    /*
-     * verify that the user did not overrun the requested number of bytes.
-     */
-    for(i=ptr->r_size; i < ptr->s.size; i++)
-    {
-        if( ptr->data[i] != M_FILL )
-        {
-            malloc_errno = M_CODE_OVERRUN;
-            malloc_warning(func);
-            break;
-        }
-    }
-
-    DEBUG3(10,"pointers: prev: 0x%.7x,  ptr: 0x%.7x, next: 0x%.7x",
-            ptr->prev, ptr, ptr->next);
-    
-    DEBUG3(10,"size:     prev: %9d,  ptr: %9d, next: %9d",
-            ptr->prev->s.size, ptr->s.size, ptr->next->s.size);
-    
-    DEBUG3(10,"flags:    prev: 0x%.7x,  ptr: 0x%.7x, next: 0x%.7x",
-            ptr->prev->flag, ptr->flag, ptr->next->flag);
-    
-    /*
-     * check to see if this block can be combined with the next and/or
-     * previous block.  Since it may be joined with the previous block
-     * we will save a pointer to the previous block and test to verify
-     * if it is joined (it's next ptr will no longer point to ptr).
-      */
-    malloc_join(ptr,ptr->next,0,0);
-    
-    oldptr = ptr->prev;
-
-    malloc_join(ptr->prev, ptr,0,0);
-
-    if( oldptr->next != ptr )
-    {
-        DEBUG0(10,"Oldptr was changed");
-        ptr = oldptr;
-    }
-    
-    /*
-     * fill this block with '\02's to ensure that nobody is using a 
-     * pointer to already freed data...
-     */
-    malloc_memset(ptr->data,M_FREE_FILL,(int)ptr->s.size);
-
-}
-
diff --git a/dmake/dbug/malloc/m_init.c b/dmake/dbug/malloc/m_init.c
deleted file mode 100644
index a30326de1..000000000
--- a/dmake/dbug/malloc/m_init.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-#include <stdio.h>
-#include "malloc.h"
-
-/*
- * Function:	malloc_init()
- *
- * Purpose:	to initialize the pointers and variables use by the
- *		malloc() debugging library
- *
- * Arguments:	none
- *
- * Returns:	nothing of any value
- *
- * Narrative:	Just initialize all the needed variables.  Use mallopt
- *		to set options taken from the environment.
- *
- */
-#ifndef lint
-static
-char rcs_hdr[] = "$Id: m_init.c,v 1.2 2006-07-25 10:08:07 rt Exp $";
-#endif
-
-void
-malloc_init()
-{
-    char			* cptr;
-    char			* getenv();
-    union malloptarg	  m;
-    extern char		* malloc_data_end;
-    extern char		* malloc_data_start;
-    extern struct mlist	* malloc_end;
-    extern struct mlist	  malloc_start;
-    char			* sbrk();
-
-    /*
-      * If already initialized...
-     */
-    if( malloc_data_start != (char *) 0)
-    {
-        return;
-    }
-
-
-    malloc_data_start = sbrk(0);
-    malloc_data_end = malloc_data_start;
-    malloc_start.s.size = 0;
-    malloc_end = &malloc_start;
-    
-    if( (cptr=getenv("MALLOC_WARN")) != NULL )
-    {
-        m.i = atoi(cptr);
-        (void) mallopt(MALLOC_WARN,m);
-    }
-
-    if( (cptr=getenv("MALLOC_FATAL")) != NULL)
-    {
-        m.i = atoi(cptr);
-        (void) mallopt(MALLOC_FATAL,m);
-    }
-
-    if( (cptr=getenv("MALLOC_CKCHAIN")) != NULL)
-    {
-        m.i = atoi(cptr);
-        (void) mallopt(MALLOC_CKCHAIN,m);
-    }
-
-    if( (cptr=getenv("MALLOC_ERRFILE")) != NULL)
-    {
-        m.str = cptr;
-        (void) mallopt(MALLOC_ERRFILE,m);
-    }
-
-}
-
diff --git a/dmake/dbug/malloc/m_perror.c b/dmake/dbug/malloc/m_perror.c
deleted file mode 100644
index 69e20d501..000000000
--- a/dmake/dbug/malloc/m_perror.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-
-#ifndef lint
-static
-char rcsid[] = "$Id: m_perror.c,v 1.2 2006-07-25 10:08:21 rt Exp $";
-#endif
-
-/*
- * malloc errno error strings...
- */
-
-char *malloc_err_strings[] = 
-{
-    "No errors",
-    "Malloc chain is corrupted, pointers out of order",
-    "Malloc chain is corrupted, end before end pointer",
-    "Pointer is not within malloc area",
-    "Malloc region does not have valid magic number in header",
-    "Pointers between this segment and ajoining segments are invalid",
-    "Data has overrun beyond requested number of bytes",
-    "Data in free'd area has been modified",
-    "Data are is not in use (can't be freed or realloced)",
-    "Unable to get additional memory from the system",
-    "Pointer within malloc region, but outside of malloc data bounds",
-    (char *) 0
-};
-
-/*
- * Function:	malloc_perror()
- *
- * Purpose:	to print malloc_errno error message
- *
- * Arguments:	str	- string to print with error message
- *
- * Returns:	nothing of any value
- *
- * Narrative:
- */
-void
-malloc_perror(str)
-    char	* str;
-{
-    extern int	  malloc_errno;
-    register char 	* s;
-    register char 	* t;
-
-    if( str && *str)
-    {
-        for(s=str; *s; s++)
-        {
-            /* do nothing */;
-        }
-
-        (void) write(2,str,(unsigned)(s-str));
-        (void) write(2,": ",(unsigned)2);
-    }
-
-    t = malloc_err_strings[malloc_errno];
-
-    for(s=t; *s; s++)
-    {
-        /* do nothing */;
-    }
-
-    (void) write(2,t,(unsigned)(s-t));
-
-    (void) write(2,"\n",(unsigned)1);
-}
-
diff --git a/dmake/dbug/malloc/makefile b/dmake/dbug/malloc/makefile
deleted file mode 100644
index 88395c7b8..000000000
--- a/dmake/dbug/malloc/makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
-# You may copy, distribute, and use this software as long as this
-# copyright statement is not removed.
-#
-#
-# This is the Makefile for the malloc debugging library
-#
-# $Id: makefile,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $
-#
-CC=cc
-# for System V systems use this CFLAGS
-#CFLAGS=-g -DSYS5
-# else for BSD use:
-#CFLAGS=-g
-LINT=lint
-SHARCMD=shar -o mallocshar -l50 -x -a -n Malloclib
-SHELL=/bin/sh
-
-LIB=libmalloc.a
-
-SRCS=	malloc.c	\
-	free.c		\
-	realloc.c	\
-	calloc.c	\
-	string.c	\
-	mlc_chk.c	\
-	mlc_chn.c	\
-	memory.c	\
-	tostring.c	\
-	m_perror.c	\
-	m_init.c	\
-	mallopt.c	\
-	dump.c
-
-OBJS=	malloc.o	\
-	free.o		\
-	realloc.o	\
-	calloc.o	\
-	string.o	\
-	mlc_chk.o	\
-	mlc_chn.o	\
-	memory.o	\
-	tostring.o	\
-	m_perror.o	\
-	m_init.o	\
-	mallopt.o	\
-	dump.o
-
-TESTS=testmlc testmem
-
-all:	$(LIB) $(TESTS)
-
-clean:  
-	rm -f $(TESTS) pgm $(LIB) *.o *.ln
-
-sharfile:
-	$(SHARCMD) Makefile README patchlevel *.[ch3] 
-	
-$(LIB): $(OBJS)
-	ar ru $(LIB) $(OBJS)
-	-if test -s /bin/ranlib; then /bin/ranlib $(LIB); else exit 0; fi
-	-if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(LIB); else exit 0; fi
-
-testmlc:	$(LIB) testmlc.o
-	$(CC) -o $@ testmlc.o $(LIB)
-
-testmem:	$(LIB) testmem.o
-	$(CC) -o $@ testmem.o $(LIB)
-
-lint:	
-	$(LINT) $(CFLAGS) $(SRCS) testmlc.c testmem.c
-
-
-$(OBJS):	malloc.h
-
-tostring.o malloc.o dump.o:	tostring.h
diff --git a/dmake/dbug/malloc/malloc.3 b/dmake/dbug/malloc/malloc.3
deleted file mode 100644
index f5e1d2dc0..000000000
--- a/dmake/dbug/malloc/malloc.3
+++ /dev/null
@@ -1,223 +0,0 @@
-.TH MALLOC 3 "" "" "1.0"
-.ds ]T 
-.\"/*
-.\" * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
-.\" * You may copy, distribute, and use this software as long as this
-.\" * copyright statement is not removed.
-.\" */
-.\" $Id: malloc.3,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $
-.SH NAME
-malloc \t- debugging malloc library
-.SH SYNOPSIS
-.ft B
-.nf
-#include <malloc.h>
-
-char	* calloc(nelem,elsize);
-void	  free(ptr);
-char	* malloc(size);
-int	  malloc_chain_check(flag);
-void	  malloc_dump(fd);
-int	  mallopt(cmd,val)
-char	* realloc(ptr,size);
-
-int			  cmd,fd,flag;
-unsigned		  elsize,nelem,size;
-char			* ptr;
-union malloptarg	  val;
-
-.fi
-.ft R
-.SH DESCRIPTION
-This malloc library is a replacement for the standard library to be used
-during software development/debugging.  See the standard malloc(3) pages
-for more information on the use of the following functions:
-.nf
-.in +.5i
-calloc(), free(), malloc(), realloc()
-.in -.5i
-.fi
-.sp
-This library differs from the standard malloc library in the
-following ways:
-.P
-1. Each malloc segment contains a magic number so that free can 
-verify that the pointer passed points to a valid malloc segment.
-.P
-2. Each malloc segment is filled with a non-zero pattern so that code that
-depends upon malloc segments being null will fail.
-.P
-3. The size of each segment will be at least 1 byte larger than requested
-and the extra bytes will be filled with a non-zero pattern.  When free is
-called, it will verify that you did not go beyond the number of bytes 
-you asked for.
-.P
-4. When a segment is freed, it will be filled with a different non-zero pattern
-to ensure that the program doesn't depend upon the use of already freed data.
-.P
-5. Whenever any of the string or memory functions (str*, b*, mem*) are 
-called with a pointer that is within the malloc arena,  the operation is
-checked to verify that it does not overrun the malloced segment.  A failure
-of this check is considered a "warning level error" (described later) and
-is handled accordingly.
-.P
-7. Run time checking can include verification of the malloc chain at each
-and every call to one of the malloc functions or manually by calling the
-malloc_chain_check function.
-.P
-6. When a problem is found, the action taken is specified at runtime by
-environment variables or at compile time by the use of the mallopt()
-function.
-.P
-There are two arbitrary levels of errors, warning and fatal, that this
-library will detect.  They are broken down as follows:
-.P
-.nf
-.in +.25i
-Warning messages include:
-.sp
-.in +.5i
-.ti -.25i
-Calling free with a bad pointer
-.br
-.ti -.25i
-Calling a bstring/string/memory (3) function which will go beyond
-the end of a malloc block. Note that the library function is
-not modified to refuse the operation.
-.sp
-.in -.5i
-Fatal errors are:
-.in +.5i
-.ti -.25i
-Detectable corruption to the malloc chain.
-.in -.5i
-.in -.25i
-.P
-The error handling for each level (warning or fatal) are specified using
-environment variables or mallopt().  The coding for the error handling is
-as follows:
-.sp
-.nf
-.in +.5i
-.ti -.25i
-  0 - continue operations
-.ti -.25i
-  1 - drop core and exit
-.ti -.25i
-  2 - just exit
-.ti -.25i
-  3 - drop core, but continue executing.  Core files will
-be placed into core.[PID].[counter] i.e: core.00123.001
-.ti -.25i
-128 - dump malloc chain and continue
-.ti -.25i
-129 - dump malloc chain, dump core, and exit
-.ti -.25i
-130 - dump malloc chain, exit
-.ti -.25i
-131 - dump malloc chain, dump core, continue processing
-.in -.5i
-.P
-In addition error messages can be placed into an error file.
-.P
-\fBmalloc_opt\fP() is used to set the malloc debugging options. The
-following options can be set:
-.br
-.sp
-.in +.5i
-MALLOC_WARN - set the error handling for warning level errors.  \fBval.i\fP is
-an integer that can contain any one of the following values:
-.sp
-.in +.5i
-M_HANDLE_IGNORE - ignore error
-.br
-M_HANDLE_ABORT - drop core and exit
-.br
-M_HANDLE_EXIT - just exit (no core drop)
-.br
-M_HANDLE_CORE - drop core, but keep on going
-.br
-.in -.5i
-.sp
-In addition, M_HANDLE_DUMP may be or'd in to cause a dump of the current
-malloc chain.
-.br
-.sp
-MALLOC_FATAL - set the error handling for fatal level errors.  \fBval.i\fP is
-equivalent to \fBval.i\fP for MALLOC_WARN.
-.br
-.sp
-MALLOC_ERRFILE - set the destination for malloc error messages.  \fBval.str\fP
-is a pointer to a character string containing the name of the file to be used
-for error messages.
-.br
-.sp
-MALLOC_CKCHAIN - set the malloc chain checking flag.  If \fBval.i\fP is
-non-zero, chain checking at every call to malloc is turned on.
-.br
-.sp
-For example, to set up the session to generate a core file for
-every malloc warning, to drop core and exit on a malloc fatal, and 
-to log all messages to the file "malloc_log" do the following:
-.sp
-.nf
-.in +.5i
-#include <malloc.h>
-malloc_opt(MALLOC_WARN,131);
-malloc_opt(MALLOC_FATAL,1);
-malloc_opt(MALLOC_ERRFILE,"malloc_log");
-.in -.5i
-.fi
-.in -.5i
-.sp
-\fBmalloc_opt\fP() can be used to set/alter the debugging options at any
-time.
-.P
-\fBmalloc_dump\fP() will dump a table of the malloc arena showing all
-allocated/freed segments and the first few bytes of data in each segment.
-\fBfd\fP is the file descriptor to write the data to.
-.P
-\fBmalloc_chain_check\fP() will check the status of the malloc arena.
-If \fBflag\fP is non-zero, an error found in the chain will cause a 
-fatal error.  \fBmalloc_chain_check\fP() returns zero when there are no
-problems found in the malloc chain, non-zero otherwise.
-.SH "ENVIRONMENT VARIABLES"
-Environment variables can be used to control error handling, error logging
-and malloc chain checking at run time.  The following environment variables
-are used:
-.P
-MALLOC_WARN - specifies the error handling for warning errors
-.br
-MALLOC_FATAL - specifies the error handling for fatal errors
-.br
-MALLOC_ERRFILE - specifies the error log file for error messages.  
-.br
-MALLOC_CKCHAIN - if 1, turns on malloc chain checking at every call to any
-of the malloc functions.
-.P
-For example, to set up the session to generate a core file for
-every malloc warning, to drop core and exit on a malloc fatal, and 
-to log all messages to the file "malloc_log" do the following:
-.sp
-.nf
-.in +.5i
-MALLOC_WARN=131
-MALLOC_FATAL=1
-MALLOC_ERRFILE=malloc_log
-
-export MALLOC_WARN MALLOC_FATAL MALLOC_ERRFILE
-.in -.5i
-.fi
-.SH WARNINGS
-This malloc library and it's associated string and memory functions are
-much less efficient than the standard functions due in part to the extra
-error checking.  You do not want to use this library when generating a
-production (i.e. releasable) version of your software.  It should only
-be used during development and testing.
-.SH SEE ALSO
-stat(2)
-.SH AUTHOR
-Conor P. Cahill
-Virtual Technologies Incorporated
-.sp
-uunet!virtech!cpcahil
diff --git a/dmake/dbug/malloc/malloc.c b/dmake/dbug/malloc/malloc.c
deleted file mode 100644
index 8e4967921..000000000
--- a/dmake/dbug/malloc/malloc.c
+++ /dev/null
@@ -1,627 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-#include <stdio.h>
-#include <fcntl.h>
-#include "malloc.h"
-#include "tostring.h"
-
-/*
- * Function:	malloc()
- *
- * Purpose:	memory allocator
- *
- * Arguments:	size	- size of data area needed
- *
- * Returns:	pointer to allocated area, or NULL if unable
- *		to allocate addtional data.
- *
- * Narrative:
- *
- */
-#ifndef lint
-static
-char rcs_hdr[] = "$Id: malloc.c,v 1.2 2006-07-25 10:08:36 rt Exp $";
-#endif
-
-extern int	  malloc_checking;
-char		* malloc_data_start;
-char		* malloc_data_end;
-struct mlist 	* malloc_end;
-int		  malloc_errfd = 2;
-int		  malloc_errno;
-int		  malloc_fatal_level = M_HANDLE_CORE;
-struct mlist	  malloc_start;
-int		  malloc_warn_level;
-void		  malloc_memset();
-
-char *
-malloc(size)
-    unsigned int	  size;
-{
-    char		* func = "malloc";
-    char		* getenv();
-    void		  malloc_fatal();
-    void		  malloc_init();
-    void		  malloc_split();
-    void		  malloc_warning();
-    unsigned int	  need;
-    struct mlist	* oldptr;
-    struct mlist	* ptr;
-    char		* sbrk();
-
-    /*
-     * If this is the first call to malloc...
-     */
-    if( malloc_data_start == (char *) 0 )
-    {
-        malloc_init();
-    }
-
-    /*
-     * If malloc chain checking is on, go do it.
-     */
-    if( malloc_checking )
-    {
-        (void) malloc_chain_check(1);
-    }
-
-    /*
-     * always make sure there is at least on extra byte in the malloc
-     * area so that we can verify that the user does not overrun the
-     * data area.
-     */
-    size++;
-
-    /*
-     * Now look for a free area of memory of size bytes...
-     */
-    oldptr = NULL;
-    for(ptr = &malloc_start; ; ptr = ptr->next)
-    {
-        /*
-         * Since the malloc chain is a forward only chain, any
-         * pointer that we get should always be positioned in 
-         * memory following the previous pointer.  If this is not
-         * so, we must have a corrupted chain.
-         */
-        if( ptr )
-        {
-            if( ptr<oldptr )
-            {
-                malloc_errno = M_CODE_CHAIN_BROKE;
-                malloc_fatal(func);
-                return(NULL);
-            }
-            oldptr = ptr;
-        }
-        else if( oldptr != malloc_end )
-        {
-            /*
-             * This should never happen.  If it does, then
-             * we got a real problem.
-             */
-            malloc_errno = M_CODE_NO_END;
-            malloc_fatal(func);
-            return(NULL);
-        }
-        
-
-        /*
-         * if this element is already in use...
-         */
-        if( ptr && ((ptr->flag & M_INUSE) != 0) )
-        {
-            continue;
-        }
-
-        /*
-         * if there isn't room for this block..
-         */
-        if( ptr && (ptr->s.size < size) )
-        {
-            continue;
-        }
-
-        /*
-         * If ptr is null, we have run out of memory and must sbrk more
-         */
-        if( ptr == NULL )
-        {
-            need = (size + M_SIZE) * (size > 10*1024 ? 1:2);
-            if( need < M_BLOCKSIZE )
-            {
-                need = M_BLOCKSIZE;
-            }
-            else if( need & (M_BLOCKSIZE-1) )
-            {
-                need &= ~(M_BLOCKSIZE-1);
-                need += M_BLOCKSIZE;
-            }
-            ptr = (struct mlist *) sbrk((int)need);
-            if( ptr == (struct mlist *) -1 )
-            {
-                malloc_errno = M_CODE_NOMORE_MEM;
-                malloc_fatal(func);
-            }
-            malloc_data_end = sbrk((int)0);
-
-            ptr->prev   = oldptr;
-            ptr->next   = (struct mlist *) 0;
-            ptr->s.size = need - M_SIZE;
-            ptr->flag  = M_MAGIC;
-
-            oldptr->next = ptr;
-            malloc_end = ptr;
-
-
-        } /* if( ptr ==... */
-
-        /*
-          * Now ptr points to a memory location that can store
-         * this data, so lets go to work.
-         */
-
-        ptr->r_size = size;		/* save requested size	*/
-        ptr->flag |= M_INUSE;
-
-        /*
-          * split off unneeded data area in this block, if possible...
-         */
-        malloc_split(ptr);
-
-        /*
-         * re-adjust the requested size so that it is what the user
-         * actually requested...
-         */
-
-        ptr->r_size--;
-
-        /*
-         * just to make sure that noone is misusing malloced
-          * memory without initializing it, lets set it to
-         * all '\01's.  We call local_memset() because memset()
-         * may be checking for malloc'd ptrs and this isn't
-         * a malloc'd ptr yet.
-         */
-        malloc_memset(ptr->data,M_FILL,(int)ptr->s.size);
-
-        return( ptr->data);
-
-    } /* for(... */
-
-} /* malloc(... */
-
-/*
- * Function:	malloc_split()
- *
- * Purpose:	to split a malloc segment if there is enough room at the
- *		end of the segment that isn't being used
- *
- * Arguments:	ptr	- pointer to segment to split
- *
- * Returns:	nothing of any use.
- *
- * Narrative:
- *		get the needed size of the module
- * 		round the size up to appropriat boundry
- *		calculate amount of left over space
- *		if there is enough left over space
- *		    create new malloc block out of remainder
- *		    if next block is free 
- *			join the two blocks together
- *		    fill new empty block with free space filler
- * 		    re-adjust pointers and size of current malloc block
- *		
- *		
- *
- * Mod History:	
- *   90/01/27	cpcahil		Initial revision.
- */
-void
-malloc_split(ptr)
-    struct mlist		* ptr;
-{
-    extern struct mlist	* malloc_end;
-    void			  malloc_join();
-    int			  rest;
-    int			  size;
-    struct mlist		* tptr;
-
-    size = ptr->r_size;
-
-    /*
-     * roundup size to the appropriate boundry
-     */
-
-    M_ROUNDUP(size);
-
-    /*
-     * figure out how much room is left in the array.
-     * if there is enough room, create a new mlist 
-     *     structure there.
-     */
-
-    if( ptr->s.size > size )
-    {
-        rest = ptr->s.size - size;
-    }
-    else
-    {
-        rest = 0;
-    }
-    
-    if( rest > (M_SIZE+M_RND) )
-    {
-        tptr = (struct mlist *) (ptr->data+size);
-        tptr->prev = ptr;
-        tptr->next = ptr->next;
-        tptr->flag = M_MAGIC;
-        tptr->s.size = rest - M_SIZE;
-
-        /*
-         * If possible, join this segment with the next one
-         */
-
-        malloc_join(tptr, tptr->next,0,0);
-
-        if( tptr->next )
-        {
-            tptr->next->prev = tptr;
-        }
-
-        malloc_memset(tptr->data,M_FREE_FILL, (int)tptr->s.size);
-
-        ptr->next = tptr;
-        ptr->s.size = size;
-
-        if( malloc_end == ptr )
-        {
-            malloc_end = tptr;
-        }
-    }
-
-} /* malloc_split(... */
-
-/*
- * Function:	malloc_join()
- *
- * Purpose:	to join two malloc segments together (if possible)
- *
- * Arguments:	ptr	- pointer to segment to join to.
- * 		nextptr	- pointer to next segment to join to ptr.
- *
- * Returns:	nothing of any values.
- *
- * Narrative:
- *
- * Mod History:	
- *   90/01/27	cpcahil		Initial revision.
- */
-void
-malloc_join(ptr,nextptr, inuse_override, fill_flag)
-    struct mlist	* ptr;
-    struct mlist	* nextptr;
-    int		  inuse_override;
-    int		  fill_flag;
-{
-    unsigned int	  newsize;
-
-    if( 	ptr     && ! (inuse_override || (ptr->flag & M_INUSE)) && 
-        nextptr && ! (nextptr->flag & M_INUSE) &&
-        ((ptr->data+ptr->s.size) == (char *) nextptr) )
-    {
-        if( malloc_end == nextptr )
-        {
-            malloc_end = ptr;
-        }
-        ptr->next = nextptr->next;
-        newsize = nextptr->s.size + M_SIZE;
-
-        /*
-         * if we are to fill and this segment is in use,
-         *   fill in with M_FILL newly added space...
-          */
-
-        if(fill_flag && (ptr->flag & M_INUSE) )
-        {
-            malloc_memset(ptr->data+ptr->s.size,
-                      M_FILL, (int)(nextptr->s.size + M_SIZE));
-        }
-
-        ptr->s.size += newsize;
-        if( ptr->next )
-        {
-            ptr->next->prev = ptr;
-        }
-    }
-
-} /* malloc_join(... */
-
-
-/*
- * The following mess is just to ensure that the versions of these functions in
- * the current library are included (to make sure that we don't accidentaly get 
- * the libc versions. (This is the lazy man's -u ld directive)
- */
-
-void free();
-int strcmp();
-int memcmp();
-char	* realloc();
-
-void		(*malloc_void_funcs[])() =
-{
-    free,
-};
-
-int		(*malloc_int_funcs[])() =
-{
-    strcmp,
-    memcmp,
-};
-
-char		* (*malloc_char_star_funcs[])() =
-{
-    realloc,
-};
-
-/*
- * This is malloc's own memset which is used without checking the parameters.
- */
-
-void
-malloc_memset(ptr,byte,len)
-    char		* ptr;
-    char		  byte;
-    int		  len;
-{
-
-    while(len-- > 0)
-    {
-        *ptr++ = byte;
-    }
-
-} /* malloc_memset(... */
-
-/*
- * Function:	malloc_fatal()
- *
- * Purpose:	to display fatal error message and take approrpriate action
- *
- * Arguments:	funcname - name of function calling this routine
- *
- * Returns:	nothing of any value
- *
- * Narrative:
- *
- * Notes:	This routine does not make use of any libc functions to build
- *		and/or disply the error message.  This is due to the fact that
- *		we are probably at a point where malloc is having a real problem
- *		and we don't want to call any function that may use malloc.
- */
-void
-malloc_fatal(funcname)
-    char		* funcname;
-{
-    char		  errbuf[128];
-    void		  exit();
-    void		  malloc_err_handler();
-    extern char	* malloc_err_strings[];
-    extern int	  malloc_errno;
-    extern int	  malloc_fatal_level;
-    char		* s;
-    char		* t;
-
-    s = errbuf;
-    t = "Fatal error: ";
-    while( *s = *t++)
-    {
-        s++;
-    }
-    t = funcname;
-    while( *s = *t++)
-    {
-        s++;
-    }
-
-    t = "(): ";
-    while( *s = *t++)
-    {
-        s++;
-    }
-
-    t = malloc_err_strings[malloc_errno];
-    while( *s = *t++)
-    {
-        s++;
-    }
-
-    *(s++) = '\n';
-
-    if( write(malloc_errfd,errbuf,(unsigned)(s-errbuf)) != (s-errbuf))
-    {
-        (void) write(2,"I/O error to error file\n",(unsigned)24);
-        exit(110);
-    }
-    malloc_err_handler(malloc_fatal_level);
-
-} /* malloc_fatal(... */
-
-/*
- * Function:	malloc_warning()
- *
- * Purpose:	to display warning error message and take approrpriate action
- *
- * Arguments:	funcname - name of function calling this routine
- *
- * Returns:	nothing of any value
- *
- * Narrative:
- *
- * Notes:	This routine does not make use of any libc functions to build
- *		and/or disply the error message.  This is due to the fact that
- *		we are probably at a point where malloc is having a real problem
- *		and we don't want to call any function that may use malloc.
- */
-void
-malloc_warning(funcname)
-    char		* funcname;
-{
-    char		  errbuf[128];
-    void		  exit();
-    void		  malloc_err_handler();
-    extern char	* malloc_err_strings[];
-    extern int	  malloc_errno;
-    extern int	  malloc_warn_level;
-    char		* s;
-    char		* t;
-
-    s = errbuf;
-    t = "Warning: ";
-    while( *s = *t++)
-    {
-        s++;
-    }
-    t = funcname;
-    while( *s = *t++)
-    {
-        s++;
-    }
-
-    t = "(): ";
-    while( *s = *t++)
-    {
-        s++;
-    }
-
-    t = malloc_err_strings[malloc_errno];
-    while( *s = *t++)
-    {
-        s++;
-    }
-
-    *(s++) = '\n';
-
-    if( write(malloc_errfd,errbuf,(unsigned)(s-errbuf)) != (s-errbuf))
-    {
-        (void) write(2,"I/O error to error file\n",(unsigned)24);
-        exit(110);
-    }
-
-    malloc_err_handler(malloc_warn_level);
-
-} /* malloc_warning(... */
-
-/*
- * Function:	malloc_err_handler()
- *
- * Purpose:	to take the appropriate action for warning and/or fatal 
- *		error conditions.
- *
- * Arguments:	level - error handling level 
- *
- * Returns:	nothing of any value
- *
- * Narrative:
- *
- * Notes:	This routine does not make use of any libc functions to build
- *		and/or disply the error message.  This is due to the fact that
- *		we are probably at a point where malloc is having a real problem
- *		and we don't want to call any function that may use malloc.
- */
-void
-malloc_err_handler(level)
-{
-    void		  exit();
-    void		  malloc_dump();
-    extern int	  malloc_errfd;
-
-    if( level & M_HANDLE_DUMP )
-    {
-        malloc_dump(malloc_errfd);
-    }
-
-    switch( level & ~M_HANDLE_DUMP )
-    {
-        /*
-         * If we are to drop a core file and exit
-         */
-        case M_HANDLE_ABORT:
-            (void) abort();
-            break;
-
-        /*
-         * If we are to exit..
-         */
-        case M_HANDLE_EXIT:
-            exit(200);
-            break;
-
-#ifndef __MSDOS__
-        /*
-         * If we are to dump a core, but keep going on our merry way
-         */
-        case M_HANDLE_CORE:
-            {
-                int	  pid;
-
-                /*
-                 * fork so child can abort (and dump core)
-                 */
-                if( (pid = fork()) == 0 )
-                {
-                    (void) write(2,"Child dumping core\n",
-                            (unsigned)9);
-                    (void) abort();
-                }
-
-                /*
-                  * wait for child to finish dumping core
-                 */
-                while( wait((int *)0) != pid)
-                {
-                }
-
-                /*
-                 * Move core file to core.pid.cnt so 
-                 * multiple cores don't overwrite each
-                 * other.
-                 */
-                if( access("core",0) == 0 )
-                {
-                    static int	  corecnt;
-                    char	  	  filenam[32];
-                    filenam[0] = 'c';
-                    filenam[1] = 'o';
-                    filenam[2] = 'r';
-                    filenam[3] = 'e';
-                    filenam[4] = '.';
-                    (void)tostring(filenam+5,getpid(),
-                        5, B_DEC, '0');
-                    filenam[10] = '.';
-                    (void)tostring(filenam+11,corecnt++,
-                        3, B_DEC, '0');
-                    filenam[14] = '\0';
-                    (void) unlink(filenam);
-                    if( link("core",filenam) == 0)
-                    {
-                        (void) unlink("core");
-                    }
-                }
-            }
-#endif
-
-
-        /* 
-         * If we are to just ignore the error and keep on processing
-         */
-        case M_HANDLE_IGNORE:
-            break;
-
-    } /* switch(... */
-
-} /* malloc_err_handler(... */
-
diff --git a/dmake/dbug/malloc/malloc.h b/dmake/dbug/malloc/malloc.h
deleted file mode 100644
index dee9e3a6f..000000000
--- a/dmake/dbug/malloc/malloc.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-/*
- * $Id: malloc.h,v 1.2 2006-07-25 10:08:50 rt Exp $
- */
-struct mlist
-{
-    struct mlist	* next;			/* next entry in chain	*/
-    struct mlist	* prev;			/* prev entry in chain	*/
-    int	 	  flag;			/* inuse flag		*/
-    unsigned int	  r_size;		/* requested size	*/
-    union
-    {
-        unsigned int	  size;		/* actual size		*/
-        double		  unused_just_for_alignment;
-    } s;
-    char		  data[4];
-};
-
-#define M_SIZE		((int)(char *)((struct mlist *)0)->data)
-#define M_RND		0x08
-
-#define M_INUSE 	0x01
-#define M_MAGIC 	0x03156100
-
-#define M_BLOCKSIZE	(1024*8)
-
-#define M_FILL		'\01'
-#define M_FREE_FILL	'\02'
-
-#define M_ROUNDUP(size)	{\
-                if( size & (M_RND-1) ) \
-                { \
-                    size &= ~(M_RND-1); \
-                    size += M_RND; \
-                } \
-            }
-
-/*
- * Malloc warning/fatal error handler defines...
- */
-#define M_HANDLE_DUMP	0x80  /* 128 */
-#define M_HANDLE_IGNORE	0
-#define M_HANDLE_ABORT	1
-#define M_HANDLE_EXIT	2
-#define M_HANDLE_CORE	3
-    
-/*
- * Mallopt commands and defaults
- */
-
-#define MALLOC_WARN	1		/* set malloc warning handling	*/
-#define MALLOC_FATAL	2		/* set malloc fatal handling	*/
-#define MALLOC_ERRFILE	3		/* specify malloc error file	*/
-#define MALLOC_CKCHAIN	4		/* turn on chain checking	*/
-union malloptarg
-{
-    int	  i;
-    char	* str;
-};
-
-/*
- * Malloc warning/fatal error codes
- */
-
-#define M_CODE_CHAIN_BROKE	1	/* malloc chain is broken	*/
-#define M_CODE_NO_END		2	/* chain end != endptr		*/
-#define M_CODE_BAD_PTR		3	/* pointer not in malloc area	*/
-#define M_CODE_BAD_MAGIC	4	/* bad magic number in header	*/
-#define M_CODE_BAD_CONNECT	5	/* chain poingers corrupt	*/
-#define M_CODE_OVERRUN		6	/* data overrun in malloc seg	*/
-#define M_CODE_REUSE		7	/* reuse of freed area		*/
-#define M_CODE_NOT_INUSE	8	/* pointer is not in use	*/
-#define M_CODE_NOMORE_MEM	9	/* no more memory available	*/
-#define M_CODE_OUTOF_BOUNDS	10	/* gone beyound bounds 		*/
-
-void malloc_warning();
-void malloc_fatal();
-void malloc_check_data();
-void malloc_check_str();
-void malloc_verify();
-
diff --git a/dmake/dbug/malloc/mallopt.c b/dmake/dbug/malloc/mallopt.c
deleted file mode 100644
index 13ef4d7b2..000000000
--- a/dmake/dbug/malloc/mallopt.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-#include <stdio.h>
-#include <fcntl.h>
-#include "malloc.h"
-
-/*
- * Function:	mallopt()
- *
- * Purpose:	to set options for the malloc debugging library
- *
- * Arguments:	none
- *
- * Returns:	nothing of any value
- *
- * Narrative:	
- *
- */
-
-#ifndef lint
-static
-char rcs_hdr[] = "$Id: mallopt.c,v 1.2 2006-07-25 10:09:05 rt Exp $";
-#endif
-
-int
-mallopt(cmd,value)
-    int			  cmd;
-    union malloptarg	  value;
-{
-    int			  i;
-    extern int		  malloc_checking;
-    extern char		* malloc_data_start;
-    extern int		  malloc_errfd;
-    extern int		  malloc_fatal_level;
-    void			  malloc_init();
-    extern int		  malloc_warn_level;
-    register char		* s;
-
-    /*
-      * If not initialized...
-     */
-    if( malloc_data_start == (char *) 0)
-    {
-        malloc_init();
-    }
-
-
-    switch(cmd)
-    {
-        case MALLOC_WARN:
-            malloc_warn_level = value.i;
-            break;
-
-        case MALLOC_FATAL:
-            malloc_fatal_level = value.i;
-            break;
-
-        case MALLOC_CKCHAIN:
-            malloc_checking = value.i;
-            break;
-
-        case MALLOC_ERRFILE:
-            
-            i = open(value.str,O_CREAT|O_APPEND|O_WRONLY,0666);
-            if( i == -1 )
-            {
-                (void) write(2,
-                      "Unable to open malloc error file: ",
-                      (unsigned) 34);
-                for(s=value.str; *s; s++)
-                {
-                    /* do nothing */;
-                }
-                (void) write(2,value.str,
-                         (unsigned)(s-value.str));
-                (void) write(2,"\n",(unsigned)1);
-            }
-            else
-            {
-                if( malloc_errfd != 2 )
-                {
-                    (void) close(malloc_errfd);
-                }
-                malloc_errfd = i;
-            }
-            
-            break;
-
-        default:
-            return(1);
-    }
-
-    return(0);
-}
-
diff --git a/dmake/dbug/malloc/memory.c b/dmake/dbug/malloc/memory.c
deleted file mode 100644
index ab63cf52b..000000000
--- a/dmake/dbug/malloc/memory.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-
-#ifndef lint
-static
-char rcs_hdr[] = "$Id: memory.c,v 1.2 2006-07-25 10:09:19 rt Exp $";
-#endif
-
-void malloc_check_data();
-
-char *
-memccpy(ptr1, ptr2, ch, len)
-    register char	* ptr1;
-    register char	* ptr2;
-    int		  len;
-    int		  ch;
-{
-    int		  check;
-    register int	  i;
-    char		* rtn;
-
-    /*
-     * I know that the assignment could be done in the following, but
-     * I wanted to perform a check before any assignment, so first I 
-     * determine the length, check the pointers and then do the assignment.
-     */
-    for( i=0; (i < len) && (ptr2[i] != ch); i++)
-    {
-    }
-    if( ptr2[i] == ch )
-    {
-        check = i+1;
-    }
-    else
-    {
-        check = len;
-    }
-
-    malloc_check_data("memccpy", ptr1, check);
-    malloc_check_data("memccpy", ptr2, check);
-
-    /*
-     * if we found the character...
-      */
-
-    if( i < len )
-    {
-        rtn = ptr1+i+1;
-        i++;
-    }
-    else
-    {
-        rtn = (char *) 0;
-    }
-
-     while( i-- )
-    {
-        *(ptr1++) = *(ptr2++);
-    }
-    
-    return(rtn);
-}
-
-char *
-memchr(ptr1,ch,len)
-    register char	* ptr1;
-    register int	  ch;
-    int		  len;
-{
-    int		  i;
-
-    for( i=0; (i < len) && (ptr1[i] != (char) ch); i++)
-    {
-    }
-
-    malloc_check_data("memchr", ptr1, i);
-
-    if( i < len )
-    {
-        return( ptr1+i );
-    }
-    else
-    {
-        return( (char *) 0);	
-    }
-}
-
-char *
-memcpy(ptr1, ptr2, len)
-    register char	* ptr1;
-    register char	* ptr2;
-    register int	  len;
-{
-    char		* rtn = ptr1;
-
-    malloc_check_data("memcpy", ptr1, len);
-    malloc_check_data("memcpy", ptr2, len);
-
-    /*
-     * while the normal memcpy does not guarrantee that it will 
-     * handle overlapping memory correctly, we will try...
-     */
-    if( ptr1 > ptr2  && ptr1 < (ptr2+len))
-    {
-        ptr1 += (len-1);
-        ptr2 += (len-1);
-        while( len-- > 0 )
-        {
-            *(ptr1--) = *(ptr2--);
-        }
-    }
-    else
-    {
-        while( len-- > 0 )
-        {
-            *(ptr1++) = *(ptr2++);
-        }
-    }
-    
-    return(rtn);
-}
-
-int
-memcmp(ptr1, ptr2, len)
-    register char	* ptr1;
-    register char	* ptr2;
-    register int	  len;
-{
-    malloc_check_data("memcpy", ptr1, len);
-    malloc_check_data("memcpy", ptr2, len);
-
-    while( --len >= 0  && (*ptr1 == *ptr2) )
-    {
-        ptr1++;
-        ptr2++;
-    }
-
-    /* 
-     * If stopped by len, return zero
-     */
-    if( len < 0 )
-    {
-        return(0);
-    }
-
-    return( *ptr1 - *ptr2 );
-}
-
-char * 
-memset(ptr1, ch, len)
-    register char	* ptr1;
-    register int	  ch;
-    register int	  len;
-{
-    char		* rtn = ptr1;
-
-    malloc_check_data("memcpy", ptr1, len);
-
-    while( len-- )
-    {
-        *(ptr1++) = ch;
-    }
-
-    return(rtn);
-}
-
-char *
-bcopy(ptr2,ptr1,len)
-    char		* ptr2;
-    char		* ptr1;
-    int		  len;
-{
-    return(memcpy(ptr1,ptr2,len));
-}
-
-char *
-bzero(ptr1,len)
-    char		* ptr1;
-    int		  len;
-{
-    return(memset(ptr1,'\0',len));
-}
-
-int
-bcmp(ptr2, ptr1, len)
-    char		* ptr1;
-    char		* ptr2;
-    int		  len;
-{
-    return( memcmp(ptr1,ptr2,len) );
-}
-
diff --git a/dmake/dbug/malloc/mlc_chk.c b/dmake/dbug/malloc/mlc_chk.c
deleted file mode 100644
index 40690580c..000000000
--- a/dmake/dbug/malloc/mlc_chk.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-
-#include <stdio.h>
-#include "malloc.h"
-#include "debug.h"
-
-#ifndef lint
-static
-char rcs_hdr[] = "$Id: mlc_chk.c,v 1.2 2006-07-25 10:09:34 rt Exp $";
-#endif
-
-extern struct mlist	  malloc_start;
-extern struct mlist	* malloc_end;
-extern char		* malloc_data_start;
-extern char		* malloc_data_end;
-
-/*
- * Function:	malloc_in_arena()
- *
- * Purpose:	to verify address is within malloc arena.
- *
- * Arguments:	ptr	- pointer to verify
- *
- * Returns:	TRUE	- if pointer is within malloc area
- *		FALSE	- otherwise
- *
- * Narrative:
- *   IF pointer is >= malloc area start AND <= malloc area end
- *      return TRUE
- *   ELSE
- *      return FALSE
- *
- * Mod History:	
- *   90/01/24	cpcahil		Initial revision.
- */
-int
-malloc_in_arena(ptr)
-    char	* ptr;
-{
-    extern char	* malloc_data_start;
-    extern char	* malloc_data_end;
-    int		  rtn = 0;
-
-    if( ptr >= malloc_data_start && ptr <= malloc_data_end )
-    {
-        rtn = 1;
-    }
-    
-    return(rtn);
-}
-
-/*
- * Function:	malloc_check_str()
- *
- * Arguments:	func	- name of function calling this routine
- *		str	- pointer to area to check
- *
- * Purpose:	to verify that if str is within the malloc arena, the data 
- *		it points to does not extend beyond the applicable region.
- *
- * Returns:	Nothing of any use (function is void).
- *
- * Narrative:
- *   IF pointer is within malloc arena
- *      determin length of string
- *      call malloc_verify() to verify data is withing applicable region
- *   return 
- *
- * Mod History:	
- *   90/01/24	cpcahil		Initial revision.
- *   90/01/29	cpcahil		Added code to ignore recursive calls.
- */
-void
-malloc_check_str(func,str)
-    char		* func;
-    char		* str;
-{
-    static int	  layers;
-    register char	* s;
-
-    if( (layers++ == 0) &&  malloc_in_arena(str) )
-    {
-        for( s=str; *s; s++)
-        {
-        }
-        
-        malloc_verify(func,str,s-str+1);
-    }
-
-    layers--;
-}
-
-/*
- * Function:	malloc_check_strn()
- *
- * Arguments:	func	- name of function calling this routine
- *		str	- pointer to area to check
- * 		len     - max length of string
- *
- * Purpose:	to verify that if str is within the malloc arena, the data 
- *		it points to does not extend beyond the applicable region.
- *
- * Returns:	Nothing of any use (function is void).
- *
- * Narrative:
- *   IF pointer is within malloc arena
- *      determin length of string
- *      call malloc_verify() to verify data is withing applicable region
- *   return 
- *
- * Mod History:	
- *   90/01/24	cpcahil		Initial revision.
- *   90/01/29	cpcahil		Added code to ignore recursive calls.
- *   90/08/29	cpcahil		added length (for strn* functions)
- */
-void
-malloc_check_strn(func,str,len)
-    char		* func;
-    char		* str;
-    int		  len;
-{
-    register int	  i;
-    static int	  layers;
-    register char	* s;
-
-    if( (layers++ == 0) &&  malloc_in_arena(str) )
-    {
-        for( s=str,i=0; (i < len) && *s; s++)
-        {
-        }
-        
-        malloc_verify(func,str,s-str+1);
-    }
-
-    layers--;
-}
-
-/*
- * Function:	malloc_check_data()
- *
- * Arguments:	func	- name of function calling this routine
- *		ptr	- pointer to area to check
- *		len 	- length to verify
- *
- * Purpose:	to verify that if ptr is within the malloc arena, the data 
- *		it points to does not extend beyond the applicable region.
- *
- * Returns:	Nothing of any use (function is void).
- *
- * Narrative:
- *   IF pointer is within malloc arena
- *      call malloc_verify() to verify data is withing applicable region
- *   return 
- *
- * Mod History:	
- *   90/01/24	cpcahil		Initial revision.
- *   90/01/29	cpcahil		Added code to ignore recursive calls.
- */
-void
-malloc_check_data(func,ptr,len)
-    char		* func;
-    char		* ptr;
-    int		  len;
-{
-    static int	  layers;
-
-    if( layers++ == 0 )
-    {
-        DEBUG3(40,"malloc_check_data(%s,0x%x,%d) called...",
-            func,ptr,len);
-        if( malloc_in_arena(ptr) )
-        {
-            DEBUG0(10,"pointer in malloc arena, verifying...");
-            malloc_verify(func,ptr,len);
-        }
-    }
-
-    layers--;
-}
-
-/*
- * Function:	malloc_verify()
- *
- * Arguments:	func	- name of function calling the malloc check routines
- *		ptr	- pointer to area to check
- *		len 	- length to verify
- *
- * Purpose:	to verify that the data ptr points to does not extend beyond
- *		the applicable malloc region.  This function is only called 
- *		if it has been determined that ptr points into the malloc arena.
- *
- * Returns:	Nothing of any use (function is void).
- *
- * Narrative:
- *
- * Mod History:	
- *   90/01/24	cpcahil		Initial revision.
- */
-void
-malloc_verify(func,ptr,len)
-    char		* func;
-    char		* ptr;
-    int		  len;
-{
-    extern struct mlist	* malloc_end;
-    extern int		  malloc_errno;
-    extern struct mlist 	  malloc_start;
-    struct mlist		* mptr;
-    
-    DEBUG3(40,"malloc_verify(%s,0x%x,%d) called...", func,ptr,len);
-    /*
-     * Find the malloc block that includes this pointer
-     */
-    mptr = &malloc_start;
-    while( mptr && 
-        ! (((char *)mptr < ptr) && ((mptr->data+mptr->s.size) > ptr) ) )
-    {
-        mptr = mptr->next;
-    }
-
-    /*
-     * if ptr was not in a malloc block, it must be part of
-     *    some direct sbrk() stuff, so just return.
-     */
-    if( ! mptr )
-    {
-        DEBUG1(10,"ptr (0x%x) not found in malloc search", ptr);
-        return;
-    }
-    
-    /*
-      * Now we have a valid malloc block that contains the indicated
-     * pointer.  We must verify that it is withing the requested block
-     * size (as opposed to the real block size which is rounded up to
-     * allow for correct alignment).
-     */
-
-    DEBUG4(60,"Checking  0x%x-0x%x, 0x%x-0x%x",
-            ptr, ptr+len, mptr->data, mptr->data+mptr->r_size);
-    
-    if( (ptr < mptr->data) || ((ptr+len) > (mptr->data+mptr->r_size)) )
-    {
-        DEBUG4(0,"pointer not within region 0x%x-0x%x, 0x%x-0x%x",
-            ptr, ptr+len, mptr->data, mptr->data+mptr->r_size);
-
-        malloc_errno = M_CODE_OUTOF_BOUNDS;
-        malloc_warning(func);
-    }
-
-    return;
-}
-
diff --git a/dmake/dbug/malloc/mlc_chn.c b/dmake/dbug/malloc/mlc_chn.c
deleted file mode 100644
index a25d906b8..000000000
--- a/dmake/dbug/malloc/mlc_chn.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-#include <stdio.h>
-#include <fcntl.h>
-#include "malloc.h"
-
-/*
- * Function:	malloc_chain_check()
- *
- * Purpose:	to verify malloc chain is intact
- *
- * Arguments:	todo	- 0 - just check and return status
- *			  1 - call malloc_warn if error detected
- *
- * Returns:	0	- malloc chain intact & no overflows
- *		other	- problems detected in malloc chain
- *
- * Narrative:
- *
- * Notes:	If todo is non-zero the malloc_warn function, when called
- *		may not return (i.e. it may exit)
- *
- */
-#ifndef lint
-static
-char rcs_hdr[] = "$Id: mlc_chn.c,v 1.1.1.1 2000-09-22 15:33:26 hr Exp $";
-#endif
-
-
-int
-malloc_chain_check(todo)
-    int		  todo;
-{
-    char			* func = "malloc_chain_check";
-    int			  i;
-    extern char		* malloc_data_start;
-    extern char		* malloc_data_end;
-    extern struct mlist 	* malloc_end;
-    extern int		  malloc_errno;
-    extern struct mlist	  malloc_start;
-    struct mlist		* oldptr;
-    struct mlist		* ptr;
-    int			  rtn = 0;
-
-    oldptr = &malloc_start;
-    for(ptr = malloc_start.next; ; ptr = ptr->next)
-    {
-        /*
-         * Since the malloc chain is a forward only chain, any
-         * pointer that we get should always be positioned in 
-         * memory following the previous pointer.  If this is not
-         * so, we must have a corrupted chain.
-         */
-        if( ptr )
-        {
-            if(ptr < oldptr )
-            {
-                malloc_errno = M_CODE_CHAIN_BROKE;
-                if( todo )
-                {
-                    malloc_fatal(func);
-                }
-                rtn++;
-                break;
-            }
-            oldptr = ptr;
-        }
-        else
-        {
-            if( oldptr != malloc_end )
-            {
-                /*
-                 * This should never happen.  If it does, then
-                 * we got a real problem.
-                 */
-                malloc_errno = M_CODE_NO_END;
-                if( todo )
-                {
-                    malloc_fatal(func);
-                }
-                rtn++;
-            }
-            break;
-        }
-        
-        /*
-         * verify that ptr is within the malloc region...
-         * since we started within the malloc chain this should never
-         * happen.
-         */
-
-        if( ((char *)ptr < malloc_data_start) ||
-            ((char *)ptr > malloc_data_end) )
-        {
-            malloc_errno = M_CODE_BAD_PTR;
-            if( todo )
-            {
-                malloc_fatal(func);
-            }
-            rtn++;
-            break;
-        }
-
-        /* 
-         * verify magic flag is set
-         */
-        
-        if( (ptr->flag&M_MAGIC) != M_MAGIC )
-        {
-            malloc_errno = M_CODE_BAD_MAGIC;
-            if( todo )
-            {
-                malloc_warning(func);
-            }
-            rtn++;
-            continue;
-        }
-
-        /* 
-         * verify segments are correctly linked together
-         */
-        
-        if( (ptr->prev && (ptr->prev->next != ptr) ) ||
-            (ptr->next && (ptr->next->prev != ptr) ) ||
-            ((ptr->next == NULL) && (ptr->prev == NULL)) )
-        {
-            malloc_errno = M_CODE_BAD_CONNECT;
-            if( todo )
-            {
-                malloc_warning(func);
-            }
-            rtn++;
-            continue;
-        }
-
-        /*
-         * If this segment is allocated
-         */
-
-        if( (ptr->flag & M_INUSE) != 0 )
-        {
-            /*
-             * verify no overflow of data area
-             */
-
-            for(i=ptr->r_size; i < ptr->s.size; i++)
-            {
-                if( ptr->data[i] != M_FILL )
-                {
-                    malloc_errno = M_CODE_OVERRUN;
-                    if( todo )
-                    {
-                        malloc_warning(func);
-                    }
-                    rtn++;
-                    break;
-                }
-            }
-        }
-        else /* it's not allocated so */
-        {
-            /*
-             * verify no reuse of freed data blocks
-             */
-
-            for(i=0; i < ptr->s.size; i++)
-            {
-                if( ptr->data[i] != M_FREE_FILL )
-                {
-                    malloc_errno = M_CODE_REUSE;
-                    if( todo )
-                    {
-                        malloc_warning(func);
-                    }
-                    rtn++;
-                    break;
-                }
-            }
-        }
-
-    } /* for(... */
-
-    return(rtn);
-
-} /* malloc_chain_check(... */
diff --git a/dmake/dbug/malloc/patchlev b/dmake/dbug/malloc/patchlev
deleted file mode 100644
index 00750edc0..000000000
--- a/dmake/dbug/malloc/patchlev
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/dmake/dbug/malloc/realloc.c b/dmake/dbug/malloc/realloc.c
deleted file mode 100644
index d9175aa22..000000000
--- a/dmake/dbug/malloc/realloc.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-#include <stdio.h>
-#include "malloc.h"
-
-/*
- * Function:	realloc()
- *
- * Purpose:	to re-allocate a data area.
- *
- * Arguments:	cptr	- pointer to area to reallocate
- *		size	- size to change area to
- *
- * Returns:	pointer to new area (may be same area)
- *
- * Narrative:	verify pointer is within malloc region
- *		obtain mlist pointer from cptr
- *		verify magic number is correct
- *		verify inuse flag is set
- *		verify connection to adjoining segments is correct
- *		save requested size
- *		round-up size to appropriate boundry
- *		IF size is bigger than what is in this segment
- *		    try to join next segment to this segment
- *		IF size is less than what is is this segment
- *		    determine leftover amount of space
- *		ELSE
- *		    allocate new segment of size bites
- *		    IF allocation failed
- *		        return NULL
- *		    copy previous data to new segment
- *		    free previous segment
- *		    return new pointer
- *		split of extra space in this segment (if any)
- *		clear bytes beyound what they had before
- *		return pointer to data 
- */
-#ifndef lint
-static
-char rcs_hdr[] = "$Id: realloc.c,v 1.2 2006-07-25 10:09:48 rt Exp $";
-#endif
-
-char *
-realloc(cptr,size)
-    char			* cptr;
-    unsigned int		  size;
-{
-    void			  free();
-    char			* func = "realloc";
-    int			  i;
-    char			* malloc();
-    extern int		  malloc_checking;
-    extern struct mlist 	* malloc_end;
-    extern int		  malloc_errno;
-    extern char		* malloc_data_end;
-    extern char		* malloc_data_start;
-    void			  malloc_join();
-    void			  malloc_memset();
-    void			  malloc_split();
-    char			* memcpy();
-    char			* new_cptr;
-    struct mlist		* ptr;
-    int			  r_size;
-
-    /*
-     * IF malloc chain checking is on, go do it.
-     */
-    if( malloc_checking )
-    {
-        (void) malloc_chain_check(1);
-    }
-
-    /*
-     * verify that cptr is within the malloc region...
-     */
-    if( cptr < malloc_data_start || cptr > malloc_data_end )
-    {
-        malloc_errno = M_CODE_BAD_PTR;
-        malloc_warning(func);
-        return (NULL);
-    }
-
-    /* 
-     * convert pointer to mlist struct pointer.  To do this we must 
-     * move the pointer backwards the correct number of bytes...
-     */
-    
-    ptr = (struct mlist *) (cptr - M_SIZE);
-    
-    if( (ptr->flag&M_MAGIC) != M_MAGIC )
-    {
-        malloc_errno = M_CODE_BAD_MAGIC;
-        malloc_warning(func);
-        return(NULL);
-    }
-
-    if( ! (ptr->flag & M_INUSE) )
-    {
-        malloc_errno = M_CODE_NOT_INUSE ;
-        malloc_warning(func);
-        return(NULL);
-    }
-
-     if( (ptr->prev && (ptr->prev->next != ptr) ) ||
-        (ptr->next && (ptr->next->prev != ptr) ) ||
-        ((ptr->next == NULL) && (ptr->prev == NULL)) )
-    {
-        malloc_errno = M_CODE_BAD_CONNECT;
-        malloc_warning(func);
-        return(NULL);
-    }
-
-    r_size = ++size;
-
-    M_ROUNDUP(size);
-
-    if( size > ptr->s.size )
-    {
-        malloc_join(ptr,ptr->next,1,1);
-    }
-
-    if( size > ptr->s.size )
-    {
-        /*
-         * else we can't combine it, so lets allocate a new chunk,
-         * copy the data and free the old chunk...
-         */
-        new_cptr = malloc(size);
-
-        if( new_cptr == (char *) 0)
-        {
-            return(new_cptr);
-        }
-
-        if( r_size < ptr->r_size )
-        {
-            i = r_size;
-        }
-        else
-        {
-            i = ptr->r_size;
-        }
-        (void)memcpy(new_cptr,ptr->data,i);
-        free(cptr);
-        return(new_cptr);
-
-    } /* else... */
-
-    /*
-     * save amount of real data in new segment (this will be used in the
-     * memset later) and then save requested size of this segment.
-     */
-
-    if( ptr->r_size < r_size )
-    {
-        i = ptr->r_size;
-    }
-    else
-    {
-        i = r_size;
-    }
-
-    ptr->r_size = r_size;
-
-    /*
-     * split off extra free space at end of this segment, if possible...
-     */
-
-    malloc_split(ptr);
-
-    malloc_memset( ptr->data+i, M_FILL, (int) (ptr->s.size - i));
-        
-    return(ptr->data);
-
-} /* realloc(... */
-
-
diff --git a/dmake/dbug/malloc/string.c b/dmake/dbug/malloc/string.c
deleted file mode 100644
index 84b42ed62..000000000
--- a/dmake/dbug/malloc/string.c
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include "malloc.h"
-
-#ifndef lint
-static
-char rcs_hdr[] = "$Id: string.c,v 1.2 2006-07-25 10:10:03 rt Exp $";
-#endif
-
-int	malloc_checking = 0;
-
-char *
-strcat(str1,str2)
-    register char	* str1;
-    register char	* str2;
-{
-    char		* rtn;
-    int	  len;
-
-    /* 
-     * check pointers agains malloc region.  The malloc* functions
-     * will properly handle the case where a pointer does not
-     * point into malloc space.
-     */
-    malloc_checking = 1;
-
-    len = strlen(str2);
-    malloc_check_str("strcat", str2);
-
-    len += strlen(str1) + 1;
-    malloc_checking = 0;
-
-    malloc_check_data("strcat", str1, len);
-
-    rtn = str1;
-
-    while( *str1 )
-    {
-        str1++;
-    }
-    
-    while( (*str1 = *str2) != '\0' )
-    {
-        str1++;
-        str2++;
-    }
-    
-    return(rtn);
-}
-
-char *
-strdup(str1)
-    register char	* str1;
-{
-    char		* malloc();
-    char		* rtn;
-    register char	* str2;
-
-    malloc_check_str("strdup", str1);
-
-    rtn = str2 = malloc((unsigned)strlen(str1)+1);
-
-    if( rtn != (char *) 0)
-    {
-        while( (*str2 = *str1) != '\0' )
-        {
-            str1++;
-            str2++;
-        }
-    }
-
-    return(rtn);
-}
-
-char *
-strncat(str1,str2,len)
-    register char	* str1;
-    register char	* str2;
-    register int	  len;
-{
-    int 		  len1;
-    int 		  len2;
-    char		* rtn;
-
-    malloc_check_strn("strncat", str2, len);
-
-    malloc_checking = 1;
-
-    len2 = strlen(str2) + 1;
-    len1 = strlen(str1);
-
-    malloc_checking = 0;
-
-
-    if( (len+1) < len2 )
-    {
-        len1 += len + 1;
-    }
-    else
-    {
-        len1 += len2;
-    }
-    malloc_check_data("strncat", str1, len1);
-
-    rtn = str1;
-
-    while( *str1 )
-    {
-        str1++;
-    }
-
-    while( len-- && ((*str1++ = *str2++) != '\0') )
-    {
-    }
-    
-    if( ! len )
-    {
-        *str1 = '\0';
-    }
-
-    return(rtn);
-}
-
-int
-strcmp(str1,str2)
-    register char	* str1;
-    register char	* str2;
-{
-    malloc_check_str("strcmp", str1);
-    malloc_check_str("strcmp", str2);
-
-    while( *str1 && (*str1 == *str2) )
-    {
-        str1++;
-        str2++;
-    }
-
-
-    /*
-     * in order to deal with the case of a negative last char of either
-     * string when the other string has a null
-     */
-    if( (*str2 == '\0') && (*str1 == '\0') )
-    {
-        return(0);
-    }
-    else if( *str2 == '\0' )
-    {
-        return(1);
-    }
-    else if( *str1 == '\0' )
-    {
-        return(-1);
-    }
-    
-    return( *str1 - *str2 );
-}
-
-int
-strncmp(str1,str2,len)
-    register char	* str1;
-    register char	* str2;
-    register int	  len;
-{
-    malloc_check_strn("strncmp", str1, len);
-    malloc_check_strn("strncmp", str2, len);
-
-    while( --len >= 0 && *str1 && (*str1 == *str2) )
-    {
-        str1++;
-        str2++;
-    }
-
-    if( len < 0 )
-    {
-        return(0);
-    }
-    /*
-     * in order to deal with the case of a negative last char of either
-     * string when the other string has a null
-     */
-    if( (*str2 == '\0') && (*str1 == '\0') )
-    {
-        return(0);
-    }
-    else if( *str2 == '\0' )
-    {
-        return(1);
-    }
-    else if( *str1 == '\0' )
-    {
-        return(-1);
-    }
-    
-    return( *str1 - *str2 );
-}
-
-char *
-strcpy(str1,str2)
-    register char	* str1;
-    register char	* str2;
-{
-    char		* rtn;
-    int		  len;
-
-    malloc_checking = 1;
-    len = strlen(str2) + 1;
-    malloc_checking = 0;
-
-    malloc_check_data("strcpy", str1, len);
-    malloc_check_data("strcpy", str2, len);
-
-    rtn = str1;
-
-    while( (*str1++ = *str2++) != '\0')
-    {
-    }
-
-    return(rtn);
-}
-
-char *
-strncpy(str1,str2,len)
-    register char	* str1;
-    register char	* str2;
-    register int	  len;
-{
-    extern int	  malloc_checking;
-    char		* rtn;
-
-    malloc_check_data("strncpy", str1, len);
-    malloc_check_strn("strncpy", str2, len);
-
-    rtn = str1;
-
-    while((len-- > 0) && (*str1++ = *str2++) != '\0')
-    {
-    }
-    while( (len-- > 0) )
-    {
-        *str1++ = '\0';
-    }
-
-    return(rtn);
-}
-
-int
-strlen(str1)
-    register char	* str1;
-{
-    register char	* s;
-
-    if(! malloc_checking )
-    {
-        malloc_check_str("strlen", str1);
-    }
-
-    for( s = str1; *s; s++)
-    {
-    }
-
-    return( s - str1 );
-}
-
-char *
-strchr(str1,c)
-    register char	* str1;
-    register int	  c;
-{
-    malloc_check_str("strchr", str1);
-
-    while( *str1 && (*str1 != (char) c) )
-    {
-        str1++;
-    }
-
-    if(*str1 != (char) c)
-    {
-        str1 = (char *) 0;
-    }
-
-    return(str1);
-}
-
-char *
-strrchr(str1,c)
-    register char	* str1;
-    register int	  c;
-{
-    register char	* rtn = (char *) 0;
-
-    malloc_check_str("strrchr", str1);
-
-    while( *str1 )
-    {
-        if(*str1 == (char) c )
-        {
-            rtn = str1;
-        }
-        str1++;
-    }
-
-    if( *str1 == (char) c)
-    {
-        rtn = str1;
-    }
-
-    return(rtn);
-}
-
-char *
-index(str1,c)
-    char		* str1;
-    char		  c;
-{
-    return( strchr(str1,c) );
-}
-
-char *
-rindex(str1,c)
-    char		* str1;
-    char		  c;
-{
-    return( strrchr(str1,c) );
-}
-
-char *
-strpbrk(str1,str2)
-    register char	* str1;
-    register char	* str2;
-{
-    register char	* tmp;
-
-    malloc_check_str("strpbrk", str1);
-    malloc_check_str("strpbrk", str2);
-
-    while(*str1)
-    {
-        for( tmp=str2; *tmp && *tmp != *str1; tmp++)
-        {
-        }
-        if( *tmp )
-        {
-            break;
-        }
-        str1++;
-    }
-
-    if( ! *str1 )
-    {
-        str1 = (char *) 0;
-    }
-
-    return(str1);
-}
-
-int
-strspn(str1,str2)
-    register char	* str1;
-    register char	* str2;
-{
-    register char	* tmp;
-    char		* orig = str1;
-
-    malloc_check_str("strspn", str1);
-    malloc_check_str("strspn", str2);
-
-    while(*str1)
-    {
-        for( tmp=str2; *tmp && *tmp != *str1; tmp++)
-        {
-        }
-        if(! *tmp )
-        {
-            break;
-        }
-        str1++;
-    }
-
-    return( (int) (str1 - orig) );
-}
-
-int
-strcspn(str1,str2)
-    register char	* str1;
-    register char	* str2;
-{
-    register char	* tmp;
-    char		* orig = str1;
-
-    malloc_check_str("strcspn", str1);
-    malloc_check_str("strcspn", str2);
-
-    while(*str1)
-    {
-        for( tmp=str2; *tmp && *tmp != *str1; tmp++)
-        {
-        }
-        if( *tmp )
-        {
-            break;
-        }
-        str1++;
-    }
-
-    return( (int) (str1 - orig) );
-}
-
-/*
- * strtok() source taken from that posted to comp.lang.c by Chris Torek
- * in Jan 1990.
- */
-
-/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
- * Get next token from string s (NULL on 2nd, 3rd, etc. calls),
- * where tokens are nonempty strings separated by runs of
- * chars from delim.  Writes NULs into s to end tokens.  delim need not
- * remain constant from call to call.
- *
- * Modified by cpc: 	changed variable names to conform with naming
- *			conventions used in rest of code.  Added malloc pointer
- *			check calls.
- */
-char *
-strtok(str1, str2)
-    char 	* str1;
-    char	* str2;
-{
-    static char 	* last;
-    char		* strtoken();
-
-    if( str1 )
-    {
-        malloc_check_str("strtok", str1);
-        last = str1;
-    }
-    malloc_check_str("strtok", str2);
-
-    return (strtoken(&last, str2, 1));
-}
-
-
-/*
- * Get next token from string *stringp, where tokens are (possibly empty)
- * strings separated by characters from delim.  Tokens are separated
- * by exactly one delimiter iff the skip parameter is false; otherwise
- * they are separated by runs of characters from delim, because we
- * skip over any initial `delim' characters.
- *
- * Writes NULs into the string at *stringp to end tokens.
- * delim will usually, but need not, remain constant from call to call.
- * On return, *stringp points past the last NUL written (if there might
- * be further tokens), or is NULL (if there are definitely no more tokens).
- *
- * If *stringp is NULL, strtoken returns NULL.
- */
-char *
-strtoken(stringp, delim, skip)
-    register char **stringp;
-    register char *delim;
-    int skip;
-{
-    register char *s;
-    register char *spanp;
-    register int c, sc;
-    char *tok;
-
-    if ((s = *stringp) == NULL)
-        return (NULL);
-
-    if (skip) {
-        /*
-         * Skip (span) leading delimiters (s += strspn(s, delim)).
-         */
-    cont:
-        c = *s;
-        for (spanp = delim; (sc = *spanp++) != 0;) {
-            if (c == sc) {
-                s++;
-                goto cont;
-            }
-        }
-        if (c == 0) {		/* no token found */
-            *stringp = NULL;
-            return (NULL);
-        }
-    }
-
-    /*
-     * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
-     * Note that delim must have one NUL; we stop if we see that, too.
-     */
-    for (tok = s;;) {
-        c = *s++;
-        spanp = delim;
-        do {
-            if ((sc = *spanp++) == c) {
-                if (c == 0)
-                    s = NULL;
-                else
-                    s[-1] = 0;
-                *stringp = s;
-                return (tok);
-            }
-        } while (sc != 0);
-    }
-    /* NOTREACHED */
-}
-
diff --git a/dmake/dbug/malloc/testmem.c b/dmake/dbug/malloc/testmem.c
deleted file mode 100644
index de5492412..000000000
--- a/dmake/dbug/malloc/testmem.c
+++ /dev/null
@@ -1,618 +0,0 @@
-/* 
- * This stuff is all stolen (with permission, since it was in the public
- * domain) from Henry Spencer's string and memory library.  Thanks Henry.
- */
-
-/*
- * Test program for string(3) routines.
- * 
- * Note that at least one Bell Labs implementation of the string
- * routines flunks a couple of these tests -- the ones which test
- * behavior on "negative" characters.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-char * index();
-char * rindex();
-
-#define	STREQ(a, b)	(strcmp((a), (b)) == 0)
-
-char *it = "<UNSET>";		/* Routine name for message routines. */
-int waserror = 0;		/* For exit status. */
-
-char uctest[] = "\004\203";	/* For testing signedness of chars. */
-int charsigned;			/* Result. */
-
-/*
- - check - complain if condition is not true
- */
-void
-check(thing, number)
-int thing;
-int number;			/* Test number for error message. */
-{
-    if (!thing) {
-        printf("%s flunked test %d\n", it, number);
-        waserror = 1;
-    }
-}
-
-/*
- - equal - complain if first two args don't strcmp as equal
- */
-void
-equal(a, b, number)
-char *a;
-char *b;
-int number;			/* Test number for error message. */
-{
-    check(a != NULL && b != NULL && STREQ(a, b), number);
-}
-
-char one[50];
-char two[50];
-
-#ifdef UNIXERR
-#define ERR 1
-#endif
-#ifdef BERKERR
-#define ERR 1
-#endif
-#ifdef ERR
-int f;
-extern char *sys_errlist[];
-extern int sys_nerr;
-extern int errno;
-#endif
-
-/* ARGSUSED */
-main(argc, argv)
-int argc;
-char *argv[];
-{
-    /*
-     * First, establish whether chars are signed.
-     */
-    if (uctest[0] < uctest[1])
-        charsigned = 0;
-    else
-        charsigned = 1;
-
-    /*
-     * Then, do the rest of the work.  Split into two functions because
-     * some compilers get unhappy about a single immense function.
-     */
-    first();
-    second();
-
-    exit((waserror) ? 1 : 0);
-}
-
-first()
-{
-    /*
-     * Test strcmp first because we use it to test other things.
-     */
-    it = "strcmp";
-    check(strcmp("", "") == 0, 1);		/* Trivial case. */
-    check(strcmp("a", "a") == 0, 2);	/* Identity. */
-    check(strcmp("abc", "abc") == 0, 3);	/* Multicharacter. */
-    check(strcmp("abc", "abcd") < 0, 4);	/* Length mismatches. */
-    check(strcmp("abcd", "abc") > 0, 5);
-    check(strcmp("abcd", "abce") < 0, 6);	/* Honest miscompares. */
-    check(strcmp("abce", "abcd") > 0, 7);
-    check(strcmp("a\203", "a") > 0, 8);	/* Tricky if char signed. */
-    if (charsigned)				/* Sign-bit comparison. */
-        check(strcmp("a\203", "a\003") < 0, 9);
-    else
-        check(strcmp("a\203", "a\003") > 0, 9);
-    check(strcmp("a", "a\203") < 0, 10);	/* Tricky if char signed. */
-
-    /*
-     * Test strcpy next because we need it to set up other tests.
-     */
-    it = "strcpy";
-    check(strcpy(one, "abcd") == one, 1);	/* Returned value. */
-    equal(one, "abcd", 2);			/* Basic test. */
-
-    (void) strcpy(one, "x");
-    equal(one, "x", 3);			/* Writeover. */
-    equal(one+2, "cd", 4);			/* Wrote too much? */
-
-    (void) strcpy(two, "hi there");
-    (void) strcpy(one, two);
-    equal(one, "hi there", 5);		/* Basic test encore. */
-    equal(two, "hi there", 6);		/* Stomped on source? */
-
-    (void) strcpy(one, "");
-    equal(one, "", 7);			/* Boundary condition. */
-
-    /*
-     * strcat
-     */
-    it = "strcat";
-    (void) strcpy(one, "ijk");
-    check(strcat(one, "lmn") == one, 1);	/* Returned value. */
-    equal(one, "ijklmn", 2);		/* Basic test. */
-
-    (void) strcpy(one, "x");
-    (void) strcat(one, "yz");
-    equal(one, "xyz", 3);			/* Writeover. */
-    equal(one+4, "mn", 4);			/* Wrote too much? */
-
-    (void) strcpy(one, "gh");
-    (void) strcpy(two, "ef");
-    (void) strcat(one, two);
-    equal(one, "ghef", 5);			/* Basic test encore. */
-    equal(two, "ef", 6);			/* Stomped on source? */
-
-    (void) strcpy(one, "");
-    (void) strcat(one, "");
-    equal(one, "", 7);			/* Boundary conditions. */
-    (void) strcpy(one, "ab");
-    (void) strcat(one, "");
-    equal(one, "ab", 8);
-    (void) strcpy(one, "");
-    (void) strcat(one, "cd");
-    equal(one, "cd", 9);
-
-    /*
-     * strncat - first test it as strcat, with big counts, then
-     * test the count mechanism.
-     */
-    it = "strncat";
-    (void) strcpy(one, "ijk");
-    check(strncat(one, "lmn", 99) == one, 1);	/* Returned value. */
-    equal(one, "ijklmn", 2);		/* Basic test. */
-
-    (void) strcpy(one, "x");
-    (void) strncat(one, "yz", 99);
-    equal(one, "xyz", 3);			/* Writeover. */
-    equal(one+4, "mn", 4);			/* Wrote too much? */
-
-    (void) strcpy(one, "gh");
-    (void) strcpy(two, "ef");
-    (void) strncat(one, two, 99);
-    equal(one, "ghef", 5);			/* Basic test encore. */
-    equal(two, "ef", 6);			/* Stomped on source? */
-
-    (void) strcpy(one, "");
-    (void) strncat(one, "", 99);
-    equal(one, "", 7);			/* Boundary conditions. */
-    (void) strcpy(one, "ab");
-    (void) strncat(one, "", 99);
-    equal(one, "ab", 8);
-    (void) strcpy(one, "");
-    (void) strncat(one, "cd", 99);
-    equal(one, "cd", 9);
-
-    (void) strcpy(one, "ab");
-    (void) strncat(one, "cdef", 2);
-    equal(one, "abcd", 10);			/* Count-limited. */
-
-    (void) strncat(one, "gh", 0);
-    equal(one, "abcd", 11);			/* Zero count. */
-
-    (void) strncat(one, "gh", 2);
-    equal(one, "abcdgh", 12);		/* Count and length equal. */
-
-    /*
-     * strncmp - first test as strcmp with big counts, then test
-     * count code.
-     */
-    it = "strncmp";
-    check(strncmp("", "", 99) == 0, 1);	/* Trivial case. */
-    check(strncmp("a", "a", 99) == 0, 2);	/* Identity. */
-    check(strncmp("abc", "abc", 99) == 0, 3);	/* Multicharacter. */
-    check(strncmp("abc", "abcd", 99) < 0, 4);	/* Length unequal. */
-    check(strncmp("abcd", "abc", 99) > 0, 5);
-    check(strncmp("abcd", "abce", 99) < 0, 6);	/* Honestly unequal. */
-    check(strncmp("abce", "abcd", 99) > 0, 7);
-    check(strncmp("a\203", "a", 2) > 0, 8);	/* Tricky if '\203' < 0 */
-    if (charsigned)				/* Sign-bit comparison. */
-        check(strncmp("a\203", "a\003", 2) < 0, 9);
-    else
-        check(strncmp("a\203", "a\003", 2) > 0, 9);
-    check(strncmp("abce", "abcd", 3) == 0, 10);	/* Count limited. */
-    check(strncmp("abce", "abc", 3) == 0, 11);	/* Count == length. */
-    check(strncmp("abcd", "abce", 4) < 0, 12);	/* Nudging limit. */
-    check(strncmp("abc", "def", 0) == 0, 13);	/* Zero count. */
-
-    /*
-     * strncpy - testing is a bit different because of odd semantics
-     */
-    it = "strncpy";
-    check(strncpy(one, "abc", 4) == one, 1);	/* Returned value. */
-    equal(one, "abc", 2);			/* Did the copy go right? */
-
-    (void) strcpy(one, "abcdefgh");
-    (void) strncpy(one, "xyz", 2);
-    equal(one, "xycdefgh", 3);		/* Copy cut by count. */
-
-    (void) strcpy(one, "abcdefgh");
-    (void) strncpy(one, "xyz", 3);		/* Copy cut just before NUL. */
-    equal(one, "xyzdefgh", 4);
-
-    (void) strcpy(one, "abcdefgh");
-    (void) strncpy(one, "xyz", 4);		/* Copy just includes NUL. */
-    equal(one, "xyz", 5);
-    equal(one+4, "efgh", 6);		/* Wrote too much? */
-
-    (void) strcpy(one, "abcdefgh");
-    (void) strncpy(one, "xyz", 5);		/* Copy includes padding. */
-    equal(one, "xyz", 7);
-    equal(one+4, "", 8);
-    equal(one+5, "fgh", 9);
-
-    (void) strcpy(one, "abc");
-    (void) strncpy(one, "xyz", 0);		/* Zero-length copy. */
-    equal(one, "abc", 10);	
-
-    (void) strncpy(one, "", 2);		/* Zero-length source. */
-    equal(one, "", 11);
-    equal(one+1, "", 12);	
-    equal(one+2, "c", 13);
-
-    (void) strcpy(one, "hi there");
-    (void) strncpy(two, one, 9);
-    equal(two, "hi there", 14);		/* Just paranoia. */
-    equal(one, "hi there", 15);		/* Stomped on source? */
-
-    /*
-     * strlen
-     */
-    it = "strlen";
-    check(strlen("") == 0, 1);		/* Empty. */
-    check(strlen("a") == 1, 2);		/* Single char. */
-    check(strlen("abcd") == 4, 3);		/* Multiple chars. */
-
-    /*
-     * strchr
-     */
-    it = "strchr";
-    check(strchr("abcd", 'z') == NULL, 1);	/* Not found. */
-    (void) strcpy(one, "abcd");
-    check(strchr(one, 'c') == one+2, 2);	/* Basic test. */
-    check(strchr(one, 'd') == one+3, 3);	/* End of string. */
-    check(strchr(one, 'a') == one, 4);	/* Beginning. */
-    check(strchr(one, '\0') == one+4, 5);	/* Finding NUL. */
-    (void) strcpy(one, "ababa");
-    check(strchr(one, 'b') == one+1, 6);	/* Finding first. */
-    (void) strcpy(one, "");
-    check(strchr(one, 'b') == NULL, 7);	/* Empty string. */
-    check(strchr(one, '\0') == one, 8);	/* NUL in empty string. */
-
-    /*
-     * index - just like strchr
-     */
-    it = "index";
-    check(index("abcd", 'z') == NULL, 1);	/* Not found. */
-    (void) strcpy(one, "abcd");
-    check(index(one, 'c') == one+2, 2);	/* Basic test. */
-    check(index(one, 'd') == one+3, 3);	/* End of string. */
-    check(index(one, 'a') == one, 4);	/* Beginning. */
-    check(index(one, '\0') == one+4, 5);	/* Finding NUL. */
-    (void) strcpy(one, "ababa");
-    check(index(one, 'b') == one+1, 6);	/* Finding first. */
-    (void) strcpy(one, "");
-    check(index(one, 'b') == NULL, 7);	/* Empty string. */
-    check(index(one, '\0') == one, 8);	/* NUL in empty string. */
-
-    /*
-     * strrchr
-     */
-    it = "strrchr";
-    check(strrchr("abcd", 'z') == NULL, 1);	/* Not found. */
-    (void) strcpy(one, "abcd");
-    check(strrchr(one, 'c') == one+2, 2);	/* Basic test. */
-    check(strrchr(one, 'd') == one+3, 3);	/* End of string. */
-    check(strrchr(one, 'a') == one, 4);	/* Beginning. */
-    check(strrchr(one, '\0') == one+4, 5);	/* Finding NUL. */
-    (void) strcpy(one, "ababa");
-    check(strrchr(one, 'b') == one+3, 6);	/* Finding last. */
-    (void) strcpy(one, "");
-    check(strrchr(one, 'b') == NULL, 7);	/* Empty string. */
-    check(strrchr(one, '\0') == one, 8);	/* NUL in empty string. */
-
-    /*
-     * rindex - just like strrchr
-     */
-    it = "rindex";
-    check(rindex("abcd", 'z') == NULL, 1);	/* Not found. */
-    (void) strcpy(one, "abcd");
-    check(rindex(one, 'c') == one+2, 2);	/* Basic test. */
-    check(rindex(one, 'd') == one+3, 3);	/* End of string. */
-    check(rindex(one, 'a') == one, 4);	/* Beginning. */
-    check(rindex(one, '\0') == one+4, 5);	/* Finding NUL. */
-    (void) strcpy(one, "ababa");
-    check(rindex(one, 'b') == one+3, 6);	/* Finding last. */
-    (void) strcpy(one, "");
-    check(rindex(one, 'b') == NULL, 7);	/* Empty string. */
-    check(rindex(one, '\0') == one, 8);	/* NUL in empty string. */
-}
-
-second()
-{
-    /*
-     * strpbrk - somewhat like strchr
-     */
-    it = "strpbrk";
-    check(strpbrk("abcd", "z") == NULL, 1);	/* Not found. */
-    (void) strcpy(one, "abcd");
-    check(strpbrk(one, "c") == one+2, 2);	/* Basic test. */
-    check(strpbrk(one, "d") == one+3, 3);	/* End of string. */
-    check(strpbrk(one, "a") == one, 4);	/* Beginning. */
-    check(strpbrk(one, "") == NULL, 5);	/* Empty search list. */
-    check(strpbrk(one, "cb") == one+1, 6);	/* Multiple search. */
-    (void) strcpy(one, "abcabdea");
-    check(strpbrk(one, "b") == one+1, 7);	/* Finding first. */
-    check(strpbrk(one, "cb") == one+1, 8);	/* With multiple search. */
-    check(strpbrk(one, "db") == one+1, 9);	/* Another variant. */
-    (void) strcpy(one, "");
-    check(strpbrk(one, "bc") == NULL, 10);	/* Empty string. */
-    check(strpbrk(one, "") == NULL, 11);	/* Both strings empty. */
-
-    /*
-     * strspn
-     */
-    it = "strspn";
-    check(strspn("abcba", "abc") == 5, 1);	/* Whole string. */
-    check(strspn("abcba", "ab") == 2, 2);	/* Partial. */
-    check(strspn("abc", "qx") == 0, 3);	/* None. */
-    check(strspn("", "ab") == 0, 4);	/* Null string. */
-    check(strspn("abc", "") == 0, 5);	/* Null search list. */
-
-    /*
-     * strcspn
-     */
-    it = "strcspn";
-    check(strcspn("abcba", "qx") == 5, 1);	/* Whole string. */
-    check(strcspn("abcba", "cx") == 2, 2);	/* Partial. */
-    check(strcspn("abc", "abc") == 0, 3);	/* None. */
-    check(strcspn("", "ab") == 0, 4);	/* Null string. */
-    check(strcspn("abc", "") == 3, 5);	/* Null search list. */
-
-    /*
-     * strtok - the hard one
-     */
-    it = "strtok";
-    (void) strcpy(one, "first, second, third");
-    equal(strtok(one, ", "), "first", 1);	/* Basic test. */
-    equal(one, "first", 2);
-    equal(strtok((char *)NULL, ", "), "second", 3);
-    equal(strtok((char *)NULL, ", "), "third", 4);
-    check(strtok((char *)NULL, ", ") == NULL, 5);
-    (void) strcpy(one, ", first, ");
-    equal(strtok(one, ", "), "first", 6);	/* Extra delims, 1 tok. */
-    check(strtok((char *)NULL, ", ") == NULL, 7);
-    (void) strcpy(one, "1a, 1b; 2a, 2b");
-    equal(strtok(one, ", "), "1a", 8);	/* Changing delim lists. */
-    equal(strtok((char *)NULL, "; "), "1b", 9);
-    equal(strtok((char *)NULL, ", "), "2a", 10);
-    (void) strcpy(two, "x-y");
-    equal(strtok(two, "-"), "x", 11);	/* New string before done. */
-    equal(strtok((char *)NULL, "-"), "y", 12);
-    check(strtok((char *)NULL, "-") == NULL, 13);
-    (void) strcpy(one, "a,b, c,, ,d");
-    equal(strtok(one, ", "), "a", 14);	/* Different separators. */
-    equal(strtok((char *)NULL, ", "), "b", 15);
-    equal(strtok((char *)NULL, " ,"), "c", 16);	/* Permute list too. */
-    equal(strtok((char *)NULL, " ,"), "d", 17);
-    check(strtok((char *)NULL, ", ") == NULL, 18);
-    check(strtok((char *)NULL, ", ") == NULL, 19);	/* Persistence. */
-    (void) strcpy(one, ", ");
-    check(strtok(one, ", ") == NULL, 20);	/* No tokens. */
-    (void) strcpy(one, "");
-    check(strtok(one, ", ") == NULL, 21);	/* Empty string. */
-    (void) strcpy(one, "abc");
-    equal(strtok(one, ", "), "abc", 22);	/* No delimiters. */
-    check(strtok((char *)NULL, ", ") == NULL, 23);
-    (void) strcpy(one, "abc");
-    equal(strtok(one, ""), "abc", 24);	/* Empty delimiter list. */
-    check(strtok((char *)NULL, "") == NULL, 25);
-    (void) strcpy(one, "abcdefgh");
-    (void) strcpy(one, "a,b,c");
-    equal(strtok(one, ","), "a", 26);	/* Basics again... */
-    equal(strtok((char *)NULL, ","), "b", 27);
-    equal(strtok((char *)NULL, ","), "c", 28);
-    check(strtok((char *)NULL, ",") == NULL, 29);
-    equal(one+6, "gh", 30);			/* Stomped past end? */
-    equal(one, "a", 31);			/* Stomped old tokens? */
-    equal(one+2, "b", 32);
-    equal(one+4, "c", 33);
-
-    /*
-     * memcmp
-     */
-    it = "memcmp";
-    check(memcmp("a", "a", 1) == 0, 1);	/* Identity. */
-    check(memcmp("abc", "abc", 3) == 0, 2);	/* Multicharacter. */
-    check(memcmp("abcd", "abce", 4) < 0, 3);	/* Honestly unequal. */
-    check(memcmp("abce", "abcd", 4) > 0, 4);
-    check(memcmp("alph", "beta", 4) < 0, 5);
-    if (charsigned)				/* Sign-bit comparison. */
-        check(memcmp("a\203", "a\003", 2) < 0, 6);
-    else
-        check(memcmp("a\203", "a\003", 2) > 0, 6);
-    check(memcmp("abce", "abcd", 3) == 0, 7);	/* Count limited. */
-    check(memcmp("abc", "def", 0) == 0, 8);	/* Zero count. */
-
-    /*
-     * memchr
-     */
-    it = "memchr";
-    check(memchr("abcd", 'z', 4) == NULL, 1);	/* Not found. */
-    (void) strcpy(one, "abcd");
-    check(memchr(one, 'c', 4) == one+2, 2);	/* Basic test. */
-    check(memchr(one, 'd', 4) == one+3, 3);	/* End of string. */
-    check(memchr(one, 'a', 4) == one, 4);	/* Beginning. */
-    check(memchr(one, '\0', 5) == one+4, 5);	/* Finding NUL. */
-    (void) strcpy(one, "ababa");
-    check(memchr(one, 'b', 5) == one+1, 6);	/* Finding first. */
-    check(memchr(one, 'b', 0) == NULL, 7);	/* Zero count. */
-    check(memchr(one, 'a', 1) == one, 8);	/* Singleton case. */
-    (void) strcpy(one, "a\203b");
-    check(memchr(one, 0203, 3) == one+1, 9);	/* Unsignedness. */
-
-    /*
-     * memcpy
-     *
-     * Note that X3J11 says memcpy must work regardless of overlap.
-     * The SVID says it might fail.
-     */
-    it = "memcpy";
-    check(memcpy(one, "abc", 4) == one, 1);	/* Returned value. */
-    equal(one, "abc", 2);			/* Did the copy go right? */
-
-    (void) strcpy(one, "abcdefgh");
-    (void) memcpy(one+1, "xyz", 2);
-    equal(one, "axydefgh", 3);		/* Basic test. */
-
-    (void) strcpy(one, "abc");
-    (void) memcpy(one, "xyz", 0);
-    equal(one, "abc", 4);			/* Zero-length copy. */
-
-    (void) strcpy(one, "hi there");
-    (void) strcpy(two, "foo");
-    (void) memcpy(two, one, 9);
-    equal(two, "hi there", 5);		/* Just paranoia. */
-    equal(one, "hi there", 6);		/* Stomped on source? */
-
-    (void) strcpy(one, "abcdefgh");
-    (void) memcpy(one+1, one, 9);
-    equal(one, "aabcdefgh", 7);		/* Overlap, right-to-left. */
-
-    (void) strcpy(one, "abcdefgh");
-    (void) memcpy(one+1, one+2, 7);
-    equal(one, "acdefgh", 8);		/* Overlap, left-to-right. */
-
-    (void) strcpy(one, "abcdefgh");
-    (void) memcpy(one, one, 9);
-    equal(one, "abcdefgh", 9);		/* 100% overlap. */
-
-    /*
-     * memccpy - first test like memcpy, then the search part
-     *
-     * The SVID, the only place where memccpy is mentioned, says
-     * overlap might fail, so we don't try it.  Besides, it's hard
-     * to see the rationale for a non-left-to-right memccpy.
-     */
-    it = "memccpy";
-    check(memccpy(one, "abc", 'q', 4) == NULL, 1);	/* Returned value. */
-    equal(one, "abc", 2);			/* Did the copy go right? */
-
-    (void) strcpy(one, "abcdefgh");
-    (void) memccpy(one+1, "xyz", 'q', 2);
-    equal(one, "axydefgh", 3);		/* Basic test. */
-
-    (void) strcpy(one, "abc");
-    (void) memccpy(one, "xyz", 'q', 0);
-    equal(one, "abc", 4);			/* Zero-length copy. */
-
-    (void) strcpy(one, "hi there");
-    (void) strcpy(two, "foo");
-    (void) memccpy(two, one, 'q', 9);
-    equal(two, "hi there", 5);		/* Just paranoia. */
-    equal(one, "hi there", 6);		/* Stomped on source? */
-
-    (void) strcpy(one, "abcdefgh");
-    (void) strcpy(two, "horsefeathers");
-    check(memccpy(two, one, 'f', 9) == two+6, 7);	/* Returned value. */
-    equal(one, "abcdefgh", 8);		/* Source intact? */
-    equal(two, "abcdefeathers", 9);		/* Copy correct? */
-
-    (void) strcpy(one, "abcd");
-    (void) strcpy(two, "bumblebee");
-    check(memccpy(two, one, 'a', 4) == two+1, 10);	/* First char. */
-    equal(two, "aumblebee", 11);
-    check(memccpy(two, one, 'd', 4) == two+4, 12);	/* Last char. */
-    equal(two, "abcdlebee", 13);
-    (void) strcpy(one, "xyz");
-    check(memccpy(two, one, 'x', 1) == two+1, 14);	/* Singleton. */
-    equal(two, "xbcdlebee", 15);
-
-    /*
-     * memset
-     */
-    it = "memset";
-    (void) strcpy(one, "abcdefgh");
-    check(memset(one+1, 'x', 3) == one+1, 1);	/* Return value. */
-    equal(one, "axxxefgh", 2);		/* Basic test. */
-
-    (void) memset(one+2, 'y', 0);
-    equal(one, "axxxefgh", 3);		/* Zero-length set. */
-
-    (void) memset(one+5, 0, 1);
-    equal(one, "axxxe", 4);			/* Zero fill. */
-    equal(one+6, "gh", 5);			/* And the leftover. */
-
-    (void) memset(one+2, 010045, 1);
-    equal(one, "ax\045xe", 6);		/* Unsigned char convert. */
-
-    /*
-     * bcopy - much like memcpy
-     *
-     * Berklix manual is silent about overlap, so don't test it.
-     */
-    it = "bcopy";
-    (void) bcopy("abc", one, 4);
-    equal(one, "abc", 1);			/* Simple copy. */
-
-    (void) strcpy(one, "abcdefgh");
-    (void) bcopy("xyz", one+1, 2);
-    equal(one, "axydefgh", 2);		/* Basic test. */
-
-    (void) strcpy(one, "abc");
-    (void) bcopy("xyz", one, 0);
-    equal(one, "abc", 3);			/* Zero-length copy. */
-
-    (void) strcpy(one, "hi there");
-    (void) strcpy(two, "foo");
-    (void) bcopy(one, two, 9);
-    equal(two, "hi there", 4);		/* Just paranoia. */
-    equal(one, "hi there", 5);		/* Stomped on source? */
-
-    /*
-     * bzero
-     */
-    it = "bzero";
-    (void) strcpy(one, "abcdef");
-    bzero(one+2, 2);
-    equal(one, "ab", 1);			/* Basic test. */
-    equal(one+3, "", 2);
-    equal(one+4, "ef", 3);
-
-    (void) strcpy(one, "abcdef");
-    bzero(one+2, 0);
-    equal(one, "abcdef", 4);		/* Zero-length copy. */
-
-    /*
-     * bcmp - somewhat like memcmp
-     */
-    it = "bcmp";
-    check(bcmp("a", "a", 1) == 0, 1);	/* Identity. */
-    check(bcmp("abc", "abc", 3) == 0, 2);	/* Multicharacter. */
-    check(bcmp("abcd", "abce", 4) != 0, 3);	/* Honestly unequal. */
-    check(bcmp("abce", "abcd", 4) != 0, 4);
-    check(bcmp("alph", "beta", 4) != 0, 5);
-    check(bcmp("abce", "abcd", 3) == 0, 6);	/* Count limited. */
-    check(bcmp("abc", "def", 0) == 0, 8);	/* Zero count. */
-
-#ifdef ERR
-    /*
-     * strerror - VERY system-dependent
-     */
-    it = "strerror";
-    f = open("/", 1);	/* Should always fail. */
-    check(f < 0 && errno > 0 && errno < sys_nerr, 1);
-    equal(strerror(errno), sys_errlist[errno], 2);
-#ifdef UNIXERR
-    equal(strerror(errno), "Is a directory", 3);
-#endif
-#ifdef BERKERR
-    equal(strerror(errno), "Permission denied", 3);
-#endif
-#endif
-}
diff --git a/dmake/dbug/malloc/testmlc.c b/dmake/dbug/malloc/testmlc.c
deleted file mode 100644
index ddd8afd4a..000000000
--- a/dmake/dbug/malloc/testmlc.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* NOT copyright by SoftQuad Inc. -- msb, 1988 */
-#ifndef lint
-static char *SQ_SccsId = "@(#)mtest3.c	1.2 88/08/25";
-#endif
-#include <stdio.h>
-/*
-** looptest.c -- intensive allocator tester 
-**
-** Usage:  looptest
-**
-** History:
-**	4-Feb-1987 rtech!daveb 
-*/
-
-# ifdef SYS5
-# define random	rand
-# else
-# include <sys/vadvise.h>
-# endif
-
-# include <stdio.h>
-# include <signal.h>
-# include <setjmp.h>
-
-# define MAXITER	1000000		/* main loop iterations */
-# define MAXOBJS	1000		/* objects in pool */
-# define BIGOBJ		90000		/* max size of a big object */
-# define TINYOBJ	80		/* max size of a small object */
-# define BIGMOD		100		/* 1 in BIGMOD is a BIGOBJ */
-# define STATMOD	10000		/* interation interval for status */
-
-main( argc, argv )
-int argc;
-char **argv;
-{
-    register int **objs;		/* array of objects */
-    register int *sizes;		/* array of object sizes */
-    register int n;			/* iteration counter */
-    register int i;			/* object index */
-    register int size;		/* object size */
-    register int r;			/* random number */
-
-    int objmax;			/* max size this iteration */
-    int cnt;			/* number of allocated objects */
-    int nm = 0;			/* number of mallocs */
-    int nre = 0;			/* number of reallocs */
-    int nal;			/* number of allocated objects */
-    int nfre;			/* number of free list objects */
-    long alm;			/* memory in allocated objects */
-    long frem;			/* memory in free list */
-    long startsize;			/* size at loop start */
-    long endsize;			/* size at loop exit */
-    long maxiter = 0;		/* real max # iterations */
-
-    extern char end;		/* memory before heap */
-    char *calloc();
-    char *malloc();
-    char *sbrk();
-    long atol();
-
-# ifndef SYS5
-    /* your milage may vary... */
-    vadvise( VA_ANOM );
-# endif
-
-    if (argc > 1)
-        maxiter = atol (argv[1]);
-    if (maxiter <= 0)
-        maxiter = MAXITER;
-
-    printf("MAXITER %d MAXOBJS %d ", maxiter, MAXOBJS );
-    printf("BIGOBJ %d, TINYOBJ %d, nbig/ntiny 1/%d\n",
-    BIGOBJ, TINYOBJ, BIGMOD );
-    fflush( stdout );
-
-    if( NULL == (objs = (int **)calloc( MAXOBJS, sizeof( *objs ) ) ) )
-    {
-        fprintf(stderr, "Can't allocate memory for objs array\n");
-        exit(1);
-    }
-
-    if( NULL == ( sizes = (int *)calloc( MAXOBJS, sizeof( *sizes ) ) ) )
-    {
-        fprintf(stderr, "Can't allocate memory for sizes array\n");
-        exit(1);
-    }
-
-    /* as per recent discussion on net.lang.c, calloc does not 
-    ** necessarily fill in NULL pointers...
-    */
-    for( i = 0; i < MAXOBJS; i++ )
-        objs[ i ] = NULL;
-
-    startsize = sbrk(0) - &end;
-    printf( "Memory use at start: %d bytes\n", startsize );
-    fflush(stdout);
-
-    printf("Starting the test...\n");
-    fflush(stdout);
-    for( n = 0; n < maxiter ; n++ )
-    {
-        if( !(n % STATMOD) )
-        {
-            printf("%d iterations\n", n);
-            fflush(stdout);
-        }
-
-        /* determine object of interst and it's size */
-
-        r = random();
-        objmax = ( r % BIGMOD ) ? TINYOBJ : BIGOBJ;
-        size = r % objmax;
-        i = r % (MAXOBJS - 1);
-
-        /* either replace the object of get a new one */
-
-        if( objs[ i ] == NULL )
-        {
-            objs[ i ] = (int *)malloc( size );
-            nm++;
-        }
-        else
-        {
-            /* don't keep bigger objects around */
-            if( size > sizes[ i ] )
-            {
-                objs[ i ] = (int *)realloc( objs[ i ], size );
-                nre++;
-            }
-            else
-            {
-                free( objs[ i ] );
-                objs[ i ] = (int *)malloc( size );
-                nm++;
-            }
-        }
-
-        sizes[ i ] = size;
-        if( objs[ i ] == NULL )
-        {
-            printf("\nCouldn't allocate %d byte object!\n", 
-                size );
-            break;
-        }
-    } /* for() */
-
-    printf( "\n" );
-    cnt = 0;
-    for( i = 0; i < MAXOBJS; i++ )
-        if( objs[ i ] )
-            cnt++;
-
-    printf( "Did %d iterations, %d objects, %d mallocs, %d reallocs\n",
-        n, cnt, nm, nre );
-    printf( "Memory use at end: %d bytes\n", sbrk(0) - &end );
-    fflush( stdout );
-
-    /* free all the objects */
-    for( i = 0; i < MAXOBJS; i++ )
-        if( objs[ i ] != NULL )
-            free( objs[ i ] );
-
-    endsize = sbrk(0) - &end;
-    printf( "Memory use after free: %d bytes\n", endsize );
-    fflush( stdout );
-
-    if( startsize != endsize )
-        printf("startsize %d != endsize %d\n", startsize, endsize );
-
-    free( objs );
-    free( sizes );
-
-    malloc_dump(2);
-    exit( 0 );
-}
-
diff --git a/dmake/dbug/malloc/tostring.c b/dmake/dbug/malloc/tostring.c
deleted file mode 100644
index b12920733..000000000
--- a/dmake/dbug/malloc/tostring.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-#include "tostring.h"
-
-/*
- * Function:	tostring()
- *
- * Purpose:	to convert an integer to an ascii display string
- *
- * Arguments:	buf	- place to put the 
- *		val	- integer to convert
- *		len	- length of output field (0 if just enough to hold data)
- *		base	- base for number conversion (only works for base <= 16)
- *		fill	- fill char when len > # digits
- *
- * Returns:	length of string
- *
- * Narrative:	IF fill character is non-blank
- *		    Determine base
- *		        If base is HEX
- *		            add "0x" to begining of string
- *		        IF base is OCTAL
- *		            add "0" to begining of string
- *
- *		While value is greater than zero
- *		    use val % base as index into xlation str to get cur char
- *		    divide val by base
- *
- *		Determine fill-in length
- *
- *		Fill in fill chars
- *
- *		Copy in number
- *		
- *
- * Mod History:	
- *   90/01/24	cpcahil		Initial revision.
- */
-
-#ifndef lint
-static
-char rcs_hdr[] = "$Id: tostring.c,v 1.2 2006-07-25 10:10:17 rt Exp $";
-#endif
-
-#define T_LEN 10
-
-int
-tostring(buf,val,len,base,fill)
-    int	  base;
-    char	* buf;
-    char	  fill;
-    int	  len;
-    int	  val;
-    
-{
-    char	* bufstart = buf;
-    int	  i = T_LEN;
-    char	* xbuf = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-    char	  tbuf[T_LEN];
-
-    /*
-     * if we are filling with non-blanks, make sure the
-     * proper start string is added
-     */
-    if( fill != ' ' )
-    {
-        switch(base)
-        {
-            case B_HEX:
-                *(buf++) = '0';
-                *(buf++) = 'x';
-                if( len )
-                {
-                    len -= 2;
-                }
-                break;
-            case B_OCTAL:
-                *(buf++) = fill;
-                if( len )
-                {
-                    len--;
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    while( val > 0 )
-    {
-        tbuf[--i] = xbuf[val % base];
-        val = val / base;
-    }
-
-    if( len )
-    {
-        len -= (T_LEN - i);
-
-        if( len > 0 )
-        {
-            while(len-- > 0)
-            {
-                *(buf++) = fill;
-            }
-        }
-        else
-        {
-            /* 
-             * string is too long so we must truncate
-             * off some characters.  We do this the easiest
-             * way by just incrementing i.  This means the
-             * most significant digits are lost.
-             */
-            while( len++ < 0 )
-            {
-                i++;
-            }
-        }
-    }
-
-    while( i < T_LEN )
-    {
-        *(buf++) = tbuf[i++];
-    }
-
-    return( (int) (buf - bufstart) );
-
-} /* tostring(... */
-
diff --git a/dmake/dbug/malloc/tostring.h b/dmake/dbug/malloc/tostring.h
deleted file mode 100644
index fe9b5e915..000000000
--- a/dmake/dbug/malloc/tostring.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * (c) Copyright 1990 Conor P. Cahill (uunet!virtech!cpcahil).  
- * You may copy, distribute, and use this software as long as this
- * copyright statement is not removed.
- */
-/*
- * $Id: tostring.h,v 1.2 2006-07-25 10:10:32 rt Exp $
- */
-#define B_BIN	 2
-#define B_DEC	10
-#define B_HEX	16
-#define B_OCTAL	 8
-
diff --git a/dmake/dbug/readme b/dmake/dbug/readme
deleted file mode 100644
index 15efc00a7..000000000
--- a/dmake/dbug/readme
+++ /dev/null
@@ -1,13 +0,0 @@
-This directory contains two public domain debugging packages.
-
-	1. Fred Fishes DEBUG macros.
-	2. Connor P. Cahills malloc library.
-
-Descriptions of both can be found in their respective sub-directories.  dbug
-for the DEBUG macros and malloc for the malloc library.  I have left the
-malloc distribution intact as it comes from the net except for the changes
-noted in the _changes file.
-
-I thank the authors for making them available for others to use.
-
--dennis
diff --git a/dmake/depcomp b/dmake/depcomp
deleted file mode 100755
index 04701da53..000000000
--- a/dmake/depcomp
+++ /dev/null
@@ -1,530 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2005-07-09.11
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/dmake/dmake.c b/dmake/dmake.c
deleted file mode 100644
index 27513cd9a..000000000
--- a/dmake/dmake.c
+++ /dev/null
@@ -1,952 +0,0 @@
-/* $RCSfile: dmake.c,v $
--- $Revision: 1.13 $
--- last change: $Author: kz $ $Date: 2008-03-05 18:28:04 $
---
--- SYNOPSIS
---      The main program.
--- 
--- DESCRIPTION
--- 
--- 	dmake [-#dbug_string] [ options ]
--- 			[ macro definitions ] [ target ... ]
--- 
--- 	This file contains the main command line parser for the
--- 	make utility.  The valid flags recognized are as follows:
--- 
--- 	-f file         - use file as the makefile
---	-C file		- duplicate console output to file (MSDOS only)
---	-K file		- .KEEP_STATE file
--- 	-#dbug_string   - dump out debugging info, see below
--- 	-v[cdfimrtw]	- verbose, print what we are doing, as we do it
--- 	-m[trae]	- measure timing information
--- 
--- 	 options: (can be catenated, ie -irn == -i -r -n)
--- 
---	-A		- enable AUGMAKE special target mapping
---	-B		- enable non-use of TABS to start recipe lines
---	-c		- use non-standard comment scanning
---      -d              - do not use directory cache
--- 	-i              - ignore errors
--- 	-n              - trace and print, do not execute commands
--- 	-t              - touch, update dates without executing commands
--- 	-T              - do not apply transitive closure on inference rules
--- 	-r              - don't use internal rules
--- 	-s              - do your work silently
---	-S		- force Sequential make, overrides -P
--- 	-q              - check if target is up to date.  Does not
--- 			  do anything.  Returns 0 if up to date, -1
--- 			  otherwise.
--- 	-p              - print out a version of the makefile
---	-P#		- set value of MAXPROCESS
--- 	-E              - define environment strings as macros
--- 	-e              - as -E but done after parsing makefile
--- 	-u              - force unconditional update of target
--- 	-k              - make all independent targets even if errors
--- 	-V              - print out this make version number
--- 	-M		- Microsoft make compatibility, (* disabled *)
--- 	-h              - print out usage info
--- 	-x		- export macro defs to environment
---      -X              - ignore #! lines found in makefile
--- 
--- 	NOTE:  - #ddbug_string is only availabe for versions of dmake that
--- 		have been compiled with -DDBUG switch on.  Not the case for
--- 		distributed versions.  Any such versions must be linked
--- 		together with a version of Fred Fish's debug code.
--- 			 
--- 	NOTE:  - in order to compile the code the include file stddef.h
--- 		must be shipped with the bundled code.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* Set this flag to one, and the global variables in vextern.h will not
- * be defined as 'extern', instead they will be defined as global vars
- * when this module is compiled. */
-#define _DEFINE_GLOBALS_ 1
-
-#include "extern.h" /* this includes config.h */
-#include "sysintf.h"
-
-#ifndef MSDOS
-#define USAGE \
-"Usage:\n%s [-P#] [-{f|K} file] [-{w|W} target ...] [macro[!][[*][+][:]]=value ...]\n"
-#define USAGE2 \
-"%s [-v[cdfimrtw]] [-m[trae]] [-ABcdeEghiknpqrsStTuVxX] [target ...]\n"
-#else
-#define USAGE \
-"Usage:\n%s [-P#] [-{f|C|K} file] [-{w|W} target ...] [macro[!][[*][+][:]]=value ...]\n"
-#define USAGE2 \
-"%s [-v[cdfimrtw]] [-m[trae]] [-ABcdeEghiknpqrsStTuVxX] [target ...]\n"
-#endif
-
-/* We don't use va_end at all, so define it out so that it doesn't produce
- * lots of "Value not used" warnings. */
-#ifdef va_end
-#undef va_end
-#endif
-#define va_end(expand_to_null)
-
-/* Make certain that ARG macro is correctly defined. */
-#ifdef ARG
-#undef ARG
-#endif
-#define ARG(a,b) a b
-
-static char *sccid = "Copyright (c) 1990,...,1997 by WTI Corp.";
-static char _warn  = TRUE;		/* warnings on by default */
-
-static	void	_do_VPATH();
-static	void	_do_ReadEnvironment();
-#if !defined(__GNUC__) && !defined(__IBMC__)
-static  void    _do_f_flag ANSI((char, char *, char **));
-#else
-static  void    _do_f_flag ANSI((int, char *, char **));
-#endif
-
-PUBLIC int
-main(argc, argv)
-int  argc;
-char **argv;
-{
-#ifdef MSDOS
-   char*   std_fil_name = NIL(char);
-#endif
-
-   char*   fil_name = NIL(char);
-   char*   state_name = NIL(char);
-   char*   whatif = NIL(char);
-   char*   cmdmacs;
-   char*   targets;
-   STRINGPTR cltarget = NIL(STRING); /* list of targets from command line. */
-   STRINGPTR cltarget_first = NIL(STRING); /* Pointer to first element. */
-   FILE*   mkfil;
-   int     ex_val;
-   int     m_export;
-
-   /* Uncomment the following line to pass commands to the DBUG engine
-    * before the command line switches (-#..) are evaluated. */
-   /*
-   DB_PUSH("d,path");
-    */
-   DB_ENTER("main");
-
-   /* Initialize Global variables to their default values       */
-   Prolog(argc, argv);
-   /* Set internal macros to their initial values, some are changed
-    * later again by Make_rules() that parses the values from ruletab.c. */
-   Create_macro_vars();
-   Catch_signals(Quit);
-
-   /* This macro is only defined for some OSs, see sysintf.c for details *
-    * and NULL if undefined.                                             */
-   Def_macro("ABSMAKECMD", AbsPname, M_PRECIOUS|M_NOEXPORT|M_EXPANDED );
-
-   Def_macro( "MAKECMD", Pname, M_PRECIOUS|M_NOEXPORT|M_EXPANDED );
-   Pname = Basename(Pname);
-
-   DB_PROCESS(Pname);
-   (void) setvbuf(stdout, NULL, _IOLBF, BUFSIZ); /* stdout line buffered */
-
-   Continue  = FALSE;
-   Comment   = FALSE;
-   Get_env   = FALSE;
-   Force     = FALSE;
-   Target    = FALSE;
-   If_expand = FALSE;
-   Listing   = FALSE;
-   Readenv   = FALSE;
-   Rules     = TRUE;
-   Trace     = FALSE;
-   Touch     = FALSE;
-   Check     = FALSE;
-   Microsoft = FALSE;
-   Makemkf   = FALSE;
-   UseWinpath= FALSE;
-   No_exec   = FALSE;
-   m_export  = FALSE;
-   cmdmacs   = NIL(char);
-   targets   = NIL(char);
-   Is_exec_shell = FALSE;
-   Shell_exec_target = NIL(CELL);
-   stdout_redir = NIL(FILE);
-
-   /* Get fd for for @@-recipe silencing. */
-   if( (zerofd = open(NULLDEV, O_WRONLY)) == -1 )
-      Fatal( "Error opening %s !", NULLDEV );
-
-   Verbose     = V_NOFLAG;
-   Measure     = M_NOFLAG;
-   Transitive  = TRUE;
-   Nest_level  = 0;
-   Line_number = 0;
-   Suppress_temp_file = FALSE;
-   Skip_to_eof = FALSE;
-
-   while( --argc > 0 ) {
-      register char *p;
-      char *q;
-
-      if( *(p = *++argv) == '-' ) {
-         if( p[1] == '\0' ) Fatal("Missing option letter");
-
-         /* copy options to Buffer for $(MFLAGS), strip 'f' and 'C'*/
-         q = strchr(Buffer, '\0');
-         while (*p != '\0') {
-        char c = (*q++ = *p++);
-            if( c == 'f' || c == 'C' ) q--;
-     }
-
-     if( *(q-1) == '-' )
-        q--;
-     else
-            *q++ = ' ';
-
-     *q = '\0';
-
-         for( p = *argv+1; *p; p++) switch (*p) {
-        case 'f':
-           _do_f_flag( 'f', *++argv, &fil_name ); argc--;
-           break;
-
-#if defined(MSDOS) && !defined(OS2)
-        case 'C':
-           _do_f_flag( 'C', *++argv, &std_fil_name ); argc--;
-           Hook_std_writes( std_fil_name );
-           break;
-#endif
-
-        case 'K':
-           _do_f_flag( 'K', *++argv, &state_name ); argc--;
-           Def_macro(".KEEP_STATE", state_name, M_EXPANDED|M_PRECIOUS);
-           break;
-
-        case 'W':
-        case 'w': {
-           CELLPTR wif;
-           _do_f_flag( 'w', *++argv, &whatif ); argc--;
-           wif = Def_cell(whatif);
-           wif->ce_attr |= A_WHATIF;
-           whatif = NIL(char);
-
-           if ( *p == 'W') 
-          break;
-        }
-        /*FALLTHRU*/
-
-        case 'n':
-           Trace = TRUE;
-           break;
-
-        case 'k': Continue   = TRUE;  break;
-        case 'c': Comment    = TRUE;  break;
-        case 'p': Listing    = TRUE;  break;
-        case 'r': Rules      = FALSE; break;
-        case 't': Touch      = TRUE;  break;
-        case 'q': Check      = TRUE;  break;
-        case 'u': Force      = TRUE;  break;
-        case 'x': m_export   = TRUE;  break;
-        case 'X': No_exec    = TRUE;  break;
-        case 'T': Transitive = FALSE; break;
-        case 'e': Get_env    = 'e';   break;
-        case 'E': Get_env    = 'E';   break;
-
-        case 'V': Version();  Quit(0);  break;
-        case 'A': Def_macro("AUGMAKE", "y", M_EXPANDED); break;
-        case 'B': Def_macro(".NOTABS", "y", M_EXPANDED); break;
-        case 'i': Def_macro(".IGNORE", "y", M_EXPANDED); break;
-        case 's': Def_macro(".SILENT", "y", M_EXPANDED); break;
-        case 'S': Def_macro(".SEQUENTIAL", "y", M_EXPANDED); break;
-        case 'g': Def_macro(".IGNOREGROUP","y", M_EXPANDED); break;
-        case 'd': Def_macro(".DIRCACHE",NIL(char),M_EXPANDED); break;
-
-        case 'v':
-           if( p[-1] != '-' ) Usage(TRUE);
-           while( p[1] ) switch( *++p ) {
-          case 'c': Verbose |= V_DIR_CACHE; break;
-          case 'd': Verbose |= V_DIR_SET;   break;
-          case 'f': Verbose |= V_FILE_IO;   break;
-          case 'i': Verbose |= V_INFER;     break;
-          case 'm': Verbose |= V_MAKE;      break;
-                  case 'r': Verbose |= V_FORCEECHO; break;
-          case 't': Verbose |= V_LEAVE_TMP; break;
-                  case 'w': Verbose |= V_WARNALL;   break;
-
-          default: Usage(TRUE); break;
-           }
-           if( !Verbose ) Verbose = V_ALL;
-               if( Verbose & V_FORCEECHO ) {
-                 HASHPTR hp;
-                 /* This cleans the .SILENT setting */
-                 hp = Def_macro(".SILENT", "", M_EXPANDED);
-                 /* This overrides the bitmask for further occurrences of
-                  * .SILENT to "no bits allowed", see bit variables in the
-                  * set_macro_value() definition in dag.c.
-                  * The bitmask is already set by Create_macro_vars() in
-                  * imacs.c and is overridden for the V_FORCEECHO case. */
-                 hp->MV_MASK  = A_DEFAULT;
-               } 
-           break;
-
-        case 'm':
-           if( p[-1] != '-' ) Usage(TRUE);
-           while( p[1] ) switch( *++p ) {
-          case 't': Measure |= M_TARGET;    break;
-          case 'r': Measure |= M_RECIPE;    break;
-          case 'a': Measure |= M_ABSPATH;   break;
-          case 'e': Measure |= M_SHELLESC;  break;
-
-          default: Usage(TRUE); break;
-           }
-           if( !Measure ) Measure = M_TARGET;
-           break;
-
-        case 'P':
-           if( p[1] ) {
-          /* Only set MAXPROCESS if -S flag is *not* used. */
-          if( !(Glob_attr & A_SEQ) ) {
-             Def_macro( "MAXPROCESS", p+1, M_MULTI|M_EXPANDED );
-          }
-          p += strlen(p)-1;
-           }
-           else
-          Fatal( "Missing number for -P flag" );
-           break;
-
-#ifdef DBUG
-        case '#':
-           DB_PUSH(p+1);
-           p += strlen(p)-1;
-           break;
-#endif
-
-        case 'h': Usage(FALSE); break;
-        case 0:   break;	/* lone - */
-        default:  Usage(TRUE);  break;
-     }
-      }
-      else if( (q = strchr(p, '=')) != NIL(char) ) {
-     cmdmacs = DmStrAdd( cmdmacs, DmStrDup2(p), TRUE );
-     /* Macros defined on the command line are marked precious.
-      * FIXME: The exception for += appears to be bogus. */
-     Parse_macro( p, (q[-1]!='+')?M_PRECIOUS:M_DEFAULT );
-      }
-      else {
-     /* Remember the targets from the command line. */
-     register STRINGPTR nsp;
-
-     targets = DmStrAdd( targets, DmStrDup(p), TRUE );
-
-     TALLOC(nsp, 1, STRING);
-     nsp->st_string = DmStrDup( p );
-     nsp->st_next = NIL(STRING);
-
-     if(cltarget != NIL(STRING) )
-        cltarget->st_next = nsp;
-     else
-        cltarget_first = nsp;
-
-     cltarget = nsp;
-      }
-   }
-
-   Def_macro( "MAKEMACROS",  cmdmacs, M_PRECIOUS|M_NOEXPORT );
-   Def_macro( "MAKETARGETS", targets, M_PRECIOUS|M_NOEXPORT );
-   if( cmdmacs != NIL(char) ) FREE(cmdmacs);
-   if( targets != NIL(char) ) FREE(targets);
-
-   Def_macro( "MFLAGS", Buffer, M_PRECIOUS|M_NOEXPORT );
-   Def_macro( "%", "$@", M_PRECIOUS|M_NOEXPORT );
-
-   if( *Buffer ) Def_macro( "MAKEFLAGS", Buffer+1, M_PRECIOUS|M_NOEXPORT );
-
-   _warn  = FALSE;  /* disable warnings for builtin rules */
-   Target = TRUE;   /* make sure we don't mark any of the default rules as
-             * potential targets. */
-   Make_rules();    /* Parse the strings stored in Rule_tab. */
-   _warn = TRUE;
-
-   /* If -r was not given find and parse startup-makefile. */
-   if( Rules )
-   {
-     char *fname = NIL(char);
-
-     /* Search_file() also checks the environment variable. */
-     if( (mkfil=Search_file("MAKESTARTUP", &fname)) != NIL(FILE) )
-     {
-       Parse(mkfil);
-       Def_macro( "MAKESTARTUP", fname, M_EXPANDED|M_MULTI|M_FORCE );
-     }
-     else
-       Fatal( "Configuration file `%s' not found", fname );
-     if ( fname != NIL(char)) { FREE( fname ); fname = NIL(char); }
-   }
-
-   /* Define the targets set on the command line now. */
-   Target = FALSE;  /* Will be set to TRUE when the default targets are set. */
-   for( cltarget = cltarget_first; cltarget != NIL(STRING); ) {
-      CELLPTR cp;
-      STRINGPTR nta = cltarget->st_next;
-
-      Add_prerequisite(Targets, cp = Def_cell(cltarget->st_string),
-               FALSE, FALSE);
-      cp->ce_flag |= F_TARGET;
-      cp->ce_attr |= A_FRINGE;
-      Target = TRUE;
-
-      FREE(cltarget->st_string);
-      FREE(cltarget);
-      cltarget = nta;
-   }
-
-   if( Get_env == 'E' ) _do_ReadEnvironment();
-
-   /* Search for and parse user makefile. */
-   if( fil_name != NIL(char) )
-      mkfil = Openfile( fil_name, FALSE, TRUE );
-   else {
-      /* Search .MAKEFILES dependent list looking for a makefile.
-       */
-      register CELLPTR cp;
-
-      cp = Def_cell( ".MAKEFILES" );
-      mkfil = TryFiles(cp->CE_PRQ);
-   }
-
-   if( mkfil != NIL(FILE) ) {
-      char *f = Filename();
-      char *p;
-
-      if( strcmp(f, "stdin") == 0 ) f = "-";
-      Def_macro( "MAKEFILE", p = DmStrAdd( "-f", f, FALSE ), M_PRECIOUS|M_NOEXPORT ); FREE(p);
-      Parse( mkfil );
-   }
-   else if( !Rules )
-      Fatal( "No `makefile' present" );
-
-   if( Nest_level     ) Fatal( "Missing .END for .IF" );
-   if( Get_env == 'e' ) _do_ReadEnvironment();
-
-   _do_VPATH();      			/* kludge it up with .SOURCE    */
-
-   if( Listing ) Dump();		/* print out the structures     */
-   if( Trace ) Glob_attr &= ~A_SILENT;	/* make sure we see the trace   */
-
-   if( !Target )
-      Fatal( "No target" );
-   else {
-      Test_circle( Root, TRUE );
-      Check_circle_dfa();
-   }
-
-   if( m_export ) {
-      int i;
-
-      for( i=0; i<HASH_TABLE_SIZE; ++i ) {
-     HASHPTR hp = Macs[i];
-
-     while( hp ) {
-        if( !(hp->ht_flag & M_NOEXPORT) && hp->ht_value != NIL(char) )
-           if( Write_env_string(hp->ht_name, hp->ht_value) != 0 )
-           Warning( "Could not export %s", hp->ht_name );
-        hp = hp->ht_next;
-     }
-      }
-   }
- 
-   if( Buffer != NIL(char) ) {FREE( Buffer ); Buffer = NIL(char);}
-   if( Trace ) Def_macro(".SEQUENTIAL", "y", M_EXPANDED);
-
-   ex_val = Make_targets();
-
-   Clear_signals();
-
-   /* Close fd for for @@-recipe silencing. */
-   if( close(zerofd) )
-      Fatal( "Error closing %s !", NULLDEV );
-   Epilog(ex_val);      /* Does not return -- EVER */
-   return 0;
-}
-
-
-static void
-_do_f_flag( flag, name, fname )
-char   flag;
-char  *name;
-char **fname;
-{
-   if( *fname == NIL(char) ) {
-      if( name != NIL(char) ) {
-     *fname = name;
-      } else
-     Fatal("No file name for -%c", flag);
-   } else
-      Fatal("Only one `-%c file' allowed", flag);
-}
-
-
-static void
-_do_ReadEnvironment()
-{
-   t_attr saveattr = Glob_attr;
-
-   Glob_attr |= A_SILENT;
-   ReadEnvironment();
-   Glob_attr = saveattr;
-}
-
-
-static void
-_do_VPATH()
-{
-   HASHPTR hp;
-   char    *_rl[2];
-   extern char **Rule_tab;
-
-   hp = GET_MACRO("VPATH");
-   if( hp == NIL(HASH) ) return;
-
-   _rl[0] = ".SOURCE :^ $(VPATH:s/:/ /)";
-   _rl[1] = NIL(char);
-
-   Rule_tab = _rl;
-   Parse( NIL(FILE) );
-}
-
-
-/*  The file table and pointer to the next FREE slot for use by both
-    Openfile and Closefile.  Each open stacks the new file onto the open
-    file stack, and a corresponding close will close the passed file, and
-    return the next file on the stack.  The maximum number of nested
-    include files is limited by the value of MAX_INC_DEPTH */
-
-static struct {
-   FILE         *file;  	/* file pointer                 */
-   char         *name;  	/* name of file                 */
-   int          numb;   	/* line number                  */
-} ftab[ MAX_INC_DEPTH ];
-
-static int next_file_slot = 0;
-
-/* Set the proper macro value to reflect the depth of the .INCLUDE directives
- * and the name of the file we are reading.
- */
-static void
-_set_inc_depth()
-{
-   char buf[10];
-   sprintf( buf, "%d", next_file_slot );
-   Def_macro( "INCDEPTH", buf, M_MULTI|M_NOEXPORT );
-   Def_macro( "INCFILENAME",
-              next_file_slot ? ftab[next_file_slot-1].name : "",
-              M_MULTI|M_NOEXPORT|M_EXPANDED );
-}
-
-
-PUBLIC FILE *
-Openfile(name, mode, err)/*
-===========================
-   This routine opens a file for input or output depending on mode.
-   If the file name is `-' then it returns standard input.
-   The file is pushed onto the open file stack.  */
-char *name;
-int  mode;
-int  err;
-{
-   FILE *fil;
-
-   DB_ENTER("Openfile");
-   
-   if( name == NIL(char) || !*name ) {
-      if( !err )
-         DB_RETURN(NIL(FILE));
-      else
-         Fatal( "Openfile:  NIL filename" );
-   }
-   
-   if( next_file_slot == MAX_INC_DEPTH )
-      Fatal( "Too many open files. Max nesting level is %d.", MAX_INC_DEPTH);
-
-   DB_PRINT( "io", ("Opening file [%s], in slot %d", name, next_file_slot) );
-
-   if( strcmp("-", name) == 0 ) {
-      name = "stdin";
-      fil = stdin;
-   }
-   else
-      fil = fopen( name, mode ? "w":"r" );
-
-   if( Verbose & V_FILE_IO )
-      printf( "%s:  Openning [%s] for %s", Pname, name, mode?"write":"read" );
-
-   if( fil == NIL(FILE) ) {
-      if( Verbose & V_FILE_IO ) printf( " (fail)\n" );
-      if( err )
-         Fatal( mode ? "Cannot open file %s for write" : "File %s not found",
-        name );
-   }
-   else {
-      if( Verbose & V_FILE_IO ) printf( " (success)\n" );
-      ftab[next_file_slot].file   = fil;
-      ftab[next_file_slot].numb   = Line_number;
-      ftab[next_file_slot++].name = DmStrDup(name);
-      Line_number = 0;
-      _set_inc_depth();
-   }
-
-   DB_RETURN(fil);
-}
-
-
-PUBLIC FILE *
-Closefile()/*
-=============
-   This routine is used to close the last file opened.  This forces make
-   to open files in a last open first close fashion.  It returns the
-   file pointer to the next file on the stack, and NULL if the stack is empty.*/
-{
-   DB_ENTER("Closefile");
-
-   if( !next_file_slot )
-      DB_RETURN( NIL(FILE) );
-
-   if( ftab[--next_file_slot].file != stdin ) {
-      DB_PRINT( "io", ("Closing file in slot %d", next_file_slot) );
-
-      if( Verbose & V_FILE_IO )
-     printf( "%s:  Closing [%s]\n", Pname, ftab[next_file_slot].name );
-
-      fclose( ftab[next_file_slot].file );
-      FREE( ftab[next_file_slot].name );
-   }
-
-   _set_inc_depth();
-
-   if( next_file_slot > 0 ) {
-      Line_number = ftab[next_file_slot].numb;
-      DB_RETURN( ftab[next_file_slot-1].file );
-   }
-   else
-      Line_number = 0;
-
-   DB_RETURN( NIL(FILE) );
-}
-
-
-PUBLIC FILE *
-Search_file( macname, rname )
-char *macname;
-char **rname;
-{
-   HASHPTR hp;
-   FILE *fil = NIL(FILE);
-   char *fname = NIL(char);
-   char *ename = NIL(char);
-
-   /* order of precedence is:
-    *
-    *   MACNAME  from command line (precious is marked)
-    *		 ... via MACNAME:=filename definition.
-    *   MACNAME  from environment
-    *   MACNAME  from builtin rules (not precious)
-    */
-
-   if( (hp = GET_MACRO(macname)) != NIL(HASH) ) {
-     /* Only expand if needed. */
-     if( hp->ht_flag & M_EXPANDED ) {
-       ename = fname = DmStrDup(hp->ht_value);
-     } else {
-       ename = fname = Expand(hp->ht_value);
-     }
-
-     if( hp->ht_flag & M_PRECIOUS ) fil = Openfile(fname, FALSE, FALSE);
-   }
-
-   if( fil == NIL(FILE) ) {
-     fname=Expand(Read_env_string(macname));
-     if( (fil = Openfile(fname, FALSE, FALSE)) != NIL(FILE) ) FREE(ename);
-   }
-
-   if( fil == NIL(FILE) && hp != NIL(HASH) ) {
-     if ( fname != NIL(char) ) { FREE(fname); fname = NIL(char); }
-     fil = Openfile(fname=ename, FALSE, FALSE);
-   }
-
-   if( rname ) *rname = fname;
-
-   return(fil);
-}
-
-
-PUBLIC char *
-Filename()/*
-============
-   Return name of file on top of stack */
-{
-   return( next_file_slot==0 ? NIL(char) : ftab[next_file_slot-1].name );
-}
-
-
-PUBLIC int
-Nestlevel()/*
-=============
-   Return the file nesting level */
-{
-   return( next_file_slot );
-}
-
-
-PUBLIC FILE *
-TryFiles(lp)/*
-==============
-   Try to open a makefile, try to make it if needed and return a
-   filepointer to the first successful found or generated file.
-   The function returns NIL(FILE) if nothing was found. */
-LINKPTR lp;
-{
-   FILE *mkfil = NIL(FILE);
-
-   if( lp != NIL(LINK) ) {
-      int s_n, s_t, s_q;
-
-      s_n = Trace;
-      s_t = Touch;
-      s_q = Check;
-
-      Trace = Touch = Check = FALSE;
-      /* We are making a makefile. Wait for it. */
-      Makemkf = Wait_for_completion = TRUE;
-      mkfil = NIL(FILE);
-
-      for(;  lp != NIL(LINK) && mkfil == NIL(FILE); lp=lp->cl_next) {
-     if( lp->cl_prq->ce_attr & A_FRINGE ) continue;
-
-     mkfil = Openfile( lp->cl_prq->CE_NAME, FALSE, FALSE );
-
-     /* Note that no error handling for failed Make() calls is possible
-      * as expected errors (no rule to make the makefile) or unexpected
-      * errors both return -1. */
-     if( mkfil == NIL(FILE) && Make(lp->cl_prq, NIL(CELL)) != -1 ) {
-        mkfil = Openfile( lp->cl_prq->CE_NAME, FALSE, FALSE );
-        /* Remove flags that indicate that the target was already made.
-         * This is also needed to avoid conflicts with the circular
-         * dependency check in rulparse(), see issues 62118 and 81296
-         * for details. */
-        Unmake(lp->cl_prq);
-     }
-      }
-
-      Trace = s_n;
-      Touch = s_t;
-      Check = s_q;
-      Makemkf = Wait_for_completion = FALSE;
-   }
-
-   return(mkfil);
-}
-
-
-/*
-** print error message from variable arg list
-*/
-
-static int errflg = TRUE;
-static int warnflg = FALSE;
-
-static void
-errargs(fmt, args)
-char    *fmt;
-va_list  args;
-{
-   int warn = _warn && warnflg && !(Glob_attr & A_SILENT);
-
-   if( errflg || warn ) {
-      char *f = Filename();
-
-      fprintf( stderr, "%s:  ", Pname );
-      if( f != NIL(char) ) fprintf(stderr, "%s:  line %d:  ", f, Line_number);
-
-      if( errflg )
-         fprintf(stderr, "Error: -- ");
-      else if( warn )
-         fprintf(stderr, "Warning: -- ");
-
-      vfprintf( stderr, fmt, args );
-      putc( '\n', stderr );
-      if( errflg && !Continue ) Quit(0);
-   }
-}
-
-
-/*
-** Print error message and abort
-*/
-PUBLIC void
-Fatal(ARG(char *,fmt), ARG(va_alist_type,va_alist))
-DARG(char *,fmt)
-DARG(va_alist_type,va_alist)
-{
-   va_list args;
-
-   va_start(args, fmt);
-   Continue = FALSE;
-   errargs(fmt, args);
-   va_end(args);
-}
-
-/*
-** error message and exit (unless -k)
-*/
-PUBLIC void
-Error(ARG(char *,fmt), ARG(va_alist_type,va_alist))
-DARG(char *,fmt)
-DARG(va_alist_type,va_alist)
-{
-   va_list args;
-
-   va_start(args, fmt);
-   errargs(fmt, args);
-   va_end(args);
-}
-
-
-/*
-** non-fatal message
-*/
-PUBLIC void
-Warning(ARG(char *,fmt), ARG(va_alist_type,va_alist))
-DARG(char *,fmt)
-DARG(va_alist_type,va_alist)
-{
-   va_list args;
-
-   va_start(args, fmt);
-   warnflg = TRUE;
-   errflg = FALSE;
-   errargs(fmt, args);
-   errflg = TRUE;
-   warnflg = FALSE;
-   va_end(args);
-}
-
-
-PUBLIC void
-No_ram()
-{
-   Fatal( "No more memory" );
-}
-
-
-PUBLIC void
-Usage( eflag )
-int eflag;
-{
-   register char *p;
-   char *fill;
-
-   fill = DmStrDup(Pname);
-   for(p=fill; *p; p++) *p=' ';
-
-   if( eflag ) {
-      fprintf(stderr, USAGE, Pname);
-      fprintf(stderr, USAGE2, fill);
-   }
-   else {
-   printf(USAGE, Pname);
-   printf(USAGE2, fill);
-   puts("    -P#        - set max number of child processes for parallel make");
-   puts("    -f file    - use file as the makefile");
-#ifdef MSDOS
-   puts("    -C [+]file - duplicate console output to file, ('+' => append)");
-#endif
-   puts("    -K file    - use file as the .KEEP_STATE file");
-   puts("    -w target  - show what you would do if 'target' were out of date");
-   puts("    -W target  - rebuild pretending that 'target' is out of date");
-   puts("    -v[cdfimrtw] - verbose, indicate what we are doing, (-v => -vcdfimrtw)");
-   puts("                   c => dump directory cache info only" );
-   puts("                   d => dump change of directory info only" );
-   puts("                   f => dump file open/close info only" );
-   puts("                   i => dump inference information only" );
-   puts("                   m => dump make of target information only" );
-   puts("                   r => Force output of recipe lines and warnings," );
-   puts("                        overrides -s" );
-   puts("                   t => keep temporary files when done" );
-   puts("                   w => issue non-essential warnings\n" );
-
-   puts("    -m[trae] - Measure timing information, (-m => -mt)");
-   puts("               t => display the start and end time of each target" );
-   puts("               r => display the start and end time of each recipe" );
-   puts("               a => display the target as an absolute path" );
-   puts("               e => display the timing of shell escape macros\n" );
-
-   puts("Options: (can be catenated, ie -irn == -i -r -n)");
-   puts("    -A   - enable AUGMAKE special target mapping");
-   puts("    -B   - enable the use of spaces instead of tabs to start recipes");
-   puts("    -c   - use non standard comment scanning");
-   puts("    -d   - do not use directory cache");
-   puts("    -E   - define environment strings as macros");
-   puts("    -e   - same as -E but done after parsing makefile");
-   puts("    -g   - disable the special meaning of [ ... ] for group recipes");
-   puts("    -h   - print out usage info");
-   puts("    -i   - ignore errors");
-   puts("    -k   - make independent targets, even if errors");
-   puts("    -n   - trace and print, do not execute commands");
-   puts("    -p   - print out a version of the makefile");
-   puts("    -q   - check if target is up to date.  Does not do");
-   puts("           anything.  Returns 0 if up to date, 1 otherwise");
-   puts("    -r   - don't use internal rules");
-   puts("    -s   - do your work silently");
-   puts("    -S   - disable parallel (force sequential) make, overrides -P");
-   puts("    -t   - touch, update time stamps without executing commands");
-   puts("    -T   - do not apply transitive closure on inference rules");
-   puts("    -u   - force unconditional update of target");
-   puts("    -V   - print out version number");
-   puts("    -x   - export macro values to environment");
-   puts("    -X   - ignore #! lines at start of makefile");
-   }
-   FREE(fill);
-
-   Quit(0);
-}
-
-
-PUBLIC void
-Version()
-{
-   extern char **Rule_tab;
-   char **p;
-   
-   printf("%s - Version %s (%s)\n", Pname, VERSION, BUILDINFO);
-   printf("%s\n\n", sccid);
-
-   puts("Default Configuration:");
-   for (p=Rule_tab;  *p != NIL(char);  p++)
-      printf("\t%s\n", *p);
-
-   printf("\n");
-
-#if defined(HAVE_SPAWN_H) || defined(__CYGWIN__)
-   /* Only systems that have spawn ar concerned whether spawn or fork/exec
-    * are used. */
-#if ENABLE_SPAWN
-      printf("Subprocesses are executed using: spawn.\n\n");
-#else
-      printf("Subprocesses are executed using: fork/exec.\n\n");
-#endif
-#endif
-
-      printf("Please read the NEWS file for the latest release notes.\n");
-}
diff --git a/dmake/dmake.h b/dmake/dmake.h
deleted file mode 100644
index 53184d974..000000000
--- a/dmake/dmake.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/* RCS  $Id: dmake.h,v 1.8 2007-10-15 15:38:34 ihi Exp $
---
--- SYNOPSIS
---      Global defines for dmake.
--- 
--- DESCRIPTION
--- 	All the interesting bits and flags that dmake uses are defined here.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_INCLUDED_
-#define _DMAKE_INCLUDED_
-
-#define MAX_INC_DEPTH     10     /* max of ten nested include files      */
-#define MAX_COND_DEPTH    20     /* max nesting level of conditionals    */
-#define ERROR_ABORT_VALUE 254    /* return code of aborted make          */
-#define ERROR_EXIT_VALUE  255    /* return code of failed  make          */
-#define CONTINUATION_CHAR '\\'   /* line continuation \<nl>              */
-#define DEF_ESCAPE_CHAR   '\\'   /* escape char for used chars           */
-#define ESCAPE_CHAR       *Escape_char
-#define COMMENT_CHAR      '#'    /* start of comment chars               */
-#define TGT_DEP_SEP       ':'    /* separator for targets and dependents */
-#define CONDSTART         '.'    /* start of conditional token eg .IF    */
-#define DEF_MAKE_PNAME    "dmake"/* default name to use as name of make  */
-
-
-/* ............... Hashing function constants ......................... */
-#define HASH_TABLE_SIZE  200            /* See hash.c for description    */
-
-
-/* Bit flags for cells and macro definitions. */
-#define M_DEFAULT        0x0000         /* default flag value           */
-#define M_MARK           0x0001         /* mark for circularity checks  */
-#define M_PRECIOUS       0x0002         /* keep macro, same as A_PRE... */
-#define M_MULTI          0x0004         /* multiple redefinitions ok!   */
-#define M_EXPANDED       0x0008         /* macro has been assigned after
-                                         * being completely expanded   */
-#define M_USED           0x0010         /* macro has been used in the
-                                         * makefile. (From another macro
-                                         * or target definition.)       */
-#define M_LITERAL        0x0020         /* don't strip w/s on macro def */
-#define M_NOEXPORT       0x0040         /* don't export macro for -x    */
-#define M_FORCE          0x0080         /* Force a macro redefinition   */
-#define M_PUSH           0x0100         /* Push previous macro defintn  */
-#define M_INIT           0x0200         /* Macro is defined initially or
-                                         * an empty macro implicitly
-                                         * defined when expanding it.   */
-#define M_VAR_BIT        0x1000         /* macro bit variable           */
-#define M_VAR_CHAR       0x2000         /* macro char variable          */
-#define M_VAR_STRING     0x4000         /* macro string variable        */
-#define M_VAR_INT        0x8000         /* macro integer variable       */
-
-#define M_VAR_MASK       0xf000         /* macro variable mask          */
-
-
-
-/* Global and target attribute flag definitions.
- * If you change the values of these or re-order them make appropriate changes
- * in dmdump.c so that the output of dmake -p matches the attribute info for a
- * target. */
-
-#define A_DEFAULT        0x00000        /* default flag value           */
-#define A_PRECIOUS       0x00001        /* object is precious           */
-#define A_SILENT         0x00002        /* don't echo commands          */
-#define A_LIBRARY        0x00004        /* target is an archive         */
-#define A_EPILOG         0x00008        /* insert shell epilog code     */
-#define A_PROLOG         0x00010        /* insert shell prolog code     */
-#define A_IGNORE         0x00020        /* ignore errors                */
-#define A_SYMBOL         0x00040        /* lib member is a symbol       */
-#define A_NOINFER        0x00080        /* no trans closure from cell   */
-#define A_UPDATEALL      0x00100        /* all targets of rule modified */
-#define A_SEQ            0x00200        /* sequential make attribute    */
-/* Reuse the sequential flag to signal Wait_for_completion to Do_cmnd()
- * and related methods of executing a sub process. */
-#define A_WFC              A_SEQ
-#define A_SETDIR         0x00400        /* cd to dir when making target */
-#define A_SHELL          0x00800        /* run the recipe using a shell */
-#define A_SWAP           0x01000        /* Use swap on MSDOS            */
-/* Reuse A_SWAP for the .WINPATH attribute to convert cygwin POSIX paths
- * into DOS style paths. */
-#define A_WINPATH        0x01000        /* Enable dos paths on cygwin   */
-#define A_MKSARGS        0x02000        /* use MKS argument swapping    */
-#define A_PHONY          0x04000        /* .PHONY attribute             */
-#define A_NOSTATE        0x08000        /* don't track state for me     */
-#define A_IGNOREGROUP    0x10000        /* Ignore group recipe          */
-#define A_EXECUTE        0x20000        /* execute this recipe under -n */
-#define A_ERRREMOVE      0x40000        /* remove this target if error  */
-#define MAX_ATTR         A_ERRREMOVE    /* highest valid attribute      */
-#define A_LIBRARYM       0x80000        /* target is an archive member  */
-#define A_FRINGE        0x100000        /* cell is on the fringe        */
-#define A_COMPOSITE     0x200000        /* member of lib(targ) name     */
-#define A_FFNAME        0x400000        /* if set, free ce_fname in stat*/
-#define A_UPDATED       0x800000        /* Used to mark cell as updated */
-#define A_ROOT        0x01000000        /* True if it is a root prereq  */
-#define A_GROUP       0x02000000        /* True if rule is to be a group*/
-#define A_WHATIF      0x04000000        /* used for WHATIF tests        */
-#define A_POOL        0x08000000        /* used for directory pool      */
-#define A_ERROR       0x10000000        /* used to halt construction    */
-#define A_FIRST       0x20000000        /* used for .INCLUDE termination*/
-#define A_SHELLESC    0x40000000        /* used for shell escape target */
-#define A_MUTE        0x80000000        /* silence a recipe line        */
-
-
-/* Global and target bit flag definitions */
-
-#define F_DEFAULT        0x0000         /* default flag value           */
-#define F_MARK           0x0001         /* circularity check mark       */
-#define F_MULTI          0x0002         /* multiple rules for target    */
-#define F_SINGLE         0x0004         /* exec recipes for each out of
-                     * date prerequisite (! ruleop) */
-#define F_TARGET	 0x0008     /* is set if a rule for a target exists.
-                     * Prerequisites do not necessarily need
-                     * to have a rule, in which case F_TARGET
-                     * is not set. */
-#define F_RULES          0x0010         /* indicates target has rules   */
-#define F_GROUP          0x0020         /* indicates that rules are to  */
-                                        /* fed to the shell as a group  */
-
-#define F_TRANS          0x0040         /* same as F_STAT not used tgthr*/
-#define F_STAT           0x0040         /* target already stated        */
-#define F_VISITED        0x0080  /* Used for two different purposes:
-                    make.c: Mark that a target is scheduled
-                    to be made.
-                    rulparse.c: Detect circular
-                    dependencies. */
-#define F_SPECIAL        0x0100         /* marks a special target       */
-#define F_DFA            0x0200         /* bit for marking added DFA    */
-#define F_EXPLICIT       0x0400         /* explicit target in makefile  */
-#define F_PERCENT        0x0800         /* marks a target as a % rule   */
-#define F_REMOVE         0x1000         /* marks an intermediate target */
-#define F_MAGIC          0x2000         /* marks a magic target         */
-#define F_INFER          0x4000         /* target is result of inference*/
-#define F_MADE           0x8000         /* target is currently made     */
-
-
-/* Definitions for the Parser states */
-#define NORMAL_SCAN    0      /* normal processing state */
-#define RULE_SCAN      1      /* scan of rule text       */
-
-/* definitions for macro operator types */
-#define M_OP_EQ   1           /* macro operation is '='   0000 0001 */
-#define M_OP_CL   3           /* macro operation is ':='  0000 0011 */
-#define M_OP_PL   5           /* macro operation is '+='  0000 0101 */
-#define M_OP_DF   9           /* macro operation is '*='  0000 1001 */
-#define M_OP_PLCL 7           /* macro operation is '+:=' 0000 0111 */
-#define M_OP_DFCL 11          /* macro operation is '*:=' 0000 1011 */
-#define M_OP_CM   17          /* macro operation is '?='  0001 0001 */
-#define M_OP_SI   32          /* macro operation is '!'   0010 ---- */
-
-/* definitions for rule operator types */
-#define R_OP_CL   1           /* rule operation is ':'   */
-#define R_OP_DCL  2           /* rule operation is '::'  */
-#define R_OP_BG   4           /* rule operation is ':!'  */
-#define R_OP_UP   8           /* rule operation is ':^'  */
-#define R_OP_MI  16           /* rule operation is ':-'  */
-#define R_OP_OR  32           /* rule operation is ':|'  */
-
-/* definitions for modifier application in Apply_modifiers in expand.c */
-#define SUFFIX_FLAG       1   /* defines for macro modifier code */
-#define DIRECTORY_FLAG    2
-#define FILE_FLAG         4
-#define WHOLENAME_FLAGS   7
-#define TOLOWER_FLAG      8
-#define TOUPPER_FLAG     16
-#define INFNAME_FLAG     32
-#define JUST_FIRST_FLAG  64
-#define NORMPATH_FLAG   128
-
-/* special target definitions for use inside dmake */
-#define ST_IF           1
-#define ST_ELSE         2
-#define ST_END          3
-#define ST_REST         4       /* remaining special targets */
-#define ST_INCLUDE      5
-#define ST_SOURCE       7
-#define ST_EXPORT       8
-#define ST_IMPORT       9
-#define ST_ELIF        10
-#define ST_KEEP        11
-#define ST_EXIT        12
-#define ST_IFEQ        13
-#define ST_IFNEQ       14
-
-/* Flags for controling use of -v switch */
-#define V_NOFLAG        0x00   /* V_NONE is used in MinGW w32api/oleauto.h */
-#define V_LEAVE_TMP     0x01
-#define V_DIR_SET       0x02
-#define V_DIR_CACHE     0x04
-#define V_INFER         0x08
-#define V_MAKE          0x10
-#define V_FILE_IO       0x20
-#define V_WARNALL       0x40
-#define V_FORCEECHO     0x80
-#define V_ALL           (V_LEAVE_TMP | V_DIR_SET | V_INFER | V_MAKE |\
-                       V_FILE_IO | V_DIR_CACHE | V_WARNALL | V_FORCEECHO)
-
-/* Flags for controling use of -m switch */
-#define M_NOFLAG        0x00
-#define M_TARGET        0x01
-#define M_RECIPE        0x02
-#define M_ABSPATH       0x04
-#define M_SHELLESC      0x08
-#define M_ALL           (M_TARGET | M_RECIPE | M_ABSPATH | M_SHELLESC)
-
-/* Macro definitions for use inside dmake */
-#define SET_TOKEN(A, B)  (A)->tk_str = (B);\
-                        (A)->tk_cchar = *(B);\
-                        (A)->tk_quote = 1;
-
-#define CLEAR_TOKEN(A)   *(A)->tk_str = (A)->tk_cchar
-#define GET_MACRO(A)     Get_name(A, Macs, FALSE)
-#define iswhite(C)       ((C == ' ') || (C == '\t'))
-#define STOBOOL(A)       (A && ((*A | 0x20) == 'y'))
-
-#endif
-
diff --git a/dmake/dmakeroot.h.in b/dmake/dmakeroot.h.in
deleted file mode 100644
index fe597de23..000000000
--- a/dmake/dmakeroot.h.in
+++ /dev/null
@@ -1,6 +0,0 @@
-	/* dmakeroot.h
-	 *
-	 * This is a generated file.  Please modify `configure.in'
-	 */
-
-@DMAKEROOT_H_LINE1@
diff --git a/dmake/dmdump.c b/dmake/dmdump.c
deleted file mode 100644
index 571340fa2..000000000
--- a/dmake/dmdump.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* RCS  $Id: dmdump.c,v 1.4 2007-06-12 06:05:11 obo Exp $
---
--- SYNOPSIS
---      Dump the internal dag to stdout.
--- 
--- DESCRIPTION
---	This file contains the routine that is called to dump a version of
---	the digested makefile to the standard output.  May be useful perhaps
---	to the ordinary user, and invaluable for debugging make.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-#define M_TEST	(M_PRECIOUS | M_VAR_MASK)
-
-static	void	dump_name ANSI((CELLPTR, int, int));
-static	void	dump_normal_target ANSI((CELLPTR, CELLPTR, int));
-static  void    dump_prerequisites ANSI((LINKPTR, CELLPTR, int, int, int));
-static  void    dump_conditionals ANSI((CELLPTR,STRINGPTR,int,int));
-static  void    dump_macro ANSI((HASHPTR, int));
-
-
-PUBLIC void
-Dump()/*
-========  Dump onto standard output the digested makefile.  Note that
-      the form of the dump is not representative of the contents
-      of the original makefile contents at all */
-{
-   HASHPTR      hp;
-   int          i;
-
-   DB_ENTER( "Dump" );
-
-   puts( "# Dump of dmake macro variables:" );
-   for( i=0; i<HASH_TABLE_SIZE; i++)
-      for( hp=Macs[i]; hp != NIL(HASH); hp = hp->ht_next ) {
-     int flag = hp->ht_flag;
-     dump_macro(hp, flag);
-      }
-
-   puts( "\n#====================================" );
-   puts( "# Dump of targets:\n" );
-
-   for( i=0; i<HASH_TABLE_SIZE; i++ )
-      for( hp = Defs[i]; hp != NIL(HASH); hp = hp->ht_next )
-         if( !(hp->CP_OWNR->ce_flag & F_PERCENT) ) {
-        if( hp->CP_OWNR == Root )
-           puts( "# ******* ROOT TARGET ********" );
-        if (Targets->ce_prq && hp->CP_OWNR == Targets->ce_prq->cl_prq)
-           puts( "# ******* FIRST USER DEFINED TARGET ******" );
-        dump_normal_target( hp->CP_OWNR,NIL(CELL),hp->CP_OWNR->ce_flag);
-     }
-
-   puts( "\n#====================================" );
-   puts( "# Dump of inference graph\n" );
-
-   for( i=0; i<HASH_TABLE_SIZE; i++ )
-      for( hp = Defs[i]; hp != NIL(HASH); hp = hp->ht_next )
-         if( (hp->CP_OWNR->ce_flag & F_PERCENT) &&
-        !(hp->CP_OWNR->ce_flag & F_MAGIC) )
-        dump_normal_target(hp->CP_OWNR,NIL(CELL),hp->CP_OWNR->ce_flag);
-
-   DB_VOID_RETURN;
-}
-
-
-
-PUBLIC void
-Dump_recipe( sp )/*
-===================
-   Given a string pointer print the recipe line out */
-STRINGPTR sp;
-{
-   char *st;
-   char *nl;
-
-   if( sp == NIL(STRING) ) return;
-
-   putchar( '\t' );
-   if( sp->st_attr & A_SILENT ) putchar( '@' );
-   if( sp->st_attr & A_IGNORE ) putchar( '-' );
-   if( sp->st_attr & A_SHELL  ) putchar( '+' );
-   if( sp->st_attr & A_SWAP   ) putchar( '%' );
-
-   st = sp->st_string;
-   for( nl=strchr(st,'\n'); nl != NIL( char); nl=strchr(st,'\n') ) {
-      *nl = '\0';
-      printf( "%s\\\n", st );
-      *nl = '\n';
-      st  = nl+1;
-   }
-   printf( "%s\n", st );
-}
-
-
-static char *_attrs[] = { ".PRECIOUS", ".SILENT", ".LIBRARY",
-   ".EPILOG", ".PROLOG", ".IGNORE", ".SYMBOL", ".NOINFER",
-   ".UPDATEALL", ".SEQUENTIAL", ".SETDIR=", ".USESHELL",
-#if defined(MSDOS)
-   ".SWAP",
-#else
-# if defined(__CYGWIN__)
-   ".WINPATH",
-# else
-   "- unused -",
-# endif
-#endif
-   ".MKSARGS",
-   ".PHONY", ".NOSTATE", ".IGNOREGROUP", ".EXECUTE", ".ERRREMOVE" };
-
-static void
-dump_normal_target( cp, namecp, flag )/*
-========================================
-    Dump in makefile like format the dag information */
-CELLPTR cp;
-CELLPTR namecp;
-int     flag;
-{
-   register STRINGPTR sp;
-   t_attr	      attr;
-   unsigned int	      k;
-
-   DB_ENTER( "dump_normal_target" );
-
-   if(!(cp->ce_flag & F_TARGET) && !cp->ce_attr && !cp->ce_prq) {
-      DB_VOID_RETURN;
-   }
-
-   if(cp->ce_set && cp->ce_set != cp) {
-      DB_VOID_RETURN;
-   }
-
-   if( cp->ce_flag & F_MULTI ) {
-      /* recursively print multi or %-targets. */
-      int tflag = cp->ce_prq->cl_prq->ce_flag;
-      if( !(cp->ce_flag & F_PERCENT) ) tflag |= F_MULTI;
-      dump_conditionals(cp, cp->ce_cond, TRUE, TRUE);
-      putchar('\n');
-
-#ifdef DBUG
-      /* Output also master targtet. (Only in debug builds) */
-      printf("Master name(s) (DBUG build): ");
-      dump_name(cp, FALSE, TRUE );
-      putchar('\n');
-#endif
-
-      /* %-targets set namecp (3rd parameter) to NULL so that the next
-       * recursive dump_normal_target() prints the name of cp->ce_prq->cl_prq
-       * instead of cp.  This should be the same unless CeMeToo(cp) points
-       * to a cell that is the head of an .UPDATEALL list. */
-      dump_prerequisites(cp->ce_prq,(cp->ce_flag&F_PERCENT)?NIL(CELL):cp,
-             FALSE, TRUE, tflag);
-   }
-   else {
-      dump_name(namecp?namecp:cp, FALSE, TRUE );
-
-      for( k=0, attr=1; attr <= MAX_ATTR; attr <<= 1, k++ )
-     if( cp->ce_attr & attr ) {
-        printf( "%s%s ", _attrs[k],
-            (attr != A_SETDIR) ? "" : (cp->ce_dir?cp->ce_dir:"") );
-     }
-
-      putchar( ':' );
-
-      if( flag & F_MULTI )  putchar( ':' );
-      if( flag & F_SINGLE ) putchar( '!' );
-      putchar( ' ' );
-
-      dump_prerequisites( cp->ce_prq, NIL(CELL), FALSE, FALSE, F_DEFAULT);
-      dump_prerequisites( cp->ce_indprq, NIL(CELL),TRUE, FALSE, F_DEFAULT);
-
-      putchar( '\n' );
-      if( cp->ce_flag & F_GROUP ) puts( "[" );
-      for( sp = cp->ce_recipe; sp != NIL(STRING); sp = sp->st_next )
-     Dump_recipe( sp );
-      if( cp->ce_flag & F_GROUP ) {
-     puts( "]" );
-     putchar( '\n' );
-      }
-      dump_conditionals(cp, cp->ce_cond, flag&F_MULTI, FALSE);
-      putchar('\n');
-   }
-
-   DB_VOID_RETURN;
-}
-
-
-static void
-dump_conditionals( cp, sp, multi, global )
-CELLPTR     cp;
-STRINGPTR   sp;
-int         multi;
-int         global;
-{
-   if (sp) {
-      dump_name(cp, FALSE, TRUE);
-      printf(".%sCONDITIONALS %s\n", global?"GLOBAL":"",multi?"::":":");
-
-      while(sp) {
-     printf("\t%s\n",sp->st_string);
-     sp=sp->st_next;
-      }
-   }
-}
-
-
-static void
-dump_macro(hp, flag)
-HASHPTR hp;
-int     flag;
-{
-   printf( "%s ", hp->ht_name );
-   if(flag & M_EXPANDED)
-      putchar( ':' );
-
-   printf( "= " );
-   if(hp->ht_value != NIL(char))
-      printf( "%s",hp->ht_value );
-
-   if(flag & M_PRECIOUS)
-      printf( "\t # PRECIOUS " );
-
-   putchar( '\n' );
-}
-
-
-static void
-dump_prerequisites( lp, namecp, quote, recurse, flag )/*
-========================================================
-   Dump as prerequisites if recurse is FALSE or as targets
-   if recurse is TRUE. (For F_MULTI/F_PERCENT targets.) */
-LINKPTR lp;
-CELLPTR namecp;
-int     quote;
-int     recurse;
-int     flag;
-{
-   for( ; lp; lp=lp->cl_next )
-      if( recurse )
-     dump_normal_target(lp->cl_prq, namecp, flag);
-      else if( lp->cl_prq )
-     dump_name(lp->cl_prq, quote, FALSE);
-}
-
-
-static void
-dump_name( cp, quote, all )/*
-=============================
-   Prints out the first or all (if all is TRUE) names of an lcell list.
-   If quote is true enclose in ' quotes, if quote
-   is FALSE and the name includes a space enclose in " quotes. */
-CELLPTR cp;
-int     quote;
-int     all;
-{
-   LINKPTR lp;
-   char qc = '\'';
-
-   for(lp=CeMeToo(cp);lp;lp=lp->cl_next) {
-      if( !quote && strchr(lp->cl_prq->CE_NAME,' ') != NIL(char)) {
-         quote = TRUE;
-         qc = '"';
-      }
-
-      if (quote) putchar(qc);
-      printf( "%s", lp->cl_prq->CE_NAME );
-      if (quote) putchar(qc);
-      putchar(' ');
-      if (!all) break;
-   }
-}
diff --git a/dmake/dmstring.c b/dmake/dmstring.c
deleted file mode 100644
index c64f503d6..000000000
--- a/dmake/dmstring.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* RCS  $Id: dmstring.c,v 1.2 2007-01-18 09:29:40 vg Exp $
---
--- SYNOPSIS
---      String handling code
--- 
--- DESCRIPTION
---	Routines to handle string manipulation.  This code is not specific
---	to dmake and has/and will be used in other programs.  The string
---	"" is considered the NULL string, if NIL(char) is received instead
---	undefined results may occurr.  (In reality NIL(char) is checked for
---	but in general it is not safe to assume NIL(char) ==  NULL)
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-PUBLIC char *
-DmStrJoin( src, data, n, fr )/*
-===============================
-   Join data to src according to value of n.
-
-      n = -1   - return strcat( src, data )
-      n >= 0   - return strncat( src, data, n )
-
-   FREE original src if fr == TRUE, else leave it alone */
-
-char *src;
-char *data;
-int  n;
-int  fr;
-{
-   char *t;
-   int  l;
-   int  flag = FALSE;
-
-   DB_ENTER( "DmStrJoin" );
-   
-   if( src  == NIL(char) ) { src = ""; flag = TRUE; }
-   if( data == NIL(char) ) data = "";
-   DB_PRINT( "str", ("Joining [%s] [%s] %d", src, data, n) );
-
-   if( n == -1 )  n = strlen( data );
-
-   l = strlen( src ) + n + 1;
-   if( (t = MALLOC( l, char )) == NIL(char) ) No_ram();
-
-   strcpy( t, src );
-   if (n) strncat( t, data, n );
-   t[ l-1 ] = '\0';
-
-   if( !flag && fr ) FREE( src );
-
-   DB_PRINT( "str", ("Result  [%s]", t) );
-   DB_RETURN( t );
-}
-
-
-
-
-PUBLIC char *
-DmStrAdd( src, data, fr )/*
-===========================
-   append data to src with space in between if src is not NIL(char) or ""
-   and free both src and data if fr == TRUE, otherwise leave them be */
-
-char *src;
-char *data;
-int  fr;
-{
-   char *t;
-   int  l;
-   int  sflag;
-   int  dflag;
-
-   DB_ENTER( "DmStrAdd" );
-
-   sflag = dflag = fr;
-
-   if( src  == NIL(char) ) { src  = ""; sflag = FALSE; }
-   if( data == NIL(char) ) { data = ""; dflag = FALSE; }
-   DB_PRINT( "str", ("Adding [%s] [%s] %d", src, data, fr) );
-
-   l = strlen(src) + strlen(data) + 1;
-   if( *src ) l++;
-
-   if( (t = MALLOC( l, char )) == NIL(char) ) No_ram();
-
-   strcpy( t, src );
-   
-   if( *data )
-   {
-      if( *src ) strcat( t,  " " );
-      strcat( t, data );
-   }
-
-   if( sflag )  FREE( src  );
-   if( dflag )  FREE( data );
-
-   DB_PRINT( "str", ("Result  [%s]", t) );
-   DB_RETURN( t );
-}
-
-
-
-PUBLIC char *
-DmStrApp( src1, src2 )/*
-========================
-   Append two strings together, and return the result with a space between
-   the two strings.  FREE the first string if it is not NIL and always
-   leave the second string be. */
-char *src1;
-char *src2;
-{
-   src2 = DmStrAdd( src1, src2, FALSE );
-   if( src1 != NIL(char) ) FREE( src1 );
-   return( src2 );
-}
-
-
-PUBLIC char *
-DmStrDup( str )/*
-=================  Duplicate the contents of a string, by using malloc */
-char *str;
-{
-   char *t;
-
-   if( str == NIL(char) ) return( NIL(char) );
-   
-   if( (t = MALLOC( strlen( str )+1, char )) == NIL(char) ) No_ram();
-   strcpy( t, str );
-
-   return( t );
-}
-
-
-
-PUBLIC char *
-DmStrDup2( str )/*
-==================
-   This function is used solely to properly quote command line arguments when
-   they are reinserted int MAKEMACROS so that they can be used further in
-   a processing line. */
-char *str;
-{
-   char *t;
-   size_t size;
-   size_t alloced;
-   char *tmp;
-   char *dest;
-   int seen_equal = 0;
-
-   if(str == NIL(char)) return(NIL(char));
-   size = strlen(str) + 1;
-   alloced = size + 2;		/* for two quotes */
-
-   for(tmp = str; *tmp; tmp++)
-      if(*tmp == '"')
-         alloced++;
-
-   if((t = MALLOC(alloced, char)) == NIL(char)) No_ram();
-
-   for(tmp = str, dest = t; *tmp; tmp++, dest++) {
-      if(*tmp == '=' && !seen_equal) {
-     seen_equal = 1;
-     *dest++ = *tmp;
-     *dest = '"';
-     continue;
-      }
-      if(*tmp == '"')
-     *dest++ = '\\';
-      *dest = *tmp;
-   }
-
-   if(!seen_equal)
-      Fatal("DmStrDup2 invoked without argument of form x=y\n");
-
-   *dest++ = '"';
-   *dest = 0;
-
-   return t;
-}
-
-
-
-PUBLIC char *
-DmStrPbrk( s1, s2 )/*
-====================
-   find first occurrence of char in s2 in string s1.
-   Returns a pointer to the first occurrence.  NOTE '\0' is considered part
-   of s2 and a pointer to it is returned if no other chars match. */
-
-char *s1;
-char *s2;
-{
-   register char *t;
-
-   if( s1 == NIL(char) || s2 == NIL(char) ) return( "" );
-
-   for( t=s1; *t && (strchr( s2, *t ) == NIL(char)); t++ );
-   return( t );
-}
-
-
-
-
-PUBLIC char *
-DmStrSpn( s1, s2 )/*
-====================
-   return pointer to first char in s1 that does not belong to s2.
-   Returns the pointer if match found, else returns pointer to null char
-   in s1. (ie. "" ) */
-   
-char *s1;
-char *s2;
-{
-   register char *t;
-
-   if( s1 == NIL(char) || s2 == NIL(char) ) return( "" );
-
-   for( t=s1; *t && (strchr( s2, *t ) != NIL(char)); t++ );
-   return( t );
-}
-
-
-
-
-PUBLIC char *
-DmStrStr( s1, s2 )/*
-====================  find first occurrence in s1 of s2 */
-char *s1;
-char *s2;
-{
-   register char *s;
-   register char *p;
-   register char *r;
-
-   if( s1 != NIL(char) && s2 != NIL(char) )
-      for( s=s1; *s; s++ )
-     if( *s == *s2 )
-     {
-        for( r=s+1, p = s2+1; *p && (*r == *p); r++, p++ );
-        if( !*p ) return( s );
-     }
-   
-   return( NIL(char) );
-}
-
-
-
-PUBLIC char *
-DmSubStr( s, e )/*
-==================
-      Return the string between the two pointers s and e, not including the
-      char that e points to.  NOTE:  This routine assumes that s and e point
-      into the same string. */
-
-char *s;
-char *e;
-{
-   char save;
-   int  len = e-s;
-
-   if( len < 0 || len > strlen(s) )
-      Fatal( "Internal Error:  SubStr fails consistency test" );
-
-   save = *e;
-   *e   = '\0';
-   s    = DmStrDup( s );
-   *e   = save;
-
-   return( s );
-}
-
-
-/* Provide "missing" string function. */
-#ifndef HAVE_STRLWR
-char *
-strlwr(char *s)
-{
-   char *p;
-   for(p=s; *p; p++ )
-      *p = tolower(*p);
-   return s;
-}
-#endif
diff --git a/dmake/dstdarg.h b/dmake/dstdarg.h
deleted file mode 100644
index d9c7260a6..000000000
--- a/dmake/dstdarg.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* RCS  $Id: dstdarg.h,v 1.1.1.1 2000-09-22 15:33:25 hr Exp $
---
--- SYNOPSIS
--- 
--- DESCRIPTION
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-#include <stdarg.h>
-
-#define ARG(a,b)  a
-
-#if __STDC__ || defined(__TURBOC__) || defined(__IBMC__)
-#  define va_alist_type ...
-#  ifdef va_alist
-#    undef va_alist
-#  endif
-#  define va_alist
-#  define DARG(a,b)
-#else
-#  ifdef va_alist
-#    define va_alist_type int
-#    define DARG(a,b) a b;
-#  else
-#    define va_alist_type ...
-#    define va_alist
-#    define DARG(a,b)
-#  endif
-#endif
diff --git a/dmake/expand.c b/dmake/expand.c
deleted file mode 100644
index 8ce045614..000000000
--- a/dmake/expand.c
+++ /dev/null
@@ -1,1204 +0,0 @@
-/* $RCSfile: expand.c,v $
--- $Revision: 1.8 $
--- last change: $Author: ihi $ $Date: 2007-10-15 15:38:46 $
---
--- SYNOPSIS
---      Macro expansion code.
--- 
--- DESCRIPTION
---
---	This routine handles all the necessary junk that deals with macro
---	expansion.  It understands the following syntax.  If a macro is
---	not defined it expands to NULL, and {} are synonyms for ().
---
---		$$      - expands to $
---		{{      - expands to {
---	        }}      - expands to }
---		$A      - expands to whatever the macro A is defined as
---		$(AA)   - expands to whatever the macro AA is defined as
---		$($(A)) - represents macro indirection
---		<+...+> - get mapped to $(mktmp ...)
---	
---        following macro is recognized
---        
---                string1{ token_list }string2
---                
---        and expands to string1 prepended to each element of token_list and
---        string2 appended to each of the resulting tokens from the first
---        operation.  If string2 is of the form above then the result is
---        the cross product of the specified (possibly modified) token_lists.
---        
---        The folowing macro modifiers are defined and expanded:
---        
---               $(macro:modifier_list:modifier_list:...)
---               
---        where modifier_list a combination of:
---        
---               D or d      - Directory portion of token including separator
---               F or f      - File portion of token including suffix
---               B or b      - basename portion of token not including suffix
---               E or e      - Suffix portion of name
---               L or l	     - translate to lower case
---               U or u      - translate to upper case
---               I or i	     - return inferred names
---               N or n	     - return normalized paths
---               1           - return the first white space separated token
---
---	  or a single one of:
---               M or m      - map escape codes
---               S or s      - pattern substitution (simple)
---               T or t      - for tokenization
---               ^           - prepend a prefix to each token
---               +           - append a suffix to each token
---               
---        NOTE:  Modifiers are applied once the macro value has been found.
---               Thus the construct $($(test):s/joe/mary/) is defined and
---               modifies the value of $($(test))
---
---	       Also the construct $(m:d:f) is not the same as $(m:df)
---	       the first applies d to the value of $(m) and then
---	       applies f to the value of that whereas the second form
---	       applies df to the value of $(m).
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-/* Microsoft BRAINDAMAGE ALERT!!!!
- * This #ifdef is here only to satisfy stupid bugs in MSC5.0 and MSC5.1
- * it isn't needed for anything else.  It turns loop optimization off. */
-#if defined(_MSV_VER) && _MSC_VER < 600 
-#include "optoff.h"
-#endif
-
-static	char*	_scan_macro ANSI((char*, char**, int));
-static	char*	_scan_brace ANSI((char*, char**, int*));
-static	char*	_cross_prod ANSI((char*, char*));
-
-#if !defined(__GNUC__) && !defined(__IBMC__)
-static  char*   _scan_ballanced_parens ANSI((char*, char));
-#else
-static  char*   _scan_ballanced_parens ANSI((char*, int));
-#endif
-
-
-PUBLIC char *
-Expand( src )/*
-===============
-      This is the driver routine for the expansion, it identifies non-white
-      space tokens and gets the ScanToken routine to figure out if they should
-      be treated in a special way. */
-
-char *src;                    /* pointer to source string  */
-{
-   char  *tmp;		      /* pointer to temporary str  */
-   char  *res;                /* pointer to result string  */
-   char  *start;              /* pointer to start of token */
-   
-   DB_ENTER( "Expand" );
-   DB_PRINT( "exp", ("Expanding [%s]", src) );
-
-   res = DmStrDup( "" );
-   if( src == NIL(char) ) DB_RETURN( res );
-
-   while( *src ) {
-      char *ks, *ke;
-
-      /* Here we find the next non white space token in the string
-       * and find it's end, with respect to non-significant white space. */
-      
-#if !defined( _MPW) && !defined(__EMX__)
-      start = DmStrSpn( src, " \t\n" );
-#else
-      start = DmStrSpn( src, " \t\r\n" );
-#endif
-
-      res   = DmStrJoin( res, src, start-src, TRUE );
-      if( !(*start) ) break;
-
-      /* START <+...+> KLUDGE */
-      if(   (ks=DmStrStr(start,"<+")) != NIL(char)
-            && (ke=DmStrStr(ks,"+>")) != NIL(char) ) {
-        char *t1, *t2;
-
-        res = DmStrJoin( res, t2=Expand(t1=DmSubStr(start,ks)), -1, TRUE);
-        FREE(t1); FREE(t2);
-
-        t1 = DmSubStr(ks+2, ke+1); t1[ke-ks-2] = ')';
-        t2 = DmStrJoin( "$(mktmp ", t1, -1,FALSE);
-        FREE(t1);
-        res = DmStrJoin( res, t1=Expand(t2), -1, TRUE);
-        FREE(t1); FREE(t2);
-        src = ke+2;
-      }
-      /* END <+...+> KLUDGE */
-      else {
-        res   = DmStrJoin( res, tmp = ScanToken(start,&src,TRUE), -1, TRUE );
-        FREE( tmp );
-      }
-   }
-   
-   DB_PRINT( "exp", ("Returning [%s]", res) );
-   DB_RETURN( res );
-}
-
-
-PUBLIC char *
-Apply_edit( src, pat, subst, fr, anchor )/*
-===========================================
-   Take the src string and apply the pattern substitution.  ie. look for
-   occurrences of pat in src and replace each occurrence with subst.  This is
-   NOT a regular expressions pattern substitution, it's just not worth it.
-   
-   if anchor == TRUE then the src pattern match must be at the end of a token.
-   ie. this is for SYSV compatibility and is only used for substitutions of
-   the caused by $(macro:pat=sub).  So if src = "fre.o.k june.o" then
-   $(src:.o=.a) results in "fre.o.k june.a", and $(src:s/.o/.a) results in
-   "fre.a.k june.a" */
-
-char *src;			/* the source string */
-char *pat;			/* pattern to find   */
-char *subst;			/* substitute string */
-int   fr;			/* if TRUE free src  */
-int   anchor;			/* if TRUE anchor    */
-{
-   char *res;
-   char *p;
-   char *s;
-   int   l;
-
-   DB_ENTER( "Apply_edit" );
-   
-   /* do nothing if pat is NULL or pat and subst are equal */
-   if( !*pat || !strcmp(pat,subst) ) DB_RETURN( src );
-
-   DB_PRINT( "mod", ("Source str:  [%s]", src) );
-   DB_PRINT( "mod", ("Replacing [%s], with [%s]", pat, subst) );
-
-   /* FIXME: This routine is used frequently and has room for optimizations */
-   s   = src;
-   l   = strlen( pat );
-   if( (p = DmStrStr( s, pat )) != NIL(char) ) {
-      res = DmStrDup( "" );
-      do {
-     if( anchor )
-        if( !*(p+l) || (strchr(" \t", *(p+l)) != NIL(char)) )
-           res = DmStrJoin( DmStrJoin(res,s,p-s,TRUE), subst, -1, TRUE );
-        else
-           res = DmStrJoin( res, s, p+l-s, TRUE );
-     else
-        res = DmStrJoin( DmStrJoin(res,s,p-s,TRUE), subst, -1, TRUE );
-
-     s   = p + l;
-      }
-      while( (p = DmStrStr( s, pat )) != NIL(char) );
-
-      res = DmStrJoin( res, s, -1, TRUE );
-      if( fr ) FREE( src );
-   }
-   else
-      res = src;
-
-
-   DB_PRINT( "mod", ("Result [%s]", res) );
-   DB_RETURN( res );
-}
-
-
-PUBLIC void
-Map_esc( tok )/*
-================
-   Map an escape sequence and replace it by it's corresponding character
-   value.  It is assumed that tok points at the initial \, the esc
-   sequence in the original string is replaced and the value of tok
-   is not modified. */
-char *tok;
-{
-   if( strchr( "\"\\vantbrf01234567", tok[1] ) ) {
-      size_t len;
-      switch( tok[1] ) {
-     case 'a' : *tok = 0x07; break;
-     case 'b' : *tok = '\b'; break;
-     case 'f' : *tok = '\f'; break;
-     case 'n' : *tok = '\n'; break;
-     case 'r' : *tok = '\r'; break;
-     case 't' : *tok = '\t'; break;
-     case 'v' : *tok = 0x0b; break;
-     case '\\': *tok = '\\'; break;
-     case '\"': *tok = '\"'; break;
-
-     default: {
-        register int i = 0;
-        register int j = 0;
-        for( ; i<2 && isdigit(tok[2]); i++ ) {
-           j = (j << 3) + (tok[1] - '0');
-           len = strlen(tok+2)+1;
-           memmove( tok+1, tok+2, len );
-        }
-        j = (j << 3) + (tok[1] - '0');
-        *tok = j;
-     }
-      }
-      len = strlen(tok+2)+1;
-      memmove( tok+1, tok+2, len );
-   }
-}
-
-
-PUBLIC char*
-Apply_modifiers( mod, src )/*
-=============================
-   This routine applies the appropriate modifiers to the string src
-   and returns the proper result string */
-
-int  mod;
-char *src;
-{
-   char	   *s;
-   char    *e;
-   char    *res;
-   TKSTR   str;
-
-   DB_ENTER( "Apply_modifiers" );
-
-   if ( mod & INFNAME_FLAG ) {
-      SET_TOKEN( &str, src );
-      e = NIL(char);
-
-      while( *(s = Get_token( &str, "", FALSE )) != '\0' ) {
-     HASHPTR hp;
-
-     if ( (hp = Get_name(normalize_path(s), Defs, FALSE)) != NIL(HASH) 
-       && hp->CP_OWNR
-       && hp->CP_OWNR->ce_fname
-     ) {
-        res = hp->CP_OWNR->ce_fname;
-     }
-     else
-        res = s;
-
-     if(str.tk_quote == 0) {
-        /* Add leading quote. */
-        e = DmStrApp(e, "\"");
-        e = DmStrJoin(e, res, -1, TRUE);
-        /* Append the trailing quote. */
-        e = DmStrJoin(e, "\"", 1, TRUE);
-     } else {
-        e = DmStrApp(e, res);
-     }
-
-      }
-
-      FREE(src);
-      src = e;
-      mod &= ~INFNAME_FLAG;
-   }
-
-   if ( mod & NORMPATH_FLAG ) {
-      e = exec_normpath(src);
-
-      FREE(src);
-      src = e;
-      mod &= ~NORMPATH_FLAG;
-   }
-
-   if(mod & (TOLOWER_FLAG|TOUPPER_FLAG) ) {
-      int lower;
-      lower = mod & TOLOWER_FLAG;
-
-      for (s=src; *s; s++) 
-     if ( isalpha(*s) )
-        *s = ((lower) ? tolower(*s) : toupper(*s));
-
-      mod &= ~(TOLOWER_FLAG|TOUPPER_FLAG);
-   }
-
-   if (mod & JUST_FIRST_FLAG) {
-      SET_TOKEN(&str, src);
-      if ((s = Get_token(&str,"",FALSE)) != '\0') {
-     /* Recycle the quote at the beginning. */
-     if(str.tk_quote == 0) {
-        s--;
-     }
-         e = DmStrDup(s);
-     /* Add trailing quote. */
-     if(str.tk_quote == 0) {
-        e = DmStrJoin(e, "\"", 1, TRUE);
-     }
-
-         CLEAR_TOKEN(&str);
-         FREE(src);
-         src = e;
-      }
-      else {
-         CLEAR_TOKEN(&str);
-      }
-      mod &= ~JUST_FIRST_FLAG;
-   }
-
-   if( !mod || mod == (SUFFIX_FLAG | DIRECTORY_FLAG | FILE_FLAG) )
-      DB_RETURN( src );
-
-   SET_TOKEN( &str, src );
-   DB_PRINT( "mod", ("Source string [%s]", src) );
-   res = DmStrDup("");
-
-   while( *(s = Get_token( &str, "", FALSE )) != '\0' ) {
-      char *tokstart = s;
-
-      /* search for the directory portion of the filename.  If the
-       * DIRECTORY_FLAG is set, then we want to keep the directory portion
-       * othewise throw it away and blank out to the end of the token */
-
-      if( (e = Basename(s)) != s) {
-     if( !(mod & DIRECTORY_FLAG) ) {
-        /* Move the basename to the start. */
-        size_t len = strlen(e)+1;
-        memmove(s, e, len);
-     }
-     else
-        s = e;
-      }
-      /* s now points to the start of the basename. */
-
-
-      /* search for the suffix, if there is none, treat it as a NULL suffix.
-       * if no file name treat it as a NULL file name.  same copy op as
-       * for directory case above */
-
-      e = strrchr( s, '.' );			/* NULL suffix if e=0 */
-      if( e == NIL(char) ) e = s+strlen(s);
-
-      if( !(mod & FILE_FLAG) ) {
-     /* Move the suffix to the start. */
-     size_t len = strlen(e)+1;
-         memmove(s, e, len);
-      }
-      else
-     s = e;
-
-      /* s now points to the start of the suffix. */
-
-
-      /* The last and final part.  This is the suffix case, if we don't want
-       * it then just erase it. */
-
-      if( s != NIL(char) )
-     if( !(mod & SUFFIX_FLAG) && s != str.tk_str )
-        *s = '\0';
-
-
-      /* only keep non-empty tokens. (This also discards empty quoted ""
-       * tokens.) */
-      if( strlen(tokstart) ) {
-     /* Recycle the quote at the beginning. */
-     if(str.tk_quote == 0) {
-        tokstart--;
-     }
-     res = DmStrApp(res, tokstart);
-     /* Add trailing quote. */
-     if(str.tk_quote == 0) {
-        res = DmStrJoin(res, "\"", 1, TRUE);
-     }
-      }
-   }
-
-   FREE(src);
-   src = res;
-
-
-   DB_PRINT( "mod", ("Result string [%s]", src) );
-   DB_RETURN( src );
-}
-
-
-PUBLIC char*
-Tokenize( src, separator, op, mapesc )/*
-========================================
-    Tokenize the input of src and join each token found together with
-    the next token separated by the separator string.
-
-    When doing the tokenization, <sp>, <tab>, <nl>, and \<nl> all
-    constitute white space. */
-
-char *src;
-char *separator;
-char op;
-int  mapesc;
-{
-   TKSTR	tokens;
-   char		*tok;
-   char		*res;
-   int		first = (op == 't' || op == 'T');
-
-   DB_ENTER( "Tokenize" );
-
-   /* map the escape codes in the separator string first */
-   if ( mapesc )
-      for(tok=separator; (tok = strchr(tok,ESCAPE_CHAR)) != NIL(char); tok++)
-     Map_esc( tok );
-
-   DB_PRINT( "exp", ("Separator [%s]", separator) );
-
-   /* By default we return an empty string */
-   res = DmStrDup( "" );
-
-   /* Build the token list */
-   SET_TOKEN( &tokens, src );
-   while( *(tok = Get_token( &tokens, "", FALSE )) != '\0' ) {
-      char *x;
-
-      if( first ) {
-     FREE( res );
-     res   = DmStrDup( tok );
-     first = FALSE;
-      }
-      else if (op == '^') {
-     res = DmStrAdd(res, DmStrJoin(separator, tok, -1, FALSE), TRUE);
-      }
-      else if (op == '+') {
-     res = DmStrAdd(res, DmStrJoin(tok, separator, -1, FALSE), TRUE);
-      }
-      else {
-     res = DmStrJoin(res, x =DmStrJoin(separator, tok, -1, FALSE),
-            -1, TRUE);
-     FREE( x );
-      }
-
-      DB_PRINT( "exp", ("Tokenizing [%s] --> [%s]", tok, res) );
-   }
-
-   FREE( src );
-   DB_RETURN( res );
-}
-
-
-static char*
-_scan_ballanced_parens(p, delim)
-char *p;
-char delim;
-{
-   int pcount = 0;
-   int bcount = 0;
-
-   if ( p ) {
-      do {
-     if (delim)
-        if( !(bcount || pcount) && *p == delim) {
-           return(p);
-        }
-
-     if ( *p == '(' ) pcount++;
-     else if ( *p == '{' ) bcount++;
-     else if ( *p == ')' && pcount ) pcount--;
-     else if ( *p == '}' && bcount ) bcount--;
-
-     p++;
-      }
-      while (*p && (pcount || bcount || delim));
-   }
-
-   return(p);
-}
-
-
-PUBLIC char*
-ScanToken( s, ps, doexpand )/*
-==============================
-      This routine scans the token characters one at a time and identifies
-      macros starting with $( and ${ and calls _scan_macro to expand their
-      value.   the string1{ token_list }string2 expansion is also handled.
-      In this case a temporary result is maintained so that we can take it's
-      cross product with any other token_lists that may possibly appear. */
-      
-char *s;		/* pointer to start of src string */
-char **ps;		/* pointer to start pointer	  */
-int  doexpand;
-{
-   char *res;                 /* pointer to result          */
-   char *start;               /* pointer to start of prefix */
-   int  crossproduct = 0;     /* if 1 then computing X-prod */
-
-   start = s;
-   res   = DmStrDup( "" );
-   while( 1 ) {
-      switch( *s ) {
-         /* Termination, We halt at seeing a space or a tab or end of string.
-          * We return the value of the result with any new macro's we scanned
-          * or if we were computing cross_products then we return the new
-          * cross_product.
-          * NOTE:  Once we start computing cross products it is impossible to
-          *        stop.  ie. the semantics are such that once a {} pair is
-          *        seen we compute cross products until termination. */
-
-         case ' ':
-         case '\t':
-     case '\n':
-     case '\r':
-         case '\0': 
-     {
-        char *tmp;
-
-        *ps = s;
-        if( !crossproduct )
-           tmp = DmStrJoin( res, start, (s-start), TRUE );
-        else
-        {
-           tmp = DmSubStr( start, s );
-           tmp = _cross_prod( res, tmp );
-        }
-        return( tmp );
-     }
-         
-         case '$':
-         case '{':
-     {
-        /* Handle if it's a macro or if it's a {} construct.
-         * The results of a macro expansion are handled differently based
-         * on whether we have seen a {} beforehand. */
-        
-        char *tmp;
-        tmp = DmSubStr( start, s );          /* save the prefix */
-
-        if( *s == '$' ) {
-           start = _scan_macro( s+1, &s, doexpand );
-
-           if( crossproduct ) {
-          res = _cross_prod( res, DmStrJoin( tmp, start, -1, TRUE ) );
-           }
-           else {
-          res = DmStrJoin(res,tmp=DmStrJoin(tmp,start,-1,TRUE),-1,TRUE);
-          FREE( tmp );
-           }
-           FREE( start );
-        }
-        else if( strchr("{ \t",s[1]) == NIL(char) ){
-           int ok;
-           start = _scan_brace( s+1, &s, &ok );
-          
-           if( ok ) {
-          if ( crossproduct ) {
-             res = _cross_prod(res,_cross_prod(tmp,start));
-          }
-          else {
-             char *freeres;
-             res = Tokenize(start,
-                    freeres=DmStrJoin(res,tmp,-1,TRUE),
-                    '^', FALSE);
-             FREE(freeres);
-             FREE(tmp);
-          }
-          crossproduct = TRUE;
-           }
-           else {
-          res =DmStrJoin(res,tmp=DmStrJoin(tmp,start,-1,TRUE),-1,TRUE);
-          FREE( start );
-          FREE( tmp   );
-           }
-        }
-        else {    /* handle the {{ case */
-           res = DmStrJoin( res, start, (s-start+1), TRUE );
-           s  += (s[1]=='{')?2:1;
-           FREE( tmp );
-        }
-
-        start = s;
-     }
-     break;
-
-     case '}':
-        if( s[1] != '}' ) {
-           /* error malformed macro expansion */
-           s++;
-        }
-        else {    /* handle the }} case */
-           res = DmStrJoin( res, start, (s-start+1), TRUE );
-           s += 2;
-           start = s;
-        }
-        break;
-         
-         default: s++;
-      }
-   }
-}
-
-
-static char*
-_scan_macro( s, ps, doexpand )/*
-================================
-    This routine scans a macro use and expands it to the value.  It
-    returns the macro's expanded value and modifies the pointer into the
-    src string to point at the first character after the macro use.
-    The types of uses recognized are:
-
-        $$ and $<sp>	- expands to $
-        $(name)		- expands to value of name
-        ${name}		- same as above
-        $($(name))	- recurses on macro names (any level)
-    and
-        $(func[,args ...] [data])
-    and 
-            $(name:modifier_list:modifier_list:...)
-        
-    see comment for Expand for description of valid modifiers.
-
-    NOTE that once a macro name bounded by ( or { is found only
-    the appropriate terminator (ie. ( or } is searched for. */
-
-char *s;		/* pointer to start of src string   */
-char **ps;		/* pointer to start pointer	    */
-int  doexpand;          /* If TRUE enables macro expansion  */
-{
-   char sdelim;         /* start of macro delimiter         */
-   char edelim;         /* corresponding end macro delim    */
-   char *start;         /* start of prefix                  */
-   char *macro_name;    /* temporary macro name             */
-   char *recurse_name;  /* recursive macro name             */
-   char *result;	/* result for macro expansion	    */
-   int  bflag = 0;      /* brace flag, ==0 => $A type macro */
-   int  done  = 0;      /* != 0 => done macro search        */
-   int  lev   = 0;      /* brace level                      */
-   int  mflag = 0;      /* != 0 => modifiers present in mac */
-   int  fflag = 0;	/* != 0 => GNU style function 	    */
-   HASHPTR hp;		/* hash table pointer for macros    */
-   
-   DB_ENTER( "_scan_macro" );
-
-   /* Check for $ at end of line, or $ followed by white space */
-   /* FIXME: Shouldn't a single '$' be an error? */
-   if( !*s || strchr(" \t", *s) != NIL(char)) {
-      *ps = s;
-      DB_RETURN( DmStrDup("") );
-   }
-
-   if( *s == '$' ) {    /* Take care of the simple $$ case. */
-      *ps = s+1;
-      DB_RETURN( DmStrDup("$") );
-   }
-
-   sdelim = *s;         /* set and remember start/end delim */
-   if( sdelim == '(' )
-      edelim = ')';
-   else
-      edelim = '}';
-
-   start = s;           /* build up macro name, find its end */
-   while( !done ) {
-      switch( *s ) {
-         case '(':				/* open macro brace */
-         case '{':
-        if( *s == sdelim ) {
-           lev++;
-           bflag++;
-        }
-        break;
-         
-         case ':':                              /* halt at modifier */
-            if( lev == 1 && !fflag && doexpand ) {
-               done = TRUE;
-               mflag = 1;
-            }
-            else if( !lev )                     /* must be $: */
-               Fatal( "Syntax error in macro [$%s]. A colon [:] cannot be a macro name.\n", start );
-
-            /* continue if a colon is found but lev > 1 */
-            break;
-
-     case '\n':                             /* Not possible because of the
-                                                 * following case. */
-        Fatal( "DEBUG: No standalone '\n' [%s].\n", start );
-        break;
-
-     case '\\':                             /* Transform \<nl> -> ' '. */
-       if( s[1] != '\n' ) {
-         done = !lev;
-         break;
-       } else {
-         size_t len;
-         s[1] = ' ';
-         len = strlen(s+1)+1;
-         memmove( s, s+1, len );
-       }
-       /*FALLTHRU*/
-     case ' ':
-     case '\t':
-        if ( lev == 1 ) fflag = 1;
-        break;
-            
-     case '\0':				/* check for null */
-       *ps = s;
-       done = TRUE;
-       if( lev ) {				/* catch $( or ${ without closing bracket */
-         Fatal( "Syntax error in macro [$%s]. The closing bracket [%c] is missing.\n", start, edelim );
-       } else
-         Fatal( "DEBUG: This cannot occur! [%s].\n", start );
-       break;
-         
-      case ')':				/* close macro brace */
-      case '}':
-        if( !lev )		/* A closing bracket without an .. */
-          Fatal("Syntax error in macro [$%s]. Closing bracket [%c] cannot be a macro name.\n", start, *s );
-        else if( *s == edelim ) --lev;
-      /*FALLTHRU*/
-
-         default:		/* Done when lev == 0. This means either no */
-        done = !lev;	/* opening bracket (single letter macro) or */
-                /* a fully enclosed $(..) or ${..} macro    */
-                /* was found. */
-      }
-      s++;
-   }
-
-   /* Check if this is a $A type macro.  If so then we have to
-    * handle it a little differently. */
-   if( bflag )
-     macro_name = DmSubStr( start+1, s-1 );
-   else
-     macro_name = DmSubStr( start, s );
-
-   /* If we don't have to expand the macro we're done. */
-   if (!doexpand) {
-     *ps = s;
-     DB_RETURN(macro_name);
-   }
-
-   /* Check to see if the macro name contains spaces, if so then treat it
-    * as a GNU style function invocation and call the function mapper to
-    * deal with it.  We do not call the function expander if the function
-    * invocation begins with a '$' */
-   if( fflag && *macro_name != '$' ) {
-     result = Exec_function(macro_name);
-   }
-   else {
-     /* Check if the macro is a recursive macro name, if so then
-      * EXPAND the name before expanding the value */
-     if( strchr( macro_name, '$' ) != NIL(char) ) {
-       recurse_name = Expand( macro_name );
-       FREE( macro_name );
-       macro_name = recurse_name;
-     }
-
-     /* Code to do value expansion goes here, NOTE:  macros whose assign bit
-        is one have been evaluated and assigned, they contain no further
-        expansions and thus do not need their values expanded again. */
-
-     if( (hp = GET_MACRO( macro_name )) != NIL(HASH) ) {
-       if( hp->ht_flag & M_MARK )
-         Fatal( "Detected circular macro [%s]", hp->ht_name );
-
-       if( !(hp->ht_flag & M_EXPANDED) ) {
-         hp->ht_flag |= M_MARK;
-         result = Expand( hp->ht_value );
-         hp->ht_flag ^= M_MARK;
-       }
-       else if( hp->ht_value != NIL(char) )
-         result = DmStrDup( hp->ht_value );
-       else
-         result = DmStrDup( "" );
-
-     }
-     else {
-       /* The use of an undefined macro implicitly defines it but
-        * leaves its value to NIL(char). */
-       hp = Def_macro( macro_name, NIL(char), M_EXPANDED );
-       /* Setting M_INIT assures that this macro is treated unset like
-        * default internal macros. (Necessary for *= and *:=) */
-       hp->ht_flag |= M_INIT;
-
-       result = DmStrDup( "" );
-     }
-     /* Mark macros as used only if we are not expanding them for
-      * the purpose of a .IF test, so we can warn about redef after use*/
-     if( !If_expand ) hp->ht_flag |= M_USED;
-
-   }
-
-   if( mflag ) {
-     char separator;
-     int  modifier_list = 0;
-     int  aug_mod       = FALSE;
-     char *pat1;
-     char *pat2;
-     char *p;
-
-     /* We are inside of a macro expansion. The "build up macro name,
-      * find its while loop above should have caught all \<nl> and
-      * converted them to a real space. Let's verify this. */
-     for( p=s; *p && *p != edelim && *p; p++ ) {
-       if( p[0] == '\\' && p[1] == '\n' ) {
-         size_t len;
-         p[1] = ' ';
-         len = strlen(p+1)+1;
-         memmove( p, p+1, len );
-       }
-     }
-     if( !*p )
-       Fatal( "Syntax error in macro modifier pattern [$%s]. The closing bracket [%c] is missing.\n", start, edelim );
-
-     /* Yet another brain damaged AUGMAKE kludge.  We should accept the
-      * AUGMAKE bullshit of $(f:pat=sub) form of macro expansion.  In
-      * order to do this we will forgo the normal processing if the
-      * AUGMAKE solution pans out, otherwise we will try to process the
-      * modifiers ala dmake.
-      *
-      * So we look for = in modifier string.
-      * If found we process it and not do the normal stuff */
-
-     for( p=s; *p && *p != '=' && *p != edelim; p++ );
-
-     if( *p == '=' ) {
-       char *tmp;
-
-       pat1 = Expand(tmp = DmSubStr(s,p)); FREE(tmp);
-       s = p+1;
-       p = _scan_ballanced_parens(s+1, edelim);
-
-       if ( !*p ) {
-         Fatal( "Incomplete macro expression [%s]", s );
-         p = s+1;
-       }
-       pat2 = Expand(tmp = DmSubStr(s,p)); FREE(tmp);
-
-       result = Apply_edit( result, pat1, pat2, TRUE, TRUE );
-       FREE( pat1 );
-       FREE( pat2 );
-       s = p;
-       aug_mod = TRUE;
-     }
-
-     if( !aug_mod )
-       while( *s && *s != edelim ) {		/* while not at end of macro */
-         char switch_char;
-
-         switch( switch_char = *s++ ) {
-         case '1': modifier_list |= JUST_FIRST_FLAG;         break;
-
-         case 'b':
-         case 'B': modifier_list |= FILE_FLAG; 		   break;
-
-         case 'd':
-         case 'D': modifier_list |= DIRECTORY_FLAG;  	   break;
-
-         case 'f':
-         case 'F': modifier_list |= FILE_FLAG | SUFFIX_FLAG; break;
-
-         case 'e':
-         case 'E': modifier_list |= SUFFIX_FLAG; break;
-
-         case 'l':
-         case 'L': modifier_list |= TOLOWER_FLAG; break;
-
-         case 'i':
-         case 'I': modifier_list |= INFNAME_FLAG; break;
-
-         case 'u':
-         case 'U': modifier_list |= TOUPPER_FLAG; break;
-
-         case 'm':
-         case 'M':
-           if( modifier_list || ( (*s != edelim) && (*s != ':') ) ) {
-             Warning( "Map escape modifier must appear alone, ignored");
-             modifier_list = 0;
-           }
-           else {
-             /* map the escape codes in the separator string first */
-             for(p=result; (p = strchr(p,ESCAPE_CHAR)) != NIL(char); p++)
-               Map_esc( p );
-           }
-         /* find the end of the macro spec, or the start of a new
-          * modifier list for further processing of the result */
-
-         for( ; (*s != edelim) && (*s != ':') && *s; s++ );
-         if( !*s )
-           Fatal( "Syntax error in macro. [$%s].\n", start );
-         if( *s == ':' ) s++;
-         break;
-
-         case 'n':
-         case 'N': modifier_list |= NORMPATH_FLAG; break;
-
-         case 'S':
-         case 's':
-           if( modifier_list ) {
-             Warning( "Edit modifier must appear alone, ignored");
-             modifier_list = 0;
-           }
-           else {
-             separator = *s++;
-             for( p=s; *p != separator && *p; p++ );
-
-             if( !*p )
-               Fatal( "Syntax error in subst macro. [$%s].\n", start );
-             else {
-               char *t1, *t2;
-               pat1 = DmSubStr( s, p );
-               for(s=p=p+1; (*p != separator) && *p; p++ );
-               /* Before the parsing fixes in iz36027 the :s macro modifier
-                * erroneously worked with patterns with missing pattern
-                * separator, i.e. $(XXX:s#pat#sub). This is an error because
-                * it prohibits the use of following macro modifiers.
-                * I.e. $(XXX:s#pat#sub:u) falsely replaces with "sub:u".
-                * ??? Remove this special case once OOo compiles without
-                * any of this warnings. */
-               if( !*p ) {
-                 if( *(p-1) == edelim ) {
-                   p--;
-                   Warning( "Syntax error in subst macro. Bracket found, but third delimiter [%c] missing in [$%s].\n", separator, start );
-                 }
-                 else {
-                   Fatal( "Syntax error in subst macro. Third delimiter [%c] missing in [$%s].\n", separator, start );
-                 }
-               }
-               pat2 = DmSubStr( s, p );
-               t1 = Expand(pat1); FREE(pat1);
-               t2 = Expand(pat2); FREE(pat2);
-               result = Apply_edit( result, t1, t2, TRUE, FALSE );
-               FREE( t1 );
-               FREE( t2 );
-             }
-             s = p;
-           }
-         /* find the end of the macro spec, or the start of a new
-          * modifier list for further processing of the result */
-
-         for( ; (*s != edelim) && (*s != ':') && *s; s++ );
-         if( !*s )
-           Fatal( "Syntax error in macro. [$%s].\n", start );
-         if( *s == ':' ) s++;
-         break;
-
-         case 'T':
-         case 't':
-         case '^':
-         case '+':
-           if( modifier_list ) {
-             Warning( "Tokenize modifier must appear alone, ignored");
-             modifier_list = 0;
-           }
-           else {
-             separator = *s++;
-
-             if( separator == '$' ) {
-               p = _scan_ballanced_parens(s,'\0');
-
-               if ( *p ) {
-                 char *tmp;
-                 pat1 = Expand(tmp = DmSubStr(s-1,p));
-                 FREE(tmp);
-                 result = Tokenize(result, pat1, switch_char, TRUE);
-                 FREE(pat1);
-               }
-               else {
-                 Warning( "Incomplete macro expression [%s]", s );
-               }
-               s = p;
-             }
-             else if ( separator == '\"' ) {
-               /* we change the semantics to allow $(v:t")") */
-               for (p = s; *p && *p != separator; p++)
-                 if (*p == '\\')
-                   if (p[1] == '\\' || p[1] == '"')
-                     p++;
-
-               if( *p == 0 )
-                 Fatal( "Unterminated separator string" );
-               else {
-                 pat1 = DmSubStr( s, p );
-                 result = Tokenize( result, pat1, switch_char, TRUE);
-                 FREE( pat1 );
-               }
-               s = p;
-             }
-             else {
-               Warning(
-                       "Separator must be a quoted string or macro expression");
-             }
-
-             /* find the end of the macro spec, or the start of a new
-              * modifier list for further processing of the result */
-
-             for( ; (*s != edelim) && (*s != ':'); s++ );
-             if( *s == ':' ) s++;
-           }
-         break;
-
-         case ':':
-           if( modifier_list ) {
-             result = Apply_modifiers( modifier_list, result );
-             modifier_list = 0;
-           }
-           break;
-
-         default:
-           Warning( "Illegal modifier in macro, ignored" );
-           break;
-         }
-       }
-
-     if( modifier_list ) /* apply modifier */
-       result = Apply_modifiers( modifier_list, result );
-      
-     s++;
-   }
-
-   *ps = s;
-   FREE( macro_name );
-   DB_RETURN( result );
-}
-
-
-static char*
-_scan_brace( s, ps, flag )/*
-============================
-      This routine scans for { token_list } pairs.  It expands the value of
-      token_list by calling Expand on it.  Token_list may be anything at all.
-      Note that the routine count's ballanced parentheses.  This means you
-      cannot have something like { fred { joe }, if that is what you really
-      need the write it as { fred {{ joe }, flag is set to 1 if all ok
-      and to 0 if the braces were unballanced. */
-      
-char *s;
-char **ps;
-int  *flag;
-{
-  char *t;
-  char *start;
-  char *res;
-  int  lev  = 1;
-  int  done = 0;
-   
-  DB_ENTER( "_scan_brace" );
-
-  start = s;
-  while( !done )
-    switch( *s++ ) {
-    case '{':
-      if( *s == '{' ) break;              /* ignore {{ */
-      lev++;
-      break;
-            
-    case '}':
-      if( *s == '}' ) break;              /* ignore }} */
-      if( lev )
-        if( --lev == 0 ) done = TRUE;
-      break;
-
-    case '$':
-      if( *s == '{' || *s == '}' ) {
-        if( (t = strchr(s,'}')) != NIL(char) )
-          s = t;
-        s++;
-      }
-      break;
-         
-    case '\0':
-      if( lev ) {
-        done = TRUE;
-        s--;
-        /* error malformed macro expansion */
-      }
-      break;
-    }
-
-  start = DmSubStr( start, (lev) ? s : s-1 );
-
-  if( lev ) {
-    /* Braces were not ballanced so just return the string.
-     * Do not expand it. */
-       
-    res   = DmStrJoin( "{", start, -1, FALSE );
-    *flag = 0;
-  }
-  else {
-    *flag = 1;
-    res   = Expand( start );
-
-    if( (t = DmStrSpn( res, " \t" )) != res ) {
-      size_t len = strlen(t)+1;
-      memmove( res, t, len );
-    }
-  }
-
-  FREE( start );       /* this is ok! start is assigned a DmSubStr above */
-  *ps = s;
-
-  DB_RETURN( res );
-}
-
-
-static char*
-_cross_prod( x, y )/*
-=====================
-      Given two strings x and y compute the cross-product of the tokens found
-      in each string.  ie. if x = "a b" and y = "c d" return "ac ad bc bd".
-
-         NOTE:  buf will continue to grow until it is big enough to handle
-                all cross product requests.  It is never freed!  (maybe I
-            will fix this someday) */
-      
-char *x;
-char *y;
-{
-  static char *buf = NULL;
-  static int  buf_siz = 0;
-  char *brkx;
-  char *brky;
-  char *cy;
-  char *cx;
-  char *res;
-  int  i;
-
-  if( *x && *y ) {
-    res = DmStrDup( "" ); cx = x;
-    while( *cx ) {
-      cy = y;
-      brkx = DmStrPbrk( cx, " \t\n" );
-      if( (brkx-cx == 2) && *cx == '\"' && *(cx+1) == '\"' ) cx = brkx;
-
-      while( *cy ) {
-        brky = DmStrPbrk( cy, " \t\n" );
-        if( (brky-cy == 2) && *cy == '\"' && *(cy+1) == '\"' ) cy = brky;
-        i    = brkx-cx + brky-cy + 2;
-
-        if( i > buf_siz ) {		/* grow buf to the correct size */
-          if( buf != NIL(char) ) FREE( buf );
-          if( (buf = MALLOC( i, char )) == NIL(char))  No_ram();
-          buf_siz = i;
-        }
-
-        strncpy( buf, cx, (i = brkx-cx) );
-        buf[i] = '\0';
-        if (brky-cy > 0) strncat( buf, cy, brky-cy );
-        buf[i+(brky-cy)] = '\0';
-        strcat( buf, " " );
-        res = DmStrJoin( res, buf, -1, TRUE );
-        cy = DmStrSpn( brky, " \t\n" );
-      }
-      cx = DmStrSpn( brkx, " \t\n" );
-    }
-
-    FREE( x );
-    res[ strlen(res)-1 ] = '\0';
-  }
-  else
-    res = DmStrJoin( x, y, -1, TRUE );
-
-  FREE( y );
-  return( res );
-}
diff --git a/dmake/extern.h b/dmake/extern.h
deleted file mode 100644
index 22d4a1468..000000000
--- a/dmake/extern.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/* $RCSfile: extern.h,v $
--- $Revision: 1.13 $
--- last change: $Author: kz $ $Date: 2008-03-05 18:28:27 $
---
--- SYNOPSIS
---      External declarations for dmake functions.
--- 
--- DESCRIPTION
---	ANSI is a macro that allows the proper handling of ANSI style
---	function declarations.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef EXTERN_h
-#define EXTERN_h
-
-/* For MSVC++ needs to include windows.h first to avoid problems with
- * type redefinitions. Include it also for MinGW for consistency. */
-#if defined(__MINGW32__) || defined(_MSC_VER)
-#include <windows.h>
-#endif
-
-#include "config.h"
-
-/* Define this for the RS/6000 if it breaks something then we have to put a
- * #ifdef around it. */
-#if defined(rs6000)
-#define _POSIX_SOURCE
-#endif
-
-#include <stdio.h>
-#ifdef HAVE_LIMITS_H
-#  include <limits.h>
-#endif
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-#include <string.h>
-#include <ctype.h>
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif
-
-#if TIME_WITH_SYS_TIME
-#  include <sys/time.h>
-#  include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#else
-# include <types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if HAVE_UTIME_H
-# include <utime.h>
-#endif
-
-#define DMPVOID void *
-
-#include <signal.h>
-#include "itypes.h"
-#include "stdmacs.h"
-#include "alloc.h"
-#include "db.h"
-#include "dstdarg.h"
-#include "dmake.h"
-#include "struct.h"
-#include "vextern.h"
-#include "public.h"
-
-/* Include this last as it invalidates some functions that are defined
- * externally above and turns them into no-ops.  Have to do this after
- * the extern declarations however. */
-#include "posix.h"
-
-
-
-/* Common declarations
- * ===================
- * are better made here then in local public.h. So far dmake didn't follow
- * this strategy but new functions will be added here. */
-
-/* Use our own implementation if no library function is present. */
-#ifndef HAVE_STRLWR
-/* from dmstring.c */
-char *strlwr(char *p);
-#endif
-
-/* from function.c */
-char *exec_normpath(char *args);
-
-/* from make.c */
-void Unmake(CELLPTR cp);
-
-/* from path.c */
-void Clean_path(char *path);
-char *normalize_path(char *path);
-
-/* from sysintf.c */
-/* cygdospath()/DO_WINPATH() are only needed for the .WINPATH attribute
- * on cygwin. */
-#if __CYGWIN__
-char *cygdospath(char *src, int winpath);
-# define DO_WINPATH(p) cygdospath(p, UseWinpath)
-#else
-# define DO_WINPATH(p) p
-#endif
-
-
-/* Define some usefull macros. This is done here and not in config.h
- * to keep this changes usefull even when not using the autotools based
- * build, i.e. using config.h files that are local to the architecture. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(MSDOS) || defined(OS2) || defined(__EMX__)
-#  define HAVE_DRIVE_LETTERS 1
-#endif
-
-#if defined(_WIN32) || defined(MSDOS) || defined(OS2) && !defined(__CYGWIN__)
-#  define NULLDEV "NUL"
-#else
-#  define NULLDEV "/dev/null"
-#endif
-
-/* For MSVC 6.0 and newer and MinGW use the CreateProcess() function. */
-#if defined(__MINGW32__) || defined(_MSC_VER) && _MSC_VER >= 1200
-#  define USE_CREATEPROCESS 1
-#else
-/* #undef USE_CREATEPROCESS */
-#endif
-
-/*  CreateProcess() is spawn-like. */
-#if ENABLE_SPAWN && ( HAVE_SPAWN_H || __CYGWIN__ || __EMX__) || defined(USE_CREATEPROCESS)
-#  define USE_SPAWN 1
-#else
-/* #undef USE_SPAWN */
-#endif
-
-/* Work around some of the functions that may or may not exist */
-#if ! HAVE_TZSET
-#if HAVE_SETTZ
-#  define tzset() settz()
-#else
-#  warn "tzset is not supported, null out"
-#  define tzset()
-#endif
-#endif
-
-/* Get the working directory fall back code */
-#if ! HAVE_GETCWD
-#if HAVE_GETWD
-#  define getcwd(buf,len) getwd(buf)
-#else
-#  error "You have no supported way of getting working directory"
-#endif
-#endif
-
-/*  If setvbuf is not available set output to unbuffered */
-#if ! HAVE_SETVBUF
-#  define setvbuf(fp,bp,type,len) setbuf(fp,NULL)
-#endif
-
-/* coreleft is used in some debug macros. Only Turbo C seems to provide
- * this function. Define it here so that the code compiles. */
-#ifdef DBUG
-#define coreleft() 0L
-#endif
-
-#endif
diff --git a/dmake/function.c b/dmake/function.c
deleted file mode 100644
index ceea3bbd3..000000000
--- a/dmake/function.c
+++ /dev/null
@@ -1,726 +0,0 @@
-/* $RCSfile: function.c,v $
--- $Revision: 1.12 $
--- last change: $Author: kz $ $Date: 2008-03-05 18:28:45 $
---
--- SYNOPSIS
---      GNU style functions for dmake.
---
--- DESCRIPTION
--- 	All GNU style functions understood by dmake are implemented in this
---	file.  Currently the only such function is $(mktmp ...) which is
---	not part of GNU-make is an extension provided by dmake.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-static char *_exec_mktmp  ANSI((char *, char *, char *));
-static char *_exec_subst  ANSI((char *, char *, char *));
-static char *_exec_iseq   ANSI((char *, char *, char *, int));
-static char *_exec_sort   ANSI((char *));
-static char *_exec_echo   ANSI((char *));
-static char *_exec_uniq   ANSI((char *));
-static char *_exec_shell  ANSI((char *, int));
-static char *_exec_call   ANSI((char *, char *));
-static char *_exec_assign ANSI((char *));
-static char *_exec_foreach ANSI((char *, char *, char *));
-static char *_exec_andor  ANSI((char *, int));
-static char *_exec_not    ANSI((char *));
-static int   _mystrcmp    ANSI((const DMPVOID, const DMPVOID));
-
-
-PUBLIC char *
-Exec_function(buf)/*
-====================
-   Execute the function given by the value of args.
-
-   So far mktmp is the only valid function, anything else elicits and error
-   message.  It is my hope to support the GNU style functions in this portion
-   of the code at some time in the future. */
-char *buf;
-{
-   char *fname;
-   char *args;
-   char *mod1;
-   char *mod2 = NIL(char);
-   int mod_count = 0;
-   char *res  = NIL(char);
-
-   /* This must succeed since the presence of ' ', \t or \n is what
-    * determines if this function is called in the first place.
-    * Unfortunately this prohibits the use of whitespaces in parameters
-    * for macro functions. */
-   /* ??? Using ScanToken to find the next ' ', \t or \n and discarding
-    * the returned, evaluated result is a misuse of that function. */
-   FREE(ScanToken(buf, &args, FALSE));
-   fname = DmSubStr(buf, args);
-   /* args points to the whitespace after the found token, this leads
-    * to leading whitespaces. */
-   if( *args ) {
-      args = DmStrSpn(args," \t"); /* strip whitespace before */ 
-      if( *args ) {                /* ... and after value */
-     char *q;
-     for(q=args+strlen(args)-1; ((*q == ' ')||(*q == '\t')); q--);
-     *++q = '\0';
-      }
-   }
-
-   /* ??? Some function macros expect comma seperated parameters, but
-    * no decent parser is included. The desirable solution would be
-    * to parse fname for the correct number of parameters in fname
-    * when a function is recognized. We only count the parameters
-    * at the moment. Note "" is a valid parameter. */
-   if( (mod1 = strchr(fname,',')) != NIL(char) ){
-      *mod1 = '\0';
-      mod1++;
-      mod_count++;
-
-      if( (mod2 = strchr(mod1,',')) != NIL(char) ){
-     *mod2 = '\0';
-     mod2++;
-     mod_count++;
-      }
-   }
-
-   /* ??? At the moment only the leading part of fname compared if it
-    * matches a known function macro. For example assignXXX or even
-    * assign,,,, is also erroneously accepted. */ 
-   switch( *fname ) {
-      case 'a':
-     if(strncmp(fname,"assign",6) == 0)
-        res = _exec_assign(args);
-         else if(strncmp(fname,"and",3) == 0)
-            res = _exec_andor(args, TRUE);
-         else
-            res = _exec_call(fname,args);
-     break;
-
-      case 'e':
-     if(strncmp(fname,"eq",2) == 0)
-        if( mod_count == 2 )
-          res = _exec_iseq(mod1,mod2,args,TRUE);
-        else
-          Fatal( "Two comma-seperated arguments expected in [%s].\n", buf );
-     else if (strncmp(fname,"echo",4) == 0)
-        res = _exec_echo(args);
-         else
-            res = _exec_call(fname,args);
-     break;
-
-      case 'f':
-     if(strncmp(fname,"foreach",7) == 0)
-        if( mod_count == 2 )
-          res = _exec_foreach(mod1,mod2,args);
-        else
-          Fatal( "Two comma-seperated arguments expected in [%s].\n", buf );
-     else
-        res = _exec_call(fname,args);
-     break;
-
-      case 'm':
-     if(strncmp(fname,"mktmp",5) == 0)
-        if( mod_count < 3 )
-          res = _exec_mktmp(mod1,mod2,args);
-        else
-          Fatal( "Maximal two comma-seperated arguments expected in [%s].\n", buf );
-     else
-        res = _exec_call(fname,args);
-     break;
-
-      case 'n':
-     if( strncmp(fname,"null", 4) == 0 )
-        res = _exec_iseq(mod1,NIL(char),args,TRUE);
-     else if (strncmp(fname,"nil",3) == 0 ) {
-        FREE(Expand(args));
-        res = DmStrDup("");
-     }
-     else if (strncmp(fname,"not",3) == 0 )
-        res = _exec_not(args);
-     else if (strncmp(fname,"normpath",8) == 0 ) {
-        char *eargs = Expand(args);
-
-        if( mod_count == 0 ) {
-           res = exec_normpath(eargs);
-        }
-        else if( mod_count == 1 ) {
-           char *para = Expand(mod1);
-           int tmpUseWinpath = UseWinpath;
-
-           if( !*para || strcmp(para, "\"\"") == 0 ) {
-          UseWinpath = FALSE;
-           } else {
-          UseWinpath = TRUE;
-           }
-           res = exec_normpath(eargs);
-           UseWinpath = tmpUseWinpath;
-           FREE(para);
-        }
-        else
-           Fatal( "One or no comma-seperated arguments expected in [%s].\n", buf );
-
-        FREE(eargs);
-     }
-         else
-            res = _exec_call(fname,args);
-     break;
-
-      case '!':
-     if(strncmp(fname,"!null",5) == 0)
-        res = _exec_iseq(mod1,NIL(char),args,FALSE);
-     else if(strncmp(fname,"!eq",3) ==0)
-        if( mod_count == 2 )
-          res = _exec_iseq(mod1,mod2,args,FALSE);
-        else
-          Fatal( "Two comma-seperated arguments expected in [%s].\n", buf );
-     else
-        res = _exec_call(fname,args);
-     break;
-
-      case 'o':
-     if(strncmp(fname,"or",2) == 0)
-            res = _exec_andor(args, FALSE);
-         else
-            res = _exec_call(fname,args);
-     break;
-
-      case 's':
-     if(strncmp(fname,"sort",4) == 0)
-        res = _exec_sort(args);
-     else if(strncmp(fname,"shell",5)==0)
-        if( mod_count == 0 ) {
-           res = _exec_shell(args, FALSE);
-        }
-        else if( mod_count == 1 ) {
-           char *emod = Expand(mod1);
-           if(strncmp(emod,"expand",7)==0)
-          res = _exec_shell(args, TRUE);
-           else
-          Fatal( "Unknown argument [%s] to shell in [%s].\n", emod, buf );
-           FREE(emod);		  
-        }
-        else
-           Fatal( "One or no comma-seperated arguments expected in [%s].\n", buf );
-     else if(strncmp(fname,"strip",5)==0)
-        res = Tokenize(Expand(args)," ",'t',TRUE);
-     else if(strncmp(fname,"subst",5)==0) {
-        if( mod_count == 2 )
-          res = _exec_subst(mod1,mod2,args);
-        else
-          Fatal( "Two comma-seperated arguments expected in [%s].\n", buf );
-     }
-         else
-            res = _exec_call(fname,args);
-     break;
-
-      case 'u':
-     if(strncmp(fname,"uniq",4) == 0)
-        res = _exec_uniq(args);
-         else
-            res = _exec_call(fname,args);
-     break;
-
-      default:
-     res = _exec_call(fname,args);
-   }
-
-   if( res == NIL(char) ) res = DmStrDup("");
-
-   FREE(fname);
-   return(res);
-}
-
-
-static char *
-_exec_assign( macrostring )
-char *macrostring;
-{
-   if ( !Parse_macro(macrostring, M_MULTI|M_FORCE) ) {
-      Error( "Dynamic macro assignment failed, while making [%s]\n",
-     Current_target ? Current_target->CE_NAME : "NIL");
-      return(DmStrDup(""));
-   }
-
-   return(DmStrDup(LastMacName));
-}
-
-
-static char *
-_exec_echo(data)
-char *data;
-{
-   return(DmStrDup(DmStrSpn(data," \t")));
-}
-
-
-static char *
-_exec_call( var, list )/*
-=========================
-  Return the (recursively expanded) value of macro var. Expand list and
-  discard the result.
-*/
-char *var;  /* Name of the macro (until first whitespace). */
-char *list; /* Rest data (after the whitespace). */
-{
-   char *res = NIL(char);
-
-   /* the argument part is expanded. */
-   FREE(Expand(list));
-
-   /* Prepend '$(' and append ')' so that Expand will return the value
-    * of the 'var' macro. */
-   var = DmStrJoin(DmStrJoin("$(",var,-1,FALSE),")",-1,TRUE);
-   res = Expand(var);
-
-   FREE(var);
-   return(res);
-}
-
-
-static char *
-_exec_foreach( var, list, data )
-char *var;
-char *list;
-char *data;
-{
-   char *res = NIL(char);
-   char *s;
-   TKSTR tk;
-   HASHPTR hp;
-
-   var = Expand(var);
-   list = Expand(list);
-
-   data = DmStrSpn(data," \t\n");
-   SET_TOKEN(&tk,list);
-   /* push previous macro definition and redefine. */
-   hp = Def_macro(var,"",M_MULTI|M_NOEXPORT|M_FORCE|M_PUSH);
-
-   while( *(s=Get_token(&tk, "", FALSE)) != '\0' ) {
-      Def_macro(var,s,M_MULTI|M_NOEXPORT|M_FORCE);
-      res = DmStrAdd(res,Expand(data),TRUE);
-   }
-
-   CLEAR_TOKEN(&tk);
-   Pop_macro(hp);	/* Get back old macro definition. */
-   FREE(hp->ht_name);
-   if(hp->ht_value) FREE(hp->ht_value);
-   FREE(hp);
-   FREE(var);
-   FREE(list);
-
-   return(res);
-}
-
-
-static char *
-_exec_mktmp( file, text, data )
-char *file;
-char *text;
-char *data;
-{
-   char *tmpname;
-   char *name;
-   FILE *tmpfile = NIL(FILE);
-
-   /* This is only a test of the recipe line so prevent the tempfile side
-    * effects. */
-   if( Suppress_temp_file ) return(NIL(char));
-
-   name = Current_target ? Current_target->CE_NAME:"makefile text";
-
-   if( file && *file ) {
-      /* Expand the file parameter to mktmp if present. */
-      tmpname = Expand(file);
-
-      if( *tmpname ) {
-#ifdef HAVE_MKSTEMP
-     /* Only use umask if we are also using mkstemp - this basically
-      * avoids using the incompatible implementation from MSVC. */
-     mode_t       mask;
-
-     /* Create tempfile with 600 permissions. */
-     mask = umask(0066);
-#endif
-
-     if( (tmpfile = fopen(tmpname, "w")) == NIL(FILE) )
-        Open_temp_error( tmpname, name );
-#ifdef HAVE_MKSTEMP
-     umask(mask);
-#endif
-
-     Def_macro("TMPFILE", tmpname, M_EXPANDED|M_MULTI);
-     Link_temp( Current_target, tmpfile, tmpname );
-
-     /* Don't free tmpname if it is used. It is stored in a FILELIST
-      * member in Link_temp() and freed by Unlink_temp_files(). */
-      }
-      else
-     FREE(tmpname);
-   }
-
-   /* If file expanded to a non empty value tmpfile is already opened,
-    * otherwise open it now. */
-   if( !tmpfile )
-      tmpfile = Start_temp( "", Current_target, &tmpname );
-
-   /* If the text parameter is given return its expanded value
-    * instead of the used filename. */
-   if( !text || !*text ) {
-      /* tmpname is freed by Unlink_temp_files(). */
-      text = DmStrDup(DO_WINPATH(tmpname));
-   }
-   else {
-      text = Expand(text);
-   }
-
-   data = Expand(data);
-
-   Append_line( data, TRUE, tmpfile, name, FALSE, FALSE );
-   Close_temp( Current_target, tmpfile );
-   FREE(data);
-
-   return( text );
-}
-
-
-static char *
-_exec_iseq( lhs, rhs, data, eq )
-char *lhs;
-char *rhs;
-char *data;
-int  eq;
-{
-   char *l = Expand(lhs);
-   char *r = Expand(rhs);
-   char *i = DmStrSpn(data, " \t\n");
-   char *e = strchr(i, ' ');
-   char *res = NIL(char);
-   int  val = strcmp(l,r);
-
-   if( (!val && eq) || (val && !eq) ) {
-      if( e != NIL(char) ) *e = '\0';
-      res = Expand(i);
-   }
-   else if( e != NIL(char) ) {
-      e = DmStrSpn(e," \t\n");
-      if( *e ) res = Expand(e);
-   }
-
-   FREE(l);
-   FREE(r);
-   return(res);
-}
-
-
-static char *
-_exec_sort( args )
-char *args;
-{
-   char *res  = NIL(char);
-   char *data = Expand(args);
-   char **tokens;
-   char *p;
-   char *white = " \t\n";
-   int  j;
-   int  i;
-
-   for(i=0,p=DmStrSpn(data,white);*p;p=DmStrSpn(DmStrPbrk(p,white),white),i++);
-
-   if( i != 0 ) {
-      TALLOC(tokens, i, char *);
-
-      for( i=0,p=DmStrSpn(data,white); *p; p=DmStrSpn(p,white),i++){
-     tokens[i] = p;
-     p = DmStrPbrk(p,white);
-     if( *p ) *p++ = '\0';
-      }
-
-      qsort( tokens, i, sizeof(char *), _mystrcmp );
-
-      for( j=0; j<i; j++ ) res = DmStrApp(res, tokens[j]);
-      FREE(data);
-      FREE(tokens);
-   }
-
-   return(res);
-}
-
-
-static char *
-_exec_uniq( args )
-char *args;
-{
-  char *res  = NIL(char);
-  char *data = Expand(args);
-  char **tokens;
-  char **tokens_after;
-  char *p;
-  char *white = " \t\n";
-  int  j;
-  int  i;
-  char *last = "";
-  int  k = 0;
-
-  for(i=0,p=DmStrSpn(data,white);*p;p=DmStrSpn(DmStrPbrk(p,white),white),i++);
-
-  if( i != 0 ) {
-    TALLOC(tokens, i, char *);
-    TALLOC(tokens_after, i, char *);
-
-    for( i=0,p=DmStrSpn(data,white); *p; p=DmStrSpn(p,white),i++){
-      tokens[i] = p;
-      p = DmStrPbrk(p,white);
-      if( *p ) *p++ = '\0';
-    }
-
-    qsort( tokens, i, sizeof(char *), _mystrcmp );
-
-    for( j=0; j<i; j++ ) {
-      if (strcmp(tokens[j], last) != 0) {
-        tokens_after[k++] = tokens[j];
-        last = tokens[j];
-      }
-    }
-
-    for( j=0; j<k; j++ ) res = DmStrApp(res, tokens_after[j]);
-    FREE(tokens);
-    FREE(tokens_after);
-  }
-
-  FREE(data);
-  return(res);
-}
-
-static int
-_mystrcmp( p, q )
-const DMPVOID p;
-const DMPVOID q;
-{
-   return(strcmp(*((const char **)p),*((const char **)q)));
-}
-
-
-static char *
-_exec_subst( pat, subst, data )
-char *pat;
-char *subst;
-char *data;
-{
-   char *res;
-
-   pat = Expand(pat);
-   subst = Expand(subst);
-
-   /* This implies FREE(Expand(data)) */
-   res = Apply_edit( Expand(data), pat, subst, TRUE, FALSE );
-   FREE(pat);
-   FREE(subst);
-
-   return(res);
-}
-
-
-static char *
-_exec_shell( data, expand )/*
-=============================
-   Capture the stdout of an execuded command.
-   If expand is TRUE expand the result. */
-char *data;
-int expand;
-{
-   extern char *tempnam();
-   int  bsize;
-   char *buffer;
-   char *tmpnm;
-   FILE *old_stdout_redir = stdout_redir;
-
-   int wait     = Wait_for_completion;
-   int old_is_exec_shell = Is_exec_shell;
-   CELLPTR old_Shell_exec_target = Shell_exec_target;
-   uint16 vflag = Verbose;
-   int tflag    = Trace;
-   char *res    = NIL(char);
-   CELL cell;
-   STRING rcp;
-   HASH   cname;
-
-   if( Suppress_temp_file ) return(NIL(char));
-
-   /* Set the temp CELL used for building prerequisite candidates to
-    * all zero so that we don't have to keep initializing all the
-    * fields. */
-   {
-      register char *s = (char *) &cell;
-      register int   n = sizeof(CELL);
-      while( n ) { *s++ = '\0'; n--; }
-   }
-   rcp.st_string  = DmStrSpn(data, " \t+-%@");
-   rcp.st_attr    = Rcp_attribute( data );
-   rcp.st_next    = NIL(STRING);
-   cname.ht_name  = "Shell escape";
-   cell.ce_name   = &cname;
-   cell.ce_all.cl_prq = &cell;
-   cell.ce_all.cl_next = NIL(LINK);
-   cell.ce_all.cl_flag = 0;
-   cell.ce_fname  = cname.ht_name;
-   cell.ce_recipe = &rcp;
-   cell.ce_flag   = F_TARGET|F_RULES;
-   /* Setting A_SILENT supresses the recipe output from Print_cmnd(). */
-   cell.ce_attr   = A_PHONY|A_SILENT|A_SHELLESC;
-
-   if( Measure & M_TARGET )
-      Do_profile_output( "s", M_TARGET, &cell );
-
-   /* Print the shell escape command. */
-   if( Verbose & V_FORCEECHO ) {
-      printf( "%s: Executing shell macro: %s\n", Pname, data );
-      fflush(stdout);
-   }
-
-   if( (stdout_redir = Get_temp(&tmpnm, "w+")) == NIL(FILE) )
-      Open_temp_error( tmpnm, cname.ht_name );
-
-   bsize  = (Buffer_size < BUFSIZ)?BUFSIZ:Buffer_size;
-   buffer = MALLOC(bsize,char);
-
-   /* As this function redirects the output of stdout we have to make sure
-    * that only this single command is executed and all previous recipe lines
-    * that belong to the same target have finished. With Shell_exec_target and
-    * Wait_for_completion set this is realized. Current_target being NIL(CELL)
-    * outside of recipe lines makes sure that no waiting for previous recipe
-    * lines has to be done. */
-   Wait_for_completion = TRUE;
-   Is_exec_shell = TRUE;
-   Shell_exec_target = Current_target;
-   Verbose &= V_LEAVE_TMP;
-   Trace   = FALSE;
-
-   /* The actual redirection happens in runargv(). */
-   Exec_commands( &cell );
-
-   Unlink_temp_files( &cell );
-
-   Trace   = tflag;
-   Verbose = vflag;
-   Wait_for_completion = wait;
-   Is_exec_shell = old_is_exec_shell;
-   Shell_exec_target = old_Shell_exec_target;
-
-   /* Now we have to read the temporary file, get the tokens and return them
-    * as a string. */
-   rewind(stdout_redir);
-   while( fgets(buffer, bsize, stdout_redir) ) {
-      char *p = strchr(buffer, '\n');
-
-      if( p == NIL(char) )
-     res = DmStrJoin(res,buffer,-1,TRUE);
-      else {
-     *p = '\0';
-     /* You might encounter '\r\n' on windows, handle it. */
-     if( p > buffer && *(p-1) == '\r')
-        *(p-1) = '\0';
-         res = DmStrApp(res,buffer);
-      }
-   }
-
-   fclose(stdout_redir);
-   Remove_file(tmpnm);
-   FREE(tmpnm);
-   FREE(buffer);
-
-   stdout_redir = old_stdout_redir;
-
-   if ( expand ) {
-      char *exp_res;
-      exp_res = Expand(res);
-      FREE(res);
-      res = exp_res;
-   }
-
-   return(res);
-}
-
-
-static char *
-_exec_andor( args, doand )
-char *args;
-int  doand;
-{
-   char *next;
-   char *p;
-   char *white = " \t\n";
-   int  res=doand;
-
-   args = DmStrSpn(args,white);
-   do {
-      p=ScanToken(args, &next, TRUE);
-
-      if (doand ? !*p : *p) {
-         res = !doand;
-         FREE(p);
-         break;
-      }
-
-      FREE(p);
-   }
-   while (*(args=DmStrSpn(next,white)));
-
-   return(res ? DmStrDup("t") : DmStrDup(""));
-}
-
-
-static char *
-_exec_not( args )
-char *args;
-{
-   char *white = " \t\n";
-   char *p=Expand(args);
-   int  res = (*DmStrSpn(p,white) == '\0');
-
-   FREE(p);
-   return(res ? DmStrDup("t") : DmStrDup(""));
-}
-
-
-char *
-exec_normpath( args )/*
-=======================
-   Normalize token-wise. The normalised filenames are returned in a new
-   string, the original string is not freed. Quoted tokens remain quoted
-   after the normalizaton. */
-char *args;
-{
-   TKSTR str;
-   char  *s, *res;
-
-   /* This honors .WINPATH . */
-   SET_TOKEN( &str, args );
-   res = NIL(char);
-   while( *(s = Get_token( &str, "", FALSE )) != '\0' ) {
-      if(str.tk_quote == 0) {
-     /* Add leading quote. */
-     res = DmStrApp(res, "\"");
-     res = DmStrJoin(res, DO_WINPATH(normalize_path(s)), -1, TRUE);
-     /* Append the trailing quote. */
-     res = DmStrJoin(res, "\"", 1, TRUE);
-      } else {
-     res = DmStrApp(res, DO_WINPATH(normalize_path(s)));
-      }
-   }
-   return res;
-}
diff --git a/dmake/getinp.c b/dmake/getinp.c
deleted file mode 100644
index 033374e4c..000000000
--- a/dmake/getinp.c
+++ /dev/null
@@ -1,854 +0,0 @@
-/* RCS  $Id: getinp.c,v 1.10 2007-10-15 15:39:23 ihi Exp $
---
--- SYNOPSIS
---      Handle reading of input.
---
--- DESCRIPTION
---	The code in this file reads the input from the specified stream
---	into the provided buffer of size Buffer_size.  In doing so it deletes
---	comments.  Comments are delimited by the #, and
---	<nl> character sequences.  An exception is \# which
---	is replaced by # in the input.  Line continuations are signalled
---	at the end of a line and are recognized inside comments.
---	The line continuation is always  <\><nl>.
---
---	If the file to read is NIL(FILE) then the Get_line routine returns the
---	next rule from the builtin rule table (Rule_tab from ruletab.c) if
---	there is one.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-#define IS_WHITE(A)  ((A == ' ') || (A == '\t') || (A == '\n') || (A == '\r'))
-#define SCAN_WHITE(A) \
-    while( IS_WHITE(*A) ) A++;
-
-static	int	_is_conditional ANSI((char*));
-static	int	_handle_conditional ANSI((int, TKSTRPTR));
-
-static int  rule_ind = 0;	/* index of rule when reading Rule_tab	 */
-static int  skip = FALSE;	/* if true the skip input		 */
-
-int partcomp( char* lhs, int opcode );
-int parse_complex_expression( char *expr, char **expr_end, int opcode );
-
-
-PUBLIC int
-Get_line( buf, fil )/*
-======================
-   Read a line of input from the file stripping off comments.  The routine
-   returns TRUE if EOF. If fil equals NIL(FILE) then the next line from
-   *Rule_tab[] is used.  Rule_tab is either the buildin rule table or points
-   to the current environment (used by ReadEnvironment()).
-   The function returns TRUE if the input file/buffer was read to the end
-   and FALSE otherwise. */
-char *buf;
-FILE *fil;
-{
-   extern   char **Rule_tab;
-   register char *p;
-   register char *c;
-   char 	 *q;
-   char	    	 *buf_org;
-   static   int	 ignore = FALSE;
-   int 		 cont   = FALSE;
-   int 		 pos    = 0;
-   int		 res = 0;
-   register char *tmp = NIL(char);
-
-   DB_ENTER( "Get_line" );
-
-   if( Skip_to_eof ) {
-      Skip_to_eof = FALSE;
-      rule_ind    = 0;
-
-      if( Verbose & V_MAKE )
-     Warning("Ignoring remainder of file %s", Filename());
-
-      DB_RETURN(TRUE);
-   }
-
-   if( fil == NIL(FILE) ) {
-      /* Reading the internal rule table.  Set rule_ind to zero after the
-       * last entry so that ReadEnvironment() works as expected every time. */
-
-      while( (p = Rule_tab[ rule_ind++ ]) != NIL(char) ) {
-     /* The last test in this if *p != '~', handles the environment
-      * passing conventions used by MKS to pass arguments.  We want to
-      * skip those environment entries. Also CYGWIN likes to export '!'
-      * prefixed environment variables that cause severe pain, axe them too.
-      * And finally it is possible to do "env 'GGG HHH'='some value' bash"
-      * which causes that there are env variables with spaces in the name
-      * defined which causes dmake to malfunction too */
-     char *equal = strchr(p,'=');
-     char *space = strchr(p,' ');
-     if( !Readenv || (Readenv && (equal != NIL(char)) && (space == NIL(char) || space > equal) && *p!='~' && *p!='!')){
-        strcpy( buf, p );
-
-        DB_PRINT( "io", ("Returning [%s]", buf) );
-        DB_RETURN( FALSE );
-     }
-      }
-
-      rule_ind = 0;
-
-      DB_PRINT( "io", ("Done Ruletab") );
-      DB_RETURN( TRUE );
-   }
-
-   buf_org = buf;
-
-do_again:
-   do {
-      p = buf+pos;
-      /* fgets() reads at most one less than Buffer_size-pos characters. */
-      if(feof( fil ) || (fgets( p, Buffer_size-pos, fil ) == NIL(char)))
-     DB_RETURN( TRUE );
-
-#ifdef _MPW
-     if ( p[0] == 10 && p[1] == COMMENT_CHAR)
-       p[0] = ' ';
-#endif
-
-      Line_number++;
-
-      /* Set q to the last char in p before the \n\0. */
-      q = p+strlen(p)-2;
-      if( q >= p ) {	/* Only check for special cases if p points
-             * to a non-empty line. */
-
-     /* ignore each RETURN at the end of a line before any further
-      * processing */
-     if( q[0] == '\r' && q[1] == '\n' ) {
-        q[0] = '\n';
-        q[1] = '\0';
-        q--;
-     }
-     /* you also have to deal with END_OF_FILE chars to process raw
-      * DOS-Files. Normally they are the last chars in file, but after
-      * working on these file with vi, there is an additional NEWLINE
-      * after the last END_OF_FILE. So if the second last char in the
-      * actual line is END_OF_FILE, you can skip the last char. Then
-      * you can search the line back until you find no more END_OF_FILE
-      * and nuke each you found by string termination. */
-     if( q[0] == '\032' )
-        q--;
-     while( q[1] == '\032' ) {
-        q[1] = '\0';
-        q--;
-     }
-
-     /* ignore input if ignore flag set and line ends in a continuation
-        character. */
-
-     if( ignore ) {
-        if( q[0] != CONTINUATION_CHAR || q[1] != '\n' )  ignore = FALSE;
-        *p = '\0';
-        continue;
-     }
-
-     /* If a comment is found the line does not end in \n anymore. */
-     c = Do_comment(p, &q, Group || (*buf == '\t') || (Notabs && *buf ==' '));
-
-     /* Does the end of the line end in a continuation sequence? */
-
-     if( (q[0] == CONTINUATION_CHAR) && (q[1] == '\n')) {
-     /* If the continuation was at the end of a comment then ignore the
-      * next input line, (or lines until we get one ending in just <nl>)
-      * else it's a continuation, so build the input line from several
-      * text lines on input.  The maximum size of this is governened by
-      * Buffer_size */
-        if( q != p && q[-1] == CONTINUATION_CHAR ) {
-           size_t len = strlen(q+1)+1;
-           memmove( q, q+1, len );
-           q--;
-           cont = FALSE;
-        }
-        else if( c != NIL(char) )
-           ignore = TRUE;
-        else
-           cont   = TRUE;	/* Keep the \<nl>. */
-     }
-     else {
-        cont = FALSE;
-     }
-
-     q = ( c == NIL(char) ) ? q+2 : c;
-      }
-      else {  /* empty line or "" */
-     cont = FALSE;
-     ignore = FALSE;
-     q = p+strlen(p);  /* strlen(p) is 1 or 0 */
-      }
-
-      pos += q-p;
-   }
-   while( (cont || !*buf) && (pos < Buffer_size-1) );
-
-   if( pos >= Buffer_size-1 )
-      Fatal( "Input line too long, increase MAXLINELENGTH" );
-
-   /* Lines that had comments don't contain \n anymore. */
-   /* ??? Continued lines that are followed by an empty or comment only
-    * line will end in \<nl>. */
-   if( (q > p) && (buf[ pos-1 ] == '\n') )
-      buf[ --pos ] = '\0';   /* Remove the final \n. */
-
-   /* STUPID AUGMAKE uses "include" at the start of a line as
-    * a signal to include a new file, so let's look for it.
-    * if we see it replace it by .INCLUDE: and stick this back
-    * into the buffer. We also allow GNU make if[n]eq/else/endif.
-    *
-    * These substitutions are made only if we are not parsing a group
-    * recipe. */
-   if( (p = DmStrSpn(buf, " \t\r\n")) == NIL(char) )
-      p = buf;
-
-   if (!Group) {
-      if( !strncmp( "include", p, 7 ) &&
-          (p[7] == ' ' || p[7] == '\t') )
-         tmp = DmStrJoin( ".INCLUDE:", p+7, -1, FALSE );
-      else if( !strncmp( "ifeq", p, 4 ) &&
-               (p[4] == ' ' || p[4] == '\t') )
-         tmp = DmStrJoin( ".IFEQ", p+4, -1, FALSE );
-      else if( !strncmp( "ifneq", p, 5 ) &&
-               (p[5] == ' ' || p[5] == '\t') )
-         tmp = DmStrJoin( ".IFNEQ", p+5, -1, FALSE );
-      else if( !strncmp( "elif", p, 4 ) &&
-               (p[4] == ' ' || p[4] == '\t') )
-         tmp = DmStrJoin( ".ELIF", p+4, -1, FALSE );
-      else if( !strncmp( "else", p, 4 ) &&
-               (p[4] == ' ' || p[4] == '\t' || p[4] == '\0') )
-         tmp = DmStrJoin( ".ELSE", p+4, -1, FALSE );
-      else if( !strncmp( "endif", p, 5 ) &&
-               (p[5] == ' ' || p[5] == '\t' || p[5] == '\0') )
-         tmp = DmStrJoin( ".END", p+5, -1, FALSE );
-   }
-
-   if( tmp != NIL(char)) {
-     strcpy( buf, tmp );
-     FREE( tmp );
-     tmp = NIL(char);
-   }
-
-   /* Now that we have the next line of input to make, we should check to
-    * see if it is a conditional expression.  If it is then process it,
-    * otherwise pass it on to the parser. */
-
-   if( *(p = DmStrSpn(buf, " \t\r\n")) == CONDSTART ) {
-      TKSTR token;
-
-      SET_TOKEN( &token, p );
-
-      p = Get_token( &token, "", FALSE );
-
-      if( (res = _is_conditional(p)) != 0 )	/* ignore non-control special */
-      {						/* targets 		      */
-     res  = _handle_conditional( res, &token );
-     skip = TRUE;
-      }
-      else {
-     CLEAR_TOKEN( &token );
-     res  = TRUE;
-      }
-   }
-
-   if( skip ) {
-      buf  = buf_org;		/* ignore line just read in */
-      pos  = 0;
-      skip = res;
-      goto do_again;
-   }
-
-   DB_PRINT( "io", ("Returning [%s]", buf) );
-   DB_RETURN( FALSE );
-}
-
-
-PUBLIC char *
-Do_comment(str, pend, keep)/*
-=============================
-   Search the input string looking for comment chars.  If it contains
-   comment chars then NUKE the remainder of the line, if the comment
-   char is preceeded by \ then shift the remainder of the line left
-   by one char. */
-char *str;
-char **pend;
-int  keep;
-{
-   char *c = str;
-
-   while( (c = strchr(c, COMMENT_CHAR)) != NIL(char) ) {
-      if( Comment || State == NORMAL_SCAN )
-     if( c != str && c[-1] == ESCAPE_CHAR ) {
-        size_t len = strlen(c)+1;
-        memmove( c-1, c, len );  /* copy it left, due to \# */
-        if( pend ) (*pend)--;    /* shift tail pointer left */
-     }
-     else {
-        /* Check/execute if shebang command is present. */
-        if(    !No_exec
-        && c == str
-            && c[1] == '!'
-            && Line_number == 1
-        && Nestlevel() == 1 ) {
-           char *cmnd;
-
-           cmnd = Expand(c+2);
-           cmnd[strlen(cmnd)-1] = '\0';	/* strip last newline */
-           Current_target = Root;
-#if defined(MSDOS)
-           Swap_on_exec = TRUE;
-#endif
-           Wait_for_completion = TRUE;
-           Do_cmnd(&cmnd, FALSE, TRUE, Current_target, A_DEFAULT, TRUE);
-#if defined(MSDOS)
-           Swap_on_exec = FALSE;
-#endif
-           Wait_for_completion = FALSE;
-           FREE(cmnd);
-        }
-
-        *c = '\0';               /* a true comment so break */
-        break;
-     }
-      else {
-         if( keep )
-        c = NIL(char);
-     else
-        *c = '\0';
-
-     break;
-      }
-   }
-
-   return(c);
-}
-
-
-PUBLIC char *
-Get_token( string, brk, anchor )/*
-==================================
-    Return the next token in string.
-
-    Returns empty string when no more tokens in string.
-    brk is a list of chars that also cause breaks in addition to space and
-    tab, but are themselves returned as tokens.  if brk is NULL then the
-    remainder of the line is returned as a single token.
-
-    'anchor' if 1, says break on chars in the brk list, but only if
-    the entire token begins with the first char of the brk list, if
-    0 then any char of brk will cause a break to occurr.
-
-    If 'anchor' is 2, then break only seeing the first char in the break
-    list allowing only chars in the break list to form the prefix. */
-
-TKSTRPTR  string;
-char      *brk;
-int	  anchor;
-{
-   register char *s;
-   register char *curp = 0;
-   register char *t;
-   int           done = FALSE;
-   char          space[100];
-
-   DB_ENTER( "Get_token" );
-
-   s  = string->tk_str;			  /* Get string parameters	*/
-   *s = string->tk_cchar;		  /* ... and strip leading w/s	*/
-
-   SCAN_WHITE( s );
-
-   DB_PRINT( "tok", ("What's left [%s]", s) );
-
-   if( !*s ) {
-      DB_PRINT( "tok", ("Returning NULL token") );
-      DB_RETURN( "" );
-   }
-
-
-   /* Build the space list.  space contains all those chars that may possibly
-    * cause breaks.  This includes the brk list as well as white space. */
-
-   if( brk != NIL(char) ) {
-      strcpy( space, " \t\r\n" );
-      strcat( space, brk   );
-   }
-   else {
-      space[0] = 0xff;            /* a char we know will not show up      */
-      space[1] = 0;
-   }
-
-
-   /* Handle processing of quoted tokens.  Note that this is disabled if
-    * brk is equal to NIL */
-
-   while( *s == '\"' && ((brk != NIL(char)) || !string->tk_quote) ) {
-      s++;
-      if( string->tk_quote ) {
-     curp = s-1;
-     do { curp = strchr( curp+1, '\"' ); }
-     while( (curp != NIL(char)) && (*(curp+1) == '\"'));
-
-         if( curp == NIL(char) ) Fatal( "Unmatched quote in token" );
-     string->tk_quote = !string->tk_quote;
-
-     /* Check for "" case, and if found ignore it */
-     if( curp == s ) continue;
-     goto found_token;
-      }
-      else
-     SCAN_WHITE( s );
-
-      string->tk_quote = !string->tk_quote;
-   }
-
-
-   /* Check for a token break character at the beginning of the token.
-    * If found return the next set of break chars as a token. */
-
-   if( anchor == 2 && brk != NIL(char) ) {
-      curp = s;
-      while( *curp && (strchr(brk,*curp)!=NIL(char)) && (*curp!=*brk) ) curp++;
-      done = (*brk == *curp++);
-   }
-   else if( (brk != NIL(char)) && (strchr( brk, *s ) != NIL(char)) ) {
-      curp = DmStrSpn( s, brk );
-      done = (anchor == 0) ? TRUE :
-         ((anchor == 1)?(*s == *brk) : (*brk == curp[-1]));
-   }
-
-
-   /* Scan for the next token in the list and return it less the break char
-    * that was used to terminate the token.  It will possibly be returned in
-    * the next call to Get_token */
-
-   if( !done ) {
-      SCAN_WHITE( s );
-
-      t = s;
-      do {
-     done = TRUE;
-     curp = DmStrPbrk(t, space);
-
-     if( anchor && *curp && !IS_WHITE( *curp ) )
-        if( ((anchor == 1)?*curp:DmStrSpn(curp,brk)[-1]) != *brk ) {
-           t++;
-           done = FALSE;
-        }
-      }
-      while( !done );
-
-      if( (curp == s) && (strchr(brk, *curp) != NIL(char)) ) curp++;
-   }
-
-found_token:
-   string->tk_str   = curp;
-   string->tk_cchar = *curp;
-   *curp = '\0';
-
-   DB_PRINT( "tok", ("Returning [%s]", s) );
-   DB_RETURN( s );
-}
-
-
-static int
-_is_conditional( tg )/*
-=======================
-    Look at tg and return it's value if it is a conditional identifier
-    otherwise return 0. */
-char *tg;
-{
-   DB_ENTER( "_is_conditional" );
-
-   tg++;
-   switch( *tg )
-   {
-      case 'I':
-         if( !strcmp( tg, "IF" ))         DB_RETURN( ST_IF    );
-         else if( !strcmp( tg, "IFEQ" ))  DB_RETURN( ST_IFEQ  );
-         else if( !strcmp( tg, "IFNEQ" )) DB_RETURN( ST_IFNEQ );
-         break;
-
-      case 'E':
-         if( !strcmp( tg, "END" ))	      DB_RETURN( ST_END  );
-         else if( !strcmp( tg, "ENDIF")) DB_RETURN( ST_END  );
-         else if( !strcmp( tg, "ELSE" )) DB_RETURN( ST_ELSE );
-         else if( !strcmp( tg, "ELIF" )) DB_RETURN( ST_ELIF );
-         break;
-   }
-
-   DB_RETURN( 0 );
-}
-
-
-
-#define SEEN_END  0x00
-#define SEEN_IF   0x01
-#define SEEN_ELSE 0x02
-#define SEEN_ELIF 0x04
-
-#define ACCEPT_IF   0x10
-#define ACCEPT_ELIF 0x20
-
-static int
-_handle_conditional( opcode, tg )
-    int      opcode;
-    TKSTRPTR tg;
-{
-   static short	action[MAX_COND_DEPTH];
-   static char		ifcntl[MAX_COND_DEPTH];
-   char			*cst;
-   char			*lhs, *expr, *expr_end;
-   char			*lop;
-   int			result;
-
-   DB_ENTER( "_handle_conditional" );
-
-   switch( opcode ) {
-      case ST_ELIF:
-         if( !(ifcntl[Nest_level] & SEEN_IF) || (ifcntl[Nest_level]&SEEN_ELSE) )
-        Fatal(".ELIF without a preceeding .IF" );
-     /*FALLTHRU*/
-
-      case ST_IF:
-      case ST_IFEQ:
-      case ST_IFNEQ:
-     if( opcode != ST_ELIF && (Nest_level+1) == MAX_COND_DEPTH )
-        Fatal( ".IF .ELSE ... .END nesting too deep" );
-
-     If_expand = TRUE;
-     expr = Expand( Get_token( tg, NIL(char), FALSE ));
-     If_expand = FALSE;
-
-     /* Remove CONTINUATION_CHAR<nl> and replace with "  " so that line
-      * continuations are recognized as whitespace. */
-     for( cst=strchr(expr,CONTINUATION_CHAR); cst != NIL(char); cst=strchr(cst,CONTINUATION_CHAR) )
-        if( cst[1] == '\n' ) {
-           *cst = ' ';
-           cst[1] = ' ';
-        }
-        else
-           cst++;
-
-     lhs = expr;
-     SCAN_WHITE( lhs );
-
-     /* Parse the expression and get its logical result */
-     if ( ((lop = DmStrStr(lhs, "||" )) !=  NIL(char)) || ((lop = DmStrStr(lhs, "&&" )) !=  NIL(char)) )
-        result = parse_complex_expression( lhs, &expr_end, opcode );
-     else
-        result = partcomp( lhs, opcode );
-
-     if( expr != NIL(char) ) FREE( expr );
-
-     if( opcode != ST_ELIF ) {
-        Nest_level++;
-        action[Nest_level] = 1;
-     }
-     ifcntl[Nest_level] |= (opcode==ST_ELIF)?SEEN_ELIF:SEEN_IF;
-
-     if( result ) {
-        if( !(ifcntl[Nest_level] & (ACCEPT_IF|ACCEPT_ELIF)) ) {
-           action[ Nest_level ] = action[ Nest_level-1 ];
-           ifcntl[Nest_level] |= (opcode==ST_ELIF)?ACCEPT_ELIF:ACCEPT_IF;
-        }
-        else
-           action[Nest_level] = 1;
-     }
-     else
-        action[Nest_level] = 1;
-     break;
-
-      case ST_ELSE:
-     if( Nest_level <= 0 ) Fatal( ".ELSE without .IF" );
-     if( ifcntl[Nest_level] & SEEN_ELSE )
-        Fatal( "Missing .IF or .ELIF before .ELSE" );
-
-     if( ifcntl[Nest_level] & (ACCEPT_IF|ACCEPT_ELIF) )
-        action[Nest_level] = 1;
-     else if( action[ Nest_level-1 ] != 1 )
-        action[ Nest_level ] ^= 0x1;	/* flip between 0 and 1	*/
-
-     ifcntl[Nest_level] |= SEEN_ELSE;
-     break;
-
-      case ST_END:
-     ifcntl[Nest_level] = SEEN_END;
-     Nest_level--;
-     if( Nest_level < 0 ) Fatal( "Unmatched .END[IF]" );
-     break;
-   }
-
-   DB_RETURN( action[ Nest_level ] );
-}
-
-/* uncomment to turn on expression debug statements */
-/*#define PARSE_DEBUG */
-#define PARSE_SKIP_WHITE(A)		while( *A && ((*A==' ') || (*A=='\t')) )  A++;
-
-#define	OP_NONE	0
-#define	OP_AND	1
-#define	OP_OR	2
-
-static int n = 1;
-
-int parse_complex_expression( char *expr, char **expr_end, int opcode )
-{
-    char *p = expr;
-    char *term_start = p;
-    char *term_end;
-    int  local_term;
-    char *part;
-    int  term_result = FALSE;
-    int  final_result = TRUE;
-    unsigned int   term_len;
-    unsigned int   last_op = OP_NONE;
-
-    #ifdef PARSE_DEBUG
-        printf( "%d: parse_complex_expression( %s ): Opcode: %d\n", n, expr, opcode );
-    #endif
-
-    while ( 1 )
-    {
-        /* A new sub-expression */
-        local_term = TRUE;
-        if ( *p == '(' )
-        {
-            n++;
-            term_result = parse_complex_expression( p+1, &p, opcode );
-            n--;
-            PARSE_SKIP_WHITE( p );
-            term_start = p;
-            term_end = p;
-            local_term = FALSE;
-        }
-        else
-            term_end = p;
-
-        /* Lets do an operation!! */
-        if ( !(*p)									/* at the end of the entire line */
-            || ((*p == '&') && (*(p+1) && (*(p+1)=='&')))	/* found an && */
-            || ((*p == '|') && (*(p+1) && (*(p+1)=='|')))	/* found an || */
-            || (*p == ')') )							/* at the end of our term */
-        {
-            /* Grab the sub-expression if we parsed it.  Otherwise,
-             * it was a () subexpression and we don't need to evaluate
-             * it since that was already done.
-             */
-            if ( local_term == TRUE )
-            {
-                /* Back up 1 to the end of the actual term */
-                term_end--;
-
-                /* Evaluate the term */
-                PARSE_SKIP_WHITE( term_start );
-                term_len = term_end - term_start + 1;
-                part = MALLOC( term_len + 1, char );
-                strncpy( part, term_start, term_len );
-                *(part+term_len) = '\0';
-                #ifdef PARSE_DEBUG
-                    printf( "%d:   evaling '%s'\n", n, part );
-                #endif
-                term_result = partcomp( part, opcode );
-                #ifdef PARSE_DEBUG
-                    printf( "%d:   evaled, result %d\n", n, term_result );
-                #endif
-                FREE( part );
-            }
-
-            /* Do the actual logical operation using the _preceding_
-             * logical operator, NOT the one we just found.
-             */
-            if ( last_op == OP_AND )
-                final_result = final_result && term_result;
-            else if ( last_op == OP_OR )
-                final_result = final_result || term_result;
-            else
-                final_result = term_result;
-            #ifdef PARSE_DEBUG
-                printf( "%d:   final_result:%d\n", n, final_result );
-            #endif
-
-            /* If we're not at the end of the line, just keep going */
-            if ( *p )
-            {
-                /* Recognize the operator we just found above */
-                if ( *p == '&' )
-                    last_op = OP_AND;
-                else if ( *p == '|' )
-                    last_op = OP_OR;
-                if ( *p != ')' )
-                    p += 2;
-    
-                /* Get the start of the next term */
-                PARSE_SKIP_WHITE( p );
-                term_start = p;
-    
-                /* If this is the close of a term, we are done and return
-                * to our caller.
-                */
-                if ( *p == ')' )
-                {
-                    p++;
-                    break;
-                }
-            }
-            else break;		/* At end of line, all done */
-        }
-        else if ( local_term == TRUE )	p++;		/* Advance to next char in expression */
-    }
-    *expr_end = p;
-
-    #ifdef PARSE_DEBUG
-        printf( "%d:   done, returning '%s', result %d\n", n, *expr_end, final_result );
-    #endif
-    return( final_result );
-}
-
-
-int partcomp( char* lhs, int opcode )
-{
-
-    char 	*tok, *rhs, *op = 0;
-    int		result, opsind;
-    const int localopscount=4;
-    char*	localops[] = { "==", "!=", "<=", ">=" };
-    int		lint, rint;
-    
-#define EQUAL			0
-#define NOTEQUAL		1
-#define LESS_EQUAL		2
-#define GREATER_EQUAL	3
-
-    #ifdef PARSE_DEBUG
-        printf( "eval: %s\n", lhs);
-    #endif
-
-    opsind = 0;
-    if( opcode == ST_IFEQ || opcode == ST_IFNEQ )
-    {
-        /* IF[N]EQ syntax is:  .IF[N]EQ <1> <2>
-         * Here, step over first argument and get to <2> if it exists.
-         */
-        for( op = lhs; ((*op)&&(*op != ' ')&&(*op != '\t')); op++ );
-        if( *op )		op++;			/* position op at start of <2> */
-        else			op = NIL(char);	/* only 1 argument given */
-    }
-    else
-    {
-        /* Find which logical operator we are to use for this expression,
-         * and jump to it */
-        while ( (opsind < localopscount) && ((op = DmStrStr(lhs, localops[opsind])) == NIL(char)) )
-            opsind++;
-
-        #ifdef PARSE_DEBUG
-            printf("  found op %d: %s\n", opsind, localops[opsind]);
-        #endif
-     }
-
-    /* If the opcode was IFEQ or IFNEQ and only 1 argument was given,
-     * or an unknown logical operator was encountered,
-     * return false if argument is empty string, true if !empty 
-     */
-    if( op == NIL(char) )
-        result = (*lhs != '\0');
-    else
-     {
-        /* Make both characters of the operation the same, replacing the = in op[1]
-         * Its easier to deal with this way???
-         */
-        if( opcode != ST_IFEQ && opcode != ST_IFNEQ )
-            op[1] = op[0];
-
-        #ifdef PARSE_DEBUG
-            printf("  op:%s\n", op);
-        #endif
-
-        /* Isolate the left half of the expression */
-        if( lhs != op )
-        {
-            for( tok = op-1; (tok != lhs) && ((*tok == ' ')||(*tok == '\t')); tok-- );
-            tok[1] = '\0';
-        }
-        else
-            lhs = NIL(char); /* Left hand side is empty. */
-
-        /* Jump over the operation so we can grab the right half of the expression */
-        if( opcode == ST_IFEQ || opcode == ST_IFNEQ )
-            op--;
-        else
-            op++;
-
-        /* Isolate the right half of the expression */
-        rhs = DmStrSpn( op+1, " \t" );
-        if( !*rhs ) rhs = NIL(char);
-        
-        #ifdef PARSE_DEBUG
-            printf("  lhs:%s, rhs:%s\n", lhs, rhs);
-        #endif
-
-        /* Do the actual logical operation on the expression */
-        if ( opsind > NOTEQUAL )
-        {
-            switch( opsind )
-            {
-                case LESS_EQUAL:
-                case GREATER_EQUAL:
-                    /* Ignore quotes around the arguments */
-                    if ( lhs && lhs[0] == '"' ) lhs++;
-                    if ( rhs && rhs[0] == '"' ) rhs++;
-
-                    /* Empty strings evaluate to zero. */
-                    lint = lhs ? atoi( lhs ) : 0;
-                    rint = rhs ? atoi( rhs ) : 0;
-                    result = ( lint >= rint ) ? TRUE : FALSE;
-                    if ( opsind == LESS_EQUAL && lint != rint )
-                        result = !result;
-                    break;
-                default:
-                    result = FALSE;
-            }
-        }
-        else
-        {
-            /* Use a simple string compare to determine equality */
-            if( (rhs == NIL(char)) || (lhs == NIL(char)) )
-                result = (rhs == lhs) ? TRUE : FALSE;
-            else
-            {
-                /* String off whitespace at the end of the right half of the expression */
-                tok = rhs + strlen( rhs );
-                for( tok=tok-1; (tok != lhs) && ((*tok == ' ')||(*tok == '\t')); tok--);
-                tok[1] = '\0';
-
-                  result = (strcmp( lhs, rhs ) == 0) ? TRUE : FALSE;
-            }
-
-            if( *op == '!' || opcode == ST_IFNEQ ) result = !result;
-        }
-    }
-
-    #ifdef PARSE_DEBUG
-        printf("partresult %d\n\n",result);
-    #endif
-    return result;
-}
-
diff --git a/dmake/hash.c b/dmake/hash.c
deleted file mode 100644
index b07fd9d9f..000000000
--- a/dmake/hash.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* RCS  $Id: hash.c,v 1.2 2006-09-25 09:39:55 vg Exp $
---
--- SYNOPSIS
---      Hashing function for hash tables.
--- 
--- DESCRIPTION
---      Hash an identifier.  The hashing function works by computing the sum
---      of each char and the previous hash value multiplied by 129.  Finally the
---      length of the identifier is added in.  This way the hash depends on the
---      chars as well as the length, and appears to be sufficiently unique,
---      and is FAST to COMPUTE, unlike the previous hash function...
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-PUBLIC uint16
-Hash( id, phv )/*
-=================
-      This function computes the identifier's hash value and returns the hash
-      value modulo the key size as well as the full hash value.  The reason
-      for returning both is so that hash table searches can be sped up.  You
-      compare hash keys instead and compare strings only for those whose 32-bit
-      hash keys match. (not many) */
-
-char   *id;  /* value */
-uint32 *phv; /* key */
-{
-   register char   *p    = id;
-   register uint32 hash  = (uint32) 0;
-
-   while( *p ) hash = (hash << 7) + hash + (uint32) (*p++);
-   *phv = hash = hash + (uint32) (p-id);
-
-   /* return an index (for Macs[]) where all keys with the same remainder
-    * after integer division with HASH_TABLE_SIZE are stored. */
-   return( (uint16) (hash % HASH_TABLE_SIZE) );
-}
-
diff --git a/dmake/imacs.c b/dmake/imacs.c
deleted file mode 100644
index 04feb0975..000000000
--- a/dmake/imacs.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* RCS  $Id: imacs.c,v 1.9 2008-03-05 18:29:01 kz Exp $
---
--- SYNOPSIS
---      Define default internal macros.
--- 
--- DESCRIPTION
---	This file adds to the internal macro tables the set of default
---	internal macros, and for those that are accessible internally via
---	variables creates these variables, and initializes them to point
---	at the default values of these macros.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-static	void	_set_int_var ANSI((char *, char *, int, int *));
-static	void	_set_string_var ANSI((char *, char *, int, char **));
-static	void	_set_bit_var ANSI((char *, char *, int));
-
-
-PUBLIC void
-Make_rules()/*
-==============
-   Parse the strings stored in Rule_tab (from ruletab.c). */
-{
-   Parse(NIL(FILE));
-}
-
-
-#define M_FLAG   M_DEFAULT | M_EXPANDED
-
-/*
-** Add to the macro table all of the internal macro variables plus
-** create secondary variables which will give access to their values
-** easily, both when needed and when the macro value is modified.
-** The latter is accomplished by providing a flag in the macro and a field
-** which gives a pointer to the value if it is a char or string macro value
-** and a mask representing the bit of the global flag register that is affected
-** by this macro's value.
-*/
-PUBLIC void
-Create_macro_vars()
-{
-   static char* switchar;
-   static char* version;
-   char   swchar[2];
-   char   buf[20];
-
-   swchar[0] = Get_switch_char(), swchar[1] = '\0';
-   _set_string_var("SWITCHAR", swchar, M_PRECIOUS, &switchar);
-   if (*swchar == '/')
-      DirSepStr = "\\";
-   else
-#if (_MPW)
-         DirSepStr = ":";
-#elif defined( __EMX__)
-   /* Use '\' for OS/2 port. */
-         DirSepStr = "\\";
-#else
-         DirSepStr = "/";
-#endif
-   _set_string_var("DIRSEPSTR", DirSepStr, M_DEFAULT,&DirSepStr);
-   _set_string_var("DIRBRKSTR", DirBrkStr, M_DEFAULT, &DirBrkStr);
-   swchar[0] = DEF_ESCAPE_CHAR, swchar[1] = '\0';
-   _set_string_var(".ESCAPE_PREFIX", swchar, M_FLAG, &Escape_char);
-
-   /* Each one the following attributes corresponds to a bit of
-    * Glob_attr. */
-   _set_bit_var(".SILENT",   "", A_SILENT  );
-   _set_bit_var(".IGNORE",   "", A_IGNORE  );
-   _set_bit_var(".PRECIOUS", "", A_PRECIOUS);
-   _set_bit_var(".EPILOG",   "", A_EPILOG  );
-   _set_bit_var(".PROLOG",   "", A_PROLOG  );
-   _set_bit_var(".NOINFER",  "", A_NOINFER );
-   _set_bit_var(".SEQUENTIAL","",A_SEQ     );
-   _set_bit_var(".USESHELL", "", A_SHELL   );
-   /* .SWAP (MSDOS) and .WINPATH (cygwin) share the same bit. */
-   _set_bit_var(".SWAP",     "", A_SWAP    );
-   _set_bit_var(".WINPATH",  "", A_WINPATH );
-   _set_bit_var(".MKSARGS",  "", A_MKSARGS );
-   _set_bit_var(".IGNOREGROUP","",A_IGNOREGROUP);
-
-   Glob_attr = A_DEFAULT;        /* set all flags to NULL   */
-
-   _set_string_var("SHELL",        "",  M_DEFAULT, &Shell       );
-   _set_string_var("SHELLFLAGS",   " ", M_DEFAULT, &Shell_flags );
-   _set_string_var("SHELLCMDQUOTE","",  M_DEFAULT, &Shell_quote );
-   _set_string_var("GROUPSHELL",   "",  M_DEFAULT, &GShell      );
-   _set_string_var("GROUPFLAGS",   " ", M_DEFAULT, &GShell_flags);
-   _set_string_var("SHELLMETAS",   "",  M_DEFAULT, &Shell_metas );
-   _set_string_var("GROUPSUFFIX",  "",  M_DEFAULT, &Grp_suff    );
-   _set_string_var("AUGMAKE",NIL(char), M_DEFAULT, &Augmake     );
-   _set_string_var("OOODMAKEMODE", "",  M_DEFAULT, &OOoDmMode );
-   _set_string_var(".KEEP_STATE",  "",  M_DEFAULT, &Keep_state  );
-   _set_string_var(".NOTABS",      "",  M_MULTI, &Notabs );
-   _set_string_var(".DIRCACHE",    "y", M_DEFAULT, &UseDirCache );
-
-#if CASE_INSENSITIVE_FS
-#define DIRCACHERESPCASEDEFAULT ""
-#else
-#define DIRCACHERESPCASEDEFAULT "y"
-#endif
-   _set_string_var(".DIRCACHERESPCASE", DIRCACHERESPCASEDEFAULT, M_DEFAULT, &DcacheRespCase);
-
-   _set_string_var("MAKEDIR",Get_current_dir(),M_PRECIOUS|M_NOEXPORT,
-           &Makedir_macval);
-   Makedir = DmStrDup(Makedir_macval); /* Later done by Def_macro(). */
-   _set_string_var("MAKEVERSION", VERSION, M_PRECIOUS, &version);
-   _set_string_var("PWD",  Makedir,  M_PRECIOUS|M_NOEXPORT, &Pwd_macval);
-   Pwd = DmStrDup(Pwd_macval); /* Later done by Def_macro(). */
-   _set_string_var("TMD",  ".",      M_PRECIOUS|M_NOEXPORT, &Tmd_macval);
-   Tmd = DmStrDup(Tmd_macval); /* Later done by _set_tmd(). */
-
-   Def_macro("NULL", "", M_PRECIOUS|M_NOEXPORT|M_FLAG);
-
-   /* Initialize a macro that contains a space. As leading and trailing
-    * spaces are stripped by Def_macro a little cheating is necessary. */
-   _set_string_var("SPACECHAR", "x", M_PRECIOUS|M_NOEXPORT|M_FLAG, &Spacechar );
-   Spacechar[0] = ' ';
-
-   _set_int_var( "MAXLINELENGTH", "0", M_DEFAULT|M_NOEXPORT, &Buffer_size );
-   _set_int_var( "PREP",          "0", M_DEFAULT, &Prep );
-   (void) Def_macro("MAXLINELENGTH", "1024", M_FLAG | M_DEFAULT);
-
-   /* MAXPROCESSLIMIT is overwritten by the ruletab.c settings. Set its
-    * initial value high so that it allows MAXPROCESS to be changed
-    * from the command line. */
-   _set_int_var( "MAXPROCESSLIMIT", "100", M_DEFAULT|M_NOEXPORT,&Max_proclmt );
-#if defined(USE_CREATEPROCESS)
-   /* Set the OS early enough. */
-   Max_proclmt = MAXIMUM_WAIT_OBJECTS;
-#endif
-   _set_int_var( "MAXPROCESS", "1", M_DEFAULT|M_NOEXPORT, &Max_proc );
-   sprintf(buf,"%d",NAME_MAX);
-   _set_int_var( "NAMEMAX", buf, M_DEFAULT|M_NOEXPORT, &NameMax);
-}
-
-
-/*
-** Define an integer variable value, and set up the macro.
-*/
-static void
-_set_int_var(name, val, flag, var)
-char *name;
-char *val;
-int  flag;
-int  *var;
-{
-   HASHPTR hp;
-
-   hp = Def_macro(name, val, M_FLAG | flag);
-   hp->ht_flag |= M_VAR_INT | M_MULTI | M_INIT;
-   hp->MV_IVAR  = var;
-   *var         = atoi(val);
-}
-
-
-/*
-** Define a string variables value, and set up the macro.
-*/
-static void
-_set_string_var(name, val, flag, var)
-char *name;
-char *val;
-int  flag;
-char **var;
-{
-   HASHPTR hp;
-
-   hp = Def_macro(name, val, M_FLAG | flag);
-   hp->ht_flag |= M_VAR_STRING | M_MULTI | M_INIT;
-   hp->MV_SVAR  = var;
-   *var         = hp->ht_value;
-}
-
-
-/* Define a bit variable value, and set up the macro. Each of the bits
- * corresponds to an attribute bit of Glob_attr. */
-static void
-_set_bit_var(name, val, mask)
-char *name;
-char *val;
-int  mask;
-{
-   HASHPTR hp;
-
-   hp           = Def_macro(name, val, M_FLAG);
-   hp->ht_flag |= M_VAR_BIT | M_MULTI | M_INIT;
-   hp->MV_MASK  = mask;
-   hp->MV_BVAR  = &Glob_attr;
-}
diff --git a/dmake/infer.c b/dmake/infer.c
deleted file mode 100644
index 8e961afec..000000000
--- a/dmake/infer.c
+++ /dev/null
@@ -1,909 +0,0 @@
-/* $RCSfile: infer.c,v $
--- $Revision: 1.8 $
--- last change: $Author: ihi $ $Date: 2007-10-15 15:39:49 $
---
--- SYNOPSIS
---      Infer how to make a target.
--- 
--- DESCRIPTION
---	This file contains the code to infer a recipe, and possibly some new
---	prerequisites for a target which dmake does not know how to make, or
---	has no explicit recipe.
---
---	The inference fails if no path through the inference graph can be
---	found by which we can make the target.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-/* attributes that get transfered from the % start cell to the inferred
- * cells. */
-
-#define A_TRANSFER  (A_EPILOG | A_PRECIOUS | A_SILENT | A_SHELL | A_SETDIR |\
-             A_SEQ | A_LIBRARY | A_IGNORE | A_PROLOG | A_SWAP |\
-             A_PHONY | A_NOSTATE )
-
-
-/* Define local static functions */
-static DFALINKPTR dfa_subset  ANSI((DFALINKPTR, DFASETPTR));
-static void 	  free_dfas   ANSI((DFALINKPTR));
-static int	  count_dots  ANSI((char *));
-static char *	  buildname   ANSI((char *, char *, char *));
-static void	  free_icells ANSI((void));
-static ICELLPTR   union_iset  ANSI((ICELLPTR, ICELLPTR));
-static ICELLPTR   add_iset    ANSI((ICELLPTR,ICELLPTR,CELLPTR,DFALINKPTR,
-                     CELLPTR,int,int,char *,char *, int));
-static ICELLPTR   derive_prerequisites ANSI((ICELLPTR, ICELLPTR *));
-static char *	  dump_inf_chain ANSI((ICELLPTR, int, int));
-
-#ifdef DBUG
-static void	  _dump_dfa_stack ANSI((DFALINKPTR, DFASETPTR));
-static void	  _dump_iset ANSI(( char *, ICELLPTR ));
-#endif
-
-
-PUBLIC void
-Infer_recipe( cp, setdirroot )/*
-================================
-   Perform a breadth-first search of the inference graph and return if
-   possible an inferred set of prerequisites for making the current target. */
-CELLPTR cp;
-CELLPTR setdirroot;
-{
-  ICELLPTR nomatch, match;
-
-  DB_ENTER("Infer_recipe");
-
-  if( cp->ce_attr & A_NOINFER ) {DB_VOID_RETURN;}
-
-  DB_PRINT("inf", ("Inferring rule for [%s]", cp->CE_NAME));
-
-  match = NIL(ICELL);
-  {
-    char *tmp;
-    nomatch = add_iset( NIL(ICELL), NIL(ICELL), NIL(CELL), NIL(DFALINK),
-                        setdirroot, Prep+count_dots(cp->CE_NAME), 0,
-                        tmp = DmStrDup(cp->CE_NAME), NIL(char),
-                        cp->ce_time != (time_t)0L);
-    FREE(tmp);
-  }
-
-  /* Make sure we try whole heartedly to infer at least one suffix */
-  if( nomatch->ic_dmax == 0 ) ++nomatch->ic_dmax;
-
-  DB_EXECUTE( "inf", _dump_iset("nomatch",nomatch); );
-
-  /* If nomatch is non-empty there was no match with an existing
-   * prerrequisite, try to derive one. */
-  while( nomatch != NIL(ICELL) ) {
-    ICELLPTR new_nomatch = NIL(ICELL);
-    ICELLPTR ic, pmatch, mmatch;
-    CELLPTR  prereq;
-
-    for( ic=nomatch; ic != NIL(ICELL); ic=ic->ic_next ) {
-      int ipush = FALSE;
-
-      if( ic->ic_dir ) ipush = Push_dir(ic->ic_dir, ic->ic_name, FALSE);
-      match = union_iset(match, derive_prerequisites(ic, &new_nomatch));
-      if( ipush ) Pop_dir(FALSE);
-    }
-
-    DB_EXECUTE( "inf", _dump_iset("match",match); );
-    DB_EXECUTE( "inf", _dump_iset("nomatch",new_nomatch); );
-
-    /* We have now deduced the two sets MATCH and NOMATCH.  MATCH holds the
-     * set of edges that we encountered that matched.  If this set is empty
-     * then we can apply transitive closure (if enabled) to the elements of
-     * NOMATCH to see if we can find some other method to make the target.
-     *
-     * If MATCH is non-empty, we have found a method for making the target.
-     * It is the shortest method for doing so (ie. uses fewest number of
-     * steps).  If MATCH contains more than one element then we have a
-     * possible ambiguity.
-     */
-    if( match == NIL(ICELL) ) {
-      nomatch = new_nomatch;
-
-      /* Skip the rest and try one level deeper. */
-      if( Transitive ) continue;
-
-      goto all_done;
-    }
-
-    /* Ok, we have a set of possible matches in MATCH, we should check the
-     * set for ambiguity.  If more than one inference path exists of the
-     * same depth, then we may issue an ambiguous inference error message.
-     *
-     * The message is suppressed if MATCH contains two elements and one of
-     * them is the empty-prerequisite-rule.  In this case we ignore the
-     * ambiguity and take the rule that infers the prerequisite.
-     *
-     * Also if there are any chains that rely on a non-existant prerequisite
-     * that may get made because it has a recipe then we prefer any that
-     * rely on existing final prerequisites over those that we have to make.
-     */
-
-    /* Split out those that have to be made from those that end in
-     * prerequisites that already exist. */
-    pmatch = mmatch = NIL(ICELL);
-    for(; match; match = ic ) {
-      /* This loop checks all possible matches. */
-      DB_PRINT("inf", ("Target [%s] : prerequisite [%s]",
-                       match->ic_meta->CE_NAME, match->ic_name));
-
-      ic = match->ic_next;
-      match->ic_next = NIL(ICELL);
-
-      if( match->ic_exists )
-        pmatch = union_iset(pmatch, match);
-      else
-        mmatch = union_iset(mmatch, match);
-    }
-
-    /* Prefer %-targets with existing prerequisites. */
-    if( pmatch )
-      match = pmatch;
-    else
-      match = mmatch;
-
-    /* Make sure it is unique. It would be easy to check
-     * match->ic_meta->ce_prq for existence and prefer no prerequisites
-     * over prerequisites that are present, but we are currently not
-     * doing it. */
-    if( match->ic_next != NIL(ICELL) ) {
-      int count = 1;
-
-      Warning( "Ambiguous inference chains for target '%s'", cp->CE_NAME );
-      for( ic=match; ic; ic=ic->ic_next )
-        (void) dump_inf_chain(ic, TRUE, count++);
-      Warning( "First matching rule is chosen.");
-    }
-
-    /* MATCH now points at the derived prerequisite chain(s).  We must now
-     * take cp, and construct the correct graph so that the make may
-     * proceed.  */
-
-    /* The folowing shows only the first element, i.e. the last matching
-     * recipe that was found.  */ 
-    if( Verbose & V_INFER ) {
-      char *tmp = dump_inf_chain(match, TRUE, FALSE);
-      printf("%s:  Inferring prerequistes and recipes using:\n%s:  ... %s\n",
-             Pname, Pname, tmp );
-      FREE(tmp);
-    }
-
-    pmatch = NIL(ICELL);
-    prereq = NIL(CELL);
-
-    /* This loop treats the inferred targets last to first. */
-    while( match ) {
-      CELLPTR infcell=NIL(CELL);
-
-      /* Compute the inferred prerequisite first. */
-      if( match->ic_name ) {
-        if( match->ic_meta )
-          infcell = Def_cell( match->ic_name );
-        else
-          infcell = cp;
-
-        infcell->ce_flag |= F_TARGET;
-
-        if( infcell != cp ) {
-          infcell->ce_flag |= F_INFER|F_REMOVE;
-          DB_PRINT("remove", ("Mark for deletion [%s]",
-                              infcell->CE_NAME));
-        }
-
-        if( !match->ic_flag )
-          infcell->ce_attr |= A_NOINFER;
-      }
-
-      /* Add global prerequisites from previous rule if there are any and
-       * the recipe. */
-      if( pmatch ) {
-        CELLPTR imeta = pmatch->ic_meta;
-        LINKPTR lp;
-
-        DB_PRINT("inf", ("%%-target [%s] - infered target [%s]\n",
-                         imeta->CE_NAME, infcell->CE_NAME));
-
-        infcell->ce_per   = pmatch->ic_dfa->dl_per;
-        infcell->ce_attr |= (imeta->ce_attr & A_TRANSFER);
-
-        /* The .PHONY mechanism relies on having phony targets not
-         * being STATed and having a zero time stamp. While inferring
-         * the this target it might have been created and stated
-         * therefore these values need to be reset. */
-        if( infcell->ce_attr & A_PHONY ){
-          infcell->ce_time =  0L;
-          infcell->ce_flag &= ~F_STAT;
-        }
-
-        if( !(infcell->ce_flag & F_RULES) ) {
-          infcell->ce_flag |= (imeta->ce_flag&(F_SINGLE|F_GROUP))|F_RULES;
-          infcell->ce_recipe = imeta->ce_recipe;
-        }
-
-        /* Add any conditional macro definitions that may be associated
-         * with the inferred cell. */
-        if (imeta->ce_cond != NIL(STRING)) {
-          STRINGPTR sp,last;
-           
-          last = infcell->ce_cond;
-          for(sp=imeta->ce_cond; sp; sp=sp->st_next) {
-            STRINGPTR new;
-            TALLOC(new, 1, STRING);
-            new->st_string = DmStrDup(sp->st_string);
-            if(last)
-              last->st_next = new;
-            else
-              infcell->ce_cond = new;
-            last = new;
-          }
-        }
-
-        pmatch->ic_dfa->dl_per = NIL(char);
-
-        /* If infcell already had a .SETDIR directory set then modify it
-         * based on whether it was the original cell or some intermediary. */
-        if( imeta->ce_dir ) {
-          if( infcell->ce_dir && infcell == cp ) {
-            /* cp->ce_dir was set and we have pushed the directory prior
-             * to calling this routine.
-             * We build a new path by appending imeta->ce_dir to the
-             * current directory of the original cell.
-             * We should therefore pop it and push the new concatenated
-             * directory required by the inference.
-             * This leaks memory as cp->ce_dir is not freed before
-             * setting the new the new infcell->ce_dir value but as
-             * the pointer could be a `A_POOL` member we accept this. */
-            infcell->ce_dir = DmStrDup(Build_path(infcell->ce_dir,
-                                                  imeta->ce_dir));
-          }
-          else {
-            /* Inherit a copy of the .SETDIR value. Use a copy because
-             * the original could have been freed in the meantime
-             * in Make() by the FREE() before _pool_lookup(). This can
-             * also leak if infcell->ce_dir was set before. */
-            infcell->ce_dir = DmStrDup(imeta->ce_dir);
-          }
-        }
-
-        for( lp=imeta->ce_indprq; lp != NIL(LINK); lp=lp->cl_next ) {
-          char    *name = lp->cl_prq->CE_NAME;
-          CELLPTR tcp;
-
-          name = buildname( cp->CE_NAME, name, infcell->ce_per );
-          tcp  = Def_cell( name );
-          tcp->ce_flag |= F_REMOVE;
-          Add_prerequisite( infcell, tcp, FALSE, FALSE );
-
-          if( Verbose & V_INFER )
-            printf( "%s:  Inferred indirect prerequisite [%s]\n",
-                    Pname, name );
-          FREE(name);
-        }
-      }
-
-      /* Add the previous cell as the prerequisite */
-      if( prereq )
-        (Add_prerequisite(infcell,prereq,FALSE,FALSE))->cl_flag |=F_TARGET;
-
-      pmatch = match;   /* Previous member in inference chain ... */
-      prereq = infcell; /* is a prerequisite to the next match.   */
-      /* ip->ic_parent is the next target in the inference chain to be
-       * build. If it is empty we are done. */
-      match  = match->ic_parent;
-    }
-
-    DB_PRINT("inf", ("Terminated due to a match"));
-    break;
-  }
-
- all_done:
-  free_icells();
-
-  DB_VOID_RETURN;
-}
-
-
-static ICELLPTR
-derive_prerequisites( ic, nnmp )/*
-===================================
-   Take a cell and derive a set of prerequisites from the cell.  Categorize
-   them into those that MATCH (ie. those that we found in the file system),
-   and those that do not match NOMATCH that we may possibly have a look at
-   later.  When we process the next level of the breadth-first search.
-   
-   Once MATCH is non-empty we will stop inserting elements into NOMATCH
-   since we know that either MATCH is successful and unique or it will
-   issue an ambiguity error.  We will never go on to look at elements
-   in NOMATCH after wards. */
-ICELLPTR ic;
-ICELLPTR *nnmp;
-{
-   ICELLPTR   match = NIL(ICELL);
-   DFALINKPTR pdfa;
-   DFALINKPTR dfas;
-
-   DB_ENTER("derive_prerequisites");
-
-   DB_PRINT("inf", ("for [%s]\n", ic->ic_name));
-
-   /* If none of the inference nodes match then forget about the inference.
-    * The user did not tell us how to make such a target.  We also stop the
-    * Inference if the new set of DFA's is a proper subset of a previous
-    * subset and it's PREP counts exceed the value of Prep.
-    */
-   dfas = dfa_subset( Match_dfa(ic->ic_name), &ic->ic_dfastack );
-
-   DB_EXECUTE("inf", _dump_dfa_stack(dfas, &ic->ic_dfastack); );
-
-   /* Ok, we have nothing here to work with so return an empty cell. */
-   if( dfas == NIL(DFALINK) ) {
-      DB_PRINT( "mem", ("%s:<- mem %ld",ic->ic_name, (long)coreleft()));
-      DB_PRINT( "inf", ("<<< Exit, no dfas, cp = %04x", NIL(CELL)) );
-      DB_RETURN( NIL(ICELL) );
-   }
-
-   /* Save the dfas, we are going to use on the stack for this cell. */
-   ic->ic_dfastack.df_set = dfas;
-
-   /* Run through the %-meta cells, build the prerequisite cells.  For each
-    * %-meta go through it's list of edges and try to use each in turn to
-    * deduce a likely prerequisite.  We perform a breadth-first search
-    * matching the first path that results in a unique method for making the
-    * target. */
-   for( pdfa = dfas; pdfa != NIL(DFALINK); pdfa = pdfa->dl_next ) {
-      LINK tl;
-      LINKPTR edge;
-      CELLPTR pmeta;
-
-      pmeta = pdfa->dl_meta;
-      DB_PRINT( "inf", ("Using dfa:  [%s]", pmeta->CE_NAME) );
-
-      /* If the %-meta is a singleton meta then deal with it differently from
-       * the case when it is a bunch of %-meta's found on the original entries
-       * prerequisite list. */
-      if( pmeta->ce_flag & F_MULTI )
-     edge = pmeta->ce_prq;
-      else {
-     tl.cl_prq = pmeta;
-     tl.cl_next = NIL(LINK);
-     edge = &tl;
-      }
-
-      /* Now run through the list of prerequisite edge's for the %-meta. */
-      for( ; edge != NIL(LINK); edge = edge->cl_next ) {
-     HASHPTR  thp = 0;		/* temporary hash table pointer		*/
-     HASH     iprqh;	/* hash cell for new prerequisite	*/
-     CELL     iprq;		/* inferred prerequisite to look for	*/
-     CELLPTR  idirroot;	/* Inferred prerequisite root		*/
-     CELLPTR  nidirroot;	/* Inferred prerequisite root		*/
-     STRINGPTR ircp = 0;	/* Inferred prerequisites recipe	*/
-     char     *idir;	/* directory to CD to.			*/
-     int      ipush = 0;	/* flag for push on inferred prereq     */
-     char     *name = NIL(char); 		/* prerequisite name    */
-     CELLPTR  meta = edge->cl_prq;
-     int	  dmax_fix;
-     int      trans;
-     int      noinf;
-     int	  exists;
-     
-     /* Name of the prerequisite, can be empty. */
-     if( meta->ce_prq )
-        name = meta->ce_prq->cl_prq->CE_NAME;
-
-     DB_PRINT( "inf", ("Trying edge from [%s] to [%s] for [%s]",
-           meta->CE_NAME, name?name:"(nil)", ic->ic_name) );
-
-     /* Set the temp CELL used for building prerequisite candidates to
-      * all zero so that we don't have to keep initializing all the
-      * fields. */
-     {
-        register char *s = (char *) &iprq;
-        register int   n = sizeof(CELL);
-        while( n ) { *s++ = '\0'; n--; }
-     }
-
-     nidirroot = idirroot = ic->ic_setdirroot;
-     iprq.ce_name = &iprqh;
-
-     if( name ) {
-        /* Build the prerequisite name from the %-meta prerequisite given
-         * for the %-meta rule. */
-        iprqh.ht_name = buildname( ic->ic_name, name, pdfa->dl_per );
-        if((dmax_fix = (count_dots(name)-count_dots(meta->CE_NAME))) < 0)
-           dmax_fix = 0;
-
-        if( !strcmp(ic->ic_name, iprqh.ht_name) ||
-        (count_dots(iprqh.ht_name) > ic->ic_dmax + dmax_fix) ) {
-           FREE( iprqh.ht_name );
-           continue;
-        }
-
-        DB_PRINT( "inf", ("Checking prerequisite [%s]", iprqh.ht_name) );
-
-        /* See if the prerequisite CELL has been previously defined.  If
-         * it has, then make a copy of it into iprq, and use it to try
-         * the inference.  We make the copy so that we don't modify the
-         * stat of the inferred cell if the inference fails.
-         */
-        thp = Get_name( iprqh.ht_name, Defs, FALSE );
-        if(thp != NIL(HASH)) {
-           iprq = *thp->CP_OWNR;
-           /* Check if a recipe for this target exists. Targets with F_MULTI
-        * set need each cell checked for existing recipes.
-        */
-           if( iprq.ce_flag & F_MULTI ) {
-          /* Walk through all cells of this target. */
-          LINKPTR mtcp = iprq.ce_prq;
-          ircp = NIL(STRING);
-          for( ; mtcp != NIL(LINK); mtcp = mtcp->cl_next ) {
-             /* If a recipe is found stop searching and set ircp to that result.
-              * ircp is not used but only checked if it is set.
-              */
-             if( mtcp->cl_prq->ce_recipe != NIL(STRING) ) {
-            ircp = mtcp->cl_prq->ce_recipe;
-            break;
-             }
-          }
-           }
-           else
-          ircp = iprq.ce_recipe;
-        }
-        else
-           ircp = NIL(STRING);
-     }
-     else
-        iprqh.ht_name = NIL(char);
-
-
-     /* If the %-meta has a .SETDIR set then we change to the new
-      * directory prior to performing the stat of the new prerequisite.
-      * If the change of directory fails then the rule is droped from
-      * further consideration.
-      */
-     if( iprq.ce_dir ) {
-        if( (ipush = Push_dir(iprq.ce_dir, iprqh.ht_name, TRUE)) != 0 ) {
-           nidirroot = thp->CP_OWNR;
-           idir      = Pwd;
-        }
-        else {
-           if( iprqh.ht_name ) FREE( iprqh.ht_name );
-           continue;
-        }
-     }
-     else
-        idir = NIL(char);
-
-
-     /* Stat the inferred prerequisite.
-      */
-     if( name ) {
-        if( Verbose & V_INFER )
-           printf( "%s:  Trying prerequisite [%s] for [%s]\n", Pname,
-               iprqh.ht_name, ic->ic_name );
-
-        /* irpq is a temporary target cell, a stat will not be remembered. */
-        if( !(iprq.ce_flag & F_STAT) ) Stat_target(&iprq, FALSE, FALSE);
-     }
-
-
-     /* If the STAT succeeded or if the prerequisite has a recipe for
-      * making it then it's a match and a candidate for getting infered.
-      * Otherwise it is not a match, and we cannot yet tell if it is
-      * going to be a successful path to follow, so we save it for
-      * later consideration.
-      */
-     noinf = ((Glob_attr)&A_NOINFER);
-     if( meta->ce_prq )
-        noinf |= ((meta->ce_prq->cl_prq->ce_attr)&A_NOINFER);
-     trans = Transitive || !noinf;
-
-     /* If no prereq is given treat it as if it is existing. */
-     exists = (iprq.ce_time != (time_t)0L) || (name == NIL(char));
-
-     if( exists || (ircp != NIL(STRING)) || !name ) {
-        match = add_iset( match, ic, meta, pdfa, idirroot, ic->ic_dmax,
-                   trans, iprq.ce_name->ht_name, idir, exists );
-        DB_PRINT("inf",("Added to MATCH %s",iprq.ce_name->ht_name));
-     }
-     else if( !noinf && match == NIL(ICELL) ) {
-        *nnmp = add_iset( *nnmp, ic, meta, pdfa, nidirroot, ic->ic_dmax,
-                   trans, iprq.ce_name->ht_name, idir, exists );
-        DB_PRINT("inf",("Added to NOMATCH %s",iprq.ce_name->ht_name));
-     }
-
-     /* If we pushed a directory for the inferred prerequisite then
-      * pop it.
-      */
-     if( ipush ) Pop_dir(FALSE);
-     if( iprqh.ht_name ) FREE(iprqh.ht_name);
-      }
-   }
-
-   DB_RETURN(match);
-}
-
-
-static char *
-buildname( tg, meta, per )/*
-============================
-   Replace '%' with per in meta. Expand the result and return it. */ 
-char *tg; /* Current target name. */
-char *meta;
-char *per;
-{
-   char    *name;
-
-   name = Apply_edit( meta, "%", per, FALSE, FALSE );
-   /* Handle infered dynamic prerequisites. */
-   if( strchr(name, '$') ) {
-      HASHPTR m_at;
-      char *tmp;
-
-      /* Set $@ so that a Expand() can use it and remove it afterwards. */
-      /* Is $@ already expanded? FIXME: Remove this check later. */
-      if( *DmStrPbrk( tg, "${}" ) != '\0' )
-     Fatal("$@ [%s] not fully expanded!", tg);
-      m_at = Def_macro( "@", DO_WINPATH(tg), M_MULTI|M_EXPANDED );
-      tmp = Expand( name );
-
-      if( m_at->ht_value != NIL(char) ) {
-     FREE( m_at->ht_value );
-     m_at->ht_value = NIL(char);
-      }
-
-      /* Free name if Apply_edit() did something. */
-      if( name != meta ) FREE( name );
-      name = tmp;
-   }
-   else if( name == meta )
-      name = DmStrDup( name );
-
-   return(name);
-}
-
-
-static DFALINKPTR
-dfa_subset( pdfa, stack )/*
-============================
-   This is the valid DFA subset computation.  Whenever a CELL has a Match_dfa
-   subset computed this algorithm is run to see if any of the previously
-   computed sets on the DFA stack are proper subsets of the new set.  If they
-   are, then any elements of the matching subset whose Prep counts exceed
-   the allowed maximum given by Prep are removed from the computed DFA set,
-   and hence from consideration, thereby cutting off the cycle in the
-   inference graph. */
-DFALINKPTR	   pdfa;
-register DFASETPTR stack;
-{
-   register DFALINKPTR element;
-   DFALINKPTR          nelement;
-
-   DB_ENTER( "dfa_subset" );
-
-   DB_PRINT("inf",("Computing DFA subset, PREP = %d",Prep));
-   DB_EXECUTE("inf", _dump_dfa_stack(pdfa, stack); );
-
-   for(; pdfa != NIL(DFALINK) && stack != NIL(DFASET); stack = stack->df_next) {
-      int subset = TRUE;
-
-      for( element=stack->df_set; subset && element != NIL(DFALINK);
-           element=element->dl_next ) {
-         register DFALINKPTR subel;
-
-     for( subel = pdfa;
-          subel != NIL(DFALINK) && (subel->dl_meta != element->dl_meta);
-          subel = subel->dl_next );
-
-     DB_PRINT("inf",("Looking for %s, (%s)",element->dl_meta->CE_NAME,
-             (subel != NIL(DFALINK))?"succ":"fail"));
-
-     if( (subset = (subel != NIL(DFALINK))) != 0 )
-        element->dl_member = subel;
-      }
-
-      if( subset )
-     for( element=stack->df_set; element != NIL(DFALINK);
-          element=element->dl_next ) {
-        DFALINKPTR mem = element->dl_member;
-        int        npr = element->dl_prep + 1;
-
-        if( npr > Prep )
-           mem->dl_delete++;
-        else
-           mem->dl_prep = npr;
-     }
-   }
-
-   for( element = pdfa; element != NIL(DFALINK); element = nelement ) {
-      nelement = element->dl_next;
-
-      if( element->dl_delete ) {
-     /* A member of the subset has a PREP count equal to PREP, so
-      * it should not be considered further in the inference, hence
-      * we remove it from the doubly linked set list */
-     if( element == pdfa )
-        pdfa = element->dl_next;
-     else
-        element->dl_prev->dl_next = element->dl_next;
-
-     if( element->dl_next != NIL(DFALINK) )
-        element->dl_next->dl_prev = element->dl_prev;
-
-     DB_PRINT("inf", ("deleting dfa [%s]", element->dl_meta->CE_NAME));
-     FREE( element->dl_per );
-     FREE( element );
-      }
-   }
-
-   DB_RETURN( pdfa );
-}
-
-
-
-static void
-free_dfas( chain )/*
-=====================
-   Free the list of DFA's constructed by Match_dfa, and linked together by
-   LINK cells.  FREE the % value as well, as long as it isn't NIL. */
-DFALINKPTR chain;
-{
-   register DFALINKPTR tl;
-
-   DB_ENTER( "free_dfas" );
-
-   for( tl=chain; tl != NIL(DFALINK); chain = tl ) {
-      tl = tl->dl_next;
-
-      DB_PRINT( "inf", ("Freeing DFA [%s], %% = [%s]", chain->dl_meta->CE_NAME,
-                chain->dl_per) );
-
-      if( chain->dl_per != NIL(char) ) FREE( chain->dl_per );
-      FREE( chain );
-   }
-
-   DB_VOID_RETURN;
-}
-
-
-static int
-count_dots( name )/*
-=====================*/
-char *name;
-{
-   register char *p;
-   register int  i = 0;
-
-   for( p = name; *p; p++ ) if(*p == '.') i++;
-
-   return( i );
-}
-
-
-static ICELLPTR _icells = NIL(ICELL);
-#ifdef DBUG
-static int _icell_cost = 0;
-#endif
-
-static ICELLPTR
-add_iset( iset, parent, meta, dfa, setdirroot, dmax, noinf, name, dir, exists)
-ICELLPTR   iset;
-ICELLPTR   parent;
-CELLPTR    meta;
-DFALINKPTR dfa;
-CELLPTR    setdirroot;
-int	   dmax;
-int	   noinf;
-char	  *name;
-char	  *dir;
-int	   exists;
-{
-   ICELLPTR icell;
-
-   DB_ENTER("add_iset");
-   TALLOC(icell, 1, ICELL);
-
-   DB_EXECUTE("inf", _icell_cost+=(sizeof(ICELL)+strlen(dir?dir:"")+strlen(name?name:"")+2););
-
-   icell->ic_meta = meta;
-   icell->ic_dfa  = dfa;
-   icell->ic_setdirroot = setdirroot;
-
-   if( parent ) icell->ic_dfastack.df_next = &parent->ic_dfastack;
-
-   icell->ic_dmax = dmax;
-   icell->ic_dir = DmStrDup(dir);
-   icell->ic_name = DmStrDup(name);
-   icell->ic_parent = parent;
-   icell->ic_next = iset;
-   icell->ic_flag = noinf;
-   icell->ic_exists = exists;
-
-   icell->ic_link = _icells;
-   _icells = icell;
-
-   DB_RETURN(icell);
-}
-
-
-static void
-free_icells()
-{
-   register ICELLPTR ic;
-
-   DB_ENTER("free_icells");
-
-   for( ; _icells; _icells = ic ) {
-      ic = _icells->ic_link;
-
-      free_dfas(_icells->ic_dfastack.df_set);
-      if( _icells->ic_dir ) FREE(_icells->ic_dir);
-      if( _icells->ic_name) FREE(_icells->ic_name);
-      FREE(_icells);
-   }
-
-   DB_PRINT("inf",("Used %d memory for icells",_icell_cost));
-   DB_EXECUTE("inf", _icell_cost=0; );
-
-   DB_VOID_RETURN;
-}
-
-
-static ICELLPTR
-union_iset( iset, uset )
-ICELLPTR iset;
-ICELLPTR uset;
-{
-   register ICELLPTR ic;
-
-   if( iset == NIL(ICELL) ) return(uset);
-
-   for( ic=iset; ic->ic_next != NIL(ICELL); ic=ic->ic_next );
-   ic->ic_next = uset;
-
-   return(iset);
-}
-
-
-static char *
-dump_inf_chain( ip, flag, print )/*
-===================================
-Return string with infered prerequisites.
-flag == TRUE adds the top of the chain.
-print == TRUE prints to screen with number "print" and returns NULL. */
-ICELLPTR ip;
-int      flag;
-int	 print;
-{
-   char *tmp;
-
-   if( ip == NIL(ICELL) ) return(NIL(char));
-
-   /* ip->ic_parent is the target to be build after ip. */
-   tmp = dump_inf_chain(ip->ic_parent, FALSE, FALSE);
-
-   if( ip->ic_meta ) {
-      tmp = DmStrJoin(tmp, "(", -1, TRUE);
-      tmp = DmStrJoin(tmp, ip->ic_meta->CE_NAME, -1, TRUE);
-
-      if( ip->ic_dir && !*ip->ic_dir ) {
-     tmp = DmStrJoin(tmp, "[", -1, TRUE);
-     if( strncmp(Makedir,ip->ic_dir, strlen(Makedir)) )
-        tmp = DmStrJoin(tmp, ip->ic_dir, -1, TRUE);
-     else
-        tmp = DmStrJoin(tmp, ip->ic_dir+strlen(Makedir)+1, -1, TRUE);
-     tmp = DmStrJoin(tmp, "]", -1, TRUE);
-      }
-      tmp = DmStrJoin(tmp, (ip->ic_name)?") -->":")", -1, TRUE);
-   }
-   
-   if( ip->ic_name ) tmp = DmStrApp( tmp, ip->ic_name );
-
-   if( flag && ip->ic_meta->ce_prq) {
-      tmp = DmStrJoin(tmp, "(", -1, TRUE);
-      tmp = DmStrJoin(tmp, ip->ic_meta->ce_prq->cl_prq->CE_NAME, -1, TRUE);
-      tmp = DmStrJoin(tmp, ")", -1, TRUE);
-   }
-
-   if( print ) {
-      fprintf( stderr, "%s:  %2d. %s\n", Pname, print, tmp );
-      FREE(tmp);
-      tmp = NIL(char);
-   }
-
-   return(tmp);
-}
-
-
-#ifdef DBUG
-static void
-_dump_dfa_stack(dfas, dfa_stack)
-DFALINKPTR dfas;
-DFASETPTR  dfa_stack;
-{
-   register DFALINKPTR pdfa;
-   char      *tmp = NIL(char);
-   DFASETPTR ds;
-
-   for( pdfa = dfas; pdfa != NIL(DFALINK); pdfa = pdfa->dl_next )
-      tmp = DmStrApp( tmp, pdfa->dl_meta->CE_NAME );
-
-   tmp = DmStrApp( tmp, ":: {" );
-   for( ds = dfa_stack; ds != NIL(DFASET); ds = ds->df_next ) {
-      tmp = DmStrApp( tmp, "[" );
-      for( pdfa = ds->df_set; pdfa != NIL(DFALINK); pdfa = pdfa->dl_next )
-     tmp = DmStrApp( tmp, pdfa->dl_meta->CE_NAME );
-      tmp = DmStrApp( tmp, "]" );
-   }
-   tmp = DmStrApp( tmp, "}" );
-
-   printf( "DFA set and stack contents:\n%s\n", tmp );
-   FREE(tmp);
-}
-
-
-static void
-_dump_iset( name, iset )
-char     *name;
-ICELLPTR iset;
-{
-   int cell = 0;
-
-   printf( "**** ISET for %s\n", name );
-   for( ; iset != NIL(ICELL); iset = iset->ic_next ){
-      printf( "cell %d\n", cell++ );
-      if( iset->ic_meta )
-     printf( "edge: %s --> %s\n", iset->ic_meta->CE_NAME,
-         iset->ic_meta->ce_prq ?
-         iset->ic_meta->ce_prq->cl_prq->CE_NAME :
-         "(nil)" );
-      else
-     printf( "edge: (nil)\n" );
-
-      if( iset->ic_dfa )
-     printf( "dfa: %s\n", iset->ic_dfa->dl_meta->CE_NAME );
-      else
-     printf( "dfa: (nil)\n" );
-
-      printf( "sdr: %p\n", iset->ic_setdirroot );
-      _dump_dfa_stack(iset->ic_dfastack.df_set, &iset->ic_dfastack);
-
-      printf( "dmax: %d\n", iset->ic_dmax );
-      printf( "name: %s\n", iset->ic_name );
-      printf( "dir:  %s\n", iset->ic_dir?iset->ic_dir:"(nil)" );
-
-      printf( "parent: " );
-      if( iset->ic_parent )
-    if( iset->ic_parent->ic_meta )
-       printf( "%s --> %s\n",
-               iset->ic_parent->ic_meta->CE_NAME,
-           iset->ic_parent->ic_meta->ce_prq ?
-           iset->ic_parent->ic_meta->ce_prq->cl_prq->CE_NAME :
-           "(nil)" );
-    else
-       printf( "(nil)\n" );
-      else
-     printf( "(nil)\n" );
-   }
-   printf( "==================================\n" );
-}
-#endif
diff --git a/dmake/install-sh b/dmake/install-sh
deleted file mode 100755
index 4d4a9519e..000000000
--- a/dmake/install-sh
+++ /dev/null
@@ -1,323 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2005-05-14.22
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-chmodcmd="$chmodprog 0755"
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test -n "$1"; do
-  case $1 in
-    -c) shift
-        continue;;
-
-    -d) dir_arg=true
-        shift
-        continue;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
-
-    -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
-	break;;
-  esac
-done
-
-if test -z "$1"; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src ;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
-  else
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dstarg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dstarg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst ;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
-	exit 1
-      fi
-      dst=$dst/`basename "$src"`
-    fi
-  fi
-
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-  # Make sure that the destination directory exists.
-
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
-
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
-
-    pathcomp=
-
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
-      shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
-      fi
-      pathcomp=$pathcomp/
-    done
-  fi
-
-  if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
-  else
-    dstfile=`basename "$dst"`
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
-
-    # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
-done
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/dmake/itypes.h b/dmake/itypes.h
deleted file mode 100644
index 6ff9bc00e..000000000
--- a/dmake/itypes.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* RCS  $Id: itypes.h,v 1.3 2004-04-21 14:10:32 svesik Exp $
---
--- SYNOPSIS
---      Type declarations for common types
--- 
--- DESCRIPTION
--- 	portable type declarations.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-
-#ifndef ITYPES_h
-#define	ITYPES_h
-
-#ifndef HAVE_INT8
-  typedef unsigned char uint8;
-#endif
-
-#ifndef HAVE_INT8
-  typedef signed char int8;
-#endif
-
-#if SIZEOF_SHORT == 2
-# ifndef HAVE_UINT16
-    typedef unsigned short uint16;
-# endif
-
-# ifndef HAVE_INT16
-    typedef short int16;
-# endif
-
-#elif SIZEOF_INT == 2
-
-# ifndef HAVE_UNIT16
-    typedef unsigned int uint16;
-# endif
-
-# ifndef HAVE_INT16
-     typedef int int16;
-# endif
-#else
-# ifndef HAVE_INT16
-#   error "No 2 byte type, you lose."
-# endif
-#endif
-#if SIZEOF_INT == 4
-# ifndef HAVE_UINT32
-    typedef unsigned int uint32;
-# endif
-# ifndef HAVE_INT32
-    typedef int int32;
-# endif
-#elif SIZEOF_LONG == 4
-# ifndef HAVE_UINT32
-    typedef unsigned long uint32;
-# endif
-# ifndef HAVE_INT32
-    typedef long int32;
-# endif
-#else
-# ifndef HAVE_INT32
-#   error "No 4 byte type, you lose."
-# endif
-#endif
-
-#endif
-
diff --git a/dmake/macparse.c b/dmake/macparse.c
deleted file mode 100644
index cb0078e4a..000000000
--- a/dmake/macparse.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/* RCS  $Id: macparse.c,v 1.3 2007-10-15 15:40:02 ihi Exp $
---
--- SYNOPSIS
---      Parse a macro definition
--- 
--- DESCRIPTION
---	This file contains the code that parses a macro definition
---	stored in a buffer.  If the string in buffer is not a valid
---	macro definition the routie Parse_macro returns 0, otherwise it
---	returns 1 to indicate success.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-PUBLIC int
-Parse_macro( buffer, flag )/*
-=============================
-   Parse the string in buffer and define it as a macro if it is a valid macro.
-   Note especially the string .SETDIR= since it is an attribute, but looks a
-   lot like a macro definition.  This would not be a problem if make used
-   white space as token separators, since this is not the case we must do
-   something about it. */
-char *buffer;
-int  flag;
-{
-   char		 *result;	/* temporary pointer for strings   */
-   TKSTR          input;        /* place to scan the buffer from   */
-   HASHPTR	  hv;		/* pointer to hash table value	   */
-   int		  operator;	/* what macro operator do we have  */
-   char *tok1;			/* temporary place to keep a token */
-   char *tok2;			/* temporary place to keep a token */
-   int  toklen;			/* length of a token               */
-
-   DB_ENTER( "Parse_macro" );
-
-   SET_TOKEN( &input, buffer );
-   tok1 = Get_token( &input, "=+:*!?", 0 );
-
-   operator=Macro_op(tok1);
-   if( operator ) {
-      CLEAR_TOKEN( &input );
-      Error( "Assignment without macro name: [%s].", buffer );
-      DB_RETURN( 1 );
-   }
-
-   tok1 = DmStrDup(tok1);
-   tok2 = Get_token( &input, "=+:*!?", 2 );
-   if( !(operator = Macro_op(tok2)) || !strcmp(tok1,".SETDIR") ) {
-      CLEAR_TOKEN( &input );
-      FREE(tok1);
-      DB_RETURN(0);
-   }
-
-   tok2 = Expand(tok1); FREE(tok1); tok1 = tok2;
-   if ( !(toklen = strlen(tok1)) ) {
-      Warning( "Empty macro name after expansion: [%s].", buffer );
-   }
-
-   /* Catch illegal single character macro names. */
-   if ( toklen == 1 && strchr("{()}", tok1[0]) ) {
-      CLEAR_TOKEN( &input );
-      Fatal( "Syntax error in macro assignment [%s]. The following characters cannot be used as single letter macro names: '{()}'.", buffer );
-   }
-
-   /* Catch ':' in macro names. */
-   if ( strchr(tok1, ':') ) {
-      CLEAR_TOKEN( &input );
-      Fatal( "Syntax error in macro assignment [%s]. The character ':' is not allowed in macro names.", buffer );
-   }
-
-   tok2 = Get_token(&input, NIL( char ), FALSE);
-
-   /* Make sure we can force the assignment. */
-   if ( operator & M_OP_SI ) {
-      flag |= M_FORCE|M_MULTI;
-      operator &= ~M_OP_SI;
-   }
-
-   switch( operator ) {
-      case M_OP_PLCL:
-      tok2 = Expand( tok2 );
-      /* Fall thru */
-
-      case M_OP_PL:
-     /* Add to an existing macro, if it is not defined, though, then
-      * just define a new macro */
-
-     if( (hv = GET_MACRO(tok1)) == NIL(HASH) || hv->ht_value == NIL(char) )
-        Def_macro( tok1, tok2, flag );
-     else {
-        result = DmStrAdd( hv->ht_value, tok2, FALSE );
-        Def_macro( tok1, result, flag );
-        FREE( result );
-     }
-     if( operator == M_OP_PLCL ) FREE(tok2);
-     break;
-
-      case M_OP_DF:
-     /* *= */
-     /* internal default macros or initialized empty macros set M_INIT. */
-      if( (hv = GET_MACRO(tok1)) != NIL(HASH) && !(hv->ht_flag & M_INIT) )
-        break;
-     /* else FALLTHRU */
-
-      case M_OP_EQ:
-     Def_macro( tok1, tok2, flag );
-     break;
-
-      case M_OP_DFCL:
-     /* *:= */
-     /* internal default macros or initialized empty macros set M_INIT. */
-      if( (hv = GET_MACRO(tok1)) != NIL(HASH) && !(hv->ht_flag & M_INIT) )
-        break;
-     /* else FALLTHRU */
-
-      case M_OP_CL:
-     tok2 = Expand( tok2 );
-     Def_macro( tok1, tok2, M_EXPANDED | flag );
-     FREE( tok2 );
-     break;
-
-      case M_OP_CM:{
-     CELLPTR     cp;
-     STRINGPTR   sp;
-
-     if (flag & M_PUSH) {
-        Error("Nested conditional definition [%s ?= %s] ignored",
-          tok1, tok2);
-     }
-     else {
-        cp = Def_cell(tok1);
-        if (cp->ce_flag & F_MULTI) {
-           LINKPTR lp;
-           for(lp=cp->ce_prq; lp->cl_next; lp=lp->cl_next);
-           cp = lp->cl_prq;
-        }
-        TALLOC(sp,1,STRING);
-        sp->st_string = DmStrDup(tok2);
-        sp->st_next   = cp->ce_cond;
-        cp->ce_cond   = sp;
-
-        tok1 = NIL(char);
-     }
-      }
-      break;
-   }
-
-   if (tok1) {	    
-      if ( LastMacName != NIL(char) )
-     FREE( LastMacName );
-
-      LastMacName = tok1;
-   }
-
-   DB_RETURN( 1 );
-}
-
-
-
-PUBLIC int
-Macro_op( op )/*
-================
-   Check the passed in op string and map it to one of the macro operators */
-char *op;
-{
-   int ret = 0;
-   DB_ENTER( "macro_op" );
-
-   if ( *op == '!' ) {
-      ret = M_OP_SI;
-      op++;
-   }
-
-   switch( *op ) {
-      case '=': ret |= M_OP_EQ; break;
-      case ':': ret |= M_OP_CL; op++; break;
-
-      case '+':
-     op++;
-         if( *op == ':' ) {
-        ret |= M_OP_PLCL;
-        op++;
-     }
-     else {
-        ret |= M_OP_PL;
-     }
-         break;
-
-      case '*':
-     op++;
-         if( *op == ':' ) {
-        ret |= M_OP_DFCL;
-        op++;
-     }
-     else {
-        ret |= M_OP_DF;
-     }
-         break;
-
-      case '?':
-     ret |= M_OP_CM;
-     op++;
-     break;
-   }
-
-   if( *op != '=' )
-      ret = 0;
-   else {
-      op++;
-      
-      if( *op != '\0' )
-     ret = 0;
-   }
-
-   DB_RETURN( ret );
-}
diff --git a/dmake/make.bat b/dmake/make.bat
deleted file mode 100755
index a0e3fdea8..000000000
--- a/dmake/make.bat
+++ /dev/null
@@ -1,273 +0,0 @@
-echo off
-cls
-rem  *** This is the make batchfile that is used under MSDOS to make the
-rem  *** first version of dmake.  It isn't pretty but it does work, assuming
-rem  *** the compilers have been correctly setup.  See the warning below
-rem  *** concerning tlink, if you are building any of the Borland compiler
-rem  *** versions.
-rem
-
-if %0%1 == %0 goto error
-if %1 == tcc20swp goto mktccswp
-
-if %1 == bcc30swp goto mkbcc30swp
-if %1 == bcc40swp goto mkbcc40swp
-if %1 == bcc45swp goto mkbcc45swp
-if %1 == bcc50swp goto mkbcc50swp
-
-if %1 == msc51       goto mkms51
-if %1 == msc51swp    goto mkms51swp
-if %1 == msc60       goto mkms60
-if %1 == msc60swp    goto mkms60swp
-
-if %1 == win95-bcc50 goto mkw32b50
-if %1 == win95-vpp40 goto mkw32vp40
-
-rem label the possible DOS variations for dmake here.
-:error
-echo MSDOS:  You must specify 'make target' where target is one of:
-echo -------------
-echo    tcc20swp     - Turbo C 2.0 compile of swapping dmake..
-
-echo    bcc30swp     - Borland C++ 3.0 compile of swapping dmake.
-echo    bcc40swp     - Borland C++ 4.0 compile of swapping dmake.
-echo    bcc45swp     - Borland C++ 4.5 compile of swapping dmake.
-echo    bcc50swp     - Borland C++ 5.0 compile of swapping dmake.
-
-echo    msc51        - Microsoft C 5.1 compile.
-echo    msc51swp     - Microsoft C 5.1, MASM 5.1 compile of swapping dmake.
-echo    msc60        - Microsoft C 6.0 compile.
-echo    msc60swp     - Microsoft C 6.0, MASM 5.1 compile of swapping dmake.
-
-echo    win95-bcc50  - Borland C++ 5.0 32-bit compile of dmake.
-echo    win95-vpp40  - Microsoft VC++ 4.0 32-bit compile of dmake.
-goto end
-
-rem This is the script that makes dmake using Microsoft C 5.1
-:mkms51
-msdos\microsft\msc51\mk.bat
-goto end
-
-:mkms51swp
-msdos\microsft\msc51\mkswp.bat
-goto end
-
-rem This is the script that makes dmake using Microsoft C 6.0
-:mkms60
-msdos\microsft\msc60\mk.bat
-goto end
-
-:mkms60swp
-msdos\microsft\msc60\mkswp.bat
-goto end
-
-:mkw32vp40
-win95\microsft\vpp40\mk.bat
-goto end
-
-rem This is the script that makes dmake using Turbo C 2.0 or higher.
-:mktcc
-cls
-echo WARNING:
-echo    The default response files:
-echo        msdos\borland\tcc20\obj.rsp
-echo        msdos\borland\tcc20\lib.rsp
-echo    contain absolute paths to TURBO-C runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Turbo-C before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-msdos\borland\tcc20\mk.bat
-goto end
-
-:mktccswp
-cls
-echo WARNING:
-echo    The default response files:
-echo        msdos\borland\tcc20\objswp.rsp
-echo        msdos\borland\tcc20\libswp.rsp
-echo    contain absolute paths to TURBO-C runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Turbo-C before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-msdos\borland\tcc20\mkswp.bat
-goto end
-
-rem This is the script that makes dmake using Borland C++ 3.0.
-:mkbcc30
-cls
-echo WARNING:
-echo    The default response files:
-echo        msdos\borland\bcc30\obj.rsp
-echo        msdos\borland\bcc30\lib.rsp
-echo    contain absolute paths to Borland C++ runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Borland C++ before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-msdos\borland\bcc30\mk.bat
-goto end
-
-:mkbcc30swp
-cls
-echo WARNING:
-echo    The default response files:
-echo        msdos\borland\bcc30\objswp.rsp
-echo        msdos\borland\bcc30\libswp.rsp
-echo    contain absolute paths to Borland C++ runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Borland C++ before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-msdos\borland\bcc30\mkswp.bat
-goto end
-
-rem This is the script that makes dmake using Borland C++ 4.0.
-:mkbcc40
-cls
-echo WARNING:
-echo    The default response files:
-echo        msdos\borland\bcc40\obj.rsp
-echo        msdos\borland\bcc40\lib.rsp
-echo    contain absolute paths to Borland C++ runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Borland C++ before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-msdos\borland\bcc40\mk.bat
-goto end
-
-:mkbcc40swp
-cls
-echo WARNING:
-echo    The default response files:
-echo        msdos\borland\bcc40\objswp.rsp
-echo        msdos\borland\bcc40\libswp.rsp
-echo    contain absolute paths to Borland C++ runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Borland C++ before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-msdos\borland\bcc40\mkswp.bat
-goto end
-
-rem This is the script that makes dmake using Borland C++ 4.5.
-:mkbcc45
-cls
-echo WARNING:
-echo    The default response files:
-echo        msdos\borland\bcc45\obj.rsp
-echo        msdos\borland\bcc45\lib.rsp
-echo    contain absolute paths to Borland C++ runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Borland C++ before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-msdos\borland\bcc45\mk.bat
-goto end
-
-:mkbcc45swp
-cls
-echo WARNING:
-echo    The default response files:
-echo        msdos\borland\bcc45\objswp.rsp
-echo        msdos\borland\bcc45\libswp.rsp
-echo    contain absolute paths to Borland C++ runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Borland C++ before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-msdos\borland\bcc45\mkswp.bat
-goto end
-
-rem This is the script that makes dmake using Borland C++ 5.0.
-:mkbcc50
-cls
-echo WARNING:
-echo    The default response files:
-echo        msdos\borland\bcc50\obj.rsp
-echo        msdos\borland\bcc50\lib.rsp
-echo    contain absolute paths to Borland C++ runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Borland C++ before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-msdos\borland\bcc50\mk.bat
-goto end
-
-:mkbcc50swp
-cls
-echo WARNING:
-echo    The default response files:
-echo        msdos\borland\bcc50\objswp.rsp
-echo        msdos\borland\bcc50\libswp.rsp
-echo    contain absolute paths to Borland C++ runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Borland C++ before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-msdos\borland\bcc50\mkswp.bat
-goto end
-
-rem This is the script that makes 32-bit dmake using Borland C++ 5.0.
-:mkw32b50
-cls
-echo WARNING:
-echo    The default response files:
-echo        win95\borland\bcc50\obj.rsp
-echo        win95\borland\bcc50\lib.rsp
-echo    contain absolute paths to Borland C++ runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Borland C++ before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-win95\borland\bcc50\mk.bat
-goto end
-
-rem All done!
-:end
diff --git a/dmake/make.c b/dmake/make.c
deleted file mode 100644
index e5414dd99..000000000
--- a/dmake/make.c
+++ /dev/null
@@ -1,1771 +0,0 @@
-/* $RCSfile: make.c,v $
--- $Revision: 1.12 $
--- last change: $Author: kz $ $Date: 2008-03-05 18:29:19 $
---
--- SYNOPSIS
---      Perform the update of all outdated targets.
--- 
--- DESCRIPTION
---	This is where we traverse the make graph looking for targets that
---	are out of date, and we try to infer how to make them if we can.
---	The usual make macros are understood, as well as some new ones:
---
---		$$	- expands to $
---		$@      - full target name
---		$*      - target name with no suffix, same as $(@:db)
---			  or, the value of % in % meta rule recipes
---		$?      - list of out of date prerequisites
---		$<      - all prerequisites associated with rules line
---		$&	- all prerequisites associated with target
---		$>      - library name for target (if any)
---		$^	- out of date prerequisites taken from value of $<
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-#include "sysintf.h"
-
-typedef struct cell {
-   char            *datum;
-   struct  cell    *next;
-   size_t           len;
-} LISTCELL, *LISTCELLPTR;
-
-typedef struct {
-   LISTCELLPTR  first;
-   LISTCELLPTR  last;
-   size_t       len;
-} LISTSTRING, *LISTSTRINGPTR;
-
-
-static	void	_drop_mac ANSI((HASHPTR));
-static	void	_set_recipe ANSI((char*, int));
-static	void	_set_tmd ANSI(());
-static	void	_append_file ANSI((STRINGPTR, FILE*, char*, int));
-static  LINKPTR _dup_prq ANSI((LINKPTR));
-static  LINKPTR _expand_dynamic_prq ANSI(( LINKPTR, LINKPTR, char * ));
-static  char*   _prefix ANSI((char *, char *));
-static  char*   _pool_lookup ANSI((char *));
-static  int	_explode_graph ANSI((CELLPTR, LINKPTR, CELLPTR));
-
-
-#define RP_GPPROLOG       0
-#define RP_RECIPE         1
-#define RP_GPEPILOG       2
-#define NUM_RECIPES       3
-
-static STRINGPTR _recipes[NUM_RECIPES];
-static LISTCELLPTR _freelist=NULL;
-
-static LISTCELLPTR
-get_cell()
-{
-   LISTCELLPTR cell;
-
-   if (!_freelist) {
-      if ((cell=MALLOC(1,LISTCELL)) == NULL)
-         No_ram();
-   }
-   else {
-      cell = _freelist;
-      _freelist = cell->next;
-   }
-
-   return(cell);
-}
-
-
-static void
-free_cell(LISTCELLPTR cell)
-{
-   cell->next = _freelist;
-   _freelist = cell;
-}
-
-
-static void
-free_list(LISTCELLPTR c)
-{
-   if(c) {
-      free_list(c->next);
-      free_cell(c);
-   }
-}
-   
-   
-static void
-list_init(LISTSTRINGPTR s)
-{
-   s->first = NULL;
-   s->last = NULL;
-   s->len = 0;
-}
-
-
-static void
-list_add(LISTSTRINGPTR s, char *str)
-{
-   LISTCELLPTR p;
-   int l;
-
-   if ((l = strlen(str)) == 0)
-      return;
-
-   p = get_cell();
-   p->datum = str;
-   p->next  = NULL;
-   p->len   = l;
-
-   if(s->first == NULL)
-      s->first = p;
-   else
-      s->last->next = p;
-
-   s->last = p;
-   s->len += l+1;
-}
-
-
-static char *
-gen_path_list_string(LISTSTRINGPTR s)/*
-=======================================
-   Take a list of filepaths and create a string from it separating
-   the filenames by a space.
-   This function honors the cygwin specific .WINPATH attribute. */
-{
-   LISTCELLPTR next, cell;
-   int         len;
-   int         slen, slen_rest;
-   char        *result;
-   char        *p, *tpath;
-
-   if( (slen_rest = slen = s->len) == 0)
-      return(NIL(char));
-
-   /* reserve enough space to hold the concated original filenames. */
-   if((p = result = MALLOC(slen, char)) == NULL) No_ram();
-
-   for (cell=s->first; cell; cell=next) {
-#if !defined(__CYGWIN__)
-      tpath = cell->datum;
-      len=cell->len;
-#else
-      /* For cygwin with .WINPATH set the lenght of the converted
-       * filepaths might be longer. Extra checking is needed ... */
-      tpath = DO_WINPATH(cell->datum);
-      if( tpath == cell->datum ) {
-     len=cell->len;
-      }
-      else {
-     /* ... but only if DO_WINPATH() did something. */
-     len = strlen(tpath);
-      }
-      if( len >= slen_rest ) {
-     /* We need more memory. As DOS paths are usually shorter than the
-      * original cygwin POSIX paths (exception mounted paths) this should
-      * rarely happen. */
-     int p_offset = p - result;
-     /* Get more than needed. */
-     slen = slen + len - slen_rest + 128;
-     if((result = realloc( result, slen ) ) == NULL)
-        No_ram();
-     p = result + p_offset;
-      }
-#endif
-
-      memcpy((void *)p, (void *)tpath, len);
-      p += len;
-      *p++ = ' ';
-
-#if defined(__CYGWIN__)
-      /* slen_rest is only used in the cygwin / .WINPATH case. */
-      slen_rest = slen - (p - result);
-#endif
-
-      next = cell->next;
-      free_cell(cell);
-   }
-
-   *--p = '\0';
-   list_init(s);
-   
-   return(result);
-}
-
-
-PUBLIC int
-Make_targets()/*
-================
-   Actually go and make the targets on the target list */
-{
-   LINKPTR lp;
-   int     done = 0;
-
-   DB_ENTER( "Make_targets" );
-
-   Read_state();
-   _set_recipe( ".GROUPPROLOG", RP_GPPROLOG );
-   _set_recipe( ".GROUPEPILOG", RP_GPEPILOG );
-
-   /* Prevent recipe inference for .ROOT */
-   if ( Root->ce_recipe == NIL(STRING) ) {
-      TALLOC( Root->ce_recipe, 1, STRING );
-      Root->ce_recipe->st_string = "";
-   }
-
-   /* Prevent recipe inference for .TARGETS */
-   if ( Targets->ce_recipe == NIL(STRING) ) {
-      TALLOC( Targets->ce_recipe, 1, STRING );
-      Targets->ce_recipe->st_string = "";
-   }
-
-   /* Make sure that user defined targets are marked as root targets */
-   for( lp = Targets->ce_prq; lp != NIL(LINK); lp = lp->cl_next )
-      lp->cl_prq->ce_attr |= A_ROOT;
-
-   while( !done ) {
-      int rval;
-
-      if( (rval = Make(Root, NIL(CELL))) == -1 )
-     DB_RETURN(1);
-      else
-     done = Root->ce_flag & F_MADE;
-
-      if( !rval && !done ) Wait_for_child( FALSE, -1 );
-   }
-
-   for( lp = Targets->ce_prq; lp != NIL(LINK); lp = lp->cl_next ) {
-      CELLPTR tgt = lp->cl_prq;
-      if( !(tgt->ce_attr & A_UPDATED) 
-          && (Verbose & V_MAKE) )
-          printf( "`%s' is up to date\n", tgt->CE_NAME );
-   }
-
-   DB_RETURN( 0 );
-}
-
-
-
-PUBLIC int
-Make( cp, setdirroot )/*
-========================
-   Make target cp. Make() is also called on prerequisites that have no rule
-   associated (F_TARGET is not set) to verify that they exist. */
-CELLPTR cp;
-CELLPTR setdirroot;
-{
-   register LINKPTR dp, prev,next;
-   register CELLPTR tcp;
-   CELLPTR          nsetdirroot;
-   char		    *name, *lib;
-   HASHPTR	    m_at, m_q, m_b, m_g, m_l, m_bb, m_up;
-   LISTSTRING       all_list, imm_list, outall_list, inf_list;
-   char             *all    = NIL(char);
-   char             *inf    = NIL(char);
-   char             *outall = NIL(char);
-   char             *imm    = NIL(char);
-   int              rval    = 0; /* 0==ready, 1==target still running, -1==error */
-   int		    push    = 0;
-   int 		    made    = F_MADE;
-   int		    ignore;
-   time_t           otime   = (time_t) 1L; /* Hold time of newest prerequisite. */
-   int		    mark_made = FALSE;
-
-#if defined(__CYGWIN__)
-   /* static variable to hold .WINPATH status of previously made target.
-    * 0, 1 are .WINPATH states, -1 indicates the first target. */
-   static int prev_winpath_attr = -1;
-#endif
-
-   DB_ENTER( "Make" );
-   DB_PRINT( "mem", ("%s:-> mem %ld", cp->CE_NAME, (long) coreleft()) );
-
-   /* Initialize the various temporary storage */
-   m_q = m_b = m_g = m_l = m_bb = m_up = NIL(HASH);
-   list_init(&all_list);
-   list_init(&imm_list);
-   list_init(&outall_list);
-   list_init(&inf_list);
-   
-   if (cp->ce_set && cp->ce_set != cp) {
-      if( Verbose & V_MAKE )
-     printf( "%s:  Building .UPDATEALL representative [%s]\n", Pname,
-          cp->ce_set->CE_NAME );
-      cp = cp->ce_set;
-   }
-
-   /* If we are supposed to change directories for this target then do so.
-    * If we do change dir, then modify the setdirroot variable to reflect
-    * that fact for all of the prerequisites that we will be making. */
-
-   nsetdirroot = setdirroot;
-   ignore = (((cp->ce_attr|Glob_attr)&A_IGNORE) != 0);
-
-   /* Set the UseWinpath variable to reflect the (global/local) .WINPATH
-    * attribute. The variable is used by DO_WINPATH() and in some other
-    * places. */
-   UseWinpath = (((cp->ce_attr|Glob_attr)&A_WINPATH) != 0);
-
-   /* m_at needs to be defined before going to a "stop_making_it" where
-    * a _drop_mac( m_at ) would try to free it. */
-   /* FIXME: m_at can most probably not be changed before the next
-    * Def_macro("@", ...) command. Check if both this and the next
-    * call are needed. */
-   m_at = Def_macro("@", DO_WINPATH(cp->ce_fname), M_MULTI);
-
-   if( cp->ce_attr & A_SETDIR ) {
-      /* Change directory only if the previous .SETDIR is a different
-       * directory from the current one.  ie. all cells with the same .SETDIR
-       * attribute are assumed to come from the same directory. */
-
-      if( (setdirroot == NIL(CELL) || setdirroot->ce_dir != cp->ce_dir) &&
-          (push = Push_dir(cp->ce_dir,cp->CE_NAME,ignore)) != 0 )
-     setdirroot = cp;
-   }
-
-   DB_PRINT( "mem", ("%s:-A mem %ld", cp->CE_NAME, (long) coreleft()) );
-
-   /* FIXME: F_MULTI targets don't have cp->ce_recipe set but the recipes
-    * are known nevertheless. It is not necessary to infer them.
-    * If (cp->ce_flag & F_MULTI) is true the recipes of the corresponding
-    * subtargets can be used. */
-   if( cp->ce_recipe == NIL(STRING) ) {
-      char *dir = cp->ce_dir;
-      
-      if( Verbose & V_MAKE )
-     printf( "%s:  Infering prerequisite(s) and recipe for [%s]\n", Pname,
-          cp->CE_NAME );
-
-      Infer_recipe( cp, setdirroot );
-
-      /* See if the directory has changed, if it has then make sure we
-       * push it. */
-      if( dir != cp->ce_dir ) {
-     if( push ) Pop_dir(FALSE);
-         push = Push_dir( cp->ce_dir, cp->CE_NAME, ignore );
-     setdirroot = cp;
-      }
-   }
-
-   for(dp=CeMeToo(cp); dp; dp=dp->cl_next) {
-      tcp = dp->cl_prq;
-      if( push ) {
-     /* If we changed the directory because of .SETDIR write Pwd into
-      * tcp->ce_dir so that it holds an absolute path. */
-     if( !(tcp->ce_attr & A_POOL) && tcp->ce_dir ) FREE( tcp->ce_dir );
-     tcp->ce_dir   = _pool_lookup(Pwd);
-     tcp->ce_attr |= A_SETDIR|A_POOL;
-      }
-      tcp->ce_setdir = nsetdirroot;
-   }
-
-   DB_PRINT( "mem", ("%s:-A mem %ld", cp->CE_NAME, (long) coreleft()) );
-   /* If we have not yet statted the target then do so. */
-   if( !(cp->ce_flag & F_STAT) && !(cp->ce_attr&A_PHONY) ) {
-      if (cp->ce_parent && (cp->ce_parent->ce_flag & F_MULTI)) {
-     /* Inherit the stat info from the F_MULTI parent. */
-     cp->ce_time  = cp->ce_parent->ce_time;
-     cp->ce_flag |= F_STAT;
-     /* Propagate the A_PRECIOUS attribute from the parent. */
-     cp->ce_attr |= cp->ce_parent->ce_attr & A_PRECIOUS;
-      }
-      else {
-     for(dp=CeMeToo(cp); dp; dp=dp->cl_next) {
-        tcp = dp->cl_prq;
-        /* Check if target already exists. */
-        Stat_target( tcp, 1, FALSE );
-
-        if( tcp->ce_time != (time_t)0L ) {
-           /* File exists so don't remove it later. */
-           tcp->ce_attr |= A_PRECIOUS;
-        }
-           
-        if( Verbose & V_MAKE )
-           printf("%s:  Time stamp of [%s] is %ld\n",Pname,tcp->CE_NAME,
-              tcp->ce_time);
-     }
-      }
-   }
-
-   DB_PRINT( "make", ("(%s, %ld, 0x%08x, 0x%04x)", cp->CE_NAME,
-            cp->ce_time, cp->ce_attr, cp->ce_flag) );
-
-   /* Handle targets without rule and without existing file. */
-   if( !(cp->ce_flag & F_TARGET) && (cp->ce_time == (time_t) 0L) ) {
-      if( Makemkf ) {
-     rval = -1;
-     goto stop_making_it;
-      }
-      else if( cp->ce_prq != NIL(LINK)
-            || (STOBOOL(Augmake) && (cp->ce_flag&F_EXPLICIT)))
-     /* Assume an empty recipe for a target that we have run inference on
-      * but do not have a set of rules for but for which we have inferred
-      * a list of prerequisites. */
-     cp->ce_flag |= F_RULES;
-      else
-     Fatal( "`%s' not found, and can't be made", cp->CE_NAME );
-   }
-
-   DB_PRINT( "mem", ("%s:-A mem %ld", cp->CE_NAME, (long) coreleft()) );
-
-   /* set value of $* if we have not infered a recipe, in this case $* is
-    * the same as $(@:db), this allows us to be compatible with BSD make */
-   if( cp->ce_per == NIL(char) ) cp->ce_per = "$(@:db)";
-
-   /* Search the prerequisite list for dynamic prerequisites and if we find
-    * them copy the list of prerequisites for potential later re-use. */
-   if ( cp->ce_prqorg == NIL(LINK) ) {
-      for( dp = cp->ce_prq; dp != NIL(LINK); dp = dp->cl_next )
-     if ( strchr(dp->cl_prq->CE_NAME, '$') != NULL )
-        break;
-
-      if (dp != NIL(LINK)) {
-     cp->ce_prqorg = _dup_prq(cp->ce_prq);
-      }
-   }
-
-   /* Define $@ macro. The only reason for defining it here (that I see ATM)
-    * is that $@ is already defined in conditional macros. */
-   /* FIXME: check if both this and the previous Def_macro("@", ...) call
-    * are needed. */
-   m_at = Def_macro("@", DO_WINPATH(cp->ce_fname), M_MULTI);
-
-   /* Define conditional macros if any, note this is done BEFORE we process
-    * prerequisites for the current target.  Thus the making of a prerequisite
-    * is done using the current value of the conditional macro. */
-   for(dp=CeMeToo(cp); dp; dp=dp->cl_next) {
-      tcp=dp->cl_prq;
-      if (tcp->ce_cond != NIL(STRING)) {
-     STRINGPTR sp;
-
-     tcp->ce_pushed = NIL(HASH);
-     for(sp=tcp->ce_cond; sp; sp=sp->st_next) {
-        if(Parse_macro(sp->st_string,M_MULTI|M_PUSH)) {
-           HASHPTR hp;
-
-           hp = GET_MACRO(LastMacName);
-           hp->ht_link = tcp->ce_pushed;
-           tcp->ce_pushed = hp;
-        }
-        else {
-          Error("Invalid conditional macro expression [%s]",sp->st_string);
-        }
-     }
-      }
-   }
-
-   /* First round, will be repeated a second time below. */
-   for( prev=NULL,dp=cp->ce_prq; dp != NIL(LINK); prev=dp, dp=next ) {
-      int seq;
-
-      /* This loop executes Make() to build prerequisites if needed. 
-       * The only macro that needs to be reset after a Make() was executed
-       * is $@ as it might be used when expanding potential dynamic
-       * prerequisites. As UseWinpath is a global variable we also
-       * need to restore it. */
-      if (m_at->ht_value == NIL(char)) {
-     /* This check effectively tests if Make() was run before because
-      * Make() frees all dynamic macro values at the end. */
-     UseWinpath = (((cp->ce_attr|Glob_attr)&A_WINPATH) != 0);
-     m_at = Def_macro("@", DO_WINPATH(cp->ce_fname), M_MULTI);
-      }
-
-      /* Make the prerequisite, note that if the current target has the
-       * .LIBRARY attribute set we pass on to the prerequisite the .LIBRARYM
-       * attribute and pass on the name of the current target as the library
-       * name, and we take it away when we are done.  */
-      next = dp->cl_next;
-
-      tcp = dp->cl_prq;
-      if( Verbose & V_MAKE )
-     printf("Checking prerequisite [%s]\n", tcp->CE_NAME);
-
-      seq = (((cp->ce_attr | Glob_attr) & A_SEQ) != 0);
-
-      /* This checks if this prerequisite is still in the making, if yes
-       * come back later. */
-      if( tcp->ce_flag & F_VISITED ) {
-     /* Check if this currently or fully made target has the same
-      * .SETDIR setting. If yes, continue if it was made or come
-      * back later otherwise. */
-     if( _explode_graph(tcp, dp, setdirroot) == 0 ) {
-        /* didn't blow it up so see if we need to wait for it. */
-        if( tcp->ce_flag & F_MADE ) {
-           /* Target was made. */
-           continue;
-        }
-        else
-           /* Target is still in the making ... */
-           goto stop_making_it;
-     }
-     else
-        /* Use the new prerequisite with the new .SETDIR value. */
-        tcp = dp->cl_prq;
-      }
-
-      /* If the previous target (prereq) is not yet ready return if
-       * seq is TRUE. */
-      if( seq && !made ) goto stop_making_it;
-
-      /* Expand dynamic prerequisites. The F_MARK flag is guarging against
-       * possible double expandion of dynamic prerequisites containing more
-       * than one prerequisite. */
-      /* A new A_DYNAMIC attribute could save a lot of strchr( ,'$') calls. */
-      if ( tcp && !(tcp->ce_flag & F_MARK) && strchr(tcp->CE_NAME, '$') ) {
-     /* Replace this dynamic prerequisite with the the real prerequisite,
-      * and add the additional prerequisites if there are more than one.*/
-
-     name = Expand( tcp->CE_NAME );
-     if( strcmp(name,cp->CE_NAME) == 0 )
-        Fatal("Detected circular dynamic dependency; generated '%s'",name);
-
-     /* Call helper for dynamic prerequisite expansion to replace the
-      * prerequisite with the expanded version and add the new
-      * prerequisites, if the macro expanded to more than one, after
-      * the current list element. */
-     dp = _expand_dynamic_prq( cp->ce_prq, dp, name );
-     FREE( name );
-
-     /* _expand_dynamic_prq() probably changed dp->cl_prq. */
-     tcp = dp->cl_prq;
-     if ( tcp ) {
-        next = dp->cl_next;
-     }
-      }
-
-      /* Dynamic expansion results in a NULL cell only when the the new
-       * prerequisite is already in the prerequisite list or empty. In this
-       * case delete the cell and continue. */
-      if ( tcp == NIL(CELL) ) {
-     FREE(dp);
-     if ( prev == NIL(LINK) ) {
-        cp->ce_prq = next;
-        dp = NULL;		/* dp will be the new value of prev. */
-     }
-     else {
-        prev->cl_next = next;
-        dp = prev;
-     }
-     continue;
-      }
-
-      /* Clear F_MARK flag that could have been set by _expand_dynamic_prq(). */ 
-      tcp->ce_flag &= ~(F_MARK);
-
-      if( cp->ce_attr & A_LIBRARY ) {
-         tcp->ce_attr |= A_LIBRARYM;
-     tcp->ce_lib   = cp->ce_fname;
-      }
-
-      /* Propagate the parent's F_REMOVE and F_INFER flags to the
-       * prerequisites. */
-      tcp->ce_flag |= cp->ce_flag & (F_REMOVE|F_INFER);
-
-      /* Propagate parents A_ROOT attribute to a child if the parent is a
-       * F_MULTI target. */
-      if( (cp->ce_flag & F_MULTI) && (cp->ce_attr & A_ROOT) )
-     tcp->ce_attr |= A_ROOT;
-
-      tcp->ce_parent = cp;
-      rval |= Make(tcp, setdirroot);
-
-      if( cp->ce_attr & A_LIBRARY )
-         tcp->ce_attr ^= A_LIBRARYM;
-
-      /* Return on error or if Make() is still running and A_SEQ is set.
-       * (All F_MULTI targets have the A_SEQ attribute.)  */
-      if( rval == -1 || (seq && (rval==1)) )
-     goto stop_making_it;
-
-      /* If tcp is ready, set made = F_MADE. */
-      made &= tcp->ce_flag & F_MADE;
-   }
-
-
-   /* Do the loop again.  We are most definitely going to make the current
-    * cell now.  NOTE:  doing this loop here also results in a reduction
-    * in peak memory usage by the algorithm. */
-
-   for( dp = cp->ce_prq; dp != NIL(LINK); dp = dp->cl_next ) {
-      int  tgflg;
-      tcp  = dp->cl_prq;
-      if( tcp == NIL(CELL) )
-     Fatal("Internal Error: Found prerequisite list cell without prerequisite!");
-
-      name = tcp->ce_fname;
-
-      /* make certain that all prerequisites are made prior to advancing. */
-      if( !(tcp->ce_flag & F_MADE) ) goto stop_making_it;
-
-      /* If the target is a library, then check to make certain that a member
-       * is newer than an object file sitting on disk.  If the disk version
-       * is newer then set the time stamps so that the archived member is
-       * replaced. */
-      if( cp->ce_attr & A_LIBRARY )
-     if( tcp->ce_time <= cp->ce_time ) {
-        time_t mtime = Do_stat( name, tcp->ce_lib, NIL(char *), FALSE );
-        if( mtime < tcp->ce_time ) tcp->ce_time = cp->ce_time+1L;
-     }
-
-      /* Set otime to the newest time stamp of all prereqs or 1 if there
-       * are no prerequisites. */
-      if( tcp->ce_time > otime ) otime = tcp->ce_time;
-
-      list_add(&all_list, name);
-      if( (tgflg = (dp->cl_flag & F_TARGET)) != 0 )
-         list_add(&inf_list, name);
-
-      if((cp->ce_time<tcp->ce_time) || ((tcp->ce_flag & F_TARGET) && Force)) {
-         list_add(&outall_list, name);
-         if( tgflg )
-            list_add(&imm_list, name);
-      }
-   }
-
-   /* If we are building a F_MULTI target inherit the time from
-    * its children. */
-   if( (cp->ce_flag & F_MULTI) )
-      cp->ce_time = otime;
-
-   /* All prerequisites are made, now make the current target. */
-
-   /* Restore UseWinpath and $@ if needed, see above for an explanation. */
-   if (m_at->ht_value == NIL(char)) {
-      /* This check effectively tests if Make() was run before because
-       * Make() frees all dynamic macro values at the end. */
-      UseWinpath = (((cp->ce_attr|Glob_attr)&A_WINPATH) != 0);
-      m_at = Def_macro("@", DO_WINPATH(cp->ce_fname), M_MULTI);
-   }
- 
-   /* Create a string with all concatenate filenames. The function
-    * respects .WINPATH.  Note that gen_path_list_string empties its
-    * parameter :( */
-   all = gen_path_list_string(&all_list);
-   imm = gen_path_list_string(&imm_list);
-   outall = gen_path_list_string(&outall_list);
-   inf = gen_path_list_string(&inf_list);
-   
-   DB_PRINT( "mem", ("%s:-C mem %ld", cp->CE_NAME, (long) coreleft()) );
-   DB_PRINT( "make", ("I make '%s' if %ld > %ld", cp->CE_NAME, otime,
-          cp->ce_time) );
-
-   if( Verbose & V_MAKE ) {
-      printf( "%s:  >>>> Making ", Pname );
-      /* Also print the F_MULTI master target. */
-      if( cp->ce_flag & F_MULTI )
-     printf( "(::-\"master\" target) " );
-      if( cp->ce_count != 0 )
-     printf( "[%s::{%d}]\n", cp->CE_NAME, cp->ce_count );
-      else
-     printf( "[%s]\n", cp->CE_NAME );
-   }
-
-
-   /* Only PWD, TMD, MAKEDIR and the dynamic macros are affected by
-    * .WINPATH. $@ is handled earlier, do the rest now. */
-#if defined(__CYGWIN__)
-   /* This is only relevant for cygwin. */
-   if( UseWinpath != prev_winpath_attr ) {
-      Def_macro( "MAKEDIR", Makedir, M_FORCE | M_EXPANDED );
-      /* If push is TRUE (Push_dir() was used) PWD and TMD are already
-       * set. */
-      if( !push ) {
-     Def_macro( "PWD", Pwd, M_FORCE | M_EXPANDED );
-     _set_tmd();
-      }
-   }
-   prev_winpath_attr = UseWinpath;
-#endif
-
-   /* Set the remaining dynamic macros $*, $>, $?, $<, $& and $^. */
-
-   /* $* is either expanded as the result of a % inference or defined to
-    * $(@:db) and hence unexpanded otherwise. The latter doesn't start
-    * with / and will therefore not be touched by DO_WINPATH(). */
-   m_bb = Def_macro( "*", DO_WINPATH(cp->ce_per),   M_MULTI );
-
-   /* This is expanded. */
-   m_g  = Def_macro( ">", DO_WINPATH(cp->ce_lib),   M_MULTI|M_EXPANDED );
-   /* These strings are generated with gen_path_list_string() and honor
-    * .WINPATH */
-   m_q  = Def_macro( "?", outall,       M_MULTI|M_EXPANDED );
-   m_b  = Def_macro( "<", inf,          M_MULTI|M_EXPANDED );
-   m_l  = Def_macro( "&", all,          M_MULTI|M_EXPANDED );
-   m_up = Def_macro( "^", imm,          M_MULTI|M_EXPANDED );
-
-   _recipes[ RP_RECIPE ] = cp->ce_recipe;
-
-   /* We attempt to make the target if
-    *   1. it has a newer prerequisite
-    *   2. It is a target and Force is set
-    *   3. It's set of recipe lines has changed.
-    */
-   if(   Check_state(cp, _recipes, NUM_RECIPES )
-      || (cp->ce_time < otime)
-      || ((cp->ce_flag & F_TARGET) && Force)
-     ) {
-
-      if( Measure & M_TARGET )
-     Do_profile_output( "s", M_TARGET, cp );
-
-      /* Only checking so stop as soon as we determine we will make
-       * something */
-      if( Check ) {
-     rval = -1;
-     goto stop_making_it;
-      }
-
-      if( Verbose & V_MAKE )
-     printf( "%s:  Updating [%s], (%ld > %ld)\n", Pname,
-         cp->CE_NAME, otime, cp->ce_time );
-
-      /* In order to check if a targets time stamp was properly updated
-       * after the target was made and to keep the dependency chain valid
-       * for targets without recipes we store the minimum required file
-       * time. If the target time stamp is older than the newest
-       * prerequisite use that time, otherwise the current time. (This
-       * avoids the call to Do_time() for every target, still checks
-       * if the target time is new enough for the given prerequisite and
-       * mintime is also the newest time of the given prerequisites and
-       * can be used for targets without recipes.)
-       * We reuse the ce_time member to store this minimum time until
-       * the target is finished by Update_time_stamp(). This function
-       * checks if the file time was updated properly and warns if it was
-       * not. (While making a target this value does not change.) */
-      cp->ce_time = ( cp->ce_time < otime ? otime : Do_time() );
-      DB_PRINT( "make", ("Set ce_time (mintime) to: %ld", cp->ce_time) );
-
-      if( Touch ) {
-     name = cp->ce_fname;
-     lib  = cp->ce_lib;
-
-     if( (!(Glob_attr & A_SILENT) || !Trace) && !(cp->ce_attr & A_PHONY) ) {
-        if( lib == NIL(char) )
-           printf("touch(%s)", name );
-        else if( cp->ce_attr & A_SYMBOL )
-           printf("touch(%s((%s)))", lib, name );
-        else
-           printf("touch(%s(%s))", lib, name );
-     }
-
-     if( !Trace && !(cp->ce_attr & A_PHONY) )
-        if( Do_touch( name, lib,
-        (cp->ce_attr & A_SYMBOL) ? &name : NIL(char *) ) != 0 )
-           printf( "  not touched - non-existant" );
-
-     if( (!(Glob_attr & A_SILENT) || !Trace) && !(cp->ce_attr & A_PHONY) )
-        printf( "\n" );
-
-     Update_time_stamp( cp );
-      }
-      else if( cp->ce_recipe != NIL(STRING) ) {
-     /* If a recipe is found use it. Note this misses F_MULTI targets. */
-     if( !(cp->ce_flag & F_SINGLE) ) /* Execute the recipes once ... */
-           rval = Exec_commands( cp );
-     /* Update_time_stamp() is called inside Exec_commands() after the
-      * last recipe line is finished. (In _finished_child()) */
-     else {				 /* or for every out of date dependency
-                      * if the ruleop ! was used. */
-        TKSTR tk;
-
-        /* We will redefine $? to be the prerequisite that the recipes
-         * are currently evaluated for. */
-        _drop_mac( m_q );
-
-        /* Execute recipes for each out out of date prerequisites.
-         * WARNING! If no prerequisite is given the recipes are not
-         * executed at all! */
-        if( outall && *outall ) {
-           /* Wait for each prerequisite to finish, save the status
-        * of Wait_for_completion. */
-           int wait_for_completion_status = Wait_for_completion;
-           Wait_for_completion = TRUE;
-
-           SET_TOKEN( &tk, outall );
-
-           /* No need to update the target timestamp/removing temporary
-        * prerequisites (Update_time_stamp() in _finished_child())
-        * until all prerequisites are done. */
-           Doing_bang = TRUE;
-           name = Get_token( &tk, "", FALSE );
-           /* This loop might fail if outall contains filenames with
-        * spaces. */
-           do {
-          /* Set $? to current prerequisite. */
-          m_q->ht_value = name;
-
-          rval = Exec_commands( cp );
-          /* Thanks to Wait_for_completion = TRUE we are allowed
-           * to remove the temp files here. */
-          Unlink_temp_files(cp);
-           }
-           while( *(name = Get_token( &tk, "", FALSE )) != '\0' );
-           Wait_for_completion = wait_for_completion_status;
-           Doing_bang = FALSE;
-        }
-
-        Update_time_stamp( cp );
-        /* Erase $? again. Don't free the pointer, it was part of outall. */
-        m_q->ht_value = NIL(char);
-     }
-      }
-      else if( !(cp->ce_flag & F_RULES) && !(cp->ce_flag & F_STAT) &&
-           (!(cp->ce_attr & A_ROOT) || !(cp->ce_flag & F_EXPLICIT)) &&
-           !(cp->ce_count) )
-     /* F_MULTI subtargets should evaluate its parents F_RULES value
-      * but _make_multi always sets the F_RULES value of the master
-      * target. Assume F_RULES is set for subtargets. This might not
-      * be true if there are no prerequisites and no recipes in any
-      * of the subtargets. (FIXME) */
-     Fatal( "Don't know how to make `%s'",cp->CE_NAME );
-      else {
-         /* Empty recipe, set the flag as MADE and update the time stamp */
-         /* This might be a the master cell of a F_MULTI target. */
-     Update_time_stamp( cp );
-      }
-   }
-   else {
-      if( Verbose & V_MAKE )
-     printf( "%s:  Up to date [%s], prq time = %ld , target time = %ld)\n", Pname,
-         cp->CE_NAME, otime, cp->ce_time );
-      mark_made = TRUE;
-   }
-
-   /* If mark_made == TRUE the target is up-to-date otherwise it is
-    * currently in the making. */
-
-   /* Update all targets in .UPDATEALL rule / only target cp. */
-   for(dp=CeMeToo(cp); dp; dp=dp->cl_next) {
-      tcp=dp->cl_prq;
-
-      /* Set the time stamp of those prerequisites without rule to the current
-       * time if Force is TRUE to make sure that targets depending on those
-       * prerequisites get remade. */
-      if( !(tcp->ce_flag & F_TARGET) && Force ) tcp->ce_time = Do_time();
-      if( mark_made ) {
-     tcp->ce_flag |= F_MADE;
-     if( tcp->ce_flag & F_MULTI ) {
-        LINKPTR tdp;
-        for( tdp = tcp->ce_prq; tdp != NIL(LINK); tdp = tdp->cl_next )
-           tcp->ce_attr |= tdp->cl_prq->ce_attr & A_UPDATED;
-     }
-      }
-
-      /* Note that the target is in the making. */
-      tcp->ce_flag |= F_VISITED;
-
-      /* Note:  If the prerequisite was made using a .SETDIR= attribute
-       * 	directory then we will include the directory in the fname
-       *        of the target.  */
-      if( push ) {
-     char *dir   = nsetdirroot ? nsetdirroot->ce_dir : Makedir;
-     /* get relative path from current SETDIR to new SETDIR. */
-     /* Attention, even with .WINPATH set this has to be a POSIX
-      * path as ce_fname neeed to be POSIX. */
-     char *pref  = _prefix( dir, tcp->ce_dir );
-     char *nname = Build_path(pref, tcp->ce_fname);
-
-     FREE(pref);
-     if( (tcp->ce_attr & A_FFNAME) && (tcp->ce_fname != NIL(char)) )
-        FREE( tcp->ce_fname );
-
-     tcp->ce_fname = DmStrDup(nname);
-     tcp->ce_attr |= A_FFNAME;
-      }
-   }
-
-stop_making_it:
-   _drop_mac( m_g  );
-   _drop_mac( m_q  );
-   _drop_mac( m_b  );
-   _drop_mac( m_l  );
-   _drop_mac( m_bb );
-   _drop_mac( m_up );
-   _drop_mac( m_at );
-
-   /* undefine conditional macros if any */
-   for(dp=CeMeToo(cp); dp; dp=dp->cl_next) {
-      tcp=dp->cl_prq;
-
-      while (tcp->ce_pushed != NIL(HASH)) {
-     HASHPTR cur = tcp->ce_pushed;
-     tcp->ce_pushed = cur->ht_link;
-
-     Pop_macro(cur);
-     FREE(cur->ht_name);
-     if(cur->ht_value)
-        FREE(cur->ht_value);
-     FREE(cur);
-      }
-   }
-
-   if( push )
-      Pop_dir(FALSE);
-
-   /* Undefine the strings that we used for constructing inferred
-    * prerequisites. */
-   if( inf    != NIL(char) ) FREE( inf    );
-   if( all    != NIL(char) ) FREE( all    );
-   if( imm    != NIL(char) ) FREE( imm    );
-   if( outall != NIL(char) ) FREE( outall );
-   free_list(all_list.first);
-   free_list(imm_list.first);
-   free_list(outall_list.first);
-   free_list(inf_list.first);
-
-   DB_PRINT( "mem", ("%s:-< mem %ld", cp->CE_NAME, (long) coreleft()) );
-   DB_RETURN(rval);
-}
-
-
-static char *
-_prefix( pfx, pat )/*
-=====================
-   Return the relative path from pfx to pat. Both paths have to be absolute
-   paths. If the paths are on different resources or drives (if applicable)
-   or only share a relative path going up to the root dir and down again
-   return pat. */
-char *pfx;
-char *pat;
-{
-   char *cmp1=pfx;
-   char *cmp2=pat;
-   char *tpat=pat; /* Keep pointer to original pat. */
-   char *result;
-   char *up;
-   int first = 1;
-   int samerootdir = 1; /* Marks special treatment for the root dir. */
-#ifdef HAVE_DRIVE_LETTERS
-   int pfxdl = 0;
-   int patdl = 0;
-#endif
-
-   /* Micro optimization return immediately if pfx and pat are equal. */
-   if( strcmp(pfx, pat) == 0 )
-      return(DmStrDup(""));
-
-#ifdef HAVE_DRIVE_LETTERS
-   /* remove the drive letters to avoid getting them into the relative
-    * path later. */
-   if( *pfx && pfx[1] == ':' && isalpha(*pfx) ) {
-      pfxdl = 1;
-      cmp1 = DmStrSpn(pfx+2, DirBrkStr);
-   }
-   if( *pat && pat[1] == ':' && isalpha(*pat) ) {
-      patdl = 1;
-      cmp2 = DmStrSpn(pat+2, DirBrkStr);
-   }
-   /* If the drive letters are different use the abs. path. */
-   if( pfxdl && patdl && (tolower(*pfx) != tolower(*pat)) )
-      return(DmStrDup(pat));
-
-   /* If only one has a drive letter also use the abs. path. */
-   if( pfxdl != patdl )
-      return(DmStrDup(pat));
-   else if( pfxdl )
-      /* If both are the same drive letter, disable the special top
-       * dir treatment. */
-      samerootdir = 0;
-
-   /* Continue without the drive letters. (Either none was present,
-    * or both were the same. This also solves the problem that the
-    * case of the drive letters sometimes depends on the shell.
-    * (cmd.exe vs. cygwin bash) */
-   pfx = cmp1;
-   pat = cmp2;
-#endif
-
-   /* Cut off equal leading parts of pfx, pat. Both have to be abs. paths. */
-   while(*pfx && *pat) {
-      /* skip leading dir. separators. */
-      pfx = DmStrSpn(cmp1, DirBrkStr);
-      pat = DmStrSpn(cmp2, DirBrkStr);
-
-      /* Only check in the first run of the loop. Leading slashes can only
-       * mean POSIX paths or Windows resources (two) slashes. Drive letters
-       * have no leading slash. In any case, if the number of slashes are
-       * not equal there can be no relative path from one two the other.
-       * In this case return the absolute path. */
-      if( first ) {
-     if( cmp1-pfx != cmp2-pat ) {
-        return(DmStrDup(tpat));
-     }
-     first = 0;
-      }
-
-      /* find next dir. separator (or ""). */
-      cmp1 = DmStrPbrk(pfx, DirBrkStr);
-      cmp2 = DmStrPbrk(pat, DirBrkStr);
-
-      /* if length of directory name is equal compare the strings. If equal
-       * go into next loop. If not equal and directory names in the root
-       * dir are compared return the absolut path otherwise break the loop
-       * and construct the relative path from pfx to pat. */
-      if ( (cmp1-pfx) != (cmp2-pat) || strncmp(pfx,pat,cmp1-pfx) != 0 ) {
-     if( samerootdir ) {
-        return(DmStrDup(tpat));
-     }
-     break;
-      }
-
-      if( samerootdir ) {
-#if __CYGWIN__
-     /* If the toplevel directory is /cygdrive (or the equivalent prefix)
-      * treat the following level also as rootdir. If we are here cmp1-pfx
-      * cannot be zero so we won't compare with an empty cygdrive prefix. */
-     if ( (cmp1-pfx) == CygDrvPreLen && strncmp(pfx,CygDrvPre,CygDrvPreLen) == 0 )
-        samerootdir = 1;
-     else
-#endif
-        samerootdir = 0;
-      }
-   }
-
-   result = DmStrDup("");
-   up = DmStrJoin("..",DirSepStr,-1,FALSE);
-   cmp1 = pfx;
-   /* Add "../" for each directory in pfx */
-   while ( *(pfx=DmStrSpn(cmp1,DirBrkStr)) != '\0' ) {
-      cmp1 = DmStrPbrk(pfx,DirBrkStr);
-      result = DmStrJoin(result,up,-1,TRUE);
-   }
-   FREE(up);
-
-   pat = DmStrSpn(pat,DirBrkStr);
-   /* Append pat to result. */
-   if( *pat != '\0' ) {
-      cmp2 = DmStrDup(Build_path(result, pat));
-      FREE(result);
-      result = cmp2;
-   } else {
-      /* if pat is empty and result exists remove the trailing slash
-       * from the last "../". */
-      if( *result ) {
-     result[strlen(result)-1] = '\0';
-      }
-   }
-
-   return(result);
-}
-
-
-static LINKPTR
-_dup_prq( lp )
-LINKPTR lp;
-{
-   LINKPTR tlp;
-
-   if( lp == NIL(LINK) ) return(lp);
-
-   TALLOC(tlp, 1, LINK);
-   tlp->cl_prq  = lp->cl_prq;
-   tlp->cl_flag = lp->cl_flag;
-   tlp->cl_next = _dup_prq( lp->cl_next );
-
-   return(tlp);
-}
-
-
-static LINKPTR
-_expand_dynamic_prq( head, lp, name )/*
-=======================================
-   The string name can contain one or more target names. Check if these are
-   already a prerequisite for the current target. If not add them to the list
-   of prerequisites. If no prerequisites were added set lp->cl_prq to NULL.
-   Set the F_MARK flag to indicate that the prerequisite was expanded.
-   Use cl_flag instead?? */
-LINKPTR head;
-LINKPTR lp;
-char *name;
-{
-   CELLPTR cur = lp->cl_prq;
-
-   if( !(*name) ) {
-      /* If name is empty this leaves lp->cl_prq unchanged -> No prerequisite added. */
-      ;
-   }
-   else if ( strchr(name, ' ') == NIL(char) ) {
-      /* If condition above is true, no space is found. */
-      CELLPTR prq  = Def_cell(name);
-      LINKPTR tmp;
-
-      /* Check if prq already exists. */
-      for(tmp=head;tmp != NIL(LINK) && tmp->cl_prq != prq;tmp=tmp->cl_next);
-
-      /* If tmp is NULL then the prerequisite is new and is added to the list. */
-      if ( !tmp ) {
-     /* replace the prerequisite with the expanded version. */
-     lp->cl_prq = prq;
-     lp->cl_prq->ce_flag |= F_MARK;
-      }
-   }
-   else {
-      LINKPTR tlp  = lp;
-      LINKPTR next = lp->cl_next;
-      TKSTR token;
-      char  *p;
-      int   first=TRUE;
-
-      /* Handle more than one prerequisite. */
-      SET_TOKEN(&token, name);
-      while (*(p=Get_token(&token, "", FALSE)) != '\0') {
-     CELLPTR prq = Def_cell(p);
-     LINKPTR tmp;
-
-     for(tmp=head;tmp != NIL(LINK) && tmp->cl_prq != prq;tmp=tmp->cl_next);
-     
-     /* If tmp is not NULL the prerequisite already exists. */
-     if ( tmp ) continue;
-
-     /* Add list elements behind the first if more then one new
-      * prerequisite is found. */
-     if ( first ) {
-        first = FALSE;
-     }
-     else {
-        TALLOC(tlp->cl_next,1,LINK);
-        tlp = tlp->cl_next;
-        tlp->cl_flag |= F_TARGET;
-        tlp->cl_next = next;
-     }
-
-     tlp->cl_prq = prq;
-     tlp->cl_prq->ce_flag |= F_MARK;
-      }
-      CLEAR_TOKEN( &token );
-   }
-
-   /* If the condition is true no new prerequisits were found. */
-   if ( lp->cl_prq == cur ) {
-      lp->cl_prq = NIL(CELL);
-      lp->cl_flag = 0;
-   }
-
-   /* Is returned unchanged. */
-   return(lp);
-}
-
-
-static void
-_drop_mac( hp )/*
-================ set a macro value to zero. */
-HASHPTR hp;
-{
-   if( hp && hp->ht_value != NIL(char) ) {
-      FREE( hp->ht_value );
-      hp->ht_value = NIL(char);
-   }
-}
-
-
-
-static int
-_explode_graph( cp, parent, setdirroot )/*
-==========================================
-   Check to see if we have made the node already.  If so then don't do
-   it again, except if the cell's ce_setdir field is set to something other
-   than the value of setdirroot.  If they differ then, and we have made it
-   already, then make it again and set the cell's stat bit to off so that
-   we do the stat again.  */
-CELLPTR cp;
-LINKPTR parent;
-CELLPTR setdirroot;
-{
-   static CELLPTR removecell = NIL(CELL);
-   
-   if ( removecell == NIL(CELL) ) 
-      removecell = Def_cell(".REMOVE");
-
-   /* we may return if we made it already from the same setdir location,
-    * or if it is not a library member whose lib field is non NULL.  (if
-    * it is such a member then we have a line of the form:
-    *	lib1 lib2 .LIBRARY : member_list...
-    * and we have to make sure all members are up to date in both libs. */
-
-   if ( setdirroot == removecell )
-      return( 0 );
-
-   if( cp->ce_setdir == setdirroot &&
-       !((cp->ce_attr & A_LIBRARYM) && (cp->ce_lib != NIL(char))) )
-      return( 0 );
-
-   /* We check to make sure that we are comming from a truly different
-    * directory, ie. ".SETDIR=joe : a.c b.c d.c" are all assumed to come
-    * from the same directory, even though setdirroot is different when
-    * making dependents of each of these targets. */
-
-   if( cp->ce_setdir != NIL(CELL) &&
-       setdirroot != NIL(CELL) &&
-       cp->ce_dir &&
-       setdirroot->ce_dir &&
-       !strcmp(cp->ce_dir, setdirroot->ce_dir) )
-      return( 0 );
-
-   if( Max_proc > 1 ) {
-      LINKPTR dp;
-
-      TALLOC(parent->cl_prq, 1, CELL);
-      *parent->cl_prq = *cp;
-      cp = parent->cl_prq;
-      cp->ce_prq = _dup_prq(cp->ce_prqorg);
-      cp->ce_all.cl_prq = cp;
-      CeNotMe(cp) = _dup_prq(CeNotMe(cp));
-
-      for(dp=CeNotMe(cp);dp;dp=dp->cl_next) {
-     CELLPTR tcp = dp->cl_prq;
-     TALLOC(dp->cl_prq,1,CELL);
-     *dp->cl_prq = *tcp;
-     dp->cl_prq->ce_flag &= ~(F_STAT|F_VISITED|F_MADE);
-     dp->cl_prq->ce_set   = cp;
-      }      
-   }
-   cp->ce_flag  &= ~(F_STAT|F_VISITED|F_MADE);
-
-   /* Indicate that we exploded the graph and that the current node should
-    * be made. */
-   return(1);
-}
-
-
-
-PUBLIC int
-Exec_commands( cp )/*
-=====================
-  Execute the commands one at a time that are pointed to by the rules pointer
-  of the target cp if normal (non-group) recipes are defined. If a group recipe
-  is found all commands are written into a temporary file first and this
-  (group-) shell script is executed all at once.
-  If a group is indicated, then the ce_attr determines .IGNORE and .SILENT
-  treatment for the group.
-
-  The function returns 0, if the command is executed and has successfully
-  returned, and it returns 1 if the command is executing but has not yet
-  returned or -1 if an error occurred (Return value from Do_cmnd()).
-
-  Macros that are found in recipe lines are expanded in this function, in
-  parallel builds this can mean they are expanded before the previous recipe
-  lines are finished. (Exception: $(shell ..) waits until all previous recipe
-  lines are done.)
-
-  The F_MADE bit in the cell is guaranteed set when the command has
-  successfully completed.  */
-CELLPTR cp;
-{
-   static HASHPTR useshell = NIL(HASH);
-   static HASHPTR command  = NIL(HASH);
-   static         int   read_cmnd = 0;
-   register STRINGPTR	rp;
-   STRINGPTR            orp;
-   char			*cmnd;
-   char			*groupfile;
-   FILE    		*tmpfile = 0;
-   int			do_it;
-   t_attr		attr;
-   int			group;
-   int			trace;
-   int			rval  = 0;
-
-   DB_ENTER( "Exec_commands" );
-
-   if( cp->ce_recipe == NIL(STRING) )
-      Fatal("Internal Error: No recipe found!");
-
-   attr  = Glob_attr | cp->ce_attr;
-   trace = Trace || !(attr & A_SILENT);
-   group = cp->ce_flag & F_GROUP;
-
-   /* Do it again here for those that call us from places other than Make()
-    * above. */
-   orp = _recipes[ RP_RECIPE ];
-   _recipes[ RP_RECIPE ] = cp->ce_recipe;
-
-   if( group ) {
-      /* Leave this assignment of Current_target here.  It is needed just
-       * incase the user hits ^C after the tempfile for the group recipe
-       * has been opened. */
-      Current_target = cp;
-      trace  = Trace || !(attr & A_SILENT);
-
-      if( !Trace ) tmpfile = Start_temp( Grp_suff, cp, &groupfile );
-      if( trace )  fputs( "[\n", stdout );
-
-      /* Emit group prolog */
-      if( attr & A_PROLOG )
-         _append_file( _recipes[RP_GPPROLOG], tmpfile, cp->CE_NAME, trace );
-   }
-
-   if( !useshell )
-      useshell=Def_macro("USESHELL",NIL(char),M_MULTI|M_EXPANDED);
-
-   if( !read_cmnd ) {
-      command = GET_MACRO("COMMAND");
-      read_cmnd = 1;
-   }
-
-   /* Process commands in recipe. If in group, merely append to file.
-    * Otherwise, run them.  */
-   for( rp=_recipes[RP_RECIPE]; rp != NIL(STRING); rp=rp->st_next) {
-      t_attr a_attr = A_DEFAULT;
-      t_attr l_attr;
-      char   *p;
-      int    new_attr = FALSE;
-      int    shell; /* True if the recipe shall run in shell. */
-
-      /* Reset it for each recipe line otherwise tempfiles don't get removed.
-       * Since processing of $(mktmp ...) depends on Current_target being
-       * correctly set. */
-      Current_target = cp;
-
-      /* Only check for +,-,%,@ if the recipe line begins with a '$' macro
-       * expansion.  Otherwise there is no way it is going to find these
-       * now. */
-      if( *rp->st_string == '$' && !group ) {
-         t_attr s_attr = Glob_attr;
-     Glob_attr |= A_SILENT;
-     Suppress_temp_file = TRUE;
-     cmnd = Expand(rp->st_string);
-     Suppress_temp_file = FALSE;
-     a_attr |= Rcp_attribute(cmnd);
-     FREE(cmnd);
-     ++new_attr;
-     Glob_attr = s_attr;
-      }
-
-      l_attr = attr|a_attr|rp->st_attr;
-      shell  = ((l_attr & A_SHELL) != 0);
-      useshell->ht_value = (group||shell)?"yes":"no";
-
-      /* All macros are expanded before putting them in the "process queue".
-       * Nothing in Expand() should be able to change dynamic macros. */
-      cmnd = Expand( rp->st_string );
-
-      if( new_attr && (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
-     size_t len = strlen(p)+1;
-     memmove(cmnd,p,len);
-      }
-
-      /* COMMAND macro is set to "$(CMNDNAME) $(CMNDARGS)" by default, it is
-       * possible for the user to reset it to, for example
-       *	COMMAND = $(CMNDNAME) @$(mktmp $(CMNDARGS))
-       * in order to get a different interface for his command execution. */
-      if( command != NIL(HASH) && !group ) {
-     char *cname = cmnd;
-         char cmndbuf[30];
-
-     if ( *(p=DmStrPbrk(cmnd," \t\n")) != '\0' ) {
-        *p = '\0';
-        (void)Def_macro("CMNDARGS",DmStrSpn(p+1," \t\n"),M_MULTI|M_EXPANDED);
-     }
-     else
-        (void) Def_macro("CMNDARGS","",M_MULTI|M_EXPANDED);
-
-     (void) Def_macro("CMNDNAME",cname,M_MULTI|M_EXPANDED);
-
-         strcpy(cmndbuf, "$(COMMAND)");
-     cmnd = Expand(cmndbuf);
-     FREE(cname); 			/* cname == cmnd at this point. */
-
-     /* Collect up any new attributes */
-     l_attr |= Rcp_attribute(cmnd);
-     shell  = ((l_attr & A_SHELL) != 0);
-
-     /* clean up the attributes that we may have just added. */
-     if( (p = DmStrSpn(cmnd," \t\n+-@%")) != cmnd ) {
-        size_t len = strlen(p)+1;
-        memmove(cmnd,p,len);
-     }
-      }
-
-#if defined(MSDOS)
-      Swap_on_exec = ((l_attr & A_SWAP) != 0);	  /* Swapping for DOS only */
-#endif
-      do_it = !Trace;
-
-      /* We force execution of the recipe if we are tracing and the .EXECUTE
-       * attribute was given or if the it is not a group recipe and the
-       * recipe line contains the string $(MAKE). Wait_for_completion might
-       * be changed gobaly but this is without consequences as we wait for
-       * every recipe with .EXECUTE and don't start anything else. */
-      if( Trace
-       && ((l_attr & A_EXECUTE)||(!group && DmStrStr(rp->st_string,"$(MAKE)")))
-      ) {
-     Wait_for_completion |= Trace;
-     do_it = TRUE;
-      }
-
-      if( group )
-     /* Append_line() calls Print_cmnd(). */
-         Append_line( cmnd, TRUE, tmpfile, cp->CE_NAME, trace, 0 );
-      else {
-     /* Don't print empty recipe lines. .ROOT and .TARGETS
-      * deliberately might have empty "" recipes and we don't want
-      * to output empty recipe lines for them. */
-     if ( *cmnd ) {
-        /* Print command and remove continuation sequence from cmnd. */
-        Print_cmnd(cmnd, !(do_it && (l_attr & A_SILENT)), 0);
-     }
-     rval=Do_cmnd(&cmnd,FALSE,do_it,cp,l_attr,
-              rp->st_next == NIL(STRING) );
-      }
-
-      FREE(cmnd);
-   }
-
-   /* If it is a group then output the EPILOG if required and possibly
-    * execute the command */
-   if( group && !(cp->ce_attr & A_ERROR) ) { 
-      if( attr & A_EPILOG )	/* emit epilog */
-     _append_file( _recipes[RP_GPEPILOG], tmpfile, cp->CE_NAME, trace );
-
-      if( trace ) fputs("]\n", stdout);
-
-      do_it = !Trace;
-      if( do_it )
-    {
-        Close_temp( cp, tmpfile );
-#if defined(UNIX)
-
-         chmod(groupfile,0700);
-#endif
-    } 			
-      rval = Do_cmnd(&groupfile, TRUE, do_it, cp, attr | A_SHELL, TRUE);
-   }
-
-   _recipes[ RP_RECIPE ] = orp;
-   cp->ce_attr &= ~A_ERROR;
-   DB_RETURN( rval );
-}
-
-
-PUBLIC void
-Print_cmnd( cmnd, echo, map )/*
-================================
-   This routine is called to print out the command to stdout.  If echo is
-   false the printing to stdout is supressed.
-   The routine is also used to remove the line continuation sequence
-   \<nl> from the command string and convert escape sequences if the
-   map flag is set.
-   The changed string is used later to actually to execute the command. */
-char *cmnd;
-int  echo;
-int  map;
-{
-   register char *p;
-   register char *n;
-   char tmp[3];
-
-   DB_ENTER( "Print_cmnd" );
-   
-   if( echo ) {
-      printf( "%s\n", cmnd  );
-      fflush(stdout);
-   }
-
-   tmp[0] = ESCAPE_CHAR;
-   tmp[1] = CONTINUATION_CHAR;
-   tmp[2] = '\0';
-
-   for( p=cmnd; *(n = DmStrPbrk(p,tmp)) != '\0'; )
-      /* Remove the \<nl> sequences. */
-      if(*n == CONTINUATION_CHAR && n[1] == '\n') {
-     size_t len = strlen(n+2)+1;
-     DB_PRINT( "make", ("fixing [%s]", p) );
-     memmove( n, n+2, len );
-     p = n;
-      }
-      /* Look for an escape sequence and replace it by it's corresponding
-       * character value. */
-      else {
-         if( *n == ESCAPE_CHAR && map ) Map_esc( n );
-     p = n+1;
-      }
-
-   DB_VOID_RETURN;
-}
-
-
-
-/* These routines are used to maintain a stack of directories when making
- * the targets.  If a target cd's to the directory then it is assumed that
- * it will undo it when it is finished making itself. */
-
-static STRINGPTR dir_stack = NIL(STRING);
-
-PUBLIC int
-Push_dir( dir, name, ignore )/*
-===============================
-   Change the current working directory to dir and save the current
-   working directory on the stack so that we can come back.
-   
-   If ignore is TRUE then do not complain about _ch_dir if not possible.
-
-   Return 1 if the directory change was successfull and 0 otherwise. */
-char *dir;
-char *name;
-int  ignore;
-{
-   STRINGPTR   new_dir;
-
-   DB_ENTER( "Push_dir" );
-
-   if( dir == NIL(char)  || *dir == '\0' ) dir = Pwd;
-   if( *dir == '\'' && dir[strlen(dir)-1] == '\'' ) {
-      dir = DmStrDup(dir+1);
-      dir[strlen(dir)-1]='\0';
-   }
-   else if (strchr(dir,'$') != NIL(char))
-      dir = Expand(dir);
-   else
-      dir = DmStrDup(dir);
-
-   if( Set_dir(dir) ) {
-      if( !ignore )
-         Fatal( "Unable to change to directory `%s', target is [%s]",
-            dir, name );
-      FREE(dir);
-      DB_RETURN( 0 );
-   }
-
-   DB_PRINT( "dir", ("Push: [%s]", dir) );
-   if( Verbose & V_DIR_SET )
-      printf( "%s:  Changed to directory [%s]\n", Pname, dir  );
-
-   FREE( dir );
-   TALLOC( new_dir, 1, STRING );
-   new_dir->st_next   = dir_stack;
-   dir_stack          = new_dir;
-   new_dir->st_string = DmStrDup( Pwd );
-
-   Def_macro( "PWD", Get_current_dir(), M_FORCE | M_EXPANDED );
-   _set_tmd();
-
-   DB_RETURN( 1 );
-}
-
-
-
-PUBLIC void
-Pop_dir(ignore)/*
-=================
-   Change the current working directory to the previous saved dir. */
-int ignore;
-{
-   STRINGPTR old_dir;
-   char      *dir;
-
-   DB_ENTER( "Pop_dir" );
-
-   if( dir_stack == NIL(STRING) ) {
-      if( ignore ) {
-         DB_VOID_RETURN;
-      }
-      else
-     Error( "Directory stack empty for return from .SETDIR" );
-   }
-
-   if( Set_dir(dir = dir_stack->st_string) )
-      Fatal( "Could not change to directory `%s'", dir );
-
-   Def_macro( "PWD", dir, M_FORCE | M_EXPANDED );
-   DB_PRINT( "dir", ("Pop: [%s]", dir) );
-   if( Verbose & V_DIR_SET )
-      printf( "%s:  Changed back to directory [%s]\n", Pname, dir);
-
-   old_dir   = dir_stack;
-   dir_stack = dir_stack->st_next;
-
-   FREE( old_dir->st_string );
-   FREE( old_dir );
-   _set_tmd();
-
-   DB_VOID_RETURN;
-}
-
-
-
-static void
-_set_tmd()/*
-============
-   Set the TMD Macro and the Tmd global variable. TMD stands for "To MakeDir"
-   and is the path from the present directory (value of $(PWD)) to the directory
-   dmake was started up in (value of $(MAKEDIR)). As _prefix() can return absolute
-   paths some special .WINPATH treatment is needed.
-*/
-{
-   char  *tmd;
-
-   if( Tmd )
-      FREE(Tmd);
-
-   tmd = _prefix(Pwd, Makedir);
-   if( *tmd ) {
-      Def_macro( "TMD", DO_WINPATH(tmd), M_FORCE | M_EXPANDED );
-      Tmd = DmStrDup(tmd);
-   } else {
-      Def_macro( "TMD", ".", M_FORCE | M_EXPANDED );
-      Tmd = DmStrDup(".");
-   }
-   FREE( tmd );
-}
-
-
-static void
-_set_recipe( target, ind )/*
-============================
-   Set up the _recipes static variable so that the slot passed in points
-   at the rules corresponding to the target supplied. */
-char *target;
-int  ind;
-{
-   CELLPTR cp;
-   HASHPTR hp;
-
-   if( (hp = Get_name(target, Defs, FALSE)) != NIL(HASH) ) {
-      cp = hp->CP_OWNR;
-      _recipes[ ind ] = cp->ce_recipe;
-   }
-   else
-      _recipes[ ind ] = NIL(STRING);
-}
-
-
-
-PUBLIC void
-Append_line( cmnd, newline, tmpfile, name, printit, map )
-char *cmnd;
-int  newline;
-FILE *tmpfile;
-char *name;
-int  printit;
-int  map;
-{
-   Print_cmnd( cmnd, printit, map );
-
-   if( Trace ) return;
-
-   fputs(cmnd, tmpfile);
-   if( newline ) fputc('\n', tmpfile);
-   fflush(tmpfile);
-
-   if( ferror(tmpfile) )
-      Fatal("Write error on temporary file, while processing `%s'", name);
-}
-
-
-
-static void
-_append_file( rp, tmpfile, name, printit )
-register STRINGPTR rp;
-FILE 		   *tmpfile;
-char 		   *name;
-int 		   printit;
-{
-   char *cmnd;
-
-   while( rp != NIL(STRING) ) {
-      Append_line(cmnd = Expand(rp->st_string), TRUE, tmpfile, name, printit,0);
-      FREE(cmnd);
-      rp = rp->st_next;
-   }
-}
-
-
-#define NUM_BUCKETS	20
-
-typedef struct strpool {
-   char 	  *string;	/* a pointer to the string value */
-   uint32	  keyval;	/* the strings hash value	 */
-   struct strpool *next;	/* hash table link pointer	 */
-} POOL, *POOLPTR;
-
-static POOLPTR strings[ NUM_BUCKETS ];
-
-static char *
-_pool_lookup( str )/*
-=====================
-   Scan down the list of chained strings and see if one of them matches
-   the string we are looking for. */
-char    *str;
-{
-   register POOLPTR key;
-   uint32   keyval;
-   uint16   hv;
-   uint16   keyindex;
-   char     *string;
-
-   DB_ENTER( "_pool_lookup" );
-
-   if( str == NIL(char) ) DB_RETURN("");
-
-   hv  = Hash(str, &keyval);
-   key = strings[ keyindex = (hv % NUM_BUCKETS) ];
-
-   while( key != NIL(POOL) )
-      if( (key->keyval != keyval) || strcmp(str, key->string) )
-     key = key->next;
-      else
-     break;
-
-   if( key == NIL(POOL) ) {
-      DB_PRINT( "pool", ("Adding string [%s]", str) );
-      TALLOC( key, 1, POOL );			/* not found so add string */
-      
-      key->string = string = DmStrDup(str);
-      key->keyval = keyval;
-
-      key->next           = strings[ keyindex ];
-      strings[ keyindex ] = key;
-   }
-   else {
-      DB_PRINT( "pool", ("Found string [%s], key->string") );
-      string = key->string;
-   }
-
-   DB_RETURN( string );
-}
-
-
-void
-Unmake( cp )/*
-==============
-   Remove flags indicating that a target was previously made.  This
-   is used for infered makefiles. */
-CELLPTR cp;
-{
-   LINKPTR dp, ep;
-   CELLPTR tcp, pcp;
-
-   DB_ENTER( "Unmake" );
-
-   for(dp=CeMeToo(cp); dp; dp=dp->cl_next) {
-      tcp = dp->cl_prq;
-
-      /* Unmake the prerequisites. */
-      for( ep = tcp->ce_prq; ep != NIL(LINK); ep = ep->cl_next ) {
-     pcp  = ep->cl_prq;
-
-     Unmake(pcp);
-      }
-      DB_PRINT( "unmake", ("Unmake [%s]", tcp->CE_NAME) );
-
-      tcp->ce_flag &= ~(F_MADE|F_VISITED|F_STAT);
-      tcp->ce_time  = (time_t)0L;
-   }
-
-   DB_VOID_RETURN;
-}
diff --git a/dmake/make.cmd b/dmake/make.cmd
deleted file mode 100755
index c0d490ddd..000000000
--- a/dmake/make.cmd
+++ /dev/null
@@ -1,115 +0,0 @@
-echo off
-
-REM * This script is deprecated for OS/2 libc 06x building! Use the configure
-REM * mechanism. Run the following commands your OS/2 shell:
-REM * 
-REM * set CFLAGS=-g -Zomf -O3 -march=pentium -mcpu=pentium4
-REM * set CXXFLAGS=-g -Zomf -O3 -march=pentium -mcpu=pentium4
-REM * set LDFLAGS=-s -Zsym -Zmap -Zhigh-mem -Zomf -Zexe -Zargs-wild -Zargs-resp
-REM * set LN_CP_F=cp.exe
-REM * set RANLIb=echo
-REM * set AR=emxomfar -p128
-REM * sh -c "./configure --enable-spawn"
-REM * make.exe
-
-cls
-rem  *** This is the make command file that is used under OS/2 to make the
-rem  *** first version of dmake.  It isn't pretty but it does work, assuming
-rem  *** the compilers have been correctly setup.
-rem
-
-if %0%1 == %0 goto error
-
-if %1 == os2-ibm     goto mkibm
-if %1 == os2-ibm3     goto mkibm3
-if %1 == winnt-bcc40 goto mkwntb40
-if %1 == winnt-bcc45 goto mkwntb45
-if %1 == winnt-bcc50 goto mkwntb50
-if %1 == winnt-vpp40 goto mkwntv40
-
-
-rem label the possible DOS variations for dmake here.
-:error
-echo OS/2 INDEX:  You must specify one of:
-echo ------------------
-echo    os2-ibm      - IBM OS/2 ICC compile.
-echo    os2-ibm3      - IBM OS/2 ICC3 compile.
-echo    winnt-bcc40  - Windows-NT Borland C++ 4.0 Compile
-echo    winnt-bcc45  - Windows-NT Borland C++ 4.5 Compile
-echo    winnt-bcc50  - Windows-NT Borland C++ 5.0 Compile
-echo    winnt-vpp40  - Windows-NT Microsoft VC++ 4.0 Compile
-goto end
-
-rem This is the script that bilds OS/2 dmake using IBM ICC Compiler
-:mkibm
-os2\ibm\icc\mk.cmd
-goto end
-
-:mkibm3
-os2\ibm\icc3\mk.cmd
-goto end
-
-rem This is the script that makes 32-bit dmake using Borland C++ 4.0.
-:mkwntb40
-cls
-echo WARNING:
-echo    The default response files:
-echo        winnt\borland\bcc40\obj.rsp
-echo        winnt\borland\bcc40\lib.rsp
-echo    contain absolute paths to Borland C++ runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Borland C++ before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-winnt\borland\bcc40\mk.bat
-goto end
-
-rem This is the script that makes 32-bit dmake using Borland C++ 4.5.
-:mkwntb45
-cls
-echo WARNING:
-echo    The default response files:
-echo        winnt\borland\bcc45\obj.rsp
-echo        winnt\borland\bcc45\lib.rsp
-echo    contain absolute paths to Borland C++ runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Borland C++ before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-winnt\borland\bcc45\mk.bat
-goto end
-
-rem All done!
-rem This is the script that makes 32-bit dmake using Borland C++ 5.0.
-:mkwntb50
-cls
-echo WARNING:
-echo    The default response files:
-echo        winnt\borland\bcc50\obj.rsp
-echo        winnt\borland\bcc50\lib.rsp
-echo    contain absolute paths to Borland C++ runtime startup objects, and to
-echo    the standard libraries.  You should check that these files contain
-echo    the correct path names for your installation of Borland C++ before
-echo    proceeding further.  Also check that the mkdir command at the start
-echo    of the response file and the copy command at the end of the response
-echo    file will work on your system.
-echo --
-echo Continue if ok, or abort and edit the response files.
-pause
-winnt\borland\bcc50\mk.bat
-goto end
-
-:mkwntv40
-winnt\microsft\vpp40\mk.bat
-goto end
-
-rem All done!
-:end
diff --git a/dmake/makefile.mk b/dmake/makefile.mk
deleted file mode 100644
index 528a79f7c..000000000
--- a/dmake/makefile.mk
+++ /dev/null
@@ -1,432 +0,0 @@
-# 			//// Makefile for DMAKE. \\\\
-# The target system is characterized by the following macros imported from
-# the environment.
-#
-#	OS	      - gives the class of operating system
-#	OSRELEASE     - optionally specifies the particular release of the OS
-#	OSENVIRONMENT - optionally specifies the environment under which the
-#                       OS and OSENVIRONMENT are running.
-#
-# For valid values for the above macros consult the readme/* files or type
-# 'make' by itself to get a summary of what is available.
-
-# First target in the makefile, do this so that targets declared in the
-# included files are never marked as being the first *default* target.
-first : all ;
-
-#Enable keeping of state for future compiles
-.KEEP_STATE *:= _state.mk
-
-# Define $(PUBLIC)
-_osenv   := $(OSENVIRONMENT)$/
-_osre    := $(OSRELEASE)$/$(!null,$(OSENVIRONMENT) $(_osenv))
-.IF "$(OS)"=="LINUX"
-OS=linux
-.ENDIF
-ENVDIR    = $(OS)$/$(!null,$(OSRELEASE) $(_osre))
-PUBLIC    = $(ENVDIR)public.h
-MKCONFIG := startup/config.mk
-
-# Define the source files
-SRC =\
-    infer.c make.c stat.c expand.c dmstring.c hash.c dag.c dmake.c\
-    path.c imacs.c sysintf.c parse.c getinp.c quit.c state.c\
-    dmdump.c macparse.c rulparse.c percent.c function.c
-
-# Common Include files.
-HDR = dmake.h extern.h struct.h vextern.h
-
-# Define the TARGET we are making, and where the OBJECT files go.
-OBJDIR := objects
-TARGET  = dmake$E
-CFLAGS += $(SWITCHAR)I.
-
-# Meta rule for making .o's from .c's (give our own so we can move object
-# to objects directory in a portable, compiler independent way)
-# Define it before the .INCLUDE so that different OS combinations can redefine
-# it.
-%$O : %.c
-.IF $(SHELL) == mpw
-    %$(CC) $(CFLAGS) -o :$(OBJDIR:s,/,:,):$@ $<
-.ELSE
-    %$(CC) $(SWITCHAR)c $(CFLAGS) $<
-.IF $(SHELL) != $(COMSPEC)
-    mv $(@:f) $(OBJDIR)
-.ELSE
-    +copy $(@:f) $(OBJDIR)
-    +del $(@:f)
-.ENDIF
-.ENDIF
-
-# Pull in the proper configuration files, based on the value of OS.
-.INCLUDE : $(OS)/config.mk
-.INCLUDE : dbug/dbug.mk
-
-# Set the .SOURCE targets so that we look for things in the right place.
-.SOURCE.c :^ .NULL
-.SOURCE.h :^ .NULL
-.SOURCE$O :^ $(OBJDIR)
-.PRECIOUS : $(HDR)
-
-# Must come after the above INCLUDE so that it gets ALL objects.
-OBJECTS	:= {$(ASRC:b) $(SRC:b)}$O
-
-# The main target, make sure the objects directory exists first.
-# LDARGS is defined in config.mk file of each OS/OSRELEASE combination.
-all        : $(TARGET) $(MKCONFIG);
-$(TARGET)  : $(OBJDIR)
-$(TARGET)  : $(OBJECTS);$(LD) $(LDARGS)
-
-# Use this for install targets
-.IF $(SHELL) == mpw
-$(MKCONFIG) : template.mk
-    duplicate :$(<:s,/,:,) $@
-.ELSE
-$(MKCONFIG) : template.mk
-    $(eq,$(SHELL),$(COMSPEC) +copy cp) $< $(eq,$(SHELL),$(COMSPEC) $(@:s,/,\,) $@)
-.ENDIF
-
-# how to make public.h
-public .PHONY : $(PUBLIC);
-$(PUBLIC) .GROUP .NOSTATE: $(SRC)
-    genpub -n DMAKE $< >$@
-#	drcsclean ./rcsclean.awk $@ > /dev/null
-
-# Other obvious targets...
-.IF $(SHELL) == mpw
-    $(OBJDIR):;-newfolder $@
-.ELSE
-    $(OBJDIR):;-$(eq,$(SHELL),$(COMSPEC) +md mkdir) $@
-.ENDIF
-
-# remaining dependencies should be automatically generated
-sysintf$O  : sysintf.h
-ruletab$O  : startup.h  #khc 01NOV90 - dependency was missing
-$(OBJECTS) : $(HDR)
-
-clean:;+- $(RM:f) -rf dmake$E dbdmake$E objects* _*state*.mk startup/config.mk
-
-# Rules for making the manual pages.
-man .SETDIR=man : dmake.nc dmake.uue ;
-dmake.nc : dmake.p ; scriptfix < $< > $@
-dmake.p  : dmake.tf; groff -man -Tascii $< > $@
-dmake.uue : dmake.p
-    compress -b 12 dmake.p
-    mv dmake.p.Z dmake.Z
-    uuencode dmake.Z dmake.Z >dmake.uue
-    /bin/rm -f dmake.Z
-
-template.mk ".SETDIR=$(ENVDIR)" .USESHELL : $$(TMD)/startup/template.mk
-    cat $< |\
-    sed -e 's/xxOSxx/$(OS)/' |\
-    sed -e 's/xxOSRELEASExx/$(OSRELEASE)/' |\
-    sed -e 's/xxOSENVIRONMENTxx/$(OSENVIRONMENT)/' > $@
-
-#--------------------------------------------------------------------------
-# Make the various archives for shipping the thing around.
-#
-archives : zip tar
-    $(RM) -rf src-list dmake
-
-zip  .PHONY : dmake.zip ;
-shar .PHONY : dmake.shar;
-tar  .PHONY : dmake.tar;
-
-dmake.zip  : dir-copy
-    zip -r $(@:b) $(@:b)
-
-dmake.shar : dir-copy
-    find dmake -type f -print >src-list
-    xshar -vc -o$@ -L40 `cat src-list`
-
-dmake.tar : dir-copy
-    tar cf $@ dmake
-
-dir-copy .PHONY : src-list
-[
-    echo 'tmp.tar .SILENT :$$(ALLSRC) ;tar -cf tmp.tar $$(ALLSRC)' >> $<
-    $(MAKECMD) -f $< tmp.tar
-    mkdir dmake
-    cd dmake
-    tar xf ../tmp.tar; chmod -R u+rw .
-    cd ..
-    /bin/rm -f tmp.tar
-]
-
-src-list : clean
-    echo 'MAXLINELENGTH := 65536' > $@
-    echo 'ALLSRC = \' >>$@
-    find . -type f -print |\
-    sed -e 's/,v//'\
-        -e 's/$$/\\/'\
-        -e 's/^\.\// /'|\
-    sort -u |\
-    grep -v tst | grep -v $@ | grep -v license |\
-    grep -v CVS | grep -v RCS |\
-    grep -v '\.zip' | grep -v '\.tar'| grep -v '\.shar' >> $@
-    echo ' readme/license.txt' >> $@
-
-#--------------------------------------------------------------------------
-# This section can be used to make the necessary script files so that dmake
-# can be bootstrapped.
-#
-#	dmake scripts	-- makes all the script files at once.
-#
-FIX-SH  = $(SH:s,fix/,,)
-FIX95-SH  = $(SH:s,fix95nt/,,)
-SH      = $(SH_n:s/c40d/cd/:s/c50d/cd/:s/c51d/cd/:s/c60d/cd/)
-SH_n    = $(@:s/swp-/-/:s,-,/,:s/scripts/${SCRIPTFILE}/)
-MS      = MAKESTARTUP=startup/startup.mk
-FS     := "SHELL := $(SHELL)" "SHELLFLAGS := -ce"
-SET-TMP:= TMPDIR:=/tmp
-
-scripts: unix-scripts\
-     atari-tos-scripts apple-mac-scripts qssl-qnx-scripts\
-     msdos-scripts win95-scripts os2-scripts;
-
-# To add a new environment for UNIX, simply create the appropriate entry
-# in the style below for the macro which contains the OS, OSRELEASE and
-# OSENVIRONMENT flags.  Then add the entry as a recipe line for the target
-# unix-scripts.
-#
-unix-bsd43-scripts-flags = OS=unix OSRELEASE=bsd43  OSENVIRONMENT=
-unix-linux-gnu-scripts-flags  = OS=unix OSRELEASE=linux  OSENVIRONMENT=gnu
-unix-solaris-scripts-flags = OS=unix OSRELEASE=solaris OSENVIRONMENT=
-unix-solaris-gnu-scripts-flags = OS=unix OSRELEASE=solaris OSENVIRONMENT=gnu
-unix-bsd43-uw-scripts-flags= OS=unix OSRELEASE=bsd43  OSENVIRONMENT=uw
-unix-bsd43-vf-scripts-flags= OS=unix OSRELEASE=bsd43  OSENVIRONMENT=vf
-unix-sysvr4-scripts-flags  = OS=unix OSRELEASE=sysvr4 OSENVIRONMENT=
-unix-sysvr3-scripts-flags  = OS=unix OSRELEASE=sysvr3 OSENVIRONMENT=
-unix-sysvr3-pwd-scripts-flags  = OS=unix OSRELEASE=sysvr3 OSENVIRONMENT=pwd
-unix-xenix-scripts-flags  = OS=unix OSRELEASE=xenix OSENVIRONMENT=
-unix-xenix-pwd-scripts-flags  = OS=unix OSRELEASE=xenix OSENVIRONMENT=pwd
-unix-sysvr1-scripts-flags  = OS=unix OSRELEASE=sysvr1 OSENVIRONMENT=
-unix-386ix-scripts-flags   = OS=unix OSRELEASE=386ix  OSENVIRONMENT=
-unix-coherent-ver40-scripts-flags= OS=unix OSRELEASE=coherent OSENVIRONMENT=ver40
-unix-coherent-ver42-scripts-flags= OS=unix OSRELEASE=coherent OSENVIRONMENT=ver42
-unix-macosx-gnu-scripts-flags  = OS=unix OSRELEASE=macosx OSENVIRONMENT=gnu
-qssl--scripts-flags        = OS=qssl OSRELEASE=       OSENVIRONMENT=
-tos--scripts-flags         = OS=tos  OSRELEASE=       OSENVIRONMENT=
-mac--scripts-flags         = OS=mac  OSRELEASE=       OSENVIRONMENT=
-
-unix-scripts .SWAP : clean
-    $(MAKE) SCRIPTFILE=make.sh unix-bsd43-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-bsd43-uw-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-bsd43-vf-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-linux-gnu-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-solaris-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-solaris-gnu-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-sysvr4-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-sysvr3-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-sysvr3-pwd-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-xenix-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-xenix-pwd-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-sysvr1-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-386ix-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-coherent-ver40-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-coherent-ver42-scripts
-    $(MAKE) SCRIPTFILE=make.sh unix-macosx-gnu-scripts
-
-atari-tos-scripts .SWAP : clean
-    $(MAKE) SCRIPTFILE=make.sh tos--scripts
-
-qssl-qnx-scripts .SWAP : clean
-    $(MAKE) SCRIPTFILE=make.sh qssl--scripts
-
-apple-mac-scripts .SWAP : clean
-    $(MAKE) SCRIPTFILE=make.sh mac--scripts
-
-unix-%-scripts .SWAP :
-    $(MAKECMD) -su $($@-flags) .KEEP_STATE:= $(FS) public template.mk
-    $(MAKECMD) -ns .KEEP_STATE:= $(MS) $($@-flags) >/tmp/dmscr
-    dfold </tmp/dmscr >$(SH)
-
-qssl-%-scripts .SWAP :
-    $(MAKECMD) -su $($@-flags) .KEEP_STATE:= $(FS) public template.mk
-    $(MAKECMD) -ns .KEEP_STATE:= $(MS) $($@-flags) >/tmp/dmscr
-    dfold </tmp/dmscr >$(SH)
-
-tos-%-scripts .SWAP :
-    $(MAKECMD) -su $($@-flags) .KEEP_STATE:= $(FS) public template.mk
-    $(MAKECMD) -ns .KEEP_STATE:= $(MS) $($@-flags) >/tmp/dmscr
-    dfold </tmp/dmscr >$(SH)
-
-mac-%-scripts .SWAP :
-    $(MAKECMD) -su $($@-flags) .KEEP_STATE:= $(FS) public template.mk
-    $(MAKECMD) -ns .KEEP_STATE:= $(MS) $($@-flags) >$(SH)
-    sed 's/ mac\/\(.*\)$$/ :mac:\1/' <$(SH) | dfold >/tmp/dmscr
-    /bin/mv /tmp/dmscr $(SH)
-
-# We make the standard dos scripts here, but we have to go and fix up the
-# mkXX.bat file since it contains names of temporary files for the response
-# files required by the linker.  We need to also construct the response file
-# contents.  These two functions are performed by the fix-msdos-%-scripts
-# meta-target.
-#
-# To add a new DOS environment just do what is described for adding a new
-# unix environment, and then make certain that the fix-msdos-%-scripts target
-# performs the correct function for the new environment.
-msdos-cf = OS=msdos
-win95-cf = OS=win95
-winnt-cf = OS=winnt
-
-msdos-borland-tcc20swp-scripts-flags = $(msdos-cf) OSRELEASE=borland OSENVIRONMENT=tcc20
-msdos-borland-bcc30-scripts-flags = $(msdos-cf) OSRELEASE=borland OSENVIRONMENT=bcc30 SWAP=n
-msdos-borland-bcc30swp-scripts-flags = $(msdos-cf) OSRELEASE=borland OSENVIRONMENT=bcc30
-msdos-borland-bcc40swp-scripts-flags = $(msdos-cf) OSRELEASE=borland OSENVIRONMENT=bcc40
-msdos-borland-bcc45swp-scripts-flags = $(msdos-cf) OSRELEASE=borland OSENVIRONMENT=bcc45
-msdos-borland-bcc50swp-scripts-flags = $(msdos-cf) OSRELEASE=borland OSENVIRONMENT=bcc50
-msdos-borland-bcc32-scripts-flags = $(msdos-cf) OSRELEASE=borland OSENVIRONMENT=bcc32 SWAP=n
-msdos-microsft-msc51-scripts-flags= $(msdos-cf) OSRELEASE=microsft SWAP=n MSC_VER=5.1 OSENVIRONMENT=msc51
-msdos-microsft-msc51swp-scripts-flags = $(msdos-cf) OSRELEASE=microsft MSC_VER=5.1 OSENVIRONMENT=msc51
-msdos-microsft-msc60-scripts-flags= $(msdos-cf) OSRELEASE=microsft SWAP=n MSC_VER=6.0 OSENVIRONMENT=msc60
-msdos-microsft-msc60swp-scripts-flags = $(msdos-cf) OSRELEASE=microsft MSC_VER=6.0 OSENVIRONMENT=msc60
-msdos-zortech-scripts-flags= $(msdos-cf) OSRELEASE=zortech SWAP=n OSENVIRONMENT=
-msdos-zortechswp-scripts-flags= $(msdos-cf) OSRELEASE=zortech OSENVIRONMENT=
-win95-borland-bcc50-scripts-flags = $(win95-cf) OSRELEASE=borland OSENVIRONMENT=bcc50 SWAP=n
-win95-microsft-vpp40-scripts-flags = $(win95-cf) OSRELEASE=microsft OSENVIRONMENT=vpp40 SWAP=n
-
-winnt-borland-bcc50-scripts-flags = $(winnt-cf) OSRELEASE=borland OSENVIRONMENT=bcc50 SWAP=n
-winnt-microsft-vpp40-scripts-flags = $(winnt-cf) OSRELEASE=microsft OSENVIRONMENT=vpp40 SWAP=n 
-
-
-msdos-scripts: clean\
-           msdos-borland-turbo-scripts\
-           msdos-borland-c++-scripts\
-           msdos-microsoft-scripts;
-
-win95-scripts: clean\
-           win95-borland-c++-scripts\
-           win95-microsft-vc++-scripts;
-
-winnt-scripts: clean\
-           winnt-borland-c++-scripts\
-           winnt-microsft-vc++-scripts;
-
-msdos-borland-turbo-scripts .SWAP :
-    $(MAKECMD) SCRIPTFILE=mkswp.bat msdos-borland-tcc20swp-scripts
-
-msdos-borland-c++-scripts .SWAP :! 30 40 45 50
-    $(MAKECMD) SCRIPTFILE=mkswp.bat msdos-borland-bcc$?swp-scripts
-
-msdos-microsoft-scripts .SWAP :! 51 60
-    $(MAKECMD) SCRIPTFILE=mk.bat msdos-microsft-msc$?-scripts
-    $(MAKECMD) SCRIPTFILE=mkswp.bat msdos-microsft-msc$?swp-scripts
-
-msdos-zortech-scripts .SWAP :
-    $(MAKECMD) SCRIPTFILE=mk.bat msdos-zortech-scripts
-    $(MAKECMD) SCRIPTFILE=mkswp.bat msdos-zortechswp-scripts
-
-win95-borland-c++-scripts .SWAP :! 50
-    $(MAKECMD) SCRIPTFILE=mk.bat win95-borland-bcc$?-scripts
-
-win95-microsft-vc++-scripts .SWAP :! 40
-    $(MAKECMD) SCRIPTFILE=mk.bat win95-microsft-vpp$?-scripts
-
-winnt-borland-c++-scripts .SWAP :! 50
-    $(MAKECMD) SCRIPTFILE=mk.cmd winnt-borland-bcc$?-scripts
-
-winnt-microsft-vc++-scripts .SWAP :! 40
-    $(MAKECMD) SCRIPTFILE=mk.cmd winnt-microsft-vpp$?-scripts
-
-msdos-%-scripts .SWAP .SILENT:
-    $(MAKECMD) -su $($@-flags) .KEEP_STATE:= $(FS) public template.mk
-    $(MAKECMD) -ns DIRSEPSTR:=$(DIRSEPSTR) SHELL=command.com COMSPEC=command.com .KEEP_STATE:= $(MS) $($@-flags) >$(SH)
-    $(MAKECMD) -s $(MAKEMACROS) $(MS) $($@-flags) $(SET-TMP) fix-msdos-$*-scripts
-
-win95-borland-%-scripts .SWAP .SILENT:
-    $(MAKECMD) -u $($@-flags) .KEEP_STATE:= $(FS) public template.mk
-    $(MAKECMD) -n DIRSEPSTR:=$(DIRSEPSTR) SHELL=command.com COMSPEC=command.com .KEEP_STATE:= $(MS) $($@-flags) >$(SH)
-    $(MAKECMD) -s $(MAKEMACROS) $(MS) $($@-flags) $(SET-TMP) fix-win95-borland-$*-scripts
-
-win95-microsft-%-scripts .SWAP .SILENT:
-    $(MAKECMD) -su $($@-flags) .KEEP_STATE:= $(FS) public template.mk
-    $(MAKECMD) -ns DIRSEPSTR:=$(DIRSEPSTR) SHELL=command.com COMSPEC=command.com .KEEP_STATE:= $(MS) $($@-flags) >$(SH)
-    $(MAKECMD) -s $(MAKEMACROS) $(MS) $($@-flags) $(SET-TMP) fix95nt-win95-microsft-$*-scripts
-
-winnt-borland-%-scripts .SWAP .SILENT:
-    $(MAKECMD) -su $($@-flags) .KEEP_STATE:= $(FS) public template.mk
-    $(MAKECMD) -ns DIRSEPSTR:=$(DIRSEPSTR) SHELL=cmd.exe COMSPEC=cmd.exe .KEEP_STATE:= $(MS) $($@-flags) >$(SH)
-    $(MAKECMD) -s $(MAKEMACROS) $(MS) $($@-flags) $(SET-TMP) fix-winnt-borland-$*-scripts
-
-winnt-microsft-%-scripts .SWAP .SILENT:
-    $(MAKECMD) -su $($@-flags) .KEEP_STATE:= $(FS) public template.mk
-    $(MAKECMD) -ns DIRSEPSTR:=$(DIRSEPSTR) SHELL=cmd.exe COMSPEC=cmd.exe .KEEP_STATE:= $(MS) $($@-flags) >$(SH)
-    $(MAKECMD) -s $(MAKEMACROS) $(MS) $($@-flags) $(SET-TMP) fix95nt-winnt-microsft-$*-scripts
-
-
-# We make the standard OS/2 scripts here, but we have to go and fix up the
-# mkXX.cmd file since it contains names of temporary files for the response
-# files required by the linker.  We need to also construct the response file
-# contents.  These two functions are performed by the fix-msdos-%-scripts
-# meta-target.
-#
-# To add a new OS/2 environment just do what is described for adding a new
-# unix environment, and then make certain that the fix-msdos-%-scripts target
-# performs the correct function for the new environment.
-os2-cf = OS=os2
-os2-ibm-icc-scripts-flags= $(os2-cf) OSRELEASE=ibm OSENVIRONMENT=icc
-
-os2-scripts: clean os2-ibm-scripts;
-
-os2-ibm-scripts .SWAP :! icc
-    $(MAKECMD) SCRIPTFILE=mk.cmd os2-ibm-$?-scripts
-
-os2-%-scripts .SWAP :
-    $(MAKECMD) -su $($@-flags) .KEEP_STATE:= $(FS) public template.mk
-    $(MAKECMD) -ns DIRSEPSTR:=$(DIRSEPSTR) SHELL=cmd.exe COMSPEC=cmd.exe .KEEP_STATE:= $(MS) SWITCHAR:=- $($@-flags) >$(SH)
-    $(MAKECMD) -s $(MAKEMACROS) $(MS) $($@-flags) $(SET-TMP) fix-os2-$*-scripts
-    cat $(SH) | sed -e 's, -, /,g' >tmp-out
-    mv tmp-out $(SH)
-
-# Signify NULL targets for the various Compiler versions.
-icc 30 40 45 50 51 60 .PHONY:;
-
-# Go over the created script file and make sure all the '/' that are in
-# filenames are '\', and make sure the final link command line looks
-# reasonable.
-MAPOBJ   = obj$(SWAP:s/y/swp/:s/n//).rsp
-MAPLIB   = lib$(SWAP:s/y/swp/:s/n//).rsp
-OBJRSP   = $(SH:s,fix/,,:s,${SCRIPTFILE},${MAPOBJ},)
-LIBRSP   = $(SH:s,fix/,,:s,${SCRIPTFILE},${MAPLIB},)
-OBJRSP95 = $(SH:s,fix95nt/,,:s,${SCRIPTFILE},${MAPOBJ},)
-LIBRSP95 = $(SH:s,fix95nt/,,:s,${SCRIPTFILE},${MAPLIB},)
-DOSOBJ   = $(CSTARTUP) $(OBJDIR)/{$(OBJECTS)}
-
-# Use group recipes, as SHELL has an invalid value in some platform instances.
-fix-%-scripts .GROUP:
-    tac $(FIX-SH) >tmp-sh-r
-    tail +3 tmp-sh-r | sed -e 's,/,\\,g' >tmp-out
-    tac tmp-out|\
-    sed -e 's,\\nologo,/nologo,g' >$(FIX-SH)
-    head -2 tmp-sh-r |\
-    sed -e 's,\\tmp\\mkA[a-zA-Z0-9]*,$(OBJRSP:s,/,\\),'\
-        -e 's,\\tmp\\mkB[a-zA-Z0-9]*,$(LIBRSP:s,/,\\),'\
-        -e 's,\\tmp\\mk[0-9]*a[a-z]*,$(OBJRSP:s,/,\\),'\
-        -e 's,\\tmp\\mk[0-9]*b[a-z]*,$(LIBRSP:s,/,\\),'\
-        -e 's,/,\\,g'\
-        -e 's,\\nologo,/nologo,g'\
-        -e 's,-,/,g' |\
-    tac >>$(FIX-SH)
-    rm -f tmp-sh-r tmp-out
-    mv <+$(DOSOBJ:s,/,\\,:t"+\n")\n+> $(OBJRSP)
-    mv <+$(LDLIBS:s,/,\\,:t"+\n")\n+> $(LIBRSP)
-
-# Use group recipes, as SHELL has an invalid value in some platform instances.
-fix95nt-%-scripts .GROUP:
-    tac $(FIX95-SH) >tmp-sh-r
-    tail +3 tmp-sh-r | sed -e 's,/,\\,g' >tmp-out
-    tac tmp-out|\
-    sed -e 's,\\nologo,/nologo,g' >$(FIX95-SH)
-    head -2 tmp-sh-r |\
-    sed -e 's,\\tmp\\mkA[a-zA-Z0-9]*,$(OBJRSP95:s,/,\\),'\
-        -e 's,\\tmp\\mkB[a-zA-Z0-9]*,$(LIBRSP95:s,/,\\),'\
-        -e 's,\\tmp\\mk[0-9]*a[a-z]*,$(OBJRSP95:s,/,\\),'\
-        -e 's,\\tmp\\mk[0-9]*b[a-z]*,$(LIBRSP95:s,/,\\),'\
-        -e 's,/,\\,g'\
-        -e 's,\\nologo,/nologo,g'\
-        -e 's,-,/,g' |\
-    tac >>$(FIX95-SH)
-    rm -f tmp-sh-r tmp-out
-    mv <+$(DOSOBJ:s,/,\\,:t"\n")\n+> $(OBJRSP95)
-    mv <+$(LDLIBS:s,/,\\,:t"\n")\n+> $(LIBRSP95)
diff --git a/dmake/man/dmake.nc b/dmake/man/dmake.nc
deleted file mode 100644
index 9961119dd..000000000
--- a/dmake/man/dmake.nc
+++ /dev/null
@@ -1,3644 +0,0 @@
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-NAME
-       dmake - maintain program groups, or interdependent files
-
-SYNOPSIS
-       dmake     [-P#]     [-{f|C|K}     file]     [-{w|W}     target     ...]
-       [macro[[!][*][+][:]]=value       ...]         [-ABcdeEghiknpqrsStTuVxX]
-       [-v[cdfimrtw]] [-m[trae]] [target ...]
-
-DESCRIPTION
-       dmake  is a re-implementation of the UNIX Make utility with significant
-       enhancements.  dmake executes commands found in an external file called
-       a  makefile to update one or more target names.  Each target may depend
-       on zero or more prerequisite targets.  If any of the target's prerequi-
-       sites  is newer than the target or if the target itself does not exist,
-       then dmake will attempt to make the target.
-
-       If no -f command line option is present  then  dmake  searches  for  an
-       existing makefile from the list of prerequisites specified for the spe-
-       cial target .MAKEFILES (see the STARTUP section for more details).   If
-       "-"  is  the  name of the file specified to the -f flag then dmake uses
-       standard input as the source of the makefile text.
-
-       Any macro definitions (arguments with embedded "=" signs)  that  appear
-       on  the  command line are processed first and supercede definitions for
-       macros of the same name found within the makefile.  In  general  it  is
-       impossible  for  definitions  found  inside  the makefile to redefine a
-       macro defined on the command line, see the MACROS  section  for  excep-
-       tions.
-
-       If  no  target names are specified on the command line, then dmake uses
-       the first non-special target found in the makefile as the default  tar-
-       get.   See  the SPECIAL TARGETS section for the list of special targets
-       and their function.  Makefiles written for most  previous  versions  of
-       Make  will  be  handled  correctly by dmake.  Known differences between
-       dmake and other versions of make are  discussed  in  the  COMPATIBILITY
-       section  found  at  the  end  of  this document.  dmake returns 0 if no
-       errors were detected and a non-zero result if an error occurred.
-
-OPTIONS
-       -A     Enable AUGMAKE special inference rule transformations  (see  the
-              "PERCENT(%) RULES" and "AUGMAKE META RULES" sections), these are
-              set to off by default.
-
-       -B     Enable the use of spaces  instead  of  <tabs>  to  begin  recipe
-              lines.  This flag equivalent to the .NOTABS special macro and is
-              further described below.
-
-       -c     Use non-standard comment stripping.   If  you  specify  -c  then
-              dmake will treat any # character as a start of comment character
-              wherever it may appear unless it is escaped by a \.
-
-       -C [+]file
-              This option writes to file a copy of standard output  and  stan-
-              dard  error  from any child processes and from the dmake process
-
-
-
-Dmake Version 4.12                2008-02-26                                 1
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-              itself.  If you specify a + prior to the file name then the text
-              is  appended  to  the previous contents of file.  This option is
-              active in the MSDOS implementation only and is ignored  by  non-
-              MSDOS versions of dmake.
-
-       -d     Disable  the  use of the directory cache.  Normally dmake caches
-              directories as it checks file timestamps.  Giving this  flag  is
-              equivalent  to the .DIRCACHE attribute or macro being set to no.
-
-       -E     Read  the  environment  and  define  all  strings  of  the  form
-              'ENV-VAR=evalue' defined within as macros whose name is ENV-VAR,
-              and whose value is 'evalue'.  The environment is processed prior
-              to processing the user specified makefile thereby allowing defi-
-              nitions in the makefile to override definitions in the  environ-
-              ment.
-
-       -e     Same  as  -E, except that the environment is processed after the
-              user specified makefile has been processed (thus definitions  in
-              the  environment  override definitions in the makefile).  The -e
-              and -E options are mutually exclusive.  If both  are  given  the
-              latter takes effect.
-
-       -f file
-              Use  file  as  the  source  for  the makefile text.  Only one -f
-              option is allowed.
-
-       -g     Globally  disable  group  recipe  parsing,  equivalent  to   the
-              .IGNOREGROUP attribute or macro being set to yes at the start of
-              the makefile.
-
-       -h     Print the command summary for dmake.
-
-       -i     Tells dmake to ignore errors, and continue making other targets.
-              This is equivalent to the .IGNORE attribute or macro.
-
-       -K file
-              Turns  on .KEEP_STATE state tracking and tells dmake to use file
-              as the state file.
-
-       -k     Causes dmake to ignore errors caused by command execution and to
-              make  all  targets  not  depending  on targets that could not be
-              made.  Ordinarily dmake stops after a command returns a non-zero
-              status,  specifying -k causes dmake to ignore the error and con-
-              tinue to make as much as possible.
-
-       -m[trae]
-              Measure timing information. Print the time when  targets  and/or
-              recipes are started and finished to stdout. The following format
-              is used:
-
-              {s|e} {target|recipe} time maketarget
-
-              s or e stands for started or ended, target or recipe denotes  if
-              this  line  refers  to  the  whole  target  or a recipe. time is
-
-
-
-Dmake Version 4.12                2008-02-26                                 2
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-              displayed in Unix time format, i.e. the number of seconds  since
-              an  epoch.   (Since 1970-01-01T00:00:00Z).  maketarget obviously
-              represents the target the timing information is given for.   The
-              optional flags [trae] can be used to change the information that
-              is displayed.  If no optional flags are given only the t flag is
-              assumed to be selected, ie. -mt.  The optional flags stand for:
-
-              t      Display the start and end time of each target.
-
-              r      Display the start and end time of each recipe.
-
-              a      Display  the target as an absolute path, i.e. prepend the
-                     current working directory.
-
-              e      Also display the start and end time of the  $(shell  com-
-                     mand) function (aka. shell escape) macros.
-
-       -n     Causes  dmake to print out what it would have executed, but does
-              not actually execute the commands.  A special check is made  for
-              the  string  "$(MAKE)" inside a recipe line, if it is found, the
-              line is expanded and invoked, thereby enabling  recursive  makes
-              to give a full description of all that they will do.  This check
-              is disabled inside group recipes.
-
-       -p     Print out a version of the digested makefile in  human  readable
-              form.  (useful for debugging, but cannot be re-read by dmake)
-
-       -P#    On  systems  that  support multi-processing cause dmake to use #
-              concurrent child processes to make targets.  See the "MULTI PRO-
-              CESSING" section for more information.
-
-       -q     Check and see if the target is up to date.  Exits with code 0 if
-              up to date, 1 otherwise.
-
-       -r     Tells dmake not  to  read  the  initial  startup  makefile,  see
-              STARTUP section for more details.
-
-       -s     Tells  dmake  to  do all its work silently and not echo the com-
-              mands it is executing  to  stdout  (also  suppresses  warnings).
-              This  is equivalent to the .SILENT attribute or macro.
-
-       -S     Force  sequential  execution  of  recipes on architectures which
-              support concurrent makes.  For backward compatibility  with  old
-              makefiles that have nasty side-effect prerequisite dependencies.
-              (Implies -P1)
-
-       -t     Causes dmake to touch the targets and  bring  them  up  to  date
-              without  executing  any commands.  Note that targets will not be
-              created if they do not already exist.
-
-       -T     Tells dmake to not perform transitive closure on  the  inference
-              graph.
-
-       -u     Force an unconditional update.  (ie. do everything that would be
-              done if everything that a target depended on was out of date)
-
-
-
-Dmake Version 4.12                2008-02-26                                 3
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       -v[cdfimrtw]
-              Verbose flag, when making targets print to stdout  what  we  are
-              going to make and what we think its time stamp is.  The optional
-              flags [cdfimrtw] can be used to restrict the information that is
-              displayed.  In the absence of any optional flags all are assumed
-              to be given (ie. -v is equivalent to -vcdfimrtw).  The  meanings
-              of the optional flags are:
-
-              c      Notify of directory cache operations only.
-
-              d      Notify of change directory operations only.
-
-              f      Notify of file I/O operations only.
-
-              i      Notify of inference algorithm operation only.
-
-              m      Notify of target update operations only.
-
-              r      Force  output of recipe lines, warnings and executed com-
-                     mands. This switch is usefull  when  debugging  makefiles
-                     that  disable  the  output using the @ or @@ property for
-                     recipe lines or the .SILENT  target/attribute.   It  also
-                     overrides the -s flag.
-
-              t      Keep any temporary files created; normally they are auto-
-                     matically deleted.
-
-              w      Notify of non-essential warnings (these are  historical).
-
-       -V     Print the version of dmake, and values of builtin macros.
-
-       -W target
-              Run dmake pretending that target is out of date.
-
-       -w target
-              What if? Show what would be made if target were out of date.
-
-       -x     Upon  processing  the  user  makefile  export all non-internally
-              defined macros to the user's environment.  This option  together
-              with  the -e option allows SYSV AUGMAKE recursive makes to func-
-              tion as expected.
-
-       -X     Inhibit the execution of #! lines found at the  beginning  of  a
-              makefile.   The  use  of  this  flag prevents non-termination of
-              recursive make invocations.
-
-INDEX
-       Here is a list of the sections that follow and a short  description  of
-       each.   Perhaps you won't have to read the entire man page to find what
-       you need.
-
-       STARTUP            Describes dmake initialization.
-
-       SYNTAX             Describes the syntax of makefile expressions.
-
-
-
-
-Dmake Version 4.12                2008-02-26                                 4
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       ATTRIBUTES         Describes the notion of attributes and how they  are
-                          used when making targets.
-
-       MACROS             Defining and expanding macros.
-
-       RULES AND TARGETS  How to define targets and their prerequisites.
-
-       RECIPES            How to tell dmake how to make a target.
-
-       BUILTIN COMMANDS   Internal dmake commands.
-
-       TEXT DIVERSIONS    How  to  use  text  diversions  in recipes and macro
-                          expansions.
-
-       VIRTUAL TARGETS    Targets that only enforce  dependencies,  but  which
-                          can not create a target file.
-
-       SPECIAL TARGETS    Some targets are special.
-
-       SPECIAL MACROS     Macros  used by dmake to alter the processing of the
-                          makefile, and those defined by dmake for the user.
-
-       CONTROL MACROS     Itemized list of special control macros.
-
-       RUNTIME MACROS     Discussion of special run-time macros such as $@ and
-                          $<.
-
-       FUNCTION MACROS    Description of functional macros.
-
-       CONDITIONAL MACROS Target specific conditional macros.
-
-       DYNAMIC PREREQUISITES
-                          Processing  of  prerequisites  which  contain  macro
-                          expansions in their name.
-
-       BINDING TARGETS    The rules that dmake uses to bind  a  target  to  an
-                          existing file in the file system.
-
-       PERCENT(%) RULES   Specification of recipes to be used by the inference
-                          algorithm.
-
-       MAKING INFERENCES  The rules that dmake uses when inferring how to make
-                          a target which has no explicit recipe.  This and the
-                          previous section are really a single section in  the
-                          text.
-
-       AUGMAKE META RULES A subclass of the PERCENT(%) RULES.
-
-       MAKING TARGETS     How dmake makes targets other than libraries.
-
-       MAKING LIBRARIES   How dmake makes libraries.
-
-       KEEP STATE         A discussion of how .KEEP_STATE works.
-
-       MULTI PROCESSING   Discussion  of  dmake's parallel make facilities for
-                          architectures that support them.
-
-
-
-Dmake Version 4.12                2008-02-26                                 5
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       CONDITIONALS       Conditional expressions which control the processing
-                          of the makefile.
-
-       EXAMPLES           Some hopefully useful examples.
-
-       COMPATIBILITY      How dmake compares with previous versions of make.
-
-       LIMITS             Limitations of dmake.
-
-       PORTABILITY        Comments on writing portable makefiles.
-
-       FILES              Files used by dmake.
-
-       SEE ALSO           Other related programs, and man pages.
-
-       AUTHOR             The guy responsible for this thing.
-
-       BUGS               Hope not.
-
-STARTUP
-       When  dmake  begins  execution  it first processes the command line and
-       then processes an initial startup-makefile.  This  is  followed  by  an
-       attempt  to  locate  and process a user supplied makefile.  The startup
-       file defines the default values of all required control macros and  the
-       set of default rules for making targets and inferences.  When searching
-       for the startup makefile, dmake searches the  following  locations,  in
-       the order specified, until a startup file is located:
-
-
-              1.     The  location given as the value of the macro MAKESTARTUP
-                     defined on the command line.
-
-              2.     The location given as the value of the environment  vari-
-                     able MAKESTARTUP defined in the current environment.
-
-              3.     The  location given as the value of the macro MAKESTARTUP
-                     defined internally within dmake.  In  this  version,  the
-                     internal   definition   of   MAKESTARTUP   is   "$(DMAKE-
-                     ROOT)/startup.mk", so you can set the  environment  vari-
-                     able DMAKEROOT to the location of your startup directory.
-
-                     If DMAKEROOT is not changed,  for  native  Windows  dmake
-                     versions  its  value defaults to "$(ABSMAKECMD:d)startup"
-                     (see definition of ABSMAKECMD  for  details).   For  unix
-                     like  versions  build  with the autotools build system it
-                     defaults to the  value  of  "${prefix}/share/startup"  at
-                     build  time.  The  actual  value,  usually something like
-                     /usr/local/share/startup can be checked with the -V  com-
-                     mand line switch.
-
-       The above search is disabled by specifying the -r option on the command
-       line.  An error is issued if a startup makefile cannot be found and the
-       -r  option  was  not specified.  A user may substitute a custom startup
-       file by defining the MAKESTARTUP environment variable or by  redefining
-       the  MAKESTARTUP  macro  on the command line.  To determine where dmake
-       looks for the default startup file, check your environment or issue the
-
-
-
-Dmake Version 4.12                2008-02-26                                 6
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       command "dmake -V".
-
-       A similar search is performed to locate a default user makefile when no
-       -f command line option is specified.  By default, the prerequisite list
-       of  the special target .MAKEFILES specifies the names of possible make-
-       files and the search order that dmake should use to  determine  if  one
-       exists.  A typical definition for this target is:
-
-              .MAKEFILES : makefile.mk Makefile makefile
-
-       dmake  will  first look for makefile.mk and then the others.  If a pre-
-       requisite cannot be found dmake will try to make it before going on  to
-       the  next prerequisite.  For example, makefile.mk can be checked out of
-       an RCS file if the proper rules for doing so are defined in the startup
-       file.
-
-       If the first line of the user makefile is of the form:
-
-              #!command command_args
-
-       then  dmake  will expand and run the command prior to reading any addi-
-       tional input.  If the return code of the command  is  zero  then  dmake
-       will  continue on to process the remainder of the user makefile, if the
-       return code is non-zero then dmake will exit.
-
-       dmake builds the internal dependency graph as it parses a  user  speci-
-       fied  makefile.  The graph is rooted at the special target .ROOT. .ROOT
-       is the top level target that dmake builds when it starts to build  tar-
-       gets.  All user specified targets (those from the command line or taken
-       as defaults from the makefile) are made prerequisites  of  the  special
-       target  .TARGETS.  dmake by default creates the relationship that .ROOT
-       depends on .TARGETS and as a result everything is made.  This  approach
-       allows  the  user  to  customize,  within their makefile, the order and
-       which, target, is built first.  For example the default makefiles  come
-       with settings for .ROOT that specify:
-
-              .ROOT .PHONY .NOSTATE .SEQUENTIAL : .INIT .TARGETS .DONE
-
-       with .INIT and .DONE defined as:
-
-              .INIT .DONE .PHONY:;
-
-       which  nicely  emulates  the  behaviour  of Sun's make extensions.  The
-       building of .ROOT's prerequisites is always forced  to  be  sequential.
-       However,  this definition is trivially changed by supplying the defini-
-       tion:
-
-              .ROOT : .TARGETS
-
-       which skips the preamble and postamble phases of building .TARGETS.
-
-       Please note that even though .INIT and .DONE  are  special  exceptions,
-       see  section  SPECIAL TARGETS, the use of self defined targets starting
-       with `.' should be avoided as they would be handled as  .<suffix>  meta
-       targets.  The  target  names  _INIT  and  _DONE  for example would work
-       equally well without the .<suffix> drawback.
-
-
-
-Dmake Version 4.12                2008-02-26                                 7
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-SYNTAX
-       This section is a summary of the syntax of  makefile  statements.   The
-       description is given in a style similar to BNF, where { } enclose items
-       that may appear zero or more times, and [  ]  enclose  items  that  are
-       optional.   Alternative  productions for a left hand side are indicated
-       by '->', and newlines are significant.  All symbols in  bold  type  are
-       text or names representing text supplied by the user.
-
-
-
-
-              Makefile -> { Statement }
-
-
-              Statement -> Macro-Definition
-                        -> Conditional-Macro-Definition
-                        -> Conditional
-                        -> Rule-Definition
-                        -> Attribute-Definition
-
-
-              Macro-Definition -> MACRO = LINE
-                               -> MACRO [!]*= LINE
-                               -> MACRO [!]:= LINE
-                               -> MACRO [!]*:= LINE
-                               -> MACRO [!]+= LINE
-                               -> MACRO [!]+:= LINE
-
-
-              Conditional-Macro-Definition ->  TARGET ?= Macro-Definition
-
-
-              Conditional ->  .IF expression
-                                 Makefile
-                              [ .ELIF expression
-                                 Makefile ]
-                              [ .ELSE
-                                 Makefile ]
-                              .END
-
-
-              expression -> LINE
-                         -> STRING
-                         -> expression == expression
-                         -> expression != expression
-                         -> expression <= expression
-                         -> expression >= expression
-                         -> ( expression )
-                         -> expression || expression
-                         -> expression && expression
-
-
-              Rule-Definition ->  target-definition
-                                     [ recipe ]
-
-              target-definition -> targets [attrs] op { PREREQUISITE } [; rcp-line]
-
-
-
-Dmake Version 4.12                2008-02-26                                 8
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-              targets -> target { targets }
-                      -> "target" { targets }
-
-
-              target -> special-target
-                     -> TARGET
-
-
-              attrs -> attribute { attrs }
-                    -> "attribute" { attrs }
-
-
-              op -> : { modifier }
-
-
-              modifier -> :
-                       -> ^
-                       -> !
-                       -> -
-                       -> |
-
-
-              recipe -> { TAB rcp-line }
-                     -> [@[@]][%][-] [
-                           { LINE }
-                        ]
-
-
-              rcp-line -> [@[@]][%][-][+] LINE
-
-
-              Attribute-Definition -> attrs : targets
-
-
-              attribute -> .EPILOG
-                        -> .ERRREMOVE
-                        -> .EXECUTE
-                        -> .GROUP
-                        -> .IGNORE
-                        -> .IGNOREGROUP
-                        -> .LIBRARY
-                        -> .MKSARGS
-                        -> .NOINFER
-                        -> .NOSTATE
-                        -> .PHONY
-                        -> .PRECIOUS
-                        -> .PROLOG
-                        -> .SETDIR=path
-                        -> .SILENT
-                        -> .SEQUENTIAL
-                        -> .SWAP
-                        -> .USESHELL
-                        -> .SYMBOL
-                        -> .UPDATEALL
-                        -> .WINPATH
-
-
-
-
-Dmake Version 4.12                2008-02-26                                 9
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-              special-target -> .ERROR
-                             -> .EXIT
-                             -> .EXPORT
-                             -> .GROUPEPILOG
-                             -> .GROUPPROLOG
-                             -> .IMPORT
-                             -> .INCLUDE
-                             -> .INCLUDEDIRS
-                             -> .MAKEFILES
-                             -> .REMOVE
-                             -> .ROOT
-                             -> .SOURCE
-                             -> .SOURCE.suffix
-                             -> .SUFFIXES (deprecated)
-                             -> .TARGETS
-                             -> .INIT
-                             -> .DONE
-                             -> .suffix
-                             -> .suffix1.suffix2
-
-
-       Where, TAB represents a <tab> character, STRING represents an arbitrary
-       sequence of characters, and LINE represents a possibly  empty  sequence
-       of  characters terminated by a non-escaped (not immediately preceded by
-       a backslash '\') new-line character.  MACRO, PREREQUISITE,  and  TARGET
-       each  represent a string of characters not including space or tab which
-       respectively form the name of a macro,  prerequisite  or  target.   The
-       name may itself be a macro expansion expression.  A LINE can be contin-
-       ued over several physical lines by terminating it with a  single  back-
-       slash  character.   Comments are initiated by the pound # character and
-       extend to the end of line.  All comment text is discarded, a '#' may be
-       placed  into  the  makefile text by escaping it with '\' (ie. \# trans-
-       lates to # when it is parsed).  An exception to this occurs when a # is
-       seen inside a recipe line that begins with a <tab> or is inside a group
-       recipe.  If you specify the -c command line switch then  this  behavior
-       is  disabled  and dmake will treat all # characters as start of comment
-       indicators unless they are escaped by \.  A set of continued lines  may
-       be  commented out by placing a single # at the start of the first line.
-       A continued line cannot span more than one makefile.
-
-       white space is defined to be any combination of <space>, <tab>, and the
-       sequence \<nl> when \<nl> is used to terminate a LINE. Note the special
-       treatment of \<nl> in macro definion and recipe lines below.  When pro-
-       cessing macro definition lines, any amount of white space is allowed on
-       either side of the macro operator and white space is stripped from both
-       before  and  after  the macro value string. A \<nl> sequence in a macro
-       definition is deleted from the macro value before assigning this value.
-       During  recipe  expansion  the sequence \<nl> is treated as white space
-       but is deleted from the final recipe string.  You must escape the \<nl>
-       with another \ in order to get a \ at the end of a recipe or macro def-
-       inition line.
-
-       When processing target definition lines, the recipe for a target  must,
-       in  general,  follow  the first definition of the target (See the RULES
-       AND TARGETS section for an exception), and  the  recipe  may  not  span
-       across  multiple  makefiles.   Any targets and prerequisites found on a
-
-
-
-Dmake Version 4.12                2008-02-26                                10
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       target definition line are taken to be white  space  separated  tokens.
-       The  rule  operator  (op  in SYNTAX section) is also considered to be a
-       token but does not require white space to precede or follow it.   Since
-       the  rule  operator  begins with a `:', traditional versions of make do
-       not allow the `:' character to form a valid target name.  dmake  allows
-       `:'  to  be  present in target/prerequisite names as long as the entire
-       target/prerequisite name is quoted.  For example:
-
-       a:fred : test
-
-       would be parsed as TARGET = a, PREREQUISITES={fred, :, test}, which  is
-       not what was intended.  To fix this you must write:
-
-       "a:fred" : test
-
-       Which will be parsed as expected.  Quoted target and prerequisite spec-
-       ifications may also contain white space thereby  allowing  the  use  of
-       complex  function macro expressions..  See the EXAMPLES section for how
-       to apply " quoting to a list of targets.
-
-ATTRIBUTES
-       dmake defines several target attributes.  Attributes may be assigned to
-       a single target, a group of targets, or to all targets in the makefile.
-       Attributes are used to modify dmake actions during target update.   The
-       recognized attributes are:
-
-
-       .EPILOG     Insert  shell  epilog  code  when  executing a group recipe
-                   associated with any target having this attribute set.
-
-       .ERRREMOVE  Always remove any target having this attribute if an  error
-                   is  encountered  while making them.  Setting this attribute
-                   overrides the .PRECIOUS attribute.
-
-       .EXECUTE    If the -n flag was given then execute the recipe associated
-                   with any target having this attribute set.
-
-       .FIRST      Used  in  conjunction with .INCLUDE.  Terminates the inclu-
-                   sion with the first successfully included prerequisite.
-
-       .GROUP      Force execution of a target's recipe as a group recipe.
-
-       .IGNORE     Ignore an error when trying to make any  target  with  this
-                   attribute set.
-
-       .IGNOREGROUP
-                   Disable  the  special  meaning  of  '[' to initiate a group
-                   recipe.
-
-       .LIBRARY    Target is a library.
-
-       .MKSARGS    If running in an MSDOS environment then  use  MKS  extended
-                   argument passing conventions to pass arguments to commands.
-                   Non-MSDOS environments ignore this attribute.
-
-       .NOINFER    Any target with this attribute set will not be subjected to
-                   transitive closure if it is inferred as a prerequisite of a
-
-
-
-Dmake Version 4.12                2008-02-26                                11
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-                   target whose recipe and prerequisites are  being  inferred.
-                   (i.e. the inference algorithm will not use any prerequisite
-                   with this attribute set,  as  a  target)  If  specified  as
-                   '.NOINFER:' (ie. with no prerequisites or targets) then the
-                   effect is equivalent to specifying -T on the command  line.
-
-       .NOSTATE    Any  target  with  this attribute set will not have command
-                   line  flag  information  stored  in  the  state   file   if
-                   .KEEP_STATE has been enabled.
-
-       .PHONY      Any  target  with  this  attribute set will have its recipe
-                   executed each time the target is made even if a file match-
-                   ing  the target name can be located.  Any targets that have
-                   a .PHONY attributed target as a prerequisite will  be  made
-                   each time the .PHONY attributed prerequisite is made.
-
-       .PRECIOUS   Do  not  remove  associated target under any circumstances.
-                   Set by default for any targets  whose  corresponding  files
-                   exist in the file system prior to the execution of dmake.
-
-       .PROLOG     Insert  shell  prolog  code  when  executing a group recipe
-                   associated with any target having this attribute set.
-
-       .SEQUENTIAL Force a sequential make of the associated target's  prereq-
-                   uisites.  If set as a global attribute this implies setting
-                   MAXPROCESS=1.
-
-       .SETDIR     Change current working  directory  to  specified  directory
-                   when  making  the  associated target.  You must specify the
-                   directory at the time the attribute is  specified.   To  do
-                   this  simply  give  .SETDIR=path as the attribute.  path is
-                   expanded and the result is used as the value of the  direc-
-                   tory  to  change to.  If path contains $$@ then the name of
-                   the target to be built is used in  computing  the  path  to
-                   change  directory  to.   If  path  is  surrounded by single
-                   quotes then path is not expanded, and is used literally  as
-                   the  directory  name.  If the path contains any `:' charac-
-                   ters then the entire attribute string must be quoted  using
-                   ".   If  a  target  having  this attribute set also has the
-                   .IGNORE attribute set then if the change to  the  specified
-                   directory  fails  it  will be ignored, and no error message
-                   will be issued.
-
-       .SILENT     Do not echo the recipe lines when making  any  target  with
-                   this attribute set, and do not issue any warnings.
-
-       .SWAP       Under  MSDOS  when  making a target with this attribute set
-                   swap the dmake executable to disk prior  to  executing  the
-                   recipe  line.  Also see the '%' recipe line flag defined in
-                   the RECIPES section.
-
-       .SYMBOL     Target is a library member and is an  entry  point  into  a
-                   module  in  the  library.  This attribute is used only when
-                   searching a library for a  target.   Targets  of  the  form
-                   lib((entry)) have this attribute set automatically.
-
-       .USESHELL   Force  each  recipe line of a target to be executed using a
-                   shell.   Specifying  this  attribute   is   equivalent   to
-
-
-
-Dmake Version 4.12                2008-02-26                                12
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-                   specifying the '+' character at the start of each line of a
-                   non-group recipe.
-
-       .UPDATEALL  Indicates that all the targets  listed  in  this  rule  are
-                   updated  by  the  execution  of the accompanying recipe.  A
-                   common example is the production of the y.tab.c and y.tab.h
-                   files  by  yacc  when  it  is run on a grammar.  Specifying
-                   .UPDATEALL in such a rule  prevents  the  running  of  yacc
-                   twice,  once  for the y.tab.c file and once for the y.tab.h
-                   file.  .UPDATEALL targets that are specified  in  a  single
-                   rule  are treated as a single target and all timestamps are
-                   updated whenever any target in the set is made.  As a side-
-                   effect,  dmake  internally  sorts such targets in ascending
-                   alphabetical order and the value of $@ is always the  first
-                   target in the sorted set.
-
-       .WINPATH    Switch  between default (POSIX) and Windows style path rep-
-                   resentation.  (This attribute is specific for cygwin  dmake
-                   executables   and   non-cygwin   environments  ignore  this
-                   attribute.)
-
-                   Under Cygwin it can be useful  to  generate  Windows  style
-                   paths  (with regular slashes) instead of the default cygwin
-                   style  (POSIX)  paths  for  dmake's  dynamic  macros.   The
-                   affected  macros  are  $@,  $*,  $>,  $?,  $<,  $&,  $^ and
-                   $(MAKEDIR), $(PWD), $(TMD), $(TMPFILE) and the $(mktmp ...)
-                   function  macro.   This  feature  can be used to create DOS
-                   style path parameters for native W32 programs from  dynamic
-                   macros.
-
-                   Note that the Windows style paths use regular slashes ('/')
-                   instead of the usual Windows backslash ('\')  as  directory
-                   separator  to avoid quoting problems (after all it is still
-                   a cygwin dmake!) and cygwin, as  well  as  native  Windows,
-                   programs  should  have  no problems using this (c:/foo/bar)
-                   path representation.
-
-                   Example: Assuming the current target  to  be  /tmp/mytarget
-                   the $@ macro without .WINPATH active expands to:
-
-                          /tmp/mytarget
-
-                   With .WINPATH set it expands to:
-
-                          C:/cygwin/tmp/mytarget
-
-       All  attributes are user setable and except for .UPDATEALL and .MKSARGS
-       may be used in one of two forms.  The .MKSARGS attribute is  restricted
-       to  use  as a global attribute, and the use of the .UPDATEALL attribute
-       is restricted to rules of the second form only.
-
-       ATTRIBUTE_LIST : targets
-
-       assigns the attributes specified by ATTRIBUTE_LIST to  each  target  in
-       targets or
-
-       targets ATTRIBUTE_LIST : ...
-
-
-
-
-Dmake Version 4.12                2008-02-26                                13
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       assigns  the  attributes  specified by ATTRIBUTE_LIST to each target in
-       targets.  In the first form if targets is empty (ie. a NULL list), then
-       the  list of attributes will apply to all targets in the makefile (this
-       is equivalent to the common Make construct of ".IGNORE :" but has  been
-       modified  to  the  notion of an attribute instead of a special target).
-       Not  all  of  the  attributes  have  global  meaning.   In  particular,
-       .LIBRARY,  .NOSTATE,  .PHONY,  .SETDIR,  .SYMBOL and .UPDATEALL have no
-       assigned global meaning.
-
-       Any attribute may be used with any target, even with the  special  tar-
-       gets.   Some  combinations are useless (e.g. .INCLUDE .PRECIOUS: ... ),
-       while others are useful (e.g. .INCLUDE .IGNORE  :  "file.mk"  will  not
-       complain  if  file.mk  cannot  be  found  using the include file search
-       rules, see  the  section  on  SPECIAL  TARGETS  for  a  description  of
-       .INCLUDE).   If a specified attribute will not be used with the special
-       target a warning is issued and the attribute is ignored.
-
-MACROS
-       dmake supports six forms of macro assignment.
-
-
-        MACRO = LINE   This is the most common  and  familiar  form  of  macro
-                       assignment.   It assigns LINE literally as the value of
-                       MACRO.  Future expansions of MACRO  recursively  expand
-                       its value.
-
-        MACRO *= LINE  This  form  behaves exactly as the simple '=' form with
-                       the exception that if MACRO already has  a  value  then
-                       the assignment is not performed.
-
-        MACRO := LINE  This  form  differs from the simple '=' form in that it
-                       expands LINE prior to assigning  it  as  the  value  of
-                       MACRO.   Future  expansions of MACRO do not recursively
-                       expand its value.
-
-        MACRO *:= LINE This form behaves exactly as the  ':='  form  with  the
-                       exception  that  if  MACRO already has a value then the
-                       assignment and expansion are not performed.
-
-        MACRO += LINE  This form of macro assignment allows  macro  values  to
-                       grow.   It  takes the literal value of LINE and appends
-                       it to the previous value of MACRO separating the two by
-                       a single space.  Future expansions of MACRO recursively
-                       expand its value.
-
-        MACRO +:= LINE This form is similar to the '+=' form except  that  the
-                       value  of  LINE is expanded prior to being added to the
-                       value of MACRO.
-
-       Macro expressions specified on the command line allow the  macro  value
-       to  be redefined within the makefile only if the macro is defined using
-       the '+=' and '+:=' operators.  Other operators will define a macro that
-       cannot be further modified.
-
-       Each  of the preceeding macro assignment operators may be prefixed by !
-       to indicate that the assignment should be forced and that  no  warnings
-       should  be issued.  Thus, specifying ! has the effect of silently forc-
-       ing the specified macro assignment.
-
-
-
-Dmake Version 4.12                2008-02-26                                14
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       When dmake defines a non-environment macro it strips leading and trail-
-       ing  white  space from the macro value.  Macros imported from the envi-
-       ronment via either the .IMPORT special target (see the SPECIAL  TARGETS
-       section),  or the -e, or -E flags are an exception to this rule.  Their
-       values are always taken literally and white space  is  never  stripped.
-       In  addition,  named macros defined using the .IMPORT special target do
-       not have their values expanded when they are used  within  a  makefile.
-       In contrast, environment macros that are imported due to the specifica-
-       tion of the -e or -E flags are subject to expansion when used.
-
-       To specify a macro expansion enclose the name in () or {}  and  precede
-       it  with  a dollar sign $.  Thus $(TEST) represents an expansion of the
-       macro variable named TEST.  If TEST is defined then $(TEST) is replaced
-       by  its expanded value.  If TEST is not defined then $(TEST) expands to
-       the NULL string (this is equivalent to defining a macro as  'TEST='  ).
-       A  short  form  may be used for single character named macros.  In this
-       case the parentheses are optional, and $(I) is equivalent to $I.  Macro
-       expansion  is recursive, hence, if the value string contains an expres-
-       sion representing a macro expansion, the expansion is performed.   Cir-
-       cular macro expansions are detected and cause an error to be issued.
-
-       When  defining  a  macro  the given macro name is first expanded before
-       being used to define the macro.  Thus it is possible to  define  macros
-       whose names depend on values of other macros.  For example, suppose CWD
-       is defined as
-
-       CWD = $(PWD:b)
-
-       then the value of $(CWD) is the name of the  current  directory.   This
-       can be used to define macros specific to this directory, for example:
-
-       _$(CWD).prt = list of files to print...
-
-       The  actual  name  of  the  defined  macro is a function of the current
-       directory.  A construct such as this is useful when processing a  hier-
-       archy  of directories using .SETDIR attributed targets and a collection
-       of small distributed makefile stubs.
-
-       Macro variables may be defined within  the  makefile,  on  the  command
-       line, or imported from the environment.
-
-       dmake  supports  several non-standard macro expansions: The first is of
-       the form:
-
-              $(macro_name:modifier_list:modifier_list:...)
-
-       where modifier_list may be a combination of:
-
-              b or B - file (not including suffix) portion of path names
-              d or D - directory portion of all path names
-              e or E - suffix portion of path names
-              f or F - file (including suffix) portion of path names
-              i or I - inferred names of targets
-              n or N - normalized path names
-              l or L - macro value in lower case
-              u or U - macro value in upper case
-              1      - return the first white space separated token from value
-
-
-
-
-Dmake Version 4.12                2008-02-26                                15
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       or a single one of:
-
-              m or M - map escape codes found in macro to their ASCII value
-              s or S - simple pattern substitution
-              t or T - tokenization.
-              ^      - prepend a prefix to each token
-              +      - append a suffix to each token
-
-       Thus if we have the example:
-              test = d1/d2/d3/a.out f.out d1/k.out
-       The following macro expansions produce the values on the right of  '->'
-       after expansion.
-
-              $(test:d)             -> d1/d2/d3/ d1/
-              $(test:b)             -> a f k
-              $(test:f)             -> a.out f.out k.out
-              ${test:db}            -> d1/d2/d3/a f d1/k
-              ${test:s/out/in/:f}   -> a.in f.in k.in
-              $(test:f:t"+")        -> a.out+f.out+k.out
-              $(test:e)             -> .out .out .out
-              $(test:u)             -> D1/D2/D3/A.OUT F.OUT D1/K.OUT
-              $(test:1)             -> d1/d2/d3/a.out
-
-       For this macro
-              test = d1/d2/../a.out "d1/file name.ext"
-       the following results are returned:
-
-              $(test:n)             -> d1/a.out "d1/file name.ext"
-
-       If  a  token  ends  in  a  string  composed from the value of the macro
-       DIRBRKSTR (ie. ends in a directory separator string, e.g. '/' in  UNIX)
-       and  you  use  the :d modifier then the expansion returns the directory
-       name less the final directory separator string.  Thus successive  pairs
-       of :d modifiers each remove a level of directory in the token string.
-
-       The  infered  names of targets :i modifier returnes the actual filename
-       associated to the target, see BINDING TARGETS. If the value  is  not  a
-       target or prerequisite the value is returned unchanged. For the follow-
-       ing example:
-              test = aprog bprog
-       If aprog and bprog are targets or prerequisits and they  are  bound  to
-       /tmp/aprog  and  bprog (see .SOURCE special target) the macro expansion
-       has the following effect:
-
-              $(test:i)             -> /tmp/aprog bprog
-
-       The normalized path names :n modifier honors the setting of .WINPATH to
-       determine the output format of the result.
-
-       The  map escape codes modifier changes the following escape codes \a =>
-       <bel>, \b => <backspace>, \f => <formfeed>, \n => <nl>, \r => <cr>,  \t
-       => <tab>, \v => <vertical tab>, \" => ", and \xxx => <xxx> where xxx is
-       the octal representation of a character into  the  corresponding  ASCII
-       value.
-
-       The  tokenization,  prepend and append modifier may use the same escape
-       codes that are supported by the map escape codes modifier in the string
-       that  is inserted, prepended or added by the respective macro modifier.
-
-
-
-Dmake Version 4.12                2008-02-26                                16
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       These modifiers may quote this string to include otherwise  problematic
-       characters.  E.g. spaces, colons and parentheses.
-
-       The  tokenization  modifier takes all white space separated tokens from
-       the macro value and separates them by the separator string.   Thus  the
-       expansion:
-
-              $(test:f:t"+\n")
-       produces:
-              a.out+
-              f.out+
-              k.out
-
-       The  prefix  operator ^ takes all white space separated tokens from the
-       macro value and prepends string to each.
-
-              $(test:f:^mydir/)
-       produces:
-              mydir/a.out mydir/f.out mydir/k.out
-
-       The suffix operator + takes all white space separated tokens  from  the
-       macro value and appends string to each.
-
-              $(test:b:+.c)
-       produces:
-              a.c f.c k.c
-
-       The  next  non-standard  form  of  macro expansion allows for recursive
-       macros.  It is possible to specify  a  $(macro_name)  or  ${macro_name}
-       expansion  where  macro_name  contains  more $( ... ) or ${ ... } macro
-       expansions itself.
-
-       For    example    $(CC$(_HOST)$(_COMPILER))    will    first     expand
-       CC$(_HOST)$(_COMPILER)  to get a result and use that result as the name
-       of the macro to expand.  This is useful for writing a makefile for more
-       than  one  target  environment.   As  an example consider the following
-       hypothetical case.  Suppose that _HOST and _COMPILER are imported  from
-       the  environment and are set to represent the host machine type and the
-       host compiler respectively.
-
-              CFLAGS_VAX_CC = -c -O  # _HOST == "_VAX", _COMPILER == "_CC"
-              CFLAGS_PC_MSC = -c -ML # _HOST == "_PC",  _COMPILER == "_MSC"
-
-              # redefine CFLAGS macro as:
-
-              CFLAGS := $(CFLAGS$(_HOST)$(_COMPILER))
-
-       This causes CFLAGS to take on a value that corresponds to the  environ-
-       ment in which the make is being invoked.
-
-       The final non-standard macro expansion is of the form:
-
-              string1{token_list}string2
-
-       where  string1,  string2 and token_list are expanded.  After expansion,
-       string1 is prepended to each token found in token_list and  string2  is
-       appended  to  each  resulting token from the previous prepend.  string1
-       and string2 are not delimited by white  space  whereas  the  tokens  in
-
-
-
-Dmake Version 4.12                2008-02-26                                17
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       token_list  are.  A null token in the token list is specified using "".
-       Thus using another example we have:
-
-              test/{f1 f2}.o     --> test/f1.o test/f2.o
-              test/ {f1 f2}.o    --> test/ f1.o f2.o
-              test/{f1 f2} .o    --> test/f1 test/f2 .o
-              test/{"f1"  ""}.o  --> test/f1.o test/.o
-
-              and
-
-              test/{d1 d2}/{f1 f2}.o --> test/d1/f1.o test/d1/f2.o
-                                         test/d2/f1.o test/d2/f2.o
-
-       This last expansion is activated only  when  the  first  characters  of
-       token_list appear immediately after the opening '{' with no intervening
-       white space.  The reason for this restriction is the  following  incom-
-       patibility with Bourne Shell recipes.  The line
-
-              { echo hello;}
-
-       is valid /bin/sh syntax; while
-
-              {echo hello;}
-
-       is  not.  Hence  the latter triggers the enhanced macro expansion while
-       the former causes it to be suppressed.  See the SPECIAL MACROS  section
-       for  a  description of the special macros that dmake defines and under-
-       stands.
-
-RULES AND TARGETS
-       A makefile contains a series  of  entries  that  specify  dependencies.
-       Such  entries are called target/prerequisite or rule definitions.  Each
-       rule definition is optionally followed by a set of lines that provide a
-       recipe  for  updating  any targets defined by the rule.  Whenever dmake
-       attempts to bring a target up to date and an explicit  recipe  is  pro-
-       vided  with  a  rule defining the target, that recipe is used to update
-       the target.  A rule definition begins with a line having the  following
-       syntax:
-
-              <targets> [<attributes>] <ruleop> [<prerequisites>] [;<recipe>]
-
-       targets  is  a  non-empty  list of targets.  If the target is a special
-       target (see SPECIAL TARGETS section below) then it must appear alone on
-       the rule line.  For example:
-
-              .IMPORT .ERROR : ...
-
-       is not allowed since both .IMPORT and .ERROR are special targets.  Spe-
-       cial targets are not used in the construction of the  dependency  graph
-       and will not be made.
-
-       attributes  is  a  possibly  empty  list  of attributes.  Any attribute
-       defined  in  the  ATTRIBUTES  section  above  may  be  specified.   All
-       attributes  will  be  applied  to the list of named targets in the rule
-       definition.  No other targets will be affected.
-
-
-        NOTE:  As stated earlier, if both the  target  list  and  prerequisite
-               list  are  empty  but  the  attributes  list  is  not, then the
-
-
-
-Dmake Version 4.12                2008-02-26                                18
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-               specified attributes affect all targets in the makefile.
-
-
-       ruleop is a separator which is used to identify the  targets  from  the
-       prerequisites.   Optionally  it  also provides a facility for modifying
-       the way in which dmake handles the making of  the  associated  targets.
-       In its simplest form the operator is a single ':', and need not be sep-
-       arated by white space from its neighboring tokens.  It may additionally
-       be followed by any of the modifiers { !, ^, -, :, | }, where:
-
-
-       !      says execute the recipe for the associated targets once for each
-              out of date prerequisite.  (The meaning of the runtime macro  $?
-              is changed, see below in the RUNTIME MACROS section.) Ordinarily
-              the recipe is executed once for all out of date prerequisites at
-              the same time.
-
-       ^      says  to  insert the specified prerequisites, if any, before any
-              other prerequisites already associated with the  specified  tar-
-              gets.   In  general, it is not useful to specify ^ with an empty
-              list of prerequisites.
-
-       -      says to clear the previous list of prerequisites  before  adding
-              the new prerequisites.  Thus,
-
-              foo :
-              foo : bar baz
-
-              can be replaced by
-
-              foo :- bar baz
-
-              however the old form still works as expected.
-
-       :      When  the rule operator is not modified by a second ':' only one
-              set of rules may be specified for  making  a  target.   Multiple
-              definitions may be used to add to the list of prerequisites that
-              a target depends on.  However, if a target is  multiply  defined
-              only  one definition may specify a recipe for making the target.
-
-              When a target's rule operator is modified by a  second  ':'  (::
-              for example) then this definition may not be the only definition
-              with a recipe for the target.  There may be other :: target def-
-              inition lines that specify a different set of prerequisites with
-              a different recipe for updating the target.  Any such target  is
-              made  if  any  of the definitions find it to be out of date with
-              respect to  the  related  prerequisites  and  the  corresponding
-              recipe  is  used  to  update the target.  By definition all '::'
-              recipes that are found to be out of date for are executed.
-
-              In the following simple example, each rule has  a  `::'  ruleop.
-              In  such an operator we call the first `:' the operator, and the
-              second `:' the modifier.
-
-              a.o :: a.c b.h
-                 first recipe for making a.o
-
-              a.o :: a.y b.h
-                 second recipe for making a.o
-
-
-
-Dmake Version 4.12                2008-02-26                                19
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-              If a.o is found to be out of date with respect to a.c  then  the
-              first  recipe  is  used to make a.o.  If it is found out of date
-              with respect to a.y then the second recipe is used.  If  a.o  is
-              out of date with respect to b.h then both recipes are invoked to
-              make a.o.  In the last case the order of invocation  corresponds
-              to  the  order in which the rule definitions appear in the make-
-              file.
-
-       |      Is defined only for PERCENT rule target definitions.  When spec-
-              ified it indicates that the following construct should be parsed
-              using the old semantinc meaning:
-
-              %.o :| %.c %.r %.f ; some rule
-
-              is equivalent to:
-
-              %.o : %.c ; some rule
-              %.o : %.r ; some rule
-              %.o : %.f ; some rule
-
-       Targets defined using a single `:' operator with a recipe may be  rede-
-       fined  again with a new recipe by using a `:' operator with a `:' modi-
-       fier.  This is equivalent to a target  having  been  initially  defined
-       with a rule using a `:' modifier.  Once a target is defined using a `:'
-       modifier it may not be defined again with a recipe using only  the  `:'
-       operator with no `:' modifier.  In both cases the use of a `:' modifier
-       creates a new list of prerequisites and makes it the current  prerequi-
-       site list for the target.  The `:' operator with no recipe always modi-
-       fies the current list of prerequisites.  Thus assuming each of the fol-
-       lowing definitions has a recipe attached, then:
-
-              joe :  fred ...     (1)
-              joe :: more ...     (2)
-
-              and
-
-              joe :: fred ...     (3)
-              joe :: more ...     (4)
-
-       are  legal and mean:  add the recipe associated with (2), or (4) to the
-       set of recipes for joe, placing them after existing recipes for  making
-       joe.  The constructs:
-
-              joe :: fred ...     (5)
-              joe : more ... (6)
-
-              and
-
-              joe : fred ... (7)
-              joe : more ... (8)
-
-       are  errors since we have two sets of perfectly good recipes for making
-       the target.
-
-       prerequisites is a possibly empty list of targets that must be  brought
-       up to date before making the current target.
-
-       recipe  is a short form and allows the user to specify short rule defi-
-       nitions on a single line.  It is taken to be the first recipe line in a
-
-
-
-Dmake Version 4.12                2008-02-26                                20
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       larger  recipe  if additional lines follow the rule definition.  If the
-       semi-colon is present but the recipe line is empty  (ie.  null  string)
-       then  it  is  taken  to be an empty rule.  Any target so defined causes
-       target to be treated as a virtual target, see VIRTUAL TARGETS below.
-
-RECIPES
-       The traditional format used by most versions of Make defines the recipe
-       lines  as  arbitrary  strings  that may contain macro expansions.  They
-       follow a rule definition line and may be spaced  apart  by  comment  or
-       blank  lines.   The  list of recipe lines defining the recipe is termi-
-       nated by a new target definition, a macro definition,  or  end-of-file.
-       Each  recipe  line  MUST  begin  with a <TAB> character (or spaces, see
-       .NOTABS) which may optionally be followed with one or all the following
-       recipe property characters '@%+-' which affect the recipe execution:
-
-       '-'    indicates  that  non-zero  exit  values  (ie.  errors) are to be
-              ignored when this recipe line is executed.
-
-       '+'    indicates that the current recipe line is to be  executed  using
-              the shell. Group recipes implicitely ignore this property.
-
-       '%'    indicates that dmake should swap itself out to secondary storage
-              (MSDOS only) before running the recipe.
-
-       '@'    indicates that the recipe line should NOT be echoed to the  ter-
-              minal prior to being executed.
-
-       '@@'   is  a stronger version of the previous property. The recipe line
-              and the output (stdout and stderr) of the  executed  recipe  are
-              NOT shown on the terminal.
-
-       Each  property  is  off by default (ie. by default, errors are signifi-
-       cant, commands are echoed, no swapping is done and a shell is used only
-       if  the  recipe  line  contains  a  character found in the value of the
-       SHELLMETAS macro).  Global settings activated via command line  options
-       or  special  attribute  or target names may also affect these settings.
-       An example recipe:
-
-              target :
-                     first recipe line
-                     second recipe line, executed independent of first.
-                     @a recipe line that is not echoed
-                     -and one that has errors ignored
-                     %and one that causes dmake to swap out
-                     +and one that is executed using a shell.
-
-       The second and new format of the recipe block begins the block with the
-       character  '['  (the  open group character) in the last non-white space
-       position of a line, and terminates the block  with  the  character  ']'
-       (the  close group character) in the first non-white space position of a
-       line.  In this form each recipe line need not have a leading TAB.  This
-       is called a recipe group.  Groups so defined are fed intact as a single
-       unit to a shell for execution whenever the corresponding  target  needs
-       to  be  updated.  If the open group character '[' is preceded by one or
-       all of the recipe properties (-, %, @ and @@) then they  apply  to  the
-       entire  group  in  the same way that they apply to single recipe lines.
-       You may also specify '+' but it is redundant  as  a  shell  is  already
-       being  used  to  run  the recipe.  See the MAKING TARGETS section for a
-       description of how dmake invokes recipes.  Here  is  an  example  of  a
-
-
-
-Dmake Version 4.12                2008-02-26                                21
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       group recipe:
-
-              target :
-              [
-                 first recipe line
-                 second recipe line
-                 tall of these recipe lines are fed to a
-                 single copy of a shell for execution.
-              ]
-
-
-BUILTIN COMMANDS
-       dmake supports some builtin commands. An optional leading '+' describes
-       that the builtin can be used also when being executed in a shell other-
-       wise  it  is  only  implemented  when used directly. Remember that if a
-       character of the recipe is found in the SHELLMETAS macro the  execution
-       of the recipe in a shell is forced.
-
-       [+]noop [something]
-              The  noop internal command always returns success if used but it
-              is not executed even though the rest of the commandline is eval-
-              uated.  This command can be used to evaluate macro expansions at
-              the runtime of the recipe without starting a real commmand.
-
-       [+]<empty recipe>
-              If an empty recipe line is encountered it is not executed.  This
-              sounds  more  trivial than it really is because the recipe could
-              consist of macros that evaluated to  empty  or  whitespace  only
-              strings.
-
-       echo [-n] data
-              This  internal  command prints data (with all leading whitespace
-              removed, but otherwise literally) to stdout. If the '-n'  switch
-              is given no trailing newline is printed. Note that no quoting is
-              removed nor that escape sequences are handled.
-
-       No special treatment of buildin commands for group  recipes  is  imple-
-       mented  even  though  the <empty recipe> will most propably also not be
-       evaluated by most shells that can be used to handle the recipe  groups.
-
-TEXT DIVERSIONS
-       dmake  supports  the  notion of text diversions.  If a recipe line con-
-       tains the macro expression
-
-              $(mktmp[,[file][,text]] data)
-
-       then all text contained in the data expression is expanded and is writ-
-       ten  to  a  temporary file.  The data in the file will always be termi-
-       nated from a new line character.  The file parameter  can  be  used  to
-       override  the  name of the temporary file. If its expanded value is not
-       empty it will be used instead of the unique and thread safe  file  name
-       that  otherwise would be generated internally.  The return value of the
-       macro is the name of the temporary file unless the  text  parameter  is
-       defined. In this case the return value is the expanded value of text.
-
-       data  can be any text and must be separated from the 'mktmp' portion of
-       the macro name by white-space.  The only restriction on the  data  text
-       is  that  it  must contain a balanced number of parentheses of the same
-       kind as are used to initiate the $(mktmp ...) expression.  For example:
-
-
-
-Dmake Version 4.12                2008-02-26                                22
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-              $(mktmp $(XXX))
-
-       is legal and works as expected, but:
-
-              $(mktmp text (to dump to file)
-
-       is not legal.  You can achieve what you wish by either defining a macro
-       that expands to '(' or by using {} in the macro expression; like this:
-
-              ${mktmp text (to dump to file}
-
-       Since the temporary file is opened when the macro containing  the  text
-       diversion  expression  is  expanded,  diversions  may be nested and any
-       diversions that are created as part of ':='  macro  expansions  persist
-       for  the duration of the dmake run.  If the data text is to contain new
-       lines the map escape codes macro expasion can be used.  For example the
-       expression:
-
-              mytext:=this is a\ntest of the text diversion
-              all:
-                   cat $(mktmp $(mytext:m))
-
-       is replaced by:
-
-              cat /tmp/mk12294AA
-
-       where  the  temporary  file contains two lines both of which are termi-
-       nated by a new-line.  A second more illustrative  example  generates  a
-       response file to an MSDOS link command:
-
-              OBJ = fred.obj mary.obj joe.obj
-              all : $(OBJ)
-                   link @$(mktmp $(^:t"+\n"))
-
-       The result of making `all' in the second example is the command:
-
-              link @/tmp/mk02394AA
-
-       where the temporary file contains:
-
-              fred.obj+
-              mary.obj+
-              joe.obj
-
-       The  last  line of the file is terminated by a new-line which is always
-       inserted at the end of the data string.
-
-       If the optional file specifier is present it can be used to specify the
-       name  of the temporary file to create.  An example that would be useful
-       for MSDOS users with a Turbo-C compiler
-
-              $(mktmp,turboc.cfg $(CFLAGS))
-
-       will place the contents of CFLAGS into a local  turboc.cfg  file.   The
-       second optional argument, text, if present alters the name of the value
-       returned by the $(mktmp ...) macro.
-
-       Under MS-DOS text diversions may be a problem.  Many DOS tools  require
-       that  path  names  which  contain  directories  use  the \ character to
-
-
-
-Dmake Version 4.12                2008-02-26                                23
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       delimit the directories.  Some users however wish to  use  the  '/'  to
-       delimit  pathnames  and use environments that allow them to do so.  The
-       macro USESHELL is set to "yes" if the current recipe is forced to use a
-       shell via the .USESHELL or '+' directives, otherwise its value is "no".
-       The dmake startup files define the macro DIVFILE whose value is  either
-       the  value of TMPFILE or the value of TMPFILE edited to replace any '/'
-       characters to the appropriate value based  on  the  current  shell  and
-       whether it will be used to execute the recipe.
-
-       Previous  versions  of  dmake  defined  text  diversions  using  <+, +>
-       strings, where <+ started a  text  diversion  and  +>  terminated  one.
-       dmake  is backward compatible with this construct only if the <+ and +>
-       appear literally on the same recipe line or in  the  same  macro  value
-       string.  In such instances the expression:
-
-       <+data+>
-
-       is mapped to:
-
-       $(mktmp data)
-
-       which  is  fully  output compatible with the earlier construct.  <+, +>
-       constructs whose text spans multiple lines must be converted by hand to
-       use $(mktmp ...).
-
-       If  the  environment variable TMPDIR is defined then the temporary file
-       is placed into the directory specified by that  variable.   A  makefile
-       can  modify  the  location of temporary files by defining a macro named
-       TMPDIR and exporting it using the .EXPORT special target.
-
-VIRTUAL TARGETS
-       Dmake allows to define targets with  the  sole  purpose  to  enforce  a
-       dependency  chain  that  are unable to create the target, hence virtual
-       targets.  When dmake tries to make a target, but only  finds  a  target
-       definition without recipe lines, it would normally issues a "Don't know
-       how to make ..." error message, but if a target rule is terminated by a
-       semicolon  and  has  no  following recipe lines, or if it has no recipe
-       lines, but defines prerequisites, or if the  AUGMAKE  mode  is  enabled
-       (see the COMPATIBILITY section for details), the target is treated as a
-       virtual target and the error is suppressed. In addition to this, if the
-       default  target does not have recipe lines it is also treated as a vir-
-       tual target.
-
-       Virtual targets should not have a  corresponding  file  therefore  they
-       inherit  the  time  of their newest prerequisite if they have prerequi-
-       sites, otherwise they get the current time assigned  when  being  made.
-       If the virtual target has a corresponding file a warning is issued, but
-       the time stamp of that file is taken into account. The  virtual  target
-       uses  the  time stamp of the corresponding file if it is newer than the
-       one determined by the previous rule.
-
-SPECIAL TARGETS
-       This section describes the  special  targets  that  are  recognized  by
-       dmake.  Some are affected by attributes and others are not.
-
-       .ERROR        If defined then the recipe associated with this target is
-                     executed whenever  an  error  condition  is  detected  by
-                     dmake.   All  attributes  that can be used with any other
-                     target may be used with this target.   Any  prerequisites
-
-
-
-Dmake Version 4.12                2008-02-26                                24
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-                     of this target will be brought up to date during its pro-
-                     cessing.  NOTE:  errors will be ignored while making this
-                     target, in extreme cases this may cause some problems.
-
-       .EXIT         If  this  target  is encountered while parsing a makefile
-                     then the parsing of the makefile  is  immediately  termi-
-                     nated at that point.
-
-       .EXPORT       All prerequisites associated with this target are assumed
-                     to correspond to macro names and they  and  their  values
-                     are exported to the environment as environment strings at
-                     the point in the makefile at which this  target  appears.
-                     Any  attributes  specified  with this target are ignored.
-                     Only macros which have been assigned a value in the make-
-                     file  prior  to the export directive are exported, macros
-                     as yet undefined or macros whose value  contains  any  of
-                     the characters "+=:*" are not exported.
-
-                     Note  that  macros that are not expanded during the macro
-                     assignment and contain other macros will be written  into
-                     the environment containing these other macros in the form
-                     of $(macroname).
-
-       .IMPORT       Prerequisite names specified for this target are searched
-                     for  in  the environment and defined as macros with their
-                     value taken from the environment.  If  the  special  name
-                     .EVERYTHING is used as a prerequisite name then all envi-
-                     ronment  variables  defined  in   the   environment   are
-                     imported.  The functionality of the -E flag can be forced
-                     by placing the construct .IMPORT  :  .EVERYTHING  at  the
-                     start of a makefile.  Similarly, by placing the construct
-                     at the end, one can emulate the effect of the -e  command
-                     line flag.  If a prerequisite name cannot be found in the
-                     environment an error message is issued.  .IMPORT  accepts
-                     the  .IGNORE  attribute.   When given, it causes dmake to
-                     ignore the above error.  See the  MACROS  section  for  a
-                     description of the processing of imported macro values.
-
-       .INCLUDE      Parse  another makefile just as if it had been located at
-                     the point of the .INCLUDE in the current  makefile.   The
-                     list  of prerequisites gives the list of makefiles to try
-                     to read.  If the list contains  multiple  makefiles  then
-                     they are read in order from left to right.  The following
-                     search rules are used when trying to locate the file.  If
-                     the filename is surrounded by " or just by itself then it
-                     is searched for in the current directory.  If it  is  not
-                     found  it is then searched for in each of the directories
-                     specified as prerequisites of  the  .INCLUDEDIRS  special
-                     target.   If the file name is surrounded by < and >, (ie.
-                     <my_spiffy_new_makefile>) then it is searched for only in
-                     the directories given by the .INCLUDEDIRS special target.
-                     In both cases if the file name is a fully qualified  name
-                     starting  at  the root of the file system then it is only
-                     searched for once, and the .INCLUDEDIRS list is  ignored.
-                     If  .INCLUDE fails to find the file it invokes the infer-
-                     ence engine to try to infer and hence make the file to be
-                     included.   In this way the file can be checked out of an
-                     RCS  repository  for  example.   .INCLUDE   accepts   the
-                     .IGNORE,   .SETDIR,  and  .NOINFER  attributes.   If  the
-
-
-
-Dmake Version 4.12                2008-02-26                                25
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-                     .IGNORE attribute is given and the file cannot  be  found
-                     then  dmake continues processing, otherwise an error mes-
-                     sage is generated.  If the .NOINFER  attribute  is  given
-                     and  the file cannot be found then dmake will not attempt
-                     to infer and make the file.  The .SETDIR attribute causes
-                     dmake  to  change  directories to the specified directory
-                     prior to attempting the include operation.  If all  fails
-                     dmake  attempts to make the file to be included.  If mak-
-                     ing the file  fails  then  dmake  terminates  unless  the
-                     .INCLUDE  directive also specified the .IGNORE attribute.
-                     If .FIRST is specified along  with  .INCLUDE  then  dmake
-                     attempts to include each named prerequisite and will ter-
-                     minate the inclusion with  the  first  prerequisite  that
-                     results in a successful inclusion.
-
-       .INCLUDEDIRS  The  list  of  prerequisites  specified  for  this target
-                     defines the set of directories to search when  trying  to
-                     include a makefile.
-
-       .KEEP_STATE   This special target is a synonym for the macro definition
-
-                     .KEEP_STATE := _state.mk
-
-                     It's effect is to turn on STATE  keeping  and  to  define
-                     _state.mk as the state file.
-
-       .MAKEFILES    The  list  of prerequisites is the set of files to try to
-                     read as the default makefile.  By default this target  is
-                     defined as:
-
-                     .MAKEFILES : makefile.mk Makefile makefile
-
-
-       .REMOVE       The recipe of this target is used whenever dmake needs to
-                     remove intermediate targets that were  made  but  do  not
-                     need  to  be  kept  around.  Such targets result from the
-                     application  of  transitive  closure  on  the  dependency
-                     graph.
-
-       .ROOT         The  internal  root  of the dependency graph, see section
-                     STARTUP for details.
-
-       .SOURCE       The prerequisite list of this target  defines  a  set  of
-                     directories  to check when trying to locate a target file
-                     name.  See the section on BINDING  of  targets  for  more
-                     information.
-
-       .SOURCE.suff  The same as .SOURCE, except that the .SOURCE.suff list is
-                     searched first when trying to locate a file matching  the
-                     a target whose name ends in the suffix .suff.
-
-       .SUFFIXES     This  deprecated  special  target has no special meaning.
-                     Avoid its use.
-
-       .TARGETS      The internal targets that all user  defined  targets  are
-                     prerequisites of, see section STARTUP for details.
-
-       There are a few targets that are "slightly" special:
-
-
-
-
-Dmake Version 4.12                2008-02-26                                26
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-              .INIT
-              .DONE
-
-       These  targets  exist  because  of historical reasons, see the usage of
-       .INIT and .DONE in section "STARTUP", they can be used and  defined  as
-       ordinary  targets  but  are  special in the sense that even though they
-       start with a `.'  they are not treated as a .<suffix> meta target  (See
-       the AUGMAKE META RULES section for details).
-
-       Please  note  that self defined targets shouldn't use the prefix `.' as
-       they would be handled as .<suffix> meta targets and dmake most propably
-       would complain about this.
-
-       In  addition  to the special targets above, several other forms of tar-
-       gets are recognized and are considered special, their  exact  form  and
-       use is defined in the sections that follow.
-
-SPECIAL MACROS
-       dmake  defines a number of special macros.  They are divided into three
-       classes: control macros, run-time macros,  and  function  macros.   The
-       control  macros are used by dmake to configure its actions, and are the
-       preferred method of doing so.  In the case when a control macro has the
-       same function as a special target or attribute they share the same name
-       as the special target or attribute.  The run-time  macros  are  defined
-       when  dmake  makes  targets and may be used by the user inside recipes.
-       The function macros provide higher level functions dealing  with  macro
-       expansion and diversion file processing.
-
-CONTROL MACROS
-       To  use  the  control  macros  simply assign them a value just like any
-       other macro.  The control macros are divided into three groups:  string
-       valued macros, character valued macros, and boolean valued macros.
-
-       The  following  are  all  of  the  string  valued macros.  This list is
-       divided into two groups.  The  first  group  gives  the  string  valued
-       macros  that  are  defined internally and cannot be directly set by the
-       user.
-
-       ABSMAKECMD      Warning! This macro's value is differently defined  for
-                       a  native  Windows  dmake  executable (compiled with MS
-                       Visual C++ or MinGW) and dmake for other operating sys-
-                       tems or build with other compilers.
-
-                       In the first case its value is the absolute filename of
-                       the executable of the current dmake process,  otherwise
-                       it is defined as the NULL string.
-
-       INCDEPTH        This  macro's  value is a string of digits representing
-                       the current depth of makefile inclusion.  In the  first
-                       makefile level this value is zero.
-
-       MFLAGS          Is  the  list  of  flags that were given on the command
-                       line including a leading switch character.  The -f flag
-                       is not included in this list.
-
-       MAKECMD         Is the name with which dmake was invoked.
-
-       MAKEDIR         Is  the  full  path  to  the initial directory in which
-                       dmake was invoked.
-
-
-
-Dmake Version 4.12                2008-02-26                                27
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       MAKEFILE        Contains the string "-f makefile"  where,  makefile  is
-                       the  name of initial user makefile that was first read.
-
-       MAKEFLAGS       Is the same as $(MFLAGS)  but  has  no  leading  switch
-                       character. (ie. MFLAGS = -$(MAKEFLAGS))
-
-       MAKEMACROS      Contains  the  complete  list of macro expressions that
-                       were specified on the command line.
-
-       MAKETARGETS     Contains the name(s) of the  target(s),  if  any,  that
-                       were specified on the command line.
-
-       MAKEVERSION     Contains  a string indicating the current dmake version
-                       number.
-
-       MAXPROCESSLIMIT Is a numeric string representing the maximum number  of
-                       processes  that dmake can use when making targets using
-                       parallel mode.
-
-       NULL            Is permanently defined to be the NULL string.  This  is
-                       useful  when  comparing  a conditional expression to an
-                       NULL value.
-
-       PWD             Is the full path to the current directory in which make
-                       is executing.
-
-       SPACECHAR       Is  permanently defined to contain one space character.
-                       This is useful when using space characters in  function
-                       macros,  e.g.  subst,  that otherwise would get deleted
-                       (leading/trailing spaces) or for using spaces in  func-
-                       tion macro parameters.
-
-       TMPFILE         Is  set  to  the name of the most recent temporary file
-                       opened by dmake.  Temporary files  are  used  for  text
-                       diversions and for group recipe processing.
-
-       TMD             Stands  for  "To  Make  Dir",  and is the path from the
-                       present directory (value of $(PWD))  to  the  directory
-                       that  dmake was started up in (value of $(MAKEDIR)). If
-                       the present directory is the directory that  dmake  was
-                       started up in TMD will be set to the relative path ".".
-                       This  allows  to  create  valid  paths  by   prepending
-                       $(TMD)$(DIRSEPSTR)  to  a relative path.  This macro is
-                       modified when .SETDIR attributes  are  processed.   TMD
-                       will  usually be a relative path with the following two
-                       exceptions. If the relative path would go up until  the
-                       root  directory or if different drive letters (DOS file
-                       system) make a relative path  impossible  the  absolute
-                       path from MAKEDIR is used.
-
-       USESHELL        The  value of this macro is set to "yes" if the current
-                       recipe is forced to use a shell for its  execution  via
-                       the .USESHELL or '+' directives, its value is "no" oth-
-                       erwise.
-
-
-       The second group of string valued macros control dmake behavior and may
-       be set by the user.
-
-
-
-
-Dmake Version 4.12                2008-02-26                                28
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       .DIRCACHE       If  set  to  "yes" enables the directory cache (this is
-                       the default).  If set to "no"  disables  the  directory
-                       cache (equivalent to -d command-line flag).
-
-       .DIRCACHERESPCASE
-                       If set to "yes" causes the directory cache, if enabled,
-                       to respect file case, if set to "no" files  are  cached
-                       case insensitive.  By default it is set to "no" on Win-
-                       dows as the filesystems on this  operating  system  are
-                       case insensitive and set to "yes" for all other operat-
-                       ing systems. The default can be overriden, if  desired.
-
-                       Note:  Using case insensitive directory caching on case
-                       sensitive file systems is a BAD idea. If in  doubt  use
-                       case  sensitive directory caching even on case insensi-
-                       tive file systems as the worst case in this scenario is
-                       that  /foo/bar/  and  /foo/BAR/  are  cached separately
-                       (with the same content) even though they are  the  same
-                       directory.  This would only happen if different targets
-                       use different upper/lower case spellings for  the  same
-                       directory and that is never a good idea.
-
-       NAMEMAX         Defines  the  maximum  length  of a filename component.
-                       The value of the variable is initialized at startup  to
-                       the value of the compiled macro NAME_MAX.  On some sys-
-                       tems the value of NAME_MAX is  too  short  by  default.
-                       Setting  a new value for NAMEMAX will override the com-
-                       piled value.
-
-       .NOTABS         When set to "yes" enables the use of spaces as well  as
-                       <tabs>  to  begin recipe lines.  By default a non-group
-                       recipe is terminated by  a  line  without  any  leading
-                       white-space  or  by  a  line not beggining with a <tab>
-                       character.  Enabling this mode modifies the first  con-
-                       dition  of  the  above  termination rule to terminate a
-                       non-group  recipe  with  a  line  that  contains   only
-                       white-space.   This mode does not effect the parsing of
-                       group recipes bracketed by [].
-
-       AUGMAKE         If set to "yes" value will enable the transformation of
-                       special  meta targets to support special AUGMAKE infer-
-                       ences (See the "AUGMAKE META RULES" and "COMPATIBILITY"
-                       sections).
-
-       DIRBRKSTR       Contains the string of chars used to terminate the name
-                       of a directory in a pathname.  Under UNIX its value  is
-                       "/", under MSDOS its value is "/\:".
-
-       DIRSEPSTR       Contains  the string that is used to separate directory
-                       components when path  names  are  constructed.   It  is
-                       defined with a default value at startup.
-
-       DIVFILE         Is  defined in the startup file and gives the name that
-                       should be returned for the  diversion  file  name  when
-                       used in $(mktmp ...) expansions, see the TEXT DIVERSION
-                       section for details.
-
-       .KEEP_STATE     Assigning this macro a value tells dmake  the  name  of
-                       the state file to use and turns on the keeping of state
-
-
-
-Dmake Version 4.12                2008-02-26                                29
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-                       information for any targets that are brought up to date
-                       by the make.
-
-       GROUPFLAGS      This  macro gives the set of flags to pass to the shell
-                       when invoking it to execute a group recipe.  The  value
-                       of the macro is the list of flags with a leading switch
-                       indicator.  (ie. `-' under UNIX)
-
-       GROUPSHELL      This macro defines the  full  path  to  the  executable
-                       image  to  be  used  as the shell when processing group
-                       recipes.  This macro must be defined if  group  recipes
-                       are  used.   It  is  assigned  a  default  value in the
-                       startup makefile.  Under UNIX this value is /bin/sh.
-
-       GROUPSUFFIX     If defined, this macro gives the string  to  use  as  a
-                       suffix when creating group recipe files to be handed to
-                       the command interpreter.  For example, if it is defined
-                       as  .sh, then all temporary files created by dmake will
-                       end in the suffix .sh.  Under MSDOS if  you  are  using
-                       command.com  as  your GROUPSHELL, then this suffix must
-                       be set to .bat in order for group recipes  to  function
-                       correctly.   The  setting of GROUPSUFFIX and GROUPSHELL
-                       is done automatically for command.com in the startup.mk
-                       files.
-
-       MAKE            Is  defined  in the startup file by default.  Initially
-                       this macro is defined to  have  the  value  "$(MAKECMD)
-                       $(MFLAGS)".   The  string  $(MAKE)  is  recognized when
-                       using the -n switch.
-
-       MAKESTARTUP     This macro defines the full path to the initial startup
-                       makefile.   Use  the -V command line option to discover
-                       its initial value.
-
-       MAXLINELENGTH   This macro defines the maximum size of a single line of
-                       makefile  input  text.  The size is specified as a num-
-                       ber, the default value is  defined  internally  and  is
-                       shown  via the -V option.  A buffer of this size plus 2
-                       is allocated for reading makefile text.  The buffer  is
-                       freed  before  any  targets  are made, thereby allowing
-                       files containing long input lines to be processed with-
-                       out  consuming  memory  during  the  actual make.  This
-                       macro can only be used to extend the line length beyond
-                       it's default minimum value.
-
-       MAXPROCESS      Specify  the  maximum  number of child processes to use
-                       when making targets.  The default value of  this  macro
-                       is  "1"  and  its  value cannot exceed the value of the
-                       macro MAXPROCESSLIMIT.  Setting the value of MAXPROCESS
-                       on the command line or in the makefile is equivalent to
-                       supplying a corresponding value to the -P flag  on  the
-                       command  line.  If  the global .SEQUENTIAL attribute is
-                       set (or the -S command line switch is used)  the  value
-                       of MAXPROCESS is fixed to "1" and cannot be changed.
-
-       OOODMAKEMODE    This  macro enables a special compatibility mode needed
-                       by the OpenOffice.org build system. If set, the  switch
-                       disables the removal of leading './' path elements dur-
-                       ing  target   filename   normalization   (See   BINDING
-
-
-
-Dmake Version 4.12                2008-02-26                                30
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-                       TARGETS).  If  './'  appear in the pathname, but not at
-                       the beginning of it, they are still removed by the nor-
-                       malization.  Please note that targets that are given on
-                       the command line are going to be registered as  default
-                       targets after the startup file is read.
-
-       PREP            This  macro  defines  the  number  of  iterations to be
-                       expanded automatically when processing %  rule  defini-
-                       tions of the form:
-
-                       % : %.suff
-
-                       See the sections on PERCENT(%) RULES for details on how
-                       PREP is used.
-
-       SHELL           This macro defines the  full  path  to  the  executable
-                       image  to  be  used as the shell when processing single
-                       line recipes.  This macro must be  defined  if  recipes
-                       requiring  the  shell for execution are to be used.  It
-                       is assigned a default value in  the  startup  makefile.
-                       Under UNIX this value is /bin/sh.
-
-       SHELLCMDQUOTE   This  macro  can  be  used to add additional characters
-                       before and after the command string that is  passed  to
-                       the  shell defined by the SHELL macro.  If needed, like
-                       for cmd.exe and command.com, it is assigned a value  in
-                       the startup file.
-
-       SHELLFLAGS      This  macro gives the set of flags to pass to the shell
-                       when invoking it to execute a single line recipe.   The
-                       value  of the macro is the list of flags with a leading
-                       switch indicator.  (ie. `-' under UNIX)
-
-       SHELLMETAS      Each time dmake executes a single recipe  line  (not  a
-                       group  recipe)  the line is searched for any occurrence
-                       of a character defined in the value of SHELLMETAS.   If
-                       such a character is found the recipe line is defined to
-                       require a shell to ensure its  correct  execution.   In
-                       such  instances  a  shell  is used to invoke the recipe
-                       line.  If no match is found the recipe line is executed
-                       without the use of a shell.
-
-
-       There  is  only  one  character valued macro defined by dmake: SWITCHAR
-       contains the switch character used  to  introduce  options  on  command
-       lines.   For  UNIX its value is `-', and for MSDOS its value may be `/'
-       or `-'.  The macro is internally defined and is not user setable.   The
-       MSDOS version of dmake attempts to first extract SWITCHAR from an envi-
-       ronment variable of the same name.  If that fails it then  attempts  to
-       use the undocumented getswitchar system call, and returns the result of
-       that.  Under MSDOS version 4.0 you must set the value of  the  environ-
-       ment macro SWITCHAR to '/' to obtain predictable behavior.
-
-       All boolean macros currently understood by dmake correspond directly to
-       the previously defined attributes.  These macros provide a  second  way
-       to apply global attributes, and represent the preferred method of doing
-       so.  They are used by assigning them a value.  If the value  is  not  a
-       NULL string then the boolean condition is set to on.  If the value is a
-       NULL string  then  the  condition  is  set  to  off.   There  are  five
-
-
-
-Dmake Version 4.12                2008-02-26                                31
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       conditions  defined  and  they correspond directly to the attributes of
-       the same name.  Their meanings are defined in  the  ATTRIBUTES  section
-       above.   The  macros  are:  .EPILOG, .IGNORE, .MKSARGS, .NOINFER, .PRE-
-       CIOUS, .PROLOG, .SEQUENTIAL, .SILENT, .SWAP, and .USESHELL.   Assigning
-       any  of  these  a  non  NULL  value will globally set the corresponding
-       attribute to on.
-
-RUNTIME MACROS
-       These macros are defined when dmake is making targets, and may take  on
-       different  values for each target.  $@ is defined to be the full target
-       name, $? is the list of all out of date prerequisites, except for the !
-       ruleop,  in  which  case  it  is  set to the current build prerequisite
-       instead.  $& is the list of all prerequisites, $> is the  name  of  the
-       library  if  the current target is a library member, and $< is the list
-       of prerequisites specified in the current rule.  If the current  target
-       had  a recipe inferred then $< is the name of the inferred prerequisite
-       even if the target had  a  list  of  prerequisites  supplied  using  an
-       explicit  rule  that  did  not provide a recipe.  In such situations $&
-       gives the full list of prerequisites.
-
-       $* is defined as $(@:db) when making targets with explicit recipes  and
-       is  defined  as  the value of % when making targets whose recipe is the
-       result of an inference.  In the first case $* is the target  name  with
-       no  suffix,  and in the second case, is the value of the matched % pat-
-       tern from the associated %-rule.  $^ expands to the set of out of  date
-       prerequisites  taken  from  the  current  value  of $<.  In addition to
-       these, $$ expands to $, {{ expands to {,  }}  expands  to  },  and  the
-       strings <+ and +> are recognized as respectively starting and terminat-
-       ing a text diversion when they appear literally together  in  the  same
-       input line.
-
-       The difference between $? and $^ can best be illustrated by an example,
-       consider:
-
-              fred.out : joe amy hello
-              rules for making fred
-
-              fred.out : my.c your.h his.h her.h   # more prerequisites
-
-       Assume joe, amy, and my.c are newer then fred.out.  When dmake executes
-       the  recipe for making fred.out the values of the following macros will
-       be:
-
-              $@ --> fred.out
-              $* --> fred
-              $? --> joe amy my.c  # note output of $? vs $^
-              $^ --> joe amy
-              $< --> joe amy hello
-              $& --> joe amy hello my.c your.h his.h her.h
-
-
-FUNCTION MACROS
-       dmake supports a full set of functional  macros.   One  of  these,  the
-       $(mktmp  ...)  macro, is discussed in detail in the TEXT DIVERSION sec-
-       tion and is not covered here.  The names of function macros must appear
-       literally  after  the opening $( or ${. They are not recognized if they
-       are the result of a recursive expansion.
-
-       Note that some of these macros take comma separated parameters but that
-
-
-
-Dmake Version 4.12                2008-02-26                                32
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       these  parameters  must not contain literal whitespaces. Whitespaces in
-       macros used in these parameters are allowed.
-
-
-              $(and macroterm ...)
-                     expands each macroterm in turn until there are no more or
-                     one  of  them  returns an empty string.  If all expand to
-                     non-empty strings the macro returs the string "t"  other-
-                     wise it returns an empty string.
-
-
-              $(assign expression)
-                     Causes  expression  to  be  parsed  as a macro assignment
-                     expression and results in the specified assignment  being
-                     made.   An  error  is  issued  if  the  assignment is not
-                     syntatically  correct.   expression  may  contain   white
-                     space.   This  is  in  effect  a dynamic macro assignment
-                     facility and may appear  anywhere  any  other  macro  may
-                     appear.   The  result  of  the  expanding a dynamic macro
-                     assignment expression is the name of the macro  that  was
-                     assigned  and  $(NULL)  if  the expression is not a valid
-                     macro assignment expression.  Some examples are:
-
-                     $(assign foo := fred)
-                     $(assign $(ind_macro_name) +:= $(morejunk))
-
-              $(echo list)
-                     Echo's the value of list.  list is not expanded.
-
-              $(eq,text_a,text_b true false)
-                     expands text_a and text_b and compares their results.  If
-                     equal  it returns the result of the expansion of the true
-                     term, otherwise it returns the  expansion  of  the  false
-                     term.
-
-              $(!eq,text_a,text_b true false)
-                     Behaves identically to the previous macro except that the
-                     true string is  chosen  if  the  expansions  of  the  two
-                     strings are not equal
-
-              $(foreach,var,list data)
-                     Implements  iterative macro expansion over data using var
-                     as the iterator taking on values from list. var and  list
-                     are  expanded  and  the  result  is  the concatenation of
-                     expanding data with var being set to each whitespace sep-
-                     arated token from list.  For example:
-
-                             list = a b c
-                             all :; echo [$(foreach,i,$(list) [$i])]
-
-                     will output
-
-                             [[a] [b] [c]]
-
-                     The  iterator  variable is defined as a local variable to
-                     this foreach instance.  The following  expression  illus-
-                     trates this:
-
-                             $(foreach,i,$(foreach,i,$(sort c a b) root/$i) [$i/f.h])
-
-
-
-Dmake Version 4.12                2008-02-26                                33
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-                     when evaluated the result is:
-
-                             [root/a/f.h] [root/b/f.h] [root/c/f.h]
-
-                     The  specification  of list must be a valid macro expres-
-                     sion, such as:
-
-                             $($(assign list=a b c))
-                             $(sort d a b c)
-                             $(echo a b c)
-
-                     and cannot just be the list itself.  That is, the follow-
-                     ing foreach expression:
-
-                             $(foreach,i,a b c [$i])
-
-                     yields:
-
-                             "b c [a]"
-
-                     when evaluated.
-
-              $(nil expression)
-                     Always  returns  the  value of $(NULL) regardless of what
-                     expression is.  This function macro can be used  to  dis-
-                     card results of expanding macro expressions.
-
-              $(normpath list)
-                     Will  return the normalized path names of all white-space
-                     separated tokens in list. Quotes can be used to normalize
-                     path names that contain white-space characters. On cygwin
-                     the result honors the setting of  .WINPATH  to  determine
-                     the output format of the returned path names.
-
-              $(normpath,para list)
-                     Same  as  above except that the expanded value of para is
-                     used to override the .WINPATH setting.
-
-              $(not macroterm)
-                     expands macroterm and returs the string "t" if the result
-                     of  the  expansion  is  the  empty  string; otherwise, it
-                     returns the empty string.
-
-              $(null,text true false)
-                     expands the value of text.  If it is NULL then the  macro
-                     returns the value of the expansion of true and the expan-
-                     sion of false otherwise.  The terms true, and false  must
-                     be strings containing no white-space.
-
-              $(!null,text true false)
-                     Behaves identically to the previous macro except that the
-                     true string is chosen if the expansion  of  text  is  not
-                     NULL.
-
-              $(or macroterm ...)
-                     expands  each  macroterm  in  turn  and  returs the empty
-                     string if each term expands to the empty  string;  other-
-                     wise, it returs the string "t".
-
-
-
-
-Dmake Version 4.12                2008-02-26                                34
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-              $(shell command)
-                     is  a  shell  escape macro. It runs command as if it were
-                     part of a recipe  and  returns,  separated  by  a  single
-                     space, all the non-white space terms written to stdout by
-                     the command.  For example:
-
-                             $(shell ls *.c)
-
-                     will return "a.c b.c c.c d.c" if the files exist  in  the
-                     current  directory.  The recipe modification flags [+@%-]
-                     are honored if they appear as the first characters in the
-                     command.  For example:
-
-                             $(shell +ls *.c)
-
-                     will run the command using the current shell.
-
-                     Note  that  if  the  macro is part of a recipe it will be
-                     evaluated after all previous recipe lines have been  exe-
-                     cuted.  For  obvious  reasons it will be evaluated before
-                     the current recipe line or group recipe is executed.
-
-              $(shell,expand command)
-                     Is an extension to the $(shell  command)  function  macro
-                     that expands the result of running command.
-
-              $(sort list)
-                     Will  take  all  white-space separated tokens in list and
-                     will return their sorted equivalent list.
-
-              $(strip data)
-                     Will replace all strings of white-space in data by a sin-
-                     gle space.
-
-              $(subst,pat,replacement data)
-                     Will  search  for pat in data and will replace any occur-
-                     rence of pat with the replacement string.  The expansion
-
-                     $(subst,.o,.c $(OBJECTS))
-
-              is equivalent to:
-
-                     $(OBJECTS:s/.o/.c/)
-
-
-              $(uniq list)
-                     Will take all white-space separated tokens  in  list  and
-                     will  return  their  sorted equivalent list containing no
-                     duplicates.
-
-       For historic reasons dmake treats the following case slightly special:
-
-              $(name something)
-
-       If it encounters a macro with a whitespace after name and name  is  not
-       literally  one  of  the above mentioned function macro identifiers then
-       dmake will return the  recursively  expanded  value  of  $(name).   The
-       remaining  something  part will be expanded but the result will be dis-
-       carded. The use of this special feature is deprecated and should not be
-
-
-
-Dmake Version 4.12                2008-02-26                                35
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       used.
-
-
-CONDITIONAL MACROS
-       dmake  supports conditional macros.  These allow the definition of tar-
-       get specific macro values.  You can now say the following:
-
-              target ?= MacroName MacroOp Value
-
-       This creates a definition for MacroName whose value is Value only  when
-       target  is being made.  You may use a conditional macro assignment any-
-       where that a regular macro assignment  may  appear,  including  as  the
-       value of a $(assign ...) macro.
-
-       The  new  definition is associated with the most recent cell definition
-       for target.  If no prior definition exists then one  is  created.   The
-       implications of this are immediately evident in the following example:
-
-              foo := hello
-
-              all : cond;@echo "all done, foo=[$(foo)] bar=[$(bar)]"
-
-              cond ?= bar := global decl
-
-              cond .SETDIR=unix::;@echo $(foo) $(bar)
-              cond ?= foo := hi
-
-              cond .SETDIR=msdos::;@echo $(foo) $(bar)
-                   cond ?= foo := hihi
-
-       The  first  conditional  assignment creates a binding for 'bar' that is
-       activated when 'cond' is made.  The bindings following the  ::  defini-
-       tions  are activated when their respective recipe rules are used.  Thus
-       the first binding serves to provide a global value for 'bar' while  any
-       of  the  cond  :: rules are processed, and the local bindings for 'foo'
-       come into effect when their associated :: rule is processed.
-
-       Conditionals for targets of .UPDATEALL are  all  activated  before  the
-       target  group  is made.  Assignments are processed in order.  Note that
-       the value of a conditional macro assignment is NOT AVAILABLE until  the
-       associated target is made, thus the construct
-
-              mytarget ?= bar := hello
-              mytarget ?= foo := $(bar)
-
-       results in $(foo) expanding to "", if you want the result to be "hello"
-       you must use:
-
-              mytarget ?= bar := hello
-              mytarget ?= foo  = $(bar)
-
-       Once a target is made any associated conditional macros are deactivated
-       and their values are no longer available.  Activation occurrs after all
-       inference, and .SETDIR directives have been processed and after  $@  is
-       assigned,  but  before  prerequisites are processed; thereby making the
-       values of conditional macro definitions available  during  construction
-       of prerequisites.
-
-       If  a  %-meta rule target has associated conditional macro assignments,
-
-
-
-Dmake Version 4.12                2008-02-26                                36
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       and the rule is chosen by the inference algorithm then the  conditional
-       macro assignments are inferred together with the associated recipe.
-
-DYNAMIC PREREQUISITES
-       dmake looks for prerequisites whose names contain macro expansions dur-
-       ing target processing.  Any such prerequisites  are  expanded  and  the
-       result  of the expansion is used as the prerequisite name.  As an exam-
-       ple the line:
-
-       fred : $$@.c
-
-       causes the $$@ to be  expanded  when  dmake  is  making  fred,  and  it
-       resolves  to the target fred.  This enables dynamic prerequisites to be
-       generated.  The value of @ may be modified by any of  the  valid  macro
-       modifiers.  So you can say for example:
-
-       fred.out : $$(@:b).c
-
-       where  the $$(@:b) expands to fred.  Note the use of $$ instead of $ to
-       indicate the dynamic expansion, this is due to the fact that  the  rule
-       line  is  expanded  when  it is initially parsed, and $$ then returns $
-       which later triggers the dynamic prerequisite expansion.  Dynamic macro
-       expansion  is performed in all user defined rules, and the special tar-
-       gets .SOURCE*, and .INCLUDEDIRS.
-
-       NOTE: The use of a $ as part  of  a  prerequisite  or  target  name  is
-       strongly  discouraged as the runtime macros (like $@) are expanded when
-       used in a recipe line so that the $ is interpreted as a  macro  identi-
-       fier  and not as a character of the filename leading to invalid runtime
-       macros.  In addition to this no filename normalization is done for pre-
-       requisites  and  targets that contain $ characters.  Nevertheless it is
-       possible to use $ in prerequisites by using $$$$ but this is not recom-
-       mended and can lead to surprising results.
-
-       If  dynamic  macro  expansion results in multiple white space separated
-       tokens then these are inserted into the prerequisite  list  inplace  of
-       the  dynamic prerequisite.  Due to the recursive nature of macro expan-
-       sion the prerequisite list is fully expanded even if the  dynamic  pre-
-       requisite contained other runtime macros.
-
-BINDING TARGETS
-       This operation takes a target name and binds it to an existing file, if
-       possible.  dmake makes a distinction between the internal  target  name
-       of a target and its associated external file name.  Thus it is possible
-       for a target's internal name and its external file name to differ.   To
-       perform  the  binding, the following set of rules is used.  Assume that
-       we are trying to bind a target whose name is of the form X.suff,  where
-       .suff is the suffix and X is the stem portion (ie. that part which con-
-       tains the directory and the basename).  dmake takes  this  target  name
-       and  performs a series of search operations that try to find a suitably
-       named file in the external file system.  The search operation  is  user
-       controlled via the settings of the various .SOURCE targets.
-
-              1.     If  target has the .SYMBOL attribute set then look for it
-                     in the library.  If found, replace the target  name  with
-                     the library member name and continue with step 2.  If the
-                     name is not found then return.
-
-              2.     Extract the suffix portion (that following  the  `.')  of
-                     the  target name.  If the suffix is not null, look up the
-
-
-
-Dmake Version 4.12                2008-02-26                                37
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-                     special target .SOURCE.<suff> (<suff> is the suffix).  If
-                     the  special  target  exists  then  search each directory
-                     given in the .SOURCE.<suff>  prerequisite  list  for  the
-                     target.   If  the target's suffix was null (ie. .suff was
-                     empty) then perform the above search but use the  special
-                     target  .SOURCE.NULL instead.  If at any point a match is
-                     found then terminate the search.  If a directory  in  the
-                     prerequisite  list is the special name `.NULL ' perform a
-                     search for the full target name  without  prepending  any
-                     directory portion (ie. prepend the NULL directory).
-
-              3.     The search in step 2. failed.  Repeat the same search but
-                     this time use the special  target  .SOURCE.   (a  default
-                     target  of  '.SOURCE  :  .NULL'  is  defined  by dmake at
-                     startup, and is user redefinable)
-
-              4.     The search in step 3. failed.   If  the  target  has  the
-                     library  member  attribute  (.LIBMEMBER)  set then try to
-                     find the target in the library  which  was  passed  along
-                     with  the  .LIBMEMBER attribute (see the MAKING LIBRARIES
-                     section).  The bound file name assigned to a target which
-                     is  successfully  located  in  a library is the same name
-                     that would be assigned had the search failed (see 5.).
-
-              5.     The search failed.  Either the target was  not  found  in
-                     any  of  the  search directories or no applicable .SOURCE
-                     special targets exist.   If  applicable  .SOURCE  special
-                     targets  exist,  but the target was not found, then dmake
-                     assigns the first name searched as the bound  file  name.
-                     If  no applicable .SOURCE special targets exist, then the
-                     full original target name becomes the bound file name.
-
-       There is potential here for a lot of search operations.  The  trick  is
-       to  define  .SOURCE.x special targets with short search lists and leave
-       .SOURCE as short as possible.  The search algorithm has  the  following
-       useful  side effect.  When a target having the .LIBMEMBER (library mem-
-       ber) attribute is searched for, it is first searched for as an ordinary
-       file.   When  a number of library members require updating it is desir-
-       able to compile all of them first and to update the library at the  end
-       in  a  single  operation.   If  one of the members does not compile and
-       dmake stops, then the user may fix the error  and  make  again.   dmake
-       will not remake any of the targets whose object files have already been
-       generated as long as none of their prerequisite files have  been  modi-
-       fied as a result of the fix.
-
-       When dmake constructs target (and prerequisite) pathnames they are nor-
-       malized  to the shortest (or most natural, see  below  for  the  cygwin
-       case) representation.  Substrings like './' or of the form 'baz/..' are
-       removed and multiple slashes are collapsed to one unless  they  are  at
-       the beginning of the pathname. Leading slashes are normalized according
-       to POSIX rules, i.e. more than two leading slashes are reduced  to  one
-       slash  and  a  leading '//' is kept as it might have a special meaning.
-       For example "./foo", "bar/../foo" and foo are recognized  as  the  same
-       file.   This  may  result  in  somewhat  unexpected values of the macro
-       expansion of runtime macros like $@, but is infact the corect result.
-
-       NOTE:  A cygwin dmake executable will accept DOS  like  pathnames  with
-       drive  letters  and  cygwin POSIX pathnames and normalize them into its
-       natural POSIX representation.  This might result in even more  surpris-
-       ing values of runtime macros.
-
-
-
-Dmake Version 4.12                2008-02-26                                38
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       When defining .SOURCE and .SOURCE.x targets the construct
-
-              .SOURCE :
-              .SOURCE : fred gery
-
-       is equivalent to
-
-              .SOURCE :- fred gery
-
-       dmake  correctly  handles  the UNIX Make variable VPATH.  By definition
-       VPATH contains a list of ':' separated directories to search when look-
-       ing for a target.  dmake maps VPATH to the following special rule:
-
-              .SOURCE :^ $(VPATH:s/:/ /)
-
-       Which  takes  the  value  of  VPATH and sets .SOURCE to the same set of
-       directories as specified in VPATH.
-
-PERCENT(%) RULES AND MAKING INFERENCES
-       When dmake makes a target, the target's set of prerequisites  (if  any)
-       must  exist  and  the  target must have a recipe which dmake can use to
-       make it.  If the makefile does not specify an explicit recipe  for  the
-       target  then dmake uses special rules to try to infer a recipe which it
-       can use to make the target.  Previous versions  of  Make  perform  this
-       task  by  using  rules  that  are defined by targets of the form .<suf-
-       fix>.<suffix> (this is still supported, see "AUGMAKE META RULES") or by
-       using  the not supported by dmake .SUFFIXES list of suffixes (see "SPE-
-       CIAL TARGETS" for more details about .SUFFIXES).  The exact workings of
-       this  mechanism were sometimes difficult to understand and often limit-
-       ing in their usefulness.  Instead, dmake supports the concept of %-meta
-       rules.   The  syntax  and semantics of these rules differ from standard
-       rule lines as follows:
-
-              <%-targets> [<attributes>] <ruleop> [<%-prereqs>] [;<recipe>]
-
-       where %-targets are one or more targets containing exactly a single `%'
-       sign,  attributes  is  a list (possibly empty) of attributes, ruleop is
-       the standard set of rule operators, %-prereqs , if present, is  a  list
-       of  prerequisites  containing  zero  or  more `%' signs, and recipe, if
-       present, is the first line of the recipe.
-
-       If more than one %-target is present this line is equivalent to a repe-
-       tition  of  the whole [<attributes>] <ruleop> [<%-prereqs>] [;<recipe>]
-       sequence for each %-target, i.e. it is possible  to  specify  the  same
-       rule  for  multiple  %-targets.  Because  of this following only speaks
-       about <%-target> as %-targets are  divided  into  multiple  definitions
-       with a single %-target.
-
-       NOTE:   As  multiple %-targets didn't work reliably with dmake versions
-       prior to 4.5 unless the rule operator `|:' was used we currently  issue
-       a warning stating that it now works.
-
-       The  %-target  defines a pattern against which a target whose recipe is
-       being inferred gets matched.  The pattern match goes as  follows:   all
-       chars  are  matched  exactly from left to right up to but not including
-       the % sign in the pattern, % then matches the longest string  from  the
-       actual  target  name not ending in the suffix given after the % sign in
-       the pattern.  Consider the following examples:
-
-              %.c       matches fred.c but not joe.c.Z
-              dir/%.c   matches dir/fred.c but not dd/fred.c
-              fred/%    matches fred/joe.c but not f/joe.c
-              %         matches anything
-
-
-
-
-Dmake Version 4.12                2008-02-26                                39
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       In each case the part of the target name that matched  the  %  sign  is
-       retained and is substituted for any % signs in the prerequisite list of
-       the %-meta rule when the rule is selected during  inference  and  dmake
-       constructs the new dependency.
-
-       Please  note,  that  only  the first, non-indirect, prerequisite of the
-       list is used for the inference mechanism. If more than one non-indirect
-       prerequisite  is  given  a warning is issued and all but the first non-
-       indirect prerequisites are ignored. See  below  for  a  description  of
-       indirect prerequisites.
-
-       As an example the following %-meta rules describe the following:
-
-              %.c : %.y ; recipe...
-
-       describes  how  to  make  any file ending in .c if a corresponding file
-       ending in .y can be found.
-
-              foo%.o : fee%.k ; recipe...
-
-       is used to describe how to make fooxxxx.o from feexxxx.k.
-
-              %.a :; recipe...
-
-       describes how to make a file whose suffix is .a without  inferring  any
-       prerequisites.
-
-              %.c : %.y 'yaccsrc/%.y' ; recipe...
-
-       matches  the  corresponding  .y  file  as prerequisite and additionally
-       another .y file in the yaccsrc subdirectory as  indirect  prerequisite.
-       Another interesting example is:
-
-              % : RCS/%,v ; co $<
-
-       which  describes  how  to  take  any target and check it out of the RCS
-       directory if the corresponding file exists in the RCS  directory.   The
-       equivalent SCCS rule would be:
-
-              % : s.% ; get $<
-
-
-       The  previous RCS example defines an infinite rule, because it says how
-       to make anything from RCS/%,v, and anything also includes RCS/fred.c,v.
-       To  limit the size of the graph that results from such rules dmake uses
-       the macro variable PREP (stands for  %  repetition).   By  default  the
-       value of this variable is 0, which says that no repetitions of a %-rule
-       are to be generated.  If it is set to something greater  than  0,  then
-       that  many  repetitions  of any infinite %-rule are allowed.  If in the
-       above example PREP was set to 1, then dmake would generate  the  depen-
-       dency graph:
-
-              % --> RCS/%,v --> RCS/RCS/%,v,v
-
-       Where  each  link  is assigned the same recipe as the first link.  PREP
-       should be used only in special cases, since it may result  in  a  large
-       increase in the number of possible prerequisites tested.  dmake further
-       assumes that any target that has no suffix can be made from a prerequi-
-       site that has at least one suffix.
-
-       dmake  supports  dynamic  prerequisite  generation for prerequisites of
-       %-meta rules.  This is best illustrated by an example.   The  RCS  rule
-       shown  above can infer how to check out a file from a corresponding RCS
-       file only if the target  is  a  simple  file  name  with  no  directory
-
-
-
-Dmake Version 4.12                2008-02-26                                40
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       information.    That   is,  the  above  rule  can  infer  how  to  find
-       RCS/fred.c,v from the target fred.c,  but  cannot  infer  how  to  find
-       srcdir/RCS/fred.c,v  from  srcdir/fred.c  because  the  above rule will
-       cause dmake to look  for  RCS/srcdir/fred.c,v;  which  does  not  exist
-       (assume that srcdir has its own RCS directory as is the common case).
-
-       A  more  versatile  formulation  of the above RCS check out rule is the
-       following:
-
-              % :  $$(@:d)RCS/$$(@:f),v : co $@
-
-       This rule uses the dynamic macro $@ to specify the prerequisite to  try
-       to  infer.   During  inference  of this rule the macro $@ is set to the
-       value of the target of the %-meta rule and the appropriate prerequisite
-       is generated by extracting the directory portion of the target name (if
-       any), appending the string RCS/ to it, and appending  the  target  file
-       name with a trailing ,v attached to the previous result.
-
-       dmake  can  also  infer indirect prerequisites.  An inferred target can
-       have a list of prerequisites added that will not show up in  the  value
-       of  $<  but will show up in the value of $? and $&.  Indirect prerequi-
-       sites are specified in an inference rule by  quoting  the  prerequisite
-       with single quotes.  For example, if you had the explicit dependency:
-
-              fred.o : fred.c ; rule to make fred.o
-              fred.o : local.h
-
-       then this can be inferred for fred.o from the following inference rule:
-
-              %.o : %.c 'local.h' ; makes a .o from a .c
-
-       You may infer indirect prerequisites that are a function of  the  value
-       of '%' in the current rule.  The meta-rule:
-
-              %.o : %.c '$(INC)/%.h' ; rule to make a .o from a .c
-
-       infers  an  indirect prerequisite found in the INC directory whose name
-       is the same as the expansion  of  $(INC),  and  the  prerequisite  name
-       depends  on  the  base name of the current target.  The set of indirect
-       prerequisites is attached to the meta rule in which they are  specified
-       and  are inferred only if the rule is used to infer a recipe for a tar-
-       get.  They do not play an active role in driving  the  inference  algo-
-       rithm.  The construct:
-
-              %.o :| %.c %.f 'local.h'; recipe
-
-       is equivalent to:
-
-              %.o : %.c 'local.h' ; recipe
-              %.o : %.f 'local.h' ; recipe
-
-
-       If  any of the attributes .EPILOG, .IGNORE, .LIBRARY, .NOSTATE, .PHONY,
-       .PRECIOUS, .PROLOG, .SETDIR, .SILENT, .SWAP, .USESHELL and .WINPATH are
-       given  for  a  %-rule  then  when that rule is bound to a target as the
-       result of an inference, the target's set of attributes is augmented  by
-       the  attributes  from  the  above  set  that are specified in the bound
-       %-rule.  Other attributes specified for %-meta rules are not  inherited
-       by  the target.  The .SETDIR attribute is treated in a special way.  If
-       the target already had a .SETDIR attribute set then  dmake  changes  to
-       that directory prior to performing the inference.  During inference any
-       .SETDIR attributes for the  inferred  prerequisite  are  honored.   The
-       directories  must  exist for a %-meta rule to be selected as a possible
-       inference path.  If the directories do not exist no  error  message  is
-
-
-
-Dmake Version 4.12                2008-02-26                                41
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       issued,  instead  the  corresponding  path  in  the  inference graph is
-       rejected.
-
-       dmake bases all of its inferences on the  inference  graph  constructed
-       from  the %-rules defined in the makefile.  It knows exactly which tar-
-       gets can be made from which prerequisites  by  making  queries  on  the
-       inference graph.
-
-       For  a %-meta rule to be inferred as the rule whose recipe will be used
-       to make a target, the target's name must match  the  %-target  pattern,
-       and  any inferred %-prerequisite must already exist or have an explicit
-       recipe so that the prerequisite can be made.  Without  transitive  clo-
-       sure  on the inference graph the above rule describes precisely when an
-       inference match  terminates  the  search.   If  transitive  closure  is
-       enabled  (the  usual case), and a prerequisite does not exist or cannot
-       be made, then dmake invokes the inference algorithm recursively on  the
-       prerequisite  to see if there is some way the prerequisite can be manu-
-       factured.  For, if the prerequisite can be made then the current target
-       can  also be made using the current %-meta rule.  This means that there
-       is no longer a need to give a rule for making a .o from  a  .y  if  you
-       have already given a rule for making a .o from a .c and a .c from a .y.
-       In such cases dmake can infer how to make the .o from the  .y  via  the
-       intermediary .c and will remove the .c when the .o is made.  Transitive
-       closure can be disabled by giving the -T switch on the command line.
-
-       A word of caution.  dmake bases its transitive closure  on  the  %-meta
-       rule  targets.   When  it  performs transitive closure it infers how to
-       make a target from a prerequisite by performing a pattern match  as  if
-       the potential prerequisite were a new target.  The set of rules:
-
-              %.o : %.c ; rule for making .o from .c
-              %.c : %.y ; rule for making .c from .y
-              % : RCS/%,v ; check out of RCS file
-
-       will,  by  performing  transitive  closure, allow dmake to infer how to
-       make a .o from a .y using a  .c  as  an  intermediate  temporary  file.
-       Additionally  it  will  be  able  to infer how to make a .y from an RCS
-       file, as long as that RCS file is in the RCS directory and has  a  name
-       which  ends in .y,v.  The transitivity computation is performed dynami-
-       cally for each target that does not have a recipe.  This has  potential
-       to  be  costly  if  the  %-meta rules are not carefully specified.  The
-       .NOINFER attribute is used to mark a %-meta node as being a final  tar-
-       get  during  inference.   Any  node with this attribute set will not be
-       used for subsequent inferences.  As an  example  the  node  RCS/%,v  is
-       marked  as  a  final  node  since we know that if the RCS file does not
-       exist there likely is no other way  to  make  it.   Thus  the  standard
-       startup makefile contains an entry similar to:
-              .NOINFER : RCS/%,v
-       Thereby indicating that the RCS file is the end of the inference chain.
-       Whenever the inference algorithm determines that a target can  be  made
-       from  more  than  one prerequisite and the inference chains for the two
-       methods are the same length the  algorithm  reports  an  ambiguity  and
-       prints the ambiguous inference chains.
-
-       dmake tries to remove intermediate files resulting from transitive clo-
-       sure if the file is not marked as being PRECIOUS, or the  -u  flag  was
-       not given on the command line, and if the inferred intermediate did not
-       previously exist.  Intermediate targets that  existed  prior  to  being
-       made  are  never  removed.  This is in keeping with the philosophy that
-       dmake should never remove things from the file system that it  did  not
-       add.   If  the  special target .REMOVE is defined and has a recipe then
-       dmake constructs a list of the intermediate files  to  be  removed  and
-       makes  them  prerequisites  of  .REMOVE.  It then makes .REMOVE thereby
-       removing the prerequisites if the recipe of .REMOVE says to.  Typically
-
-
-
-Dmake Version 4.12                2008-02-26                                42
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       .REMOVE is defined in the startup file as:
-
-              .REMOVE :; $(RM) $<
-
-AUGMAKE META RULES
-       As  a  subclass  of  the meta targets that is actually mapped to %-meta
-       rules dmake understands several SYSV AUGMAKE  targets  transformations.
-       This  .<suffix>  special target construct transforms into the following
-       %-meta rules:
-
-              .suff :; recipe
-
-       gets mapped into:
-
-              % : %.suff; recipe
-
-
-       dmake also supports the old format special target .<suffix>.<suffix> by
-       identifying  any rules of this form and mapping them to the appropriate
-       %-rule.  So for example if an old makefile contains the construct:
-
-              .c.o :; cc -c $< -o $@
-
-       dmake maps this into the following %-rule:
-
-              %.o : %.c; cc -c $< -o $@
-
-       The following SYSV  AUGMAKE  special  targets  transformation  must  be
-       enabled  by providing the -A flag on the command line or by setting the
-       value of AUGMAKE to non-NULL.  The construct
-
-              .c~.o :; recipe
-
-       gets mapped into:
-
-              %.o : s.%.c ; recipe
-
-       In general, a special target of the form .<str>~  is  replaced  by  the
-       %-rule  construct  s.%.<str>,  thereby providing support for the syntax
-       used by SYSV AUGMAKE for providing SCCS support.  When  enabled,  these
-       mappings  allow processing of existing SYSV makefiles without modifica-
-       tions.
-
-MAKING TARGETS
-       In order to update a target dmake must execute a recipe.  When a recipe
-       needs  to  be  executed  it is first expanded so that any macros in the
-       recipe text are expanded, and it is then either  executed  directly  or
-       passed  to  a shell.  dmake supports two types of recipes.  The regular
-       recipes and group recipes.
-
-       When a regular recipe is invoked dmake executes each line of the recipe
-       separately  using  a  new copy of a shell if a shell is required.  Thus
-       effects of commands do not generally persist across recipe lines  (e.g.
-       cd  requests  in  a  recipe  line  do not carry over to the next recipe
-       line).  This is true even in environments such as  MSDOS,  where  dmake
-       internally  sets the current working director to match the directory it
-       was in before the command was executed.
-
-       The decision on whether a shell is required to  execute  a  command  is
-       based  on  the value of the macro SHELLMETAS or on the specification of
-       '+' or .USESHELL for the current recipe or target respectively.  If any
-       character  in  the  value of SHELLMETAS is found in the expanded recipe
-       text-line or the use of a shell is  requested  explicitly  via  '+'  or
-       .USESHELL  then  the  command  is executed using a shell, otherwise the
-
-
-
-Dmake Version 4.12                2008-02-26                                43
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       command is executed directly.  The shell that is used for execution  is
-       given  by  the  value of the macro SHELL.  The flags that are passed to
-       the shell are given by the value of SHELLFLAGS.  Thus dmake  constructs
-       the command line:
-
-       $(SHELL) $(SHELLFLAGS) $(expanded_recipe_command)
-
-       If  the  $(SHELLCMDQUOTE) macro is set its value is inserted before and
-       after the $(expanded_recipe_command) string.
-
-       Normally dmake writes the command line that it is about  to  invoke  to
-       standard output.  If the .SILENT attribute is set for the target or for
-       the recipe line (via @), then the recipe line is not echoed.
-
-       Group recipe processing is similar to that of regular  recipes,  except
-       that  a shell is always invoked.  The shell that is invoked is given by
-       the value of the macro GROUPSHELL, and its flags  are  taken  from  the
-       value  of  the macro GROUPFLAGS.  If a target has the .PROLOG attribute
-       set then dmake prepends to the shell script the recipe associated  with
-       the special target .GROUPPROLOG, and if the attribute .EPILOG is set as
-       well, then the recipe associated with the special  target  .GROUPEPILOG
-       is  appended  to  the script file.  This facility can be used to always
-       prepend a common header and common trailer  to  group  recipes.   Group
-       recipes  are  echoed to standard output just like standard recipes, but
-       are enclosed by lines beginning with [ and ].
-
-       The recipe flags [+,-,%,@] are recognized at the start of a recipe line
-       even if they appear in a macro.  For example:
-
-              SH = +
-              all:
-              $(SH)echo hi
-
-       is completely equivalent to writing
-
-              SH = +
-              all:
-              +echo hi
-
-
-       The  last  step  performed by dmake prior to running a recipe is to set
-       the macro CMNDNAME to the name of the command to execute (determined by
-       finding  the  first  white-space ending token in the command line).  It
-       then sets the macro CMNDARGS to be the remainder of  the  line.   dmake
-       then expands the macro COMMAND which by default is set to
-
-              COMMAND = $(CMNDNAME) $(CMNDARGS)
-
-       The  result  of  this  final expansion is the command that will be exe-
-       cuted.  The reason for this expansion  is  to  allow  for  a  different
-       interface to the argument passing facilities (esp. under DOS) than that
-       provided by dmake.  You can for example define COMMAND to be
-
-              COMMAND = $(CMNDNAME) @$(mktmp $(CMNDARGS))
-
-       which dumps the arguments into a temporary file and runs the command
-
-              $(CMNDNAME) @/tmp/ASAD23043
-
-       which has a much shorter argument list.  It is now up to the command to
-       use the supplied argument as the source for all other arguments.  As an
-       optimization, if COMMAND is not defined  dmake  does  not  perform  the
-       above  expansion.   On  systems, such as UNIX, that handle long command
-       lines this provides a slight saving in processing the makefiles.
-
-
-
-Dmake Version 4.12                2008-02-26                                44
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-MAKING LIBRARIES
-       Libraries are easy to maintain using dmake.  A library is a  file  con-
-       taining  a collection of object files.  Thus to make a library you sim-
-       ply specify it as a target with the .LIBRARY attribute set and  specify
-       its list of prerequisites.  The prerequisites should be the object mem-
-       bers that are to go into the library.  When  dmake  makes  the  library
-       target  it uses the .LIBRARY attribute to pass to the prerequisites the
-       .LIBMEMBER attribute and the name of the  library.   This  enables  the
-       file  binding  mechanism  to  look  for the member in the library if an
-       appropriate object file  cannot  be  found.   dmake  now  supports  Elf
-       libraries on systems that support Elf and hence supports, on those sys-
-       tems, long member file names.  A small example best illustrates this.
-
-              mylib.a .LIBRARY : mem1.o mem2.o mem3.o
-              rules for making library...
-              # remember to remove .o's when lib is made
-
-              # equivalent to:  '%.o : %.c ; ...'
-              .c.o :; rules for making .o from .c say
-
-       dmake will use the .c.o rule for making the library members  if  appro-
-       priate  .c  files  can be found using the search rules.  NOTE:  this is
-       not specific in any way to C programs, they are simply used as an exam-
-       ple.
-
-       dmake  tries  to  handle the old library construct format in a sensible
-       way.  The construct lib(member.o) is separated and the lib  portion  is
-       declared  as  a  library  target.   The  new target is defined with the
-       .LIBRARY attribute set and the member.o portion  of  the  construct  is
-       declared  as  a  prerequisite  of  the  lib  target.   If the construct
-       lib(member.o) appears as a prerequisite of a target  in  the  makefile,
-       that  target  has the new name of the lib assigned as its prerequisite.
-       Thus the following example:
-
-              a.out : ml.a(a.o) ml.a(b.o); $(CC) -o $@  $<
-
-              .c.o :; $(CC) -c $(CFLAGS) -o $@  $<
-              %.a:
-                     ar rv $@ $?
-                     ranlib $@
-                     rm -rf $?
-
-       constructs the following dependency graph.
-
-              a.out : ml.a; $(CC) -o $@  $<
-              ml.a .LIBRARY : a.o b.o
-
-              %.o : %.c ; $(CC) -c $(CFLAGS) -o $@  $<
-              %.a :
-                     ar rv $@ $?
-                     ranlib $@
-                     rm -rf $?
-
-       and making a.out then works as expected.
-
-       The same thing happens for any target of the form lib((entry)).   These
-       targets  have  an  additional  feature in that the entry target has the
-       .SYMBOL attribute set automatically.
-
-       NOTE:  If the notion of entry points is supported by the archive and by
-       dmake  (currently  not the case) then dmake will search the archive for
-       the entry point and return not only the modification time of the member
-       which  defines  the  entry  but also the name of the member file.  This
-       name will then replace entry and will be used  for  making  the  member
-
-
-
-Dmake Version 4.12                2008-02-26                                45
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       file.  Once bound to an archive member the .SYMBOL attribute is removed
-       from the target.  This feature is presently disabled as there is little
-       standardization  among archive formats, and we have yet to find a make-
-       file utilizing this feature (possibly due to the fact that it is  unim-
-       plemented in most versions of UNIX Make).
-
-       Finally, when dmake looks for a library member it must first locate the
-       library file.  It does so by first looking for the library relative  to
-       the  current directory and if it is not found it then looks relative to
-       the current value of $(TMD).  This allows commonly used libraries to be
-       kept near the root of a source tree and to be easily found by dmake.
-
-KEEP STATE
-       dmake  supports  the  keeping  of state information for targets that it
-       makes whenever the macro .KEEP_STATE is assigned a value.  The value of
-       the  macro  should  be  the  name of a state file that will contain the
-       state information.  If state keeping is enabled then each  target  that
-       does  not  poses the .NOSTATE attribute will have a record written into
-       the state file indicating the target's name, the current directory, the
-       command  used to update the target, and which, if any, :: rule is being
-       used.  When you make this target again if any of this information  does
-       not match the previous settings and the target is not out dated it will
-       still be re-made.  The assumption is that one of the  conditions  above
-       has  changed and that we wish to remake the target.  For example, state
-       keeping is used in the maintenance of dmake to test  compile  different
-       versions  of  the  source using different compilers.  Changing the com-
-       piler causes the compilation flags to be modified and hence all sources
-       to be recompiled.
-
-       The  state  file is an ascii file and is portable, however it is not in
-       human readable form as the entries represent hash  keys  of  the  above
-       information.
-
-       The Sun Microsystem's Make construct
-
-              .KEEP_STATE :
-
-       is  recognized and is mapped to .KEEP_STATE:=_state.mk.  The dmake ver-
-       sion of state keeping does not include  scanning  C  source  files  for
-       dependencies  like Sun Make.  This is specific to C programs and it was
-       felt that it does not belong in make.  dmake instead provides the tool,
-       cdepend,  to  scan C source files and to produce depedency information.
-       Users are free to modify cdepend to  produce  other  dependency  files.
-       (NOTE:  cdepend  does  not come with the distribution at this time, but
-       will be available in a patch in the near future)
-
-MULTI PROCESSING
-       If the architecture supports it then dmake is capable of making a  tar-
-       get's  prerequisites  in parallel.  dmake will make as much in parallel
-       as it can and use a number of child processes up to the maximum  speci-
-       fied  by  MAXPROCESS  or  by  the value supplied to the -P command line
-       flag.  A parallel make is enabled by setting the  value  of  MAXPROCESS
-       (either  directly  or  via  -P  option) to a value which is > 1.  dmake
-       guarantees that all dependencies as specified in the makefile are  hon-
-       ored.   A  target  will not be made until all of its prerequisites have
-       been made.  Note that when you specify -P 4 then four  child  processes
-       are  run  concurrently but dmake actually displays the fifth command it
-       will run immediately upon a child process becomming free.  This  is  an
-       artifact of the method used to traverse the dependency graph and cannot
-       be removed.  If a parallel make is being performed then  the  following
-       restrictions on parallelism are enforced.
-
-              1.     Individual  recipe  lines  in a non-group recipe are per-
-                     formed sequentially  in  the  order  in  which  they  are
-
-
-
-Dmake Version 4.12                2008-02-26                                46
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-                     specified  within  the  makefile and in parallel with the
-                     recipes of other targets.
-
-              2.     If a target contains multiple recipe definitions (cf.  ::
-                     rules) then these are performed sequentially in the order
-                     in which the :: rules are specified within  the  makefile
-                     and in parallel with the recipes of other targets.
-
-              3.     If  a  target  rule  contains  the `!' modifier, then the
-                     recipe is performed sequentially for the list of outdated
-                     prerequisites  and  in parallel with the recipes of other
-                     targets.
-
-              4.     If a target has the .SEQUENTIAL attribute set then all of
-                     its  prerequisites  are made sequentially relative to one
-                     another (as if MAXPROCESS=1), but in parallel with  other
-                     targets in the makefile.
-
-       Note:   If  you specify a parallel make then the order of target update
-       and the order in which the associated recipes are invoked will not cor-
-       respond to that displayed by the -n flag.
-
-CONDITIONALS
-       dmake  supports  a  makefile construct called a conditional.  It allows
-       the user to conditionally select portions of makefile  text  for  input
-       processing  and  to  discard  other  portions.  This becomes useful for
-       writing makefiles that are intended to function for more than one  tar-
-       get  host  and environment.  The conditional expression is specified as
-       follows:
-
-              .IF  expression
-                 ... if text ...
-              .ELIF  expression
-                 ... if text ...
-              .ELSE
-                 ... else text ...
-              .END
-
-       The .ELSE and .ELIF portions are optional, and the conditionals may  be
-       nested  (ie.   the  text may contain another conditional).  .IF, .ELSE,
-       and .END may appear anywhere in the makefile, but a single  conditional
-       expression may not span multiple makefiles.
-
-       expression can be one of the following forms:
-
-       String evaluation
-       <text> | <text> == <text> | <text> != <text>
-
-       Numeric evaluation
-       <text> <= <text> | <text> >= <text>
-
-       Boolean evaluation
-       ( <text> ) | <text> || <text> | <text> && <text>
-
-       where  text  is either text or a macro expression.  In any case, before
-       the comparison is made, the expression is expanded.  The text  portions
-       are then selected and compared.  In the case of the numeric comparisons
-       enclosing quotes are removed after expanding the  expressions  and  the
-       leading  numerical  parts  are  converted  to  an integer number. If no
-       numerical part is found this results to 0 (zero). The string "12ab" for
-       example  evaluates to the number 12.  Expressions can be nested with ()
-       and the use of || or &&.  White space at the start and end of the  text
-       portion  is  discarded  before the comparison.  This means that a macro
-       that evaluates to nothing but white space is considered  a  NULL  value
-
-
-
-Dmake Version 4.12                2008-02-26                                47
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       for  the  purpose  of the comparison.  In the first case the expression
-       evaluates TRUE if the text is not NULL otherwise  it  evaluates  FALSE.
-       The  remaining two cases both evaluate the expression on the basis of a
-       string comparison.  If a macro expression needs to be equated to a NULL
-       string  then compare it to the value of the macro $(NULL).  You can use
-       the $(shell ...) macro to construct more complex test expressions.
-
-EXAMPLES
-              # A simple example showing how to use make
-              #
-              prgm : a.o b.o
-                   cc a.o b.o -o prgm
-              a.o : a.c g.h
-                   cc a.c -o $@
-              b.o : b.c g.h
-                   cc b.c -o $@
-
-       In the previous example prgm is remade only if a.o and/or b.o is out of
-       date  with respect to prgm.  These dependencies can be stated more con-
-       cisely by using the inference rules defined  in  the  standard  startup
-       file.   The default rule for making .o's from .c's looks something like
-       this:
-
-       %.o : %.c; cc -c $(CFLAGS) -o $@ $<
-
-       Since there exists a rule (defined in the startup file) for making .o's
-       from .c's dmake will use that rule for manufacturing a .o from a .c and
-       we can specify our dependencies more concisely.
-
-              prgm : a.o b.o
-                   cc -o prgm $<
-              a.o b.o : g.h
-
-       A more general way to say the above  using  the  new  macro  expansions
-       would be:
-
-              SRC = a b
-              OBJ = {$(SRC)}.o
-
-              prgm : $(OBJ)
-                   cc -o $@ $<
-
-              $(OBJ) : g.h
-
-       If  we want to keep the objects in a separate directory, called objdir,
-       then we would write something like this.
-
-              SRC = a b
-              OBJ = {$(SRC)}.o
-
-              prgm : $(OBJ)
-                   cc $< -o $@
-
-              $(OBJ) : g.h
-              %.o : %.c
-                   $(CC) -c $(CFLAGS) -o $(@:f) $<
-                   mv $(@:f) objdir
-
-              .SOURCE.o : objdir   # tell dmake to look here for .o's
-
-       An example of building library members would go  something  like  this:
-       (NOTE:  The same rules as above will be used to produce .o's from .c's)
-
-              SRC= a b
-
-
-
-Dmake Version 4.12                2008-02-26                                48
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-              LIB= lib
-              LIBm= { $(SRC) }.o
-
-              prgm: $(LIB)
-                   cc -o $@ $(LIB)
-
-              $(LIB) .LIBRARY : $(LIBm)
-                   ar rv $@ $<
-                   rm $<
-
-       Finally, suppose that each of the source files in the previous  example
-       had  the  `:'  character in their target name.  Then we would write the
-       above example as:
-
-              SRC= f:a f:b
-              LIB= lib
-              LIBm= "{ $(SRC) }.o"      # put quotes around each token
-
-              prgm: $(LIB)
-                   cc -o $@ $(LIB)
-
-              $(LIB) .LIBRARY : $(LIBm)
-                   ar rv $@ $<
-                   rm $<
-
-COMPATIBILITY
-       There are two notable differences between dmake and the  standard  ver-
-       sion of BSD UNIX 4.2/4.3 Make.
-
-              1. BSD  UNIX  4.2/4.3 Make supports wild card filename expansion
-                 for prerequisite names.  Thus if a  directory  contains  a.h,
-                 b.h and c.h, then a line like
-
-                 target: *.h
-
-                 will  cause  UNIX  make to expand the *.h into "a.h b.h c.h".
-                 dmake does not support this type of filename expansion.
-
-              2. Unlike UNIX make, touching a library member causes  dmake  to
-                 search  the  library  for  the  member name and to update the
-                 library time stamp.  This is only  implemented  in  the  UNIX
-                 version.   MSDOS  and  other versions may not have librarians
-                 that keep file time stamps, as a  result  dmake  touches  the
-                 library file itself, and prints a warning.
-
-       dmake  is  not  compatible  with  GNU  Make.  In particular it does not
-       understand GNU Make's macro expansions that query the file system.
-
-       dmake is fully compatible with SYSV AUGMAKE, and supports the following
-       AUGMAKE features:
-
-              1. GNU  Make  style  include,  and  if/else/endif directives are
-                 allowed in non-group recipes.  Thus, the word include appear-
-                 ing at the start of a line that is not part of a gruop recipe
-                 will be mapped to the ".INCLUDE" directive that  damke  uses.
-                 Similarly,  the  words  ifeq,ifneq,elif,else,  and  endif are
-                 mapped to their corresponding dmake equivalents.
-
-              2. The macro modifier expression $(macro:str=sub) is  understood
-                 and  is equivalent to the expression $(macro:s/str/sub), with
-                 the restriction that str must  match  the  following  regular
-                 expression:
-
-                 str[ |\t][ |\t]*
-
-
-
-Dmake Version 4.12                2008-02-26                                49
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-                 (ie.  str  only  matches at the end of a token where str is a
-                 suffix and is terminated by a space, a tab, or end  of  line)
-                 Normally  sub is expanded before the substitution is made, if
-                 you specify -A on the command line then sub is not  expanded.
-
-              3. The  macro  % is defined to be $@ (ie. $% expands to the same
-                 value as $@).
-
-              4. The AUGMAKE notion of libraries is handled correctly.
-
-              5. Directories are always made if you specify -A.  This is  con-
-                 sistent with other UNIX versions of Make.
-
-              6. Makefiles  that  utilize  virtual  targets to force making of
-                 other targets work as expected if AUGMAKE special target han-
-                 dling is enabled.  For example:
-
-                 FRC:
-                 myprog.o : myprog.c $(FRC) ; ...
-
-                 Works as expected if you issue the command
-
-                 'dmake -A FRC=FRC'
-
-                 but  fails  with a 'don't know how to make FRC' error message
-                 if you do not specify AUGMAKE special target handling via the
-                 -A flag (or by setting AUGMAKE:=yes internally).
-
-LIMITS
-       In  some  environments  the length of an argument string is restricted.
-       (e.g. MSDOS command line arguments cannot be longer than 128  bytes  if
-       you  are  using  the  standard  command.com command interpreter as your
-       shell, dmake text diversions may help in these situations.)
-
-PORTABILITY
-       To write makefiles that can be moved from one  environment  to  another
-       requires some forethought.  In particular you must define as macros all
-       those things that may be different in the new environment.   dmake  has
-       two  facilities that help to support writing portable makefiles, recur-
-       sive macros and conditional expressions.  The recursive  macros,  allow
-       one  to define environment configurations that allow different environ-
-       ments for similar types of operating systems.   For  example  the  same
-       make script can be used for SYSV and BSD but with different macro defi-
-       nitions.
-
-       To write a makefile that is portable between UNIX  and  MSDOS  requires
-       both  features  since  in  almost all cases you will need to define new
-       recipes for making targets.  The recipes will probably be quite differ-
-       ent  since the capabilities of the tools on each machine are different.
-       Different macros will be needed to help handle the smaller  differences
-       in the two environments.
-
-FILES
-       Makefile,  makefile,  startup.mk  (use  dmake  -V to tell you where the
-       startup file is)
-
-SEE ALSO
-       sh(1), csh(1), touch(1), f77(1), pc(1), cc(1)
-       S.I. Feldman  Make - A Program for Maintaining Computer Programs
-
-AUTHOR
-       Dennis Vadura, dvadura@wticorp.com
-       Many thanks to Carl Seger for his helpful suggestions,  and  to  Trevor
-       John Thompson for his many excellent ideas and informative bug reports.
-
-
-
-Dmake Version 4.12                2008-02-26                                50
-
-
-
-
-
-DMAKE(1)                                                              DMAKE(1)
-
-
-       Many thanks also go to those on the NET  that  have  helped  in  making
-       dmake one of the best Make tools available.
-
-BUGS
-       Some  system  commands  return non-zero status inappropriately.  Use -i
-       (`-' within the makefile) to overcome the difficulty.
-
-       Some systems do not have easily accessible time stamps for library mem-
-       bers  (MSDOS,  AMIGA,  etc)  for these dmake uses the time stamp of the
-       library instead and prints a warning the first time it does  so.   This
-       is  almost  always  ok,  except when multiple makefiles update a single
-       library file.  In these instances it is possible to miss an  update  if
-       one is not careful.
-
-       This man page is way too long.
-
-WARNINGS
-       Rules supported by make(1) may not work if transitive closure is turned
-       off (-T, .NOINFER).
-
-       PWD from csh/ksh will cause problems if a cd operation is performed and
-       -e or -E option is used.
-
-       Using  internal  macros  such  as COMMAND, may wreak havoc if you don't
-       understand their functionality.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Dmake Version 4.12                2008-02-26                                51
-
-
diff --git a/dmake/man/dmake.tf b/dmake/man/dmake.tf
deleted file mode 100644
index 981d82fc0..000000000
--- a/dmake/man/dmake.tf
+++ /dev/null
@@ -1,3480 +0,0 @@
-.\" Copyright (c) 1990,...,1995 Dennis Vadura, All rights reserved.
-.\"
-.\" You must use groff to format this man page!!!
-.\"
-.ds TB "0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.5i +0.5i +2.0i
-.de Ip
-.sp \\n[PD]u
-.nf
-.nr dmake-indent \w@\\$1 @u
-.IP "\\$1" \\n[dmake-indent]u
-\\$2
-..
-.de Is
-.nr dmake-indent \w@\\$1@u
-.nf
-..
-.de Ii
-.PD 0
-.IP "\\$1" \\n[dmake-indent]u
-.it 1 PD
-..
-.TH DMAKE 1  "2008-02-26" "Dmake Version 4.12"
-.SH NAME
-\fBdmake\fR \- maintain program groups, or interdependent files
-.SH SYNOPSIS
-.nh
-.B dmake
-[\-P#] [\-{f|C|K} file] [\-{w|W} target ...]
-[macro[[!][*][+][:]]=\fIvalue\fP ...]
-[\-ABcdeEghiknpqrsStTuVxX] [\-v[cdfimrtw]] [\-m[trae]] [target ...]
-.hy 14
-.SH DESCRIPTION
-.PP
-.B dmake
-is a re-implementation of the UNIX Make utility with significant enhancements.
-.B dmake
-executes commands found in an external file called a
-.I makefile
-to update one or more target names.
-Each target may depend on zero or more prerequisite targets.
-If any of the target's prerequisites is newer than the target or if the target
-itself does not exist, then
-.B dmake
-will attempt to make the target.
-.PP
-If no
-.B \-f
-command line option is present then
-.B dmake
-searches for an existing
-.I makefile
-from the list of prerequisites specified for the special target \fI.MAKEFILES\fR
-(see the STARTUP section for more details).
-If "\-" is the name of the file specified to the
-.B \-f
-flag then \fBdmake\fR uses standard input as the source of the makefile text.
-.PP
-Any macro definitions (arguments with embedded "="
-signs) that appear on the command line are processed first
-and supercede definitions for macros of the same name found
-within the makefile.  In general it is impossible for definitions found
-inside the makefile to redefine a macro defined on the command line, see the
-MACROS section for exceptions.
-.PP
-If no
-.I target
-names are specified on the command line, then \fBdmake\fR uses the first
-non-special target found in the makefile as the default target.
-See the
-.B "SPECIAL TARGETS"
-section for the list of special targets and their function.
-Makefiles written for most previous
-versions of
-.I Make
-will be handled correctly by 
-.B dmake.
-Known differences between \fBdmake\fR and other versions of make
-are discussed in the
-.B COMPATIBILITY
-section found at the end of this document.
-.B dmake
-returns 0 if no errors were detected and a non-zero result if an error
-occurred.
-.SH OPTIONS
-.IP "\fB\-A\fR"
-Enable AUGMAKE special inference rule transformations
-(see the "PERCENT(%) RULES" and "AUGMAKE META RULES" sections), these are
-set to off by default.
-.IP "\fB\-B\fR"
-Enable the use of spaces instead of <tabs> to begin recipe lines.
-This flag equivalent to the .NOTABS special macro and is further described
-below.
-.IP "\fB\-c\fR"
-Use non-standard comment stripping.  If you specify \fB\-c\fP then
-.B dmake
-will treat any \fB#\fP character as a start of comment character wherever it
-may appear unless it is escaped by a \e.
-.IP "\fB\-C [+]file\fR"
-This option writes to \fIfile\fP a copy of standard output and
-standard error from any child processes and from the
-.B dmake
-process itself.  If you specify a \fB+\fP prior to the file name then
-the text is appended to the previous contents of \fIfile\fP.
-This option is active in the MSDOS implementation only and is ignored
-by non-MSDOS versions of
-.B dmake.
-.IP "\fB\-d\fR"
-Disable the use of the directory cache.  Normally \fBdmake\fP caches directories
-as it checks file timestamps.  Giving this flag is equivalent to the
-\&.DIRCACHE attribute or macro being set to \fIno\fP.
-.IP "\fB\-E\fR"
-Read the environment and define all strings of the
-form '\fBENV\-VAR\fP=\fIevalue\fP'
-defined within as macros whose name is \fBENV\-VAR\fP,
-and whose value is '\fIevalue\fP'.
-The environment is processed prior to processing the user
-specified makefile thereby allowing definitions in the makefile to override
-definitions in the environment.
-.IP "\fB\-e\fR"
-Same as \-E, except that the environment is processed after the
-user specified makefile has been processed
-(thus definitions in the environment override definitions in the makefile).
-The \-e and \-E options are mutually exclusive.
-If both are given the latter takes effect.
-.IP "\fB\-f file\fR"
-Use \fBfile\fR as the source for the makefile text.
-Only one \fB\-f\fR option is allowed.
-.IP "\fB\-g\fR"
-Globally disable group recipe parsing, equivalent to the .IGNOREGROUP
-attribute or macro being set to \fIyes\fP at the start of the makefile.
-.IP "\fB\-h\fR"
-Print the command summary for \fBdmake\fR.
-.IP "\fB\-i\fR"
-Tells \fBdmake\fR to ignore errors, and continue making other targets.
-This is equivalent to the .IGNORE attribute or macro.
-.IP "\fB\-K file\fR"
-Turns on \fB.KEEP_STATE\fP state tracking and tells \fBdmake\fP to use
-\fIfile\fP as the state file.
-.IP "\fB\-k\fR"
-Causes \fBdmake\fR to ignore errors caused by command execution and to make
-all targets not depending on targets that could not be made. 
-Ordinarily \fBdmake\fR stops after a command returns a non-zero status,
-specifying \fB\-k\fR causes \fBdmake\fR to ignore the error
-and continue to make as much as possible.
-.IP "\fB\-m[trae]\fR"
-Measure timing information. Print the time when targets and/or recipes
-are started and finished to stdout. The following format is used:
-.IP ""
-\fB{s|e} {target|recipe} time maketarget\fP
-.IP ""
-\fBs\fP or \fBe\fP stands for started or ended, \fBtarget\fP or
-\fBrecipe\fP denotes if this line refers to the whole target or a
-recipe. \fBtime\fP is displayed in Unix time format, i.e. the number
-of seconds since an epoch.  (Since 1970-01-01T00:00:00Z).  \fBmaketarget\fP
-obviously represents the target the timing information is given for.
-The optional flags \fB[trae]\fP can be used to change the information that
-is displayed.  If no optional flags are given only the \fBt\fP flag
-is assumed to be selected, ie. \fB\-mt\fP.  The optional flags stand for:
-.RS
-.IP "\fBt\fP"
-Display the start and end time of each target.
-.IP "\fBr\fP"
-Display the start and end time of each recipe.
-.IP "\fBa\fP"
-Display the target as an absolute path, i.e. prepend the current working
-directory.
-.IP "\fBe\fP"
-Also display the start and end time of the \fB$(shell command)\fP function
-(aka. shell escape) macros.
-.RE
-.IP "\fB\-n\fR"
-Causes \fBdmake\fR to print out what it would have executed,
-but does not actually execute the commands.  A special check is made for
-the string "$(MAKE)" inside a recipe line, if it is found,
-the line is expanded and invoked, thereby enabling recursive makes to give a
-full description of all that they will do.
-This check is disabled inside group recipes.
-.IP "\fB\-p\fR"
-Print out a version of the digested makefile in human readable form.
-(useful for debugging, but cannot be re-read by \fBdmake\fP)
-.IP "\fB\-P#\fR"
-On systems that support multi-processing cause \fBdmake\fP to use \fI#\fP
-concurrent child processes to make targets.
-See the "MULTI PROCESSING" section for more information.
-.IP "\fB\-q\fR"
-Check and see if the target is up to date.  Exits with code 0 if up to date,
-1 otherwise.
-.IP "\fB\-r\fR"
-Tells \fBdmake\fR not to read the initial startup makefile, see STARTUP
-section for more details.
-.IP "\fB\-s\fR"
-Tells \fBdmake\fR to do all its work silently and not echo the commands it is
-executing to stdout (also suppresses warnings).
-This  is equivalent to the .SILENT attribute or macro.
-.IP "\fB\-S\fR"
-Force sequential execution of recipes on architectures which support
-concurrent makes.  For backward compatibility with old makefiles that have
-nasty side-effect prerequisite dependencies. (Implies -P1)
-.IP "\fB\-t\fR"
-Causes \fBdmake\fR to touch the targets and bring them up to date
-without executing any commands.
-Note that targets will not be created if they do not already exist.
-.IP "\fB\-T\fR"
-Tells \fBdmake\fP to not perform transitive closure on the inference graph.
-.IP "\fB\-u\fR"
-Force an unconditional update.  (ie. do everything that would
-be done if everything that a target depended on was out of date)
-.IP "\fB\-v[cdfimrtw]\fR"
-Verbose flag, when making targets print to stdout what we are going to make
-and what we think its time stamp is.  The optional flags \fB[cdfimrtw]\fP can be
-used to restrict the information that is displayed.  In the absence of any
-optional flags all are assumed to be given (ie. \fB\-v\fP is equivalent to
-\fB\-vcdfimrtw\fP).  The meanings of the optional flags are:
-.RS
-.IP "\fBc\fP"
-Notify of directory cache operations only.
-.IP "\fBd\fP"
-Notify of change directory operations only.
-.IP "\fBf\fP"
-Notify of file I/O operations only.
-.IP "\fBi\fP"
-Notify of inference algorithm operation only.
-.IP "\fBm\fP"
-Notify of target update operations only.
-.IP "\fBr\fP"
-Force output of recipe lines, warnings and executed commands. This switch
-is usefull when debugging makefiles that disable the output using the @
-or @@ property for recipe lines or the .SILENT target/attribute.
-It also overrides the -s flag.
-.IP "\fBt\fP"
-Keep any temporary files created; normally they are automatically deleted.
-.IP "\fBw\fP"
-Notify of non-essential warnings (these are historical).
-.RE
-.IP "\fB\-V\fR"
-Print the version of \fBdmake\fR, and values of builtin macros.
-.IP "\fB\-W target\fR"
-Run \fBdmake\fP pretending that \fItarget\fP is out of date.
-.IP "\fB\-w target\fR"
-\fIWhat if?\fP Show what would be made if \fItarget\fP were out of date.
-.IP "\fB\-x\fR"
-Upon processing the user makefile export all non-internally defined macros
-to the user's environment.  This option together with the \-e option
-allows SYSV AUGMAKE recursive makes to function as expected.
-.IP "\fB\-X\fR"
-Inhibit the execution of \fB#!\fP lines found at the beginning of a makefile.
-The use of this flag prevents non-termination of recursive make invocations.
-.SH INDEX
-Here is a list of the sections that follow and a short description of each.
-Perhaps you won't have to read the entire man page to find
-what you need.
-.IP \fBSTARTUP\fP 1.9i
-Describes \fBdmake\fP initialization.
-.IP \fBSYNTAX\fP 1.9i
-Describes the syntax of makefile expressions.
-.IP \fBATTRIBUTES\fP 1.9i
-Describes the notion of attributes and how they are used when
-making targets.
-.IP \fBMACROS\fP 1.9i
-Defining and expanding macros.
-.IP "\fBRULES AND TARGETS" 1.9i
-How to define targets and their prerequisites.
-.IP \fBRECIPES\fP 1.9i
-How to tell \fBdmake\fP how to make a target.
-.IP "\fBBUILTIN COMMANDS\fP" 1.9i
-Internal dmake commands.
-.IP "\fBTEXT DIVERSIONS\fP" 1.9i
-How to use text diversions in recipes and macro expansions.
-.IP "\fBVIRTUAL TARGETS\fP" 1.9i
-Targets that only enforce dependencies, but which can not create a target file.
-.IP "\fBSPECIAL TARGETS\fP" 1.9i
-Some targets are special.
-.IP "\fBSPECIAL MACROS\fP" 1.9i
-Macros used by \fBdmake\fP to alter the processing of the makefile,
-and those defined by \fBdmake\fP for the user.
-.IP "\fBCONTROL MACROS\fP" 1.9i
-Itemized list of special control macros.
-.IP "\fBRUNTIME MACROS\fP" 1.9i
-Discussion of special run-time macros such as $@ and $<.
-.IP "\fBFUNCTION MACROS\fP" 1.9i
-Description of functional macros.
-.IP "\fBCONDITIONAL MACROS\fP" 1.9i
-Target specific conditional macros.
-.IP "\fBDYNAMIC PREREQUISITES\fP" 1.9i
-Processing of prerequisites which contain macro expansions in their name.
-.IP "\fBBINDING TARGETS\fP" 1.9i
-The rules that \fBdmake\fP uses to bind
-a target to an existing file in the file system.
-.IP "\fBPERCENT(%) RULES\fP" 1.9i
-Specification of recipes to be used by the inference algorithm.
-.IP "\fBMAKING INFERENCES\fP" 1.9i
-The rules that \fBdmake\fP uses when inferring how to make a target which
-has no explicit recipe.  This and the previous section are really a single
-section in the text.
-.IP "\fBAUGMAKE META RULES\fP" 1.9i
-A subclass of the \fBPERCENT(%) RULES\fP.
-.IP "\fBMAKING TARGETS\fP" 1.9i
-How \fBdmake\fP makes targets other than libraries.
-.IP "\fBMAKING LIBRARIES\fP" 1.9i
-How \fBdmake\fP makes libraries.
-.IP "\fBKEEP STATE\fP" 1.9i
-A discussion of how .KEEP_STATE works.
-.IP "\fBMULTI PROCESSING\fP" 1.9i
-Discussion of \fBdmake's\fP parallel make facilities for architectures that
-support them.
-.IP "\fBCONDITIONALS\fP" 1.9i
-Conditional expressions which control the processing of the makefile.
-.IP "\fBEXAMPLES\fP" 1.9i
-Some hopefully useful examples.
-.IP "\fBCOMPATIBILITY\fP" 1.9i
-How \fBdmake\fP compares with previous versions of make.
-.IP "\fBLIMITS\fP" 1.9i
-Limitations of \fBdmake\fP.
-.IP \fBPORTABILITY\fP 1.9i
-Comments on writing portable makefiles.
-.IP \fBFILES\fP 1.9i
-Files used by \fBdmake\fP.
-.IP "\fBSEE ALSO\fP" 1.9i
-Other related programs, and man pages.
-.IP "\fBAUTHOR\fP" 1.9i
-The guy responsible for this thing.
-.IP \fBBUGS\fP 1.9i
-Hope not.
-.SH STARTUP
-When
-.B dmake
-begins execution it first processes the command line and then processes
-an initial startup-makefile.
-This is followed by an attempt to locate and process a user supplied makefile.
-The startup file defines the default values of all required control macros
-and the set of default rules for making targets and inferences.
-When searching for the startup makefile,
-.B dmake
-searches the following locations, in the order specified,
-until a startup file is located:
-.LP
-.RS
-.IP 1.
-The location given as the value of the macro
-MAKESTARTUP defined on the command line.
-.IP 2.
-The location given as the value of the environment variable MAKESTARTUP
-defined in the current environment.
-.IP 3.
-The location given as the value of the macro
-MAKESTARTUP defined internally within \fBdmake\fP.  In this version, the
-internal definition of MAKESTARTUP is "$(DMAKEROOT)/startup.mk", so you
-can set the environment variable DMAKEROOT to the location of your startup
-directory.
-.sp
-If DMAKEROOT is not changed, for native Windows dmake versions its value
-defaults to "$(ABSMAKECMD:d)startup" (see definition of ABSMAKECMD for
-details).
-For unix like versions build with the autotools build system it defaults
-to the value of "${prefix}/share/startup" at build time. The actual value,
-usually something like /usr/local/share/startup can be checked with the \-V
-command line switch.
-.RE
-.LP
-The above search is disabled by specifying the \-r option on the command line.
-An error is issued if a startup makefile cannot be found and the \-r
-option was not specified.
-A user may substitute a custom startup file by defining
-the MAKESTARTUP environment variable or by redefining the
-MAKESTARTUP macro on the command line.
-To determine where
-.B dmake
-looks for the default startup file, check your environment or issue the command
-\fI"dmake \-V"\fP.
-.PP
-A similar search is performed to locate a default user makefile when no
-\fB\-f\fP command line option is specified.
-By default, the prerequisite list of the special target .MAKEFILES
-specifies the names of possible makefiles and the search order that
-\fBdmake\fP should use to determine if one exists.
-A typical definition for this target is:
-.RS
-.sp
-\&.MAKEFILES : makefile.mk Makefile makefile
-.sp
-.RE
-\fBdmake\fP will first look for makefile.mk and then the others.
-If a prerequisite
-cannot be found \fBdmake\fP will try to make it before going on to the next
-prerequisite.  For example, makefile.mk can be checked out of an RCS file
-if the proper rules for doing so are defined in the startup file.
-.PP
-If the first line of the user makefile is of the form:
-.RS
-.sp
-#!command command_args
-.sp
-.RE
-then \fBdmake\fP will expand and run the command prior to reading any
-additional input.  If the return code of the command is zero then \fBdmake\fP
-will continue on to process the remainder of the user makefile, if the return
-code is non-zero then dmake will exit.
-.PP
-\fBdmake\fP builds the internal dependency graph as it parses a user specified
-makefile.  The graph is rooted at the special target \fB.ROOT\fP. .ROOT is the
-top level target that dmake builds when it starts to build targets.  All user
-specified targets (those from the command line or taken as defaults from
-the makefile) are made prerequisites of the special target \fB.TARGETS\fP.
-\fBdmake\fP by default creates the relationship that .ROOT depends on .TARGETS
-and as a result everything is made.  This approach allows the user to customize, within
-their makefile, the order and which, target, is built first.  For example the
-default makefiles come with settings for .ROOT that specify:
-.sp
-.RS
-\&.ROOT .PHONY .NOSTATE .SEQUENTIAL : .INIT .TARGETS .DONE
-.RE
-.sp
-with .INIT and .DONE defined as:
-.sp
-.RS
-\&.INIT .DONE .PHONY:;
-.RE
-.sp
-which nicely emulates the behaviour of Sun's make extensions.  The building of
-\&.ROOT's prerequisites is always forced to be sequential.  However, this
-definition is trivially changed by supplying the definition:
-.sp
-.RS
-\&.ROOT : .TARGETS
-.RE
-.sp
-which skips the preamble and postamble phases of building .TARGETS.
-.PP
-.B Please note
-that even though .INIT and .DONE are special exceptions, see section SPECIAL
-TARGETS, the use of self defined targets starting with `.' should be avoided
-as they would be handled as .<suffix> meta targets. The target names _INIT
-and _DONE for example would work equally well without the .<suffix>
-drawback.
-.SH SYNTAX
-This section is a summary of the syntax of makefile statements.
-The description is given in a style similar to BNF, where { } enclose
-items that may appear zero or more times, and [ ] enclose items that
-are optional.  Alternative productions for a left hand side are indicated
-by '\(->', and newlines are significant.  All symbols in \fBbold\fP type
-are text or names representing text supplied by the user.
-.sp 2
-.RS
-.Ip "Makefile" "\(-> { Statement }"
-.Ip "Statement" "\(-> Macro-Definition"
-\(-> Conditional-Macro-Definition
-\(-> Conditional
-\(-> Rule-Definition
-\(-> Attribute-Definition
-.Ip "Macro-Definition" "\(-> \fBMACRO = LINE\fP"
-\(-> \fBMACRO [\fB!\fR]*= LINE\fP
-\(-> \fBMACRO [\fB!\fR]:= LINE\fP
-\(-> \fBMACRO [\fB!\fR]*:= LINE\fP
-\(-> \fBMACRO [\fB!\fR]+= LINE\fP
-\(-> \fBMACRO [\fB!\fR]+:= LINE\fP
-.Ip "Conditional-Macro-Definition \(-> " "\fBTARGET\fP ?= Macro-Definition"
-.Ip "Conditional \(-> " "\fB\&.IF\fR expression"
-   Makefile
-[ \fB.ELIF\fR expression
-   Makefile ]
-[ \fB.ELSE\fR
-   Makefile ]
-\fB\&.END\fR
-.Ip "expression" "\(-> \fBLINE\fR"
-\(-> \fBSTRING\fR
-\(-> expression \fB==\fR expression
-\(-> expression \fB!=\fR expression
-\(-> expression \fB<=\fR expression
-\(-> expression \fB>=\fR expression
-\(-> \fB(\fR expression \fB)\fR
-\(-> expression \fB||\fR expression
-\(-> expression \fB&&\fR expression
-.Ip "Rule-Definition \(-> " "target-definition"
-   [ recipe ]
-.PP
-target-definition \(-> targets [attrs] op { \fBPREREQUISITE\fP } [\fB;\fR rcp-line]
-.Ip "targets" "\(-> target { targets }"
-\(-> \fB"\fRtarget\fB"\fR { targets }
-.Ip "target" "\(-> special-target"
-\(-> \fBTARGET\fR
-.Ip "attrs" "\(-> attribute { attrs }"
-\(-> \fB"\fRattribute\fB"\fR { attrs }
-.Ip "op" "\(-> \fB:\fR { modifier }"
-.Ip "modifier" "\(-> \fB:\fR"
-\(-> \fB^\fR
-\(-> \fB!\fR
-\(-> \fB\-\fR
-\(-> \fB|\fR
-.Ip "recipe" "\(-> { \fBTAB\fR rcp-line }"
-\(-> [\fB@\fR[\fB@\fR]][\fB%\fR][\fB\-\fR] \fB[
-.Is "recipe \(-> "
-.Ii " "
-   \fR{ \fBLINE\fR }
-.Ii " "
-\fB]\fR
-.Ip "rcp-line" "\(-> [\fB@\fR[\fB@\fR]][\fB%\fR][\fB\-\fR][\fB+\fR] \fBLINE\fR"
-.Ip Attribute-Definition "\(-> attrs \fB:\fR targets"
-.Ip attribute "\(-> \fB.EPILOG\fR"
-\(-> \fB.ERRREMOVE\fR
-\(-> \fB.EXECUTE\fR
-\(-> \fB.GROUP\fR
-\(-> \fB.IGNORE\fR
-\(-> \fB.IGNOREGROUP\fR
-\(-> \fB.LIBRARY\fR
-\(-> \fB.MKSARGS\fR
-\(-> \fB.NOINFER\fR
-\(-> \fB.NOSTATE\fR
-\(-> \fB.PHONY\fR
-\(-> \fB.PRECIOUS\fR
-\(-> \fB.PROLOG\fR
-\(-> \fB.SETDIR=\fIpath\fP\fR
-\(-> \fB.SILENT\fR
-\(-> \fB.SEQUENTIAL\fR
-\(-> \fB.SWAP\fR
-\(-> \fB.USESHELL\fR
-\(-> \fB.SYMBOL\fR
-\(-> \fB.UPDATEALL\fR
-\(-> \fB.WINPATH\fR
-.Ip "special-target" "\(-> \fB.ERROR\fR"
-\(-> \fB.EXIT\fR
-\(-> \fB.EXPORT\fR
-\(-> \fB.GROUPEPILOG\fR
-\(-> \fB.GROUPPROLOG\fR
-\(-> \fB.IMPORT\fR
-\(-> \fB.INCLUDE\fR
-\(-> \fB.INCLUDEDIRS\fR
-\(-> \fB.MAKEFILES\fR
-\(-> \fB.REMOVE\fR
-\(-> \fB.ROOT\fR
-\(-> \fB.SOURCE\fR
-\(-> \fB.SOURCE.\fIsuffix\fR
-\(-> \fB.SUFFIXES (deprecated)\fR
-\(-> \fB.TARGETS\fR
-\(-> \fB.INIT\fR
-\(-> \fB.DONE\fR
-\(-> .\fIsuffix\fR
-\(-> .\fIsuffix1\fR.\fIsuffix2\fR
-.fi
-.RE
-.sp 1
-.PP
-Where, \fBTAB\fP represents a <tab> character, \fBSTRING\fP represents an
-arbitrary sequence of characters, and
-\fBLINE\fP represents a
-possibly empty sequence of characters terminated by a non-escaped 
-(not immediately preceded by a backslash '\e') new-line character.
-\fBMACRO\fP, \fBPREREQUISITE\fP,
-and \fBTARGET\fP each represent a string of characters not
-including space or tab which respectively form the name of a macro,
-prerequisite or target.
-The name may itself be a macro expansion expression.
-A \fBLINE\fP can be continued over several physical lines by terminating it with
-a single backslash character.  Comments are initiated by the
-pound \fB#\fR character and extend to the end of line.
-All comment text is discarded, a '#' may be placed into the makefile text
-by escaping it with '\e' (ie. \e# translates to # when it is parsed).
-An exception to this occurs when a # is seen inside
-a recipe line that begins with a <tab> or is inside a group recipe.
-If you specify the \fB\-c\fP command line switch then this behavior is
-disabled and
-.B dmake
-will treat all # characters as start of comment indicators unless they
-are escaped by \e.
-A set of continued lines may be commented out by placing a single # at the
-start of the first line.
-A continued line cannot span more than one makefile.
-.PP
-\fBwhite space\fP is defined to be any combination of
-<space>, <tab>, and the sequence \e<nl> when \e<nl> is used to terminate a
-LINE. \fBNote\fP the special treatment of \e<nl> in macro definion and recipe
-lines below.
-When processing \fBmacro definition\fP lines,
-any amount of white space is allowed on either side of the macro operator
-and white space is stripped from both before and after the macro
-value string. A \e<nl> sequence in a macro definition is deleted from the
-macro value before assigning this value.
-During \fBrecipe expansion\fP the sequence \e<nl> is treated as white space 
-but is deleted from the final recipe string.
-You must escape the \e<nl> with another \e in order to get a \e at the end
-of a recipe or macro definition line.
-.PP
-When processing \fBtarget\fP definition lines,
-the recipe for a target must, in general, follow the first definition
-of the target (See the RULES AND TARGETS section for an exception), and
-the recipe may not span across multiple makefiles.
-Any targets and prerequisites found on a target definition line are taken
-to be white space separated tokens.
-The rule operator (\fIop\fP in SYNTAX section) is also considered
-to be a token but does not require
-white space to precede or follow it.  Since the rule operator begins with a `:',
-traditional versions of make do not allow the `:' character to
-form a valid target name.  \fBdmake\fP allows `:' to be present in
-target/prerequisite names as long as the entire target/prerequisite name is
-quoted.  For example:
-.sp
-\ta:fred : test
-.sp
-would be parsed as TARGET = a, PREREQUISITES={fred, :, test}, which
-is not what was intended.  To fix this you must write:
-.sp
-\t"a:fred" : test
-.sp
-Which will be parsed as expected.  Quoted target and prerequisite
-specifications may also contain white space thereby allowing the use of
-complex function macro expressions..
-See the EXAMPLES section for how to apply \fB"\fP quoting
-to a list of targets.
-.SH ATTRIBUTES
-.B dmake
-defines several target attributes.  Attributes may be
-assigned to a single target, a group of targets, or to all targets in the
-makefile.  Attributes are used to modify
-\fBdmake\fP actions during target update.
-The recognized attributes are:
-.sp
-.IP \fB.EPILOG\fP 1.2i
-Insert shell epilog code when executing a group recipe associated with
-any target having this attribute set.
-.IP \fB.ERRREMOVE\fP 1.2i
-Always remove any target having this attribute if an error is encountered
-while making them.  Setting this attribute overrides the .PRECIOUS attribute.
-.IP \fB.EXECUTE\fP 1.2i
-If the \-n flag was given then execute the recipe associated with any
-target having this attribute set.
-.IP \fB.FIRST\fP 1.2i
-Used in conjunction with .INCLUDE.  Terminates the inclusion with the first
-successfully included prerequisite.
-.IP \fB.GROUP\fP 1.2i
-Force execution of a target's recipe as a group recipe.
-.IP \fB.IGNORE\fP 1.2i
-Ignore an error when trying to make any target with this attribute set.
-.IP \fB.IGNOREGROUP\fP 1.2i
-Disable the special meaning of '[' to initiate a group recipe.
-.IP \fB.LIBRARY\fP 1.2i
-Target is a library.
-.IP \fB.MKSARGS\fP 1.2i
-If running in an MSDOS environment then use MKS extended argument passing
-conventions to pass arguments to commands.  Non-MSDOS
-environments ignore this attribute.
-.IP \fB.NOINFER\fP 1.2i
-Any target with this attribute set will not be subjected
-to transitive closure if it is inferred as a prerequisite 
-of a target whose recipe and prerequisites are being inferred.
-(i.e. the inference algorithm will not use any prerequisite with this attribute 
-set, as a target)
-If specified as '.NOINFER:' (ie. with no prerequisites or targets) then the
-effect is equivalent to specifying \fB\-T\fP on the command line.
-.IP \fB.NOSTATE\fP 1.2i
-Any target with this attribute set will not have command line flag
-information stored in the state file if .KEEP_STATE has been enabled.
-.IP \fB.PHONY\fP 1.2i
-Any target with this attribute set will have its recipe executed
-each time the target is made even if a file matching the target name can
-be located.  Any targets that have a .PHONY attributed target as a
-prerequisite will be made each time the .PHONY attributed prerequisite is
-made.
-.IP \fB.PRECIOUS\fP 1.2i
-Do not remove associated target under any circumstances.
-Set by default for any targets whose corresponding files exist in the file
-system prior to the execution of \fBdmake\fP.
-.IP \fB.PROLOG\fP 1.2i
-Insert shell prolog code when executing a group recipe associated with
-any target having this attribute set.
-.IP \fB.SEQUENTIAL\fP 1.2i
-Force a sequential make of the associated target's prerequisites. If set
-as a global attribute this implies setting MAXPROCESS=1.
-.IP \fB.SETDIR\fP 1.2i
-Change current working directory to specified directory when making the
-associated target.  You must
-specify the directory at the time the attribute is specified.  To do this
-simply give \fI.SETDIR=path\fP as the attribute.  \fIpath\fP is expanded and
-the result is used as the value of the directory to change to.
-If \fIpath\fP contains \fB$$@\fP then the name of the target to be built is
-used in computing the path to change directory to.
-If path is surrounded by single quotes then path is not expanded, and is used
-literally as the directory name.
-If the \fIpath\fP contains any `:' characters then the entire attribute string
-must be quoted using ".
-If a target having this attribute set also has the .IGNORE
-attribute set then if the change to the specified directory fails it will be
-ignored, and no error message will be issued.
-.IP \fB.SILENT\fP 1.2i
-Do not echo the recipe lines when making any target with this attribute set,
-and do not issue any warnings.
-.IP \fB.SWAP\fP 1.2i
-Under MSDOS
-when making a target with this attribute set swap the \fBdmake\fP executable
-to disk prior to executing the recipe line.  Also see the '%' recipe line
-flag defined in the RECIPES section.
-.IP \fB.SYMBOL\fP 1.2i
-Target is a library member and is an entry point into a module in the
-library.  This attribute is used only when searching a library for a target.
-Targets of the form lib((entry)) have this attribute set automatically.
-.IP \fB.USESHELL\fP 1.2i
-Force each recipe line of a target to be executed using a shell.
-Specifying this attribute is equivalent to specifying the '+' character at the
-start of each line of a non-group recipe.
-.IP \fB.UPDATEALL\fP 1.2i
-Indicates that all the targets listed in this rule are updated by the
-execution of the accompanying recipe.
-A common example is the production of the
-.I y.tab.c
-and
-.I y.tab.h
-files by
-.B yacc
-when it is run on a grammar.  Specifying .UPDATEALL in such a rule
-prevents the running of yacc twice, once for the y.tab.c file and once
-for the y.tab.h file.  .UPDATEALL targets that are specified in a single rule
-are treated as a single target and all timestamps are updated whenever any
-target in the set is made.  As a side-effect, \fBdmake\fP internally sorts
-such targets in ascending alphabetical order and the value of $@ is always
-the first target in the sorted set.
-.IP \fB.WINPATH\fP 1.2i
-Switch between default (POSIX) and Windows style path representation.
-(This attribute is specific for cygwin dmake executables and non-cygwin
-environments ignore this attribute.)
-.sp
-Under Cygwin it can be useful to generate Windows style paths (with
-regular slashes) instead of the default cygwin style (POSIX) paths
-for dmake's dynamic macros.
-The affected macros are $@, $*, $>, $?, $<, $&, $^ and $(MAKEDIR), $(PWD),
-$(TMD), $(TMPFILE) and the $(mktmp ...) function macro.
-This feature can be used to create DOS style path parameters
-for native W32 programs from dynamic macros.
-.sp
-\fBNote\fP that the Windows style paths use regular slashes ('/') instead
-of the usual Windows backslash ('\\') as directory separator to avoid quoting
-problems (after all it is still a cygwin \fBdmake\fP!) and cygwin, as well
-as native Windows, programs should have no problems using this (c:/foo/bar)
-path representation.
-.sp
-Example: Assuming the current target to be /tmp/mytarget the $@ macro
-without .WINPATH active expands to:
-.RS
-.sp
-.RS
-/tmp/mytarget
-.sp
-.RE
-With .WINPATH set it expands to:
-.sp
-.RS
-C:/cygwin/tmp/mytarget
-.RE
-.RE
-.LP
-All attributes are user setable and except for .UPDATEALL and .MKSARGS
-may be used in one of two forms.
-The .MKSARGS attribute is restricted to use as a global attribute, and
-the use of the .UPDATEALL attribute is restricted to rules
-of the second form only.
-.sp
-\tATTRIBUTE_LIST : \fItargets\fP
-.sp
-assigns the attributes specified by ATTRIBUTE_LIST to each target in
-.I targets
-or
-.sp
-\t\fItargets\fP ATTRIBUTE_LIST : ...
-.sp
-assigns the attributes specified by ATTRIBUTE_LIST to each target in
-.I targets.
-In the first form if
-.I targets
-is empty (ie. a NULL list), then the
-list of attributes will apply to all targets in the makefile
-(this is equivalent to the common Make construct of \fI".IGNORE :"\fP
-but has been modified to the notion of an attribute instead of
-a special target).
-Not all of the attributes have global meaning.
-In particular, .LIBRARY, .NOSTATE, .PHONY, .SETDIR, .SYMBOL and .UPDATEALL
-have no assigned global meaning.
-.PP
-Any attribute may be used with any target, even with the special targets.
-Some combinations are useless (e.g. .INCLUDE .PRECIOUS: ... ),
-while others are useful (e.g. .INCLUDE .IGNORE : "file.mk" will not complain
-if file.mk cannot be found using the include file search rules,
-see the section on SPECIAL TARGETS for a description of .INCLUDE).
-If a specified attribute will not be used with the special target a warning
-is issued and the attribute is ignored.
-.SH MACROS
-.B dmake
-supports six forms of macro assignment.
-.sp
-.IP "\fBMACRO = LINE\fP" 1.55i
-This is the most common and familiar form of macro assignment.  It assigns
-LINE literally as the value of MACRO.
-Future expansions of MACRO recursively expand its value.
-.IP "\fBMACRO *= LINE\fP" 1.55i
-This form behaves exactly as the simple '=' form with the exception that if
-MACRO already has a value then the assignment is not performed.
-.IP "\fBMACRO := LINE\fP" 1.55i
-This form differs from the simple '=' form in that it expands LINE
-prior to assigning it as the value of MACRO.
-Future expansions of MACRO do not recursively expand its value.
-.IP "\fBMACRO *:= LINE\fP" 1.55i
-This form behaves exactly as the ':=' form with the exception that if
-MACRO already has a value then the assignment and expansion are not performed.
-.IP "\fBMACRO += LINE\fP" 1.55i
-This form of macro assignment allows macro values to grow.  It takes the
-literal value of LINE and appends it to the previous value of MACRO separating
-the two by a single space.
-Future expansions of MACRO recursively expand its value.
-.IP "\fBMACRO +:= LINE\fP" 1.55i
-This form is similar to the '+=' form except that the value of LINE is expanded
-prior to being added to the value of MACRO.
-.PP
-Macro expressions specified on the command line allow the macro value
-to be redefined within the makefile only if the macro is defined using
-the '+=' and '+:=' operators.  Other operators will define a macro that cannot
-be further modified.
-.PP
-Each of the preceeding macro assignment operators may be prefixed by \fB!\fP
-to indicate that the assignment should be forced and that no warnings should
-be issued.  Thus, specifying \fB!\fP has the effect of silently forcing the
-specified macro assignment.
-.PP
-When \fBdmake\fP defines a non-environment macro it strips leading and
-trailing white space from the macro value.
-Macros imported from the environment via either the .IMPORT special
-target (see the SPECIAL TARGETS section), or the \fB\-e\fP, or \fB\-E\fP flags
-are an exception to this rule.  Their values are
-always taken literally and white space is never stripped.
-In addition, named macros defined using the .IMPORT special target do
-not have their values expanded when they are used within a makefile.
-In contrast, environment macros that are imported
-due to the specification of the \fB\-e\fP or \fB\-E\fP flags
-are subject to expansion when used.
-.PP
-To specify a macro expansion
-enclose the name in () or {} and precede it with a dollar sign $.
-Thus $(TEST) represents an expansion of the macro variable named TEST.
-If TEST is
-defined then $(TEST) is replaced by its expanded value.  If TEST is not
-defined then $(TEST) expands to the NULL string (this is equivalent to
-defining a macro as 'TEST=' ).  A short form may be used for single character
-named macros.  In this case the parentheses are optional, and $(I) is
-equivalent to $I.
-Macro expansion is recursive, hence, if the value string contains an expression
-representing a macro expansion, the expansion is performed.  Circular macro
-expansions are detected and cause an error to be issued.
-.PP
-When defining a macro the given macro name is first expanded before being used
-to define the macro.  Thus it is possible to define macros whose names
-depend on values of other macros.  For example, suppose CWD is defined as
-.sp
-\tCWD = $(PWD:b)
-.sp
-then the value of $(CWD) is the name of the current directory.
-This can be used to define macros specific to this directory, for
-example:
-.sp
-\t_$(CWD).prt = list of files to print...
-.sp
-The actual name of the defined macro is a function of the current directory.
-A construct such as this is useful when processing a hierarchy of directories
-using .SETDIR attributed targets and a collection of small distributed
-makefile stubs.
-.PP
-Macro variables may be defined within the makefile, on the command
-line, or imported from the environment.
-.PP
-.B \fBdmake\fR
-supports several non-standard macro expansions:
-The first is of the form:
-.RS
-.IP \fI$(macro_name:modifier_list:modifier_list:...)\fR
-.RE
-.LP
-where
-.I modifier_list
-may be a combination of:
-.RS
-.sp
-.Is "b or B "
-.Ii "b or B"
-\- file (not including suffix) portion of path names
-.Ii "d or D"
-\- directory portion of all path names
-.Ii "e or E"
-\- suffix portion of path names
-.Ii "f or F"
-\- file (including suffix) portion of path names
-.Ii "i or I"
-\- inferred names of targets
-.Ii "n or N"
-\- normalized path names
-.Ii "l or L"
-\- macro value in lower case
-.Ii "u or U"
-\- macro value in upper case
-.Ii "1"
-\- return the first white space separated token from value
-.RE
-.sp
-or a single one of:
-.RS
-.sp
-.Ii "m or M"
-\- map escape codes found in macro to their ASCII value
-.Ii "s or S"
-\- simple pattern substitution
-.Ii "t or T"
-\- tokenization.
-.Ii "^"
-\- prepend a prefix to each token
-.Ii "+"
-\- append a suffix to each token
-.sp
-.RE
-.fi
-Thus if we have the example:
-.RS
-test = d1/d2/d3/a.out f.out d1/k.out
-.RE
-The following macro expansions produce the values on the right of '\(->' after
-expansion.
-.RS
-.sp
-.Is "$(test:s/out/in/:f)   "
-.Ii "$(test:d)"
-\(-> d1/d2/d3/ d1/
-.Ii "$(test:b)"
-\(-> a f k
-.Ii "$(test:f)"
-\(-> a.out f.out k.out
-.Ii "${test:db}"
-\(-> d1/d2/d3/a f d1/k
-.Ii "${test:s/out/in/:f}"
-\(-> a.in f.in k.in
-.Ii $(test:f:t"+")
-\(-> a.out+f.out+k.out
-.Ii $(test:e)
-\(-> .out .out .out
-.Ii $(test:u)
-\(-> D1/D2/D3/A.OUT F.OUT D1/K.OUT
-.Ii $(test:1)
-\(-> d1/d2/d3/a.out
-.RE
-.fi
-.PP
-For this macro
-.RS
-test = d1/d2/../a.out "d1/file name.ext"
-.RE
-the following results are returned:
-.RS
-.sp
-.Is "$(test:s/out/in/:f)   "
-.Ii "$(test:n)"
-\(-> d1/a.out "d1/file name.ext"
-.RE
-.fi
-.PP
-If a token ends in a string composed from the value of the macro DIRBRKSTR
-(ie. ends in a directory separator string, e.g. '/' in UNIX) and you use the
-\fB:d\fP modifier then the expansion returns the directory name less the
-final directory separator string.  Thus successive pairs of :d modifiers
-each remove a level of directory in the token string.
-.PP
-The infered names of targets \fB:i\fP modifier returnes the actual filename
-associated to the target, see BINDING TARGETS. If the value is not a target or
-prerequisite the value is returned unchanged. For the following example:
-.RS
-test = aprog bprog
-.RE
-If aprog and bprog are targets or prerequisits and they are bound
-to /tmp/aprog and bprog (see .SOURCE special target) the macro expansion
-has the following effect:
-.RS
-.sp
-.Is "$(test:s/out/in/:f)   "
-.Ii "$(test:i)"
-\(-> /tmp/aprog bprog
-.RE
-.fi
-.PP
-The normalized path names \fB:n\fP modifier honors the setting of .WINPATH to
-determine the output format of the result.
-.PP
-The map escape codes modifier changes the following escape codes \ea => <bel>,
-\&\eb => <backspace>, \ef => <formfeed>, \en => <nl>, \er => <cr>,
-\&\et => <tab>, \ev => <vertical tab>, \e" => ", and \exxx => <xxx> where
-xxx is the octal representation of a character into the corresponding ASCII
-value.
-.PP
-The tokenization, prepend and append modifier may use the same escape codes
-that are supported by the map escape codes modifier in the string that is
-inserted, prepended or added by the respective macro modifier.
-These modifiers may quote this string to include otherwise problematic
-characters.  E.g. spaces, colons and parentheses.
-.PP
-The tokenization modifier takes all white space separated tokens from the
-macro value and separates them by the separator string.  Thus the
-expansion:
-.LP
-.RS
-.nf
-$(test:f:t"+\en")
-.RE
-produces:
-.RS
-a.out+
-f.out+
-k.out
-.fi
-.RE
-.PP
-The prefix operator \fB^\fP takes all white space separated tokens from the
-macro value and prepends \fIstring\fP to each.
-.LP
-.RS
-.nf
-$(test:f:^mydir/)
-.RE
-produces:
-.RS
-mydir/a.out mydir/f.out mydir/k.out
-.fi
-.RE
-.PP
-The suffix operator \fB+\fP takes all white space separated tokens from the
-macro value and appends \fIstring\fP to each.
-.LP
-.RS
-.nf
-$(test:b:+.c)
-.RE
-produces:
-.RS
-a.c f.c k.c
-.fi
-.RE
-.PP
-The next non-standard form of macro expansion allows for recursive macros.
-It is possible to specify a $(\fImacro_name\fR) or ${\fImacro_name\fR} expansion
-where \fImacro_name\fR contains more $( ... ) or ${ ... } macro expansions
-itself.
-.PP
-For example $(CC$(_HOST)$(_COMPILER)) will first expand CC$(_HOST)$(_COMPILER)
-to get a result and use that result as the name of the macro to expand.
-This is useful for writing a makefile for more than one target
-environment.  As an example consider the following hypothetical case. 
-Suppose that _HOST and _COMPILER are imported from the environment
-and are set to represent the host machine type and the host compiler
-respectively.
-.RS
-.sp
-.nf
-CFLAGS_VAX_CC = \-c \-O  # _HOST == "_VAX", _COMPILER == "_CC"
-CFLAGS_PC_MSC = \-c \-ML # _HOST == "_PC",  _COMPILER == "_MSC"
-.sp
-# redefine CFLAGS macro as:
-.sp
-CFLAGS := $(CFLAGS$(_HOST)$(_COMPILER))
-.fi
-.sp
-.RE
-This causes CFLAGS to take on a value that corresponds to the
-environment in which the make is being invoked.
-.PP
-The final non-standard macro expansion is of the form:
-.RS
-.sp
-string1{token_list}string2
-.RE
-.LP
-where string1, string2 and token_list are expanded.  After expansion,
-string1 is prepended to each token found in token_list and
-string2 is appended to each resulting token from the previous prepend.
-string1 and string2 are not delimited by white space
-whereas the tokens in token_list are.
-A null token in the token list 
-is specified using "".
-Thus using another example we have:
-.RS
-.sp
-.Is "test/{f1  f2}.o    "
-.Ii "test/{f1 f2}.o"
---> test/f1.o test/f2.o
-.Ii "test/ {f1 f2}.o"
---> test/ f1.o f2.o
-.Ii "test/{f1 f2} .o"
---> test/f1 test/f2 .o
-.Ii "test/{""f1""  """"}.o"
---> test/f1.o test/.o
-.sp
-.Ii and
-.sp
-.Is "test/{d1 d2}/{f1 f2}.o --> "
-.Ii "test/{d1 d2}/{f1 f2}.o --> "
-test/d1/f1.o test/d1/f2.o
-test/d2/f1.o test/d2/f2.o
-.sp
-.RE
-.fi
-This last expansion is activated only when the first characters of
-\fItoken_list\fP
-appear immediately after the opening '{' with no intervening white space.
-The reason for this restriction is the following incompatibility with
-Bourne Shell recipes.  The line
-.RS
-.sp
-{ echo hello;}
-.sp
-.RE
-is valid /bin/sh syntax; while
-.RS
-.sp
-{echo hello;}
-.sp
-.RE
-.fi
-is not. Hence the latter triggers the enhanced macro expansion while the former
-causes it to be suppressed.
-See the SPECIAL MACROS section for a description of the special macros that
-\fBdmake\fP defines and understands.
-.SH "RULES AND TARGETS"
-A makefile contains a series of entries that specify dependencies.
-Such entries are called \fItarget/prerequisite\fP or \fIrule\fP definitions.
-Each rule definition
-is optionally followed by a set of lines that provide a recipe for updating
-any targets defined by the rule.
-Whenever
-.B dmake
-attempts to bring a target up to date and an explicit recipe is provided with
-a rule defining the target, that recipe is used to update the
-target.  A rule definition begins with a line having the following syntax:
-.sp
-.RS
-.nf
-\fI<targets>\fP [\fI<attributes>\fP] \fI<ruleop>\fP [\fI<prerequisites>\fP] [;\fI<recipe>\fP]
-.fi
-.RE
-.sp
-.I targets
-is a non-empty list of targets.  If the target is a
-special target (see SPECIAL TARGETS section below) then it must appear alone
-on the rule line.  For example:
-.sp
-.RS
-\&.IMPORT .ERROR : ...
-.RE
-.sp
-is not allowed since both .IMPORT and .ERROR are special targets.
-Special targets are not used in the construction of the dependency graph and
-will not be made.
-.PP
-.I attributes
-is a possibly empty list of attributes.  Any attribute defined in the
-ATTRIBUTES section above may be specified.  All attributes will be applied to
-the list of named targets in the rule definition.  No other targets will
-be affected.
-.sp
-.IP NOTE: 0.75i
-As stated earlier,
-if both the target list and prerequisite list are empty but the attributes
-list is not, then the specified attributes affect all targets in the makefile.
-.sp
-.PP
-.I ruleop
-is a separator which is used to identify the targets from the prerequisites.
-Optionally it also provides a facility for modifying the way in which
-.B dmake
-handles the making of the associated targets.
-In its simplest form the operator is a single ':', and need not be separated
-by white space from its neighboring tokens.  It may additionally be followed
-by any of the modifiers { !, ^, \-, :, | }, where:
-.sp
-.IP \fB!\fP
-says execute the recipe for the associated targets once for each out of date
-prerequisite.  (The meaning of the runtime macro \fB$?\fP is changed, see
-below in the
-.B "RUNTIME MACROS"
-section.) Ordinarily the recipe is executed
-once for all out of date prerequisites at the same time.
-.IP \fB^\fP
-says to insert the specified prerequisites, if any, before any
-other prerequisites already associated with the specified targets.
-In general, it is not useful to specify ^ with an empty
-list of prerequisites.
-.IP \fB\-\fP
-says to clear the previous list of prerequisites before adding
-the new prerequisites.  Thus,
-.sp
-\tfoo :
-.br
-\tfoo : bar baz
-.sp
-can be replaced by
-.sp
-\tfoo :\- bar baz
-.sp
-however the old form still works as expected.
-.IP \fB:\fP
-When the rule operator is not modified by a second ':'
-only one set of rules may be specified for making a target.
-Multiple definitions may be used to add to the
-list of prerequisites that a target depends on.
-However, if a target is multiply defined
-only one definition may specify a recipe
-for making the target.
-.sp
-When a target's rule operator is modified by a second ':'
-(:: for example) then this definition may not be the only
-definition with a recipe for the target.  There may be other :: target
-definition lines that specify a different set of prerequisites with a
-different recipe for updating the target.  
-Any such target is made if any of the definitions
-find it to be out of date
-with respect to the related prerequisites
-and the corresponding recipe is used to update the
-target.  By definition all '::' recipes that are found to be out of date for
-are executed.
-.sp 
-In the following simple example, each rule has a `::' \fIruleop\fP.  In such an
-operator we call the first `:' the operator, and the second `:' the modifier.
-.sp
-.nf
-a.o :: a.c b.h
-   first recipe for making a.o
-
-a.o :: a.y b.h
-   second recipe for making a.o
-.fi
-.sp
-If a.o is found to be out of date with respect to a.c then the first recipe
-is used to make a.o.  If it is found out of date with respect to a.y then
-the second recipe is used.  If a.o is out of date with respect to
-b.h then both recipes are invoked to make a.o.
-In the last case the order of invocation corresponds to the order in which the
-rule definitions appear in the makefile.
-.IP \fB|\fP
-Is defined only for PERCENT rule target definitions.  When specified it
-indicates that the following construct should be parsed using the old
-semantinc meaning:
-.sp
-.nf
-%.o :| %.c %.r %.f ; some rule
-.sp
-is equivalent to:
-.sp
-%.o : %.c ; some rule
-%.o : %.r ; some rule
-%.o : %.f ; some rule
-.fi
-.PP
-Targets defined using a single `:' operator
-with a recipe may be redefined again with a new recipe by using a
-`:' operator with a `:' modifier.
-This is equivalent to a target having been
-initially defined with a rule using a `:' modifier.
-Once a target is defined using a `:'
-modifier it may not be defined again with a recipe using only the `:' operator
-with no `:' modifier.  In both cases the use of a `:' modifier creates a new
-list of prerequisites and makes it the current prerequisite list for the target.
-The `:' operator with no recipe always modifies the current list
-of prerequisites.
-Thus assuming each of the following definitions has a recipe attached, then:
-.RS
-.sp
-.nf
-joe :  fred ...	(1)
-joe :: more ...	(2)
-.sp
-and
-.sp
-joe :: fred ...	(3)
-joe :: more ...	(4)
-.sp
-.fi
-.RE
-are legal and mean:  add the recipe associated with (2), or (4) to the set
-of recipes for joe, placing them after existing recipes for
-making joe.
-The constructs:
-.RS
-.sp
-.nf
-joe :: fred ...	(5)
-joe : more ...	(6)
-.sp
-and
-.sp
-joe : fred ...	(7)
-joe : more ...	(8)
-.sp
-.fi
-.RE
-are errors since we have two sets of perfectly good recipes for
-making the target.
-.PP
-.I prerequisites
-is a possibly empty list of targets that must be brought up to date before
-making the current target.
-.PP
-.I recipe
-is a short form and allows the user to specify short rule definitions
-on a single line.
-It is taken to be the first recipe line in a larger recipe
-if additional lines follow the rule definition.
-If the semi-colon is present but the recipe line is empty (ie. null string)
-then it is taken
-to be an empty rule.  Any target so defined causes target to be treated
-as a virtual target, see VIRTUAL TARGETS below.
-.SH "RECIPES"
-The traditional format used by most versions of Make defines the recipe
-lines as arbitrary strings that may contain macro expansions.  They
-follow a rule definition line and may be spaced
-apart by comment or blank lines.
-The list of recipe lines defining the recipe is terminated by a new target
-definition, a macro definition, or end-of-file.
-Each recipe line
-.B MUST
-begin with a \fB<TAB>\fP character (or \fBspaces\fP, see \fB.NOTABS\fP)
-which may optionally be followed with one or all the following
-.I recipe property
-characters 
-.IR "'@%+\-'"
-which affect the recipe execution:
-.IP "'\-'"
-indicates that non-zero exit values (ie. errors)
-are to be ignored when this recipe line is executed.
-.IP "'\+'"
-indicates that the current recipe line is to be executed using the shell. Group recipes implicitely ignore this property.
-.IP "'%'"
-indicates that
-.B dmake
-should swap itself out to secondary storage (MSDOS only) before running the
-recipe.
-.IP "'@'"
-indicates that the recipe line should NOT be echoed to the terminal prior to
-being executed.
-.IP "'@@'"
-is a stronger version of the previous property. The recipe line and the
-output (stdout and stderr) of the executed recipe are NOT shown on the
-terminal.
-.LP
-Each property is off by default
-(ie. by default, errors are significant, commands are echoed, no swapping is
-done and a shell is
-used only if the recipe line contains a character found in the value of the
-SHELLMETAS macro).
-Global settings activated via command line options or special attribute or
-target names may also affect these settings.
-An example recipe:
-.sp
-.RS
-.nf
-target :
-.RS
-first recipe line
-second recipe line, executed independent of first.
-@a recipe line that is not echoed
--and one that has errors ignored
-%and one that causes dmake to swap out
-+and one that is executed using a shell.
-.RE
-.fi
-.RE
-.PP
-The second and new format of the recipe block begins the block with the
-character '[' (the open group character) in the last non-white space
-position of a line, and terminates the
-block with the character ']' (the close group character)
-in the first non-white space position of a line.
-In this form each recipe line need not have a leading TAB.  This is
-called a recipe group.  Groups so defined are fed intact as a single
-unit to a shell for execution whenever the corresponding target needs to
-be updated.  If the open group character '[' is preceded
-by one or all of the
-.I recipe properties
-(\-, %, @ and @@)
-then they apply to the entire group in the same way that they
-apply to single recipe lines.  You may also specify '+' but it is
-redundant as a shell is already being used to run the recipe.
-See the MAKING TARGETS section for a description of how
-.B dmake
-invokes recipes.
-Here is an example of a group recipe:
-.sp
-.RS
-.nf
-target :
-[
-   first recipe line
-   second recipe line
-   tall of these recipe lines are fed to a
-   single copy of a shell for execution.
-]
-.fi
-.RE
-.sp
-.SH "BUILTIN COMMANDS"
-.B dmake
-supports some builtin commands. An optional leading '+' describes that
-the builtin can be used also when being executed in a shell otherwise it
-is only implemented when used directly. Remember that if a character of the
-recipe is found in the SHELLMETAS macro the execution of the recipe in a
-shell is forced.
-.IP "[\fB+\fP]\fBnoop\fP [\fBsomething\fP]"
-The  \fBnoop\fP internal command always returns success if used but it is
-not executed even though the rest of the commandline is evaluated.
-This command can be used to evaluate macro expansions at the runtime of the
-recipe without starting a real commmand.
-.IP "[\fB+\fP]<empty recipe>
-If an empty recipe line is encountered it is not executed. This sounds
-more trivial than it really is because the recipe could consist of
-macros that evaluated to empty or whitespace only strings.
-.IP "\fBecho\fP [\fB-n\fP] \fBdata\fP"
-This internal command prints data (with all leading whitespace removed, but
-otherwise literally) to stdout. If the '-n' switch is given no trailing
-newline is printed. Note that no quoting is removed nor that escape sequences
-are handled.
-.PP
-No special treatment of buildin commands for group recipes is implemented
-even though the <empty recipe> will most propably also not be evaluated by
-most shells that can be used to handle the recipe groups.
-.SH "TEXT DIVERSIONS"
-.B dmake
-supports the notion of text diversions.
-If a recipe line contains the macro expression
-.RS
-.sp
-$(mktmp[,[\fIfile\fP][,\fItext\fP]] \fIdata\fP)
-.sp
-.RE
-then all text contained in the \fIdata\fP expression is expanded and
-is written to a temporary file.  The \fIdata\fP in the file will always
-be terminated from a new line character.  The \fIfile\fP parameter can
-be used to override the name of the temporary file. If its expanded value
-is not empty it will be used instead of the unique and thread safe file
-name that otherwise would be generated internally.  The return
-value of the macro is the name of the temporary file unless the \fItext\fP
-parameter is defined. In this case the return value is the expanded value
-of \fItext\fP.
-.PP
-.I data
-can be any text and must be separated from the 'mktmp' portion of the
-macro name by white-space.  The only restriction on the data text is that
-it must contain a balanced number of parentheses of the same kind as are
-used to initiate the $(mktmp ...) expression.  For example:
-.RS
-.sp
-$(mktmp $(XXX))
-.sp
-.RE
-is legal and works as expected, but:
-.RS
-.sp
-$(mktmp text (to dump to file)
-.sp
-.RE
-is not legal.  You can achieve what you wish by either defining a macro that
-expands to '(' or by using {} in the macro expression; like this:
-.RS
-.sp
-${mktmp text (to dump to file}
-.sp
-.RE
-Since the temporary file is opened when the
-macro containing the text diversion expression is expanded, diversions may
-be nested and any diversions that are created as part of ':=' macro
-expansions persist for the duration of the
-.B dmake
-run.
-If the \fIdata\fP text is to contain new lines the map escape codes macro
-expasion can be used.  For example the expression:
-.RS
-.sp
-.nf
-mytext:=this is a\entest of the text diversion
-all:
-	cat $(mktmp $(mytext:m))
-.fi
-.sp
-.RE
-is replaced by:
-.RS
-.sp
-cat /tmp/mk12294AA
-.sp
-.RE
-where the temporary file contains two lines both of which are terminated
-by a new-line.
-A second more illustrative example generates a response file to an MSDOS
-link command:
-.RS
-.sp
-.nf
-OBJ = fred.obj mary.obj joe.obj
-all : $(OBJ)
-	link @$(mktmp $(^:t"+\en"))
-.fi
-.sp
-.RE
-The result of making `all' in the second example is the command:
-.RS
-.sp
-link @/tmp/mk02394AA
-.sp
-.RE
-where the temporary file contains:
-.RS
-.sp
-.nf
-fred.obj+
-mary.obj+
-joe.obj
-.fi
-.sp
-.RE
-The last line of the file is terminated by a new-line which is always
-inserted at the end of the \fIdata\fP string.
-.PP
-If the optional \fIfile\fP specifier is present it can be used to specify
-the name of the temporary file to create.  An example that would be useful
-for MSDOS users with a Turbo-C compiler
-.RS
-.sp
-$(mktmp,turboc.cfg $(CFLAGS))
-.sp
-.RE
-will place the contents of CFLAGS into a local \fIturboc.cfg\fP file.
-The second optional argument, \fItext\fP, if present alters the name
-of the value returned by the $(mktmp ...) macro.
-.PP
-Under MS-DOS text diversions may be a problem.  Many DOS tools require
-that path names which contain directories use the \e character to delimit
-the directories.  Some users however wish to use the '/' to delimit pathnames
-and use environments that allow them to do so.
-The macro USESHELL is set to "yes" if the
-current recipe is forced to use a shell via the .USESHELL or '+' directives,
-otherwise its value is "no".
-The
-.B dmake
-startup files define the macro DIVFILE whose value is either the
-value of TMPFILE or the value of TMPFILE edited to replace any '/' characters
-to the appropriate value based on the current shell and whether it will be
-used to execute the recipe.
-.PP
-Previous versions of
-.B dmake
-defined text diversions using <+, +> strings,
-where <+ started a text diversion and +> terminated one.
-.B dmake
-is backward compatible with this construct only
-if the <+ and +> appear literally
-on the same recipe line or in the same macro value string.  In such instances
-the expression:
-.sp
-\t<+data+>
-.sp
-is mapped to:
-.sp
-\t$(mktmp data)
-.sp
-which is fully output compatible with the earlier construct.  <+, +>
-constructs whose text spans multiple lines must be converted by hand to use
-$(mktmp ...).
-.PP
-If the environment variable TMPDIR is defined then the
-temporary file is placed into the directory specified by that variable.
-A makefile can modify the location of temporary files by
-defining a macro named TMPDIR and exporting it using the .EXPORT special
-target.
-.SH "VIRTUAL TARGETS"
-.B Dmake
-allows to define targets with the sole purpose to enforce a dependency
-chain that are unable to create the target, hence virtual targets.
-When \fBdmake\fP tries to make a target, but only finds a target definition
-without recipe lines, it would normally issues
-a \fB"Don't know how to make ..."\fP error message, but if a target rule is
-terminated by a semicolon and has no following recipe lines,
-or if it has no recipe lines, but defines prerequisites,
-or if the AUGMAKE mode is enabled (see the COMPATIBILITY section for details),
-the target is treated as a virtual target and the error is suppressed. In
-addition to this, if the default target does not have recipe lines it is also
-treated as a virtual target.
-.PP
-Virtual targets should not have a corresponding file therefore
-they inherit the time of their newest prerequisite if they have prerequisites,
-otherwise they get the current time assigned when being made.
-If the virtual target has a corresponding file a warning is issued, but the
-time stamp of that file is taken into account. The virtual target uses the
-time stamp of the corresponding file if it is newer than the one determined
-by the previous rule.
-.SH "SPECIAL TARGETS"
-This section describes the special targets that are recognized by \fBdmake\fP.
-Some are affected by attributes and others are not.
-.IP \fB.ERROR\fP 1.4i
-If defined then the recipe associated with this target is executed
-whenever an error condition is detected by \fBdmake\fP.  All attributes that
-can be used with any other target may be used with this target.  Any
-prerequisites of this target will be brought up to date during its processing.
-NOTE:  errors will be ignored while making this target, in extreme cases this
-may cause some problems.
-.IP \fB.EXIT\fP 1.4i
-If this target is encountered while parsing a makefile then the parsing of the
-makefile is immediately terminated at that point.
-.IP \fB.EXPORT\fP 1.4i
-All prerequisites associated with this target are assumed to
-correspond to macro names and they and their values
-are exported to the environment as environment strings at the point in
-the makefile at which this target appears.
-Any attributes specified with this target are ignored.
-Only macros which have been assigned a value in the makefile prior to the
-export directive are exported, macros as yet undefined
-or macros whose value contains any of the characters "+=:*"
-are not exported.
-.sp
-Note that macros that are not expanded during the macro assignment and contain
-other macros will be written into the environment containing these other
-macros in the form of $(macroname).
-.IP \fB.IMPORT\fP 1.4i
-Prerequisite names specified for this target are searched for in the
-environment and defined as macros with their value taken from the environment.
-If the special name \fB.EVERYTHING\fP is used as a prerequisite name then
-all environment variables defined in the environment are imported.
-The functionality of the \fB\-E\fP flag can be forced by placing the construct
-\&\fI.IMPORT : .EVERYTHING\fP at the start of a makefile.  Similarly, by
-placing the construct at the end, one can emulate the effect of the \fB\-e\fP
-command line flag.
-If a prerequisite name cannot be found in the environment
-an error message is issued.
-\&.IMPORT accepts the .IGNORE attribute.  When given, it causes \fBdmake\fP
-to ignore the above error.
-See the MACROS section for a description of the processing of imported macro
-values.
-.IP \fB.INCLUDE\fP 1.4i
-Parse another makefile just as if it had been located at the point of the
-\&.INCLUDE in the current makefile.
-The list of prerequisites gives the list of
-makefiles to try to read.  If the list contains multiple makefiles then they
-are read in order from left to right.  The following search rules are used
-when trying to locate the file.  If the filename is surrounded by " or just
-by itself then it is searched for in the current directory.  If it is not
-found it is then searched for in each of the directories specified
-as prerequisites of the \&.INCLUDEDIRS special target.
-If the file name is surrounded by < and >, (ie.
-<my_spiffy_new_makefile>) then it is searched for only in the directories
-given by the .INCLUDEDIRS special target.  In both cases if the file name is a
-fully qualified name starting at the root of the file system then it is only
-searched for once, and the .INCLUDEDIRS list is ignored.
-If .INCLUDE fails to find the file it invokes the inference engine to
-try to infer and hence make the file to be included.  In this way the
-file can be checked out of an RCS repository for example.
-\&.INCLUDE accepts
-the .IGNORE, .SETDIR, and .NOINFER attributes.
-If the .IGNORE attribute is given and the file
-cannot be found then \fBdmake\fP continues processing,
-otherwise an error message is generated.
-If the .NOINFER attribute is given and the file
-cannot be found then \fBdmake\fP will not attempt to
-\fIinfer and make\fP the file.
-The .SETDIR attribute causes
-.B dmake
-to change directories to the specified directory prior to attempting the
-include operation.  If all fails \fBdmake\fP attempts to \fImake\fP the file
-to be included.  If making the file fails then \fBdmake\fP terminates unless
-the .INCLUDE directive also specified the .IGNORE attribute.
-If .FIRST is specified along with .INCLUDE then \fBdmake\fP attempts to
-include each named prerequisite and will terminate the inclusion with the
-first prerequisite that results in a successful inclusion.
-.IP \fB.INCLUDEDIRS\fP 1.4i
-The list of prerequisites specified for this target defines the set of
-directories to search when trying to include a makefile.
-.IP \fB.KEEP_STATE\fP 1.4i
-This special target is a synonym for the macro definition
-.sp
-\&\t.KEEP_STATE := _state.mk
-.sp
-It's effect is to turn on STATE keeping and to define \fI_state.mk\fP
-as the state file.
-.IP \fB.MAKEFILES\fP 1.4i
-The list of prerequisites is the set of files to try to read as the default
-makefile.  By default this target is defined as: 
-.sp
-\t\&.MAKEFILES : makefile.mk Makefile makefile
-.sp
-.IP \fB.REMOVE\fP 1.4i
-The recipe of this target is used whenever \fBdmake\fP needs to remove
-intermediate targets that were made but do not need to be kept around.
-Such targets result from the application of transitive closure on the
-dependency graph.
-.IP \fB.ROOT\fP 1.4i
-The internal root of the dependency graph, see section STARTUP for details.
-.IP \fB.SOURCE\fP 1.4i
-The prerequisite list of this target defines a set of directories to check
-when trying to locate a target file name.  See the section on BINDING of
-targets for more information.
-.IP \fB.SOURCE.suff\fP 1.4i
-The same as .SOURCE, except that the .SOURCE.suff list is searched first when
-trying to locate a file matching the a target whose name ends in the suffix
-\&.suff.
-.IP \fB.SUFFIXES\fP 1.4i
-This deprecated special target has no special meaning. Avoid its use.
-.IP \fB.TARGETS\fP 1.4i
-The internal targets that all user defined targets are prerequisites of,
-see section STARTUP for details.
-.PP
-There are a few targets that are "slightly" special:
-.RS
-.nf
-
-\&\fB.INIT\fP
-\&\fB.DONE\fP
-
-.fi
-.RE
-These targets exist because of historical reasons, see the usage of .INIT
-and .DONE in section "STARTUP", they can be used and defined as ordinary
-targets but are special in the sense that even though they start with a `.'
-they are not treated as a .<suffix> meta target (See the AUGMAKE META RULES
-section for details).
-.PP
-.B Please note
-that self defined targets shouldn't use the prefix `.' as they would be
-handled as .<suffix> meta targets and dmake most propably would complain
-about this.
-.PP
-In addition to the special targets above,
-several other forms of targets are recognized and are considered special,
-their exact form and use is defined in the sections that follow.
-.SH "SPECIAL MACROS"
-.B dmake
-defines a number of special macros.  They are divided into three classes:
-control macros, run-time macros, and function macros.
-The control macros are used by
-.B dmake
-to configure its actions, and are the preferred method of doing so.
-In the case when a control macro has the same function as a special 
-target or attribute they share the same name as the special target or
-attribute.
-The run-time macros are defined when
-.B dmake
-makes targets and may be used by the user inside recipes.
-The function macros provide higher level functions dealing with macro
-expansion and diversion file processing.
-.SH "CONTROL MACROS"
-To use the control macros simply assign them a value just like any other
-macro.  The control macros are divided into three groups:
-string valued macros, character valued macros, and boolean valued macros.
-.PP
-The following are all of the string valued macros.
-This list is divided into two groups.  The first group gives the string
-valued macros that are defined internally and cannot be directly set by the
-user.
-.IP \fBABSMAKECMD\fP 1.6i
-\fBWarning!\fP This macro's value is differently defined for a native Windows
-dmake executable (compiled with MS Visual C++ or MinGW) and dmake for other
-operating systems or build with other compilers.
-.sp
-In the first case its value is the absolute filename of the executable of
-the current dmake process, otherwise it is defined as the NULL string.
-.IP \fBINCDEPTH\fP 1.6i
-This macro's value is a string of digits representing
-the current depth of makefile inclusion.
-In the first makefile level this value is zero.
-.IP \fBMFLAGS\fP 1.6i
-Is the list of flags
-that were given on the command line including a leading switch character.
-The \-f flag is not included in this list.
-.IP \fBMAKECMD\fP 1.6i
-Is the name with which \fBdmake\fP was invoked.
-.IP \fBMAKEDIR\fP 1.6i
-Is the full path to the initial directory in which
-.B dmake
-was invoked.
-.IP \fBMAKEFILE\fP 1.6i
-Contains the string "\-f \fImakefile\fP" where, \fImakefile\fP is the name
-of initial user makefile that was first read.
-.IP \fBMAKEFLAGS\fP 1.6i
-Is the same as $(MFLAGS) but has no leading switch
-character. (ie. MFLAGS = \-$(MAKEFLAGS))
-.IP \fBMAKEMACROS\fP 1.6i
-Contains the complete list of macro expressions that were specified on the
-command line.
-.IP \fBMAKETARGETS\fP 1.6i
-Contains the name(s) of the target(s), if any, that were
-specified on the command line.
-.IP \fBMAKEVERSION\fP 1.6i
-Contains a string indicating the current \fBdmake\fP version number.
-.IP \fBMAXPROCESSLIMIT\fP 1.6i
-Is a numeric string representing the maximum number of processes that 
-\fBdmake\fP can use when making targets using parallel mode.
-.IP \fBNULL\fP 1.6i
-Is permanently defined to be the NULL string.
-This is useful when comparing a conditional expression to an NULL value.
-.IP \fBPWD\fP 1.6i
-Is the full path to the
-current directory in which make is executing.
-.IP \fBSPACECHAR\fP 1.6i
-Is permanently defined to contain one space character. This is useful
-when using space characters in function macros, e.g. subst, that
-otherwise would get deleted (leading/trailing spaces) or for using
-spaces in function macro parameters.
-.IP \fBTMPFILE\fP 1.6i
-Is set to the name of the most recent temporary file opened by \fBdmake\fP.
-Temporary files are used for text diversions and for group recipe processing.
-.IP \fBTMD\fP 1.6i
-Stands for "To Make Dir", and
-is the path from the present directory (value of $(PWD)) to the directory
-that \fBdmake\fP was started up in (value of $(MAKEDIR)). If the present
-directory is the directory that \fBdmake\fP was started up in TMD will be
-set to the relative path ".". This allows to create valid paths by prepending
-$(TMD)$(DIRSEPSTR) to a relative path.
-This macro is modified when .SETDIR attributes are processed.
-TMD will usually be a relative path with the following two exceptions. If the
-relative path would go up until the root directory or if different drive
-letters (DOS file system) make a relative path impossible the absolute path
-from MAKEDIR is used.
-.IP \fBUSESHELL\fP 1.6i
-The value of this macro is set to "yes" if the current recipe is forced to
-use a shell for its execution via the .USESHELL or '+' directives, its value
-is "no" otherwise.
-.sp
-.PP
-The second group of string valued macros control
-.B dmake
-behavior and may be set by the user.
-.IP \fB.DIRCACHE\fP 1.6i
-If set to "yes" enables the directory cache (this is the default).  If set to
-"no" disables the directory cache (equivalent to -d command-line flag).
-.IP \fB.DIRCACHERESPCASE\fP 1.6i
-If set to "yes" causes the directory cache, if enabled, to respect
-file case, if set to "no" files are cached case insensitive.
-By default it is set to "no" on Windows as the filesystems on
-this operating system are case insensitive and set to "yes" for all
-other operating systems. The default can be overriden, if desired.
-.sp
-\fBNote:\fP Using case insensitive directory caching on case sensitive
-file systems is a \fBBAD\fP idea. If in doubt use case sensitive
-directory caching even on case insensitive file systems as the
-worst case in this scenario is that /foo/bar/ and /foo/BAR/ are
-cached separately (with the same content) even though they are
-the same directory. This would only happen if different targets
-use different upper/lower case spellings for the same directory
-and that is \fBnever\fP a good idea.
-.IP \fBNAMEMAX\fP 1.6i
-Defines the maximum length of a filename component.  The value of the variable
-is initialized at startup to the value of the compiled macro NAME_MAX.  On
-some systems the value of NAME_MAX is too short by default.  Setting a new
-value for NAMEMAX will override the compiled value.
-.IP \fB.NOTABS\fP 1.6i
-When set to "yes" enables the use of spaces as well as <tabs> to begin
-recipe lines.
-By default a non\-group recipe is terminated by a line without any leading
-white\-space or by a line not beggining with a <tab> character.
-Enabling this mode modifies the first condition of
-the above termination rule to terminate a
-non\-group recipe with a line that contains only white\-space.
-This mode does not effect the parsing of group recipes bracketed by [].
-.IP \fBAUGMAKE\fP 1.6i
-If set to "yes" value will enable the transformation of special
-meta targets to support special AUGMAKE inferences (See the "AUGMAKE
-META RULES" and "COMPATIBILITY" sections).
-.IP \fBDIRBRKSTR\fP 1.6i
-Contains the string of chars used to terminate
-the name of a directory in a pathname.
-Under UNIX its value is "/", under MSDOS its value is "/\e:".
-.IP \fBDIRSEPSTR\fP 1.6i
-Contains the string that is used to separate directory components when
-path names are constructed.  It is defined with a default value at startup.
-.IP \fBDIVFILE\fP 1.6i
-Is defined in the startup file and gives the name that should be returned for
-the diversion file name when used in
-$(mktmp ...) expansions, see the TEXT DIVERSION section for details.
-.IP \fB.KEEP_STATE\fP 1.6i
-Assigning this macro a value tells
-.B dmake
-the name of the state file to use and turns on the keeping of state
-information for any targets that are brought up to date by the make.
-.IP \fBGROUPFLAGS\fP 1.6i
-This macro gives the set of flags to pass to the shell when
-invoking it to execute a group recipe.  The value of the macro is the
-list of flags with a leading switch indicator.  (ie. `\-' under UNIX)
-.IP \fBGROUPSHELL\fP 1.6i
-This macro defines the full
-path to the executable image to be used as the shell when
-processing group recipes.  This macro must be defined if group recipes are
-used.  It is assigned a default value in the startup makefile.  Under UNIX
-this value is /bin/sh.
-.IP \fBGROUPSUFFIX\fP 1.6i
-If defined, this macro gives the string to use as a suffix
-when creating group recipe files to be handed to the command interpreter.
-For example, if it is defined as .sh, then all
-temporary files created by \fBdmake\fP will end in the suffix .sh.
-Under MSDOS if you are using command.com as your GROUPSHELL, then this suffix
-must be set to .bat in order for group recipes to function correctly.
-The setting of GROUPSUFFIX and GROUPSHELL is done automatically for
-command.com in the startup.mk files.
-.IP \fBMAKE\fP 1.6i
-Is defined in the startup file by default.
-Initially this macro is defined to have the value "$(MAKECMD) $(MFLAGS)".
-The string $(MAKE) is recognized when using the \-n switch.
-.IP \fBMAKESTARTUP\fP 1.6i
-This macro defines the full path to the initial startup
-makefile.  Use the \fB\-V\fP command line option to discover its initial
-value.
-.IP \fBMAXLINELENGTH\fP 1.6i
-This macro defines the maximum size of a single line of
-makefile input text.  The size is specified as a number, the default value
-is defined internally and is shown via the \fB\-V\fP option.
-A buffer of this size plus 2 is allocated for reading makefile text.  The
-buffer is freed before any targets are made, thereby allowing files containing
-long input lines to be processed without consuming memory during the actual
-make.
-This macro can only be used to extend the line length beyond it's default
-minimum value.
-.IP \fBMAXPROCESS\fP 1.6i
-Specify the maximum number of child processes to use when making targets.
-The default value of this macro is "1" and its value cannot exceed the value
-of the macro MAXPROCESSLIMIT.  Setting the value of MAXPROCESS on the command
-line or in the makefile is equivalent to supplying a corresponding value to
-the -P flag on the command line. If the global .SEQUENTIAL attribute is set
-(or the -S command line switch is used) the value of MAXPROCESS is fixed
-to "1" and cannot be changed.
-.IP \fBOOODMAKEMODE\fP 1.6i
-This macro enables a special compatibility mode needed by the OpenOffice.org
-build system. If set, the switch disables the removal of leading './' path
-elements during target filename normalization (See BINDING TARGETS). If './'
-appear in the pathname, but not at the beginning of it, they are still
-removed by the normalization. Please note that targets that are given on the
-command line are going to be registered as default targets \fBafter\fP the
-startup file is read.
-.IP \fBPREP\fP 1.6i
-This macro defines the number of iterations to be expanded
-automatically when processing % rule definitions of the form:
-.sp
-% : %.suff
-.sp
-See the sections on PERCENT(%) RULES for details on how PREP is used.
-.IP \fBSHELL\fP 1.6i
-This macro defines the full path to the executable
-image to be used as the shell when
-processing single line recipes.  This macro must be defined if recipes
-requiring the shell for execution are to be used.
-It is assigned a default value in the startup makefile.
-Under UNIX this value is /bin/sh.
-.IP \fBSHELLCMDQUOTE\fP 1.6i
-This macro can be used to add additional characters before and after the
-command string that is passed to the shell defined by the SHELL macro.
-If needed, like for \fIcmd.exe\fP and \fIcommand.com\fP, it is assigned
-a value in the startup file.
-.IP \fBSHELLFLAGS\fP 1.6i
-This macro gives the set of flags to pass to the shell when
-invoking it to execute a single line recipe.  The value of the macro is the
-list of flags with a leading switch indicator.  (ie. `\-' under UNIX)
-.IP \fBSHELLMETAS\fP 1.6i
-Each time
-.B dmake
-executes a single recipe line (not a group recipe) the line is
-searched for any occurrence of a character defined in the value of SHELLMETAS.
-If such a character is found the recipe line is defined to require a shell
-to ensure its correct execution.  In such instances
-a shell is used to invoke the recipe line.
-If no match is found the recipe line is executed without the use of a shell.
-.sp
-.PP
-There is only one character valued macro defined by \fBdmake\fP:
-\fBSWITCHAR\fP contains the switch character used
-to introduce options on command lines.  For UNIX its value is `\-', and for
-MSDOS its value may be `/' or `\-'.
-The macro is internally defined and is not user setable.
-The MSDOS version of \fBdmake\fP attempts to first extract SWITCHAR from an
-environment variable of the same name.  If that fails it then attempts to
-use the undocumented getswitchar system call, and returns the result of
-that.  Under MSDOS version 4.0 you must set the value of the environment
-macro SWITCHAR to '/' to obtain predictable behavior.
-.PP
-All boolean macros currently understood by 
-.B dmake
-correspond directly to the previously defined attributes.
-These macros provide
-a second way to apply global attributes, and represent the
-preferred method of doing so.  They are used by assigning them a
-value.  If the value is not a NULL string then the boolean condition
-is set to on.
-If the value is a NULL string then the condition is set to off.
-There are five conditions defined and they correspond directly to the
-attributes of the same name.  Their meanings are defined in the ATTRIBUTES
-section above.
-The macros are:
-\&\fB.EPILOG\fP,
-\&\fB.IGNORE\fP,
-\&\fB.MKSARGS\fP,
-\&\fB.NOINFER\fP,
-\&\fB.PRECIOUS\fP,
-\&\fB.PROLOG\fP,
-\&\fB.SEQUENTIAL\fP,
-\&\fB.SILENT\fP,
-\&\fB.SWAP\fP, and
-\&\fB.USESHELL\fP.
-Assigning any of these a non NULL value will globally set
-the corresponding attribute to on.
-.SH "RUNTIME MACROS"
-These macros are defined
-when \fBdmake\fP is making targets, and may take on different values for each
-target.  \fB$@\fP is defined to be the full target name, \fB$?\fP is the
-list of all out of date prerequisites, except for the \fB!\fP ruleop, in
-which case it is set to the current build
-prerequisite instead.  \fB$&\fP is the list of all
-prerequisites, \fB$>\fP is the name of the library if the current target is a
-library member, and
-\fB$<\fP is the list of prerequisites specified in the current rule.
-If the current target had a recipe inferred then \fB$<\fP is the name of the
-inferred prerequisite even if the target had a list of prerequisites supplied
-using an explicit rule that did not provide a recipe.  In such situations
-\fB$&\fP gives the full list of prerequisites.
-.PP
-\fB$*\fP is defined as
-\fB$(@:db)\fP when making targets with explicit recipes and is defined as the
-value of % when making targets whose recipe is the result of an inference.
-In the first case \fB$*\fP is the target name with no suffix,
-and in the second case, is the value of the matched % pattern from
-the associated %-rule.
-\fB$^\fP expands to the set of out of date prerequisites taken from the
-current value of \fB$<\fP.
-In addition to these,
-\fB$$\fP expands to $, \fB{{\fP expands to {, \fB}}\fP expands to }, and the
-strings \fB<+\fP and \fB+>\fP are recognized
-as respectively starting and terminating a text diversion when they appear
-literally together in the same input line.
-.PP
-The difference between $? and $^ can best be illustrated by an example,
-consider:
-.RS
-.sp
-.nf
-fred.out : joe amy hello
-\trules for making fred
-
-fred.out : my.c your.h his.h her.h	  # more prerequisites
-.fi
-.sp
-.RE
-Assume joe, amy, and my.c are newer then fred.out.  When
-.B dmake
-executes the recipe for making fred.out the values of the following macros
-will be:
-.RS
-.sp
-.nf
-.Is "$@ "
-.Ii "$@"
---> fred.out
-.Ii "$*"
---> fred
-.Ii "$?"
---> joe amy my.c  # note output of $? vs $^
-.Ii "$^"
---> joe amy
-.Ii "$<"
---> joe amy hello
-.Ii "$&"
---> joe amy hello my.c your.h his.h her.h
-.fi
-.sp
-.RE
-.SH "FUNCTION MACROS"
-.B dmake
-supports a full set of functional macros.  One of these, the $(mktmp ...)
-macro, is discussed in detail in the TEXT DIVERSION section and is not
-covered here.
-The names of function macros must appear literally after the opening $(
-or ${. They are \fBnot\fP recognized if they are the result of a recursive
-expansion.
-.PP
-Note that some of these macros take comma separated parameters
-but that these parameters must not contain literal whitespaces. Whitespaces
-in macros used in these parameters are allowed.
-.RS
-.sp
-.IP "$(\fBand\fP \fBmacroterm ...\fP)"
-expands each \fBmacroterm\fP in turn until there are no more or one of
-them returns an empty string.  If all expand to non-empty strings the
-macro returs the string "t" otherwise it returns an empty string.
-.sp
-.IP "$(\fBassign\fP \fBexpression\fP)"
-Causes \fIexpression\fP to be parsed as a macro assignment expression and results
-in the specified assignment being made.  An error is issued if the assignment
-is not syntatically correct.  \fIexpression\fP may contain white space.  This is
-in effect a dynamic macro assignment facility and may appear anywhere any
-other macro may appear.  The result of the expanding a dynamic macro
-assignment expression is the name of the macro that was assigned and $(NULL)
-if the \fIexpression\fP is not a valid macro assignment expression.
-Some examples are:
-.RS
-.sp
-.nf
-$(assign foo := fred)
-$(assign $(ind_macro_name) +:= $(morejunk))
-.fi
-.RE
-.IP "$(\fBecho\fP \fBlist\fP)"
-Echo's the value of \fIlist\fP.  \fIlist\fP is not expanded.
-.IP "$(\fBeq\fP,\fItext_a\fP,\fItext_b\fP \fBtrue\fP \fBfalse\fP)"
-expands
-.I text_a
-and
-.I text_b
-and compares their results.  If equal it returns the result of the expansion
-of the 
-.B true
-term, otherwise it returns the expansion of the
-.B false
-term.
-.IP "$(\fB!eq\fP,\fItext_a\fP,\fItext_b\fP \fBtrue\fP \fBfalse\fP)"
-Behaves identically to the previous macro except that the 
-.B true
-string is chosen if the expansions of the two strings are not equal
-.IP "$(\fBforeach\fP,\fIvar\fP,\fIlist\fP \fBdata\fP)"
-Implements iterative macro expansion over \fIdata\fP using \fBvar\fP as the
-iterator taking on values from \fIlist\fP. \fIvar\fP and \fIlist\fP are
-expanded and the result is the concatenation of expanding \fIdata\fP with
-\fIvar\fP being set to each whitespace separated token from \fIlist\fP.
-For example:
-.RS
-.RS
-.sp
-.nf
-list = a b c
-all :; echo [$(foreach,i,$(list) [$i])]
-.fi
-.sp
-.RE
-will output
-.RS
-.sp
-.nf
-[[a] [b] [c]]
-.fi
-.sp
-.RE
-The iterator variable is defined as a local variable to this foreach
-instance.  The following expression illustrates this:
-.RS
-.sp
-.nf
-$(foreach,i,$(foreach,i,$(sort c a b) root/$i) [$i/f.h])
-.fi
-.sp
-.RE
-when evaluated the result is:
-.RS
-.sp
-.nf
-[root/a/f.h] [root/b/f.h] [root/c/f.h]
-.fi
-.sp
-.RE
-The specification of list must be a valid macro expression, such as:
-.RS
-.sp
-.nf
-$($(assign list=a b c))
-$(sort d a b c)
-$(echo a b c)
-.fi
-.sp
-.RE
-and cannot just be the list itself.  That is, the following foreach
-expression:
-.RS
-.sp
-.nf
-$(foreach,i,a b c [$i])
-.fi
-.sp
-.RE
-yields:
-.RS
-.sp
-.nf	
-"b c [a]"
-.fi
-.sp
-.RE
-when evaluated.
-.RE
-.IP "$(\fBnil\fP \fBexpression\fP)"
-Always returns the value of $(NULL) regardless of what \fIexpression\fP is.
-This function macro can be used to discard results of expanding
-macro expressions.
-.IP "$(\fBnormpath\fP \fBlist\fP)"
-Will return the normalized path names of all white-space separated tokens
-in \fBlist\fP. Quotes can be used to normalize path names that contain
-white-space characters. On cygwin the result honors the setting of .WINPATH
-to determine the output format of the returned path names.
-.IP "$(\fBnormpath,para\fP \fBlist\fP)"
-Same as above except that the expanded value of \fBpara\fP is used to
-override the .WINPATH setting.
-.IP "$(\fBnot\fP \fBmacroterm\fP)"
-expands \fBmacroterm\fP and returs the string "t" if the result of the
-expansion is the empty string; otherwise, it returns the empty string.
-.IP "$(\fBnull\fP,\fItext\fP \fBtrue\fP \fBfalse\fP)"
-expands the value of
-.I text.
-If it is NULL then the macro returns the value of the expansion of \fBtrue\fP
-and the expansion of \fBfalse\fP otherwise.  The terms \fBtrue\fP, and
-\fBfalse\fP must be strings containing no white\-space.
-.IP "$(\fB!null\fP,\fItext\fP \fBtrue\fP \fBfalse\fP)"
-Behaves identically to the previous macro except that the 
-.B true
-string is chosen if the expansion of
-.I text
-is not NULL.
-.IP "$(\fBor\fP \fBmacroterm ...\fP)"
-expands each \fBmacroterm\fP in turn and returs the empty string if
-each term expands to the empty string; otherwise, it returs the string
-"t".
-.IP "$(\fBshell\fP \fBcommand\fP)"
-is a shell escape macro. It runs \fIcommand\fP as if it were part of a
-recipe and returns, separated by a single space, all the non-white
-space terms written to stdout by the command.
-For example:
-.RS
-.RS
-.sp
-$(shell ls *.c)
-.sp
-.RE
-will return \fI"a.c b.c c.c d.c"\fP if the files exist in the current
-directory.  The recipe modification flags \fB[+@%\-]\fP are honored if they
-appear as the first characters in the command.  For example:
-.RS
-.sp
-$(shell +ls *.c)
-.sp
-.RE
-will run the command using the current shell.
-.LP
-\fBNote\fP that if the macro is part of a recipe it will be evaluated after
-all previous recipe lines have been executed. For obvious reasons it will be
-evaluated before the current recipe line or group recipe is executed.
-.RE
-.IP "$(\fBshell,expand\fP \fBcommand\fP)"
-Is an extension to the \fB$(shell command)\fP function macro that expands the
-result of running \fBcommand\fP.
-.IP "$(\fBsort\fP \fBlist\fP)"
-Will take all white\-space separated tokens in \fIlist\fP and will
-return their sorted equivalent list.
-.IP "$(\fBstrip\fP \fBdata\fP)"
-Will replace all strings of white\-space in data by a single space.
-.IP "$(\fBsubst\fP,\fIpat\fP,\fIreplacement\fP \fBdata\fP)"
-Will search for \fIpat\fP in
-.B data
-and will replace any occurrence of
-.I pat
-with the
-.I replacement
-string.  The expansion
-.RS
-.sp
-$(subst,.o,.c $(OBJECTS))
-.sp
-.RE
-is equivalent to:
-.RS
-.sp
-$(OBJECTS:s/.o/.c/)
-.sp
-.RE
-.IP "$(\fBuniq\fP \fBlist\fP)"
-Will take all white\-space separated tokens in \fIlist\fP and will
-return their sorted equivalent list containing no duplicates.
-.sp
-.RE
-For historic reasons \fBdmake\fP treats the following case slightly special:
-.RS
-.sp
-$(\fBname\fP \fBsomething\fP)
-.sp
-.RE
-If it encounters a macro with a whitespace after \fBname\fP and \fBname\fP
-is not literally one of the above mentioned function macro identifiers then
-\fBdmake\fP will return the recursively expanded value of \fB$(name)\fP.
-The remaining \fBsomething\fP part will be expanded but the result will be
-discarded. The use of this special feature is deprecated and should not be
-used.
-.sp
-.SH "CONDITIONAL MACROS"
-.B dmake
-supports conditional macros.  These allow the definition of target specific
-macro values.  You can now say the following:
-.RS
-.sp
-\fBtarget\fP ?= \fIMacroName MacroOp Value\fP
-.sp
-.RE
-This creates a definition for \fIMacroName\fP whose value is \fIValue\fP
-only when \fBtarget\fP is being made.  You may use a conditional macro
-assignment anywhere that a regular macro assignment may appear, including
-as the value of a $(assign ...) macro.
-.LP
-The new definition is associated with the most recent cell definition
-for \fBtarget\fP.  If no prior definition exists then one is created.  The
-implications of this are immediately evident in the following example:
-.sp
-.RS
-.nf
-foo := hello
-.sp
-all : cond;@echo "all done, foo=[$(foo)] bar=[$(bar)]"
-.sp
-cond ?= bar := global decl
-.sp
-cond .SETDIR=unix::;@echo $(foo) $(bar)
-cond ?= foo := hi
-.sp
-cond .SETDIR=msdos::;@echo $(foo) $(bar)
-	cond ?= foo := hihi
-.fi
-.RE
-.sp
-The first conditional assignment creates a binding for 'bar' that is
-activated when 'cond' is made.  The bindings following the :: definitions are
-activated when their respective recipe rules are used.  Thus the
-first binding serves to provide a global value for 'bar' while any of the
-cond :: rules are processed, and the local bindings for 'foo' come into
-effect when their associated :: rule is processed.
-.LP
-Conditionals for targets of .UPDATEALL are all activated before the
-target group is made.  Assignments are processed in order.  Note that
-the value of a conditional macro assignment is NOT AVAILABLE until the
-associated target is made, thus the construct
-.sp
-.RS
-.nf
-mytarget ?= bar := hello
-mytarget ?= foo := $(bar)
-.fi
-.RE
-.sp
-results in $(foo) expanding to "", if you want the result to be "hello"
-you must use:
-.sp
-.RS
-.nf
-mytarget ?= bar := hello
-mytarget ?= foo  = $(bar)
-.fi
-.RE
-.sp
-Once a target is made any associated conditional macros are deactivated
-and their values are no longer available.  Activation occurrs after all
-inference, and .SETDIR directives have been processed and after $@ is
-assigned, but before prerequisites are processed; thereby making the values of
-conditional macro definitions available during construction of prerequisites.
-.LP
-If a %-meta rule target has associated conditional macro assignments,
-and the rule is chosen by the inference algorithm then the conditional
-macro assignments are inferred together with the associated recipe.
-.SH "DYNAMIC PREREQUISITES"
-.B dmake
-looks for prerequisites whose names contain macro expansions during target
-processing.  Any such prerequisites are expanded and the result of the
-expansion is used as the prerequisite name.  As an example the line:
-.sp
-\tfred : $$@.c
-.sp
-causes the $$@ to be expanded when \fBdmake\fP is making fred, and it resolves
-to the target \fIfred\fP.
-This enables dynamic prerequisites to be generated.  The value
-of @ may be modified by any of the valid macro modifiers.  So you can say for
-example:
-.sp
-\tfred.out : $$(@:b).c
-.sp
-where the $$(@:b) expands to \fIfred\fP.
-Note the use of $$ instead of $ to indicate the dynamic expansion, this
-is due to the fact that the rule line is expanded when it is initially parsed,
-and $$ then returns $ which later triggers the dynamic prerequisite expansion.
-Dynamic macro expansion is performed in all user defined rules, and the special
-targets .SOURCE*, and .INCLUDEDIRS.
-.PP
-\fBNOTE:\fP The use of a \fB$\fP as part of a prerequisite or target name is
-\fBstrongly discouraged\fP as the runtime macros (like $@) are expanded when
-used in a recipe line so that the $ is interpreted as a macro identifier and
-not as a character of the filename leading to invalid runtime macros.
-In addition to this no filename normalization is done for prerequisites and
-targets that contain $ characters.
-Nevertheless it is possible to use $ in prerequisites by using $$$$ but this
-is \fBnot recommended\fP and can lead to surprising results.
-.PP
-If dynamic macro expansion results in multiple white space separated tokens
-then these are inserted into the prerequisite list inplace of the dynamic
-prerequisite.  Due to the recursive nature of macro expansion the prerequisite
-list is fully expanded even if the dynamic prerequisite contained other
-runtime macros.
-.SH "BINDING TARGETS"
-This operation takes a target name and binds it to an existing file, if
-possible.
-.B dmake
-makes a distinction between the internal target name of a target and its
-associated external file name.
-Thus it is possible for a target's internal name and its external
-file name to differ.
-To perform the binding, the following set of rules is used.
-Assume that we are
-trying to bind a target whose name is of the form \fIX.suff\fP,
-where \fI.suff\fP is the suffix and \fIX\fP is the stem portion
-(ie. that part which contains the directory and the basename).
-.B dmake
-takes this target name and performs a series of search operations that try to
-find a suitably named file in the external file system.
-The search operation is user controlled
-via the settings of the various .SOURCE targets.
-.RS
-.IP 1.
-If target has the .SYMBOL attribute set then look for it in the library.
-If found, replace the target name with the library member name and continue
-with step 2.  If the name is not found then return.
-.IP 2.
-Extract the suffix portion (that following the `.') of the target name.
-If the suffix is not null, look up the special target .SOURCE.<suff>
-(<suff> is the suffix).  
-If the special target exists then search each directory given in
-the .SOURCE.<suff> prerequisite list for the target.
-If the target's suffix was null (ie. \fI.suff\fP was empty) then 
-perform the above search but use the special target .SOURCE.NULL instead.
-If at any point a match is found then terminate the search.
-If a directory in the prerequisite list is the special name `.NULL ' perform
-a search for the full target name without prepending any directory portion
-(ie. prepend the NULL directory).
-.IP 3.
-The search in step 2. failed.  Repeat the same search but this time
-use the special target .SOURCE.
-(a default target of '.SOURCE : .NULL' is defined by \fBdmake\fP at startup,
-and is user redefinable)
-.IP 4.
-The search in step 3. failed.
-If the target has the library member attribute (.LIBMEMBER)
-set then try to find the target in the library which was passed along
-with the .LIBMEMBER attribute (see the MAKING LIBRARIES section).
-The bound file name assigned to a target which is successfully
-located in a library is the same name that would be assigned had the search
-failed (see 5.).
-.IP 5.
-The search failed.  Either the target was not found in any of the search
-directories or no applicable .SOURCE special targets exist.
-If applicable .SOURCE special targets exist, but the target was not found,
-then \fBdmake\fP assigns the first name searched as the bound file name.
-If no applicable .SOURCE special targets exist,
-then the full original target name becomes the bound file name.
-.RE
-.PP
-There is potential here for a lot of search operations.  The trick is to
-define .SOURCE.x special targets with short search lists and leave .SOURCE
-as short as possible.
-The search algorithm has the following useful side effect.
-When a target having the .LIBMEMBER (library member) attribute is searched for,
-it is first searched for as an ordinary file.
-When a number of library members require updating it is desirable to compile
-all of them first and to update the library at the end in a single operation.
-If one of the members does not compile and \fBdmake\fP stops, then
-the user may fix the error and make again.  \fBdmake\fP will not remake any
-of the targets whose object files have already been generated as long as
-none of their prerequisite files have been modified as a result of the fix.
-.PP
-When \fBdmake\fP constructs target (and prerequisite) pathnames they are
-normalized  to the shortest (or most natural, see below for the cygwin case)
-representation.  Substrings like './' or of the form 'baz/..' are removed
-and multiple slashes are collapsed to one unless they are at the beginning
-of the pathname. Leading slashes are normalized according to POSIX rules,
-i.e. more than two leading slashes are reduced to one slash and a
-leading '//' is kept as it might have a special meaning. 
-For example "./foo", "bar/../foo" and foo are recognized as the same file.
-This may result in somewhat unexpected values of the macro expansion
-of runtime macros like \fB$@\fP, but is infact the corect result.
-.PP
-\fBNOTE:\fP  A cygwin \fBdmake\fP executable will accept DOS like pathnames
-with drive letters and cygwin POSIX pathnames and normalize them into its
-natural POSIX representation.  This might result in even more surprising
-values of runtime macros.
-.PP
-When defining .SOURCE and .SOURCE.x targets the construct
-.RS
-.sp
-\&.SOURCE :
-.br
-\&.SOURCE : fred gery
-.sp
-.RE
-is equivalent to
-.RS
-.sp
-\&.SOURCE :\- fred gery
-.RE
-.PP
-\fBdmake\fP correctly handles the UNIX Make variable VPATH.  By definition VPATH
-contains a list of ':' separated directories to search when looking for a
-target.  \fBdmake\fP maps VPATH to the following special rule:
-.RS
-.sp
-\&.SOURCE :^ $(VPATH:s/:/ /)
-.sp
-.RE
-Which takes the value of VPATH and sets .SOURCE to the same set of directories
-as specified in VPATH.
-.SH "PERCENT(%) RULES AND MAKING INFERENCES"
-When \fBdmake\fP makes a target, the target's set of prerequisites (if any)
-must exist and the target must have a recipe which \fBdmake\fP
-can use to make it.
-If the makefile does not specify an explicit recipe for the target then
-.B dmake
-uses special rules to try to infer a recipe which it can use
-to make the target.  Previous versions of Make perform this task by using
-rules that are defined by targets of the form .<suffix>.<suffix> (this is still
-supported, see "AUGMAKE META RULES") or by using the \fBnot supported\fP by
-dmake .SUFFIXES list of suffixes (see "SPECIAL TARGETS" for more details
-about .SUFFIXES).  The exact workings of this mechanism
-were sometimes difficult to understand and often limiting in their usefulness.
-Instead, \fBdmake\fP supports the concept of \fI%-meta\fP rules.  
-The syntax and semantics of these rules differ from standard rule lines as
-follows:
-.sp
-.nf
-.RS
-\fI<%-targets>\fP [\fI<attributes>\fP] \fI<ruleop>\fP [\fI<%-prereqs>\fP] [;\fI<recipe>\fP]
-.RE
-.fi
-.sp
-where \fI%-targets\fP are one or more targets containing exactly a single `%'
-sign,
-.I attributes
-is a list (possibly empty) of attributes,
-.I ruleop
-is the standard set of rule operators,
-.I "%-prereqs"
-\&, if present, is a list of prerequisites containing zero or more `%' signs,
-and
-.I recipe,
-if present, is the first line of the recipe.
-.PP
-If more than one %-target is present this line is equivalent to a repetition
-of the whole [<attributes>] <ruleop> [<%-prereqs>] [;<recipe>] sequence
-for each %-target, i.e. it is possible to specify the same rule for multiple
-%-targets. Because of this following only speaks about \fI<%-target>\fP as
-\fI%-targets\fP are divided into multiple definitions with a single %-target.
-.PP
-\fBNOTE:\fP  As multiple %-targets didn't work reliably with dmake versions prior
-to 4.5 unless the rule operator `|:' was used we currently issue a warning
-stating that it \fBnow\fP works.
-.PP
-The
-.I %-target
-defines a pattern against which a target whose recipe is
-being inferred gets matched.  The pattern match goes as follows:  all chars are
-matched exactly from left to right up to but not including the % sign in the
-pattern, % then matches the longest string from the actual target name
-not ending in
-the suffix given after the % sign in the pattern.
-Consider the following examples:
-.RS
-.sp
-.nf
-.Is "dir/%.c   "
-.Ii "%.c"
-matches fred.c but not joe.c.Z
-.Ii "dir/%.c"
-matches dir/fred.c but not dd/fred.c
-.Ii "fred/%"
-matches fred/joe.c but not f/joe.c
-.Ii "%"
-matches anything
-.fi
-.sp
-.RE
-In each case the part of the target name that matched the % sign is retained
-and is substituted for any % signs in the prerequisite list of the %-meta rule
-when the rule is selected during inference and
-.B dmake
-constructs the new dependency.
-.PP
-.B Please note,
-that only the first, non-indirect, prerequisite of the list is used for the
-inference mechanism. If more than one non-indirect prerequisite is given
-a warning is issued and all but the first non-indirect prerequisites are
-ignored. See below for a description of indirect prerequisites.
-.PP
-As an example the following %-meta rules describe the following:
-.RS
-.sp
-%.c : %.y ; recipe...
-.sp
-.RE
-describes how to make any file ending in .c if a corresponding file ending
-in .y can be found.
-.RS
-.sp
-foo%.o : fee%.k ; recipe...
-.sp
-.RE
-is used to describe how to make fooxxxx.o from feexxxx.k.
-.RS
-.sp
-%.a :; recipe...
-.sp
-.RE
-describes how to make a file whose suffix is .a without inferring any
-prerequisites.
-.RS
-.sp
-%.c : %.y 'yaccsrc/%.y' ; recipe...
-.sp
-.RE
-matches the corresponding .y file as prerequisite and additionally another .y
-file in the yaccsrc subdirectory as indirect prerequisite.
-Another interesting example is:
-.RS
-.sp
-% : RCS/%,v ; co $<
-.sp
-.RE
-which describes how to take any target and check it out of
-the RCS directory if the corresponding file exists in the RCS directory.
-The equivalent SCCS rule would be:
-.RS
-.sp
-% : s.% ; get $<
-.sp
-.RE
-.PP
-The previous RCS example defines an infinite rule, because it says how to make
-.I anything
-from RCS/%,v, and
-.I anything
-also includes RCS/fred.c,v.
-To limit the size of the graph that results from such rules
-.B dmake
-uses the macro variable PREP (stands for % repetition).  By default the value
-of this variable is 0, which says that no repetitions of a %-rule are to be
-generated.  If it is set to something greater than 0, then that many
-repetitions of any infinite %-rule are allowed.  If in the above
-example PREP was set to 1, then \fBdmake\fP would generate the dependency
-graph:
-.RS
-.sp
-% --> RCS/%,v --> RCS/RCS/%,v,v
-.sp
-.RE
-Where each link is assigned the same recipe as the first link.
-PREP should be used only in special cases, since it may result in
-a large increase in the number of possible prerequisites tested.
-.B dmake
-further assumes that any target that has no suffix can be made from
-a prerequisite that has at least one suffix.
-.PP
-.B dmake
-supports dynamic prerequisite generation for prerequisites of %-meta rules.
-This is best illustrated by an example.  The RCS rule shown above can infer
-how to check out a file from a corresponding RCS file only if the target
-is a simple file name with no directory information.  That is, the above rule
-can infer how to find \fIRCS/fred.c,v\fP from the target \fIfred.c\fP,
-but cannot infer how to find \fIsrcdir/RCS/fred.c,v\fP from \fIsrcdir/fred.c\fP
-because the above rule will cause \fBdmake\fP to look for RCS/srcdir/fred.c,v;
-which does not exist (assume that srcdir has its own RCS directory as is the
-common case).
-.PP
-A more versatile formulation of the above RCS check out rule is the following:
-.RS
-.sp
-% :  $$(@:d)RCS/$$(@:f),v : co $@
-.sp
-.RE
-This rule uses the dynamic macro $@ to specify the prerequisite to try to
-infer.  During inference of this rule the macro $@ is set to the value of
-the target of the %-meta rule and the appropriate prerequisite is generated by
-extracting the directory portion of the target name (if any), appending the
-string \fIRCS/\fP to it, and appending the target file name with a trailing
-\fI,v\fP attached to the previous result.
-.PP
-.B dmake
-can also infer indirect prerequisites.
-An inferred target can have a list of prerequisites added that will not
-show up in the value of $< but will show up in the value of $? and $&.
-Indirect prerequisites are specified in an inference rule by quoting the
-prerequisite with single quotes.  For example, if you had the explicit
-dependency:
-.RS
-.sp
-.nf
-fred.o : fred.c ; rule to make fred.o
-fred.o : local.h
-.fi
-.sp
-.RE
-then this can be inferred for fred.o from the following inference rule:
-.RS
-.sp
-%.o : %.c 'local.h' ; makes a .o from a .c
-.sp
-.RE
-You may infer indirect prerequisites that are a function of the value of '%'
-in the current rule.  The meta-rule:
-.RS
-.sp
-%.o : %.c '$(INC)/%.h' ; rule to make a .o from a .c
-.sp
-.RE
-infers an indirect prerequisite found in the INC directory whose name is the
-same as the expansion of $(INC), and the prerequisite name depends on the
-base name of the current target.
-The set of indirect prerequisites is attached to the meta rule in which they
-are specified and are inferred only if the rule is used to infer a recipe
-for a target.  They do not play an active role in driving the inference
-algorithm.
-The construct:
-.RS
-.sp
-%.o :| %.c %.f 'local.h'; recipe
-.sp
-.RE
-is equivalent to:
-.RS
-.sp
-.nf
-%.o : %.c 'local.h' ; recipe
-%.o : %.f 'local.h' ; recipe
-.fi
-.sp
-.RE
-.PP
-If any of the attributes .EPILOG, .IGNORE, .LIBRARY, .NOSTATE, .PHONY, .PRECIOUS,
-\&.PROLOG, .SETDIR, .SILENT, .SWAP, .USESHELL and .WINPATH
-are given for a %-rule then when that rule is bound to a target
-as the result of an inference, the target's set of attributes is augmented by
-the attributes from the above set that are specified in the bound %-rule.
-Other attributes specified for %-meta rules are not inherited by the target.
-The .SETDIR attribute is treated in a special way.
-If the target already had a .SETDIR attribute set then
-.B dmake
-changes to that directory prior to performing the inference.
-During inference any .SETDIR attributes for the inferred prerequisite
-are honored.
-The directories must exist for a %-meta rule to be selected as a possible
-inference path.  If the directories do not exist no error message is issued,
-instead the corresponding path in the inference graph is rejected.
-.PP
-.B dmake
-bases all of its inferences on the inference graph constructed from the
-%-rules defined in the makefile.
-It knows exactly which targets can be made from which prerequisites by
-making queries on the inference graph.
-.PP
-For a %-meta rule to be inferred as the
-rule whose recipe will be used to make a target, the target's name must match
-the %-target pattern, and any inferred %-prerequisite must already exist or
-have an explicit recipe so that the prerequisite can be made.
-Without \fItransitive closure\fP on the inference graph the above rule
-describes precisely when an inference match terminates the search.
-If transitive closure is enabled (the usual case), and a prerequisite does
-not exist or cannot be made, then
-.B dmake
-invokes the inference algorithm recursively on the prerequisite to see if
-there is some way the prerequisite can be manufactured.  For, if the
-prerequisite can be made then the current target can also be made using the
-current %-meta rule.
-This means that there is no longer a need to give a rule
-for making a .o from a .y if you have already given a rule for making a .o
-from a .c and a .c from a .y.  In such cases
-.B dmake
-can infer how to make the
-\&.o from the .y via the intermediary .c and will remove the .c when the .o is
-made.  Transitive closure can be disabled by giving the \-T switch on the
-command line.
-.PP
-A word of caution.
-.B dmake
-bases its transitive closure on the %-meta rule targets.
-When it performs transitive closure it infers how to make a target from a
-prerequisite by performing a pattern match as if the potential prerequisite
-were a new target.
-The set of rules:
-.RS
-.nf
-.sp
-%.o : %.c ; rule for making .o from .c
-%.c : %.y ; rule for making .c from .y
-% : RCS/%,v ; check out of RCS file
-.fi
-.sp
-.RE
-will, by performing transitive closure, allow \fBdmake\fP to infer how to make
-a .o from a .y using a .c as an intermediate temporary file.  Additionally
-it will be able to infer how to make a .y from an RCS file, as long as that
-RCS file is in the RCS directory and has a name which ends in .y,v.
-The transitivity computation is performed dynamically for each target that
-does not have a recipe.  This has potential to be costly if the %-meta
-rules are not carefully specified.  The .NOINFER attribute is used to mark
-a %-meta node as being a final target during inference.  Any node with this
-attribute set will not be used for subsequent inferences.  As an example
-the node RCS/%,v is marked as a final node since we know that if the RCS file
-does not exist there likely is no other way to make it.  Thus the standard
-startup makefile contains an entry similar to:
-.RS
-.nf
-\&.NOINFER : RCS/%,v
-.fi
-.RE
-Thereby indicating that the RCS file is the end of the inference chain.
-Whenever the inference algorithm determines that a target can be made from
-more than one prerequisite and the inference chains for the two methods
-are the same length the algorithm reports an ambiguity and prints the
-ambiguous inference chains.
-.PP
-.B dmake
-tries to
-remove intermediate files resulting from transitive closure if the file
-is not marked as being PRECIOUS, or the \fB\-u\fP flag was not given on the
-command line, and if the inferred intermediate did not previously exist.
-Intermediate targets that existed prior to being made are never removed.
-This is in keeping with the philosophy that
-.B dmake
-should never remove things from the file system that it did not add.
-If the special target .REMOVE is defined and has a recipe then
-.B dmake
-constructs a list of the intermediate files to be removed and makes them
-prerequisites of .REMOVE.  It then makes .REMOVE thereby removing the
-prerequisites if the recipe of .REMOVE says to.  Typically .REMOVE is defined
-in the startup file as:
-.RS
-.sp
-\&.REMOVE :; $(RM) $<
-.RE
-.SH "AUGMAKE META RULES"
-As a subclass of the meta targets that is actually mapped to %-meta rules
-.B dmake
-understands several SYSV AUGMAKE targets transformations. This .<suffix>
-special target construct transforms into the following %-meta rules:
-.RS
-.sp
-\&.suff :; recipe
-.sp
-.RE
-gets mapped into:
-.RS
-.sp
-% : %.suff; recipe
-.sp
-.RE
-.PP
-.B dmake
-also supports the old format special target .<suffix>.<suffix>
-by identifying any rules
-of this form and mapping them to the appropriate %-rule.  So for example if
-an old makefile contains the construct:
-.RS
-.sp
-\&.c.o :; cc \-c $< \-o $@
-.sp
-.RE
-.B dmake
-maps this into the following %-rule:
-.RS
-.sp
-%.o : %.c; cc \-c $< \-o $@
-.sp
-.RE
-The following SYSV AUGMAKE special targets transformation must be
-enabled by providing the \-A flag
-on the command line or by setting the value of AUGMAKE to non\-NULL.
-The construct
-.RS
-.sp
-\&.c~.o :; recipe
-.sp
-.RE
-gets mapped into:
-.RS
-.sp
-%.o : s.%.c ; recipe
-.sp
-.RE
-In general, a special target of the form .<str>~ is replaced by the %-rule
-construct s.%.<str>, thereby providing support for the syntax used by SYSV
-AUGMAKE for providing SCCS support.
-When enabled, these mappings allow processing of existing SYSV
-makefiles without modifications.
-.RE
-.SH "MAKING TARGETS"
-In order to update a target \fBdmake\fP must execute a recipe.
-When a recipe needs to be executed it is first expanded so that any macros
-in the recipe text are expanded, and it is then either executed directly or
-passed to a shell.
-.B dmake
-supports two types of recipes.  The regular recipes and group recipes.
-.PP
-When a regular recipe is invoked \fBdmake\fP executes each line of the recipe
-separately using a new copy of a shell if a shell is required.
-Thus effects of commands do not generally persist across recipe lines
-(e.g. cd requests in a recipe line do not carry over to the next recipe line).
-This is true even in environments such as \fBMSDOS\fP, where dmake internally
-sets the current working director to match the directory it was in before
-the command was executed.
-.PP
-The decision on whether a shell is required to execute a command is based on
-the value of the macro SHELLMETAS or on the specification of '+' or .USESHELL
-for the current recipe or target respectively.
-If any character in the value of
-SHELLMETAS is found in the expanded recipe text-line or the use of a shell
-is requested explicitly via '+' or .USESHELL then the command is
-executed using a shell, otherwise the command is executed directly.
-The shell that is used for execution is given by the value of the macro SHELL.
-The flags that are passed to the shell are given by the value of SHELLFLAGS.
-Thus \fBdmake\fP constructs the command line:
-.sp
-\t$(SHELL) $(SHELLFLAGS) $(expanded_recipe_command)
-.sp
-If the $(SHELLCMDQUOTE) macro is set its value is inserted before and after
-the $(expanded_recipe_command) string.
-.sp
-Normally
-.B dmake
-writes the command line that it is about to invoke to standard output.
-If the .SILENT attribute is set for the target or for
-the recipe line (via @), then the recipe line is not echoed.
-.PP
-Group recipe processing is similar to that of regular recipes, except that
-a shell is always invoked.  The shell that is invoked is given by the value of
-the macro GROUPSHELL, and its flags are taken from the value of the macro
-GROUPFLAGS.  If a target has the .PROLOG attribute set then
-.B dmake
-prepends to the shell script the recipe associated with the special target
-\&.GROUPPROLOG, and if the attribute .EPILOG is set as well, then the recipe
-associated with the special target .GROUPEPILOG is appended to the script
-file.
-This facility can be used to always prepend a common header and common trailer
-to group recipes.
-Group recipes are echoed to standard output just like standard recipes, but
-are enclosed by lines beginning with [ and ].
-.PP
-The recipe flags [+,\-,%,@] are recognized at the start of a recipe line
-even if they appear in a macro.  For example:
-.RS
-.sp
-.nf
-SH = +
-all:
-\t$(SH)echo hi
-.fi
-.sp
-.RE
-is completely equivalent to writing
-.RS
-.sp
-.nf
-SH = +
-all:
-\t+echo hi
-.fi
-.sp
-.RE
-.PP
-The last step performed by
-.B dmake
-prior to running a recipe is to set the macro CMNDNAME to the name of the
-command to execute (determined by finding the first white\-space ending token
-in the command line).  It then sets the macro CMNDARGS to be the remainder
-of the line.
-.B dmake
-then expands the macro COMMAND which by default is set to
-.RS
-.sp
-COMMAND = $(CMNDNAME) $(CMNDARGS)
-.sp
-.RE
-The result of this final expansion is the command that will be executed.
-The reason for this expansion is to allow for a different interface to
-the argument passing facilities (esp. under DOS) than that provided by
-.B dmake\fR.\fP
-You can for example define COMMAND to be
-.RS
-.sp
-COMMAND = $(CMNDNAME) @$(mktmp $(CMNDARGS))
-.sp
-.RE
-which dumps the arguments into a temporary file and runs the command
-.RS
-.sp
-$(CMNDNAME) @/tmp/ASAD23043
-.sp
-.RE
-which has a much shorter argument list.  It is now up to the command to
-use the supplied argument as the source for all other arguments.
-As an optimization, if COMMAND is not defined
-.B dmake
-does not perform the above expansion.  On systems, such as UNIX, that
-handle long command lines this provides a slight saving in processing the
-makefiles.
-.SH "MAKING LIBRARIES"
-Libraries are easy to maintain using \fBdmake\fP.  A library is a file
-containing a collection of object files.
-Thus to make a library you simply specify it as a target with the .LIBRARY
-attribute set and specify its list of prerequisites.  The prerequisites should
-be the object members that are to go into the library.  When
-.B dmake
-makes the library target it uses the .LIBRARY attribute to pass to the
-prerequisites the .LIBMEMBER attribute and the name of the library.  This
-enables the file binding mechanism to look for the member in the library if an
-appropriate object file cannot be found. 
-.B dmake
-now supports \fBElf\fP libraries on systems that support \fBElf\fP and
-hence supports, on those systems, long member file names.
-A small example best illustrates this.
-.RS
-.nf
-.sp
-mylib.a .LIBRARY : mem1.o mem2.o mem3.o
-\trules for making library...
-\t# remember to remove .o's when lib is made
-.sp
-# equivalent to:  '%.o : %.c ; ...'
-\&.c.o :; rules for making .o from .c say
-.sp
-.fi
-.RE
-.B dmake
-will use the .c.o rule for making the library members if appropriate .c files
-can be found using the search rules.  NOTE:  this is not specific in any way
-to C programs, they are simply used as an example.
-.PP
-.B dmake
-tries to handle the old library construct format in a sensible way.
-The construct 
-.I lib(member.o)
-is separated and the \fIlib\fP portion is declared
-as a library target.
-The new target is defined
-with the .LIBRARY attribute set and the \fImember.o\fP portion of the
-construct is
-declared as a prerequisite of the lib target.
-If the construct \fIlib(member.o)\fP
-appears as a prerequisite of a target in the
-makefile, that target has the new name of the lib assigned as its
-prerequisite.  Thus the following example:
-.RS
-.sp
-.nf
-a.out : ml.a(a.o) ml.a(b.o); $(CC) \-o $@  $<
-
-\&.c.o :; $(CC) \-c $(CFLAGS) \-o $@  $<
-%.a:
-.RS
-ar rv $@ $?
-ranlib $@
-rm \-rf $?
-.RE
-.sp
-.fi
-.RE
-constructs the following dependency
-graph.
-.RS
-.sp
-.nf
-a.out : ml.a; $(CC) \-o $@  $<
-ml.a .LIBRARY : a.o b.o
-
-%.o : %.c ; $(CC) -c $(CFLAGS) \-o $@  $<
-%.a :
-.RS
-ar rv $@ $?
-ranlib $@
-rm -rf $?
-.RE
-.sp
-.fi
-.RE
-and making a.out then works as expected.
-.PP
-The same thing happens for any target of the form \fIlib((entry))\fP.
-These targets have an
-additional feature in that the \fIentry\fP target has the .SYMBOL attribute
-set automatically.
-.PP
-NOTE:  If the notion of entry points is supported by the archive and by
-\fBdmake\fP (currently not the case) then
-.B dmake
-will search the archive for the entry point and return not only the
-modification time of the member which defines the entry but also the name of
-the member file.  This name will then replace \fIentry\fP and will be used for
-making the member file.  Once bound to an archive member the .SYMBOL
-attribute is removed from the target.
-This feature is presently disabled as there is little standardization
-among archive formats, and we have yet to find a makefile utilizing this
-feature (possibly due to the fact that it is unimplemented in most versions
-of UNIX Make).
-.PP
-Finally, when
-.B dmake
-looks for a library member it must first locate the library file.
-It does so by first looking for the library relative to the current directory
-and if it is not found it then looks relative to the current value of
-$(TMD).  This allows commonly used libraries to be kept near the root of
-a source tree and to be easily found by
-.B dmake\fR.\fP
-.SH "KEEP STATE"
-.B dmake
-supports the keeping of state information for targets that it makes whenever
-the macro .KEEP_STATE is assigned a value.  The value of the macro should be
-the name of a state file that will contain the state information.  If state
-keeping is enabled then each target that does not poses the .NOSTATE
-attribute will have a record written into the state file indicating the
-target's name, the current directory, the command used to update the target,
-and which, if any, :: rule is being used.  When you make this target again
-if any of this information does not match the previous settings and the
-target is not out dated it will still be re\-made.  The assumption is that one
-of the conditions above has changed and that we wish to remake the target.
-For example,
-state keeping is used in the maintenance of
-.B dmake
-to test compile different versions of the source using different compilers.
-Changing the compiler causes the compilation flags to be modified and hence
-all sources to be recompiled.
-.PP
-The state file is an ascii file and is portable, however it is
-not in human readable form as the entries represent hash keys of the above
-information.
-.PP
-The Sun Microsystem's Make construct
-.RS
-.sp
-\&.KEEP_STATE :
-.sp
-.RE
-is recognized and is mapped to \fB.KEEP_STATE:=_state.mk\fP.
-The
-.B dmake
-version of state keeping does not include scanning C source files for
-dependencies like Sun Make.  This is specific to C programs and it was
-felt that it does not belong in make.
-.B dmake
-instead provides the tool, \fBcdepend\fP, to scan C source files and to produce
-depedency information.  Users are free to modify cdepend to produce other
-dependency files.  (NOTE:
-.B cdepend
-does not come with the distribution at this time, but will be available in
-a patch in the near future)
-.SH "MULTI PROCESSING"
-If the architecture supports it then \fBdmake\fP is capable of making a target's
-prerequisites in parallel.  \fBdmake\fP will make as much in parallel as it
-can and use a number of child processes up to the maximum specified by
-MAXPROCESS or by the value supplied to the \-P command line flag.
-A parallel make is enabled by setting the value of MAXPROCESS (either directly
-or via \-P option) to a value which is > 1.
-\fBdmake\fP guarantees that all dependencies as specified in the makefile are
-honored.  A target will not be made until all of its prerequisites have been
-made.  Note that when you specify \fB-P 4\fP then four child processes are
-run concurrently but \fBdmake\fP actually displays the fifth command it will
-run immediately upon a child process becomming free.  This is an artifact of
-the method used to traverse the dependency graph and cannot be removed.
-If a parallel make is being performed then the following restrictions on
-parallelism are enforced.
-.RS
-.IP 1.
-Individual recipe lines in a non-group recipe are performed sequentially in
-the order in which they are specified within the makefile and in parallel with
-the recipes of other targets.
-.IP 2.
-If a target contains multiple recipe definitions (cf. :: rules) then these are
-performed sequentially in the order in which the :: rules are specified within
-the makefile and in parallel with the recipes of other targets.
-.IP 3.
-If a target rule contains the `!' modifier, then the recipe is performed
-sequentially for the list of outdated prerequisites and in parallel with the recipes of other targets.
-.IP 4.
-If a target has the .SEQUENTIAL attribute set then all of its prerequisites
-are made sequentially relative to one another (as if MAXPROCESS=1), but in
-parallel with other targets in the makefile.
-.RE
-.PP
-Note:  If you specify a parallel make then
-the order of target update and the order in which the associated recipes are
-invoked will not correspond to that displayed by the \-n flag.
-.SH "CONDITIONALS"
-.B dmake
-supports a makefile construct called a \fIconditional\fR.  It allows
-the user
-to conditionally select portions of makefile text for input processing
-and to discard other portions.  This becomes useful for
-writing makefiles that are intended to function for more than one target
-host and environment.  The conditional expression is specified as follows:
-.sp
-.RS
-.nf
-\&.IF  \fIexpression\fR
-   ... if text ...
-\&.ELIF  \fIexpression\fR
-   ... if text ...
-\&.ELSE
-   ... else text ...
-\&.END
-.RE
-.fi
-.sp
-The .ELSE and .ELIF portions are optional, and the conditionals may be
-nested (ie.  the text may contain another conditional).
-\&.IF, .ELSE, and .END
-may appear anywhere in the makefile, but a single conditional expression
-may not span multiple makefiles.
-.PP
-\fIexpression\fR can be one of the following forms:
-.sp
-String evaluation
-.br
-\t<text> | <text> == <text> | <text> != <text>
-.sp
-Numeric evaluation
-.br
-\t<text> <= <text> | <text> >= <text>
-.sp
-Boolean evaluation
-.br
-\t( <text> ) | <text> || <text> | <text> && <text>
-.sp
-where \fItext\fR is either text or a macro expression.  In any case,
-before the comparison is made, the expression is expanded.  The text
-portions are then selected and compared.  In the case of the numeric
-comparisons enclosing quotes are removed after expanding the expressions
-and the leading numerical parts are converted to an integer number. If no
-numerical part is found this results to 0 (zero). The
-string "12ab" for example evaluates to the number 12.
-Expressions can be nested with () and the use of || or &&.
-White space at the start and
-end of the text portion is discarded before the comparison.  This means
-that a macro that evaluates to nothing but white space is considered a
-NULL value for the purpose of the comparison.
-In the first case the expression evaluates TRUE if the text is not NULL
-otherwise it evaluates FALSE.  The remaining two cases both evaluate the
-expression on the basis of a string comparison.
-If a macro expression needs to be equated to a NULL string then compare it to
-the value of the macro $(NULL).
-You can use the $(shell ...) macro to construct more complex test expressions.
-.SH "EXAMPLES"
-.RS
-.nf
-.sp
-# A simple example showing how to use make
-#
-prgm : a.o b.o
-	cc a.o b.o \-o prgm
-a.o : a.c g.h
-	cc a.c \-o $@
-b.o : b.c g.h
-	cc b.c \-o $@
-.fi
-.RE
-.sp
-In the previous
-example prgm is remade only if a.o and/or b.o is out of date with
-respect to prgm.
-These dependencies can be stated more concisely
-by using the inference rules defined in the standard startup file.
-The default rule for making .o's from .c's looks something like this:
-.sp
-\&\t%.o : %.c; cc \-c $(CFLAGS) \-o $@ $<
-.sp
-Since there exists a rule (defined in the startup file)
-for making .o's from .c's
-\fBdmake\fR will use that rule
-for manufacturing a .o from a .c and we can specify our dependencies
-more concisely.
-.sp
-.RS
-.nf
-prgm : a.o b.o
-	cc \-o prgm $<
-a.o b.o : g.h
-.fi
-.RE
-.sp
-A more general way to say the above using the new macro expansions
-would be:
-.sp
-.RS
-.nf
-SRC = a b
-OBJ = {$(SRC)}.o
-.sp
-prgm : $(OBJ)
-	cc \-o $@ $<
-.sp
-$(OBJ) : g.h
-.fi
-.RE
-.sp
-If we want to keep the objects in a separate directory, called
-objdir, then we would write
-something like this.
-.sp
-.RS
-.nf
-SRC = a b
-OBJ = {$(SRC)}.o
-.sp
-prgm : $(OBJ)
-	cc $< \-o $@
-.sp
-$(OBJ) : g.h
-\&%.o : %.c
-	$(CC) \-c $(CFLAGS) \-o $(@:f) $<
-	mv $(@:f) objdir
-
-\&.SOURCE.o : objdir   # tell dmake to look here for .o's
-.fi
-.RE
-.sp
-An example of building library members would go something like this:
-(NOTE:  The same rules as above will be used to produce .o's from .c's)
-.sp
-.RS
-.nf
-SRC\t= a b
-LIB\t= lib
-LIBm\t= { $(SRC) }.o
-.sp
-prgm: $(LIB)
-	cc \-o $@ $(LIB)
-.sp
-$(LIB) .LIBRARY : $(LIBm)
-	ar rv $@ $<
-	rm $<
-.fi
-.RE
-.sp
-Finally, suppose that each of the source files in the previous example had
-the `:' character in their target name.  Then we would write the above example
-as:
-.sp
-.RS
-.nf
-SRC\t= f:a f:b
-LIB\t= lib
-LIBm\t= "{ $(SRC) }.o"	 # put quotes around each token
-.sp
-prgm: $(LIB)
-	cc \-o $@ $(LIB)
-.sp
-$(LIB) .LIBRARY : $(LIBm)
-	ar rv $@ $<
-	rm $<
-.fi
-.RE
-.SH "COMPATIBILITY"
-There are two notable differences between 
-.B \fBdmake\fR
-and the standard version of BSD UNIX 4.2/4.3 Make.
-.RS
-.IP 1. .3i
-BSD UNIX 4.2/4.3 Make supports wild card filename expansion for
-prerequisite names.  Thus if a directory contains a.h, b.h and c.h, then a
-line like
-.sp
-\ttarget: *.h
-.sp
-will cause UNIX make to expand the *.h into "a.h b.h c.h".  \fBdmake\fR
-does not support this type of filename expansion.
-.IP 2. .3i
-Unlike UNIX make, touching a library member causes \fBdmake\fR
-to search the library for the member name and to update the library time stamp.
-This is only implemented in the UNIX version.
-MSDOS and other versions may not have librarians that keep file time stamps,
-as a result \fBdmake\fR touches the library file itself, and prints a warning.
-.RE
-.PP
-\fBdmake\fP is not compatible with GNU Make.  In particular it does not
-understand GNU Make's macro expansions that query the file system.
-.PP
-.B dmake
-is fully compatible with SYSV AUGMAKE, and supports the following AUGMAKE
-features:
-.RS
-.IP 1. .3i
-GNU Make style \fBinclude\fP, and \fBif/else/endif\fP directives are allowed
-in non-group recipes.
-Thus, the word \fBinclude\fP appearing at
-the start of a line that is not part of a gruop recipe will be mapped
-to the ".INCLUDE" directive that \fBdamke\fP uses.
-Similarly, the words \fBifeq\fP,\fBifneq\fP,\fBelif\fP,\fBelse\fP,
-and \fBendif\fP are mapped to their corresponding \fBdmake\fP equivalents.
-.IP 2. .3i
-The macro modifier expression $(macro:str=sub) is understood and is equivalent
-to the expression $(macro:s/str/sub), with the restriction that str must match
-the following regular expression:
-.sp
-\tstr[ |\et][ |\et]*
-.sp
-(ie. str only matches at the end of a token where str is a suffix and is
-terminated by a space, a tab, or end of line)
-Normally \fIsub\fP is expanded before the substitution is made, if you specify
-\-A on the command line then sub is not expanded.
-.IP 3.
-The macro % is defined to be $@ (ie. $% expands to the same value as $@).
-.IP 4.
-The AUGMAKE notion of libraries is handled correctly.
-.IP 5.
-Directories are always made if you specify \fB\-A\fP.  This is consistent
-with other UNIX versions of Make.
-.IP 6.
-Makefiles that utilize virtual targets to force making of other targets work
-as expected if AUGMAKE special target handling is enabled.  For example:
-.sp
-.nf
-\tFRC:
-\tmyprog.o : myprog.c $(FRC) ; ...
-.fi
-.sp
-Works as expected if you issue the command
-.sp
-\t'\fBdmake\fP \-A FRC=FRC'
-.sp
-but fails with a 'don't know how to make FRC'
-error message if you do not specify AUGMAKE special target handling via
-the \-A flag (or by setting AUGMAKE:=yes internally).
-.RE
-.SH "LIMITS"
-In some environments the length of an argument string is restricted.
-(e.g. MSDOS command line arguments cannot be longer than 128 bytes if you are
-using the standard command.com command interpreter as your shell,
-.B dmake
-text diversions may help in these situations.)
-.SH "PORTABILITY"
-To write makefiles that can be moved from one environment to another requires
-some forethought.  In particular you must define as macros all those things
-that may be different in the new environment.
-.B dmake
-has two facilities that help to support writing portable makefiles, recursive
-macros and conditional expressions.  The recursive macros, allow one to define
-environment configurations that allow different environments for similar types
-of operating systems.  For example the same make script can be used for SYSV and
-BSD but with different macro definitions.
-.PP
-To write a makefile that is portable between UNIX and MSDOS requires both
-features since in almost all cases you will need to define new recipes for
-making targets.  The recipes will probably be quite different since the
-capabilities of the tools on each machine are different.  Different
-macros will be needed to help handle the smaller differences in the two
-environments.
-.SH FILES
-Makefile, makefile, startup.mk (use dmake \-V to tell you where the startup
-file is)
-.SH "SEE ALSO"
-sh(1), csh(1), touch(1), f77(1), pc(1), cc(1)
-.br
-S.I. Feldman  \fIMake - A Program for Maintaining Computer Programs\fP
-.SH "AUTHOR"
-Dennis Vadura, dvadura@wticorp.com
-.br
-Many thanks to Carl Seger for his helpful suggestions,
-and to Trevor John Thompson for his many excellent ideas and
-informative bug reports.  Many thanks also go to those on the
-NET that have helped in making \fBdmake\fP one of the best Make tools
-available.
-.SH BUGS
-Some system commands return non-zero status inappropriately.
-Use
-.B \-i
-(`\-' within the makefile) to overcome the difficulty.
-.PP
-Some systems do not have easily accessible
-time stamps for library members (MSDOS, AMIGA, etc)
-for these \fBdmake\fR uses the time stamp of the library instead and prints
-a warning the first time it does so.  This is almost always ok, except when
-multiple makefiles update a single library file.  In these instances it is
-possible to miss an update if one is not careful.
-.PP
-This man page is way too long.
-.SH WARNINGS
-Rules supported by make(1) may not work if transitive closure is turned off
-(-T, .NOINFER).
-.PP
-PWD from csh/ksh will cause problems if a cd operation is performed and
--e or -E option is used.
-.PP
-Using internal macros such as COMMAND, may wreak havoc if you don't understand
-their functionality.
diff --git a/dmake/man/readme b/dmake/man/readme
deleted file mode 100644
index 68c364e30..000000000
--- a/dmake/man/readme
+++ /dev/null
@@ -1,12 +0,0 @@
-This directory contains the DMAKE manual page.
-
-The files found here are:
-
-  dmake.tf  - troff source for the manual page, you must use GNU groff
-              to typeset it or copy it as dmake.1 into a directory in
-              your search path for man pages to view it with the man
-              command.
-
-  dmake.nc  - a typeset version of the manual page containing no control
-              characters. Generated with:
-              "groff -mman -rcR=0 -Tlatin1 -P -bcu dmake.tf > dmake.nc"
diff --git a/dmake/missing b/dmake/missing
deleted file mode 100755
index 894e786e1..000000000
--- a/dmake/missing
+++ /dev/null
@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2005-06-08.21
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/dmake/mkinstalldirs b/dmake/mkinstalldirs
deleted file mode 100755
index 259dbfcd3..000000000
--- a/dmake/mkinstalldirs
+++ /dev/null
@@ -1,158 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2005-06-29.22
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
-  shift
-  IFS=$oIFS
-
-  for d
-  do
-    test "x$d" = x && continue
-
-    pathcomp=$pathcomp$d
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
-
-    pathcomp=$pathcomp/
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/dmake/msdos/arlib.c b/dmake/msdos/arlib.c
deleted file mode 100644
index b95a33d41..000000000
--- a/dmake/msdos/arlib.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* RCS  $Id: arlib.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Library access code.
--- 
--- DESCRIPTION
---	This implementation uses the library timestamp inplace of the
---	library member timestamp.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-PUBLIC time_t
-seek_arch(name, lib)
-char*	name;
-char*	lib;
-{
-   static	int	warned = FALSE;
-
-   if (!warned && !(Glob_attr&A_SILENT))
-       warned = TRUE,
-       Warning("Can't extract library member timestamp;\n\
-       using library timestamp instead.");
-   return (Do_stat(lib, NULL, NULL, TRUE));
-}
-
-PUBLIC int
-touch_arch(name, lib)
-char*	name;
-char*	lib;
-{
-   static	int	warned = FALSE;
-
-   if (!warned && !(Glob_attr&A_SILENT))
-       warned = TRUE,
-       Warning("Can't update library member timestamp;\n\
-       touching library instead.");
-   return (Do_touch(lib, NULL, NULL));
-}
-
diff --git a/dmake/msdos/borland/bcc30/config.h b/dmake/msdos/borland/bcc30/config.h
deleted file mode 100644
index 4f320e25f..000000000
--- a/dmake/msdos/borland/bcc30/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* RCS  $Id: config.h,v 1.2 2008-03-05 18:36:08 kz Exp $
---
--- SYNOPSIS
---      Configurarion include file.
--- 
--- DESCRIPTION
--- 	There is one of these for each specific machine configuration.
---	It can be used to further tweek the machine specific sources
---	so that they compile.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* define this for configurations that don't have the coreleft function
- * so that the code compiles.  To my knowledge coreleft exists only on
- * Turbo C, but it is needed here since the function is used in many debug
- * macros. */
-/*#define coreleft() 0L*/
-extern unsigned int coreleft();
-
-#define SIGQUIT	SIGTERM		/* turbo C doesn't understand SIGQUIT */
-
-/* Turbo-C understands const declarations. */
-#define CONST const
-
-#ifndef MSDOS
-#   define MSDOS 1
-#endif
-
-/* a small problem with pointer to voids on some unix machines needs this */
-#define DMPVOID void *
-
-/* Have to pull this in for the standard lib defines */
-#include <io.h>
diff --git a/dmake/msdos/borland/bcc30/config.mk b/dmake/msdos/borland/bcc30/config.mk
deleted file mode 100644
index 0b1d122a8..000000000
--- a/dmake/msdos/borland/bcc30/config.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# Definition of macros for library, and C startup code.
-osedir     = $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-LDLIBS	   = e:/cc/borland/bcc30/lib/c$(MODEL)
-CSTARTUP   = e:/cc/borland/bcc30/lib/c0$(MODEL).obj
-
-CFLAGS    += -I$(osedir) -w-pia
diff --git a/dmake/msdos/borland/bcc30/lib.rsp b/dmake/msdos/borland/bcc30/lib.rsp
deleted file mode 100644
index 41e591347..000000000
--- a/dmake/msdos/borland/bcc30/lib.rsp
+++ /dev/null
@@ -1 +0,0 @@
-d:\cc\borland\bcc30\lib\cl
diff --git a/dmake/msdos/borland/bcc30/libswp.rsp b/dmake/msdos/borland/bcc30/libswp.rsp
deleted file mode 100644
index 64f053bf1..000000000
--- a/dmake/msdos/borland/bcc30/libswp.rsp
+++ /dev/null
@@ -1 +0,0 @@
-e:\cc\borland\bcc30\lib\cl
diff --git a/dmake/msdos/borland/bcc30/mkswp.bat b/dmake/msdos/borland/bcc30/mkswp.bat
deleted file mode 100755
index 9266d8dfc..000000000
--- a/dmake/msdos/borland/bcc30/mkswp.bat
+++ /dev/null
@@ -1,107 +0,0 @@
-md objects
-tasm -t -mx -dmlarge msdos\exec.asm,,,;
-mv exec.obj objects
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  infer.c
-copy infer.obj objects
-del infer.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  make.c
-copy make.obj objects
-del make.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  stat.c
-copy stat.obj objects
-del stat.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  expand.c
-copy expand.obj objects
-del expand.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  dmstring.c
-copy dmstring.obj objects
-del dmstring.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  hash.c
-copy hash.obj objects
-del hash.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  dag.c
-copy dag.obj objects
-del dag.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  dmake.c
-copy dmake.obj objects
-del dmake.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  path.c
-copy path.obj objects
-del path.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  imacs.c
-copy imacs.obj objects
-del imacs.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  sysintf.c
-copy sysintf.obj objects
-del sysintf.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  parse.c
-copy parse.obj objects
-del parse.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  getinp.c
-copy getinp.obj objects
-del getinp.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  quit.c
-copy quit.obj objects
-del quit.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  state.c
-copy state.obj objects
-del state.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  dmdump.c
-copy dmdump.obj objects
-del dmdump.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  macparse.c
-copy macparse.obj objects
-del macparse.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  rulparse.c
-copy rulparse.obj objects
-del rulparse.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  percent.c
-copy percent.obj objects
-del percent.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  function.c
-copy function.obj objects
-del function.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  msdos\ruletab.c
-copy ruletab.obj objects
-del ruletab.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  msdos\dirbrk.c
-copy dirbrk.obj objects
-del dirbrk.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  msdos\runargv.c
-copy runargv.obj objects
-del runargv.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  msdos\arlib.c
-copy arlib.obj objects
-del arlib.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  msdos\dchdir.c
-copy dchdir.obj objects
-del dchdir.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  msdos\switchar.c
-copy switchar.obj objects
-del switchar.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  msdos\rmprq.c
-copy rmprq.obj objects
-del rmprq.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  msdos\spawn.c
-copy spawn.obj objects
-del spawn.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  msdos\find.c
-copy find.obj objects
-del find.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  msdos\dirlib.c
-copy dirlib.obj objects
-del dirlib.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  msdos\dstrlwr.c
-copy dstrlwr.obj objects
-del dstrlwr.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  unix\dcache.c
-copy dcache.obj objects
-del dcache.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  msdos\borland\tempnam.c
-copy tempnam.obj objects
-del tempnam.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc30 -w-pia  msdos\borland\utime.c
-copy utime.obj objects
-del utime.obj
-tlink   @msdos\borland\bcc30\objswp.rsp,dmake.exe,NUL.MAP,@msdos\borland\bcc30\libswp.rsp
-copy msdos\borland\bcc30\template.mk startup\config.mk
diff --git a/dmake/msdos/borland/bcc30/obj.rsp b/dmake/msdos/borland/bcc30/obj.rsp
deleted file mode 100644
index 3f396242c..000000000
--- a/dmake/msdos/borland/bcc30/obj.rsp
+++ /dev/null
@@ -1,34 +0,0 @@
-d:\cc\borland\bcc30\lib\c0l.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\tee.obj+
-objects\dirlib.obj+
-objects\find.obj+
-objects\dcache.obj+
-objects\tempnam.obj+
-objects\utime.obj
diff --git a/dmake/msdos/borland/bcc30/objswp.rsp b/dmake/msdos/borland/bcc30/objswp.rsp
deleted file mode 100644
index aa0bf5e58..000000000
--- a/dmake/msdos/borland/bcc30/objswp.rsp
+++ /dev/null
@@ -1,36 +0,0 @@
-e:\cc\borland\bcc30\lib\c0l.obj+
-objects\exec.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\spawn.obj+
-objects\find.obj+
-objects\dirlib.obj+
-objects\dstrlwr.obj+
-objects\dcache.obj+
-objects\tempnam.obj+
-objects\utime.obj
diff --git a/dmake/msdos/borland/bcc30/public.h b/dmake/msdos/borland/bcc30/public.h
deleted file mode 100644
index 65338ca81..000000000
--- a/dmake/msdos/borland/bcc30/public.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:43:40 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void Clean_up_processes ANSI(());
-int Wait_for_child ANSI((int, int));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int dchdir ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int spawnvpe ANSI((int, char *, char **, char **));
-void Hook_std_writes ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/msdos/borland/bcc30/template.mk b/dmake/msdos/borland/bcc30/template.mk
deleted file mode 100644
index df574e09c..000000000
--- a/dmake/msdos/borland/bcc30/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= bcc30
diff --git a/dmake/msdos/borland/bcc40/config.h b/dmake/msdos/borland/bcc40/config.h
deleted file mode 100644
index 058c51446..000000000
--- a/dmake/msdos/borland/bcc40/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* RCS  $Id: config.h,v 1.2 2008-03-05 18:36:30 kz Exp $
---
--- SYNOPSIS
---      Configurarion include file.
--- 
--- DESCRIPTION
--- 	There is one of these for each specific machine configuration.
---	It can be used to further tweek the machine specific sources
---	so that they compile.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* define this for configurations that don't have the coreleft function
- * so that the code compiles.  To my knowledge coreleft exists only on
- * Turbo C, but it is needed here since the function is used in many debug
- * macros. */
-/*#define coreleft() 0L*/
-extern unsigned int coreleft();
-
-#define SIGQUIT	SIGTERM		/* turbo C doesn't understand SIGQUIT */
-
-/* Turbo-C understands const declarations. */
-#define CONST const
-
-#ifndef MSDOS
-#   define MSDOS 1
-#endif
-
-/* a small problem with pointer to voids on some unix machines needs this */
-#define DMPVOID void *
-
-/* Borland redefined the environment variable, sigh */
-#define environ _environ
-
-/* Have to pull this in for the standard lib defines */
-#include <io.h>
diff --git a/dmake/msdos/borland/bcc40/config.mk b/dmake/msdos/borland/bcc40/config.mk
deleted file mode 100644
index 550b86950..000000000
--- a/dmake/msdos/borland/bcc40/config.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Definition of macros for library, and C startup code.
-osedir    = $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-LDLIBS	  = e:/cc/borland/bcc40/lib/c$(MODEL)
-CSTARTUP  = e:/cc/borland/bcc40/lib/c0$(MODEL).obj
-
-CFLAGS   += -I$(osedir) -w-pro
diff --git a/dmake/msdos/borland/bcc40/lib.rsp b/dmake/msdos/borland/bcc40/lib.rsp
deleted file mode 100644
index 828ccf4ab..000000000
--- a/dmake/msdos/borland/bcc40/lib.rsp
+++ /dev/null
@@ -1,2 +0,0 @@
-e:\cc\borland\bcc40\lib\cw32+
-e:\cc\borland\bcc40\lib\import32
diff --git a/dmake/msdos/borland/bcc40/libswp.rsp b/dmake/msdos/borland/bcc40/libswp.rsp
deleted file mode 100644
index 1557935cd..000000000
--- a/dmake/msdos/borland/bcc40/libswp.rsp
+++ /dev/null
@@ -1 +0,0 @@
-e:\cc\borland\bcc40\lib\cl
diff --git a/dmake/msdos/borland/bcc40/mkswp.bat b/dmake/msdos/borland/bcc40/mkswp.bat
deleted file mode 100755
index d8a1bf824..000000000
--- a/dmake/msdos/borland/bcc40/mkswp.bat
+++ /dev/null
@@ -1,107 +0,0 @@
-md objects
-tasm -t -mx -dmlarge msdos\exec.asm,,,;
-mv exec.obj objects
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  infer.c
-copy infer.obj objects
-del infer.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  make.c
-copy make.obj objects
-del make.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  stat.c
-copy stat.obj objects
-del stat.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  expand.c
-copy expand.obj objects
-del expand.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  dmstring.c
-copy dmstring.obj objects
-del dmstring.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  hash.c
-copy hash.obj objects
-del hash.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  dag.c
-copy dag.obj objects
-del dag.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  dmake.c
-copy dmake.obj objects
-del dmake.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  path.c
-copy path.obj objects
-del path.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  imacs.c
-copy imacs.obj objects
-del imacs.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  sysintf.c
-copy sysintf.obj objects
-del sysintf.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  parse.c
-copy parse.obj objects
-del parse.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  getinp.c
-copy getinp.obj objects
-del getinp.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  quit.c
-copy quit.obj objects
-del quit.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  state.c
-copy state.obj objects
-del state.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  dmdump.c
-copy dmdump.obj objects
-del dmdump.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  macparse.c
-copy macparse.obj objects
-del macparse.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  rulparse.c
-copy rulparse.obj objects
-del rulparse.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  percent.c
-copy percent.obj objects
-del percent.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  function.c
-copy function.obj objects
-del function.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  msdos\ruletab.c
-copy ruletab.obj objects
-del ruletab.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  msdos\dirbrk.c
-copy dirbrk.obj objects
-del dirbrk.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  msdos\runargv.c
-copy runargv.obj objects
-del runargv.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  msdos\arlib.c
-copy arlib.obj objects
-del arlib.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  msdos\dchdir.c
-copy dchdir.obj objects
-del dchdir.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  msdos\switchar.c
-copy switchar.obj objects
-del switchar.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  msdos\rmprq.c
-copy rmprq.obj objects
-del rmprq.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  msdos\spawn.c
-copy spawn.obj objects
-del spawn.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  msdos\find.c
-copy find.obj objects
-del find.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  msdos\dirlib.c
-copy dirlib.obj objects
-del dirlib.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  msdos\dstrlwr.c
-copy dstrlwr.obj objects
-del dstrlwr.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  unix\dcache.c
-copy dcache.obj objects
-del dcache.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  msdos\borland\tempnam.c
-copy tempnam.obj objects
-del tempnam.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc40 -w-pro  msdos\borland\utime.c
-copy utime.obj objects
-del utime.obj
-tlink   @msdos\borland\bcc40\objswp.rsp,dmake.exe,NUL.MAP,@msdos\borland\bcc40\libswp.rsp
-copy msdos\borland\bcc40\template.mk startup\config.mk
diff --git a/dmake/msdos/borland/bcc40/obj.rsp b/dmake/msdos/borland/bcc40/obj.rsp
deleted file mode 100644
index 572259dca..000000000
--- a/dmake/msdos/borland/bcc40/obj.rsp
+++ /dev/null
@@ -1,34 +0,0 @@
-e:\cc\borland\bcc40\lib\c0x32.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\find.obj+
-objects\tee.obj+
-objects\dirlib.obj+
-objects\dcache.obj+
-objects\tempnam.obj+
-objects\utime.obj
diff --git a/dmake/msdos/borland/bcc40/objswp.rsp b/dmake/msdos/borland/bcc40/objswp.rsp
deleted file mode 100644
index 712d47f47..000000000
--- a/dmake/msdos/borland/bcc40/objswp.rsp
+++ /dev/null
@@ -1,36 +0,0 @@
-e:\cc\borland\bcc40\lib\c0l.obj+
-objects\exec.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\spawn.obj+
-objects\find.obj+
-objects\dirlib.obj+
-objects\dstrlwr.obj+
-objects\dcache.obj+
-objects\tempnam.obj+
-objects\utime.obj
diff --git a/dmake/msdos/borland/bcc40/public.h b/dmake/msdos/borland/bcc40/public.h
deleted file mode 100644
index 3a5e0c5f3..000000000
--- a/dmake/msdos/borland/bcc40/public.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:43:53 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void Clean_up_processes ANSI(());
-int Wait_for_child ANSI((int, int));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int dchdir ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int spawnvpe ANSI((int, char *, char **, char **));
-void Hook_std_writes ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/msdos/borland/bcc40/template.mk b/dmake/msdos/borland/bcc40/template.mk
deleted file mode 100644
index 30a27692f..000000000
--- a/dmake/msdos/borland/bcc40/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= bcc40
diff --git a/dmake/msdos/borland/bcc45/config.h b/dmake/msdos/borland/bcc45/config.h
deleted file mode 100644
index b90aa5196..000000000
--- a/dmake/msdos/borland/bcc45/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* RCS  $Id: config.h,v 1.2 2008-03-05 18:36:44 kz Exp $
---
--- SYNOPSIS
---      Configurarion include file.
--- 
--- DESCRIPTION
--- 	There is one of these for each specific machine configuration.
---	It can be used to further tweek the machine specific sources
---	so that they compile.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* define this for configurations that don't have the coreleft function
- * so that the code compiles.  To my knowledge coreleft exists only on
- * Turbo C, but it is needed here since the function is used in many debug
- * macros. */
-/*#define coreleft() 0L*/
-extern unsigned int coreleft();
-
-#define SIGQUIT	SIGTERM		/* turbo C doesn't understand SIGQUIT */
-
-/* Turbo-C understands const declarations. */
-#define CONST const
-
-#ifndef MSDOS
-#   define MSDOS 1
-#endif
-
-/* a small problem with pointer to voids on some unix machines needs this */
-#define DMPVOID void *
-
-/* Borland redefined the environment variable, sigh */
-#define environ _environ
-
-/* Have to pull this in for the standard lib defines */
-#include <io.h>
diff --git a/dmake/msdos/borland/bcc45/config.mk b/dmake/msdos/borland/bcc45/config.mk
deleted file mode 100644
index 550b86950..000000000
--- a/dmake/msdos/borland/bcc45/config.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Definition of macros for library, and C startup code.
-osedir    = $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-LDLIBS	  = e:/cc/borland/bcc40/lib/c$(MODEL)
-CSTARTUP  = e:/cc/borland/bcc40/lib/c0$(MODEL).obj
-
-CFLAGS   += -I$(osedir) -w-pro
diff --git a/dmake/msdos/borland/bcc45/lib.rsp b/dmake/msdos/borland/bcc45/lib.rsp
deleted file mode 100644
index db2b78d82..000000000
--- a/dmake/msdos/borland/bcc45/lib.rsp
+++ /dev/null
@@ -1,2 +0,0 @@
-e:\cc\borland\bcc45\lib\cw32+
-e:\cc\borland\bcc45\lib\import32
diff --git a/dmake/msdos/borland/bcc45/libswp.rsp b/dmake/msdos/borland/bcc45/libswp.rsp
deleted file mode 100644
index 1557935cd..000000000
--- a/dmake/msdos/borland/bcc45/libswp.rsp
+++ /dev/null
@@ -1 +0,0 @@
-e:\cc\borland\bcc40\lib\cl
diff --git a/dmake/msdos/borland/bcc45/mkswp.bat b/dmake/msdos/borland/bcc45/mkswp.bat
deleted file mode 100755
index c6bfede2f..000000000
--- a/dmake/msdos/borland/bcc45/mkswp.bat
+++ /dev/null
@@ -1,107 +0,0 @@
-md objects
-tasm -t -mx -dmlarge msdos\exec.asm,,,;
-mv exec.obj objects
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  infer.c
-copy infer.obj objects
-del infer.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  make.c
-copy make.obj objects
-del make.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  stat.c
-copy stat.obj objects
-del stat.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  expand.c
-copy expand.obj objects
-del expand.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  dmstring.c
-copy dmstring.obj objects
-del dmstring.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  hash.c
-copy hash.obj objects
-del hash.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  dag.c
-copy dag.obj objects
-del dag.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  dmake.c
-copy dmake.obj objects
-del dmake.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  path.c
-copy path.obj objects
-del path.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  imacs.c
-copy imacs.obj objects
-del imacs.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  sysintf.c
-copy sysintf.obj objects
-del sysintf.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  parse.c
-copy parse.obj objects
-del parse.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  getinp.c
-copy getinp.obj objects
-del getinp.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  quit.c
-copy quit.obj objects
-del quit.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  state.c
-copy state.obj objects
-del state.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  dmdump.c
-copy dmdump.obj objects
-del dmdump.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  macparse.c
-copy macparse.obj objects
-del macparse.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  rulparse.c
-copy rulparse.obj objects
-del rulparse.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  percent.c
-copy percent.obj objects
-del percent.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  function.c
-copy function.obj objects
-del function.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  msdos\ruletab.c
-copy ruletab.obj objects
-del ruletab.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  msdos\dirbrk.c
-copy dirbrk.obj objects
-del dirbrk.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  msdos\runargv.c
-copy runargv.obj objects
-del runargv.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  msdos\arlib.c
-copy arlib.obj objects
-del arlib.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  msdos\dchdir.c
-copy dchdir.obj objects
-del dchdir.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  msdos\switchar.c
-copy switchar.obj objects
-del switchar.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  msdos\rmprq.c
-copy rmprq.obj objects
-del rmprq.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  msdos\spawn.c
-copy spawn.obj objects
-del spawn.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  msdos\find.c
-copy find.obj objects
-del find.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  msdos\dirlib.c
-copy dirlib.obj objects
-del dirlib.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  msdos\dstrlwr.c
-copy dstrlwr.obj objects
-del dstrlwr.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  unix\dcache.c
-copy dcache.obj objects
-del dcache.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  msdos\borland\tempnam.c
-copy tempnam.obj objects
-del tempnam.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc45 -w-pro  msdos\borland\utime.c
-copy utime.obj objects
-del utime.obj
-tlink   @msdos\borland\bcc45\objswp.rsp,dmake.exe,NUL.MAP,@msdos\borland\bcc45\libswp.rsp
-copy msdos\borland\bcc45\template.mk startup\config.mk
diff --git a/dmake/msdos/borland/bcc45/obj.rsp b/dmake/msdos/borland/bcc45/obj.rsp
deleted file mode 100644
index e1d4b1e23..000000000
--- a/dmake/msdos/borland/bcc45/obj.rsp
+++ /dev/null
@@ -1,34 +0,0 @@
-e:\cc\borland\bcc45\lib\c0x32.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\find.obj+
-objects\tee.obj+
-objects\dirlib.obj+
-objects\dcache.obj+
-objects\tempnam.obj+
-objects\utime.obj
diff --git a/dmake/msdos/borland/bcc45/objswp.rsp b/dmake/msdos/borland/bcc45/objswp.rsp
deleted file mode 100644
index 712d47f47..000000000
--- a/dmake/msdos/borland/bcc45/objswp.rsp
+++ /dev/null
@@ -1,36 +0,0 @@
-e:\cc\borland\bcc40\lib\c0l.obj+
-objects\exec.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\spawn.obj+
-objects\find.obj+
-objects\dirlib.obj+
-objects\dstrlwr.obj+
-objects\dcache.obj+
-objects\tempnam.obj+
-objects\utime.obj
diff --git a/dmake/msdos/borland/bcc45/public.h b/dmake/msdos/borland/bcc45/public.h
deleted file mode 100644
index 41e2333c1..000000000
--- a/dmake/msdos/borland/bcc45/public.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:44:06 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void Clean_up_processes ANSI(());
-int Wait_for_child ANSI((int, int));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int dchdir ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int spawnvpe ANSI((int, char *, char **, char **));
-void Hook_std_writes ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/msdos/borland/bcc45/template.mk b/dmake/msdos/borland/bcc45/template.mk
deleted file mode 100644
index 83b5e0090..000000000
--- a/dmake/msdos/borland/bcc45/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= bcc45
diff --git a/dmake/msdos/borland/bcc50/config.h b/dmake/msdos/borland/bcc50/config.h
deleted file mode 100644
index b7c44f2d7..000000000
--- a/dmake/msdos/borland/bcc50/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* RCS  $Id: config.h,v 1.2 2008-03-05 18:36:58 kz Exp $
---
--- SYNOPSIS
---      Configurarion include file.
--- 
--- DESCRIPTION
--- 	There is one of these for each specific machine configuration.
---	It can be used to further tweek the machine specific sources
---	so that they compile.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* define this for configurations that don't have the coreleft function
- * so that the code compiles.  To my knowledge coreleft exists only on
- * Turbo C, but it is needed here since the function is used in many debug
- * macros. */
-/*#define coreleft() 0L*/
-extern unsigned int coreleft();
-
-#define SIGQUIT	SIGTERM		/* turbo C doesn't understand SIGQUIT */
-
-/* Turbo-C understands const declarations. */
-#define CONST const
-
-#ifndef MSDOS
-#   define MSDOS 1
-#endif
-
-/* a small problem with pointer to voids on some unix machines needs this */
-#define DMPVOID void *
-
-/* Borland redefined the environment variable, sigh */
-#define environ _environ
-
-/* Have to pull this in for the standard lib defines */
-#include <io.h>
diff --git a/dmake/msdos/borland/bcc50/config.mk b/dmake/msdos/borland/bcc50/config.mk
deleted file mode 100644
index 550b86950..000000000
--- a/dmake/msdos/borland/bcc50/config.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Definition of macros for library, and C startup code.
-osedir    = $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-LDLIBS	  = e:/cc/borland/bcc40/lib/c$(MODEL)
-CSTARTUP  = e:/cc/borland/bcc40/lib/c0$(MODEL).obj
-
-CFLAGS   += -I$(osedir) -w-pro
diff --git a/dmake/msdos/borland/bcc50/lib.rsp b/dmake/msdos/borland/bcc50/lib.rsp
deleted file mode 100644
index fd89d29f2..000000000
--- a/dmake/msdos/borland/bcc50/lib.rsp
+++ /dev/null
@@ -1,2 +0,0 @@
-e:\cc\borland\bcc50\lib\cw32+
-e:\cc\borland\bcc50\lib\import32
diff --git a/dmake/msdos/borland/bcc50/libswp.rsp b/dmake/msdos/borland/bcc50/libswp.rsp
deleted file mode 100644
index 1557935cd..000000000
--- a/dmake/msdos/borland/bcc50/libswp.rsp
+++ /dev/null
@@ -1 +0,0 @@
-e:\cc\borland\bcc40\lib\cl
diff --git a/dmake/msdos/borland/bcc50/mkswp.bat b/dmake/msdos/borland/bcc50/mkswp.bat
deleted file mode 100755
index 14de52506..000000000
--- a/dmake/msdos/borland/bcc50/mkswp.bat
+++ /dev/null
@@ -1,107 +0,0 @@
-md objects
-tasm -t -mx -dmlarge msdos\exec.asm,,,;
-mv exec.obj objects
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  infer.c
-copy infer.obj objects
-del infer.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  make.c
-copy make.obj objects
-del make.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  stat.c
-copy stat.obj objects
-del stat.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  expand.c
-copy expand.obj objects
-del expand.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  dmstring.c
-copy dmstring.obj objects
-del dmstring.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  hash.c
-copy hash.obj objects
-del hash.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  dag.c
-copy dag.obj objects
-del dag.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  dmake.c
-copy dmake.obj objects
-del dmake.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  path.c
-copy path.obj objects
-del path.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  imacs.c
-copy imacs.obj objects
-del imacs.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  sysintf.c
-copy sysintf.obj objects
-del sysintf.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  parse.c
-copy parse.obj objects
-del parse.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  getinp.c
-copy getinp.obj objects
-del getinp.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  quit.c
-copy quit.obj objects
-del quit.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  state.c
-copy state.obj objects
-del state.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  dmdump.c
-copy dmdump.obj objects
-del dmdump.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  macparse.c
-copy macparse.obj objects
-del macparse.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  rulparse.c
-copy rulparse.obj objects
-del rulparse.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  percent.c
-copy percent.obj objects
-del percent.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  function.c
-copy function.obj objects
-del function.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  msdos\ruletab.c
-copy ruletab.obj objects
-del ruletab.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  msdos\dirbrk.c
-copy dirbrk.obj objects
-del dirbrk.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  msdos\runargv.c
-copy runargv.obj objects
-del runargv.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  msdos\arlib.c
-copy arlib.obj objects
-del arlib.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  msdos\dchdir.c
-copy dchdir.obj objects
-del dchdir.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  msdos\switchar.c
-copy switchar.obj objects
-del switchar.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  msdos\rmprq.c
-copy rmprq.obj objects
-del rmprq.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  msdos\spawn.c
-copy spawn.obj objects
-del spawn.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  msdos\find.c
-copy find.obj objects
-del find.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  msdos\dirlib.c
-copy dirlib.obj objects
-del dirlib.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  msdos\dstrlwr.c
-copy dstrlwr.obj objects
-del dstrlwr.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  unix\dcache.c
-copy dcache.obj objects
-del dcache.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  msdos\borland\tempnam.c
-copy tempnam.obj objects
-del tempnam.obj
-bcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\bcc50 -w-pro  msdos\borland\utime.c
-copy utime.obj objects
-del utime.obj
-tlink   @msdos\borland\bcc50\objswp.rsp,dmake.exe,NUL.MAP,@msdos\borland\bcc50\libswp.rsp
-copy msdos\borland\bcc50\template.mk startup\config.mk
diff --git a/dmake/msdos/borland/bcc50/obj.rsp b/dmake/msdos/borland/bcc50/obj.rsp
deleted file mode 100644
index 08ea653f7..000000000
--- a/dmake/msdos/borland/bcc50/obj.rsp
+++ /dev/null
@@ -1,34 +0,0 @@
-e:\cc\borland\bcc50\lib\c0x32.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\find.obj+
-objects\tee.obj+
-objects\dirlib.obj+
-objects\dcache.obj+
-objects\tempnam.obj+
-objects\utime.obj
diff --git a/dmake/msdos/borland/bcc50/objswp.rsp b/dmake/msdos/borland/bcc50/objswp.rsp
deleted file mode 100644
index 712d47f47..000000000
--- a/dmake/msdos/borland/bcc50/objswp.rsp
+++ /dev/null
@@ -1,36 +0,0 @@
-e:\cc\borland\bcc40\lib\c0l.obj+
-objects\exec.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\spawn.obj+
-objects\find.obj+
-objects\dirlib.obj+
-objects\dstrlwr.obj+
-objects\dcache.obj+
-objects\tempnam.obj+
-objects\utime.obj
diff --git a/dmake/msdos/borland/bcc50/public.h b/dmake/msdos/borland/bcc50/public.h
deleted file mode 100644
index d08bb2c71..000000000
--- a/dmake/msdos/borland/bcc50/public.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:44:19 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void Clean_up_processes ANSI(());
-int Wait_for_child ANSI((int, int));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int dchdir ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int spawnvpe ANSI((int, char *, char **, char **));
-void Hook_std_writes ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/msdos/borland/bcc50/template.mk b/dmake/msdos/borland/bcc50/template.mk
deleted file mode 100644
index 51b575677..000000000
--- a/dmake/msdos/borland/bcc50/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= bcc50
diff --git a/dmake/msdos/borland/config.mk b/dmake/msdos/borland/config.mk
deleted file mode 100644
index 423619686..000000000
--- a/dmake/msdos/borland/config.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# This is the Turbo C++ 2.0 DOS configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# The following sources are required for TURBO C++ 2.0
-OSR_SRC = tempnam.c utime.c
-.SETDIR=$(osrdir) : $(OSR_SRC)
-
-SRC += $(OSR_SRC)
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS.  Make sure your turboc.cfg
-# file contains a -D__STDC__=1 and -DM_I86=1, if not then uncomment the line
-# below!
-#CFLAGS += -DM_I86=1 -D__STDC__=1
-
-# You can get a smaller executable still, buy adding a -1 to the list of
-# flags below, but then you can't run this on an 8086/88 cpu.
-#CFLAGS += -1
-CFLAGS  += -I$(osrdir) -d -O -N- -w-nod $(C_$(MODEL))
-ASFLAGS += -t -mx $(S_$(MODEL))
-
-# Debugging information for Turbo-C
-DB_CFLAGS  += -v
-DB_LDFLAGS += /v
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
-
-C_s =
-C_m = -mm
-C_c = -mc
-C_l = -ml
-
-S_s = -dmsmall
-S_m = -dmmedium
-S_c = -dmcompact
-S_l = -dmlarge
diff --git a/dmake/msdos/borland/tcc20/config.h b/dmake/msdos/borland/tcc20/config.h
deleted file mode 100644
index 471f857fb..000000000
--- a/dmake/msdos/borland/tcc20/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* RCS  $Id: config.h,v 1.2 2008-03-05 18:37:12 kz Exp $
---
--- SYNOPSIS
---      Configurarion include file.
--- 
--- DESCRIPTION
--- 	There is one of these for each specific machine configuration.
---	It can be used to further tweek the machine specific sources
---	so that they compile.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* define this for configurations that don't have the coreleft function
- * so that the code compiles.  To my knowledge coreleft exists only on
- * Turbo C, but it is needed here since the function is used in many debug
- * macros. */
-/*#define coreleft() 0L*/
-extern unsigned int coreleft();
-
-#define SIGQUIT	SIGTERM		/* turbo C doesn't understand SIGQUIT */
-
-/* Turbo-C understands const declarations. */
-#define CONST const
-
-#ifndef MSDOS
-#   define MSDOS 1
-#endif
-
-/* a small problem with pointer to voids on some unix machines needs this */
-#define DMPVOID void *
-
-/* Have to pull this in for the standard lib defines */
-#include <io.h>
diff --git a/dmake/msdos/borland/tcc20/config.mk b/dmake/msdos/borland/tcc20/config.mk
deleted file mode 100644
index e7c53757d..000000000
--- a/dmake/msdos/borland/tcc20/config.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Definition of macros for library, and C startup code.
-osedir    = $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-LDLIBS	  = e:/cc/borland/tcc20/lib/c$(MODEL)
-CSTARTUP  = e:/cc/borland/tcc20/lib/c0$(MODEL).obj
-
-CFLAGS   += -I$(osedir) -f-
-
-# Case of identifiers is significant
-NDB_LDFLAGS += -c
diff --git a/dmake/msdos/borland/tcc20/libswp.rsp b/dmake/msdos/borland/tcc20/libswp.rsp
deleted file mode 100644
index 68d583f00..000000000
--- a/dmake/msdos/borland/tcc20/libswp.rsp
+++ /dev/null
@@ -1 +0,0 @@
-e:\cc\borland\tcc20\lib\cl
diff --git a/dmake/msdos/borland/tcc20/mkswp.bat b/dmake/msdos/borland/tcc20/mkswp.bat
deleted file mode 100755
index 52f6748e8..000000000
--- a/dmake/msdos/borland/tcc20/mkswp.bat
+++ /dev/null
@@ -1,107 +0,0 @@
-md objects
-tasm -t -mx -dmlarge msdos\exec.asm,,,;
-mv exec.obj objects
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  infer.c
-copy infer.obj objects
-del infer.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  make.c
-copy make.obj objects
-del make.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  stat.c
-copy stat.obj objects
-del stat.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  expand.c
-copy expand.obj objects
-del expand.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  dmstring.c
-copy dmstring.obj objects
-del dmstring.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  hash.c
-copy hash.obj objects
-del hash.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  dag.c
-copy dag.obj objects
-del dag.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  dmake.c
-copy dmake.obj objects
-del dmake.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  path.c
-copy path.obj objects
-del path.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  imacs.c
-copy imacs.obj objects
-del imacs.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  sysintf.c
-copy sysintf.obj objects
-del sysintf.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  parse.c
-copy parse.obj objects
-del parse.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  getinp.c
-copy getinp.obj objects
-del getinp.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  quit.c
-copy quit.obj objects
-del quit.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  state.c
-copy state.obj objects
-del state.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  dmdump.c
-copy dmdump.obj objects
-del dmdump.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  macparse.c
-copy macparse.obj objects
-del macparse.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  rulparse.c
-copy rulparse.obj objects
-del rulparse.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  percent.c
-copy percent.obj objects
-del percent.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  function.c
-copy function.obj objects
-del function.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  msdos\ruletab.c
-copy ruletab.obj objects
-del ruletab.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  msdos\dirbrk.c
-copy dirbrk.obj objects
-del dirbrk.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  msdos\runargv.c
-copy runargv.obj objects
-del runargv.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  msdos\arlib.c
-copy arlib.obj objects
-del arlib.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  msdos\dchdir.c
-copy dchdir.obj objects
-del dchdir.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  msdos\switchar.c
-copy switchar.obj objects
-del switchar.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  msdos\rmprq.c
-copy rmprq.obj objects
-del rmprq.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  msdos\spawn.c
-copy spawn.obj objects
-del spawn.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  msdos\find.c
-copy find.obj objects
-del find.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  msdos\dirlib.c
-copy dirlib.obj objects
-del dirlib.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  msdos\dstrlwr.c
-copy dstrlwr.obj objects
-del dstrlwr.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  unix\dcache.c
-copy dcache.obj objects
-del dcache.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  msdos\borland\tempnam.c
-copy tempnam.obj objects
-del tempnam.obj
-tcc -c -I. -Imsdos -Imsdos\borland -d -O -N- -w-nod -ml -Imsdos\borland\tcc20 -f-  msdos\borland\utime.c
-copy utime.obj objects
-del utime.obj
-tlink  /c @msdos\borland\tcc20\objswp.rsp,dmake.exe,NUL.MAP,@msdos\borland\tcc20\libswp.rsp
-copy msdos\borland\tcc20\template.mk startup\config.mk
diff --git a/dmake/msdos/borland/tcc20/objswp.rsp b/dmake/msdos/borland/tcc20/objswp.rsp
deleted file mode 100644
index c177fda3e..000000000
--- a/dmake/msdos/borland/tcc20/objswp.rsp
+++ /dev/null
@@ -1,36 +0,0 @@
-e:\cc\borland\tcc20\lib\c0l.obj+
-objects\exec.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\spawn.obj+
-objects\find.obj+
-objects\dirlib.obj+
-objects\dstrlwr.obj+
-objects\dcache.obj+
-objects\tempnam.obj+
-objects\utime.obj
diff --git a/dmake/msdos/borland/tcc20/public.h b/dmake/msdos/borland/tcc20/public.h
deleted file mode 100644
index 42a1fff5c..000000000
--- a/dmake/msdos/borland/tcc20/public.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:44:32 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void Clean_up_processes ANSI(());
-int Wait_for_child ANSI((int, int));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int dchdir ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int spawnvpe ANSI((int, char *, char **, char **));
-void Hook_std_writes ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/msdos/borland/tcc20/template.mk b/dmake/msdos/borland/tcc20/template.mk
deleted file mode 100644
index 3cac6b22a..000000000
--- a/dmake/msdos/borland/tcc20/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= tcc20
diff --git a/dmake/msdos/borland/tempnam.c b/dmake/msdos/borland/tempnam.c
deleted file mode 100644
index 8d7db878d..000000000
--- a/dmake/msdos/borland/tempnam.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:28 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dos.h>
-
-#if defined(max)
-#   undef  max
-#endif
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-int d_access();
-
-/* Turbo C stdio.h doesn't define P_tmpdir, so let's do it here */
-/* Under DOS leave the default tmpdir pointing here!		*/
-#ifndef P_tmpdir
-static char *P_tmpdir = "";
-#endif
-
-char *
-tempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   static         int count = 0;
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-   char		  buf[30];
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   else if( (tmpdir = getenv("TMP")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+13))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (d_access( strcpy(p, tmpdir), 0) != 0) )
-     if( (dl == 0) || (d_access( strcpy(p, dir), 0) != 0) )
-    if( d_access( strcpy(p, P_tmpdir), 0) != 0 )
-       if( !prefix )
-          prefix = "tp";
-
-   if(prefix)
-   {
-      *(p+strlen(p)+2) = '\0';
-      (void)strncat(p, prefix, 2);
-   }
-
-   sprintf( buf, "%08x", _psp );
-   buf[6]='\0';
-   (void)strcat(p, buf );
-   sprintf( buf, "%04d", count++ );
-   q=p+strlen(p)-6;
-   *q++ = buf[0]; *q++ = buf[1];
-   *q++ = buf[2]; *q   = buf[3];
-
-   if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
-
-   return(p);
-}
-
-
-
-d_access( name, flag )
-char *name;
-int  flag;
-{
-   extern char *DirSepStr;
-   char *p;
-   int r;
-
-   if( name == NULL || !*name ) return(1);  /* NULL dir means current dir */
-   r = access( name, flag );
-   p = name+strlen(name)-1;
-
-   if(*p != '/' && *p != '\\') strcat( p, DirSepStr );
-
-   return( r );
-}
diff --git a/dmake/msdos/borland/utime.c b/dmake/msdos/borland/utime.c
deleted file mode 100644
index bba775967..000000000
--- a/dmake/msdos/borland/utime.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* RCS  $Id: utime.c,v 1.1.1.1 2000-09-22 15:33:28 hr Exp $
---
--- SYNOPSIS
---      utime
---
--- DESCRIPTION
---      chage the last modified time on a file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <io.h>
-#include <time.h>
-
-int
-utime(name, timep)/*
-====================
-    Broken for turbo C it only sets the file time to the current time by
-    touching a character in the file */
-char*	name;
-time_t	timep[2];
-{
-    struct  stat buf;
-    int	fil;
-    char	data;
-
-    if (stat(name, &buf) != 0)
-        return (-1);
-    if (buf.st_size != 0)  {
-        if ((fil = open(name, O_RDWR, S_IWRITE)) < 0)
-            return (-1);
-        if (read(fil, &data, 1) < 1) {
-            close(fil);
-            return (-1);
-        }
-        lseek(fil, 0L, 0);
-        if (write(fil, &data, 1) < 1) {
-            close(fil);
-            return (-1);
-        }
-        close(fil);
-        return (0);
-    } else 	if ((fil = creat(name, S_IWRITE)) < 0) {
-        return (-1);
-    } else {
-        close(fil);
-        return (0);
-    }
-}
diff --git a/dmake/msdos/config.mk b/dmake/msdos/config.mk
deleted file mode 100644
index 77a32bf41..000000000
--- a/dmake/msdos/config.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-# This is an OS specific configuration file
-#	It assumes that OBJDIR, TARGET and DEBUG are previously defined.
-#	It defines	CFLAGS, LDARGS, CPPFLAGS, STARTUPFILE, LDOBJS
-#	It augments	SRC, OBJDIR, TARGET, CFLAGS, LDLIBS
-#
-
-# Memory model to compile for
-# set to s - small, m - medium, c - compact, l - large
-# Need large model now, dmake has grown up :-)
-MODEL = l
-
-STARTUPFILE	= $(OS)/startup.mk
-
-CPPFLAGS 	= $(CFLAGS)
-LDOBJS		= $(CSTARTUP) $(OBJDIR)/{$(<:f)}
-LDARGS		= $(LDHEAD) $(LDFLAGS:s/ //) @$(LDTMPOBJ),$(TARGET),NUL.MAP$(LDTAIL)
-LDTAIL		= $(_libs)
-_libs           = $(!null,$(LDLIBS) ,@$(LDTMPLIB))
-LDTMPOBJ	= $(mktmp,,$(DIVFILE) $(LDOBJS:s,/,\\,:t"+\n")\n)
-LDTMPLIB	= $(mktmp,,$(DIVFILE) $(LDLIBS:s,/,\\,:t"+\n")\n)
-
-# Debug flags
-DB_CFLAGS	= -DDBUG
-DB_LDFLAGS	=
-DB_LDLIBS	=
-
-# NO Debug flags
-NDB_CFLAGS	=
-NDB_LDFLAGS	=
-NDB_LDLIBS	=
-
-# Local configuration modifications for CFLAGS.
-CFLAGS         += -I$(OS)
-
-# Common MSDOS source files.
-# Define SWAP to anything but 'y' for the swap code to be excluded on making.
-# Swapping for DOS versions is enabled by default.
-# Note: swapping is handled specially for ZTC in msdos/zortech/config.mk.
-SWAP *= y
-
-.IF $(OSRELEASE) != zortech
-   .IF $(SWAP) == y
-      SWP_SRC += spawn.c
-      ASRC += exec.asm
-   .ELSE
-      SWP_SRC += tee.c
-   .END
-.ELSE
-   SWP_SRC += tee.c
-.END
-
-OS_SRC += ruletab.c dirbrk.c runargv.c arlib.c dchdir.c switchar.c rmprq.c\
-        $(SWP_SRC) find.c dirlib.c dstrlwr.c
-UNIXSRC := dcache.c
-SRC += $(OS_SRC) $(UNIXSRC)
-.SETDIR=$(OS) : $(ASRC) $(OS_SRC)
-.SETDIR=unix  : $(UNIXSRC)
-
-# Provide our own %$O : %$S rule.
-%$O : %$S
-    +$(AS) $(ASFLAGS) $(<:s,\,${__.DIVSEP-sh-${USESHELL}},:s,/,${__.DIVSEP-sh-${USESHELL}},),,,;
-    mv $(@:f) $(OBJDIR)
-
-# Set source dirs so that we can find files named in this
-# config file.
-.SOURCE.h : $(OS)
-
-# See if we modify anything in the lower levels.
-.IF $(OSRELEASE) != $(NULL)
-   .INCLUDE : $(OS)$(DIRSEPSTR)$(OSRELEASE)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/msdos/dchdir.c b/dmake/msdos/dchdir.c
deleted file mode 100644
index c9cf1faf1..000000000
--- a/dmake/msdos/dchdir.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* RCS  $Id: dchdir.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Change directory.
--- 
--- DESCRIPTION
---	Under DOS change the current drive as well as the current directory.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <dos.h>
-#include "extern.h"
-
-PUBLIC int
-dchdir(path)
-char *path;
-{
-   int   res;
-
-   res = chdir(path);
-
-   if (res != -1 && path[1] == ':') {
-      union REGS  reg;
-
-      /* we must change the logged drive, since the chdir worked. */
-      reg.h.ah = 0x0E;
-      reg.h.dl = (*path & ~0x20) - 'A' + 1;
-      intdos(&reg, &reg);
-   }
-
-   return (res);
-}
diff --git a/dmake/msdos/dirbrk.c b/dmake/msdos/dirbrk.c
deleted file mode 100644
index 2b8dead1f..000000000
--- a/dmake/msdos/dirbrk.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* RCS  $Id: dirbrk.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Define the directory separator string.
--- 
--- DESCRIPTION
--- 	Define this string for any character that may appear in a path name
---	and can be used as a directory separator.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-/* dos uses /, \, and : */
-char*	DirBrkStr = "/\\:";
-
-/*
-** Return TRUE if the name is the full specification of a path name to a file
-** starting at the root of the file system, otherwise return FALSE
-*/
-PUBLIC int
-If_root_path(name)
-char *name;
-{
-   return( (strchr(DirBrkStr, *name) != NIL(char)) ||
-           (isalpha(*name) && name[1] == ':') );
-}
diff --git a/dmake/msdos/dirent.h b/dmake/msdos/dirent.h
deleted file mode 100644
index 24ad5681d..000000000
--- a/dmake/msdos/dirent.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* DIRLIB.H by M. J. Weinstein   Released to public domain 1-Jan-89 */
-
-#ifndef _DIRLIB_h_
-#define _DIRLIB_h_
-
-#include <stdio.h>
-#include "stdmacs.h"
-#include "dosdta.h"
-
-#define MAXNAMLEN   15
-
-struct dirent {
-   long              d_ino;
-   unsigned short    d_reclen;
-   unsigned short    d_namlen;
-   char              d_name[MAXNAMLEN+1];
-};
-
-typedef struct {
-   DTA    dd_dta;       /* disk transfer area for this dir.        */
-   short  dd_stat;      /* status return from last lookup          */
-   char   dd_name[1];   /* full name of file -- struct is extended */
-} DIR;
-
-extern DIR           *opendir   ANSI((char *));
-extern struct dirent *readdir   ANSI((DIR *));
-extern long          telldir    ANSI((DIR *));
-extern void          seekdir    ANSI((DIR *, long));
-extern void          closedir   ANSI((DIR *));
-
-#define rewinddir(dirp)   seekdir(dirp,0L)
-#endif
diff --git a/dmake/msdos/dirlib.c b/dmake/msdos/dirlib.c
deleted file mode 100644
index 9097e5163..000000000
--- a/dmake/msdos/dirlib.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
-            DIRLIB for MS-DOS
-            -----------------
-
-Enclosed is an implementation of the `dirlib' package for MS-DOS.  
-The implementation is targeted for MS-C, although any reasonably
-competent C compiler should manage.  The package consists of:
-
-    dir.h		the header file
-    dir.c		the functions
-    testdir.c	a q&d test program
-    
-The package tries to view directory naming in a Un*x light; in particular,
-directories such as '/.' and '/..' (as well as `.' and `..' if your
-current directory is root) are understood.   Indefinite paths like 
-`/../.././../..' will correctly refer to the root (of the particular disk).
-Names such as `a:////./../' are okay too.
-
-I've tried to be as sensible about DTA's as possible, since you never
-know who will be using one; they are set before use, and reset afterwards.
-
-There is some cruft in the package, namely the way `seekdir' and
-`telldir' are done.  The code was derived from a little experimentation, 
-and may not work after a certain point (although I believe the 2.x version
-to be solid).  Caveat utilitor.
-
-Documentation for the package is available in the public domain; the
-package's functionality was derived from this documentation.
-
-Bug reports and comments are welcome.  Enjoy!
-
-                - Matt
-
--------
-UUCP:	{ucbvax,ihnp4,randvax,trwrb!trwspp,ism780}!ucla-cs!matt
-ARPA:	matt@LOCUS.UCLA.EDU
-Ph:	(213) 825-2756
-
---------
-Modified for use in dmake by Dennis Vadura.  Mostly just clean up and an
-effort to make correctly typed objects are passed to functions in find.c.
-Also deleted all dos version 2.0 specific code.  It is not required any
-more.
-*/
-
-/*
- * revision history:
- *
- *	VER	MM/DD/YY	COMMENTS
- *	----	--------	--------
- *	0.99	02/24/86	Beta release to INTERNET
- */
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <dos.h>
-
-#include "dirent.h"
-
-extern int find_err;
-
-
-static char *
-getdcwd(drive)
-int drive;
-{
-   union REGS r;
-   struct SREGS s;
-   static char xcwd[64];
-   char far *cwd = xcwd;
-
-   r.h.ah = 0x47;
-   r.h.dl = drive;
-   r.x.si = FP_OFF(cwd);
-   s.ds = FP_SEG(cwd);
-   intdosx(&r, &r, &s);
-   find_err = r.x.ax;
-   if (r.x.cflag)
-      return (char *) 0;
-   return xcwd;
-}
-
-
-
-/*
- * opendir
- */
-
-#define SUFFIX	"\\*.*"
-#define	SLASH	"\\"
-#define streq(a,b)	(strcmp(a,b)==0)
-
-DIR *
-opendir(name)
-char *name;
-{
-   register DIR *nd;
-   char *cwd;
-   char drive[3];
-   int atroot = 0;
-   int rooted = 0;
-
-   /*
-   * hack off drive designator if present
-   */
-
-   if (name[1] == ':') {
-      cwd = getdcwd(toupper(name[0]) - 'A' + 1);
-      drive[0] = name[0]; drive[1] = ':'; drive[2] = '\0';
-      name += 2;
-   }
-   else {
-      cwd = getdcwd(0);
-      drive[0] = '\0';
-   }
-
-   /* is the name 'rooted'? */
-   if ((*name == '/') || (*name == '\\')) ++rooted;
-
-   /* see if we are at the root directory for this device */
-   if (!*cwd) ++atroot;
-
-   /* 
-   * MSDOS '/' doesn't have a '.' or '..'
-   * also, double '/' sequences don't make sense.
-   * many ported programs expect them to work, so we fix it up...
-   */
-
-   /* chop off leading . and .. if at root */
-   if (atroot && (*name == '.')) {
-      switch (*++name) {
-     case '\0':
-     case '/':
-     case '\\':
-        break;
-
-     case '.':
-        switch (*++name) {
-           case '\0':
-           case '/':
-           case '\\':
-            break;
-           default:
-            --name; 
-            --name;
-        }
-        break;
-
-     default:
-        --name;
-      }
-   }
-
-   /* chop off leading /'s, /.'s and /..'s to make naming sensible */
-   while (*name && ((*name == '/') || (*name == '\\'))) {
-      if (*++name == '.') {
-     switch (*++name) {
-        case '\0':
-        case '/':
-        case '\\':
-           break;
-
-        case '.':
-           switch (*++name) {
-          case '\0':
-          case '/':
-          case '\\':
-              break;
-
-         default:
-              --name; 
-              --name;
-           }
-           break;
-
-        default:
-           --name;
-     }
-      }
-   }
-
-
-   /*
-   * name should now look like: path/path/path 
-   * we must now construct name based on whether or not it
-   * was 'rooted' (started with a /)
-   */
-
-   if (rooted) cwd = "";
-
-   /* construct DIR */
-   if (!(nd = (DIR *)malloc(
-      sizeof(DIR)+strlen(drive)+strlen(cwd)+strlen(SLASH)+
-      strlen(name)+strlen(SUFFIX))))
-      return (DIR *) 0;
-
-   /* create long name */
-   strcpy(nd->dd_name, drive);
-   if (*cwd) {
-      strcat(nd->dd_name, SLASH);
-      strcat(nd->dd_name, cwd);
-   }
-   if (*name) {
-      strcat(nd->dd_name, SLASH);
-      strcat(nd->dd_name, name);
-   }
-   strcat(nd->dd_name, SUFFIX);
-
-   /* search */
-   if (!findfirst(&nd->dd_name[0], &nd->dd_dta)) {
-      free((char *)nd);
-      errno = ENOENT;
-      return (DIR *) 0;
-   }
-   nd->dd_stat = 0;
-   return nd;
-}
-
-
-struct dirent *
-readdir(dirp)
-DIR *dirp;
-{
-   static struct dirent dir;
-
-   if (dirp->dd_stat)
-      return (struct dirent *) 0;
-
-   /* format structure */
-   dir.d_ino = 0; /* not valid for DOS */
-   dir.d_reclen = 0;
-   strcpy(dir.d_name, dirp->dd_dta.name);
-   dir.d_namlen = strlen(dir.d_name);
-   strlwr(dir.d_name); /* DOSism */
-
-   /* read ahead */
-   if (findnext(&dirp->dd_dta) != NULL)
-      dirp->dd_stat = 0;
-   else		
-      dirp->dd_stat = find_err;
-
-   return &dir;
-}
-
-
-void
-closedir(dirp)
-DIR *dirp;
-{
-   free((char *)dirp);
-}
-
-
-void
-seekdir(dirp, pos)
-DIR *dirp;
-long pos;
-{
-   /*
-   * check against DOS limits
-   */
-
-   if ((pos < 0) || (pos > 4095)) {
-      dirp->dd_stat = 1;
-      return;
-   }
-
-   *(short *)&dirp->dd_dta.fcb[13] = pos + 1;
-
-   /* read ahead */
-   if (findnext(&dirp->dd_dta))
-      dirp->dd_stat = 0;
-   else		
-      dirp->dd_stat = find_err;
-}
-
-
-long
-telldir(dirp)
-DIR *dirp;
-{
-   return (long) (*(short *)&dirp->dd_dta.fcb[13] - 2);
-}
diff --git a/dmake/msdos/dosdta.h b/dmake/msdos/dosdta.h
deleted file mode 100644
index c9642715d..000000000
--- a/dmake/msdos/dosdta.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _DOSDTA_
-#define _DOSDTA_
-
-#include "stdmacs.h"
-typedef struct {
-   char   fcb[21];
-   char   attr;
-   short  time;
-   short  date;
-   long   size;
-   char   name[13];
-} DTA;
-
-extern DTA  *findfirst ANSI((char *, DTA *));
-extern DTA  *findnext  ANSI((DTA *));
-#endif
diff --git a/dmake/msdos/dstrlwr.c b/dmake/msdos/dstrlwr.c
deleted file mode 100644
index 6ee83b218..000000000
--- a/dmake/msdos/dstrlwr.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* RCS  $Id: dstrlwr.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Rotines for computing case mappings in Win95/NT environments.
---
--- DESCRIPTION
---      This code is an attempt at providing sane case mappings to help
---      deal with the disparity in file name case between 8.3 and long
---      file names under Win95/NT.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-#include "extern.h"
-
-PUBLIC void
-dstrlwr(entry, target)
-char *entry;
-char *target;
-{
-   char *p;
-
-   if (STOBOOL(DcacheRespCase))
-      return;
-   
-   /* Look for the target being lower case, if so then lower the case
-    * of the directory entry.  Note that we only check the first
-    * character of the target.  This is a bit of a kludge but there is
-    * really no other way to know, particularly since this test will be
-    * performed for each member of the directory but against the same
-    * target. */
-   if (islower(*target))
-      strlwr(entry);
-
-   return;
-}
diff --git a/dmake/msdos/exec.asm b/dmake/msdos/exec.asm
deleted file mode 100644
index db745aece..000000000
--- a/dmake/msdos/exec.asm
+++ /dev/null
@@ -1,1234 +0,0 @@
-; 
-; DESCRIPTION
-;      This code is a model independent version of DOS exec that will swap
-;      the calling process out to secondary storage prior to running the
-;      child.  The prototype for calling the exec function is below.
-;
-;      exec( int swap, char far *program, char far *cmdtail,
-;	     int environment_seg, char far *tmpfilename );
-;
-;
-;      To assemble this file issue the command:
-;
-;         tasm /mx /t /dmmodel exec.asm
-;
-;      where 'model' is one of {small, compact, medium, large}, you may
-;      also use MASM 5.1 to assemble this file, in this case simply replace
-;      'tasm' with 'masm' in the above command line.
-;
-; AUTHOR
-;      Dennis Vadura, dvadura@watdragon.uwaterloo.ca
-;      CS DEPT, University of Waterloo, Waterloo, Ont., Canada
-;
-; COPYRIGHT
-;      Copyright (c) 1990 by Dennis Vadura.  All rights reserved.
-; 
-;      This program is free software; you can redistribute it and/or
-;      modify it under the terms of the GNU General Public License
-;      (version 1), as published by the Free Software Foundation, and
-;      found in the file 'LICENSE' included with this distribution.
-; 
-;      This program is distributed in the hope that it will be useful,
-;      but WITHOUT ANY WARRANTY; without even the implied warrant of
-;      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;      GNU General Public License for more details.
-; 
-;      You should have received a copy of the GNU General Public License
-;      along with this program;  if not, write to the Free Software
-;      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-;
-ifdef have286
- .286    ; define have286 with -D for 80286 processor or better
-    mpusha Macro
-    	pusha
-    Endm
-
-    mpopa Macro
-    	popa
-    Endm
-
-else	; 8088/8086 compatible
-    mpusha Macro
-    	push ax
-	push cx
-	push dx
-	push bx
-	push sp
-	push bp
-	push si
-	push di
-    Endm
-
-    mpopa Macro
-    	pop di
-	pop si
-	pop bp
-	add sp,2
-	pop bx
-	pop dx
-	pop cx
-	pop ax
-    Endm
-endif
-
-ifdef msmall
-	        .model	small
-argbase		equ	4
-endif
-ifdef mcompact
-		.model  compact
-argbase		equ	4
-endif
-ifdef mmedium
-		.model	medium
-argbase		equ	6
-endif
-ifdef mlarge
-		.model	large
-argbase		equ	6
-endif
-a_swap		equ	<bp+argbase+0>
-a_prog		equ	<bp+argbase+2>
-a_tail		equ	<bp+argbase+6>
-a_env 		equ	<bp+argbase+10>
-a_tmp		equ	<bp+argbase+12>
-
-a_handle	equ	<bp+argbase>
-
-
-; Define all useful equ's
-swap_xms	equ	0		; we swapped it out to xms
-swap_ems	equ	2		; we swapped it out to ems
-swap_file	equ	4		; we swapped it out to a file
-seg_no_alloc	equ	0		; this is part of a segment
-seg_alloc	equ	1		; this is a full segment header
-seg_data	equ	2		; this is data for part of a segment
-
-
-; Define any global/external variables that we will be accessing from here.
-	        .data
-		extrn	_errno:word		; Set to dos ret code from exec
-		public  _Interrupted		; Set to 1 if interrupted 0
-_Interrupted	dw	0			; otherwise
-
-	        .code
-		assume	cs:@code, ds:@code, ss:@code, es:@code
-
-		even
-execstack	dw	64  dup (?)	; put the temporary exec stack right
-exec_sp		label	word		; at the start.
-
-old_ss		dw	?		; save stack seg across exec
-old_sp		dw	?		; save stack ptr across exec
-progsize	dw	?		; original size of the program
-rootsize	dw	?		; size of base root kept during swap
-resend		dw	?		; paragraph where resident code ends
-envseg		dw	?		; paragraph of environment segment
-psp		dw	?		; our own psp
-swap		dw	?		; swapping selection flag
-eretcode	dw	?		; return code from exec
-interrupted	dw	?		; interrupted flag for exec
-arenahead	dw	?		; start of memory block list
-alstr		dw	?		; allocation strategy save spot
-in_exec		dw	0		; flag, 1 ==> in exec
-
-cmdpath		db	65  dup(?)	; file to exec
-cmdtail		db	129 dup(?)	; its command tail
-fcb		db	37  dup(0)	; dummy fcb
-tmpseg		db	7   dup(?)	; block header buffer
-
-tmpname		db	65  dup(0)	; name of temporary file resource
-
-		even
-tmphandle	dw	?		; handle for temporary file
-real_21h	dd	0		; will be DOS's 21h vector if doing -C
-
-std_fil_handle	dw	?		; file handle for -C file
-std_fil_number	db	?		; system file number for -C file
-our_stdout	db	?		; sys file number our stdout handle
-
-error_rhdr	db	"exec: Failure reading header block", 0DH, 0AH, '$'
-error_rseg	db	"exec: Failure reading segment data", 0DH, 0AH, '$'
-error_resize	db	"exec: Failure on resize", 0DH, 0AH, '$'
-error_free	db	"exec: Failure to free a block", 0DH, 0AH, '$'
-error_string	db	"exec: Program swap failure", 0DH, 0AH, '$'
-error_alloc	db	"exec: Memory blocks don't match", 0DH, 0AH, '$'
-
-		even
-write_header label word
-   whdr_xms_ptr		dw	word ptr whdr_xms
-   whdr_ems_ptr		dw	word ptr whdr_ems
-   whdr_file_ptr	dw	word ptr whdr_file
-
-write_seg label word
-   wseg_xms_ptr		dw	word ptr wseg_xms
-   wseg_ems_ptr		dw	word ptr wseg_ems
-   wseg_file_ptr	dw	word ptr wseg_file
-
-read_header label word
-   rhdr_xms_ptr		dw	word ptr rhdr_xms
-   rhdr_ems_ptr		dw	word ptr rhdr_ems
-   rhdr_file_ptr	dw	word ptr rhdr_file
-
-read_seg label word
-   rseg_xms_ptr		dw	word ptr rseg_xms
-   rseg_ems_ptr		dw	word ptr rseg_ems
-   rseg_file_ptr	dw	word ptr rseg_file
-
-free_resource label word
-   free_xms_ptr		dw	word ptr free_xms_resource
-   free_ems_ptr		dw	word ptr free_ems_resource
-   free_file_ptr	dw	word ptr free_file_resource
-
-reset_resource label word
-   reset_xms_ptr	dw	word ptr reset_xms_resource
-   reset_ems_ptr	dw	word ptr reset_ems_resource
-   reset_file_ptr	dw	word ptr reset_file_resource
-
-old_ctl_brk label dword
-   old_ctl_brk_off	dw	?
-   old_ctl_brk_seg 	dw	?
-
-old_crit_err label dword
-   old_crit_err_off	dw	?
-   old_crit_err_seg 	dw	?
-
-exec_block label word
-  ex_envseg	dw	?			; env seg, use parent's if 0
-  ex_cmdtail	dd	?			; command tail for exec
-  ex_fcb1	dd	far ptr fcb		; fcb's aren't used by dmake
-  ex_fcb2	dd	far ptr fcb
-  ex_ss		dw	?			; saved ss for exec
-  ex_sp		dw	?			; saved sp for exec
-  ex_error	dw	0			; error code for dos exec
-
-
-; Special 21h (DOS call) handler to tee stdout/stderr writes to the -C file.
-; Ignore 21h calls that aren't writes to 1 or 2; i.e., pass them to DOS handler.
-; If write call was from this process, it's pretty simple to duplicate it
-; to the -C file.  If it's from another process, we try to write to its
-; inherited handle.  Worst case is where the handle wasn't inherited: someone
-; closed it.  In that instance we have to switch to dmake's PSP to do the
-; duplicate write.
-
-; Subprocesses do not get their stdout/stderr teed to the -C file if
-; their stdout/stderr no longer points to the file/device that dmake's
-; stdout points to.  This is tested by looking at the process's job
-; file table, which is a table that maps process handles to DOS system file
-; table numbers.  (The far pointer to the JFT is at the PSP offset 34h.)
-; The JFT is also queried to see if the -C file was inherited.
-
-; O_BINARY, O_TEXT problems are ignored here.  These are fudged by the
-; C library before it calls DOS; since we're working below that level
-; we don't have to worry about it.
-
-simulate_21h Macro
-    pushf			;; direct call to DOS
-    call cs:[real_21h]
-    Endm
-
-	assume cs:@code, ds:nothing, es:nothing, ss:nothing
-our_21h_handler proc far
-    pushf
-    cmp ah,40h		; is this a write?
-    jne call_dos	; --no
-    cmp bx,1		; write on handle 1 (stdout?)
-    je duplicate_it
-    cmp bx,2		; stderr?
-    je duplicate_it
-
-call_dos:
-    popf
-    jmp [real_21h]	; far jump to real handler, which will do the sys call
-    			; and return to the original caller
-
-duplicate_it:
-    mpusha
-    push ds
-    push es
-    mov bp,sp
-
-    mov di,std_fil_handle	; handle of the -C file
-
-  If @CodeSize eq 0
-  	; Small/compact models allow for quick test of us versus subprocess.
-	; False negative (it's us with a different CS) will be picked
-	; up by code just below.  (Might happen due to call from C library.)
-	; False positives would be bad, but can't happen.
-    mov ax,[bp+24]	; caller's CS
-    cmp ax,@code	; same as us?
-    je call_from_dmake
-  Endif
-
-    mov ah,51h		; get PSP ("undocumented version" works in DOS 2.0+)
-    simulate_21h	; PSP segment returned in BX
-    cmp bx,psp		; our PSP?
-    je call_from_dmake	; --yes, no PSP changing needed
-
-    mov es,bx		; set ES to current (caller's) PSP
-    lds bx,es:[34h]	; set DS:BX pointing to caller's job file table
-
-    mov si,[bp+12]	; file handle caller passed in (known to be 1 or 2)
-    mov al,[bx+si]	; system file number corresponding to caller's handle
-    cmp al,our_stdout	; same as our stdout?
-    jne do_real_write	; no--subprocess must have redirected it
-
-    mov al,[bx+di]	; see if caller has dup of -C file still open
-    cmp al,std_fil_number
-    je use_dup		; yes--we can write using caller's PSP
-
-    	; Calling process (or some intermediate process) has closed
-	; the -C descriptor.  We'll use dmake's (our) -C descriptor, but
-	; to do so we'll have to change the PSP.  Disable BREAK handling
-	; so that ^break doesn't kill the wrong process.
-
-    mov ax,3300h	; get BREAK flag
-    simulate_21h
-    mov si,dx		; save BREAK state in SI
-    sub dx,dx		; now turn break flag off
-    mov ax,3301h
-    simulate_21h	; don't want ^Break recoginized while PSP changed
-    mov bx,psp		; set dmake's PSP
-    mov ah,50h
-    simulate_21h
-
-    mov bx,di			; handle of -C file
-    ; CX still has caller's count
-    mov ds,[bp+2]		; restore caller's DS
-    mov dx,[bp+14]		; DS:DX again points to caller's buffer
-    mov ah,40h
-    simulate_21h		; write the copy
-
-    mov bx,es		; caller's PSP
-    mov ah,50h		; set PSP
-    simulate_21h	; restore caller's PSP
-    mov dx,si		; break state before we changed it
-    mov ax,3301h
-    simulate_21h	; restore break state
-
-    jmp short do_real_write
-
-use_dup:
-    mov ds,[bp+2]		; restore caller's DS
-    mov dx,[bp+14]		; DS:DX again points to caller's buffer
-
-call_from_dmake:
-    mov bx,di			; handle of -C file
-    mov ah,40h			; write
-    ; CX still has caller's count
-    simulate_21h		; write to the file
-
-do_real_write:
-    pop es
-    pop ds
-    mpopa
-    popf
-    jmp [real_21h]	; far jump to real handler, which will do the sys call
-    			; and return to the original caller
-our_21h_handler endp
-
-	assume	cs:@code, ds:@code, ss:@code, es:@code
-
-;-----------------------------------------------------------------------------
-; First define the critical-error and control-brk handlers. 
-; The critical error handler simply pops the machine state and returns an
-; access denied result code.
-crit_err_handler proc far
-		add	sp, 6		; ip/cs/flags ...
-		pop	ax
-		pop	bx
-		pop	cx
-		pop	dx
-		pop	si
-		pop	di
-		pop	bp
-		pop	ds
-		pop	es
-		push	bp		; fix up the return flags
-		mov	bp, sp
-		xchg	ax, [bp+6]	; get the flag byte.
-		or	ax, 1		; set the carry bit
-		xchg	ax, [bp+6]	; put it back.
-		pop	bp
-		mov	ax, 5		; access denied
-		iret
-crit_err_handler endp
-
-
-;-----------------------------------------------------------------------------
-; Here we set the interrupted flag, and terminate the currently running
-; process.
-ctl_brk_handler proc far
-		clc				; make sure carry is clear
-		inc	cs:interrupted		; set the flag
-
-; Make certain it isn't us that is going to get terminated.
-; There is a small window where the in_exec flag is set but the child is
-; not running yet, I assume that DOS doesn't test for ctl_brk at that time
-; as it is bussily creating a new process.
-		cmp	cs:in_exec,0
-		je	just_return		; note this implies CF == 0
-		stc				; set CF to abort child
-just_return:	iret
-ctl_brk_handler endp
-
-
-;-----------------------------------------------------------------------------
-; Something really nasty happened, so abort the exec call and exit.
-; This kills the calling process altogether, and is a very nasty way of
-; termination since files may still be open etc.
-abort_exec_rhdr label near
-		mov	dx, offset error_rhdr
-		jmp	print_it
-abort_exec_rseg label near
-		mov	dx, offset error_rseg
-		jmp	print_it
-abort_exec_resize label near
-		mov	dx, offset error_resize
-		jmp	print_it
-abort_exec_free label near
-		mov	dx, offset error_free
-		jmp	print_it
-abort_exec_alloc label near
-		mov	dx, offset error_alloc
-		jmp	print_it
-abort_exec proc near
-		mov	dx, offset error_string
-print_it:	push	dx
-		mov	bx, [swap]
-		call	[free_resource+bx]
-		mov	ax, cs
-		mov	ds, ax
-		pop	dx
-		mov	ah, 9
-		int	21H
-kill_program:	mov	ax, 04cffH			; nuke it!
-		int	21H
-abort_exec endp
-
-
-;-----------------------------------------------------------------------------
-; lodsw/stosw loop to copy data.  Called only for word copy operations.
-; 	ds:si  - point at source
-;	es:di  - point at destination
-;	cx     - count of bytes to copy.
-copy_data proc near
-		shr	cx, 1		; convert to word count
-		jnc	copy_words
-		movsb
-copy_words:	rep	movsw		; copy the words.
-		ret
-copy_data endp
-
-
-
-;=============================================================================
-; THE FOLLOWING SECTION DEALS WITH ALL ROUTINES REQUIRED TO READ XMS RECORDS.
-;=============================================================================
-rhdr_xms proc near
-		ret
-rhdr_xms endp
-
-rseg_xms proc near
-		ret
-rseg_xms endp
-
-reset_xms_resource proc near
-		ret
-reset_xms_resource endp
-
-free_xms_resource proc near
-		ret
-free_xms_resource endp
-;=============================================================================
-
-
-
-;=============================================================================
-; THE FOLLOWING SECTION DEALS WITH ALL ROUTINES REQUIRED TO READ EMS RECORDS.
-;=============================================================================
-rhdr_ems proc near
-		ret
-rhdr_ems endp
-
-rseg_ems proc near
-		ret
-rseg_ems endp
-
-reset_ems_resource proc near
-		ret
-reset_ems_resource endp
-
-free_ems_resource proc near
-		ret
-free_ems_resource endp
-;=============================================================================
-
-
-
-;=============================================================================
-; THE FOLLOWING SECTION DEALS WITH ALL ROUTINES REQUIRED TO READ FILE RECORDS.
-;=============================================================================
-; This routine reads a segment header from a file.
-; The header is a seven byte record formatted as follows:
-;	segment address		- of data
-;	offset address		- of data
-; 	length in paragraphs	- of data
-;	mode			- 1 => segment header (allocate seg on read)
-;				  0 => subsegment, don't allocate on read.
-; The information is placed into the tmpseg data area in the code segment.
-; The routine aborts if an error is detected.
-rhdr_file proc near
-		mov	dx, offset tmpseg	; read the header record out
-		mov	cx, 7
-		mov	bx, [tmphandle]
-		mov	ah, 03fH
-		int	21H
-		jnc	rhdr_done		; make sure it worked
-		jmp	abort_exec_rhdr
-
-rhdr_done:	cmp	ax, 7
-		je	exit_rhdr_file
-		or	ax, ax
-		je	signal_eof
-		jmp	abort_exec_rhdr
-
-signal_eof:	stc
-exit_rhdr_file:	ret
-rhdr_file endp
-
-
-;-----------------------------------------------------------------------------
-; Read a segment from the temporary file whose handle is in cs:tmphandle.
-; The routine aborts if an error is detected.
-rseg_file proc near
-		push	ds
-		mov	ds, word ptr cs:tmpseg; Now read the whole segment
-		mov	dx, word ptr cs:tmpseg+2
-		mov	cx, word ptr cs:tmpseg+4
-		mov	bx, cs:tmphandle
-		mov	ah, 03fH
-		int	21H
-		pop	ds
-		jnc	rseg_done
-		jmp	abort_exec_rseg
-
-rseg_done:	cmp	ax, [word ptr tmpseg+4]
-		je	exit_rseg_file
-		jmp	abort_exec_rseg		; If we didn't get read full
-exit_rseg_file:	ret				; segment then abort
-rseg_file endp
-
-
-;-----------------------------------------------------------------------------
-; Seek to the beginning of the file.
-reset_file_resource proc near
-		mov	bx, [tmphandle]
-		xor	cx, cx
-		mov	dx, cx
-		mov	ax, 04200H		; seek to begining of file
-		int	21H
-		ret
-reset_file_resource endp
-
-
-;-----------------------------------------------------------------------------
-; unlink the temporary file allocated for swapping.
-; We close the file first, and then delete it.   We ignore errors here since
-; we can't do anything about them anyway.
-free_file_resource proc near
-		mov	bx, [tmphandle]		; get the file handle
-		mov	ah, 03eH		; close the file
-		int	21H
-		mov	dx, offset tmpname	; Now delete the temp file
-		mov	ah, 041H
-		int	21H
-		ret
-free_file_resource endp
-;=============================================================================
-
-
-
-;=============================================================================
-; CODE TO SWAP THE IMAGE IN FROM SECONDARY STORAGE
-;=============================================================================
-swap_in proc near
-		mov	bx, [alstr]		; get previous alloc strategy
-		mov	ax, 5801H		; and set it back
-		int	21H
-		mov	bx, [swap]		; get type of resource
-		call	[reset_resource+bx]	; reset the resource
-		mov	es, [psp]		; resize the program back
-		mov	bx, [progsize]		; to original size
-		mov	ah, 04AH
-		int	21H
-		jnc	read_seg_loop
-		jmp	abort_exec
-
-read_seg_loop:	mov	bx, [swap]		; get type of resource
-		call	[read_header+bx]	; get seg header
-		jc	exit_swap_in		; all done
-		mov	al, [tmpseg+6]
-		cmp	al, seg_no_alloc	; see if dummy segment header
-		je	read_seg_loop
-		cmp	al, seg_alloc		; do we need to do an alloc?
-		jne	read_data		; nope
-
-; Allocate back the memory for a segment that is not the [psp], note that this
-; must come back to the same segment we had previously since other segments
-; may have pointers stored in their variables that point to this segment using
-; segment:offset long pointers.
-		mov	bx, [word ptr tmpseg+4]	; get count of paragraphs
-		mov	ah, 048H		; dos_alloc
-		int	21H
-		jc	alloc_error		; oops!
-		cmp	ax, [word ptr tmpseg]	; did we get the same segment?
-		je	read_seg_loop		; yup!
-alloc_error:	jmp	abort_exec_alloc
-
-read_data:	mov	bx, [swap]
-		call	[read_seg+bx]		; this must succeed, if fail
-		jmp	read_seg_loop		; we never come back here
-
-exit_swap_in:	mov	bx, [swap]		; all done, so free resource
-		call	[free_resource+bx]
-		ret
-swap_in endp
-
-
-;=============================================================================
-; CODE TO SWAP THE IMAGE OUT TO SECONDARY STORAGE
-;=============================================================================
-; This routine is called to swap the non-resident portion of the program
-; out to the resource specified by the value of [cs:swap].  If the swap out
-; fails, then appropriate routines are called to free the resources allocated
-; up to that point.
-;
-; The steps used to swap the program out are as follows:
-;	- calculate new size of program to remain resident and size to swap
-;	  out.
-;	- write out non-resident portion of current segment
-;	- walk DOS allocation chain and write out all other segments owned by
-;	  the current program that are contiguous with the _psp segment
-;	- copy the environment down to low memory
-;	- resize the current _psp segment to savesize
-;	- free all segments belonging to program except current _psp segment
-swap_out proc near
-		mov	ax, 05800H	; get memory alocation strategy
-		int	021H
-		mov	[alstr], ax	; and save it for future restoration.
-		mov	di, [psp]	; compute length of program to current
-		mov	bx, cs		; value of cs, and find program size
-		sub	bx, di		; by looking at length stored in
-		mov	ax, di		; arena header found in front of psp
-		dec	ax
-		mov	es, ax
-		mov	si, es:3	; si is size of program in paragraphs
-		mov	[progsize], si	; progsize now contains the size.
-
-; Now compute length of program segment to save.
-; Length is:   cs - psp + (offset overlay_code_here+15 >> 4)
-		mov	ax, offset overlay_code_here+15
-		shr	ax, 1
-		shr	ax, 1
-		shr	ax, 1
-		shr	ax, 1
-		add	bx, ax			; bx is size of program to keep
-		sub	si, bx			; si is # of paragraphs to save.
-		add	di, bx			; di is paragraph to start at
-		mov	rootsize, bx
-		mov	resend, di		; cs:resend is saved start para
-		mov	al, seg_no_alloc	; set no allocation for segment
-		call	write_segment
-		jc	abort_swap_out
-
-; We have now saved the portion of the program segment that will not remain
-; resident during the exec.  We should now walk the DOS allocation chain and
-; write out all other segments owned by the current process.
-save_segments:	mov	ax, [psp]
-		dec	ax
-		mov	es, ax
-		mov	bx, offset write_segment_data
-		call	walk_arena_chain
-		jc	abort_swap_out
-
-; Now we must walk the chain of allocated memory blocks again and free
-; all those that are owned by the current process, except the one that is
-; the current process' psp.
-free_segments:	mov	ax, [psp]
-		dec	ax
-		mov	es,ax
-		mov	bx, offset free_dos_segment
-		call	walk_arena_chain
-		jnc	resize_program
-		jmp	abort_exec_free		; can't fix it up now.
-
-; We now resize the program to the size specified by cs:rootsize.  This will
-; free most of the memory taken up by the current program segment.
-resize_program: mov	es, [psp]		; es is segment to resize.
-		mov	bx, [rootsize]		; bx is size of segment.
-		mov	ah, 04aH		; resize memory block
-		int	21H
-		jnc	swap_out_ok
-		jmp	abort_exec_resize	; disaster
-swap_out_ok:	ret
-
-; The swap out failed for some reason, so free any allocated resources
-; and set the carry bit.
-abort_swap_out:	mov	bx, [swap]
-		call	[free_resource+bx]
-		xor	ax, ax
-		mov	[swap], ax		; clear the swap flag
-		stc
-		ret
-swap_out endp
-
-
-;=============================================================================
-; CODE TO SET-UP FOR AND EXEC THE CHILD PROCESS
-;=============================================================================
-; Actually execute the program.  If cs:swap is set, this code will invoke the
-; swap-out/swap-in code as required.
-do_exec proc near
-		cmp	[swap], 0		; does the user want to swap?
-		je	no_swap_out		; nope
-		call	init_swap		; figger out where to swap to
-		jc	no_swap_out		; if carry set then don't swap
-		call	swap_out
-
-no_swap_out:	cmp	[interrupted], 0	; were we interrupted?
-		jne	leave_exec		; yep, so clean up, don't exec
-
-; free passed in environment block if it is non zero.
-; This way the parent program does not need to free it.
-		mov	ax, [envseg]
-		or	ax, ax
-		je	setup_block
-		push	ax
-		mov	es, ax
-		mov	ah, 49H
-		int	21H
-		pop	ax
-
-; set up the parameter block for the DOS exec call.
-;    offset  contents
-;        00  segment address of environment to be passed,
-; 	     0 => use parents env.
-;        02  pointer to command tail for new process.
-;        06  pointer to fcb1
-;        0a  pointer to fcb2
-setup_block:	mov	ax, [envseg]
-		mov	[ex_envseg], ax
-		mov	cx, cs
-		mov	[word ptr ex_cmdtail], offset cmdtail
-		mov	[word ptr ex_cmdtail+2], cx
-
-; set up registers for exec call
-;	ds:dx	- pointer to pathname of program to execute
-;	es:bx	- pointer to above parameter block
-		mov	dx, offset cmdpath
-		mov	es, cx
-		mov	bx, offset exec_block
-
-; Under DOS 2.x exec is notorious for clobbering registers and guarantees
-; to preserve only cs:ip.
-		push	ds
-		mov	[ex_sp], sp
-		mov	[ex_ss], ss
-		mov	[ex_error], 0		; clear exec error code
-		inc	[in_exec]		; set internal flag
-		mov	ax, 04b00H
-		int	21H
-
-; returned from exec, so restore possibly clobbered registers.
-		mov	ss, cs:ex_ss
-		mov	sp, cs:ex_sp
-		pop	ds
-
-; check to make certain the exec call worked.
-		jnc	it_worked
-
-; exec call failed.  Save return code from msdos.
-		mov	[ex_error], ax
-		jmp	leave_exec
-
-it_worked:	mov	ah, 04dH	; get the return code
-		int	21H
-		cmp	ah,1		; check if terminated by ^C
-		jnz	nosigint
-		inc	interrupted	; yes so set flag
-nosigint:	xor	ah, ah		; 8-bit return code, so clear ah
-		mov	[eretcode], ax
-
-leave_exec:	cmp	[swap], 0	; check swap, if non-zero swap back in
-		je	no_swap_in
-		call	swap_in
-
-; Clear the in_exec after the swap back in.  This way we are guaranteed to
-; get parent in and the resources freed should a ^C be hit when we are reading
-; the image in.
-no_swap_in:	mov	[in_exec], 0
-		ret
-do_exec endp				
-
-
-
-;==============================================================================
-; Everything past this point is overwriten with the environment and new
-; program after the currently executing program is swapped out.
-;==============================================================================
-overlay_code_here label word
-
-;-----------------------------------------------------------------------------
-; Figure out where we can swap to and initialize the resource we are going to
-; use.  We try XMS, EMS, and a tempfile (if specified), in that order.  We set
-; [cs:swap] to the correct value based on which of the resources exists.
-; If none can be used, then [cs:swap] is set to 0, and no swap takes place.
-; The exec code will still attempt to execute the child in this instance, but
-; may fail due to lack of resources.   Each swap_out_* routine must provide
-; its own clean-up handler should it not be able to write all program
-; segments to the swap resource.
-init_swap proc near
-		mov	[swap], 0
-;call	init_xms
-;jnc	init_done
-;call	init_ems
-;jnc	init_done
-		call	init_file
-init_done:	ret
-init_swap endp
-
-
-;-----------------------------------------------------------------------------
-; This routine is used to walk the DOS allocated memory block chain
-; starting at address supplied in the es register.  For each block it
-; calls the routine specified by the bx register with the segment length
-; in si, and its address in di.  It does not apply the routine to the
-; segment if the segment is the same as the current program's [cs:psp] value.
-memheader struc
-   magic	db	?	; either 'Z' for end or 'M' for allocated
-   owner	dw	?	; psp of owner block
-   len		dw	?	; length in paragraphs of segment
-memheader ends
-
-walk_arena_chain proc near
-		mov	si, word ptr es:3		; get length
-		mov	di, es
-		inc	di
-		mov	ax, word ptr es:1
-
-; Stop the search if the block is NOT owned by us.  Ignore our own psp block
-; and our environment segment block.
-		cmp	ax, cs:psp			; is it owned by us?
-		jne	walk_done			; NOPE!  -- all done
-		cmp	di, cs:envseg			; skip our environment
-		je	next_block
-		cmp	di, cs:psp			; skip our psp
-		je	next_block
-
-; Now save state and call the routine pointed at by [bx].
-		push	di
-		push	si
-		push	bx
-		call	bx
-		pop	bx
-		pop	si
-		pop	di
-		jc	exit_walk			; if error then stop
-		mov	al, byte ptr es:0		; check if at end 
-		cmp	al, 'Z'
-		je	walk_done
-
-next_block:	add	di, si				; go on to next segment
-		mov	es, di
-		jmp	walk_arena_chain
-walk_done:	clc
-exit_walk:	ret
-walk_arena_chain endp
-
-
-;-----------------------------------------------------------------------------
-; This routine takes a dos segment found in the di register and free's it.
-free_dos_segment proc near
-		mov	es, di		; free dos memory block
-		mov	ah, 49H
-		int	21H
-		ret
-free_dos_segment endp
-
-
-;-----------------------------------------------------------------------------
-; Called to invoke write_segment with proper values in the al register.  Only
-; ever called from walk_arena_chain, and so al should be set to seg_alloc.
-write_segment_data label near
-		mov	al, seg_alloc	; and fall through into write_segment
-;-----------------------------------------------------------------------------
-; This routine writes a segment as a block of data segments if the number of
-; paragraphs to write exceeds 0x0fff (rarely the case).
-; It stuffs the info into tmpseg, and then calls wheader and wseg to get the
-; data out.
-;
-;	di:dx	segment:offset of segment;  offset is ALWAYS zero.
-;	si	number of paragraphs to write.
-;	al	mode of header to write
-write_segment proc near
-		push	di
-		push	si
-		xor	dx,dx
-		mov	bx, [swap]
-		call	[write_header+bx]
-		pop	si
-		pop	di
-		jc	exit_wseg
-
-do_io_loop:	cmp	si, 0		; are we done yet?
-		je	exit_wseg	; yup so leave.
-		mov	cx, si		; # of paragraphs to move
-		cmp	cx, 0fffH	; see if we have lots to move?
-		jle	do_io
-		mov	cx, 0fffH	; reset to max I/O size
-
-do_io:		push	cx		; save # of paragraphs we are writing
-		shl	cx, 1		; shift cx by four to the left
-		shl	cx, 1
-		shl	cx, 1
-		shl	cx, 1
-		push    di		; save the start, and count left
-		push    si
-		mov	si, cx
-		xor	dx,dx
-		mov	al, seg_data
-		mov	bx, [swap]
-		push	bx
-		call	[write_header+bx]
-		pop	bx
-		call	[write_seg+bx]
-		pop	si
-		pop	di
-		pop	dx		; original paragraph count in dx
-		jc	exit_wseg	; it failed so exit.
-		add	di, dx		; adjust the pointers, and continue.
-		sub	si, dx
-		jmp     do_io_loop
-exit_wseg:	ret
-write_segment endp
-
-
-;=============================================================================
-; THE FOLLOWING SECTION DEALS WITH ALL ROUTINES REQUIRED TO WRITE XMS RECORDS.
-;=============================================================================
-init_xms proc near
-		ret
-init_xms endp
-
-whdr_xms proc near
-		ret
-whdr_xms endp
-
-wseg_xms proc near
-		ret
-wseg_xms endp
-;=============================================================================
-
-
-;=============================================================================
-; THE FOLLOWING SECTION DEALS WITH ALL ROUTINES REQUIRED TO WRITE EMS RECORDS.
-;=============================================================================
-init_ems proc near
-		ret
-init_ems endp
-
-whdr_ems proc near
-		ret
-whdr_ems endp
-
-wseg_ems proc near
-		ret
-wseg_ems endp
-;=============================================================================
-
-
-;=============================================================================
-; THE FOLLOWING SECTION DEALS WITH ALL ROUTINES REQUIRED TO WRITE FILES.
-;=============================================================================
-;-----------------------------------------------------------------------------
-; Attempt to create a temporary file.  If the tempfile name is NIL then return
-; with the cary flag set.
-init_file proc near
-		mov	al, [tmpname]
-		or	al, al
-		je	err_init_file
-		mov	dx, offset tmpname
-		xor 	cx, cx
-		mov	ah, 03cH
-		int	21H
-		jc	err_init_file		; if carry set then failure
-		mov	[tmphandle], ax		; init swapping
-		mov	[swap], swap_file
-		jmp	exit_init_file
-err_init_file:	stc
-exit_init_file: ret
-init_file endp
-
-
-;-----------------------------------------------------------------------------
-; This routine writes a segment header to a file.
-; The header is a seven byte record formatted as follows:
-;	segment address		- of data
-;	offset address		- of data
-; 	length in paragraphs	- of data
-;	mode			- 1 => segment header (allocate seg on read)
-;				  0 => subsegment, don't allocate on read.
-; Routine takes three arguments:
-;	di:dx	segment:offset of segment
-;	si	number of paragraphs to write.
-;	al	mode of header to write
-whdr_file proc near
-		mov	[word ptr tmpseg], di	; save the segment/offset
-		mov	[word ptr tmpseg+2], dx
-		mov	[word ptr tmpseg+4], si	; save the segment length
-		mov	[tmpseg+6], al
-		mov	dx, offset tmpseg	; write the header record out
-		mov	cx, 7
-		mov	bx, [tmphandle]
-		mov	ah, 040H
-		int	21H
-		jc	exit_whdr_file		; make sure it worked
-		cmp	ax, 7
-		je	exit_whdr_file		; oh oh, disk is full!
-err_whdr_file:	stc
-exit_whdr_file:	ret
-whdr_file endp
-
-
-;-----------------------------------------------------------------------------
-; Write a segment to the temporary file whose handle is in cs:tmphandle
-; Parameters for the write are assumed to be stored in the tmpseg data area.
-; function returns carry set if failed, carry clear otherwise.
-wseg_file proc near
-		push	ds
-		mov	ds, word ptr cs:tmpseg ; Now write the whole segment
-		mov	dx, word ptr cs:tmpseg+2
-		mov	cx, word ptr cs:tmpseg+4
-		mov	bx, cs:tmphandle
-		mov	ah, 040H
-		int	21H
-		pop	ds
-		jc	exit_wseg_file		; make sure it worked
-		cmp	ax, [word ptr tmpseg+4]
-		je	exit_wseg_file
-err_wseg_file:	stc				; it failed (usually disk full)
-exit_wseg_file:	ret
-wseg_file endp
-;=============================================================================
-
-
-;=============================================================================
-; _exec: THIS IS THE MAIN ENTRY ROUTINE TO THIS MODULE
-;=============================================================================
-; This is the main entry routine into the swap code and corresponds to the
-; following C function call:
-;
-; exec( int swap, char far *program, char far *cmdtail, int environment_seg,
-;	char far *tmpfilename );
-;
-; Exec performs the following:
-;	1. set up the local code segment copies of arguments to the exec call.
-;	2. switch to a local stack frame so that we don't clobber the user
-;	   stack.
-;	3. save old interrupt vectors for ctrl-brk.
-;	4. install our own handler for the ctrl-brk interrupt, our handler
-;	   terminates the current running process, and returns with non-zero
-;	   status code.
-;	5. get our psp
-;	6. setup arguments for exec call
-;	7. exec the program, save result code on return.
-;       8. restore previous ctrl-brk and crit-error handler.
-;       9. restore previous process stack, and segment registers.
-;      10. return from exec with child result code in AX
-;	   and global _Interrupted flag set to true if child execution was
-;	   interrupted.
-
-; NOTE:  When first called the segments here assume the standard segment
-;        settings.
-		assume cs:@code, ds:DGROUP,es:DGROUP,ss:DGROUP
-
-		public	_exec
-_exec proc
-	    	push	bp		; set up the stack frame
-		mov	bp, sp
-		push	si		; save registers we shouldn't step on.
-		push	di
-		push	ds
-
-; set up for copying of parameters passed in with long pointers.
-		push	cs		; going to use lodsb/stosb, set up es
-		pop	es		; as destination.
-		assume  es:@code	; let the assembler know :-)
-		cld			; make sure direction is right
-
-; Copy all parameters into the bottom of the code segment.  After doing so we
-; will immediately switch stacks, so that the user stack is preserved intact.
-		mov	ax, ss:[a_swap]		; save swap
-		mov	es:swap, ax
-		mov	ax, ss:[a_env]		; save env seg to use
-		mov	es:envseg, ax
-
-		mov 	di, offset cs:cmdpath	; copy the command
-		lds 	si, ss:[a_prog]		; 65 bytes worth
-		mov	cx, 65
-		call	copy_data
-
-		mov	di, offset cs:cmdtail	; copy the command tail
-		lds	si, ss:[a_tail]		; 129 bytes worth
-		mov	cx, 129
-		call	copy_data
-
-		mov	di, offset cs:tmpname	; copy the temp file name
-		lds	si, ss:[a_tmp]		; 65 bytes worth.
-		mov	cx, 65
-		call	copy_data
-
-; Now we save the current ss:sp stack pointer and swap stack to our temporary
-; stack located in the current code segment.  At the same time we reset the
-; segment pointers to point into the code segment only.
-swap_stacks:	mov	ax, ss
-		mov	es:old_ss, ax
-		mov	es:old_sp, sp
-		mov	ax, cs
-		mov	ds, ax
-		mov	ss, ax			; set ss first, ints are then
-		mov	sp, offset cs:exec_sp	; disabled for this instr too
-		assume  ds:@code, ss:@code	; let the assembler know :-)
-
-; Now we save the old control break and critical error handler addresses.
-; We replace them by our own routines found in the resident portion of the
-; swapping exec code.
-set_handlers:	mov	[interrupted], 0	; clear interrupted flag
-		mov	[eretcode], 0		; clear the return code
-		mov	ax, 03523H		; get int 23 handler address
-		int	21H
-		mov	cs:old_ctl_brk_off, bx
-		mov	cs:old_ctl_brk_seg, es
-		mov	dx, offset ctl_brk_handler
-		mov	ax, 02523H		; set int 23 handler address
-		int	21H
-
-		mov	ax, 03524H		; get int 24 handler address
-		int	21H
-		mov	cs:old_crit_err_off, bx
-		mov	cs:old_crit_err_seg, es
-		mov	dx, offset crit_err_handler
-		mov	ax, 02524H		; set int 24 handler address
-		int	21H
-
-; Go and execute the child, we've set up all of its parameters.  The do_exec
-; routine will attempt to perform a swap of the code if requested to do so by
-; a non-zero value in the variable cs:swap.
-		mov	ah, 051H		; get the psp
-		int	21H
-		mov	cs:psp, bx
-		call	do_exec
-
-; We're back from the exec, so fix things up the way they were.
-; Restore the old control-break and critical-error handlers.
-		lds	dx, cs:old_ctl_brk
-		mov	ax, 02523H
-		int	21H
-		lds	dx, cs:old_crit_err
-		mov	ax, 02524H
-		int	21H
-
-; Restore previous program stack segment registers, and data segment.
-		mov	ax, cs:old_ss
-		mov	ss, ax			; mov into ss first, that way
-		mov	sp, cs:old_sp		; no interrupts in this instr.
-		pop	ds
-
-; Tell the assembler we have swaped segments again.
-		assume	ds:DGROUP,es:DGROUP,ss:DGROUP
-
-; Set the global Interrupted flag so that parent can tell it was interrupted.
-		mov	ax, seg DGROUP:_Interrupted
-		mov	es, ax
-		mov	ax, cs:interrupted
-		mov	es:_Interrupted, ax
-
-; Set the global errno value to reflect the success/failure of the DOS
-; exec call.
-		mov	ax, seg DGROUP:_errno
-		mov	es, ax
-		mov	ax, cs:ex_error
-		mov	es:_errno, ax
-
-; Fetch the child's return code, pop rest of stuff off of the stack
-; and return to the caller.
-		mov	ax, cs:eretcode
-		pop	di
-		pop	si
-		pop	bp
-		ret
-_exec endp
-
-; void do_hook_std_writes(int handle);
-;	This saves the 21h interrupt vector and changes it to point
-;	into this code.  Argument is the file handle of the -C file.
-
-    public _do_hook_std_writes
-_do_hook_std_writes proc
-    		push	bp
-		mov	bp,sp
-		push	di
-
-		mov	di, ss:[a_handle]	; handle of -C file
-		mov	std_fil_handle, di
-
-		mov	ah, 51h			; request our PSP
-		int	21h
-		mov	[psp], bx		; save it
-
-		mov	es, bx
-		les	bx, es:[34h]		; pointer to job file table
-		mov	al, es:[bx+1]		; system file # of our stdout
-		mov	[our_stdout], al
-		mov	al, es:[bx+di]		; system file number of -C file
-		mov	std_fil_number, al
-
-		mov	ax,3521h		; request vector 21h
-		int	21h			; it's returned in ES:BX
-		mov	word ptr [real_21h], bx
-		mov	word ptr [real_21h+2], es
-
-		push	ds
-		mov	ax,cs
-		mov	ds,ax
-		lea	dx,our_21h_handler	; DS:DX is the new vector
-		mov	ax,2521h		; set vector 21h
-		int	21h
-
-		pop	ds
-		pop	di
-		pop	bp
-		ret
-_do_hook_std_writes endp
-
-; void do_unhook_std_writes(void);
-;	This restores the 21h interrupt vector.
-;	The saved vector is zero if it wasn't changed (no -C option).
-
-    public _do_unhook_std_writes
-_do_unhook_std_writes proc
-		push	ds
-
-    		lds	dx, [real_21h]	; put saved vector into DS:DX
-		mov	ax, ds
-		or	ax, dx
-		jz	unhook_return	; zero means we didn't hook 21h
-
-		mov	ax,2521h	; set vector 21h
-		simulate_21h
-
-unhook_return:	pop ds
-		ret
-_do_unhook_std_writes endp
-end
diff --git a/dmake/msdos/exec.h b/dmake/msdos/exec.h
deleted file mode 100644
index 2e82aaa3e..000000000
--- a/dmake/msdos/exec.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* RCS  $Id: exec.h,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Internal version of exec for dmake.
---
--- DESCRIPTION
---      External defines for the exec.c code.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-#ifndef _EXEC_h_
-#define _EXEC_h_
-
-#ifndef ANSI
-#if defined(__STDC__) || defined(__TURBOC__)
-#define ANSI(x) x
-#else
-#define ANSI(x) ()
-#endif
-#endif
-
-extern int  exec ANSI((int, char far *, char far *, unsigned int, char far *));
-
-#ifndef MK_FP
-#define MK_FP(seg,ofs) \
-    ((void far *) (((unsigned long)(seg) << 16) | (unsigned)(ofs)))
-#endif
-
-#endif
diff --git a/dmake/msdos/exec.uue b/dmake/msdos/exec.uue
deleted file mode 100644
index 90a1c3e66..000000000
--- a/dmake/msdos/exec.uue
+++ /dev/null
@@ -1,63 +0,0 @@
-begin 777 exec.obj
-M@!  #DU31$]37&5X96,N87-M;(@@    '%1U<F)O($%S<V5M8FQE<B @5F5R
-M<VEO;B S+C";B!8 0.DJ<T$=#DU31$]37&5X96,N87-M.H@# $#I3)8"  !H
-MB , 0*&4EA  "45814-?5$585 1#3T1%:9@' $@:" (# ?&6#  %7T1!5$$$
-M1$%40<*8!P!( @ $!0$-E@@ !D1'4D]54(N:!  &_P);C D !E]E<G)N;P#@
-MD!,  0(,7TEN=&5R<G5P=&5D    69 <   !%5]D;U]U;FAO;VM?<W1D7W=R
-M:71E<P,( &>0#    05?97AE8^$& '.0&@   1-?9&]?:&]O:U]S=&1?=W)I
-M=&5SN < FH@$ $"B 9&@!@ !F    ,&B#@ !7 $E  $  0    $ RJ(.  &(
-M 4$  0 !     0""H@X  <D! 0 !  $    ! (&@"  !S $     BJ#'  '4
-M 65X96,Z($9A:6QU<F4@<F5A9&EN9R!H96%D97(@8FQO8VL-"B1E>&5C.B!&
-M86EL=7)E(')E861I;F<@<V5G;65N="!D871A#0HD97AE8SH@1F%I;'5R92!O
-M;B!R97-I>F4-"B1E>&5C.B!&86EL=7)E('1O(&9R964@82!B;&]C:PT*)&5X
-M96,Z(%!R;V=R86T@<W=A<"!F86EL=7)E#0HD97AE8SH@365M;W)Y(&)L;V-K
-M<R!D;VXG="!M871C: T*)+>B#@ !EP(!  $  0    $ LJ H  &8 G(&=0:7
-M!G,&=@:]!@,$!P0+! 0$" 0J! 8$"@1@! 4$"012! J<20#$ %0!Q )4 <0$
-M5 '$!E0!Q A4 <0*5 '$#%0!Q Y4 <005 '$$E0!Q!14 <065 '$&%0!Q!I4
-M <0<5 '$'E0!Q"!4 <0B5 $GH P  <H"7 $  %P!  #-G D S !4 <P$5 $5
-MH,T# =8"  "<@/Q =0J#^P%T"X/[ G0&G2[_+LP!4%%24U155E<>!HOL+HL^
-MT &T49PN_Q[, 2X['HP =&R.PR;%'C0 BW8,B@ N.@;3 75CB@$N.@;2 71*
-MN  SG"[_'LP!B_(KTK@!,YPN_Q[, 2Z+'HP M%"<+O\>S &+WXY> HM6#K1 
-MG"[_'LP!C,.T4)PN_Q[, 8O6N $SG"[_'LP!ZQ".7@*+5@Z+W[1 G"[_'LP!
-M!Q]?7EV#Q );6EE8G2[_+LP!@\0&6%M96EY?71\'58OLAT8&#0$ AT8&7;@%
-M ,_X+O\&D@ N@SZ8  !T ?G/NM0!ZQR0NOD!ZQ:0NAX"ZQ"0NC@"ZPJ0NG4"
-MZP20NE@"4HL>C@#_E[ "C,B.V%JT"<TAN/],S2'1Z7,!I/.EP\/#P\/#P\/#
-MNH$!N0< BQ[* ;0_S2%S NNF/0< = <+P'0"ZYOYPQXNCAZ! 2Z+%H,!+HL.
-MA0$NBQ[* ;0_S2$?<P+K@3L&A0%T ^EX_\.+'LH!,\F+T;@ 0LTAPXL>R@&T
-M/LTANH@!M$'-(<.+'I8 N %8S2&+'HX _Y>V HX&C "+'H0 M$K-(7,#Z4__
-MBQZ. /^7I )R**"' 3P =.\\ 743BQZ% ;1(S2%R!CL&@0%TV^DA_XL>C@#_
-MEZH"Z\Z+'HX _Y>P L.X %C-(:.6 (L^C ",RRO?B\=(CL FBS8# (DVA "X
-MYP71Z-'HT>C1Z /8*_,#^XD>A@")/H@ L #H'0%R,:&, $B.P+LD!NC+ '(C
-MH8P 2([ NQT&Z+T <P/IJ_Z.!HP BQZ& +1*S2%S ^F4_L.+'HX _Y>P C/ 
-MHXX ^<.#/HX  '0(Z(, <@/H<_^#/I(  '5FH8H "\!T"%".P+1)S2%8H8H 
-MH\0"C,G'!L8"VP")#L@"NIH CL&[Q (>B2;4 HP6T@+'!M8"  #_!I@ N !+
-MS2$NCA;2 BZ+)M0"'W,&H]8"ZQ.0M$W-(8#\ 74$_P:2 #+DHY  @SZ.  !T
-M ^B?_L<&F    ,/'!HX   #HE@##)HLV P",QT<FH0$ +CL&C !U)BX[/HH 
-M=!DN.SZ, '025U93_]-;7E]R#R:@   \6G0& _Z.Q^O'^,..Q[1)S2'#L %7
-M5C/2BQZ. /^7F )>7W(Z@_X =#6+SH'Y_P]^ [G_#U'1X='AT>'1X5=6B_$S
-MTK "BQZ. %/_EY@"6_^7G@)>7UIR!@/Z*_+KQL/#P\/#P\.@B $*P'07NH@!
-M,\FT/,TA<@RCR@''!HX ! #K I#YPXD^@0&)%H,!(YR1 <065 '$)U0!Q"]4
-M <0T5 '$1U0!Q%!4 <1;5 '$:%0!Q&U4 <1U5 '$A50!Q(]4 <2:5 '$K%0!
-MQ+Y4 <3A5 '$YE0!Q.Y4 <3T5 '$^E0!Q0!4 <4&5 '%#%0!Q1%4 <455 '%
-M-E0!Q3U4 <585 '%750!Q6)4 <5G5 '%=%0!Q7Y4 <6,5 '%DU0!Q9Q4 <6E
-M5 '%J50!Q:U4 <6Q5 '%OE0!Q<)4 <7'5 '%TU0!Q=U4 <865 '&/%0!QDI4
-M <7F5 '%ZE0!Q?!4 <7T5 '%_50!Q@%4 <835 '&*%0!QBQ4 <8V5 '&1%0!
-MQE94 <9:5 '&:%0!QFQ4 <9Q5 '&=U0!QH94 <:,5 '&FU0!QIY4 <:D5 '&
-MIE0!QJI4 <:M5 '&LE0!QK=4 <:[5 '&OU0!QL54 <;/5 '&U%0!QMI4 <;J
-M5 '&[U0!QO-4 <;]5 ''!%0!QQM4 <<B5 ''*50!QU94 <=:5 ''@U0!QXA4
-M <>-5 ''HE0!QZE4 <>T5 ''N%0!Q\-4 <?'5 $%H'\! 9\&B3:% :*' ;J!
-M ;D' (L>R@&T0,TA<@8]!P!T ?G#'BZ.'H$!+HL6@P$NBPZ% 2Z+'LH!M$#-
-M(1]R!SL&A0%T ?G#58OL5E<>#@?\BT8&)J.. (M&$":CB@"_F@#%=@BY00#H
-M]_R_VP#%=@RY@0#HZ_R_B '%=A*Y00#HW_R,T":C@  FB2:" (S(CMB.T+R 
-M ,<&D@   ,<&D    +@C-<TA+HD>O (NC :^ KJS [@C)<TAN"0US2$NB1[ 
-M BZ,!L("NI8#N"0ES2&T4<TA+HD>C #HU?TNQ1:\ K@C)<TA+L46P *X)"7-
-M(2ZA@ ".T"Z+)H( '[@  ([ +J&2 ":C  "X  ".P"ZAU@(FHP  +J&0 %]>
-M7<M5B^Q7BWX&+HD^T &T4<TA+HD>C ".PR;$'C0 )HI' 2ZBTP$FB@$NHM(!
-MN"$US2$NB1[, 2Z,!LX!'HS(CMBZV *X(27-(1]?7<L>+L46S &,V O"= FX
-M(26<+O\>S $?RPJ<O0#$ E0!Q 54 <0(5 '$#U0!Q")4 <0G5 '$+%0!Q#%4
-M <0\5 '$4%0!Q%=4 <1:5 '$9E0!Q')4 <2!5 '$AE0!Q(]4 <235 '$F50!
-MQ*54 <2J5 '$K50!Q+Q4 <3!5 '$Q%0!Q-)4 <3:5 '$Y%0!Q.U4 <3T5 '(
-M^!0! L3^5 '% A0! LD%%@$!Q0M4 <4/%@$!Q1-4 <4C5 '%+%0!Q3M4 <5"
-E5 '%3%0!Q5%4 <595 '%:%0!Q7=4 ?6@!@ "     %B* @  =%0!
- 
-end
diff --git a/dmake/msdos/find.c b/dmake/msdos/find.c
deleted file mode 100644
index ac0c6b8ed..000000000
--- a/dmake/msdos/find.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-    Directory Access Library
-
-           FIND.C taken from DIRLIB.C by M. J. Weinstein
-         Released to public domain 1-Jan-89
-
-    The author may be contacted at: 
-    matt@cs.ucla.edu -or- POB 84524, L.A., CA  90073
-
-    Modified by dvadura@watdragon.edu to work with dmake.
-    (nuked the DOS version 2 code, since dmake needs version
-    3.0 or greater to function).
- */
-
-
-/*
- * revision history:
- *
- *	VER	MM/DD/YY	COMMENTS
- *	----	--------	--------
- *	0.99	02/24/86	Beta release to INTERNET
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <alloc.h>
-#include <dos.h>
-#include "dosdta.h"
-
-#ifndef MK_FP
-#define MK_FP(seg,ofs)	((void far *) \
-               (((unsigned long)(seg) << 16) | (unsigned)(ofs)))
-#endif
-#ifndef FP_SEG
-#define FP_SEG(fp)	((unsigned)((unsigned long)(fp) >> 16))
-#endif
-#ifndef FP_OFF
-#define FP_OFF(fp)	((unsigned)(fp))
-#endif
-
-int find_err;
-
-/*
- * get/set dta address
- */
-
-static DTA far *
-_getsetdta(newdta)
-DTA far *newdta;
-{
-    DTA far *olddta;
-    union REGS r;
-    struct SREGS s;
-
-    /* get old dta */     	
-    r.h.ah = 0x2f;
-    intdos(&r, &r);
-    segread(&s);
-    olddta = (DTA far *) MK_FP(s.es, r.x.bx);
-
-    /* conditionally set new dta */
-    if (newdta) {
-        r.h.ah = 0x1a;
-        s.ds	= FP_SEG(newdta);
-        r.x.dx	= FP_OFF(newdta);	
-        intdosx(&r, &r, &s);
-    }
-
-    return olddta;
-}
-
-/*
- * dos findfirst
- */
-
-DTA *
-findfirst(name, dta)
-char *name;
-DTA  *dta;
-{
-    union REGS r;  
-    struct SREGS s;
-    DTA far *dtasave;
-    char far *nmp = (char far *)name;
-
-    dtasave = _getsetdta((DTA far *)dta);
-    
-    /* do directory lookup */
-    segread(&s);
-    r.h.ah	= 0x4e;
-    r.x.cx	= 0x10;
-    r.x.dx	= FP_OFF(nmp);
-    s.ds	= FP_SEG(nmp);
-    intdosx(&r, &r, &s);
-    /* restore dta */
-    _getsetdta(dtasave);
-    find_err = r.x.ax;
-    if (r.x.cflag)
-        return(NULL);
-
-    return dta;
-}
-
-/*
- * dos findnext
- */
-
-DTA *
-findnext(dta)
-DTA *dta;
-{
-    union REGS r;  
-    DTA far *dtasave;
-
-    dtasave = _getsetdta((DTA far *)dta);
-
-    /* do directory lookup */
-    r.h.ah = 0x4f;
-    intdos(&r, &r);
-    /* restore old dta */
-    _getsetdta(dtasave);
-    find_err = r.x.ax;
-    if (r.x.cflag)
-        return(NULL);
-
-    return dta;
-}
diff --git a/dmake/msdos/microsft/config.h b/dmake/msdos/microsft/config.h
deleted file mode 100644
index 1e9f16c94..000000000
--- a/dmake/msdos/microsft/config.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* RCS  $Id: config.h,v 1.2 2008-03-05 18:37:29 kz Exp $
---
--- SYNOPSIS
---      Configurarion include file.
--- 
--- DESCRIPTION
--- 	There is one of these for each specific machine configuration.
---	It can be used to further tweek the machine specific sources
---	so that they compile.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#if defined (_MSC_VER)
-# if _MSC_VER < 500
-    Force a compile-time blowup.
-    Do not define "#define _MSC_VER" for MSC compilers earlier than 5.0.
-# endif
-#endif
-
-/* define this for configurations that don't have the coreleft function
- * so that the code compiles.  To my knowledge coreleft exists only on
- * Turbo C, but it is needed here since the function is used in many debug
- * macros. */
-#define coreleft() 0L
-
-/* MSC Version 4.0 doesn't understand SIGTERM, later versions do. */
-#ifndef SIGTERM
-#   define SIGTERM SIGINT
-#endif
-
-/* Fixes unimplemented line buffering for MSC 5.x and 6.0.
- * MSC _IOLBF is the same as _IOFBF
- */
-#if defined(MSDOS) && defined (_MSC_VER)
-#   undef  _IOLBF
-#   define _IOLBF   _IONBF
-#endif
-
-/* in alloc.h: size_t is redefined
- * defined in stdio.h which is included by alloc.h
- */
-#if defined(MSDOS) && defined (_MSC_VER)
-#   define _TYPES_
-#endif
-
-/* in sysintf.c: SIGQUIT is used, this is not defined in MSC */
-#ifndef SIGQUIT
-#   define SIGQUIT SIGTERM
-#endif
-
-/* MSC doesn't seem to care about CONST */
-#define CONST
-
-#ifndef MSDOS
-#   define MSDOS 1
-#endif
-
-/* a small problem with pointer to voids on some unix machines needs this */
-#define DMPVOID void *
-
-/* Have to pull this in for the standard lib defines */
-#include <io.h>
diff --git a/dmake/msdos/microsft/config.mk b/dmake/msdos/microsft/config.mk
deleted file mode 100644
index cd049cd47..000000000
--- a/dmake/msdos/microsft/config.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-# This is the MSC 4.0 and higher DOS configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-TMPDIR :=
-.EXPORT : TMPDIR
-
-# Definition of macros for library, and C startup code.
-
-# The following sources are required for MSC
-OSR_SRC = tempnam.c
-.SETDIR=$(osrdir) : $(OSR_SRC)
-
-SRC += $(OSR_SRC)
-.SOURCE.h : $(osrdir)
-
-SET_STACK = -stack:4096
-NDB_LDFLAGS += $(SET_STACK)
-
-ASFLAGS += -t -mx $(S_$(MODEL))
-
-# Microsoft C doesn't need tail but needs head
-LDTAIL = ;
-LDHEAD =
-
-# Debugging libraries
-DB_LDFLAGS += -co -li -map $(SET_STACK)
-DB_LDLIBS  +=
-
-# NO Debug MSC flags:
-# Set the environment variable MSC_VER to be one of 5.1, 6.0, 8.0 (for VC++4.0)
-# to get these by default when you make dmake using 'dmake'.
-#
-# Setting MSC_VER to one of the above sets the variable _MSC_VER appropriately
-# and sets the flags appropriately.
-
-CFLAGS    += -I$(osrdir) $(C_$(MODEL)) -nologo
-DB_CFLAGS += -Zi
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
-
-C_s =
-C_m = -AM
-C_c = -AC
-C_l = -AL
-
-S_s = -Dmsmall
-S_m = -Dmmedium
-S_c = -Dmcompact
-S_l = -Dmlarge
diff --git a/dmake/msdos/microsft/msc51/config.mk b/dmake/msdos/microsft/msc51/config.mk
deleted file mode 100644
index beaae0dfe..000000000
--- a/dmake/msdos/microsft/msc51/config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Definition of macros for library, and C startup code.
-osedir     = $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-.IMPORT .IGNORE : MSC_VER
-MSC_VER      *= 5.1
-
-CFLAGS       += -I$(osedir) -D_MSC_VER=$(MSC_VER:s,.,,)0
-
-NDB_CFLAGS   += -Oscl -Gs
-NDB_LDFLAGS  += -exe -packc -batch
-NDB_LDLIBS   +=
diff --git a/dmake/msdos/microsft/msc51/lib.rsp b/dmake/msdos/microsft/msc51/lib.rsp
deleted file mode 100644
index 8b1378917..000000000
--- a/dmake/msdos/microsft/msc51/lib.rsp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dmake/msdos/microsft/msc51/libswp.rsp b/dmake/msdos/microsft/msc51/libswp.rsp
deleted file mode 100644
index 8b1378917..000000000
--- a/dmake/msdos/microsft/msc51/libswp.rsp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dmake/msdos/microsft/msc51/mk.bat b/dmake/msdos/microsft/msc51/mk.bat
deleted file mode 100755
index b111d6e62..000000000
--- a/dmake/msdos/microsft/msc51/mk.bat
+++ /dev/null
@@ -1,102 +0,0 @@
-md objects
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs infer.c
-copy infer.obj objects
-del infer.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs make.c
-copy make.obj objects
-del make.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs stat.c
-copy stat.obj objects
-del stat.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs expand.c
-copy expand.obj objects
-del expand.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs dmstring.c
-copy dmstring.obj objects
-del dmstring.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs hash.c
-copy hash.obj objects
-del hash.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs dag.c
-copy dag.obj objects
-del dag.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs dmake.c
-copy dmake.obj objects
-del dmake.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs path.c
-copy path.obj objects
-del path.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs imacs.c
-copy imacs.obj objects
-del imacs.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs sysintf.c
-copy sysintf.obj objects
-del sysintf.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs parse.c
-copy parse.obj objects
-del parse.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs getinp.c
-copy getinp.obj objects
-del getinp.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs quit.c
-copy quit.obj objects
-del quit.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs state.c
-copy state.obj objects
-del state.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs dmdump.c
-copy dmdump.obj objects
-del dmdump.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs macparse.c
-copy macparse.obj objects
-del macparse.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs rulparse.c
-copy rulparse.obj objects
-del rulparse.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs percent.c
-copy percent.obj objects
-del percent.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs function.c
-copy function.obj objects
-del function.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\ruletab.c
-copy ruletab.obj objects
-del ruletab.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\dirbrk.c
-copy dirbrk.obj objects
-del dirbrk.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\runargv.c
-copy runargv.obj objects
-del runargv.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\arlib.c
-copy arlib.obj objects
-del arlib.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\dchdir.c
-copy dchdir.obj objects
-del dchdir.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\switchar.c
-copy switchar.obj objects
-del switchar.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\rmprq.c
-copy rmprq.obj objects
-del rmprq.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\tee.c
-copy tee.obj objects
-del tee.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\find.c
-copy find.obj objects
-del find.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\dirlib.c
-copy dirlib.obj objects
-del dirlib.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\dstrlwr.c
-copy dstrlwr.obj objects
-del dstrlwr.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs unix\dcache.c
-copy dcache.obj objects
-del dcache.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\microsft\tempnam.c
-copy tempnam.obj objects
-del tempnam.obj
-link  /stack:4096/exe/packc/batch @msdos\microsft\msc51\obj.rsp,dmake.exe,NUL.MAP;
-copy msdos\microsft\msc51\template.mk startup\config.mk
diff --git a/dmake/msdos/microsft/msc51/mkswp.bat b/dmake/msdos/microsft/msc51/mkswp.bat
deleted file mode 100755
index 5ab14d351..000000000
--- a/dmake/msdos/microsft/msc51/mkswp.bat
+++ /dev/null
@@ -1,104 +0,0 @@
-md objects
-masm -t -mx -Dmlarge msdos\exec.asm,,,;
-mv exec.obj objects
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs infer.c
-copy infer.obj objects
-del infer.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs make.c
-copy make.obj objects
-del make.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs stat.c
-copy stat.obj objects
-del stat.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs expand.c
-copy expand.obj objects
-del expand.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs dmstring.c
-copy dmstring.obj objects
-del dmstring.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs hash.c
-copy hash.obj objects
-del hash.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs dag.c
-copy dag.obj objects
-del dag.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs dmake.c
-copy dmake.obj objects
-del dmake.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs path.c
-copy path.obj objects
-del path.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs imacs.c
-copy imacs.obj objects
-del imacs.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs sysintf.c
-copy sysintf.obj objects
-del sysintf.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs parse.c
-copy parse.obj objects
-del parse.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs getinp.c
-copy getinp.obj objects
-del getinp.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs quit.c
-copy quit.obj objects
-del quit.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs state.c
-copy state.obj objects
-del state.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs dmdump.c
-copy dmdump.obj objects
-del dmdump.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs macparse.c
-copy macparse.obj objects
-del macparse.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs rulparse.c
-copy rulparse.obj objects
-del rulparse.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs percent.c
-copy percent.obj objects
-del percent.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs function.c
-copy function.obj objects
-del function.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\ruletab.c
-copy ruletab.obj objects
-del ruletab.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\dirbrk.c
-copy dirbrk.obj objects
-del dirbrk.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\runargv.c
-copy runargv.obj objects
-del runargv.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\arlib.c
-copy arlib.obj objects
-del arlib.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\dchdir.c
-copy dchdir.obj objects
-del dchdir.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\switchar.c
-copy switchar.obj objects
-del switchar.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\rmprq.c
-copy rmprq.obj objects
-del rmprq.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\spawn.c
-copy spawn.obj objects
-del spawn.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\find.c
-copy find.obj objects
-del find.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\dirlib.c
-copy dirlib.obj objects
-del dirlib.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\dstrlwr.c
-copy dstrlwr.obj objects
-del dstrlwr.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs unix\dcache.c
-copy dcache.obj objects
-del dcache.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc51 -D_MSC_VER=510 -Oscl -Gs msdos\microsft\tempnam.c
-copy tempnam.obj objects
-del tempnam.obj
-link  /stack:4096/exe/packc/batch @msdos\microsft\msc51\objswp.rsp,dmake.exe,NUL.MAP;
-copy msdos\microsft\msc51\template.mk startup\config.mk
diff --git a/dmake/msdos/microsft/msc51/obj.rsp b/dmake/msdos/microsft/msc51/obj.rsp
deleted file mode 100644
index 8f79a3275..000000000
--- a/dmake/msdos/microsft/msc51/obj.rsp
+++ /dev/null
@@ -1,33 +0,0 @@
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\tee.obj+
-objects\find.obj+
-objects\dirlib.obj+
-objects\dstrlwr.obj+
-objects\dcache.obj+
-objects\tempnam.obj
diff --git a/dmake/msdos/microsft/msc51/objswp.rsp b/dmake/msdos/microsft/msc51/objswp.rsp
deleted file mode 100644
index 54524124d..000000000
--- a/dmake/msdos/microsft/msc51/objswp.rsp
+++ /dev/null
@@ -1,34 +0,0 @@
-objects\exec.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\spawn.obj+
-objects\find.obj+
-objects\dirlib.obj+
-objects\dstrlwr.obj+
-objects\dcache.obj+
-objects\tempnam.obj
diff --git a/dmake/msdos/microsft/msc51/public.h b/dmake/msdos/microsft/msc51/public.h
deleted file mode 100644
index c696e8d6f..000000000
--- a/dmake/msdos/microsft/msc51/public.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:44:44 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void Clean_up_processes ANSI(());
-int Wait_for_child ANSI((int, int));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int dchdir ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int spawnvpe ANSI((int, char *, char **, char **));
-void Hook_std_writes ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/msdos/microsft/msc51/template.mk b/dmake/msdos/microsft/msc51/template.mk
deleted file mode 100644
index 7174197d6..000000000
--- a/dmake/msdos/microsft/msc51/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= microsft
-   OSENVIRONMENT *:= msc51
diff --git a/dmake/msdos/microsft/msc60/config.mk b/dmake/msdos/microsft/msc60/config.mk
deleted file mode 100644
index 5b206bec3..000000000
--- a/dmake/msdos/microsft/msc60/config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Definition of macros for library, and C startup code.
-osedir     = $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-.IMPORT .IGNORE : MSC_VER
-MSC_VER      *= 6.0
-
-CFLAGS       += -I$(osedir) -D_MSC_VER=$(MSC_VER:s,.,,)0
-
-NDB_CFLAGS   += -Osecgl -Gs
-NDB_LDFLAGS  += -exe -packc -batch
-NDB_LDLIBS  +=
diff --git a/dmake/msdos/microsft/msc60/lib.rsp b/dmake/msdos/microsft/msc60/lib.rsp
deleted file mode 100644
index 8b1378917..000000000
--- a/dmake/msdos/microsft/msc60/lib.rsp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dmake/msdos/microsft/msc60/libswp.rsp b/dmake/msdos/microsft/msc60/libswp.rsp
deleted file mode 100644
index 8b1378917..000000000
--- a/dmake/msdos/microsft/msc60/libswp.rsp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dmake/msdos/microsft/msc60/mk.bat b/dmake/msdos/microsft/msc60/mk.bat
deleted file mode 100755
index c260b6d54..000000000
--- a/dmake/msdos/microsft/msc60/mk.bat
+++ /dev/null
@@ -1,102 +0,0 @@
-md objects
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs infer.c
-copy infer.obj objects
-del infer.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs make.c
-copy make.obj objects
-del make.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs stat.c
-copy stat.obj objects
-del stat.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs expand.c
-copy expand.obj objects
-del expand.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs dmstring.c
-copy dmstring.obj objects
-del dmstring.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs hash.c
-copy hash.obj objects
-del hash.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs dag.c
-copy dag.obj objects
-del dag.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs dmake.c
-copy dmake.obj objects
-del dmake.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs path.c
-copy path.obj objects
-del path.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs imacs.c
-copy imacs.obj objects
-del imacs.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs sysintf.c
-copy sysintf.obj objects
-del sysintf.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs parse.c
-copy parse.obj objects
-del parse.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs getinp.c
-copy getinp.obj objects
-del getinp.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs quit.c
-copy quit.obj objects
-del quit.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs state.c
-copy state.obj objects
-del state.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs dmdump.c
-copy dmdump.obj objects
-del dmdump.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs macparse.c
-copy macparse.obj objects
-del macparse.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs rulparse.c
-copy rulparse.obj objects
-del rulparse.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs percent.c
-copy percent.obj objects
-del percent.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs function.c
-copy function.obj objects
-del function.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\ruletab.c
-copy ruletab.obj objects
-del ruletab.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\dirbrk.c
-copy dirbrk.obj objects
-del dirbrk.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\runargv.c
-copy runargv.obj objects
-del runargv.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\arlib.c
-copy arlib.obj objects
-del arlib.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\dchdir.c
-copy dchdir.obj objects
-del dchdir.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\switchar.c
-copy switchar.obj objects
-del switchar.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\rmprq.c
-copy rmprq.obj objects
-del rmprq.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\tee.c
-copy tee.obj objects
-del tee.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\find.c
-copy find.obj objects
-del find.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\dirlib.c
-copy dirlib.obj objects
-del dirlib.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\dstrlwr.c
-copy dstrlwr.obj objects
-del dstrlwr.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs unix\dcache.c
-copy dcache.obj objects
-del dcache.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\microsft\tempnam.c
-copy tempnam.obj objects
-del tempnam.obj
-link  /stack:4096/exe/packc/batch @msdos\microsft\msc60\obj.rsp,dmake.exe,NUL.MAP;
-copy msdos\microsft\msc60\template.mk startup\config.mk
diff --git a/dmake/msdos/microsft/msc60/mkswp.bat b/dmake/msdos/microsft/msc60/mkswp.bat
deleted file mode 100755
index 6b9ed76a5..000000000
--- a/dmake/msdos/microsft/msc60/mkswp.bat
+++ /dev/null
@@ -1,104 +0,0 @@
-md objects
-masm -t -mx -Dmlarge msdos\exec.asm,,,;
-mv exec.obj objects
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs infer.c
-copy infer.obj objects
-del infer.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs make.c
-copy make.obj objects
-del make.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs stat.c
-copy stat.obj objects
-del stat.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs expand.c
-copy expand.obj objects
-del expand.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs dmstring.c
-copy dmstring.obj objects
-del dmstring.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs hash.c
-copy hash.obj objects
-del hash.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs dag.c
-copy dag.obj objects
-del dag.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs dmake.c
-copy dmake.obj objects
-del dmake.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs path.c
-copy path.obj objects
-del path.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs imacs.c
-copy imacs.obj objects
-del imacs.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs sysintf.c
-copy sysintf.obj objects
-del sysintf.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs parse.c
-copy parse.obj objects
-del parse.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs getinp.c
-copy getinp.obj objects
-del getinp.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs quit.c
-copy quit.obj objects
-del quit.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs state.c
-copy state.obj objects
-del state.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs dmdump.c
-copy dmdump.obj objects
-del dmdump.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs macparse.c
-copy macparse.obj objects
-del macparse.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs rulparse.c
-copy rulparse.obj objects
-del rulparse.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs percent.c
-copy percent.obj objects
-del percent.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs function.c
-copy function.obj objects
-del function.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\ruletab.c
-copy ruletab.obj objects
-del ruletab.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\dirbrk.c
-copy dirbrk.obj objects
-del dirbrk.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\runargv.c
-copy runargv.obj objects
-del runargv.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\arlib.c
-copy arlib.obj objects
-del arlib.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\dchdir.c
-copy dchdir.obj objects
-del dchdir.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\switchar.c
-copy switchar.obj objects
-del switchar.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\rmprq.c
-copy rmprq.obj objects
-del rmprq.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\spawn.c
-copy spawn.obj objects
-del spawn.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\find.c
-copy find.obj objects
-del find.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\dirlib.c
-copy dirlib.obj objects
-del dirlib.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\dstrlwr.c
-copy dstrlwr.obj objects
-del dstrlwr.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs unix\dcache.c
-copy dcache.obj objects
-del dcache.obj
-cl -c -I. -Imsdos -Imsdos\microsft -AL -nologo -Imsdos\microsft\msc60 -D_MSC_VER=600 -Osecgl -Gs msdos\microsft\tempnam.c
-copy tempnam.obj objects
-del tempnam.obj
-link  /stack:4096/exe/packc/batch @msdos\microsft\msc60\objswp.rsp,dmake.exe,NUL.MAP;
-copy msdos\microsft\msc60\template.mk startup\config.mk
diff --git a/dmake/msdos/microsft/msc60/obj.rsp b/dmake/msdos/microsft/msc60/obj.rsp
deleted file mode 100644
index 8f79a3275..000000000
--- a/dmake/msdos/microsft/msc60/obj.rsp
+++ /dev/null
@@ -1,33 +0,0 @@
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\tee.obj+
-objects\find.obj+
-objects\dirlib.obj+
-objects\dstrlwr.obj+
-objects\dcache.obj+
-objects\tempnam.obj
diff --git a/dmake/msdos/microsft/msc60/objswp.rsp b/dmake/msdos/microsft/msc60/objswp.rsp
deleted file mode 100644
index 54524124d..000000000
--- a/dmake/msdos/microsft/msc60/objswp.rsp
+++ /dev/null
@@ -1,34 +0,0 @@
-objects\exec.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\spawn.obj+
-objects\find.obj+
-objects\dirlib.obj+
-objects\dstrlwr.obj+
-objects\dcache.obj+
-objects\tempnam.obj
diff --git a/dmake/msdos/microsft/msc60/public.h b/dmake/msdos/microsft/msc60/public.h
deleted file mode 100644
index ee92ab980..000000000
--- a/dmake/msdos/microsft/msc60/public.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:44:56 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void Clean_up_processes ANSI(());
-int Wait_for_child ANSI((int, int));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int dchdir ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int spawnvpe ANSI((int, char *, char **, char **));
-void Hook_std_writes ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/msdos/microsft/msc60/template.mk b/dmake/msdos/microsft/msc60/template.mk
deleted file mode 100644
index a147c694c..000000000
--- a/dmake/msdos/microsft/msc60/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= microsft
-   OSENVIRONMENT *:= msc60
diff --git a/dmake/msdos/microsft/optoff.h b/dmake/msdos/microsft/optoff.h
deleted file mode 100644
index 2e7b59b1c..000000000
--- a/dmake/msdos/microsft/optoff.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* RCS  $Id: optoff.h,v 1.1.1.1 2000-09-22 15:33:29 hr Exp $
---
--- SYNOPSIS
---      Turn off microsoft loop optimization.
---
--- DESCRIPTION
---      This is broken in some pre 600 compilers so just turn it off.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-#if _MSC_VER < 600
-# pragma loop_opt(off)
-#endif
diff --git a/dmake/msdos/microsft/tempnam.c b/dmake/msdos/microsft/tempnam.c
deleted file mode 100644
index 41bad028b..000000000
--- a/dmake/msdos/microsft/tempnam.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:29 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dos.h>
-
-#if defined(max)
-#   undef  max
-#endif
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-int d_access();
-
-/* MSC stdio.h defines P_tmpdir, so let's undo it here */
-/* Under DOS leave the default tmpdir pointing here!		*/
-#ifdef P_tmpdir
-#undef P_tmpdir
-#endif
-static char *P_tmpdir = "";
-
-char *
-tempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   static         int count = 0;
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-   char		  buf[30];
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   else if( (tmpdir = getenv("TMP")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+13))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (d_access( strcpy(p, tmpdir), 0) != 0) )
-     if( (dl == 0) || (d_access( strcpy(p, dir), 0) != 0) )
-    if( d_access( strcpy(p, P_tmpdir), 0) != 0 )
-       if( !prefix )
-          prefix = "tp";
-
-   if(prefix)
-   {
-      *(p+strlen(p)+2) = '\0';
-      (void)strncat(p, prefix, 2);
-   }
-
-   sprintf( buf, "%08x", _psp );
-   buf[6]='\0';
-   (void)strcat(p, buf );
-   sprintf( buf, "%04d", count++ );
-   q=p+strlen(p)-6;
-   *q++ = buf[0]; *q++ = buf[1];
-   *q++ = buf[2]; *q++ = buf[3];
-
-   if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
-
-   return(p);
-}
-
-
-
-d_access( name, flag )
-char *name;
-int  flag;
-{
-   extern char *DirSepStr;
-   char *p;
-   int r;
-
-   if( name == NULL || !*name ) return(1);  /* NULL dir means current dir */
-   r = access( name, flag );
-   p = name+strlen(name)-1;
-   if(*p != '/' && *p != '\\') strcat( p, DirSepStr );
-
-   return( r );
-}
diff --git a/dmake/msdos/rmprq.c b/dmake/msdos/rmprq.c
deleted file mode 100644
index a5200de43..000000000
--- a/dmake/msdos/rmprq.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* RCS  $Id: rmprq.c,v 1.2 2008-03-05 18:35:28 kz Exp $
---
--- SYNOPSIS
---      Remove prerequisites code.
--- 
--- DESCRIPTION
---	This code is different for DOS and for UNIX and parallel make
---	architectures since the parallel case requires the rm's to be
---	run in parallel, whereas DOS guarantees to run them sequentially.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#if defined(USE_CREATEPROCESS)
-/* MSVC6.0 and newer and MinGW use the parallel build enabled runargv(). */
-Force a compile-time blowup.
-This file should not be used, use unix/rmprq.c instead.
-#endif
-
-#include "extern.h"
-
-PUBLIC void
-Remove_prq( tcp )
-CELLPTR tcp;
-{
-   tcp->ce_flag &= ~(F_MADE|F_VISITED);
-   tcp->ce_time  = 0L;
-
-   Make( tcp, tcp ); 
-}
diff --git a/dmake/msdos/ruletab.c b/dmake/msdos/ruletab.c
deleted file mode 100644
index 93fef6483..000000000
--- a/dmake/msdos/ruletab.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* RCS  $Id: ruletab.c,v 1.2 2006-04-20 12:06:11 hr Exp $
---
--- SYNOPSIS
---      Default initial configuration of dmake.
--- 
--- DESCRIPTION
--- 	Define here the initial set of rules that are defined before
---	dmake performs any processing.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* These are control macros for dmake that MUST be defined at some point
- * if they are NOT dmake will not work!  These are default definitions.  They
- * may be overridden inside the .STARTUP makefile, they are here
- * strictly so that dmake can parse the STARTUP makefile */
-
-#include <stdio.h>
-
-static char *_rules[] = {
-    "MAXLINELENGTH := 2046",
-    "MAXPROCESSLIMIT := 1",
-    "MAXPROCESS := 1",
-    ".IMPORT .IGNORE: DMAKEROOT",
-    ".MAKEFILES : makefile.mk makefile",
-    ".SOURCE    : .NULL",
-#include "startup.h"
-    (char *)NULL };
-
-char **Rule_tab = _rules; /* for sundry reasons in Get_environment() */
-
diff --git a/dmake/msdos/runargv.c b/dmake/msdos/runargv.c
deleted file mode 100644
index d91e8bffc..000000000
--- a/dmake/msdos/runargv.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* RCS  $Id: runargv.c,v 1.6 2008-03-05 18:35:53 kz Exp $
---
--- SYNOPSIS
---      Run a sub process.
--- 
--- DESCRIPTION
---	Use spawn to run a subprocess.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#if defined(USE_CREATEPROCESS)
-/* MSVC6.0 and newer and MinGW use the parallel build enabled runargv(). */
-Force a compile-time blowup.
-This file should not be used, use unix/runargv.c instead.
-#endif
-
-#include <process.h>
-#include <errno.h>
-#include "extern.h"
-#include "sysintf.h"
-
-static int  _abort_flg = FALSE;
-static void _add_child ANSI((CELLPTR, int));
-static void _finished_child ANSI((int));
-
-PUBLIC int
-runargv(target, group, last, cmnd_attr, cmd)
-CELLPTR target;
-int	group;
-int	last;
-t_attr  cmnd_attr; /* Attributes for current cmnd. */
-char  **cmd; /* Simulate a reference to *cmd. */
-{
-   int  ignore = (cmnd_attr & A_IGNORE)!= 0; /* Ignore errors ('-'). */
-   int  shell  = (cmnd_attr & A_SHELL) != 0; /* Use shell ('+'). */
-   int  mute = (cmnd_attr & A_MUTE) != 0; /* Mute output ('@@'). */
-#if ! defined(_MSC_VER)
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x500
-   extern char ** _RTLENTRY _EXPDATA environ;
-#else
-   extern char **environ;
-#endif
-#endif
-   int status;
-   char **argv;
-   int old_stdout = -1; /* For redirecting shell escapes */
-   int old_stderr = -1; /* and silencing @@-recipes      */
-   char *tcmd = *cmd; /* For saver/easier string arithmetic on *cmd. */
-
-   if( Measure & M_RECIPE )
-      Do_profile_output( "s", M_RECIPE, target );
-
-   _add_child(target, ignore);
-
-   /* redirect output for _exec_shell / @@-recipes. */
-   if( Is_exec_shell ) {
-      /* Add error checking? */
-      old_stdout = dup(1);
-      dup2( fileno(stdout_redir), 1 );
-   }
-   if( mute ) {
-      old_stderr = dup(2);
-      dup2( zerofd, 2 );
-
-      if( !Is_exec_shell ) {
-     old_stdout = dup(1);
-     dup2( zerofd, 1 );
-      }
-   }
-
-   /* Return immediately for empty line or noop command. */
-   if ( !*tcmd ||				/* empty line */
-    ( strncmp(tcmd, "noop", 4) == 0 &&	/* noop command */
-      (iswhite(tcmd[4]) || tcmd[4] == '\0')) ) {
-      status = 0;
-   }
-   else if( !shell &&  /* internal echo only if not in shell */
-        strncmp(tcmd, "echo", 4) == 0 &&
-        (iswhite(tcmd[4]) || tcmd[4] == '\0') ) {
-      int nl = 1;
-
-      tcmd = tcmd + 4;
-
-      while( iswhite(*tcmd) ) ++tcmd;
-      if ( strncmp(tcmd,"-n",2 ) == 0) {
-     nl = 0;
-     tcmd = tcmd+2;
-     while( iswhite(*tcmd) ) ++tcmd;
-      }
-      printf("%s%s", tcmd, nl ? "\n" : "");
-      fflush(stdout);
-      status = 0;
-   }
-   else {
-      argv = Pack_argv( group, shell, cmd );
-      Packed_shell = shell||group;
-
-      /* The last two arguments would need (const char *const *) casts
-       * to silence the warning when building with MinGW. */
-      status = spawnvpe(P_WAIT, *argv, argv, environ);
-   }
-
-   /* Restore stdout/stderr if needed. */
-   if( old_stdout != -1 ) {
-      dup2(old_stdout, 1);
-      if( old_stderr != -1 )
-     dup2(old_stderr, 2);
-   }
-
-   if( status == -1 ) {
-      /* spawnvpe failed */
-      fprintf(stderr, "%s:  Error executing '%s': %s",
-          Pname, argv[0], strerror(errno) );
-      if( ignore||Continue ) {
-     fprintf(stderr, " (Ignored)" );
-      }
-      fprintf(stderr, "\n");
-   }
-
-   if( Measure & M_RECIPE )
-      Do_profile_output( "e", M_RECIPE, target );
-
-   _finished_child(status);
-   if( last && !Doing_bang ) Update_time_stamp( target );
-
-   return( 0 );
-}
-
-
-PUBLIC void
-Clean_up_processes()
-{
-   _abort_flg = TRUE;
-   _finished_child(-1);
-}
-
-
-PUBLIC int
-Wait_for_child( abort_flg, pid )
-int abort_flg;
-int pid;
-{
-   /* There is currently no parallel processing for this OS, always
-    * return -1 indicating that there was nothing to wait for. */
-   return(-1);
-}
-
-
-static int     _valid = -1;
-static CELLPTR _tg;
-static int     _ignore;
-
-static void
-_add_child( target, ignore )
-CELLPTR target;
-int	ignore;
-{
-   _tg = target;
-   _ignore = ignore;
-   _valid = 0;
-
-   Current_target = NIL(CELL);
-}
-
-
-static void
-_finished_child(status)
-int	status;
-{
-   if( _valid == -1 ) return;
-   _valid = -1;
-   Handle_result( status, _ignore, _abort_flg, _tg );
-}
diff --git a/dmake/msdos/spawn.c b/dmake/msdos/spawn.c
deleted file mode 100644
index c5e995565..000000000
--- a/dmake/msdos/spawn.c
+++ /dev/null
@@ -1,415 +0,0 @@
-/* RCS  $Id: spawn.c,v 1.3 2007-10-15 15:43:28 ihi Exp $
---
--- SYNOPSIS
---      Spawnvpe code to emulate spawnvpe call common to DOS compilers.
--- 
--- DESCRIPTION
---	This implementation is further integrated into dmake in that it
---	determines the program to execute and if it's extension is either
---	.bat or .ksh it executes it using the appropriate shell based on the
---	setting of .MKSARGS.  If .MKSARGS is set then in addition
---	to the command tail getting built the arguments are also passed in the
---	environment pursuant to the published MKS argument passing conventions.
---	If the variable Swap_on_exec is set and the DOS OS supports it
---	then the dmake executable image is swapped to secondary storage prior
---	to running the child process.  This is requested by setting the
---	appropriate flag in the call to exec.
---
---	This and the exec.asm routine are derived from work that was supplied
---	to me by Kent Williams (williams@umaxc.weeg.uiowa.edu) and by
---      Len Reed, (..!gatech!holos0!lbr or holos0!lbr@gatech.edu., Holos
---	Software, Inc., Tucker, Ga.).  I sincerely acknowledge their help since
---	their Turbo C, and MSC 6.0 code lead directly to this combined
---	swapping exec that hopefully works with either compiler in all memory
---	models.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#if defined(_MSC_VER) && _MSC_VER >= 600
-    /* Ignore the MSC 6.0 library's "const"-riddled prototype
-       for spawnvpe.
-    */
-# define spawnvpe _ignore_msc_spawnvpe
-# include <process.h>
-# undef spawnvpe
-  int spawnvpe(int, char *, char **, char **);
-#else
-# include <process.h>
-#endif
-
-#include <dos.h>
-#include <errno.h>
-#include <string.h>
-#include <alloc.h>
-#include <fcntl.h>
-#include "extern.h"
-#include "dosdta.h"
-#include "exec.h"
-#include "sysintf.h"
-
-extern int Interrupted;
-
-/* variables and functions local to this file */
-static char     *_findexec ANSI((char *, int *));
-static char    **_getpath ANSI(());
-static char far *_dos_alloc ANSI((uint16));
-
-static uint16 _swap_mask;
-static int    _mks_args;
-static char   dot_com[] = ".COM",
-          dot_exe[] = ".EXE",
-              dot_bat[] = ".BAT",
-          dot_ksh[] = ".KSH";
-
-/* Kinds of executables */
-#define SCR 1
-#define COM 2
-#define EXE 4
-#define ALL (SCR|COM|EXE)
-
-/* How to make a long pointer */
-#define CF(x) (char far *)x
-
-/* Make sure we know how to get a segment out of a long pointer */
-#ifndef FP_SEG
-#define FP_SEG(fp)	((unsigned)((unsigned long)(fp) >> 16))
-#endif
-
-iz81252 changed the parameters for Pack_argv() but this file did not get fixed!
-PUBLIC int
-spawnvpe(mode, program, av, ep)/*
-=================================
-   Spawn a process using an environment and a vector of arguments.
-   The code computes a new environment, puts the MKS arguments into
-   it if need be, and calls the appropriate routines to search the
-   path and to invoke the process. */
-int  mode;
-char *program;
-char **av;
-char **ep;
-{
-   char pwd[PATH_MAX+1];
-   char **envp = ep;		/* Cause we are going to mess with it. */
-   char **argv = av;		/* Same with this one.		       */
-   char cmdtail[129];
-   char far *environment;
-   char *tail;
-   char *swptmp;
-   unsigned int envsize;
-   unsigned int cmdsize;
-   int  cmdtailen;
-   int  i;
-   int  doswap;
-
-   /* First check to see if we can find the program to execute this way we
-    * don't alloc the environment and other such stuff prior to figuring out
-    * we don't know how to run the program. */
-find_program:
-   if((program = _findexec(program, &i)) == NIL(char)) {
-      errno = ENOENT;
-      return( -1 );
-   }
-
-   /* i is set to TRUE in _findexec if the exec is a shell
-    * script (either .BAT or .KSH file), returns FALSE for all others. */
-   if( i && !Packed_shell ) {
-      /* Restore the spaces into the command line that were erased by
-       * the previous call to Pack_argv.  This enables us to repack the
-       * command as a shell command using Pack_argv again. */
-      for( i=0; argv[i] != NIL(char); i++ ) {
-         int x = strlen(argv[i]);
-         if( argv[i+1] != NIL(char) ) argv[i][x] = ' ';
-      }
-
-      argv = Pack_argv( FALSE, TRUE, *argv );
-      Packed_shell = TRUE; /* Previous call implies shell = TRUE. */
-
-      /* Go and find the program again, I hate goto's but it seems silly to
-       * use tail recursion here just for aesthetic purity. */
-      program = *argv;
-      goto find_program;
-   }
-
-   /* Compute size of *argv vector for passing as MKS style arguments */
-   cmdsize = strlen(*argv)+2;
-
-   /* So we have decided on a program to run, therefore pack the command tail
-    * and build the environment to pass to the exec code.  This loop packs the
-    * DOS command tail, and computes the size of all arguments for the MKS
-    * argument passing convention.  Note that we reserve one less byte in the
-    * command tail if we are not using MKS style argument passing.
-    *
-    * Make sure the command tail contains at leat a space.  Some commands fail
-    * to work if the command tail is only a \r, STUPID DOS! */
-   cmdtailen = ((_mks_args = ((Glob_attr & A_MKSARGS) != 0)) != 0)?3:2;
-   tail      = cmdtail+1;
-
-   if( argv[1] != NIL(char) )
-      for( i=1; argv[i] != NIL(char); i++ ) {
-     int arglen = strlen(argv[i]);
-
-     cmdsize += arglen+2;		/* Compute all args size for MKS */
-
-     if( (cmdtailen += arglen+1) <= 128 ) {
-        register char *p = argv[i];
-        tail[-1] = ' ';		/* put in the space */
-        while( *tail++ = *p++ );	/* put in the arg   */
-     }
-     else if( !_mks_args ) {
-        errno = E2BIG;		/* unless its MKS exit if arglist */
-        return(-1);			/* is too long.			  */
-     }
-      }
-   else
-      *tail++ = ' ';
-
-   /* Finish the command tail set up, placing the length in the first byte,
-    * and the \r \n \0 at the end for DOS, MKS and us respectively. */
-   *cmdtail = tail-cmdtail-2;
-   tail[-1] = '\r';
-   if( _mks_args ) *tail++ = '\n';
-   *tail = '\0';
-
-   /* Compute size of environment, skipping any MKS arguments passed in our
-    * environment */
-   for(; *envp && **envp == '~'; envp++ );
-   for(i=0, envsize=_mks_args?cmdsize:1; envp[i] != NIL(char); i++ )
-      envsize += strlen(envp[i]) + 1;
-
-   /* Check the DOS version number here.  If it is < 3.0 then we don't
-    * even want to think about executing the swapping code.   Permanently
-    * set swap to 0. */
-   doswap = (_osmajor < 3) ? 0 : Swap_on_exec;
-
-   /* Set up temporary file for swapping */
-   swptmp = doswap?tempnam(NIL(char),"mk"):""; 
-
-   /* Allocate an appropriate sized environment block and align it on a
-    * paragraph boundary.  It will later get copied to an appropriately low
-    * place in the executable image so that when we swap out the environment
-    * is still present.  Use
-    *    _dos_alloc
-    * to allocate the environment segment.  The segment is freed by the call
-    * to exec. */
-   environment = _dos_alloc( envsize = ((envsize+16)>>4) );
-   *environment = '\0';
-
-   /* First copy the arguments preceeded by ~ character if we are using
-    * MKS style argument passing */
-   if( _mks_args )
-      for(; *argv; argv++) {
-         register char *p = *argv;
-
-     *environment++ = '~';
-     while( *environment++ = *p++ );	/* Far dest, poss near ptr */
-      }
-
-   /* Now stick in the current evironment vectors. */
-   for(; *envp; envp++) {
-      register char *p = *envp;
-      while( *environment++ = *p++ );		/* Far dest, poss near ptr */
-   }
-
-   /* Clear the interrupted flag, and exec  */
-   Interrupted = 0;
-
-   /* Preserve the current working directory accross a spawn call 
-    * DOS is brain dead about this.  This way we have some hope of cleaning
-    * up the swapping tempfiles after we return. */
-   strcpy(pwd,Get_current_dir());
-   i = exec(doswap,CF(program),CF(cmdtail),FP_SEG(environment),CF(swptmp));
-   Set_dir(pwd);
-
-   /* Now free the temporary file name */
-   if( doswap ) FREE(swptmp);
-
-   /* If swap was interrupted then quit properly from dmake. */
-   if( Interrupted ) Quit();
-
-   return(i);
-}
-
-
-PUBLIC void
-Hook_std_writes( file )
-char *file;
-{
-   if( file!= NIL(char) ) {
-      int mode = O_BINARY | O_WRONLY | O_CREAT | O_TRUNC;
-      int handle;
-
-      if (*file == '+') {
-          ++file;             /* -F +file means append to file */
-          mode = O_BINARY | O_WRONLY | O_CREAT | O_APPEND;
-      }
-      handle = open(file, mode, S_IREAD | S_IWRITE);
-      if (handle < 0) {
-          Fatal( "Could not open -F file");
-      }
-      (void) lseek(handle, 0L, SEEK_END);
-      do_hook_std_writes(handle);
-   }
-   else
-      do_unhook_std_writes();
-}
-
-
-/*
-** _findexec finds executables on the path.
-** Note that it is pretty simple to add support for other executable types
-** shell scripts, etc.
-**
-** This follows the command.com behavior very closely.
-*/
-static char *
-_findexec( s, is_shell )/*
-==========================
-   Cloned closely from code provided by Kent Williams.  Stripped his down to
-   a reduced search since dmake doesn't need to recompute the PATH vector
-   each time it does the search since it cannot alter the path vector once
-   it begins to make recipes.  Also modified it to use findfirst and findnext
-   as provided for dirlib package that I got off the net. */
-char *s;
-int  *is_shell;
-{
-   unsigned found_flags;
-   char     **pathv = NIL(char *);
-   char     *ext    = NIL(char);
-   char     *buf    = NIL(char);
-   char     *p[2];
-   char     *dot_scr;
-   char	    *dot;
-
-   p[0] = ""; p[1] = NIL(char);
-   if( strchr("./\\", *s) || s[1] == ':' )
-      pathv = p;
-   else if( (pathv = _getpath()) == NIL(char *) )
-      return( NIL(char) );
-
-   /* Compute the extension we need if any. */
-   if( (dot = strrchr(s,'.')) != NIL(char) &&
-        dot > strrchr(s,'/') && dot > strrchr(s,'\\') )
-      ext = dot+1;
-
-   dot_scr   = _mks_args ? dot_ksh : dot_bat;
-   *is_shell = FALSE;
-
-   for( found_flags = 0; *pathv && !found_flags; pathv++ ) {
-      DTA dta;
-
-      if( !ext ) {
-     char *name;
-     buf = Build_path( *pathv, name=DmStrJoin(s, ".???", -1, FALSE) );
-     FREE(name);
-      }
-      else
-     buf = Build_path( *pathv, s );
-
-      if( findfirst((char *)strupr(buf), &dta) != NIL(DTA) ) {
-     if( !ext ) {
-        char *dot;
-
-        /* search order is .com .exe (.ksh || .bat)
-         * there has to be a '.' */
-        do {
-           dot = strrchr(dta.name,'.');
-           if(0 == strcmp(dot,dot_com))
-          found_flags |= COM;
-           else if(0 == strcmp(dot,dot_exe))
-          found_flags |= EXE;
-           else if( 0 == strcmp(dot,dot_scr) )
-          found_flags |= SCR;
-        } while( found_flags != ALL && findnext(&dta) != NIL(DTA) );
-
-        if(found_flags & COM)      ext = dot_com;
-        else if(found_flags & EXE) ext = dot_exe;
-        else if(found_flags & SCR) {
-           ext = dot_scr;
-           *is_shell = TRUE;
-        }
-
-        if( found_flags ) {
-           char *name;
-           buf = Build_path( *pathv, name=DmStrJoin(s,ext,-1,FALSE) );
-           FREE(name);
-           strupr(buf);
-        }
-     }
-     else
-        found_flags++;
-      }
-   }
-
-   return( found_flags ? buf : NIL(char) );
-}
-
-
-/*
-** getpath turns the DOS path into a char *vector, It is gotten and
-** transformed only once since dmake can't modify the value of PATH while
-** it is making targets.
-*/
-static char **
-_getpath()
-{
-   static   char **dir = NIL(char *);
-   register char *p;
-
-   if( !dir ) {
-      register char *t;
-      int           i;
-      char          *semi = NIL(char);
-
-      if( (p = getenv("PATH")) == NIL(char) ) p = "";
-      for( i=1, t=p; *t; t++ ) if( *t == ';' ) i++;
-
-      TALLOC(dir, i+1, char *);
-      p   = DmStrDup(p);
-
-      for( i=0; p; p = semi ? (semi+1):NIL(char),i++ ){
-     if( (semi = strchr(p,';')) != NIL(char) ) *semi = '\0';
-     dir[i] = p;
-      }
-      dir[i]=NIL(char);
-   }
-
-   return( dir );
-}
-
-
-static char far *
-_dos_alloc( size )/*
-====================
-   This routine allocates size paragraphs from DOS.  It changes the memory
-   allocation strategy to allocate from the tail and then changes it back.
-   to using first fit. */
-uint16 size;
-{
-   union REGS r;
-
-   r.h.ah = 0x48;
-   r.x.bx = size;
-
-   intdos( &r, &r );
-   if( r.x.cflag ) No_ram();
-   
-   return( (char far *) MK_FP(r.x.ax, 0) );
-}
diff --git a/dmake/msdos/startup.h b/dmake/msdos/startup.h
deleted file mode 100644
index 3affebd1c..000000000
--- a/dmake/msdos/startup.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* RCS  $Id: startup.h,v 1.2 2006-04-20 12:06:36 hr Exp $
---
--- SYNOPSIS
---      Dmake startup header file definition.
---
--- DESCRIPTION
---      Where we define the default value of MAKESTARTUP.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-"MAKESTARTUP := $(DMAKEROOT)\\startup.mk",
diff --git a/dmake/msdos/switchar.c b/dmake/msdos/switchar.c
deleted file mode 100644
index 9638ec229..000000000
--- a/dmake/msdos/switchar.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* RCS  $Id: switchar.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      switch char query.
---
--- DESCRIPTION
---      Get the current value of the command line switch char.  Only useful
---      in a DOS environment, otherwise we #define it to be '-'.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-#if defined(_MSC_VER)
-#include <stdlib.h>
-#endif
-#include <dos.h>
-#include <stdio.h>
-#include "stdmacs.h"
-
-getswitchar()/*
-===============
-   Try the environment first.  If you don't find SWITCHAR there, then use
-   the DOS call.  The call is undocumented, and doesn't work for DOS versions
-   4.0 and up, so the check of the environment will fix that. */
-{
-#if defined(__MSDOS__) || defined(M_I86)
-   union REGS rg;
-   static char *_env_switchar = NIL(char);
-
-   if( _env_switchar != NIL(char) ||
-       (_env_switchar = (char *)getenv("SWITCHAR")) != NIL(char) )
-      return(*_env_switchar);
-
-   rg.h.ah = 0x37;      /* switch char request */
-   rg.h.al = 0;         /* get (not set) */
-
-   intdos(&rg, &rg);
-   return (rg.h.dl);
-#endif /* M_I86 */
-
-   return ('-');
-}
diff --git a/dmake/msdos/sysintf.h b/dmake/msdos/sysintf.h
deleted file mode 100644
index 5b70133b5..000000000
--- a/dmake/msdos/sysintf.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* RCS  $Id: sysintf.h,v 1.2 2007-01-18 09:34:40 vg Exp $
---
--- SYNOPSIS
---      Interfaces for sysintf.c
---
--- DESCRIPTION
---      Abstractions of functions in sysintf.c
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-#define DMSTAT stat
-#define VOID_LCACHE(l,m)
-#define GETPID _psp
-
-extern char * tempnam();
-extern char * getcwd();
-
-/*
-** standard C items
-*/
-
-/*
-** DOS interface standard items
-*/
-#define	chdir(p) dchdir(p)
-
-/*
-** make parameters
-*/
-#ifdef _POSIX_NAME_MAX
-#undef  _POSIX_NAME_MAX
-#endif
-#define _POSIX_NAME_MAX 12
-
-#ifdef _POSIX_PATH_MAX
-#undef _POSIX_PATH_MAX
-#endif
-#define _POSIX_PATH_MAX 64
diff --git a/dmake/msdos/tee.c b/dmake/msdos/tee.c
deleted file mode 100644
index 448a4597b..000000000
--- a/dmake/msdos/tee.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* RCS  $Id: tee.c,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $
---
--- SYNOPSIS
---      Hook_std_writes() dummy call for non swapping MSDOS versions.
--- 
--- DESCRIPTION
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-PUBLIC void
-Hook_std_writes( file )
-char *file;
-{
-}
diff --git a/dmake/msdos/zortech/config.h b/dmake/msdos/zortech/config.h
deleted file mode 100644
index a49141a4a..000000000
--- a/dmake/msdos/zortech/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* RCS  $Id: config.h,v 1.2 2008-03-05 18:37:45 kz Exp $
---
--- SYNOPSIS
---      Configurarion include file.
--- 
--- DESCRIPTION
--- 	There is one of these for each specific machine configuration.
---	It can be used to further tweek the machine specific sources
---	so that they compile.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* in sysintf.c: SIGQUIT is used, this is not defined in ZTC */
-#ifndef SIGQUIT
-#   define SIGQUIT SIGTERM
-#endif
-
-/* in sysintf.c: tzset is not supported by ZTC */
-#define tzset()
-
-/* ZTC uses it's own swapping spawn. */
-#define spawnvpe(a,b,c,d) spawnvp(a,b,c)
-
-#ifndef CONST
-#   define CONST const
-#endif
-
-#ifndef MSDOS
-#   define MSDOS 1
-#endif
-
-extern unsigned _psp;
-
-/* a small problem with pointer to voids on some unix machines needs this */
-#define DMPVOID void *
-
-#include <io.h>
diff --git a/dmake/msdos/zortech/config.mk b/dmake/msdos/zortech/config.mk
deleted file mode 100644
index e947dc876..000000000
--- a/dmake/msdos/zortech/config.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-# This is the ZTC DOS configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-TMPDIR :=
-.EXPORT : TMPDIR
-
-# Definition of macros for library, and C startup code.
-# Swapping for DOS versions is enabled by default.  ZTC will automatically
-# perform swapping to XMS, EMS or disk by including _swapl.obj at link time.
-# To be most effective, _swapl.obj should be the first file linked so we
-# assign it to CSTARTUP if needed.
-.IF $(SWAP) == y
-   CSTARTUP = _swapl.obj
-.END
-
-# The following sources are required for ZTC
-# The tempnam supplied with ZTC doesn't handle a NULL dir.
-OSR_SRC = tempnam.c environ.c
-.SETDIR=$(osrdir) : $(OSR_SRC)
-
-SRC += $(OSR_SRC)
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS 
-# If you have a 286, you can use -2 or appropriate to get better code, 
-# in that case uncomment the line below.  (You can also simply set
-# it in the CL environment variable.)
-#CFLAGS += -2
-ASFLAGS += -t -mx $(S_$(MODEL))
-
-# Redefine this, it isn't needed!
-LDTAIL = ;
-
-# Debugging libraries
-DB_LDFLAGS += -g
-DB_LDLIBS  +=
-
-# NO Debug ZTC flags:
-#
-
-CFLAGS      += -I$(osrdir) $(C_$(MODEL))
-CFLAGS      += -DM_I86=1 -DMSDOS
-CFLAGS      += -b             # use large compiler
-#CFLAGS      += -w            # no warnings
-CFLAGS      += -mi            # integer only
-CFLAGS      += -p             # no auto-prototyping
-NDB_CFLAGS  += -o
-DB_CFLAGS   += -g
-
-# Redefine rule for making our objects, we don't need mv
-%$O : %.c ;% $(CC) -c $(CFLAGS) -o$@ $<
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
-
-C_s =
-C_m = -mM
-C_c = -mC
-C_l = -mL
-
-S_s = -Dmsmall
-S_m = -Dmmedium
-S_c = -Dmcompact
-S_l = -Dmlarge
diff --git a/dmake/msdos/zortech/environ.c b/dmake/msdos/zortech/environ.c
deleted file mode 100644
index dea86f8c7..000000000
--- a/dmake/msdos/zortech/environ.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* RCS  $Id: environ.c,v 1.1.1.1 2000-09-22 15:33:29 hr Exp $
---
--- SYNOPSIS
---      environment routines.
---
--- DESCRIPTION
---      Someone thought that Zortech needs this.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "alloc.h"
-
-/* ZTC++ doesn't have environ, so we have to create one. */
-
-extern char *_envptr;
-char **environ = { NULL };
-
-void
-make_env()
-{
-    int		i;
-    char	*cp;
-
-    for (i = 0, cp = _envptr; *cp; i++, cp += strlen(cp)+1)
-        ;
-
-    TALLOC(environ, i+1, char*);
-
-    for (i = 0, cp = _envptr; *cp; i++, cp += strlen(cp)+1)
-        environ[i] = cp;
-
-    return;
-}
-
-void
-free_env()
-{
-    FREE(environ);
-
-    return;
-}
diff --git a/dmake/msdos/zortech/lib.rsp b/dmake/msdos/zortech/lib.rsp
deleted file mode 100644
index 8b1378917..000000000
--- a/dmake/msdos/zortech/lib.rsp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dmake/msdos/zortech/libswp.rsp b/dmake/msdos/zortech/libswp.rsp
deleted file mode 100644
index 8b1378917..000000000
--- a/dmake/msdos/zortech/libswp.rsp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dmake/msdos/zortech/mkswp.bat b/dmake/msdos/zortech/mkswp.bat
deleted file mode 100755
index 60c12d372..000000000
--- a/dmake/msdos/zortech/mkswp.bat
+++ /dev/null
@@ -1,36 +0,0 @@
-md objects
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\infer.obj infer.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\make.obj make.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\stat.obj stat.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\expand.obj expand.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\dmstring.obj dmstring.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\hash.obj hash.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\dag.obj dag.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\dmake.obj dmake.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\path.obj path.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\imacs.obj imacs.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\sysintf.obj sysintf.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\parse.obj parse.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\getinp.obj getinp.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\quit.obj quit.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\state.obj state.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\dmdump.obj dmdump.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\macparse.obj macparse.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\rulparse.obj rulparse.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\percent.obj percent.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\function.obj function.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\ruletab.obj msdos\ruletab.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\dirbrk.obj msdos\dirbrk.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\runargv.obj msdos\runargv.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\arlib.obj msdos\arlib.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\dchdir.obj msdos\dchdir.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\switchar.obj msdos\switchar.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\rmprq.obj msdos\rmprq.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\tee.obj msdos\tee.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\find.obj msdos\find.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\dirlib.obj msdos\dirlib.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\dstrlwr.obj msdos\dstrlwr.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\dcache.obj unix\dcache.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\tempnam.obj msdos\zortech\tempnam.c
-ztc -c -I. -Imsdos -Imsdos\zortech -mL -DM_I86=1 -DMSDOS -b -mi -p -o -oobjects\environ.obj msdos\zortech\environ.c
-blink  @msdos\zortech\objswp.rsp,dmake.exe,NUL.MAP;
diff --git a/dmake/msdos/zortech/obj.rsp b/dmake/msdos/zortech/obj.rsp
deleted file mode 100644
index c97a42f9f..000000000
--- a/dmake/msdos/zortech/obj.rsp
+++ /dev/null
@@ -1,34 +0,0 @@
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\tee.obj+
-objects\find.obj+
-objects\dirlib.obj+
-objects\dstrlwr.obj+
-objects\dcache.obj+
-objects\tempnam.obj+
-objects\environ.obj
diff --git a/dmake/msdos/zortech/objswp.rsp b/dmake/msdos/zortech/objswp.rsp
deleted file mode 100644
index 60a33c4eb..000000000
--- a/dmake/msdos/zortech/objswp.rsp
+++ /dev/null
@@ -1,35 +0,0 @@
-_swapl.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dirbrk.obj+
-objects\runargv.obj+
-objects\arlib.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\rmprq.obj+
-objects\tee.obj+
-objects\find.obj+
-objects\dirlib.obj+
-objects\dstrlwr.obj+
-objects\dcache.obj+
-objects\tempnam.obj+
-objects\environ.obj
diff --git a/dmake/msdos/zortech/public.h b/dmake/msdos/zortech/public.h
deleted file mode 100644
index 07e70eb39..000000000
--- a/dmake/msdos/zortech/public.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:45:09 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void Clean_up_processes ANSI(());
-int Wait_for_child ANSI((int, int));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int dchdir ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-void Hook_std_writes ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/msdos/zortech/startup.mk b/dmake/msdos/zortech/startup.mk
deleted file mode 100644
index 2697f738b..000000000
--- a/dmake/msdos/zortech/startup.mk
+++ /dev/null
@@ -1,153 +0,0 @@
-# MSDOS DMAKE startup file.  Customize to suit your needs.
-# Assumes MKS toolkit for the tool commands, and Zortech C.  Change as req'd.
-# See the documentation for a description of internally defined macros.
-#
-# Disable warnings for macros redefined here that were given
-# on the command line.
-__.SILENT !:= $(.SILENT)
-.SILENT   !:= yes
-
-# Configuration parameters for DMAKE startup.mk file
-# Set these to NON-NULL if you wish to turn the parameter on.
-_HAVE_RCS	:= yes		# yes => RCS  is installed.
-_HAVE_SCCS	:= 		# yes => SCCS is installed.
-
-# Applicable suffix definitions
-A := .lib	# Libraries
-E := .exe	# Executables
-F := .for	# Fortran
-O := .obj	# Objects
-P := .pas	# Pascal
-S := .asm	# Assembler sources
-V := 		# RCS suffix
-
-# See if these are defined
-.IMPORT .IGNORE : TMPDIR SHELL COMSPEC ROOTDIR
-TMPDIR *:= $(ROOTDIR)/tmp
-
-# Recipe execution configurations
-# First set SHELL, If it is not defined, use COMSPEC, otherwise
-# it is assumed to be MKS Korn SHELL.
-.IF $(SHELL) == $(NULL)
-.IF $(COMSPEC) == $(NULL)
-   SHELL := $(ROOTDIR)/bin/sh$E
-.ELSE
-   SHELL := $(COMSPEC)
-.END
-.END
-GROUPSHELL := $(SHELL)
-
-# Now set remaining arguments depending on which SHELL we
-# are going to use.  COMSPEC (assumed to be command.com) or
-# MKS Korn Shell.
-.IF $(SHELL)==$(COMSPEC)
-   SHELLFLAGS  := $(SWITCHAR)c
-   GROUPFLAGS  := $(SHELLFLAGS)
-   SHELLMETAS  := *"?<>
-   GROUPSUFFIX := .bat
-   DIRSEPSTR   := \\\
-   DIVFILE      = $(TMPFILE:s,/,\,)
-.ELSE
-   SHELLFLAGS  := -c
-   GROUPFLAGS  := 
-   SHELLMETAS  := *"?<>|()&][$$\#`'
-   GROUPSUFFIX := .ksh
-   .MKSARGS    := yes
-   DIVFILE      = $(TMPFILE:s,/,${DIVSEP_shell_${USESHELL}},)
-   DIVSEP_shell_yes := \\\
-   DIVSEP_shell_no  := \\
-.END
-
-# Standard C-language command names and flags
-   CC      := ztc		# C-compiler and flags
-   CFLAGS  +=
-
-   AS      := masm		# Assembler and flags
-   ASFLAGS +=
-
-   LD       = blink		# Loader and flags
-   LDFLAGS +=
-   LDLIBS   =
-
-# Definition of $(MAKE) macro for recursive makes.
-   MAKE = $(MAKECMD) -S $(MFLAGS)
-
-# Language and Parser generation Tools and their flags
-   YACC	  := yacc		# standard yacc
-   YFLAGS +=
-   YTAB	  := ytab		# yacc output files name stem.
-
-   LEX	  := lex		# standard lex
-   LFLAGS +=
-   LEXYY  := lex_yy		# lex output file
-
-# Other Compilers, Tools and their flags
-   PC	:= any_pc		# pascal compiler
-   RC	:= anyf77		# ratfor compiler
-   FC	:= anyf77		# fortran compiler
-
-   CO	   := co		# check out for RCS
-   COFLAGS += -q
-
-   AR     := ar			# archiver
-   ARFLAGS+= ruv
-
-   RM	   := rm		# remove a file command
-   RMFLAGS +=
-
-# Implicit generation rules for making inferences.
-# We don't provide .yr or .ye rules here.  They're obsolete.
-# Rules for making *$O
-   %$O : %.c ; $(CC) $(CFLAGS) -c $<
-   %$O : %.cpp ; $(CC) $(CFLAGS) -c $<
-   %$O : %$P ; $(PC) $(PFLAGS) -c $<
-   %$O : %$S ; $(AS) $(ASFLAGS) $(<:s,/,\);
-   %$O : %.cl ; class -c $<
-   %$O :| %.e %.r %.F %$F ; $(FC) $(RFLAGS) $(EFLAGS) $(FFLAGS) -c $<
-
-# Executables
-   %$E : %$O ; $(CC) $(LDFLAGS) -o$@ $< $(LDLIBS)
-
-# lex and yacc rules
-   %.c : %.y ; $(YACC)  $(YFLAGS) $<; mv $(YTAB).c $@
-   %.c : %.l ; $(LEX)   $(LFLAGS) $<; mv $(LEXYY).c $@
-
-# RCS support
-.IF $(_HAVE_RCS)
-   % : $$(@:d)RCS$$(DIRSEPSTR)$$(@:f)$V;- $(CO) $(COFLAGS) $@
-   .NOINFER : $$(@:d)RCS$$(DIRSEPSTR)$$(@:f)$V
-.END
-
-# SCCS support
-.IF $(_HAVE_SCCS)
-   % : s.% ; get $<
-   .NOINFER : s.%
-.END
-
-# Recipe to make archive files.
-%$A .SWAP .GROUP :
-    $(AR) $(ARFLAGS) $@ $?
-    $(RM) $(RMFLAGS) $?
-
-# DMAKE uses this recipe to remove intermediate targets
-.REMOVE :; $(RM) -f $<
-
-# AUGMAKE extensions for SYSV compatibility
-"@B" = $(@:b)
-"@D" = $(@:d)
-"@F" = $(@:f)
-"*B" = $(*:b)
-"*D" = $(*:d)
-"*F" = $(*:f)
-"<B" = $(<:b)
-"<D" = $(<:d)
-"<F" = $(<:f)
-"?B" = $(?:b)
-"?F" = $(?:f)
-"?D" = $(?:d)
-
-# Turn warnings back to previous setting.
-.SILENT !:= $(__.SILENT)
-
-# Local init file if any, gets parsed before user makefile
-.INCLUDE .IGNORE: "_startup.mk"
diff --git a/dmake/msdos/zortech/tempnam.c b/dmake/msdos/zortech/tempnam.c
deleted file mode 100644
index 6bccd6e08..000000000
--- a/dmake/msdos/zortech/tempnam.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:29 hr Exp $
---
--- SYNOPSIS
---      temname
---
--- DESCRIPTION
---      temp file name generation code.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dos.h>
-
-#if defined(max)
-#   undef  max
-#endif
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-int d_access();
-
-/* Zortech C stdio.h doesn't define P_tmpdir, so let's do it here */
-/* Under DOS leave the default tmpdir pointing here!		*/
-static char *P_tmpdir = "";
-
-char *
-tempnam(dir, prefix)
-const char *dir;		/* use this directory please (if non-NULL) */
-const char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   static         int count = 0;
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-   char		  buf[30];
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   else if( (tmpdir = getenv("TMP")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+13))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (d_access( strcpy(p, tmpdir), 0) != 0) )
-     if( (dl == 0) || (d_access( strcpy(p, dir), 0) != 0) )
-    if( d_access( strcpy(p, P_tmpdir), 0) != 0 )
-       if( !prefix )
-          prefix = "tp";
-
-   if(prefix)
-   {
-      *(p+strlen(p)+2) = '\0';
-      (void)strncat(p, prefix, 2);
-   }
-
-   sprintf( buf, "%08x", _psp );
-   buf[6]='\0';
-   (void)strcat(p, buf );
-   sprintf( buf, "%04d", count++ );
-   q=p+strlen(p)-6;
-   *q++ = buf[0]; *q++ = buf[1];
-   *q++ = buf[2]; *q++ = buf[3];
-
-   if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
-
-   return(p);
-}
-
-
-
-d_access( name, flag )
-char *name;
-int  flag;
-{
-   extern char *DirSepStr;
-   char *p;
-   int r;
-
-   if( name == NULL || !*name ) return(1);  /* NULL dir means current dir */
-   r = access( name, flag );
-   p = name+strlen(name)-1;
-   if(*p != '/' && *p != '\\') strcat( p, DirSepStr );
-
-   return( r );
-}
diff --git a/dmake/os2/config.mk b/dmake/os2/config.mk
deleted file mode 100644
index 5e2b7689b..000000000
--- a/dmake/os2/config.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# This is an OS specific configuration file
-#	It assumes that OBJDIR, TARGET and DEBUG are previously defined.
-#	It defines	CFLAGS, LDARGS, CPPFLAGS, STARTUPFILE, LDOBJS
-#	It augments	SRC, OBJDIR, TARGET, CFLAGS, LDLIBS
-#
-OSRELEASE *= ibm
-- := $(SWITCHAR)
-
-# Memory model to compile for
-# set to s - small, m - medium, c - compact, l - large
-# Use only large model now.
-MODEL = l
-
-STARTUPFILE	= $(OS)/startup.mk
-
-CPPFLAGS 	= $(CFLAGS)
-LDOBJS		= $(CSTARTUP) $(OBJDIR)/{$(<:f)}
-LDARGS		= $(LDHEAD) @$(LDTMPOBJ),$(TARGET),NUL.MAP,,$(LDTAIL)
-LDTAIL		= $(_libs)$(LDFLAGS:s/ //)
-_libs           = $(!null,$(LDLIBS) ,@$(LDTMPLIB))
-LDTMPOBJ	= $(mktmp,,$(DIVFILE) $(LDOBJS:s,/,\\,:t"+\n")\n)
-LDTMPLIB	= $(mktmp,,$(DIVFILE) $(LDLIBS)\n)
-
-# Debug flags
-DB_CFLAGS	= -DDBUG
-DB_LDFLAGS	=
-DB_LDLIBS	=
-
-# NO Debug flags
-NDB_CFLAGS	= 
-NDB_LDFLAGS	=
-NDB_LDLIBS      =
-
-# Local configuration modifications for CFLAGS.
-CFLAGS         += $-I$(OS)
-
-# OS2 does not have a swap version. The operating system will
-# handle all swapping.
-# To save copying unchanged files in from elsewhere, I shall use them in situ.
-OS_SRC   += ruletab.c dchdir.c switchar.c
-DOS_SRC  += dirbrk.c arlib.c dstrlwr.c runargv.c rmprq.c
-
-SRC += $(OS_SRC) $(DOS_SRC)
-.SETDIR=$(OS) : $(ASRC) $(OS_SRC)
-.SETDIR=msdos : $(DOS_SRC)
-
-# Set source dirs so that we can find files named in this
-# config file.
-.SOURCE.h : $(OS)
-
-# See if we modify anything in the lower levels.
-.IF $(OSRELEASE) != $(NULL)
-   .INCLUDE .IGNORE : $(OS)$(DIRSEPSTR)$(OSRELEASE)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/os2/dchdir.c b/dmake/os2/dchdir.c
deleted file mode 100644
index cf093308f..000000000
--- a/dmake/os2/dchdir.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* RCS  $Id: dchdir.c,v 1.1.1.1 2000-09-22 15:33:30 hr Exp $
---
--- SYNOPSIS
---      Change directory.
--- 
--- DESCRIPTION
---	Under DOS change the current drive as well as the current directory.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <os2.h>
-#include "extern.h"
-
-PUBLIC int
-_dchdir(path)
-char *path;
-{
-   int res;
-
-   res = _chdir(path);
-
-   if (res == 0 && path[1] == ':')
-      DosSelectDisk((*path & ~0x20) - '@');
-
-   return (res);
-}
diff --git a/dmake/os2/dirent.h b/dmake/os2/dirent.h
deleted file mode 100644
index eafaccbcc..000000000
--- a/dmake/os2/dirent.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* DIRLIB.H by M. J. Weinstein   Released to public domain 1-Jan-89 */
-
-#ifndef _DIRLIB_h_
-#define _DIRLIB_h_
-
-#define INCL_DOSFILEMGR
-#include <os2.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "stdmacs.h"
-
-#define MAXNAMLEN   _MAX_FNAME
-
-struct dirent {
-   long              d_ino;
-   unsigned short    d_reclen;
-   unsigned short    d_namlen;
-   char              d_name[MAXNAMLEN+1];
-};
-
-typedef struct {
-   HDIR           dd_handle;    /* Handle for FindFirst/Next               */
-   FILEFINDBUF3   dd_dta;       /* Disk transfer area for this dir.        */
-   ULONG          dd_count;     /* Count for FindFirst/Next                */
-   APIRET         dd_stat;      /* Status return from last lookup          */
-   char           dd_name[1];   /* Full name of file -- struct is extended */
-} DIR;
-
-extern DIR           *opendir   ANSI((char *));
-extern struct dirent *readdir   ANSI((DIR *));
-extern long          telldir    ANSI((DIR *));
-extern void          seekdir    ANSI((DIR *, long));
-extern void          closedir   ANSI((DIR *));
-
-#define rewinddir(dirp)   seekdir(dirp,0L)
-#endif
diff --git a/dmake/os2/ibm/config.h b/dmake/os2/ibm/config.h
deleted file mode 100644
index 6a3efa35d..000000000
--- a/dmake/os2/ibm/config.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* RCS  $Id: config.h,v 1.2 2008-03-05 18:38:08 kz Exp $
---
--- SYNOPSIS
---      Configurarion include file.
--- 
--- DESCRIPTION
--- 	There is one of these for each specific machine configuration.
---	It can be used to further tweek the machine specific sources
---	so that they compile.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#if defined (_MSC_VER)
-# if _MSC_VER < 500
-    Force a compile-time blowup.
-    Do not define define _MSC_VER for MSC compilers ealier than 5.0.
-# endif
-#endif
-
-/* define this for configurations that don't have the coreleft function
- * so that the code compiles.  To my knowledge coreleft exists only on
- * Turbo C, but it is needed here since the function is used in many debug
- * macros. */
-#define coreleft() 0L
-
-/* MSC Version 4.0 doesn't understand SIGTERM, later versions do. */
-#ifndef SIGTERM
-#   define SIGTERM SIGINT
-#endif
-
-/* This should already be defined under C6.0, also for OS/2 we want buffering
- * to minimise the mess during parallel makes.
- */
-#ifndef _IOLBF
-#   define _IOLBF   _IOFBF
-#endif
-
-/* in alloc.h: size_t is redefined
- * defined in stdio.h which is included by alloc.h
- */
-#if defined(MSDOS) && defined (_MSC_VER)
-#   define _TYPES_
-#endif
-
-/* Don't need this one either */
-#define CONST
-
-/* in sysintf.c: SIGQUIT is used, this is not defined in MSC */
-#ifndef SIGQUIT
-#   define SIGQUIT SIGTERM
-#endif
-
-/* a small problem with pointer to voids on some unix machines needs this */
-#define DMPVOID void *
-
-/* C-lib redefinitions... */
-#define dup            _dup
-#define close          _close
-#define utime          _utime
-#define tzset          _tzset
-#define access         _access
-#define getpid         _getpid
-#define getcwd         _getcwd
diff --git a/dmake/os2/ibm/config.mk b/dmake/os2/ibm/config.mk
deleted file mode 100644
index 716addd82..000000000
--- a/dmake/os2/ibm/config.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# This is the MSC 4.0 and higher DOS configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-TMPDIR :=
-.EXPORT : TMPDIR
-
-# Definition of macros for library, and C startup code.
-
-# The following sources are required for MSC
-OSR_SRC = tempnam.c
-.SETDIR=$(osrdir) : $(OSR_SRC)
-
-SRC += $(OSR_SRC)
-.SOURCE.h : $(osrdir)
-
-SET_STACK    = $-stack:32768
-NDB_LDFLAGS +=
-
-ASFLAGS += -t -mx $(S_$(MODEL))
-
-# Microsoft C doesn't need tail but needs head
-LDTAIL = ,;
-LDHEAD = $(LDFLAGS)
-
-# Debugging libraries
-DB_LDFLAGS += $-co $-li $-map $(SET_STACK)
-DB_LDLIBS  +=
-
-# NO Debug MSC flags:
-# Set the environment variable MSC_VER to be one of 5.1, 6.0, 8.0 (for VC++4.0)
-# to get these by default when you make dmake using 'dmake'.
-#
-# Setting MSC_VER to one of the above sets the variable _MSC_VER appropriately
-# and sets the flags appropriately.
-
-CFLAGS    += $-I$(osrdir)
-DB_CFLAGS += $-Ti+
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
-
-S_s = -Dmsmall
-S_m = -Dmmedium
-S_c = -Dmcompact
-S_l = -Dmlarge
diff --git a/dmake/os2/ibm/icc/config.mk b/dmake/os2/ibm/icc/config.mk
deleted file mode 100644
index 2042f5636..000000000
--- a/dmake/os2/ibm/icc/config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Definition of macros for library, and C startup code.
-osedir     = $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-.IMPORT .IGNORE : MSC_VER
-MSC_VER      *= 6.0
-
-CFLAGS       += $-I$(osedir) $-Sp1 $-Q $-Fi-
-
-NDB_CFLAGS   += $-O
-NDB_LDFLAGS  += $-de $-pmtype:vio $-align:16 $-nologo $-m $-stack:32768
-NDB_LDLIBS   +=
diff --git a/dmake/os2/ibm/icc/lib.rsp b/dmake/os2/ibm/icc/lib.rsp
deleted file mode 100644
index 8b1378917..000000000
--- a/dmake/os2/ibm/icc/lib.rsp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dmake/os2/ibm/icc/mk.cmd b/dmake/os2/ibm/icc/mk.cmd
deleted file mode 100755
index 563a88aad..000000000
--- a/dmake/os2/ibm/icc/mk.cmd
+++ /dev/null
@@ -1,96 +0,0 @@
-md objects
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O infer.c
-copy infer.obj objects
-del infer.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O make.c
-copy make.obj objects
-del make.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O stat.c
-copy stat.obj objects
-del stat.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O expand.c
-copy expand.obj objects
-del expand.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O dmstring.c
-copy dmstring.obj objects
-del dmstring.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O hash.c
-copy hash.obj objects
-del hash.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O dag.c
-copy dag.obj objects
-del dag.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O dmake.c
-copy dmake.obj objects
-del dmake.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O path.c
-copy path.obj objects
-del path.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O imacs.c
-copy imacs.obj objects
-del imacs.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O sysintf.c
-copy sysintf.obj objects
-del sysintf.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O parse.c
-copy parse.obj objects
-del parse.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O getinp.c
-copy getinp.obj objects
-del getinp.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O quit.c
-copy quit.obj objects
-del quit.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O state.c
-copy state.obj objects
-del state.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O dmdump.c
-copy dmdump.obj objects
-del dmdump.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O macparse.c
-copy macparse.obj objects
-del macparse.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O rulparse.c
-copy rulparse.obj objects
-del rulparse.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O percent.c
-copy percent.obj objects
-del percent.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O function.c
-copy function.obj objects
-del function.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O os2\ruletab.c
-copy ruletab.obj objects
-del ruletab.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O os2\dchdir.c
-copy dchdir.obj objects
-del dchdir.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O os2\switchar.c
-copy switchar.obj objects
-del switchar.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O os2\dirlib.c
-copy dirlib.obj objects
-del dirlib.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O os2\runargv.c
-copy runargv.obj objects
-del runargv.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O msdos\dirbrk.c
-copy dirbrk.obj objects
-del dirbrk.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O msdos\arlib.c
-copy arlib.obj objects
-del arlib.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O msdos\dstrlwr.c
-copy dstrlwr.obj objects
-del dstrlwr.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O unix\rmprq.c
-copy rmprq.obj objects
-del rmprq.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O unix\dcache.c
-copy dcache.obj objects
-del dcache.obj
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc /Sp1 /Q /Fi- /O os2\ibm\tempnam.c
-copy tempnam.obj objects
-del tempnam.obj
-link386 /de /pmtype:vio /align:16 /nologo /m /stack:32768 @os2\ibm\icc\obj.rsp,dmake.exe,NUL.MAP,,,;
-copy os2\ibm\icc\template.mk startup\config.mk
diff --git a/dmake/os2/ibm/icc/obj.rsp b/dmake/os2/ibm/icc/obj.rsp
deleted file mode 100644
index 594535036..000000000
--- a/dmake/os2/ibm/icc/obj.rsp
+++ /dev/null
@@ -1,31 +0,0 @@
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\dirlib.obj+
-objects\runargv.obj+
-objects\dirbrk.obj+
-objects\arlib.obj+
-objects\dstrlwr.obj+
-objects\rmprq.obj+
-objects\dcache.obj+
-objects\tempnam.obj
diff --git a/dmake/os2/ibm/icc/public.h b/dmake/os2/ibm/icc/public.h
deleted file mode 100644
index 99d57276a..000000000
--- a/dmake/os2/ibm/icc/public.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:45:45 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int _dchdir ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void SetSessionTitle ANSI((char *));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-int If_root_path ANSI((char *));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-void dstrlwr ANSI((char *, char *));
-void Remove_prq ANSI((CELLPTR));
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/os2/ibm/icc/template.mk b/dmake/os2/ibm/icc/template.mk
deleted file mode 100644
index c9c5adbf2..000000000
--- a/dmake/os2/ibm/icc/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= os2
-   OSRELEASE     *:= ibm
-   OSENVIRONMENT *:= icc
diff --git a/dmake/os2/ibm/icc3/config.mk b/dmake/os2/ibm/icc3/config.mk
deleted file mode 100644
index 2042f5636..000000000
--- a/dmake/os2/ibm/icc3/config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Definition of macros for library, and C startup code.
-osedir     = $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-.IMPORT .IGNORE : MSC_VER
-MSC_VER      *= 6.0
-
-CFLAGS       += $-I$(osedir) $-Sp1 $-Q $-Fi-
-
-NDB_CFLAGS   += $-O
-NDB_LDFLAGS  += $-de $-pmtype:vio $-align:16 $-nologo $-m $-stack:32768
-NDB_LDLIBS   +=
diff --git a/dmake/os2/ibm/icc3/lib.rsp b/dmake/os2/ibm/icc3/lib.rsp
deleted file mode 100644
index 8b1378917..000000000
--- a/dmake/os2/ibm/icc3/lib.rsp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dmake/os2/ibm/icc3/mk.cmd b/dmake/os2/ibm/icc3/mk.cmd
deleted file mode 100755
index f45e63e64..000000000
--- a/dmake/os2/ibm/icc3/mk.cmd
+++ /dev/null
@@ -1,192 +0,0 @@
-md objects
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O infer.c
-
-copy infer.obj objects
-
-del infer.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O make.c
-
-copy make.obj objects
-
-del make.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O stat.c
-
-copy stat.obj objects
-
-del stat.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O expand.c
-
-copy expand.obj objects
-
-del expand.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O dmstring.c
-
-copy dmstring.obj objects
-
-del dmstring.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O hash.c
-
-copy hash.obj objects
-
-del hash.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O dag.c
-
-copy dag.obj objects
-
-del dag.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O dmake.c
-
-copy dmake.obj objects
-
-del dmake.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O path.c
-
-copy path.obj objects
-
-del path.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O imacs.c
-
-copy imacs.obj objects
-
-del imacs.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O sysintf.c
-
-copy sysintf.obj objects
-
-del sysintf.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O parse.c
-
-copy parse.obj objects
-
-del parse.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O getinp.c
-
-copy getinp.obj objects
-
-del getinp.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O quit.c
-
-copy quit.obj objects
-
-del quit.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O state.c
-
-copy state.obj objects
-
-del state.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O dmdump.c
-
-copy dmdump.obj objects
-
-del dmdump.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O macparse.c
-
-copy macparse.obj objects
-
-del macparse.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O rulparse.c
-
-copy rulparse.obj objects
-
-del rulparse.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O percent.c
-
-copy percent.obj objects
-
-del percent.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O function.c
-
-copy function.obj objects
-
-del function.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O os2\ruletab.c
-
-copy ruletab.obj objects
-
-del ruletab.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O os2\dchdir.c
-
-copy dchdir.obj objects
-
-del dchdir.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O os2\switchar.c
-
-copy switchar.obj objects
-
-del switchar.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O msdos\dirlib.c
-
-copy dirlib.obj objects
-
-del dirlib.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O msdos\runargv.c
-
-copy runargv.obj objects
-
-del runargv.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O msdos\dirbrk.c
-
-copy dirbrk.obj objects
-
-del dirbrk.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O msdos\arlib.c
-
-copy arlib.obj objects
-
-del arlib.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O msdos\dstrlwr.c
-
-copy dstrlwr.obj objects
-
-del dstrlwr.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O unix\rmprq.c
-
-copy rmprq.obj objects
-
-del rmprq.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O unix\dcache.c
-
-copy dcache.obj objects
-
-del dcache.obj
-
-icc /c /I. /Ios2 /Ios2\ibm /Ios2\ibm\icc3 /Sp1 /Q /Fi- /O tempnam.c
-
-copy tempnam.obj objects
-
-del tempnam.obj
-
-ilink /NOFREE /de /pmtype:vio /align:16 /nologo /m /stack:32768 @os2\ibm\icc3\obj.rsp,,,,,
-
-copy os2\ibm\icc3\template.mk startup\config.mk
-
diff --git a/dmake/os2/ibm/icc3/obj.rsp b/dmake/os2/ibm/icc3/obj.rsp
deleted file mode 100644
index 630957768..000000000
--- a/dmake/os2/ibm/icc3/obj.rsp
+++ /dev/null
@@ -1,30 +0,0 @@
-objects\dmake.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\ruletab.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\runargv.obj+
-objects\dirbrk.obj+
-objects\arlib.obj+
-objects\dstrlwr.obj+
-objects\rmprq.obj+
-objects\tempnam.obj
-
diff --git a/dmake/os2/ibm/icc3/public.h b/dmake/os2/ibm/icc3/public.h
deleted file mode 100644
index 72d7caacd..000000000
--- a/dmake/os2/ibm/icc3/public.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:45:57 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int _dchdir ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void SetSessionTitle ANSI((char *));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-int If_root_path ANSI((char *));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-void dstrlwr ANSI((char *, char *));
-void Remove_prq ANSI((CELLPTR));
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/os2/ibm/icc3/template.mk b/dmake/os2/ibm/icc3/template.mk
deleted file mode 100644
index c9c5adbf2..000000000
--- a/dmake/os2/ibm/icc3/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= os2
-   OSRELEASE     *:= ibm
-   OSENVIRONMENT *:= icc
diff --git a/dmake/os2/ibm/tempnam.c b/dmake/os2/ibm/tempnam.c
deleted file mode 100644
index 55e7d24e3..000000000
--- a/dmake/os2/ibm/tempnam.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:30 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "config.h"
-
-#if defined(max)
-#   undef  max
-#endif
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern int access();
-int d_access();
-
-/* MSC stdio.h defines P_tmpdir, so let's undo it here */
-/* Under DOS leave the default tmpdir pointing here!		*/
-#ifdef P_tmpdir
-#undef P_tmpdir
-#endif
-static char *P_tmpdir = "";
-
-char *
-tempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   static         int count = 0;
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-   char		  buf[30];
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL )
-      tl = strlen(tmpdir);
-   else if( (tmpdir = getenv("TMP")) != NULL )
-      tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+13))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (d_access( strcpy(p, tmpdir), 0) != 0) )
-     if( (dl == 0) || (d_access( strcpy(p, dir), 0) != 0) )
-    if( d_access( strcpy(p, P_tmpdir), 0) != 0 )
-       if( !prefix )
-          prefix = "tp";
-
-   if(prefix)
-   {
-      *(p+strlen(p)+2) = '\0';
-      (void)strncat(p, prefix, 2);
-   }
-
-   sprintf( buf, "%08x", getpid() );
-   buf[6]='\0';
-   (void)strcat(p, buf );
-   sprintf( buf, "%04d", count++ );
-   q=p+strlen(p)-6;
-   *q++ = buf[0]; *q++ = buf[1];
-   *q++ = buf[2]; *q++ = buf[3];
-
-   if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
-
-   return strlwr(p);
-}
-
-
-
-d_access( name, flag )
-char *name;
-int  flag;
-{
-   char *p;
-   int r;
-
-   if( name == NULL || !*name ) return(1);  /* NULL dir means current dir */
-   p = name+strlen(name)-1;
-   if(*p == ':' ) strcat( p++, "\\" );
-   r = access( name, flag );
-   if(*p != '/' && *p != '\\') strcat( p, "\\" );
-
-   return( r );
-}
diff --git a/dmake/os2/ruletab.c b/dmake/os2/ruletab.c
deleted file mode 100644
index 5f9990c15..000000000
--- a/dmake/os2/ruletab.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* RCS  $Id: ruletab.c,v 1.4 2007-10-15 15:45:20 ihi Exp $
---
--- SYNOPSIS
---      Default initial configuration of dmake.
--- 
--- DESCRIPTION
--- 	Define here the initial set of rules that are defined before
---	dmake performs any processing.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* These are control macros for dmake that MUST be defined at some point
- * if they are NOT dmake will not work!  These are default definitions.  They
- * may be overridden inside the .STARTUP makefile, they are here
- * strictly so that dmake can parse the STARTUP makefile */
-/*
- * For OS/2 these are close to the Unix definitions in terms of limits.
- * We dont need the two different cases of Makefile, so only keep the
- * pretty one.
- */
-static char *_rules[] = {
-    "MAXLINELENGTH := 8190",
-    "MAXPROCESSLIMIT := 16",
-#include "dmakeroot.h"
-    ".IMPORT .IGNORE: DMAKEROOT"
-    ".MAKEFILES : makefile.mk Makefile",
-    ".SOURCE    : .NULL",
-#include "startup.h"
-    0 };
-
-char **Rule_tab = _rules; /* for sundry reasons in Get_environment() */
-
diff --git a/dmake/os2/startup.h b/dmake/os2/startup.h
deleted file mode 100644
index 5c3f64132..000000000
--- a/dmake/os2/startup.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* RCS  $Id: startup.h,v 1.1.1.1 2000-09-22 15:33:30 hr Exp $
---
--- SYNOPSIS
---      Definition of MAKESTARTUP
--- 
--- DESCRIPTION
---      Default MAKESTARTUP value defining where dmake locates the
---      startup file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-"MAKESTARTUP := $(DMAKEROOT)\\startup.mk",
diff --git a/dmake/os2/switchar.c b/dmake/os2/switchar.c
deleted file mode 100644
index 1543c54bd..000000000
--- a/dmake/os2/switchar.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* RCS  $Id: switchar.c,v 1.1.1.1 2000-09-22 15:33:30 hr Exp $
---
--- SYNOPSIS
---      switch char query.
---
--- DESCRIPTION
---      Get the current value of the command line switch char.  Only useful
---      in a DOS environment, otherwise we #define it to be '-'.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-#include <stdlib.h>
-#include <stdio.h>
-#include "stdmacs.h"
-
-getswitchar()/*
-===============
-   Try the environment first.  If you don't find SWITCHAR there, then use
-   the DOS call.  The call is undocumented, and doesn't work for DOS versions
-   4.0 and up, so the check of the environment will fix that. */
-{
-   static char *_env_switchar = NIL(char);
-
-   if( _env_switchar != NIL(char) ||
-       (_env_switchar = (char *)getenv("SWITCHAR")) != NIL(char) )
-      return(*_env_switchar);
-
-   return ('/');
-}
diff --git a/dmake/os2/sysintf.h b/dmake/os2/sysintf.h
deleted file mode 100644
index 7992bf910..000000000
--- a/dmake/os2/sysintf.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* RCS  $Id: sysintf.h,v 1.4 2007-10-15 15:45:33 ihi Exp $
---
--- SYNOPSIS
---      Interfaces for sysintf.c
---
--- DESCRIPTION
---      Abstractions of functions in sysintf.c
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#define DMSTAT stat
-#define VOID_LCACHE(l,m)
-#define Hook_std_writes(A)
-#define GETPID getpid()
-/* Disabled for CWS os2port01
- *#define S_IFMT (S_IFDIR|S_IFCHR|S_IFREG)
- */
-extern char * tempnam();
-extern char * getcwd();
-
-/* for directory cache */
-/* #define CacheStat(A,B)	really_dostat(A,&buf)*/
-
-/*
-** standard C items
-*/
-
-/*
-** DOS interface standard items
-*/
-/* Disabled for CWS os2port01
- *#define	chdir(p) _dchdir(p)
- */
-#define CacheStat(A,B) really_dostat(A,&buf)
-
-/*
-** make parameters
-*/
-#ifdef _POSIX_NAME_MAX
-#undef  _POSIX_NAME_MAX
-#endif
-#define _POSIX_NAME_MAX 12
-
-#ifdef _POSIX_PATH_MAX
-#undef _POSIX_PATH_MAX
-#endif
-#define _POSIX_PATH_MAX 255
diff --git a/dmake/parse.c b/dmake/parse.c
deleted file mode 100644
index f4a2377e4..000000000
--- a/dmake/parse.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* $RCSfile: parse.c,v $
--- $Revision: 1.8 $
--- last change: $Author: ihi $ $Date: 2007-10-15 15:40:45 $
---
--- SYNOPSIS
---      Parse the input, and perform semantic analysis
--- 
--- DESCRIPTION
--- 	This file contains the routines that parse the input makefile and
---	call the appropriate routines to perform the semantic analysis and
---	build the internal dag.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-
-PUBLIC void
-Parse( fil )/*
-==============  Parse the makefile input */
-FILE *fil;
-{
-  int  rule  = FALSE;                 /* have seen a recipe line        */
-  char *p;			       /* termporary pointer into Buffer */
-  char *pTmpBuf;
-
-  DB_ENTER( "Parse" );
-
-  State = NORMAL_SCAN;
-  Group = FALSE;                 /* true if scanning a group rcpe  */
-  while( TRUE ) {
-    if( Get_line( Buffer, fil ) ) {
-      if( Group )  Fatal( "Incomplete rule recipe group detected" );
-
-      /* If we are still in RULE_SCAN mode there might be unbound recipes.  */
-      if( State == RULE_SCAN )
-        Bind_rules_to_targets( F_DEFAULT );
-
-      if( fil != NIL( FILE ) )               /* end of parsable input */
-        Closefile();
-
-      DB_VOID_RETURN;
-    }
-    else {
-
-#ifdef _MPW
-      if ( Buffer[0] == 10 )
-        pTmpBuf = Buffer+1;
-      else
-#endif
-        pTmpBuf = Buffer;
-
-#ifdef _MPW
-      p = pTmpBuf;
-      while ( *p )
-        {
-          if ( *p == 10 )
-            *p = '\t';
-          p++;
-        }
-#endif
-
-      switch( State ) {
-      case RULE_SCAN:
-
-        /* Check for the `[' that starts off a group recipe definition.
-         * It must appear as the first non-white space
-         * character in the line. */
-
-        p = DmStrSpn( Buffer, " \t\r\n" );
-        if( Set_group_attributes( p ) ) {
-          if( Group )
-            Fatal( "New group recipe begin found within group recipe." );
-          else if( rule )
-            Fatal( "Cannot mix single and group recipe lines." );
-          else
-            Group = TRUE;
-
-          rule = TRUE;
-
-          break;                     /* ignore the group start  */
-        }
-
-        if( Group ) {
-          if( *p != ']' ) {
-            Add_recipe_to_list( pTmpBuf, TRUE, TRUE );
-            rule = TRUE;
-          }
-          else
-            State = NORMAL_SCAN;
-        }
-        else {
-          if(    *pTmpBuf == '\t'
-                 || (Notabs && *pTmpBuf == ' ') ) {
-            Add_recipe_to_list( pTmpBuf, FALSE, FALSE );
-            rule = TRUE;
-          }
-          else if( *p == ']' )
-            Fatal( "Found unmatched ']'" );
-          else if( *pTmpBuf ) /* Something that was no recipe. */
-            State = NORMAL_SCAN;
-          /* The only thing that was not handled was an empty line. */
-        }
- 
-        if( State == RULE_SCAN ) break;     /* ie. keep going    */
-               
-        Bind_rules_to_targets( (Group) ? F_GROUP: F_DEFAULT );
-
-        rule = FALSE;
-        if( Group ) {
-          Group = FALSE;
-          break;
-        }
-        /*FALLTRHOUGH*/
-
-        /* In this case we broke out of the rule scan because we do not
-         * have a recipe line that begins with a <TAB>, so lets
-         * try to scan the thing as a macro or rule definition. */
-               
-
-      case NORMAL_SCAN:
-        if( !*pTmpBuf ) continue;         /* we have null input line */
-
-        /* STUPID AUGMAKE uses "include" at the start of a line as
-         * a signal to include a new file, so let's look for it.
-         * if we see it replace it by .INCLUDE: and stick this back
-         * into the buffer. */
-        if( !strncmp( "include", pTmpBuf, 7 ) &&
-            (pTmpBuf[7] == ' ' || pTmpBuf[7] == '\t') )
-          {
-            char *tmp;
-
-            tmp = DmStrJoin( ".INCLUDE:", pTmpBuf+7, -1, FALSE );
-            strcpy( pTmpBuf, tmp );
-            FREE( tmp );
-          }
-
-        /* look for a macro definition, they all contain an = sign
-         * if we fail to recognize it as a legal macro op then try to
-         * parse the same line as a rule definition, it's one or the
-         * other */
-        
-        if( Parse_macro(pTmpBuf, M_DEFAULT) ) break;/* it's a macro def*/
-        if( Parse_rule_def( &State ) ) 	    break;/* it's a rule def */
-
-        /* if it is an empty or blank line then ignore it */
-        if( !*Buffer || *DmStrSpn( Buffer, " \t\r\n" ) == '\0' ) break;
-           
-        /* otherwise assume it was a line of unrecognized input, or a
-         * recipe line out of place so print a message */
-        
-        Fatal( "Expecting macro or rule defn, found neither" );
-        break;
-
-      default:
-        Fatal( "Internal -- UNKNOWN Parser state %d", State );
-      }
-    }
-  }
-}
-
diff --git a/dmake/path.c b/dmake/path.c
deleted file mode 100644
index 39c66e33d..000000000
--- a/dmake/path.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/* RCS  $Id: path.c,v 1.6 2008-03-05 18:29:34 kz Exp $
---
--- SYNOPSIS
---      Pathname manipulation code
--- 
--- DESCRIPTION
---	Pathname routines to handle building and pulling appart
---	pathnames.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-#if __CYGWIN__
-#include <sys/cygwin.h>
-#include <errno.h>
-#endif
-
-
-/*
-** Return the suffix portion of a filename, assumed to begin with a `.'.
-*/
-PUBLIC char *
-Get_suffix(name)
-char *name;
-{
-   char *suff;
-
-   if(name == NIL(char)  || (suff = strrchr(name, '.')) == NIL(char))
-      suff = ".NULL";
-
-   return (suff);
-}
-
-
-PUBLIC char *
-Basename(path)/*
-================
-   Return pointer to the basename part of path. path itself remains
-   unchanged. */
-char *path;
-{
-   char *p;
-   char *q;
-
-   if( path && *(q = path) ) {
-      for(; *(p=DmStrPbrk(q, DirBrkStr)) != '\0'; q = p+1 );
-      if( !*q ) {
-     for( p=q-1; p != path; --p )
-        if( strchr( DirBrkStr, *p ) == NIL(char) ) return( p+1 );
-     return( strchr(DirBrkStr, *p)?path:(p+1) );
-      }
-      path = q;
-   }
-   return( path );
-}
-
-
-PUBLIC char *
-Filedir(path)
-char *path;
-{
-   char *p;
-   char *q;
-
-   if( path && *(q = path) ) {
-      for(; *(p=DmStrPbrk(q,DirBrkStr)) != '\0'; q=p+1 );
-
-      if (q == path) return("");
-
-      for(p=q-1; p!=path; --p)
-     if( strchr(DirBrkStr,*p) == NIL(char) )
-        break;
-
-      p[1] = '\0';
-   }
-
-   return(path);
-}
-
-
-
-PUBLIC char *
-Build_path(dir, name)/*
-=======================
-   Return a path that is created by concatenating dir and name. A directory
-   separater is added between them if needed. If dir is empty name is stripped
-   of leading slashes (if there) and returned.
-
-   The returned path is also cleaned from unneeded './' and 'foo/../'
-   elements and also multiple consequtive '/' are removed.
-
-   Note, the returned path is built in a static buffer, if it is to be used
-   later strdup should be used on the result returned by Build_path to create
-   a copy. */
-
-char *dir;
-char *name;
-{
-   static char     *path  = NIL(char);
-   static unsigned buflen = 0;
-   int  plen = 0;
-   int  dlen = 0;
-   int  len;
-
-   DB_ENTER( "Build_path" );
-
-   if( dir  != NIL(char) ) dlen = strlen( dir  );
-   if( name != NIL(char) ) plen = strlen( name );
-   len = plen+dlen+1+1; /* Reserve space for extra path separator. */
-
-   if( len > buflen ) {
-      buflen = (len+16) & ~0xf;		/* buf is always multiple of 16 */
-
-      if( path == NIL(char) )
-         path = MALLOC( buflen, char );
-      else
-         path = realloc( path, (unsigned) (buflen*sizeof(char)) );
-   }
-   
-   *path = '\0';
-
-   if( dlen ) {
-      strcpy( path, dir );
-      if( *path && strchr(DirBrkStr, dir[dlen-1]) == NIL(char) )
-     strcat( path, DirSepStr );
-   }
-
-   if ( plen ) {
-      while ( *name && strchr(DirBrkStr,*name) != 0 ) name++;
-      strcat( path, name );
-   }
-
-   DB_PRINT( "path", ("dir: %s  name: %s", dir, name ));
-   DB_PRINT( "path", ("joined to: %s", path ));
-
-   Clean_path( path );
-   DB_PRINT( "path", ("cleaned to: %s", path ));
-
-   DB_RETURN( path );
-}
-
-
-void
-Clean_path(path)/*
-==================
-   Clean the path from irregular directory separators (if more than one are
-   allowed), remove unneeded './' and 'foo/../' elements and also multiple
-   consequtive '/'.
-
-   The resulting string is shorter than the original, therefore this function
-   works on the original string. */
-
-char *path;
-{
-   register char *p;
-   register char *q;
-   char *tpath;
-   int hasdriveletter = 0;
-   int delentry;
-   size_t len;
-
-   DB_ENTER( "Clean_path" );
-
-   /* Skip the root part. */
-   tpath=path;
-
-#ifdef HAVE_DRIVE_LETTERS
-
-   /* Change all occurrences from DirBrkStr to *DirSepStr. This assumes
-    * that when HAVE_DRIVE_LETTERS is set the directory separator is
-    * either '\' or '/'. */
-   if (*DirSepStr == '/')
-      for( q = tpath; (q = strchr(q, '\\')) != NIL(char); )
-         *q = *DirSepStr;
-   else
-      for( q = tpath; (q = strchr(q, '/')) != NIL(char); )
-         *q = *DirSepStr;
-
-   /* The following dosn't trigger often because normalize_path() uses
-    * a cygwin function and bypasses Clean_path() if it encounters a path
-    * with a drive letter. */
-   if( *tpath && tpath[1] == ':' && isalpha(*tpath) ) {
-      hasdriveletter = 1;
-      tpath+=2;
-      if( *tpath != *DirSepStr )
-     Warning("Malformed DOS path %s", path);
-   }
-
-#endif
-
-   /* Collapse > 2 ( > 1 if its an absolute DOS path ) into one slash.
-    * Keep // as it is reserved in posix. */
-   q = tpath;
-   for( ; *q == *DirSepStr ; ++q )
-      ;
-   if( q - tpath > 2 - hasdriveletter ) {
-      strcpy(tpath+1, q);
-   }
-
-   /* Set tpath after leading slash / drive letter. */
-   for( ; *tpath == *DirSepStr ; ++tpath )
-      ;
-   q = tpath;
-
-   while( *q ) {
-      char *t;
-
-      /* p is NULL or greater than q. */
-      p=strchr(q, *DirSepStr);
-      if( !p ) break;
-
-      /* Remove multiple consequtive DirSepStr. */
-      if( p[1] == *DirSepStr ) {
-     t = p++; /* t points to first, p to second DirStrSep. */
-     /* Move p after the second (or possible more) DirSepStr. */
-     do {
-        p++;
-     }
-     while( *p == *DirSepStr);
-     len = strlen(p)+1;
-     memmove(t+1,p,len);
-     continue;
-      }
-
-      /* Remove './'. If OOODMAKEMODE is set do this only if it is not at
-       * the start of the path. */
-      if ( p-q == 1 && *q == '.' && (q != path || !STOBOOL(OOoDmMode)) ) {
-     len = strlen(p+1)+1;
-     memmove(q,p+1,len);
-     q = tpath;
-     continue;
-      }
-
-      /* If two '/' are in path check/remove 'foo/../' elements. */
-      t=strchr(p+1, *DirSepStr);
-      if( !t ) break;
-
-      /* Collaps this only if foo is neither '.' nor '..'. */
-      switch( p-q ) {
-     case 2:
-        delentry = !((q[0] == '.') && (q[1] == '.'));
-        break;
-     case 1:
-        delentry = !(q[0] == '.');
-        break;
-     default:
-        delentry = TRUE;
-        break;
-      }
-
-      if ( delentry
-       && (t-p-1 == 2 && strncmp(p+1,"..",2) == 0) ) {
-     /* Skip one (or possible more) DirSepStr. */
-     do {
-        t++;
-     }
-     while( *t == *DirSepStr);
-     /* q points to first letter of the current directory/file. */
-     len = strlen(t)+1;
-     memmove(q,t,len);
-     q = tpath;
-      }
-      else
-     q = p+1;
-   }
-
-   DB_PRINT( "path", ("Cleaned path: %s", path ));
-
-   DB_VOID_RETURN;
-}
-
-
-char *
-normalize_path(path)/*
-=======================
-   Normalize the given path unless it contains a $ indicating a dynamic
-   prerequisite.
-   Special case: For absolute DOSish paths under cygwin a cygwin API
-   function is used to normalize the path optherwise Clean_path() is used.
-
-   Note, the returned path is built in a static buffer, if it is to be used
-   later a copy should be created. */
-
-char *path;
-{
-   static char *cpath = NIL(char);
-
-   DB_ENTER( "normalize_path" );
-
-   if ( !cpath && ( (cpath = MALLOC( PATH_MAX, char)) == NIL(char) ) )
-      No_ram();
-
-   /* If there is a $ in the path this can either mean a '$' character in
-    * a target definition or a dynamic macro expression in a prerequisite
-    * list. As dynamic macro expression must not be normalized and is
-    * indistinguishable from a literal $ characters at this point we skip
-    * the normalization if a $ is found.  */
-   if( strchr(path, '$') ) {
-      DB_RETURN( path );
-   }
-
-#if __CYGWIN__
-   /* Use cygwin function to convert a DOS path to a POSIX path. */
-   if( *path && path[1] == ':' && isalpha(*path) ) {
-      int err = cygwin_conv_to_posix_path(path, cpath);
-      if (err)
-     Fatal( "error converting \"%s\" - %s\n",
-        path, strerror (errno));
-      if( path[2] != '/' && path[2] != '\\' )
-     Warning("Malformed DOS path %s converted to %s", path, cpath);
-   }
-   else
-#endif
-   {
-      strcpy( cpath, path );
-      Clean_path( cpath );
-   }
-
-   DB_PRINT( "path", ("normalized: %s", cpath ));
-
-   DB_RETURN( cpath );
-}
diff --git a/dmake/percent.c b/dmake/percent.c
deleted file mode 100644
index 732473ce3..000000000
--- a/dmake/percent.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* RCS  $Id: percent.c,v 1.1.1.1 2000-09-22 15:33:25 hr Exp $
---
--- SYNOPSIS
---      Handle building or %-rule meta-target nfa.
--- 
--- DESCRIPTION
---	Builds the NFA used by dmake to match targets against %-meta
---	rule constructs.  The NFA is built as a set of DFA's.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-static DFAPTR _build_dfa ANSI((char *));
-static char   _shift_dfa ANSI((DFAPTR, char *));
-
-
-#define NO_ACTION	0
-#define START_PERCENT	1
-#define END_PERCENT	2
-#define ACCEPT		4
-#define FAIL           -1
-
-static  NFAPTR _nfa = NIL( NFA );
-
-
-PUBLIC DFALINKPTR
-Match_dfa( buf )/*
-==================
-   This routines runs all DFA's in parrallel and selects the one that best
-   matches the string.  If no match then it returns NIL( DFA ) */
-char *buf;
-{
-   register NFAPTR nfa;
-   int  	   adv;
-   DFALINKPTR	   dfa_list = NIL(DFALINK);
-
-   DB_ENTER( "Match_dfa" );
-   DB_PRINT( "dfa", ("Matching %s", buf) );
-
-   /* Run each of the DFA's on the input string in parallel, we terminate
-    * when all DFA's have either failed or ACCEPTED, if more than one DFA
-    * accepts we build a list of all accepting DFA's sorted on states with
-    * those matching in a higher numbered state heading the list. */
-
-   do {
-      adv = FALSE;
-
-      for( nfa = _nfa; nfa != NIL( NFA ); nfa = nfa->next )
-     if( nfa->status != (char) FAIL && nfa->status != (char) ACCEPT ) {
-        adv++;
-        nfa->status = _shift_dfa( nfa->dfa, buf );
-
-        /* Construct the list of matching DFA's */
-        if( nfa->status == (char) ACCEPT ) {
-           DFALINKPTR dl;
-
-           TALLOC( dl, 1, DFALINK );
-           dl->dl_meta  = nfa->dfa->node;
-           dl->dl_per   = DmSubStr( nfa->dfa->pstart, nfa->dfa->pend );
-           dl->dl_state = nfa->dfa->states - nfa->dfa->c_state;
-
-           if( dfa_list == NIL(DFALINK) )
-              dfa_list = dl;
-           else {
-          DFALINKPTR tdli = dfa_list;
-          DFALINKPTR tdlp = NIL(DFALINK);
-
-          for( ; tdli != NIL(DFALINK); tdli = tdli->dl_next ) {
-             if( dl->dl_state >= tdli->dl_state )
-            break;
-             tdlp = tdli;
-          }
-
-          if( tdli != NIL(DFALINK) ) {
-             tdli->dl_prev = dl;
-             dl->dl_next   = tdli;
-          }
-
-          if( tdlp != NIL(DFALINK) ) {
-             tdlp->dl_next = dl;
-             dl->dl_prev   = tdlp;
-          }
-          else
-             dfa_list = dl;
-           }
-
-           DB_PRINT( "dfa", ("Matched [%s]", dl->dl_meta->CE_NAME) );
-        }
-     }
-
-      buf++;
-   }
-   while ( adv );
-
-   for( nfa = _nfa; nfa != NIL( NFA ); nfa = nfa->next ) {
-      nfa->status = 0;
-      nfa->dfa->c_state = nfa->dfa->states;
-   }
-
-   DB_RETURN( dfa_list );
-}
-
-
-PUBLIC void
-Check_circle_dfa()/*
-====================
-   This function is called to test for circularities in the DFA lists
-   constructed from %-meta targets. */
-{
-   register NFAPTR nfa;
-
-   for( nfa = _nfa; nfa != NIL(NFA); nfa = nfa->next )
-      if( Test_circle( nfa->dfa->node, FALSE ) )
-     Fatal( "Detected circular dependency in inference graph at [%s]",
-        nfa->dfa->node->CE_NAME );
-}
-
-
-PUBLIC void
-Add_nfa( name )/*
-=================
-   Given name, build a DFA and add it to the NFA.  The NFA is maintained as
-   a singly linked list of DFA's. */
-char *name;
-{
-   NFAPTR nfa;
-
-   TALLOC(nfa, 1, NFA);
-   nfa->dfa = _build_dfa(name);
-
-   if( _nfa != NIL(NFA) ) nfa->next = _nfa;
-
-   _nfa = nfa;
-}
-
-
-static DFAPTR
-_build_dfa( name )/*
-====================
-   Construct a dfa for the passed in cell name.  The routine returns a struct
-   that represents a finite state machine that can recognize a regular
-   expression with exactly one '%' sign in it.  The '%' symbol is used as a
-   wildcard character that will match anything except the character that
-   immediately follows it or NUL.
-
-   The Construction of DFA's is well known and can be found in Hopcroft and
-   Ullman or any other book discussing formal language theory.
-   A more practical treatise can be found in Compilers, Aho, Sethi and Ullman.
-*/
-char *name;
-{
-   DFAPTR   dfa;
-   int      nstates;
-   register STATEPTR sp;
-   STATEPTR per_state = NIL(STATE);
-   int      pcount=0;
-   int      end_percent=FALSE;
-
-   nstates = strlen(name)+2;
-
-   /* Allocate a DFA node and the right number of states. */
-   TALLOC(dfa, 1, DFA);
-   TALLOC(sp=dfa->c_state=dfa->states, nstates, STATE);
-   dfa->node = Def_cell( name );
-
-   /* Now construct the state table for the DFA */
-   do {
-      if( *name == '%' ) {
-     if( pcount++ > 0 )
-        Error( "Only one %% allowed within a %%-meta target" );
-
-     sp->symbol   = 0;
-     sp->action   = START_PERCENT;
-     sp->no_match = sp->match = per_state = sp+1;
-     end_percent  = TRUE;
-      }
-      else {
-     sp->symbol   = *name;
-     sp->no_match = per_state;
-
-     if( *name == '\0' ) {
-        sp->action = ACCEPT;
-        sp->match  = dfa->states;
-     }
-     else {
-        sp->action = NO_ACTION;
-        sp->match  = sp+1;
-     }
-
-     if( end_percent ) {
-        sp->action |= END_PERCENT;
-        end_percent = FALSE;
-     }
-      }
-      
-      sp++; 
-   }
-   while( *name++ );
-
-   return(dfa);
-}
-
-
-static char
-_shift_dfa( dfa, data )/*
-=========================
-   Take a given dfa and advance it based on the current state, the shift
-   action in that state, and the current data value. */
-DFAPTR dfa;
-char   *data;
-{
-   register STATEPTR sp = dfa->c_state;
-   char c = *data;
-
-   /* Check if it is a START_PERCENT action if so then we need to save
-    * a pointer to the start of the string and advance to the next state. */
-   if( sp->action & START_PERCENT ) {
-      dfa->pstart = data;
-      sp++;
-   }
-
-   /* Now check if the current char matches the character expected in the
-    * current state.  If it does then perform the specified action, otherwise
-    * either shift it or fail.  We fail if the next state on no-match is
-    * NIL. */
-   if( sp->symbol == c ) {
-      if( sp->action & END_PERCENT ) dfa->pend = data;
-      if( sp->action & ACCEPT ) return(ACCEPT);
-      dfa->c_state = sp->match;
-   }
-   else if( (dfa->c_state = sp->no_match) == NIL(STATE) || !c )
-      return((unsigned char) FAIL);
-
-   return(NO_ACTION);
-}
diff --git a/dmake/posix.h b/dmake/posix.h
deleted file mode 100644
index d1c4f3e74..000000000
--- a/dmake/posix.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* RCS  $Id: posix.h,v 1.3 2006-04-20 12:01:40 hr Exp $
---
--- SYNOPSIS
---      Definition for POSIX conforming defines in dmake.
--- 
--- DESCRIPTION
---	This file is intended to make certain that defines used within dmake
---	for file name lengths, and number of children processes are defined.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* Define the minimum values that each system requires, and do so only if
- * we have not defined these includes elsewhere.  These should already be
- * defined in <limits.h> if you have a C compiler that is POSIX compliant.
- */
-#ifndef _POSIX_NAME_MAX
-#define _POSIX_NAME_MAX 14
-#endif
-
-#ifndef _POSIX_PATH_MAX
-#define _POSIX_PATH_MAX 64
-#endif
-
-#ifndef _POSIX_CHILD_MAX
-#define _POSIX_CHILD_MAX 1
-#endif
-
-/* Now define the actual manifests used in the code. */
-#ifndef NAME_MAX
-#define NAME_MAX _POSIX_NAME_MAX
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX _POSIX_PATH_MAX
-#endif
-
-#ifndef CHILD_MAX
-#define CHILD_MAX _POSIX_CHILD_MAX
-#endif
-
-/* FIXME! This is a very big hammer, these values should be set to
- * sensible values in the architecture dependent sysintf.h files. */
-#if NAME_MAX < 255
-#undef NAME_MAX
-#define NAME_MAX 255
-#endif
-
-#if PATH_MAX < 1024
-#undef PATH_MAX
-#define PATH_MAX 1024
-#endif
diff --git a/dmake/qssl/config.mk b/dmake/qssl/config.mk
deleted file mode 100644
index d5d153499..000000000
--- a/dmake/qssl/config.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# This is an OS specific configuration file
-#	It assumes that OBJDIR, TARGET and DEBUG are previously defined.
-#	It defines	CFLAGS, LDARGS, CPPFLAGS, STARTUPFILE, LDOBJS
-#			PRINTER, PRINTFLAGS
-#	It augments	SRC, OBJDIR, TARGET, CFLAGS, LDLIBS
-#
-PRINTER		= hw
-PRINTFLAGS	= -P$(PRINTER)
-STARTUPFILE	= $(OS)/startup.mk
-CPPFLAGS 	= $(CFLAGS)
-LDOBJS		= $(CSTARTUP) $(OBJDIR)/{$(<:f)}
-LDARGS		= $(LDFLAGS) -o $@ $(LDOBJS) $(LDLIBS)
-
-# Debug flags
-DB_CFLAGS	= -g -DDBUG
-DB_LDFLAGS	= -g
-DB_LDLIBS	=
-
-# NO Debug flags
-NDB_CFLAGS	= -O
-NDB_LDFLAGS	= -N 8192
-NDB_LDLIBS	=
-
-# Local configuration modifications for CFLAGS.
-CFLAGS         += -I$(OS) -3
-
-# Sources that must be defined for each different version
-OSSRC := ruletab.c runargv.c tempnam.c
-UNIXSRC := dcache.c rmprq.c dirbrk.c
-DOSSRC := arlib.c
-SRC  += $(OSSRC) $(UNIXSRC) $(DOSSRC)
-.SETDIR=$(OS) : $(OSSRC)
-.SETDIR=unix : $(UNIXSRC)
-.SETDIR=msdos : $(DOSSRC)
-
-# Set source dirs so that we can find files named in this
-# config file.
-.SOURCE.h : $(OS)
-
-# See if we modify anything in the lower levels.
-.IF $(OSRELEASE) != $(NULL)
-   .INCLUDE .IGNORE : $(OS)$(DIRSEPSTR)$(OSRELEASE)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/qssl/make.sh b/dmake/qssl/make.sh
deleted file mode 100644
index aa9a34a9b..000000000
--- a/dmake/qssl/make.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-mkdir objects
-cc -c -I. -Iqssl -3 -O infer.c
-mv infer.o objects
-cc -c -I. -Iqssl -3 -O make.c
-mv make.o objects
-cc -c -I. -Iqssl -3 -O stat.c
-mv stat.o objects
-cc -c -I. -Iqssl -3 -O expand.c
-mv expand.o objects
-cc -c -I. -Iqssl -3 -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iqssl -3 -O hash.c
-mv hash.o objects
-cc -c -I. -Iqssl -3 -O dag.c
-mv dag.o objects
-cc -c -I. -Iqssl -3 -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iqssl -3 -O path.c
-mv path.o objects
-cc -c -I. -Iqssl -3 -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iqssl -3 -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iqssl -3 -O parse.c
-mv parse.o objects
-cc -c -I. -Iqssl -3 -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iqssl -3 -O quit.c
-mv quit.o objects
-cc -c -I. -Iqssl -3 -O state.c
-mv state.o objects
-cc -c -I. -Iqssl -3 -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iqssl -3 -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iqssl -3 -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iqssl -3 -O percent.c
-mv percent.o objects
-cc -c -I. -Iqssl -3 -O function.c
-mv function.o objects
-cc -c -I. -Iqssl -3 -O qssl/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iqssl -3 -O qssl/runargv.c
-mv runargv.o objects
-cc -c -I. -Iqssl -3 -O qssl/tempnam.c
-mv tempnam.o objects
-cc -c -I. -Iqssl -3 -O unix/dcache.c
-mv dcache.o objects
-cc -c -I. -Iqssl -3 -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iqssl -3 -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iqssl -3 -O msdos/arlib.c
-mv arlib.o objects
-cc -N 8192 -o dmake  objects/infer.o objects/make.o objects/stat.o \
-objects/expand.o objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o \
-objects/path.o objects/imacs.o objects/sysintf.o objects/parse.o \
-objects/getinp.o objects/quit.o objects/state.o objects/dmdump.o \
-objects/macparse.o objects/rulparse.o objects/percent.o objects/function.o \
-objects/ruletab.o objects/runargv.o objects/tempnam.o objects/dcache.o objects/rmprq.o objects/dirbrk.o objects/arlib.o 
-cp qssl/template.mk startup/config.mk
diff --git a/dmake/qssl/public.h b/dmake/qssl/public.h
deleted file mode 100644
index 04560c9ae..000000000
--- a/dmake/qssl/public.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:46:09 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-void Remove_prq ANSI((CELLPTR));
-int If_root_path ANSI((char *));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-
-#endif
diff --git a/dmake/qssl/ruletab.c b/dmake/qssl/ruletab.c
deleted file mode 100644
index 19ead6ef2..000000000
--- a/dmake/qssl/ruletab.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* RCS  $Id: ruletab.c,v 1.2 2006-04-20 12:09:28 hr Exp $
---
--- SYNOPSIS
---      Default initial configuration of dmake.
--- 
--- DESCRIPTION
--- 	Define here the initial set of rules that are defined before
---	dmake performs any processing.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* These are control macros for dmake that MUST be defined at some point
- * if they are NOT dmake will not work!  These are default definitions.  They
- * may be overridden inside the .STARTUP makefile, they are here
- * strictly so that dmake can parse the STARTUP makefile */
-
-static char *_rules[] = {
-    "MAXPROCESSLIMIT := 10",
-    "MAXLINELENGTH := 8190",
-    ".IMPORT .IGNORE: ROOTDIR DMAKEROOT",
-    ".MAKEFILES : makefile.mk Makefile makefile",
-    ".SOURCE    : .NULL",
-#include "startup.h"
-    0 };
-
-char **Rule_tab = _rules; /* for sundry reasons in Get_environment() */
diff --git a/dmake/qssl/runargv.c b/dmake/qssl/runargv.c
deleted file mode 100644
index 1b30907a6..000000000
--- a/dmake/qssl/runargv.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/* RCS  $Id: runargv.c,v 1.3 2007-10-15 15:46:20 ihi Exp $
---
--- SYNOPSIS
---      Invoke a sub process.
--- 
--- DESCRIPTION
--- 	Use the standard methods of executing a sub process.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <signal.h>
-#include "extern.h"
-#include "sysintf.h"
-
-typedef struct prp {
-   char *prp_cmd;
-   int   prp_group;
-   int   prp_ignore;
-   int   prp_last;
-   int	 prp_shell;
-   struct prp *prp_next;
-} RCP, *RCPPTR;
-
-typedef struct pr {
-   int		pr_valid;
-   int		pr_pid;
-   CELLPTR	pr_target;
-   int		pr_ignore;
-   int		pr_last;
-   RCPPTR  	pr_recipe;
-   RCPPTR  	pr_recipe_end;
-   char        *pr_dir;
-} PR;
-
-static PR  *_procs    = NIL(PR);
-static int  _proc_cnt = 0;
-static int  _abort_flg= FALSE;
-static int  _use_i    = -1;
-static int  _do_upd   = 0;
-
-static  void	_add_child ANSI((int, CELLPTR, int, int));
-static  void	_attach_cmd ANSI((char *, int, int, CELLPTR, int, int));
-static  void    _finished_child ANSI((int, int));
-static  int     _running ANSI((CELLPTR));
-
-/* iz71422 changed the parameters for runargv but it (and the rest of
- * qssl) got *NOT* fixed. */
-iz81252 changed the parameters for Pack_argv() and runargv()  but this file
-did not get fixed!
-PUBLIC int
-runargv(target, ignore, group, last, shell, cmd)
-CELLPTR target;
-int     ignore;
-int	group;
-int	last;
-int     shell;
-char	*cmd;
-{
-   extern  int  errno;
-   int          pid;
-   char         **argv;
-
-   if( _running(target) /*&& Max_proc != 1*/ ) {
-      /* The command will be executed when the previous recipe
-       * line completes. */
-      _attach_cmd( cmd, group, ignore, target, last, shell );
-      return(1);
-   }
-
-   while( _proc_cnt == Max_proc )
-      if( Wait_for_child(FALSE, -1) == -1 )  Fatal( "Lost a child %d", errno );
-
-   argv = Pack_argv( group, shell, cmd );
-
-   switch( pid=fork() ){
-      int   wid;
-      int   status;
-
-   case -1: /* fork failed */
-      Error("%s: %s", argv[0], strerror(errno));
-      Handle_result(-1, ignore, _abort_flg, target);
-      return(-1);
-
-   case 0:  /* child */
-      execvp(argv[0], argv);
-      Continue = TRUE;   /* survive error message */
-      Error("%s: %s", argv[0], strerror(errno));
-      kill(getpid(), SIGTERM);
-      /*NOTREACHED*/
-
-   default: /* parent */
-      _add_child(pid, target, ignore, last);
-   }
-
-   return(1);
-}
-
-
-PUBLIC int
-Wait_for_child( abort_flg, pid )
-int abort_flg;
-int pid;
-{
-   int wid;
-   int status;
-   int waitchild;
-
-   waitchild = (pid == -1)? FALSE : Wait_for_completion;
-
-   do {
-      if( (wid = wait(&status)) == -1 ) return(-1);
-
-      _abort_flg = abort_flg;
-      _finished_child(wid, status);
-      _abort_flg = FALSE;
-   }
-   while( waitchild && pid != wid );
-
-   return(0);
-}
-
-
-PUBLIC void
-Clean_up_processes()
-{
-   register int i;
-
-   if( _procs != NIL(PR) ) {
-      for( i=0; i<Max_proc; i++ )
-     if( _procs[i].pr_valid )
-        kill(_procs[i].pr_pid, SIGTERM);
-
-      while( Wait_for_child(TRUE, -1) != -1 );
-   }
-}
-
-
-static void
-_add_child( pid, target, ignore, last )
-int	pid;
-CELLPTR target;
-int	ignore;
-int     last;
-{
-   register int i;
-   register PR *pp;
-
-   if( _procs == NIL(PR) ) {
-      TALLOC( _procs, Max_proc, PR );
-   }
-
-   if( (i = _use_i) == -1 )
-      for( i=0; i<Max_proc; i++ )
-     if( !_procs[i].pr_valid )
-        break;
-
-   pp = _procs+i;
-
-   pp->pr_valid  = 1;
-   pp->pr_pid    = pid;
-   pp->pr_target = target;
-   pp->pr_ignore = ignore;
-   pp->pr_last   = last;
-   pp->pr_dir    = DmStrDup(Get_current_dir());
-
-   Current_target = NIL(CELL);
-
-   _proc_cnt++;
-
-   if( Wait_for_completion ) Wait_for_child( FALSE, pid );
-}
-
-
-static void
-_finished_child(pid, status)
-int	pid;
-int	status;
-{
-   register int i;
-   register PR *pp;
-   char     *dir;
-
-   for( i=0; i<Max_proc; i++ )
-      if( _procs[i].pr_valid && _procs[i].pr_pid == pid )
-     break;
-
-   /* Some children we didn't make esp true if using /bin/sh to execute a
-    * a pipe and feed the output as a makefile into dmake. */
-   if( i == Max_proc ) return;
-   _procs[i].pr_valid = 0;
-   _proc_cnt--;
-   dir = DmStrDup(Get_current_dir());
-   Set_dir( _procs[i].pr_dir );
-
-   if( _procs[i].pr_recipe != NIL(RCP) && !_abort_flg ) {
-      RCPPTR rp = _procs[i].pr_recipe;
-
-
-      Current_target = _procs[i].pr_target;
-      Handle_result( status, _procs[i].pr_ignore, FALSE, _procs[i].pr_target );
-      Current_target = NIL(CELL);
-
-      if ( _procs[i].pr_target->ce_attr & A_ERROR ) {
-     _procs[i].pr_last = TRUE;
-     goto ABORT_REMAINDER_OF_RECIPE;
-      }
-
-      _procs[i].pr_recipe = rp->prp_next;
-
-      _use_i = i;
-      runargv( _procs[i].pr_target, rp->prp_ignore, rp->prp_group,
-           rp->prp_last, rp->prp_shell, rp->prp_cmd );
-      _use_i = -1;
-
-      FREE( rp->prp_cmd );
-      FREE( rp );
-
-      if( _proc_cnt == Max_proc ) Wait_for_child( FALSE, -1 );
-   }
-   else {
-      Handle_result(status,_procs[i].pr_ignore,_abort_flg,_procs[i].pr_target);
-
- ABORT_REMAINDER_OF_RECIPE:
-      if( _procs[i].pr_last ) {
-     FREE(_procs[i].pr_dir );
-
-     if( !Doing_bang ) Update_time_stamp( _procs[i].pr_target );
-      }
-   }
-
-   Set_dir(dir);
-   FREE(dir);
-}
-
-
-static int
-_running( cp )
-CELLPTR cp;
-{
-   register int i;
-
-   if( !_procs ) return(FALSE);
-
-   for( i=0; i<Max_proc; i++ )
-      if( _procs[i].pr_valid &&
-      _procs[i].pr_target == cp  )
-     break;
-     
-   return( i != Max_proc );
-}
-
-
-static void
-_attach_cmd( cmd, group, ignore, cp, last, shell )
-char    *cmd;
-int	group;
-int     ignore;
-CELLPTR cp;
-int     last;
-int     shell;
-{
-   register int i;
-   RCPPTR rp;
-
-   for( i=0; i<Max_proc; i++ )
-      if( _procs[i].pr_valid &&
-      _procs[i].pr_target == cp  )
-     break;
-
-   TALLOC( rp, 1, RCP );
-   rp->prp_cmd   = DmStrDup(cmd);
-   rp->prp_group = group;
-   rp->prp_ignore= ignore;
-   rp->prp_last  = last;
-   rp->prp_shell = shell;
-
-   if( _procs[i].pr_recipe == NIL(RCP) )
-      _procs[i].pr_recipe = _procs[i].pr_recipe_end = rp;
-   else {
-      _procs[i].pr_recipe_end->prp_next = rp;
-      _procs[i].pr_recipe_end = rp;
-   }
-}
diff --git a/dmake/qssl/setup b/dmake/qssl/setup
deleted file mode 100644
index 9aa004cd6..000000000
--- a/dmake/qssl/setup
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-if [ ! -d /usr/local ]; then mkdir /usr/local ; fi
-if [ ! -d /usr/local/bin ]; then mkdir /usr/local/bin ; fi
-if [ ! -d /usr/local/lib ]; then mkdir /usr/local/lib ; fi
-if [ ! -d /usr/local/lib/dmake-4.1 ]; then mkdir /usr/local/lib/dmake-4.1 ; fi
-
-
-if [ -d /usr/local/lib/dmake-4.1/startup ]
-then
-   if [ -f /usr/local/lib/dmake-4.1/startup/local.mk ]; then
-      cp /usr/local/lib/dmake-4.1/startup/local.mk  /tmp/local$$
-   elif [ -d /usr/local/lib/dmake ]; then
-      if [ -f /usr/local/lib/dmake/startup/local.mk ]; then
-	 cp /usr/local/lib/dmake/startup/local.mk  /tmp/local$$
-      fi
-   fi
-   /bin/rm -rf /usr/local/lib/dmake-4.1/startup /usr/local/lib/dmake
-fi
-
-mkdir /usr/local/lib/dmake-4.1/startup
-
-echo "Installing Dmake into /usr/local/bin"
-
-cp dmake-4.1g/dmake /usr/local/bin/dmake-4.1;
-/bin/rm -f /usr/local/bin/dmake
-(cd /usr/local/bin; ln -s dmake-4.1 dmake; chmod a+x,og-w dmake-4.1)
-cp -r dmake-4.1g/startup /usr/local/lib/dmake-4.1/startup
-(cd /usr/local/lib; ln -s dmake-4.1 dmake)
-find /usr/local/lib/dmake-4.1 -type d -exec chmod a+x {} \;
-find /usr/local/lib/dmake-4.1 -type f -exec chmod og-w,a+r {} \;
-
-if [ -f /tmp/local$$ ]
-then
-   cp /tmp/local$$ /usr/local/lib/dmake/startup/local.mk
-fi
-
-/bin/rm -rf dmake-4.1g
-
-echo "Dmake setup is complete"
diff --git a/dmake/qssl/startup.h b/dmake/qssl/startup.h
deleted file mode 100644
index b29d5ade1..000000000
--- a/dmake/qssl/startup.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* RCS  $Id: startup.h,v 1.2 2006-04-20 12:09:40 hr Exp $
---
--- SYNOPSIS
---      Definition of MAKESTARTUP
--- 
--- DESCRIPTION
---      Default MAKESTARTUP value defining where dmake locates the
---      startup file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-"DMAKEROOT *:= $(ROOTDIR)/usr/local/lib/dmake/startup",
-"MAKESTARTUP := $(DMAKEROOT)/startup.mk",
diff --git a/dmake/qssl/stdlib.h b/dmake/qssl/stdlib.h
deleted file mode 100644
index e41861c6b..000000000
--- a/dmake/qssl/stdlib.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* RCS  $Id: stdlib.h,v 1.1.1.1 2000-09-22 15:33:30 hr Exp $
---
--- SYNOPSIS
---      stdlib interface
--- 
--- DESCRIPTION
---      Specially needed pieces of interface to the standard C lib.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-#ifndef _STDLIB_INCLUDED_
-#define _STDLIB_INCLUDED_
-
-extern /*GOTO*/ _exit();
-extern /*GOTO*/ exit();
-extern /*GOTO*/ abort();
-extern int system();
-extern char *getenv();
-extern char *calloc();
-extern char *malloc();
-extern char *realloc();
-
-#ifndef _AIX
-/* The AIX compiler dies on illegal redefinition of free */
-extern free();
-#endif
-
-extern int errno;
-
-#ifndef EIO
-#	include <errno.h>
-#endif
-
-#endif /* _STDLIB_INCLUDED_ */
diff --git a/dmake/qssl/sysintf.h b/dmake/qssl/sysintf.h
deleted file mode 100644
index aef9ae278..000000000
--- a/dmake/qssl/sysintf.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* RCS  $Id: sysintf.h,v 1.2 2007-01-18 09:37:51 vg Exp $
---
--- SYNOPSIS
---      Interfaces for sysintf.c
---
--- DESCRIPTION
---      Abstractions of functions in sysintf.c
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#define DMSTAT stat
-#define VOID_LCACHE(l,m)
-#define Hook_std_writes(A)
-#define GETPID getpid()
-
-/*
-** standard C items
-*/
-
-/*
-** DOS interface standard items
-*/
-#define	getswitchar()	'-'
-
-/*
-** make parameters
-*/
diff --git a/dmake/qssl/template.mk b/dmake/qssl/template.mk
deleted file mode 100644
index e7e9837ae..000000000
--- a/dmake/qssl/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= qssl
-   OSRELEASE     *:= 
-   OSENVIRONMENT *:= 
diff --git a/dmake/qssl/tempnam.c b/dmake/qssl/tempnam.c
deleted file mode 100644
index de9c4692b..000000000
--- a/dmake/qssl/tempnam.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:30 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern int access();
-
-static char *cpdir();
-static char  seed[4]="AAA";
-
-/* BSD stdio.h doesn't define P_tmpdir, so let's do it here */
-#ifndef P_tmpdir
-static char *P_tmpdir = "/tmp";
-#endif
-
-char *
-tempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+16))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (access( cpdir(p, tmpdir), 3) != 0) )
-     if( (dl == 0) || (access( cpdir(p, dir), 3) != 0) )
-    if( access( cpdir(p, P_tmpdir),   3) != 0 )
-       if( access( cpdir(p, "/tmp"),  3) != 0 )
-          return(NULL);
-
-   (void) strcat(p, "/");
-   if(prefix)
-   {
-      *(p+strlen(p)+5) = '\0';
-      (void)strncat(p, prefix, 5);
-   }
-
-   (void)strcat(p, seed);
-   (void)strcat(p, "XXXXXX");
-
-   q = seed;
-   while(*q == 'Z') *q++ = 'A';
-   ++*q;
-
-   if(*tmpnam(p) == '\0') return(NULL);
-   return(p);
-}
-
-
-
-static char *
-cpdir(buf, str)
-char *buf;
-char *str;
-{
-   char *p;
-
-   if(str != NULL)
-   {
-      (void) strcpy(buf, str);
-      p = buf - 1 + strlen(buf);
-      if(*p == '/') *p = '\0';
-   }
-
-   return(buf);
-}
diff --git a/dmake/qssl/time.h b/dmake/qssl/time.h
deleted file mode 100644
index 0abb1bb1f..000000000
--- a/dmake/qssl/time.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* RCS  $Id: time.h,v 1.1.1.1 2000-09-22 15:33:30 hr Exp $
---
--- SYNOPSIS
---      time_t
---
--- DESCRIPTION
---      Fix broken time_t definition.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef	TIME_h
-#define	TIME_h
-
-typedef	long	time_t;	/* this is the thing we use */
-
-#endif	TIME_h
-
diff --git a/dmake/quit.c b/dmake/quit.c
deleted file mode 100644
index 1c9d8dda0..000000000
--- a/dmake/quit.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* $RCSfile: quit.c,v $
--- $Revision: 1.8 $
--- last change: $Author: kz $ $Date: 2008-03-05 18:29:56 $
---
--- SYNOPSIS
---      End the dmake session.
--- 
--- DESCRIPTION
--- 	Handles dmake termination.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-static	void	_handle_quit ANSI((char*));
-static	int	_quitting = 0; /* Set to 1 once Quit() is called for the
-                * first time. */
-
-
-PUBLIC void
-Quit( sig )/*
-======== Error or quit */
-int sig;
-{
-   int ret = ERROR_ABORT_VALUE;
-
-   if( sig == SIGINT )
-      fprintf(stderr, "Caught SIGINT. Trying to quit ...\n");
-   else
-#ifdef SIGQUIT
-   /* MinGW, maybe others also, does not have SIGQUIT. */
-   if( sig == SIGQUIT )
-      fprintf(stderr, "Caught SIGQUIT. Trying to quit ...\n");
-   else
-#endif
-   if( sig == 0 )
-      /* Don't be verbose during regular program termination. */
-      ret = ERROR_EXIT_VALUE;
-   else
-      fprintf(stderr, "Caught signal %d. Trying to quit ...\n", sig);
-
-   if( _quitting ) return; /* Guard to only quit once. */
-   _quitting = 1;
-
-   while( Closefile() != NIL( FILE ) );
-
-   /* CTRL-c sends SIGINT and CTRL-\ sends SIGQUIT to the parent and to all
-    * children. No need to kill them. */
-   if( sig != SIGINT
-#ifdef SIGQUIT
-       /* MinGW, maybe others also, does not have SIGQUIT. */
-       && sig != SIGQUIT
-#endif
-       )
-      /* This should be called Kill_all_processes(). */
-      Clean_up_processes();
-
-   /* Wait until all Processes are done. */
-   while( Wait_for_child(TRUE, -1) != -1 )
-      ;
-
-   if( Current_target != NIL(CELL) )
-      Unlink_temp_files(Current_target);
-
-   if( _quitting == 0 ) _handle_quit( ".ERROR" );
-
-   Set_dir( Makedir );		/* No Error message if we can't do it */
-   Epilog( ret );
-}
-
-
-PUBLIC const int
-in_quit( void )/*
-=================
-   Called to check if we are already quitting.
-   (Only used in unix/runargv.c.) */
-{
-    return _quitting;
-}
-
-static void
-_handle_quit( err_target )/*
-============================
-   Called by Quit() to handle the execution of termination code
-   from within make */
-char *err_target;
-{
-   HASHPTR hp;
-   CELLPTR cp;
-
-   if( (hp = Get_name(err_target, Defs, FALSE)) != NIL(HASH) ) {
-      cp = hp->CP_OWNR;
-      Glob_attr |= A_IGNORE;
-
-      cp->ce_flag |= F_TARGET;
-      Make( cp, NIL(CELL) );
-
-      /* Beware! If the ".ERROR" target doesn't finish the following
-       * wait will never return!!! */
-      while( Wait_for_child(FALSE, -1) != -1 );
-
-   }
-}
diff --git a/dmake/rcsclean.awk b/dmake/rcsclean.awk
deleted file mode 100644
index 8fdba716b..000000000
--- a/dmake/rcsclean.awk
+++ /dev/null
@@ -1,57 +0,0 @@
-/^\/\* RCS/ { print "/* RCS  $Id: rcsclean.awk,v 1.1.1.1 2000-09-22 15:33:25 hr Exp $"; next }
-/^-- LOG/,/^\*\// {
-   if( ! flag ) {
-      print "-- LOG";
-      print "--      Use cvs log to obtain detailed change logs.";
-      print "*/";
-      flag = 1;
-   }
-
-   next;
-}
-/^-- SYNOPSIS --/ {
-     print "--";
-     print "-- SYNOPSIS";
-     printf "--      %s%s\n", toupper(substr($0, 16,1)), substr($0,17);
-     next;
-}
-/^-- WWW/,/^--$/ {
-   if( !wflag ) {
-     print "-- WWW";
-     print "--      http://dmake.wticorp.com/";
-     print "--";
-     wflag = 1;
-   }
-   next;
-}
-/^-- AUTHOR/,/^--$/ {
-   if( !aflag ) {
-     print "-- AUTHOR";
-     print "--      Dennis Vadura, dvadura@dmake.wticorp.com";
-     print "--";
-     aflag = 1;
-   }
-   next;
-}
-/^-- COPYRIGHT/,/^--$/ {
-   if( !wflag ) {
-     print "-- WWW";
-     print "--      http://dmake.wticorp.com/";
-     print "--";
-     wflag = 1;
-   }
-     
-   if( !cflag ) {
-print "-- COPYRIGHT";
-print "--      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.";
-print "-- ";
-print "--      This program is NOT free software; you can redistribute it and/or";
-print "--      modify it under the terms of the Software License Agreement Provided";
-print "--      in the file <distribution-root>/readme/license.txt.";
-print "--";
-cflag = 1;
-   }
-   next;
-}
-
-{ print; }
diff --git a/dmake/readme/intro.txt b/dmake/readme/intro.txt
deleted file mode 100644
index 8e25f9523..000000000
--- a/dmake/readme/intro.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-DMAKE
------
-
-The original sources of dmake were available on http://dmake.wticorp.com.
-This site has not been reachable for some time and the source is hosted
-in the OpenOffice.org http://www.openoffice.org/ cvs now. You can view
-the source at: http://tools.openoffice.org/source/browse/tools/dmake.
-
-dmake is different from other versions of Make in that it supports significant
-enhancements.  A short summary of the more important features follows:
-
-	. support for portable makefiles
-	. portable accross many platforms
-	. significantly enhanced macro facilities
-	. sophisticated inference algorithm supporting transitive closure
-	  over the inference graph
-	. support for traversing the file sytem both during making of targets
-	  and during inference
-	. %-meta rules for specifying rules to be used for inferring
-	  prerequisites
-	. conditional macros
-	. local rule macro variables
-	. proper support for libraries
-	. parallel making of targets on architectures that support it
-	. attributed targets
-	. text diversions
-	. group recipes
-	. swapping itself to DISK under MSDOS
-	. supports MKS extended argument passing convention
-	. directory caching
-	. highly configurable
-
-Current release notes can be found in the file:
-
-	NEWS
-
-Release notes for older dmake versions (4.1 and before) can be found in
-the file:
-
-	readme/release.txt
diff --git a/dmake/readme/license.txt b/dmake/readme/license.txt
deleted file mode 100644
index 3c68f02bb..000000000
--- a/dmake/readme/license.txt
+++ /dev/null
@@ -1,248 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		     Version 1, February 1989
-
- Copyright (C) 1989 Free Software Foundation, Inc.
-                    675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The license agreements of most software companies try to keep users
-at the mercy of those companies.  By contrast, our General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  The
-General Public License applies to the Free Software Foundation's
-software and to any other program whose authors commit to using it.
-You can use it for your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Specifically, the General Public License is designed to make
-sure that you have the freedom to give away or sell copies of free
-software, that you receive source code or can get it if you want it,
-that you can change the software or use pieces of it in new free
-programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of a such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must tell them their rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any program or other work which
-contains a notice placed by the copyright holder saying it may be
-distributed under the terms of this General Public License.  The
-"Program", below, refers to any such program or work, and a "work based
-on the Program" means either the Program or any work containing the
-Program or a portion of it, either verbatim or with modifications.  Each
-licensee is addressed as "you".
-
-  1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this
-General Public License and to the absence of any warranty; and give any
-other recipients of the Program a copy of this General Public License
-along with the Program.  You may charge a fee for the physical act of
-transferring a copy.
-
-  2. You may modify your copy or copies of the Program or any portion of
-it, and copy and distribute such modifications under the terms of Paragraph
-1 above, provided that you also do the following:
-
-    a) cause the modified files to carry prominent notices stating that
-    you changed the files and the date of any change; and
-
-    b) cause the whole of any work that you distribute or publish, that
-    in whole or in part contains the Program or any part thereof, either
-    with or without modifications, to be licensed at no charge to all
-    third parties under the terms of this General Public License (except
-    that you may choose to grant warranty protection to some or all
-    third parties, at your option).
-
-    c) If the modified program normally reads commands interactively when
-    run, you must cause it, when started running for such interactive use
-    in the simplest and most usual way, to print or display an
-    announcement including an appropriate copyright notice and a notice
-    that there is no warranty (or else, saying that you provide a
-    warranty) and that users may redistribute the program under these
-    conditions, and telling the user how to view a copy of this General
-    Public License.
-
-    d) 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.
-
-Mere aggregation of another independent work with the Program (or its
-derivative) on a volume of a storage or distribution medium does not bring
-the other work under the scope of these terms.
-
-  3. You may copy and distribute the Program (or a portion or derivative of
-it, under Paragraph 2) in object code or executable form under the terms of
-Paragraphs 1 and 2 above provided that you also do one of the following:
-
-    a) accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of
-    Paragraphs 1 and 2 above; or,
-
-    b) accompany it with a written offer, valid for at least three
-    years, to give any third party free (except for a nominal charge
-    for the cost of distribution) a complete machine-readable copy of the
-    corresponding source code, to be distributed under the terms of
-    Paragraphs 1 and 2 above; or,
-
-    c) accompany it with the information you received as to where the
-    corresponding source code may be obtained.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form alone.)
-
-Source code for a work means the preferred form of the work for making
-modifications to it.  For an executable file, complete source code means
-all the source code for all modules it contains; but, as a special
-exception, it need not include source code for modules which are standard
-libraries that accompany the operating system on which the executable
-file runs, or for standard header files or definitions files that
-accompany that operating system.
-
-  4. You may not copy, modify, sublicense, distribute or transfer the
-Program except as expressly provided under this General Public License.
-Any attempt otherwise to copy, modify, sublicense, distribute or transfer
-the Program is void, and will automatically terminate your rights to use
-the Program under this License.  However, parties who have received
-copies, or rights to use copies, from you under this General Public
-License will not have their licenses terminated so long as such parties
-remain in full compliance.
-
-  5. By copying, distributing or modifying the Program (or any work based
-on the Program) you indicate your acceptance of this license to do so,
-and all its terms and conditions.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the original
-licensor to copy, distribute or modify the Program subject to these
-terms and conditions.  You may not impose any further restrictions on the
-recipients' exercise of the rights granted herein.
-
-  7. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of the license which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-the license, you may choose any version ever published by the Free Software
-Foundation.
-
-  8. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to humanity, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
-  To do so, attach the following notices to the program.  It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 1, or (at your option)
-    any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19xx name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than `show w' and `show
-c'; they could even be mouse-clicks or menu items--whatever suits your
-program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  program `Gnomovision' (a program to direct compilers to make passes
-  at assemblers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/dmake/readme/public/install.txt b/dmake/readme/public/install.txt
deleted file mode 100644
index a5ee339d2..000000000
--- a/dmake/readme/public/install.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-                DMAKE UNPACKING AND INSTALLATION INSTRUCTIONS
-
-
-We attempt to keep the information presented here accurate.  However, the
-defacto location of the most up to date information is the dmake WWW site
-found at:
-
-   http://dmake.wticorp.com/
-
-DMAKE is available in several formats:  a compressed tar src archive,
-a pkzip src archive, a variety of executable archives.  Refer to the
-appropriate section below for unpacking instructions.
-
-
-1. UNPACKING THE DISTRIBUTION FILES
-
-   OPTION 'A' (compressed tar src archive):
-   --------------------------------------
-   Assumption:  The current directory contains the latest version of dmake in
-		the file 'dm41src.tgz'. 
-
-   This file is a standard GNU zip compressed tar archive.  To unpack the file
-   issue the following command.  gunzip is available for most UNIX platforms
-   as well as DOS.
-
-	   gunzip -c dm41src.tgz | tar xf -
-
-
-   OPTION 'B' (src zip archive):
-   -----------------------------
-   Assumption:  The current directory contains the latest version of DMAKE in
-		the file dm41src.zip.
-
-   To unpack the full zip distribution simply use pkunzip with the
-   following command:
-
-	   pkunzip dm41src.zip
-   or
-	   unzip dm41src.zip
-
-
-   Instructions for unpacking executable only versions are given on the
-   dmake WWW site.
-
-
-2. BUILDING THE EXECUTABLE
-
-   Skip this step if you have purchased a prebuilt binary distribution.
-
-   The only supported method for building a new executable from a fresh or
-   patched distribution is to use the self building scripts rather than DMAKE
-   itself.  This is necessary in order to allow for the use of new DMAKE
-   features and functionality in the DMAKE 'makefile' itself.  Once built
-   the DMAKE executable can be used to rebuild DMAKE.
-
-   To determine the set of supported environments issue the following
-   commands:
-
-	cd src
-	make
-
-   The output of this command will be a set of arguments representing the
-   supported environments that DMAKE can be compiled in.  Choose the one
-   that most closely represents your environment and issue the command:
-
-	make environ_tag
-
-   where 'environ_tag' is from the previous list, for example on a Solaris
-   System the option is Solaris, so you would issue the command 'make Solaris'.
-
-   The script runs the appropriate set of commands; upon completion the file
-   'dmake' or 'dmake.exe' is found in the current directory.
-   This is the binary executable.
-
-   Note: before issuing the build command please read Section 3 and decide
-   if you need or want to modify the pre-compiled value of MAKESTARTUP.
-
-   During the build it is safe to ignore any warnings that may
-   be generated by your build.  If you get errors from the build then
-   it is probably the case that you have chosen a build target that is
-   not compatible with your environment.
-
-
-3. INSTALLING AND CONFIGURING THE EXECUTABLE
-
-   To install the dmake executable place the executable into the
-   location where your system normally finds executables.  That is
-   place dmake into a subdirectory that is or will be in your
-   executable search PATH.
-
-   You can now issue the command 'dmake -V'; the output will be
-   similar to:
-
-      dmake - Copyright (c) 1990,...,1996 by Dennis Vadura, Version 4.10, PL 0
-
-      Default Configuration:
-	 MAXPROCESSLIMIT := 10
-	 MAXLINELENGTH := 8190
-	 .IMPORT .IGNORE: ROOTDIR
-	 .MAKEFILES : makefile.mk Makefile makefile
-	 .SOURCE    : .NULL
-	 MAKESTARTUP := $(ROOTDIR)/usr/local/lib/dmake/startup/startup.mk
-
-      Please read the file readme/release for the latest release notes.
-
-
-   Take note of the line defining the value of MAKESTARTUP; to configure
-   the executable you must perform two steps:
-
-	1. Copy the <dmake-distdir>/startup subtree to a suitable location,
-	2. Tell dmake where you put it,
-
-
-   Step 1:
-   -------
-   The above example build of dmake assumes that the directory path (assuming
-   ROOTDIR is NULL)
-
-        /usr/local/lib/dmake/
-
-   is a directory which contains a copy of the "<dmake-distdir>/startup" 
-   subtree.  Thus to properly configure dmake so that the precompiled
-   defaults would be used you would have to perform the following:
-
-        cd <dmake-distdir>
-	mkdir /usr/local/lib/dmake
-	cp -r startup /usr/local/lib/dmake
-
-   or if you are in the MSDOS or Windows-95/NT world:
-
-	cd <dmake-distdir>
-	md \usr\local\lib\dmake
-	xcopy startup \usr\local\lib\dmake
-
-   and you are done Step 1.
-
-
-   Step 2:
-   -------
-   You must tell dmake where it is that you placed the "startup" subtree.  If
-   the location is the directory that is pre-compiled into dmake then you
-   are done.  If the directory where you copied the dmake subtree is not the
-   precompiled value you must either set the global environment variable
-   MAKESTARTUP to point at the new location of "startup/startup.mk" or you
-   must rebuild dmake with a new precompiled value of MAKESTARTUP.  To do the
-   latter create the file:
-
-	src/startup.h
-
-   and make sure that it contains an entry similar to the following:
-
-     /* This file contains the default value of the MAKESTARTUP variable.
-      * You must set the quoted string below to the default path to the startup
-      * variable, so that it gets compiled in.  LEAVE ROOTDIR at the front of
-      * the path.  This allows the user to customize his environment for dmake
-      * by setting up a new ROOTDIR environment variable. */
-
-     "MAKESTARTUP := $(ROOTDIR)/usr/local/lib/dmake/startup/startup.mk",
-
-   (See src/msdos/startup.h for an example).  Once set properly rerun your
-   previous build.  In the rare instance that your compiler has broken
-   #include search rules, the shipped "startup.h" files are located in
-   architecture specific subdirectories as described in the file
-   "readme/srcorg".
-
-
-4. DMAKE SPECIFIC ENVIRONMENT VARIABLES 
-
-   Once you have built dmake, the dmake startup directory contains the file
-   "config.mk".  This file contains definitions corresponding to your installed
-   target environment for the variables:
-
-	OS            - Specifies the flavour of operating system.
-	OSRELEASE     - Specifies the particular version of the operating
-		        system.
-	OSENVIRONMENT - An optional configuration parameter for the operating
-			system release.
-
-   Appropriate values for these variables are found in the
-
-  	<install-dir>/startup/templates/<OS>/<OSRELEASE>/<OSENVIRONMENT>/template.mk
-
-   file.  Select the OS, OSRELEASE, and OSENVIRONMENT that best suits your
-   setup (check readme.1st) for hints on selecting the most appropriate
-   settings.
-
-   These three variables are used to determine the correct dmake configuration
-   when dmake starts up, and loads its builtin definitions from the startup
-   subtree hierarchy.  The only time you should have a need to change these
-   values or the contents of the startup subtree is when you wish to supply
-   your own customized default environment or you are building dmake for a
-   new as yet unsupported target environment.
-
-
-5. LOCALE SPECIFIC CONFIGURATION
-
-   Locale specific macro definitions that are not part of the predefined macro
-   set should be placed into the file "startup/local.mk".  This ensures that
-   future dmake releases will not overwrite your prior definitions.  We
-   guarantee that the file "startup/local.mk" will never be part of any future
-   dmake distribution.
-
-
diff --git a/dmake/readme/public/mac.txt b/dmake/readme/public/mac.txt
deleted file mode 100644
index 34a2dca5f..000000000
--- a/dmake/readme/public/mac.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-MAC specific information for dmake.  This information is provided in the
-hope that it makes it easier to install and recompile dmake in a MAC
-environment.  
-
-
-1. ENVIRONMENT VARIABLE SETTINGS
-
-Only a single set of settings is available for the macintosh.  There are no
-sub-selections for specific OS release and/or environment.
-
-   OS		 - mac
-   OSRELEASE	 - NULL
-   OSENVIRONMENT - NULL
-
-
-2. IMPLEMENTATION NOTES
-
-This port for the Macintosh is specifically designed to be run
-under MPW.
-
-I had to make a couple of changes to dmake in order to get it to work
-on the Mac.  First, MPW provides no documented way to run a
-subprocess, so when you use dmake, you MUST use the -n option and
-execute the output.  Typically, you will probably want to write a
-simple script file to do these operations for you.
-
-I added some code so that the Macintosh version of dmake can
-use UNIX-style directories to specify include paths and target
-and dependency file names.  I.e., if you specify a file "/dir/file",
-dmake will look at the file "dir:file".  However, Mac dmake does not
-do any translation from files specified by UNIX-style directories
-in the recipe line that gets executed.  If you need to translate,
-you can use substitution commands.  (For example,
-":$(RELATIVEUNIXFILE:s,/,:,)".)  This code was added so one could
-execute dmake's makefile, and also so one would have an easier time
-porting other UNIX makefiles.  I would suggest you stick with
-Macintosh-style directories for all other makefiles.
-
-In order to run dmake, you must set (and export) the environmental
-variable "OS" to "mac".
-
-Micah Doyle
-micah@leland.Stanford.EDU
diff --git a/dmake/readme/public/msdos.txt b/dmake/readme/public/msdos.txt
deleted file mode 100644
index 72664843a..000000000
--- a/dmake/readme/public/msdos.txt
+++ /dev/null
@@ -1,124 +0,0 @@
-MSDOS specific information for dmake.  This information is provided in the
-hope that it makes it easier to install and recompile dmake under MSDOS.
-I will be happy to hear of erroneous information and will make every effort
-to correct it.
-
-NOTE:  If you are seeking information for Win32 compiles please refer to
-       the file "readme/winnt".
-
-
-1. ENVIRONMENT VARIABLE SETTINGS
-
-There are many environment variable settings available for MSDOS.  Each
-option is described below.
-
-   OS		 - msdos
-
-   OSRELEASE	 - borland              # Borland compilers
-	         - microsft             # Microsoft compilers
-                 - zortech              # zortech compilers (unsupported)
-
-   OSENVIRONMENT - tcc20                # Borland Turbo C 2.0
-		 - bcc30		# Borland C++ V3.0 MSDOS compile
-   		 - bcc40		# Borland C++ V4.0 MSDOS compile
-   		 - bcc45		# Borland C++ V4.5 MSDOS compile
-   		 - bcc50		# Borland C++ V5.0 MSDOS compile
-
-		 - msc51                # Microsoft 5.1 Compiler MSDOS compile
-		 - msc60                # Microsoft 6.0 Compiler MSDOS compile
-
-   MSC_VER	 - 5.1			# Microsoft Compiler version 
-		 - 6.0			# Microsoft Compiler version 
-
-
-2. IMPLEMENTATION NOTES
-
-Bootstrapping the binary:
--------------------------
-   A make.bat file is provided to bootstrap the binary.  The file contains
-   several targets for bootstrapping.  Invoking the batch file with no
-   arguments lists the possibilities shown below.
-
-      INDEX:  You must specify one of:
-         tccswp   - Turbo C 2.0 compile of swapping dmake.
-	 bcc30swp - Borland C++ 3.0 compile of swapping dmake.
-	 bcc40swp - Borland C++ 4.0 compile of swapping dmake.
-	 bcc45swp - Borland C++ 4.5 compile of swapping dmake.
-	 bcc50swp - Borland C++ 5.0 compile of swapping dmake.
-
-	 msc51    - Microsoft C 5.1 compile.
-	 msc51swp - Microsoft C 5.1, MASM 5.1 compile of swapping dmake.
-	 msc60    - Microsoft C 6.0 compile.
-	 msc60swp - Microsoft C 6.0, MASM 5.1 compile of swapping dmake.
-
-   Based on the compiler you have installed and whether or not you
-   want the swapping version of dmake, you should select the appropriate
-   target and issue 'make.bat target'.
-
-   The batch file runs a second batch script that comes with the distribution
-   which compiles the sources using the appropriate compiler and flags.  The
-   MSC Versions of the batch files should not require any further user
-   intervention during the build.  The Borland versions, as a final step,
-   invoke tlink with two response files.  The second of these response files,
-   named in msdos/borland/{bcc*,tcc20}/mk*.bat, contains absolute path names to
-   Borland's libraries.  You likely need to edit these before getting a
-   successful binary linked.  The reason for this is that not all of us
-   install the Borland compiler in the same place.
-
-   Note that the file msdos/exec.uue is a uuencoded version of a BCC++
-   compiled exec.obj (from exec.asm).  If you do not have an assembler
-   either microsoft MASM or Borland TASM (or some other), you can uudecode
-   this file and put it into src/objects/exec.obj.  The build will then
-   link against it to build your binary.
-
-
-Using dmake to Make itself:
----------------------------
-   See the file "readme/install" for information on building dmake by using
-   dmake itself.  Once successfully built using the presupplied scripts it
-   should be straight forward to rebuild dmake.
-
-
-Memory Requirements and Swapping:
----------------------------------
-   The swapping code currently only swaps to DISK, there are hooks
-   in the code to accomodate XMS and EMS, but have not been used (and
-   probably never will).
-
-   It appears that a ramdisk seems to work just fine.  If anyone
-   wishes to fill in the hooks please do so and send us the differences.
-
-
-^C and stopping a make:
------------------------
-   Thanks to the efforts of Len Reed, appears to now work.  I have been unable
-   to hang my machine if it's swapped out and I hit ^C a couple thousand times.
-
-
-Other notes:
-------------
-   dmake does not care if you are running command.com or some other command
-   interpretter, you must however specify the proper values of the environment
-   variables SHELL, SHELLFLAGS, GROUPSHELL, and GROUPFLAGS in order for things
-   to work correctly.  Read the man page FIRST, if you still have trouble
-   then send email.
-
-   Group recipes under DOS that use command.com as the command interpretter
-   require you to set the GROUPSUFFIX macro.
-
-   As shipped the startup.mk files for the DOS version try to figure out what
-   command interpretter you are using and set things up appropriately.
-   Two command interpretters are supported in the shipped startup.mk file,
-   command.com, and the MKS Korn shell.
-
-   The dos version of dmake contains one builtin command.  noop which
-   simply ignores the remainder of the line and always retuns success,
-
-   dmake supports the MKS argument passing conventions.  The facility is
-   enabled by setting .MKSARGS:=1.  It is set by default in the startup.mk file
-   if an MKS Korn shell is detected as being the active command interpretter.
-
-   At this time there are no plans to support the other popular UNIX like
-   argument passing conventions available under DOS.  We recommend you get
-   a copy of the MKS Toolkit from Mortice Kern Systems in Waterloo, Ontario,
-   Canada [http://www.mks.com/].
diff --git a/dmake/readme/public/os2.txt b/dmake/readme/public/os2.txt
deleted file mode 100644
index 5acf4cc6a..000000000
--- a/dmake/readme/public/os2.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-OS/2 specific information for dmake.  This information is provided in the
-hope that it makes it easier to install and recompile dmake in a OS/2
-environment.
-
-Notes on the OS/2 implementation of dmake:
-==========================================
-
-As shipped the DOS versions of dmake will run under OS/2 protected mode.
-However, support for a full OS/2 version is also provided.  The OS/2 version
-will run in parallel under OS/2.
-
-Bootstrapping the binary:
--------------------------
-   A make.cmd file is provided to bootstrap the binary.  The file contains
-   several targets for bootstrapping.  Invoking the batch file with no
-   arguments lists the possibilities shown below.
-
-      INDEX:  You must specify one of:
-	 ibm	  - IBM C2 compile.
-
-   The only supported compiler under OS/2 is the Visual Age ICC compiler.
-   I have tested the build using this compiler.  The resulting binary
-   performs proper directory caching and file-name case mapping for cached
-   directories and is capable of parallel target builds.  The only known
-   limitation of the OS/2 implementation is the treatment of library time
-   stamps.  Libraries do not have time stamps on members and the timestamp
-   of the library is used instead.
-
-
-OS/2 Specifics
---------------
-
-   There is a small number of OS/2 specific features that need to be
-   stated.  
-
-   1. The environment variables TMP as well as TMPDIR are checked for the
-      location of the directory where dmake should place any temporary files.
-      TMPDIR is checked before TMP.
-
-   2. Appropriate limits are setup for MAXPROCESSES and buffer sizes etc.
-      See output of 'dmake -V'.
-
-   3. By default dmake will look for the startup.mk file in the path:
-          
-	  $(ROOTDIR)/dmake/startup/startup.mk
-
-      This is more in keeping with OS/2 philosophy.  You may still rename
-      and put it anywhere else you like by defining the MAKESTARTUP
-      environment variable.
-
-   4. Swapping the dmake binary to disk is not supported under OS/2.
-
-
-Other notes:
-------------
-   dmake does not care if you are running cmd.exe or some other command
-   interpretter, you must however specify the proper values of the environment
-   variables SHELL, SHELLFLAGS, GROUPSHELL, and GROUPFLAGS in order for things
-   to work correctly.  Read the man page first.
-
-   Group recipes under OS/2 that use cmd.exe as the command interpretter
-   require you to set the GROUPSUFFIX macro.
-
-   As shipped the startup.mk files try to figure out what
-   command interpretter you are using and set things up appropriately.
-   Two command interpretters are supported in the shipped startup.mk file,
-   cmd.exe (via COMSPEC), and the MKS Korn shell.
-
-   dmake does not contain any builtin commands.  It gets all commands it
-   executes from an external file system.  It is therefore most useful if it
-   is used in conjunction with an environment similar to that provided by
-   the MKS Tool kit, or equivalent.
-
-   dmake now supports the MKS argument passing conventions.  The facility is
-   enabled by setting .MKSARGS:=1 and is set by default in the startup.mk file
-   if an MKS Korn shell is detected as being the active command interpretter.
diff --git a/dmake/readme/public/qssl-qnx.txt b/dmake/readme/public/qssl-qnx.txt
deleted file mode 100644
index 80fc8b56a..000000000
--- a/dmake/readme/public/qssl-qnx.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-QNX differs from UNIX only in that the library format is that of MSDOS and
-as such the normal stating of library members does not work.  QNX versions of
-dmake stat the library instead of the members (as does the MSDOS
-implementation).  Otherwise see the readme/unix file for further unix related
-information.
diff --git a/dmake/readme/public/srcorg.txt b/dmake/readme/public/srcorg.txt
deleted file mode 100644
index 89ff914ee..000000000
--- a/dmake/readme/public/srcorg.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-SOURCE CODE ORGANIZATION:
--------------------------
-The source code is organized as follows:
-
-			dmake 		[source for all common functions]
-			  |
-			  |
-	    ----------------------------
-	    |	 |     |    |          |
-	   unix tos   qnx  os2       msdos  [source for OS specific functions]
-	    |	            |          |
-  --------------------      |       -------------------
-  |         |        |      |       |       |         |
-386ix     bsd43  sysvr[134] |    tccdos   bccdos   mscdos  [source for OSRELEASE
-	    |	      	    |		    |	            specific functions] 
-	    |           ---------       ------------------
-	    |           |       |       |        |       |
-	    |          ibm    mscdos  bcc30    bcc32   bcc40
-	    |
-	    |
-	    |
-	--------
-	|      |
-       uw      vf   [source for OSENVIRONMENT specific functions]
-
-
-Each of the directories (eg. bsd43, mscdos, tccdos, and sysvr3) contain source
-that is specific to that release of the OS (and possibly C-library)
-
-
-CREATING A NEW VERSION:
------------------------
-To create yet another version of dmake you should follow the following steps.
-
-The sysvr3 version as sent is the base version, all dmake versions must provide
-the equivalent of the functions defined in the sysvr3 directory, and MUST
-provide the same semantics (MSDOS archive lib searches are an exception since
-we cannot search libraries for timestamps in MSDOS, Actually the MKS version
-of dmake does this, I don't have the inclination to add this code though).
-
-1. Create a new directory for the version you will be making at the level
-   that is appropriate.  If it is a new OS then add the dir at the top level,
-   if it is a new version of UNIX then add it below the unix directory.
-
-2. Copy the files from the unix and unix/sysvr3 directories to the new dir.
-   (Or from any other directory sub-tree that is more appropriate)
-
-3. Not all OS/OSRELEASE combinations are compatible so in order to make
-   dmake on each, the particular directory may contain C-source for functions
-   present in the SVID SysV R3 distribution which are used by dmake but are
-   not supplied by the C-library in the target system.  For example the bsd43
-   directory contains source for tempnam.c since it is not provided with
-   the BSD C-library.  Before writing a new version of the source file
-   check the other directories to see if one already exists.
-
-4. Under some systems the standard include files may be missing or incorrect.
-   eg. under BSD stdarg.h and string.h.  If this is the case
-   you should create the proper .h file in the proper directory.
-   This works as expected as the compile line includes the flag -Idir
-   where dir is the configuration dir, (bsd43 for example) and any
-   standard include files will be searched for in dir before the compiler
-   looks in the normal places (if you have a sane compiler :-).
-
-5. Modify dmake.sh to contain the appropriate C compiler flags and link command
-   and to include any specific C files that you have had to add for this
-   version of dmake, and run the result through the shell.
-   (make the same changes to config.mk so that once you have a working copy of
-   dmake you can use it to bring itself up to date)
-
-6. Send me the changes :-) so that I can incorporate them into future
-   distributions.
-
-7. This should be all that you require to create a new version of dmake.
-   If you have any questions send e-mail to dvadura@plg.uwaterloo.ca
diff --git a/dmake/readme/public/tos.txt b/dmake/readme/public/tos.txt
deleted file mode 100644
index ddcc43104..000000000
--- a/dmake/readme/public/tos.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Atari TOS specific information for dmake.  This information is provided in the
-hope that it makes it easier to install and recompile dmake in a TOS
-environment.  I do not own an ST.  As a result I rely on others to insure that
-this version of dmake works as advertized.  If you have any problems with it
-please fix them and send me the differences so that I can incorporate them
-into future releases and patches.
-
-
-1. ENVIRONMENT VARIABLE SETTINGS
-
-Only a single set of settings is available for Atari TOS.  There are no
-sub-selections for specific OS release and/or environment.
-
-   OS		 - tos
-   OSRELEASE	 - NULL
-   OSENVIRONMENT - NULL
-
-
-2. IMPLEMENTATION NOTES
-
-The code to compile on an Atari-ST using GCC was supplied by Edgar Roeder
-(roeder@cs.uni-sb.de).  I do not have an ST on which to verify the
-distribution sources but I have no reason to believe them to not work.
-If there are any problems please let Edgar or myself know.
-
-I know of no bugs or limitation to the Atari-ST implementation.  Note that
-it is similar to the DOS version but it does not swap itself out.  This does
-not appear to be as much of a problem on the Atari as it is on MSDOS boxes :-).
-See the msdos specific info file for further information.
-
--dennis
diff --git a/dmake/readme/public/unix.txt b/dmake/readme/public/unix.txt
deleted file mode 100644
index b50ab9afa..000000000
--- a/dmake/readme/public/unix.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-UNIX specific information for dmake.  This information is provided in the
-hope that it makes it easier to install and recompile dmake under UNIX.
-I will be happy to hear of erroneous information and will make every effort
-to correct it.
-
-
-1. ENVIRONMENT VARIABLE SETTINGS
-
-There are many environment variable settings available for UNIX.  Each
-option is described below.
-
-   OS - unix
-
-   OSRELEASE - bsd43		# generic BSD 4.3
-	     - solaris 		# Solaris environments
-	     - sysvr1		# System V R1
-	     - sysvr3		# System V R3
-	     - sysvr4		# System V R4
-	     - xenix		# Xenix
-	     - 386ix		# Sun IPX 386 boxen
-	     - coherent		# Coherent...
-	     - qnx		# QNX 
-
-   OSENVIRONMENT - uw		# U of Waterloo mfcf environment for BSD4.3
-		 - vf		# for environments needing vfprintf
-		 - pwd		# for environments needing new pwd
-		 - gcc		# for GCC compiles with Solaris2.3 and greater
-		 - verxx        # for specific OS versions.
-
-
-The table below lists valid combinations for settings of OS, OSRELEASE, and
-OSENVIRONMENT.
-
-	OS		OSRELEASE		OSENVIRONMENT
-	--		---------		-------------
-	unix		bsd43
-	unix		bsd43			uw
-	unix		bsd43			vf
-	unix		solaris
-	unix		solaris			gcc
-	unix		sysvr1
-	unix		sysvr3
-	unix		sysvr3			pwd
-	unix		sysvr4
-	unix		xenix
-	unix		xenix			pwd
-	unix		386ix
-	unix		coherent		ver40
-	unix		coherent		ver42
-
-You must set OS and OSRELEASE, OSENVIRONMENT to correspond to one of the
-configurations in the above table.
-
-
-2. IMPLEMENTATION NOTES
-
-Bootstrapping the binary:
--------------------------
-   A 'makefile' file is provided to bootstrap the binary.  The file contains
-   many targets for bootstrapping.  Issuing 'make' will provide the list of
-   possible targets that can be built.  A restricted sample is shown below:
-
-   INDEX:  You must specify 'make target' where target is one of:
-   -------------
-      make bsd43         - Generic BSD 4.3 System
-      make bsd43uw       - Generic BSD 4.3 at U of Waterloo
-      make bsd43vf       - Generic BSD 4.3 that needs vfprintf
-      make sysvr4        - Generic SysV R4 UNIX System
-      make sysvr3        - Generic SysV R3 UNIX System
-      make sysvr3pwd     - Generic SysV R3 UNIX System, our PWD
-      make sysvr1        - Generic SysV R1 UNIX System
-      make dynix         - Sequent DYNIX System
-      make linux         - Linux
-      make ultrix        - Ultrix 3.0 System
-      make mips          - Any MIPS System
-      make coherent40    - Any Coherent Version 4.0 System
-      make coherent42    - Any Coherent Version 4.2 or greater System
-      make hpux          - HP Unix
-      make 386ix         - 386/ix (SysV R3) System
-      make xenix         - 386 Xenix System
-      make xenixpwd      - 386 Xenix System, our PWD
-      make aix           - IBM RS6000/AIX System
-      make Solaris       - SUN Solaris 1.0 to 2.0
-      make Solaris2.1    - SUN Solaris 2.1 or greater
-      make gccSolaris2.1 - SUN Solaris 2.1 or greater with gcc
-
-   The above shows only the possible builds for UNIX like operating systems.
-   Choose the one that best suits your needs and issue the command
-
-      'make target'
-
-
-Using dmake to Make itself:
----------------------------
-   If you use dmake to make itself you must first set a number of makefile
-   control variables, either through the environment or on the command line.
-
-   The following variables must be set:
-
-	OS	       - defines operating system (must be set)
-	OSRELEASE      - particular version of it.
-	OSENVIRNOMENT  - more customization
-
-   These three variables should be defined in your environment.  Valid values
-   for UNIX are listed above in Section 1.  You must chose one a setting from
-   the table that best matches your system.
-
-   Once set simply issue the command: 'dmake' and the sources will be
-   automatically rebuilt.  You do not need to specify a target when you
-   use dmake and the environment variables are correctly set.
-
-
-.NAMEMAX and length of file names:
-----------------------------------
-dmake assumes that no file name component has a name longer than .NAMEMAX
-(a user-settable variable, see the man page).  Files whose basename is
-longer than .NAMEMAX return a timestamp of 0 when statted.  The reason for
-this test is to handle broken versions of stat that return non-zero times
-for stating files that are longer than the legal file name length but for
-which a file whose name is the legal maximum file name length and is a prefix
-of the longer name exists.  This used to cause infinite loops in the inference
-engine.
-
-As a result the value of .NAMEMAX is important.  dmake attempts to determine
-it at from your system header files when compiled however sometimes even these
-may be erroneous thus as a result as of dmake 4.0 users may set the value of
-.NAMEMAX to any value they wish.
-
-
-Library Name Length:
---------------------
-By default the maximum length of library member names is defined in the the
-ar.h header file and is usually 14.  Elf libraries allow for a arbitrarily
-long member names, if your archiver supports the elf archiver extension for
-long member names then edit the file unix/arlib.c and set the CHECKELF define
-to indicate that the Elf archiver extension is to be checked for.
-
-If Elf is not supported and your archiver truncates member names you should
-set (in unix/arlib.c) the macro AR_TRUNCATE_MEMBER_NAMES.  dmake will then
-also truncate member names and perform a length limitted comparison when
-scanning the library for matching member names.
-
-
-UNIX Sysv R3 and getcwd:
-------------------------
-Some versions of UNIX SysV R3 and Xenix use the popen call to capture the
-output of pwd when invoking the C library function getcwd().  These versions
-of the function cause dmake to terminate with the "lost a child" message
-due to the fact that the parent dmake process may catch the pwd and not
-recognize it as a child.  For systems that have this problem use the version
-of dmake that supplies its own getcwd function.  The settings are:
-
-   OS = unix
-   OSRELEASE = sysvr3
-   OSENVIRONMENT = pwd 
-
-It is directly available through the 'makefile' by typing one of:
-
-   make sysvr3pwd
-   make xenixpwd
-
-both include the getcwd code but the xenixpwd target compiles for a Xenix
-system.
-
-
-UNIX and "limits.h":
---------------------
-Some compilers do not yet provide the "limits.h" file, if yours is one of
-these then simply copy the file "namemax.h" in the source root directory to
-"limits.h".  Make sure the length of a file name is correctly set in
-"limits.h" as it is processed prior to "namemax.h".
diff --git a/dmake/readme/read1st.txt b/dmake/readme/read1st.txt
deleted file mode 100644
index 1ff1229e6..000000000
--- a/dmake/readme/read1st.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-DMAKE 4.12
-==========
-
-This directory tree contains a number of files.  Here is a short
-description of what each file contains so that you do not need to
-search as much.  There is also a recommended order for reading them.
-
-    read1st.txt - This file; generic information.
-    intro.txt   - Short note describing what 'dmake' is and where to
-                  get it from.
-    release.txt - Changes of previous releases, and release specific
-                  notes. (Not longer continued.)
-    ../NEWS     - Changes from previous release. (Continuation of
-                  release.txt.)
-    ../man/     - directory containing DMAKE manual page.
-
-    public/     - Old build and installation instructions
-                  for the Dmake 4.1 public release. As of Dmake 4.2
-                  dmake switched to an autotools based build system
-                  and these instructions are not longer valid for
-                  operating systems that are supported by the autotools
-                  system.
-                  If you are on a system that is not supported you
-                  might still find some useful information there.
-
-Building Dmake
-==============
-
-With autotools
---------------
-Building dmake on systems that are supported by the autotools build system
-only requires the usual "./configure && make && make install" command.
-The configure command will notify you when your platform is not supported.
-
-With Microsoft C++ compiler
----------------------------
-For MS Visual C++ 6 and up run "make.bat win95-vpp40" in a command shell.
-This should create a dmake.exe in the top-level directory.
-
-It is possible to rename this to, say, dmake0.exe, delete the objects/
-sub-directory and then simply run "dmake0.exe" to build a new dmake.exe.
-Note that it is not necessary to have dmake rebuild itself in this way,
-but it is a nice test that your new dmake is working to see that it can.
-
-To install dmake, simply copy dmake.exe and the startup/ sub-directory to
-a directory of your choice.  You may also want to copy the man/
-sub-directory for future access to the manual page.
-
-
-All other systems might look in the public/ directory for usefull hints.
-
-
-The original sources of dmake were available on http://dmake.wticorp.com.
-This site has not been reachable for some time and the source is hosted
-in the OpenOffice.org http://www.openoffice.org/ cvs now. You can view
-the source at: http://tools.openoffice.org/source/browse/tools/dmake.
-Please send questions regarding dmake to the tools project mailing list
-at dev@tools.openoffice.org.
diff --git a/dmake/readme/release.txt b/dmake/readme/release.txt
deleted file mode 100644
index 41b950976..000000000
--- a/dmake/readme/release.txt
+++ /dev/null
@@ -1,196 +0,0 @@
-This file is superseded/continued by the toplevel NEWS file.
-
-DMAKE Version 4.1
-=================
-FINAL FREE RELEASE OF DMAKE, REPLACES VERSION 4.0
-
-Nature: This distribution advances dmake to Version 4.1, patch level 0.
-------- This release adds significant functionality and eliminates
-        bugs that were introduced with release 4.0.
-
-
-DETAILS OF ENHANCEMENTS/TWEAKS:
-===============================
-
-BUG FIXES:
-----------
-
-1. General clean up all over to fix small incompatibilities and obvious
-   typos.
-
-2. Fixed bug in getinp.c where buffer was being erroneously overwritten,
-   this caused the invalidation of the return address on the stack on
-   DOS systems.
-
-3. Fixed a bug that caused the "<target> is up to date" message to be
-   suppressed.
-
-4. Fixed a bug involving the value of $@ in conjunction with dynamic
-   prerequisites.
-
-5. Relegated the warning associated with duplicate entries in prerequisite
-   lists to a non-essential warning.  Added an option flag -Vw to display
-   it if you wish to check your makefile for duplicate entries.  Either way
-   the parser ignores duplicates.
-
-6. Better default action on checking out RCS targets.  If an RCS target has
-   no directory prefix of its own it is checked out into the directory
-   which contains the RCS subdirectory, otherwise it ends up in its directory
-   qualified location.
-
-7. Improved the speed of lookups in the directory cache; handle mixed case
-   file name entries on OS/2 and Win95/NT.
-
-8. Improved prerequisite list generation for long prerequisite lists.
-
-9. Rearanged startup macro files to form an architectural hierarchy.
-   This greatly simplifies the maintenance of the startup files.  They
-   might even be right at some point in the future.  Please let me know if
-   you encounter difficulties, as I don't have access to all possible
-   platforms, this sub-hierarchy is bound to have ommisions at this release
-   and hence is intended to be evolutionary over time.
-
-10. A build that only touches targets (-t) uses the same algorithm to decide
-    valid names as a normal build.
-
-11. Conditional macro assignments fixed, and now work for builtin macro
-    variables as well.
-
-
-NEW FEATURES:
--------------
-
-0. Complete reorganization of Dmake STARTUP scripts.  Please refer to the
-   installation notes for details.  THIS ONE IS IMPORTANT!!!
-
-1. Support for long archive member names if Elf is available, plus better
-   support for archivers that truncate member names (see comments in
-   unix/arlib.c for details).
-
-2. Added variable MAKEVERSION which contains a string indicating the current
-   version of dmake.
-
-3. Added the .EXECUTE attribute, see man page for details.
-
-4. Added the .ERRREMOVE attribute, see man page for details.
-
-5. Added support for gmake style if/else/endif, but only if not part of
-   a Group recipe.
-
-6. Added initial build target for Coherent version 4.2 UNIX
-   and for Windows-NT/Windows-95 32-bit app using Borland C++ 4.0,4.5, 5.0,
-   and Microsoft Visual C++ 4.0.
-
-7. MSDOS version now supports two builtin runtime commands, noop, and echo.
-
-8. Added new macro $(uniq list) which returns a sorted version of the
-   white space separated tokens in list such that there are no repetitions.
-
-9. Added the function macro $(echo list) which simply returns list.
-   This is most useful in conjunction with the new $(foreach ...)
-   function macro.
-
-10. Added gmake style function macro
-
-	$(foreach,var,list data)
-
-    where var and list are expanded, and the result is the concatenation of
-    expanding data with var being set to each white space separated token in
-    list in turn.  For example:
-
-	list = a b c
-	all :
-		echo [$(foreach,i,$(list) [$i])]
-
-    will output
-
-	[[a] [b] [c]]
-
-    The iterator variable is defined as a local variable to this foreach
-    instance.  The following expression illustrates this:
-
-	$(foreach,i,$(foreach,i,$(sort c a b) root/$i) [$i/f.h])
-
-    when evaluated the result is:
-
-	[root/a/f.h] [root/b/f.h] [root/c/f.h]
-
-    The specification of list must be a valid macro expression, such as:
-
-	$($(assign list=a b c))
-	$(sort d a b c)
-	$(echo a b c)
-
-    and cannot just be the list itself.  That is, the following foreach
-    expression:
-
-	$(foreach,i,a b c [$i])
-
-    yields:
-	
-	"b c [a]"
-
-    when evaluated.
-
-11. Added the macro $(and list).
-
-12. Added the macro $(or list).
-
-13. Added the macro $(not term).
-
-14. Added the .NOINFER attribute to the .INCLUDE directive.  When specified
-    any prerequisite of the .INCLUDE directive which cannot be found in
-    the .INCLUDEDIRS search list is not automatically made.
-
-15. Improved the handling of internal macros for proper functioning of the *=
-    and *:= assignment constructs.  Macros that are internally initially
-    defined are considered to be undefined for the purpose of *= and *:=
-    assignment until they are the target of an explicit assignment operation.
-
-16. Improved the caching of file names, and their matching on case insensitive
-    file systems.  Two control macros help to manage the functionality:
-
-	.DIRCACHE := yes
-
-    Implies that the directory cache will be used.  This is on by default for
-    systems that support the reading of directories.  Setting the value of this
-    macro to 'no' is equivalent to supplying the '-d' command line switch.
-
-        .DIRCACHERESPCASE := yes
-
-    Causes dmake to respect the case of the directory entries when the cache
-    is enabled, thereby treating directory entries in a case sensitive manner.
-    Setting this to 'no' disables the matching of case.  This macro has effect
-    only if .DIRCACHE := yes.  Otherwise the facilities provided by the native
-    OS are used to match file names using 'stat'.
-
-17. Added parameterized user defined function macros.  Yes it's true
-    you may now define your own parametized function macros.  Here is
-    how it works.  Any macro that is not a predefined function macro and
-    is invoked with parameters is looked up as a user defined function
-    macro.  A new macro scope is created.  The n'th argument to the
-    macro is then assigned to the value of the the macro $n where n is 0
-    for the first argument, 1 for the second argument and so on.  The
-    argument is expanded before it is assigned.  The original macro is
-    then expanded.  For example:
-
-        FOO = a $0 b $1 c $2 d
-        echo :; $(FOO x y z)
-
-    Will produce the result string "a z b y c z d".  The
-    expansion of $(FOO) on it's own behaves as expected and returns the
-    string "a b c d" (assuming that each of $0, $1, $2
-    are undefined).   The only restriction when specifying function
-    macro arguments is as before:  they cannot contain spaces
-    themselves.
-
-
-ACKNOWLEDGEMENTS:
-=================
-    Thanks to all who submitted code for new features, suggestions for
-    improvements, and bug fixes.  I have tried to make sure no gotchas
-    remain, if you encounter problems installing or running dmake please
-    let me know.  As always, I am always happy to receive e-mail.
-
-    Many have contributed suggestions and bug fixes that make this
-    release possible.  The NET thanks you.
diff --git a/dmake/rulparse.c b/dmake/rulparse.c
deleted file mode 100644
index 37a8aaaf8..000000000
--- a/dmake/rulparse.c
+++ /dev/null
@@ -1,1733 +0,0 @@
-/* $RCSfile: rulparse.c,v $
--- $Revision: 1.12 $
--- last change: $Author: ihi $ $Date: 2007-10-15 15:41:24 $
---
--- SYNOPSIS
---      Perform semantic analysis on input
--- 
--- DESCRIPTION
---	This code performs semantic analysis on the input, and builds
---	the complex internal datastructure that is used to represent
---	the user makefile.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-/* prototypes for local functions */
-static  void    _add_indirect_prereq ANSI((CELLPTR));
-static  int     _add_root ANSI((CELLPTR));
-static	CELLPTR	_build_graph ANSI((int, CELLPTR, CELLPTR));
-static	char*	_build_meta ANSI((char*));
-static	int	_do_magic ANSI((int, char*, CELLPTR, CELLPTR, t_attr, char*));
-static	void	_do_special ANSI((int, int, t_attr,char*,CELLPTR,CELLPTR,int*));
-static	int	_do_targets ANSI((int, t_attr, char*, CELLPTR, CELLPTR));
-static	t_attr	_is_attribute ANSI((char*));
-static	int	_is_special ANSI((char*));
-static	char*	_is_magic ANSI((char*));
-static	int	_is_percent ANSI((char*));
-static  CELLPTR _make_multi ANSI((CELLPTR));
-static  CELLPTR _replace_cell ANSI((CELLPTR,CELLPTR,CELLPTR));
-static	void	_set_attributes ANSI((t_attr, char*, CELLPTR ));
-static	void	_stick_at_head ANSI((CELLPTR, CELLPTR));
-static	void	_set_global_attr ANSI((t_attr));
-
-
-/* static variables that must persist across invocation of Parse_rule_def */
-static CELLPTR    _sv_targets = NIL(CELL);
-static STRINGPTR  _sv_rules   = NIL(STRING); /* first recipe element. */
-static STRINGPTR  _sv_crule   = NIL(STRING); /* current/last recipe element. */
-static CELLPTR    _sv_edgel   = NIL(CELL);
-static LINKPTR    _sv_ind_prq = NIL(LINK);   /* indirect prerequisites for % cell */
-static int	  _sp_target  = FALSE;
-static t_attr     _sv_attr;
-static int        _sv_flag;
-static int	  _sv_op;
-static char      *_sv_setdir;
-static char	  _sv_globprq_only = 0;
-
-/* Define for global attribute mask (A_SWAP == A_WINPATH) */
-#define A_GLOB	 (A_PRECIOUS | A_SILENT | A_IGNORE | A_EPILOG | A_SWAP |\
-          A_SHELL | A_PROLOG | A_NOINFER | A_SEQ | A_MKSARGS )
-
-
-PUBLIC int
-Parse_rule_def( state )/*
-=========================
-   Parse the rule definition contained in Buffer, and modify the state 
-   if appropriate.  The function returns 0, if the definition is found to
-   be an illegal rule definition, and it returns 1 if it is a rule definition.
-   */
-int *state;
-{
-  TKSTR 	input;		/* input string struct for token search	  */
-  CELLPTR	targets;	/* list of targets if any		  */
-  CELLPTR	prereq;		/* list of prereq if any		  */
-  CELLPTR	prereqtail;	/* tail of prerequisite list		  */
-  CELLPTR	cp;		/* temporary cell pointer for list making */
-  char 	*result;	/* temporary storage for result	  	  */
-  char		*tok;		/* temporary pointer for tokens		  */
-  char         *set_dir;       /* value of setdir attribute              */
-  char		*brk;		/* break char list for Get_token	  */
-  char         *firstrcp;      /* first recipe line, from ; in rule line */
-  t_attr       attr;           /* sum of attribute flags for current tgts*/
-  t_attr	at;		/* temp place to keep an attribute code	  */
-  int		op;		/* rule operator			  */
-  int		special;	/* indicate special targets in rule	  */
-  int		augmeta;	/* indicate .<suffix> like target	  */
-  int		percent;	/* indicate percent rule target		  */
-  int		percent_prq;	/* indicate mixed %-rule prereq possible  */
-
-  DB_ENTER( "Parse_rule_def" );
-
-  op	      = 0;
-  attr       = 0;
-  special    = 0;
-  augmeta    = 0;
-  percent    = 0;
-  set_dir    = NIL( char );
-  targets    = NIL(CELL);
-  prereq     = NIL(CELL);
-  prereqtail = NIL(CELL);
-  percent_prq = 0;
-
-  /* Check to see if the line is of the form:
-   *    targets : prerequisites; first recipe line
-   * If so remember the first_recipe part of the line. */
-
-  firstrcp = strchr( Buffer, ';' );
-  if( firstrcp != NIL( char ) ) {
-    *firstrcp++ = 0;
-    firstrcp = DmStrSpn( firstrcp, " \t" );
-  }
-
-  result = Expand( Buffer );
-  /* Remove CONTINUATION_CHAR, keep the <nl> */
-  for( brk=strchr(result,CONTINUATION_CHAR); brk != NIL(char); brk=strchr(brk,CONTINUATION_CHAR) )
-    if( brk[1] == '\n' )
-      *brk = ' ';
-    else
-      brk++;
-
-  DB_PRINT( "par", ("Scanning: [%s]", result) );
-
-  SET_TOKEN( &input, result );
-  brk = ":-^!|";
-  Def_targets = TRUE;
-   
-  /* Scan the input rule line collecting targets, the operator, and any
-   * prerequisites.  Stop when we run out of targets and prerequisites. */
-
-  while( *(tok = Get_token( &input, brk, TRUE )) != '\0' )
-    if( !op ) {
-      /* we are scanning targets and attributes
-       * check to see if token is an operator.  */
-
-      op = Rule_op( tok );
-
-      if( !op ) {
-        /* Define a new cell, or get pointer to pre-existing cell.  */
-        /* Do we need cells for attributes? If not move the definition
-         * to the target part.  */
-        cp = Def_cell( tok );
-        /* A $ character indicates either a literal $ in the pathname (this
-         * was broken before) or a dynamic macro (this is a syntax error).
-         * FIXME: Here would be the place to add a sanity check. */
-        DB_PRINT( "par", ("tg_cell [%s]", tok) );
-        
-        if( (at = _is_attribute(tok)) != 0 ) {
-          /* Ignore .SILENT when -vr is active. */
-          if( (Verbose & V_FORCEECHO) && (at == A_SILENT) )
-            at = 0;
-
-          /* Logically OR the attributes specified into one main
-           * ATTRIBUTE mask. */
-
-          if( at == A_SETDIR ) {
-            if( set_dir != NIL( char ) )
-              Warning( "Multiple .SETDIR attribute ignored" );
-            else
-              set_dir = DmStrDup( tok );
-          }
-
-          attr |= at;
-        }
-        else {
-          /* Not an attribute, this must be a target. */
-          int tmp;
-           
-          tmp = _is_special( tok );
-
-          if( _is_percent( tok ) ) {
-            /* First %-target checks if there were non-%-targets before. */
-            if( !percent && targets != NIL(CELL) )
-              Fatal( "A %%-target must not be mixed with non-%%-targets, offending target [%s]", tok );
-
-            percent++;
-            cp->ce_flag |= F_PERCENT;
-          } else {
-            if( percent )
-              Fatal( "A non-%%-target must not be mixed with %%-targets, offending target [%s]", tok );
-          }
-
-          if( _is_magic( tok ) ) {
-            /* Check that AUGMAKE targets are not mixed with other
-             * targets. The return value of _is_magic() is discarded and
-             * calculated again in _do_targets() if this rule definition
-             * really is a .<suffix> like target.
-             * If we would allow only one target per line we could easily
-             * store the result for later, but for multiple .<suffix>
-             * targets this creates too much overhead.
-             * These targets should be rare (obsolete?) anyway. */
-            if( !augmeta && targets != NIL(CELL) )
-              Fatal( "An AUGMAKE meta target must not be mixed with non AUGMAKE meta targets, offending target [%s]", tok );
-
-            augmeta++;
-            cp->ce_flag |= F_MAGIC; /* do_magic will also add F_PERCENT later. */
-          } else {
-            if( augmeta )
-              Fatal( "A non AUGMAKE meta target must not be mixed with AUGMAKE meta targets, offending target [%s]", tok );
-          }
-
-          if( special )
-            Fatal( "Special target must appear alone, found [%s]", tok );
-          else if( !(cp->ce_flag & F_MARK) ) {
-            /* Targets are kept in this list in lexically sorted order.
-             * This allows for easy equality comparison of target
-             * sets.*/
-            CELLPTR prev,cur;
-            for(prev=NIL(CELL),cur=targets;cur;prev=cur,cur=cur->ce_link)
-              if(strcmp(cur->CE_NAME,cp->CE_NAME) > 0)
-                break;
-            
-            cp->ce_link = cur;
-
-            if (!prev)
-              targets = cp;
-            else
-              prev->ce_link = cp;
-
-            cp->ce_flag |= F_MARK | F_EXPLICIT;
-            special = tmp;
-          }
-          else
-            Warning( "Duplicate target [%s]", cp->CE_NAME );
-        }
-      }
-      else {
-        /* found an operator so empty out break list and clear mark
-         * bits on target list, setting them all to F_VISITED*/
-
-        brk  = "";
-        for( cp=targets; cp != NIL(CELL); cp=cp->ce_link ) {
-          cp->ce_flag ^= F_MARK;
-          cp->ce_flag |= F_VISITED;
-        }
-
-        Def_targets = FALSE;
-      }
-    }
-    else {
-      /* Scanning prerequisites so build the prerequisite list.  We use
-       * F_MARK flag to make certain we have only a single copy of the
-       * prerequisite in the list */
-
-      cp = Def_cell( tok );
-
-      /* %-prerequisits require eiter a %-target or this might be a rule of
-       * the "ATTRIBUTE_LIST : targets" form. */
-      if( _is_percent( tok ) ) {
-        if( percent || ((targets == NIL(CELL)) && attr) )
-          percent_prq = 1;
-        else
-          Fatal( "Syntax error in %% rule, missing %% target");
-      }
-
-      if( cp->ce_flag & F_VISITED ) {
-        if( cp->ce_attr & A_COMPOSITE )
-          continue;
-        else
-          Fatal( "Detected circular dependency in graph at [%s]",
-                 cp->CE_NAME );
-      }
-      else if( !(cp->ce_flag & F_MARK) ) {
-        DB_PRINT( "par", ("pq_cell [%s]", tok) );
-        cp->ce_flag |= F_MARK;
-
-        if( prereqtail == NIL(CELL) )	/* keep prereq's in order */
-          prereq = cp;
-        else
-          prereqtail->ce_link = cp;
-
-        prereqtail = cp;
-        cp->ce_link = NIL(CELL);
-      }
-      else if( !(cp->ce_attr & A_LIBRARY) && (Verbose & V_WARNALL))
-        Warning("Duplicate entry [%s] in prerequisite list",cp->CE_NAME);
-    }
-      
-  /* Check to see if we have a percent rule that has only global
-   * prerequisites, i.e. they are of the form: "%.a : foo".
-   * If so then set the flag so that later on, we don't issue
-   * an error if such targets supply an empty set of rules. */
-
-  if( percent && !percent_prq && (prereq != NIL(CELL)) )
-    _sv_globprq_only = 1;
-
-  /* It's ok to have targets with attributes, and no prerequisites, but it's
-   * not ok to have no targets and no attributes, or no operator */
-
-  CLEAR_TOKEN( &input ); FREE(result); result = NIL(char);
-  if( !op ) {
-    DB_PRINT( "par", ("Not a rule [%s]", Buffer) );
-    DB_RETURN( 0 );
-  }
-
-  /* More than one percent target didn't work with prior versions. */
-  if( (percent > 1) && !(op & R_OP_OR) )
-    Warning( "Prior to dmake 4.5 only one\n"
-             "%%-target per target-definition worked reliably. Check your makefiles.\n" );
-
-  if( !attr && targets == NIL(CELL) ) {
-    Fatal( "Missing targets or attributes in rule" );
-    if( set_dir != NIL( char )) FREE( set_dir );
-    DB_RETURN( 0 );
-  }
-
-  /* We have established we have a legal rules line, so we must process it.
-   * In doing so we must handle any special targets.  Special targets must
-   * appear alone possibly accompanied by attributes.
-   * NOTE:  special != 0  ==> targets != NIL(CELL) */
-    
-  if( prereqtail != NIL(CELL) ) prereqtail->ce_link = NIL(CELL);
-
-  /* Clear out MARK bits used in duplicate checking.  I originally wanted
-   * to do this as the lists get processed but that got too error prone
-   * so I bit the bullit and added these two loops. */
-
-  for( cp=prereq;  cp != NIL(CELL); cp=cp->ce_link ) cp->ce_flag &= ~F_MARK;
-  for( cp=targets; cp != NIL(CELL); cp=cp->ce_link ) cp->ce_flag &= ~F_VISITED;
-
-  /* Check to see if the previous recipe was bound, if not the call
-   * Bind_rules_to_targets() to bind the recipe (_sv_rules) to the
-   * target(s) (_sv_targets). */
-  /* was:  if( _sv_rules != NIL(STRING) ) Bind_rules_to_targets( F_DEFAULT );*/
-  /* Only Add_recipe_to_list() sets _sv_rules and Bind_rules_to_targets()
-   * clears the (static) variables again.  Bind_rules_to_targets() is
-   * (should be) called after State is leaving RULE_SCAN in Parse().
-   * Abort if there are unbound recipes. FIXME: Remove this paragraph
-   * if this never occurs.  */
-  if( _sv_rules != NIL(STRING) )
-    Fatal( "Internal Error: _sv_rules not empty." );
-
-  /* Add the first recipe line to the list */
-  if( firstrcp != NIL( char ) )
-    Add_recipe_to_list( firstrcp, TRUE, FALSE );
-
-  /* Save these prior to calling _do_targets, since _build_graph needs the
-   * _sv_setdir value for matching edges. */
-  _sv_op     = op;
-  _sv_setdir = set_dir;
-
-  if( special )
-    /* _do_special() can alter *state */
-    _do_special( special, op, attr, set_dir, targets, prereq, state );
-  else
-    *state = _do_targets( op, attr, set_dir, targets, prereq );
-
-  if( (*state != RULE_SCAN) && (_sv_rules != NIL(STRING)) )
-    Fatal( "Unexpected recipe found." );
-
-  DB_RETURN( 1 );
-}
-
-
-PUBLIC int
-Rule_op( op )/*
-================
-   Check the passed in op string and map it to one of the rule operators */
-char *op;
-{
-   int ret = 0;
-
-   DB_ENTER( "rule_op" );
-   
-   if( *op == TGT_DEP_SEP ) {
-      ret = R_OP_CL;
-      op++;
-
-      /* All rule operations begin with a :, but may include any one of the
-       * four modifiers.  In order for the rule to be properly mapped we must
-       * check for each of the modifiers in turn, building up our return bit
-       * string. */
-
-      while( *op && ret )
-         switch( *op ) {
-        case ':': ret |= R_OP_DCL; op++; break;
-        case '!': ret |= R_OP_BG;  op++; break;
-        case '^': ret |= R_OP_UP;  op++; break;
-        case '-': ret |= R_OP_MI;  op++; break;
-        case '|': ret |= R_OP_OR;  op++; break;
-
-        default : ret  = 0;  /* an invalid modifier, chuck whole string */
-         }
-
-      if( *op != '\0' ) ret = 0;
-   }
-
-   DB_RETURN( ret );
-}
-
-
-PUBLIC void
-Add_recipe_to_list( rule, white_too, no_check )/*
-=================================================
-        Take the provided string and add it to the list of recipe lines
-    we are saving to be added to the list of targets we have built
-    previously.  If white_too == TRUE add the rule EVEN IF it contains only
-        an empty string (whitespace is handled by Def_recipe()). */
-char *rule;
-int  white_too;
-int  no_check;
-{
-   DB_ENTER( "Add_recipe_to_list" );
-
-   if( rule != NIL( char ) && (*rule != '\0' || white_too) ) {
-      DB_PRINT( "par", ("Adding recipe [%s]", rule) );
-      _sv_crule = Def_recipe( rule, _sv_crule, white_too, no_check );
-
-      /* If _sv_rules is not yet set this must be the first recipe line,
-       * remember it. */
-      if( _sv_rules == NIL(STRING) )
-         _sv_rules = _sv_crule;
-   }
-
-   DB_VOID_RETURN;
-}
-
-
-PUBLIC void
-Bind_rules_to_targets( flag )/*
-===============================
-        Take the recipe lines we have defined and bind them with proper attributes
-        to the targets that were previously defined in the parse.  The
-        attributes that get passed here are merged with those that are were
-        previously defined.  (namely attribute F_SINGLE) */
-int flag;
-{
-   CELLPTR tg;             /* pointer to current target in list */
-   LINKPTR lp;		   /* pointer to link cell		*/
-   int     magic;          /* TRUE if target of % or .xxx.yyy form */
-   int     tflag;          /* TRUE if we assigned targets here  */
-
-   DB_ENTER( "Bind_rules_to_targets" );
-
-   /* This line is needed since Parse may call us twice when the last
-    * GROUP rule appears at the end of file.  In this case the rules
-    * have already been bound and we want to ignore them. */
-
-   if( _sv_targets == NIL(CELL) ) { DB_VOID_RETURN; }
-
-   tflag  = FALSE;
-   flag  |= (_sv_flag & F_SINGLE);
-   flag  |= ((_sv_attr & A_GROUP) ? F_GROUP : 0);
-
-   for( tg = _sv_targets; tg != NIL(CELL); tg = tg->ce_link ) {
-      DB_PRINT( "par", ("Binding to %s, %04x", tg->CE_NAME, tg->ce_flag) );
-      magic = tg->ce_flag & F_PERCENT;
-
-
-      /* NOTE:  For targets that are magic or special we ignore any
-       * previously defined rules, ie. We throw away the old definition
-       * and use the new, otherwise we complain. */
-      if( !(tg->ce_flag & F_MULTI) && !magic && (tg->CE_RECIPE != NIL(STRING))
-      && !_sp_target && (_sv_rules != NIL(STRING)) )
-         Fatal( "Multiply defined recipe for target %s", tg->CE_NAME );
-
-      if( (magic || _sp_target) && (_sv_rules == NIL(STRING)) &&
-      !(tg->ce_flag & F_SPECIAL) && !_sv_globprq_only )
-         Warning( "Empty recipe for special or meta target %s", tg->CE_NAME );
-
-      if( magic ) {
-     CELLPTR ep;
-
-     for( ep=_sv_edgel; ep != NIL(CELL); ep=ep->ce_link ) {
-        DB_PRINT( "par", ("ep address: %#x", ep) );
-        /* %.xx :| '%.yy' abc xx '%.tt' ; touch $@
-         * loops here ... */
-        _set_attributes( _sv_attr, _sv_setdir, ep );
-        ep->ce_flag |= (F_TARGET|flag);
-
-        if( _sv_rules != NIL(STRING) ) {
-           ep->ce_recipe  = _sv_rules;
-           ep->ce_indprq  = _sv_ind_prq;
-        }
-     }
-      }
-      else {
-     tg->ce_attr |= _sv_attr;
-     tg->ce_flag |= flag;
-
-     if( _sv_rules != NIL(STRING) ) {
-        tg->ce_recipe  = _sv_rules;
-        tg->ce_flag   |= F_RULES | F_TARGET;
-
-        /* Bind the current set of prerequisites as belonging to the
-         * original recipe given for the target */
-        for( lp=tg->ce_prq; lp != NIL(LINK); lp = lp->cl_next )
-          if( !(lp->cl_flag & F_VISITED) ) lp->cl_flag |= F_TARGET;
-         }
-     else for( lp=tg->ce_prq; lp != NIL(LINK); lp = lp->cl_next )
-        lp->cl_flag |= F_VISITED;
-      }
-
-      tflag |= _add_root(tg);
-   }
-
-   if( tflag ) Target = TRUE;
-   if( _sv_setdir ) FREE(_sv_setdir);
-   _sv_rules   = NIL(STRING);
-   _sv_crule   = NIL(STRING);
-   _sv_targets = NIL(CELL);
-   _sv_ind_prq = NIL(LINK);
-   _sv_edgel   = NIL(CELL);
-   _sp_target  = FALSE;
-   _sv_globprq_only = 0;
-
-   DB_VOID_RETURN;
-}
-
-
-
-PUBLIC int
-Set_group_attributes( list )/*
-==============================
-    Scan list looking for the standard @,-,% and + (as in recipe line
-    defs) (+ is set but ignored for group recipes)
-    and set the flags accordingly so that they apply when we bind the
-    rules to the appropriate targets.
-    Return TRUE if group recipe start '[' was found, otherwise FALSE.  */
-char *list;
-{
-   int res = FALSE;
-   char *s;
-
-   if ( !((_sv_attr|Glob_attr)&A_IGNOREGROUP) ) {
-      s = DmStrSpn(list,"@-%+ \t");
-      res = (*s == '[');
-      if( res ) {
-     /* Check for non-white space characters after the [. */
-     for( s++; *s && iswhite(*s) ; s++ )
-        ;
-     if( *s )
-        Warning("Found non-white space character after '[' in [%s].", list);
-
-     _sv_attr |= Rcp_attribute(list);
-      }
-   }
-
-   return(res);
-}
-
-
-static void
-_do_special( special, op, attr, set_dir, target, prereq, state )/*
-==================================================================
-   Process a special target (always only a single target).  So far the only
-   special targets we have are those recognized by the _is_special function.
-   Some of the special targets can take recipes, they call _do_targets()
-   and (implicitly) set *state to to RULE_SCAN. Otherwise *state remains
-   unaffected, i.e. NORMAL_SCAN.
-
-   target is always only a single special target.
-   
-   NOTE:  For the cases of .IMPORT, and .INCLUDE, the cells created by the
-         parser are never freed.  This is due to the fact that it is too much
-      trouble to get them out of the hash table once they are defined, and
-      if they are per chance used again it will be ok, anyway, since the
-      cell is not really used by the code below.  */
-
-int	special;
-int	op;
-t_attr	attr;
-char	*set_dir;
-CELLPTR target;
-CELLPTR prereq;
-int     *state;
-{
-  HASHPTR	hp;		/* pointer to macro def cell		*/
-  CELLPTR	cp;		/* temporary pointer into cells list	*/
-  CELLPTR 	dp;		/* pointer to directory dir cell	*/
-  LINKPTR 	lp;		/* pointer at prerequisite list 	*/
-  char    	*dir;		/* current dir to prepend		*/
-  char    	*path;		/* resulting path to try to read	*/
-  char 	*name;		/* File name for processing a .INCLUDE	*/
-  char		*tmp;		/* temporary string pointer		*/
-  FILE 	*fil;		/* File descriptor returned by Openfile	*/
-
-  DB_ENTER( "_do_special" );
-
-  target->ce_flag = F_SPECIAL;	/* mark the target as special */
-
-  switch( special ) {
-  case ST_EXPORT:
-    for( ; prereq != NIL(CELL); prereq = prereq->ce_link ) {
-      DB_PRINT( "par", ("Exporting [%s]", prereq->CE_NAME) );
-      hp = GET_MACRO( prereq->CE_NAME );
-
-      if( hp != NIL(HASH) ) {
-        char *tmpstr = hp->ht_value;
-
-        if( tmpstr == NIL(char) ) tmpstr = "";
-
-        if( Write_env_string( prereq->CE_NAME, tmpstr ) != 0 )
-          Warning( "Could not export %s", prereq->CE_NAME );
-      }
-    }
-    break;
-
-    /* Simply cause the parser to fail on the next input read */
-  case ST_EXIT:
-    Skip_to_eof = TRUE;
-    break;
-
-  case ST_IMPORT:
-    for( ; prereq != NIL(CELL); prereq = prereq->ce_link ) {
-      char *tmpstr;
-
-      DB_PRINT( "par", ("Importing [%s]", prereq->CE_NAME) );
-
-      if( strcmp(prereq->CE_NAME, ".EVERYTHING") == 0 ) {
-        t_attr sattr = Glob_attr;
-        Glob_attr |= A_SILENT;
-
-        ReadEnvironment();
-
-        Glob_attr = sattr;
-      }
-      else {
-        tmpstr = Read_env_string( prereq->CE_NAME );
-
-        if( tmpstr != NIL(char) )
-          Def_macro(prereq->CE_NAME, tmpstr, M_EXPANDED|M_LITERAL);
-        else
-          if( !((Glob_attr | attr) & A_IGNORE) )
-            Fatal("Imported macro `%s' not found",prereq->CE_NAME);
-      }
-    }
-
-    attr &= ~A_IGNORE;
-    break;
-
-  case ST_INCLUDE:
-    {
-      int pushed     = FALSE;
-      int first      = (attr & A_FIRST);
-      int ignore     = (((Glob_attr | attr) & A_IGNORE) != 0);
-      int found      = FALSE;
-      int noinf      = (attr & A_NOINFER);
-      LINKPTR prqlnk = NIL(LINK);
-      LINKPTR prqlst = NIL(LINK);
-
-      if( prereq == NIL(CELL) )  Fatal( "No .INCLUDE file(s) specified" );
-
-      dp = Def_cell( ".INCLUDEDIRS" );
-
-      if( (attr & A_SETDIR) && *(dir = strchr(set_dir, '=')+1) )
-        pushed = Push_dir( dir, ".INCLUDE", ignore );
-
-      for( cp=prereq; cp != NIL(CELL); cp = cp->ce_link ) {
-        LINKPTR ltmp;
-        TALLOC(ltmp, 1, LINK);
-        ltmp->cl_prq = cp;
-
-        if( prqlnk == NIL(LINK) )
-          prqlst = ltmp;
-        else
-          prqlnk->cl_next = ltmp;
-
-        prqlnk = ltmp;
-      }
-
-      for( ; prqlst != NIL(LINK); FREE(prqlst), prqlst=prqlnk ) {
-        prqlnk = prqlst->cl_next;
-        cp     = prqlst->cl_prq;
-        name   = cp->CE_NAME;
-
-        /* Leave this here, it ensures that prqlst gets propely free'd */
-        if ( first && found )
-          continue;
-        
-        if( *name == '<' ) {
-          /* We have a file name enclosed in <....>
-           * so get rid of the <> arround the file name */
-
-          name++;
-          if( (tmp = strrchr( name, '>' )) != NIL( char ) )
-            *tmp = 0;
-
-          if( If_root_path( name ) )
-            fil = Openfile( name, FALSE, FALSE );
-          else
-            fil = NIL(FILE);
-        }
-        else
-          fil = Openfile( name, FALSE, FALSE );
-           
-        if( fil == NIL(FILE) && !If_root_path( name ) ) { /*if true ==> not found in current dir*/
-
-          /* Now we must scan the list of prerequisites for .INCLUDEDIRS
-           * looking for the file in each of the specified directories.
-           * if we don't find it then we issue an error.  The error
-           * message is suppressed if the .IGNORE attribute of attr is
-           * set.  If a file is found we call Parse on the file to
-           * perform the parse and then continue on from where we left
-           * off.  */
-
-          for(lp=dp->CE_PRQ; lp && fil == NIL(FILE); lp=lp->cl_next) {
-            dir  = lp->cl_prq->CE_NAME;
-            if( strchr(dir, '$') ) dir = Expand(dir);
-            path = Build_path( dir, name );
-
-            DB_PRINT( "par", ("Trying to include [%s]", path) );
-
-            fil = Openfile( path, FALSE, FALSE );
-            if( dir != lp->cl_prq->CE_NAME ) FREE(dir);
-          }
-        }
-
-        if (!noinf && fil == NIL(FILE)) {
-          t_attr glob = Glob_attr;
-          t_attr cattr = prqlst->cl_prq->ce_attr;
-
-          prqlst->cl_next = NIL(LINK);
-          Glob_attr |= (attr&A_IGNORE);
-          prqlst->cl_prq->ce_attr &= ~A_FRINGE;
-
-          if( Verbose & V_FILE_IO )
-            printf( "%s:  Inferring include file [%s].\n",
-                    Pname, name );
-          fil = TryFiles(prqlst);
-
-          Glob_attr = glob;
-          prqlst->cl_prq->ce_attr |= (cattr & A_FRINGE);
-        }
-
-        if( fil != NIL(FILE) ) {
-          if( Verbose & V_FILE_IO )
-            printf( "%s:  Parsing include file [%s].\n",
-                    Pname, name );
-          Parse( fil );
-          found = TRUE;
-        }
-        else if( !(ignore || first) )
-          Fatal( "Include file %s, not found", name );
-        else if( Verbose & V_FILE_IO )
-          printf( "%s:  Include file [%s] was not found.\n",
-                  Pname, name );
-      }
-
-      if ( !ignore && first && !found )
-        Fatal( "No include file was found" );
-
-      if( pushed ) Pop_dir(FALSE);
-      attr &= ~(A_IGNORE|A_SETDIR|A_FIRST|A_NOINFER);
-    }
-    break;
-     
-  case ST_SOURCE:
-    if( prereq != NIL(CELL) )
-      _do_targets( op & (R_OP_CL | R_OP_MI | R_OP_UP), attr, set_dir,
-                   target, prereq );
-    else {
-      /* The old semantics of .SOURCE were that an empty list of
-       * prerequisites clears the .SOURCE list.  So we must implement
-       * that here as a clearout prerequisite operation.  Since this is
-       * a standard operation with the :- opcode we can simply call the
-       * proper routine with the target cell and it should do the trick
-       */
-
-      if( op == R_OP_CL || (op & R_OP_MI) )
-        Clear_prerequisites( target );
-    }
-
-    op &= ~(R_OP_MI | R_OP_UP);
-    break;
-
-  case ST_KEEP:
-    if( Keep_state != NIL(char) ) break;
-    Def_macro( ".KEEP_STATE", "_state.mk", M_EXPANDED );
-    break;
-
-  case ST_REST:
-    /* The rest of the special targets can all take recipes, as such they
-     * must be able to affect the state of the parser. */
-
-    {
-      int s_targ = Target;
-
-      Target     = TRUE;
-      _sp_target = TRUE;
-      *state     = _do_targets( op, attr, set_dir, target, prereq );
-      Target     = s_targ;
-
-      target->ce_flag |= F_TARGET;
-
-      attr    = A_DEFAULT;
-      op      = R_OP_CL;
-    }
-    break;
-
-  default:break;
-  }
-      
-  if( op   != R_OP_CL   ) Warning( "Modifier(s) for operator ignored" );
-  if( attr != A_DEFAULT ) Warning( "Extra attributes ignored" );
-
-  DB_VOID_RETURN;
-}
-
-
-static int
-_do_targets( op, attr, set_dir, targets, prereq )/*
-===================================================
-   Evaluate the values derived from the current target definition
-   line. Helper functions _build_graph(), _do_magic(), _make_multi(),
-   _add_root(), _replace_cell(), _set_attributes(), Clear_prerequisites()
-   _stick_at_head(), Add_prerequisite() and _set_global_attr() are used.
-   If successfull "_sv_targets" is set to "targets".
-   Return RULE_SCAN if a recipe is expected to follow, otherwise
-   NORMAL_SCAN. */
-int	op;		/* rule operator                           */
-t_attr	attr;		/* attribute flags for current targets     */
-char	*set_dir;	/* value of setdir attribute               */
-CELLPTR targets;	/* list of targets (each cell maybe already
-             * defined by a previous target definition
-             * line.  */
-CELLPTR prereq;		/* list of prerequisites                   */
-{
-   CELLPTR	tg1;		/* temporary target pointer		*/
-   CELLPTR	tp1;		/* temporary prerequisite pointer	*/
-   LINKPTR      prev_cell;	/* pointer for .UPDATEALL processing	*/
-   char		*p;		/* temporary char pointer		*/
-   int          tflag = FALSE;	/* set to TRUE if we add target to root */
-   int	        ret_state = RULE_SCAN;  /* Return state */
-
-   DB_ENTER( "_do_targets" );
-
-   /* If .UPDATEALL is set sort the target list that was temporary linked
-    * with ce_link into a list using ce_link with ce_set pointing to the first
-    * element. */
-   /* FIXME: Check that .UPDATEALL and %-targets on one line work together. */
-   if( attr & A_UPDATEALL ) {
-      if( targets == NIL(CELL) )
-     Fatal( ".UPDATEALL attribute requires non-empty list of targets" );
-
-      if (targets->ce_set == NIL(CELL)) {
-     for(
-        prev_cell=CeMeToo(targets),tg1=targets->ce_link;
-        tg1 != NIL(CELL);
-        tg1=tg1->ce_link
-     ) {
-        if (tg1->ce_set)
-           Fatal( "Target [%s] appears on multiple .UPDATEALL lists",
-              tg1->CE_NAME);
-        tg1->ce_set = targets;
-        TALLOC(prev_cell->cl_next, 1, LINK);
-        prev_cell = prev_cell->cl_next;
-        prev_cell->cl_prq = tg1;
-     }
-     targets->ce_set = targets;
-      }
-      else {
-     LINKPTR ap;
-     CELLPTR tp;
-
-     tp = targets;
-     ap = CeMeToo(targets);
-     while (ap && tp && ap->cl_prq == tp && tp->ce_set == targets) {
-        ap = ap->cl_next;
-        tp = tp->ce_link;
-     }
-     if (ap || tp)
-        Fatal("Inconsistent .UPDATEALL lists for target [%s]",
-          targets->CE_NAME);
-      }
-      targets->ce_link = NIL(CELL);
-   }
-
-   for( tg1 = targets; tg1 != NIL(CELL); tg1 = tg1->ce_link ) {
-      /* Check if tg1 is already marked as a %-target, but not a magic
-       * (.xxx.yyy) target.  */
-      int purepercent = (tg1->ce_flag & F_PERCENT) && !(tg1->ce_flag & F_MAGIC);
-
-      /* Check each target.  Check for inconsistencies between :: and : rule
-       * sets.  :: may follow either : or :: but not the reverse.
-       *
-       * Any F_MULTI target (contains :: rules) is represented by a prerequisite
-       * list hanging off the main target cell where each of the prerequisites
-       * is a copy of the target cell but is not entered into the hash table.
-       */
-      if( !(op & R_OP_DCL ) && (tg1->ce_flag & F_MULTI) && !purepercent )
-     Fatal( "':' vs '::' inconsistency in rules for %s", tg1->CE_NAME );
-
-      if( purepercent ) {
-     /* Handle %-targets. */
-     CELLPTR cur;
-     CELLPTR tpq = NIL(CELL);
-     CELLPTR nprq = NULL;
-
-#ifdef DBUG
-     DB_PRINT( "%", ("Handling %%-target [%s : : <prerequisites follow, maybe empty>]",
-             tg1->CE_NAME) );
-     for(cur=prereq;cur;cur=cur->ce_link) {
-        DB_PRINT( "%", ("         %%-prerequisites : %s ", 
-                cur->CE_NAME ? cur->CE_NAME : "<empty>") );
-     }
-#endif
-
-     /* Handle indirect (global) prerequisites first. */
-     for(cur=prereq;cur;cur=cur->ce_link) {
-        char *name = cur->CE_NAME;
-        int   len  = strlen(name);
-
-        if( *name == '\'' && name[len-1]=='\'' ){
-           name[len-1] = '\0';
-           len = strlen(name+1)+1;
-           memmove(name,name+1,len);
-           /* add indirect prerequisite */
-           _add_indirect_prereq( cur );
-        }
-        else {
-           /* Sort all "other" prerequisits into tpq, with nprq
-        * pointing to the first element. */
-           if (tpq)
-          tpq->ce_link = cur;
-           else
-          nprq = cur;
-           tpq = cur;
-        }
-     }
-     /* Mark the last element of nprq. */
-     if(tpq)
-        tpq->ce_link=NIL(CELL);
-     else
-        nprq = NIL(CELL);
-
-     /* Handle "normal" prerequisites now. */
-
-     if ( op & R_OP_OR ) {
-        /* for op == ':|' transform:
-         * <%-target> :| <prereq_1> ... <prereq_n> ; <recipe>
-         * into:
-         * <%-target> : <prereq_1> ; <recipe>
-         * ..
-         * <%-target> : <prereq_n> ; <recipe>
-         */
-        for(tp1=nprq; tp1; tp1=tp1->ce_link) {
-           CELLPTR tmpcell = tp1->ce_link;
-           tp1->ce_link = NIL(CELL);
-           _build_graph(op,tg1,tp1);
-           tp1->ce_link = tmpcell;
-        }
-     }
-     else {
-        /* The inference mechanism for %-targets limits the number of
-         * (non-indirect) prerequisite to one, but an unlimited number
-         * of indirect prerequisites is possible. */
-        if ( nprq && nprq->ce_link && !(op & R_OP_OR))
-           Warning("More than one prerequisite\n"
-           "for %%-target. Use :| ruleop or indirect prerequisites.");
-
-        _build_graph(op,tg1,nprq);
-     }
-      }
-      else if( tg1->ce_flag & F_MAGIC &&
-           (p = _is_magic( tg1->CE_NAME )) != NIL(char) &&
-           _do_magic( op, p, tg1, prereq, attr, set_dir ) )
-    ; /* _do_magic() does all that is needed (if return value is TRUE). */
-      else if( op & R_OP_DCL ) {  /* op == :: */
-     CELLPTR tmp_cell = _make_multi(tg1);
-
-     /* Add the F_MULTI master to .TARGETS (If not set already).
-      * Do this here so that the member cell is not added instead
-      * when the recipies are bound in Bind_rules_to_targets(). */
-     tflag |= _add_root(tg1);
-
-     /* Replace the F_MULTI master with the member cell. */
-     targets = _replace_cell( targets, tg1, tmp_cell );
-
-    /* We have to set (add) the attributes also for the F_MULTI master
-     * target cell. As there is no recipe the setdir value is not
-     * needed. _set_attributes() that follows in approx. 8 lines
-     * will set the attributes for the F_MULTI member cell.  */
-     tg1->ce_attr |= (attr & ~A_SETDIR);
-
-     /* Now switch tg1 to the current (F_MULTI prereq.) target.
-      * All recipes have to be added to that cell and not to the
-      * F_MULTI master.  */
-     tg1 = tmp_cell;
-      }
-
-      if( !purepercent ) _set_attributes( attr, set_dir, tg1 );
-
-      /* Build the proper prerequisite list of the target.  If the `-',
-       * modifier was used clear the prerequisite list before adding any
-       * new prerequisites.  Else add them to the head/tail as appropriate.
-       *
-       * If the target has F_PERCENT set then no prerequisites are used. */
-
-      if( !(tg1->ce_flag & F_PERCENT) ) {
-     if( op & R_OP_MI ) Clear_prerequisites( tg1 ); /* op == :- */
-
-     if( (op & R_OP_UP) && (tg1->ce_prq != NIL(LINK)) ) /* op == :^ */
-        _stick_at_head( tg1, prereq );
-     else for( tp1=prereq; tp1 != NIL(CELL); tp1 = tp1->ce_link )
-        Add_prerequisite( tg1, tp1, FALSE, FALSE );
-      }
-      else if( op & (R_OP_MI | R_OP_UP) )
-     Warning( "Modifier(s) `^-' for %-meta target ignored" );
-   }
-
-   /* In case a F_MULTI member that was the first prerequisite of .TARGETS */
-   if(tflag)
-      Target = TRUE;
-
-   /* Check to see if we have NO targets but some attributes, i.e. an
-    * Attribute-Definition.  If so then apply all of the attributes to the
-    * complete list of prerequisites.  No recipes are allowed to follow. */
-
-   if( (targets == NIL(CELL)) && attr ) {
-      ret_state = NORMAL_SCAN;
-      if( prereq != NIL(CELL) )
-     for( tp1=prereq; tp1 != NIL(CELL); tp1 = tp1->ce_link )
-        _set_attributes( attr, set_dir, tp1 );
-      else
-     _set_global_attr( attr );
-   }
-
-   /* Now that we have built the lists of targets, the parser must parse the
-    * recipes if there are any.  However we must start the recipe list with the
-    * recipe specified as via the ; kludge, if there is one */
-   _sv_targets = targets;
-   _sv_attr    = attr;
-   _sv_flag    = ((op & R_OP_BG) ? F_SINGLE : F_DEFAULT);
-      
-   DB_RETURN( ret_state );
-}
-
-
-static int
-_do_magic( op, dot, target, prereq, attr, set_dir )/*
-=====================================================
-   This function investigates dot for being a magic target of the form
-   .<chars>.<chars> or .<chars> and creates the appropriate % rules for
-   that target.
-   If the target is given with an undefined syntax, i.e. with prerequisites,
-   then this function terminates early without creating % rules and
-   returns 0.
-   If successful the function returns 1.
-   
-   The function builds the % rule, `%.o : %.c'  from .c.o, and
-   `% : %.a' from .a */
-
-int	op;
-char    *dot;
-CELLPTR target;
-CELLPTR prereq;
-t_attr  attr;
-char    *set_dir;
-{
-   CELLPTR tg;
-   CELLPTR prq;
-   char    *tmp, *tmp2;
-
-   DB_ENTER( "_do_magic" );
-
-   DB_PRINT("%", ("Analysing magic target [%s]", target->CE_NAME));
-
-   if( prereq != NIL(CELL) ) {
-      Warning( "Ignoring AUGMAKE meta-target [%s] because prerequisites are present.", target->CE_NAME );
-      DB_RETURN(0);
-   }
-
-   if( dot == target->CE_NAME ) {    /* its of the form .a */
-      tg  = Def_cell( "%" );
-      tmp = _build_meta( target->CE_NAME );
-      prq = Def_cell( tmp );
-      FREE( tmp );
-
-      _build_graph( op, tg, prq );
-   }
-   else {
-      tmp = _build_meta( dot );
-      tg  = Def_cell( tmp );
-      FREE( tmp );
-
-      tmp = _build_meta( tmp2 = DmSubStr( target->CE_NAME, dot ) );
-      prq = Def_cell( tmp );
-      FREE( tmp  );
-      FREE( tmp2 );
-
-      _build_graph( op, tg, prq );
-   }
-
-   tg->ce_flag      |= F_PERCENT;
-   target->ce_flag  |= (F_MAGIC|F_PERCENT);
-
-   _set_attributes( attr, set_dir, tg );
-
-   DB_RETURN(1);
-}
-
-
-static CELLPTR
-_replace_cell( lst, cell, rep )/*
-=================================
-   Replace cell with rep in lst. Note if cell is not part of lst we are in
-   real trouble. */
-CELLPTR lst;
-CELLPTR cell;
-CELLPTR rep;
-{
-   register CELLPTR tp;
-   
-   if( lst == cell ) {
-      rep->ce_link = lst->ce_link;
-      lst = rep;
-   }
-   else {
-      for( tp=lst; tp->ce_link != cell && tp ; tp=tp->ce_link );
-      if( !tp )
-     Fatal( "Internal Error: cell not part of lst." );
-      rep->ce_link = tp->ce_link->ce_link;
-      tp->ce_link = rep;
-   }
-
-   return(lst);
-}
-
-
-static char *
-_build_meta( name )/*
-=====================
-   Check to see if the name is of the form .c~ if so and if Augmake
-   translation is enabled then return s.%.c, else return %.suff, where if the
-   suffix ends in '~' then leave it be.*/
-char *name;
-{
-   char *tmp;
-   int  test = (STOBOOL(Augmake) ? name[strlen(name)-1] == '~' : 0);
-
-   tmp = DmStrJoin( test ? "s.%" : "%", name, -1, FALSE);
-   if( test ) tmp[ strlen(tmp)-1 ] = '\0';
-
-   return(tmp);
-}
-
-
-static CELLPTR
-_build_graph( op, target, prereq )/*
-====================================
-   This function is called to build the graph for the % rule given by
-   target : prereq cell combination.  This function assumes that target
-   is a % target and that prereq is one or multiple non-indirect prerequisite.
-   It also assumes that target cell has F_PERCENT set already.
-
-   NOTE: If more than one prerequisite is present this function handles them
-   correctly but the lookup still only uses the first (BUG!).
-
-   R_OP_CL (:) rules replace existing rules if any, %.o :: %.c is meaningless.
-
-   The function always returns NIL(CELL). */
-int op;
-CELLPTR target;
-CELLPTR prereq;
-{
-   LINKPTR edl;
-   CELLPTR edge = 0;
-   CELLPTR tpq,cur;
-   int match;
-
-#ifdef DBUG
-   DB_ENTER( "_build_graph" );
-   DB_PRINT( "%", ("Building graph for [%s : <prerequisites follow, maybe empty>]",
-           target->CE_NAME) );
-   for(tpq=prereq;tpq;tpq=tpq->ce_link) {
-      DB_PRINT( "%", ("         %%-prerequisites : %s ", 
-              tpq->CE_NAME ? tpq->CE_NAME : "<empty>") );
-   }
-#endif
-
-   /* Currently multiple prerequisites are not (yet) handled correctly.
-    * We already issue a warning in _do_targets(), don't issue it here
-    * again.
-   if ( prereq && prereq->ce_link )
-      Warning( "Internal Error: more than one prerequisite in _build_graph." );
-    */
-
-   /* There cannot be more than one target name ( linked with
-    * (CeMeToo(target))->cl_next ) per %-target master.
-    * FIXME: remove this check after verifying that it never triggers. */
-   if ( (CeMeToo(target))->cl_next )
-      Fatal( "Internal Error: more than one target name in _build_graph." );
-
-   /* Search the list of prerequisites for the current target and see if
-    * any of them match the current %-meta's : prereq's pair.  NOTE that
-    * %-metas are built as if they were F_MULTI targets, i.e. the target
-    * definitions for the %-target members are stored in the prerequisites
-    * list of the master target. */
-   /* This relies on target->ce_prq being NULL if this is the first
-    * occurrence of this %-target and therefore not yet having a %-target
-    * master. */
-   match = FALSE;
-   for(edl=target->ce_prq; !match && edl != NIL(LINK); edl=edl->cl_next) {
-      LINKPTR l1,l2;
-      edge = edl->cl_prq;
-
-      DB_PRINT("%", ("Trying to match [%s]",edge?edge->CE_NAME:"(nil)"));
-
-      /* First we match the target sets, if this fails then we don't have to
-       * bother with the prerequisite sets.  The targets sets are sorted.
-       * this makes life very simple. */
-      /* ce_dir is handled per member target, no check needed for the
-       * master target. */
-
-      /* FIXME: We already checked above that there is only one target
-       * name. Remove the comparisons for following names. */
-      l1 = CeMeToo(target); /* Used by .UPDATEALL !!! */
-      l2 = CeMeToo(edge);
-      while(l1 && l2 && l1->cl_prq == l2->cl_prq) {
-     l1=l1->cl_next;
-     l2=l2->cl_next;
-      }
-      /* If both l1 and l2 are NULL we had a match. */
-      if (l1 || l2)
-     continue;
-
-      /* target sets match, so check prerequisites. */
-      if(    (!edge->ce_prq && !prereq) /* matches both empty - separate this. */
-      || (   edge->ce_prq
-          && (   edge->ce_dir == _sv_setdir
-          || (   edge->ce_dir
-              && _sv_setdir
-              && !strcmp(edge->ce_dir,strchr(_sv_setdir,'=')+1)
-             )
-         )
-         )
-      ) {
-     LINKPTR prql;
-     
-     /* this is a really gross way to compare two sets, it's n^2 but
-      * since the sets are assumed to always be tiny, it should be ok. */
-     for(tpq=prereq; tpq; tpq=tpq->ce_link) {
-        for(prql=edge->ce_prq;prql;prql=prql->cl_next)
-           if (prql->cl_prq == tpq)
-          break;
-
-        if(prql == NIL(LINK))
-           break;
-        
-        prql->cl_prq->ce_flag |= F_MARK;
-     }
-
-     if (tpq == NIL(CELL)) {
-        for(prql=edge->ce_prq;prql;prql=prql->cl_next)
-           if(!(prql->cl_prq->ce_flag & F_MARK))
-          break;
-
-        if(prql == NIL(LINK))
-        match = TRUE;
-     }
-
-     /* clean up the mark bits. */
-     for(prql=edge->ce_prq;prql;prql=prql->cl_next)
-        prql->cl_prq->ce_flag &= ~F_MARK;
-      }
-   }
-
-   if( match ) {
-      /* match is TRUE hence, we found an edge joining the target and the
-       * prerequisite so reset the new edge so that new values replace it. */
-      DB_PRINT( "%", ("It's an old edge") );
-
-      edge->ce_dir    = NIL(char);
-      edge->ce_flag  &= (F_PERCENT|F_MAGIC|F_DFA);
-      edge->ce_attr  &= A_NOINFER;
-   }
-   else {
-      DB_PRINT( "%", ("Adding a new edge") );
-
-      edge = _make_multi(target);
-
-      /* FIXME: There can be only one %-target. */
-      for(edl=CeMeToo(target);edl;edl=edl->cl_next) {
-     if( !((tpq=edl->cl_prq)->ce_flag & F_DFA) ) {
-        Add_nfa( tpq->CE_NAME );
-        tpq->ce_flag |= F_DFA;
-     }
-
-     edl->cl_prq->ce_set = edge;
-      }
-
-      edge->ce_all = target->ce_all;
-      target->ce_all.cl_next = NIL(LINK);
-      target->ce_set = NIL(CELL);
-      
-      /* Add all prerequisites to edge. */
-      for(tpq=prereq; tpq; tpq=tpq->ce_link)
-         Add_prerequisite(edge, tpq, FALSE, TRUE);
-   }
-
-   if( op & R_OP_DCL )
-   Warning("'::' operator for meta-target '%s' ignored, ':' operator assumed.",
-       target->CE_NAME );
-
-   /* If edge was already added we're in BIG trouble. */
-   /* Re-use cur as temporary variable. */
-   for( cur=_sv_edgel; cur != NIL(CELL); cur=cur->ce_link ) {
-      if( cur == edge )
-     Fatal( "Internal Error: edge already in _sv_edgel." );
-   }
-
-   edge->ce_link = _sv_edgel;
-   _sv_edgel = edge;
-   _sv_globprq_only = 0;
-
-   DB_RETURN(NIL(CELL));
-}
-
-
-static CELLPTR
-_make_multi( tg )/*
-===================
-   This function is called to convert tg into an F_MULTI target.
-   Return a pointer to the new member cell. 
-   I don't know what the author intended but the ce_index entry is only
-   used in this function (set to 0 for added targets) and undefined otherwise!
-   The undefined value is hopefully set to 0 by the C compiler as each added
-   target sets its ce_count to ++ce_index (==1). (FIXME) */
-CELLPTR tg;
-{
-   CELLPTR cp;
-
-   /* This creates a new master F_MULTI target if tg existed before as a normal
-    * target with prerequisites or recipes. */
-   if( !(tg->ce_flag & F_MULTI) && (tg->ce_prq || tg->ce_recipe) ) {
-      /* Allocate a new master cell. */
-      TALLOC(cp, 1, CELL);
-      *cp = *tg;
-
-      /* F_MULTI master */
-      tg->ce_prq    = NIL(LINK);
-      tg->ce_flag  |= F_RULES|F_MULTI|F_TARGET;
-      tg->ce_attr  |= A_SEQ;
-      tg->ce_recipe = NIL(STRING);
-      tg->ce_dir    = NIL(char);
-
-      /* F_MULTI member for preexisting elements */
-      cp->ce_count  = ++tg->ce_index;
-      cp->ce_cond   = NIL(STRING);
-      cp->ce_set    = NIL(CELL);
-      cp->ce_all.cl_prq = cp;
-      CeNotMe(cp)   = NIL(LINK);
-
-      Add_prerequisite(tg, cp, FALSE, TRUE);
-   }
-
-   /* Alocate memory for new member of F_MULTI target */
-   TALLOC(cp, 1, CELL);
-   *cp = *tg;
-
-   /* This is reached if the target already exists, but without having
-    * prerequisites or recepies. Morph it into a F_MULTI master cell. */
-   if( !(tg->ce_flag & F_MULTI) ) {
-      tg->ce_prq    = NIL(LINK);
-      tg->ce_flag  |= F_RULES|F_MULTI|F_TARGET;
-      tg->ce_attr  |= A_SEQ;
-      tg->ce_recipe = NIL(STRING);
-      tg->ce_dir    = NIL(char);
-      cp->ce_cond   = NIL(STRING);
-   }
-   /* This handles the case of adding an additional target as a 
-    * prerequisite to a F_MULTI target. */
-   else {
-      cp->ce_flag  &= ~(F_RULES|F_MULTI);
-      cp->ce_attr  &= ~A_SEQ;
-      cp->ce_prq    = NIL(LINK);
-      cp->ce_index  = 0;
-      cp->ce_cond   = NIL(STRING);
-   }
-   cp->ce_count = ++tg->ce_index;
-   cp->ce_flag |= F_TARGET;
-   cp->ce_set   = NIL(CELL);
-   cp->ce_all.cl_prq = cp;
-   CeNotMe(cp)  = NIL(LINK);
-   
-   Add_prerequisite(tg, cp, FALSE, TRUE);
-   return(cp);
-}
-
-
-static void
-_add_indirect_prereq( pq )/*
-==========================
-   Prerequisite is an indirect prerequisite for a %-target, add it to
-   the target's list of indirect prerequsites to add on match. */
-CELLPTR pq;
-{
-   register LINKPTR ln;
-
-   /* Only add to list of indirect prerequsites if it is not in already. */
-   for(ln=_sv_ind_prq; ln; ln=ln->cl_next)
-      if(strcmp(ln->cl_prq->CE_NAME,pq->CE_NAME) == 0)
-     return;
-
-   /* Not in, add it. */
-   TALLOC( ln, 1, LINK );
-   ln->cl_next = _sv_ind_prq;
-   ln->cl_prq  = pq;
-   _sv_ind_prq = ln;
-}
-
-
-
-static void
-_set_attributes( attr, set_dir, cp )/*
-======================================
-    Set the appropriate attributes for a cell */
-t_attr	attr;
-char	*set_dir;
-CELLPTR cp;
-{
-   char   *dir = 0;
-
-   DB_ENTER( "_set_attributes" );
-
-   /* If .SETDIR attribute is set then we have at least .SETDIR= in the
-    * set_dir string.  So go and fishout what is at the end of the =.
-    * If not set and not NULL then propagate it to the target cell. */
-
-   if( attr & A_SETDIR ) {
-      char *p;
-      if( (p = strchr( set_dir, '=' )) != NULL )
-         dir = p + 1;
-
-      if( cp->ce_dir )
-     Warning( "Multiple .SETDIR for %s ignored", cp->CE_NAME );
-      else if( *dir )
-         cp->ce_dir = DmStrDup(dir);
-   }
-   cp->ce_attr |= attr;		/* set rest of attributes for target */
-
-   DB_VOID_RETURN;
-}
-
-
-
-static void
-_set_global_attr( attr )/*
-==========================
-    Handle the setting of the global attribute functions based on
-    The attribute flags set in attr. */
-t_attr attr;
-{
-   t_attr flag;
-
-   /* Some compilers can't handle a switch on a long, and t_attr is now a long
-    * integer on some systems.  foey! */
-   for( flag = MAX_ATTR; flag; flag >>= 1 )
-      if( flag & attr ) {
-     if( flag == A_PRECIOUS)      Def_macro(".PRECIOUS",  "y", M_EXPANDED);
-     else if( flag == A_SILENT)   Def_macro(".SILENT",    "y", M_EXPANDED);
-     else if( flag == A_IGNORE )  Def_macro(".IGNORE",    "y", M_EXPANDED);
-     else if( flag == A_EPILOG )  Def_macro(".EPILOG",    "y", M_EXPANDED);
-     else if( flag == A_PROLOG )  Def_macro(".PROLOG",    "y", M_EXPANDED);
-     else if( flag == A_NOINFER ) Def_macro(".NOINFER",   "y", M_EXPANDED);
-     else if( flag == A_SEQ )     Def_macro(".SEQUENTIAL","y", M_EXPANDED);
-     else if( flag == A_SHELL )   Def_macro(".USESHELL",  "y", M_EXPANDED);
-     else if( flag == A_MKSARGS ) Def_macro(".MKSARGS",   "y", M_EXPANDED);
-#if !defined(__CYGWIN__)
-     else if( flag == A_SWAP )    Def_macro(".SWAP",      "y", M_EXPANDED);
-#else
-     else if( flag == A_WINPATH ) Def_macro(".WINPATH",   "y", M_EXPANDED);
-#endif
-      }
-
-   attr &= ~A_GLOB;
-   if( attr ) Warning( "Non global attribute(s) ignored" );
-}
-
-
-
-static void
-_stick_at_head( cp, pq )/*
-==========================
-    Add the prerequisite list to the head of the existing prerequisite
-    list */
-
-CELLPTR cp;  		/* cell for target node	*/
-CELLPTR pq;		/* list of prerequisites to add */
-{
-   DB_ENTER( "_stick_at_head" );
-
-   if( pq->ce_link != NIL(CELL) ) _stick_at_head( cp, pq->ce_link );
-   Add_prerequisite( cp, pq, TRUE, FALSE );
-
-   DB_VOID_RETURN;
-}
-
-
-
-static t_attr
-_is_attribute( name )/*
-=======================
-   Check the passed name against the list of valid attributes and return the
-   attribute index if it is, else return 0, indicating the name is not a valid
-   attribute.  The present attributes are defined in dmake.h as A_xxx #defines,
-   with the corresponding makefile specification:  (note they must be named
-   exactly as defined below)
-   
-   Valid attributes are:  .IGNORE, .SETDIR=, .SILENT, .PRECIOUS, .LIBRARY,
-                          .EPILOG, .PROLOG,  .LIBRARYM, .SYMBOL, .UPDATEALL,
-              .USESHELL, .NOINFER, .PHONY, .SWAP/.WINPATH, .SEQUENTIAL
-              .NOSTATE,  .MKSARGS, .IGNOREGROUP, .GROUP, .FIRST
-              .EXECUTE, .ERRREMOVE
-
-   NOTE:  The strcmp's are OK since at most three are ever executed for any
-          one attribute check, and that happens only when we can be fairly
-          certain we have an attribute.  */
-char *name;
-{
-   t_attr attr = 0;
-   
-   DB_ENTER( "_is_attribute" );
-   
-   if( *name++ == '.' )
-      switch( *name )
-      {
-         case 'E':
-        if( !strcmp(name, "EPILOG") )           attr = A_EPILOG;
-        else if( !strcmp(name, "EXECUTE")) 	    attr = A_EXECUTE;
-        else if( !strcmp(name, "ERRREMOVE"))    attr = A_ERRREMOVE;
-        else attr = 0;
-        break;
-
-     /* A_FIRST implies A_IGNORE, handled in ST_INCLUDE */
-         case 'F':
-        attr = (strcmp(name, "FIRST")) ? 0 : A_FIRST;
-        break;
-
-     case 'G': attr = (strcmp(name, "GROUP"))    ? 0 : A_GROUP;   break;
-         case 'L': attr = (strcmp(name, "LIBRARY"))  ? 0 : A_LIBRARY; break;
-         case 'M': attr = (strcmp(name, "MKSARGS"))  ? 0 : A_MKSARGS; break;
-
-         case 'I':
-        if( !strcmp(name, "IGNORE") )           attr = A_IGNORE;
-        else if( !strcmp(name, "IGNOREGROUP"))  attr = A_IGNOREGROUP;
-        else attr = 0;
-        break;
-
-         case 'N':
-        if( !strcmp(name, "NOINFER") )      attr = A_NOINFER;
-        else if( !strcmp(name, "NOSTATE"))  attr = A_NOSTATE;
-        else attr = 0;
-        break;
-
-         case 'U':
-        if( !strcmp(name, "UPDATEALL") )    attr = A_UPDATEALL;
-        else if( !strcmp(name, "USESHELL")) attr = A_SHELL;
-        else attr = 0;
-        break;
-
-         case 'P':
-            if( !strcmp(name, "PRECIOUS") )     attr = A_PRECIOUS;
-            else if( !strcmp(name, "PROLOG") )  attr = A_PROLOG;
-            else if( !strcmp(name, "PHONY") )   attr = A_PHONY;
-            else attr = 0;
-            break;
-
-         case 'S':
-            if( !strncmp(name, "SETDIR=", 7) )    attr = A_SETDIR;
-            else if( !strcmp(name, "SILENT") )    attr = A_SILENT;
-            else if( !strcmp(name, "SYMBOL") )    attr = A_SYMBOL;
-            else if( !strcmp(name, "SEQUENTIAL")) attr = A_SEQ;
-        /* A_SWAP has no meaning except for MSDOS. */
-            else if( !strcmp(name, "SWAP"))       attr = A_SWAP;
-            else attr = 0;
-            break;
-
-         case 'W': attr = (strcmp(name, "WINPATH"))  ? 0 : A_WINPATH; break;
-      }
-
-   DB_RETURN( attr );
-}
-
-
-
-static int
-_is_special( tg )/*
-===================
-   This function returns TRUE if the name passed in represents a special
-   target, otherwise it returns false.  A special target is one that has
-   a special meaning to dmake, and may require processing at the time that
-   it is parsed.
-   
-   Current Special targets are:
-    .GROUPPROLOG	.GROUPEPILOG	.INCLUDE	.IMPORT
-    .EXPORT		.SOURCE 	.SUFFIXES	.ERROR        .EXIT
-    .INCLUDEDIRS	.MAKEFILES	.REMOVE		.KEEP_STATE
-    .TARGETS	.ROOT
-*/
-char *tg;
-{
-   DB_ENTER( "_is_special" );
-   
-   if( *tg++ != '.' ) DB_RETURN( 0 );
-   
-   switch( *tg )
-   {
-      case 'E':
-         if( !strcmp( tg, "ERROR" ) )		DB_RETURN( ST_REST     );
-         else if( !strcmp( tg, "EXPORT" ) )	DB_RETURN( ST_EXPORT   );
-         else if( !strcmp( tg, "EXIT" ) )	DB_RETURN( ST_EXIT     );
-     break;
-
-      case 'G':
-     if( !strcmp( tg, "GROUPPROLOG" ))      DB_RETURN( ST_REST     );
-     else if( !strcmp( tg, "GROUPEPILOG" )) DB_RETURN( ST_REST     );
-     break;
-
-      case 'I':
-         if( !strcmp( tg, "IMPORT" ) )		DB_RETURN( ST_IMPORT   );
-         else if( !strcmp( tg, "INCLUDE" ) )	DB_RETURN( ST_INCLUDE  );
-     else if( !strcmp( tg, "INCLUDEDIRS" )) DB_RETURN( ST_REST     );
-     break;
-      
-      case 'K':
-         if( !strcmp( tg, "KEEP_STATE" ) )	DB_RETURN( ST_KEEP     );
-     break;
-
-      case 'M':
-         if( !strcmp( tg, "MAKEFILES" ) )	DB_RETURN( ST_REST     );
-     break;
-
-      case 'R':
-         if( !strcmp( tg, "REMOVE" ) )		DB_RETURN( ST_REST     );
-         else if( !strcmp( tg, "ROOT" ) )	DB_RETURN( ST_REST     );
-     break;
-
-      case 'S':
-         if( !strncmp( tg, "SOURCE", 6 ) )	DB_RETURN( ST_SOURCE   );
-         else if( !strncmp(tg, "SUFFIXES", 8 )) {
-            if  (Verbose & V_WARNALL)
-               Warning( "The .SUFFIXES target has no special meaning and is deprecated." );
-            DB_RETURN( ST_SOURCE   );
-     }
-     break;
-
-      case 'T':
-         if( !strcmp( tg, "TARGETS" ) )		DB_RETURN( ST_REST     );
-     break;
-   }
-   
-   DB_RETURN( 0 );
-}
-
-
-
-static int
-_is_percent( np )/*
-===================
-    return TRUE if np points at a string containing a % sign */
-char *np;
-{
-   return( (strchr(np,'%') && (*np != '\'' && np[strlen(np)-1] != '\'')) ?
-       TRUE : FALSE );
-}
-
-
-static char *
-_is_magic( np )/*
-=================
-   return NULL if np does not points at a string of the form
-      .<chars>.<chars>  or  .<chars>
-   where chars are "visible characters" for the current locale. If np is of the
-   first form we return a pointer to the second '.' and for the second form we
-   return a pointer to the '.'.
-
-   NOTE:  reject target if it contains / or begins with ..
-          reject also .INIT and .DONE because they are mentioned in the
-          man page. */
-char *np;
-{
-   register char *n;
-
-   n = np;
-   if( *n != '.' ) return( NIL(char) );
-   if (strchr(DirBrkStr, *(n+1))!=NULL || *(n+1) == '.' )
-      return (NIL(char));
-   if( !strcmp( n+1, "INIT" ) || !strcmp( n+1, "DONE" ) )
-      return (NIL(char));
-
-   for( n++; isgraph(*n) && (*n != '.'); n++ );
-
-   if( *n != '\0' ) {
-      if( *n != '.' )  return( NIL(char) );
-      for( np = n++; isgraph( *n ) && (*n != '.'); n++ );
-      if( *n != '\0' ) return( NIL(char) );
-   }
-   /* Until dmake 4.5 a .<suffix> target was ignored when AUGMAKE was
-    * set and evaluated as a meta target if unset (also for -A).
-    * To keep maximum compatibility accept this regardles of the AUGMAKE
-    * status. */
-
-   /* np points at the second . of .<chars>.<chars> string.
-    * if the special target is of the form .<chars> then np points at the
-    * first . in the token. */
-
-   return( np );
-}
-
-
-static int
-_add_root(tg)/*
-===============
-   Adds "tg" to the prerequisits list of "Targets" if "Target" is not TRUE,
-   i.e. to the list of targets that are to be build.
-   Instead io setting "Target" to TRUE, TRUE is returned as more targets
-   might be defined in the current makefile line and they all have to be
-   add to "Targets" in this case.  */
-
-CELLPTR tg;
-{
-   int res = FALSE;
-
-   if(tg == Targets)
-      return(TRUE);
-
-   if( !Target && !(tg->ce_flag & (F_SPECIAL|F_PERCENT)) ) {
-      Add_prerequisite(Targets, tg, FALSE, TRUE);
-
-      tg->ce_flag |= F_TARGET;
-      tg->ce_attr |= A_FRINGE;
-      res          = TRUE;
-   }
-
-   return(res);
-}
diff --git a/dmake/stamp-h b/dmake/stamp-h
deleted file mode 100755
index 9788f7023..000000000
--- a/dmake/stamp-h
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/dmake/startup/Makefile.am b/dmake/startup/Makefile.am
deleted file mode 100755
index ca907266c..000000000
--- a/dmake/startup/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-startupdir = $(datadir)/startup
-
-startup_DATA = startup.mk config.mk
-
-DIST_SUBDIRS = unix winnt
-SUBDIRS = @OS_TYPE@ 
diff --git a/dmake/startup/Makefile.in b/dmake/startup/Makefile.in
deleted file mode 100644
index 0bede9b62..000000000
--- a/dmake/startup/Makefile.in
+++ /dev/null
@@ -1,492 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-subdir = startup
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.mk.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = config.mk
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(startupdir)"
-startupDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(startup_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
-OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
-OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
-OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-startupdir = $(datadir)/startup
-startup_DATA = startup.mk config.mk
-DIST_SUBDIRS = unix winnt
-SUBDIRS = @OS_TYPE@ 
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  startup/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  startup/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-config.mk: $(top_builddir)/config.status $(srcdir)/config.mk.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-uninstall-info-am:
-install-startupDATA: $(startup_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(startupdir)" || $(mkdir_p) "$(DESTDIR)$(startupdir)"
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(startupDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(startupdir)/$$f'"; \
-	  $(startupDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-uninstall-startupDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(startupdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(startupdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-startupDATA
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-startupDATA
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-startupDATA install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-startupDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/startup/config.mk.in b/dmake/startup/config.mk.in
deleted file mode 100644
index b2429a8fb..000000000
--- a/dmake/startup/config.mk.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-
-OS            := @OS_TYPE@
-OSRELEASE     := @OS_VERSION@
-#OSENVIRONMENT := ???
diff --git a/dmake/startup/msdos/borland/bcc30/macros.mk b/dmake/startup/msdos/borland/bcc30/macros.mk
deleted file mode 100644
index 599ba52c0..000000000
--- a/dmake/startup/msdos/borland/bcc30/macros.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# MSDOS Borland-C customization.
-
-# Standard C-language command names and flags
-CC         *:= bcc		# C   compiler 
diff --git a/dmake/startup/msdos/borland/bcc40/macros.mk b/dmake/startup/msdos/borland/bcc40/macros.mk
deleted file mode 100644
index 599ba52c0..000000000
--- a/dmake/startup/msdos/borland/bcc40/macros.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# MSDOS Borland-C customization.
-
-# Standard C-language command names and flags
-CC         *:= bcc		# C   compiler 
diff --git a/dmake/startup/msdos/borland/bcc45/macros.mk b/dmake/startup/msdos/borland/bcc45/macros.mk
deleted file mode 100644
index 599ba52c0..000000000
--- a/dmake/startup/msdos/borland/bcc45/macros.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# MSDOS Borland-C customization.
-
-# Standard C-language command names and flags
-CC         *:= bcc		# C   compiler 
diff --git a/dmake/startup/msdos/borland/bcc50.32/macros.mk b/dmake/startup/msdos/borland/bcc50.32/macros.mk
deleted file mode 100644
index 599ba52c0..000000000
--- a/dmake/startup/msdos/borland/bcc50.32/macros.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# MSDOS Borland-C customization.
-
-# Standard C-language command names and flags
-CC         *:= bcc		# C   compiler 
diff --git a/dmake/startup/msdos/borland/bcc50/macros.mk b/dmake/startup/msdos/borland/bcc50/macros.mk
deleted file mode 100644
index 599ba52c0..000000000
--- a/dmake/startup/msdos/borland/bcc50/macros.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# MSDOS Borland-C customization.
-
-# Standard C-language command names and flags
-CC         *:= bcc		# C   compiler 
diff --git a/dmake/startup/msdos/borland/macros.mk b/dmake/startup/msdos/borland/macros.mk
deleted file mode 100644
index 1e8915171..000000000
--- a/dmake/startup/msdos/borland/macros.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# MSDOS Borland-C environment customization.
-
-.IF $(OSENVIRONMENT)
-   .INCLUDE .IGNORE .NOINFER : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
-
-# Standard C-language command names and flags
-CPP	   *:=			# C-preprocessor
-CFLAGS     *=			# C   compiler flags
-"C++"      *:=			# C++ Compiler
-"C++FLAGS" *=			# C++ Compiler flags
-
-AS         *:= tasm		# Assembler and flags
-ASFLAGS    *= 
-LD         *= tlink		# Loader and flags
-LDFLAGS    *=
-LDLIBS     *=			# Default libraries
-AR         *:= tlib		# archiver
-ARFLAGS    *= ????
-
-# Definition of Print command for this system.
-PRINT      *= print
-
-# Language and Parser generation Tools and their flags
-YACC	   *:= yacc		# standard yacc
-YFLAGS     *=
-LEX	   *:= lex		# standard lex
-LFLAGS     *=
-
-# Other Compilers, Tools and their flags
-PC	   *:= tpc		# pascal compiler
-RC	   *:= ???		# ratfor compiler
-FC	   *:= ???		# fortran compiler
diff --git a/dmake/startup/msdos/borland/tcc20/macros.mk b/dmake/startup/msdos/borland/tcc20/macros.mk
deleted file mode 100644
index 7d922e44d..000000000
--- a/dmake/startup/msdos/borland/tcc20/macros.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# MSDOS Turbo-C customization.
-
-# Standard C-language command names and flags
-CC         *:= tcc		# C   compiler 
diff --git a/dmake/startup/msdos/macros.mk b/dmake/startup/msdos/macros.mk
deleted file mode 100644
index 8f8c57c5a..000000000
--- a/dmake/startup/msdos/macros.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# Define additional MSDOS specific settings.
-#
-
-# Execution environment configuration.
-# Grab the current setting of COMSPEC.
-#
-.IMPORT .IGNORE : COMSPEC ROOTDIR
-
-# First check if SHELL is defined to be something other than COMSPEC.
-# If it is, then assume that SHELL is a Korn compatible shell like MKS's
-.IF $(SHELL) == $(NULL)
-   .IF $(COMSPEC) == $(NULL)
-      SHELL *:= $(ROOTDIR)$/bin$/sh$E
-   .ELSE
-      SHELL *:= $(COMSPEC)
-   .END
-.END
-GROUPSHELL *:= $(SHELL)
-
-# Process release-specific refinements, if any.
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/macros.mk
-
-# Applicable suffix definitions
-A *:= .lib	# Libraries
-E *:= .exe	# Executables
-F *:= .for	# Fortran
-O *:= .obj	# Objects
-P *:= .pas	# Pascal
-S *:= .asm	# Assembler sources
-V *:= 		# RCS suffix
-
-# Now set the remaining arguments depending on which SHELL we
-# are going to use.  COMSPEC (assumed to be command.com) or
-# MKS Korn shell.
-.IF $(SHELL) == $(COMSPEC)
-   SHELLFLAGS       *:= $(SWITCHAR)c
-   GROUPFLAGS       *:= $(SHELLFLAGS)
-   SHELLMETAS       *:= "<>|
-   GROUPSUFFIX      *:= .bat
-   DIVFILE          *=  $(TMPFILE:s,/,\,)
-   RM               *=  del
-   RMFLAGS          *=
-   MV	            *=  rename
-   __.DIVSEP-sh-yes *:= \\
-   __.DIVSEP-sh-no  *:= \\
-.ELSE
-   SHELLFLAGS       *:= -c
-   GROUPFLAGS       *:= 
-   SHELLMETAS       *:= *";?<>|()&][$$\#`'
-   GROUPSUFFIX      *:= .ksh
-   .MKSARGS         *:= yes
-   RM               *=  $(ROOTDIR)$/bin$/rm
-   RMFLAGS          *=  -f
-   MV	            *=  $(ROOTDIR)$/bin$/mv
-   DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}},)
-   __.DIVSEP-sh-yes *:= \\\
-   __.DIVSEP-sh-no  *:= \\
-.ENDIF
-
-
-# Does not respect case of filenames.
-.DIRCACHERESPCASE := no
diff --git a/dmake/startup/msdos/microsft/macros.mk b/dmake/startup/msdos/microsft/macros.mk
deleted file mode 100644
index 3891f84fd..000000000
--- a/dmake/startup/msdos/microsft/macros.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# MSDOS Microsoft-C environment customization.
-
-.IF $(OSENVIRONMENT)
-   .INCLUDE .IGNORE .NOINFER : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
-
-# Standard C-language command names and flags
-CC         *:= cl		# C   compiler 
-CPP	   *:=			# C-preprocessor
-CFLAGS     *=			# C   compiler flags
-"C++"      *:=			# C++ Compiler
-"C++FLAGS" *=			# C++ Compiler flags
-
-AS         *:= masm		# Assembler and flags
-ASFLAGS    *= 
-LD         *= link		# Loader and flags
-LDFLAGS    *=
-LDLIBS     *=			# Default libraries
-AR         *:= lib		# archiver
-ARFLAGS    *= ????
-
-# Definition of Print command for this system.
-PRINT      *= print
-
-# Language and Parser generation Tools and their flags
-YACC	   *:= yacc		# standard yacc
-YFLAGS     *=
-LEX	   *:= lex		# standard lex
-LFLAGS     *=
-
-# Other Compilers, Tools and their flags
-PC	   *:= ???		# pascal compiler
-RC	   *:= ???		# ratfor compiler
-FC	   *:= ???		# fortran compiler
diff --git a/dmake/startup/msdos/recipes.mk b/dmake/startup/msdos/recipes.mk
deleted file mode 100644
index 39a5965e8..000000000
--- a/dmake/startup/msdos/recipes.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Define additional MSDOS specific build recipes.
-#
-
-# Executables
-   %$E .SWAP : %$O ; $(CC) $(LDFLAGS) -o$@ $< $(LDLIBS)
-   %$O       : %$S ; $(AS) $(ASFLAGS) $(<:s,/,\)
-
-# Process release-specific refinements, if any.
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/recipes.mk
diff --git a/dmake/startup/msdos/zortech/macros.mk b/dmake/startup/msdos/zortech/macros.mk
deleted file mode 100644
index f9166150f..000000000
--- a/dmake/startup/msdos/zortech/macros.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# MSDOS Zortech-C environment customization.
-
-# Standard C-language command names and flags
-CC         *:= ztc		# C   compiler 
-CPP	   *:=			# C-preprocessor
-CFLAGS     *=			# C   compiler flags
-"C++"      *:=			# C++ Compiler
-"C++FLAGS" *=			# C++ Compiler flags
-
-AS         *:= masm		# Assembler and flags
-ASFLAGS    *= 
-LD         *= blink		# Loader and flags
-LDFLAGS    *=
-LDLIBS     *=			# Default libraries
-AR         *:= ????		# archiver
-ARFLAGS    *= ????
-
-# Definition of Print command for this system.
-PRINT      *= print
-
-# Language and Parser generation Tools and their flags
-YACC	   *:= yacc		# standard yacc
-YFLAGS     *=
-LEX	   *:= lex		# standard lex
-LFLAGS     *=
-
-# Other Compilers, Tools and their flags
-PC	   *:= ???		# pascal compiler
-RC	   *:= ???		# ratfor compiler
-FC	   *:= ???		# fortran compiler
diff --git a/dmake/startup/os2/ibm/macros.mk b/dmake/startup/os2/ibm/macros.mk
deleted file mode 100644
index 4b848d93c..000000000
--- a/dmake/startup/os2/ibm/macros.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# OS/2 1.3 and 2.1 specific customization.
-
-# Standard C-language command names and flags
-CC         *:= icc		# C   compiler 
-CPP	   *:=			# C-preprocessor
-CFLAGS     *=			# C   compiler flags
-"C++"      *:=			# C++ Compiler
-"C++FLAGS" *=			# C++ Compiler flags
-
-AS         *:= masm		# Assembler and flags
-ASFLAGS    *= 
-LD         *= link386		# Loader and flags
-LDFLAGS    *=
-LDLIBS     *=			# Default libraries
-AR         *:= lib		# archiver
-ARFLAGS    *= ????
-
-# Definition of Print command for this system.
-PRINT      *= print
-
-# Language and Parser generation Tools and their flags
-YACC	   *:= yacc		# standard yacc
-YFLAGS     *=
-LEX	   *:= lex		# standard lex
-LFLAGS     *=
-
-# Other Compilers, Tools and their flags
-PC	   *:= ???		# pascal compiler
-RC	   *:= ???		# ratfor compiler
-FC	   *:= ???		# fortran compiler
diff --git a/dmake/startup/os2/macros.mk b/dmake/startup/os2/macros.mk
deleted file mode 100644
index 08c829ba0..000000000
--- a/dmake/startup/os2/macros.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# Define additional OS/2 specific macros.
-#
-
-# Process release-specific refinements, if any.
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/macros.mk
-
-# Execution environment configuration.
-# Grab the current setting of COMSPEC.
-#
-.IMPORT .IGNORE : COMSPEC ROOTDIR
-
-# First check if SHELL is defined to be something other than COMSPEC.
-# If it is assume that SHELL is a Korn compatible shell like MKS's
-.IF $(SHELL) == $(NULL)
-   .IF $(COMSPEC) == $(NULL)
-      SHELL *:= $(ROOTDIR)$/bin$/sh$E
-   .ELSE
-      SHELL *:= $(COMSPEC)
-   .END
-.END
-GROUPSHELL *:= $(SHELL)
-
-# Directory entries are case incensitive
-.DIRCACHERESPCASE *:= no
-
-# Applicable suffix definitions
-A *:= .lib	# Libraries
-E *:= .exe	# Executables
-F *:= .for	# Fortran
-O *:= .obj	# Objects
-P *:= .pas	# Pascal
-S *:= .asm	# Assembler sources
-V *:= 		# RCS suffix
-
-# Now set the remaining arguments depending on which SHELL we
-# are going to use.  COMSPEC (assumed to be command.com) or
-# MKS Korn shell.
-.IF $(SHELL) == $(COMSPEC)
-   SHELLFLAGS       *:= $(SWITCHAR)c
-   GROUPFLAGS       *:= $(SHELLFLAGS)
-   SHELLMETAS       *:= *"?<>
-   GROUPSUFFIX      *:= .bat
-   DIRSEPSTR        *:= \\\
-   DIVFILE          *=  $(TMPFILE:s,/,\,)
-   RM               *=  del
-   RMFLAGS          *=
-   MV	            *=  rename
-.ELSE
-   SHELLFLAGS       *:= -c
-   GROUPFLAGS       *:= 
-   SHELLMETAS       *:= *"?<>|()&][$$\#`'
-   GROUPSUFFIX      *:= .ksh
-   .MKSARGS         *:= yes
-   RM               *=  $(ROOTDIR)$/bin$/rm
-   RMFLAGS          *=  -f
-   MV	            *=  $(ROOTDIR)$/bin$/mv
-   DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}},)
-   __.DIVSEP-sh-yes !:= \\\
-   __.DIVSEP-sh-no  !:= \\
-.ENDIF
diff --git a/dmake/startup/qssl/macros.mk b/dmake/startup/qssl/macros.mk
deleted file mode 100644
index de89485e8..000000000
--- a/dmake/startup/qssl/macros.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# QNX Specific macro definitions
-#
-
-# Primary suffixes in common use
-A       *:= .lib		# Libraries
-
-# Standard C-language command names and flags
-AS      *:= 			# Don't have an assembler
-
-AR      *:= wlib		# archiver
-ARFLAGS *= 
diff --git a/dmake/startup/qssl/qnx/macros.mk b/dmake/startup/qssl/qnx/macros.mk
deleted file mode 100644
index de89485e8..000000000
--- a/dmake/startup/qssl/qnx/macros.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# QNX Specific macro definitions
-#
-
-# Primary suffixes in common use
-A       *:= .lib		# Libraries
-
-# Standard C-language command names and flags
-AS      *:= 			# Don't have an assembler
-
-AR      *:= wlib		# archiver
-ARFLAGS *= 
diff --git a/dmake/startup/qssl/qnx/recipes.mk b/dmake/startup/qssl/qnx/recipes.mk
deleted file mode 100644
index 4458b4392..000000000
--- a/dmake/startup/qssl/qnx/recipes.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Define additional QNX specific build recipes.
-#
-
-# Recipe to make archive files.
-# --Figure out what to do about the librarian--
-%$A .GROUP :
-    $(AR) $(ARFLAGS) $@ $?
-    $(RM) $(RMFLAGS) $?
diff --git a/dmake/startup/qssl/recipes.mk b/dmake/startup/qssl/recipes.mk
deleted file mode 100644
index 4458b4392..000000000
--- a/dmake/startup/qssl/recipes.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Define additional QNX specific build recipes.
-#
-
-# Recipe to make archive files.
-# --Figure out what to do about the librarian--
-%$A .GROUP :
-    $(AR) $(ARFLAGS) $@ $?
-    $(RM) $(RMFLAGS) $?
diff --git a/dmake/startup/startup.mk b/dmake/startup/startup.mk
deleted file mode 100644
index 524ad1efb..000000000
--- a/dmake/startup/startup.mk
+++ /dev/null
@@ -1,211 +0,0 @@
-# This is the root DMAKE startup file.
-#
-# Definitions common to all environments are given at the root.
-# Definitions parameterized at the root have their parameters specified
-# in sub-makefiles which are included based on the values of the three
-# make variables:
-#
-#	OS		- core operating system flavour
-#	OSRELEASE	- specific release of the operating system
-#	OSENVIRONMENT	- software construction environment in use
-# 
-# See the file 'summary', found in this directory for a list of
-# environments supported by this release.
-
-# Disable warnings for macros given on the command line but redefined here.
-__.silent !:= $(.SILENT)	# Preserve user's .SILENT flag
-.SILENT   !:= yes
-
-# startup.mk configuration parameters, for each, set it to non-null if you wish
-# to enable the named facility.
-__.HAVE_RCS  !:= yes 		# yes => RCS  is installed.
-__.HAVE_SCCS !:=    		# yes => SCCS is installed.
-__.DEFAULTS  !:= yes		# yes => define default construction rules.
-__.EXECS     !:= yes            # yes => define how to build executables.
-
-# Grab key definitions from the environment
-# The variables OS OSRELEASE OSENVIRONMENT were removed from this
-# list because of windows. See issue 43254 for details. 
-.IMPORT .IGNORE : TMPDIR SHELL
-
-# Default DMAKE configuration, if not overriden by environment
-.INCLUDE .NOINFER $(!null,$(OS) .IGNORE) : $(INCFILENAME:d)config.mk
-
-# Look for a local defaults configuration
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)local.mk
-
-# Define the directory separator string.
-/ *=  $(DIRSEPSTR)
-
-# Customize macro definitions based on setings of OS, OSRELEASE and
-# OSENVIRONMENT, this must come before the default macro definitions which
-# follow.
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OS)$/macros.mk
-
-# ----------------- Default Control Macro definitions -----------------------
-# Select appropriate defaults for basic macros
-   MAKE          *=  $(MAKECMD) -S $(MFLAGS)
-   TMPDIR        *:= $/tmp
-   DIVFILE       *=  $(TMPFILE)
-   AUGMAKE       *:= no
-
-# Recipe execution configuration
-   SHELL	 *:= $/bin$/sh
-   SHELLFLAGS	 *:= -ce
-   GROUPSHELL	 *:= $(SHELL)
-   GROUPFLAGS	 *:= 
-   SHELLMETAS	 *:= |();&<>?*][$$:\\#`'"
-   GROUPSUFFIX	 *:=
-
-# Intermediate target removal configuration
-   RM            *:= $/bin$/rm
-   RMFLAGS       *=  -f
-   RMTARGET      *=  $<
-
-# Default recipe that is used to remove intermediate targets.
-.REMOVE :; $(RM) $(RMFLAGS) $(RMTARGET)
-
-# Check and enable AUGMAKE extensions for SYSV compatibility
-.IF $(AUGMAKE)
-   "@B" != $(@:b)
-   "@D" != $(@:d)
-   "@F" != $(@:f)
-   "*B" != $(*:b)
-   "*D" != $(*:d)
-   "*F" != $(*:f)
-   "<B" != $(<:b)
-   "<D" != $(<:d)
-   "<F" != $(<:f)
-   "?B" != $(?:b)
-   "?F" != $(?:f)
-   "?D" != $(?:d)
-.ENDIF
-
-# Directory caching configuration.
-  .DIRCACHE         *:= yes
-  .DIRCACHERESPCASE *:= yes
-
-# Define the special NULL Prerequisite
-NULLPRQ *:= __.NULLPRQ
-
-# ---------- Default Construction Macro and Rule definitions --------------
-# The construction rules may be customized further in subsequent recipes.mk
-# files.
-.IF $(__.DEFAULTS)
-   # Primary suffixes in common use
-   A          *:= .a		# Libraries
-   E          *:= 		# Executables
-   F          *:= .f		# Fortran
-   O          *:= .o		# Objects
-   P          *:= .p		# Pascal
-   S          *:= .s		# Assembler sources
-   V          *:= ,v		# RCS suffix
-   YTAB	      *:= y.tab		# name-stem for yacc output files.
-   LEXYY      *:= lex.yy	# lex output file
-
-   # Standard C-language command names and flags
-   CPP	      *:= $/lib$/cpp	# C-preprocessor
-   CC         *:= cc		# C   compiler 
-   CFLAGS     *=		# C   compiler flags
-   "C++"      *:= CC		# C++ Compiler
-   "C++FLAGS" *=                # C++ Compiler flags
-
-   AS         *:= as		# Assembler and flags
-   ASFLAGS    *= 
-
-   LD         *= $(CC)		# Loader and flags
-   LDFLAGS    *=
-   LDLIBS     *=		# Default libraries
-
-   AR         *:= ar		# archiver
-   ARFLAGS    *= -rv
-
-   # Definition of Print command for this system.
-   PRINT      *= lp
-
-   # Language and Parser generation Tools and their flags
-   YACC	      *:= yacc		# standard yacc
-   YFLAGS     *=
-   LEX	      *:= lex		# standard lex
-   LFLAGS     *=
-
-   # Other Compilers, Tools and their flags
-   PC	      *:= pc		# pascal compiler
-   RC	      *:= f77		# ratfor compiler
-   FC	      *:= f77		# fortran compiler
-   MV	      *:= $/bin$/mv     # File rename command
-
-   # Implicit generation rules for making inferences.
-   # lex and yacc rules
-   %.c : %.y %.Y
-    $(YACC) $(YFLAGS) $<
-    $(MV) $(YTAB).c $@
-
-   %.c : %.l %.L
-    $(LEX) $(LFLAGS) $<
-    $(MV) $(LEXYY).c $@
-
-   # Rules for making *$O
-   %$O : %.c ; $(CC) $(CFLAGS) -c $<
-   %$O : %$P ; $(PC) $(PFLAGS) -c $<
-   %$O : %$S ; $(AS) $(ASFLAGS) -o $@ $<
-   %$O : %.cl ; class -c $<
-   %$O :| %.e %.r %.F %$F
-    $(FC) $(RFLAGS) $(EFLAGS) $(FFLAGS) -c $<
-
-   # Defibe how to build simple executables
-   .IF $(__.EXECS)
-      %$E : %$O ; $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS)
-   .ENDIF
-
-   # Recipe to make archive files, defined only if we have
-   # an archiver defined.
-   .IF $(AR)
-      %$A .SWAP .GROUP :
-    $(AR) $(ARFLAGS) $@ $?
-    $(RM) $(RMFLAGS) $?
-   .ENDIF
-
-   # RCS support
-   .IF $(__.HAVE_RCS)
-      CO      *:= co		# check out for RCS
-      COFLAGS !+= -q
-
-      % : $$(@:d)RCS$$/$$(@:f)$V
-    -$(CO) $(COFLAGS) $(null,$(@:d) $@ $(<:d:s/RCS/)$@)
-      .NOINFER : $$(@:d)RCS$$/$$(@:f)$V
-
-      .IF $V
-         % : %$V
-        -$(CO) $(COFLAGS) $(null,$(@:d) $@ $(<:d:s/RCS/)$@)
-         .NOINFER : %$V
-      .ENDIF
-   .END
-
-   # SCCS support
-   .IF $(__.HAVE_SCCS)
-      GET     *:= get
-      GFLAGS  !+=
-
-      % : "$$(null,$$(@:d) s.$$@ $$(@:d)s.$$(@:f))"
-    -$(GET) $(GFLAGS) $@
-      .NOINFER : "$$(null,$$(@:d) s.$$@ $$(@:d)s.$$(@:f))"
-   .END
-
-   # Customize default recipe definitions for OS, OSRELEASE, etc. settings.
-   .INCLUDE .NOINFER .IGNORE: $(INCFILENAME:d)$(OS)$/recipes.mk
-.ENDIF
-
-
-# Finally, define the default construction strategy
-.ROOT .PHONY .NOSTATE .SEQUENTIAL :- .INIT .TARGETS .DONE;
-.INIT .DONE .PHONY: $(NULLPRQ);
-
-# Define the NULL Prerequisite as having no recipe.
-$(NULLPRQ) .PHONY :;
-
-# Reset warnings back to previous setting.
-.SILENT !:= $(__.silent)
-
-# Check for a Local project file, gets parsed before user makefile.
-.INCLUDE .IGNORE .NOINFER: "project.mk"
diff --git a/dmake/startup/summary b/dmake/startup/summary
deleted file mode 100644
index 4ae18860d..000000000
--- a/dmake/startup/summary
+++ /dev/null
@@ -1,3 +0,0 @@
-The following is a summary of the supported dmake environments.  When you
-issue the build command 'dmake tag' where tag is the target environment it
-will build one of these by default.
diff --git a/dmake/startup/template.mk b/dmake/startup/template.mk
deleted file mode 100644
index 58544ee35..000000000
--- a/dmake/startup/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= xxOSxx
-   OSRELEASE     *:= xxOSRELEASExx
-   OSENVIRONMENT *:= xxOSENVIRONMENTxx
diff --git a/dmake/startup/templates/mac/template.mk b/dmake/startup/templates/mac/template.mk
deleted file mode 100644
index 0cf10289c..000000000
--- a/dmake/startup/templates/mac/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= mac
-   OSRELEASE     *:= 
-   OSENVIRONMENT *:= 
diff --git a/dmake/startup/templates/msdos/borland/bcc30/template.mk b/dmake/startup/templates/msdos/borland/bcc30/template.mk
deleted file mode 100644
index df574e09c..000000000
--- a/dmake/startup/templates/msdos/borland/bcc30/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= bcc30
diff --git a/dmake/startup/templates/msdos/borland/bcc40/template.mk b/dmake/startup/templates/msdos/borland/bcc40/template.mk
deleted file mode 100644
index 30a27692f..000000000
--- a/dmake/startup/templates/msdos/borland/bcc40/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= bcc40
diff --git a/dmake/startup/templates/msdos/borland/bcc45/template.mk b/dmake/startup/templates/msdos/borland/bcc45/template.mk
deleted file mode 100644
index 83b5e0090..000000000
--- a/dmake/startup/templates/msdos/borland/bcc45/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= bcc45
diff --git a/dmake/startup/templates/msdos/borland/bcc50/template.mk b/dmake/startup/templates/msdos/borland/bcc50/template.mk
deleted file mode 100644
index 51b575677..000000000
--- a/dmake/startup/templates/msdos/borland/bcc50/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= bcc50
diff --git a/dmake/startup/templates/msdos/borland/tcc20/template.mk b/dmake/startup/templates/msdos/borland/tcc20/template.mk
deleted file mode 100644
index 3cac6b22a..000000000
--- a/dmake/startup/templates/msdos/borland/tcc20/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= tcc20
diff --git a/dmake/startup/templates/msdos/microsft/msc51/template.mk b/dmake/startup/templates/msdos/microsft/msc51/template.mk
deleted file mode 100644
index 7174197d6..000000000
--- a/dmake/startup/templates/msdos/microsft/msc51/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= microsft
-   OSENVIRONMENT *:= msc51
diff --git a/dmake/startup/templates/msdos/microsft/msc60/template.mk b/dmake/startup/templates/msdos/microsft/msc60/template.mk
deleted file mode 100644
index a147c694c..000000000
--- a/dmake/startup/templates/msdos/microsft/msc60/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= msdos
-   OSRELEASE     *:= microsft
-   OSENVIRONMENT *:= msc60
diff --git a/dmake/startup/templates/os2/ibm/icc/template.mk b/dmake/startup/templates/os2/ibm/icc/template.mk
deleted file mode 100644
index c9c5adbf2..000000000
--- a/dmake/startup/templates/os2/ibm/icc/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= os2
-   OSRELEASE     *:= ibm
-   OSENVIRONMENT *:= icc
diff --git a/dmake/startup/templates/qssl/template.mk b/dmake/startup/templates/qssl/template.mk
deleted file mode 100644
index e7e9837ae..000000000
--- a/dmake/startup/templates/qssl/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= qssl
-   OSRELEASE     *:= 
-   OSENVIRONMENT *:= 
diff --git a/dmake/startup/templates/tos/template.mk b/dmake/startup/templates/tos/template.mk
deleted file mode 100644
index 91ce656f1..000000000
--- a/dmake/startup/templates/tos/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= tos
-   OSRELEASE     *:= 
-   OSENVIRONMENT *:= 
diff --git a/dmake/startup/templates/unix/386ix/template.mk b/dmake/startup/templates/unix/386ix/template.mk
deleted file mode 100644
index e59d37c7c..000000000
--- a/dmake/startup/templates/unix/386ix/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= 386ix
-   OSENVIRONMENT *:= 
diff --git a/dmake/startup/templates/unix/bsd43/template.mk b/dmake/startup/templates/unix/bsd43/template.mk
deleted file mode 100644
index 14a7cab8e..000000000
--- a/dmake/startup/templates/unix/bsd43/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= bsd43
-   OSENVIRONMENT *:= 
diff --git a/dmake/startup/templates/unix/bsd43/uw/template.mk b/dmake/startup/templates/unix/bsd43/uw/template.mk
deleted file mode 100644
index 6afe91c1f..000000000
--- a/dmake/startup/templates/unix/bsd43/uw/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= bsd43
-   OSENVIRONMENT *:= uw
diff --git a/dmake/startup/templates/unix/bsd43/vf/template.mk b/dmake/startup/templates/unix/bsd43/vf/template.mk
deleted file mode 100644
index 395cd4718..000000000
--- a/dmake/startup/templates/unix/bsd43/vf/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= bsd43
-   OSENVIRONMENT *:= vf
diff --git a/dmake/startup/templates/unix/coherent/ver40/template.mk b/dmake/startup/templates/unix/coherent/ver40/template.mk
deleted file mode 100644
index ef23550cf..000000000
--- a/dmake/startup/templates/unix/coherent/ver40/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= coherent
-   OSENVIRONMENT *:= ver40
diff --git a/dmake/startup/templates/unix/coherent/ver42/template.mk b/dmake/startup/templates/unix/coherent/ver42/template.mk
deleted file mode 100644
index e5dd9f99f..000000000
--- a/dmake/startup/templates/unix/coherent/ver42/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= coherent
-   OSENVIRONMENT *:= ver42
diff --git a/dmake/startup/templates/unix/linux/gnu/template.mk b/dmake/startup/templates/unix/linux/gnu/template.mk
deleted file mode 100644
index a0bcef640..000000000
--- a/dmake/startup/templates/unix/linux/gnu/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= linux
-   OSENVIRONMENT *:= gnu
diff --git a/dmake/startup/templates/unix/solaris/gnu/template.mk b/dmake/startup/templates/unix/solaris/gnu/template.mk
deleted file mode 100644
index 3f9282027..000000000
--- a/dmake/startup/templates/unix/solaris/gnu/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= solaris
-   OSENVIRONMENT *:= gnu
diff --git a/dmake/startup/templates/unix/solaris/template.mk b/dmake/startup/templates/unix/solaris/template.mk
deleted file mode 100644
index 233917a6b..000000000
--- a/dmake/startup/templates/unix/solaris/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= solaris
-   OSENVIRONMENT *:= 
diff --git a/dmake/startup/templates/unix/sysvr1/template.mk b/dmake/startup/templates/unix/sysvr1/template.mk
deleted file mode 100644
index 4eb40febb..000000000
--- a/dmake/startup/templates/unix/sysvr1/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= sysvr1
-   OSENVIRONMENT *:= 
diff --git a/dmake/startup/templates/unix/sysvr3/pwd/template.mk b/dmake/startup/templates/unix/sysvr3/pwd/template.mk
deleted file mode 100644
index fa6b4aa6b..000000000
--- a/dmake/startup/templates/unix/sysvr3/pwd/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= sysvr3
-   OSENVIRONMENT *:= pwd
diff --git a/dmake/startup/templates/unix/sysvr3/template.mk b/dmake/startup/templates/unix/sysvr3/template.mk
deleted file mode 100644
index 3cb518671..000000000
--- a/dmake/startup/templates/unix/sysvr3/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= sysvr3
-   OSENVIRONMENT *:= 
diff --git a/dmake/startup/templates/unix/sysvr4/template.mk b/dmake/startup/templates/unix/sysvr4/template.mk
deleted file mode 100644
index 553878268..000000000
--- a/dmake/startup/templates/unix/sysvr4/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= sysvr4
-   OSENVIRONMENT *:= 
diff --git a/dmake/startup/templates/unix/xenix/pwd/template.mk b/dmake/startup/templates/unix/xenix/pwd/template.mk
deleted file mode 100644
index abd4066c3..000000000
--- a/dmake/startup/templates/unix/xenix/pwd/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= xenix
-   OSENVIRONMENT *:= pwd
diff --git a/dmake/startup/templates/unix/xenix/template.mk b/dmake/startup/templates/unix/xenix/template.mk
deleted file mode 100644
index 7ab223fbd..000000000
--- a/dmake/startup/templates/unix/xenix/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= xenix
-   OSENVIRONMENT *:= 
diff --git a/dmake/startup/templates/win95/borland/bcc50/template.mk b/dmake/startup/templates/win95/borland/bcc50/template.mk
deleted file mode 100644
index b5095c40c..000000000
--- a/dmake/startup/templates/win95/borland/bcc50/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= win95
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= bcc50
diff --git a/dmake/startup/templates/win95/microsft/vpp40/template.mk b/dmake/startup/templates/win95/microsft/vpp40/template.mk
deleted file mode 100644
index d4e6c9eb9..000000000
--- a/dmake/startup/templates/win95/microsft/vpp40/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= win95
-   OSRELEASE     *:= microsft
-   OSENVIRONMENT *:= vpp40
diff --git a/dmake/startup/templates/winnt/borland/bcc50/template.mk b/dmake/startup/templates/winnt/borland/bcc50/template.mk
deleted file mode 100644
index b94ac034e..000000000
--- a/dmake/startup/templates/winnt/borland/bcc50/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= winnt
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= bcc50
diff --git a/dmake/startup/templates/winnt/microsft/vpp40/template.mk b/dmake/startup/templates/winnt/microsft/vpp40/template.mk
deleted file mode 100644
index e53922df6..000000000
--- a/dmake/startup/templates/winnt/microsft/vpp40/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= winnt
-   OSRELEASE     *:= microsft
-   OSENVIRONMENT *:= vpp40
diff --git a/dmake/startup/tos/macros.mk b/dmake/startup/tos/macros.mk
deleted file mode 100644
index 1023dfc9a..000000000
--- a/dmake/startup/tos/macros.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Define Atari TOS specific macros.
-#
-
-# Process environment-specific refinements, if any.
-.IF $(OSENVIRONMENT)
-   .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
-
-# Set default to GCC Compiler.
-CPP   *:= /gnu/lib/cpp
-CC    *:= gcc
-"C++" *:= g++
-AS    *:= gas
-YACC  *:= bison
-LEX   *:= flex
-RM    *:= /bin/rm
-
-# Common flag settings
-ARFLAGS *= -rvs
-
-# Other appropriate macro settings.
-A            *:= .olb
-SHELLFLAGS   *:=
-GROUPSUFFIX  *:= .bat
diff --git a/dmake/startup/unix/386ix/macros.mk b/dmake/startup/unix/386ix/macros.mk
deleted file mode 100644
index a359b302f..000000000
--- a/dmake/startup/unix/386ix/macros.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# We hang off the standard sysvr3'isms
-#
-__.incdir !:= $(INCFILENAME:d:d:d:d)/sysvr3
-
-# Process environment-specific refinements, if any.
-.INCLUDE .SETDIR=$(__.incdir) .NOINFER .IGNORE : macros.mk
diff --git a/dmake/startup/unix/Makefile.am b/dmake/startup/unix/Makefile.am
deleted file mode 100755
index d7861ffff..000000000
--- a/dmake/startup/unix/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-
-startupdir = $(datadir)/startup/unix
-
-startup_DATA = macros.mk recipes.mk
-
-DIST_SUBDIRS = cygwin linux macosx solaris sysvr4
-SUBDIRS = @OS_VERSION@
-
diff --git a/dmake/startup/unix/Makefile.in b/dmake/startup/unix/Makefile.in
deleted file mode 100644
index 7abbdf7f7..000000000
--- a/dmake/startup/unix/Makefile.in
+++ /dev/null
@@ -1,489 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-subdir = startup/unix
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(startupdir)"
-startupDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(startup_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
-OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
-OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
-OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-startupdir = $(datadir)/startup/unix
-startup_DATA = macros.mk recipes.mk
-DIST_SUBDIRS = cygwin linux macosx solaris sysvr4
-SUBDIRS = @OS_VERSION@
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  startup/unix/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  startup/unix/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-startupDATA: $(startup_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(startupdir)" || $(mkdir_p) "$(DESTDIR)$(startupdir)"
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(startupDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(startupdir)/$$f'"; \
-	  $(startupDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-uninstall-startupDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(startupdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(startupdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-startupDATA
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-startupDATA
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-startupDATA install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-startupDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/startup/unix/bsd43/macros.mk b/dmake/startup/unix/bsd43/macros.mk
deleted file mode 100644
index be4ae5fe4..000000000
--- a/dmake/startup/unix/bsd43/macros.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Define additional Berkely UNIX specific macros.
-#
-
-# Process environment-specific refinements, if any.
-.IF $(OSENVIRONMENT)
-   .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
-
-# Set defaults for local OS release
-RANLIB *:= ranlib
-PRINT  *:= lpr
diff --git a/dmake/startup/unix/bsd43/recipes.mk b/dmake/startup/unix/bsd43/recipes.mk
deleted file mode 100644
index 557ac7c8c..000000000
--- a/dmake/startup/unix/bsd43/recipes.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Define additional Berkeley UNIX specific build rules and recipes.
-#
-
-# Recipe to make archive files.
-%$A .GROUP :
-    $(AR) $(ARFLAGS) $@ $?
-    $(RM) $(RMFLAGS) $?
-    $(RANLIB) $@
-
-# Process environment-specific refinements, if any.
-.IF $(OSENVIRONMENT)
-   .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSENVIRONMENT)$/recipes.mk
-.ENDIF
diff --git a/dmake/startup/unix/coherent/macros.mk b/dmake/startup/unix/coherent/macros.mk
deleted file mode 100644
index e0201ebd1..000000000
--- a/dmake/startup/unix/coherent/macros.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# We hang off the standard BSD'isms
-#
-__.incdir !:= $(INCFILENAME:d:d:d:d)/bsd43
-
-# Process environment-specific refinements, if any.
-.INCLUDE .SETDIR=$(__.incdir) .NOINFER .IGNORE : macros.mk
diff --git a/dmake/startup/unix/coherent/recipes.mk b/dmake/startup/unix/coherent/recipes.mk
deleted file mode 100644
index 5966640d3..000000000
--- a/dmake/startup/unix/coherent/recipes.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use the same file as 
-#
-__.incdir !:= $(INCFILENAME:d:d:d:d)/bsd43
-
-# Process environment-specific refinements, if any.
-.INCLUDE .SETDIR=$(__.incdir) .NOINFER .IGNORE : recipes.mk
diff --git a/dmake/startup/unix/cygwin/Makefile.am b/dmake/startup/unix/cygwin/Makefile.am
deleted file mode 100644
index 97848b4ab..000000000
--- a/dmake/startup/unix/cygwin/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-startupdir = $(datadir)/startup/unix/cygwin
-
-startup_DATA = macros.mk 
-
-
-
diff --git a/dmake/startup/unix/cygwin/Makefile.in b/dmake/startup/unix/cygwin/Makefile.in
deleted file mode 100644
index 9b8adb824..000000000
--- a/dmake/startup/unix/cygwin/Makefile.in
+++ /dev/null
@@ -1,331 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-subdir = startup/unix/cygwin
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(startupdir)"
-startupDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(startup_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
-OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
-OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
-OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-startupdir = $(datadir)/startup/unix/cygwin
-startup_DATA = macros.mk 
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  startup/unix/cygwin/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  startup/unix/cygwin/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-startupDATA: $(startup_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(startupdir)" || $(mkdir_p) "$(DESTDIR)$(startupdir)"
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(startupDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(startupdir)/$$f'"; \
-	  $(startupDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-uninstall-startupDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(startupdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(startupdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-startupDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-startupDATA
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-startupDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-startupDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/startup/unix/cygwin/macros.mk b/dmake/startup/unix/cygwin/macros.mk
deleted file mode 100644
index 91956ca47..000000000
--- a/dmake/startup/unix/cygwin/macros.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Define additional Cygwin specific macros.
-#
-
-# Process environment-specific refinements, if any.
-.IF $(OSENVIRONMENT)
-   .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
-
-# Make OS-release-specific settings
-#PRINT *:= lpr
diff --git a/dmake/startup/unix/linux/Makefile.am b/dmake/startup/unix/linux/Makefile.am
deleted file mode 100755
index c19307b12..000000000
--- a/dmake/startup/unix/linux/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-
-startupdir = $(datadir)/startup/unix/linux
-
-startup_DATA = macros.mk 
-
-
diff --git a/dmake/startup/unix/linux/Makefile.in b/dmake/startup/unix/linux/Makefile.in
deleted file mode 100644
index 6c58d38dc..000000000
--- a/dmake/startup/unix/linux/Makefile.in
+++ /dev/null
@@ -1,331 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-subdir = startup/unix/linux
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(startupdir)"
-startupDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(startup_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
-OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
-OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
-OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-startupdir = $(datadir)/startup/unix/linux
-startup_DATA = macros.mk 
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  startup/unix/linux/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  startup/unix/linux/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-startupDATA: $(startup_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(startupdir)" || $(mkdir_p) "$(DESTDIR)$(startupdir)"
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(startupDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(startupdir)/$$f'"; \
-	  $(startupDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-uninstall-startupDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(startupdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(startupdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-startupDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-startupDATA
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-startupDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-startupDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/startup/unix/linux/gnu/macros.mk b/dmake/startup/unix/linux/gnu/macros.mk
deleted file mode 100644
index 3d9c437d9..000000000
--- a/dmake/startup/unix/linux/gnu/macros.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# We hang off the standard sysvr3'isms
-#
-__.incdir !:= $(INCFILENAME:d:d:d:d:d:d)/sysvr3/gnu
-
-# Process environment-specific refinements, if any.
-.INCLUDE .SETDIR=$(__.incdir) .NOINFER .IGNORE : macros.mk
diff --git a/dmake/startup/unix/linux/macros.mk b/dmake/startup/unix/linux/macros.mk
deleted file mode 100644
index 228dafff2..000000000
--- a/dmake/startup/unix/linux/macros.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Define additional Linux specific macros.
-#
-
-# Process environment-specific refinements, if any.
-.IF $(OSENVIRONMENT)
-   .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
-
-# Make OS-release-specific settings
-PRINT *:= lpr
diff --git a/dmake/startup/unix/macosx/Makefile.am b/dmake/startup/unix/macosx/Makefile.am
deleted file mode 100755
index 54bf5b17b..000000000
--- a/dmake/startup/unix/macosx/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-
-startupdir = $(datadir)/startup/unix/macosx
-
-startup_DATA = macros.mk 
-
-
diff --git a/dmake/startup/unix/macosx/Makefile.in b/dmake/startup/unix/macosx/Makefile.in
deleted file mode 100644
index b391080f6..000000000
--- a/dmake/startup/unix/macosx/Makefile.in
+++ /dev/null
@@ -1,331 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-subdir = startup/unix/macosx
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(startupdir)"
-startupDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(startup_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
-OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
-OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
-OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-startupdir = $(datadir)/startup/unix/macosx
-startup_DATA = macros.mk 
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  startup/unix/macosx/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  startup/unix/macosx/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-startupDATA: $(startup_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(startupdir)" || $(mkdir_p) "$(DESTDIR)$(startupdir)"
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(startupDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(startupdir)/$$f'"; \
-	  $(startupDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-uninstall-startupDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(startupdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(startupdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-startupDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-startupDATA
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-startupDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-startupDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/startup/unix/macosx/gnu/macros.mk b/dmake/startup/unix/macosx/gnu/macros.mk
deleted file mode 100644
index 3d9c437d9..000000000
--- a/dmake/startup/unix/macosx/gnu/macros.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# We hang off the standard sysvr3'isms
-#
-__.incdir !:= $(INCFILENAME:d:d:d:d:d:d)/sysvr3/gnu
-
-# Process environment-specific refinements, if any.
-.INCLUDE .SETDIR=$(__.incdir) .NOINFER .IGNORE : macros.mk
diff --git a/dmake/startup/unix/macosx/macros.mk b/dmake/startup/unix/macosx/macros.mk
deleted file mode 100644
index b29e917ec..000000000
--- a/dmake/startup/unix/macosx/macros.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Define additional Mac OS X specific macros.
-#
-
-# Process environment-specific refinements, if any.
-.IF $(OSENVIRONMENT)
-   .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
-
-# Make OS-release-specific settings
-PRINT *:= lpr
diff --git a/dmake/startup/unix/macros.mk b/dmake/startup/unix/macros.mk
deleted file mode 100644
index 362b81d2c..000000000
--- a/dmake/startup/unix/macros.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Define additional UNIX specific macros.
-#
-
-# Process release-specific refinements, if any.
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/macros.mk
diff --git a/dmake/startup/unix/os2/Makefile.am b/dmake/startup/unix/os2/Makefile.am
deleted file mode 100644
index be69ae315..000000000
--- a/dmake/startup/unix/os2/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-
-startupdir = $(datadir)/startup/unix/os2
-
-startup_DATA = macros.mk 
-
-
diff --git a/dmake/startup/unix/os2/Makefile.in b/dmake/startup/unix/os2/Makefile.in
deleted file mode 100644
index 3fabee1a1..000000000
--- a/dmake/startup/unix/os2/Makefile.in
+++ /dev/null
@@ -1,331 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-subdir = startup/unix/os2
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(startupdir)"
-startupDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(startup_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
-OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
-OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
-OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-startupdir = $(datadir)/startup/unix/os2
-startup_DATA = macros.mk 
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  startup/unix/os2/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  startup/unix/os2/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-startupDATA: $(startup_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(startupdir)" || $(mkdir_p) "$(DESTDIR)$(startupdir)"
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(startupDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(startupdir)/$$f'"; \
-	  $(startupDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-uninstall-startupDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(startupdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(startupdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-startupDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-startupDATA
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-startupDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-startupDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/startup/unix/os2/macros.mk b/dmake/startup/unix/os2/macros.mk
deleted file mode 100644
index 08c829ba0..000000000
--- a/dmake/startup/unix/os2/macros.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# Define additional OS/2 specific macros.
-#
-
-# Process release-specific refinements, if any.
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/macros.mk
-
-# Execution environment configuration.
-# Grab the current setting of COMSPEC.
-#
-.IMPORT .IGNORE : COMSPEC ROOTDIR
-
-# First check if SHELL is defined to be something other than COMSPEC.
-# If it is assume that SHELL is a Korn compatible shell like MKS's
-.IF $(SHELL) == $(NULL)
-   .IF $(COMSPEC) == $(NULL)
-      SHELL *:= $(ROOTDIR)$/bin$/sh$E
-   .ELSE
-      SHELL *:= $(COMSPEC)
-   .END
-.END
-GROUPSHELL *:= $(SHELL)
-
-# Directory entries are case incensitive
-.DIRCACHERESPCASE *:= no
-
-# Applicable suffix definitions
-A *:= .lib	# Libraries
-E *:= .exe	# Executables
-F *:= .for	# Fortran
-O *:= .obj	# Objects
-P *:= .pas	# Pascal
-S *:= .asm	# Assembler sources
-V *:= 		# RCS suffix
-
-# Now set the remaining arguments depending on which SHELL we
-# are going to use.  COMSPEC (assumed to be command.com) or
-# MKS Korn shell.
-.IF $(SHELL) == $(COMSPEC)
-   SHELLFLAGS       *:= $(SWITCHAR)c
-   GROUPFLAGS       *:= $(SHELLFLAGS)
-   SHELLMETAS       *:= *"?<>
-   GROUPSUFFIX      *:= .bat
-   DIRSEPSTR        *:= \\\
-   DIVFILE          *=  $(TMPFILE:s,/,\,)
-   RM               *=  del
-   RMFLAGS          *=
-   MV	            *=  rename
-.ELSE
-   SHELLFLAGS       *:= -c
-   GROUPFLAGS       *:= 
-   SHELLMETAS       *:= *"?<>|()&][$$\#`'
-   GROUPSUFFIX      *:= .ksh
-   .MKSARGS         *:= yes
-   RM               *=  $(ROOTDIR)$/bin$/rm
-   RMFLAGS          *=  -f
-   MV	            *=  $(ROOTDIR)$/bin$/mv
-   DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}},)
-   __.DIVSEP-sh-yes !:= \\\
-   __.DIVSEP-sh-no  !:= \\
-.ENDIF
diff --git a/dmake/startup/unix/recipes.mk b/dmake/startup/unix/recipes.mk
deleted file mode 100644
index 1650430f3..000000000
--- a/dmake/startup/unix/recipes.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Define additional UNIX specific build recipes.
-#
-
-# Define additional build targets.
-%$E : %.sh; cp $< $@; chmod 0777 $@
-
-# This rule tells how to make a non-suffixed executable from its single
-# file source.
-% : %$O; $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS)
-
-# This rule tells how to make a.out from it's immediate list of prerequisites.
-%.out :; $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-
-# Process release-specific refinements, if any.
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/recipes.mk
diff --git a/dmake/startup/unix/solaris/Makefile.am b/dmake/startup/unix/solaris/Makefile.am
deleted file mode 100755
index 2eb912672..000000000
--- a/dmake/startup/unix/solaris/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-
-startupdir = $(datadir)/startup/unix/solaris
-
-startup_DATA = macros.mk 
-
-
diff --git a/dmake/startup/unix/solaris/Makefile.in b/dmake/startup/unix/solaris/Makefile.in
deleted file mode 100644
index 66503539e..000000000
--- a/dmake/startup/unix/solaris/Makefile.in
+++ /dev/null
@@ -1,331 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-subdir = startup/unix/solaris
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(startupdir)"
-startupDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(startup_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
-OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
-OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
-OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-startupdir = $(datadir)/startup/unix/solaris
-startup_DATA = macros.mk 
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  startup/unix/solaris/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  startup/unix/solaris/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-startupDATA: $(startup_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(startupdir)" || $(mkdir_p) "$(DESTDIR)$(startupdir)"
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(startupDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(startupdir)/$$f'"; \
-	  $(startupDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-uninstall-startupDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(startupdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(startupdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-startupDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-startupDATA
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-startupDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-startupDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/startup/unix/solaris/macros.mk b/dmake/startup/unix/solaris/macros.mk
deleted file mode 100644
index a359b302f..000000000
--- a/dmake/startup/unix/solaris/macros.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# We hang off the standard sysvr3'isms
-#
-__.incdir !:= $(INCFILENAME:d:d:d:d)/sysvr3
-
-# Process environment-specific refinements, if any.
-.INCLUDE .SETDIR=$(__.incdir) .NOINFER .IGNORE : macros.mk
diff --git a/dmake/startup/unix/sysvr1/macros.mk b/dmake/startup/unix/sysvr1/macros.mk
deleted file mode 100644
index a359b302f..000000000
--- a/dmake/startup/unix/sysvr1/macros.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# We hang off the standard sysvr3'isms
-#
-__.incdir !:= $(INCFILENAME:d:d:d:d)/sysvr3
-
-# Process environment-specific refinements, if any.
-.INCLUDE .SETDIR=$(__.incdir) .NOINFER .IGNORE : macros.mk
diff --git a/dmake/startup/unix/sysvr3/gnu/macros.mk b/dmake/startup/unix/sysvr3/gnu/macros.mk
deleted file mode 100644
index 13141971f..000000000
--- a/dmake/startup/unix/sysvr3/gnu/macros.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# System V R3 GCC compiler specific macro definitions...
-#
-
-# Common tool renamings
-CC    *:= gcc
-"C++" *:= g++
-AS    *:= gas
-YACC  *:= bison
-LEX   *:= flex
-
-# Common flag settings
-ARFLAGS *= -rvs
diff --git a/dmake/startup/unix/sysvr3/macros.mk b/dmake/startup/unix/sysvr3/macros.mk
deleted file mode 100644
index 2ccd730ac..000000000
--- a/dmake/startup/unix/sysvr3/macros.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Define additional UNIX specific macros.
-#
-
-# Process environment-specific refinements, if any.
-.IF $(OSENVIRONMENT)
-   .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
diff --git a/dmake/startup/unix/sysvr4/Makefile.am b/dmake/startup/unix/sysvr4/Makefile.am
deleted file mode 100755
index 6c1b9590f..000000000
--- a/dmake/startup/unix/sysvr4/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-
-startupdir = $(datadir)/startup/unix/sysvr4
-
-startup_DATA = macros.mk 
-
-
diff --git a/dmake/startup/unix/sysvr4/Makefile.in b/dmake/startup/unix/sysvr4/Makefile.in
deleted file mode 100644
index 2722634d7..000000000
--- a/dmake/startup/unix/sysvr4/Makefile.in
+++ /dev/null
@@ -1,331 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-subdir = startup/unix/sysvr4
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(startupdir)"
-startupDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(startup_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
-OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
-OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
-OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-startupdir = $(datadir)/startup/unix/sysvr4
-startup_DATA = macros.mk 
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  startup/unix/sysvr4/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  startup/unix/sysvr4/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-startupDATA: $(startup_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(startupdir)" || $(mkdir_p) "$(DESTDIR)$(startupdir)"
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(startupDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(startupdir)/$$f'"; \
-	  $(startupDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-uninstall-startupDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(startupdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(startupdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-startupDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-startupDATA
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-startupDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-startupDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/startup/unix/sysvr4/macros.mk b/dmake/startup/unix/sysvr4/macros.mk
deleted file mode 100644
index a359b302f..000000000
--- a/dmake/startup/unix/sysvr4/macros.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# We hang off the standard sysvr3'isms
-#
-__.incdir !:= $(INCFILENAME:d:d:d:d)/sysvr3
-
-# Process environment-specific refinements, if any.
-.INCLUDE .SETDIR=$(__.incdir) .NOINFER .IGNORE : macros.mk
diff --git a/dmake/startup/unix/xenix/macros.mk b/dmake/startup/unix/xenix/macros.mk
deleted file mode 100644
index a359b302f..000000000
--- a/dmake/startup/unix/xenix/macros.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# We hang off the standard sysvr3'isms
-#
-__.incdir !:= $(INCFILENAME:d:d:d:d)/sysvr3
-
-# Process environment-specific refinements, if any.
-.INCLUDE .SETDIR=$(__.incdir) .NOINFER .IGNORE : macros.mk
diff --git a/dmake/startup/win95/borland/macros.mk b/dmake/startup/win95/borland/macros.mk
deleted file mode 100644
index 2017f02d3..000000000
--- a/dmake/startup/win95/borland/macros.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# MSDOS Borland-C environment customization.
-
-.IF $(OSENVIRONMENT)
-   .INCLUDE .IGNORE .NOINFER : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
-
-# Standard C-language command names and flags
-CPP	   *:=			# C-preprocessor
-CC         *:= bcc32
-CFLAGS     *=			# C   compiler flags
-"C++"      *:=			# C++ Compiler
-"C++FLAGS" *=			# C++ Compiler flags
-
-AS         *:= tasm		# Assembler and flags
-ASFLAGS    *= 
-LD         *= tlink32		# Loader and flags
-LDFLAGS    *=
-LDLIBS     *=			# Default libraries
-AR         *:= tlib		# archiver
-ARFLAGS    *= ????
-
-# Definition of Print command for this system.
-PRINT      *= print
-
-# Language and Parser generation Tools and their flags
-YACC	   *:= yacc		# standard yacc
-YFLAGS     *=
-LEX	   *:= lex		# standard lex
-LFLAGS     *=
-
-# Other Compilers, Tools and their flags
-PC	   *:= tpc		# pascal compiler
-RC	   *:= ???		# ratfor compiler
-FC	   *:= ???		# fortran compiler
diff --git a/dmake/startup/win95/macros.mk b/dmake/startup/win95/macros.mk
deleted file mode 100644
index 5490634e6..000000000
--- a/dmake/startup/win95/macros.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-# Define additional MSDOS specific settings.
-#
-
-# Execution environment configuration.
-# Grab the current setting of COMSPEC.
-#
-.IMPORT .IGNORE : COMSPEC ROOTDIR
-
-# First check if SHELL is defined to be something other than COMSPEC.
-# If it is, then assume that SHELL is a Korn compatible shell like MKS's
-.IF $(SHELL) == $(NULL)
-   .IF $(COMSPEC) == $(NULL)
-      SHELL *:= $(ROOTDIR)$/bin$/sh$E
-   .ELSE
-      SHELL *:= $(COMSPEC)
-   .END
-.END
-GROUPSHELL *:= $(SHELL)
-
-# Process release-specific refinements, if any.
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/macros.mk
-
-# Applicable suffix definitions
-A *:= .lib	# Libraries
-E *:= .exe	# Executables
-F *:= .for	# Fortran
-O *:= .obj	# Objects
-P *:= .pas	# Pascal
-S *:= .asm	# Assembler sources
-V *:= 		# RCS suffix
-
-# Now set the remaining arguments depending on which SHELL we
-# are going to use.  COMSPEC (assumed to be command.com) or
-# MKS Korn shell.
-.IF $(SHELL) == $(COMSPEC)
-.IF $(COMSPEC:lf) == cmd.exe
-   SHELLFLAGS       *:= $(SWITCHAR)S $(SWITCHAR)c
-   SHELLCMDQUOTE    *:= "
-# " fix syntax highlighting
-.ELIF $(COMSPEC:lf) == command.com
-   SHELLFLAGS       *:= $(SWITCHAR)c
-   SHELLCMDQUOTE    *:= "
-# " fix syntax highlighting
-.ELSE
-   SHELLFLAGS       *:= $(SWITCHAR)c
-.END
-   GROUPFLAGS       *:= $(SWITCHAR)c
-   SHELLMETAS       *:= "<>|
-# " fix syntax highlighting
-   GROUPSUFFIX      *:= .bat
-   DIVFILE          *=  $(TMPFILE:s,/,\,)
-   RM               *=  del
-   RMFLAGS          *=
-   MV	            *=  rename
-   __.DIVSEP-sh-yes *:= \\
-   __.DIVSEP-sh-no  *:= \\
-.ELSE
-   SHELL	    !:= $(SHELL:s,/,\,)
-   COMMAND          *=  $(CMNDNAME:s,/,\,) $(CMNDARGS)
-   SHELLFLAGS       *:= -c
-   GROUPFLAGS       *:= 
-   SHELLMETAS       *:= *";?<>|()&][$$\#`'
-   GROUPSUFFIX      *:= .ksh
-   .MKSARGS         *:= yes
-   RM               *=  $(ROOTDIR)$/bin$/rm
-   RMFLAGS          *=  -f
-   MV	            *=  $(ROOTDIR)$/bin$/mv
-   DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}},)
-   __.DIVSEP-sh-yes *:= \\\
-   __.DIVSEP-sh-no  *:= \\
-.ENDIF
-
-
-# Does not respect case of filenames.
-.DIRCACHERESPCASE := no
diff --git a/dmake/startup/win95/microsft/macros.mk b/dmake/startup/win95/microsft/macros.mk
deleted file mode 100644
index f10b1fdfa..000000000
--- a/dmake/startup/win95/microsft/macros.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# MSDOS Microsoft-C environment customization.
-
-.IF $(OSENVIRONMENT)
-   .INCLUDE .IGNORE .NOINFER : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
-
-# Standard C-language command names and flags
-CC         *:= cl		# C   compiler 
-CPP	   *:=			# C-preprocessor
-CFLAGS     *=			# C   compiler flags
-"C++"      *:=			# C++ Compiler
-"C++FLAGS" *=			# C++ Compiler flags
-
-AS         *:= masm		# Assembler and flags
-ASFLAGS    *= 
-LD         *= link		# Loader and flags
-LDFLAGS    *=
-LDLIBS     *=			# Default libraries
-AR         *:= lib		# archiver
-ARFLAGS    *= ????
-
-# Definition of Print command for this system.
-PRINT      *= print
-
-# Language and Parser generation Tools and their flags
-YACC	   *:= yacc		# standard yacc
-YFLAGS     *=
-LEX	   *:= lex		# standard lex
-LFLAGS     *=
-
-# Other Compilers, Tools and their flags
-PC	   *:= ???		# pascal compiler
-RC	   *:= ???		# ratfor compiler
-FC	   *:= ???		# fortran compiler
-
-
-# Directory cache configuration.
-.DIRCACHE *:= no
diff --git a/dmake/startup/win95/recipes.mk b/dmake/startup/win95/recipes.mk
deleted file mode 100644
index 5a98f22b1..000000000
--- a/dmake/startup/win95/recipes.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Define additional MSDOS specific build recipes.
-#
-
-# Executables
-   %$E       : %$O ; $(CC) $(LDFLAGS) -o$@ $< $(LDLIBS)
-   %$O       : %$S ; $(AS) $(ASFLAGS) $(<:s,/,\)
-
-# Process release-specific refinements, if any.
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/recipes.mk
diff --git a/dmake/startup/winnt/Makefile.am b/dmake/startup/winnt/Makefile.am
deleted file mode 100644
index 5bbd4d632..000000000
--- a/dmake/startup/winnt/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-
-startupdir = $(datadir)/startup/winnt
-
-startup_DATA = macros.mk recipes.mk
-
-DIST_SUBDIRS = mingw msvc6
-SUBDIRS = @OS_VERSION@
-
diff --git a/dmake/startup/winnt/Makefile.in b/dmake/startup/winnt/Makefile.in
deleted file mode 100644
index 48812e431..000000000
--- a/dmake/startup/winnt/Makefile.in
+++ /dev/null
@@ -1,489 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-subdir = startup/winnt
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(startupdir)"
-startupDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(startup_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
-OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
-OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
-OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-startupdir = $(datadir)/startup/winnt
-startup_DATA = macros.mk recipes.mk
-DIST_SUBDIRS = mingw msvc6
-SUBDIRS = @OS_VERSION@
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  startup/winnt/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  startup/winnt/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-startupDATA: $(startup_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(startupdir)" || $(mkdir_p) "$(DESTDIR)$(startupdir)"
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(startupDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(startupdir)/$$f'"; \
-	  $(startupDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-uninstall-startupDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(startupdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(startupdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-startupDATA
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-startupDATA
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-startupDATA install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-startupDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/startup/winnt/borland/macros.mk b/dmake/startup/winnt/borland/macros.mk
deleted file mode 100644
index 2017f02d3..000000000
--- a/dmake/startup/winnt/borland/macros.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# MSDOS Borland-C environment customization.
-
-.IF $(OSENVIRONMENT)
-   .INCLUDE .IGNORE .NOINFER : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
-
-# Standard C-language command names and flags
-CPP	   *:=			# C-preprocessor
-CC         *:= bcc32
-CFLAGS     *=			# C   compiler flags
-"C++"      *:=			# C++ Compiler
-"C++FLAGS" *=			# C++ Compiler flags
-
-AS         *:= tasm		# Assembler and flags
-ASFLAGS    *= 
-LD         *= tlink32		# Loader and flags
-LDFLAGS    *=
-LDLIBS     *=			# Default libraries
-AR         *:= tlib		# archiver
-ARFLAGS    *= ????
-
-# Definition of Print command for this system.
-PRINT      *= print
-
-# Language and Parser generation Tools and their flags
-YACC	   *:= yacc		# standard yacc
-YFLAGS     *=
-LEX	   *:= lex		# standard lex
-LFLAGS     *=
-
-# Other Compilers, Tools and their flags
-PC	   *:= tpc		# pascal compiler
-RC	   *:= ???		# ratfor compiler
-FC	   *:= ???		# fortran compiler
diff --git a/dmake/startup/winnt/macros.mk b/dmake/startup/winnt/macros.mk
deleted file mode 100644
index 507773b36..000000000
--- a/dmake/startup/winnt/macros.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-# Define additional MSDOS specific settings.
-#
-
-# Execution environment configuration.
-# Grab the current setting of COMSPEC.
-#
-.IMPORT .IGNORE : COMSPEC ROOTDIR
-
-# First check if SHELL is defined to be something other than COMSPEC.
-# If it is, then assume that SHELL is a Korn compatible shell like MKS's
-.IF $(SHELL) == $(NULL)
-   .IF $(COMSPEC) == $(NULL)
-      SHELL *:= $(ROOTDIR)$/bin$/sh$E
-   .ELSE
-      SHELL *:= $(COMSPEC)
-   .END
-.END
-GROUPSHELL *:= $(SHELL)
-
-# Process release-specific refinements, if any.
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/macros.mk
-
-# Applicable suffix definitions
-A *:= .lib	# Libraries
-E *:= .exe	# Executables
-F *:= .for	# Fortran
-O *:= .obj	# Objects
-P *:= .pas	# Pascal
-S *:= .asm	# Assembler sources
-V *:= 		# RCS suffix
-
-# Now set the remaining arguments depending on which SHELL we
-# are going to use.  COMSPEC (assumed to be command.com) or
-# MKS Korn shell.
-.IF $(SHELL) == $(COMSPEC)
-.IF $(COMSPEC:lf) == cmd.exe
-   SHELLFLAGS       *:= $(SWITCHAR)S $(SWITCHAR)c
-   SHELLCMDQUOTE    *:= "
-# " fix syntax highlighting
-.ELIF $(COMSPEC:lf) == command.com
-   SHELLFLAGS       *:= $(SWITCHAR)c
-   SHELLCMDQUOTE    *:= "
-# " fix syntax highlighting
-.ELSE
-   SHELLFLAGS       *:= $(SWITCHAR)c
-.END
-   GROUPFLAGS       *:= $(SWITCHAR)c
-   SHELLMETAS       *:= "<>|
-# " fix syntax highlighting
-   GROUPSUFFIX      *:= .cmd
-   DIVFILE          *=  $(TMPFILE:s,/,\,)
-   RM               *=  del
-   RMFLAGS          *=
-   MV	            *=  rename
-   __.DIVSEP-sh-yes *:= \\
-   __.DIVSEP-sh-no  *:= \\
-.ELSE
-   SHELL	    !:= $(SHELL:s,/,\,)
-   COMMAND          *=  $(CMNDNAME:s,/,\,) $(CMNDARGS)
-   SHELLFLAGS       *:= -c
-   GROUPFLAGS       *:= 
-   SHELLMETAS       *:= *";?<>|()&][$$\#`'
-   GROUPSUFFIX      *:= .ksh
-   .MKSARGS         *:= yes
-   RM               *=  $(ROOTDIR)$/bin$/rm
-   RMFLAGS          *=  -f
-   MV	            *=  $(ROOTDIR)$/bin$/mv
-   DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}},)
-   __.DIVSEP-sh-yes *:= \\\
-   __.DIVSEP-sh-no  *:= \\
-.ENDIF
-
-
-# Does not respect case of filenames.
-.DIRCACHERESPCASE := no
diff --git a/dmake/startup/winnt/microsft/macros.mk b/dmake/startup/winnt/microsft/macros.mk
deleted file mode 100644
index eed3fbdee..000000000
--- a/dmake/startup/winnt/microsft/macros.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# MSDOS Microsoft-C environment customization.
-
-.IF $(OSENVIRONMENT)
-   .INCLUDE .IGNORE .NOINFER : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
-
-# Standard C-language command names and flags
-CC         *:= cl		# C   compiler 
-CPP	   *:=			# C-preprocessor
-CFLAGS     *=			# C   compiler flags
-"C++"      *:=			# C++ Compiler
-"C++FLAGS" *=			# C++ Compiler flags
-
-AS         *:= masm		# Assembler and flags
-ASFLAGS    *= 
-LD         *= link		# Loader and flags
-LDFLAGS    *=
-LDLIBS     *=			# Default libraries
-AR         *:= lib		# archiver
-ARFLAGS    *= ????
-
-# Definition of Print command for this system.
-PRINT      *= print
-
-# Language and Parser generation Tools and their flags
-YACC	   *:= yacc		# standard yacc
-YFLAGS     *=
-LEX	   *:= lex		# standard lex
-LFLAGS     *=
-
-# Other Compilers, Tools and their flags
-PC	   *:= ???		# pascal compiler
-RC	   *:= ???		# ratfor compiler
-FC	   *:= ???		# fortran compiler
-
-# Directory cache configuration.
-.DIRCACHE  *:= no
diff --git a/dmake/startup/winnt/mingw/Makefile.am b/dmake/startup/winnt/mingw/Makefile.am
deleted file mode 100644
index 7b91888be..000000000
--- a/dmake/startup/winnt/mingw/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-startupdir = $(datadir)/startup/winnt/mingw
-
-startup_DATA = macros.mk 
-
-
-
diff --git a/dmake/startup/winnt/mingw/Makefile.in b/dmake/startup/winnt/mingw/Makefile.in
deleted file mode 100644
index 5ded188bb..000000000
--- a/dmake/startup/winnt/mingw/Makefile.in
+++ /dev/null
@@ -1,331 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-subdir = startup/winnt/mingw
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(startupdir)"
-startupDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(startup_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
-OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
-OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
-OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-startupdir = $(datadir)/startup/winnt/mingw
-startup_DATA = macros.mk 
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  startup/winnt/mingw/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  startup/winnt/mingw/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-startupDATA: $(startup_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(startupdir)" || $(mkdir_p) "$(DESTDIR)$(startupdir)"
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(startupDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(startupdir)/$$f'"; \
-	  $(startupDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-uninstall-startupDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(startupdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(startupdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-startupDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-startupDATA
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-startupDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-startupDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/startup/winnt/mingw/macros.mk b/dmake/startup/winnt/mingw/macros.mk
deleted file mode 100644
index 77cc4ef04..000000000
--- a/dmake/startup/winnt/mingw/macros.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Define additional MinGW specific macros.
-#
-
-# Process environment-specific refinements, if any.
-.IF $(OSENVIRONMENT)
-   .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
-
-# Make OS-release-specific settings
-#PRINT *:= lpr
diff --git a/dmake/startup/winnt/msvc6/Makefile.am b/dmake/startup/winnt/msvc6/Makefile.am
deleted file mode 100644
index d621377de..000000000
--- a/dmake/startup/winnt/msvc6/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-startupdir = $(datadir)/startup/winnt/msvc6
-
-startup_DATA = macros.mk 
-
-
-
diff --git a/dmake/startup/winnt/msvc6/Makefile.in b/dmake/startup/winnt/msvc6/Makefile.in
deleted file mode 100644
index 10c03813f..000000000
--- a/dmake/startup/winnt/msvc6/Makefile.in
+++ /dev/null
@@ -1,331 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-subdir = startup/winnt/msvc6
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(startupdir)"
-startupDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(startup_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
-OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
-OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
-OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-startupdir = $(datadir)/startup/winnt/msvc6
-startup_DATA = macros.mk 
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  startup/winnt/msvc6/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  startup/winnt/msvc6/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-startupDATA: $(startup_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(startupdir)" || $(mkdir_p) "$(DESTDIR)$(startupdir)"
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(startupDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(startupdir)/$$f'"; \
-	  $(startupDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-
-uninstall-startupDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(startup_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(startupdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(startupdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(startupdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-startupDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-startupDATA
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-startupDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-startupDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/startup/winnt/msvc6/macros.mk b/dmake/startup/winnt/msvc6/macros.mk
deleted file mode 100644
index eed3fbdee..000000000
--- a/dmake/startup/winnt/msvc6/macros.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# MSDOS Microsoft-C environment customization.
-
-.IF $(OSENVIRONMENT)
-   .INCLUDE .IGNORE .NOINFER : $(INCFILENAME:d)$(OSENVIRONMENT)$/macros.mk
-.ENDIF
-
-# Standard C-language command names and flags
-CC         *:= cl		# C   compiler 
-CPP	   *:=			# C-preprocessor
-CFLAGS     *=			# C   compiler flags
-"C++"      *:=			# C++ Compiler
-"C++FLAGS" *=			# C++ Compiler flags
-
-AS         *:= masm		# Assembler and flags
-ASFLAGS    *= 
-LD         *= link		# Loader and flags
-LDFLAGS    *=
-LDLIBS     *=			# Default libraries
-AR         *:= lib		# archiver
-ARFLAGS    *= ????
-
-# Definition of Print command for this system.
-PRINT      *= print
-
-# Language and Parser generation Tools and their flags
-YACC	   *:= yacc		# standard yacc
-YFLAGS     *=
-LEX	   *:= lex		# standard lex
-LFLAGS     *=
-
-# Other Compilers, Tools and their flags
-PC	   *:= ???		# pascal compiler
-RC	   *:= ???		# ratfor compiler
-FC	   *:= ???		# fortran compiler
-
-# Directory cache configuration.
-.DIRCACHE  *:= no
diff --git a/dmake/startup/winnt/recipes.mk b/dmake/startup/winnt/recipes.mk
deleted file mode 100644
index 5a98f22b1..000000000
--- a/dmake/startup/winnt/recipes.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Define additional MSDOS specific build recipes.
-#
-
-# Executables
-   %$E       : %$O ; $(CC) $(LDFLAGS) -o$@ $< $(LDLIBS)
-   %$O       : %$S ; $(AS) $(ASFLAGS) $(<:s,/,\)
-
-# Process release-specific refinements, if any.
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/recipes.mk
diff --git a/dmake/stat.c b/dmake/stat.c
deleted file mode 100644
index 851366eff..000000000
--- a/dmake/stat.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/* RCS  $Id: stat.c,v 1.3 2007-10-15 15:41:38 ihi Exp $
---
--- SYNOPSIS
---      Bind a target name to a file.
--- 
--- DESCRIPTION
---	This file contains the code to go and stat a target.  The stat rules
---	follow a predefined order defined in the comment for Stat_target.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-
-static	int	_check_dir_list ANSI((CELLPTR, CELLPTR, int, int));
-
-#ifdef DBUG
-   /* Just a little ditty for debugging this thing */
-   static time_t
-   _do_stat( name, lib, sym, force )
-   char *name;
-   char *lib;
-   char **sym;
-   int  force;
-   {
-      time_t res;
-      DB_ENTER( "_do_stat" );
-
-      res = Do_stat(name, lib, sym, force);
-      DB_PRINT( "stat", ("Statted [%s,%s,%d,%ld]", name, lib, sym, res) );
-
-      DB_RETURN( res );
-   }   
-#define DO_STAT(A,B,C,D)  _do_stat(A,B,C,D)
-#else
-#define DO_STAT(A,B,C,D)  Do_stat(A,B,C,D)
-#endif
-
-static char *_first;	/* If set this variable saves the first pathname that was
-             * used to stat the target in, if subsequently a match is
-             * found it is overridden by the matched path name. */
-
-PUBLIC void
-Stat_target( cp, setfname, force )/*
-====================================
-    Stat a target.  When doing so follow the following rules, suppose
-    that cp->CE_NAME points at a target called fred.o:
-    (See also man page: BINDING TARGETS)
-
-        0.      If A_SYMBOL attribute set look into the library
-            then do the steps 1 thru 4 on the resulting name.
-        1.	Try path's obtained by prepending any dirs found as
-            prerequisites for .SOURCE.o.
-        2.	If not found, do same as 2 but use .SOURCE
-            The predefined '.SOURCE  : .NULL' targets takes care
-            of local/absolute paths.
-        3.	If not found and .LIBRARYM attribute for the target is
-            set then look for it in the corresponding library.
-            4.	If found in step 0 thru 3, then ce_fname points at
-            file name associate with target, else ce_fname points
-            at a file name built by the first .SOURCE* dir that
-            applied.
-    If setfname is != 0 this tells _check_dir_list() to set the static
-    _first variable. setfname also controls the use of _first.
-    If it is -1 ce_fname (the file name associated with target) is only
-    set if a matching file was found and statted, if it is 1 ce_fname
-    is set to _first even if target doesn't exist yet.
-
-    If force is TRUE really stat the target. Do not use the directory
-    cache but update the files entry if it's enabled. */
-
-CELLPTR cp;
-int     setfname;
-int     force;
-{
-   register HASHPTR hp;
-   static   HASHPTR srchp = NIL(HASH);
-   char		    *name;
-   char		    *tmp;
-   int		    res = 0;
-
-   DB_ENTER( "Stat_target" );
-
-   name = cp->CE_NAME;
-   DB_PRINT( "stat", ("called on [%s]", name) );
-
-   if( srchp == NIL(HASH) ) srchp = Get_name(".SOURCE",Defs,FALSE);
-
-   /* Look for a symbol of the form lib((symbol)) the name of the symbol
-    * as entered in the hash table is (symbol) so pull out symbol and try
-    * to find it's module.  If successful DO_STAT will return the module
-    * as well as the archive member name (pointed at by tmp).  We then
-    * replace the symbol name with the archive member name so that we
-    * have the proper name for any future refrences. */
-
-   if( cp->ce_attr & A_SYMBOL ) {
-      DB_PRINT( "stat", ("Binding lib symbol [%s]", name) );
-
-      cp->ce_time = DO_STAT( name, cp->ce_lib, &tmp, force );
-
-      if( cp->ce_time != (time_t) 0L ) {
-     /* stat the new member name below  note tmp must point at a string
-      * returned by MALLOC... ie. the Do_stat code should use DmStrDup */
-
-     if( Verbose & V_MAKE )
-        printf( "%s:  Mapped ((%s)) to %s(%s)\n", Pname,
-             name, cp->ce_lib, tmp );
-
-         FREE( name );		
-     name = cp->CE_NAME = tmp;		
-     cp->ce_attr &= ~(A_FFNAME | A_SYMBOL);
-      }
-      else
-         { DB_VOID_RETURN; }
-   }
-
-   _first = NIL(char);
-   tmp = DmStrJoin( ".SOURCE", Get_suffix(name), -1, FALSE);
-
-   /* Check .SOURCE.xxx target */
-   if( (hp = Get_name(tmp, Defs, FALSE)) != NIL(HASH) )
-      res = _check_dir_list( cp, hp->CP_OWNR, setfname, force );
-
-   /* Check just .SOURCE */
-   if( !res && (srchp != NIL(HASH)) )
-      res = _check_dir_list( cp, srchp->CP_OWNR, setfname, force );
-
-   /* If libmember and we haven't found it check the library */
-   if( !res && (cp->ce_attr & A_LIBRARYM) ) {
-      cp->ce_time = DO_STAT(name, cp->ce_lib, NIL(char *), force);
-
-      if( !cp->ce_time && Tmd && *Tmd && cp->ce_lib ) {
-     char *tmplib;
-     tmplib=DmStrDup(Build_path(Tmd,cp->ce_lib));
-
-     if ((cp->ce_time = DO_STAT(name, tmplib, NIL(char *),force)) != (time_t)0L){
-        cp->ce_lib=DmStrDup(tmplib);
-     }
-      }
-
-      if( Verbose & V_MAKE )
-     printf( "%s:  Checking library '%s' for member [%s], time %ld\n",
-         Pname, cp->ce_lib, name, cp->ce_time );
-   }
-
-   FREE( tmp );
-
-   if( setfname == 1 || (setfname == -1 && cp->ce_time != (time_t)0L) ) {
-      int setlib = (cp->ce_lib == cp->ce_fname);
-
-      if( (cp->ce_attr & A_FFNAME) && (cp->ce_fname != NIL(char)) )
-     FREE( cp->ce_fname );
-
-      if( _first != NIL(char) ) {
-     cp->ce_fname = _first;
-     cp->ce_attr |= A_FFNAME;
-      }
-      else {
-     cp->ce_fname = cp->CE_NAME;
-     cp->ce_attr &= ~A_FFNAME;
-      }
-
-      if ( setlib ) cp->ce_lib = cp->ce_fname;
-   }
-   else if( _first )
-      FREE( _first );
-
-   /* set it as stated only if successful, this way, we shall try again
-    * later. */
-   if( cp->ce_time != (time_t)0L ) {
-      cp->ce_flag |= F_STAT;
-
-      /* If it is a whatif this changed scenario then return the current
-       * time, but do so only if the stat was successful. */
-      if ( (cp->ce_attr & A_WHATIF) && !(cp->ce_flag & F_MADE) ) {
-     cp->ce_time = Do_time();
-      }
-   }
-
-   DB_VOID_RETURN;
-}
-
-
-static int
-_check_dir_list( cp, sp, setfname, force )/*
-============================================
-    Check the list of dir's given by the prerequisite list of sp, for a
-    file pointed at by cp.  Returns 0 if path not bound, else returns
-    1 and replaces old name for cell with new cell name. */
-
-CELLPTR cp;
-CELLPTR sp;
-int     setfname;
-int     force;
-{
-   /* FIXME: BCC 5.0 BUG??? If lp is assigned to a register variable then
-    *        BCC 5.0 corrupts a field of the member structure when DO_STAT
-    *        calls the native win95 stat system call. Blech!!!
-    *
-    *        Making this a static variable forces it out of a register and
-    *        seems to avoid the problem. */
-   static LINKPTR lp;
-   char *dir;
-   char *path;
-   char *name;
-   int  res  = 0;
-   int  fset = 0;
-
-   DB_ENTER( "_check_dir_list" );
-   DB_PRINT( "mem", ("%s:-> mem %ld", cp->CE_NAME, (long) coreleft()) );
-
-   if( sp->ce_prq != NIL(LINK) )	/* check prerequisites if any */
-   {
-      /* Use the real name instead of basename, this prevents silly
-       * loops in inference code, and is consistent with man page */
-      name = cp->CE_NAME;
-
-      /* Here we loop through each directory on the list, and try to stat
-       * the target.  We always save the first pathname we try to stat in
-       * _first.  If we subsequently get a match we then replace the value of
-       * _first by the matched path name.  */
-
-      for( lp=sp->CE_PRQ; lp != NIL(LINK) && !res; lp=lp->cl_next ) {
-     int  nodup = 0;
-     dir  = lp->cl_prq->CE_NAME;
-
-     if( strchr( dir, '$' ) ) dir = Expand(dir);
-     if( strcmp( dir, ".NULL" ) == 0 ) {
-        nodup = 1;
-        path = cp->CE_NAME;
-     }	 else {
-        path = DmStrDup(Build_path(dir,name));
-     }
-
-     res = ((cp->ce_time=DO_STAT(path,NIL(char),NIL(char *),force))!=(time_t)0L);
-
-     /* Have to use DmStrDup to set _first since Build_path, builds it's
-      * path names inside a static buffer. */
-     if( setfname )
-        if( (_first == NIL(char) && !fset) || res ) {
-           if( _first != NIL(char) ) FREE( _first );
-           if (nodup)
-          _first = NIL(char);
-           else {
-          _first = path;
-          path = NIL(char);
-           }
-           fset = 1;
-        }
-
-     DB_PRINT( "stat", ("_first [%s], path [%s]", _first, path) );
-     if( dir != lp->cl_prq->CE_NAME )  FREE(dir);
-     if( path && path != cp->CE_NAME ) FREE(path);
-      }
-   }
-
-   DB_PRINT( "mem", ("%s:-< mem %ld", cp->CE_NAME, (long) coreleft()) );
-   DB_RETURN( res );
-}
-
-
-
-
diff --git a/dmake/state.c b/dmake/state.c
deleted file mode 100644
index 92a5af4f7..000000000
--- a/dmake/state.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/* RCS  $Id: state.c,v 1.3 2007-09-20 14:33:53 vg Exp $
---
--- SYNOPSIS
---      .KEEP_STATE state file management
--- 
--- DESCRIPTION
--- 	Three routines to interface to the .KEEP_STATE state file.
---
---		Read_state()	- reads the state file if any.
---		Write_state()	- writes the state file.
---
---		Check_state(cp,how) - checks an entry returns 0 or 1
---				      and updates the entry.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-typedef struct se {
-   char		*st_name;		/* name of cell		*/
-   uint32	st_nkey;		/* name hash key	*/
-   int		st_count;		/* how count for how	*/
-   uint32	st_dkey;		/* directory hash key	*/
-   uint32	st_key;			/* hash key		*/
-   struct se    *st_next;
-} KSTATE, *KSTATEPTR;
-
-static KSTATEPTR _st_head  = NIL(KSTATE);
-static KSTATEPTR _st_tail  = NIL(KSTATE);
-static int       _st_upd   = FALSE;
-static char     *_st_file  = NIL(char);
-
-static int  _my_fgets ANSI((char *, int, FILE *));
-
-PUBLIC void
-Read_state()
-{
-   char *buf;
-   char sizeb[20];
-   int  size;
-   FILE *fp;
-   KSTATEPTR sp;
-
-   if( (fp = Search_file(".KEEP_STATE", &_st_file)) != NIL(FILE) ) {
-      if( _my_fgets( sizeb, 20, fp ) ) {
-     size = atol(sizeb);
-     buf = MALLOC(size+2, char);
-
-     while( _my_fgets(buf, size, fp) ) {
-        TALLOC(sp, 1, KSTATE);
-        sp->st_name = DmStrDup(buf);
-        (void) Hash(buf, &sp->st_nkey);
-
-        if( _my_fgets(buf, size, fp) ) sp->st_count = atoi(buf);
-        if( _my_fgets(buf, size, fp) ) sp->st_dkey   = (uint32) atol(buf);
-
-        if( _my_fgets(buf, size, fp) )
-           sp->st_key = (uint32) atol(buf);
-        else {
-           FREE(sp);
-           break;
-        }
-
-        if( _st_head == NIL(KSTATE) )
-           _st_head = sp;
-        else
-           _st_tail->st_next = sp;
-
-        _st_tail = sp;
-     }
-
-     FREE(buf);
-      }
-
-      Closefile();
-   }
-}
-
-
-PUBLIC void
-Write_state()
-{
-   static int in_write = 0;
-   register KSTATEPTR sp;
-   FILE *fp;
-
-   if( !_st_upd || !_st_file || (_st_file && !*_st_file) ||
-       Trace || in_write ) return;
-
-   in_write++;
-   if( (fp = Openfile(_st_file, TRUE, TRUE)) != NIL(FILE) ) {
-      int maxlen = 0;
-      int tmplen;
-
-      for( sp = _st_head; sp; sp=sp->st_next )
-     if( (tmplen = strlen(sp->st_name)+2) > maxlen )
-        maxlen = tmplen;
-
-      /* A nice arbitrary minimum size */
-      if( maxlen < 20 ) maxlen = 20;
-      fprintf( fp, "%d\n", maxlen );
-
-      for( sp = _st_head; sp; sp=sp->st_next ) {
-     uint16 hv;
-     uint32 hk;
-
-     if( Search_table(Defs, sp->st_name, &hv, &hk) ) {
-        fprintf( fp, "%s\n",  sp->st_name   );
-        fprintf( fp, "%d\n",  sp->st_count );
-        /* long unsigned can be !=  uint32, silence the warning. */
-        fprintf( fp, "%lu\n", (unsigned long)sp->st_dkey   );
-        fprintf( fp, "%lu\n", (unsigned long)sp->st_key    );
-     }
-      }
-
-      Closefile();
-   }
-   else
-      Fatal("Cannot open STATE file %s", _st_file);
-
-   in_write = 0;
-}
-
-
-PUBLIC int
-Check_state( cp, recipes, maxrcp )
-CELLPTR cp;
-STRINGPTR *recipes;
-int  maxrcp;
-{
-   KSTATEPTR  st;
-   STRINGPTR sp;
-   int    i;
-   uint32 thkey;
-   uint32 hkey;
-   uint32 nkey;
-   uint32 dkey;
-   int    update = FALSE;
-
-   if( !_st_file || (_st_file && !*_st_file) || Trace )
-      return(FALSE);
-
-   if(    strcmp(cp->CE_NAME,".REMOVE") == 0
-       || (cp->ce_attr & (A_PHONY|A_NOSTATE)) )
-      return(FALSE);
-
-   (void) Hash( cp->CE_NAME, &nkey ); thkey = nkey + (uint32) cp->ce_count;
-   (void) Hash( Pwd,  &dkey ); thkey += dkey;
-
-   Suppress_temp_file = TRUE;
-   for( i=0 ; i<maxrcp; i++ )
-      for(sp=recipes[i]; sp != NIL(STRING); sp=sp->st_next ) {
-     CELLPTR svct = Current_target;
-     char *cmnd;
-     t_attr silent = (Glob_attr & A_SILENT);
-
-     Current_target = cp;
-     Glob_attr |= A_SILENT;
-     cmnd = Expand(sp->st_string);
-     Glob_attr = (Glob_attr & ~A_SILENT)|silent;
-     Current_target = svct;
-
-     (void) Hash(cmnd, &hkey); thkey += hkey;
-     FREE(cmnd);
-      }
-   Suppress_temp_file = FALSE;
-
-   for( st=_st_head; st != NIL(KSTATE); st=st->st_next ) {
-      if(    st->st_nkey   == nkey
-      && st->st_dkey   == dkey
-      && st->st_count  == cp->ce_count
-      && !strcmp(cp->CE_NAME, st->st_name) )
-     break;
-   }
-
-   if( st == NIL(KSTATE) ) {
-      KSTATEPTR nst;
-
-      TALLOC(nst, 1, KSTATE);
-      nst->st_name = cp->CE_NAME;
-      nst->st_nkey = nkey;
-      nst->st_dkey = dkey;
-      nst->st_key  = thkey;
-      nst->st_count = cp->ce_count;
-
-      if( _st_head == NIL(KSTATE) )
-     _st_head = nst;
-      else
-     _st_tail->st_next = nst;
-
-      _st_tail = nst;
-      _st_upd  = TRUE;
-   }
-   else if( st->st_key != thkey ) {
-      st->st_key = thkey;
-      _st_upd = update = TRUE;
-   }
-
-   return(st != NIL(KSTATE) && update);
-}
-
-
-static int
-_my_fgets(buf, size, fp)
-char *buf;
-int  size;
-FILE *fp;
-{
-   char *p;
-
-   if( fgets(buf, size, fp) == NULL ) return(0);
-
-   if( (p=strrchr(buf,'\n')) != NIL(char) ) *p='\0';
-   if( (p=strrchr(buf,'\r')) != NIL(char) ) *p='\0';
-   return(1);
-}
diff --git a/dmake/stdmacs.h b/dmake/stdmacs.h
deleted file mode 100644
index 0616b0ef5..000000000
--- a/dmake/stdmacs.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $RCSfile: stdmacs.h,v $
--- $Revision: 1.5 $
--- last change: $Author: hr $ $Date: 2006-04-20 12:02:29 $
---
--- SYNOPSIS
---      General use macros.
--- 
--- DESCRIPTION
--- 	ANSI macro relies on the fact that it can be replaced by (), or by
---	its value, where the value is one value due to the preprocessors
---	handling of arguments that are surrounded by ()'s as a single
---	argument.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef	MACROS_h
-#define	MACROS_h
-
-/* AIX and Mac MPW define __STDC__ as special, but defined(__STDC__) is false,
- * and it has no value. */
-#ifndef  __STDC__
-#define  __STDC__ 0
-#endif
-
-/* MSVC 6 and newer understand ANSI prototypes */
-#if __STDC__ || defined(__TURBOC__) || defined(__IBMC__) || defined (_MSC_VER)
-#define ANSI(x)	x
-#else
-#define ANSI(x)	()
-#endif
-
-#define NIL(p)	((p*)NULL)
-
-/* Cygwin defines _STDDEF_H with only one leading '_' */
-#if !defined(atarist) && !defined(__STDDEF_H) && !defined(_STDDEF_H)
-#define offsetof(type,id) ((size_t)&((type*)NULL)->id)
-#endif
-
-#define FALSE	0
-#define TRUE	1
-
-#define PUBLIC
-
-#endif
-
diff --git a/dmake/struct.h b/dmake/struct.h
deleted file mode 100644
index 5a113dd30..000000000
--- a/dmake/struct.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/* RCS  $Id: struct.h,v 1.2 2006-06-29 11:24:50 ihi Exp $
---
--- SYNOPSIS
---      Structure definitions
--- 
--- DESCRIPTION
---	dmake main data structure definitions.  See each of the individual
---	struct declarations for more detailed information on the defined
---	fields and their use.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _STRUCT_INCLUDED_
-#define _STRUCT_INCLUDED_
-
-typedef uint32 t_attr;
-
-/* The following struct is the cell used in the hash table.
- * NOTE:  It contains the actual hash value.  This allows the hash table
- *        insertion to compare hash values and to do a string compare only
- *        for entries that have matching hash_key values.  This elliminates
- *        99.9999% of all extraneous string compare operations when searching
- *        a hash table chain for matching entries.  */
-
-typedef struct hcell {
-    struct hcell	*ht_next;	/* next entry in the hash table */
-        struct hcell    *ht_link;       /* for temporary lists */
-    char		*ht_name;	/* name of this cell */
-    char		*ht_value;	/* cell value if any */
-    uint32		ht_hash;	/* actual hash_key of cell */
-    int		ht_flag;	/* flags belonging to hash entry */
-
-    /* NOTE: some macros have corresponding variables defined
-     * that control program behaviour.  For these macros a
-     * bit of ht_flag indicates the variable value will be set, and the
-     * type of the value that will be set.
-     *
-     * The struct below contains a mask for bit variables, and a
-     * pointer to the global STATIC location for that variable.
-     * String and char variables point to the same place as ht_value
-     * and must be updated when ht_value changes, bit variables must
-     * have their value recomputed. See Def_macro code for more
-     * details.
-     *
-     * NOTE:  Macro variables and Targets are always distinct.  Thus
-     * the value union contains pointers back at cells that own
-     * a particular name entry.  A conflict in this can never
-     * arise, ie pointers at cells will never be used as
-     * values for a macro variable, since the cell and macro
-     * name spaces are completely distinct. */
-
-    struct {
-        int	mv_mask;	/* bit mask for bit variable      */
-        union {
-             char**	mv_svar;/* ptr to string valued glob var  */
-            char*	mv_cvar;/* ptr to char   valued glob var */
-            t_attr*	mv_bvar;/* ptr to bit    valued glob var */
-             int*    mv_ivar;/* ptr to int    valued glob var  */
-
-            struct {
-               struct tcell* ht_owner;/* ptr to CELL owning name */
-               struct tcell* ht_root; /* root ptr for explode */
-            } ht;
-        } val;
-    } var;				/* variable's static equivalent */
-} HASH, *HASHPTR;
-
-#define MV_MASK   var.mv_mask
-#define MV_SVAR   var.val.mv_svar
-#define MV_CVAR   var.val.mv_cvar
-#define MV_BVAR   var.val.mv_bvar
-#define MV_IVAR   var.val.mv_ivar
-#define CP_OWNR   var.val.ht.ht_owner
-#define CP_ROOT   var.val.ht.ht_root
-
-
-
-/* This struct holds the list of temporary files that have been created.
- * It gets unlinked when Quit is called due to an execution error */
-typedef struct flst {
-   char		*fl_name;	/* file name 		*/
-   FILE		*fl_file;	/* the open file	*/
-   struct flst  *fl_next;	/* pointer to next file */
-} FILELIST, *FILELISTPTR;
-
-
-/* The next struct is used to link together prerequisite lists. It
- * is also used to link multiple targets together. */
-typedef struct lcell {
-    struct tcell	*cl_prq;	/* link to a prerequisite 	*/
-    struct lcell	*cl_next;	/* next cell on dependency list */
-    int		cl_flag;	/* flags for link cell		*/
-} LINK, *LINKPTR;
-
-
-/* This is the structure of a target cell in the dag which represents the
- * graph of dependencies.  Each possible target is represented as a cell.
- * 
- * Each cell contains a pointer to the hash table entry for this cell.
- * The hash table entry records the name of the cell. */
-
-typedef struct tcell {
-    struct hcell	*ce_name;	/* name of this cell                */
-        struct hcell    *ce_pushed;     /* local pushed macro definitions   */
-
-    /* Def_cell sets ce_all.cl_prq to point back to itself. .UPDATEALL
-     * uses ce_all.cl_next to link the cells together. */
-    struct lcell	ce_all;
-
-    /* If set it points to first element of the list linked by ce_all. */
-        struct tcell    *ce_set;
-    struct tcell    *ce_setdir;	/* SETDIR ROOT pointer for this cell*/
-    struct tcell	*ce_link;	/* link for temporary list making   */
-        struct tcell    *ce_parent;     /* used by inner loop, not a static */
-
-    struct lcell    *ce_prq;	/* list of prerequisites for cell   */
-    struct lcell    *ce_prqorg;	/* list of original prerequisites   */
-    struct lcell    *ce_indprq;	/* indirect prerequisites for % cell*/
-
-    struct str      *ce_recipe;	/* recipe for making this cell      */
-    FILELISTPTR     ce_files;	/* list of temporary files for cell */
-        struct str      *ce_cond;       /* conditional macro assignments    */
-
-    char 		*ce_per;	/* value of % in %-meta expansion   */
-    char		*ce_fname;	/* file name associated with target */
-    char		*ce_lib;	/* archive name, if A_LIBRARYM      */
-    char		*ce_dir;	/* value for .SETDIR attribute      */
-
-    int		ce_count;	/* value for :: recipe set          */
-    int		ce_index;	/* value of count for next :: child */
-    int   		ce_flag;	/* all kinds of goodies		    */
-    t_attr		ce_attr;	/* attributes for this target	    */
-    time_t		ce_time;	/* time stamp value of target if any*/
-} CELL, *CELLPTR;
-
-#define CE_NAME		ce_name->ht_name
-#define CE_RECIPE       ce_recipe
-#define CE_PRQ          ce_prq
-#define CeMeToo(C)      &((C)->ce_all)
-#define CeNotMe(C)      (C)->ce_all.cl_next
-
-
-/* This struct represents that used by Get_token to return and control
- * access to a token list inside a particular string.  This gives the
- * ability to access non overlapping tokens simultaneously from
- * multiple strings. */
-    
-typedef struct {
-    char *tk_str;              /* the string to search for tokens  */
-    char tk_cchar;             /* current char under *str          */
-    int  tk_quote;	           /* if we are scanning a quoted str  */
-}  TKSTR, *TKSTRPTR;
-
-
-
-/* Below is the struct used to represent a string.  It points at possibly
- * another string, since the set of rules for making a target is a collection
- * of strings. */
-
-
-typedef struct str {
-    char		*st_string;	/* the string value */
-    struct str	*st_next;	/* pointer to the next string */
-    t_attr		st_attr;	/* attr for rule operations */
-} STRING, *STRINGPTR;
-
-
-
-/* These structs are used in processing of the % rules, and in building
- * the NFA machine that is used to match an arbitrary target string to
- * one of the % rules that is represented by each DFA */
-
-typedef int16 statecnt;		/* limits the max number of dfa states	*/
-
-
-/* Each state of the DFA contains four pieces of information. */
-typedef struct st {
-    struct st	*no_match;	/* state to go to if no match */
-    struct st	*match;		/* state to go to if we do match */
-    char		symbol;		/* symbol on which we transit */
-    char		action;		/* action to perform if match */
-} STATE, *STATEPTR;
-
-
-/* Each DFA machine looks like this.  It must have two pointers that represent
- * the value of % in the matched string, and it contains a pointer into the
- * current state, as well as the array of all states. */
-typedef struct {
-    char		*pstart;	/* start of % string match */
-    char		*pend;		/* end of % string match */
-    STATEPTR	c_state;	/* current DFA state */
-    CELLPTR		node;		/* % target represented by this DFA */
-    STATEPTR	states;		/* table of states for the DFA */
-} DFA, *DFAPTR;
-
-
-/* An NFA is a collection of DFA's.  For each DFA we must know it's current
- * state and where the next NFA is. */
-typedef struct nfa_machine {
-    DFAPTR		dfa;		/* The DFA for this eps transition */
-    char		status;		/* DFA state */
-    struct nfa_machine *next; 	/* the next DFA in NFA */
-} NFA, *NFAPTR;
-
-
-
-/* The next struct is used to link together DFA nodes for inference. */
-
-typedef struct dfal {
-    struct tcell	*dl_meta;	/* link to %-meta cell		*/
-    struct dfal	*dl_next;	/* next cell on matched DFA list*/
-    struct dfal	*dl_prev;	/* prev cell on matched DFA list*/
-    struct dfal	*dl_member;	/* used during subset calc	*/
-    char		dl_delete;	/* used during subset calc	*/
-    char   		*dl_per;	/* value of % for matched DFA   */
-    statecnt        dl_state;	/* matched state of the DFA	*/
-    int		dl_prep;	/* repetion count for the cell	*/
-} DFALINK, *DFALINKPTR;
-
-
-/* This struct is used to store the stack of DFA sets during inference */
-typedef struct dfst {
-   DFALINKPTR	df_set;			/* pointer to the set		*/
-   struct dfst *df_next;		/* next element in the stack	*/
-} DFASET, *DFASETPTR;
-
-
-/* We need sets of items during inference, here is the item, we form sets
- * by linking them together. */
-
-typedef struct ic {
-   CELLPTR	ic_meta;		/* Edge we used to make this cell*/
-   DFALINKPTR   ic_dfa;			/* Dfa that we matched against	 */
-   CELLPTR	ic_setdirroot;		/* setdir root pointer for cell	 */
-   DFASET       ic_dfastack;		/* set of dfas we're working with*/
-   int		ic_dmax;		/* max depth of cycles in graph  */
-   char	       *ic_name;		/* name of the cell to insert    */
-   char        *ic_dir;			/* dir to CD to prior to recurse */
-   struct ic   *ic_next;		/* next pointer to link		 */
-   struct ic   *ic_link;		/* link all ICELL'S together     */
-   struct ic   *ic_parent;		/* pointer to post-requisite	 */
-   char		ic_flag;		/* flag, used for NOINFER only	 */
-   char         ic_exists;		/* TRUE if prerequisite exists	 */
-} ICELL, *ICELLPTR;
-
-#endif
diff --git a/dmake/sysintf.c b/dmake/sysintf.c
deleted file mode 100644
index 53df89898..000000000
--- a/dmake/sysintf.c
+++ /dev/null
@@ -1,1163 +0,0 @@
-/* RCS  $Id: sysintf.c,v 1.13 2008-03-05 18:30:58 kz Exp $
---
--- SYNOPSIS
---      System independent interface
--- 
--- DESCRIPTION
---	These are the routines constituting the system interface.
---	The system is taken to be essentially POSIX conformant.
---	The original code was extensively revised by T J Thompson at MKS,
---	and the library cacheing was added by Eric Gisin at MKS.  I then
---	revised the code yet again, to improve the lib cacheing, and to
---	make it more portable.
---
---	The following is a list of routines that are required by this file
---	in order to work.  These routines are provided as functions by the
---	standard C lib of the target system or as #defines in system/sysintf.h
---	or via appropriate C code in the system/ directory for the given
---	system.
---
---	The first group must be provided by a file in the system/ directory
---	the second group is ideally provided by the C lib.  However, there
---	are instances where the C lib implementation of the specified routine
---	does not exist, or is incorrect.  In these instances the routine
---	must be provided by the the user in the system/ directory of dmake.
---	(For example, the bsd/ dir contains code for putenv(), and tempnam())
---
---	DMAKE SPECIFIC:
---		seek_arch()
---		touch_arch()
---		void_lcache()
---		runargv()
---		DMSTAT()
---		Remove_prq()
---
---	C-LIB SPECIFIC:  (should be present in your C-lib)
---		utime()
---		time()
---		getenv()
---		putenv()
---		getcwd()
---		signal()
---		chdir()
---		tempnam()
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-/* The following definition controls the use of GetModuleFileName() */
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#   define HAVE_GETMODULEFILENAMEFUNC 1
-
-/* this is needed for the _ftime call below. Only needed here. */
-#   include <sys/timeb.h>
-#endif
-
-/* for cygwin_conv_to_posix_path() in Prolog() and for cygdospath()*/
-#if __CYGWIN__
-#   include <sys/cygwin.h>
-#endif
-
-#include "sysintf.h"
-#if HAVE_ERRNO_H
-#  include <errno.h>
-#else
-   extern  int  errno;
-#endif
-
-/*
-** Tries to stat the file name.  Returns 0 if the file
-** does not exist.  Note that if lib is not null it tries to stat
-** the name found inside lib.
-**
-** If member is NOT nil then look for the library object which defines the
-** symbol given by name.  If found DmStrDup the name and return make the
-** pointer pointed at by sym point at it.  Not handled for now!
-*/
-static time_t
-really_dostat(name, buf)
-char *name;
-struct stat *buf;
-{
-   return( (   DMSTAT(name,buf)==-1 
-            || (STOBOOL(Augmake) && (buf->st_mode & S_IFDIR)))
-       ? (time_t)0L
-       : (time_t) buf->st_mtime
-     );
-}
-
-
-PUBLIC time_t
-Do_stat(name, lib, member, force)
-char *name;
-char *lib;
-char **member;
-int  force;
-{
-   struct stat buf;
-   time_t seek_arch();
-
-   if( member != NIL(char *) )
-      Fatal("Library symbol names not supported");
-
-   buf.st_mtime = (time_t)0L;
-   if( lib != NIL(char) )
-      return( seek_arch(Basename(name), lib) );
-   else if( strlen(Basename(name)) > NameMax ) {
-      Warning( "Filename [%s] longer than value of NAMEMAX [%d].\n\
-      Assume unix time 0.\n", Basename(name), NameMax );
-      return((time_t)0L);
-   }
-   else if( STOBOOL(UseDirCache) )
-      return(CacheStat(name,force));
-   else
-      return(really_dostat(name,&buf));
-}
-
-
-/* Touch existing file to force modify time to present.
- */
-PUBLIC int
-Do_touch(name, lib, member)
-char *name;
-char *lib;
-char **member;
-{
-   if( member != NIL(char *) )
-      Fatal("Library symbol names not supported");
-
-   if (lib != NIL(char))
-      return( touch_arch(Basename(name), lib) );
-   else if( strlen(Basename(name)) > NameMax ) {
-      Warning( "Filename [%s] longer than value of NAMEMAX [%d].\n\
-      File timestamp not updated to present time.\n", Basename(name), NameMax );
-      return(-1);
-   }
-   else
-#ifdef HAVE_UTIME_NULL
-      return( utime(name, NULL) );
-#else
-#	error "Utime NULL not supported"
-#endif
-}
-
-
-
-PUBLIC void
-Void_lib_cache( lib_name, member_name )/*
-=========================================
-   Void the library cache for lib lib_name, and member member_name. */
-char *lib_name;
-char *member_name;
-{
-   VOID_LCACHE( lib_name, member_name );
-}
-
-
-
-/*
-** return the current time
-*/
-PUBLIC time_t
-Do_time()
-{
-   return (time( NIL(time_t) ));
-}
-
-
-
-/*
-** Print profiling information
-*/
-PUBLIC void
-Do_profile_output( text, mtype, target )
-char *text;
-uint16 mtype;
-CELLPTR target;
-{
-
-   time_t time_sec;
-   uint32 time_msec;
-   char *tstrg;
-   char *tname;
-
-#ifdef HAVE_GETTIMEOFDAY
-   struct timeval timebuffer;
-   gettimeofday(&timebuffer, NULL);
-   time_sec = timebuffer.tv_sec;
-   time_msec = timebuffer.tv_usec/1000;
-#else
-#if defined(_MSC_VER) || defined(__MINGW32__)
-   struct _timeb timebuffer;
-   _ftime( &timebuffer );
-   time_sec = timebuffer.time;
-   time_msec = timebuffer.millitm;
-#   else
-   time_sec = time( NIL(time_t) );
-   time_msec = 0;
-#   endif
-#endif
-
-   tname = target->CE_NAME;
-   if( mtype & M_TARGET ) {
-      tstrg = "target";
-      /* Don't print special targets .TARGETS and .ROOT */
-      if( tname[0] == '.' && (strcmp(".TARGETS", tname) == 0 || \
-                  strcmp(".ROOT", tname) == 0) ) {
-     return;
-      }
-   } else {
-      tstrg = "recipe";
-   }
-
-   /* Don't print shell escape targets if not especially requested. */
-   if( (target->ce_attr & A_SHELLESC) && !(Measure & M_SHELLESC) ) {
-      return;
-   }
-
-   /* Print absolute path if requested. */
-   if( !(target->ce_attr & A_SHELLESC) && (Measure & M_ABSPATH) ) {
-      printf("%s %s %lu.%.3u %s%s%s\n",text, tstrg, time_sec, time_msec, Pwd, DirSepStr, tname);
-   } else {
-      printf("%s %s %lu.%.3u %s\n",text, tstrg, time_sec, time_msec, tname);
-   }
-}
-
-
-
-PUBLIC int
-Do_cmnd(cmd, group, do_it, target, cmnd_attr, last)/*
-=====================================================
-  Execute the string passed in as a command and return
-  the return code. The command line arguments are
-  assumed to be separated by spaces or tabs.  The first
-  such argument is assumed to be the command.
-
-  If group is true then this is a group of commands to be fed to the
-  the shell as a single unit.  In this case cmd is of the form
-  "file" indicating the file that should be read by the shell
-  in order to execute the command group.
-
-  If Wait_for_completion is TRUE add the A_WFC attribute to the new
-  process.
-*/
-char  **cmd; /* Simulate a reference to *cmd. */
-int     group;	/* if set cmd contains the filename of a (group-)shell
-         * script. */
-int     do_it;	/* Only execute cmd if not set to null. */
-CELLPTR target;
-t_attr  cmnd_attr; /* Attributes for current cmnd. */
-int     last;	/* Last recipe line in target. */
-{
-   int  i;
-
-   DB_ENTER( "Do_cmnd" );
-
-   if( !do_it ) {
-      if( last && !Doing_bang ) {
-     /* Don't execute, just update the target when using '-t'
-      * switch. */
-         Update_time_stamp( target );
-      }
-      DB_RETURN( 0 );
-   }
-
-   /* Stop making the rest of the recipies for this target if an error occurred
-    * but the Continue (-k) flag is set to build as much as possible. */
-   if ( target->ce_attr & A_ERROR ) {
-      if ( last ) {
-     Update_time_stamp( target );
-      }
-      DB_RETURN( 0 );
-   }
-
-   if( Max_proc == 1 ) Wait_for_completion = TRUE;
-
-   /* Tell runargv() to wait if needed. */
-   if( Wait_for_completion ) cmnd_attr |= A_WFC;
-
-   /* remove leading whitespace - This should never trigger! */
-   if( iswhite(**cmd) ) {
-      char *p;
-      if( (p = DmStrSpn(*cmd," \t") ) != *cmd )
-     strcpy(*cmd,p);
-   }
-
-   /* set shell if shell metas are found */
-   if( (cmnd_attr & A_SHELL) || group || (*DmStrPbrk(*cmd, Shell_metas)!='\0') )
-      cmnd_attr |= A_SHELL; /* If group is TRUE this doesn't hurt. */
-
-   /* runargv() returns either 0 or 1, 0 ==> command executed, and
-    * we waited for it to return, 1 ==> command started and is still
-    * running. */
-   i = runargv(target, group, last, cmnd_attr, cmd);
-
-   DB_RETURN( i );
-}
-
-
-#define MINARGV 64
-
-PUBLIC char **
-Pack_argv( group, shell, cmd )/*
-================================
-  Take a command and pack it into an argument vector to be executed.
-  If group is true cmd holds the group script file.
-*/
-int    group;
-int    shell;
-char **cmd; /* Simulate a reference to *cmd. */
-{
-   static char **av = NIL(char *);
-   static int   avs = 0;
-   int i = 0;
-   char *s; /* Temporary string pointer. */
-
-   if( av == NIL(char *) ) {
-      TALLOC(av, MINARGV, char*);
-      avs = MINARGV;
-   }
-   av[0] = NIL(char);
-
-   if (**cmd) {
-      if( shell||group ) {
-     char* sh = group ? GShell : Shell;
-
-     if( sh != NIL(char) ) {
-        av[i++] = sh;
-        if( (av[i] = (group?GShell_flags:Shell_flags)) != NIL(char) ) i++;
-
-        if( shell && Shell_quote && *Shell_quote ) {
-           /* Enclose the shell command with SHELLCMDQUOTE. */
-           s = DmStrJoin(Shell_quote, *cmd, -1, FALSE);
-           FREE(*cmd);
-           *cmd = DmStrJoin(s, Shell_quote, -1, TRUE);
-        }
-        av[i++] = *cmd;
-
-#if defined(USE_CREATEPROCESS)
-        /* CreateProcess() needs one long command line. */
-        av[0] = DmStrAdd(av[0], av[1], FALSE);
-        av[1] = NIL(char);
-        /* i == 3 means Shell_flags are given. */
-        if( i == 3 ) {
-           s = av[0];
-           av[0] = DmStrAdd(s, av[2], FALSE);
-           FREE(s);
-           av[2] = NIL(char);
-        }
-        /* The final free of cmd will free the concated command line. */
-        FREE(*cmd);
-        *cmd = av[0];
-#endif
-        av[i]   = NIL(char);
-     }
-     else
-        Fatal("%sSHELL macro not defined", group?"GROUP":"");
-      }
-      else {
-     char *tcmd = *cmd;
-
-#if defined(USE_CREATEPROCESS)
-     /* CreateProcess() needs one long command line, fill *cmd
-      * into av[0]. */
-     while( iswhite(*tcmd) ) ++tcmd;
-     if( *tcmd ) av[i++] = tcmd;
-#else
-     /* All other exec/spawn functions need the parameters separated
-      * in the argument vector. */
-     do {
-        /* Fill *cmd into av[]. Whitespace is converted into '\0' to
-         * terminate each av[] member. */
-        while( iswhite(*tcmd) ) ++tcmd;
-        if( *tcmd ) av[i++] = tcmd;
-
-        while( *tcmd != '\0' && !iswhite(*tcmd) ) ++tcmd;
-        if( *tcmd ) *tcmd++ = '\0';
-
-        /* dynamically increase av size. */
-        if( i == avs ) {
-           avs += MINARGV;
-           av = (char **) realloc( av, avs*sizeof(char *) );
-        }
-     } while( *tcmd );
-#endif
-
-     av[i] = NIL(char);
-      }
-   }
-
-   return(av);
-}
-
-
-/*
-** Return the value of ename from the environment
-** if ename is not defined in the environment then
-** NIL(char) should be returned
-*/
-PUBLIC char *
-Read_env_string(ename)
-char *ename;
-{
-   return( getenv(ename) );
-}
-
-
-/*
-** Set the value of the environment string ename to value.
-**  Returns 0 if success, non-zero if failure
-*/
-PUBLIC int
-Write_env_string(ename, value)
-char *ename;
-char *value;
-{
-#if defined(HAVE_SETENV)
-
-  return( setenv(ename, value, 1) );
-
-#else  /* !HAVE_SETENV */
-
-  char*   p;
-  char*   envstr = DmStrAdd(ename, value, FALSE);
-
-  p = envstr+strlen(ename);	/* Don't change this code, DmStrAdd does not */
-  *p++ = '=';			/* add the space if *value is 0, it does    */
-  if( !*value ) *p = '\0';	/* allocate enough memory for one though.   */
-
-  return( putenv(envstr) ); /* Possibly leaking 'envstr' */
-
-#endif /* !HAVE_SETENV */
-}
-
-
-PUBLIC void
-ReadEnvironment()
-{
-   extern char **Rule_tab;
-#if !defined(_MSC_VER)
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x500
-   extern char ** _RTLENTRY _EXPDATA environ;
-#else
-   extern char **environ;
-#endif
-#endif
-   char **rsave;
-
-#if !defined(__ZTC__) && !defined(_MPW)
-# define make_env()
-# define free_env()
-#else
-   void make_env();
-   void free_env();
-#endif
-
-   make_env();
-
-   rsave    = Rule_tab;
-   Rule_tab = environ;
-   Readenv  = TRUE;
-
-   Parse( NIL(FILE) );
-
-   Readenv  = FALSE;
-   Rule_tab = rsave;
-
-   free_env();
-}
-
-
-
-/*
-** All we have to catch is SIGINT
-*/
-PUBLIC void
-Catch_signals(fn)
-void (*fn)(int);
-{
-   /* FIXME: Check this and add error handling. */
-   if( (void (*)(int)) signal(SIGINT, SIG_IGN) != (void (*)(int))SIG_IGN )
-      signal( SIGINT, fn );
-   if( (void (*)(int)) signal(SIGQUIT, SIG_IGN) != (void (*)(int))SIG_IGN )
-      signal( SIGQUIT, fn );
-}
-
-
-
-/*
-** Clear any previously set signals
-*/
-PUBLIC void
-Clear_signals()
-{
-   if( (void (*)())signal(SIGINT, SIG_IGN) != (void (*)())SIG_IGN )
-      signal( SIGINT, SIG_DFL );
-   if( (void (*)())signal(SIGQUIT, SIG_IGN) != (void (*)())SIG_IGN )
-      signal( SIGQUIT, SIG_DFL );
-}
-
-
-
-/*
-** Set program name
-*/
-PUBLIC void
-Prolog(argc, argv)
-int   argc;
-char* argv[];
-{
-   Pname = (argc == 0) ? DEF_MAKE_PNAME : argv[0];
-
-   /* Only some native Windows compilers provide this functionality. */
-#ifdef HAVE_GETMODULEFILENAMEFUNC
-   if( (AbsPname = MALLOC( PATH_MAX, char)) == NIL(char) ) No_ram();
-   GetModuleFileName(NULL, AbsPname, PATH_MAX*sizeof(char));
-#else
-   AbsPname = "";
-#endif
-
-#if __CYGWIN__
-   /* Get the drive letter prefix used by cygwin. */
-   if ( (CygDrvPre = MALLOC( PATH_MAX, char)) == NIL(char) )
-      No_ram();
-   else {
-      int err = cygwin_conv_to_posix_path("c:", CygDrvPre);
-      if (err)
-     Fatal( "error converting \"%s\" - %s\n",
-        CygDrvPre, strerror (errno));
-      if( (CygDrvPreLen = strlen(CygDrvPre)) == 2 ) {
-     /* No prefix */
-     *CygDrvPre = '\0';
-     CygDrvPreLen = 0;
-      } else {
-     /* Cut away the directory letter. */
-     CygDrvPre[CygDrvPreLen-2] = '\0';
-     /* Cut away the leading '/'. We don't free the pointer, i.e. choose
-      * the easy way. */
-     CygDrvPre++;
-     CygDrvPreLen -= 3;
-      }
-   }
-#endif
-
-   /* DirSepStr is used from Clean_path() in Def_cell(). Set it preliminary
-    * here, it will be redefined later in Create_macro_vars() in imacs.c. */
-   DirSepStr = "/";
-
-   Root = Def_cell( ".ROOT" );
-   Targets = Def_cell( ".TARGETS" );
-   Add_prerequisite(Root, Targets, FALSE, FALSE);
-
-   Targets->ce_flag = Root->ce_flag = F_RULES|F_TARGET|F_STAT;
-   Targets->ce_attr = Root->ce_attr = A_NOSTATE|A_PHONY;
-
-   Root->ce_flag |= F_MAGIC;
-   Root->ce_attr |= A_SEQ;
-
-   tzset();
-}
-
-
-
-/*
-** Do any clean up for exit.
-*/
-PUBLIC void
-Epilog(ret_code)
-int ret_code;
-{
-   Write_state();
-   Unlink_temp_files(Root);
-   Hook_std_writes(NIL(char));		/* For MSDOS tee (-F option) */
-   exit( ret_code );
-}
-
-
-
-/*
-** Use the built-in functions of the operating system to get the current
-** working directory.
-*/
-PUBLIC char *
-Get_current_dir()
-{
-   static char buf[PATH_MAX+2];
-
-   if( !getcwd(buf, sizeof(buf)) )
-      Fatal("Internal Error: Error when calling getcwd()!");
-
-#ifdef __EMX__
-   char *slash;
-   slash = buf;
-   while( (slash=strchr(slash,'/')) )
-      *slash = '\\';
-#endif
-
-   return buf;
-}
-
-
-
-/*
-** change working directory
-*/
-PUBLIC int
-Set_dir(path)
-char*   path;
-{
-   return( chdir(path) );
-}
-
-
-
-/*
-** return switch char
-*/
-PUBLIC char
-Get_switch_char()
-{
-   return( getswitchar() );
-}
-
-
-int Create_temp(tmpdir, path)/*
-===============================
-  Create a temporary file and open with exclusive access
-  Path is updated with the filename and the file descriptor
-  is returned.  Note that the new name should be freed when
-  the file is removed.
-*/
-char *tmpdir;
-char **path;
-{
-   int fd; /* file descriptor */
-
-#if defined(HAVE_MKSTEMP)
-   mode_t       mask;
-
-   *path = DmStrJoin( tmpdir, DirSepStr, -1, FALSE);
-   *path = DmStrJoin( *path, "mkXXXXXX", -1, TRUE );
-
-   mask = umask(0066);
-   fd = mkstemp( *path );
-   umask(mask);
-
-#elif defined(HAVE_TEMPNAM)
-   char pidbuff[32];
-#if _MSC_VER >= 1300
-   /* Create more unique filename for .NET2003 and newer. */
-   long npid;
-   long nticks;
-
-   npid = _getpid();
-   nticks = GetTickCount() & 0xfff;
-   sprintf(pidbuff,"mk%d_%d_",npid,nticks);
-#else   
-   sprintf(pidbuff,"mk");
-#endif   
-   *path = tempnam(tmpdir, pidbuff);
-   fd = open(*path, O_CREAT | O_EXCL | O_TRUNC | O_RDWR, 0600);
-#else
-
-#error mkstemp() or tempnam() is needed
-
-#endif
-
-   return fd;
-}
-
-
-PUBLIC FILE*
-Get_temp(path, mode)/*
-======================
-  Generate a temporary file name and open the file for writing.
-  If a name cannot be generated or the file cannot be opened
-  return -1, else return the fileno of the open file.
-  and update the source file pointer to point at the new file name.
-  Note that the new name should be freed when the file is removed.
-  The file stream is opened with the given mode.
-*/
-char **path;
-char *mode;
-{
-   int          fd;
-   FILE         *fp;
-   char         *tmpdir;
-   int          tries = 20;
-
-   tmpdir = Read_env_string( "TMPDIR" );
-   if( tmpdir == NIL(char) )
-      tmpdir = "/tmp";
-
-   while( --tries )
-   {
-      /* This sets path to the name of the created temp file. */
-      if( (fd = Create_temp(tmpdir, path)) != -1)
-         break;
-
-      free(*path); /* free var if creating temp failed. */
-   }
-
-   if( fd != -1)
-   {
-      Def_macro( "TMPFILE", DO_WINPATH(*path), M_MULTI|M_EXPANDED );
-      /* associate stream with file descriptor */
-      fp = fdopen(fd, mode);
-   }
-   else
-      fp = NIL(FILE);
-
-   return fp;
-}
-
-
-PUBLIC FILE *
-Start_temp( suffix, cp, fname )/*
-=================================
-  Open a new temporary file and set it up for writing. The file is linked
-  to cp and will be removed if once the target is finished.
-  If a suffix for the temporary files is requested two temporary files are
-  created. This is done because the routines that create a save temporary
-  file do not provide a definable suffix. The first (provided by Get_temp())
-  is save and unique and the second file is generated by adding the desired
-  suffix the the first temporary file. The extra file is also linked to cp
-  so that it gets removed later.
-  The function returns the FILE pointer to the temporary file (with suffix
-  if specified) and leaves the file name in *fname.
-*/
-char     *suffix;
-CELLPTR   cp;
-char    **fname;
-{
-   FILE        *fp, *fp2;
-   char        *tmpname;
-   char        *name;
-   char        *fname_suff;
-
-   name = (cp != NIL(CELL))?cp->CE_NAME:"makefile text";
-
-   /* This sets tmpname to the name that was used. */
-   if( (fp = Get_temp(&tmpname, "w")) == NIL(FILE) )
-      Open_temp_error( tmpname, name );
-
-   /* Don't free tmpname, it's stored in a FILELIST member in Link_temp(). */
-   Link_temp( cp, fp, tmpname );
-   *fname = tmpname;
-
-   /* As Get_temp() doesn't provide a definable suffix (anymore) we create an
-    * additional temporary file with that suffix. */
-   if ( suffix && *suffix ) {
-
-#ifdef HAVE_MKSTEMP
-      /* Only use umask if we are also using mkstemp - this basically
-       * avoids using the incompatible implementation from MSVC. */
-      mode_t mask;
-
-      mask = umask(0066);
-#endif
-
-      fname_suff = DmStrJoin( tmpname, suffix, -1, FALSE );
-
-      /* Overwrite macro, Get_temp didn't know of the suffix. */
-      Def_macro( "TMPFILE", DO_WINPATH(fname_suff), M_MULTI|M_EXPANDED );
-
-      if( (fp2 = fopen(fname_suff, "w" )) == NIL(FILE) )
-         Open_temp_error( fname_suff, name );
-#ifdef HAVE_MKSTEMP
-      umask(mask);
-#endif
-
-      /* Don't free fname_suff. */
-      Link_temp( cp, fp2, fname_suff );
-      fp = fp2;
-      *fname = fname_suff;
-   }
-
-   return( fp );
-}
-
-
-/*
-** Issue an error on failing to open a temporary file
-*/
-PUBLIC void
-Open_temp_error( tmpname, name )
-char *tmpname;
-char *name;
-{
-   Fatal("Cannot open temp file `%s' while processing `%s'", tmpname, name );
-}
-
-
-/*
-** Link a temp file onto the list of files.
-*/
-PUBLIC void
-Link_temp( cp, fp, fname )
-CELLPTR cp;
-FILE   *fp;
-char   *fname;
-{
-   FILELISTPTR new;
-
-   if( cp == NIL(CELL) ) cp = Root;
-
-   TALLOC( new, 1, FILELIST );
-
-   new->fl_next = cp->ce_files;
-   new->fl_name = fname;
-   new->fl_file = fp;		/* indicates temp file is open */
-
-   cp->ce_files = new;
-}
-
-
-/*
-** Close a previously used temporary file.
-*/
-PUBLIC void
-Close_temp(cp, file)
-CELLPTR cp;
-FILE    *file;
-{
-   FILELISTPTR fl;
-   if( cp == NIL(CELL) ) cp = Root;
-
-   for( fl=cp->ce_files; fl && fl->fl_file != file; fl=fl->fl_next );
-   if( fl ) {
-      fl->fl_file = NIL(FILE);
-      fclose(file);
-   }
-}
-
-
-/*
-** Clean-up, and close all temporary files associated with a target.
-*/
-PUBLIC void
-Unlink_temp_files( cp )/*
-==========================
-   Unlink the tempfiles if any exist.  Make sure you close the files first
-   though.  This ensures that under DOS there is no disk space lost. */
-CELLPTR cp;
-{
-   FILELISTPTR cur, next;
-
-   if( cp == NIL(CELL) || cp->ce_files == NIL(FILELIST) ) return;
-
-   for( cur=cp->ce_files; cur != NIL(FILELIST); cur=next ) {
-      next = cur->fl_next;
-
-      if( cur->fl_file ) fclose( cur->fl_file );
-
-      if( Verbose & V_LEAVE_TMP )
-         fprintf( stderr, "%s:  Left temp file [%s]\n", Pname, cur->fl_name );
-      else
-         (void) Remove_file( cur->fl_name );
-
-      FREE(cur->fl_name);
-      FREE(cur);
-   }
-
-   cp->ce_files = NIL(FILELIST);
-}
-
-
-PUBLIC void
-Handle_result(status, ignore, abort_flg, target)/*
-==================================================
-  Handle return value of recipe.
-*/
-int	status;
-int	ignore;
-int	abort_flg;
-CELLPTR target;
-{
-   status = ((status&0xff)==0 ? status>>8   /* return from exit()      */
-         : (status & 0xff)==SIGTERM ? -1 /* terminated from SIGTERM */
-         : (status & 0x7f)+128);         /* terminated from signal
-                          *         ( =status-128 ) */ 
-
-   if( status ) {
-      if( !abort_flg ) {
-     char buf[512];
-
-     sprintf(buf, "%s:  Error code %d, while making '%s'",
-         Pname, status, target->ce_fname );
-
-     if( ignore || Continue ) {
-        if (!(Glob_attr & A_SILENT)) {
-           strcat(buf, " (Ignored" );
-
-           if ( Continue ) {
-          /* Continue after error if '-k' was used. */
-          strcat(buf,",Continuing");
-          target->ce_attr |= A_ERROR;
-           }
-           strcat(buf,")");
-           if (Verbose)
-          fprintf(stderr, "%s\n", buf);
-        }
-
-        if( target->ce_attr & A_ERRREMOVE
-        && Remove_file( target->ce_fname ) == 0
-        && !(Glob_attr & A_SILENT))
-           fprintf(stderr,"%s:  '%s' removed.\n", Pname, target->ce_fname);
-     }
-     else {
-        fprintf(stderr, "%s\n",buf);
-
-        if(!(target->ce_attr & A_PRECIOUS)||(target->ce_attr & A_ERRREMOVE))
-           if( Remove_file( target->ce_fname ) == 0 )
-          fprintf(stderr,"%s:  '%s' removed.\n", Pname,
-              target->ce_fname);
-
-        Quit(0);
-     }
-      }
-      else if(!(target->ce_attr & A_PRECIOUS)||(target->ce_attr & A_ERRREMOVE))
-     Remove_file( target->ce_fname );
-   }
-}
-
-
-PUBLIC void
-Update_time_stamp( cp )/*
-=========================
-   Update the time stamp of cp and scan the list of its prerequisites for
-   files being marked as removable (ie. an inferred intermediate node).
-   Remove them if there are any. */
-CELLPTR cp;
-{
-   HASHPTR hp;
-   LINKPTR dp;
-   CELLPTR tcp;
-   time_t  mintime;
-   int     phony = ((cp->ce_attr&A_PHONY) != 0);
-
-   for(dp=CeMeToo(cp); dp; dp=dp->cl_next) {
-      tcp=dp->cl_prq;
-      /* When calling Make() on this target ce_time was set to the minimal
-       * required time the target should have after building, i.e. the time
-       * stamp of the newest prerequisite or 1L if there is no
-       * prerequisite. */
-      mintime = tcp->ce_time;
-
-      if( tcp->ce_attr & A_LIBRARY )
-     Void_lib_cache( tcp->ce_fname, NIL(char) );
-      else if( !Touch && (tcp->ce_attr & A_LIBRARYM) )
-     Void_lib_cache( tcp->ce_lib, tcp->ce_fname );
-
-      /* phony targets are treated as if they were recently made
-       * and get the current time assigned. */
-      if( phony ) {
-     tcp->ce_time = Do_time();
-      }
-      else if (Trace) {
-     tcp->ce_time = Do_time();
-      }
-      else {
-     Stat_target(tcp, -1, TRUE);
-
-     if( tcp->ce_time == (time_t) 0L ) {
-        /* If the target does not exist after building set its
-         * time stamp depending if it has recipes or not. Virtual
-         * Targets (without recipes) get the newest time stamp of
-         * its prerequisites assigned. (This was conveniently stored
-         * in mintime.)
-         * Targets with recipes are treated as if they were recently
-         * made and get the current time assigned. */
-        if( cp->ce_recipe == NIL(STRING) && mintime > 1 ) {
-           tcp->ce_time = mintime;
-        }
-        else {
-           tcp->ce_time = Do_time();
-        }
-     }
-     else {
-        /* The target exist. If the target does not have recipe
-         * lines use the newest time stamp of either the target or
-         * the newest time stamp of its prerequisites and issue
-         * a warning. */
-        if( cp->ce_recipe == NIL(STRING) ) {
-           time_t  newtime = ( mintime > 1 ? mintime : Do_time() );
-
-           if( !(tcp->ce_attr & A_SILENT) )
-          Warning( "Found file corresponding to virtual target [%s].",
-               tcp->CE_NAME );
-
-           if( newtime > tcp->ce_time )
-          tcp->ce_time = mintime;
-        }
-     }
-      }
-
-      if( Trace ) {
-     tcp->ce_flag |= F_STAT;		/* pretend we stated ok */
-      }
-
-      if( Verbose & V_MAKE )
-     printf( "%s:  <<<< Set [%s] time stamp to %lu\n",
-         Pname, tcp->CE_NAME, tcp->ce_time );
-
-      if( Measure & M_TARGET )
-     Do_profile_output( "e", M_TARGET, tcp );
-
-      /* At this point cp->ce_time is updated to either the actual file
-       * time or the current time. */
-      DB_PRINT( "make", ("time stamp: %ld, required mintime: %ld",
-             cp->ce_time, mintime) );
-      if( tcp->ce_time < mintime && !(tcp->ce_attr & A_SILENT) ) {
-     Warning( "Target [%s] was made but the time stamp has not been updated.",
-          tcp->CE_NAME );
-      }
-
-      /* The target was made, remove the temp files now. */
-      Unlink_temp_files( tcp );
-      tcp->ce_flag |= F_MADE;
-      tcp->ce_attr |= A_UPDATED;
-   }
-
-   /* Scan the list of prerequisites and if we find one that is
-    * marked as being removable, (ie. an inferred intermediate node)
-    * then remove it.  We remove a prerequisite by running the recipe
-    * associated with the special target .REMOVE.
-    * Typically .REMOVE is defined in the startup file as:
-    *  .REMOVE :; $(RM) $<
-    * with $< being the list of prerequisites specified in the current
-    * target. (Make() sets $< .) */
-
-   /* Make sure we don't try to remove prerequisites for the .REMOVE
-    * target. */
-   if( strcmp(cp->CE_NAME,".REMOVE") != 0 &&
-       (hp = Get_name(".REMOVE", Defs, FALSE)) != NIL(HASH) ) {
-      register LINKPTR dp;
-      int flag = FALSE;
-      int rem;
-      t_attr attr;
-
-      tcp = hp->CP_OWNR;
-
-      /* The .REMOVE target is re-used. Remove old prerequisites. */
-      tcp->ce_flag |= F_TARGET;
-      Clear_prerequisites( tcp );
-
-      for(dp=cp->ce_prq; dp != NIL(LINK); dp=dp->cl_next) {
-     register CELLPTR prq = dp->cl_prq;
-
-     attr = Glob_attr | prq->ce_attr;
-     /* We seem to have problems here that F_MULTI subtargets get removed
-      * that even though they are still needed because the A_PRECIOUS
-      * was not propagated correctly. Solution: Don't remove subtargets, the
-      * master target will be removed if is not needed. */
-     rem  = (prq->ce_flag & F_REMOVE) &&
-        (prq->ce_flag & F_MADE  ) &&
-            !(prq->ce_count ) && /* Don't remove F_MULTI subtargets. */
-        !(prq->ce_attr & A_PHONY) &&
-        !(attr & A_PRECIOUS);
-
-     /* remove if rem is != 0 */
-     if(rem) {
-        LINKPTR tdp;
-
-        /* Add the target plus all that are linked to it with the .UPDATEALL
-         * attribute. */
-        for(tdp=CeMeToo(prq); tdp; tdp=tdp->cl_next) {
-           CELLPTR tmpcell=tdp->cl_prq;
-
-           (Add_prerequisite(tcp,tmpcell,FALSE,FALSE))->cl_flag|=F_TARGET;
-           tmpcell->ce_flag &= ~F_REMOVE;
-        }
-        flag = TRUE;
-     }
-      }
-
-      if( flag ) {
-     int sv_force = Force;
-
-     Force = FALSE;
-     Remove_prq( tcp );
-     Force = sv_force;
-
-     for(dp=tcp->ce_prq; dp != NIL(LINK); dp=dp->cl_next) {
-        register CELLPTR prq = dp->cl_prq;
-
-        prq->ce_flag &= ~(F_MADE|F_VISITED|F_STAT);
-        prq->ce_flag |= F_REMOVE;
-        prq->ce_time  = (time_t)0L;
-     }
-      }
-   }
-}
-
-
-PUBLIC int
-Remove_file( name )
-char *name;
-{
-   struct stat buf;
-
-   if( stat(name, &buf) != 0 )
-      return 1;
-   if( (buf.st_mode & S_IFMT) == S_IFDIR )
-      return 1;
-   return(unlink(name));
-}
-
-
-#if defined(__CYGWIN__)
-char *
-cygdospath(char *src, int winpath)/*
-====================================
-   Convert to DOS path if winpath is true. The returned pointer is
-   either the original pointer or a pointer to a static buffer.
-*/
-{
-   static char *buf = NIL(char);
-
-   if ( !buf && ( (buf = MALLOC( PATH_MAX, char)) == NIL(char) ) )
-      No_ram();
-
-   DB_PRINT( "cygdospath", ("converting [%s] with winpath [%d]", src, winpath ) );
-
-   /* Return immediately on NULL pointer or when .WINPATH is
-    * not set. */
-   if( !src || !winpath )
-      return src;
-
-   if( *src && src[0] == '/' ) {
-      char *tmp;
-      int err = cygwin_conv_to_win32_path(src, buf);
-      if (err)
-     Fatal( "error converting \"%s\" - %s\n",
-        src, strerror (errno));
-
-      tmp = buf;
-      while ((tmp = strchr (tmp, '\\')) != NULL) {
-     *tmp = '/';
-     tmp++;
-      }
-
-      return buf;
-   }
-   else
-      return src;
-}
-#endif
diff --git a/dmake/tests/Makefile.am b/dmake/tests/Makefile.am
deleted file mode 100644
index 87be868be..000000000
--- a/dmake/tests/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile for the tests subdirectory of dmake.
-
-TESTS = infra-0 function_macros-1 function_macros-2 function_macros-3 \
-        function_macros-4 function_macros-5 function_macros-6 \
-        function_macros-7 function_macros-8 function_macros-9 \
-        function_macros-10 \
-        macros-1 macros-2 macros-3 macros-4 macros-5 macros-6 macros-7 \
-        macros-8 macros-9 macros-10 macros-11 \
-        recipes-1 recipes-2 recipes-3 recipes-4 recipes-5 recipes-6 \
-        recipes-7 recipes-8 recipes-9 \
-        misc-1 misc-2 misc-3 misc-4 misc-5 misc-6 misc-7 misc-8 misc-9 \
-        misc-10 misc-11 misc-12 misc-13 misc-14 misc-15 misc-16 misc-17 \
-        misc-18 misc-19 misc-20 misc-21 \
-        targets-1 targets-2 targets-3 targets-4 targets-5 targets-6 \
-        targets-7 targets-8 targets-9 targets-10 targets-11 targets-12 \
-        targets-13 targets-14 targets-15 targets-16 targets-17 targets-18 \
-        targets-19 targets-20 targets-21 targets-22 targets-23 targets-24 \
-        targets-25 targets-26 targets-27 targets-28 targets-29 targets-30
-
-TESTS_ENVIRONMENT = DMAKEPROG="../dmake"
-
-EXTRA_DIST = $(TESTS)
diff --git a/dmake/tests/Makefile.in b/dmake/tests/Makefile.in
deleted file mode 100644
index 40868002e..000000000
--- a/dmake/tests/Makefile.in
+++ /dev/null
@@ -1,392 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-subdir = tests
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OSTYPEUNIX_FALSE = @OSTYPEUNIX_FALSE@
-OSTYPEUNIX_TRUE = @OSTYPEUNIX_TRUE@
-OSTYPEWIN32_FALSE = @OSTYPEWIN32_FALSE@
-OSTYPEWIN32_TRUE = @OSTYPEWIN32_TRUE@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-TESTS = infra-0 function_macros-1 function_macros-2 function_macros-3 \
-        function_macros-4 function_macros-5 function_macros-6 \
-        function_macros-7 function_macros-8 function_macros-9 \
-        function_macros-10 \
-        macros-1 macros-2 macros-3 macros-4 macros-5 macros-6 macros-7 \
-        macros-8 macros-9 macros-10 macros-11 \
-        recipes-1 recipes-2 recipes-3 recipes-4 recipes-5 recipes-6 \
-        recipes-7 recipes-8 recipes-9 \
-        misc-1 misc-2 misc-3 misc-4 misc-5 misc-6 misc-7 misc-8 misc-9 \
-        misc-10 misc-11 misc-12 misc-13 misc-14 misc-15 misc-16 misc-17 \
-        misc-18 misc-19 misc-20 misc-21 \
-        targets-1 targets-2 targets-3 targets-4 targets-5 targets-6 \
-        targets-7 targets-8 targets-9 targets-10 targets-11 targets-12 \
-        targets-13 targets-14 targets-15 targets-16 targets-17 targets-18 \
-        targets-19 targets-20 targets-21 targets-22 targets-23 targets-24 \
-        targets-25 targets-26 targets-27 targets-28 targets-29 targets-30
-
-TESTS_ENVIRONMENT = DMAKEPROG="../dmake"
-EXTRA_DIST = $(TESTS)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tests/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tests/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		echo "XPASS: $$tst"; \
-	      ;; \
-	      *) \
-		echo "PASS: $$tst"; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
-		xfail=`expr $$xfail + 1`; \
-		echo "XFAIL: $$tst"; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		echo "FAIL: $$tst"; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      echo "SKIP: $$tst"; \
-	    fi; \
-	  done; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="All $$all tests passed"; \
-	    else \
-	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all tests failed"; \
-	    else \
-	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
-	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    skipped="($$skip tests were not run)"; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  echo "$$dashes"; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-TESTS check-am clean clean-generic \
-	distclean distclean-generic distdir dvi dvi-am html html-am \
-	info info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/tests/README b/dmake/tests/README
deleted file mode 100644
index ac0af7a8e..000000000
--- a/dmake/tests/README
+++ /dev/null
@@ -1,12 +0,0 @@
-DMAKE TESTCASES
-===============
-
-The testcases in this directory will be executed by "make check" in
-this or the top directory.
-
-Each test can be executed as a standalone script that will test the
-first dmake that is found in the path. A different dmake to be tested
-can be specified by setting the DMAKEPROG environment variable.
-
-Example:
-$ DMAKEPROG=../dmake ./misc-4
diff --git a/dmake/tests/function_macros-1 b/dmake/tests/function_macros-1
deleted file mode 100755
index 6e5368005..000000000
--- a/dmake/tests/function_macros-1
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# 01.06.2005 Volker Quetschke
-# Tests for dmake function macros. (issue 36027, issue 37053)
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Testing function macros
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-TEST1:=a b c
-
-all:
-	@echo \$\$(and ...) section
-	test "::" = ":\$(and  \$(nil) \$(nil)  ):"
-	test ":t:" = ":\$(and  a b  ):"
-	test "::" = ":\$(and  \$(nil) \
- \$(nil)  ):"
-	test "::" = ":\$(and   \
-   ):"
-
-	@echo -e \n\$\$(assign ...) section
-	test ":A:" =  ":\$(assign A := B ):"
-	test "\$(A)" = "B"
-	test ":A:" = ":\$(assign A\
- := C ):"
-	test "\$(A)" = "C"
-
-	@echo -e \n\$\$(echo ...) section
-	test ":123:" = ":\$(echo 123    ):"
-	test ":123:" = ":\$(echo  123    ):"
-	test ":123:" = ":\$(echo\
- 123    ):"
-	test ":123:" = ":\$(echo     \
- 123    ):"
-
-	@echo -e \n\$\$(eq ...) section
-	test ":true:" = ":\$(eq,1,1 true false):"
-	test ":true:" = ":\$(eq,1,1\
- true false):"
-
-#       These tests need to use a shell
-	+@echo -e '\n\$\$(foreach ...) section'
-	+test ":[a] [b] [c]:" = ":\$(foreach,i,\$(TEST1) [\$i]):"
-	+test ":[a] [b] [c]:" = ":\$(foreach,i,\$(TEST1)     [\$i]):"
-	+test ":[a] [b] [c]:" = ":\$(foreach,i,\$(TEST1) [\$i]  ):"
-	+test ":[a] [b] [c]:" = ":\$(foreach,i,\$(TEST1) \
-    [\$i]  ):"
-
-	@echo -e \n\$\$(nil ...) section
-	test "::" = ":\$(nil abc):"
-#   Fails with syntax error
-	test "::" = ":\$(nil \
-          ):"
-
-	@echo -e \n\$\$(not ...) section
-	test "::" = ":\$(not abc):"
-	test ":t:" = ":\$(not \$(NULL)):"
-	test ":t:" = ":\$(not   ):"
-	test ":t:" = ":\$(not  \
-     ):"
-
-	@echo -e \n\$\$(null ...) section
-	test ":true:" = ":\$(null, true      false):"
-	test ":false:" = ":\$(null,a true false):"
-	test ":false:" = ":\$(null,a true false    ):"
-	test ":false:" = ":\$(null,a \
-     true false    ):"
-	test ":true:" = ":\$(null, \
-     true false    ):"
-
-	@echo -e \n\$\$(or ...) section
-	test "::" = ":\$(or  \$(nil) \$(nil)  ):"
-	test ":t:" = ":\$(or  a \$(nil)  ):"
-	test "::" = ":\$(or  \$(nil) \
- \$(nil)  ):"
-	test "::" = ":\$(or   \
-   ):"
-
-EOT
-
-${DMAKEPROG} -r -f $file1
-result=$?
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
\ No newline at end of file
diff --git a/dmake/tests/function_macros-10 b/dmake/tests/function_macros-10
deleted file mode 100755
index db6ce88b0..000000000
--- a/dmake/tests/function_macros-10
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-
-# 28.08.2007 Volker Quetschke
-# Test mktmp function macro.
-# (issue 64234)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1 - Check that mktmp can write special characters into a file.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-FOO:=test1\n\ttest2\n\
-    test3
-
-all :
-	@cat \$(mktmp \$(FOO:m))
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-comparewith=`printf "test1\n\ttest2\n    test3"`
-if test $result1 = 0 -a "$output1" = "$comparewith" ; then
-  echo "Subtest 1: OK"
-  result1=0
-else
-  echo "Subtest 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 2 - Check output of '('
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all :
-	@cat \${mktmp text (to dump to file}
-
-EOT
-
-output2=`eval ${DMAKEPROG} -r -f $file1`
-result2=$?
-if test $result2 = 0 -a "$output2" = "text (to dump to file" ; then
-  echo "Subtest 2: OK"
-  result2=0
-else
-  echo "Subtest 2: Wrong result: $output2"
-  echo
-  result2=1
-fi
-
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 3 - Test multiple line output.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-OBJ = fred.obj mary.obj
-
-./all :
-	@cat \$(mktmp \$(OBJ:t"+\n"))
-EOT
-
-output3=`eval OOODMAKEMODE=y ${DMAKEPROG} -r -f $file1`
-result3=$?
-comparewith=`printf "fred.obj+\nmary.obj"`
-if test $result3 = 0 -a "$output3" = "$comparewith" ; then
-  echo "Subtest 3: OK"
-  result3=0
-else
-  echo "Subtest 3: Wrong result: $output3"
-  echo
-  result3=1
-fi
-
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 4 - Test <+ ... +>
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-OBJ = fred.obj mary.obj joe.obj
-
-./all :
-	@cat <+\$(OBJ)+>
-EOT
-
-output4=`eval ${DMAKEPROG} -r -f $file1`
-result4=$?
-if test $result4 = 0 -a "$output4" = "fred.obj mary.obj joe.obj" ; then
-  echo "Subtest 4: OK"
-  result4=0
-else
-  echo "Subtest 4: Wrong result: $output4"
-  echo
-  result4=1
-fi
-
-
-if test $result1 -eq 0 -a $result2 -eq 0 \
-    -a $result3 -eq 0 -a $result4 -eq 0  ; then
-    echo "Success - Cleaning up" && rm -f ${tmpfiles}
-    exit
-else
-    echo "Failure!"
-    exit 1
-fi
diff --git a/dmake/tests/function_macros-2 b/dmake/tests/function_macros-2
deleted file mode 100755
index c17501f2a..000000000
--- a/dmake/tests/function_macros-2
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# 01.06.2005 Volker Quetschke
-# Tests for dmake function macros - part 2.
-# (issue 36027, issue 37053, issue 37491)
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Testing function macros
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-TEST1:=a b c
-PAT:=Z
-
-all:
-	+@echo -e '\n\$\$(shell ...) section'
-	+test ":123:" = ":\$(shell echo 123  ):"
-	+test ":123:" = ":\$(shell   \
-     echo 123  ):"
-	+test ":123:" = ":\$(shell echo \
-     123  ):"
-
-	+@echo -e '\n\$\$(sort ...) section'
-	+test ":a b c:" = ":\$(sort c  a b   ):"
-	+test ":a b c:" = ":\$(sort\
-     c  a b   ):"
-	+test ":a b c:" = ":\$(sort   c \
-    a b   ):"
-
-	+@echo -e '\n\$\$(strip ...) section'
-	+test ":c a b:" = ":\$(strip    c   a b   ):"
-	+test ":c a b:" = ":\$(strip    c \
-     a b   ):"
-
-	+@echo -e '\n\$\$(subst ...) section' 
-	+test ":aZbZc:" = ":\$(subst,\$(SPACECHAR),\$(PAT) \$(TEST1)):"
-	+test ":aZbZc:" = ":\$(subst,%Z*Z%,\$(PAT) \$(TEST1:s/ /%Z*Z%/)):"
-	+test ":aZbZc:" = ":\$(subst,Y,\$(PAT)       aYbYc         ):"
-	+test ":aZbZc:" = ":{\$(subst,Y,Z       aYbYc         )}:"
-# Undefined
-#	+test ":Should error out:BUG:\$(subst, ,\$(PAT) \$(TEST1)):"
-
-	+@echo -e '\n\$\$(uniq ...) section'
-	+test ":a b c:" = ":\$(uniq    c   a b c ):"
-	+test ":a b c:" = ":\$(uniq    c   \
-     a b c ):"
-
-EOT
-
-${DMAKEPROG} -r -f $file1
-result=$?
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
\ No newline at end of file
diff --git a/dmake/tests/function_macros-3 b/dmake/tests/function_macros-3
deleted file mode 100755
index bd8d06b3d..000000000
--- a/dmake/tests/function_macros-3
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# 04.09.2005 Volker Quetschke
-# Tests $(shell ..) function macro when using two concurrend processes.
-# (issue 53148)
-
-: ${DMAKEPROG:=dmake}
-file1="makefile.mk"
-file2="stdout.txt"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Testing continuation char in recipes
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-AA=X\$(shell +echo shellexec)X
-
-$file2 :
-	+@echo b0
-	+@echo b1
-	+@echo b2
-	+@echo A\$(AA)A > $file2
-EOT
-
-${DMAKEPROG} -P2 -r -f $file1
-result=$?
-if test "`cat $file2`" != "AXshellexecXA"; then
-  echo "Wrong result: `cat $file2`, AXshellexecXA expected!"
-  result=1
-fi
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/function_macros-4 b/dmake/tests/function_macros-4
deleted file mode 100755
index eef22e334..000000000
--- a/dmake/tests/function_macros-4
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# 04.09.2005 Volker Quetschke
-# Tests $(shell ..) if function macro is executed after previous recipe lines
-# when using two concurrend (or more) processes.
-# (issue 53148)
-
-: ${DMAKEPROG:=dmake}
-file1="makefile.mk"
-file2="stdout.txt"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Testing continuation char in recipes
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-aaa :
-	+echo b0
-	+echo b1
-	+echo teststring > $file2
-	+echo A\$(shell cat $file2)A
-EOT
-
-${DMAKEPROG} -P2 -r -f $file1
-result=$?
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/function_macros-5 b/dmake/tests/function_macros-5
deleted file mode 100755
index 1be199068..000000000
--- a/dmake/tests/function_macros-5
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# 03.14.2006 Volker Quetschke
-# Verifies that $(shell ..) does not pick up stdout output from
-# concurrent processes. (Stronger test for the spawn case.)
-# (issue 61856 / issue 61940)
-
-: ${DMAKEPROG:=dmake}
-file1="makefile.mk"
-file2="stdout.txt"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Testing continuation char in recipes
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all : all1 all2
-	@+echo "Y\$(DYNMAC)Y" > $file2 
-
-all1 :
-	@+echo "Before the sleeps ..."
-	@+echo A; sleep 1; echo B; sleep 1; echo C; sleep 1; echo D; sleep 1; echo E
-	@+echo "After the sleeps ..."
-
-all2 :
-	@+sleep 1;
-	@+echo "X\$(assign DYNMAC:=\$(shell @+echo "(shellpre)";sleep 2; echo "(shellpost)"))X"
-	@+echo "Z\$(DYNMAC)Z"
-EOT
-
-${DMAKEPROG} -P3 -r -f $file1
-result=$?
-if test "`cat $file2`" != "Y(shellpre) (shellpost)Y"; then
-  echo "Wrong result: `cat $file2`, Y(shellpre) (shellpost)Y expected!"
-  result=1
-fi
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/function_macros-6 b/dmake/tests/function_macros-6
deleted file mode 100755
index ce22d9c6e..000000000
--- a/dmake/tests/function_macros-6
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# 22.07.2006 Volker Quetschke
-# Verifies that $(nil expression) expand expression but returns "".
-# (issue 67585)
-
-: ${DMAKEPROG:=dmake}
-file1="makefile.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Testing nil function macro
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all : dep
-	@+echo "X\$(AAA)X"
-
-dep :
-	\$(nil \$(assign AAA := OK))
-
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-if test $output1 = "XOKX" ; then
-  dummy=1
-  # OK
-else
-  echo "Wrong result: $output1"
-  result1=1
-fi
-
-test $result1 -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result1 -ne 0 && echo "Failure!"
-exit $result1
diff --git a/dmake/tests/function_macros-7 b/dmake/tests/function_macros-7
deleted file mode 100755
index e6fc03a3d..000000000
--- a/dmake/tests/function_macros-7
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# 24.07.2006 Volker Quetschke
-# Checks that $(mktmp ...) works.
-# (issue 64583)
-
-: ${DMAKEPROG:=dmake}
-file1="makefile.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Testing mktmp function macro
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all :
-	@+cat \$(mktmp WRITTENTODISK)
-
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-if test $output1 = "WRITTENTODISK" ; then
-  dummy=1
-  # OK
-else
-  echo "Wrong result: $output1"
-  result1=1
-fi
-
-test $result1 -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result1 -ne 0 && echo "Failure!"
-exit $result1
diff --git a/dmake/tests/function_macros-8 b/dmake/tests/function_macros-8
deleted file mode 100755
index 911b1cff3..000000000
--- a/dmake/tests/function_macros-8
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# 24.07.2007 Volker Quetschke
-# Test the $(normpath ..) function macro.
-# (issue 78776)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1 - Test if normpath works.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.WINPATH:=
-
-all :
-	@echo 1\$(normpath /tmp/./a "/tmp/a b/xxx/../b" /tmp)1
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-if test "$output1" != "1/tmp/a \"/tmp/a b/b\" /tmp1"; then
-  echo "Subtest 1: Wrong result: $output1"
-  result1=1
-else
-  echo "Subtest 1: OK"
-fi 
-
-# Test 2 - Test if normpath honors .WINPATH setting
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all .WINPATH :
-	@echo 2\$(normpath /tmp)2
-
-EOT
-
-output2=`eval ${DMAKEPROG} -r -f $file1`
-result2=$?
-if test x`uname -o 2> /dev/null` = "xCygwin"; then
-  if test "$output2" != "2`cygpath -m /tmp`2"; then
-    echo "Subtest 2: Wrong result: $output2"
-    result2=1
-  else
-    echo "Subtest 2: OK"
-  fi
-else
-  if test "$output2" != "2/tmp2"; then
-    echo "Subtest 2: Wrong result: $output2"
-    result2=1
-  else
-    echo "Subtest 2: OK"
-  fi
-fi
-
-# Test 3 - Test if the optional parameter works
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all :
-	@echo 3\$(normpath,"" /tmp)3\$(normpath,"abc" /tmp)3
-
-EOT
-
-output3=`eval ${DMAKEPROG} -r -f $file1`
-result3=$?
-if test x`uname -o 2> /dev/null` = "xCygwin"; then
-  if test "$output3" != "3/tmp3`cygpath -m /tmp`3"; then
-    echo "Subtest 3: Wrong result: $output3"
-    result3=1
-  else
-    echo "Subtest 3: OK"
-  fi
-else
-  if test "$output3" != "3/tmp3/tmp3"; then
-    echo "Subtest 3: Wrong result: $output3"
-    result3=1
-  else
-    echo "Subtest 3: OK"
-  fi
-fi
-
-
-if test $result1 -eq 0 -a $result2 -eq 0 \
-    -a $result3 -eq 0 ; then
-    echo "Success - Cleaning up" && rm -f ${tmpfiles}
-    exit
-else
-    echo "Failure!"
-    exit 1
-fi
diff --git a/dmake/tests/function_macros-9 b/dmake/tests/function_macros-9
deleted file mode 100755
index e8d4d3a07..000000000
--- a/dmake/tests/function_macros-9
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-# 05.08.2007 Volker Quetschke
-# Test the $(shell,expand ..) function macro.
-# (issue 50092)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1 - Test if it works.
-cat > $file1 <<EOT
-# The printf on Solaris seems to need bash.
-SHELL:=/bin/bash 
-SHELLFLAGS*:=-ce
-
-AAA!=123
-
-all :
-	noop X\$(shell,expand +@printf "\x24(AAA)")Y\$(shell +@printf \\\\x24\\(AAA\\))Z
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-if test "$output1" != "noop X123Y\$(AAA)Z"; then
-  echo "Subtest 1: Wrong result: $output1"
-  result1=1
-else
-  echo "Subtest 1: OK"
-fi
-
-# Test 2 - Test if wrong arguments are catched.
-cat > $file1 <<EOT
-# The printf on Solaris seems to need bash.
-SHELL:=/bin/bash 
-SHELLFLAGS*:=-ce
-
-AAA!=123
-
-all :
-	noop X\$(shell,XXX +@printf ABC\\\\x24\\(AAA\\))Y
-
-EOT
-
-output2=`eval ${DMAKEPROG} -rf $file1 2>&1`
-result2=$?
-
-if echo $output2 | grep 'Error: -- Unknown argument \[XXX\] to shell' > /dev/null 2>&1 ; then
-  echo "Subtest 2: OK"
-else
-  echo "Subtest 2: Wrong result: $output2"
-  echo
-  result2=0
-fi
-
-
-
-if test $result1 -eq 0 -a $result2 -ne 0 ; then
-    echo "Success - Cleaning up" && rm -f ${tmpfiles}
-    exit
-else
-    echo "Failure!"
-    exit 1
-fi
diff --git a/dmake/tests/infra-0 b/dmake/tests/infra-0
deleted file mode 100755
index 494ffa442..000000000
--- a/dmake/tests/infra-0
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-# 01.06.2005 Volker Quetschke
-# Basic test of dmake existence and the needed infrastructure.
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-file2="mytestfile"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Test for "test" programm in path
-which test > /dev/null || { echo "Failure! \"test\" program missing." ; exit 1; } 
-echo "Found \"test\" program."
-test=`which test`
-
-# Test for "echo" programm in path
-which echo  > /dev/null || { echo "Failure! \"echo\" program missing." ; exit 1; }
-echo "Found \"echo\" program."
-
-# Test for dmake program
-${test} -x "${DMAKEPROG}" || { echo "Failure! \"dmake\" is missing." ; exit 1; }
-echo "Found \"dmake\" program."
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# simple makefile
-${file2}:
-	@echo 'Generating ${file2}'
-	touch ${file2}
-EOT
-
-${DMAKEPROG} -r -f $file1
-result=$?
-if ${test} ! -e "${file2}"; then
-  echo "File missing"
-  result=1
-fi
-
-${test} $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-${test} $result -ne 0 && echo "Failure!"
-exit $result
-
diff --git a/dmake/tests/macros-1 b/dmake/tests/macros-1
deleted file mode 100755
index 3eb0d5770..000000000
--- a/dmake/tests/macros-1
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# 01.06.2005 Volker Quetschke
-# Tests for special dmake macros.
-# (issue 37491)
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Testing macros
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-TEST1:=a b c
-PAT:=Z
-
-all:
-	+@echo -e '\n\$\$(SPACECHAR) section' 
-	+test ": :" = ":\$(SPACECHAR):"
-
-	+@echo -e '\n\$\$(MACRO:s/pat/rep/) section' 
-	+test ":aZbZc:" = ":\$(TEST1:s/ /Z/):"
-	+test ":aZbZc:" = ":\$(TEST1:s/\$(SPACECHAR)/Z/):"
-	+test ":aZbZc:" = ":\$(TEST1:s/ /\$(PAT)/  ):"
-
-EOT
-
-${DMAKEPROG} -r -f $file1
-result=$?
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
-
diff --git a/dmake/tests/macros-10 b/dmake/tests/macros-10
deleted file mode 100755
index b2e7d3737..000000000
--- a/dmake/tests/macros-10
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# 08.08.2007 Volker Quetschke
-# Test macro assignment syntax check.
-# (issue 69510)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-AAA:=BBB
-\$(AAA) := 123
-
-X) := YYY
-
-all :
-	@echo :\$(BBB):\${X)}:
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-if test "$output1" != ":123:YYY:"; then
-  echo "Subtest 1: Wrong result: $output1"
-  result1=1
-else
-  echo "Subtest 1: OK"
-fi 
-
-# Test 2
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-{ := fail
-
-all :
-	@echo Should fail
-
-EOT
-
-output2=`eval ${DMAKEPROG} -r -f $file1 2>&1`
-result2=$?
-
-if test $result2 != 0 && echo $output2 | grep 'Error: -- Syntax error in macro assignment' > /dev/null 2>&1 ; then
-  echo "Subtest 2: OK"
-  result2=0
-else
-  echo "Subtest 2: Wrong result: $output2"
-  echo
-  result2=1
-fi
-
-
-# Test 3
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-X := :
-
-AA\$XBB = 098
-
-all :
-	@echo Should fail
-
-EOT
-
-output3=`eval ${DMAKEPROG} -r -f $file1 2>&1`
-result3=$?
-if test $result3 != 0 && echo $output3 | grep 'Error: -- Syntax error in macro assignment' > /dev/null 2>&1 ; then
-  echo "Subtest 3: OK"
-  result3=0
-else
-  echo "Subtest 3: Wrong result: $output3"
-  echo
-  result3=1
-fi
-
-
-
-if test $result1 -eq 0 -a $result2 -eq 0 \
-    -a $result3 -eq 0  ; then
-    echo "Success - Cleaning up" && rm -f ${tmpfiles}
-    exit
-else
-    echo "Failure!"
-    exit 1
-fi
diff --git a/dmake/tests/macros-11 b/dmake/tests/macros-11
deleted file mode 100755
index 023b8a140..000000000
--- a/dmake/tests/macros-11
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/sh
-
-# 26.08.2007 Volker Quetschke
-# Test OOODMAKEMODE macro.
-# (issue 74007)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="startup.mk"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1 - Without OOODMAKEMODE set strip leading ./
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-#OOODMAKEMODE=
-
-./all :
-	@echo X\$@Y
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-if test $result1 = 0 -a "$output1" = "XallY" ; then
-  echo "Subtest 1: OK"
-  result1=0
-else
-  echo "Subtest 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 2 - With OOODMAKEMODE=y do not strip leading ./
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-OOODMAKEMODE:=y
-
-./all :
-	@echo X\$@Y
-EOT
-
-output2=`eval ${DMAKEPROG} -r -f $file1`
-result2=$?
-if test $result2 = 0 -a "$output2" = "X./allY" ; then
-  echo "Subtest 2: OK"
-  result2=0
-else
-  echo "Subtest 2: Wrong result: $output2"
-  echo
-  result2=1
-fi
-
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 3 - Test OOODMAKEMODE from environment.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.IMPORT : OOODMAKEMODE
-
-./all :
-	@echo X\$@Y
-EOT
-
-output3=`eval OOODMAKEMODE=y ${DMAKEPROG} -r -f $file1`
-result3=$?
-if test $result3 = 0 -a "$output3" = "X./allY" ; then
-  echo "Subtest 3: OK"
-  result3=0
-else
-  echo "Subtest 3: Wrong result: $output3"
-  echo
-  result3=1
-fi
-
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 4 - With OOODMAKEMODE= leading ./
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-OOODMAKEMODE:=
-
-./all :
-	@echo X\$@Y
-EOT
-
-output4=`eval ${DMAKEPROG} -r -f $file1`
-result4=$?
-if test $result4 = 0 -a "$output4" = "XallY" ; then
-  echo "Subtest 4: OK"
-  result4=0
-else
-  echo "Subtest 4: Wrong result: $output4"
-  echo
-  result4=1
-fi
-
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 5 - Import from environment / targets from command line.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-%target :
-	@echo X\$@Y
-EOT
-
-cat > $file2 <<EOT
-.IMPORT : OOODMAKEMODE
-EOT
-
-output5=`eval DMAKEROOT=. OOODMAKEMODE=y ${DMAKEPROG} -f $file1 ./mytarget`
-result5=$?
-if test $result5 = 0 -a "$output5" = "X./mytargetY" ; then
-  echo "Subtest 5: OK"
-  result5=0
-else
-  echo "Subtest 5: Wrong result: $output5"
-  echo
-  result5=1
-fi
-
-
-if test $result1 -eq 0 -a $result2 -eq 0 \
-    -a $result3 -eq 0 -a $result4 -eq 0 \
-    -a $result5 -eq 0 ; then
-    echo "Success - Cleaning up" && rm -f ${tmpfiles}
-    exit
-else
-    echo "Failure!"
-    exit 1
-fi
diff --git a/dmake/tests/macros-2 b/dmake/tests/macros-2
deleted file mode 100755
index c0d26260e..000000000
--- a/dmake/tests/macros-2
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# 26.01.2006 Volker Quetschke
-# TMD is sometimes set incorrectly (issue 61170).
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="mfile2.mk"
-file3="dirwith space"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles "$file3"; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles "$file3"
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Testcase 1
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all .SETDIR=${TMP} :
-	+@echo \$(TMD)
-
-EOT
-
-# Testcase 2
-mkdir -p "$file3"
-cat > $file2 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-
-all ".SETDIR=dirwith space" :
-	+@echo \$(TMD)
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-output2=`eval ${DMAKEPROG} -r -f $file2`
-result2=$?
-
-if test "$output1" = ""; then
-  echo "Test 1: Wrong result"
-  result1=1
-fi
-if test "$output2" != ".."; then
-  echo "Test 2: Wrong result"
-  result2=1
-fi
-
-if test $result1 -eq 0 -a $result2 -eq 0; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles "$file3"
-exit
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result 
diff --git a/dmake/tests/macros-3 b/dmake/tests/macros-3
deleted file mode 100755
index f3428fb83..000000000
--- a/dmake/tests/macros-3
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# 17.05.2006 Volker Quetschke
-# Check that .INIT and .DONE are not mistaken for .<suffix> targets
-# and that dmake warns if .<suffix> targets have prerequisites.
-# (issue 65333).
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="mfile2.mk"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Testcase 1 - No warning expected
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all :
-	+@echo "all"
-
-.INIT .DONE : something
-	+@echo "Dummy recipe"
-
-something :
-	+@echo "just a target"
-
-EOT
-
-# Testcase 2 - dmake should warn
-cat > $file2 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.MYTARGET : something
-	+@echo ".MYTARGET"
-
-something :
-	+@echo "just a target"
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 2>&1 `
-result1=$?
-output2=`eval ${DMAKEPROG} -r -f $file2 2>&1 `
-result2=$?
-
-if test "$output1" != "all"; then
-  echo "Test 1: Wrong result: $output1"
-  result1=1
-fi
-if echo $output2 | grep -v 'Warning: -- Ignoring' ; then
-  echo "Test 2: Wrong result: $output2"
-  result2=1
-fi
-
-if test $result1 -eq 0 -a $result2 -eq 0; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-exit
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result 
diff --git a/dmake/tests/macros-4 b/dmake/tests/macros-4
deleted file mode 100755
index 89134d2fa..000000000
--- a/dmake/tests/macros-4
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-
-# 15.08.2006 Volker Quetschke
-# Check that single letter macros with (, {, ), } and : are rejected.
-# (issue 44961).
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="mfile2.mk"
-file3="mfile3.mk"
-file4="mfile4.mk"
-tmpfiles="$file1 $file2 $file3 $file4"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Testcase 1 - Warn about miising closing braket.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all :
-	+@echo "X\$(subst Y"
-EOT
-
-# Testcase 2 - warn about $)
-cat > $file2 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all :
-	+@echo "X\$)Y"
-EOT
-
-# Testcase 3 - warn about $:
-cat > $file3 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all :
-	+@echo "X\$:Y"
-EOT
-
-# Testcase 4 - don't warn
-cat > $file4 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all :
-	+@printf "X\$BLA)Y"
-	+@echo "X\$XX:Y"
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 2>&1 `
-result1=$?
-output2=`eval ${DMAKEPROG} -r -f $file2 2>&1 `
-result2=$?
-output3=`eval ${DMAKEPROG} -r -f $file3 2>&1 `
-result3=$?
-output4=`eval ${DMAKEPROG} -r -f $file4 2>&1 `
-result4=$?
-
-if echo $output1 | grep -v 'Error: -- Syntax error'; then
-  echo "Test 1: Missing error: $output1"
-  result1=0
-fi
-if echo $output2 | grep -v 'Error: -- Syntax error' ; then
-  echo "Test 2: Missing error: $output2"
-  result2=0
-fi
-if echo $output3 | grep -v 'Error: -- Syntax error'; then
-  echo "Test 3: Missing error: $output3"
-  result3=0
-fi
-if test "$output4" != "XLA)YXX:Y"; then
-  echo "Test 2: Wrong result: $output4"
-  result4=1
-fi
-
-if test $result1 -ne 0 -a $result2 -ne 0 -a $result3 -ne 0 -a $result4 -eq 0; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-exit
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result 
diff --git a/dmake/tests/macros-5 b/dmake/tests/macros-5
deleted file mode 100755
index d175271ee..000000000
--- a/dmake/tests/macros-5
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# 24.09.2006 Volker Quetschke
-# TMD is sometimes set incorrectly (issue 69821).
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="mfile2.mk"
-file3="test1/aaa"
-file4="test2/aaa"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles test1 test2; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles test1 test2
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Testcase 1
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all :
-	+@echo \$(TMD)
-
-EOT
-
-# Testcase 2
-mkdir -p "$file3"
-mkdir -p "$file4"
-cat > $file2 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-
-all ".SETDIR=../../$file3" :
-	+@echo \$(TMD)
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-output2=`eval cd $file4 ; ../../${DMAKEPROG} -r -f ../../$file2`
-result2=$?
-
-if test "$output1" != "."; then
-  echo "Test 1: Wrong result: $output1"
-  result1=1
-else
-  echo "  Subtest 1: OK"
-fi
-if test "$output2" != "../../test2/aaa"; then
-  echo "Test 2: Wrong result: $output2"
-  result2=1
-else
-  echo "  Subtest 2: OK"
-fi
-
-if test $result1 -eq 0 -a $result2 -eq 0; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles test1 test2
-exit
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result 
diff --git a/dmake/tests/macros-6 b/dmake/tests/macros-6
deleted file mode 100755
index 8119f2ae8..000000000
--- a/dmake/tests/macros-6
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# 09.11.2006 Volker Quetschke
-# Check that TMD honors if .SETDIR is used (with drive letters on cygwin)
-# (issue 69821).
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Testcase 1
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.IMPORT .IGNORE : TEMP
-.IF "\$(TEMP)"==""
-TEMP:=/tmp
-.ENDIF
-
-
-# Test if .SETDIR works with drive letters
-.IF "\$(subst,Cygwin, \$(shell @uname))"!="\$(shell @uname)"
-SDIR:=\$(shell @+cygpath -d "\$(TEMP)")
-.ELSE
-SDIR:=\$(TEMP)
-.ENDIF
-
-# Make TEMP the target directory, cd to TMD should go back to
-# the original directory
-all ".SETDIR=\$(SDIR)" :
-	@+cd \$(TMD); pwd
-
-EOT
-
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-
-if test "$output1" != "`pwd`"; then
-  echo "Test 1: Wrong result: ${output1}"
-  result1=1
-else
-  echo "Test 1: OK"
-fi
-
-if test $result1 -eq 0; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-exit
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result 
diff --git a/dmake/tests/macros-7 b/dmake/tests/macros-7
deleted file mode 100755
index 2c7d08491..000000000
--- a/dmake/tests/macros-7
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-# 24.07.2007 Volker Quetschke
-# Test the $(macro:n) macro extension.
-# (issue 78776)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1 - Test if :n works.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.WINPATH:=
-
-MACRO:=/tmp/./a "/tmp/a b/xxx/../b" /tmp
-
-all :
-	@echo 1\$(MACRO:n)1
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-if test "$output1" != "1/tmp/a \"/tmp/a b/b\" /tmp1"; then
-  echo "Subtest 1: Wrong result: $output1"
-  result1=1
-else
-  echo "Subtest 1: OK"
-fi 
-
-# Test 2 - Test if the .WINPATH setting is honored
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-MACRO:=/tmp
-
-all .WINPATH :
-	@echo 2\$(MACRO:n)2
-
-EOT
-
-output2=`eval ${DMAKEPROG} -r -f $file1`
-result2=$?
-if test x`uname -o 2> /dev/null` = "xCygwin"; then
-  if test "$output2" != "2`cygpath -m /tmp`2"; then
-    echo "Subtest 2: Wrong result: $output2"
-    result2=1
-  else
-    echo "Subtest 2: OK"
-  fi
-else
-  if test "$output2" != "2/tmp2"; then
-    echo "Subtest 2: Wrong result: $output2"
-    result2=1
-  else
-    echo "Subtest 2: OK"
-  fi
-fi
-
-
-if test $result1 -eq 0 -a $result2 -eq 0 ; then
-    echo "Success - Cleaning up" && rm -f ${tmpfiles}
-    exit
-else
-    echo "Failure!"
-    exit 1
-fi
diff --git a/dmake/tests/macros-8 b/dmake/tests/macros-8
deleted file mode 100755
index 705a92878..000000000
--- a/dmake/tests/macros-8
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/bin/sh
-
-# 24.07.2007 Volker Quetschke
-# Test the :b :d :e :f macro extensions.
-# (issue 80009)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1 - Test if :f works.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.WINPATH:=
-
-MACRO:=/tmp/yyy.ext "/tmp/a  b/xxx.ext"
-
-all :
-	@echo f:\$(MACRO:f):
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-if test "$output1" != "f:yyy.ext \"xxx.ext\":"; then
-  echo "Subtest 1: Wrong result: $output1"
-  result1=1
-else
-  echo "Subtest 1: OK"
-fi 
-
-# Test 2
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-MACRO:=/tmp/yyy.ext "/tmp/a  b/xxx.ext"
-
-all :
-	@echo d:\$(MACRO:d):
-
-EOT
-
-output2=`eval ${DMAKEPROG} -r -f $file1`
-result2=$?
-if test "$output2" != "d:/tmp/ \"/tmp/a  b/\":"; then
-  echo "Subtest 2: Wrong result: $output2"
-  result2=1
-else
-  echo "Subtest 2: OK"
-fi 
-
-
-# Test 3
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-MACRO:=/tmp/yyy.ext "/tmp/a  b/xxx.ext"
-
-all :
-	@echo e:\$(MACRO:e):
-
-EOT
-
-output3=`eval ${DMAKEPROG} -r -f $file1`
-result3=$?
-if test "$output3" != "e:.ext \".ext\":"; then
-  echo "Subtest 3: Wrong result: $output3"
-  result3=1
-else
-  echo "Subtest 3: OK"
-fi 
-
-
-# Test 4
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-MACRO:=/tmp/yyy.ext "/tmp/a  b/xxx.ext"
-
-all :
-	@echo b:\$(MACRO:b):
-
-EOT
-
-output4=`eval ${DMAKEPROG} -r -f $file1`
-result4=$?
-if test "$output4" != "b:yyy \"xxx\":"; then
-  echo "Subtest 4: Wrong result: $output4"
-  result4=1
-else
-  echo "Subtest 4: OK"
-fi 
-
-
-# Test 5
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-MACRO:=/tmp/yyy.ext "/tmp/a  b/xxx.ext"
-
-all :
-	@echo de:\$(MACRO:de):
-
-EOT
-
-output5=`eval ${DMAKEPROG} -r -f $file1`
-result5=$?
-if test "$output5" != "de:/tmp/.ext \"/tmp/a  b/.ext\":"; then
-  echo "Subtest 5: Wrong result: $output5"
-  result5=1
-else
-  echo "Subtest 5: OK"
-fi 
-
-
-# Test 6
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-MACROd:=/tmp/yyy "/tmp/a  b/xxx"
-
-all :
-	@echo e:\$(MACROd:e):
-
-EOT
-
-output6=`eval ${DMAKEPROG} -r -f $file1`
-result6=$?
-if test "$output6" != "e::"; then
-  echo "Subtest 6: Wrong result: $output6"
-  result6=1
-else
-  echo "Subtest 6: OK"
-fi
-
-
-if test $result1 -eq 0 -a $result2 -eq 0 \
-    -a $result3 -eq 0  -a $result4 -eq 0 \
-    -a $result5 -eq 0  -a $result6 -eq 0 ; then
-    echo "Success - Cleaning up" && rm -f ${tmpfiles}
-    exit
-else
-    echo "Failure!"
-    exit 1
-fi
diff --git a/dmake/tests/macros-9 b/dmake/tests/macros-9
deleted file mode 100755
index edfaf343f..000000000
--- a/dmake/tests/macros-9
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/sh
-
-# 27.07.2007 Volker Quetschke
-# Test the :i :1 macro extensions.
-# (issue 80010)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.WINPATH:=
-
-MACRO:="/tmp/yyy.ext" "/tmp/a  b/xxx.ext"
-
-all :
-	@echo 1:\$(MACRO:1):
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-if test "$output1" != "1:\"/tmp/yyy.ext\":"; then
-  echo "Subtest 1: Wrong result: $output1"
-  result1=1
-else
-  echo "Subtest 1: OK"
-fi 
-
-# Test 2
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-MACRO2:=/tmp/zzz.ext /tmp/aaa
-
-all :
-	@echo 1:\$(MACRO2:1):
-
-EOT
-
-output2=`eval ${DMAKEPROG} -r -f $file1`
-result2=$?
-if test "$output2" != "1:/tmp/zzz.ext:"; then
-  echo "Subtest 2: Wrong result: $output2"
-  result2=1
-else
-  echo "Subtest 2: OK"
-fi 
-
-
-# Test 3
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-MACRO:="/tmp/yyy.ext" "/tmp/a  b/xxx.ext"
-
-all :
-	@echo i:\$(MACRO:i):
-
-EOT
-
-output3=`eval ${DMAKEPROG} -r -f $file1`
-result3=$?
-if test "$output3" != "i:\"/tmp/yyy.ext\" \"/tmp/a  b/xxx.ext\":"; then
-  echo "Subtest 3: Wrong result: $output3"
-  result3=1
-else
-  echo "Subtest 3: OK"
-fi 
-
-
-# Test 4
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-MACRO:="/tmp/yyy.ext" "/tmp/a  b/xxx.ext"
-
-.WINPATH=
-
-all :
-	@echo 1n:\$(MACRO:1n):
-
-EOT
-
-output4=`eval ${DMAKEPROG} -r -f $file1`
-result4=$?
-if test "$output4" != "1n:\"/tmp/yyy.ext\":"; then
-  echo "Subtest 4: Wrong result: $output4"
-  result4=1
-else
-  echo "Subtest 4: OK"
-fi 
-
-
-# Test 5
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-MACROi:="./expand.c"
-
-.WINPATH=
-
-.SOURCE : ..
-
-all : expand.c
-	@echo i:\$(MACROi:i):
-
-EOT
-
-output5=`eval ${DMAKEPROG} -r -f $file1`
-result5=$?
-if test "$output5" != "i:\"../expand.c\":"; then
-  echo "Subtest 5: Wrong result: $output5"
-  result5=1
-else
-  echo "Subtest 5: OK"
-fi 
-
-
-if test $result1 -eq 0 -a $result2 -eq 0 \
-    -a $result3 -eq 0  -a $result4 -eq 0 \
-    -a $result5 -eq 0  ; then
-    echo "Success - Cleaning up" && rm -f ${tmpfiles}
-    exit
-else
-    echo "Failure!"
-    exit 1
-fi
diff --git a/dmake/tests/misc-1 b/dmake/tests/misc-1
deleted file mode 100755
index 5b4f581af..000000000
--- a/dmake/tests/misc-1
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# 04.06.2005 Volker Quetschke
-# Test for a bug that dmake complained about a continuation char followed
-# by a newline. This could happen if \<nl> was used in an imported 
-# environment variable.
-# This bug was <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=310107?>
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles ( $ -> \$ ).
-# Also quote line continuations ( \<nl> -> \\<nl> ).
-cat > $file1 <<EOT
-# Testing continuation char in recipes
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-.IMPORT : MYMACRO
-all:
-	+echo "\$(MYMACRO)"
-
-EOT
-
-MYMACRO=`echo 'aa\\\\\naa'` ;export MYMACRO; ${DMAKEPROG} -r -f $file1
-result=$?
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
-
diff --git a/dmake/tests/misc-10 b/dmake/tests/misc-10
deleted file mode 100755
index 42d2bea5b..000000000
--- a/dmake/tests/misc-10
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# 10.05.2006 Volker Quetschke
-# A comparison with the empty string crashes dmake.
-# (issue 65182/65281)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-MYVAR=
-
-all:
-.IF \$(MYVAR) >= "122"
-	+@echo "true"
-.ELSE
-	+@echo "false"
-.ENDIF
-
-EOT
-
-output=`eval ${DMAKEPROG} -r -f $file1`
-result=$?
-
-if test "$output" != "false"; then
-  result=1
-fi 
- 
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/misc-11 b/dmake/tests/misc-11
deleted file mode 100755
index 938294974..000000000
--- a/dmake/tests/misc-11
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# 16.06.2006 Volker Quetschke
-# A comparison with the empty string crashes dmake - equality test with empty
-# string must work too.
-# (issue 65281)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-RHS=
-
-all:
-.IF \$(LHS) == \$(RHS)
-	+@echo "true"
-.ELSE
-	+@echo "false"
-.ENDIF
-
-EOT
-
-output=`eval ${DMAKEPROG} -r -f $file1`
-result=$?
-
-if test "$output" != "true"; then
-  result=1
-fi 
- 
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/misc-12 b/dmake/tests/misc-12
deleted file mode 100755
index f8e4f7a1d..000000000
--- a/dmake/tests/misc-12
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# 22.06.2006 Volker Quetschke
-# Conditional expressions failed before with line continuations.
-# (issue 66659)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles ( $ -> \$ ).
-# Also quote line continuations ( \<nl> -> \\<nl> ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all:
-.IF "a" == "a" && \\
-   "b" == "b"
-	@+echo OK
-.ELSE
-	@+echo WRONG
-.ENDIF
-EOT
-
-output=`eval ${DMAKEPROG} -r -f $file1`
-result=$?
-
-if test "$output" != "OK"; then
-  result=1
-fi 
- 
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/misc-13 b/dmake/tests/misc-13
deleted file mode 100755
index 7493e744b..000000000
--- a/dmake/tests/misc-13
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# 29.09.2006 Volker Quetschke
-# Check if the directory cache can be made case insensitive
-# (issue 69814)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="TeSt.target"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-echo "Something" > $file2
-
-# Remember to quote variables in generated makefiles ( $ -> \$ ).
-# Also quote line continuations ( \<nl> -> \\<nl> ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.DIRCACHE=yes
-
-# Only test the directory cache for case insensitivity if the FS is also 
-# case insensitive.
-.IF "\$(.DIRCACHERESPCASE)"!="y"
-test.target :
-	@echo "Building \$@"
-
-.ELSE
-TeSt.target :
-	@echo "Building \$@"
-
-.ENDIF
-
-EOT
-
-output=`eval ${DMAKEPROG} -vm -r -f $file1`
-result=$?
-
-if echo "$output" | grep -v ".target' is up to date"  > /dev/null 2>&1 ; then
-  echo "Wrong result: ${output}"
-  result=1
-fi 
- 
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/misc-14 b/dmake/tests/misc-14
deleted file mode 100755
index 6f71b373c..000000000
--- a/dmake/tests/misc-14
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-# 07.10.2006 Volker Quetschke
-# Check if the line of the error is issued
-# (issue 70027)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles ( $ -> \$ ).
-# Also quote line continuations ( \<nl> -> \\<nl> ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all : 
-	+echo allA
-
-all : 
-	+echo allB
-EOT
-
-output=`eval ${DMAKEPROG} -r -f $file1 2>&1`
-result=$?
-
-if echo "$output" | grep 'line .:  Error: --' > /dev/null 2>&1 ; then
-  dummy=1
-  result=0
-  # OK
-else
-  echo "Test 1: Wrong result: $output"
-  echo
-  result=1
-fi
- 
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/misc-15 b/dmake/tests/misc-15
deleted file mode 100755
index a213c2d88..000000000
--- a/dmake/tests/misc-15
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# 09.11.2006 Volker Quetschke
-# Check DOS style paths and directory caching with cygwin dmake or just
-# normal paths with other versions.
-# issue 69742, 69943 
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="target.abc"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-echo "Something" > $file2
-
-# Remember to quote variables in generated makefiles ( $ -> \$ ).
-# Also quote line continuations ( \<nl> -> \\<nl> ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.DIRCACHE=yes
-
-# Test if .SETDIR works with drive letters
-.IF "\$(subst,Cygwin, \$(shell @uname))"!="\$(shell @uname)"
-MYTARGET:=\$(shell @+cygpath -d "\$(PWD)")\target.abc
-.ELSE
-MYTARGET:=\$(PWD)/target.abc
-.ENDIF
-
-"\$(MYTARGET)" :
-	@echo "Building \$@ - \$(MYTARGET)"
-
-EOT
-
-output=`eval ${DMAKEPROG} -vm -r -f $file1`
-result=$?
-
-if echo "$output" | grep "target.abc' is up to date"  > /dev/null 2>&1 ; then
-  # OK
-  dummy=1
-else
-  echo "Wrong result: ${output}"
-  result=1
-fi 
- 
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/misc-16 b/dmake/tests/misc-16
deleted file mode 100755
index 2e234d3d1..000000000
--- a/dmake/tests/misc-16
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-# 17.11.2006 Volker Quetschke
-# Check that parallel builds $(shell ...) only waits its own target and
-# not for all previous recipe lines.
-# (issue 61856)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="mytarget.dpcc"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all : all1 all2
-	@+echo all
-
-all1 :
-	@+printf "1"
-	@+sleep 2
-	@+printf "4"
-
-all2 :
-	@+sleep 1
-	@+printf "2"
-	@+printf "\$(shell @+echo "3")"
-
-EOT
-
-output=`eval ${DMAKEPROG} -r -P2 -f $file1`
-result=$?
-
-if test "$output" != "1234all"; then
-  echo "Wrong result: $output - expecting: 1234all"
-  result=1
-fi 
- 
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/misc-17 b/dmake/tests/misc-17
deleted file mode 100755
index 158b11575..000000000
--- a/dmake/tests/misc-17
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# 19.11.2006 Volker Quetschke
-# Check that a global .SEQUENTIAL attribute enforces MAXPROCESS=1.
-# (issue 71704)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="my.inc"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL=/bin/sh
-SHELLFLAGS=-c
-
-my.inc :
-	@+echo "MYMAXPROCESS!:=\$(MAXPROCESS)" > my.inc
-
-.INCLUDE : my.inc
-
-all:
-	@+echo "MYMAXPROCESS:\$(MYMAXPROCESS):"
-
-EOT
-
-output=`eval ${DMAKEPROG} -S -P2 -rf $file1 all`
-result=$?
-
-if test "$output" != "MYMAXPROCESS:1:"; then
-  echo "Wrong result: $output - expecting: MYMAXPROCESS:1:"
-  result=1
-fi 
- 
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/misc-18 b/dmake/tests/misc-18
deleted file mode 100755
index a676df658..000000000
--- a/dmake/tests/misc-18
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-
-# 23.03.2007 Volker Quetschke
-# Test .WINPATH attribute (A cygwin only attribute that is ignored
-# elsewhere).
-# (issue 73499)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1 - Test if .WINPATH is accepted as global attribute
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.WINPATH :
-
-all :
-	@echo OK1
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-if test "$output1" != "OK1"; then
-  echo "Subtest 1: Wrong result: $output1"
-  result1=1
-else
-  echo "Subtest 1: OK"
-fi 
-
-# Test 2 - Test if .WINPATH is accepted as local attribute
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all .WINPATH :
-	@echo OK2
-
-EOT
-
-output2=`eval ${DMAKEPROG} -r -f $file1`
-result2=$?
-if test "$output2" != "OK2"; then
-  echo "Subtest 2: Wrong result: $output2"
-  result2=1
-else
-  echo "Subtest 2: OK"
-fi 
-
-
-# Test 3 - Test if $@ and $* are DOSified.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-/tmp/blah.xx .WINPATH :
-	@echo at:\$@:star:\$*:
-
-EOT
-
-if test x`uname -o 2> /dev/null` = "xCygwin"; then
-    output3=`eval ${DMAKEPROG} -r -f $file1`
-    result3=$?
-    if test "$output3" != "at:`cygpath -m /tmp/blah.xx`:star:`cygpath -m /tmp/blah`:"; then
-        echo "Subtest : Wrong result: $output3"
-        result3=1
-    else
-        echo "Subtest 3: OK"
-    fi
-else
-    echo "Subtest 3 ignored for non cygwin environment"
-    result3=0
-fi 
-
-
-# Test 4 - Test if $(PWD), $(MAKEDIR) are DOSified.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all .WINPATH .SETDIR=/tmp :
-	@echo :\$(PWD):\$(MAKEDIR):
-
-EOT
-
-if test x`uname -o 2> /dev/null` = "xCygwin"; then
-    output4=`eval ${DMAKEPROG} -r -f $file1`
-    result4=$?
-    mypwd=`pwd`
-    if test "$output4" != ":`cygpath -m /tmp`:`cygpath -m $mypwd`:"; then
-        echo "Subtest : Wrong result: $output4"
-        result4=1
-    else
-        echo "Subtest 4: OK"
-    fi
-else
-    echo "Subtest 4 ignored for non cygwin environment"
-    result4=0
-fi 
-
-
-# Test 5 - Test if $(TMD) is DOSified (if it is an absolute path).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all .WINPATH .SETDIR=/ :
-	@echo :\$(PWD):\$(TMD):
-
-EOT
-
-if test x`uname -o 2> /dev/null` = "xCygwin"; then
-    output5=`eval ${DMAKEPROG} -r -f $file1`
-    result5=$?
-    mypwd=`pwd`
-    if test "$output5" != ":`cygpath -m /`:`cygpath -m $mypwd`:"; then
-        echo "Subtest : Wrong result: $output5"
-        result5=1
-    else
-        echo "Subtest 5: OK"
-    fi
-else
-    echo "Subtest 5 ignored for non cygwin environment"
-    result5=0
-fi 
-
-
-# Test 6 - Test if .WINPATH changes $@ in conditional macro.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-/tmp/all.bla ?= QQQ=\$@
-/tmp/all.bla .WINPATH :
-	@echo :\$(QQQ):
-EOT
-
-if test x`uname -o 2> /dev/null` = "xCygwin"; then
-    output6=`eval ${DMAKEPROG} -r -f $file1`
-    result6=$?
-    if test "$output6" != ":`cygpath -m /tmp/all.bla`:"; then
-        echo "Subtest : Wrong result: $output6"
-        result6=1
-    else
-        echo "Subtest 6: OK"
-    fi
-else
-    echo "Subtest 6 ignored for non cygwin environment"
-    result6=0
-fi 
-
-
-if test $result1 -eq 0 -a $result2 -eq 0 \
-    -a $result3 -eq 0 -a $result4 -eq 0 \
-    -a $result5 -eq 0 -a $result6 -eq 0; then
-    echo "Success - Cleaning up" && rm -f ${tmpfiles}
-    exit
-else
-    echo "Failure!"
-    exit 1
-fi
diff --git a/dmake/tests/misc-19 b/dmake/tests/misc-19
deleted file mode 100755
index af8245712..000000000
--- a/dmake/tests/misc-19
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-# 02.09.2007 Volker Quetschke
-# Check that temporary filenames are kept alive between recipe lines.
-# (issue 67911)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-all :
-	@noop \$(assign TMPFILE:=\$(mktmp abcd))
-	@cat \$(TMPFILE)
-
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-if test $result1 = 0 -a "$output1" = "abcd"; then
-  echo "OK"
-else
-  echo "Wrong result: $output1"
-  echo
-  result1=1
-fi 
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/misc-2 b/dmake/tests/misc-2
deleted file mode 100755
index 06748dd98..000000000
--- a/dmake/tests/misc-2
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# 01.09.2005 Volker Quetschke
-# Tests if dmake can work with makefiles with DOS lineendings.
-# (issue 52238)
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-file2="mymakefile_dos.mk"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Testing continuation char in recipes
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.NOTABS	  !:= yes
-
-all:
-
-	echo aaa
-
-EOT
-
-#more compatible version of: unix2dos $file1
-: ${AWK:=awk}
-#$AWK 'sub("$", "\r")' $file1 > $file2
-$AWK '{print $0"\r"}' $file1 > $file2
-
-${DMAKEPROG} -r -f $file2
-result=$?
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/misc-20 b/dmake/tests/misc-20
deleted file mode 100755
index c25bf05d8..000000000
--- a/dmake/tests/misc-20
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-
-# 16.09.2007 Volker Quetschke
-# Check that inferred makefiles for .INCLUDE do not disturb the dependency
-# checking afterwards.
-# (issue 81296)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="my.c"
-file3="my.obj"
-file4="my.foo"
-tmpfiles="$file1 $file2 $file3 $file4"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1 - from testcase t_81296_5.mk
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-# Test that my.c is build when my.foo is newer.
-
-# rules.mk ---
-%.obj : %.c ;  @+printf "\$@:"
-#	@sleep 1
-	@touch \$@
-
-%.dpo : %.c ; @+printf "incbuild:\$@:"
-#	@sleep 1
-
-# target.mk ---
-all : my.obj ; @echo all
-
-# If the file exist no inference is done for it.
-.INCLUDE .IGNORE : my.dpo
-
-# When inference was run on the %.dpo with an existing
-# %.c these rule gets ignored.
-# local makefile.mk ---
-%.c : %.foo ; @+printf "\$@:"
-#	@sleep 1
-	@touch \$@
-EOT
-
-# Create test environment
-touch my.c
-sleep 1
-touch my.foo
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-if test $result1 = 0 -a "$output1" = "incbuild:my.dpo:my.c:my.obj:all"; then
-  echo "Subtest 1: OK"
-else
-  echo "Subtest 1: Wrong result: $output1"
-  echo
-  result1=1
-fi 
-
-# Remove files from prior run
-rm -rf $tmpfiles
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 2 - from testcase t_81296_6.mk
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-# Test that no circular dependency error is issued:
-# $ rm -f my.* ; touch my.c ; ./dmake/dmake.exe -rf t_81296_6.mk
-
-# rules.mk ---
-%.obj : %.c ;  @+printf "\$@:"
-	@touch \$@
-
-%.dpo : %.c ; @+printf "incbuild:\$@:"
-
-# target.mk ---
-all : my.obj ; @echo all
-
-# If the file exist no inference is done for it.
-.INCLUDE .IGNORE : my.dpo
-
-%.c : %.foo ; @+printf "\$@:"
-	@touch \$@
-
-# This leads to a (wrong) circular dependency error
-my.obj : my.c
-
-EOT
-
-# Create test environment
-touch my.c
-sleep 1
-touch my.foo
-
-output2=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result2=$?
-
-if test $result2 = 0 -a "$output2" = "incbuild:my.dpo:my.c:my.obj:all"; then
-  echo "Subtest 2: OK"
-else
-  echo "Subtest 2: Wrong result: $output2"
-  echo
-  result2=1
-fi 
-
-
-if test $result1 -eq 0 -a $result2 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/misc-21 b/dmake/tests/misc-21
deleted file mode 100755
index 9dea6cc23..000000000
--- a/dmake/tests/misc-21
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# 13.10.2007 Volker Quetschke
-# Check that SHELLCMDQUOTE adds the characters to the command.
-# issue 81252
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles ( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL!:=printf
-SHELLFLAGS!:=
-
-SHELLCMDQUOTE=X
-
-all :
-	@+testtest
-
-EOT
-
-output=`eval ${DMAKEPROG} -rf $file1`
-result=$?
-
-if test "$result" = "0" && test "$output" = "XtesttestX" ; then
-  # OK
-  dummy=1
-else
-  echo "Wrong result: ${output}"
-  result=1
-fi 
- 
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/misc-3 b/dmake/tests/misc-3
deleted file mode 100755
index acd7ce482..000000000
--- a/dmake/tests/misc-3
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-# 17.09.2005 Volker Quetschke
-# Test for line continuation in comments.
-# (issue 49461)
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Testing continuation char in recipes
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-AAA:=aaa
-
-# A continued comment line followed/ended by an empty line \
-
-AAA+=bbb
-
-all:
-	+@echo \$(AAA)
-
-EOT
-
-output=`eval ${DMAKEPROG} -r -f $file1`
-result=$?
-
-# The space between aaa and bbb comes from the +=
-if test "$output" != "aaa bbb"; then
-  echo "Wrong result"
-  result=1
-fi
-
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/misc-4 b/dmake/tests/misc-4
deleted file mode 100755
index ed11a8e20..000000000
--- a/dmake/tests/misc-4
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# 06.10.2005 Volker Quetschke
-# Test for parallel operation.
-# (no issue, sanity check only)
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-file2="testfile"
-file3="testfile1"
-file4="testfile2"
-file5="testfile3"
-tmpfiles="$file1 $file2 $file3 $file4 $file5"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Testing parallel execution
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-testfile : testfile2 testfile3 testfile1
-	+@echo xx > \$@
-
-testfile1 :
-	+@echo making \$@ 1>&2
-	+@sleep 1
-	+@printf t1
-	+@echo 1 > \$@
-
-testfile2 :
-	+@echo making \$@ 1>&2
-	+@sleep 2
-	+@printf t2
-	+@echo 2 > \$@
-
-testfile3 :
-	+@echo making \$@ 1>&2
-	+@sleep 3
-	+@printf t3
-	+@echo 3 > \$@
-
-EOT
-
-output=`eval ${DMAKEPROG} -r -P3 -f $file1`
-result=$?
-
-# In parallel operation the targets with the smaller sleep value
-# will finish first.
-if test "$output" != "t1t2t3"; then
-  echo "Wrong result"
-  result=1
-fi
-
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/misc-5 b/dmake/tests/misc-5
deleted file mode 100755
index 5c458482d..000000000
--- a/dmake/tests/misc-5
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# 06.10.2005 Volker Quetschke
-# Test if infered makefile generation works.
-# (issue 54938)
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-file2="incfile.mk"
-file3="incfiledepend"
-tmpfiles="$file1 $file2 $file3"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Verify that makefile generation is finished when using it
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-incfile.mk : incfiledepend
-	+@echo AA:=123 > \$@
-
-incfiledepend :
-	+@sleep 1
-	+@echo 1234 > \$@
-
-.INCLUDE : incfile.mk
-
-all :
-	+@echo aa:\$(AA):bb 
-EOT
-
-output=`eval ${DMAKEPROG} -r -P2 -f $file1 all`
-result=$?
-
-# The space between aaa and bbb comes from the +=
-if test "$output" != "aa:123:bb"; then
-  echo "Wrong result"
-  result=1
-fi
-
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/misc-6 b/dmake/tests/misc-6
deleted file mode 100755
index 9f74f1e77..000000000
--- a/dmake/tests/misc-6
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# 05.01.2006 Volker Quetschke
-# Old dmakes throw a segmentation fault in special cases with
-# dynamic prerequisits ( $$@ ).
-# (issue 58259)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="mfile2.mk"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Testcase 1
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all : allA allB
-
-all  : \$\$@A \$\$@B
-
-allA :
-	+echo XaX
-
-allB :
-	+echo XbX
-EOT
-
-# Testcase 2
-cat > $file2 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all  : \$\$@A \$\$@B
-
-all : allA allB
-
-allA :
-	+echo XaX
-
-allB :
-	+echo XbX
-EOT
-
-${DMAKEPROG} -r -f $file1 >/dev/null 2>&1
-result1=$?
-${DMAKEPROG} -r -f $file2 >/dev/null 2>&1
-result2=$?
-
-if test $result1 -eq 0 -a $result2 -eq 0; then
-  echo "Success - Cleaning up"
-  rm -f ${tmpfiles}
-  result=0
-else
-  test $result1 -ne 0 && echo "Failure in testcase 1! Remove the corefile!"
-  test $result2 -ne 0 && echo "Failure in testcase 2! Remove the corefile!"
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/misc-7 b/dmake/tests/misc-7
deleted file mode 100755
index 285f44d50..000000000
--- a/dmake/tests/misc-7
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# 06.02.2006 Volker Quetschke
-# Verify that the .SETDIR attribute works separately from the target
-# definition. (issue 61714)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="subdir"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.SETDIR=subdir : all
-
-all :
-	@+echo ":\$(PWD:f):"
-
-EOT
-
-mkdir -p "$file2"
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-
-if test "$output1" != ":$file2:"; then
-  echo "Wrong result - use of .SETDIR was not successful."
-  result1=1
-fi 
-
-if test $result1 -eq 0; then
-  echo "Success - Cleaning up"
-  rm -rf ${tmpfiles}
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/misc-8 b/dmake/tests/misc-8
deleted file mode 100755
index 28d27595a..000000000
--- a/dmake/tests/misc-8
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# 26.02.2006 Volker Quetschke
-# Test if dmake complains about circular dependencies when using
-# infered .INCLUDE targets
-# (issue 62118)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="mytarget.dpcc"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Verify that makefile generation is finished when using it
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-%.dpcc :
-	@echo making: \$@
-	@+echo AA=123 > \$@
-
-.INCLUDE : mytarget.dpcc
-
-ALL : mytarget.dpcc
-
-EOT
-
-output=`eval ${DMAKEPROG} -r -f $file1`
-result=$?
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure! Invalid circular dependency detected."
-exit $result
diff --git a/dmake/tests/misc-9 b/dmake/tests/misc-9
deleted file mode 100755
index c3f8aad1a..000000000
--- a/dmake/tests/misc-9
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# 01.03.2006 Volker Quetschke
-# If a dependency is added to a target after it is already build as an
-# indered .INCLUDE makefile the new dependency can be lost in parallel
-# builds.
-# (issue 61969)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="mytarget.dpcc"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-%.dpcc :
-	@sleep 1
-# The following line adds a dependency to %.obj when the %.dpcc is included
-	@+echo \$@ : \$(@:b).obj > \$@
-
-# This has to be build if mytarget.dpcc is included and is requested
-# as a target
-# Adding the wait makes sure that the unpatched dmake is ended before the
-# next recipe line is started, therefore loosing it.
-%.obj :
-	@sleep 1
-	@echo making: \$@
-
-.INCLUDE : mytarget.dpcc
-
-# Make this the main target
-mytarget.dpcc :
-
-EOT
-
-output=`eval ${DMAKEPROG} -r -P2 -f $file1`
-result=$?
-
-if test "$output" != "making: mytarget.obj"; then
-  result=1
-fi 
- 
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure! Recipe line got lost."
-exit $result
diff --git a/dmake/tests/recipes-1 b/dmake/tests/recipes-1
deleted file mode 100755
index c9108d861..000000000
--- a/dmake/tests/recipes-1
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# 01.06.2005 Volker Quetschke
-# Tests for line continuation in recipes.
-# (issue 37053)
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Testing continuation char in recipes
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all:
-	+@echo line1\
-line2
-
-EOT
-
-output=`eval ${DMAKEPROG} -r -f $file1`
-result=$?
-if test "$output" != "line1line2"; then
-  echo "Wrong result"
-  result=1
-fi
-
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
-
diff --git a/dmake/tests/recipes-2 b/dmake/tests/recipes-2
deleted file mode 100755
index 3e31fa1eb..000000000
--- a/dmake/tests/recipes-2
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# 24.07.2006 Volker Quetschke
-# Simple tests for group recipes.
-# (issue 64583)
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Test group recipes
-SHELL:=/bin/sh 
-SHELLFLAGS:=-ce
-GROUPSHELL:=/bin/sh 
-GROUPSUFFIX:=.sh
-
-all :
-@[
-	printf "line1"
-	printf "line2"
-] 
-EOT
-
-output=`eval ${DMAKEPROG} -r -f $file1`
-result=$?
-if test "$output" != "line1line2"; then
-  echo "Wrong result: $output"
-  result=1
-fi
-
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
-
diff --git a/dmake/tests/recipes-3 b/dmake/tests/recipes-3
deleted file mode 100755
index a4e4a24b6..000000000
--- a/dmake/tests/recipes-3
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# 29.07.2006 Volker Quetschke
-# Test builtin commands.
-# (issue 67589)
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Test noop and empty lines
-SHELL:=/bin/sh 
-SHELLFLAGS:=-ce
-
-all :
-	\$(NULL)
-	+\$(NULL)
-	@noop bla bla \$(assign NOSHELL:=ABC)
-	@+noop bla bla \$(assign WITHSHELL:=DEF)
-	@echo \$(NOSHELL)\$(WITHSHELL)
-
-EOT
-
-output=`eval ${DMAKEPROG} -r -f $file1`
-result=$?
-if test "$output" != "ABCDEF"; then
-  echo "Wrong result: $output"
-  result=1
-fi
-
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/recipes-4 b/dmake/tests/recipes-4
deleted file mode 100755
index 378a2b4fa..000000000
--- a/dmake/tests/recipes-4
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# 29.07.2006 Volker Quetschke
-# Test builtin echo command.
-# (issue 67589)
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# internal echo - This test might fail later if the internal echo ever
-# learns to handle quotes.
-SHELL:=/bin/sh 
-SHELLFLAGS:=-ce
-
-all :
-	@echo -n "AB  CD"
-	@+echo XY
-
-EOT
-
-output=`eval ${DMAKEPROG} -r -f $file1`
-result=$?
-if test "$output" != "\"AB  CD\"XY"; then
-  echo "Wrong result: $output"
-  result=1
-fi
-
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/recipes-5 b/dmake/tests/recipes-5
deleted file mode 100755
index b8887212a..000000000
--- a/dmake/tests/recipes-5
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# 13.11.2006 Volker Quetschke
-# Test @@ recipe property.
-# (issue 71422)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="ofile1.out"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Test @@ recipe
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-all :
-	@@+echo someoutput > $file2
-	@@+echo something
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-if test "$output1" != ""; then
-  echo "Wrong result: $output1"
-  result1=1
-fi
-if test -f $file2; then
-  if test `cat $file2 ` != "someoutput"; then
-    echo "Wrong file content: `cat $file2`"
-    result1=1
-  fi
-else
-  echo "No such file : $file2"
-  result1=1
-fi
-
-# Test if -vr enables the output again
-output2=`eval ${DMAKEPROG} -vr -rf $file1`
-result2=$?
-if echo $output2 | grep -v 'echo someoutput > ofile1.out'; then
-  echo "Missing output: echo someoutput > ofile1.out"
-  result2=1
-fi
-if echo $output2 | grep -v 'something'; then
-  echo "Missing output: something"
-  result2=1
-fi
-
-if test $result1 -eq 0 -a $result2 -eq 0; then
-  echo "Success - Cleaning up"
-  rm -f ${tmpfiles}
-  exit 0
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/recipes-6 b/dmake/tests/recipes-6
deleted file mode 100755
index 2a0af305e..000000000
--- a/dmake/tests/recipes-6
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-
-# 13.11.2006 Volker Quetschke
-# Test @@ recipe property with group recipes.
-# (issue 71422)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="ofile1.out"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# Test @@ recipe
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-GROUPSHELL*:=/bin/sh
-GROUPSUFFIX:=.sh
-
-all :
-@@[
-  echo someoutput > $file2
-  echo something
-]
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1`
-result1=$?
-if test "$output1" != ""; then
-  echo "Wrong result: $output1"
-  result1=1
-fi
-if test -f $file2; then
-  if test `cat $file2` != "someoutput"; then
-    echo "Wrong file content: `cat $file2`"
-    result1=1
-  fi
-else
-  echo "No such file : $file2"
-  result1=1
-fi
-
-# Test if -vr enables the output again
-output2=`eval ${DMAKEPROG} -vr -rf $file1`
-result2=$?
-if echo $output2 | grep -v 'echo someoutput > ofile1.out'; then
-  echo "Missing output: echo someoutput > ofile1.out"
-  result2=1
-fi
-if echo $output2 | grep -v 'something'; then
-  echo "Missing output: something"
-  result2=1
-fi
-
-if test $result1 -eq 0 -a $result2 -eq 0; then
-  echo "Success - Cleaning up"
-  rm -f ${tmpfiles}
-  exit 0
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/recipes-7 b/dmake/tests/recipes-7
deleted file mode 100755
index 3a932bb59..000000000
--- a/dmake/tests/recipes-7
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# 01.12.2006 Volker Quetschke
-# Test that the '-' recipe switch is honored.
-# (issue 72210)
-
-: ${DMAKEPROG:=dmake}
-file1="mymakefile.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-trap 'rm -rf $tmpfiles' 1 2 3 15 
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-# internal echo - This test might fail later if the internal echo ever
-# learns to handle quotes.
-SHELL:=/bin/sh 
-SHELLFLAGS:=-ce
-
-all :
-	@-blabla
-	@echo OK
-
-EOT
-
-output=`eval ${DMAKEPROG} -r -f $file1 2> /dev/null`
-result=$?
-if test $result -eq 0 -a "$output" != "OK"; then
-  echo "Wrong result: $output"
-  result=1
-fi
-
-
-test $result -eq 0 && echo "Success - Cleaning up" && rm -f ${tmpfiles}
-test $result -ne 0 && echo "Failure!"
-exit $result
diff --git a/dmake/tests/recipes-8 b/dmake/tests/recipes-8
deleted file mode 100755
index b4264a33d..000000000
--- a/dmake/tests/recipes-8
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-# 08.08.2007 Volker Quetschke
-# Test group recipes syntax check.
-# (issue 67709)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-GROUPSHELL*:=/bin/sh 
-
-all :
-[ This should warn!
-	@echo "Group recipe line"
-]
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 2>&1`
-result1=$?
-
-if test $result1 != 0 && echo $output1 | grep 'Warning: -- Found non-white space character after' > /dev/null 2>&1 ; then
-  echo "Subtest 1: OK"
-  result1=0
-else
-  echo "Subtest 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-
-# Test 2
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-GROUPSHELL*:=/bin/sh 
-
-all :
-	echo hallo
-[    
-	echo "Group recipe line"
-]
-
-EOT
-
-output2=`eval ${DMAKEPROG} -r -f $file1 2>&1`
-result2=$?
-
-if test $result2 != 0 && echo $output2 | grep 'Error: -- Cannot mix single and group recipe lines.' > /dev/null 2>&1 ; then
-  echo "Subtest 2: OK"
-  result2=0
-else
-  echo "Subtest 2: Wrong result: $output2"
-  echo
-  result2=1
-fi
-
-
-# Test 3
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-GROUPSHELL*:=/bin/sh 
-
-all :
-[
-  [
-	echo "Group recipe line"
-]
-
-EOT
-
-output3=`eval ${DMAKEPROG} -r -f $file1 2>&1`
-result3=$?
-if test $result3 != 0 && echo $output3 | grep 'Error: -- New group recipe begin found within group recipe.' > /dev/null 2>&1 ; then
-  echo "Subtest 3: OK"
-  result3=0
-else
-  echo "Subtest 3: Wrong result: $output3"
-  echo
-  result3=1
-fi
-
-
-
-if test $result1 -eq 0 -a $result2 -eq 0 \
-    -a $result3 -eq 0  ; then
-    echo "Success - Cleaning up" && rm -f ${tmpfiles}
-    exit
-else
-    echo "Failure!"
-    exit 1
-fi
diff --git a/dmake/tests/recipes-9 b/dmake/tests/recipes-9
deleted file mode 100755
index 409b6cbab..000000000
--- a/dmake/tests/recipes-9
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-# 11.08.2007 Volker Quetschke
-# Test that recipes with error can be ignored.
-# (issue 80598)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1 - Ignore, but display failed execution.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all .IGNORE :
-	tttouch all
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 2>&1`
-result1=$?
-
-if test "$result1" = "0" && echo $output1 | grep '(Ignored)' > /dev/null 2>&1 ; then
-  echo "Subtest 1: OK"
-  result1=0
-else
-  echo "Subtest 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-
-# Test 2 - Ignore, but display failed execution.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all :
-	-ttttouch all
-
-EOT
-
-output2=`eval ${DMAKEPROG} -r -f $file1 2>&1`
-result2=$?
-
-if test "$result2" = "0" && echo $output2 | grep '(Ignored)' > /dev/null 2>&1 ; then
-  echo "Subtest 2: OK"
-  result2=0
-else
-  echo "Subtest 2: Wrong result: $output2"
-  echo
-  result2=1
-fi
-
-
-# Test 3
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-GROUPSHELL*:=/bin/sh 
-
-all :
-	ttttouch all
-
-EOT
-
-output3=`eval ${DMAKEPROG} -r -f $file1 2>&1`
-result3=$?
-if test $result3 != 0 && echo $output3 | grep 'Error code -1, while making ' > /dev/null 2>&1 ; then
-  echo "Subtest 3: OK"
-  result3=0
-else
-  echo "Subtest 3: Wrong result: $output3"
-  echo
-  result3=1
-fi
-
-
-# Test 4 - Ignore a succesfully executed, but failing recipe.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all :
-	-false all
-
-EOT
-
-output4=`eval ${DMAKEPROG} -r -f $file1 2>&1`
-result4=$?
-
-if test "$result4" = "0" -a "$output4" = "false all" ; then
-  echo "Subtest 4: OK"
-  result4=0
-else
-  echo "Subtest 4: Wrong result: $output4"
-  echo
-  result4=1
-fi
-
-
-
-if test $result1 -eq 0 -a $result2 -eq 0 \
-    -a $result3 -eq 0 -a $result4 -eq 0  ; then
-    echo "Success - Cleaning up" && rm -f ${tmpfiles}
-    exit
-else
-    echo "Failure!"
-    exit 1
-fi
diff --git a/dmake/tests/targets-1 b/dmake/tests/targets-1
deleted file mode 100644
index 688c33cf0..000000000
--- a/dmake/tests/targets-1
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-# 03.06.2006 Volker Quetschke
-# Percent target definitions were not handled properly before.
-# (issue 64869)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="mfile2.mk"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Testcase 1 - This segfaulted before 4.5
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-allnew : all
-
-%.x all  : %.c
-	+true $@
-
-qqq.c :
-	+echo OK
-
-EOT
-
-# Testcase 2 - earlier than dmake 4.5 the second %-target was defined
-# without the prerequisites, i.e. qqq.c was not build
-cat > $file2 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-allnew : qqq.y
-
-%.x %.y  : %.c
-	+true "building %.y"
-
-qqq.c :
-	+echo building qqq.c
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 2>&1 `
-result1=$?
-output2=`eval ${DMAKEPROG} -r -f $file2 2>&1 `
-result2=$?
-
-if echo $output1 | grep 'Error: -- A non-%' > /dev/null 2>&1 ; then
-  #echo "Test 1: Right result: $output1"
-  result1=0
-else
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-if echo $output2 | grep -v 'building qqq.c' > /dev/null 2>&1 ; then
-  echo "Test 2: Wrong result: $output2"
-  echo
-  result2=1
-fi
-
-if test $result1 -eq 0 -a $result2 -eq 0; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-exit
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/targets-10 b/dmake/tests/targets-10
deleted file mode 100644
index 3f7931242..000000000
--- a/dmake/tests/targets-10
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-# 14.06.2006 Volker Quetschke
-# If %-targets are defined with more than one (not indirect) prerequisite
-# only the first is used. This is supposed to be fixed at one point but
-# currently we issue a warning that it not working (yet).
-# (issue 48087)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Check that we warn.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-%.xx : %.yy %.pp ; touch $@
-
-abc.xx : ; echo nix
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 2>&1 `
-result1=$?
-
-if echo $output1 | grep 'Warning: -- More than one prerequisite' > /dev/null 2>&1 ; then
-  dummy=1
-  # OK
-else
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/targets-11 b/dmake/tests/targets-11
deleted file mode 100644
index 5dbff149d..000000000
--- a/dmake/tests/targets-11
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# 09.07.2006 Volker Quetschke
-# If %-targets are defined with the .SILENT attribute and the -vr verbose
-# flag is used dmake 4.5 stops falsely with an error.
-# (issue 67025)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Check that we don't issue an error.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-%.xx .SILENT :
-	+echo "OK"
-EOT
-
-output1=`eval ${DMAKEPROG} -vr -rf $file1 all.xx 2>&1 `
-result1=$?
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  result=0
-else
-  echo "Failure! dmake failed with error."
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/targets-12 b/dmake/tests/targets-12
deleted file mode 100644
index ba9982c4f..000000000
--- a/dmake/tests/targets-12
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# 10.07.2006 Volker Quetschke
-# Check that dmake warns if it encounters .SUFFIXES
-# (issue 66567)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Check that we issue a warning.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.SUFFIXES : .aa .bb
-
-all: ; @echo OK
-EOT
-
-output1=`eval ${DMAKEPROG} -vw -rf $file1 2>&1 `
-result1=$?
-
-if echo $output1 | grep 'Warning: -- The .SUFFIXES' > /dev/null 2>&1 ; then
-  dummy=1
-  # OK
-else
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
- 
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  result=0
-else
-  echo "Failure! dmake failed to issue a warning."
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/targets-13 b/dmake/tests/targets-13
deleted file mode 100755
index 702a9b0a1..000000000
--- a/dmake/tests/targets-13
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# 16.07.2006 Volker Quetschke
-# Check that dmake warns if a previously unset macro (i.e. it is
-# assumed to be empty) is used and later set to a different value.
-# (issue 67166)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Check that we issue a warning.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all: \$(NEWDEP)
-	@+echo all
-
-NEWDEP=my_dependency
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-if echo $output1 | grep 'Warning: -- Macro .* redefined after use' > /dev/null 2>&1 ; then
-  dummy=1
-  # OK
-else
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
- 
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  result=0
-else
-  echo "Failure! dmake failed to issue a warning."
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/targets-14 b/dmake/tests/targets-14
deleted file mode 100755
index 7e1fae45f..000000000
--- a/dmake/tests/targets-14
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# 16.07.2006 Volker Quetschke
-# Check that evaluating an empty macro and thereby initializing it does not
-# prevent the *= and *:= operator from assigning a new value.
-# (issue 67166)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Check that we set AAA to set_AAA.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-.IF \$(AAA)!=321
-BLA=bla
-.ENDIF
-
-AAA*=set_AAA
-
-all:
-	@+echo "\$(AAA)"
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-if test $output1 = "set_AAA" ; then
-  dummy=1
-  # OK
-else
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
- 
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  result=0
-else
-  echo "Failure! Unexpected result."
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/targets-15 b/dmake/tests/targets-15
deleted file mode 100755
index 6a5310a6e..000000000
--- a/dmake/tests/targets-15
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# 06.10.2006 Volker Quetschke
-# Check that normalized targets are treated as equal.
-# (issue 69742)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Check that we set AAA to set_AAA.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-# On cygwin add c:/temp/try5.xx to the prerequisites to test cygwin related
-# normalization
-all : try1.xx try2.xx ../..//d/try3.xx xxx//yyy/../../try4.xx
-# c:/temp/try5.xx
-	echo all
-
-./try1.xx :
-	echo try1
-
-./././try2.xx :
-	echo try2
-
-../../d/try3.xx :
-	echo try3
-
-./xxx/..////try4.xx :
-	echo try4
-
-/cygdrive/c/temp/try5.xx :
-	echo try5
-
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-else
-  echo "Failure! dmake reported:"
-  echo "$output1"
-fi
-exit $result
diff --git a/dmake/tests/targets-16 b/dmake/tests/targets-16
deleted file mode 100755
index 795fb7a63..000000000
--- a/dmake/tests/targets-16
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# 08.10.2006 Volker Quetschke
-# Check that $ in dynamic prerequisites are handled correctly.
-# (issue 70168)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Check that we set AAA to set_AAA.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-DYNPRQS=a\$\$xx1 a\$\$xx2
-
-all : \$\$(DYNPRQS) a\$\$\$\$xx3
-	echo all
-
-a\$\$xx1 :
-	echo a1:\$@
-
-a\$\$xx2 :
-	echo a2:\$@
-
-a\$\$xx3 :
-	echo a3:\$@
-
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-else
-  echo "Failure! dmake reported:"
-  echo "$output1"
-fi
-exit $result
diff --git a/dmake/tests/targets-17 b/dmake/tests/targets-17
deleted file mode 100755
index cea9c6336..000000000
--- a/dmake/tests/targets-17
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# 08.10.2006 Volker Quetschke
-# Check that empty dynamic prerequisites are handled correctly.
-# (issue 70210)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-EMPTYPRQ=
-
-all : \$\$(EMPTYPRQ)
-	echo all
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-else
-  echo "Failure! dmake reported:"
-  echo "$output1"
-fi
-exit $result
diff --git a/dmake/tests/targets-18 b/dmake/tests/targets-18
deleted file mode 100755
index 0e75ddb0f..000000000
--- a/dmake/tests/targets-18
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-# 21.06.2007 Volker Quetschke
-# Check that OOODMAKEMODE can switches of the ./foo to foo normalization.
-# (issue 74007)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-.IMPORT : OOODMAKEMODE
-
-# See if OOODMAKEMODE works
-./all :
-	@echo X\$@Y
-
-EOT
-
-
-output1=`eval OOODMAKEMODE="" ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-if test $result1 -ne 0 -o "$output1" != "XallY"; then
-  echo "Test 1: Wrong result: $output1"
-  result1=1
-fi
-
-
-output2=`eval OOODMAKEMODE=y ${DMAKEPROG} -rf $file1 2>&1 `
-result2=$?
-if test $result2 -ne 0 -o "$output2" != "X./allY"; then
-  echo "Test 2: Wrong result: $output2"
-  result2=1
-fi
-
-if test $result1 -eq 0 -a $result2 -eq 0; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit 0
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/targets-19 b/dmake/tests/targets-19
deleted file mode 100755
index 3ca904f53..000000000
--- a/dmake/tests/targets-19
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# 22.06.2007 Volker Quetschke
-# Check that multiple leading slashes are normalized.
-# (issue 78061)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1 - Test if excess leading slashes get removed
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-////all :
-	@echo X\$@Y
-
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-if test "$output1" != "X/allY"; then
-  echo "Subtest 1: Wrong result: $output1"
-  result1=1
-else
-  echo "Subtest 1: OK"
-fi 
-
-
-# Test 2 - Test if excess leading slashes in DOS paths get removed
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-"c:////all" .WINPATH :
-	@echo X\$@Y
-
-EOT
-
-if test x`uname -o 2> /dev/null` = "xCygwin"; then
-    output2=`eval ${DMAKEPROG} -r -f $file1`
-    result2=$?
-    if test "$output2" != "Xc:/allY"; then
-        echo "Subtest 2: Wrong result: $output2"
-        result2=1
-    else
-        echo "Subtest 2: OK"
-    fi
-else
-    echo "Subtest 2 ignored for non cygwin environment"
-    result2=0
-fi 
-
-
-if test $result1 -eq 0 -a $result2 -eq 0; then
-    echo "Success - Cleaning up" && rm -f ${tmpfiles}
-    exit
-else
-    echo "Failure!"
-    exit 1
-fi
\ No newline at end of file
diff --git a/dmake/tests/targets-2 b/dmake/tests/targets-2
deleted file mode 100644
index fbc1b0e39..000000000
--- a/dmake/tests/targets-2
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-# 03.06.2006 Volker Quetschke
-# Percent target definitions were not handled properly before.
-# (issue 64869) - Two more testcases
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="mfile2.mk"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Testcase 1 - %-target prerequisite - syntax error
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.PHONY all : %.c
-	+true all
-
-EOT
-
-# Testcase 2 - The recipe part is ignored - syntax error
-cat > $file2 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all :
-	+true all
-
-.PHONY : all ; +echo no recipe expected
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 2>&1 `
-result1=$?
-output2=`eval ${DMAKEPROG} -r -f $file2 2>&1 `
-result2=$?
-
-if echo $output1 | grep 'Error: -- Syntax' > /dev/null 2>&1 ; then
-  result1=0
-else
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-if echo $output2 | grep 'Error: -- Unexpected recipe' > /dev/null 2>&1 ; then
-  result2=0
-else
-  echo "Test 2: Wrong result: $output2"
-  echo
-  result1=1
-fi
-
-if test $result1 -eq 0 -a $result2 -eq 0; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-exit
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/targets-20 b/dmake/tests/targets-20
deleted file mode 100755
index 64a6a5b06..000000000
--- a/dmake/tests/targets-20
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# 12.07.2007 Volker Quetschke
-# Make sure that intermediate targets get created. BUG: If an intermediate
-# %-target does not exist it inherits the time stamp of it's parent and
-# doesn not get made.
-# Recipe: Create ptarget.c and then (newer) ptarget.a but ptarget.b did
-# not get made.
-# (issue 69462)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="ptarget.a"
-file3="ptarget.b"
-file4="ptarget.c"
-tmpfiles="$file1 $file2 $file3 $file4"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Create test environment
-touch ptarget.c
-touch ptarget.a
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-%.a : %.b
-	@cp \$< \$@
-
-%.b .PRECIOUS : %.c
-	@cp \$< \$@
-	@+printf "OK"
-
-%.c :
-	@touch \$@
-
-all : ptarget.a
-	@+echo "done"
-
-
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-if test "$output1" != "OKdone"; then
-  echo "Wrong result: $output1"
-  result1=1
-else
-  echo "OK"
-fi 
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/targets-21 b/dmake/tests/targets-21
deleted file mode 100755
index 2aff2285a..000000000
--- a/dmake/tests/targets-21
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-# 12.07.2007 Volker Quetschke
-# Another %-target testcase.
-# (issue 78837)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="aaa.aaa"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Create test environment
-touch aaa.aaa
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-%.aaa : %.bbb
-	@sleep 1
-	@touch \$@
-
-%.bbb :
-	@echo building \$@
-
-
-all : aaa.aaa
-	@noop Done
-
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-if test "$output1" != "building aaa.bbb"; then
-  echo "Wrong result: $output1"
-  result1=1
-else
-  echo "OK"
-fi 
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/targets-22 b/dmake/tests/targets-22
deleted file mode 100755
index 14474f097..000000000
--- a/dmake/tests/targets-22
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-# 12.07.2007 Volker Quetschke
-# Check that intermediate targets are marked removable.
-# (issue 80143)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="aaa.aaa"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Create test environment
-touch aaa.aaa
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-.REMOVE : ; @echo remove \$<
-
-%.a : %.b
-	@noop $@
-
-%.b :
-	@noop $@
-
-all : xx.a
-	@noop all
-
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-if test "$output1" != "remove xx.b"; then
-  echo "Wrong result: $output1"
-  result1=1
-else
-  echo "OK"
-fi 
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/targets-23 b/dmake/tests/targets-23
deleted file mode 100755
index ee670d496..000000000
--- a/dmake/tests/targets-23
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# 03.08.2007 Volker Quetschke
-# Check that a %-target without prereq has precedence over one with
-# prerequisite.
-# (issue 80144)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="aaa.aaa"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Create test environment
-touch aaa.aaa
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-.REMOVE : ; @echo remove \$<
-
-%.a : %.b
-	@echo Wrong choice - $@
-
-%.a :
-	@echo Right choice
-
-all : xx.a
-	@noop all
-
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-if test "$output1" != "Right choice"; then
-  echo "Wrong result: $output1"
-  result1=1
-else
-  echo "OK"
-fi 
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/targets-24 b/dmake/tests/targets-24
deleted file mode 100755
index 98c760398..000000000
--- a/dmake/tests/targets-24
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# 03.08.2007 Volker Quetschke
-# Check that ambigous %-target are found.
-# prerequisite.
-# (issue 80144)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="aaa.aaa"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Create test environment
-touch aaa.aaa
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-.REMOVE : ; @echo remove \$<
-
-%.a : %.b
-	@echo Blah
-
-%.a : xx.b
-	@echo Blue
-
-%.b  :
-	touch $@
-
-all : xx.a
-	@noop all
-
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-if echo $output1 | grep ': -- Ambiguous inference chains for target' > /dev/null 2>&1 ; then
-  echo "OK"
-else
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=0
-fi
-
-# Errorcode in $result1 means successfull test
-if test $result1 -ne 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/targets-25 b/dmake/tests/targets-25
deleted file mode 100755
index fa95f655b..000000000
--- a/dmake/tests/targets-25
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# 03.08.2007 Volker Quetschke
-# Check that the .PRECIOUS attribute works.
-# (issue 80352)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-.REMOVE : ; @echo remove \$<
-
-%.a : %.b
-	@noop Blah
-
-%.b .PRECIOUS :
-	@noop xx.b
-
-all : xx.a
-	@echo Done
-
-EOT
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-
-if test "$output1" != "Done"; then
-  echo "Wrong result: $output1"
-  result1=1
-else
-  echo "OK"
-fi 
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/targets-26 b/dmake/tests/targets-26
deleted file mode 100755
index 10ac0d43f..000000000
--- a/dmake/tests/targets-26
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# 10.08.2007 Volker Quetschke
-# Check that the .PHONY attribute works with %-targets.
-# (issue 66751)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="phonyfile.a"
-file3="phonyfile.b"
-tmpfiles="$file1 $file2 $file3"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-%.a : %.b
-	@sleep 1
-	@touch \$@
-	@+printf " and \$@.\n"
-
-#%.b :
-%.b .PHONY :
-	@touch \$@
-	@+printf "Build \$@"
-
-EOT
-
-touch phonyfile.a phonyfile.b
-# Avoid that phonyfile.a has the same time stamp as phonyfile.b after
-# that has been rebuild.
-sleep 1
-
-output1=`eval ${DMAKEPROG} -rf $file1 phonyfile.a 2>&1 `
-result1=$?
-
-if test "$output1" != "Build phonyfile.b and phonyfile.a."; then
-  echo "Wrong result: $output1"
-  result1=1
-else
-  echo "OK"
-fi 
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/targets-27 b/dmake/tests/targets-27
deleted file mode 100755
index 3ad33b4c2..000000000
--- a/dmake/tests/targets-27
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-# 15.08.2007 Volker Quetschke
-# Another check that the .PHONY attribute works with %-targets. This test
-# was still failing after issue 66751.
-# (issue 80687)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="aa.x"
-file3="aa.y"
-file4="aa.z"
-tmpfiles="$file1 $file2 $file3 $file4"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-%.x : %.y
-	@sleep 1
-	@+printf " and \$@.\n"
-	@touch \$@
-
-aa.y .PHONY : aa.z
-	@+printf "Build \$@"
-	@touch \$@
-
-EOT
-
-# Create test environment
-touch aa.z; sleep 1; touch aa.y ; sleep 1 ;touch aa.x
-# Avoid that aa.x has the same time stamp as aa.y after
-# that has been rebuild.
-sleep 1
-
-output1=`eval ${DMAKEPROG} -rf $file1 aa.x 2>&1 `
-result1=$?
-
-if test "$output1" != "Build aa.y and aa.x."; then
-  echo "Wrong result: $output1"
-  result1=1
-else
-  echo "OK"
-fi 
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/targets-28 b/dmake/tests/targets-28
deleted file mode 100755
index 0943eb667..000000000
--- a/dmake/tests/targets-28
+++ /dev/null
@@ -1,175 +0,0 @@
-#!/bin/sh
-
-# 25.08.2007 Volker Quetschke
-# Check that dmake handles dependencies correctly.
-# (issue 64572)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="aa.x"
-file3="aa.y"
-file4="aa.z"
-tmpfiles="$file1 $file2 $file3 $file4"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 1
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-aa.x : aa.y
-	@echo nothing
-
-aa.y :
-	@echo \$@
-
-EOT
-
-# Create test environment
-touch aa.x
-# Avoid that aa.x has the same time stamp as aa.y after
-# that has been rebuild.
-sleep 1
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1`
-result1=$?
-
-if test $result1 = 0 && echo $output1 | grep 'Warning: -- Target \[aa.x\] was made but the time stamp has not been updated.' > /dev/null 2>&1 ; then
-  echo "Subtest 1: OK"
-  result1=0
-else
-  echo "Subtest 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 2 - Warn if virtual targets have a corresponding file.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-aa.x : aa.y
-	@echo X\$@X
-	@touch \$@
-
-# Should warn - aa.y exists.
-aa.y : aa.z
-
-aa.z :
-	@printf Z\$@Z
-
-EOT
-
-# Create test environment
-rm -f aa.x
-touch aa.y
-# Avoid the same time after build.
-sleep 1
-
-output2=`eval ${DMAKEPROG} -rf $file1 2>&1`
-result2=$?
-
-if test $result2 = 0 && echo $output2 | grep 'Warning: -- Found file corresponding to virtual target \[aa.y\].' > /dev/null 2>&1 ; then
-  echo "Subtest 2: OK"
-  result2=0
-else
-  echo "Subtest 2: Wrong result: $output2"
-  echo
-  result2=1
-fi
-
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 3
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-aa.x : aa.y
-	@echo X\$@X
-	@touch \$@
-
-aa.y : aa.z
-
-aa.z :
-	@printf Z\$@Z
-	@touch \$@
-
-EOT
-
-# Create test environment
-rm -f aa.y
-touch aa.z ; sleep 1 ; touch aa.x
-# Avoid the same time after build.
-sleep 1
-
-# This tests that aa.x is not build as the dependency chain is intact with
-# the virtual target aa.y having the same time stamp as aa.z.
-output3=`eval ${DMAKEPROG} -vm -rf $file1 2>&1`
-result3=$?
-
-if test $result3 = 0 && echo "$output3" | grep "aa.x' is up to date"  > /dev/null 2>&1 ; then
-  echo "Subtest 3: OK"
-  result3=0
-else
-  echo "Subtest 3: Wrong result: :$output3:"
-  echo
-  result3=1
-fi
-
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Test 4
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-aa.x : aa.y
-	@echo Build \$@
-	@touch \$@
-
-aa.y : aa.z
-
-aa.z :
-	@printf Z\$@Z
-	@touch \$@
-
-EOT
-
-# Create test environment
-touch aa.z ; sleep 1 ; touch aa.x
-# Create a file for the virtual target that is newer than aa.x
-sleep 1 ; touch aa.y
-# Avoid the same time after build.
-sleep 1
-
-# This tests that aa.x is build.
-output4=`eval ${DMAKEPROG} -rf $file1 2>&1`
-result4=$?
-
-if test $result4 = 0 -a "$output4" = "Build aa.x" ; then
-  echo "Subtest 4: OK"
-  result4=0
-else
-  echo "Subtest 4: Wrong result: :$output4:"
-  echo
-  result4=1
-fi
-
-
-if test $result1 -eq 0 -a $result2 -eq 0 \
-    -a $result3 -eq 0 -a $result4 -eq 0  ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/targets-29 b/dmake/tests/targets-29
deleted file mode 100755
index 004553eb9..000000000
--- a/dmake/tests/targets-29
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-# 24.09.2007 Volker Quetschke
-# Check that the .REMOVE target does not crash dmake in parallel builds.
-# (issue 80012)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="aaa.aaa"
-file3="aaa.bbb"
-file4="aaa.ccc"
-tmpfiles="$file1 $file2 $file3 $file4"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-.REMOVE :; @echo remove intermediate target: \$<
-
-%.aaa : %.bbb
-	@echo built \$@
-
-%.bbb : %.ccc
-	@sleep 1
-	@echo built \$@
-
-%.ccc :
-	@echo built \$@
-
-all : aaa.aaa
-	@echo Done
-
-EOT
-
-output1=`eval ${DMAKEPROG} -P2 -rf $file1 2>&1`
-result1=$?
-
-if test $result1 -ne 0; then
-  echo "Failure! Remove the corefile!"
-  echo "Output: $output1"
-  result1=1
-else
-  echo "OK"
-fi 
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/targets-3 b/dmake/tests/targets-3
deleted file mode 100644
index 288dd67f1..000000000
--- a/dmake/tests/targets-3
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# 03.06.2006 Volker Quetschke
-# .<suffix> targets were silently ignored despite the illegal syntax.
-# (issue 65360)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Testcase 1 - Check that warning is issued if .<suffix> targets are ignored
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.nada : something
-
-something :
-	+echo "A target."
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 2>&1 `
-result1=$?
-
-if echo $output1 | grep 'Warning: -- Ignoring AUGMAKE meta-target' > /dev/null 2>&1 ; then
-  result1=0
-else
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-exit
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/targets-30 b/dmake/tests/targets-30
deleted file mode 100755
index 31e2e9712..000000000
--- a/dmake/tests/targets-30
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# 05.02.2008 Volker Quetschke
-# Check that OOODMAKEMODE=y does not normalize ./../foo.
-# (issue 84800)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-OOODMAKEMODE:=y
-
-# See if OOODMAKEMODE keeps ./../all
-./../all :
-	@echo X\$@Y
-
-EOT
-
-
-output1=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result1=$?
-if test $result1 -ne 0 -o "$output1" != "X./../allY"; then
-  echo "Test 1: Wrong result: $output1"
-  result1=1
-fi
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-cat > $file1 <<EOT
-SHELL*:=/bin/sh
-SHELLFLAGS*:=-ce
-
-OOODMAKEMODE:=
-
-# See if OOODMAKEMODE= removes the leading .
-./../all :
-	@echo X\$@Y
-
-EOT
-
-
-output2=`eval ${DMAKEPROG} -rf $file1 2>&1 `
-result2=$?
-if test $result2 -ne 0 -o "$output2" != "X../allY"; then
-  echo "Test 2: Wrong result: $output2"
-  result2=1
-fi
-
-if test $result1 -eq 0 -a $result2 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  exit 0
-else
-  echo "Failure!"
-  exit 1
-fi
diff --git a/dmake/tests/targets-4 b/dmake/tests/targets-4
deleted file mode 100644
index 2bc66d9ec..000000000
--- a/dmake/tests/targets-4
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-# 03.06.2006 Volker Quetschke
-# Check that a warning is issued for special or meta targets with
-# empty recipes.
-# (issue 65360) - Well, the issue is talking about slightly a different
-# issue but a related patch was committed with this issue reference.
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-file2="mfile2.mk"
-tmpfiles="$file1 $file2"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Testcase 1 - AUGMAKE meta targets
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.NIX :
-
-something :
-	+echo "A target."
-
-EOT
-
-# Testcase 2 - Percent targets
-cat > $file2 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-%.a : %.b
-
-something :
-	+echo "A target."
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 2>&1 `
-result1=$?
-output2=`eval ${DMAKEPROG} -r -f $file2 2>&1 `
-result2=$?
-
-if echo $output1 | grep -v 'Warning: -- Empty recipe' > /dev/null 2>&1 ; then
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-if echo $output2 | grep -v 'Warning: -- Empty recipe' > /dev/null 2>&1 ; then
-  echo "Test 2: Wrong result: $output2"
-  echo
-  result1=1
-fi
-
-if test $result1 -eq 0 -a $result2 -eq 0; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-exit
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/targets-5 b/dmake/tests/targets-5
deleted file mode 100644
index 0e83ca431..000000000
--- a/dmake/tests/targets-5
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# 13.06.2006 Volker Quetschke
-# Error out if AUGMAKE meta and normal targets occur in the same rule
-# definition.
-# (issue 66083)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Testcase 1 - Check that warning is issued if .<suffix> targets are ignored
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-.NIX.NUX aaa : ; @+echo "Normal and meta target together"
-
-something :
-	@+echo "A target."
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 2>&1 `
-result1=$?
-
-if echo $output1 | grep 'Error: -- A non AUGMAKE meta target must' > /dev/null 2>&1 ; then
-  dummy=1
-  # OK
-else
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=0
-fi
-
-# Errorcode in $result1 means successfull test
-if test $result1 -ne 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/targets-6 b/dmake/tests/targets-6
deleted file mode 100644
index 08ec6591a..000000000
--- a/dmake/tests/targets-6
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-# 13.06.2006 Volker Quetschke
-# Pre 4.5 dmakes didn't handle .<suffix> targets if AUGMAKE was set.
-# (issue 66365)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Check that .NIX is treated as meta target, making all the target
-# that gets build.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-AUGMAKE=yes
-
-.NIX : ; @+echo ".NIX Treated as a normal target"
-
-all :
-	@+echo "Fallthrough"
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 2>&1 `
-result1=$?
-
-if echo $output1 | grep 'Fallthrough' > /dev/null 2>&1 ; then
-  dummy=1
-  # OK
-else
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/targets-7 b/dmake/tests/targets-7
deleted file mode 100644
index 7fb091bd5..000000000
--- a/dmake/tests/targets-7
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-# 13.06.2006 Volker Quetschke
-# Check that `%.a %.b :| %.x %.y 'Z' ; recipe` rules are handled correctly.
-# (issues 48087 and 65122)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Expect dummy, all.pp and all.xx to be build
-# that gets build.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-%.xx %.rr :| %.yy %.pp 'dummy' ; @+printf "\$@"
-
-%.pp :
-	@sleep 1
-	@+printf "\$@"
-
-dummy :
-	@+printf "\$@"
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 all.xx 2>&1 `
-result1=$?
-
-if echo $output1 | grep 'dummyall.ppall.xx' > /dev/null 2>&1 ; then
-  dummy=1
-  # OK
-else
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/targets-8 b/dmake/tests/targets-8
deleted file mode 100644
index 1bb31959a..000000000
--- a/dmake/tests/targets-8
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-# 13.06.2006 Volker Quetschke
-# .SETDIR used to fail for multiple percent targets.
-# (issue 64431)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Expect xxx.1 and xxx.2 to be build
-# that gets build.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-all : xxx.1 xxx.2
-
-xxx.% .SETDIR=. :
-	@+printf "OK"
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 2>&1 `
-result1=$?
-
-if echo $output1 | grep 'OKOK' > /dev/null 2>&1 ; then
-  dummy=1
-  # OK
-else
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result
diff --git a/dmake/tests/targets-9 b/dmake/tests/targets-9
deleted file mode 100644
index b82d37967..000000000
--- a/dmake/tests/targets-9
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# 14.06.2006 Volker Quetschke
-# Prior to dmake 4.5 only one %-target per target-definition worked reliably.
-# (issue 48087)
-
-: ${DMAKEPROG:=dmake}
-file1="mfile1.mk"
-tmpfiles="$file1"
-
-trap '{ echo "trapped signal - removing temporary files" ; rm -rf $tmpfiles ; }' 1 2 3 15
-
-# Remove files from prior failed run
-rm -rf $tmpfiles
-
-# Remember to quote variables in generated makefiles( $ -> \$ ).
-# Check that we warn.
-cat > $file1 <<EOT
-SHELL*:=/bin/sh 
-SHELLFLAGS*:=-ce
-
-%.xx %.rr : %.yy 'a' 'b' ; touch $@
-
-dummy :
-	@+echo "A target"
-
-EOT
-
-output1=`eval ${DMAKEPROG} -r -f $file1 2>&1 `
-result1=$?
-
-if echo $output1 | grep 'Warning: -- Prior to dmake 4.5 only one' > /dev/null 2>&1 ; then
-  dummy=1
-  # OK
-else
-  echo "Test 1: Wrong result: $output1"
-  echo
-  result1=1
-fi
-
-if test $result1 -eq 0 ; then
-  echo "Success - Cleaning up"
-  rm -rf $tmpfiles
-  result=0
-else
-  echo "Failure!"
-  result=1
-fi
-exit $result
diff --git a/dmake/tos/config.mk b/dmake/tos/config.mk
deleted file mode 100644
index 650762001..000000000
--- a/dmake/tos/config.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# This is an OS specific configuration file
-#	It assumes that OBJDIR, TARGET and DEBUG are previously defined.
-#	It defines	CFLAGS, LDARGS, CPPFLAGS, STARTUPFILE, LDOBJS
-#			PRINTER, PRINTFLAGS
-#	It augments	SRC, OBJDIR, TARGET, CFLAGS, LDLIBS
-#
-PRINTER		= hw
-PRINTFLAGS	= -P$(PRINTER)
-STARTUPFILE	= $(OS)/startup.mk
-CPPFLAGS 	= $(CFLAGS)
-LDOBJS		= $(CSTARTUP) $(OBJDIR)/{$(<:f)}
-LDARGS		= $(LDFLAGS) -o $@ $(OBJDIR)/*$O
-LDFLAGS	       += -s
-LD		= $(CC)
-
-# Debug flags
-DB_CFLAGS	= -g -DDBUG
-DB_LDFLAGS	= -g
-DB_LDLIBS	=
-
-# NO Debug flags
-NDB_CFLAGS	= -O
-NDB_LDFLAGS	=
-NDB_LDLIBS	=
-
-# Local configuration modifications for CFLAGS.
-CFLAGS         += -I$(OS)
-
-# Sources that must be defined for each different version
-OS_SRC  += ruletab.c
-DOS_SRC  = rmprq.c runargv.c dirbrk.c rmprq.c
-UNIX_SRC = arlib.c
-BSD_SRC  = putenv.c tempnam.c
-
-.SETDIR=$(OS) : $(OS_SRC)
-.SETDIR=msdos : $(DOS_SRC)
-.SETDIR=unix  : $(UNIX_SRC)
-.SETDIR=unix/bsd43 : $(BSD_SRC)
-
-SRC += $(OS_SRC) $(DOS_SRC) $(UNIX_SRC) $(BSD_SRC)
-
-# Set source dirs so that we can find files named in this
-# config file.
-.SOURCE.h : $(OS)
-
-# See if we modify anything in the lower levels.
-.IF $(OSRELEASE) != $(NULL)
-   .INCLUDE .IGNORE : $(OS)$(DIRSEPSTR)$(OSRELEASE)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/tos/make.sh b/dmake/tos/make.sh
deleted file mode 100644
index 8ecb7db9c..000000000
--- a/dmake/tos/make.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-mkdir objects
-gcc -c -I. -Itos -O infer.c
-mv infer.o objects
-gcc -c -I. -Itos -O make.c
-mv make.o objects
-gcc -c -I. -Itos -O stat.c
-mv stat.o objects
-gcc -c -I. -Itos -O expand.c
-mv expand.o objects
-gcc -c -I. -Itos -O dmstring.c
-mv dmstring.o objects
-gcc -c -I. -Itos -O hash.c
-mv hash.o objects
-gcc -c -I. -Itos -O dag.c
-mv dag.o objects
-gcc -c -I. -Itos -O dmake.c
-mv dmake.o objects
-gcc -c -I. -Itos -O path.c
-mv path.o objects
-gcc -c -I. -Itos -O imacs.c
-mv imacs.o objects
-gcc -c -I. -Itos -O sysintf.c
-mv sysintf.o objects
-gcc -c -I. -Itos -O parse.c
-mv parse.o objects
-gcc -c -I. -Itos -O getinp.c
-mv getinp.o objects
-gcc -c -I. -Itos -O quit.c
-mv quit.o objects
-gcc -c -I. -Itos -O state.c
-mv state.o objects
-gcc -c -I. -Itos -O dmdump.c
-mv dmdump.o objects
-gcc -c -I. -Itos -O macparse.c
-mv macparse.o objects
-gcc -c -I. -Itos -O rulparse.c
-mv rulparse.o objects
-gcc -c -I. -Itos -O percent.c
-mv percent.o objects
-gcc -c -I. -Itos -O function.c
-mv function.o objects
-gcc -c -I. -Itos -O tos/ruletab.c
-mv ruletab.o objects
-gcc -c -I. -Itos -O msdos/rmprq.c
-mv rmprq.o objects
-gcc -c -I. -Itos -O msdos/runargv.c
-mv runargv.o objects
-gcc -c -I. -Itos -O msdos/dirbrk.c
-mv dirbrk.o objects
-gcc -c -I. -Itos -O unix/arlib.c
-mv arlib.o objects
-gcc -c -I. -Itos -O unix/bsd43/putenv.c
-mv putenv.o objects
-gcc -c -I. -Itos -O unix/bsd43/tempnam.c
-mv tempnam.o objects
-gcc -s  -o dmake objects/*.o
-cp tos/template.mk startup/config.mk
diff --git a/dmake/tos/public.h b/dmake/tos/public.h
deleted file mode 100644
index c7c1558cc..000000000
--- a/dmake/tos/public.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:52:34 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void Clean_up_processes ANSI(());
-int Wait_for_child ANSI((int, int));
-int If_root_path ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-
-#endif
diff --git a/dmake/tos/putenv.c b/dmake/tos/putenv.c
deleted file mode 100644
index 22f1c7866..000000000
--- a/dmake/tos/putenv.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* RCS  $Id: putenv.c,v 1.1.1.1 2000-09-22 15:33:33 hr Exp $
---
--- SYNOPSIS
---      My own putenv for BSD like systems.
--- 
--- DESCRIPTION
--- 	This originally came from MKS, but I rewrote it to fix a bug with
---	replacing existing strings, probably never happened but the code
---	was wrong nonetheless.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <stdio.h>
-#include <string.h>
-
-int
-putenv( str )/*
-===============
-   Take a string of the form NAME=value and stick it into the environment.
-   We do this by allocating a new set of pointers if we have to add a new
-   string and by replacing an existing pointer if the value replaces the value
-   of an existing string. */
-char *str;
-{
-   extern char **environ;		/* The current environment. */
-   static char **ourenv = NULL;		/* A new environment	    */
-   register char **p;
-   register char *q;
-   int      size;
-
-   /* First search the current environment and see if we can replace a
-    * string. */
-   for( p=environ; *p; p++ ) {
-      register char *s = str;
-
-      for( q = *p; *q && *s && *s == *q; q++, s++ )
-     if( *s == '=' ) {
-        *p = str;
-        return(0);			/* replaced it so go away */
-     }
-   }
-
-   /* Ok, can't replace a string so need to grow the environment. */
-   size = p - environ + 2;	/* size of new environment */
-                /* size of old is size-1   */
-
-   /* It's the first time, so allocate a new environment since we don't know
-    * where the old one is comming from. */
-   if( ourenv == NULL ) {
-      if( (ourenv = (char **) malloc( sizeof(char *)*size )) == NULL )
-     return(1);
-
-      memcpy( (char *)ourenv, (char *)environ, (size-2)*sizeof(char *) );
-   }
-   else if( (ourenv = (char **)realloc( ourenv, size*sizeof(char *))) == NULL )
-      return(1);
-
-   ourenv[--size] = NULL;
-   ourenv[--size] = str;
-
-   environ = ourenv;
-   return(0);
-}
diff --git a/dmake/tos/ruletab.c b/dmake/tos/ruletab.c
deleted file mode 100644
index a3541917b..000000000
--- a/dmake/tos/ruletab.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* RCS  $Id: ruletab.c,v 1.2 2006-04-20 12:18:01 hr Exp $
---
--- SYNOPSIS
---      Default initial configuration of dmake.
--- 
--- DESCRIPTION
--- 	Define here the initial set of rules that are defined before
---	dmake performs any processing.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* These are control macros for dmake that MUST be defined at some point
- * if they are NOT dmake will not work!  These are default definitions.  They
- * may be overridden inside the .STARTUP makefile, they are here
- * strictly so that dmake can parse the STARTUP makefile */
-
-static char *_rules[] = {
-    "MAXPROCESSLIMIT := 1",
-    "MAXPROCESS := 1",
-    "MAXLINELENGTH := 8190",
-    ".IMPORT .IGNORE: ROOTDIR DMAKEROOT",
-    ".MAKEFILES : makefile.mk Makefile makefile",
-    ".SOURCE    : .NULL",
-#include "startup.h"
-    0 };
-
-char **Rule_tab = _rules; /* for sundry reasons in Get_environment() */
diff --git a/dmake/tos/startup.h b/dmake/tos/startup.h
deleted file mode 100644
index c210b5a17..000000000
--- a/dmake/tos/startup.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* RCS  $Id: startup.h,v 1.2 2006-04-20 12:18:14 hr Exp $
---
--- SYNOPSIS
---      Definition of MAKESTARTUP
--- 
--- DESCRIPTION
---      Default MAKESTARTUP value defining where dmake locates the
---      startup file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-"DMAKEROOT *:= $(ROOTDIR)/etc/startup",
-"MAKESTARTUP := $(DMAKEROOT)/startup.mk",
diff --git a/dmake/tos/sysintf.h b/dmake/tos/sysintf.h
deleted file mode 100644
index d340396e0..000000000
--- a/dmake/tos/sysintf.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* RCS  $Id: sysintf.h,v 1.2 2007-01-18 09:43:39 vg Exp $
---
--- SYNOPSIS
---      Interfaces for sysintf.c
---
--- DESCRIPTION
---      Abstractions of functions in sysintf.c
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#define DMSTAT stat
-#define VOID_LCACHE(l,m) (void) void_lcache(l,m)
-#define Hook_std_writes(A)
-#define GETPID getpid()
-
-/* for directory cache */
-#define CacheStat(A,B)	really_dostat(A,&buf)
-
-/*
-** standard C items
-*/
-
-/*
-** DOS interface standard items
-*/
-#define	getswitchar()	'-'
-
-/*
-** make parameters
-*/
diff --git a/dmake/tos/template.mk b/dmake/tos/template.mk
deleted file mode 100644
index 91ce656f1..000000000
--- a/dmake/tos/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= tos
-   OSRELEASE     *:= 
-   OSENVIRONMENT *:= 
diff --git a/dmake/tos/tempnam.c b/dmake/tos/tempnam.c
deleted file mode 100644
index ed072319c..000000000
--- a/dmake/tos/tempnam.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:33 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-
-static char *cpdir();
-static char  *seed="AAA";
-
-/* BSD stdio.h doesn't define P_tmpdir, so let's do it here */
-#ifndef P_tmpdir
-static char *P_tmpdir = "/tmp";
-#endif
-
-char *
-tempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+16))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (access( cpdir(p, tmpdir), 3) != 0) )
-     if( (dl == 0) || (access( cpdir(p, dir), 3) != 0) )
-    if( access( cpdir(p, P_tmpdir),   3) != 0 )
-       if( access( cpdir(p, "/tmp"),  3) != 0 )
-          return(NULL);
-
-   (void) strcat(p, "/");
-   if(prefix)
-   {
-      *(p+strlen(p)+5) = '\0';
-      (void)strncat(p, prefix, 5);
-   }
-
-   (void)strcat(p, seed);
-   (void)strcat(p, "XXXXXX");
-
-   q = seed;
-   while(*q == 'Z') *q++ = 'A';
-   ++*q;
-
-   if(*mktemp(p) == '\0') return(NULL);
-   return(p);
-}
-
-
-
-static char *
-cpdir(buf, str)
-char *buf;
-char *str;
-{
-   char *p;
-
-   if(str != NULL)
-   {
-      (void) strcpy(buf, str);
-      p = buf - 1 + strlen(buf);
-      if(*p == '/') *p = '\0';
-   }
-
-   return(buf);
-}
diff --git a/dmake/unix/386ix/ar.h b/dmake/unix/386ix/ar.h
deleted file mode 100644
index da28222ac..000000000
--- a/dmake/unix/386ix/ar.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* RCS  $Id: ar.h,v 1.1.1.1 2000-09-22 15:33:33 hr Exp $
---
--- SYNOPSIS
---      ar header
---
--- DESCRIPTION
---      Make sure that PORTAR is defined.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#define PORTAR 1
-#include "/usr/include/ar.h"
diff --git a/dmake/unix/386ix/config.mk b/dmake/unix/386ix/config.mk
deleted file mode 100644
index 4c1eac92b..000000000
--- a/dmake/unix/386ix/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This is the 386IX UNIX configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# The following are required sources
-OSDSRC := 
-.IF $(OSDSRC)
-   SRC += $(OSDSRC)
-   .SETDIR=$(osrdir) : $(OSDSRC)
-.END
-
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS, there's local SysV includes
-# too.
-CFLAGS += -I$(osrdir)
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/unix/386ix/make.sh b/dmake/unix/386ix/make.sh
deleted file mode 100644
index 0ac25c71a..000000000
--- a/dmake/unix/386ix/make.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/386ix -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/386ix -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/386ix -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/386ix -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/386ix -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/386ix -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/386ix -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/386ix -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/386ix -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/386ix -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/386ix -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/386ix -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/386ix -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/386ix -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/386ix -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/386ix -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/386ix -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/386ix -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/386ix -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/386ix -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/386ix -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/386ix -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/386ix -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/386ix -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/386ix -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/386ix -O unix/dcache.c
-mv dcache.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o objects/dcache.o 
-cp unix/386ix/template.mk startup/config.mk
diff --git a/dmake/unix/386ix/public.h b/dmake/unix/386ix/public.h
deleted file mode 100644
index ee8e40082..000000000
--- a/dmake/unix/386ix/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:53:49 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/386ix/stdlib.h b/dmake/unix/386ix/stdlib.h
deleted file mode 100644
index f4048ef6c..000000000
--- a/dmake/unix/386ix/stdlib.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* RCS  $Id: stdlib.h,v 1.1.1.1 2000-09-22 15:33:33 hr Exp $
---
--- SYNOPSIS
---      stdlib interface
--- 
--- DESCRIPTION
---      Specially needed pieces of interface to the standard C lib.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _STDLIB_INCLUDED_
-#define _STDLIB_INCLUDED_
-
-extern /*GOTO*/ _exit();
-extern /*GOTO*/ exit();
-extern /*GOTO*/ abort();
-extern int system();
-extern char *getenv();
-extern char *calloc();
-extern char *malloc();
-extern char *realloc();
-extern free();
-extern int errno;
-
-#ifndef EIO
-#	include <errno.h>
-#endif
-
-#endif /* _STDLIB_INCLUDED_ */
diff --git a/dmake/unix/386ix/template.mk b/dmake/unix/386ix/template.mk
deleted file mode 100644
index e59d37c7c..000000000
--- a/dmake/unix/386ix/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= 386ix
-   OSENVIRONMENT *:= 
diff --git a/dmake/unix/386ix/time.h b/dmake/unix/386ix/time.h
deleted file mode 100644
index be3f11240..000000000
--- a/dmake/unix/386ix/time.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* RCS  $Id: time.h,v 1.1.1.1 2000-09-22 15:33:33 hr Exp $
---
--- SYNOPSIS
---      time_t
---
--- DESCRIPTION
---      Properly define time_t.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*
-** Berkeley get this wrong!
-*/
-#ifndef	TIME_h
-#define	TIME_h
-
-typedef	long	time_t;	/* this is the thing we use */
-
-#endif	TIME_h
-
diff --git a/dmake/unix/Makefile.am b/dmake/unix/Makefile.am
deleted file mode 100755
index e92c23ae9..000000000
--- a/dmake/unix/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-noinst_LIBRARIES = libunix.a
-
-libunix_a_SOURCES = arlib.c dcache.c dirbrk.c rmprq.c ruletab.c runargv.c tempnam.c
-
-
-INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/unix/@OS_VERSION@/gnu -I$(top_srcdir)/unix  -I$(top_srcdir)/unix/@OS_VERSION@
diff --git a/dmake/unix/Makefile.in b/dmake/unix/Makefile.in
deleted file mode 100755
index c46390514..000000000
--- a/dmake/unix/Makefile.in
+++ /dev/null
@@ -1,396 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-LIBOBJDIR =
-subdir = unix
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
-ARFLAGS = cru
-libunix_a_AR = $(AR) $(ARFLAGS)
-libunix_a_LIBADD =
-am_libunix_a_OBJECTS = arlib.$(OBJEXT) dcache.$(OBJEXT) \
-	dirbrk.$(OBJEXT) rmprq.$(OBJEXT) ruletab.$(OBJEXT) \
-	runargv.$(OBJEXT) tempnam.$(OBJEXT)
-libunix_a_OBJECTS = $(am_libunix_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libunix_a_SOURCES)
-DIST_SOURCES = $(libunix_a_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUG_FALSE = @DBUG_FALSE@
-DBUG_TRUE = @DBUG_TRUE@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DMAKEROOT_H_LINE1 = @DMAKEROOT_H_LINE1@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OS_LIBRARY = @OS_LIBRARY@
-OS_SUBDIRS = @OS_SUBDIRS@
-OS_TYPE = @OS_TYPE@
-OS_VERSION = @OS_VERSION@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-noinst_LIBRARIES = libunix.a
-libunix_a_SOURCES = arlib.c dcache.c dirbrk.c rmprq.c ruletab.c runargv.c tempnam.c
-INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/unix/@OS_VERSION@/gnu -I$(top_srcdir)/unix  -I$(top_srcdir)/unix/@OS_VERSION@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  unix/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  unix/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libunix.a: $(libunix_a_OBJECTS) $(libunix_a_DEPENDENCIES) 
-	-rm -f libunix.a
-	$(libunix_a_AR) libunix.a $(libunix_a_OBJECTS) $(libunix_a_LIBADD)
-	$(RANLIB) libunix.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arlib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcache.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirbrk.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmprq.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ruletab.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runargv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tempnam.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/dmake/unix/arlib.c b/dmake/unix/arlib.c
deleted file mode 100644
index 2ee86c6b0..000000000
--- a/dmake/unix/arlib.c
+++ /dev/null
@@ -1,610 +0,0 @@
-/* $RCSfile: arlib.c,v $
--- $Revision: 1.5 $
--- last change: $Author: hr $ $Date: 2006-04-20 12:18:37 $
---
--- SYNOPSIS
---      Unix archive manipulation code.
--- 
--- DESCRIPTION
--- 	Originally this code was provided by Eric Gisin of MKS.  I took
---	his code and completely rewrote it adding cacheing of lib members
---	and other various optimizations.  I kept the overal functional
---	idea of the library routines as they are similar to those in GNU
---	make and felt it advantageous to maintain a similar interface.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* Sun unix on 386i's has a broken ar.h that does not assume PORTAR format
- * by default, so we fix it here. */
-#if defined(i386) || defined(__DGUX__)
-#define PORTAR 1
-#endif
-
-#if !defined (COHERENT) && !defined(__COHERENT__)
-#include <ar.h>
-#else
-#include <arcoff.h>
-#endif /* COHERENT, __COHERENT__ */
-#include "extern.h"
-#include "sysintf.h"
-
-/* By defining the defines below it is possible to configure the library
- * code for library cacheing/non-cacheing, ASCII archive headers, and a full
- * decode of the ar_hdr fields in the scan_ar function. */
-
-#ifndef ASCARCH
-#define ASCARCH			1	/* ASCII time stored in archive	*/
-#endif
-
-#ifndef LC
-#define LC			1	/* Turn on library cacheing	*/
-#endif
-
-#ifndef CHECKELF
-#define CHECKELF		1	/* Enable Elf long member names */
-#endif
-
-#ifndef DECODE_ALL_AR_FIELDS
-#define DECODE_ALL_AR_FIELDS	0	/* decode only fields make needs*/
-#endif
-
-#ifndef AR_TRUNCATE_MEMBER_NAMES
-#define AR_TRUNCATE_MEMBER_NAMES 0	/* truncate member names for */
-#endif					/* comparison.               */
-
-#if LC
-#  define FOUND_MEMBER	FALSE
-#else
-#  define FOUND_MEMBER	TRUE
-#  define _cache_member(a, b, c)
-#  define _check_cache(a, b, c, d)	FALSE
-#endif
-
-#define MAXFNAME      255       /* Max length of member name    */
-#define	MAXMNAME	8	/* Max module name < MAXFNAME	*/
-
-
-/* This struct is used to pass the library and member inrmation about the
- * routines that perform the library seeking/cacheing */
-struct ar_args {
-   char   *lib;
-   char   *member;
-   time_t time;
-};
-
-
-typedef struct AR {
-   char    ar_name[MAXFNAME+1];      /* File name */
-   long    ar_size;                  /* Size in bytes */
-   time_t  ar_time;                  /* Modification time */
-
-#ifdef DOS
-   char    ar_modname[MAXMNAME+1];   /* DOS module name */
-#endif
-
-#if DECODE_ALL_AR_FIELDS
-   uint16  ar_mode;         	     /* File mode */
-   uint16  ar_uid;            	     /* File owner */
-   uint16  ar_gid;                   /* File group owner */
-#endif
-} AR, *ARPTR;
-
-
-static int ar_scan  ANSI((FILE *,
-              int (*) ANSI((FILE *, struct AR *,struct ar_args *)),
-              struct ar_args *));
-static int ar_touch ANSI(( FILE *, time_t ));
-static int time_function  ANSI(( FILE *, struct AR *, struct ar_args * ));
-static int touch_function ANSI(( FILE *, struct AR *, struct ar_args * ));
-static int ar_name_equal ANSI((char *, char *));
-
-#if LC
-static int _cache_member ANSI((char *, char *, time_t));
-static int _check_cache  ANSI((char *, char *, time_t *, int));
-#endif
-
-/* decoded archive header */
-static AR    _ar;
-static off_t arhdroffset;  /* member seek offset */
-
-
-PUBLIC time_t
-seek_arch(name, lib)/*
-======================
-   Look for module 'name' inside 'lib'.  If compiled with cacheing then first
-   check to see if the specified lib is cached.  If so then return that time
-   stamp instead of looking into the library. */
-char    *name;
-char 	*lib;
-{
-   FILE   *f;
-   int    rv;
-   time_t mtime;
-   struct ar_args args;
-
-   /* Check the cache first (if there is a cache) */
-   if( _check_cache(name, lib, &mtime, FALSE) )  return( mtime );
-
-   /* Open the lib file and perform the scan of the members, looking
-    * for our particular member.  If cacheing is enabled it will be
-    * taken care of automatically during the scan. */
-
-   args.lib    = lib;
-   args.member = name;
-   args.time   = (time_t)0L;
-
-   if( (f = fopen(lib, "r")) == NIL(FILE) ) return( (time_t)0L );
-   rv = ar_scan(f, time_function, &args );
-   fclose( f );
-
-   if( rv < 0 ) Fatal("(%s): Invalid library format", lib);
-
-   return( args.time );
-}
-
-
-PUBLIC int
-touch_arch(name, lib)/*
-=======================
-   Look for module 'name' inside 'lib'.  If compiled with cacheing then first
-   check to see if the specified lib is cached.  If so then set that time
-   stamp and write it into the library.  Returns 0 on success, non-zero
-   on failure. */
-char   *name;
-char   *lib;
-{
-   FILE   *f;
-   int    rv;
-   struct ar_args args;
-
-   /* Open the lib file and perform the scan of the members, looking
-    * for our particular member.  If cacheing is enabled it will be
-    * taken care of automatically during the scan. */
-
-   args.lib    = lib;
-   args.member = name;
-   args.time   = (time_t)0L;
-
-   if( (f = fopen(lib, "r+")) == NIL(FILE) ) return( (time_t)1L );
-   rv = ar_scan(f, touch_function, &args );
-   fclose( f );
-
-   if( rv < 0 ) Fatal("(%s): Invalid library format", lib);
-
-   return( 0 );
-}
-
-
-
-static int
-time_function(f, arp, argp)/*
-=============================
-   get library member's time, if it matches than return it in argp, if
-   cacheing is enabled than cache the library members also. */
-FILE           *f;      /* library file          */
-struct AR      *arp;    /* library member header */
-struct ar_args *argp;
-{
-   int rv = _cache_member( arp->ar_name, argp->lib, arp->ar_time );
-
-   if( ar_name_equal (argp->member, arp->ar_name)) {
-      argp->time = arp->ar_time;
-
-      if( arp->ar_time == 0 && !(Glob_attr & A_SILENT) )
-         Warning( "(%s): Can't extract library member timestamp; using EPOCH",
-              argp->member);
-
-      return( rv );  /* 1 => no cacheing, 0 => cacheing */
-   }
-
-   return( FALSE ); /* continue scan */
-}
-
-
-
-static int
-touch_function(f, arp, argp)/*
-==============================
-   Update library member's time stamp, and write new time value into cache
-   if required. */
-FILE           *f;      /* library file */
-struct AR      *arp;    /* library member header */
-struct ar_args *argp;
-{
-   extern time_t time ANSI(( time_t * ));
-   time_t now = time((time_t*) NULL);  /* Current time.		  */
-
-   if( ar_name_equal(argp->member, arp->ar_name) ) {
-      _check_cache( argp->member, argp->lib, &now, TRUE );
-      ar_touch(f, now );
-
-      return( TRUE );
-   }
-
-   return( FALSE ); /* continue scan */
-}
-
-
-static int
-ar_name_equal (char * name1, char * name2)
-{
-  int equal;
-  
-#if AR_TRUNCATE_MEMBER_NAMES
-  struct ar_hdr hdr;
-
-  equal = !strncmp (name1, name2, sizeof (hdr.ar_name)-1);
-#else
-  equal = !strcmp (name1, name2);
-#endif
-
-  return equal;
-}
-
-
-static int
-ar_scan(f, function, arg)/*
-===========================
-   Scan the opened archive, and call the given function for each member found.
-   The function will be called with the file positioned at the beginning of
-   the member and it can read up to arp->ar_size bytes of the archive member.
-   If the function returns 1, we stop and return 1.  We return 0 at the end
-   of the archive, or -1 if the archive has invalid format.  This interface
-   is more general than required by "make", but it can be used by other
-   utilities.  */
-register FILE *f;
-int      (*function) ANSI((FILE *, struct AR *, struct ar_args *));
-struct   ar_args *arg;
-{
-   extern long atol ();
-   register char *p;
-   struct ar_hdr arhdr;   /* archive member header   */
-   long		 nsize;   /* size of member name     */
-   long          arind=0; /* archive index offset    */
-   int           process;
-#if defined(_AIX)
-   struct fl_hdr flhdr;   /* archive file header     */
-   char   magic[SAIAMAG]; /* size of magic string    */
-#else
-#if ASCARCH
-   char magic[SARMAG];
-#else
-   unsigned short word;
-#endif
-#endif
-
-   fseek( f, 0L, 0 );	/* Start at the beginning of the archive file */
-
-#if ASCARCH
-#if defined(_AIX)
-   fread( (char *)&flhdr, sizeof(flhdr), 1, f );
-   if( strncmp(flhdr.fl_magic,AIAMAG, SAIAMAG) != 0 ) return(-1);
-   fseek(f, atol(flhdr.fl_fstmoff), 0 ); /* postition to first member */
-#else
-   fread( magic, sizeof(magic), 1, f );
-   if( strncmp(magic, ARMAG, SARMAG) != 0 ) return( -1 );
-#endif
-#else
-   fread( (char*)&word, sizeof(word), 1, f );
-   if( word != ARMAG ) return( -1 );
-#endif
-
-   /* scan the library, calling `function' for each member
-    */
-   while( 1 ) {
-      arhdroffset = ftell(f);
-#if defined(_AIX)
-      if( fread((char*)&arhdr,sizeof(arhdr)-sizeof(arhdr._ar_name),1,f)!=1)
-         break;
-      nsize = atoi(arhdr.ar_namlen);
-      fseek(f, arhdroffset+(unsigned long)(((struct ar_hdr *)0)->_ar_name.ar_name), 0);
-      if( fread((char*)_ar.ar_name,nsize,1,f)!=1)
-         break;
-      _ar.ar_name[nsize]='\0';
-#else
-      if( fread((char*) &arhdr, sizeof(arhdr), 1, f) != 1 ) break;
-      strncpy(_ar.ar_name, arhdr.ar_name, nsize = sizeof(arhdr.ar_name));
-#endif
-
-      for( p = &_ar.ar_name[nsize];
-           --p >= _ar.ar_name && *p == ' ';);
-
-      p[1] = '\0';
-      if( *p == '/' ) *p = 0; 	/* SysV has trailing '/' */
-      
-      /* check to see if this is an archive index using SsysV Index scheme.
-       * see ar(4) man page for more info */
-#if CHECKELF
-      if( _ar.ar_name[0] == '/' && _ar.ar_name[1] == '\0' ) {
-     arind = arhdroffset+sizeof(arhdr);
-     process = 0;
-      }
-      else
-#endif
-     process = 1;
-
-#if !defined(_AIX)
-#if ASCARCH
-      if( strncmp(arhdr.ar_fmag, ARFMAG, sizeof(arhdr.ar_fmag)) != 0 )
-     return( -1 );
-      _ar.ar_time = atol(arhdr.ar_date);
-      _ar.ar_size = atol(arhdr.ar_size);
-#else
-      _ar.ar_time = arhdr.ar_date;
-      _ar.ar_size = arhdr.ar_size;
-#endif
-#if CHECKELF
-      /* check for names of the form /xxxx where xxxx is an offset into the
-       * name table pointed at by arind. */
-      if(arind && _ar.ar_name[0] == '/') {
-     long offset = atol(_ar.ar_name+1);
-     long here = ftell(f);
-     int  c;
-
-     fseek(f, arind+offset, 0);
-     p = _ar.ar_name;
-     while((c=fgetc(f)) != EOF) {
-        *p++ = c;
-        if(c == '/') {
-           p[-1] = '\0';
-           break;
-        }
-     }
-
-     if (c==EOF) return(-1);          /* 'c' should never be EOF */
-     fseek(f, here, 0);
-      }
-#endif
-#else
-#if ASCARCH
-      _ar.ar_time = atol(arhdr.ar_date);
-      _ar.ar_size = atol(arhdr.ar_nxtmem);
-#else
-      _ar.ar_time = arhdr.ar_date;
-      _ar.ar_size = arhdr.ar_nxtmem;
-#endif
-#endif
-
-
-#if DECODE_ALL_AR_FIELDS
-#if ASCARCH
-      _ar.ar_mode = atoi(arhdr.ar_mode);
-      _ar.ar_uid  = atoi(arhdr.ar_uid);
-      _ar.ar_gid  = atoi(arhdr.ar_gid);
-#else
-      _ar.ar_mode = arhdr.ar_mode;
-      _ar.ar_uid = arhdr.ar_uid;
-      _ar.ar_gid = arhdr.ar_gid;
-#endif
-#endif
-      if( process && (*function)(f, &_ar, arg) ) return( 1 );
-
-#if defined(_AIX)
-      if( _ar.ar_size == 0L ) break;
-      fseek( f, (long) _ar.ar_size, 0 );
-#else
-      fseek( f, arhdroffset + sizeof(arhdr) + ((_ar.ar_size+1) & ~1L), 0 );
-#endif
-   }
-
-#if !defined(_AIX)
-   if( !feof(f) ) return( -1 );
-#endif
-   return 0;
-}
-
-
-
-static int
-ar_touch( f, now )/*
-====================
-   touch module header timestamp. */
-FILE   *f;
-time_t now;
-{
-
-   fseek(f, arhdroffset + (unsigned long)(((struct ar_hdr *)0)->ar_date), 0);
-
-#if ASCARCH
-   fprintf(f, "%lu", now);
-#else
-   fwrite((char *)now, sizeof(now), 1, f);
-#endif
-
-   return( ferror(f) ? 0 : 1 );
-}
-
-
-#if LC
-typedef struct mem {
-   time_t	m_time;		/* modify time of member*/
-   struct mem	*m_next;	/* next member in lib	*/
-   char		m_valid;	/* valid cache entry    */
-   char 	m_name[1];	/* lib member name	*/
-} MEM, *MEMPTR;
-
-typedef struct lib {
-   struct lib	*lb_next;	/* next library in list */
-   struct mem	*lb_members;	/* list of lib members	*/
-   char		lb_valid;	/* valid cache entry    */
-   char 	*lb_name;	/* library name		*/
-} LIB, *LIBPTR;
-
-static LIBPTR _cache = NIL(LIB);
-static MEMPTR _find_member ANSI(( LIBPTR, char * ));
-
-static int
-_check_cache( name, lib, pmtime, touch )/*
-==========================================
-   Check to see if we have cached member in lib, if so return time in pmtime
-   and return TRUE, otherwise return FALSE, if touch is TRUE then touch
-   the archive member instead. */
-char   *name;
-char   *lib;
-time_t *pmtime;
-int    touch;
-{
-   register MEMPTR mp;
-   register LIBPTR lp;
-
-   for( lp=_cache; lp != NIL(LIB) && lp->lb_name != lib; lp=lp->lb_next );
-   if( lp == NIL(LIB) ) return( FALSE );
-
-   mp = _find_member( lp, name );
-   if( mp == NIL(MEM) || !mp->m_valid ) return( FALSE );
-
-   if( touch == TRUE )
-   {
-      mp->m_time = *pmtime;
-      mp->m_valid = 1;
-   }
-   else
-      *pmtime = mp->m_time;
-
-   lp->lb_valid   = 1;
-   lp->lb_members = mp;
-
-   return( TRUE );
-}
-
-
-
-static int
-_cache_member( name, lib, mtime )/*
-===================================
-   Cache name in lib along with it's time */
-char   *name;
-char   *lib;
-time_t mtime;
-{
-   register MEMPTR mp;
-   register LIBPTR lp;
-
-   for( lp=_cache;
-    lp != NIL(LIB) && lp->lb_name != NIL(char) && lp->lb_name != lib;
-    lp=lp->lb_next);
-
-   if( lp == NIL(LIB) )
-   {
-      lp = (LIBPTR) malloc(sizeof(LIB));
-      if( lp == NIL(LIB) ) No_ram();
-
-      lp->lb_name    = lib;
-      lp->lb_members = NIL(MEM);
-      lp->lb_next    = _cache;
-      lp->lb_valid   = 0;
-      _cache = lp;
-   }
-
-   /* On UNIX ar does not allow multiple copies of the same .o file to live
-    * in the same AR file.  If this is not TRUE then use the commented out
-    * version to set the value of mp. */
-
-   /*mp = _find_member(lp, name);*/
-   mp = NIL(MEM);
-
-   if( mp == NIL(MEM) )
-   {
-      mp = (MEMPTR) malloc(sizeof(char)*offsetof(MEM,m_name[strlen(name)+1]));
-      if( mp == NIL(MEM) ) No_ram();
-
-      strcpy( mp->m_name, name );
-      mp->m_time     = mtime;
-
-      if( lp->lb_members == NIL(MEM) ) {
-     mp->m_next     = mp;
-     lp->lb_members = mp;
-      }
-      else {
-     mp->m_next = lp->lb_members->m_next;
-     lp->lb_members->m_next = mp;
-     lp->lb_members = mp;
-      }
-   }
-   else
-      mp->m_time = mtime;
-
-   mp->m_valid = 1;
-
-   return( lp->lb_valid );
-}
-
-
-static MEMPTR
-_find_member( lp, name )
-LIBPTR lp;
-char   *name;
-{
-   register MEMPTR mp = lp->lb_members;
-
-   if( mp == NIL(MEM) ) return(mp);
-
-   do {
-      if( !strcmp(mp->m_name, name ) ) return( mp );
-      mp = mp->m_next;
-   }
-   while( mp != lp->lb_members );
-
-   return( NIL(MEM) );
-}
-#endif
-
-
-
-PUBLIC void
-void_lcache( lib, member )/*
-============================
-   Void the library cache for lib.  If member is NIL(char) then nuke all
-   of the members, if member is NOT NIL(char) then invalidate only that
-   member. */
-char *lib;
-char *member;
-{
-#if LC
-   register LIBPTR lp;
-   register MEMPTR mp;
-   register MEMPTR tmp;
-
-   for( lp=_cache; lp != NIL(LIB) && lp->lb_name != lib; lp=lp->lb_next );
-   if( lp == NIL(LIB) ) return;
-
-   if( member == NIL(char) ) {
-      mp = lp->lb_members;
-      do {
-     tmp = mp->m_next;
-     (void) free( mp );
-     mp = tmp;
-      } while( mp != lp->lb_members );
-
-      lp->lb_valid   = 0;
-      lp->lb_members = NIL(MEM);
-      lp->lb_name    = NIL(char);
-   }
-   else {
-      mp=lp->lb_members;
-      do {
-     if( strcmp( member, mp->m_name) == 0 ) {
-        lp->lb_members = mp->m_next;
-        mp->m_valid = 0;
-     }
-       
-     mp=mp->m_next;
-      } while( mp != lp->lb_members );
-   }
-#endif
-}
diff --git a/dmake/unix/bsd43/config.mk b/dmake/unix/bsd43/config.mk
deleted file mode 100644
index e99937342..000000000
--- a/dmake/unix/bsd43/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This is the BSD 4.3 UNIX configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# The following sources are required for BSD4.3
-OSDSRC := putenv.c tempnam.c utime.c setvbuf.c
-.IF $(OSDSRC)
-   SRC    += $(OSDSRC)
-   .SETDIR=$(osrdir) : $(OSDSRC)
-.END
-
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS, there's local BSD includes
-# too.
-CFLAGS += -I$(osrdir)
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/unix/bsd43/dirent.h b/dmake/unix/bsd43/dirent.h
deleted file mode 100644
index 394a783ac..000000000
--- a/dmake/unix/bsd43/dirent.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* RCS  $Id: dirent.h,v 1.1.1.1 2000-09-22 15:33:33 hr Exp $
---
--- SYNOPSIS
---      dirent
---
--- DESCRIPTION
---      Deal with sysV'ish dirent.h on BSD4.3 systems, which have the stuff
---      in sys/dir.h
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <sys/dir.h>
-#define dirent direct
diff --git a/dmake/unix/bsd43/limits.h b/dmake/unix/bsd43/limits.h
deleted file mode 100644
index f90c9af62..000000000
--- a/dmake/unix/bsd43/limits.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* RCS  $Id: limits.h,v 1.1.1.1 2000-09-22 15:33:33 hr Exp $
---
--- SYNOPSIS
---      limits
---
--- DESCRIPTION
---      Compensate for systems that don't have a limits.h header file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <sys/types.h>
-#include <sys/dirent.h>
-#include <sys/param.h>
-
-#define NAME_MAX  MAXNAMLEN
-#define PATH_MAX  MAXPATHLEN
-#define CHILD_MAX 20
diff --git a/dmake/unix/bsd43/make.sh b/dmake/unix/bsd43/make.sh
deleted file mode 100644
index aa0bb6fdf..000000000
--- a/dmake/unix/bsd43/make.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/bsd43 -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O unix/dcache.c
-mv dcache.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O unix/bsd43/putenv.c
-mv putenv.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O unix/bsd43/tempnam.c
-mv tempnam.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O unix/bsd43/utime.c
-mv utime.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -O unix/bsd43/setvbuf.c
-mv setvbuf.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o \
-objects/dcache.o objects/putenv.o objects/tempnam.o objects/utime.o objects/setvbuf.o 
-cp unix/bsd43/template.mk startup/config.mk
diff --git a/dmake/unix/bsd43/public.h b/dmake/unix/bsd43/public.h
deleted file mode 100644
index ed37ec4e1..000000000
--- a/dmake/unix/bsd43/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:54:02 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/bsd43/putenv.c b/dmake/unix/bsd43/putenv.c
deleted file mode 100644
index 3186796d0..000000000
--- a/dmake/unix/bsd43/putenv.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* RCS  $Id: putenv.c,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      My own putenv for BSD like systems.
--- 
--- DESCRIPTION
--- 	This originally came from MKS, but I rewrote it to fix a bug with
---	replacing existing strings, probably never happened but the code
---	was wrong nonetheless.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <stdio.h>
-#include <string.h>
-
-int
-putenv( str )/*
-===============
-   Take a string of the form NAME=value and stick it into the environment.
-   We do this by allocating a new set of pointers if we have to add a new
-   string and by replacing an existing pointer if the value replaces the value
-   of an existing string. */
-char *str;
-{
-   extern char **environ;		/* The current environment. */
-   static char **ourenv = NULL;		/* A new environment	    */
-   register char **p;
-   register char *q;
-   int      size;
-
-   /* First search the current environment and see if we can replace a
-    * string. */
-   for( p=environ; *p; p++ ) {
-      register char *s = str;
-
-      for( q = *p; *q && *s && *s == *q; q++, s++ )
-     if( *s == '=' ) {
-        *p = str;
-        return(0);			/* replaced it so go away */
-     }
-   }
-
-   /* Ok, can't replace a string so need to grow the environment. */
-   size = p - environ + 2;	/* size of new environment */
-                /* size of old is size-1   */
-
-   /* It's the first time, so allocate a new environment since we don't know
-    * where the old one is comming from. */
-   if( ourenv == NULL ) {
-      if( (ourenv = (char **) malloc( sizeof(char *)*size )) == NULL )
-     return(1);
-
-      memcpy( (char *)ourenv, (char *)environ, (size-2)*sizeof(char *) );
-   }
-   else if( (ourenv = (char **)realloc( ourenv, size*sizeof(char *))) == NULL )
-      return(1);
-
-   ourenv[--size] = NULL;
-   ourenv[--size] = str;
-
-   environ = ourenv;
-   return(0);
-}
diff --git a/dmake/unix/bsd43/setvbuf.c b/dmake/unix/bsd43/setvbuf.c
deleted file mode 100644
index b4a3dd55b..000000000
--- a/dmake/unix/bsd43/setvbuf.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* RCS  $Id: setvbuf.c,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      Setvbuf for BSD
--- 
--- DESCRIPTION
--- 	A sysv call, standard BSD doesn't have this.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <stdio.h>
-
-setvbuf(fp, bp, type, len_unused)
-FILE*	fp;
-char*	bp;
-int	type;
-int	len_unused;
-{
-   switch (type) {
-      case _IOLBF: setlinebuf(fp);   return;
-      case _IONBF: setbuf(fp, NULL); return;
-      default:     setbuf(fp, bp);   return;
-   }
-}
-
diff --git a/dmake/unix/bsd43/stdlib.h b/dmake/unix/bsd43/stdlib.h
deleted file mode 100644
index 23ae77ecd..000000000
--- a/dmake/unix/bsd43/stdlib.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* RCS  $Id: stdlib.h,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      stdlib interface
--- 
--- DESCRIPTION
---      Specially needed pieces of interface to the standard C lib.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _STDLIB_INCLUDED_
-#define _STDLIB_INCLUDED_
-
-extern /*GOTO*/ _exit();
-extern /*GOTO*/ exit();
-extern /*GOTO*/ abort();
-extern int system();
-extern char *getenv();
-extern char *calloc();
-extern char *malloc();
-extern char *realloc();
-extern free();
-extern int errno;
-
-#ifndef EIO
-#	include <errno.h>
-#endif
-
-#endif /* _STDLIB_INCLUDED_ */
diff --git a/dmake/unix/bsd43/string.h b/dmake/unix/bsd43/string.h
deleted file mode 100644
index c311e2c05..000000000
--- a/dmake/unix/bsd43/string.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* RCS  $Id: string.h,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      string function headers
--- 
--- DESCRIPTION
---      Supply correct definitions for certain string functions.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-#ifndef STRING_h
-#define STRING_h
-
-/*
-** BSD does this wrong
-*/
-#include <strings.h>
-
-#include "stdmacs.h"
-extern	char*	strpbrk ANSI((char* src, char* any));
-
-#ifndef DBUG
-#define	strchr(str,c)	index(str,c)
-#define	strrchr(str,c)	rindex(str,c)
-#else
-char *strchr ANSI((char*, char));
-char *strrchr ANSI((char*, char));
-#endif
-#endif
diff --git a/dmake/unix/bsd43/template.mk b/dmake/unix/bsd43/template.mk
deleted file mode 100644
index 14a7cab8e..000000000
--- a/dmake/unix/bsd43/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= bsd43
-   OSENVIRONMENT *:= 
diff --git a/dmake/unix/bsd43/tempnam.c b/dmake/unix/bsd43/tempnam.c
deleted file mode 100644
index 3456d3d38..000000000
--- a/dmake/unix/bsd43/tempnam.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-
-static char *cpdir();
-static char  seed[4]="AAA";
-
-/* BSD stdio.h doesn't define P_tmpdir, so let's do it here */
-#ifndef P_tmpdir
-static char *P_tmpdir = "/tmp";
-#endif
-
-char *
-tempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+16))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (access( cpdir(p, tmpdir), 3) != 0) )
-     if( (dl == 0) || (access( cpdir(p, dir), 3) != 0) )
-    if( access( cpdir(p, P_tmpdir),   3) != 0 )
-       if( access( cpdir(p, "/tmp"),  3) != 0 )
-          return(NULL);
-
-   (void) strcat(p, "/");
-   if(prefix)
-   {
-      *(p+strlen(p)+5) = '\0';
-      (void)strncat(p, prefix, 5);
-   }
-
-   (void)strcat(p, seed);
-   (void)strcat(p, "XXXXXX");
-
-   q = seed;
-   while(*q == 'Z') *q++ = 'A';
-   ++*q;
-
-   if(*mktemp(p) == '\0') return(NULL);
-   return(p);
-}
-
-
-
-static char *
-cpdir(buf, str)
-char *buf;
-char *str;
-{
-   char *p;
-
-   if(str != NULL)
-   {
-      (void) strcpy(buf, str);
-      p = buf - 1 + strlen(buf);
-      if(*p == '/') *p = '\0';
-   }
-
-   return(buf);
-}
diff --git a/dmake/unix/bsd43/utime.c b/dmake/unix/bsd43/utime.c
deleted file mode 100644
index 653196891..000000000
--- a/dmake/unix/bsd43/utime.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* RCS  $Id: utime.c,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      utime
---
--- DESCRIPTION
---      Provide our own utime function.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-
-int
-utime(name, timep)
-char*	name;
-time_t	timep[2];
-{
-    struct timeval tv[2], *tvp;
-    struct stat buf;
-    int	fil;
-    char	data;
-
-    if (timep!=0)
-    {
-        tvp = tv, tv[0].tv_sec = timep[0], tv[1].tv_sec = timep[1];
-        if (utimes(name, tvp)==0)
-            return (0);
-    }
-
-    if (stat(name, &buf) != 0)
-        return (-1);
-    if (buf.st_size != 0)  {
-        if ((fil = open(name, O_RDWR, 0666)) < 0)
-            return (-1);
-        if (read(fil, &data, 1) < 1) {
-            close(fil);
-            return (-1);
-        }
-        lseek(fil, 0L, 0);
-        if (write(fil, &data, 1) < 1) {
-            close(fil);
-            return (-1);
-        }
-        close(fil);
-        return (0);
-    } else 	if ((fil = creat(name, 0666)) < 0) {
-        return (-1);
-    } else {
-        close(fil);
-        return (0);
-    }
-}
diff --git a/dmake/unix/bsd43/uw/config.mk b/dmake/unix/bsd43/uw/config.mk
deleted file mode 100644
index 1f94136f6..000000000
--- a/dmake/unix/bsd43/uw/config.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# This is the BSD 4.3 University of Waterloo (uw) UNIX configuration file
-# for DMAKE
-#	It simply modifies the values of LDLIBS to include libuw.a
-#	so that vfprintf can be found.
-#
-
-LDLIBS += -luw
-osredir := $(OS)$(DIRSEPSTR)$(OSRELEASE)$(DIRSEPSTR)$(OSENVIRONMENT)
-CFLAGS += -I$(osredir)
-
-# install script for UW's /usr/software hierarchy...
-install:
-    mkdir ../bin; strip ./dmake; mv ./dmake ../bin
-    chmod a+rx ../bin/dmake ../bin
-    mkdir ../lib; chmod a+rx ../lib
-    cp $(STARTUPFILE) ../lib
-    chmod a+r ../lib/startup.mk
diff --git a/dmake/unix/bsd43/uw/make.sh b/dmake/unix/bsd43/uw/make.sh
deleted file mode 100644
index d9941b7e1..000000000
--- a/dmake/unix/bsd43/uw/make.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O unix/dcache.c
-mv dcache.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O unix/bsd43/putenv.c
-mv putenv.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O unix/bsd43/tempnam.c
-mv tempnam.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O unix/bsd43/utime.c
-mv utime.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/uw -O unix/bsd43/setvbuf.c
-mv setvbuf.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o \
-objects/dcache.o objects/putenv.o objects/tempnam.o objects/utime.o objects/setvbuf.o -luw 
-cp unix/bsd43/uw/template.mk startup/config.mk
diff --git a/dmake/unix/bsd43/uw/public.h b/dmake/unix/bsd43/uw/public.h
deleted file mode 100644
index f02514f78..000000000
--- a/dmake/unix/bsd43/uw/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:54:14 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/bsd43/uw/template.mk b/dmake/unix/bsd43/uw/template.mk
deleted file mode 100644
index 6afe91c1f..000000000
--- a/dmake/unix/bsd43/uw/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= bsd43
-   OSENVIRONMENT *:= uw
diff --git a/dmake/unix/bsd43/vf/config.mk b/dmake/unix/bsd43/vf/config.mk
deleted file mode 100644
index bf4e64808..000000000
--- a/dmake/unix/bsd43/vf/config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# This config file adds vfprintf.c and memcpy.c for those systems that
-# do not have it.
-#
-
-osredir := $(OS)$(DIRSEPSTR)$(OSRELEASE)$(DIRSEPSTR)$(OSENVIRONMENT)
-CFLAGS += -I$(osredir)
-
-# The following sources are required for BSD4.3
-OSDESRC := memcpy.c vfprintf.c
-SRC    += $(OSDESRC)
-.SETDIR=$(osredir) : $(OSDESRC)
diff --git a/dmake/unix/bsd43/vf/ctype.h b/dmake/unix/bsd43/vf/ctype.h
deleted file mode 100644
index bf4122f9f..000000000
--- a/dmake/unix/bsd43/vf/ctype.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* RCS  $Id: ctype.h,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      ctype
---
--- DESCRIPTION
---      ctype.h	4.2 85/09/04
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#define	_U	01
-#define	_L	02
-#define	_N	04
-#define	_S	010
-#define _P	020
-#define _C	040
-#define _X	0100
-#define	_B	0200
-
-extern	char	_ctype_[];
-
-#define	isalpha(c)	((_ctype_+1)[c]&(_U|_L))
-#define	isupper(c)	((_ctype_+1)[c]&_U)
-#define	islower(c)	((_ctype_+1)[c]&_L)
-#define	isdigit(c)	((_ctype_+1)[c]&_N)
-#define	isxdigit(c)	((_ctype_+1)[c]&(_N|_X))
-#define	isspace(c)	((_ctype_+1)[c]&_S)
-#define ispunct(c)	((_ctype_+1)[c]&_P)
-#define isalnum(c)	((_ctype_+1)[c]&(_U|_L|_N))
-#define isprint(c)	((_ctype_+1)[c]&(_P|_U|_L|_N|_B))
-#define isgraph(c)	((_ctype_+1)[c]&(_P|_U|_L|_N))
-#define iscntrl(c)	((_ctype_+1)[c]&_C)
-#define isascii(c)	((unsigned)(c)<=0177)
-#define toupper(c)	((c)-'a'+'A')
-#define tolower(c)	((c)-'A'+'a')
-#define toascii(c)	((c)&0177)
diff --git a/dmake/unix/bsd43/vf/make.sh b/dmake/unix/bsd43/vf/make.sh
deleted file mode 100644
index 5ac9e7896..000000000
--- a/dmake/unix/bsd43/vf/make.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O unix/dcache.c
-mv dcache.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O unix/bsd43/putenv.c
-mv putenv.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O unix/bsd43/tempnam.c
-mv tempnam.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O unix/bsd43/utime.c
-mv utime.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O unix/bsd43/setvbuf.c
-mv setvbuf.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O unix/bsd43/vf/memcpy.c
-mv memcpy.o objects
-cc -c -I. -Iunix -Iunix/bsd43 -Iunix/bsd43/vf -O unix/bsd43/vf/vfprintf.c
-mv vfprintf.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o \
-objects/dcache.o objects/putenv.o objects/tempnam.o objects/utime.o objects/setvbuf.o objects/memcpy.o objects/vfprintf.o 
-cp unix/bsd43/vf/template.mk startup/config.mk
diff --git a/dmake/unix/bsd43/vf/memcpy.c b/dmake/unix/bsd43/vf/memcpy.c
deleted file mode 100644
index da6937208..000000000
--- a/dmake/unix/bsd43/vf/memcpy.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* RCS  $Id: memcpy.c,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      memcpy
---
--- DESCRIPTION
---      BSD didn't have this in the library many moons ago.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-char *
-memcpy(t, f, n)
-register char *t, *f;
-register n;
-{
-   register char *p = t;
-
-   while( --n >= 0 ) *t++ = *f++;
-
-   return (p);
-}
diff --git a/dmake/unix/bsd43/vf/public.h b/dmake/unix/bsd43/vf/public.h
deleted file mode 100644
index c464f7a20..000000000
--- a/dmake/unix/bsd43/vf/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:54:25 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/bsd43/vf/template.mk b/dmake/unix/bsd43/vf/template.mk
deleted file mode 100644
index 395cd4718..000000000
--- a/dmake/unix/bsd43/vf/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= bsd43
-   OSENVIRONMENT *:= vf
diff --git a/dmake/unix/bsd43/vf/vfprintf.c b/dmake/unix/bsd43/vf/vfprintf.c
deleted file mode 100644
index ba52dee28..000000000
--- a/dmake/unix/bsd43/vf/vfprintf.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vfprintf.c	5.2 (Berkeley) 6/27/88";
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdio.h>
-#include <varargs.h>
-
-int
-vfprintf(iop, fmt, ap)
-    FILE *iop;
-    char *fmt;
-    va_list ap;
-{
-    int len;
-    char localbuf[BUFSIZ];
-
-    if (iop->_flag & _IONBF) {
-        iop->_flag &= ~_IONBF;
-        iop->_ptr = iop->_base = localbuf;
-        len = _doprnt(fmt, ap, iop);
-        (void) fflush(iop);
-        iop->_flag |= _IONBF;
-        iop->_base = NULL;
-        iop->_bufsiz = 0;
-        iop->_cnt = 0;
-    } else
-        len = _doprnt(fmt, ap, iop);
-
-    return (ferror(iop) ? EOF : len);
-}
-
diff --git a/dmake/unix/bsdarm32/config.mk b/dmake/unix/bsdarm32/config.mk
deleted file mode 100644
index e99937342..000000000
--- a/dmake/unix/bsdarm32/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This is the BSD 4.3 UNIX configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# The following sources are required for BSD4.3
-OSDSRC := putenv.c tempnam.c utime.c setvbuf.c
-.IF $(OSDSRC)
-   SRC    += $(OSDSRC)
-   .SETDIR=$(osrdir) : $(OSDSRC)
-.END
-
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS, there's local BSD includes
-# too.
-CFLAGS += -I$(osrdir)
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/unix/bsdarm32/dirent.h b/dmake/unix/bsdarm32/dirent.h
deleted file mode 100644
index bd420a3cd..000000000
--- a/dmake/unix/bsdarm32/dirent.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* RCS  $Id: dirent.h,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      dirent
---
--- DESCRIPTION
---      Deal with sysV'ish dirent.h on BSD4.3 systems, which have the stuff
---      in sys/dir.h
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <sys/dir.h>
-#include </usr/include/dirent.h>
-#define dirent direct
-
diff --git a/dmake/unix/bsdarm32/limits.h b/dmake/unix/bsdarm32/limits.h
deleted file mode 100644
index c55e462ff..000000000
--- a/dmake/unix/bsdarm32/limits.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* RCS  $Id: limits.h,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      limits
---
--- DESCRIPTION
---      Compensate for systems that don't have a limits.h header file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <sys/types.h>
-#include <sys/dirent.h>
-#include <sys/param.h>
-
diff --git a/dmake/unix/bsdarm32/make.sh b/dmake/unix/bsdarm32/make.sh
deleted file mode 100644
index 198cc9f6a..000000000
--- a/dmake/unix/bsdarm32/make.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O unix/dcache.c
-mv dcache.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O unix/bsdarm32/putenv.c
-mv putenv.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O unix/bsdarm32/tempnam.c
-mv tempnam.o objects
-cc -c -I. -Iunix -Iunix/bsdarm32 -O unix/bsdarm32/utime.c
-mv utime.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o \
-objects/dcache.o objects/putenv.o objects/tempnam.o objects/utime.o objects/setvbuf.o 
-cp unix/bsdarm32/template.mk startup/config.mk
diff --git a/dmake/unix/bsdarm32/public.h b/dmake/unix/bsdarm32/public.h
deleted file mode 100644
index 8061d8499..000000000
--- a/dmake/unix/bsdarm32/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:54:38 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/bsdarm32/putenv.c b/dmake/unix/bsdarm32/putenv.c
deleted file mode 100644
index 3186796d0..000000000
--- a/dmake/unix/bsdarm32/putenv.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* RCS  $Id: putenv.c,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      My own putenv for BSD like systems.
--- 
--- DESCRIPTION
--- 	This originally came from MKS, but I rewrote it to fix a bug with
---	replacing existing strings, probably never happened but the code
---	was wrong nonetheless.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <stdio.h>
-#include <string.h>
-
-int
-putenv( str )/*
-===============
-   Take a string of the form NAME=value and stick it into the environment.
-   We do this by allocating a new set of pointers if we have to add a new
-   string and by replacing an existing pointer if the value replaces the value
-   of an existing string. */
-char *str;
-{
-   extern char **environ;		/* The current environment. */
-   static char **ourenv = NULL;		/* A new environment	    */
-   register char **p;
-   register char *q;
-   int      size;
-
-   /* First search the current environment and see if we can replace a
-    * string. */
-   for( p=environ; *p; p++ ) {
-      register char *s = str;
-
-      for( q = *p; *q && *s && *s == *q; q++, s++ )
-     if( *s == '=' ) {
-        *p = str;
-        return(0);			/* replaced it so go away */
-     }
-   }
-
-   /* Ok, can't replace a string so need to grow the environment. */
-   size = p - environ + 2;	/* size of new environment */
-                /* size of old is size-1   */
-
-   /* It's the first time, so allocate a new environment since we don't know
-    * where the old one is comming from. */
-   if( ourenv == NULL ) {
-      if( (ourenv = (char **) malloc( sizeof(char *)*size )) == NULL )
-     return(1);
-
-      memcpy( (char *)ourenv, (char *)environ, (size-2)*sizeof(char *) );
-   }
-   else if( (ourenv = (char **)realloc( ourenv, size*sizeof(char *))) == NULL )
-      return(1);
-
-   ourenv[--size] = NULL;
-   ourenv[--size] = str;
-
-   environ = ourenv;
-   return(0);
-}
diff --git a/dmake/unix/bsdarm32/stdlib.h b/dmake/unix/bsdarm32/stdlib.h
deleted file mode 100644
index 23ae77ecd..000000000
--- a/dmake/unix/bsdarm32/stdlib.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* RCS  $Id: stdlib.h,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      stdlib interface
--- 
--- DESCRIPTION
---      Specially needed pieces of interface to the standard C lib.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _STDLIB_INCLUDED_
-#define _STDLIB_INCLUDED_
-
-extern /*GOTO*/ _exit();
-extern /*GOTO*/ exit();
-extern /*GOTO*/ abort();
-extern int system();
-extern char *getenv();
-extern char *calloc();
-extern char *malloc();
-extern char *realloc();
-extern free();
-extern int errno;
-
-#ifndef EIO
-#	include <errno.h>
-#endif
-
-#endif /* _STDLIB_INCLUDED_ */
diff --git a/dmake/unix/bsdarm32/string.h b/dmake/unix/bsdarm32/string.h
deleted file mode 100644
index 59997de8b..000000000
--- a/dmake/unix/bsdarm32/string.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* RCS  $Id: string.h,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      string function headers
--- 
--- DESCRIPTION
---      Supply correct definitions for certain string functions.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-
-/*
-** BSD does this wrong
-*/
-#include </usr/include/string.h>
-
-#include "stdmacs.h"
-extern	char*	strpbrk ANSI((const char* src, const char* any));
-
-#ifndef DBUG
-#define	strchr(str,c)	index(str,c)
-#define	strrchr(str,c)	rindex(str,c)
-#else
-char *strchr ANSI((char*, char));
-char *strrchr ANSI((char*, char));
-#endif
-
diff --git a/dmake/unix/bsdarm32/template.mk b/dmake/unix/bsdarm32/template.mk
deleted file mode 100644
index 830e99583..000000000
--- a/dmake/unix/bsdarm32/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= bsdarm32
-   OSENVIRONMENT *:= 
diff --git a/dmake/unix/bsdarm32/tempnam.c b/dmake/unix/bsdarm32/tempnam.c
deleted file mode 100644
index 23e0125d7..000000000
--- a/dmake/unix/bsdarm32/tempnam.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-
-static char *cpdir();
-static char  seed[4]="AAA";
-
-/* BSD stdio.h doesn't define P_tmpdir, so let's do it here */
-#ifndef P_tmpdir
-static char *P_tmpdir = "/tmp";
-#endif
-
-
-char *
-tempnam(dir, prefix)
-const char *dir;		/* use this directory please (if non-NULL) */
-const char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+16))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (access( cpdir(p, tmpdir), 3) != 0) )
-     if( (dl == 0) || (access( cpdir(p, dir), 3) != 0) )
-    if( access( cpdir(p, P_tmpdir),   3) != 0 )
-       if( access( cpdir(p, "/tmp"),  3) != 0 )
-          return(NULL);
-
-   (void) strcat(p, "/");
-   if(prefix)
-   {
-      *(p+strlen(p)+5) = '\0';
-      (void)strncat(p, prefix, 5);
-   }
-
-   (void)strcat(p, seed);
-   (void)strcat(p, "XXXXXX");
-
-   q = seed;
-   while(*q == 'Z') *q++ = 'A';
-   ++*q;
-
-   if(*mktemp(p) == '\0') return(NULL);
-   return(p);
-}
-
-
-
-
-static char *
-cpdir(buf, str)
-char *buf;
-char *str;
-{
-   char *p;
-
-   if(str != NULL)
-   {
-      (void) strcpy(buf, str);
-      p = buf - 1 + strlen(buf);
-      if(*p == '/') *p = '\0';
-   }
-
-   return(buf);
-}
diff --git a/dmake/unix/bsdarm32/utime.c b/dmake/unix/bsdarm32/utime.c
deleted file mode 100644
index 653196891..000000000
--- a/dmake/unix/bsdarm32/utime.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* RCS  $Id: utime.c,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      utime
---
--- DESCRIPTION
---      Provide our own utime function.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-
-int
-utime(name, timep)
-char*	name;
-time_t	timep[2];
-{
-    struct timeval tv[2], *tvp;
-    struct stat buf;
-    int	fil;
-    char	data;
-
-    if (timep!=0)
-    {
-        tvp = tv, tv[0].tv_sec = timep[0], tv[1].tv_sec = timep[1];
-        if (utimes(name, tvp)==0)
-            return (0);
-    }
-
-    if (stat(name, &buf) != 0)
-        return (-1);
-    if (buf.st_size != 0)  {
-        if ((fil = open(name, O_RDWR, 0666)) < 0)
-            return (-1);
-        if (read(fil, &data, 1) < 1) {
-            close(fil);
-            return (-1);
-        }
-        lseek(fil, 0L, 0);
-        if (write(fil, &data, 1) < 1) {
-            close(fil);
-            return (-1);
-        }
-        close(fil);
-        return (0);
-    } else 	if ((fil = creat(name, 0666)) < 0) {
-        return (-1);
-    } else {
-        close(fil);
-        return (0);
-    }
-}
diff --git a/dmake/unix/coherent/config.mk b/dmake/unix/coherent/config.mk
deleted file mode 100644
index 9c5890c80..000000000
--- a/dmake/unix/coherent/config.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# This is the COHERENT configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# The following are required sources
-.IF $(OSDSRC)
-   SRC    += $(OSDSRC)
-   .SETDIR=$(osrdir) : $(OSDSRC)
-.END
-
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS, there's local SysV includes
-# too.
-CFLAGS += -I$(osrdir) -Dvoid=int
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/unix/coherent/stdlib.h b/dmake/unix/coherent/stdlib.h
deleted file mode 100644
index 23ae77ecd..000000000
--- a/dmake/unix/coherent/stdlib.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* RCS  $Id: stdlib.h,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      stdlib interface
--- 
--- DESCRIPTION
---      Specially needed pieces of interface to the standard C lib.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _STDLIB_INCLUDED_
-#define _STDLIB_INCLUDED_
-
-extern /*GOTO*/ _exit();
-extern /*GOTO*/ exit();
-extern /*GOTO*/ abort();
-extern int system();
-extern char *getenv();
-extern char *calloc();
-extern char *malloc();
-extern char *realloc();
-extern free();
-extern int errno;
-
-#ifndef EIO
-#	include <errno.h>
-#endif
-
-#endif /* _STDLIB_INCLUDED_ */
diff --git a/dmake/unix/coherent/time.h b/dmake/unix/coherent/time.h
deleted file mode 100644
index 2b8b9eeb3..000000000
--- a/dmake/unix/coherent/time.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* RCS  $Id: time.h,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      time_t
---
--- DESCRIPTION
---      Properly define time_t.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef	TIME_h
-#define	TIME_h
-
-typedef	long	time_t;	/* this is the thing we use */
-
-#endif	TIME_h
-
diff --git a/dmake/unix/coherent/ver40/config.mk b/dmake/unix/coherent/ver40/config.mk
deleted file mode 100644
index df2a702ea..000000000
--- a/dmake/unix/coherent/ver40/config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# This config file adds vfprintf.c and memcpy.c for those systems that
-# do not have it.
-#
-
-osredir := $(OS)$(DIRSEPSTR)$(OSRELEASE)$(DIRSEPSTR)$(OSENVIRONMENT)
-CFLAGS += -I$(osredir)
-
-# The following sources are required for coherent version 4.0
-OSDESRC := vfprintf.c getcwd.c
-SRC    += $(OSDESRC)
-.SETDIR=$(osredir) : $(OSDESRC)
diff --git a/dmake/unix/coherent/ver40/getcwd.c b/dmake/unix/coherent/ver40/getcwd.c
deleted file mode 100644
index c0a826ea4..000000000
--- a/dmake/unix/coherent/ver40/getcwd.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* RCS  $Id: getcwd.c,v 1.1.1.1 2000-09-22 15:33:34 hr Exp $
---
--- SYNOPSIS
---      getcwd
---
--- DESCRIPTION
---      Wrapper for getcwd.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#if __STDC__
-char *getcwd(char *buffer, int length)
-#else
-char *getcwd (buffer, length)
-char *buffer;
-int length;
-#endif
-{
-  extern char *getwd();
-
-  char *dir;
-  dir = getwd();
-  if (dir)
-  {
-    strncpy(buffer,dir,length);
-    return buffer;
-  }
-  else
-  {
-    *buffer = 0;
-    return (char *) 0;
-  }
-}
-
diff --git a/dmake/unix/coherent/ver40/make.sh b/dmake/unix/coherent/ver40/make.sh
deleted file mode 100644
index 71832a013..000000000
--- a/dmake/unix/coherent/ver40/make.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O unix/dcache.c
-mv dcache.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O unix/coherent/ver40/vfprintf.c
-mv vfprintf.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver40 -O unix/coherent/ver40/getcwd.c
-mv getcwd.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o objects/dcache.o objects/vfprintf.o objects/getcwd.o 
-cp unix/coherent/ver40/template.mk startup/config.mk
diff --git a/dmake/unix/coherent/ver40/public.h b/dmake/unix/coherent/ver40/public.h
deleted file mode 100644
index c71b1ea0f..000000000
--- a/dmake/unix/coherent/ver40/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:54:51 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/coherent/ver40/template.mk b/dmake/unix/coherent/ver40/template.mk
deleted file mode 100644
index ef23550cf..000000000
--- a/dmake/unix/coherent/ver40/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= coherent
-   OSENVIRONMENT *:= ver40
diff --git a/dmake/unix/coherent/ver40/vfprintf.c b/dmake/unix/coherent/ver40/vfprintf.c
deleted file mode 100644
index a645d646d..000000000
--- a/dmake/unix/coherent/ver40/vfprintf.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/* Portable vfprintf and vprintf by Robert A. Larson <blarson@skat.usc.edu> */
-
-/* Copyright 1989 Robert A. Larson.
- * Distribution in any form is allowed as long as the author
- * retains credit, changes are noted by their author and the
- * copyright message remains intact.  This program comes as-is
- * with no warentee of fitness for any purpouse.
- *
- * Thanks to Doug Gwen, Chris Torek, and others who helped clarify
- * the ansi printf specs.
- *
- * Please send any bug fixes and improvments to blarson@skat.usc.edu .
- * The use of goto is NOT a bug.
- */
-
-/* Feb	9, 1989		blarson		First usenet release */
-
-/* This code implements the vfprintf function, without relying on
- * the existance of _doprint or other system specific code.
- *
- * Define NOVOID if void * is not a supported type.
- *
- * Two compile options are available for efficency:
- *	INTSPRINTF	should be defined if sprintf is int and returns
- *			the number of chacters formated.
- *	LONGINT		should be defined if sizeof(long) == sizeof(int)
- *
- *	They only make the code smaller and faster, they need not be
- *	defined.
- *
- * UNSIGNEDSPECIAL should be defined if unsigned is treated differently
- * than int in argument passing.  If this is definded, and LONGINT is not,
- * the compiler must support the type unsingned long.
- *
- * Most quirks and bugs of the available fprintf fuction are duplicated,
- * however * in the width and precision fields will work correctly
- * even if fprintf does not support this.  The %n format and the return
- * count will only work if fprintf returns the number of characters
- * formatted.
- *
- * Bad format strings, or those with very long width and precision
- * fields (including expanded * fields) will cause undesired results.
- */
-
-#ifdef OSK		/* os9/68k can take advantage of both */
-#define INTSPRINTF
-#define LONGINT
-#endif
-#define NOVOID 1
-
-/* This must be a typedef not a #define! */
-#ifdef NOVOID
-typedef char *pointer;
-#else
-typedef void *pointer;
-#endif
-
-#include <stdio.h>
-
-#ifdef	INTSPRINTF
-#define Sprintf(string,format,arg)	(sprintf((string),(format),(arg)))
-#else
-#define Sprintf(string,format,arg)	(\
-    sprintf((string),(format),(arg)),\
-    strlen(string)\
-)
-#endif
-
-#include <stdarg.h>
-
-typedef int *intp;
-
-int vfprintf(dest, format, args)
-FILE *dest;
-register char *format;
-va_list args;
-{
-    register char c;
-    register char *tp;
-    register int count = 0;
-    char tempfmt[64];
-#ifndef LONGINT
-    int longflag;
-#endif
-
-    tempfmt[0] = '%';
-    while(c = *format++) {
-    if(c=='%') {
-        tp = &tempfmt[1];
-#ifndef LONGINT
-        longflag = 0;
-#endif
-continue_format:
-        switch(c = *format++) {
-        case 's':
-            *tp++ = c;
-            *tp = '\0';
-            count += fprintf(dest, tempfmt, va_arg(args, char *));
-            break;
-        case 'u':
-        case 'x':
-        case 'o':
-        case 'X':
-#ifdef UNSIGNEDSPECIAL
-            *tp++ = c;
-            *tp = '\0';
-#ifndef LONGINT
-            if(longflag)
-            count += fprintf(dest, tempfmt, va_arg(args, unsigned long));
-            else
-#endif
-            count += fprintf(dest, tempfmt, va_arg(args, unsigned));
-            break;
-#endif
-        case 'd':
-        case 'c':
-        case 'i':
-            *tp++ = c;
-            *tp = '\0';
-#ifndef LONGINT
-            if(longflag)
-            count += fprintf(dest, tempfmt, va_arg(args, long));
-            else
-#endif
-            count += fprintf(dest, tempfmt, va_arg(args, int));
-            break;
-        case 'f':
-        case 'e':
-        case 'E':
-        case 'g':
-        case 'G':
-            *tp++ = c;
-            *tp = '\0';
-            count += fprintf(dest, tempfmt, va_arg(args, double));
-            break;
-        case 'p':
-            *tp++ = c;
-            *tp = '\0';
-            count += fprintf(dest, tempfmt, va_arg(args, pointer));
-            break;
-        case '-':
-        case '+':
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-        case '.':
-        case ' ':
-        case '#':
-        case 'h':
-            *tp++ = c;
-            goto continue_format;
-        case 'l':
-#ifndef LONGINT
-            longflag = 1;
-            *tp++ = c;
-#endif
-            goto continue_format;
-        case '*':
-            tp += Sprintf(tp, "%d", va_arg(args, int));
-            goto continue_format;
-        case 'n':
-            *va_arg(args, intp) = count;
-            break;
-        case '%':
-        default:
-            putc(c, dest);
-            count++;
-            break;
-        }
-    } else {
-        putc(c, dest);
-        count++;
-    }
-    }
-    return count;
-}
-
-vprintf(format, args)
-char *format;
-va_list args;
-{
-    return vfprintf(stdout, format, args);
-}
diff --git a/dmake/unix/coherent/ver42/config.mk b/dmake/unix/coherent/ver42/config.mk
deleted file mode 100644
index 2ff06b6b7..000000000
--- a/dmake/unix/coherent/ver42/config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# This config file adds vfprintf.c and memcpy.c for those systems that
-# do not have it.
-#
-
-osredir := $(OS)$(DIRSEPSTR)$(OSRELEASE)$(DIRSEPSTR)$(OSENVIRONMENT)
-CFLAGS += -I$(osredir)
-
-# The following sources are required for Coherent version 4.2
-#OSDESRC :=
-#SRC    += $(OSDESRC)
-#.SETDIR=$(osredir) : $(OSDESRC)
diff --git a/dmake/unix/coherent/ver42/make.sh b/dmake/unix/coherent/ver42/make.sh
deleted file mode 100644
index 5bdca3bb4..000000000
--- a/dmake/unix/coherent/ver42/make.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/coherent -Dvoid=int -Iunix/coherent/ver42 -O unix/dcache.c
-mv dcache.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o objects/dcache.o 
-cp unix/coherent/ver42/template.mk startup/config.mk
diff --git a/dmake/unix/coherent/ver42/public.h b/dmake/unix/coherent/ver42/public.h
deleted file mode 100644
index 2505b1872..000000000
--- a/dmake/unix/coherent/ver42/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:55:03 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/coherent/ver42/template.mk b/dmake/unix/coherent/ver42/template.mk
deleted file mode 100644
index e5dd9f99f..000000000
--- a/dmake/unix/coherent/ver42/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= coherent
-   OSENVIRONMENT *:= ver42
diff --git a/dmake/unix/config.mk b/dmake/unix/config.mk
deleted file mode 100644
index a6859ceb3..000000000
--- a/dmake/unix/config.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# This is an OS specific configuration file
-#	It assumes that OBJDIR, TARGET and DEBUG are previously defined.
-#	It defines	CFLAGS, LDARGS, CPPFLAGS, STARTUPFILE, LDOBJS
-#			PRINTER, PRINTFLAGS
-#	It augments	SRC, OBJDIR, TARGET, CFLAGS, LDLIBS
-#
-PRINTER		= hw
-PRINTFLAGS	= -P$(PRINTER)
-STARTUPFILE	= $(OS)/startup.mk
-CPPFLAGS 	= $(CFLAGS)
-LDOBJS		= $(CSTARTUP) $(OBJDIR)/{$(<:f)}
-LDARGS		= $(LDFLAGS) -o $@ $(LDOBJS) $(LDLIBS)
-
-# Debug flags
-DB_CFLAGS	= -g -DDBUG
-DB_LDFLAGS	= -g
-DB_LDLIBS	=
-
-# NO Debug flags
-NDB_CFLAGS	= -O
-NDB_LDFLAGS	= -O
-NDB_LDLIBS	=
-
-# Local configuration modifications for CFLAGS.
-CFLAGS         += -I$(OS)
-
-# Sources that must be defined for each different version
-OSSRC := arlib.c dirbrk.c rmprq.c ruletab.c runargv.c dcache.c
-SRC  += $(OSSRC)
-.SETDIR=$(OS) : $(OSSRC)
-
-# Set source dirs so that we can find files named in this
-# config file.
-.SOURCE.h : $(OS)
-
-# See if we modify anything in the lower levels.
-.IF $(OSRELEASE) != $(NULL)
-   .INCLUDE .IGNORE : $(OS)$(DIRSEPSTR)$(OSRELEASE)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/unix/cygwin/public.h b/dmake/unix/cygwin/public.h
deleted file mode 100644
index bb5345d8a..000000000
--- a/dmake/unix/cygwin/public.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* $RCSfile: public.h,v $
--- $Revision: 1.9 $
--- last change: $Author: ihi $ $Date: 2007-10-15 15:55:15 $
---
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-const int in_quit ANSI((void));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-
-#endif
diff --git a/dmake/unix/dcache.c b/dmake/unix/dcache.c
deleted file mode 100644
index 9b893577d..000000000
--- a/dmake/unix/dcache.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* $RCSfile: dcache.c,v $
--- $Revision: 1.9 $
--- last change: $Author: ihi $ $Date: 2007-10-15 15:52:47 $
---
--- SYNOPSIS
---      Directory cache management routines.
---
--- DESCRIPTION
---      This is the code that maintains a directory cache for each directory
---      that dmake visits.  The entire directory is thus only read once and
---      the need for performing costly 'stat' calls when performing target
---      inference is much reduced.  The improvement in performance should be
---      significant for NFS or remote mounted file systems.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* For Borland 5.00 compile, for some reason they seem to insist on pulling
- * in the winnt.h if __WIN32__ is defined and you include <dirent.h>.  This
- * is, in my opinion, a BUG! on Borland's part.
- */
-#if defined(__BORLANDC__) && defined(__WIN32__)
-#undef __WIN32__
-#endif
-
-#ifdef __APPLE__
-#include <sys/types.h>
-#endif
-#include <dirent.h>
-#include "extern.h"
-#include "sysintf.h"
-
-
-typedef struct ent {
-   char    *name;
-   uint32  hkey;
-   time_t  mtime;
-   int     isdir;
-   struct ent *next;
-} Entry, *EntryPtr;
-
-
-typedef struct mydir {
-   char         *path;
-   uint32        hkey;
-   EntryPtr      entries;
-   struct mydir *next;
-} DirEntry, *DirEntryPtr;
-
-static DirEntryPtr dtab[HASH_TABLE_SIZE];
-
-
-/* Stat a path using the directory cache.
- *
- * We build a cannonical representation of the path using either an absolute
- * path name if that is what 'path' is or the relative path name constructed
- * from 'path' and the present value of Pwd.
- *
- * The present value of Pwd then gives a directory path that we search for
- * in our cache using a hash lookup.  If the directory component is located
- * then we search the basename component of the path and return the result of
- * the search:  0L if the component is not in the cache and it's time stamp
- * otherwise.
- *
- * If the directory is not in our cache we insert it into the cache by
- * openning the directory and reading all of the files within.  Once read
- * then we return the result of the above search.
- *
- * Optionally, if force is TRUE, and we did NOT read the directory to provide
- * the result then stat the file anyway and update the internal cache.
- */
-
-PUBLIC time_t
-CacheStat(path, force)
-char        *path;
-int          force;
-{
-   struct stat stbuf;
-   DirEntryPtr dp;
-   EntryPtr    ep;
-   uint32 hkey;
-   uint16 hv;
-   char *fpath;
-   char *spath;
-   char *comp;
-   char *dir;
-   char *udir; /* Hold the unchanged (DcacheRespCase) directory. */
-   int  loaded=FALSE;
-
-   if (If_root_path(path))
-      spath = path;
-   else
-      spath = Build_path(Pwd,path);
-
-   fpath = DmStrDup(spath);
-
-   comp  = Basename(fpath); /* Use before the Filedir() call. */
-   dir   = Filedir(fpath);
-
-   /* do caching and comparing lower case if told so. */
-   if( !STOBOOL(DcacheRespCase) ) {
-      udir = DmStrDup(dir);
-      strlwr(comp);
-      strlwr(dir);
-   } else
-      udir = dir;
-
-   hv = Hash(dir,&hkey);
-
-   for(dp=dtab[hv]; dp; dp=dp->next)
-      if (hkey == dp->hkey && strcmp(dp->path,dir) == 0)
-     break;
-
-   if (!dp) {
-      /* Not cached yet, doing it now. */
-      DIR *dirp;
-      struct dirent *direntp;
-
-      if( Verbose & V_DIR_CACHE )
-     printf( "%s:  Caching directory [%s]\n", Pname, dir  );
-
-      /* Load the directory, we have the right hash position already */
-      loaded = TRUE;
-
-      TALLOC(dp,1,DirEntry);
-      dp->next = dtab[hv];
-      dtab[hv] = dp;
-      dp->path = DmStrDup(dir);
-      dp->hkey = hkey;
-
-      /* We use the unchanged (not potentially lowercased because of
-       * DcacheRespCase) directory as this would fail on a case sensitive
-       * file system.
-       * Note: Using case insensitive directory caching on case sensitive
-       * file systems is a *BAD* idea. If in doubt use case sensitive
-       * directory caching even on case insensitive file systems as the
-       * worst case in this szenario is that /foo/bar/ and /foo/BAR/ are
-       * cached separately (with the same content) even though they are
-       * the same directory. This would only happen if different targets
-       * using different upper/lower case spellings for the same directory
-       * and is *never* a good idea. */
-      if (Set_dir(udir) == 0) {
-     if((dirp=opendir(".")) != NIL(DIR)) {
-        while((direntp=readdir(dirp)) != NULL) {
-           TALLOC(ep,1,Entry);
-           ep->name = DmStrDup(direntp->d_name); /* basename only */
-           if( !STOBOOL(DcacheRespCase) )
-          strlwr(ep->name);
-
-           Hash(ep->name, &ep->hkey); /* This sets ep->hkey. */
-
-           ep->next = dp->entries;
-           dp->entries = ep;
-           DMSTAT(direntp->d_name,&stbuf);
-           ep->isdir = (stbuf.st_mode & S_IFDIR);
-           ep->mtime = stbuf.st_mtime;
-        }
-        closedir(dirp);
-     }
-     Set_dir(Pwd);
-      }
-   }
-
-   Hash(comp, &hkey); /* Calculate hkey. */
-
-   /* search in dp->entries for comp. */
-   if (dp) {
-      for(ep=dp->entries; ep; ep=ep->next)
-     if(hkey == ep->hkey && strcmp(ep->name,comp) == 0)
-        break;
-   }
-   else
-      ep = NULL;
-
-   if( force && !loaded) {
-      if (strlen(comp) > NameMax || DMSTAT(spath,&stbuf) != 0) {
-     /* Either file to long or the stat failed. */
-     if (strlen(comp) > NameMax)
-        Warning( "File [%s] longer than value of NAMEMAX [%d].\n\
-    Assume unix time 0.\n", comp, NameMax );
-     if(ep)
-        ep->mtime = 0L;
-      }
-      else {
-     if (!ep) {
-        TALLOC(ep,1,Entry);
-        ep->name = DmStrDup(comp);
-        if( !STOBOOL(DcacheRespCase) )
-           strlwr(ep->name);
-        Hash(ep->name, &ep->hkey);
-        ep->next = dp->entries;
-        ep->isdir = (stbuf.st_mode & S_IFDIR);
-        dp->entries = ep;
-     }
-
-     ep->mtime = stbuf.st_mtime;
-      }
-
-      if( Verbose & V_DIR_CACHE )
-     printf("%s:  Updating dir cache entry for [%s], new time is %ld\n",
-            Pname, spath, ep ? ep->mtime : 0L);
-   }
-
-   if( udir != dir )
-      FREE(udir); /* Keep this before the free of fpath. */
-
-   FREE(fpath);
-   return(!ep ? (time_t)0L : ((STOBOOL(Augmake) && ep->isdir)?0L:ep->mtime));
-}
diff --git a/dmake/unix/dirbrk.c b/dmake/unix/dirbrk.c
deleted file mode 100644
index 186c5a8bc..000000000
--- a/dmake/unix/dirbrk.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* RCS  $Id: dirbrk.c,v 1.4 2007-10-15 15:52:59 ihi Exp $
---
--- SYNOPSIS
---      Define the directory separator string.
--- 
--- DESCRIPTION
--- 	Define this string for any character that may appear in a path name
---	and can be used as a directory separator.  Also provide a function
---	to indicate if a given path begins at the root of the file system.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-#ifdef __EMX__
-/* os2 uses /, \, and : */
-/* FIXME: The OS/2 port most probably wants to use the HAVE_DRIVE_LETTERS
- * macro, see extern.h. */
-char*	DirBrkStr = "/\\:";
-#else
-/* Unix only uses / */
-char*	DirBrkStr = "/";
-#endif
-
-/*
-** Return TRUE if the name is the full specification of a path name to a file
-** starting at the root of the file system, otherwise return FALSE
-*/
-PUBLIC int
-If_root_path(name)
-char *name;
-{
-   return( strchr(DirBrkStr, *name) != NIL(char)
-#ifdef HAVE_DRIVE_LETTERS
-       || (*name && name[1] == ':' && isalpha(*name))
-#endif
-       );
-}
diff --git a/dmake/unix/linux/config.mk b/dmake/unix/linux/config.mk
deleted file mode 100644
index 75bcf3c2a..000000000
--- a/dmake/unix/linux/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This is the SysV R3 UNIX configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# The following are required sources
-OSDSRC := 
-.IF $(OSDSRC)
-   SRC    += $(OSDSRC)
-   .SETDIR=$(osrdir) : $(OSDSRC)
-.END
-
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS, there's local SysV includes
-# too.
-CFLAGS += -I$(osrdir)
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/unix/linux/gnu/config.mk b/dmake/unix/linux/gnu/config.mk
deleted file mode 100644
index e351490a6..000000000
--- a/dmake/unix/linux/gnu/config.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# This is the Linux gnu configuration file for DMAKE
-#	It makes sure we include from the right place.
-#
-CFLAGS += -I$(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
diff --git a/dmake/unix/linux/gnu/make.sh b/dmake/unix/linux/gnu/make.sh
deleted file mode 100644
index 26d06be43..000000000
--- a/dmake/unix/linux/gnu/make.sh
+++ /dev/null
@@ -1,193 +0,0 @@
-platform=`uname -m`; export platform;
-
-mkdir objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c
-fi
-mv infer.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c
-fi
-mv make.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c
-fi
-mv stat.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c
-fi
-mv expand.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c
-fi
-mv dmstring.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c
-fi
-mv hash.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c
-fi
-mv dag.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c
-fi
-mv dmake.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c
-fi
-mv path.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c
-fi
-mv imacs.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c
-fi
-mv sysintf.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c
-fi
-mv parse.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c
-fi
-mv getinp.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c
-fi
-mv quit.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c
-fi
-mv state.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c
-fi
-mv dmdump.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c
-fi
-mv macparse.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c
-fi
-mv rulparse.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c
-fi
-mv percent.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c
-fi
-mv function.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c
-fi
-mv arlib.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c
-fi
-mv dirbrk.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c
-fi
-mv rmprq.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c
-fi
-mv ruletab.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c
-fi
-mv runargv.o objects
-
-if test $platform = sparc -o $platform = sparc64; then
-gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
-else
-gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c
-fi
-mv dcache.o objects
-
-gcc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o objects/dcache.o 
-cp unix/linux/gnu/template.mk startup/config.mk
diff --git a/dmake/unix/linux/gnu/public.h b/dmake/unix/linux/gnu/public.h
deleted file mode 100644
index 188ae80d6..000000000
--- a/dmake/unix/linux/gnu/public.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* $RCSfile: public.h,v $
--- $Revision: 1.9 $
--- last change: $Author: ihi $ $Date: 2007-10-15 15:55:29 $
---
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-const int in_quit ANSI((void));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-
-#endif
diff --git a/dmake/unix/linux/gnu/template.mk b/dmake/unix/linux/gnu/template.mk
deleted file mode 100644
index a0bcef640..000000000
--- a/dmake/unix/linux/gnu/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= linux
-   OSENVIRONMENT *:= gnu
diff --git a/dmake/unix/macosx/config.mk b/dmake/unix/macosx/config.mk
deleted file mode 100644
index 75bcf3c2a..000000000
--- a/dmake/unix/macosx/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This is the SysV R3 UNIX configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# The following are required sources
-OSDSRC := 
-.IF $(OSDSRC)
-   SRC    += $(OSDSRC)
-   .SETDIR=$(osrdir) : $(OSDSRC)
-.END
-
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS, there's local SysV includes
-# too.
-CFLAGS += -I$(osrdir)
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/unix/macosx/gnu/config.mk b/dmake/unix/macosx/gnu/config.mk
deleted file mode 100644
index e351490a6..000000000
--- a/dmake/unix/macosx/gnu/config.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# This is the Linux gnu configuration file for DMAKE
-#	It makes sure we include from the right place.
-#
-CFLAGS += -I$(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
diff --git a/dmake/unix/macosx/gnu/make.sh b/dmake/unix/macosx/gnu/make.sh
deleted file mode 100644
index 65929e930..000000000
--- a/dmake/unix/macosx/gnu/make.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O unix/dcache.c
-mv dcache.o objects
-cc -c -I. -Iunix -Iunix/macosx -Iunix/macosx/gnu -O unix/macosx/tempnam.c
-mv tempnam.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o \
-objects/dcache.o objects/tempnam.o
-cp unix/macosx/gnu/template.mk startup/config.mk
diff --git a/dmake/unix/macosx/gnu/public.h b/dmake/unix/macosx/gnu/public.h
deleted file mode 100644
index ab9b09e24..000000000
--- a/dmake/unix/macosx/gnu/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.8 2007-10-15 15:55:41 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-PUBLIC int main ANSI((int argc, char **argv));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/macosx/gnu/template.mk b/dmake/unix/macosx/gnu/template.mk
deleted file mode 100644
index 672878dfa..000000000
--- a/dmake/unix/macosx/gnu/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= macosx
-   OSENVIRONMENT *:= gnu
diff --git a/dmake/unix/macosx/tempnam.c b/dmake/unix/macosx/tempnam.c
deleted file mode 100644
index ff5dace5b..000000000
--- a/dmake/unix/macosx/tempnam.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1 2001-02-23 03:44:30 pluby Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#if defined(max)
-#   undef  max
-#endif
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-int d_access();
-
-char *
-dtempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   static         int count = 0;
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-   char		  buf[30];
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   else if( (tmpdir = getenv("TMP")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+13))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (d_access( strcpy(p, tmpdir), 0) != 0) )
-     if( (dl == 0) || (d_access( strcpy(p, dir), 0) != 0) )
-    if( d_access( strcpy(p, P_tmpdir), 0) != 0 )
-       if( !prefix )
-          prefix = "tp";
-
-   if(prefix)
-   {
-      *(p+strlen(p)+2) = '\0';
-      (void)strncat(p, prefix, 2);
-   }
-
-   sprintf( buf, "%08x", getpid() );
-   buf[6]='\0';
-   (void)strcat(p, buf );
-   sprintf( buf, "%04d", count++ );
-   q=p+strlen(p)-6;
-   *q++ = buf[0]; *q++ = buf[1];
-   *q++ = buf[2]; *q++ = buf[3];
-
-   if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
-
-   return(p);
-}
-
-
-
-d_access( name, flag )
-char *name;
-int  flag;
-{
-   extern char *DirSepStr;
-   char *p;
-   int r;
-
-   if( name == NULL || !*name ) return(1);  /* NULL dir means current dir */
-   r = access( name, flag );
-   p = name+strlen(name)-1;
-   if(*p != '/' && *p != '\\') strcat( p, DirSepStr );
-
-   return( r );
-}
diff --git a/dmake/unix/os2/public.h b/dmake/unix/os2/public.h
deleted file mode 100644
index 3c696496a..000000000
--- a/dmake/unix/os2/public.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* $RCSfile: public.h,v $
--- $Revision: 1.2 $
--- last change: $Author: ihi $ $Date: 2007-10-15 15:55:51 $
---
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-const int in_quit ANSI((void));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-
-#endif
diff --git a/dmake/unix/rmprq.c b/dmake/unix/rmprq.c
deleted file mode 100644
index 402d769a3..000000000
--- a/dmake/unix/rmprq.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* $RCSfile: rmprq.c,v $
--- $Revision: 1.5 $
--- last change: $Author: obo $ $Date: 2007-06-12 06:09:05 $
---
--- SYNOPSIS
---      Remove prerequisites code.
--- 
--- DESCRIPTION
---	This code is different for DOS and for UNIX and parallel make
---	architectures since the parallel case requires the rm's to be
---	run in parallel, whereas DOS guarantees to run them sequentially.
--- 
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include "extern.h"
-
-PUBLIC void
-Remove_prq( tcp )/*
-===================
-   Removable targets (ie. an inferred intermediate node) are removed
-   by this function by running Make() on the special target .REMOVE
-   (pointed to by tcp).
-   As this function can be called from within another Make() (for example
-   like this:
-     Make()->Exec_commands()->Do_cmnd()->runargv()->..->_finished_child()
-     ->Update_time_stamp()->Remove_prq() )
-   it is necessary to store and restore the dynamic macros when Make()
-   is finished.
-
-   FIXME: Another potential problem is that while building .REMOVE another
-   previously started target finishes and from _finished_child() calls
-   Remove_prq() again. This will delete the dynamic macros and possibly
-   clear/reset the prerequisites of the previous .REMOVE target.
-*/
-CELLPTR tcp;
-{
-   static  LINKPTR rlp = NIL(LINK);
-   static  int flag = 0;
-   static  HASHPTR m_at, m_q, m_b, m_g, m_l, m_bb, m_up;
-   char    *m_at_s, *m_g_s, *m_q_s, *m_b_s, *m_l_s, *m_bb_s, *m_up_s;
-   LINKPTR tlp;
-
-   /* Unset F_MADE and F_VISITED. */
-   tcp->ce_flag         &= ~(F_MADE|F_VISITED);
-   tcp->ce_time          = 0L;
-
-   /* The idea seems to be to create a target that is used to remove
-    * intermediate prerequisites. Why add something to the "CeMeToo(tlp)"
-    * list? I don't understand this yet.
-    * FIXME! Either comment on what is going on or fix the code. */
-   for( tlp=rlp; tlp !=NIL(LINK); tlp=tlp->cl_next )
-      /* Find first target that has F_VISITED not set or F_MADE set,
-       * i.e. it is not currently made or already done. */
-      if( (tlp->cl_prq->ce_flag & (F_VISITED|F_MADE)) != F_VISITED )
-     break;
-
-   if( tlp == NIL(LINK) ) {
-      TALLOC(tlp, 1, LINK);
-      TALLOC(tlp->cl_prq, 1, CELL);
-      tlp->cl_next = rlp;
-      rlp = tlp;
-   }
-
-   *tlp->cl_prq = *tcp;
-
-   /* We save the dynamic macro values here, as it is possible that the
-    * .REMOVE recipe is getting executed for a target while some other target
-    * is in the middle of executing it's list of recipe lines, in this case
-    * the values of $@ etc, must be preserved so that when we return to
-    * complete the other recipe we must make certain that the values of it's
-    * dynamic macros are unmodified. */
-
-   if( !flag ) {
-      /* Do the getting of the macros only once. */
-      flag = 1;
-      m_at = Get_name("@", Macs, TRUE);
-      m_g  = Get_name(">", Macs, TRUE);
-      m_q  = Get_name("?", Macs, TRUE);
-      m_b  = Get_name("<", Macs, TRUE);
-      m_l  = Get_name("&", Macs, TRUE);
-      m_bb = Get_name("*", Macs, TRUE);
-      m_up = Get_name("^", Macs, TRUE);
-   }
-
-   m_at_s = m_at->ht_value; m_at->ht_value = NIL(char);
-   m_g_s  = m_g->ht_value;  m_g->ht_value  = NIL(char);
-   m_q_s  = m_q->ht_value;  m_q->ht_value  = NIL(char);
-   m_b_s  = m_b->ht_value;  m_b->ht_value  = NIL(char);
-   m_l_s  = m_l->ht_value;  m_l->ht_value  = NIL(char);
-   m_bb_s = m_bb->ht_value; m_bb->ht_value = NIL(char);
-   m_up_s = m_up->ht_value; m_up->ht_value = NIL(char);
-
-   Make( tlp->cl_prq, tcp );
-   if( tlp->cl_prq->ce_dir ){
-      FREE(tlp->cl_prq->ce_dir);
-      tlp->cl_prq->ce_dir=NIL(char);
-   }
-
-   m_at->ht_value = m_at_s;
-   m_g->ht_value  = m_g_s;
-   m_q->ht_value  = m_q_s;
-   m_b->ht_value  = m_b_s;
-   m_l->ht_value  = m_l_s;
-   m_bb->ht_value = m_bb_s;
-   m_up->ht_value = m_up_s;
-}
diff --git a/dmake/unix/ruletab.c b/dmake/unix/ruletab.c
deleted file mode 100644
index 59dc039f0..000000000
--- a/dmake/unix/ruletab.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $RCSfile: ruletab.c,v $
--- $Revision: 1.9 $
--- last change: $Author: ihi $ $Date: 2007-10-15 15:53:13 $
---
--- SYNOPSIS
---      Default initial configuration of dmake.
--- 
--- DESCRIPTION
--- 	Define here the initial set of rules that are defined before
---	dmake performs any processing.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* These are control macros for dmake that MUST be defined at some point
- * if they are NOT dmake will not work!  These are default definitions.  They
- * may be overridden inside the .STARTUP makefile, they are here
- * strictly so that dmake can parse the STARTUP makefile */
-
-static char *_rules[] = {
-    "MAXPROCESSLIMIT := 64",
-    "MAXLINELENGTH := 32766",
-#include "dmakeroot.h"
-    ".IMPORT .IGNORE: DMAKEROOT",
-    ".MAKEFILES : makefile.mk Makefile makefile",
-    ".SOURCE    : .NULL",
-#include "startup.h"
-    0 };
-
-char **Rule_tab = _rules; /* for sundry reasons in Get_environment() */
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c
deleted file mode 100644
index 8135e6758..000000000
--- a/dmake/unix/runargv.c
+++ /dev/null
@@ -1,1101 +0,0 @@
-/* $RCSfile: runargv.c,v $
--- $Revision: 1.14 $
--- last change: $Author: kz $ $Date: 2008-03-05 18:39:41 $
---
--- SYNOPSIS
---      Invoke a sub process.
--- 
--- DESCRIPTION
--- 	Use the standard methods of executing a sub process.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-/*
-This file (runargv.c) provides all the parallel process handling routines
-for dmake on unix like operating systems. The following text briefly
-describes the process flow.
-
-Exec_commands() [make.c] builds the recipes associated to the given target.
-  They are build sequentially in a loop that calls Do_cmnd() for each of them.
-
-Do_cmnd() [sysintf.c] feeds the given command or command group to runargv().
-
-The following flowchart decripes the process flow starting with runargv,
-descriptions for each of the functions are following.
-
-  +--------------------------------+
-  |            runargv             | <+
-  +--------------------------------+  |
-    |               ^                 |
-    |               | returns if      |
-    | calls         | wfc is false    |
-    v               |                 |
-  +--------------------------------+  |
-  |           _add_child           |  |
-  +--------------------------------+  |
-    |               ^                 |
-    | calls if      |                 | if another process
-    | wfc is true   | returns         | is queued:
-    v               |                 | recursive call
-  +--------------------------------+  |
-  |         Wait_for_Child         |  |
-  +--------------------------------+  |
-    |               ^                 |
-    |               | process queue   |
-    | calls         | is empty        |
-    v               |                 |
-  +--------------------------------+  |
-  |        _finished_child         | -+
-  +--------------------------------+
-
-
-
-runargv() [unix/runargv] The runargv function manages up to MAXPROCESS
-  process queues (_procs[i]) for parallel process execution and hands
-  the actual commands down to the operating system.
-  Each of the process queues handles the sequential execution of commands
-  that  belong to that process queue. Usually this means the sequential
-  execution of the recipe lines that belong to one target.
-  Even in non parallel builds (MAXPROCESS==1) child processes are
-  created and handled.
-  If recipes for a target are currently running attach them to the
-  corresponding process queue (_procs[i]) of that target and return.
-  If the maximum number (MAXPROCESS) of concurrently running queues is
-  reached use Wait_for_child(?, -1) to wait for a process queue to become
-  available.
-  New child processes are started using:
-    spawn:       posix_spawnp (POSIX) or spawnvp (cygwin).
-    fork/execvp: Create a client process with fork and run the command
-                 with execvp.
-  The parent calls _add_child() to track the child.
-
-_add_child(..., wfc) [unix/runargv] creates (or reuses) a process queue
-  and enters the child's parameters.
-  If wfc (wait for completion) is TRUE the function calls
-  Wait_for_child to wait for the whole process queue to be finished.
-
-Wait_for_child(abort_flg, pqid) [unix/runargv] waits either for the current
-  process from process queue pqid to finish or if the W_WFC attribute is
-  set for all entries of that process queue (recursively) to finish.
-  All finished processes are handled by calling _finished_child() for each
-  of them.
-  If pqid == -1 wait for the next process to finish but honor the A_WFC
-  attribute of that process (queue) and wait for the whole queue if needed.
-  If abort_flg is TRUE no further processes will be added to any process
-  queue.
-  If a pqid is given but a process from another process queue finishes
-  first that process is handled and A_WFC is also honored.
-  All finished processes are processed until the process from the given pqid
-  is reached or gone (might have been handled while finishing another process
-  queue).
-
-_finished_child(pid, status) [unix/runargv] handles the finished child. If
-  there are more commands in the corresponding process queue start the next
-  with runargv().
-*/
-
-#include <signal.h>
-
-#include "extern.h"
-
-#ifdef HAVE_WAIT_H
-#  include <wait.h>
-#else 
-# ifdef HAVE_SYS_WAIT_H
-#  include <sys/wait.h>
-# endif
-#endif
-
-#if HAVE_SPAWN_H && ENABLE_SPAWN
-#  include <spawn.h>
-#endif
-
-#if __CYGWIN__ && ENABLE_SPAWN
-#  include <process.h>
-#endif
-
-#ifdef __EMX__
-#  include <process.h>
-#define _P_NOWAIT P_NOWAIT
-#endif
-
-#include "sysintf.h"
-#if HAVE_ERRNO_H
-#  include <errno.h>
-#else
-   extern  int  errno;
-#endif
-
-typedef struct prp {
-   char *prp_cmd;
-   int   prp_group;
-   t_attr prp_attr;
-   int   prp_last;
-   struct prp *prp_next;
-} RCP, *RCPPTR;
-
-#if defined(USE_CREATEPROCESS)
-   /* MS's HANDLE is basically a (void *) (winnt.h). */
-typedef HANDLE DMHANDLE;
-#else
-typedef int DMHANDLE;
-#endif
-
-typedef struct pr {
-   int		pr_valid;
-   DMHANDLE	pr_pid;
-   DMHANDLE	pr_tid;
-   CELLPTR	pr_target;
-   int		pr_ignore;
-   int		pr_last;
-   int		pr_wfc;
-   RCPPTR  	pr_recipe;
-   RCPPTR  	pr_recipe_end;
-   char        *pr_dir;
-} PR;
-
-typedef struct tpid {
-   DMHANDLE pid;
-   DMHANDLE tid;
-} TPID;
-
-const TPID DMNOPID = { (DMHANDLE)-1, (DMHANDLE)0 };
-
-static PR  *_procs    = NIL(PR); /* Array to hold concurrent processes. */
-static int  _procs_size = 0;     /* Savegard to find MAXPROCESS changes. */
-static int  _proc_cnt = 0;       /* Number of running processes. */
-static int  _abort_flg= FALSE;
-static int  _use_i    = -1;
-#if defined(USE_CREATEPROCESS)
-static HANDLE *_wpList = NIL(HANDLE); /* Array to hold pids to wait for. */
-#endif
-
-static  int	_add_child ANSI((TPID, CELLPTR, int, int, int));
-static  void	_attach_cmd ANSI((char *, int, CELLPTR, t_attr, int));
-static  void    _finished_child ANSI((DMHANDLE, int));
-static  int     _running ANSI((CELLPTR));
-
-/* Machine/OS dependent helpers. */
-static	int	dmwaitnext ANSI((DMHANDLE *, int *));
-static	int	dmwaitpid ANSI((int, DMHANDLE *, int *));
-
-#if defined( USE_SPAWN )
-
-int terrno; /* Temporarily store errno. */
-
-static	TPID	dmspawn ANSI((char **));
-
-static TPID
-dmspawn( argv )
-   char **argv;
-{
-   TPID pid;
-
-   /* No error output is done here as stdout/stderr might be redirected. */
-#if defined( __CYGWIN__) || defined( __EMX__)
-   pid.pid = spawnvp(_P_NOWAIT, argv[0], (const char**) argv);
-   pid.tid = 0;
-#elif defined(USE_CREATEPROCESS)
-   static STARTUPINFO si;
-   static int initSTARTUPINFO = FALSE;
-   PROCESS_INFORMATION pi;
-
-   /* si can be reused. */
-   if( initSTARTUPINFO == FALSE ) {
-      initSTARTUPINFO = TRUE;
-      ZeroMemory( &si, sizeof(si) );
-      si.cb = sizeof(si);
-   }
-   ZeroMemory( &pi, sizeof(pi) );
-
-   /* Start the child process. CreateProcess() parameters:
-    * No module name (use command line).
-    * Command line. This fails if the path to the program contains spaces.
-    * Process handle not inheritable.
-    * Thread handle not inheritable.
-    * Set handle inheritance (stdout, stderr, etc.) to TRUE.
-    * No creation flags.
-    * Use parent's environment block.
-    * Use parent's starting directory.
-    * Pointer to STARTUPINFO structure.
-    * Pointer to PROCESS_INFORMATION structure. */
-   if( CreateProcess(NULL, argv[0], NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi) ) {
-      pid.pid = pi.hProcess;
-      pid.tid = pi.hThread;
-   } else {
-      fprintf(stderr, "CreateProcess failed (%d).\n", GetLastError() );
-      pid.pid = (DMHANDLE)-1;
-   }
-#else   /* Non cygwin, OS/2, MinGW and MSC */
-   int tpid;
-   if (posix_spawnp (&tpid, argv[0], NULL, NULL, argv, (char *)NULL))
-      tpid = -1; /* posix_spawn failed */
-
-   pid.pid = tpid;
-   pid.tid = 0;
-#endif  /* __CYGWIN__ */
-   return pid;
-}
-
-#endif /* USE_SPAWN */
-
-static int
-dmwaitnext( wid, status )
-     DMHANDLE *wid;	/* Id we waited for. */
-     int *status;	/* status of the finished process. */
-     /* return 1 if a process finished, -1 if there
-      * was nothing to wait for (ECHILD) and -2 for other errors. */
-{
-
-#if !defined(USE_CREATEPROCESS)
-   /* Here might be the culprit for the famous OOo build hang. If
-    * cygwin manages to "loose" a process and none else is left the
-    * wait() will wait forever. */
-   *wid = wait(status);
-
-   /* If ECHILD is set from waitpid/wait then no child was left. */
-   if( *wid  == -1 ) {
-	 int realErr = errno; // fprintf can pollute errno
-	 fprintf(stderr, "%s:  Internal Error: wait() failed: %d -  %s\n",
-			 Pname, errno, strerror(errno) );
-      if( realErr != ECHILD ) {
-     /* Wait was interrupted or a child was terminated (SIGCHLD) */
-     return -2;
-      } else {
-     return -1;
-      }
-   }
-#else
-   DWORD pEvent;
-   DWORD dwExitCode;
-   int i;
-   int numProc = 0;
-
-   *status = 0;
-
-   /* Create a list of possible objects to wait for. */
-   for( i=0; i<Max_proc; i++ ) {
-      if(_procs[i].pr_valid) {
-     _wpList[numProc++] = _procs[i].pr_pid;
-      }
-   }
-   if( numProc == 0 ) {
-      fprintf(stderr, "%s:  Internal Error: dmwaitnext() failed: "
-          "Nothing to wait for.\n", Pname );
-      return -1;
-   }
-
-   /* Wait ... */
-   /* number of objects in array, array of objects,
-    * wait for any object, wait for the next child to finish */
-   pEvent = WaitForMultipleObjects( numProc, _wpList, FALSE, INFINITE);
-
-   if( pEvent >= 0 && pEvent < WAIT_OBJECT_0 + numProc ) {
-      *wid = _wpList[pEvent - WAIT_OBJECT_0];
-      for( i=0; i<Max_proc && _procs[i].pr_pid != *wid; i++ )
-     ;
-      if( i == Max_proc )
-     Fatal("Internal Error: Process not in pq !");
-
-      GetExitCodeProcess(*wid, &dwExitCode);
-      if(dwExitCode == STILL_ACTIVE) {
-     /* Process did not terminate -> force it, with exit code 1. */
-     TerminateProcess(*wid, 1);
-     dwExitCode = 1;
-     fprintf(stderr, "%s:  Internal Error: Process still running - "
-         "terminate it!\n", Pname );
-      }
-
-      /* Close process and thread handles. */
-      CloseHandle( *wid );
-      CloseHandle( _procs[i].pr_tid );
-      *status = dwExitCode;
-   }
-   else {
-      int err = GetLastError();
-      LPVOID lpMsgBuf;
-      
-      FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-             FORMAT_MESSAGE_FROM_SYSTEM |
-             FORMAT_MESSAGE_IGNORE_INSERTS,
-             NULL,
-             err,
-             MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-             (LPTSTR) &lpMsgBuf,
-             0, NULL );
-
-      fprintf(stderr, "%s:  Internal Error: WaitForMultipleObjects() (%d) failed:"
-          " %d -  %s\n", Pname, numProc, err, lpMsgBuf);
-      LocalFree(lpMsgBuf);
-
-      /* No way to identify something comparable to ECHILD, always return -2.*/
-      return -2;
-   }
-
-#endif
-   return 1;
-}
-
-
-static int
-dmwaitpid( pqid, wid, status )
-     int pqid;		/* Process queue to wait for. */
-     DMHANDLE *wid;	/* Id we waited for. */
-     int *status;	/* status of the finished process. */
-     /* return 1 if the process finished, 0 if it didn't finish yet, -1 if there
-      * was nothing to wait for (ECHILD) and -2 for other errors. */
-{
-
-#if !defined(USE_CREATEPROCESS)
-   *wid = waitpid(_procs[pqid].pr_pid, status, WNOHANG);
-
-   /* Process still running. */
-   if( *wid  == 0 ) {
-      *status = 0;
-      return 0;
-   }
-   /* If ECHILD is set from waitpid/wait then no child was left. */
-   if( *wid  == -1 ) {
-	 int realErr = errno; // fprintf can pollute errno
-      fprintf(stderr, "%s:  Internal Error: waitpid() failed: %d -  %s\n",
-          Pname, errno, strerror(errno) );
-      if(realErr != ECHILD) {
-     /* Wait was interrupted or a child was terminated (SIGCHLD) */
-     return -2;
-      } else {
-     return -1;
-      }
-   }
-#else
-   DWORD pEvent;
-   DWORD dwExitCode;
-
-   *wid = _procs[pqid].pr_pid;
-   *status = 0;
-
-   /* Wait ... (Check status and return) */
-   pEvent = WaitForSingleObject(*wid, 0);
-
-   if( pEvent == WAIT_OBJECT_0 ) {
-      GetExitCodeProcess(*wid, &dwExitCode);
-      if(dwExitCode == STILL_ACTIVE) {
-     /* Process did not terminate -> force it, with exit code 1. */
-     TerminateProcess(*wid, 1);
-     dwExitCode = 1;
-     fprintf(stderr, "%s:  Internal Error: Process still running - "
-         "terminate it!\n", Pname );
-      }
-
-      /* Close process and thread handles. */
-      CloseHandle( *wid );
-      CloseHandle( _procs[pqid].pr_tid );
-      *status = dwExitCode;
-   }
-   else if( pEvent == WAIT_TIMEOUT ) {
-      return 0;
-   }
-   else {
-      int err = GetLastError();
-      LPVOID lpMsgBuf;
-      
-      FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-             FORMAT_MESSAGE_FROM_SYSTEM |
-             FORMAT_MESSAGE_IGNORE_INSERTS,
-             NULL,
-             err,
-             MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-             (LPTSTR) &lpMsgBuf,
-             0, NULL );
-
-      fprintf(stderr, "%s:  Internal Error: WaitForSingleObject() failed:"
-          " %d -  %s\n", Pname, err, lpMsgBuf);
-      LocalFree(lpMsgBuf);
-
-      /* No way to identify something comparable to ECHILD, always return -2.*/
-      return -2;
-   }
-#endif
-
-   return 1;
-}
-
-
-#if ! HAVE_STRERROR
-static char *
-private_strerror (errnum)
-     int errnum; 
-{ 
-#ifndef __APPLE__
-# if defined(arm32) || defined(linux) || defined(__FreeBSD__) || \
-     defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-  extern  const char * const sys_errlist[];
-# else
-  extern  char *sys_errlist[];
-# endif
-#endif
-  extern int sys_nerr;
-
-  if (errnum > 0 && errnum <= sys_nerr)
-    return sys_errlist[errnum];
-  return "Unknown system error";
-}
-#define strerror private_strerror
-#endif /* HAVE_STRERROR */
-
-PUBLIC int
-runargv(target, group, last, cmnd_attr, cmd)/*
-==============================================
-  Execute the command given by cmd.
-
-  Return 0 if the command executed and finished or
-         1 if the command started and is running.
- */
-CELLPTR target;
-int	group;
-int	last;
-t_attr  cmnd_attr; /* Attributes for current cmnd. */
-char  **cmd; /* Simulate a reference to *cmd. */
-{
-   int  ignore = (cmnd_attr & A_IGNORE)!= 0; /* Ignore errors ('-'). */
-   int  shell  = (cmnd_attr & A_SHELL) != 0; /* Use shell ('+'). */
-   int  mute = (cmnd_attr & A_MUTE) != 0; /* Mute output ('@@'). */
-   int  wfc = (cmnd_attr & A_WFC) != 0; /* Wait for completion. */
-
-   TPID  pid;
-   int  st_pq = 0; /* Current _exec_shell target process index */
-   char *tcmd = *cmd; /* For saver/easier string arithmetic on *cmd. */
-   char         **argv;
-
-   int old_stdout = -1; /* For shell escapes and */
-   int old_stderr = -1; /* @@-recipe silencing.  */
-   int internal = 0; /* Used to indicate internal command. */
-
-   DB_ENTER( "runargv" );
-
-   /* Special handling for the shell function macro is required. If the
-    * currend command is called as part of a shell escape in a recipe make
-    * sure that all previous recipe lines of this target have finished. */
-   if( Is_exec_shell ) {
-      if( (st_pq = _running(Shell_exec_target)) != -1 ) {
-     RCPPTR rp;
-     /* Add WFC to _procs[st_pq]. */
-     _procs[st_pq].pr_wfc = TRUE;
-     /* Set also the A_WFC flag in the recipe attributes. */
-     for( rp = _procs[st_pq].pr_recipe ; rp != NIL(RCP); rp = rp->prp_next )
-        rp->prp_attr |= A_WFC;
-
-     Wait_for_child(FALSE, st_pq);
-      }
-   } else {
-      if( _running(target) != -1 /*&& Max_proc != 1*/ ) {
-     /* The command will be executed when the previous recipe
-      * line completes. */
-     _attach_cmd( *cmd, group, target, cmnd_attr, last );
-     DB_RETURN( 1 );
-      }
-   }
-
-   /* If all process array entries are used wait until we get a free
-    * slot. For Max_proc == 1 this forces sequential execution. */
-   while( _proc_cnt == Max_proc ) {
-      Wait_for_child(FALSE, -1);
-   }
-
-   /* Return immediately for empty line or noop command. */
-   if ( !*tcmd ||				/* empty line */
-    ( strncmp(tcmd, "noop", 4) == 0 &&	/* noop command */
-      (iswhite(tcmd[4]) || tcmd[4] == '\0')) ) {
-      internal = 1;
-   }
-   else if( !shell &&  /* internal echo only if not in shell */
-        strncmp(tcmd, "echo", 4) == 0 &&
-        (iswhite(tcmd[4]) || tcmd[4] == '\0') ) {
-      int nl = 1;
-
-      tcmd = tcmd+4;
-      while( iswhite(*tcmd) ) ++tcmd;
-      if ( strncmp(tcmd,"-n",2 ) == 0) {
-     nl = 0;
-     tcmd = tcmd+2;
-     while( iswhite(*tcmd) ) ++tcmd;
-      }
-
-      /* redirect output for _exec_shell / @@-recipes. */
-      if( Is_exec_shell ) {
-     /* Add error checking? */
-     old_stdout = dup(1);
-     dup2( fileno(stdout_redir), 1 );
-      }
-      if( mute ) {
-     old_stderr = dup(2);
-     dup2( zerofd, 2 );
-
-     if( !Is_exec_shell ) {
-        old_stdout = dup(1);
-        dup2( zerofd, 1 );
-     }
-      }
-
-      printf("%s%s", tcmd, nl ? "\n" : "");
-      fflush(stdout);
-
-      /* Restore stdout/stderr if needed. */
-      if( old_stdout != -1 ) {
-     dup2(old_stdout, 1);
-     close(old_stdout);
-     if( old_stderr != -1 ) {
-        dup2(old_stderr, 2);
-        close(old_stderr);
-      }
-      }
-
-      internal = 1;
-   }
-   if ( internal ) {
-      /* Use _add_child() / _finished_child() with internal command. */
-      int cur_proc = _add_child(DMNOPID, target, ignore, last, FALSE);
-      _finished_child( (DMHANDLE)-cur_proc, 0 );
-      DB_RETURN( 0 );
-   }
-
-   /* Pack cmd in argument vector. */
-   argv = Pack_argv( group, shell, cmd );
-
-   /* Really spawn or fork a child. */
-#if defined( USE_SPAWN )
-   /* As no other childs are started while the output is redirected this
-    * is save. */
-   if( Is_exec_shell ) {
-      /* Add error checking? */
-      old_stdout = dup(1);
-      dup2( fileno(stdout_redir), 1 );
-   }
-   if( mute ) {
-      old_stderr = dup(2);
-      dup2( zerofd, 2 );
-
-      if( !Is_exec_shell ) {
-     old_stdout = dup(1);
-     dup2( zerofd, 1 );
-      }
-   }
-
-   pid = dmspawn( argv );
-   terrno = errno;
-
-   if( old_stdout != -1 ) {
-      dup2(old_stdout, 1);
-      close(old_stdout);
-      if( old_stderr != -1 ) {
-     dup2(old_stderr, 2);
-     close(old_stderr);
-      }
-   }
-   if(pid.pid == (DMHANDLE)-1) {
-      /* spawn failed */
-      int cur_proc;
-
-      fprintf(stderr, "%s:  Error executing '%s': %s",
-          Pname, argv[0], strerror(terrno) );
-      if( ignore||Continue ) {
-     fprintf(stderr, " (Ignored)" );
-      }
-      fprintf(stderr, "\n");
-
-      /* Use _add_child() / _finished_child() to treat the failure
-       * gracefully, if so requested. */
-      cur_proc = _add_child(DMNOPID, target, ignore, last, FALSE);
-      _finished_child((DMHANDLE)cur_proc, SIGTERM);
-
-      /* _finished_child() aborts dmake if we are not told to
-       * ignore errors. If we reach the this point return 0 as
-       * errors are obviously ignored and indicate that the process
-       * finished. */
-      DB_RETURN( 0 );
-   } else {
-      _add_child(pid, target, ignore, last, wfc);
-   }
-#else  /* USE_SPAWN */
-
-   fflush(stdout);
-   switch( pid.pid = fork() ){
-
-   case -1: /* fork failed */
-      Fatal("fork failed: %s: %s", argv[0], strerror( errno ));
-
-   case 0:  /* child */
-      /* redirect output for _exec_shell / @@-recipes. */
-      if( Is_exec_shell ) {
-     /* Add error checking? */
-     old_stdout = dup(1);
-     dup2( fileno(stdout_redir), 1 );
-      }
-      if( mute ) {
-     old_stderr = dup(2);
-     dup2( zerofd, 2 );
-
-     if( !Is_exec_shell ) {
-        old_stdout = dup(1);
-        dup2( zerofd, 1 );
-     }
-      }
-      execvp(argv[0], argv);
-      /* restoring output to catch potential error output if execvp()
-       * failed. */
-      if( old_stdout != -1 ) {
-     dup2(old_stdout, 1);
-     close(old_stdout);
-     if( old_stderr != -1 ) {
-        dup2(old_stderr, 2);
-        close(old_stderr);
-     }
-      }
-      fprintf(stderr, "%s:  Error executing '%s': %s",
-          Pname, argv[0], strerror(errno) );
-      if( ignore||Continue ) {
-     fprintf(stderr, " (Ignored)" );
-      }
-      fprintf(stderr, "\n");
-
-      kill(getpid(), SIGTERM);
-      /*NOTREACHED*/
-      Fatal("\nInternal Error - kill could't kill child %d.\n", getpid());
-
-   default: /* parent */
-      _add_child(pid, target, ignore, last, wfc);
-   }
-
-#endif  /* USE_SPAWN */
-
-   /* If wfc is set this command must have been finished. */
-   if( wfc ) {
-      DB_RETURN( 0 );
-   } else {
-      DB_RETURN( 1 );
-   }
-}
-
-
-PUBLIC int
-Wait_for_child( abort_flg, pqid )/*
-===================================
-  Wait for the next processes from process queue pqid to finish. All finished
-  processes are handled by calling  _finished_child() for each of them.
-  If pqid == -1 wait for the next process to finish.
-  If abort_flg is TRUE no further processes will be added to any process
-  queue. The A_WFC attribute is honored, see the documentation at the top
-  of this file.
-  Return 0 if we successfully waited for a process and -1 if there was nothing
-  to wait for.
-*/
-int abort_flg;
-int pqid;
-{
-   DMHANDLE pid;
-   DMHANDLE wid;
-   int status;
-   int waitret; /* return value of the dmwait functions. */
-   /* Never wait for internal commands. */
-   int waitchild;
-   int is_exec_shell_status = Is_exec_shell;
-
-   if( !_procs ) {
-      /* No process was ever created, i.e. _procs is not yet initialized.
-       * Nothing to wait for. */
-     return -1;
-   }
-
-   if( pqid > Max_proc ) Fatal("Internal Error: pqid > Max_proc !");
-
-   if( pqid == -1 ) {
-      /* Check if there is something to wait for. */
-      int i;
-      for( i=0; i<Max_proc && !_procs[i].pr_valid; i++ )
-     ;
-      if( i == Max_proc )
-     return(-1);
-
-      pid = (DMHANDLE)-1;
-      waitchild = FALSE;
-   }
-   else {
-      /* Check if pqid is active. */
-      if( !_procs[pqid].pr_valid ) {
-     /* Make this an error? */
-     Warning("Internal Warning: pqid is not active!?");
-     return(-1);
-      }
-
-      pid = _procs[pqid].pr_pid;
-      waitchild = _procs[pqid].pr_wfc;
-   }
-
-
-   /* It is impossible that processes that were started from _exec_shell
-    * have follow-up commands in its process entry. Unset Is_exec_shell
-    * to prevent piping of child processes that are started from the
-    * _finished_child subroutine and reset to its original value when
-    * leaving this function. */
-   Is_exec_shell = FALSE;
-
-   do {
-      /* Wait for the next process to finish. */
-      if( (pid != (DMHANDLE)-1) && (waitret = dmwaitpid(pqid, &wid, &status)) != 0 ) {
-     /* if dmwaitpid returns 0 this means that pid didn't finish yet.
-      * In this case just handle the next finished process in the
-      * following "else". If an error is returned (waitret < 0) the else
-      * clause is not evaluated and the error is handled in the following
-      * lines. If a process was waited for (waitret == 0) also proceed to
-      * the following lines. */
-     ;
-      }
-      else {
-     waitret = dmwaitnext(&wid, &status);
-     /* If we get an error tell the error handling routine below that we
-      * were not waiting for a specific pid. */
-     if( waitret < 0 ) {
-        pid = (DMHANDLE)-1;
-     }
-      }
- 
-      /* If ECHILD is set from waitpid/wait then no child was left. */
-      if( waitret < 0 ) {
-     if(waitret == -2) {
-        /* Wait was interrupted or a child was terminated (SIGCHLD) */
-        if ( in_quit() ) {
-           /* We're already terminating, just continue. */
-           return 0;
-        } else {
-           Fatal( "dmake was interrupted or a child terminated. "
-              "Stopping all childs ..." );
-        }
-     } else {
-        /* The child we were waiting for is missing or no child is
-         * left to wait for. */
-        if( pid != (DMHANDLE)-1 ) {
-           /* If we know the pid disable the pq entry. */
-           if( _procs[pqid].pr_valid ) {
-          _procs[pqid].pr_valid = 0;
-                  _procs[pqid].pr_recipe = NIL(RCP);
-          _proc_cnt--;
-           }
-        } else {
-           /* otherwise disable all remaining pq's. As we don't know
-        * which pid failed there is no gracefull way to terminate. */
-           int i;
-           for( i=0; i<Max_proc; i++ ) {
-          _procs[i].pr_valid = 0;
-                  _procs[i].pr_recipe = NIL(RCP);
-               }
-           _proc_cnt = 0;
-        }
-        /* The pid we were waiting for or any of the remaining childs
-         * (pid == -1) is missing. This should not happen and means
-         * that the process got lost or was treated elsewhere. */
-        Fatal( "Internal Error: Child is missing but still listed in _procs[x] %d: %s\n"
-           "\nTemporary or .ERRREMOVE targets might not have been removed!\n",
-           errno, strerror( errno ) );
-     }
-      }
-
-      _abort_flg = abort_flg;
-      _finished_child(wid, status);
-      _abort_flg = FALSE;
-      if( waitchild ) {
-     /* If pid != wid the process we're waiting for might have been
-      * finished from a "Wait_for_child(FALSE, -1)" call from
-      * _finished_child() -> runargv(). */
-     if( pid != wid ) {
-        if( !_procs[pqid].pr_valid || _procs[pqid].pr_pid != pid ) {
-           /* Someone finished pid, no need to wait further. */
-           waitchild = FALSE;
-        }
-     }
-     else
-        /* We finished pid, no need to wait further. */
-        waitchild = FALSE;
-      }
-   }
-   while( waitchild );
-
-   Is_exec_shell = is_exec_shell_status;
-   return(0);
-}
-
-
-PUBLIC void
-Clean_up_processes()
-{
-   register int i;
-   int ret;
-
-   if( _procs != NIL(PR) ) {
-      for( i=0; i<Max_proc; i++ )
-     if( _procs[i].pr_valid ) {
-#if !defined(USE_CREATEPROCESS)
-        if( (ret = kill(_procs[i].pr_pid, SIGTERM)) ) {
-           fprintf(stderr, "Killing of pid %d from pq[%d] failed with: %s - %d ret: %d\n",
-               _procs[i].pr_pid, i,
-               strerror(errno), SIGTERM, ret );
-        }
-#else
-     TerminateProcess(_procs[i].pr_pid, 1);
-#endif
-     }
-   }
-}
-
-
-static int
-_add_child( pid, target, ignore, last, wfc )/*
-==============================================
-  Creates/amend a process queue entry and enters the child parameters.
-  The pid == -1 represents an internal command and the function returns
-  the used process array index. For non-internal commands the function
-  returns -1.
-  If wfc (wait for completion) is TRUE the function calls
-  Wait_for_child to wait for the whole process queue to be finished.
-*/
-TPID	pid;
-CELLPTR target;
-int	ignore;
-int     last;
-int     wfc;
-{
-   register int i;
-   register PR *pp;
-
-   /* Never change MAXPROCESS after _procs is allocated. */
-   if( _procs_size != Max_proc ) {
-     /* If procs was never initialize this is OK, do it now. */
-     if( _procs == NIL(PR) ) {
-       _procs_size = Max_proc;
-       TALLOC( _procs, Max_proc, PR );
-#if defined(USE_CREATEPROCESS)
-       TALLOC( _wpList, Max_proc, HANDLE );
-
-       /* Signed int values are cast to DMHANDLE in various places, use this
-        * sanity check to verify that DMHANDLE is large enough. */
-       if( sizeof(int) > sizeof(DMHANDLE) )
-         Fatal( "Internal Error: Check type of DMHANDLE!" );
-#endif
-     }
-     else {
-       Fatal( "MAXPROCESS changed from `%d' to `%d' after a command was executed!", _procs_size, Max_proc );
-     }
-   }
-
-   if( Measure & M_RECIPE )
-      Do_profile_output( "s", M_RECIPE, target );
-
-   /* If _use_i ! =-1 then this function is called by _finished_child() ( through runargv() ),
-      and we re-use the process queue number given by _use_i. */
-   if( (i = _use_i) == -1 ) {
-     for( i=0; i<Max_proc; i++ )
-       if( !_procs[i].pr_valid )
-         break;
-   }
-
-   pp = &(_procs[i]);
-
-   pp->pr_valid  = 1;
-   pp->pr_pid    = pid.pid;
-   pp->pr_tid    = pid.tid;
-   pp->pr_target = target;
-   pp->pr_ignore = ignore;
-   pp->pr_last   = last;
-   pp->pr_wfc    = wfc;
-
-   if( pp->pr_dir != NIL(char) )
-     FREE(pp->pr_dir);
-   pp->pr_dir    = DmStrDup(Get_current_dir());
-
-   Current_target = NIL(CELL);
-
-   _proc_cnt++;
-
-   if( pid.pid != (DMHANDLE)-1 ) {
-      /* Wait for each recipe to finish if wfc is TRUE. This
-       * basically forces sequential execution. */
-      if( wfc ) {
-     Wait_for_child( FALSE, i );
-      }
-
-      return -1;
-   } else
-      return i;
-}
-
-
-static void
-_finished_child(cid, status)/*
-==============================
-  Handle process array entry for finished child. This can be a finished
-  process or a finished internal command depending on the content of cid.
-  For cid >= 1 the value of cid is used as the pid to of the finished
-  process and for cid < 1 -cid is used as the process array index of the
-  internal command.
-*/
-DMHANDLE cid;
-int	status;
-{
-  register int i;
-  char     *dir;
-
-  if((int)cid < 1) { /* Force int. */
-    /* internal command */
-    i = -((int)cid);
-  }
-  else {
-    for( i=0; i<Max_proc; i++ )
-      if( _procs[i].pr_valid && _procs[i].pr_pid == cid )
-        break;
-
-    /* Some children we didn't make esp true if using /bin/sh to execute a
-     * a pipe and feed the output as a makefile into dmake. */
-    if( i == Max_proc ) {
-      Warning("Internal Warning: finished pid %d is not in pq!?", cid);
-      return;
-    }
-  }
-
-  /* Not a running process anymore, the next runargv() will not use
-   * _attach_cmd(). */
-  _procs[i].pr_valid = 0;
-
-  if( Measure & M_RECIPE )
-    Do_profile_output( "e", M_RECIPE, _procs[i].pr_target );
-
-  _proc_cnt--;
-  dir = DmStrDup(Get_current_dir());
-  Set_dir( _procs[i].pr_dir );
-
-  if( _procs[i].pr_recipe != NIL(RCP) && !_abort_flg ) {
-    RCPPTR rp = _procs[i].pr_recipe;
-
-
-    Current_target = _procs[i].pr_target;
-    Handle_result( status, _procs[i].pr_ignore, FALSE, _procs[i].pr_target );
-    Current_target = NIL(CELL);
-
-    if ( _procs[i].pr_target->ce_attr & A_ERROR ) {
-      _procs[i].pr_last = TRUE;
-      goto ABORT_REMAINDER_OF_RECIPE;
-    }
-
-    _procs[i].pr_recipe = rp->prp_next;
-
-    _use_i = i;
-    /* Run next recipe line. The rp->prp_attr propagates a possible
-     * wfc condition. */
-    runargv( _procs[i].pr_target, rp->prp_group,
-             rp->prp_last, rp->prp_attr, &rp->prp_cmd );
-    _use_i = -1;
-
-    FREE( rp->prp_cmd );
-    FREE( rp );
-
-    /* If all process queues are used wait for the next process to
-     * finish. Is this really needed here? */
-    if( _proc_cnt == Max_proc ) {
-      Wait_for_child( FALSE, -1 );
-    }
-  }
-  else {
-    /* empty the queue on abort. */
-    if( _abort_flg )
-      _procs[i].pr_recipe = NIL(RCP);
-
-    Handle_result(status,_procs[i].pr_ignore,_abort_flg,_procs[i].pr_target);
-
-  ABORT_REMAINDER_OF_RECIPE:
-    if( _procs[i].pr_last ) {
-      FREE(_procs[i].pr_dir ); _procs[i].pr_dir = NIL(char); /* Set in _add_child() */
-
-      if( !Doing_bang ) {
-        /* Update_time_stamp() triggers the deletion of intermediate
-         * targets.  This starts a new process queue, so we have to
-         * clear the _use_i variable. */
-        int my_use_i = _use_i;
-
-        _use_i = -1;
-        Update_time_stamp( _procs[i].pr_target );
-        _use_i =  my_use_i;
-      }
-    }
-  }
-
-  Set_dir(dir);
-  FREE(dir);
-}
-
-
-static int
-_running( cp )/*
-================
-  Check if target exists in process array AND is running. Return its
-  process array index if it is running, return -1 otherwise.
-*/
-CELLPTR cp;
-{
-   register int i;
-
-   if( !_procs ) return( -1 );
-
-   for( i=0; i<Max_proc; i++ )
-      if( _procs[i].pr_valid &&
-      _procs[i].pr_target == cp  )
-     break;
-     
-   return( i == Max_proc ? -1 : i );
-}
-
-
-static void
-_attach_cmd( cmd, group, cp, cmnd_attr, last )/*
-================================================
-  Attach to an active process queue. Inherit wfc setting. */
-char    *cmd;
-int	group;
-CELLPTR cp;
-t_attr  cmnd_attr;
-int     last;
-{
-   register int i;
-   RCPPTR rp;
-
-   for( i=0; i<Max_proc; i++ )
-      if( _procs[i].pr_valid &&
-      _procs[i].pr_target == cp  )
-     break;
-
-   TALLOC( rp, 1, RCP );
-   rp->prp_cmd   = DmStrDup(cmd);
-   rp->prp_attr = cmnd_attr;
-   /* Inherit wfc from process queue. */
-   if( _procs[i].pr_wfc )
-      rp->prp_attr |= A_WFC;
-   rp->prp_group = group;
-   rp->prp_last  = last;
-
-   if( _procs[i].pr_recipe == NIL(RCP) )
-      _procs[i].pr_recipe = _procs[i].pr_recipe_end = rp;
-   else {
-      _procs[i].pr_recipe_end->prp_next = rp;
-      _procs[i].pr_recipe_end = rp;
-   }
-}
diff --git a/dmake/unix/solaris/config.mk b/dmake/unix/solaris/config.mk
deleted file mode 100644
index bc2364a33..000000000
--- a/dmake/unix/solaris/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This is the BSD 4.3 UNIX configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# The following sources are required for Solaris 2.1 or greater
-OSDSRC := tempnam.c getcwd.c
-.IF $(OSDSRC)
-   SRC    += $(OSDSRC)
-   .SETDIR=$(osrdir) : $(OSDSRC)
-.END
-
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS, there's local BSD includes
-# too.
-CFLAGS += -I$(osrdir) -DSolaris
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/unix/solaris/getcwd.c b/dmake/unix/solaris/getcwd.c
deleted file mode 100644
index 5c5b84711..000000000
--- a/dmake/unix/solaris/getcwd.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-    getcwd -- get pathname of current working directory
-
-    public-domain implementation
-
-    last edit:	03-Nov-1990	Gwyn@BRL.MIL
-
-    complies with the following standards:
-        IEEE Std 1003.1-1988
-        SVID Issue 3
-        X/Open Portability Guide Issue 2 (when "XPG2" is defined)
-        X/Open Portability Guide Issue 3
-
-    This implementation of getcwd() can be used to replace the UNIX
-    System V library routine (which uses popen() to capture the output of
-    the "pwd" command).  Once that is done, "pwd" can be reimplemented as
-    just puts(getcwd((char*)0,0)), assuming "XPG2" is defined below.
-
-    This implementation depends on every directory having entries for
-    "." and "..".  It also depends on the internals of the <dirent.h>
-    data structures to some degree.
-
-    I considered using chdir() to ascend the hierarchy, followed by a
-    final chdir() to the path being returned by getcwd() to restore the
-    location, but decided that error recovery was too difficult that way.
-    The algorithm I settled on was inspired by my rewrite of the "pwd"
-    utility, combined with the dotdots[] array trick from the SVR2 shell.
-*/
-#define XPG2	/* define to support obsolete XPG2-mandated feature */
-
-
-#include	<sys/types.h>
-#include	<sys/stat.h>
-
-#ifdef M_XENIX
-# include        <sys/ndir.h>
-# define dirent direct
-#else
-# include        <dirent.h>
-#endif
-
-#include	<errno.h>
-#include	<string.h>
-
-typedef char	*pointer;		/* (void *) if you have it */
-
-extern void	free();
-extern pointer	malloc();
-extern int	fstat(), stat();
-
-extern int	errno;			/* normally done by <errno.h> */
-
-#ifndef NULL
-#define	NULL	0			/* amorphous null pointer constant */
-#endif
-
-#ifndef NAME_MAX
-#define	NAME_MAX	255		/* maximum directory entry size */
-#endif
-
-
-char	*
-getcwd( buf, size )			/* returns pointer to CWD pathname */
-    char		*buf;		/* where to put name (NULL to malloc) */
-    int		size;		/* size of buf[] or malloc()ed memory */
-    {
-    static char	dotdots[] =
-"../../../../../../../../../../../../../../../../../../../../../../../../../..";
-    char		*dotdot;	/* -> dotdots[.], right to left */
-    DIR		*dirp;		/* -> parent directory stream */
-    struct dirent	*dir;		/* -> directory entry */
-    struct stat	stat1,
-            stat2;		/* info from stat() */
-    struct stat	*d = &stat1;	/* -> info about "." */
-    struct stat	*dd = &stat2;	/* -> info about ".." */
-    register char	*buffer;	/* local copy of buf, or malloc()ed */
-    char		*bufend;	/* -> buffer[size] */
-    register char	*endp;		/* -> end of reversed string */
-    register char	*dname;		/* entry name ("" for root) */
-    int		serrno = errno;	/* save entry errno */
-
-    if ( buf != NULL && size <= 0
-#ifndef XPG2
-      || buf == NULL
-#endif
-       )	{
-        errno = EINVAL;		/* invalid argument */
-        return NULL;
-        }
-
-    buffer = buf;
-#ifdef XPG2
-    if ( buf == NULL		/* wants us to malloc() the string */
-      && (buffer = (char *) malloc( (unsigned) size )) == NULL
-    /* XXX -- actually should probably not pay attention to "size" arg */
-       )	{
-        errno = ENOMEM;		/* cannot malloc() specified size */
-        return NULL;
-        }
-#endif
-
-    if ( stat( ".", dd ) != 0 )	/* prime the pump */
-        goto error;		/* errno already set */
-
-    endp = buffer;			/* initially, empty string */
-    bufend = &buffer[size];
-
-    for ( dotdot = &dotdots[sizeof dotdots]; dotdot != dotdots; )
-        {
-        dotdot -= 3;		/* include one more "/.." section */
-                    /* (first time is actually "..") */
-
-        /* swap stat() info buffers */
-        {
-        register struct stat	*temp = d;
-
-        d = dd;			/* new current dir is old parent dir */
-        dd = temp;
-        }
-
-        if ( (dirp = opendir( dotdot )) == NULL )	/* new parent */
-            goto error;	/* errno already set */
-
-        if ( fstat( dirp->dd_fd, dd ) != 0 )
-            {
-            serrno = errno;	/* set by fstat() */
-            (void)closedir( dirp );
-            errno = serrno;	/* in case closedir() clobbered it */
-            goto error;
-            }
-
-        if ( d->st_dev == dd->st_dev )
-            {		/* not crossing a mount point */
-            if ( d->st_ino == dd->st_ino )
-                {	/* root directory */
-                dname = "";
-                goto append;
-                }
-
-            do
-                if ( (dir = readdir( dirp )) == NULL )
-                    {
-                    (void)closedir( dirp );
-                    errno = ENOENT;	/* missing entry */
-                    goto error;
-                    }
-            while ( dir->d_ino != d->st_ino );
-            }
-        else	{		/* crossing a mount point */
-            struct stat	t;	/* info re. test entry */
-            char		name[sizeof dotdots + 1 + NAME_MAX];
-
-            (void)strcpy( name, dotdot );
-            dname = &name[strlen( name )];
-            *dname++ = '/';
-
-            do	{
-                if ( (dir = readdir( dirp )) == NULL )
-                    {
-                    (void)closedir( dirp );
-                    errno = ENOENT;	/* missing entry */
-                    goto error;
-                    }
-
-                (void)strcpy( dname, dir->d_name );
-                /* must fit if NAME_MAX is not a lie */
-                }
-            while ( stat( name, &t ) != 0
-                 || t.st_ino != d->st_ino
-                 || t.st_dev != d->st_dev
-                  );
-            }
-
-        dname = dir->d_name;
-
-        /* append "/" and reversed dname string onto buffer */
-    append:
-        if ( endp != buffer	/* avoid trailing / in final name */
-          || dname[0] == '\0'	/* but allow "/" when CWD is root */
-           )
-            *endp++ = '/';
-
-        {
-        register char	*app;	/* traverses dname string */
-
-        for ( app = dname; *app != '\0'; ++app )
-            ;
-
-        if ( app - dname >= bufend - endp )
-            {
-            (void)closedir( dirp );
-            errno = ERANGE;	/* won't fit allotted space */
-            goto error;
-            }
-
-        while ( app != dname )
-            *endp++ = *--app;
-        }
-
-        (void)closedir( dirp );
-
-        if ( dname[0] == '\0' )	/* reached root; wrap it up */
-            {
-            register char	*startp;	/* -> buffer[.] */
-
-            *endp = '\0';	/* plant null terminator */
-
-            /* straighten out reversed pathname string */
-            for ( startp = buffer; --endp > startp; ++startp )
-                {
-                char	temp = *endp;
-
-                *endp = *startp;
-                *startp = temp;
-                }
-
-            errno = serrno;	/* restore entry errno */
-            /* XXX -- if buf==NULL, realloc here? */
-            return buffer;
-            }
-        }
-
-    errno = ENOMEM;			/* actually, algorithm failure */
-
-    error:
-    if ( buf == NULL )
-        free( (pointer)buffer );
-
-    return NULL;
-    }
-
diff --git a/dmake/unix/solaris/gnu/config.mk b/dmake/unix/solaris/gnu/config.mk
deleted file mode 100644
index f6f4f2c68..000000000
--- a/dmake/unix/solaris/gnu/config.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# This is the Solaris gcc configuration file for DMAKE
-#	It modifies the value of CC to be gcc
-#
-
-CC = gcc
-
-# disable a gcc bug when compiling runargv.c
-runargv.o ?= CFLAGS += -g
diff --git a/dmake/unix/solaris/gnu/make.sh b/dmake/unix/solaris/gnu/make.sh
deleted file mode 100644
index 10006f9e6..000000000
--- a/dmake/unix/solaris/gnu/make.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-mkdir objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O infer.c
-mv infer.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O make.c
-mv make.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O stat.c
-mv stat.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O expand.c
-mv expand.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O dmstring.c
-mv dmstring.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O hash.c
-mv hash.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O dag.c
-mv dag.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O dmake.c
-mv dmake.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O path.c
-mv path.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O imacs.c
-mv imacs.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O sysintf.c
-mv sysintf.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O parse.c
-mv parse.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O getinp.c
-mv getinp.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O quit.c
-mv quit.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O state.c
-mv state.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O dmdump.c
-mv dmdump.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O macparse.c
-mv macparse.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O rulparse.c
-mv rulparse.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O percent.c
-mv percent.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O function.c
-mv function.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/arlib.c
-mv arlib.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/dirbrk.c
-mv dirbrk.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/rmprq.c
-mv rmprq.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/ruletab.c
-mv ruletab.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O -g unix/runargv.c
-mv runargv.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/dcache.c
-mv dcache.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/solaris/tempnam.c
-mv tempnam.o objects
-gcc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/solaris/getcwd.c
-mv getcwd.o objects
-gcc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o objects/dcache.o objects/tempnam.o objects/getcwd.o 
-cp unix/solaris/gnu/template.mk startup/config.mk
diff --git a/dmake/unix/solaris/gnu/public.h b/dmake/unix/solaris/gnu/public.h
deleted file mode 100644
index 17282a735..000000000
--- a/dmake/unix/solaris/gnu/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:56:16 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/solaris/gnu/template.mk b/dmake/unix/solaris/gnu/template.mk
deleted file mode 100644
index 3f9282027..000000000
--- a/dmake/unix/solaris/gnu/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= solaris
-   OSENVIRONMENT *:= gnu
diff --git a/dmake/unix/solaris/make.sh b/dmake/unix/solaris/make.sh
deleted file mode 100644
index 2529b8a1e..000000000
--- a/dmake/unix/solaris/make.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/dcache.c
-mv dcache.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/solaris/tempnam.c
-mv tempnam.o objects
-cc -c -I. -Iunix -Iunix/solaris -DSolaris -O unix/solaris/getcwd.c
-mv getcwd.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o objects/dcache.o objects/tempnam.o objects/getcwd.o 
-cp unix/solaris/template.mk startup/config.mk
diff --git a/dmake/unix/solaris/public.h b/dmake/unix/solaris/public.h
deleted file mode 100644
index ac048bf46..000000000
--- a/dmake/unix/solaris/public.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* RCS  $Id: public.h,v 1.7 2007-10-15 15:56:04 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/solaris/template.mk b/dmake/unix/solaris/template.mk
deleted file mode 100644
index 233917a6b..000000000
--- a/dmake/unix/solaris/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= solaris
-   OSENVIRONMENT *:= 
diff --git a/dmake/unix/solaris/tempnam.c b/dmake/unix/solaris/tempnam.c
deleted file mode 100644
index bb108d629..000000000
--- a/dmake/unix/solaris/tempnam.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:35 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-
-static char *cpdir();
-static char  seed[4]="AAA";
-
-/* BSD stdio.h doesn't define P_tmpdir, so let's do it here */
-#ifndef P_tmpdir
-static char *P_tmpdir = "/tmp";
-#endif
-
-char *
-tempnam(dir, prefix)
-const char *dir;		/* use this directory please (if non-NULL) */
-const char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+16))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (access( cpdir(p, tmpdir), 3) != 0) )
-     if( (dl == 0) || (access( cpdir(p, dir), 3) != 0) )
-    if( access( cpdir(p, P_tmpdir),   3) != 0 )
-       if( access( cpdir(p, "/tmp"),  3) != 0 )
-          return(NULL);
-
-   (void) strcat(p, "/");
-   if(prefix)
-   {
-      *(p+strlen(p)+5) = '\0';
-      (void)strncat(p, prefix, 5);
-   }
-
-   (void)strcat(p, seed);
-   (void)strcat(p, "XXXXXX");
-
-   q = seed;
-   while(*q == 'Z') *q++ = 'A';
-   ++*q;
-
-   if(*mktemp(p) == '\0') return(NULL);
-   return(p);
-}
-
-
-
-static char *
-cpdir(buf, str)
-char *buf;
-char *str;
-{
-   char *p;
-
-   if(str != NULL)
-   {
-      (void) strcpy(buf, str);
-      p = buf - 1 + strlen(buf);
-      if(*p == '/') *p = '\0';
-   }
-
-   return(buf);
-}
diff --git a/dmake/unix/startup.h b/dmake/unix/startup.h
deleted file mode 100644
index 23e2059f1..000000000
--- a/dmake/unix/startup.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* RCS  $Id: startup.h,v 1.1.1.1 2000-09-22 15:33:33 hr Exp $
---
--- SYNOPSIS
---      Definition of MAKESTARTUP
--- 
--- DESCRIPTION
---      Default MAKESTARTUP value defining where dmake locates the
---      startup file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-"MAKESTARTUP := $(DMAKEROOT)/startup.mk",
diff --git a/dmake/unix/sysintf.h b/dmake/unix/sysintf.h
deleted file mode 100644
index d86c208f1..000000000
--- a/dmake/unix/sysintf.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* RCS  $Id: sysintf.h,v 1.4 2007-10-15 15:53:38 ihi Exp $
---
--- SYNOPSIS
---      Interfaces for sysintf.c
---
--- DESCRIPTION
---      Abstractions of functions in sysintf.c
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#define DMSTAT stat
-#define VOID_LCACHE(l,m) (void) void_lcache(l,m)
-#define Hook_std_writes(A)
-#define GETPID getpid()
-
-#ifndef S_IFDIR
-#define S_IFDIR 0040000
-#endif
-
-#ifndef S_IFMT
-#define S_IFMT 0170000
-#endif
-
-/*
-** standard C items
-*/
-
-/*
-** DOS interface standard items
-*/
-#define	getswitchar()	'-'
-
-/*
-** Make parameters
-*/
diff --git a/dmake/unix/sysvr1/config.mk b/dmake/unix/sysvr1/config.mk
deleted file mode 100644
index d1cd2d881..000000000
--- a/dmake/unix/sysvr1/config.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is the SysV R3 UNIX configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# The following are required sources
-OSDSRC := vfprintf.c
-
-.IF $(OSDSRC)
-   SRC    += $(OSDSRC)
-   .SETDIR=$(osrdir) : $(OSDSRC)
-.END
-
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS, there's local SysV includes
-# too.
-CFLAGS += -I$(osrdir)
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/unix/sysvr1/make.sh b/dmake/unix/sysvr1/make.sh
deleted file mode 100644
index 36728d779..000000000
--- a/dmake/unix/sysvr1/make.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O unix/dcache.c
-mv dcache.o objects
-cc -c -I. -Iunix -Iunix/sysvr1 -O unix/sysvr1/vfprintf.c
-mv vfprintf.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o objects/dcache.o objects/vfprintf.o 
-cp unix/sysvr1/template.mk startup/config.mk
diff --git a/dmake/unix/sysvr1/public.h b/dmake/unix/sysvr1/public.h
deleted file mode 100644
index b824af320..000000000
--- a/dmake/unix/sysvr1/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:56:28 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/sysvr1/putenv.c b/dmake/unix/sysvr1/putenv.c
deleted file mode 100644
index 98ca5d159..000000000
--- a/dmake/unix/sysvr1/putenv.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* RCS  $Id: putenv.c,v 1.1.1.1 2000-09-22 15:33:35 hr Exp $
---
--- SYNOPSIS
---      My own putenv for BSD like systems.
--- 
--- DESCRIPTION
--- 	This originally came from MKS, but I rewrote it to fix a bug with
---	replacing existing strings, probably never happened but the code
---	was wrong nonetheless.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <stdio.h>
-#include <string.h>
-
-int
-putenv( str )/*
-===============
-   Take a string of the form NAME=value and stick it into the environment.
-   We do this by allocating a new set of pointers if we have to add a new
-   string and by replacing an existing pointer if the value replaces the value
-   of an existing string. */
-char *str;
-{
-   extern char **environ;		/* The current environment. */
-   static char **ourenv = NULL;		/* A new environment	    */
-   register char **p;
-   register char *q;
-   int      size;
-
-   /* First search the current environment and see if we can replace a
-    * string. */
-   for( p=environ; *p; p++ ) {
-      register char *s = str;
-
-      for( q = *p; *q && *s && *s == *q; q++, s++ )
-     if( *s == '=' ) {
-        *p = str;
-        return(0);			/* replaced it so go away */
-     }
-   }
-
-   /* Ok, can't replace a string so need to grow the environment. */
-   size = p - environ + 2;	/* size of new environment */
-                /* size of old is size-1   */
-
-   /* It's the first time, so allocate a new environment since we don't know
-    * where the old one is comming from. */
-   if( ourenv == NULL ) {
-      if( (ourenv = (char **) malloc( sizeof(char *)*size )) == NULL )
-     return(1);
-
-      memcpy( (char *)ourenv, (char *)environ, (size-2)*sizeof(char *) );
-   }
-   else if( (ourenv = (char **)realloc( ourenv, size*sizeof(char *))) == NULL )
-      return(1);
-
-   ourenv[--size] = NULL;
-   ourenv[--size] = str;
-
-   environ = ourenv;
-   return(0);
-}
diff --git a/dmake/unix/sysvr1/stdlib.h b/dmake/unix/sysvr1/stdlib.h
deleted file mode 100644
index f04e45e66..000000000
--- a/dmake/unix/sysvr1/stdlib.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* RCS  $Id: stdlib.h,v 1.1.1.1 2000-09-22 15:33:35 hr Exp $
---
--- SYNOPSIS
---      stdlib interface
--- 
--- DESCRIPTION
---      Specially needed pieces of interface to the standard C lib.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _STDLIB_INCLUDED_
-#define _STDLIB_INCLUDED_
-
-extern /*GOTO*/ _exit();
-extern /*GOTO*/ exit();
-extern /*GOTO*/ abort();
-extern int system();
-extern char *getenv();
-extern char *calloc();
-extern char *malloc();
-extern char *realloc();
-extern free();
-extern int errno;
-
-#ifndef EIO
-#	include <errno.h>
-#endif
-
-#endif /* _STDLIB_INCLUDED_ */
diff --git a/dmake/unix/sysvr1/template.mk b/dmake/unix/sysvr1/template.mk
deleted file mode 100644
index 4eb40febb..000000000
--- a/dmake/unix/sysvr1/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= sysvr1
-   OSENVIRONMENT *:= 
diff --git a/dmake/unix/sysvr1/time.h b/dmake/unix/sysvr1/time.h
deleted file mode 100644
index 6e1dbcd57..000000000
--- a/dmake/unix/sysvr1/time.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* RCS  $Id: time.h,v 1.1.1.1 2000-09-22 15:33:35 hr Exp $
---
--- SYNOPSIS
---      time_t
---
--- DESCRIPTION
---      Properly define time_t.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef	TIME_h
-#define	TIME_h
-
-typedef	long	time_t;	/* this is the thing we use */
-
-#endif	TIME_h
-
diff --git a/dmake/unix/sysvr1/vfprintf.c b/dmake/unix/sysvr1/vfprintf.c
deleted file mode 100644
index 55e4d3664..000000000
--- a/dmake/unix/sysvr1/vfprintf.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* From:
- * John Limpert            johnl@gronk.UUCP        uunet!n3dmc!gronk!johnl
- */
-
-#include <stdio.h>
-#include <varargs.h>
-
-#ifndef BUFSIZ
-#include <stdio.h>
-#endif
-
-#ifndef va_dcl
-#include <varargs.h>
-#endif
-
-int
-vsprintf(str, fmt, ap)
-    char *str, *fmt;
-    va_list ap;
-{
-    FILE f;
-    int len;
-
-    f._flag = _IOWRT+_IOMYBUF;
-    f._ptr = (char *)str;	/* My copy of BSD stdio.h has this as (char *)
-                 * with a comment that it should be
-                 * (unsigned char *).  Since this code is
-                 * intended for use on a vanilla BSD system,
-                 * we'll stick with (char *) for now.
-                 */
-    f._cnt = 32767;
-    len = _doprnt(fmt, ap, &f);
-    *f._ptr = 0;
-    return (len);
-}
-
-int
-vfprintf(iop, fmt, ap)
-    FILE *iop;
-    char *fmt;
-    va_list ap;
-{
-    int len;
-
-    len = _doprnt(fmt, ap, iop);
-    return (ferror(iop) ? EOF : len);
-}
-
-int
-vprintf(fmt, ap)
-    char *fmt;
-    va_list ap;
-{
-    int len;
-
-    len = _doprnt(fmt, ap, stdout);
-    return (ferror(stdout) ? EOF : len);
-}
diff --git a/dmake/unix/sysvr3/config.mk b/dmake/unix/sysvr3/config.mk
deleted file mode 100644
index 75bcf3c2a..000000000
--- a/dmake/unix/sysvr3/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This is the SysV R3 UNIX configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# The following are required sources
-OSDSRC := 
-.IF $(OSDSRC)
-   SRC    += $(OSDSRC)
-   .SETDIR=$(osrdir) : $(OSDSRC)
-.END
-
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS, there's local SysV includes
-# too.
-CFLAGS += -I$(osrdir)
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/unix/sysvr3/gnu/public.h b/dmake/unix/sysvr3/gnu/public.h
deleted file mode 100644
index d0e98913f..000000000
--- a/dmake/unix/sysvr3/gnu/public.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:56:54 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-int Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-int Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/sysvr3/make.sh b/dmake/unix/sysvr3/make.sh
deleted file mode 100644
index adbf1672b..000000000
--- a/dmake/unix/sysvr3/make.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-mkdir objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O infer.c
-mv infer.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O make.c
-mv make.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O stat.c
-mv stat.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O expand.c
-mv expand.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O dmstring.c
-mv dmstring.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O hash.c
-mv hash.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O dag.c
-mv dag.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O dmake.c
-mv dmake.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O path.c
-mv path.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O imacs.c
-mv imacs.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O sysintf.c
-mv sysintf.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O parse.c
-mv parse.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O getinp.c
-mv getinp.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O quit.c
-mv quit.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O state.c
-mv state.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O dmdump.c
-mv dmdump.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O macparse.c
-mv macparse.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O rulparse.c
-mv rulparse.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O percent.c
-mv percent.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O function.c
-mv function.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O unix/arlib.c
-mv arlib.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O unix/dirbrk.c
-mv dirbrk.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O unix/rmprq.c
-mv rmprq.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O unix/ruletab.c
-mv ruletab.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O unix/runargv.c
-mv runargv.o objects
-gcc -c -I. -Iunix -Iunix/sysvr3 -O unix/dcache.c
-mv dcache.o objects
-gcc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o objects/dcache.o 
-cp unix/sysvr3/template.mk startup/config.mk
diff --git a/dmake/unix/sysvr3/public.h b/dmake/unix/sysvr3/public.h
deleted file mode 100644
index 7d4a4b145..000000000
--- a/dmake/unix/sysvr3/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:56:41 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/sysvr3/pwd/config.mk b/dmake/unix/sysvr3/pwd/config.mk
deleted file mode 100644
index 86c535a64..000000000
--- a/dmake/unix/sysvr3/pwd/config.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# This is the Sys VR3 PWD configuration file.  It configures SysvR3 unix
-# versions of dmake to use a provided version of getcwd rather than the
-# standard library version that uses popen to capture the output of pwd.
-#
-
-osredir := $(OS)$(DIRSEPSTR)$(OSRELEASE)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-# The following are required sources
-OSRESRC := getcwd.c
-
-.IF $(OSRESRC)
-   SRC    += $(OSRESRC)
-   .SETDIR=$(osredir) : $(OSRESRC)
-.END
-
-.SOURCE.h : $(osredir)
-
-# Local configuration modifications for CFLAGS, there's local SysV includes
-# too.
-CFLAGS += -I$(osredir)
diff --git a/dmake/unix/sysvr3/pwd/getcwd.c b/dmake/unix/sysvr3/pwd/getcwd.c
deleted file mode 100644
index 5c5b84711..000000000
--- a/dmake/unix/sysvr3/pwd/getcwd.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-    getcwd -- get pathname of current working directory
-
-    public-domain implementation
-
-    last edit:	03-Nov-1990	Gwyn@BRL.MIL
-
-    complies with the following standards:
-        IEEE Std 1003.1-1988
-        SVID Issue 3
-        X/Open Portability Guide Issue 2 (when "XPG2" is defined)
-        X/Open Portability Guide Issue 3
-
-    This implementation of getcwd() can be used to replace the UNIX
-    System V library routine (which uses popen() to capture the output of
-    the "pwd" command).  Once that is done, "pwd" can be reimplemented as
-    just puts(getcwd((char*)0,0)), assuming "XPG2" is defined below.
-
-    This implementation depends on every directory having entries for
-    "." and "..".  It also depends on the internals of the <dirent.h>
-    data structures to some degree.
-
-    I considered using chdir() to ascend the hierarchy, followed by a
-    final chdir() to the path being returned by getcwd() to restore the
-    location, but decided that error recovery was too difficult that way.
-    The algorithm I settled on was inspired by my rewrite of the "pwd"
-    utility, combined with the dotdots[] array trick from the SVR2 shell.
-*/
-#define XPG2	/* define to support obsolete XPG2-mandated feature */
-
-
-#include	<sys/types.h>
-#include	<sys/stat.h>
-
-#ifdef M_XENIX
-# include        <sys/ndir.h>
-# define dirent direct
-#else
-# include        <dirent.h>
-#endif
-
-#include	<errno.h>
-#include	<string.h>
-
-typedef char	*pointer;		/* (void *) if you have it */
-
-extern void	free();
-extern pointer	malloc();
-extern int	fstat(), stat();
-
-extern int	errno;			/* normally done by <errno.h> */
-
-#ifndef NULL
-#define	NULL	0			/* amorphous null pointer constant */
-#endif
-
-#ifndef NAME_MAX
-#define	NAME_MAX	255		/* maximum directory entry size */
-#endif
-
-
-char	*
-getcwd( buf, size )			/* returns pointer to CWD pathname */
-    char		*buf;		/* where to put name (NULL to malloc) */
-    int		size;		/* size of buf[] or malloc()ed memory */
-    {
-    static char	dotdots[] =
-"../../../../../../../../../../../../../../../../../../../../../../../../../..";
-    char		*dotdot;	/* -> dotdots[.], right to left */
-    DIR		*dirp;		/* -> parent directory stream */
-    struct dirent	*dir;		/* -> directory entry */
-    struct stat	stat1,
-            stat2;		/* info from stat() */
-    struct stat	*d = &stat1;	/* -> info about "." */
-    struct stat	*dd = &stat2;	/* -> info about ".." */
-    register char	*buffer;	/* local copy of buf, or malloc()ed */
-    char		*bufend;	/* -> buffer[size] */
-    register char	*endp;		/* -> end of reversed string */
-    register char	*dname;		/* entry name ("" for root) */
-    int		serrno = errno;	/* save entry errno */
-
-    if ( buf != NULL && size <= 0
-#ifndef XPG2
-      || buf == NULL
-#endif
-       )	{
-        errno = EINVAL;		/* invalid argument */
-        return NULL;
-        }
-
-    buffer = buf;
-#ifdef XPG2
-    if ( buf == NULL		/* wants us to malloc() the string */
-      && (buffer = (char *) malloc( (unsigned) size )) == NULL
-    /* XXX -- actually should probably not pay attention to "size" arg */
-       )	{
-        errno = ENOMEM;		/* cannot malloc() specified size */
-        return NULL;
-        }
-#endif
-
-    if ( stat( ".", dd ) != 0 )	/* prime the pump */
-        goto error;		/* errno already set */
-
-    endp = buffer;			/* initially, empty string */
-    bufend = &buffer[size];
-
-    for ( dotdot = &dotdots[sizeof dotdots]; dotdot != dotdots; )
-        {
-        dotdot -= 3;		/* include one more "/.." section */
-                    /* (first time is actually "..") */
-
-        /* swap stat() info buffers */
-        {
-        register struct stat	*temp = d;
-
-        d = dd;			/* new current dir is old parent dir */
-        dd = temp;
-        }
-
-        if ( (dirp = opendir( dotdot )) == NULL )	/* new parent */
-            goto error;	/* errno already set */
-
-        if ( fstat( dirp->dd_fd, dd ) != 0 )
-            {
-            serrno = errno;	/* set by fstat() */
-            (void)closedir( dirp );
-            errno = serrno;	/* in case closedir() clobbered it */
-            goto error;
-            }
-
-        if ( d->st_dev == dd->st_dev )
-            {		/* not crossing a mount point */
-            if ( d->st_ino == dd->st_ino )
-                {	/* root directory */
-                dname = "";
-                goto append;
-                }
-
-            do
-                if ( (dir = readdir( dirp )) == NULL )
-                    {
-                    (void)closedir( dirp );
-                    errno = ENOENT;	/* missing entry */
-                    goto error;
-                    }
-            while ( dir->d_ino != d->st_ino );
-            }
-        else	{		/* crossing a mount point */
-            struct stat	t;	/* info re. test entry */
-            char		name[sizeof dotdots + 1 + NAME_MAX];
-
-            (void)strcpy( name, dotdot );
-            dname = &name[strlen( name )];
-            *dname++ = '/';
-
-            do	{
-                if ( (dir = readdir( dirp )) == NULL )
-                    {
-                    (void)closedir( dirp );
-                    errno = ENOENT;	/* missing entry */
-                    goto error;
-                    }
-
-                (void)strcpy( dname, dir->d_name );
-                /* must fit if NAME_MAX is not a lie */
-                }
-            while ( stat( name, &t ) != 0
-                 || t.st_ino != d->st_ino
-                 || t.st_dev != d->st_dev
-                  );
-            }
-
-        dname = dir->d_name;
-
-        /* append "/" and reversed dname string onto buffer */
-    append:
-        if ( endp != buffer	/* avoid trailing / in final name */
-          || dname[0] == '\0'	/* but allow "/" when CWD is root */
-           )
-            *endp++ = '/';
-
-        {
-        register char	*app;	/* traverses dname string */
-
-        for ( app = dname; *app != '\0'; ++app )
-            ;
-
-        if ( app - dname >= bufend - endp )
-            {
-            (void)closedir( dirp );
-            errno = ERANGE;	/* won't fit allotted space */
-            goto error;
-            }
-
-        while ( app != dname )
-            *endp++ = *--app;
-        }
-
-        (void)closedir( dirp );
-
-        if ( dname[0] == '\0' )	/* reached root; wrap it up */
-            {
-            register char	*startp;	/* -> buffer[.] */
-
-            *endp = '\0';	/* plant null terminator */
-
-            /* straighten out reversed pathname string */
-            for ( startp = buffer; --endp > startp; ++startp )
-                {
-                char	temp = *endp;
-
-                *endp = *startp;
-                *startp = temp;
-                }
-
-            errno = serrno;	/* restore entry errno */
-            /* XXX -- if buf==NULL, realloc here? */
-            return buffer;
-            }
-        }
-
-    errno = ENOMEM;			/* actually, algorithm failure */
-
-    error:
-    if ( buf == NULL )
-        free( (pointer)buffer );
-
-    return NULL;
-    }
-
diff --git a/dmake/unix/sysvr3/pwd/make.sh b/dmake/unix/sysvr3/pwd/make.sh
deleted file mode 100644
index 514fde77f..000000000
--- a/dmake/unix/sysvr3/pwd/make.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O unix/dcache.c
-mv dcache.o objects
-cc -c -I. -Iunix -Iunix/sysvr3 -Iunix/sysvr3/pwd -O unix/sysvr3/pwd/getcwd.c
-mv getcwd.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o objects/dcache.o objects/getcwd.o 
-cp unix/sysvr3/pwd/template.mk startup/config.mk
diff --git a/dmake/unix/sysvr3/pwd/public.h b/dmake/unix/sysvr3/pwd/public.h
deleted file mode 100644
index 916c629fe..000000000
--- a/dmake/unix/sysvr3/pwd/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:57:06 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/sysvr3/pwd/template.mk b/dmake/unix/sysvr3/pwd/template.mk
deleted file mode 100644
index fa6b4aa6b..000000000
--- a/dmake/unix/sysvr3/pwd/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= sysvr3
-   OSENVIRONMENT *:= pwd
diff --git a/dmake/unix/sysvr3/stdlib.h b/dmake/unix/sysvr3/stdlib.h
deleted file mode 100644
index 84b1d8dee..000000000
--- a/dmake/unix/sysvr3/stdlib.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* RCS  $Id: stdlib.h,v 1.1.1.1 2000-09-22 15:33:35 hr Exp $
---
--- SYNOPSIS
---      stdlib interface
--- 
--- DESCRIPTION
---      Specially needed pieces of interface to the standard C lib.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _STDLIB_INCLUDED_
-#define _STDLIB_INCLUDED_
-
-#ifndef _AIX
-extern /*GOTO*/ _exit();
-extern /*GOTO*/ exit();
-extern /*GOTO*/ abort();
-extern int system();
-extern char *getenv();
-extern char *calloc();
-extern char *malloc();
-extern char *realloc();
-
-/* The AIX compiler dies on illegal redefinition of free */
-extern free();
-#endif
-
-/* AIX doesn't use NAME_MAX anylonger... */
-#ifdef _AIX
-#include <unistd.h>
-#define NAME_MAX pathconf("/dev/null",_PC_NAME_MAX)
-#endif
-
-extern int errno;
-
-#ifndef EIO
-#	include <errno.h>
-#endif
-
-#endif /* _STDLIB_INCLUDED_ */
diff --git a/dmake/unix/sysvr3/template.mk b/dmake/unix/sysvr3/template.mk
deleted file mode 100644
index 3cb518671..000000000
--- a/dmake/unix/sysvr3/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= sysvr3
-   OSENVIRONMENT *:= 
diff --git a/dmake/unix/sysvr3/time.h b/dmake/unix/sysvr3/time.h
deleted file mode 100644
index 6e1dbcd57..000000000
--- a/dmake/unix/sysvr3/time.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* RCS  $Id: time.h,v 1.1.1.1 2000-09-22 15:33:35 hr Exp $
---
--- SYNOPSIS
---      time_t
---
--- DESCRIPTION
---      Properly define time_t.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef	TIME_h
-#define	TIME_h
-
-typedef	long	time_t;	/* this is the thing we use */
-
-#endif	TIME_h
-
diff --git a/dmake/unix/sysvr4/config.mk b/dmake/unix/sysvr4/config.mk
deleted file mode 100644
index 6443ff6a9..000000000
--- a/dmake/unix/sysvr4/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This is the SysV R4 UNIX configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# The following are required sources
-OSDSRC := 
-.IF $(OSDSRC)
-   SRC    += $(OSDSRC)
-   .SETDIR=$(osrdir) : $(OSDSRC)
-.END
-
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS, there's local SysV includes
-# too.
-CFLAGS += -I$(osrdir)
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/unix/sysvr4/make.sh b/dmake/unix/sysvr4/make.sh
deleted file mode 100644
index bb309a38a..000000000
--- a/dmake/unix/sysvr4/make.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/sysvr4 -O unix/dcache.c
-mv dcache.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o objects/dcache.o 
-cp unix/sysvr4/template.mk startup/config.mk
diff --git a/dmake/unix/sysvr4/public.h b/dmake/unix/sysvr4/public.h
deleted file mode 100644
index 1baa2e301..000000000
--- a/dmake/unix/sysvr4/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:57:19 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/sysvr4/template.mk b/dmake/unix/sysvr4/template.mk
deleted file mode 100644
index 553878268..000000000
--- a/dmake/unix/sysvr4/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= sysvr4
-   OSENVIRONMENT *:= 
diff --git a/dmake/unix/tempnam.c b/dmake/unix/tempnam.c
deleted file mode 100644
index d322c91d4..000000000
--- a/dmake/unix/tempnam.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.2 2002-07-11 08:53:35 mh Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifdef __APPLE__
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#if defined(max)
-#   undef  max
-#endif
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-int d_access();
-
-char *
-dtempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   static         int count = 0;
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-   char		  buf[30];
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   else if( (tmpdir = getenv("TMP")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+13))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (d_access( strcpy(p, tmpdir), 0) != 0) )
-     if( (dl == 0) || (d_access( strcpy(p, dir), 0) != 0) )
-    if( d_access( strcpy(p, P_tmpdir), 0) != 0 )
-       if( !prefix )
-          prefix = "tp";
-
-   if(prefix)
-   {
-      *(p+strlen(p)+2) = '\0';
-      (void)strncat(p, prefix, 2);
-   }
-
-   sprintf( buf, "%08x", getpid() );
-   buf[6]='\0';
-   (void)strcat(p, buf );
-   sprintf( buf, "%04d", count++ );
-   q=p+strlen(p)-6;
-   *q++ = buf[0]; *q++ = buf[1];
-   *q++ = buf[2]; *q++ = buf[3];
-
-   if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
-
-   return(p);
-}
-
-
-
-d_access( name, flag )
-char *name;
-int  flag;
-{
-   extern char *DirSepStr;
-   char *p;
-   int r;
-
-   if( name == NULL || !*name ) return(1);  /* NULL dir means current dir */
-   r = access( name, flag );
-   p = name+strlen(name)-1;
-   if(*p != '/' && *p != '\\') strcat( p, DirSepStr );
-
-   return( r );
-}
-
-#endif
diff --git a/dmake/unix/xenix/config.mk b/dmake/unix/xenix/config.mk
deleted file mode 100644
index a4f8f78f3..000000000
--- a/dmake/unix/xenix/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# This is the SysV R3 UNIX configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# The following are required sources
-OSDSRC := 
-.IF $(OSDSRC)
-   SRC    += $(OSDSRC)
-   .SETDIR=$(osrdir) : $(OSDSRC)
-.END
-
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS, there's local SysV includes
-# too.
-CFLAGS += -I$(osrdir) -DM_XENIX
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
diff --git a/dmake/unix/xenix/make.sh b/dmake/unix/xenix/make.sh
deleted file mode 100644
index 66a5a6d76..000000000
--- a/dmake/unix/xenix/make.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -O unix/dcache.c
-mv dcache.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o objects/dcache.o 
-cp unix/xenix/template.mk startup/config.mk
diff --git a/dmake/unix/xenix/public.h b/dmake/unix/xenix/public.h
deleted file mode 100644
index 86e4f26fb..000000000
--- a/dmake/unix/xenix/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:57:31 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/xenix/pwd/config.mk b/dmake/unix/xenix/pwd/config.mk
deleted file mode 100644
index 095ff3587..000000000
--- a/dmake/unix/xenix/pwd/config.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# This is the Sys VR3 PWD configuration file.  It configures SysvR3 unix
-# versions of dmake to use a provided version of getcwd rather than the
-# standard library version that uses popen to capture the output of pwd.
-#
-
-osredir := $(OS)$(DIRSEPSTR)$(OSRELEASE)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-# The following are required sources
-OSRESRC := getcwd.c
-
-.IF $(OSRESRC)
-   SRC    += $(OSRESRC)
-   .SETDIR=$(osredir) : $(OSRESRC)
-.END
-
-.SOURCE.h : $(osredir)
-
-# Local configuration modifications for CFLAGS, there's local SysV includes
-# too.
-CFLAGS += -I$(osredir)
-
-# Xenix needs -lx in order to link successfully.
-LDLIBS += -lx
diff --git a/dmake/unix/xenix/pwd/getcwd.c b/dmake/unix/xenix/pwd/getcwd.c
deleted file mode 100644
index 5c5b84711..000000000
--- a/dmake/unix/xenix/pwd/getcwd.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-    getcwd -- get pathname of current working directory
-
-    public-domain implementation
-
-    last edit:	03-Nov-1990	Gwyn@BRL.MIL
-
-    complies with the following standards:
-        IEEE Std 1003.1-1988
-        SVID Issue 3
-        X/Open Portability Guide Issue 2 (when "XPG2" is defined)
-        X/Open Portability Guide Issue 3
-
-    This implementation of getcwd() can be used to replace the UNIX
-    System V library routine (which uses popen() to capture the output of
-    the "pwd" command).  Once that is done, "pwd" can be reimplemented as
-    just puts(getcwd((char*)0,0)), assuming "XPG2" is defined below.
-
-    This implementation depends on every directory having entries for
-    "." and "..".  It also depends on the internals of the <dirent.h>
-    data structures to some degree.
-
-    I considered using chdir() to ascend the hierarchy, followed by a
-    final chdir() to the path being returned by getcwd() to restore the
-    location, but decided that error recovery was too difficult that way.
-    The algorithm I settled on was inspired by my rewrite of the "pwd"
-    utility, combined with the dotdots[] array trick from the SVR2 shell.
-*/
-#define XPG2	/* define to support obsolete XPG2-mandated feature */
-
-
-#include	<sys/types.h>
-#include	<sys/stat.h>
-
-#ifdef M_XENIX
-# include        <sys/ndir.h>
-# define dirent direct
-#else
-# include        <dirent.h>
-#endif
-
-#include	<errno.h>
-#include	<string.h>
-
-typedef char	*pointer;		/* (void *) if you have it */
-
-extern void	free();
-extern pointer	malloc();
-extern int	fstat(), stat();
-
-extern int	errno;			/* normally done by <errno.h> */
-
-#ifndef NULL
-#define	NULL	0			/* amorphous null pointer constant */
-#endif
-
-#ifndef NAME_MAX
-#define	NAME_MAX	255		/* maximum directory entry size */
-#endif
-
-
-char	*
-getcwd( buf, size )			/* returns pointer to CWD pathname */
-    char		*buf;		/* where to put name (NULL to malloc) */
-    int		size;		/* size of buf[] or malloc()ed memory */
-    {
-    static char	dotdots[] =
-"../../../../../../../../../../../../../../../../../../../../../../../../../..";
-    char		*dotdot;	/* -> dotdots[.], right to left */
-    DIR		*dirp;		/* -> parent directory stream */
-    struct dirent	*dir;		/* -> directory entry */
-    struct stat	stat1,
-            stat2;		/* info from stat() */
-    struct stat	*d = &stat1;	/* -> info about "." */
-    struct stat	*dd = &stat2;	/* -> info about ".." */
-    register char	*buffer;	/* local copy of buf, or malloc()ed */
-    char		*bufend;	/* -> buffer[size] */
-    register char	*endp;		/* -> end of reversed string */
-    register char	*dname;		/* entry name ("" for root) */
-    int		serrno = errno;	/* save entry errno */
-
-    if ( buf != NULL && size <= 0
-#ifndef XPG2
-      || buf == NULL
-#endif
-       )	{
-        errno = EINVAL;		/* invalid argument */
-        return NULL;
-        }
-
-    buffer = buf;
-#ifdef XPG2
-    if ( buf == NULL		/* wants us to malloc() the string */
-      && (buffer = (char *) malloc( (unsigned) size )) == NULL
-    /* XXX -- actually should probably not pay attention to "size" arg */
-       )	{
-        errno = ENOMEM;		/* cannot malloc() specified size */
-        return NULL;
-        }
-#endif
-
-    if ( stat( ".", dd ) != 0 )	/* prime the pump */
-        goto error;		/* errno already set */
-
-    endp = buffer;			/* initially, empty string */
-    bufend = &buffer[size];
-
-    for ( dotdot = &dotdots[sizeof dotdots]; dotdot != dotdots; )
-        {
-        dotdot -= 3;		/* include one more "/.." section */
-                    /* (first time is actually "..") */
-
-        /* swap stat() info buffers */
-        {
-        register struct stat	*temp = d;
-
-        d = dd;			/* new current dir is old parent dir */
-        dd = temp;
-        }
-
-        if ( (dirp = opendir( dotdot )) == NULL )	/* new parent */
-            goto error;	/* errno already set */
-
-        if ( fstat( dirp->dd_fd, dd ) != 0 )
-            {
-            serrno = errno;	/* set by fstat() */
-            (void)closedir( dirp );
-            errno = serrno;	/* in case closedir() clobbered it */
-            goto error;
-            }
-
-        if ( d->st_dev == dd->st_dev )
-            {		/* not crossing a mount point */
-            if ( d->st_ino == dd->st_ino )
-                {	/* root directory */
-                dname = "";
-                goto append;
-                }
-
-            do
-                if ( (dir = readdir( dirp )) == NULL )
-                    {
-                    (void)closedir( dirp );
-                    errno = ENOENT;	/* missing entry */
-                    goto error;
-                    }
-            while ( dir->d_ino != d->st_ino );
-            }
-        else	{		/* crossing a mount point */
-            struct stat	t;	/* info re. test entry */
-            char		name[sizeof dotdots + 1 + NAME_MAX];
-
-            (void)strcpy( name, dotdot );
-            dname = &name[strlen( name )];
-            *dname++ = '/';
-
-            do	{
-                if ( (dir = readdir( dirp )) == NULL )
-                    {
-                    (void)closedir( dirp );
-                    errno = ENOENT;	/* missing entry */
-                    goto error;
-                    }
-
-                (void)strcpy( dname, dir->d_name );
-                /* must fit if NAME_MAX is not a lie */
-                }
-            while ( stat( name, &t ) != 0
-                 || t.st_ino != d->st_ino
-                 || t.st_dev != d->st_dev
-                  );
-            }
-
-        dname = dir->d_name;
-
-        /* append "/" and reversed dname string onto buffer */
-    append:
-        if ( endp != buffer	/* avoid trailing / in final name */
-          || dname[0] == '\0'	/* but allow "/" when CWD is root */
-           )
-            *endp++ = '/';
-
-        {
-        register char	*app;	/* traverses dname string */
-
-        for ( app = dname; *app != '\0'; ++app )
-            ;
-
-        if ( app - dname >= bufend - endp )
-            {
-            (void)closedir( dirp );
-            errno = ERANGE;	/* won't fit allotted space */
-            goto error;
-            }
-
-        while ( app != dname )
-            *endp++ = *--app;
-        }
-
-        (void)closedir( dirp );
-
-        if ( dname[0] == '\0' )	/* reached root; wrap it up */
-            {
-            register char	*startp;	/* -> buffer[.] */
-
-            *endp = '\0';	/* plant null terminator */
-
-            /* straighten out reversed pathname string */
-            for ( startp = buffer; --endp > startp; ++startp )
-                {
-                char	temp = *endp;
-
-                *endp = *startp;
-                *startp = temp;
-                }
-
-            errno = serrno;	/* restore entry errno */
-            /* XXX -- if buf==NULL, realloc here? */
-            return buffer;
-            }
-        }
-
-    errno = ENOMEM;			/* actually, algorithm failure */
-
-    error:
-    if ( buf == NULL )
-        free( (pointer)buffer );
-
-    return NULL;
-    }
-
diff --git a/dmake/unix/xenix/pwd/make.sh b/dmake/unix/xenix/pwd/make.sh
deleted file mode 100644
index 7936e0e11..000000000
--- a/dmake/unix/xenix/pwd/make.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-mkdir objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O infer.c
-mv infer.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O make.c
-mv make.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O stat.c
-mv stat.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O expand.c
-mv expand.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O dmstring.c
-mv dmstring.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O hash.c
-mv hash.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O dag.c
-mv dag.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O dmake.c
-mv dmake.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O path.c
-mv path.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O imacs.c
-mv imacs.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O sysintf.c
-mv sysintf.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O parse.c
-mv parse.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O getinp.c
-mv getinp.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O quit.c
-mv quit.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O state.c
-mv state.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O dmdump.c
-mv dmdump.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O macparse.c
-mv macparse.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O rulparse.c
-mv rulparse.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O percent.c
-mv percent.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O function.c
-mv function.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O unix/arlib.c
-mv arlib.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O unix/dirbrk.c
-mv dirbrk.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O unix/rmprq.c
-mv rmprq.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O unix/ruletab.c
-mv ruletab.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O unix/runargv.c
-mv runargv.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O unix/dcache.c
-mv dcache.o objects
-cc -c -I. -Iunix -Iunix/xenix -DM_XENIX -Iunix/xenix/pwd -O unix/xenix/pwd/getcwd.c
-mv getcwd.o objects
-cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o objects/dcache.o objects/getcwd.o -lx 
-cp unix/xenix/pwd/template.mk startup/config.mk
diff --git a/dmake/unix/xenix/pwd/public.h b/dmake/unix/xenix/pwd/public.h
deleted file mode 100644
index c058a4076..000000000
--- a/dmake/unix/xenix/pwd/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:57:43 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-time_t seek_arch ANSI((char *, char *));
-int touch_arch ANSI(( char *, char *));
-void void_lcache ANSI(( char *, char *));
-int If_root_path ANSI((char *));
-void Remove_prq ANSI((CELLPTR));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-
-#endif
diff --git a/dmake/unix/xenix/pwd/template.mk b/dmake/unix/xenix/pwd/template.mk
deleted file mode 100644
index abd4066c3..000000000
--- a/dmake/unix/xenix/pwd/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= xenix
-   OSENVIRONMENT *:= pwd
diff --git a/dmake/unix/xenix/stdlib.h b/dmake/unix/xenix/stdlib.h
deleted file mode 100644
index 3d3f615ff..000000000
--- a/dmake/unix/xenix/stdlib.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* RCS  $Id: stdlib.h,v 1.1.1.1 2000-09-22 15:33:36 hr Exp $
---
--- SYNOPSIS
---      stdlib interface
--- 
--- DESCRIPTION
---      Specially needed pieces of interface to the standard C lib.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-
-#ifndef _STDLIB_INCLUDED_
-#define _STDLIB_INCLUDED_
-
-extern /*GOTO*/ _exit();
-extern /*GOTO*/ exit();
-extern /*GOTO*/ abort();
-extern int system();
-extern char *getenv();
-extern char *calloc();
-extern char *malloc();
-extern char *realloc();
-
-#ifndef _AIX
-/* The AIX compiler dies on illegal redefinition of free */
-extern free();
-#endif
-
-extern int errno;
-
-#ifndef EIO
-#	include <errno.h>
-#endif
-
-#endif /* _STDLIB_INCLUDED_ */
diff --git a/dmake/unix/xenix/template.mk b/dmake/unix/xenix/template.mk
deleted file mode 100644
index 7ab223fbd..000000000
--- a/dmake/unix/xenix/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= unix
-   OSRELEASE     *:= xenix
-   OSENVIRONMENT *:= 
diff --git a/dmake/unix/xenix/time.h b/dmake/unix/xenix/time.h
deleted file mode 100644
index 512393994..000000000
--- a/dmake/unix/xenix/time.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* RCS  $Id: time.h,v 1.1.1.1 2000-09-22 15:33:36 hr Exp $
---
--- SYNOPSIS
---      time_t
---
--- DESCRIPTION
---      Properly define time_t.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef	TIME_h
-#define	TIME_h
-
-typedef	long	time_t;	/* this is the thing we use */
-
-#endif	TIME_h
-
diff --git a/dmake/vextern.h b/dmake/vextern.h
deleted file mode 100644
index f4402ceea..000000000
--- a/dmake/vextern.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* RCS  $Id: vextern.h,v 1.7 2007-10-15 15:42:04 ihi Exp $
---
--- SYNOPSIS
---      Global variable declarations.
--- 
--- DESCRIPTION
--- 	Leave _DEFINE_GLOBALS_ undefined and the following declarations
---	will be defined as global variables, otherwise you get the
---	external declarations to the same global variables.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
- 
-/* These two are defined in dir/ruletab.c and dir/dirbrk.c, and are always
- * imported as externals by the other code.  Their defining modules do not
- * #include this file. */
-extern	char*	DirBrkStr;	/* pointer to value of macro DIRBRKSTR    */
-extern	char**	Rule_tab;	/* Builtin rules */
- 
-#ifndef _DEFINE_GLOBALS_
-#define EXTERN	extern
-#else
-#define EXTERN
-#endif
- 
-EXTERN	int	Line_number;	/* Current line number in make file parse */
-EXTERN	t_attr	Glob_attr;	/* Global attrs to control global ops     */
-EXTERN	char*	Makedir;	/* pointer to macro value for MAKEDIR     */
-EXTERN	char*	Makedir_macval;	/* value of MAKEDIR (for .WINPATH)        */
-EXTERN	char*	Shell;		/* pointer to macro value for SHELL       */
-EXTERN	char*	Shell_flags;	/* pointer to macro value for SHELLFLAGS  */
-EXTERN	char*	Shell_quote;	/* pointer to macro value for SHELLCMDQUOTE */
-EXTERN	char*	GShell;		/* pointer to macro value for GROUPSHELL  */
-EXTERN	char*	GShell_flags;	/* pointer to macro value for GROUPFLAGS  */
-EXTERN	char*	Shell_metas;	/* pointer to macro value for SHELLMETAS  */
-EXTERN	char*	Grp_suff;	/* pointer to macro value for GROUPSUFFIX */
-EXTERN	char*   DirSepStr;	/* pointer to macro value for DIRSEPSTR   */
-EXTERN	char*	AbsPname;	/* pointer to macro value for ABSMAKECMD  */
-EXTERN	char*	Pname;		/* dmake process invoke name              */
-EXTERN	char*	Pwd;		/* current working dir                    */
-EXTERN	char*	Pwd_macval;	/* value of PWD	(for .WINPATH)            */
-EXTERN	char*	Tmd;		/* path to directory where dmake started  */
-EXTERN	char*	Tmd_macval;	/* value of TMD (for .WINPATH)            */
-EXTERN	char*	Spacechar;	/* pointer to macro value for SPACECHAR   */
-EXTERN	char*	Keep_state;	/* current .KEEP_STATE file		  */
-EXTERN  char*   Escape_char;	/* Current escape character               */
-EXTERN  char*   LastMacName;	/* Last macro successfully parsed	  */
-EXTERN  char*   UseDirCache;    /* The value of .DIRCACHE                 */
-EXTERN  char*   DcacheRespCase; /* TRUE if we are to respect dcache case  */
-EXTERN  char*   OOoDmMode;	/* Enable special behavior for OOo build. */
-EXTERN	int	Target;		/* TRUE if a default target was found in  *
-                 * a makefile or on the commandline       */
-EXTERN	int	If_expand;	/* TRUE if calling Expand from getinp.c   */
-EXTERN  int	Suppress_temp_file;/* TRUE if doing a test in _exec_recipe*/
-EXTERN	int	Readenv;	/* TRUE if defining macro from environment*/
-EXTERN	int	Makemkf;	/* TRUE if making makefile(s)		  */
-EXTERN	int	Nest_level;	/* Nesting level for .IF .ELSE .END ...   */
-EXTERN	int  	Prep;		/* Value of macro PREP			  */
-EXTERN	int	Def_targets;	/* TRUE if defining targets - Only used	  *
-                 * in Def_cell().			  */
-EXTERN  int	Skip_to_eof;	/* TRUE if asked to skip to eof on input  */
-EXTERN	int	NameMax;	/* The value of NAMEMAX                   */
-EXTERN	int	UseWinpath;	/* True if .WINPATH is set for currently  *
-                 * made target.                           */
-#if __CYGWIN__
-EXTERN  char*   CygDrvPre;      /* Drive prefix used by cygwin            */
-EXTERN  int     CygDrvPreLen;   /* Drive prefix length used by cygwin     */
-#endif
-
- 
-EXTERN  CELLPTR Root;		/* Root of the make graph (.ROOT)	  */
-EXTERN  CELLPTR Targets;	/* Targets in makefile (.TARGETS)	  */
- 
-EXTERN  CELLPTR Current_target; /* cell of current target being made      */
-EXTERN  int	Wait_for_completion; /* Wait for subprocess to finish     */
-EXTERN  int	Is_exec_shell;  /* Indicate shell escape                  */
-EXTERN  CELLPTR Shell_exec_target; /* Keep Current_target for _exec__shell */
-EXTERN  FILE*	stdout_redir;   /* For _exec_shell client redirects       */
-EXTERN  int	zerofd;         /* File descriptor for /dev/null          */
-EXTERN  int	Doing_bang;	/* TRUE if target timestamp needs not to be
-                 * updated immediately. */
-EXTERN  int	Packed_shell;	/* TRUE if packed args to use a shell	  */
-#if defined(MSDOS)
-EXTERN  int	Swap_on_exec;	/* TRUE if going to swap on exec call     */
-#endif
-EXTERN  int	State;		/* parser state				  */
-EXTERN  int	Group;		/* parsing a group recipe ==> TRUE        */
- 
-/* Command line option flags are defined here.  They correspond one-for one
- * with the flags defined in dmake.c */
- 
-EXTERN	char    *Augmake;	  /* -A */
-EXTERN  char    Comment;	  /* -c */
-EXTERN	char	Get_env;	  /* -e or -E */
-EXTERN  char*   Notabs;		  /* -B */
-EXTERN	int	Continue;	  /* -k */
-EXTERN	int	Force;		  /* -u */
-EXTERN	int	Listing;	  /* -p */
-EXTERN	int	Rules;		  /* -r */
-EXTERN	int	Trace;		  /* -n */
-EXTERN	int	Touch;		  /* -t */
-EXTERN	int	Check;		  /* -q */
-EXTERN	uint16	Verbose;	  /* -v */
-EXTERN	uint16	Measure;	  /* -m */
-EXTERN	int	Microsoft;	  /* -M */
-EXTERN	int	Transitive;	  /* -T */
-EXTERN  int     No_exec;          /* -X */
-
-EXTERN  HASHPTR Defs[HASH_TABLE_SIZE];
-EXTERN  HASHPTR Macs[HASH_TABLE_SIZE];
-
-EXTERN	char	*Buffer;		/* a general purpose buffer     */
-EXTERN  int	Buffer_size;
-EXTERN  int	Max_proclmt;		/* limit of max # of conc procs */
-EXTERN	int	Max_proc;		/* max # of conc procs		*/
diff --git a/dmake/win95/borland/bcc50/config.h b/dmake/win95/borland/bcc50/config.h
deleted file mode 100644
index 4064f7ee4..000000000
--- a/dmake/win95/borland/bcc50/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* RCS  $Id: config.h,v 1.2 2008-03-05 18:39:58 kz Exp $
---
--- SYNOPSIS
---      Configurarion include file.
--- 
--- DESCRIPTION
--- 	There is one of these for each specific machine configuration.
---	It can be used to further tweek the machine specific sources
---	so that they compile.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* define this for configurations that don't have the coreleft function
- * so that the code compiles.  To my knowledge coreleft exists only on
- * Turbo C, but it is needed here since the function is used in many debug
- * macros. */
-/*#define coreleft() 0L*/
-extern unsigned int coreleft();
-
-#define SIGQUIT	SIGBREAK	/* turbo C doesn't understand SIGQUIT */
-
-/* Turbo-C understands const declarations. */
-#define CONST const
-
-/* a small problem with pointer to voids on some unix machines needs this */
-#define DMPVOID void *
-
-/* Borland redefined the environment variable, sigh */
-#define environ _environ
diff --git a/dmake/win95/borland/bcc50/config.mk b/dmake/win95/borland/bcc50/config.mk
deleted file mode 100644
index b63cae1c1..000000000
--- a/dmake/win95/borland/bcc50/config.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Definition of macros for library, and C startup code.
-osedir    = $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-# Change the CCROOT variable to reflect the installation directory of your
-# C++ compiler.
-.IMPORT .IGNORE : CCVER
-
-CCVER   *:= c:/cc/borland/$(OSENVIRONMENT)
-
-# Definitions for compiles and links
-CSTARTUP  = $(CCVER)/lib/c0x32.obj
-LDLIBS	  = $(CCVER)/lib/cw32 $(CCVER)/lib/import32
-
-CFLAGS    += -A- -w-pro -I$(osedir)
diff --git a/dmake/win95/borland/bcc50/lib.rsp b/dmake/win95/borland/bcc50/lib.rsp
deleted file mode 100644
index 6b6ffb39d..000000000
--- a/dmake/win95/borland/bcc50/lib.rsp
+++ /dev/null
@@ -1,2 +0,0 @@
-c:\cc\borland\bcc50\lib\cw32+
-c:\cc\borland\bcc50\lib\import32
diff --git a/dmake/win95/borland/bcc50/mk.bat b/dmake/win95/borland/bcc50/mk.bat
deleted file mode 100755
index 1c77b3799..000000000
--- a/dmake/win95/borland/bcc50/mk.bat
+++ /dev/null
@@ -1,96 +0,0 @@
-md objects
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  infer.c
-copy infer.obj objects
-del infer.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  make.c
-copy make.obj objects
-del make.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  stat.c
-copy stat.obj objects
-del stat.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  expand.c
-copy expand.obj objects
-del expand.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  dmstring.c
-copy dmstring.obj objects
-del dmstring.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  hash.c
-copy hash.obj objects
-del hash.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  dag.c
-copy dag.obj objects
-del dag.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  dmake.c
-copy dmake.obj objects
-del dmake.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  path.c
-copy path.obj objects
-del path.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  imacs.c
-copy imacs.obj objects
-del imacs.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  sysintf.c
-copy sysintf.obj objects
-del sysintf.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  parse.c
-copy parse.obj objects
-del parse.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  getinp.c
-copy getinp.obj objects
-del getinp.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  quit.c
-copy quit.obj objects
-del quit.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  state.c
-copy state.obj objects
-del state.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  dmdump.c
-copy dmdump.obj objects
-del dmdump.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  macparse.c
-copy macparse.obj objects
-del macparse.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  rulparse.c
-copy rulparse.obj objects
-del rulparse.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  percent.c
-copy percent.obj objects
-del percent.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  function.c
-copy function.obj objects
-del function.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  win95\dchdir.c
-copy dchdir.obj objects
-del dchdir.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  win95\switchar.c
-copy switchar.obj objects
-del switchar.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  msdos\dstrlwr.c
-copy dstrlwr.obj objects
-del dstrlwr.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  msdos\arlib.c
-copy arlib.obj objects
-del arlib.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  msdos\dirbrk.c
-copy dirbrk.obj objects
-del dirbrk.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  win95\borland\tempnam.c
-copy tempnam.obj objects
-del tempnam.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  win95\borland\ruletab.c
-copy ruletab.obj objects
-del ruletab.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  win95\borland\utime.c
-copy utime.obj objects
-del utime.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  win95\borland\runargv.c
-copy runargv.obj objects
-del runargv.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  unix\dcache.c
-copy dcache.obj objects
-del dcache.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  unix\rmprq.c
-copy rmprq.obj objects
-del rmprq.obj
-tlink32  @win95\borland\bcc50\obj.rsp,dmake.exe,NUL.MAP,@win95\borland\bcc50\lib.rsp
-copy win95\borland\bcc50\template.mk startup\config.mk
diff --git a/dmake/win95/borland/bcc50/obj.rsp b/dmake/win95/borland/bcc50/obj.rsp
deleted file mode 100644
index 030127086..000000000
--- a/dmake/win95/borland/bcc50/obj.rsp
+++ /dev/null
@@ -1,32 +0,0 @@
-c:\cc\borland\bcc50\lib\c0x32.obj+
-objects\infer.obj+
-objects\make.obj+
-objects\stat.obj+
-objects\expand.obj+
-objects\dmstring.obj+
-objects\hash.obj+
-objects\dag.obj+
-objects\dmake.obj+
-objects\path.obj+
-objects\imacs.obj+
-objects\sysintf.obj+
-objects\parse.obj+
-objects\getinp.obj+
-objects\quit.obj+
-objects\state.obj+
-objects\dmdump.obj+
-objects\macparse.obj+
-objects\rulparse.obj+
-objects\percent.obj+
-objects\function.obj+
-objects\dchdir.obj+
-objects\switchar.obj+
-objects\dstrlwr.obj+
-objects\arlib.obj+
-objects\dirbrk.obj+
-objects\tempnam.obj+
-objects\ruletab.obj+
-objects\utime.obj+
-objects\runargv.obj+
-objects\dcache.obj+
-objects\rmprq.obj
diff --git a/dmake/win95/borland/bcc50/public.h b/dmake/win95/borland/bcc50/public.h
deleted file mode 100644
index 8b0242c8c..000000000
--- a/dmake/win95/borland/bcc50/public.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:58:03 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int dchdir ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-void Remove_prq ANSI((CELLPTR));
-
-#endif
diff --git a/dmake/win95/borland/bcc50/template.mk b/dmake/win95/borland/bcc50/template.mk
deleted file mode 100644
index b5095c40c..000000000
--- a/dmake/win95/borland/bcc50/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= win95
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= bcc50
diff --git a/dmake/win95/borland/config.mk b/dmake/win95/borland/config.mk
deleted file mode 100644
index 8d5d69df5..000000000
--- a/dmake/win95/borland/config.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# This is the Turbo C++ 2.0 DOS configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# OS specific sources
-OSR_SRC  += tempnam.c ruletab.c
-DOS_SRC += runargv.c rmprq.c
-
-SRC += $(OSR_SRC) $(DOS_SRC)
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS.  Make sure your turboc.cfg
-# file contains a -D__STDC__=1 and -DM_I86=1, if not then uncomment the line
-# below!
-#CFLAGS += -DM_I86=1 -D__STDC__=1
-
-# You can get a smaller executable still, buy adding a -1 to the list of
-# flags below, but then you can't run this on an 8086/88 cpu.
-#CFLAGS += -1
-CFLAGS  += -I$(osrdir) -d -O -N- -w-nod
-ASFLAGS += -t -mx $(S_$(MODEL))
-
-LDOBJS		= $(CSTARTUP) $(OBJDIR)/{$(<:f)}
-LDARGS		= $(LDHEAD) @$(LDTMPOBJ),$(TARGET),NUL.MAP$(LDTAIL)
-LDTAIL		= $(_libs)$(LDFLAGS:s/ //)
-_libs           = $(!null,$(LDLIBS) ,@$(LDTMPLIB))
-LDTMPOBJ	= $(mktmp,,$(DIVFILE) $(LDOBJS:s,/,\\,:t"+\n")\n)
-LDTMPLIB	= $(mktmp,,$(DIVFILE) $(LDLIBS:s,/,\\,:t"+\n")\n)
-
-# Debugging information for Turbo-C
-DB_CFLAGS  += -v
-DB_LDFLAGS += /v
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
-
-.SETDIR=$(osrdir) : $(OSR_SRC)
-.SETDIR=msdos      : $(DOS_SRC)
-
-S_s = -dmsmall
-S_m = -dmmedium
-S_c = -dmcompact
-S_l = -dmlarge
diff --git a/dmake/win95/borland/ruletab.c b/dmake/win95/borland/ruletab.c
deleted file mode 100644
index ad12cd1f3..000000000
--- a/dmake/win95/borland/ruletab.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* RCS  $Id: ruletab.c,v 1.3 2006-06-29 11:32:01 ihi Exp $
---
--- SYNOPSIS
---      Default initial configuration of dmake.
--- 
--- DESCRIPTION
--- 	Define here the initial set of rules that are defined before
---	dmake performs any processing.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* These are control macros for dmake that MUST be defined at some point
- * if they are NOT dmake will not work!  These are default definitions.  They
- * may be overridden inside the .STARTUP makefile, they are here
- * strictly so that dmake can parse the STARTUP makefile */
-
-#include <stdio.h>
-
-static char *_rules[] = {
-    "MAXLINELENGTH := 32766",
-    "MAXPROCESSLIMIT := 4",
-    ".IMPORT .IGNORE: DMAKEROOT",
-    ".MAKEFILES : makefile.mk makefile",
-    ".SOURCE    : .NULL",
-#include "startup.h"
-    (char *)NULL };
-
-char **Rule_tab = _rules; /* for sundry reasons in Get_environment() */
-
diff --git a/dmake/win95/borland/sysintf.h b/dmake/win95/borland/sysintf.h
deleted file mode 100644
index 133749c41..000000000
--- a/dmake/win95/borland/sysintf.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* RCS  $Id: sysintf.h,v 1.3 2007-01-18 09:49:31 vg Exp $
---
--- SYNOPSIS
---      Interfaces for sysintf.c
---
--- DESCRIPTION
---      Abstractions of functions in sysintf.c
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#define DMSTAT stat
-#define VOID_LCACHE(l,m)
-#define GETPID _psp
-#define Hook_std_writes(A)
-
-extern char * tempnam();
-extern char * getcwd();
-
-/*
-** standard C items
-*/
-
-/*
-** DOS interface standard items
-*/
-#define	chdir(p) dchdir(p)
-#define CacheStat(A,B) really_dostat(A,&buf)
-
-/*
-** make parameters
-*/
-#ifdef _POSIX_NAME_MAX
-#undef  _POSIX_NAME_MAX
-#endif
-#define _POSIX_NAME_MAX _MAX_FNAME
-
-#ifdef _POSIX_PATH_MAX
-#undef _POSIX_PATH_MAX
-#endif
-#define _POSIX_PATH_MAX _MAX_PATH
diff --git a/dmake/win95/borland/tempnam.c b/dmake/win95/borland/tempnam.c
deleted file mode 100644
index 01b7ad526..000000000
--- a/dmake/win95/borland/tempnam.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:36 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dos.h>
-
-#if defined(max)
-#   undef  max
-#endif
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-int d_access();
-
-/* Turbo C stdio.h doesn't define P_tmpdir, so let's do it here */
-/* Under DOS leave the default tmpdir pointing here!		*/
-#ifndef P_tmpdir
-static char *P_tmpdir = "";
-#endif
-
-char *
-tempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   static         int count = 0;
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-   char		  buf[30];
-
-#if defined(__WIN32__)
-    unsigned int _psp = rand();
-#endif
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   else if( (tmpdir = getenv("TMP")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+13))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (d_access( strcpy(p, tmpdir), 0) != 0) )
-     if( (dl == 0) || (d_access( strcpy(p, dir), 0) != 0) )
-    if( d_access( strcpy(p, P_tmpdir), 0) != 0 )
-       if( !prefix )
-          prefix = "tp";
-
-   if(prefix)
-   {
-      *(p+strlen(p)+2) = '\0';
-      (void)strncat(p, prefix, 2);
-   }
-
-   sprintf( buf, "%08x", _psp );
-   buf[6]='\0';
-   (void)strcat(p, buf );
-   sprintf( buf, "%04d", count++ );
-   q=p+strlen(p)-6;
-   *q++ = buf[0]; *q++ = buf[1];
-   *q++ = buf[2]; *q   = buf[3];
-
-   if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
-
-   return(p);
-}
-
-
-
-d_access( name, flag )
-char *name;
-int  flag;
-{
-   extern char *DirSepStr;
-   char *p;
-   int r;
-
-   if( name == NULL || !*name ) return(1);  /* NULL dir means current dir */
-   r = access( name, flag );
-   p = name+strlen(name)-1;
-
-   if(*p != '/' && *p != '\\') strcat( p, DirSepStr );
-
-   return( r );
-}
diff --git a/dmake/win95/config.mk b/dmake/win95/config.mk
deleted file mode 100644
index 721be05b0..000000000
--- a/dmake/win95/config.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# This is an OS specific configuration file
-#	It assumes that OBJDIR, TARGET and DEBUG are previously defined.
-#	It defines	CFLAGS, LDARGS, CPPFLAGS, STARTUPFILE, LDOBJS
-#	It augments	SRC, OBJDIR, TARGET, CFLAGS, LDLIBS
-#
-
-# Memory model to compile for
-# set to s - small, m - medium, c - compact, l - large
-# Need large model now, dmake has grown up :-)
-MODEL = l
-
-STARTUPFILE	= startup/startup.mk
-
-CPPFLAGS 	= $(CFLAGS)
-
-# Debug flags
-DB_CFLAGS	= -DDBUG
-DB_LDFLAGS	=
-DB_LDLIBS	=
-
-# NO Debug flags
-NDB_CFLAGS	=
-NDB_LDFLAGS	=
-NDB_LDLIBS	=
-
-# Local configuration modifications for CFLAGS.
-CFLAGS += -I$(OS)
-
-# Common Win32 source files.
-OS_SRC  += dchdir.c switchar.c
-
-# Imported MSDOS Files.
-DOSSRC  += dstrlwr.c arlib.c dirbrk.c
-
-SRC += $(OS_SRC) $(UNIXSRC) $(DOSSRC)
-
-# Provide our own %$O : %$S rule.
-%$O : %$S
-    +$(AS) $(ASFLAGS) \
-    $(<:s,\,${__.DIVSEP-sh-${USESHELL}},:s,/,${__.DIVSEP-sh-${USESHELL}},);
-    mv $(@:f) $(OBJDIR)
-
-# Set source dirs so that we can find files named in this
-# config file.
-.SOURCE.h : $(OS)
-
-# See if we modify anything in the lower levels.
-.IF $(OSRELEASE) != $(NULL)
-   .INCLUDE : $(OS)$(DIRSEPSTR)$(OSRELEASE)$(DIRSEPSTR)config.mk
-.END
-
-.SETDIR=msdos : $(DOSSRC)
-.SETDIR=$(OS) : $(ASRC) $(OS_SRC)
diff --git a/dmake/win95/dchdir.c b/dmake/win95/dchdir.c
deleted file mode 100644
index 7398b0f4c..000000000
--- a/dmake/win95/dchdir.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* RCS  $Id: dchdir.c,v 1.1.1.1 2000-09-22 15:33:36 hr Exp $
---
--- SYNOPSIS
---      Change directory.
--- 
--- DESCRIPTION
---	Under DOS change the current drive as well as the current directory.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <direct.h>
-#include "extern.h"
-
-PUBLIC int
-dchdir(path)
-char *path;
-{
-   int   res;
-
-   res = chdir(path);
-
-   if (res != -1 && path[1] == ':') {
-      unsigned new_drive;
-
-      /* for WIN32 just use the _chdrive library call */
-      new_drive = (*path & ~0x20) - 'A' + 1;
-      _chdrive(new_drive);
-   }
-
-   return (res);
-}
diff --git a/dmake/win95/microsft/config.h b/dmake/win95/microsft/config.h
deleted file mode 100644
index 846df323f..000000000
--- a/dmake/win95/microsft/config.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* $RCSfile: config.h,v $
--- $Revision: 1.14 $
--- last change: $Author: kz $ $Date: 2008-03-05 18:40:17 $
---
--- SYNOPSIS
---      Configurarion include file.
--- 
--- DESCRIPTION
--- 	There is one of these for each specific machine configuration.
---	It can be used to further tweek the machine specific sources
---	so that they compile.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* Attention! In the UNIX like builds with the ./configure ; make
-   procedure a config.h is generated. The autogenerated config.h
-   must not be there to compile dmake with MSC and the
-   "dmake\make.bat win95-vpp40" command. This file sets (among other
-   things) the needed HAS_... and HAVE_... macros.
-
-   Don't forget to update the PACKAGE and VERSION macros!
-*/
-
-/* Name and version number of this package */
-#define PACKAGE "dmake"
-#define VERSION "4.12"
-#define BUILDINFO "Windows / MS Visual C++"
-
-#if defined (_MSC_VER)
-# if _MSC_VER < 500
-    Force a compile-time blowup.
-    Do not define "#define _MSC_VER" for MSC compilers earlier than 5.0.
-# endif
-#endif
-
-/* define this for configurations that don't have the coreleft function
- * so that the code compiles.  To my knowledge coreleft exists only on
- * Turbo C, but it is needed here since the function is used in many debug
- * macros. */
-#define coreleft() 0L
-
-/* MSC Version 4.0 doesn't understand SIGTERM, later versions do. */
-/* config.h is included before signal.h therefore test MSC version */
-#if _MSC_VER < 500
-#   define SIGTERM SIGINT
-#endif
-
-/* Fixes unimplemented line buffering for MSC 5.x and 6.0.
- * MSC _IOLBF is the same as _IOFBF
- */
-#if defined(MSDOS) && defined (_MSC_VER)
-#   undef  _IOLBF
-#   define _IOLBF   _IONBF
-#endif
-
-/* in alloc.h: size_t is redefined
- * defined in stdio.h which is included by alloc.h
- */
-#if defined(MSDOS) && defined (_MSC_VER)
-#   define _TYPES_
-#endif
-
-/* in sysintf.c: SIGQUIT is used, this is not defined in MSC */
-#ifndef SIGQUIT
-#   define SIGQUIT SIGTERM
-#endif
-
-/* MSC didn't seem to care about CONST in the past */
-#ifndef CONST
-#   define CONST
-#endif
-
-/* Assume case insensitive file system. */
-#define CASE_INSENSITIVE_FS 1
-
-/* MSC has sys/types.h and sys/stat.h (this is tested only with MSVC++ 6.0) */
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_STAT_H 1
-
-/* These functions are available! (this is tested only with MSVC++ 6.0) */
-#define HAVE_GETCWD 1
-#define HAVE_UTIME_NULL 1
-#define HAVE_TZSET 1
-#define HAVE_STRLWR 1
-
-#define HAVE_ERRNO_H 1
-#define HAVE_STRERROR 1
-#define HAVE_TEMPNAM 1
-#define HAVE_FCNTL_H 1
-
-/* These defines are needed for itypes.h! (this is tested only with MSVC++ 6.0) */
-#define SIZEOF_INT 4
-#define SIZEOF_LONG 4
-#define SIZEOF_SHORT 2
-
-#ifndef MSDOS
-#   define MSDOS 1
-#endif
-
-/* a small problem with pointer to voids on some unix machines needs this */
-#define DMPVOID void *
-
-/* Use my own tempnam for MSC Version less than 6.0 */
-#if _MSC_VER < 600
-#   define tempnam dtempnam
-#endif
-
diff --git a/dmake/win95/microsft/config.mk b/dmake/win95/microsft/config.mk
deleted file mode 100644
index acc43fd31..000000000
--- a/dmake/win95/microsft/config.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# This is the MSC 4.0 and higher DOS configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-TMPDIR :=
-.EXPORT : TMPDIR
-
-# Definition of macros for library, and C startup code.
-
-# The following sources are required for MSC
-OSR_SRC += ruletab.c
-UNX_SRC += runargv.c rmprq.c
-
-.SETDIR=$(osrdir) : $(OSR_SRC)
-.SETDIR=unix      : $(UNX_SRC)
-
-SRC += $(OSR_SRC) $(UNX_SRC)
-.SOURCE.h : $(osrdir)
-
-SET_STACK  = /stack:4096
-ASFLAGS   += -t -mx $(S_$(MODEL))
-
-# Microsoft C doesn't need tail but needs head
-LDOBJS         != $(CSTARTUP) $(OBJDIR)/{$(<:f)}
-LDTAIL         !=
-LDHEAD         != $(LDFLAGS)
-LDARGS	       != $(LDHEAD) -out:$(TARGET) @$(LDTMPOBJ) $(LDTAIL)
-LDTAIL	       != $(_libs)
-_libs          != $(!null,$(LDLIBS) ,@$(LDTMPLIB))
-LDTMPOBJ       != $(mktmp,,$(DIVFILE) $(LDOBJS:s,/,\,:t"\n"))
-LDTMPLIB       != $(mktmp,,$(DIVFILE) $(LDLIBS:s,/,\,:t"\n"))
-
-# Debugging libraries and flags
-DB_LDFLAGS += /nologo /co /li /map
-DB_LDLIBS  +=
-DB_CFLAGS  += -Zi
-
-# NO Debug MSC flags:
-# Set the environment variable MSC_VER to be one of 5.1, 6.0, 8.0 (for VC++4.0)
-# to get these by default when you make dmake using 'dmake'.
-#
-
-NDB_LDFLAGS += /nologo
-CFLAGS      += -I$(osrdir)
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-  .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
-
-CFLAGS      += /nologo
-
-S_s = -Dmsmall
-S_m = -Dmmedium
-S_c = -Dmcompact
-S_l = -Dmlarge
diff --git a/dmake/win95/microsft/optoff.h b/dmake/win95/microsft/optoff.h
deleted file mode 100644
index d11076624..000000000
--- a/dmake/win95/microsft/optoff.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* RCS  $Id: optoff.h,v 1.1.1.1 2000-09-22 15:33:36 hr Exp $
---
--- SYNOPSIS
---      Turn off microsoft loop optimization.
---
--- DESCRIPTION
---      This is broken in some pre 600 compilers so just turn it off.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-#if _MSC_VER < 600
-# pragma loop_opt(off)
-#endif
diff --git a/dmake/win95/microsft/ruletab.c b/dmake/win95/microsft/ruletab.c
deleted file mode 100644
index fa2165a3a..000000000
--- a/dmake/win95/microsft/ruletab.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* RCS  $Id: ruletab.c,v 1.5 2008-03-05 18:40:54 kz Exp $
---
--- SYNOPSIS
---      Default initial configuration of dmake.
---
--- DESCRIPTION
--- 	Define here the initial set of rules that are defined before
---	dmake performs any processing.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* These are control macros for dmake that MUST be defined at some point
- * if they are NOT dmake will not work!  These are default definitions.  They
- * may be overridden inside the .STARTUP makefile, they are here
- * strictly so that dmake can parse the STARTUP makefile */
-
-#include "extern.h"
-
-#if !defined(MAXIMUM_WAIT_OBJECTS)
-#define MAXIMUM_WAIT_OBJECTS 1
-#endif
-
-/* To stringify the result of the expansion of a macro argument
- * use two levels of macros. */
-#define dmstr2(s) dmstr1(s)
-#define dmstr1(s) #s
-
-static char *_rules[] = {
-    "MAXLINELENGTH := 32766",
-    "MAXPROCESSLIMIT := " dmstr2(MAXIMUM_WAIT_OBJECTS) ,
-    ".IMPORT .IGNORE: DMAKEROOT",
-    ".MAKEFILES : makefile.mk makefile",
-    ".SOURCE    : .NULL",
-#include "startup.h"
-#if __MINGW32__
-#   include "dmakeroot.h"
-#endif
-    (char *)NULL };
-
-char **Rule_tab = _rules; /* for sundry reasons in Get_environment() */
-
diff --git a/dmake/win95/microsft/sysintf.h b/dmake/win95/microsft/sysintf.h
deleted file mode 100644
index 086e0b385..000000000
--- a/dmake/win95/microsft/sysintf.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* RCS  $Id: sysintf.h,v 1.3 2007-01-18 09:50:52 vg Exp $
---
--- SYNOPSIS
---      Interfaces for sysintf.c
---
--- DESCRIPTION
---      Abstractions of functions in sysintf.c
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#define DMSTAT stat
-#define VOID_LCACHE(l,m)
-#define GETPID _psp
-#define Hook_std_writes(A)
-
-extern char * tempnam();
-extern char * getcwd();
-
-/* for directory cache */
-#define CacheStat(A,B)	really_dostat(A,&buf)
-
-/*
-** standard C items
-*/
-
-/*
-** DOS interface standard items
-*/
-#define	chdir(p) dchdir(p)
-
-/*
-** make parameters
-*/
-#ifdef _POSIX_NAME_MAX
-#undef  _POSIX_NAME_MAX
-#endif
-#define _POSIX_NAME_MAX _MAX_FNAME
-
-#ifdef _POSIX_PATH_MAX
-#undef _POSIX_PATH_MAX
-#endif
-#define _POSIX_PATH_MAX _MAX_PATH
diff --git a/dmake/win95/microsft/tempnam.c b/dmake/win95/microsft/tempnam.c
deleted file mode 100644
index 5f8ce9edd..000000000
--- a/dmake/win95/microsft/tempnam.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:37 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <process.h>
-
-#if defined(max)
-#   undef  max
-#endif
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-int d_access();
-
-/* MSC stdio.h defines P_tmpdir, so let's undo it here */
-/* Under DOS leave the default tmpdir pointing here!		*/
-#ifdef P_tmpdir
-#undef P_tmpdir
-#endif
-static char *P_tmpdir = "";
-
-char *
-dtempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   static         int count = 0;
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-   char		  buf[30];
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   else if( (tmpdir = getenv("TMP")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+13))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (d_access( strcpy(p, tmpdir), 0) != 0) )
-     if( (dl == 0) || (d_access( strcpy(p, dir), 0) != 0) )
-    if( d_access( strcpy(p, P_tmpdir), 0) != 0 )
-       if( !prefix )
-          prefix = "tp";
-
-   if(prefix)
-   {
-      *(p+strlen(p)+2) = '\0';
-      (void)strncat(p, prefix, 2);
-   }
-
-   sprintf( buf, "%08x", getpid() );
-   buf[6]='\0';
-   (void)strcat(p, buf );
-   sprintf( buf, "%04d", count++ );
-   q=p+strlen(p)-6;
-   *q++ = buf[0]; *q++ = buf[1];
-   *q++ = buf[2]; *q++ = buf[3];
-
-   if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
-
-   return(p);
-}
-
-
-
-d_access( name, flag )
-char *name;
-int  flag;
-{
-   extern char *DirSepStr;
-   char *p;
-   int r;
-
-   if( name == NULL || !*name ) return(1);  /* NULL dir means current dir */
-   r = access( name, flag );
-   p = name+strlen(name)-1;
-   if(*p != '/' && *p != '\\') strcat( p, DirSepStr );
-
-   return( r );
-}
diff --git a/dmake/win95/microsft/vpp40/config.mk b/dmake/win95/microsft/vpp40/config.mk
deleted file mode 100644
index 14fe952ea..000000000
--- a/dmake/win95/microsft/vpp40/config.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Definition of macros for library, and C startup code.
-osedir        = $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-.IMPORT .IGNORE : MSC_VER
-MSC_VER      *= 8.0
-
-CFLAGS       += -I$(osedir)
-
-NDB_CFLAGS   += -Od -GF -Ge
-NDB_LDFLAGS  +=
-NDB_LDLIBS   +=
-
-# Redefine rule for making our objects, we don't need mv
-%$O : %.c ;% $(CC) -c $(CFLAGS) -Fo$@ $<
diff --git a/dmake/win95/microsft/vpp40/lib.rsp b/dmake/win95/microsft/vpp40/lib.rsp
deleted file mode 100644
index 8b1378917..000000000
--- a/dmake/win95/microsft/vpp40/lib.rsp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dmake/win95/microsft/vpp40/mk.bat b/dmake/win95/microsft/vpp40/mk.bat
deleted file mode 100755
index 1f1cee1d0..000000000
--- a/dmake/win95/microsft/vpp40/mk.bat
+++ /dev/null
@@ -1,41 +0,0 @@
-if not "%1" == "" goto link 
-if exist objects rd /S /Q objects
-if exist config.h del config.h
-if exist dmake.exe del dmake.exe
-md objects
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\infer.obj infer.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\make.obj make.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\stat.obj stat.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\expand.obj expand.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dmstring.obj dmstring.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\hash.obj hash.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dag.obj dag.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dmake.obj dmake.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\path.obj path.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\imacs.obj imacs.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\sysintf.obj sysintf.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\parse.obj parse.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\getinp.obj getinp.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\quit.obj quit.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\state.obj state.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dmdump.obj dmdump.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\macparse.obj macparse.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\rulparse.obj rulparse.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\percent.obj percent.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\function.obj function.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dchdir.obj win95\dchdir.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\switchar.obj win95\switchar.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dstrlwr.obj msdos\dstrlwr.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\arlib.obj msdos\arlib.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dirbrk.obj msdos\dirbrk.c
-rem Not needed for MSVC 6 and up. Lesser versions not supported
-rem cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\tempnam.obj tempnam.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\ruletab.obj win95\microsft\ruletab.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\runargv.obj unix\runargv.c
-cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\rmprq.obj unix\rmprq.c
-
-:link
-rem link /nologo /out:dmake.exe @fix95nt\win95\microsft\vpp40\obj.rsp
-if "%c_flg%" == "" link /out:dmake.exe @.\win95\microsft\vpp40\obj.rsp
-if not "%c_flg%" == "" link /DEBUG:notmapped,full /DEBUGTYPE:cv /PDB:NONE /out:dmake.exe @.\win95\microsft\vpp40\obj.rsp
-copy win95\microsft\vpp40\template.mk startup\config.mk
diff --git a/dmake/win95/microsft/vpp40/obj.rsp b/dmake/win95/microsft/vpp40/obj.rsp
deleted file mode 100644
index ae89a27c3..000000000
--- a/dmake/win95/microsft/vpp40/obj.rsp
+++ /dev/null
@@ -1,28 +0,0 @@
-objects\infer.obj
-objects\make.obj
-objects\stat.obj
-objects\expand.obj
-objects\dmstring.obj
-objects\hash.obj
-objects\dag.obj
-objects\dmake.obj
-objects\path.obj
-objects\imacs.obj
-objects\sysintf.obj
-objects\parse.obj
-objects\getinp.obj
-objects\quit.obj
-objects\state.obj
-objects\dmdump.obj
-objects\macparse.obj
-objects\rulparse.obj
-objects\percent.obj
-objects\function.obj
-objects\dchdir.obj
-objects\switchar.obj
-objects\dstrlwr.obj
-objects\arlib.obj
-objects\dirbrk.obj
-objects\ruletab.obj
-objects\runargv.obj
-objects\rmprq.obj
diff --git a/dmake/win95/microsft/vpp40/public.h b/dmake/win95/microsft/vpp40/public.h
deleted file mode 100644
index 7a118a971..000000000
--- a/dmake/win95/microsft/vpp40/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.8 2007-10-15 15:58:42 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int dchdir ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void Clean_up_processes ANSI(());
-int Wait_for_child ANSI((int, int));
-void Remove_prq ANSI((CELLPTR));
-
-#endif
diff --git a/dmake/win95/microsft/vpp40/runargv.c b/dmake/win95/microsft/vpp40/runargv.c
deleted file mode 100644
index a85a5878c..000000000
--- a/dmake/win95/microsft/vpp40/runargv.c
+++ /dev/null
@@ -1,288 +0,0 @@
-Blake sent me the wrong one.
-
-/* RCS  $Id: runargv.c,v 1.2 2007-10-15 15:58:54 ihi Exp $
---
--- SYNOPSIS
---      Invoke a sub process.
--- 
--- DESCRIPTION
--- 	Use the standard methods of executing a sub process.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <process.h>
-#include <errno.h>
-#include <signal.h>
-#include "extern.h"
-#include "sysintf.h"
-
-extern char **environ;
-
-typedef struct prp {
-   char *prp_cmd;
-   int   prp_group;
-   int   prp_ignore;
-   int   prp_last;
-   int	 prp_shell;
-   struct prp *prp_next;
-} RCP, *RCPPTR;
-
-typedef struct pr {
-   int		pr_valid;
-   int		pr_pid;
-   CELLPTR	pr_target;
-   int		pr_ignore;
-   int		pr_last;
-   RCPPTR  	pr_recipe;
-   RCPPTR  	pr_recipe_end;
-   char        *pr_dir;
-} PR;
-
-static PR  *_procs    = NIL(PR);
-static int  _proc_cnt = 0;
-static int  _abort_flg= FALSE;
-static int  _use_i    = -1;
-static int  _do_upd   = 0;
-
-static  void	_add_child ANSI((int, CELLPTR, int, int));
-static  void	_attach_cmd ANSI((char *, int, int, CELLPTR, int, int));
-static  void    _finished_child ANSI((int, int));
-static  int     _running ANSI((CELLPTR));
-
-PUBLIC int
-runargv(target, ignore, group, last, shell, cmd)
-CELLPTR target;
-int     ignore;
-int	group;
-int	last;
-int     shell;
-char	*cmd;
-{
-   extern  int  errno;
-   extern  char *sys_errlist[];
-   int          pid;
-   char         **argv;
-
-   if( _running(target) /*&& Max_proc != 1*/ ) {
-      /* The command will be executed when the previous recipe
-       * line completes. */
-      _attach_cmd( cmd, group, ignore, target, last, shell );
-      return(1);
-   }
-
-   while( _proc_cnt == Max_proc )
-      if( Wait_for_child(FALSE, -1) == -1 )  Fatal( "Lost a child %d", errno );
-
-   argv = Pack_argv( group, shell, cmd );
-
-   pid = _spawnvpe(_P_NOWAIT, argv[0], argv, environ);
-   if (pid == -1)  {  /*  failed  */
-       Error("%s: %s", argv[0], sys_errlist[errno]);
-       Handle_result(-1, ignore, _abort_flg, target);
-       return(-1);
-   } else
-       _add_child(pid, target, ignore, last);
-
-   return(1);
-}
-
-
-PUBLIC int
-Wait_for_child( abort_flg, pid )
-int abort_flg;
-int pid;
-{
-   int wid;
-   int status;
-   int waitchild;
-
-   waitchild = (pid == -1)? FALSE : Wait_for_completion;
-
-   do {
-      if( (wid = wait(&status)) == -1 ) return(-1);
-
-      _abort_flg = abort_flg;
-      _finished_child(wid, status);
-      _abort_flg = FALSE;
-   } while( waitchild && pid != wid );
-
-   return(0);
-}
-
-
-PUBLIC void
-Clean_up_processes()
-{
-   register int i;
-
-   if( _procs != NIL(PR) ) {
-      for( i=0; i<Max_proc; i++ )
-     if( _procs[i].pr_valid )
-        kill(_procs[i].pr_pid, SIGTERM);
-
-      while( Wait_for_child(TRUE, -1) != -1 );
-   }
-}
-
-
-static void
-_add_child( pid, target, ignore, last )
-int	pid;
-CELLPTR target;
-int	ignore;
-int     last;
-{
-   register int i;
-   register PR *pp;
-
-   if( _procs == NIL(PR) ) {
-      TALLOC( _procs, Max_proc, PR );
-   }
-
-   if( (i = _use_i) == -1 )
-      for( i=0; i<Max_proc; i++ )
-     if( !_procs[i].pr_valid )
-        break;
-
-   pp = _procs+i;
-
-   pp->pr_valid  = 1;
-   pp->pr_pid    = pid;
-   pp->pr_target = target;
-   pp->pr_ignore = ignore;
-   pp->pr_last   = last;
-   pp->pr_dir    = DmStrDup(Get_current_dir());
-
-   Current_target = NIL(CELL);
-
-   _proc_cnt++;
-
-   if( Wait_for_completion ) Wait_for_child( FALSE, pid );
-}
-
-
-static void
-_finished_child(pid, status)
-int	pid;
-int	status;
-{
-   register int i;
-   register PR *pp;
-   char     *dir;
-
-   for( i=0; i<Max_proc; i++ )
-      if( _procs[i].pr_valid && _procs[i].pr_pid == pid )
-     break;
-
-   /* Some children we didn't make esp true if using /bin/sh to execute a
-    * a pipe and feed the output as a makefile into dmake. */
-   if( i == Max_proc ) return;
-   _procs[i].pr_valid = 0;
-   _proc_cnt--;
-   dir = DmStrDup(Get_current_dir());
-   Set_dir( _procs[i].pr_dir );
-
-   if( _procs[i].pr_recipe != NIL(RCP) && !_abort_flg ) {
-      RCPPTR rp = _procs[i].pr_recipe;
-
-
-      Current_target = _procs[i].pr_target;
-      Handle_result( status, _procs[i].pr_ignore, FALSE, _procs[i].pr_target );
-      Current_target = NIL(CELL);
-
-      if ( _procs[i].pr_target->ce_attr & A_ERROR ) {
-     _procs[i].pr_last = TRUE;
-     goto ABORT_REMAINDER_OF_RECIPE;
-      }
-
-      _procs[i].pr_recipe = rp->prp_next;
-
-      _use_i = i;
-      runargv( _procs[i].pr_target, rp->prp_ignore, rp->prp_group,
-           rp->prp_last, rp->prp_shell, rp->prp_cmd );
-      _use_i = -1;
-
-      FREE( rp->prp_cmd );
-      FREE( rp );
-
-      if( _proc_cnt == Max_proc ) Wait_for_child( FALSE, -1 );
-   }
-   else {
-      Handle_result(status,_procs[i].pr_ignore,_abort_flg,_procs[i].pr_target);
-
- ABORT_REMAINDER_OF_RECIPE:
-      if( _procs[i].pr_last ) {
-     FREE(_procs[i].pr_dir );
-
-     if( !Doing_bang ) Update_time_stamp( _procs[i].pr_target );
-      }
-   }
-
-   Set_dir(dir);
-   FREE(dir);
-}
-
-
-static int
-_running( cp )
-CELLPTR cp;
-{
-   register int i;
-
-   if( !_procs ) return(FALSE);
-
-   for( i=0; i<Max_proc; i++ )
-      if( _procs[i].pr_valid &&
-      _procs[i].pr_target == cp  )
-     break;
-     
-   return( i != Max_proc );
-}
-
-
-static void
-_attach_cmd( cmd, group, ignore, cp, last, shell )
-char    *cmd;
-int	group;
-int     ignore;
-CELLPTR cp;
-int     last;
-int     shell;
-{
-   register int i;
-   RCPPTR rp;
-
-   for( i=0; i<Max_proc; i++ )
-      if( _procs[i].pr_valid &&
-      _procs[i].pr_target == cp  )
-     break;
-
-   TALLOC( rp, 1, RCP );
-   rp->prp_cmd   = DmStrDup(cmd);
-   rp->prp_group = group;
-   rp->prp_ignore= ignore;
-   rp->prp_last  = last;
-   rp->prp_shell = shell;
-
-   if( _procs[i].pr_recipe == NIL(RCP) )
-      _procs[i].pr_recipe = _procs[i].pr_recipe_end = rp;
-   else {
-      _procs[i].pr_recipe_end->prp_next = rp;
-      _procs[i].pr_recipe_end = rp;
-   }
-}
diff --git a/dmake/win95/microsft/vpp40/template.mk b/dmake/win95/microsft/vpp40/template.mk
deleted file mode 100644
index d4e6c9eb9..000000000
--- a/dmake/win95/microsft/vpp40/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= win95
-   OSRELEASE     *:= microsft
-   OSENVIRONMENT *:= vpp40
diff --git a/dmake/win95/microsft/vpp40/tempnam.c b/dmake/win95/microsft/vpp40/tempnam.c
deleted file mode 100644
index 3cb6cce71..000000000
--- a/dmake/win95/microsft/vpp40/tempnam.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:37 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dos.h>
-
-#if defined(max)
-#   undef  max
-#endif
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-int d_access();
-
-/* MSC stdio.h defines P_tmpdir, so let's undo it here */
-/* Under DOS leave the default tmpdir pointing here!		*/
-#ifdef P_tmpdir
-#undef P_tmpdir
-#endif
-static char *P_tmpdir = "";
-
-char *
-tempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   static         int count = 0;
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-   char		  buf[30];
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   else if( (tmpdir = getenv("TMP")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+13))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (d_access( strcpy(p, tmpdir), 0) != 0) )
-     if( (dl == 0) || (d_access( strcpy(p, dir), 0) != 0) )
-    if( d_access( strcpy(p, P_tmpdir), 0) != 0 )
-       if( !prefix )
-          prefix = "tp";
-
-   if(prefix)
-   {
-      *(p+strlen(p)+2) = '\0';
-      (void)strncat(p, prefix, 2);
-   }
-
-   sprintf( buf, "%08x", _psp );
-   buf[6]='\0';
-   (void)strcat(p, buf );
-   sprintf( buf, "%04d", count++ );
-   q=p+strlen(p)-6;
-   *q++ = buf[0]; *q++ = buf[1];
-   *q++ = buf[2]; *q++ = buf[3];
-
-   if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
-
-   return(p);
-}
-
-
-
-d_access( name, flag )
-char *name;
-int  flag;
-{
-   extern char *DirSepStr;
-   char *p;
-   int r;
-
-   if( name == NULL || !*name ) return(1);  /* NULL dir means current dir */
-   r = access( name, flag );
-   p = name+strlen(name)-1;
-   if(*p != '/' && *p != '\\') strcat( p, DirSepStr );
-
-   return( r );
-}
diff --git a/dmake/win95/startup.h b/dmake/win95/startup.h
deleted file mode 100644
index af0f88c1e..000000000
--- a/dmake/win95/startup.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* RCS  $Id: startup.h,v 1.2 2006-04-20 12:23:16 hr Exp $
---
--- SYNOPSIS
---      Definition of MAKESTARTUP
---
--- DESCRIPTION
---      Default MAKESTARTUP value defining where dmake locates the
---      startup file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-"DMAKEROOT *= $(ABSMAKECMD:d)startup",
-"MAKESTARTUP := $(DMAKEROOT)\\startup.mk",
diff --git a/dmake/win95/switchar.c b/dmake/win95/switchar.c
deleted file mode 100644
index 6daae2646..000000000
--- a/dmake/win95/switchar.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* RCS  $Id: switchar.c,v 1.1.1.1 2000-09-22 15:33:36 hr Exp $
---
--- SYNOPSIS
---      switchar settings
--- 
--- DESCRIPTION
---      Figure out the value of switchar.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "stdmacs.h"
-
-getswitchar()/*
-===============
-   Try the environment first.  If you don't find SWITCHAR there, then use
-   the DOS call.  The call is undocumented, and doesn't work for DOS versions
-   4.0 and up, so the check of the environment will fix that. */
-{
-   static char *_env_switchar = NIL(char);
-
-   if( _env_switchar != NIL(char) ||
-       (_env_switchar = (char *)getenv("SWITCHAR")) != NIL(char) )
-      return(*_env_switchar);
-
-   return ('/');
-}
diff --git a/dmake/winnt/borland/bcc50/config.h b/dmake/winnt/borland/bcc50/config.h
deleted file mode 100644
index e4a8ff400..000000000
--- a/dmake/winnt/borland/bcc50/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* RCS  $Id: config.h,v 1.2 2008-03-05 18:41:34 kz Exp $
---
--- SYNOPSIS
---      Configurarion include file.
--- 
--- DESCRIPTION
--- 	There is one of these for each specific machine configuration.
---	It can be used to further tweek the machine specific sources
---	so that they compile.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* define this for configurations that don't have the coreleft function
- * so that the code compiles.  To my knowledge coreleft exists only on
- * Turbo C, but it is needed here since the function is used in many debug
- * macros. */
-/*#define coreleft() 0L*/
-extern unsigned int coreleft();
-
-#define SIGQUIT	SIGBREAK	/* turbo C doesn't understand SIGQUIT */
-
-/* Turbo-C understands const declarations. */
-#define CONST const
-
-/* a small problem with pointer to voids on some unix machines needs this */
-#define DMPVOID void *
-
-/* Borland redefined the environment variable, sigh */
-#define environ _environ
diff --git a/dmake/winnt/borland/bcc50/config.mk b/dmake/winnt/borland/bcc50/config.mk
deleted file mode 100644
index 6e4fbd89e..000000000
--- a/dmake/winnt/borland/bcc50/config.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Definition of macros for library, and C startup code.
-osedir    = $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-# Change the CCROOT variable to reflect the installation directory of your
-# C++ compiler.
-CCVER   *:= c:/cc/borland/$(OSENVIRONMENT)
-
-# Definitions for compiles and links
-CSTARTUP  = $(CCVER)/lib/c0x32.obj
-LDLIBS	  = $(CCVER)/lib/cw32 $(CCVER)/lib/import32
-
-CFLAGS    += -A- -w-pro -I$(osedir)
diff --git a/dmake/winnt/borland/bcc50/lib.rsp b/dmake/winnt/borland/bcc50/lib.rsp
deleted file mode 100644
index 0bad32e71..000000000
--- a/dmake/winnt/borland/bcc50/lib.rsp
+++ /dev/null
@@ -1,2 +0,0 @@
-c:\cc\borland\bcc50\lib\cw32
-c:\cc\borland\bcc50\lib\import32
diff --git a/dmake/winnt/borland/bcc50/mk.bat b/dmake/winnt/borland/bcc50/mk.bat
deleted file mode 100755
index f6e3c75fc..000000000
--- a/dmake/winnt/borland/bcc50/mk.bat
+++ /dev/null
@@ -1,95 +0,0 @@
-md objects
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  infer.c
-copy infer.obj objects
-del infer.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  make.c
-copy make.obj objects
-del make.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  stat.c
-copy stat.obj objects
-del stat.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  expand.c
-copy expand.obj objects
-del expand.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  dmstring.c
-copy dmstring.obj objects
-del dmstring.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  hash.c
-copy hash.obj objects
-del hash.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  dag.c
-copy dag.obj objects
-del dag.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  dmake.c
-copy dmake.obj objects
-del dmake.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  path.c
-copy path.obj objects
-del path.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  imacs.c
-copy imacs.obj objects
-del imacs.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  sysintf.c
-copy sysintf.obj objects
-del sysintf.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  parse.c
-copy parse.obj objects
-del parse.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  getinp.c
-copy getinp.obj objects
-del getinp.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  quit.c
-copy quit.obj objects
-del quit.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  state.c
-copy state.obj objects
-del state.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  dmdump.c
-copy dmdump.obj objects
-del dmdump.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  macparse.c
-copy macparse.obj objects
-del macparse.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  rulparse.c
-copy rulparse.obj objects
-del rulparse.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  percent.c
-copy percent.obj objects
-del percent.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  function.c
-copy function.obj objects
-del function.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  win95\dchdir.c
-copy dchdir.obj objects
-del dchdir.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  win95\switchar.c
-copy switchar.obj objects
-del switchar.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  msdos\dstrlwr.c
-copy dstrlwr.obj objects
-del dstrlwr.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  msdos\arlib.c
-copy arlib.obj objects
-del arlib.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  msdos\dirbrk.c
-copy dirbrk.obj objects
-del dirbrk.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  win95\borland\tempnam.c
-copy tempnam.obj objects
-del tempnam.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  win95\borland\utime.c
-copy utime.obj objects
-del utime.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  win95\borland\ruletab.c
-copy ruletab.obj objects
-del ruletab.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  win95\borland\runargv.c
-copy runargv.obj objects
-del runargv.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  unix\dcache.c
-copy dcache.obj objects
-del dcache.obj
-bcc32 -c -I. -Iwin95 -Iwin95\borland -d -O -N- -w-nod -A- -w-pro -Iwin95\borland\bcc50  unix\rmprq.c
-copy rmprq.obj objects
-del rmprq.obj
-tlink32  @win95\borland\bcc50\obj.rsp,dmake.exe,NUL.MAP,@win95\borland\bcc50\lib.rsp
diff --git a/dmake/winnt/borland/bcc50/mk.cmd b/dmake/winnt/borland/bcc50/mk.cmd
deleted file mode 100755
index 7f212e9c4..000000000
--- a/dmake/winnt/borland/bcc50/mk.cmd
+++ /dev/null
@@ -1,93 +0,0 @@
-md objects
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  infer.c
-copy infer.obj objects
-del infer.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  make.c
-copy make.obj objects
-del make.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  stat.c
-copy stat.obj objects
-del stat.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  expand.c
-copy expand.obj objects
-del expand.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  dmstring.c
-copy dmstring.obj objects
-del dmstring.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  hash.c
-copy hash.obj objects
-del hash.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  dag.c
-copy dag.obj objects
-del dag.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  dmake.c
-copy dmake.obj objects
-del dmake.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  path.c
-copy path.obj objects
-del path.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  imacs.c
-copy imacs.obj objects
-del imacs.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  sysintf.c
-copy sysintf.obj objects
-del sysintf.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  parse.c
-copy parse.obj objects
-del parse.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  getinp.c
-copy getinp.obj objects
-del getinp.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  quit.c
-copy quit.obj objects
-del quit.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  state.c
-copy state.obj objects
-del state.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  dmdump.c
-copy dmdump.obj objects
-del dmdump.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  macparse.c
-copy macparse.obj objects
-del macparse.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  rulparse.c
-copy rulparse.obj objects
-del rulparse.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  percent.c
-copy percent.obj objects
-del percent.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  function.c
-copy function.obj objects
-del function.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  winnt\dchdir.c
-copy dchdir.obj objects
-del dchdir.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  msdos\dstrlwr.c
-copy dstrlwr.obj objects
-del dstrlwr.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  msdos\arlib.c
-copy arlib.obj objects
-del arlib.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  msdos\dirbrk.c
-copy dirbrk.obj objects
-del dirbrk.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  winnt\borland\tempnam.c
-copy tempnam.obj objects
-del tempnam.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  winnt\borland\ruletab.c
-copy ruletab.obj objects
-del ruletab.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  winnt\borland\utime.c
-copy utime.obj objects
-del utime.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  winnt\borland\runargv.c
-copy runargv.obj objects
-del runargv.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  unix\dcache.c
-copy dcache.obj objects
-del dcache.obj
-bcc32 -c -I. -Iwinnt -Iwinnt\borland -d -O -N- -w-nod -A- -w-pro -Iwinnt\borland\bcc50  unix\rmprq.c
-copy rmprq.obj objects
-del rmprq.obj
-tlink32  @fix95nt\winnt\borland\bcc50\obj.rsp,dmake.exe,NUL.MAP,@fix95nt\winnt\borland\bcc50\lib.rsp
-copy winnt\borland\bcc50\template.mk startup\config.mk
diff --git a/dmake/winnt/borland/bcc50/obj.rsp b/dmake/winnt/borland/bcc50/obj.rsp
deleted file mode 100644
index 9cf59afde..000000000
--- a/dmake/winnt/borland/bcc50/obj.rsp
+++ /dev/null
@@ -1,31 +0,0 @@
-c:\cc\borland\bcc50\lib\c0x32.obj
-objects\infer.obj
-objects\make.obj
-objects\stat.obj
-objects\expand.obj
-objects\dmstring.obj
-objects\hash.obj
-objects\dag.obj
-objects\dmake.obj
-objects\path.obj
-objects\imacs.obj
-objects\sysintf.obj
-objects\parse.obj
-objects\getinp.obj
-objects\quit.obj
-objects\state.obj
-objects\dmdump.obj
-objects\macparse.obj
-objects\rulparse.obj
-objects\percent.obj
-objects\function.obj
-objects\dchdir.obj
-objects\dstrlwr.obj
-objects\arlib.obj
-objects\dirbrk.obj
-objects\tempnam.obj
-objects\ruletab.obj
-objects\utime.obj
-objects\runargv.obj
-objects\dcache.obj
-objects\rmprq.obj
diff --git a/dmake/winnt/borland/bcc50/public.h b/dmake/winnt/borland/bcc50/public.h
deleted file mode 100644
index e78838425..000000000
--- a/dmake/winnt/borland/bcc50/public.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:59:14 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int dchdir ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-int Wait_for_child ANSI((int, int));
-void Clean_up_processes ANSI(());
-time_t CacheStat ANSI((char *, int));
-void Remove_prq ANSI((CELLPTR));
-
-#endif
diff --git a/dmake/winnt/borland/bcc50/template.mk b/dmake/winnt/borland/bcc50/template.mk
deleted file mode 100644
index b94ac034e..000000000
--- a/dmake/winnt/borland/bcc50/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= winnt
-   OSRELEASE     *:= borland
-   OSENVIRONMENT *:= bcc50
diff --git a/dmake/winnt/borland/config.mk b/dmake/winnt/borland/config.mk
deleted file mode 100644
index 85c929b41..000000000
--- a/dmake/winnt/borland/config.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# This is the Turbo C++ 2.0 DOS configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-# OS specific sources
-OSR_SRC  += tempnam.c ruletab.c
-DOS_SRC  += runargv.c rmprq.c
-
-SRC += $(OSR_SRC) $(DOS_SRC)
-.SOURCE.h : $(osrdir)
-
-# Local configuration modifications for CFLAGS.  Make sure your turboc.cfg
-# file contains a -D__STDC__=1 and -DM_I86=1, if not then uncomment the line
-# below!
-#CFLAGS += -DM_I86=1 -D__STDC__=1
-
-# You can get a smaller executable still, buy adding a -1 to the list of
-# flags below, but then you can't run this on an 8086/88 cpu.
-#CFLAGS += -1
-CFLAGS  += -I$(osrdir) -d -O -N- -w-nod
-ASFLAGS += -t -mx $(S_$(MODEL))
-
-LDOBJS		= $(CSTARTUP) $(OBJDIR)/{$(<:f)}
-LDARGS		= $(LDHEAD) @$(LDTMPOBJ),$(TARGET),NUL.MAP$(LDTAIL)
-LDTAIL		= $(_libs)$(LDFLAGS:s/ //)
-_libs           = $(!null,$(LDLIBS) ,@$(LDTMPLIB))
-LDTMPOBJ	= $(mktmp,,$(DIVFILE) $(LDOBJS:s,/,\\,:t"+\n")\n)
-LDTMPLIB	= $(mktmp,,$(DIVFILE) $(LDLIBS:s,/,\\,:t"+\n")\n)
-
-# Debugging information for Turbo-C
-DB_CFLAGS  += -v
-DB_LDFLAGS += /v
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-   .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
-
-.SETDIR=$(osrdir) : $(OSR_SRC)
-.SETDIR=msdos     : $(DOS_SRC)
-
-S_s = -dmsmall
-S_m = -dmmedium
-S_c = -dmcompact
-S_l = -dmlarge
diff --git a/dmake/winnt/borland/ruletab.c b/dmake/winnt/borland/ruletab.c
deleted file mode 100644
index a373d6ed1..000000000
--- a/dmake/winnt/borland/ruletab.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* RCS  $Id: ruletab.c,v 1.3 2006-06-29 11:32:41 ihi Exp $
---
--- SYNOPSIS
---      Default initial configuration of dmake.
--- 
--- DESCRIPTION
--- 	Define here the initial set of rules that are defined before
---	dmake performs any processing.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* These are control macros for dmake that MUST be defined at some point
- * if they are NOT dmake will not work!  These are default definitions.  They
- * may be overridden inside the .STARTUP makefile, they are here
- * strictly so that dmake can parse the STARTUP makefile */
-
-#include <stdio.h>
-
-static char *_rules[] = {
-    "MAXLINELENGTH := 32766",
-    "MAXPROCESSLIMIT := 4",
-    ".IMPORT .IGNORE: DMAKEROOT",
-    ".MAKEFILES : makefile.mk makefile",
-    ".SOURCE    : .NULL",
-#include "startup.h"
-    (char *)NULL };
-
-char **Rule_tab = _rules; /* for sundry reasons in Get_environment() */
-
diff --git a/dmake/winnt/borland/sysintf.h b/dmake/winnt/borland/sysintf.h
deleted file mode 100644
index b0457b320..000000000
--- a/dmake/winnt/borland/sysintf.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* RCS  $Id: sysintf.h,v 1.3 2007-01-18 09:51:20 vg Exp $
---
--- SYNOPSIS
---      Interfaces for sysintf.c
---
--- DESCRIPTION
---      Abstractions of functions in sysintf.c
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#define DMSTAT stat
-#define VOID_LCACHE(l,m)
-#define GETPID _psp
-#define Hook_std_writes(A)
-
-extern char * tempnam();
-extern char * getcwd();
-
-/*
-** standard C items
-*/
-
-/*
-** DOS interface standard items
-*/
-#define	chdir(p) dchdir(p)
-#define CacheStat(A,B) really_dostat(A,&buf)
-
-/*
-** make parameters
-*/
-#ifdef _POSIX_NAME_MAX
-#undef  _POSIX_NAME_MAX
-#endif
-#define _POSIX_NAME_MAX _MAX_FNAME
-
-#ifdef _POSIX_PATH_MAX
-#undef _POSIX_PATH_MAX
-#endif
-#define _POSIX_PATH_MAX _MAX_PATH
diff --git a/dmake/winnt/borland/tempnam.c b/dmake/winnt/borland/tempnam.c
deleted file mode 100644
index 4a1766d78..000000000
--- a/dmake/winnt/borland/tempnam.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:37 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dos.h>
-
-#if defined(max)
-#   undef  max
-#endif
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-int d_access();
-
-/* Turbo C stdio.h doesn't define P_tmpdir, so let's do it here */
-/* Under DOS leave the default tmpdir pointing here!		*/
-#ifndef P_tmpdir
-static char *P_tmpdir = "";
-#endif
-
-char *
-tempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   static         int count = 0;
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-   char		  buf[30];
-
-#if defined(__WIN32__)
-    unsigned int _psp = rand();
-#endif
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   else if( (tmpdir = getenv("TMP")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+13))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (d_access( strcpy(p, tmpdir), 0) != 0) )
-     if( (dl == 0) || (d_access( strcpy(p, dir), 0) != 0) )
-    if( d_access( strcpy(p, P_tmpdir), 0) != 0 )
-       if( !prefix )
-          prefix = "tp";
-
-   if(prefix)
-   {
-      *(p+strlen(p)+2) = '\0';
-      (void)strncat(p, prefix, 2);
-   }
-
-   sprintf( buf, "%08x", _psp );
-   buf[6]='\0';
-   (void)strcat(p, buf );
-   sprintf( buf, "%04d", count++ );
-   q=p+strlen(p)-6;
-   *q++ = buf[0]; *q++ = buf[1];
-   *q++ = buf[2]; *q   = buf[3];
-
-   if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
-
-   return(p);
-}
-
-
-
-d_access( name, flag )
-char *name;
-int  flag;
-{
-   extern char *DirSepStr;
-   char *p;
-   int r;
-
-   if( name == NULL || !*name ) return(1);  /* NULL dir means current dir */
-   r = access( name, flag );
-   p = name+strlen(name)-1;
-
-   if(*p != '/' && *p != '\\') strcat( p, DirSepStr );
-
-   return( r );
-}
diff --git a/dmake/winnt/config.mk b/dmake/winnt/config.mk
deleted file mode 100644
index 2abcb8ad6..000000000
--- a/dmake/winnt/config.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-# This is an OS specific configuration file
-#	It assumes that OBJDIR, TARGET and DEBUG are previously defined.
-#	It defines	CFLAGS, LDARGS, CPPFLAGS, STARTUPFILE, LDOBJS
-#	It augments	SRC, OBJDIR, TARGET, CFLAGS, LDLIBS
-#
-
-# Memory model to compile for
-# set to s - small, m - medium, c - compact, l - large
-# Need large model now, dmake has grown up :-)
-MODEL = l
-
-STARTUPFILE	= startup/startup.mk
-
-CPPFLAGS 	= $(CFLAGS)
-
-# Debug flags
-DB_CFLAGS	= -DDBUG
-DB_LDFLAGS	=
-DB_LDLIBS	=
-
-# NO Debug flags
-NDB_CFLAGS	=
-NDB_LDFLAGS	=
-NDB_LDLIBS	=
-
-# Local configuration modifications for CFLAGS.
-CFLAGS += -I$(OS)
-
-# Common Win32 source files.
-OS_SRC  += dchdir.c
-
-# Imported Win95 files.
-WIN95SRC += switchar.c
-
-# Imported MSDOS Files.
-DOSSRC  += dstrlwr.c arlib.c dirbrk.c
-
-SRC += $(OS_SRC) $(UNIXSRC) $(DOSSRC)
-
-# Provide our own %$O : %$S rule.
-%$O : %$S
-    +$(AS) $(ASFLAGS) \
-    $(<:s,\,${__.DIVSEP-sh-${USESHELL}},:s,/,${__.DIVSEP-sh-${USESHELL}},);
-    mv $(@:f) $(OBJDIR)
-
-# Set source dirs so that we can find files named in this
-# config file.
-.SOURCE.h : $(OS)
-
-# See if we modify anything in the lower levels.
-.IF $(OSRELEASE) != $(NULL)
-   .INCLUDE : $(OS)$(DIRSEPSTR)$(OSRELEASE)$(DIRSEPSTR)config.mk
-.END
-
-.SETDIR=msdos : $(DOSSRC)
-.SETDIR=win95 : $(WIN95SRC)
-.SETDIR=$(OS) : $(ASRC) $(OS_SRC)
diff --git a/dmake/winnt/dchdir.c b/dmake/winnt/dchdir.c
deleted file mode 100644
index 248a3d464..000000000
--- a/dmake/winnt/dchdir.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* RCS  $Id: dchdir.c,v 1.1.1.1 2000-09-22 15:33:37 hr Exp $
---
--- SYNOPSIS
---      Change directory.
--- 
--- DESCRIPTION
---	Under DOS change the current drive as well as the current directory.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <dir.h>
-#include <direct.h>
-#include "extern.h"
-
-PUBLIC int
-dchdir(path)
-char *path;
-{
-   int   res;
-
-   res = chdir(path);
-
-   if (res != -1 && path[1] == ':') {
-      unsigned new_drive;
-
-      /* for WIN32 just use the _chdrive library call */
-      new_drive = (*path & ~0x20) - 'A' + 1;
-      _chdrive(new_drive);
-   }
-
-   return (res);
-}
diff --git a/dmake/winnt/microsft/config.h b/dmake/winnt/microsft/config.h
deleted file mode 100644
index 3ef8b99e9..000000000
--- a/dmake/winnt/microsft/config.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* RCS  $Id: config.h,v 1.9 2008-03-05 18:41:51 kz Exp $
---
--- SYNOPSIS
---      Configurarion include file.
--- 
--- DESCRIPTION
--- 	There is one of these for each specific machine configuration.
---	It can be used to further tweek the machine specific sources
---	so that they compile.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* Name and version number of this package */
-#define PACKAGE "dmake"
-#define VERSION "4.12"
-#define BUILDINFO "Windows / MS Visual C++"
-
-#if defined (_MSC_VER)
-# if _MSC_VER < 500
-    Force a compile-time blowup.
-    Do not define "#define _MSC_VER" for MSC compilers earlier than 5.0.
-# endif
-#endif
-
-/* define this for configurations that don't have the coreleft function
- * so that the code compiles.  To my knowledge coreleft exists only on
- * Turbo C, but it is needed here since the function is used in many debug
- * macros. */
-#define coreleft() 0L
-
-/* MSC Version 4.0 doesn't understand SIGTERM, later versions do. */
-#ifndef SIGTERM
-#   define SIGTERM SIGINT
-#endif
-
-/* Fixes unimplemented line buffering for MSC 5.x and 6.0.
- * MSC _IOLBF is the same as _IOFBF
- */
-#if defined(MSDOS) && defined (_MSC_VER)
-#   undef  _IOLBF
-#   define _IOLBF   _IONBF
-#endif
-
-/* in alloc.h: size_t is redefined
- * defined in stdio.h which is included by alloc.h
- */
-#if defined(MSDOS) && defined (_MSC_VER)
-#   define _TYPES_
-#endif
-
-/* in sysintf.c: SIGQUIT is used, this is not defined in MSC */
-#ifndef SIGQUIT
-#   define SIGQUIT SIGTERM
-#endif
-
-/* MSC didn't seem to care about CONST in the past */
-#ifndef CONST
-#   define CONST
-#endif
-
-#ifndef MSDOS
-#   define MSDOS 1
-#endif
-
-/* a small problem with pointer to voids on some unix machines needs this */
-#define DMPVOID void *
-
-/* Use my own tempnam */
-#define tempnam dtempnam
-
diff --git a/dmake/winnt/microsft/config.mk b/dmake/winnt/microsft/config.mk
deleted file mode 100644
index 352eed716..000000000
--- a/dmake/winnt/microsft/config.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# This is the MSC 4.0 and higher DOS configuration file for DMAKE
-#	It simply modifies the values of SRC, and checks to see if
-#	OSENVIRONMENT is defined.  If so it includes the appropriate
-#	config.mk file.
-#
-# It also sets the values of .SOURCE.c and .SOURCE.h to include the local
-# directory.
-#
-osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
-
-TMPDIR :=
-.EXPORT : TMPDIR
-
-# Definition of macros for library, and C startup code.
-
-# The following sources are required for MSC
-OSR_SRC += tempnam.c ruletab.c
-DOS_SRC += runargv.c rmprq.c
-
-.SETDIR=$(osrdir) : $(OSR_SRC)
-.SETDIR=msdos     : $(DOS_SRC)
-
-SRC += $(OSR_SRC) $(DOS_SRC)
-.SOURCE.h : $(osrdir)
-
-SET_STACK  = /stack:4096
-ASFLAGS   += -t -mx $(S_$(MODEL))
-
-# Microsoft C doesn't need tail but needs head
-LDTAIL         !=
-LDHEAD         != $(LDFLAGS)
-LDARGS	       != $(LDHEAD) -out:$(TARGET) @$(LDTMPOBJ) $(LDTAIL)
-LDTAIL	       != $(_libs)
-_libs          != $(!null,$(LDLIBS) ,@$(LDTMPLIB))
-LDTMPOBJ       != $(mktmp,,$(DIVFILE) $(LDOBJS:s,/,\\,:t"\n")\n)
-LDTMPLIB       != $(mktmp,,$(DIVFILE) $(LDLIBS:s,/,\\,:t"\n")\n)
-
-# Debugging libraries and flags
-DB_LDFLAGS += /nologo /co /li /map
-DB_LDLIBS  +=
-DB_CFLAGS  += -Zi
-
-# NO Debug MSC flags:
-# Set the environment variable MSC_VER to be one of 5.1, 6.0, 8.0 (for VC++4.0)
-# to get these by default when you make dmake using 'dmake'.
-#
-
-NDB_LDFLAGS += /nologo
-CFLAGS      += -I$(osrdir)
-
-# See if we modify anything in the lower levels.
-.IF $(OSENVIRONMENT) != $(NULL)
-  .INCLUDE .IGNORE : $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)$(DIRSEPSTR)config.mk
-.END
-
-CFLAGS      += /nologo
-
-S_s = -Dmsmall
-S_m = -Dmmedium
-S_c = -Dmcompact
-S_l = -Dmlarge
diff --git a/dmake/winnt/microsft/optoff.h b/dmake/winnt/microsft/optoff.h
deleted file mode 100644
index 36e6392a0..000000000
--- a/dmake/winnt/microsft/optoff.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* RCS  $Id: optoff.h,v 1.1.1.1 2000-09-22 15:33:37 hr Exp $
---
--- SYNOPSIS
---      Turn off microsoft loop optimization.
---
--- DESCRIPTION
---      This is broken in some pre 600 compilers so just turn it off.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-#if _MSC_VER < 600
-# pragma loop_opt(off)
-#endif
diff --git a/dmake/winnt/microsft/ruletab.c b/dmake/winnt/microsft/ruletab.c
deleted file mode 100644
index 36dd37690..000000000
--- a/dmake/winnt/microsft/ruletab.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* RCS  $Id: ruletab.c,v 1.3 2006-06-29 11:33:07 ihi Exp $
---
--- SYNOPSIS
---      Default initial configuration of dmake.
---
--- DESCRIPTION
--- 	Define here the initial set of rules that are defined before
---	dmake performs any processing.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/* These are control macros for dmake that MUST be defined at some point
- * if they are NOT dmake will not work!  These are default definitions.  They
- * may be overridden inside the .STARTUP makefile, they are here
- * strictly so that dmake can parse the STARTUP makefile */
-
-#include <stdio.h>
-
-static char *_rules[] = {
-    "MAXLINELENGTH := 32766",
-    "MAXPROCESSLIMIT := 4",
-    "MAXPROCESS := 1",
-    ".IMPORT .IGNORE: DMAKEROOT"
-    ".MAKEFILES : makefile.mk makefile",
-    ".SOURCE    : .NULL",
-#include "startup.h"
-    (char *)NULL };
-
-char **Rule_tab = _rules; /* for sundry reasons in Get_environment() */
-
diff --git a/dmake/winnt/microsft/sysintf.h b/dmake/winnt/microsft/sysintf.h
deleted file mode 100644
index 0deea5480..000000000
--- a/dmake/winnt/microsft/sysintf.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* RCS  $Id: sysintf.h,v 1.3 2007-01-18 09:52:02 vg Exp $
---
--- SYNOPSIS
---      Interfaces for sysintf.c
---
--- DESCRIPTION
---      Abstractions of functions in sysintf.c
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#define DMSTAT stat
-#define VOID_LCACHE(l,m)
-#define GETPID _psp
-#define Hook_std_writes(A)
-
-extern char * tempnam();
-extern char * getcwd();
-
-/* for directory cache */
-#define CacheStat(A,B)	really_dostat(A,&buf)
-
-/*
-** standard C items
-*/
-
-/*
-** DOS interface standard items
-*/
-#define	chdir(p) dchdir(p)
-
-/*
-** make parameters
-*/
-#ifdef _POSIX_NAME_MAX
-#undef  _POSIX_NAME_MAX
-#endif
-#define _POSIX_NAME_MAX _MAX_FNAME
-
-#ifdef _POSIX_PATH_MAX
-#undef _POSIX_PATH_MAX
-#endif
-#define _POSIX_PATH_MAX _MAX_PATH
diff --git a/dmake/winnt/microsft/tempnam.c b/dmake/winnt/microsft/tempnam.c
deleted file mode 100644
index 5f8ce9edd..000000000
--- a/dmake/winnt/microsft/tempnam.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:37 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <process.h>
-
-#if defined(max)
-#   undef  max
-#endif
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-int d_access();
-
-/* MSC stdio.h defines P_tmpdir, so let's undo it here */
-/* Under DOS leave the default tmpdir pointing here!		*/
-#ifdef P_tmpdir
-#undef P_tmpdir
-#endif
-static char *P_tmpdir = "";
-
-char *
-dtempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   static         int count = 0;
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-   char		  buf[30];
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   else if( (tmpdir = getenv("TMP")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+13))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (d_access( strcpy(p, tmpdir), 0) != 0) )
-     if( (dl == 0) || (d_access( strcpy(p, dir), 0) != 0) )
-    if( d_access( strcpy(p, P_tmpdir), 0) != 0 )
-       if( !prefix )
-          prefix = "tp";
-
-   if(prefix)
-   {
-      *(p+strlen(p)+2) = '\0';
-      (void)strncat(p, prefix, 2);
-   }
-
-   sprintf( buf, "%08x", getpid() );
-   buf[6]='\0';
-   (void)strcat(p, buf );
-   sprintf( buf, "%04d", count++ );
-   q=p+strlen(p)-6;
-   *q++ = buf[0]; *q++ = buf[1];
-   *q++ = buf[2]; *q++ = buf[3];
-
-   if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
-
-   return(p);
-}
-
-
-
-d_access( name, flag )
-char *name;
-int  flag;
-{
-   extern char *DirSepStr;
-   char *p;
-   int r;
-
-   if( name == NULL || !*name ) return(1);  /* NULL dir means current dir */
-   r = access( name, flag );
-   p = name+strlen(name)-1;
-   if(*p != '/' && *p != '\\') strcat( p, DirSepStr );
-
-   return( r );
-}
diff --git a/dmake/winnt/microsft/vpp40/config.mk b/dmake/winnt/microsft/vpp40/config.mk
deleted file mode 100644
index 14fe952ea..000000000
--- a/dmake/winnt/microsft/vpp40/config.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Definition of macros for library, and C startup code.
-osedir        = $(osrdir)$(DIRSEPSTR)$(OSENVIRONMENT)
-
-.IMPORT .IGNORE : MSC_VER
-MSC_VER      *= 8.0
-
-CFLAGS       += -I$(osedir)
-
-NDB_CFLAGS   += -Od -GF -Ge
-NDB_LDFLAGS  +=
-NDB_LDLIBS   +=
-
-# Redefine rule for making our objects, we don't need mv
-%$O : %.c ;% $(CC) -c $(CFLAGS) -Fo$@ $<
diff --git a/dmake/winnt/microsft/vpp40/lib.rsp b/dmake/winnt/microsft/vpp40/lib.rsp
deleted file mode 100644
index 8b1378917..000000000
--- a/dmake/winnt/microsft/vpp40/lib.rsp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/dmake/winnt/microsft/vpp40/mk.bat b/dmake/winnt/microsft/vpp40/mk.bat
deleted file mode 100755
index 22917df5e..000000000
--- a/dmake/winnt/microsft/vpp40/mk.bat
+++ /dev/null
@@ -1,32 +0,0 @@
-md objects
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\infer.obj infer.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\make.obj make.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\stat.obj stat.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\expand.obj expand.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\dmstring.obj dmstring.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\hash.obj hash.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\dag.obj dag.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\dmake.obj dmake.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\path.obj path.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\imacs.obj imacs.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\sysintf.obj sysintf.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\parse.obj parse.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\getinp.obj getinp.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\quit.obj quit.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\state.obj state.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\dmdump.obj dmdump.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\macparse.obj macparse.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\rulparse.obj rulparse.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\percent.obj percent.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\function.obj function.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\dchdir.obj win95\dchdir.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\switchar.obj win95\switchar.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\dstrlwr.obj msdos\dstrlwr.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\arlib.obj msdos\arlib.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\dirbrk.obj msdos\dirbrk.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\tempnam.obj tempnam.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\ruletab.obj win95\microsft\ruletab.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\runargv.obj msdos\runargv.c
-cl -c -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 \nologo -Od -GF -Ge -Foobjects\rmprq.obj msdos\rmprq.c
-rem link /nologo @win95\microsft\vpp40\obj.rsp,dmake.exe,NUL.MAP;
-link /out:dmake.exe @.\win95\microsft\vpp40\obj.rsp
diff --git a/dmake/winnt/microsft/vpp40/mk.cmd b/dmake/winnt/microsft/vpp40/mk.cmd
deleted file mode 100755
index 5fcc801fa..000000000
--- a/dmake/winnt/microsft/vpp40/mk.cmd
+++ /dev/null
@@ -1,31 +0,0 @@
-md objects
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\infer.obj infer.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\make.obj make.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\stat.obj stat.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\expand.obj expand.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dmstring.obj dmstring.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\hash.obj hash.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dag.obj dag.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dmake.obj dmake.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\path.obj path.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\imacs.obj imacs.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\sysintf.obj sysintf.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\parse.obj parse.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\getinp.obj getinp.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\quit.obj quit.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\state.obj state.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dmdump.obj dmdump.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\macparse.obj macparse.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\rulparse.obj rulparse.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\percent.obj percent.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\function.obj function.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dchdir.obj winnt\dchdir.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dstrlwr.obj msdos\dstrlwr.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\arlib.obj msdos\arlib.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\dirbrk.obj msdos\dirbrk.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\tempnam.obj winnt\microsft\tempnam.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\ruletab.obj winnt\microsft\ruletab.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\runargv.obj msdos\runargv.c
-cl -c -I. -Iwinnt -Iwinnt\microsft -Iwinnt\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\rmprq.obj msdos\rmprq.c
-link /nologo /out:dmake.exe @fix95nt\winnt\microsft\vpp40\obj.rsp 
-copy winnt\microsft\vpp40\template.mk startup\config.mk
diff --git a/dmake/winnt/microsft/vpp40/obj.rsp b/dmake/winnt/microsft/vpp40/obj.rsp
deleted file mode 100644
index 5c00dab6c..000000000
--- a/dmake/winnt/microsft/vpp40/obj.rsp
+++ /dev/null
@@ -1,28 +0,0 @@
-objects\infer.obj
-objects\make.obj
-objects\stat.obj
-objects\expand.obj
-objects\dmstring.obj
-objects\hash.obj
-objects\dag.obj
-objects\dmake.obj
-objects\path.obj
-objects\imacs.obj
-objects\sysintf.obj
-objects\parse.obj
-objects\getinp.obj
-objects\quit.obj
-objects\state.obj
-objects\dmdump.obj
-objects\macparse.obj
-objects\rulparse.obj
-objects\percent.obj
-objects\function.obj
-objects\dchdir.obj
-objects\dstrlwr.obj
-objects\arlib.obj
-objects\dirbrk.obj
-objects\tempnam.obj
-objects\ruletab.obj
-objects\runargv.obj
-objects\rmprq.obj
diff --git a/dmake/winnt/microsft/vpp40/public.h b/dmake/winnt/microsft/vpp40/public.h
deleted file mode 100644
index 6365f11d4..000000000
--- a/dmake/winnt/microsft/vpp40/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.9 2007-10-15 15:59:48 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int dchdir ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void Clean_up_processes ANSI(());
-int Wait_for_child ANSI((int, int));
-void Remove_prq ANSI((CELLPTR));
-
-#endif
diff --git a/dmake/winnt/microsft/vpp40/runargv.c b/dmake/winnt/microsft/vpp40/runargv.c
deleted file mode 100644
index 3d6465304..000000000
--- a/dmake/winnt/microsft/vpp40/runargv.c
+++ /dev/null
@@ -1,288 +0,0 @@
-Blake sent me the wrong one.
-
-/* RCS  $Id: runargv.c,v 1.2 2007-10-15 16:00:01 ihi Exp $
---
--- SYNOPSIS
---      Invoke a sub process.
--- 
--- DESCRIPTION
--- 	Use the standard methods of executing a sub process.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#include <process.h>
-#include <errno.h>
-#include <signal.h>
-#include "extern.h"
-#include "sysintf.h"
-
-extern char **environ;
-
-typedef struct prp {
-   char *prp_cmd;
-   int   prp_group;
-   int   prp_ignore;
-   int   prp_last;
-   int	 prp_shell;
-   struct prp *prp_next;
-} RCP, *RCPPTR;
-
-typedef struct pr {
-   int		pr_valid;
-   int		pr_pid;
-   CELLPTR	pr_target;
-   int		pr_ignore;
-   int		pr_last;
-   RCPPTR  	pr_recipe;
-   RCPPTR  	pr_recipe_end;
-   char        *pr_dir;
-} PR;
-
-static PR  *_procs    = NIL(PR);
-static int  _proc_cnt = 0;
-static int  _abort_flg= FALSE;
-static int  _use_i    = -1;
-static int  _do_upd   = 0;
-
-static  void	_add_child ANSI((int, CELLPTR, int, int));
-static  void	_attach_cmd ANSI((char *, int, int, CELLPTR, int, int));
-static  void    _finished_child ANSI((int, int));
-static  int     _running ANSI((CELLPTR));
-
-PUBLIC int
-runargv(target, ignore, group, last, shell, cmd)
-CELLPTR target;
-int     ignore;
-int	group;
-int	last;
-int     shell;
-char	*cmd;
-{
-   extern  int  errno;
-   extern  char *sys_errlist[];
-   int          pid;
-   char         **argv;
-
-   if( _running(target) /*&& Max_proc != 1*/ ) {
-      /* The command will be executed when the previous recipe
-       * line completes. */
-      _attach_cmd( cmd, group, ignore, target, last, shell );
-      return(1);
-   }
-
-   while( _proc_cnt == Max_proc )
-      if( Wait_for_child(FALSE, -1) == -1 )  Fatal( "Lost a child %d", errno );
-
-   argv = Pack_argv( group, shell, cmd );
-
-   pid = _spawnvpe(_P_NOWAIT, argv[0], argv, environ);
-   if (pid == -1)  {  /*  failed  */
-       Error("%s: %s", argv[0], sys_errlist[errno]);
-       Handle_result(-1, ignore, _abort_flg, target);
-       return(-1);
-   } else
-       _add_child(pid, target, ignore, last);
-
-   return(1);
-}
-
-
-PUBLIC int
-Wait_for_child( abort_flg, pid )
-int abort_flg;
-int pid;
-{
-   int wid;
-   int status;
-   int waitchild;
-
-   waitchild = (pid == -1)? FALSE : Wait_for_completion;
-
-   do {
-      if( (wid = wait(&status)) == -1 ) return(-1);
-
-      _abort_flg = abort_flg;
-      _finished_child(wid, status);
-      _abort_flg = FALSE;
-   } while( waitchild && pid != wid );
-
-   return(0);
-}
-
-
-PUBLIC void
-Clean_up_processes()
-{
-   register int i;
-
-   if( _procs != NIL(PR) ) {
-      for( i=0; i<Max_proc; i++ )
-     if( _procs[i].pr_valid )
-        kill(_procs[i].pr_pid, SIGTERM);
-
-      while( Wait_for_child(TRUE, -1) != -1 );
-   }
-}
-
-
-static void
-_add_child( pid, target, ignore, last )
-int	pid;
-CELLPTR target;
-int	ignore;
-int     last;
-{
-   register int i;
-   register PR *pp;
-
-   if( _procs == NIL(PR) ) {
-      TALLOC( _procs, Max_proc, PR );
-   }
-
-   if( (i = _use_i) == -1 )
-      for( i=0; i<Max_proc; i++ )
-     if( !_procs[i].pr_valid )
-        break;
-
-   pp = _procs+i;
-
-   pp->pr_valid  = 1;
-   pp->pr_pid    = pid;
-   pp->pr_target = target;
-   pp->pr_ignore = ignore;
-   pp->pr_last   = last;
-   pp->pr_dir    = DmStrDup(Get_current_dir());
-
-   Current_target = NIL(CELL);
-
-   _proc_cnt++;
-
-   if( Wait_for_completion ) Wait_for_child( FALSE, pid );
-}
-
-
-static void
-_finished_child(pid, status)
-int	pid;
-int	status;
-{
-   register int i;
-   register PR *pp;
-   char     *dir;
-
-   for( i=0; i<Max_proc; i++ )
-      if( _procs[i].pr_valid && _procs[i].pr_pid == pid )
-     break;
-
-   /* Some children we didn't make esp true if using /bin/sh to execute a
-    * a pipe and feed the output as a makefile into dmake. */
-   if( i == Max_proc ) return;
-   _procs[i].pr_valid = 0;
-   _proc_cnt--;
-   dir = DmStrDup(Get_current_dir());
-   Set_dir( _procs[i].pr_dir );
-
-   if( _procs[i].pr_recipe != NIL(RCP) && !_abort_flg ) {
-      RCPPTR rp = _procs[i].pr_recipe;
-
-
-      Current_target = _procs[i].pr_target;
-      Handle_result( status, _procs[i].pr_ignore, FALSE, _procs[i].pr_target );
-      Current_target = NIL(CELL);
-
-      if ( _procs[i].pr_target->ce_attr & A_ERROR ) {
-     _procs[i].pr_last = TRUE;
-     goto ABORT_REMAINDER_OF_RECIPE;
-      }
-
-      _procs[i].pr_recipe = rp->prp_next;
-
-      _use_i = i;
-      runargv( _procs[i].pr_target, rp->prp_ignore, rp->prp_group,
-           rp->prp_last, rp->prp_shell, rp->prp_cmd );
-      _use_i = -1;
-
-      FREE( rp->prp_cmd );
-      FREE( rp );
-
-      if( _proc_cnt == Max_proc ) Wait_for_child( FALSE, -1 );
-   }
-   else {
-      Handle_result(status,_procs[i].pr_ignore,_abort_flg,_procs[i].pr_target);
-
- ABORT_REMAINDER_OF_RECIPE:
-      if( _procs[i].pr_last ) {
-     FREE(_procs[i].pr_dir );
-
-     if( !Doing_bang ) Update_time_stamp( _procs[i].pr_target );
-      }
-   }
-
-   Set_dir(dir);
-   FREE(dir);
-}
-
-
-static int
-_running( cp )
-CELLPTR cp;
-{
-   register int i;
-
-   if( !_procs ) return(FALSE);
-
-   for( i=0; i<Max_proc; i++ )
-      if( _procs[i].pr_valid &&
-      _procs[i].pr_target == cp  )
-     break;
-     
-   return( i != Max_proc );
-}
-
-
-static void
-_attach_cmd( cmd, group, ignore, cp, last, shell )
-char    *cmd;
-int	group;
-int     ignore;
-CELLPTR cp;
-int     last;
-int     shell;
-{
-   register int i;
-   RCPPTR rp;
-
-   for( i=0; i<Max_proc; i++ )
-      if( _procs[i].pr_valid &&
-      _procs[i].pr_target == cp  )
-     break;
-
-   TALLOC( rp, 1, RCP );
-   rp->prp_cmd   = DmStrDup(cmd);
-   rp->prp_group = group;
-   rp->prp_ignore= ignore;
-   rp->prp_last  = last;
-   rp->prp_shell = shell;
-
-   if( _procs[i].pr_recipe == NIL(RCP) )
-      _procs[i].pr_recipe = _procs[i].pr_recipe_end = rp;
-   else {
-      _procs[i].pr_recipe_end->prp_next = rp;
-      _procs[i].pr_recipe_end = rp;
-   }
-}
diff --git a/dmake/winnt/microsft/vpp40/template.mk b/dmake/winnt/microsft/vpp40/template.mk
deleted file mode 100644
index e53922df6..000000000
--- a/dmake/winnt/microsft/vpp40/template.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** Default build configuration for dmake.
-# ** DO NOT PLACE LOCAL DEFINITIONS INTO THIS FILE IT IS AUTO GENERATED
-# ** USE "startup/local.mk" for those.
-
-   OS            *:= winnt
-   OSRELEASE     *:= microsft
-   OSENVIRONMENT *:= vpp40
diff --git a/dmake/winnt/microsft/vpp40/tempnam.c b/dmake/winnt/microsft/vpp40/tempnam.c
deleted file mode 100644
index 3cb6cce71..000000000
--- a/dmake/winnt/microsft/vpp40/tempnam.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* RCS  $Id: tempnam.c,v 1.1.1.1 2000-09-22 15:33:37 hr Exp $
---
--- SYNOPSIS
---      tempnam
---
--- DESCRIPTION
---      temp file name generation routines.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-/*LINTLIBRARY*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dos.h>
-
-#if defined(max)
-#   undef  max
-#endif
-#define max(A,B) (((A)<(B))?(B):(A))
-
-extern char *mktemp();
-extern int access();
-int d_access();
-
-/* MSC stdio.h defines P_tmpdir, so let's undo it here */
-/* Under DOS leave the default tmpdir pointing here!		*/
-#ifdef P_tmpdir
-#undef P_tmpdir
-#endif
-static char *P_tmpdir = "";
-
-char *
-tempnam(dir, prefix)
-char *dir;		/* use this directory please (if non-NULL) */
-char *prefix;		/* use this (if non-NULL) as filename prefix */
-{
-   static         int count = 0;
-   register char *p, *q, *tmpdir;
-   int            tl=0, dl=0, pl;
-   char		  buf[30];
-
-   pl = strlen(P_tmpdir);
-
-   if( (tmpdir = getenv("TMPDIR")) != NULL ) tl = strlen(tmpdir);
-   else if( (tmpdir = getenv("TMP")) != NULL ) tl = strlen(tmpdir);
-   if( dir != NULL ) dl = strlen(dir);
-
-   if( (p = malloc((unsigned)(max(max(dl,tl),pl)+13))) == NULL )
-     return(NULL);
-
-   *p = '\0';
-
-   if( (tl == 0) || (d_access( strcpy(p, tmpdir), 0) != 0) )
-     if( (dl == 0) || (d_access( strcpy(p, dir), 0) != 0) )
-    if( d_access( strcpy(p, P_tmpdir), 0) != 0 )
-       if( !prefix )
-          prefix = "tp";
-
-   if(prefix)
-   {
-      *(p+strlen(p)+2) = '\0';
-      (void)strncat(p, prefix, 2);
-   }
-
-   sprintf( buf, "%08x", _psp );
-   buf[6]='\0';
-   (void)strcat(p, buf );
-   sprintf( buf, "%04d", count++ );
-   q=p+strlen(p)-6;
-   *q++ = buf[0]; *q++ = buf[1];
-   *q++ = buf[2]; *q++ = buf[3];
-
-   if( (q = strrchr(p,'.')) != NULL ) *q = '\0';
-
-   return(p);
-}
-
-
-
-d_access( name, flag )
-char *name;
-int  flag;
-{
-   extern char *DirSepStr;
-   char *p;
-   int r;
-
-   if( name == NULL || !*name ) return(1);  /* NULL dir means current dir */
-   r = access( name, flag );
-   p = name+strlen(name)-1;
-   if(*p != '/' && *p != '\\') strcat( p, DirSepStr );
-
-   return( r );
-}
diff --git a/dmake/winnt/mingw/public.h b/dmake/winnt/mingw/public.h
deleted file mode 100644
index f217a8307..000000000
--- a/dmake/winnt/mingw/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.7 2007-10-15 16:00:18 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int dchdir ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void Clean_up_processes ANSI(());
-int Wait_for_child ANSI((int, int));
-void Remove_prq ANSI((CELLPTR));
-
-#endif
diff --git a/dmake/winnt/mingw/sysintf.h b/dmake/winnt/mingw/sysintf.h
deleted file mode 100644
index ce47aa83b..000000000
--- a/dmake/winnt/mingw/sysintf.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* RCS  $Id: sysintf.h,v 1.4 2007-01-18 09:53:01 vg Exp $
---
--- SYNOPSIS
---      Interfaces for sysintf.c
---
--- DESCRIPTION
---      Abstractions of functions in sysintf.c
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#define DMSTAT stat
-#define VOID_LCACHE(l,m)
-#define GETPID _psp
-#define Hook_std_writes(A)
-
-extern char * tempnam();
-extern char * getcwd();
-
-/* for directory cache */
-#define CacheStat(A,B)	really_dostat(A,&buf)
-
-/*
-** standard C items
-*/
-
-/*
-** DOS interface standard items
-*/
-#define	chdir(p) dchdir(p)
-
-/* in sysintf.c: SIGQUIT is used, this is not defined in MinGW */
-#ifndef SIGQUIT
-#   define SIGQUIT SIGTERM
-#endif
-
-/*
-** make parameters
-*/
-#ifdef _POSIX_NAME_MAX
-#undef  _POSIX_NAME_MAX
-#endif
-#define _POSIX_NAME_MAX _MAX_FNAME
-
-#ifdef _POSIX_PATH_MAX
-#undef _POSIX_PATH_MAX
-#endif
-#define _POSIX_PATH_MAX _MAX_PATH
diff --git a/dmake/winnt/msvc6/public.h b/dmake/winnt/msvc6/public.h
deleted file mode 100644
index e7cff03d1..000000000
--- a/dmake/winnt/msvc6/public.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* RCS  $Id: public.h,v 1.7 2007-10-15 16:00:31 ihi Exp $
--- WARNING  -- This file is AUTOMATICALLY GENERATED DO NOT EDIT IT
---
---
--- SYNOPSIS
---      Local functions exported to be visible by others.
---
--- DESCRIPTION
---      This file is generated by 'genpub'.  Function declarations
---      that appear in this file are extracted by 'genpub' from
---      source files.  Any function in the source file whose definition
---      appears like:
---
---          PUBLIC return_type
---          function( arg_list );
---          type_expr1 arg1;
---          ...
---
---      has its definition extracted and a line of the form:
---
---          return_type function ANSI((type_expr1,type_expr2,...));
---
---      entered into the output file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#ifndef _DMAKE_PUBLIC_h
-#define _DMAKE_PUBLIC_h
-
-#ifdef EXTERN
-#undef EXTERN
-#endif
-#if defined(DEFINE_DMAKE_VARIABLES)
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-/***** genpub: Begin list of generated function headers */
-void Infer_recipe ANSI((CELLPTR, CELLPTR));
-int Make_targets ANSI(());
-int Make ANSI((CELLPTR, CELLPTR));
-int Exec_commands ANSI((CELLPTR));
-void Print_cmnd ANSI((char *, int, int));
-int Push_dir ANSI((char *, char *, int));
-void Pop_dir ANSI((int));
-void Append_line ANSI((char *, int, FILE *, char *, int, int));
-void Stat_target ANSI((CELLPTR, int, int));
-char *Expand ANSI((char *));
-char *Apply_edit ANSI((char *, char *, char *, int, int));
-void Map_esc ANSI((char *));
-char* Apply_modifiers ANSI((int, char *));
-char* Tokenize ANSI((char *, char *, char, int));
-char* ScanToken ANSI((char *, char **, int));
-char *DmStrJoin ANSI((char *, char *, int, int));
-char *DmStrAdd ANSI((char *, char *, int));
-char *DmStrApp ANSI((char *, char *));
-char *DmStrDup ANSI((char *));
-char *DmStrDup2 ANSI((char *));
-char *DmStrPbrk ANSI((char *, char *));
-char *DmStrSpn ANSI((char *, char *));
-char *DmStrStr ANSI((char *, char *));
-char *DmSubStr ANSI((char *, char *));
-uint16 Hash ANSI((char *, uint32 *));
-HASHPTR Get_name ANSI((char *, HASHPTR *, int));
-HASHPTR Search_table ANSI((HASHPTR *, char *, uint16 *, uint32 *));
-HASHPTR Push_macro ANSI((HASHPTR));
-HASHPTR Pop_macro ANSI((HASHPTR));
-HASHPTR Def_macro ANSI((char *, char *, int));
-CELLPTR Def_cell ANSI((char *));
-LINKPTR Add_prerequisite ANSI((CELLPTR, CELLPTR, int, int));
-void Clear_prerequisites ANSI((CELLPTR));
-int Test_circle ANSI((CELLPTR, int));
-STRINGPTR Def_recipe ANSI((char *, STRINGPTR, int, int));
-t_attr Rcp_attribute ANSI((char *));
-int main ANSI((int, char **));
-FILE *Openfile ANSI((char *, int, int));
-FILE *Closefile ANSI(());
-FILE *Search_file ANSI((char *, char **));
-char *Filename ANSI(());
-int Nestlevel ANSI(());
-FILE *TryFiles ANSI((LINKPTR));
-void Fatal ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Error ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void Warning ANSI((ARG (char *,fmt),ARG (va_alist_type, va_alist)));
-void No_ram ANSI(());
-void Usage ANSI((int));
-void Version ANSI(());
-char *Get_suffix ANSI((char *));
-char *Basename ANSI((char *));
-char *Filedir ANSI((char *));
-char *Build_path ANSI((char *, char *));
-void Make_rules ANSI(());
-void Create_macro_vars ANSI(());
-time_t Do_stat ANSI((char *, char *, char **, int));
-int Do_touch ANSI((char *, char *, char **));
-void Void_lib_cache ANSI((char *, char *));
-time_t Do_time ANSI(());
-void Do_profile_output ANSI((char *, uint16, CELLPTR));
-int Do_cmnd ANSI((char **, int, int, CELLPTR, t_attr, int));
-char ** Pack_argv ANSI((int, int, char **));
-char *Read_env_string ANSI((char *));
-int Write_env_string ANSI((char *, char *));
-void ReadEnvironment ANSI(());
-void Catch_signals ANSI((void (*)(int)));
-void Clear_signals ANSI(());
-void Prolog ANSI((int, char* []));
-void Epilog ANSI((int));
-char *Get_current_dir ANSI(());
-int Set_dir ANSI((char*));
-char Get_switch_char ANSI(());
-FILE* Get_temp ANSI((char **, char *));
-FILE *Start_temp ANSI((char *, CELLPTR, char **));
-void Open_temp_error ANSI((char *, char *));
-void Link_temp ANSI((CELLPTR, FILE *, char *));
-void Close_temp ANSI((CELLPTR, FILE *));
-void Unlink_temp_files ANSI((CELLPTR));
-void Handle_result ANSI((int, int, int, CELLPTR));
-void Update_time_stamp ANSI((CELLPTR));
-int Remove_file ANSI((char *));
-void Parse ANSI((FILE *));
-int Get_line ANSI((char *, FILE *));
-char *Do_comment ANSI((char *, char **, int));
-char *Get_token ANSI((TKSTRPTR, char *, int));
-void Quit ANSI((int));
-void Read_state ANSI(());
-void Write_state ANSI(());
-int Check_state ANSI((CELLPTR, STRINGPTR *, int));
-void Dump ANSI(());
-void Dump_recipe ANSI((STRINGPTR));
-int Parse_macro ANSI((char *, int));
-int Macro_op ANSI((char *));
-int Parse_rule_def ANSI((int *));
-int Rule_op ANSI((char *));
-void Add_recipe_to_list ANSI((char *, int, int));
-void Bind_rules_to_targets ANSI((int));
-int Set_group_attributes ANSI((char *));
-DFALINKPTR Match_dfa ANSI((char *));
-void Check_circle_dfa ANSI(());
-void Add_nfa ANSI((char *));
-char *Exec_function ANSI((char *));
-int dchdir ANSI((char *));
-void dstrlwr ANSI((char *, char *));
-time_t seek_arch ANSI((char*, char*));
-int touch_arch ANSI((char*, char*));
-int If_root_path ANSI((char *));
-int runargv ANSI((CELLPTR, int, int, t_attr, char **));
-void Clean_up_processes ANSI(());
-int Wait_for_child ANSI((int, int));
-void Remove_prq ANSI((CELLPTR));
-
-#endif
diff --git a/dmake/winnt/msvc6/sysintf.h b/dmake/winnt/msvc6/sysintf.h
deleted file mode 100644
index e947b11ba..000000000
--- a/dmake/winnt/msvc6/sysintf.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* RCS  $Id: sysintf.h,v 1.3 2007-01-18 09:53:49 vg Exp $
---
--- SYNOPSIS
---      Interfaces for sysintf.c
---
--- DESCRIPTION
---      Abstractions of functions in sysintf.c
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
--- 
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-#define DMSTAT stat
-#define VOID_LCACHE(l,m)
-#define GETPID _psp
-#define Hook_std_writes(A)
-
-extern char * tempnam();
-extern char * getcwd();
-
-/* for directory cache */
-#define CacheStat(A,B)	really_dostat(A,&buf)
-
-/*
-** standard C items
-*/
-
-/*
-** DOS interface standard items
-*/
-#define	chdir(p) dchdir(p)
-
-/* in sysintf.c: SIGQUIT is used, this is not defined in MinGW */
-#ifndef SIGQUIT
-#   define SIGQUIT SIGTERM
-#endif
-
-/*
-** make parameters
-*/
-#ifdef _POSIX_NAME_MAX
-#undef  _POSIX_NAME_MAX
-#endif
-#define _POSIX_NAME_MAX 12
-
-#ifdef _POSIX_PATH_MAX
-#undef _POSIX_PATH_MAX
-#endif
-#define _POSIX_PATH_MAX _MAX_PATH
diff --git a/dmake/winnt/startup.h b/dmake/winnt/startup.h
deleted file mode 100644
index 18f48cfd9..000000000
--- a/dmake/winnt/startup.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* RCS  $Id: startup.h,v 1.2 2006-04-20 12:25:19 hr Exp $
---
--- SYNOPSIS
---      Definition of MAKESTARTUP
---
--- DESCRIPTION
---      Default MAKESTARTUP value defining where dmake locates the
---      startup file.
---
--- AUTHOR
---      Dennis Vadura, dvadura@dmake.wticorp.com
---
--- WWW
---      http://dmake.wticorp.com/
---
--- COPYRIGHT
---      Copyright (c) 1996,1997 by WTI Corp.  All rights reserved.
---
---      This program is NOT free software; you can redistribute it and/or
---      modify it under the terms of the Software License Agreement Provided
---      in the file <distribution-root>/readme/license.txt.
---
--- LOG
---      Use cvs log to obtain detailed change logs.
-*/
-
-"DMAKEROOT *= $(ABSMAKECMD:d)startup",
-"MAKESTARTUP := $(DMAKEROOT)\\startup.mk",
-
diff --git a/download b/download
deleted file mode 100755
index 1eee6ef7e..000000000
--- a/download
+++ /dev/null
@@ -1,307 +0,0 @@
-#!/bin/sh
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# environment setup yet?
-if [ -z "$TARFILE_LOCATION" ]; then
-    . ./Env.Host.sh
-fi
-
-# we want to clone if we are in the bootstrap git repo and clone does not exist yet
-# we need to test for a .git in order not to clone after rsync if we are called in
-# the inner autogen of the buid-repo based build
-
-check_file()
-{
-    echo "Looking for $1 ..."
-    if test -f $1; then
-	    echo "ok"
-    else
-	    echo "missing required archive; run './download' again";
-	    exit 1;
-    fi
-}
-
-if [ -d .git ] ; then
-    if [ -z "$GIT_LINK_SRC" ]; then
-        ./g -f clone
-    else
-        # space-saving clone from another local workdir
-        mkdir clone
-        for i in $GIT_REPO_NAMES ; do
-            bin/git-new-workdir $GIT_LINK_SRC/$i clone/$i
-            for i in clone/$i/* ; do
-                ln -sf $i $(basename $i)
-            done
-        done
-    fi
-fi
-
-if [ ! -d "$TARFILE_LOCATION" ]; then
-    mkdir $TARFILE_LOCATION
-fi
-if [ ! -d "$TARFILE_LOCATION" ]; then
-    echo "Error: Cannot create $TARFILE_LOCATION."
-    exit 1
-fi
-
-FILELIST="$1"
-if [ -z "$FILELIST" ]; then
-    echo "No filelist provided, using the default ooo.lst."
-    FILELIST="ooo.lst"
-fi
-
-# check for wget and md5sum
-wget=
-md5sum=
-curl=`which curl 2>/dev/null`
-
-for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do
-    eval "$i --version" > /dev/null 2>&1
-    ret=$?
-    if [ $ret -eq 0 ]; then
-        wget=$i
-        break
-    fi
-done
-
-if [ -z "$wget" -a -z "$curl" ]; then
-    echo "ERROR: neither  wget nor curl found!"
-    exit 1
-fi
-
-for i in md5 md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do
-    if [ "$i" = "md5" ]; then
-        eval "$i -x" > /dev/null 2>&1
-    else
-        eval "$i --version" > /dev/null 2>&1
-    fi
-    ret=$?
-    if [ $ret -eq 0 ]; then
-        md5sum=$i
-        break
-    fi
-done
-
-if [ "$md5sum" = "md5" ]; then
-    if md5 -r < /dev/null > /dev/null 2>/dev/null; then
-        md5special=-r
-    elif md5 -n < /dev/null > /dev/null 2>/dev/null; then
-        md5special=-n
-    fi
-fi
-
-if [ -z "$md5sum" ]; then
-    echo "Warning: no md5sum: found!"
-fi
-
-start_dir=`pwd`
-logfile=$TARFILE_LOCATION/fetch.log
-date >> $logfile
-
-downloaditem()
-{
-    if [ "$1" != "" ]; then
-        if [ ! -f "../$2" ]; then
-            echo $2
-            if [ ! -z "$wget" ]; then
-                $wget --progress=dot:mega -N $1/$2 2>&1 | tee -a $logfile
-            else
-                echo fetching $2
-                $curl $file_date_check -O $1/$2 2>&1 | tee -a $logfile
-            fi
-            wret=$?
-            if [ $wret -ne 0 ]; then
-                mv $2 ${i}_broken
-                failed="$failed $2"
-                wret=0
-            fi
-            if [ -f $2 -a -n "$3" -a -n "$md5sum" ]; then
-                sum=`$md5sum $md5special $2 | sed "s/ .*//"`
-                if [ "$sum" != "$3" ]; then
-                    echo checksum failure for $2 2>&1 | tee -a $logfile
-                    failed="$failed $2"
-                    mv $2 ${i}_broken
-                else
-                    mv $2 ..
-                fi
-            else
-                mv $2 ..
-            fi
-        fi
-    fi
-}
-
-filelist=`cat $FILELIST`
-mkdir -p $TARFILE_LOCATION/tmp
-cd $TARFILE_LOCATION/tmp
-echo $$ > fetch-running
-for i in $filelist ; do
-#    echo $i
-    if [ "$i" != `echo $i | sed "s/^http:\///"` ]; then
-        tarurl=$i
-    # TODO: check for comment    
-    else
-        if [ "$tarurl" != "" ]; then
-            sum=`echo $i | sed "s/-.*//"`
-            downloaditem $tarurl $i $sum
-        fi
-    fi
-done
-
-if [ "$COM" = "MSC" ]; then
-    downloaditem "http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.1/W9XNT4/EN-US/" "dbghinst.EXE" "096f1d53d9ba09cde27d6f7c2ea6cc47"
-    downloaditem "http://download.microsoft.com/download/a/b/c/abc45517-97a0-4cee-a362-1957be2f24e1/" "WindowsXP-KB975337-x86-ENU.exe" "946d00d87e4094f3a6e425e2d538eadd"
-
-    msvcver=`$SRC_ROOT/oowintool --msvc-ver`
-    case "$msvcver" in
-        9.0)
-          downloaditem "http://download.microsoft.com/download/9/7/7/977B481A-7BA6-4E30-AC40-ED51EB2028F2/" "vcredist_x86.exe" "fd30acc7a696c32f661b33668e73bf7b"
-          downloaditem "http://download.microsoft.com/download/9/7/7/977B481A-7BA6-4E30-AC40-ED51EB2028F2/" "vcredist_x64.exe" "3abb5efe9ad4d9728406a1a90a47575f"
-        ;;
-    *)
-        ;;
-    esac
-
-fi
-
-if [ -f $start_dir/bootstrap.ver -a ! -d $start_dir/.git ] ; then
-    # bootstrap is from sources, so get the other source tarballs
-    . $start_dir/bootstrap.ver
-    lo_src_dir="$start_dir/src"
-    mkdir -p "$lo_src_dir"
-    for piece in `cat $start_dir/bin/repo-list` ; do
-        tarname="libreoffice-$piece-$lo_bootstrap_ver"
-        if [ ! -f "$TARFILE_LOCATION/$tarname.tar.bz2" ] ; then
-	    downloaditem "http://download.documentfoundation.org/libreoffice/src/" "$tarname.tar.bz2" ""
-	fi
-	$start_dir/bin/unpack-sources $start_dir $TARFILE_LOCATION/$tarname.tar.bz2
-    done
-fi
-
-rm $TARFILE_LOCATION/tmp/*-*
-cd $start_dir
-
-if [ ! -z "$failed" ]; then
-    echo
-    echo ERROR: failed on:
-    for i in $failed ; do
-        echo $i
-    done
-    exit 1
-fi
-
-if [ "$COM" = "MSC" -a -n "$md5sum" ]; then
-    # This can be run only on Windows itself (Cygwin)
-    TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp`
-    chmod a+w $TARFILE_LOCATION/tmp
-    if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbghinst.EXE ]; then
-	if [ ! -x $TARFILE_LOCATION/dbghinst.EXE ]; then
-	    chmod +x $TARFILE_LOCATION/dbghinst.EXE
-	fi
-        $TARFILE_LOCATION/dbghinst.EXE /T:$TMPUNPACK /C
-        sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/dbghelp.exe | sed "s/ .*//"`
-        if [ "$sum" = "cd3086a91e37965dd761ef5fd5df5b15" ]; then
-            unzip -LL -j -o -d ./external/dbghelp $TARFILE_LOCATION/tmp/dbghelp.exe
-        fi
-    fi
-    if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB975337-x86-ENU.exe ]; then
-	gdiplus_dll_path=asms/10/msft/windows/gdiplus/gdiplus.dll
-
-	# Run it through cmd so that the UAC prompt is displayed
-	echo
-	echo "NOTE: We are running the Microsoft KB975337 security fix installer"
-	echo "to get gdiplus.dll. You will most probably get a UAC prompt now."
-	echo "If you trust us, just enter your administrator password."
-	echo "The security fix is run with the /extract switch to just unpack"
-	echo "its files."
-	echo "If you don't trust us, just get gdiplus.dll yourself and put it"
-	echo "in external/gdiplus/gdiplus.dll."
-	echo "gdiplus.dll is included in the LibreOffice installer for the benefit of"
-	echo "Windows 2000 users."
-	# A few empty lines so that the above is visible even if the taskbar's auto-hide is turned on,
-	# and the UAC prompt caused it to taise (with a blinking icon for the UAC prompt)
-	echo
-	echo
-	echo
-        cmd /c "`cygpath -d $TARFILE_LOCATION/WindowsXP-KB975337-x86-ENU.exe` /extract:$TMPUNPACK /q"
-	if [ -f $TARFILE_LOCATION/tmp/$gdiplus_dll_path ]; then
-	    echo "Extraction succeeded"
-	    sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$gdiplus_dll_path | sed "s/ .*//"`
-	    if [ "$sum" = "4721ab485e0c29cd1617a5f296b9cc47" ]; then
-		cp $TARFILE_LOCATION/tmp/$gdiplus_dll_path ./external/gdiplus/gdiplus.dll
-	    else
-		echo "But unexpected checksum of $gdiplus_dll_path"
-	    fi
-	else
-	    echo "WindowsXP-KB975337-x86-ENU.exe did not unpack the expected $gdiplus_dll_path"
-        fi
-    fi
-    if [ ! -f ./external/vcredist/vcredist_x86.exe -a -f $TARFILE_LOCATION/vcredist_x86.exe ]; then
-        cp $TARFILE_LOCATION/vcredist_x86.exe ./external/vcredist/vcredist_x86.exe
-    fi
-    if [ ! -f ./external/vcredist/vcredist_x64.exe -a -f $TARFILE_LOCATION/vcredist_x64.exe ]; then
-        cp $TARFILE_LOCATION/vcredist_x64.exe ./external/vcredist/vcredist_x64.exe
-    fi
-fi
-
-# OxygenOffice extras
-for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
-    check_file $TARFILE_LOCATION/$pack
-    echo "Unpacking OxygenOffice extra '$pack' ..."
-    unzip -o -q $TARFILE_LOCATION/$pack -d $SRC_ROOT/extras/source
-done
-
-# Extensions copy
-for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $OOOBLOGGER_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
-    check_file $TARFILE_LOCATION/$pack
-    packfilename=`echo "$pack" | cut -f 2- -s -d - | cut -f 1 -d _`
-    echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
-    mkdir -p $SRC_ROOT/extras/source/extensions/ || exit 1
-    cp $TARFILE_LOCATION/$pack $SRC_ROOT/extras/source/extensions/$packfilename.oxt || exit 1
-done
-
-[ -x "post_download" ] || { echo "'post_download' script not found, run ./autogen.sh." ; exit 1 ; }
-
-# Save the config.log from the main configure script
-# and restore it after running post_download.
-mv config.log config.log.save
-
-./post_download --build=$BUILD_PLATFORM --host=$HOST_PLATFORM
-post_download_status=$?
-
-test -f config.log && mv config.log post_download.log
-mv config.log.save config.log
-
-exit $post_download_status
-
-# Local Variables:
-# tab-width: 4
-# indent-tabs-mode: nil
-# End:
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/guw/guw.cc b/guw/guw.cc
deleted file mode 100644
index 431866cb8..000000000
--- a/guw/guw.cc
+++ /dev/null
@@ -1,678 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// guw - A wrapper program to execute windows programs with parameters that
-// contain cygwin (POSIX) style pathnames.
-
-// Todo: Add a -? switch to guw to issue a help page.
-
-#include <string>
-#include <list>
-#include <vector>
-
-#include <iostream>
-#include <sstream>
-#include <fstream>
-
-#include <cstddef>
-#include <cerrno>
-
-#include <sys/cygwin.h>
-#include <windows.h>
-#include <regex.h>
-
-
-using std::string;
-using std::list;
-using std::vector;
-using std::cout;
-using std::cerr;
-using std::endl;
-using std::size_t;
-
-void init_ignorepara(string command);
-bool is_ignorepara(const string &para);
-int winFormat(string &para);
-void do_atcommand(string &para);
-void myCygpath(string &path, int shortname = 1 );
-void replace_cyg_env( void );
-void Fatal( const string text );
-
-int match2s(const string argument, const char *pattern, string &sub1, string &sub2);
-void rep_subn_cyg(string &argument);
-void rep_subn( string &argument, const char *pattern, int subexp, const char repl);
-void rep_char( string &argument, const char from, const char to);
-
-bool debug = false;
-bool debug_light = false;
-
-// The commands are treated case insensitive, the parameters
-// are case sensitive.
-const string ignorepara[] = { "echo /TEST",
-                              "cl -clr: -Z",
-                              "climaker StarOffice/OpenOffice",
-                              "csc -target:",
-                              "g++ -DLOCAL_RULE_LANGS -DUPD -DMINOR"
-                                " -DBUILD_ID -DSC_INFO_OSVERSION",
-                              "gcc -DUDATA_SO_SUFFIX -DSTATIC_O"
-                                " -DPACKAGE -DU_MAKE",
-                              "lib /OUT: -out: -def: -machine:",
-                              "link /BASE: /COMMENT: /DEBUG: /DLL /ENTRY:"
-                                " /MACHINE: /MAP /NODEFAULTLIB /OPT: /RELEASE"
-                                " /STACK: /SUBSYSTEM: -NODEFAULTLIB:"
-                                " -def: delayload: -implib: -map: -out:",
-                              "rc -D",
-                              "regcomp -env: vnd.sun.star.expand:"
-                                " vnd.openoffice.pymodule: file:",
-                              "regmerge /UCR",
-                              "rsc -DOOO_" };
-
-vector<string> ignorepara_vec;
-
-// environment variables that are "winformatted" when -env is given
-const string transformvars[] = { "SOLAR_VERSION",
-                                 "SOLARVERSION",
-                                 "SOLARVER",
-                                 "SRC_ROOT",
-                                 "SOLARENV",
-                                 "CLASSPATH",
-                                 "JAVA_HOME" };
-
-
-int main(int argc, char **argv) {
-
-  // initialize arglist with arguments
-  list<string> arglist(argv, argv + argc);
-
-  // Drop the first (filename) argument
-  arglist.pop_front();
-
-  // iterarot over cmdline elements
-  list<string>::iterator ele = arglist.begin();
-
-  // Allowed switch values
-  bool conv_cyg_arg = false;
-
-  // Look for switches to guw
-  // Supported: -env
-  //            -dbg
-  //            -ldbg
-  while ( !arglist.empty()
-          && ele!=arglist.end()
-          && (ele->find("-", 0) == 0) ) {
-    if (ele->find("-env", 0) == 0) {
-      if ( conv_cyg_arg )
-        Fatal("-env used twice!");
-
-      conv_cyg_arg = true;
-      ele = arglist.erase(ele);
-      continue;
-    }
-    else if (ele->find("-dbg", 0) == 0) {
-
-      debug = true;
-      ele = arglist.erase(ele);
-      continue;
-    }
-    else if (ele->find("-ldbg", 0) == 0) {
-
-      debug_light = true;
-      ele = arglist.erase(ele);
-      continue;
-    }
-    else {
-      // Ignore this switch
-      ++ele;
-    }
-  }
-
-  // The next entry must be the program
-  string command;
-  if ( !arglist.empty() ) {
-    command.assign(*arglist.begin());
-    arglist.pop_front();
-  }
-  else
-    Fatal("guw needs at least one parameter.");
-
-  if ( debug )
-    cerr << "Command: " << command << "\n" << endl;
-  // Initialize parameter exception list (for this command)
-  init_ignorepara(command);
-
-
-  // Do something if -env was found
-  if ( conv_cyg_arg )
-    replace_cyg_env();
-
-
-  // loop and and DOSify the parameters
-  if ( debug )
-    cerr << "Transform the parameter\n" << endl;
-
-  ele=arglist.begin();
-  while ( ele != arglist.end() ) {
-
-    if ((*ele)[0] == '@')
-      do_atcommand(*ele);
-    else if (!is_ignorepara(*ele)) {
-      if ( debug ) {
-        cerr << "----------------" << endl;
-        cerr << "Process parameter: " << *ele << endl;
-      }
-      winFormat(*ele);
-      if ( debug )
-        cerr << "Transformed to: " << *ele << "\n" << endl;
-    }
-
-    ++ele;
-  }
-
-  // create the argv[] for execvp(argv[0], argv);
-  ele=arglist.begin();
-
-  // const char *nargv[arglist.size()+2]; // or ..
-  char *nargv[arglist.size()+2];
-
-  // nargv[0] = command.c_str(); // or ..
-  nargv[0] = new char[command.length()+1];
-  // strcpy(nargv[0], command.c_str());
-  command.copy(nargv[0], command.length());
-  nargv[0][command.length()] = 0;
-
-  if ( debug )
-    cerr << "----------------\n" << endl;
-  if ( debug || debug_light )
-    cerr << "Execute: " << nargv[0];
-
-  int count = 1, sLen;
-  while ( ele != arglist.end() ) {
-    // nargv[count] = ele->c_str(); // or ..
-    sLen = ele->length();
-    nargv[count] = new char[sLen+1];
-    //    strcpy(nargv[count], ele->c_str());
-    ele->copy(nargv[count], sLen);
-    nargv[count][sLen] = 0;
-
-    if ( debug || debug_light )
-      cerr << " " << nargv[count];
-
-    ++count;
-    ++ele;
-  }
-  // last nargv[] must be NULL
-  nargv[count] = NULL;
-  if ( debug || debug_light )
-    cerr << endl;
-
-  // Unfortunately the prototype of execvp does not like const char*,
-  // actually not const char* nargv[] coming from .c_str(). So either
-  // we copy everything into newly allocated variables or we force it
-  // with a cast. const_cast<char * const *>()
-  // execvp(nargv[0], const_cast<char * const *>(nargv) );
-  if ( execvp(nargv[0], nargv ) < 0 ) {
-    perror("Execvp error.  Aborting.");
-    exit(1);       
-  }
-
-  // Omit the deleting of the dynamically allocated nargv[] elements
-  // here as this part will never be reached.
-
-  return 0;
-}
-
-// Initialize exception list from global var ignorepara[]
-void init_ignorepara(string fullcommand) {
-  const size_t kplen = sizeof(ignorepara)/sizeof(string *);
-  string shortcommand, cmd, para, sub2;
-
-  // First lowercase everything
-  for(size_t i=0;i<fullcommand.length();i++)
-    fullcommand[i] = tolower(fullcommand[i]);
-
-  // Remove a potential .exe
-  size_t slen = fullcommand.length();
-
-  // for slen == 3 this would yield string::npos otherwise
-  if ( slen > 4 && fullcommand.rfind(".exe") == slen - 4 )
-    fullcommand.erase(slen-4);
-
-  // get the program name - Only one subexpression
-  if (!match2s(fullcommand, "([[:alnum:]_~. +-]+)$",
-               shortcommand, sub2)) {
-    Fatal("No basename found in: " + fullcommand);
-  }
-
-  for (size_t i=0; i != kplen; ++i) {
-    std::istringstream line(ignorepara[i]);
-    line >> cmd;
-    if (shortcommand == cmd)
-      while (line >> para) {
-        ignorepara_vec.push_back(para);
-      }
-  }
-  return ;
-}
-
-// Check if command/parameter is in exception list.
-bool is_ignorepara(const string &para) {
-
-  for( vector<string>::iterator it = ignorepara_vec.begin();
-       it != ignorepara_vec.end(); ++it ) {
-    if ( para.find(*it) != string::npos ) {
-      if ( debug )
-        cerr << "Found execption para: " << para << endl;
-
-      return true;
-    }
-  }
-
-  return false;
-}
-
-// Reformat para to DOSish format
-int winFormat(string &para) {
-  string su1, su2;
-
-  // Instead of ([/[:alnum:]_~. +-]+)   use   ((/?[[:alnum:]_~. +-]+)+)
-
-  // find [-][-]X<something>=<path>, sometimes with quotes or "/" at the end
-  if (match2s(para, "^(-?-?[[:alpha:]][[:alnum:]_.-]*=)[\'\"]?((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
-              su1, su2)) {
-
-    myCygpath(su2);
-    para.assign(su1 + su2);
-    if ( debug )
-      cerr << "   WinFormat - ([-][-]<something>=<path>)\n"
-           << "      " << para << endl;
-
-  }
-  // find -X<something>:<path>, sometimes with quotes or "/" at the end
-  else if (match2s(para, "^(-[[:alpha:]][[:alnum:]_.]*:)[\'\"]?((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
-                   su1, su2)) {
-
-    myCygpath(su2);
-    para.assign(su1 + su2);
-    if ( debug )
-      cerr << "   WinFormat - (-<something>:<path>)\n"
-           << "      " << para << endl;
-
-  }
-  // find -X<something>:<NO-path>, and prevents translating of these.
-  else if (match2s(para, "^(-[[:alpha:]][[:alnum:]_]*:)(.*)$",
-                   su1, su2)) {
-
-    // myCygpath(su2);
-    // para.assign(su1 + su2);
-    if ( debug )
-      cerr << "   WinFormat - (-<something>:<NO-path>)\n"
-           << "      " << para << endl;
-
-  }
-  // See iz35982 for the reason for the special treatment of this switch.
-  // This regex evaluates <something>:///<path>, sometimes with
-  // quotes or "/" at the end
-  else if (match2s(para, "^([[:alpha:]][[:alnum:]_]*:)[\'\"]?///((/?[[:alnum:]_~. +-]+)+)[\'\"]?$",
-                   su1, su2)) {
-
-    myCygpath(su2);
-    para.assign(su1 + "///" + su2);
-    // Replace \ to /
-    rep_char( para, '\\', '/');
-
-    if ( debug )
-      cerr << "   WinFormat - (<something>:///<path>)\n"
-           << "      " << para << endl;
-
-  }
-  // find -X<absolute path>, sometimes with quotes or "/" at the end
-  else if (match2s(para, "^(-[[:alpha:]])[\'\"]?((/[[:alnum:]_~. +-]+)+)[\'\"]?$",
-                   su1, su2)) {
-
-    myCygpath(su2);
-    para.assign(su1 + su2);
-    if ( debug )
-      cerr << "   WinFormat - (-X<absolute path>)\n"
-           << "      " << para << endl;
-
-  }
-  // find -FX<path> (MSVC switches for output naming), sometimes with quotes
-  // or "/" at the end
-  else if (match2s(para, "^(-F[ARdemopr])[\'\"]?(/[/[:alnum:]_~. +-]+)[\'\"]?$",
-                   su1, su2)) {
-
-    myCygpath(su2);
-    para.assign(su1 + su2);
-    if ( debug )
-      cerr << "   WinFormat - (compiler naming (-FX<absolute path>) path)\n"
-           << "      " << para << endl;
-
-  }
-  else{
-    // No parameter found, assume a path
-
-    // replace the colon in drives with 0x1F"
-    // (Unused ascii US - unit separator)
-    rep_subn( para, "(^|[;,])[[:alpha:]](:)", 2, 0x1F);
-
-    // Replace remaining : to ;
-    rep_char( para, ':', ';');
-
-    // Replace back US to ':';
-    rep_char( para, 0x1F, ':');
-
-    /* Search for posix path ;entry; (The regex accepts valid paths with at
-     * least one /) and replace with DOS path, accept quotes.
-     * since iz28717 we also accept ',' as path seperator. */
-    rep_subn_cyg(para);
-
-    if ( debug )
-      cerr << "   WinFormat - full path\n"
-           << "      " << para << endl;
-
-  }
-
-  // Sanity check for -X<abspath>
-  if (match2s(para, "^(-[[:alpha:]])[\'\"]?((/[[:alnum:]_~. +-]+)+)",
-              su1, su2)) {
-    Fatal("Not converted -X/... type switch in :" + para);
-  }
-  // Sanity check for [-]X<something>(:|=)<abspath> case
-  if (match2s(para, "^(-?[[:alpha:]][[:alnum:]_.]+[=:])[\'\"]?((/[[:alnum:]_~. +-]+)+)",
-              su1, su2)) {
-    Fatal("Not processed [-]X<something>(=|:)/... in :" + para);
-  }
-
-
-  return 1;
-}
-
-// Reformat para to DOSish format
-void do_atcommand(string &para) {
-  string at, filename, token;
-
-  // Workaround, iz28717, keep number of @'s.
-  match2s(para, "^(@+)(.*)",at ,filename);
-  if ( debug ) {
-    cerr << "----------------" << endl;
-    cerr << "Process @-file" << endl;
-    cerr << "   :" << at << ": before filename :" << filename << ":" << endl;
-  }
-
-  // Read at file into memory
-  std::ifstream atin(filename.c_str());
-  list<string> newtoken;
-  while (atin >> token) {
-    // Read / transform tokens
-    if ( debug )
-      cerr << "@ token :" << token << ":" << endl;
-    if (!is_ignorepara(token))
-      winFormat(token);
-
-    newtoken.push_back(token);
-  }
-  atin.close();
-
-  // Write token tokens bak to file
-  if ( debug  || debug_light )
-    cerr << "New @-file parameter:" << endl;
-
-  // for debugging ..
-  // filename += ".bak";
-
-  std::ofstream atout(filename.c_str());
-  list<string>::iterator tok = newtoken.begin();
-  while ( tok != newtoken.end() ) {
-    if ( debug || debug_light )
-      cerr << ( tok != newtoken.begin() ? " " : "" ) << *tok ;
-
-    atout << ( tok != newtoken.begin() ? " " : "" ) << *tok ;
-    ++tok;
-  }
-  // We want a dos file
-  atout << '\r' << endl;
-  atout.close();
-
-  // Transform the filename
-  winFormat(filename);
-  para = at + filename;
-  if ( debug || debug_light ) {
-    cerr << "\nNew @-file name: " << para << "\n" << endl;
-  }
-}
-
-void myCygpath(string &path, int shortname /* =1 */ )
-{
-  static char convpath[MAX_PATH];
-  static char buf[MAX_PATH];
-  int err;
-
-  // Only use cygwin_conv_to_win32_path() on absolute paths as it errors
-  // out if its path doen't exist. Unfortunatelt there are a lot of not
-  // existing relative pathes used as parameters during an OOo build.
-  if( path.find("/", 0) == 0) {
-    err = cygwin_conv_to_win32_path( path.c_str(), convpath );
-  }
-  else {
-    rep_char( path, '/', '\\');
-    // see below, we copy convpath back to path, that's stupid
-    path.copy( convpath, path.length());
-    convpath[path.length()] = 0;
-    err = 0;
-  }
-
-  if (err)
-    Fatal("converting: " + path + " - " + strerror(errno) );
-
-  // Only convert to short dos names when space is present
-  if (shortname && (path.find(" ", 0) != string::npos) ) {
-    DWORD len = GetShortPathName (convpath, buf, MAX_PATH);
-    if (!len) {
-      Fatal("cannot create short name of " + string(convpath) );
-    }
-
-    path.assign(buf);
-  }
-  else
-    path.assign(convpath);
-
-}
-
-void replace_cyg_env( void ) {
-  // Transform certain environment variables
-  if ( debug )
-    cerr << "Transforming some environment variables" << endl;
-
-  const size_t nvars = sizeof(transformvars)/sizeof(string *);
-
-  char *currvar;
-  string newvar;
-
-  for (size_t i=0; i != nvars; ++i) {
-    if ( currvar = getenv(transformvars[i].c_str() ) ) {
-      // Only transform existent vars
-      if ( debug )
-        cerr << "Transform variable: " << transformvars[i] << "="
-             << currvar << endl;
-      newvar.assign(currvar);
-      winFormat(newvar);
-      if( setenv(transformvars[i].c_str(), newvar.c_str(), 1) )
-        Fatal("setenv failed on " + transformvars[i] + "=" + newvar +
-              " with error: " + strerror(errno));
-      if ( debug )
-        cerr << "To: " << transformvars[i] << "="
-             << newvar << "\n" << endl;
-    }
-  }
-}
-
-
-void Fatal( const string text ) {
-  // End with error
-  cerr << "Error: " << text << endl;
-  exit(1);
-}
-
-
-int
-match2s(const string argument, const char *pattern, string &sub1, string &sub2)
-{
-  int status;
-  regex_t re;
-
-  const int maxsub = 3;  // Only 3 needed, 4 is for debug
-  regmatch_t match[maxsub];
-
-  if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
-    Fatal("regcomp had a problem.");      /* report error */
-  }
-  status = regexec(&re, argument.c_str(), maxsub, match, 0);
-  regfree(&re);
-
-  if (status == REG_NOMATCH) {
-    return(0);      /* no match */
-  } else if (status == 0) {
-    string tstr(argument.c_str() + match[0].rm_so,
-                match[0].rm_eo - match[0].rm_so);
-    // cout << "Match: " << tstr << endl;
-
-    sub1.assign(argument.c_str() + match[1].rm_so, match[1].rm_eo - match[1].rm_so);
-    // cout << "Match1: " << sub1 << endl;
-
-    sub2.assign(argument.c_str() + match[2].rm_so, match[2].rm_eo - match[2].rm_so);
-    // cout << "Match2: " << sub2 << endl;
-
-    return(1);      /* match found */
-  } else {
-    Fatal("regexec had a problem.");
-  }
-
-  // Not reached.
-  return(1);
-}
-
-
-// Replace path entry with myCygpath() version
-void rep_subn_cyg(string &argument)
-{
-  // accept ["']<entry>["']:["']<entry>["']:... to make the
-  // $(WRAPCMD) echo 1 ICON $(EMQ)"$(APP1ICON)$(EMQ)"
-  // work in ?tg_app.mk.
-  // FIXME: Better would be to use a DOSified $(APP1ICON) there and remove
-  // the special " treatment here.
-  const char *pattern = "(^|[;,])[\'\"]?([[:alnum:]_~. +-]*(/[[:alnum:]_~. +-]+)+/?)[\'\"]?([;,]|$)";
-  const int subexp = 2;
-
-  int status, pos=0;
-  regex_t re;
-
-  string repstr;
-  string::size_type oLen, nLen;
-
-  const int maxsub = subexp+1;  // One more than the maximal subexpression
-  regmatch_t match[maxsub];
-
-  if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
-    Fatal("regcomp had a problem.");      /* report error */
-  }
-  status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
-  while (status == 0) {  /* While matches found. */
-    // Classical assert()
-    if (match[subexp].rm_eo == -1) {
-      Fatal("Nonexisting subexpression specified!");
-    }
-
-    oLen = match[subexp].rm_eo - match[subexp].rm_so;
-    repstr.assign(argument.c_str() + pos + match[subexp].rm_so, oLen);
-
-    // Do not replace with shortpaths
-    myCygpath(repstr, 0);
-    nLen = repstr.length();
-
-    // replace 
-    argument.replace( pos + match[subexp].rm_so, oLen, repstr );
-
-    /* Substring found between match[0].rm_so and match[0].rm_eo. */
-    /* This call to regexec() finds the next match. */
-
-    pos += match[0].rm_eo + nLen - oLen ;
-
-    // Either the last match did end in ';' or we are at the end of para.
-    // REG_NOTBOL is not used because we skip over the ';' by using pos.
-    status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
-  }
-
-  if (status != REG_NOMATCH) {
-    Fatal("regexec had a problem.");
-  }
-
-  regfree(&re);
-}
-
-// Replace all occurrences of subexpression number "subexp" with "repl"
-void rep_subn( string &argument, const char *pattern, int subexp, const char repl)
-{
-  int status, pos=0;
-  regex_t re;
-
-  const int maxsub = subexp+1;  // One more than the maximal subexpression
-  regmatch_t match[maxsub];
-
-  if (regcomp(&re, pattern, REG_EXTENDED) != 0) {
-    Fatal("regcomp had a problem.");      /* report error */
-  }
-  status = regexec (&re, argument.c_str() + pos, maxsub, match, 0);
-  while (status == 0) {  /* While matches found. */
-    // Classical assert()
-    if (match[subexp].rm_eo == -1) {
-      Fatal("Nonexisting subexpression specified!");
-    }
-
-    argument[pos + match[subexp].rm_so] = repl;
-
-    /* Substring found between match[0].rm_so and match[0].rm_eo. */
-    /* This call to regexec() finds the next match. */
-    pos += match[0].rm_eo;
-    status = regexec (&re, argument.c_str() + pos, maxsub, match, REG_NOTBOL);
-  }
-
-  if (status != REG_NOMATCH) {
-    Fatal("regexec had a problem.");
-  }
-
-  regfree(&re);
-}
-
-// Replace all char1 with char2
-void rep_char( string &argument, const char from, const char to)
-{
-  string::size_type loc = 0;
-
-  while ( (loc = argument.find( from, loc )) != string::npos ) {
-    argument[loc] = to;
-  }
-}
diff --git a/guw/makefile b/guw/makefile
deleted file mode 100644
index 8931c32f8..000000000
--- a/guw/makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-sources = guw.cc
-
-guw : $(sources)
-	g++ -Wall -o guw $(sources)
-
diff --git a/install-sh b/install-sh
deleted file mode 100644
index 36f96f3e0..000000000
--- a/install-sh
+++ /dev/null
@@ -1,276 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd=$cpprog
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd=$stripprog
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "$0: no input file specified" >&2
-	exit 1
-else
-	:
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-
-	if [ -d "$dst" ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f "$src" ] || [ -d "$src" ]
-	then
-		:
-	else
-		echo "$0: $src does not exist" >&2
-		exit 1
-	fi
-
-	if [ x"$dst" = x ]
-	then
-		echo "$0: no destination specified" >&2
-		exit 1
-	else
-		:
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d "$dst" ]
-	then
-		dst=$dst/`basename "$src"`
-	else
-		:
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-$defaultIFS}"
-
-oIFS=$IFS
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS=$oIFS
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp=$pathcomp$1
-	shift
-
-	if [ ! -d "$pathcomp" ] ;
-        then
-		$mkdirprog "$pathcomp"
-	else
-		:
-	fi
-
-	pathcomp=$pathcomp/
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd "$dst" &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		dstfile=`basename "$dst" $transformbasename |
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		:
-	fi
-
-# Make a couple of temp file names in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-	rmtmp=$dstdir/#rm.$$#
-
-# Trap to clean up temp files at exit.
-
-	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-	trap '(exit $?); exit' 1 2 13 15
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd "$src" "$dsttmp" &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
-
-# Now remove or move aside any old file at destination location.  We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons.  In this case, the final cleanup
-# might fail but the new file should still install successfully.
-
-{
-	if [ -f "$dstdir/$dstfile" ]
-	then
-		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-		{
-		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		  (exit 1); exit
-		}
-	else
-		:
-	fi
-} &&
-
-# Now rename the file to the real destination.
-
-	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-
-fi &&
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-
-{
-	(exit 0); exit
-}
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt
deleted file mode 100644
index 7263a0a9e..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt
+++ /dev/null
@@ -1,73 +0,0 @@
-Action	Description	Template
-s72	L0	L0
-WINDOWSENCODINGTEMPLATE	ActionText	Action
-Advertise	OOO_ACTIONTEXT_1	
-AllocateRegistrySpace	OOO_ACTIONTEXT_2	OOO_ACTIONTEXT_3
-AppSearch	OOO_ACTIONTEXT_4	OOO_ACTIONTEXT_5
-BindImage	OOO_ACTIONTEXT_6	OOO_ACTIONTEXT_7
-caCreateVRoots	OOO_ACTIONTEXT_8	
-caRemoveVRoots	OOO_ACTIONTEXT_9	
-CCPSearch	OOO_ACTIONTEXT_10	
-CostFinalize	OOO_ACTIONTEXT_11	
-CostInitialize	OOO_ACTIONTEXT_12	
-CreateFolders	OOO_ACTIONTEXT_13	OOO_ACTIONTEXT_14
-CreateShortcuts	OOO_ACTIONTEXT_15	OOO_ACTIONTEXT_16
-DeleteServices	OOO_ACTIONTEXT_17	OOO_ACTIONTEXT_18
-DuplicateFiles	OOO_ACTIONTEXT_19	OOO_ACTIONTEXT_20
-FileCost	OOO_ACTIONTEXT_21	
-FindRelatedProducts	OOO_ACTIONTEXT_22	OOO_ACTIONTEXT_23
-GenerateScript	OOO_ACTIONTEXT_24	OOO_ACTIONTEXT_25
-InstallAdminPackage	OOO_ACTIONTEXT_26	OOO_ACTIONTEXT_27
-InstallFiles	OOO_ACTIONTEXT_28	OOO_ACTIONTEXT_29
-InstallODBC	OOO_ACTIONTEXT_30	
-InstallServices	OOO_ACTIONTEXT_31	OOO_ACTIONTEXT_32
-InstallSFPCatalogFile	OOO_ACTIONTEXT_33	OOO_ACTIONTEXT_34
-InstallValidate	OOO_ACTIONTEXT_35	
-LaunchConditions	OOO_ACTIONTEXT_36	
-MigrateFeatureStates	OOO_ACTIONTEXT_37	OOO_ACTIONTEXT_38
-MoveFiles	OOO_ACTIONTEXT_39	OOO_ACTIONTEXT_40
-PatchFiles	OOO_ACTIONTEXT_41	OOO_ACTIONTEXT_42
-ProcessComponents	OOO_ACTIONTEXT_43	
-PublishComponents	OOO_ACTIONTEXT_44	OOO_ACTIONTEXT_45
-PublishFeatures	OOO_ACTIONTEXT_46	OOO_ACTIONTEXT_47
-PublishProduct	OOO_ACTIONTEXT_48	
-RegisterClassInfo	OOO_ACTIONTEXT_49	OOO_ACTIONTEXT_50
-RegisterComPlus	OOO_ACTIONTEXT_51	OOO_ACTIONTEXT_52
-RegisterExtensionInfo	OOO_ACTIONTEXT_53	OOO_ACTIONTEXT_54
-RegisterFonts	OOO_ACTIONTEXT_55	OOO_ACTIONTEXT_56
-RegisterMIMEInfo	OOO_ACTIONTEXT_57	OOO_ACTIONTEXT_58
-RegisterProduct	OOO_ACTIONTEXT_59	OOO_ACTIONTEXT_60
-RegisterProgIdInfo	OOO_ACTIONTEXT_61	OOO_ACTIONTEXT_62
-RegisterTypeLibraries	OOO_ACTIONTEXT_63	OOO_ACTIONTEXT_64
-RegisterUser	OOO_ACTIONTEXT_65	OOO_ACTIONTEXT_66
-RemoveDuplicateFiles	OOO_ACTIONTEXT_67	OOO_ACTIONTEXT_68
-RemoveEnvironmentStrings	OOO_ACTIONTEXT_69	OOO_ACTIONTEXT_70
-RemoveExistingProducts	OOO_ACTIONTEXT_71	OOO_ACTIONTEXT_72
-RemoveFiles	OOO_ACTIONTEXT_73	OOO_ACTIONTEXT_74
-RemoveFolders	OOO_ACTIONTEXT_75	OOO_ACTIONTEXT_76
-RemoveIniValues	OOO_ACTIONTEXT_77	OOO_ACTIONTEXT_78
-RemoveODBC	OOO_ACTIONTEXT_79	
-RemoveRegistryValues	OOO_ACTIONTEXT_80	OOO_ACTIONTEXT_81
-RemoveShortcuts	OOO_ACTIONTEXT_82	OOO_ACTIONTEXT_83
-RMCCPSearch	OOO_ACTIONTEXT_84	
-Rollback	OOO_ACTIONTEXT_85	OOO_ACTIONTEXT_86
-RollbackCleanup	OOO_ACTIONTEXT_87	OOO_ACTIONTEXT_88
-SelfRegModules	OOO_ACTIONTEXT_89	OOO_ACTIONTEXT_90
-SelfUnregModules	OOO_ACTIONTEXT_91	OOO_ACTIONTEXT_92
-SetODBCFolders	OOO_ACTIONTEXT_93	
-StartServices	OOO_ACTIONTEXT_94	OOO_ACTIONTEXT_95
-StopServices	OOO_ACTIONTEXT_96	OOO_ACTIONTEXT_97
-UnmoveFiles	OOO_ACTIONTEXT_98	OOO_ACTIONTEXT_99
-UnpublishComponents	OOO_ACTIONTEXT_100	OOO_ACTIONTEXT_101
-UnpublishFeatures	OOO_ACTIONTEXT_102	OOO_ACTIONTEXT_103
-UnpublishProduct	OOO_ACTIONTEXT_104	
-UnregisterClassInfo	OOO_ACTIONTEXT_105	OOO_ACTIONTEXT_106
-UnregisterComPlus	OOO_ACTIONTEXT_107	OOO_ACTIONTEXT_108
-UnregisterExtensionInfo	OOO_ACTIONTEXT_109	OOO_ACTIONTEXT_110
-UnregisterFonts	OOO_ACTIONTEXT_111	OOO_ACTIONTEXT_112
-UnregisterMIMEInfo	OOO_ACTIONTEXT_113	OOO_ACTIONTEXT_114
-UnregisterProgIdInfo	OOO_ACTIONTEXT_115	OOO_ACTIONTEXT_116
-UnregisterTypeLibraries	OOO_ACTIONTEXT_117	OOO_ACTIONTEXT_118
-WriteEnvironmentStrings	OOO_ACTIONTEXT_119	OOO_ACTIONTEXT_120
-WriteIniValues	OOO_ACTIONTEXT_121	OOO_ACTIONTEXT_122
-WriteRegistryValues	OOO_ACTIONTEXT_123	OOO_ACTIONTEXT_124
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminExe.idt
deleted file mode 100644
index ede3f7cb4..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminExe.idt
+++ /dev/null
@@ -1,13 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdminExecuteSequence	Action
-CostFinalize		150
-CostInitialize		50
-CreateFolders		325
-FileCost		100
-InstallAdminPackage		300
-InstallFiles		350
-InstallFinalize		400
-InstallInitialize		250
-InstallValidate		200
-ScheduleReboot	ISSCHEDULEREBOOT	375
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminUIS.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminUIS.idt
deleted file mode 100644
index 3d92e28a4..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminUIS.idt
+++ /dev/null
@@ -1,14 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdminUISequence	Action
-AdminWelcome	Not PATCH	250
-CostFinalize		200
-CostInitialize		100
-ExecuteAction		350
-FileCost		150
-PatchWelcome	PATCH	260
-SetupCompleteError		-3
-SetupCompleteSuccess		-1
-SetupInitialization		50
-SetupInterrupted		-2
-SetupProgress		300
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdvtExec.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdvtExec.idt
deleted file mode 100644
index 32b74d61a..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AdvtExec.idt
+++ /dev/null
@@ -1,19 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdvtExecuteSequence	Action
-CostFinalize		100
-CostInitialize		50
-CreateShortcuts		250
-InstallFinalize		700
-InstallInitialize		200
-InstallValidate		150
-MsiPublishAssemblies		575
-PublishComponents		550
-PublishFeatures		600
-PublishProduct		650
-RegisterClassInfo		300
-RegisterExtensionInfo		350
-RegisterMIMEInfo		450
-RegisterProgIdInfo		400
-RegisterTypeLibraries		500
-ScheduleReboot	ISSCHEDULEREBOOT	675
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary.idt
deleted file mode 100644
index 0b638cb0e..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary.idt
+++ /dev/null
@@ -1,20 +0,0 @@
-Name	Data
-s72	v0
-Binary	Name
-ImageBmp	Image.bmp
-BannerBmp	Banner.bmp
-CautionIco	caution.ico
-DontInstallIco	dontinstall.ico
-OpenFolderIco	openfolder.ico
-InstallIco	install.ico
-InstallFirstUseIco	installfirstuse.ico
-InstallPartialIco	installpartial.ico
-InstallStateMenuIco	installstatemenu.ico
-NetworkInstallIco	networkinstall.ico
-NewFolderIco	newfolder.ico
-SetupCompleteIco	setupcomplete.ico
-SetupIco	setup.ico
-SetupPartialIco	setuppartial.ico
-SetupRepairIco	setuprepair.ico
-TrashcanIco	trashcan.ico
-UpIco	up.ico
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp
deleted file mode 100644
index a453f1fcd..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp
deleted file mode 100644
index 11acb28b1..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/caution.ico
deleted file mode 100644
index 1c6f14ee0..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/caution.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/dontinstall.ico
deleted file mode 100644
index e7136d0e8..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/dontinstall.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/install.ico
deleted file mode 100644
index 2eb32becb..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/install.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installfirstuse.ico
deleted file mode 100644
index dc1e6542e..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installfirstuse.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installpartial.ico
deleted file mode 100644
index bd5767969..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installpartial.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installstatemenu.ico
deleted file mode 100644
index 914340dbb..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installstatemenu.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/networkinstall.ico
deleted file mode 100644
index ae11ed113..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/networkinstall.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/newfolder.ico
deleted file mode 100644
index 324adbcba..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/newfolder.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/openfolder.ico
deleted file mode 100644
index ef88d2e47..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/openfolder.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setup.ico
deleted file mode 100644
index 3580448fe..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setup.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setupcomplete.ico
deleted file mode 100644
index 609276af0..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setupcomplete.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuppartial.ico
deleted file mode 100644
index ac158ab39..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuppartial.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuprepair.ico
deleted file mode 100644
index 2f4a24d0b..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuprepair.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/trashcan.ico
deleted file mode 100644
index f1cc8083f..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/trashcan.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/up.ico
deleted file mode 100644
index 5dc25fae6..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/up.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CheckBox.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CheckBox.idt
deleted file mode 100644
index c7c8e06d7..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CheckBox.idt
+++ /dev/null
@@ -1,4 +0,0 @@
-Property	Value
-s72	S64
-CheckBox	Property
-ISCHECKFORPRODUCTUPDATES	1
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
deleted file mode 100644
index e5be5e4d6..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ /dev/null
@@ -1,380 +0,0 @@
-Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
-s72	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L50
-WINDOWSENCODINGTEMPLATE	Control	Dialog_	Control
-AdminChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-AdminChangeFolder	BannerLine	Line	0	44	374	0	1				
-AdminChangeFolder	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-AdminChangeFolder	Branding2	Text	3	228	140	13	65537		[ProductName]		
-AdminChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_3	ComboText	
-AdminChangeFolder	Combo	DirectoryCombo	21	64	277	80	458755	TARGETDIR		Up	
-AdminChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_5	Combo	
-AdminChangeFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_6		
-AdminChangeFolder	DlgLine	Line	145	234	229	0	1				
-AdminChangeFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_7		
-AdminChangeFolder	List	DirectoryList	21	90	332	97	7	TARGETDIR		TailText	
-AdminChangeFolder	NewFolder	PushButton	335	66	19	19	3670019		NewFolderIco	List	OOO_CONTROL_9
-AdminChangeFolder	OK	PushButton	230	243	66	17	3		OOO_CONTROL_10	Cancel	
-AdminChangeFolder	Tail	PathEdit	21	207	332	17	3	TARGETDIR		OK	
-AdminChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_12	Tail	
-AdminChangeFolder	Up	PushButton	310	66	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_13
-AdminNetworkLocation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_14	InstallNow	
-AdminNetworkLocation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-AdminNetworkLocation	BannerLine	Line	0	44	374	0	1				
-AdminNetworkLocation	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-AdminNetworkLocation	Branding2	Text	3	228	140	13	65537		[ProductName]		
-AdminNetworkLocation	Browse	PushButton	286	124	66	17	3		OOO_CONTROL_17	Back	
-AdminNetworkLocation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_18	LBBrowse	
-AdminNetworkLocation	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_19		
-AdminNetworkLocation	DlgLine	Line	145	234	229	0	1				
-AdminNetworkLocation	DlgText	Text	21	51	326	40	3		OOO_CONTROL_20		
-AdminNetworkLocation	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_21		
-AdminNetworkLocation	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_22	Cancel	
-AdminNetworkLocation	LBBrowse	Text	21	90	100	10	3		OOO_CONTROL_23	SetupPathEdit	
-AdminNetworkLocation	SetupPathEdit	PathEdit	21	102	330	17	3	TARGETDIR		Browse	
-AdminWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_24	Next	
-AdminWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_25	Back	
-AdminWelcome	DlgLine	Line	0	234	326	0	1				
-AdminWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-AdminWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_26	Cancel	
-AdminWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_27		
-AdminWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_28		
-CancelSetup	Icon	Icon	15	15	24	24	5242881		CautionIco		
-CancelSetup	No	PushButton	135	57	66	17	3		OOO_CONTROL_29	Yes	
-CancelSetup	Text	Text	48	15	194	30	3		OOO_CONTROL_30		
-CancelSetup	Yes	PushButton	62	57	66	17	3		OOO_CONTROL_31	No	
-CustomerInformation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_32	Next	
-CustomerInformation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomerInformation	BannerLine	Line	0	44	374	0	1				
-CustomerInformation	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomerInformation	Branding2	Text	3	228	140	13	65537		[ProductName]		
-CustomerInformation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_35	NameLabel	
-CustomerInformation	CompanyEdit	Edit	21	100	237	17	3	COMPANYNAME	OOO_CONTROL_36	SerialLabel	
-CustomerInformation	CompanyLabel	Text	21	89	75	10	3		OOO_CONTROL_37	CompanyEdit	
-CustomerInformation	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_38		
-CustomerInformation	DlgLine	Line	145	234	229	0	1				
-CustomerInformation	DlgRadioGroupText	Text	21	161	300	14	3		OOO_CONTROL_39		
-CustomerInformation	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_40		
-CustomerInformation	NameEdit	Edit	21	63	237	17	3	USERNAME	OOO_CONTROL_41	CompanyLabel	
-CustomerInformation	NameLabel	Text	21	52	75	10	3		OOO_CONTROL_42	NameEdit	
-CustomerInformation	Next	PushButton	230	243	66	17	3		OOO_CONTROL_43	Cancel	
-CustomerInformation	RadioGroup	RadioButtonGroup	63	170	300	50	3	ApplicationUsers		Back	
-CustomerInformation	SerialLabel	Text	21	127	109	10	2		OOO_CONTROL_45	SerialNumber	
-CustomerInformation	SerialNumber	MaskedEdit	21	138	237	17	2	ISX_SERIALNUM		RadioGroup	
-CustomSetup	Back	PushButton	164	243	66	17	3		OOO_CONTROL_46	Next	
-CustomSetup	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomSetup	BannerLine	Line	0	44	374	0	1				
-CustomSetup	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomSetup	Branding2	Text	3	228	140	13	65537		[ProductName]		
-CustomSetup	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_49	Tree	
-CustomSetup	ChangeFolder	PushButton	301	203	66	17	3		OOO_CONTROL_50	Help	
-CustomSetup	Details	PushButton	93	243	66	17	3		OOO_CONTROL_51	Back	
-CustomSetup	DlgDesc	Text	17	23	276	25	65539		OOO_CONTROL_52		
-CustomSetup	DlgLine	Line	145	234	229	0	1				
-CustomSetup	DlgText	Text	9	51	360	10	3		OOO_CONTROL_53		
-CustomSetup	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_54		
-CustomSetup	FeatureGroup	GroupBox	235	67	131	120	1		OOO_CONTROL_55		
-CustomSetup	Help	PushButton	22	243	66	17	3		OOO_CONTROL_56	Details	
-CustomSetup	InstallLabel	Text	8	190	360	10	3		OOO_CONTROL_57		
-CustomSetup	ItemDescription	Text	241	80	120	50	3		OOO_CONTROL_58		
-CustomSetup	Location	Text	8	203	291	20	3		OOO_CONTROL_59		
-CustomSetup	Next	PushButton	230	243	66	17	3		OOO_CONTROL_60	Cancel	
-CustomSetup	Size	Text	241	133	120	50	3		OOO_CONTROL_61		
-CustomSetup	Tree	SelectionTree	8	70	220	118	7	_BrowseProperty		ChangeFolder	
-CustomSetupTips	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomSetupTips	BannerLine	Line	0	44	374	0	1				
-CustomSetupTips	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomSetupTips	Branding2	Text	3	228	140	13	65537		[ProductName]		
-CustomSetupTips	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_64		
-CustomSetupTips	DlgLine	Line	145	234	229	0	1				
-CustomSetupTips	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_65		
-CustomSetupTips	DontInstall	Icon	21	155	24	24	5242881		DontInstallIco		
-CustomSetupTips	DontInstallText	Text	60	155	300	20	3		OOO_CONTROL_66		
-CustomSetupTips	Install	Icon	21	105	24	24	5242881		InstallIco		
-CustomSetupTips	InstallPartial	Icon	21	130	24	24	5242881		InstallPartialIco		
-CustomSetupTips	InstallStateMenu	Icon	21	52	24	24	5242881		InstallStateMenuIco		
-CustomSetupTips	InstallStateText	Text	21	91	300	10	3		OOO_CONTROL_68		
-CustomSetupTips	InstallText	Text	60	105	300	20	3		OOO_CONTROL_69		
-CustomSetupTips	MenuText	Text	50	52	300	36	3		OOO_CONTROL_70		
-CustomSetupTips	OK	PushButton	301	243	66	17	3		OOO_CONTROL_72		
-CustomSetupTips	PartialText	Text	60	130	300	20	3		OOO_CONTROL_73		
-DatabaseFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_74	Next	
-DatabaseFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DatabaseFolder	BannerLine	Line	0	44	374	0	1				
-DatabaseFolder	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-DatabaseFolder	Branding2	Text	3	228	140	13	65537		[ProductName]		
-DatabaseFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_77	ChangeFolder	
-DatabaseFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_78	Back	
-DatabaseFolder	DatabaseFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
-DatabaseFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_79		
-DatabaseFolder	DlgLine	Line	145	234	229	0	1				
-DatabaseFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_80		
-DatabaseFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_81		
-DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
-DatabaseFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_83	Cancel	
-DestinationFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_84	Next	
-DestinationFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DestinationFolder	BannerLine	Line	0	44	374	0	1				
-DestinationFolder	Branding1	Text	4	229	110	13	3		{&MSSWhiteSerif8}[ProductName]		
-DestinationFolder	Branding2	Text	3	228	110	13	65537		[ProductName]		
-DestinationFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_87	ChangeFolder	
-DestinationFolder	ChangeFolder	PushButton	301	125	66	17	3		OOO_CONTROL_88	Back	
-DestinationFolder	DestFolder	Icon	21	112	24	24	5242881		OpenFolderIco		
-DestinationFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_304		
-DestinationFolder	DlgLine	Line	114	234	260	0	1				
-DestinationFolder	DlgTitle	Text	13	6	280	25	65539		{&MSSansBold8}[ProductName]		
-DestinationFolder	Location	Text	57	128	240	40	3	_BrowseProperty	[INSTALLLOCATION]		
-DestinationFolder	LocLabel	Text	57	115	290	10	3		OOO_CONTROL_92		
-DestinationFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_93	Cancel	
-DestinationFolder	LabelStartInstall	Text	21	52	290	30	2		OOO_CONTROL_300		
-DestinationFolder	LabelInvalidDir	Text	21	52	290	30	2		OOO_CONTROL_301		
-DestinationFolder	LabelWrongProduct	Text	21	52	290	30	2		OOO_CONTROL_303		
-DestinationFolder	LabelStartInstall2	Text	21	82	290	30	2		OOO_CONTROL_305		
-DestinationFolder	LabelInvalidDir2	Text	21	82	290	30	2		OOO_CONTROL_307		
-DestinationFolder	LabelWrongProduct2	Text	21	82	290	30	2		OOO_CONTROL_306		
-DiskSpaceRequirements	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DiskSpaceRequirements	BannerLine	Line	0	44	374	0	1				
-DiskSpaceRequirements	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-DiskSpaceRequirements	Branding2	Text	3	228	140	13	65537		[ProductName]		
-DiskSpaceRequirements	DlgDesc	Text	17	23	276	25	65539		OOO_CONTROL_96		
-DiskSpaceRequirements	DlgLine	Line	145	234	229	0	1				
-DiskSpaceRequirements	DlgText	Text	10	185	358	41	3		OOO_CONTROL_97		
-DiskSpaceRequirements	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_98		
-DiskSpaceRequirements	List	VolumeCostList	8	55	358	125	393223		{120}{70}{70}{70}{70}		
-DiskSpaceRequirements	OK	PushButton	301	243	66	17	3		OOO_CONTROL_100		
-FilesInUse	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-FilesInUse	BannerLine	Line	0	44	374	0	1				
-FilesInUse	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-FilesInUse	Branding2	Text	3	228	140	13	65537		[ProductName]		
-FilesInUse	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_103		
-FilesInUse	DlgLine	Line	145	234	229	0	1				
-FilesInUse	DlgText	Text	21	51	348	29	3		OOO_CONTROL_104		
-FilesInUse	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_105		
-FilesInUse	Exit	PushButton	301	243	66	17	3		OOO_CONTROL_106	List	
-FilesInUse	Ignore	PushButton	230	243	66	17	3		OOO_CONTROL_107	Exit	
-FilesInUse	List	ListBox	21	87	331	135	7	FileInUseProcess		Retry	
-FilesInUse	Retry	PushButton	164	243	66	17	3		OOO_CONTROL_108	Ignore	
-FileTypeDialog	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
-FileTypeDialog	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-FileTypeDialog	BannerLine	Line	0	44	374	0	1				
-FileTypeDialog	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-FileTypeDialog	Branding2	Text	3	228	140	13	65537		[ProductName]		
-FileTypeDialog	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_138	CheckBox1	
-FileTypeDialog	CheckBox1	CheckBox	41	106	200	10	3	SELECT_WORD	 OOO_CONTROL_270	CheckBox2	
-FileTypeDialog	CheckBox2	CheckBox	41	131	200	10	3	SELECT_EXCEL	 OOO_CONTROL_271	CheckBox3	
-FileTypeDialog	CheckBox3	CheckBox	41	156	200	10	3	SELECT_POWERPOINT	 OOO_CONTROL_272	Back	
-FileTypeDialog	DlgDesc	Text	21	20	272	25	65539		OOO_CONTROL_274		
-FileTypeDialog	DlgLine	Line	145	234	229	0	1				
-FileTypeDialog	DlgText	Text	21	56	326	40	3		OOO_CONTROL_275		
-FileTypeDialog	DlgText2	Text	21	190	326	30	3		OOO_CONTROL_309		
-FileTypeDialog	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_278		
-FileTypeDialog	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-InstallChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-InstallChangeFolder	BannerLine	Line	0	44	374	0	1				
-InstallChangeFolder	Branding1	Text	4	229	110	13	3		{&MSSWhiteSerif8}[ProductName]		
-InstallChangeFolder	Branding2	Text	3	228	110	13	65537		[ProductName]		
-InstallChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_111	ComboText	
-InstallChangeFolder	Combo	DirectoryCombo	21	64	302	80	4128779	_BrowseProperty		Up	
-InstallChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_113	Combo	
-InstallChangeFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_114		
-InstallChangeFolder	DlgLine	Line	114	234	260	0	1				
-InstallChangeFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_115		
-InstallChangeFolder	List	DirectoryList	21	90	332	97	15	_BrowseProperty		TailText	
-InstallChangeFolder	OK	PushButton	230	243	66	17	3		OOO_CONTROL_118	Cancel	
-InstallChangeFolder	Tail	PathEdit	21	207	332	17	15	_BrowseProperty		OK	
-InstallChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_120	Tail	
-InstallChangeFolder	Up	PushButton	333	64	19	19	3670019		UpIco	List	OOO_CONTROL_121
-InstallWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_122	Copyright	
-InstallWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_123	Back	
-InstallWelcome	Copyright	Text	135	144	228	73	65539		OOO_CONTROL_124	Next	
-InstallWelcome	DlgLine	Line	0	234	374	0	1				
-InstallWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-InstallWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_125	Cancel	
-InstallWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_126		
-InstallWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_127		
-LicenseAgreement	Agree	RadioButtonGroup	8	190	330	40	3	AgreeToLicense		Back	
-LicenseAgreement	Back	PushButton	164	243	66	17	3		OOO_CONTROL_128	Next	
-LicenseAgreement	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-LicenseAgreement	BannerLine	Line	0	44	374	0	1				
-LicenseAgreement	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-LicenseAgreement	Branding2	Text	3	228	140	13	65537		[ProductName]		
-LicenseAgreement	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_131	Agree	
-LicenseAgreement	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_132		
-LicenseAgreement	DlgLine	Line	145	234	229	0	1				
-LicenseAgreement	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_133		
-LicenseAgreement	Memo	ScrollableText	8	54	358	130	7				
-LicenseAgreement	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-MaintenanceType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
-MaintenanceType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-MaintenanceType	BannerLine	Line	0	44	374	0	1				
-MaintenanceType	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-MaintenanceType	Branding2	Text	3	228	140	13	65537		[ProductName]		
-MaintenanceType	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_138	RadioGroup	
-MaintenanceType	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_139		
-MaintenanceType	DlgLine	Line	145	234	229	0	1				
-MaintenanceType	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_140		
-MaintenanceType	Ico1	Icon	35	75	24	24	5242881		SetupRepairIco		
-MaintenanceType	Ico2	Icon	35	135	24	24	5242881		TrashcanIco		
-MaintenanceType	Next	PushButton	230	243	66	17	3		OOO_CONTROL_141	Cancel	
-MaintenanceType	RadioGroup	RadioButtonGroup	21	55	290	170	3	_IsMaintenance		Back	
-MaintenanceType	Text1	Text	80	72	260	35	3		OOO_CONTROL_144		
-MaintenanceType	Text2	Text	80	135	260	35	3		OOO_CONTROL_145		
-MaintenanceWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_146	Next	
-MaintenanceWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_147	Back	
-MaintenanceWelcome	DlgLine	Line	0	234	374	0	1				
-MaintenanceWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-MaintenanceWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_148	Cancel	
-MaintenanceWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_149		
-MaintenanceWelcome	TextLine2	Text	135	55	228	50	65539		OOO_CONTROL_150		
-OutOfSpace	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-OutOfSpace	BannerLine	Line	0	44	374	0	1				
-OutOfSpace	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-OutOfSpace	Branding2	Text	3	228	140	13	65537		[ProductName]		
-OutOfSpace	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_153		
-OutOfSpace	DlgLine	Line	145	234	229	0	1				
-OutOfSpace	DlgText	Text	21	51	326	43	3		OOO_CONTROL_154		
-OutOfSpace	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_155		
-OutOfSpace	List	VolumeCostList	21	95	332	120	393223		OOO_CONTROL_156		
-OutOfSpace	Resume	PushButton	301	243	66	17	3		OOO_CONTROL_157		
-PatchWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_158	Next	
-PatchWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_159	Back	
-PatchWelcome	DlgLine	Line	0	234	374	0	1				
-PatchWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-PatchWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_160	Cancel	
-PatchWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_161		
-PatchWelcome	TextLine2	Text	135	54	228	45	65539		OOO_CONTROL_162		
-ReadyToInstall	Back	PushButton	164	243	66	17	3		OOO_CONTROL_163	InstallNow	
-ReadyToInstall	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-ReadyToInstall	BannerLine	Line	0	44	374	0	1				
-ReadyToInstall	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-ReadyToInstall	Branding2	Text	3	228	140	13	65537		[ProductName]		
-ReadyToInstall	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_166	Back	
-ReadyToInstall	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_167		
-ReadyToInstall	DlgLine	Line	145	234	229	0	1				
-ReadyToInstall	DlgText	Text	21	51	326	20	3		OOO_CONTROL_168		
-ReadyToInstall	DlgText1	Text	21	70	330	24	3		OOO_CONTROL_169		
-ReadyToInstall	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_170		
-ReadyToInstall	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_171		
-ReadyToInstall	DlgTitle3	Text	13	6	280	25	65538		OOO_CONTROL_172		
-ReadyToInstall	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_173	Cancel	
-ReadyToRemove	Back	PushButton	164	243	66	17	3		OOO_CONTROL_174	RemoveNow	
-ReadyToRemove	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-ReadyToRemove	BannerLine	Line	0	44	374	0	1				
-ReadyToRemove	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-ReadyToRemove	Branding2	Text	3	228	140	13	65537		[ProductName]		
-ReadyToRemove	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_177	Back	
-ReadyToRemove	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_178		
-ReadyToRemove	DlgLine	Line	145	234	229	0	1				
-ReadyToRemove	DlgText	Text	21	51	326	24	3		OOO_CONTROL_179		
-ReadyToRemove	DlgText1	Text	21	79	330	23	3		OOO_CONTROL_180		
-ReadyToRemove	DlgText2	Text	21	102	330	24	3				
-ReadyToRemove	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_181		
-ReadyToRemove	RemoveNow	PushButton	230	243	66	17	3		OOO_CONTROL_182	Cancel	
-SetupCompleteError	Back	PushButton	164	243	66	17	1		OOO_CONTROL_183	Finish	
-SetupCompleteError	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_184	Back	
-SetupCompleteError	DlgLine	Line	0	234	374	0	1				
-SetupCompleteError	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_185	Cancel	
-SetupCompleteError	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_186		
-SetupCompleteError	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_187		
-SetupCompleteError	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupCompleteError	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_188		
-SetupCompleteError	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_189		
-SetupCompleteError	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_190		
-SetupCompleteError	TextLine2	Text	135	55	228	25	65539		OOO_CONTROL_191		
-SetupCompleteSuccess	Back	PushButton	164	243	66	17	1		OOO_CONTROL_192	OK	
-SetupCompleteSuccess	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_193	Image	
-SetupCompleteSuccess	CheckBoxUpdates	CheckBox	135	164	10	9	2	ISCHECKFORPRODUCTUPDATES	CheckBox1	Back	
-SetupCompleteSuccess	CheckForUpdatesText	Text	152	162	190	30	65538		OOO_CONTROL_194		
-SetupCompleteSuccess	CheckLaunchProgram	CheckBox	151	114	10	9	2	LAUNCHPROGRAM			
-SetupCompleteSuccess	CheckLaunchReadme	CheckBox	151	148	10	9	2	LAUNCHREADME			
-SetupCompleteSuccess	DlgLine	Line	0	234	374	0	1				
-SetupCompleteSuccess	Image	Bitmap	0	0	122	234	1		ImageBmp	CheckBoxUpdates	
-SetupCompleteSuccess	LaunchProgramText	Text	164	112	198	15	65538		OOO_CONTROL_195		
-SetupCompleteSuccess	LaunchReadmeText	Text	164	148	198	13	65538		OOO_CONTROL_196		
-SetupCompleteSuccess	OK	PushButton	230	243	66	17	3		OOO_CONTROL_197	Cancel	
-SetupCompleteSuccess	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_198		
-SetupCompleteSuccess	TextLine2	Text	135	55	228	45	65538		OOO_CONTROL_199		
-SetupCompleteSuccess	TextLine3	Text	135	55	228	45	65538		OOO_CONTROL_200		
-SetupCompleteSuccess	UpdateTextLine1	Text	135	30	228	45	65538		OOO_CONTROL_201		
-SetupCompleteSuccess	UpdateTextLine2	Text	135	80	228	45	65538		OOO_CONTROL_202		
-SetupCompleteSuccess	UpdateTextLine3	Text	135	120	228	45	65538		OOO_CONTROL_203		
-SetupError	A	PushButton	192	80	66	17	3		OOO_CONTROL_204		
-SetupError	C	PushButton	192	80	66	17	3		OOO_CONTROL_205		
-SetupError	ErrorText	Text	50	15	200	50	3		OOO_CONTROL_206		
-SetupError	I	PushButton	192	80	66	17	3		OOO_CONTROL_207		
-SetupError	N	PushButton	192	80	66	17	3		OOO_CONTROL_208		
-SetupError	O	PushButton	192	80	66	17	3		OOO_CONTROL_209		
-SetupError	R	PushButton	192	80	66	17	3		OOO_CONTROL_210		
-SetupError	WarningIcon	Icon	15	15	24	24	5242881		CautionIco		
-SetupError	Y	PushButton	192	80	66	17	3		OOO_CONTROL_211		
-SetupInitialization	ActionData	Text	135	125	228	12	65539				
-SetupInitialization	ActionText	Text	135	109	220	36	65539				
-SetupInitialization	Back	PushButton	164	243	66	17	1		OOO_CONTROL_214		
-SetupInitialization	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_215		
-SetupInitialization	DlgLine	Line	0	234	374	0	1				
-SetupInitialization	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupInitialization	Next	PushButton	230	243	66	17	1		OOO_CONTROL_216		
-SetupInitialization	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_217		
-SetupInitialization	TextLine2	Text	135	55	228	30	65539		OOO_CONTROL_218		
-SetupInterrupted	Back	PushButton	164	243	66	17	1		OOO_CONTROL_219		
-SetupInterrupted	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_220		
-SetupInterrupted	DlgLine	Line	0	234	374	0	1				
-SetupInterrupted	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_221		
-SetupInterrupted	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_222		
-SetupInterrupted	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_223		
-SetupInterrupted	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupInterrupted	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_224		
-SetupInterrupted	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_225		
-SetupInterrupted	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_226		
-SetupInterrupted	TextLine2	Text	135	55	228	25	65539		OOO_CONTROL_227		
-SetupProgress	ActionProgress95	ProgressBar	59	113	275	12	65537		OOO_CONTROL_228		
-SetupProgress	ActionText	Text	59	100	275	12	3				
-SetupProgress	Back	PushButton	164	243	66	17	1		OOO_CONTROL_230	Next	
-SetupProgress	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-SetupProgress	BannerLine	Line	0	44	374	0	1				
-SetupProgress	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-SetupProgress	Branding2	Text	3	228	140	13	65537		[ProductName]		
-SetupProgress	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_233	Back	
-SetupProgress	DlgDesc	Text	21	23	272	25	65538		OOO_CONTROL_234		
-SetupProgress	DlgDesc2	Text	21	23	272	25	65538		OOO_CONTROL_235		
-SetupProgress	DlgLine	Line	145	234	229	0	1				
-SetupProgress	DlgText	Text	59	51	275	30	65538		OOO_CONTROL_236		
-SetupProgress	DlgText2	Text	59	51	275	30	65538		OOO_CONTROL_237		
-SetupProgress	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_238		
-SetupProgress	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_239		
-SetupProgress	LbSec	Text	172	139	32	12	2		OOO_CONTROL_240		
-SetupProgress	LbStatus	Text	59	85	70	12	3		OOO_CONTROL_241		
-SetupProgress	Next	PushButton	230	243	66	17	1		OOO_CONTROL_242	Cancel	
-SetupProgress	SetupIcon	Icon	21	51	24	24	5242881		SetupIco		
-SetupProgress	ShowTime	Text	155	139	17	12	2				
-SetupProgress	TextTime	Text	59	139	96	12	2		OOO_CONTROL_244		
-SetupResume	Back	PushButton	164	243	66	17	1		OOO_CONTROL_245	Next	
-SetupResume	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_246	Back	
-SetupResume	DlgLine	Line	0	234	374	0	1				
-SetupResume	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupResume	Next	PushButton	230	243	66	17	3		OOO_CONTROL_247	Cancel	
-SetupResume	PreselectedText	Text	135	55	228	45	65539		OOO_CONTROL_248		
-SetupResume	ResumeText	Text	135	46	228	45	65539		OOO_CONTROL_249		
-SetupResume	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_250		
-SetupType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_251	Next	
-SetupType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-SetupType	BannerLine	Line	0	44	374	0	1				
-SetupType	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-SetupType	Branding2	Text	3	228	140	13	65537		[ProductName]		
-SetupType	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_254	RadioGroup	
-SetupType	CompleteIco	Icon	34	94	24	24	5242881		SetupCompleteIco		
-SetupType	CompText	Text	80	94	246	35	3		OOO_CONTROL_255		
-SetupType	CustomIco	Icon	34	154	24	24	5242881		SetupPartialIco		
-SetupType	CustText	Text	80	154	246	35	3		OOO_CONTROL_256		
-SetupType	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_257		
-SetupType	DlgLine	Line	145	234	229	0	1				
-SetupType	DlgText	Text	21	51	326	10	3		OOO_CONTROL_258		
-SetupType	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_259		
-SetupType	Next	PushButton	230	243	66	17	3		OOO_CONTROL_260	Cancel	
-SetupType	RadioGroup	RadioButtonGroup	21	79	264	120	3	_IsSetupTypeMin		Back	
-SplashBitmap	Back	PushButton	164	243	66	17	1		OOO_CONTROL_262	Next	
-SplashBitmap	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-SplashBitmap	Branding2	Text	3	228	140	13	65537		[ProductName]		
-SplashBitmap	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_265	Back	
-SplashBitmap	DlgLine	Line	145	234	229	0	1				
-SplashBitmap	Image	Bitmap	13	12	114	211	1		ImageBmp		
-SplashBitmap	Next	PushButton	230	243	66	17	3		OOO_CONTROL_266	Cancel	
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
deleted file mode 100644
index 6f6e3cb59..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
+++ /dev/null
@@ -1,70 +0,0 @@
-Dialog_	Control_	Action	Condition
-s72	s50	s50	s255
-ControlCondition	Dialog_	Control_	Action	Condition
-CustomerInformation	DlgRadioGroupText	Hide	NOT Privileged
-CustomerInformation	DlgRadioGroupText	Hide	ProductState > 0
-CustomerInformation	DlgRadioGroupText	Hide	Version9X
-CustomerInformation	RadioGroup	Hide	NOT Privileged
-CustomerInformation	RadioGroup	Hide	ProductState > 0
-CustomerInformation	RadioGroup	Hide	Version9X
-CustomerInformation	SerialLabel	Show	SERIALNUMSHOW
-CustomerInformation	SerialNumber	Show	SERIALNUMSHOW
-CustomSetup	ChangeFolder	Hide	Installed
-CustomSetup	Details	Hide	Installed
-CustomSetup	InstallLabel	Hide	Installed
-InstallWelcome	Copyright	Hide	SHOWCOPYRIGHT="No"
-InstallWelcome	Copyright	Show	SHOWCOPYRIGHT="Yes"
-LicenseAgreement	Next	Disable	AgreeToLicense <> "Yes"
-LicenseAgreement	Next	Enable	AgreeToLicense = "Yes"
-ReadyToInstall	DlgTitle	Show	ProgressType0="Modify"
-ReadyToInstall	DlgTitle2	Show	ProgressType0="Repair"
-ReadyToInstall	DlgTitle3	Show	ProgressType0="install"
-SetupCompleteError	Back	Default	UpdateStarted
-SetupCompleteError	Back	Disable	NOT UpdateStarted
-SetupCompleteError	Back	Enable	UpdateStarted
-SetupCompleteError	Cancel	Disable	NOT UpdateStarted
-SetupCompleteError	Cancel	Enable	UpdateStarted
-SetupCompleteError	Finish	Default	NOT UpdateStarted
-SetupCompleteError	FinishText1	Hide	UpdateStarted
-SetupCompleteError	FinishText1	Show	NOT UpdateStarted
-SetupCompleteError	FinishText2	Hide	UpdateStarted
-SetupCompleteError	FinishText2	Show	NOT UpdateStarted
-SetupCompleteError	RestContText1	Hide	NOT UpdateStarted
-SetupCompleteError	RestContText1	Show	UpdateStarted
-SetupCompleteError	RestContText2	Hide	NOT UpdateStarted
-SetupCompleteError	RestContText2	Show	UpdateStarted
-SetupCompleteSuccess	CheckBoxUpdates	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	CheckForUpdatesText	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	CheckLaunchProgram	Show	SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	CheckLaunchReadme	Show	SHOWLAUNCHREADME="-1"  And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	LaunchProgramText	Show	SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	LaunchReadmeText	Show	SHOWLAUNCHREADME="-1"  And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	TextLine2	Show	ProgressType2="installed" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess	TextLine3	Show	ProgressType2="uninstalled" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess	UpdateTextLine1	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	UpdateTextLine2	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	UpdateTextLine3	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupInterrupted	Back	Default	UpdateStarted
-SetupInterrupted	Back	Disable	NOT UpdateStarted
-SetupInterrupted	Back	Enable	UpdateStarted
-SetupInterrupted	Cancel	Disable	NOT UpdateStarted
-SetupInterrupted	Cancel	Enable	UpdateStarted
-SetupInterrupted	Finish	Default	NOT UpdateStarted
-SetupInterrupted	FinishText1	Hide	UpdateStarted
-SetupInterrupted	FinishText1	Show	NOT UpdateStarted
-SetupInterrupted	FinishText2	Hide	UpdateStarted
-SetupInterrupted	FinishText2	Show	NOT UpdateStarted
-SetupInterrupted	RestContText1	Hide	NOT UpdateStarted
-SetupInterrupted	RestContText1	Show	UpdateStarted
-SetupInterrupted	RestContText2	Hide	NOT UpdateStarted
-SetupInterrupted	RestContText2	Show	UpdateStarted
-SetupProgress	DlgDesc	Show	ProgressType2="installed"
-SetupProgress	DlgDesc2	Show	ProgressType2="uninstalled"
-SetupProgress	DlgText	Show	ProgressType3="installs"
-SetupProgress	DlgText2	Show	ProgressType3="uninstalls"
-SetupProgress	DlgTitle	Show	ProgressType1="Installing"
-SetupProgress	DlgTitle2	Show	ProgressType1="Uninstalling"
-SetupResume	PreselectedText	Hide	RESUME
-SetupResume	PreselectedText	Show	NOT RESUME
-SetupResume	ResumeText	Hide	NOT RESUME
-SetupResume	ResumeText	Show	RESUME
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
deleted file mode 100644
index 21f7fe772..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
+++ /dev/null
@@ -1,138 +0,0 @@
-Dialog_	Control_	Event	Argument	Condition	Ordering
-s72	s50	s50	s255	S255	I2
-ControlEvent	Dialog_	Control_	Event	Argument	Condition
-AdminChangeFolder	Cancel	EndDialog	Return	1	2
-AdminChangeFolder	Cancel	Reset	0	1	1
-AdminChangeFolder	NewFolder	DirectoryListNew	0	1	0
-AdminChangeFolder	OK	EndDialog	Return	1	0
-AdminChangeFolder	OK	SetTargetPath	TARGETDIR	1	1
-AdminChangeFolder	Up	DirectoryListUp	0	1	0
-AdminNetworkLocation	Back	NewDialog	AdminWelcome	1	0
-AdminNetworkLocation	Browse	SpawnDialog	AdminChangeFolder	1	0
-AdminNetworkLocation	Cancel	SpawnDialog	CancelSetup	1	0
-AdminNetworkLocation	InstallNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	3
-AdminNetworkLocation	InstallNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	2
-AdminNetworkLocation	InstallNow	SetTargetPath	TARGETDIR	1	1
-AdminWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-AdminWelcome	Next	NewDialog	AdminNetworkLocation	1	0
-CancelSetup	No	EndDialog	Return	1	0
-CancelSetup	Yes	EndDialog	Exit	1	2
-CustomerInformation	Back	NewDialog	LicenseAgreement	1	1
-CustomerInformation	Cancel	SpawnDialog	CancelSetup	1	0
-CustomerInformation	Next	[ALLUSERS]	{}	ApplicationUsers = "OnlyCurrentUser" And Privileged	2
-CustomerInformation	Next	[ALLUSERS]	1	ApplicationUsers = "AllUsers" And Privileged	1
-CustomerInformation	Next	EndDialog	Exit	(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT<0) And (SERIALNUMVALRETURN<>SERIALNUMVALSUCCESSRETVAL)	3
-CustomerInformation	Next	NewDialog	SetupType	((Not SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))	4
-CustomSetup	Back	NewDialog	MaintenanceType	Installed	0
-CustomSetup	Back	NewDialog	SetupType	NOT Installed	0
-CustomSetup	Cancel	SpawnDialog	CancelSetup	1	0
-CustomSetup	ChangeFolder	SelectionBrowse	InstallChangeFolder	1	0
-CustomSetup	Details	SelectionBrowse	DiskSpaceRequirements	1	1
-CustomSetup	Help	SpawnDialog	CustomSetupTips	1	1
-CustomSetup	Next	[_IsSetupTypeMin]	Custom	1	0
-CustomSetup	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-CustomSetup	Next	NewDialog	ReadyToInstall	OutOfNoRbDiskSpace <> 1	0
-CustomSetupTips	OK	EndDialog	Return	1	1
-DatabaseFolder	Back	NewDialog	CustomerInformation	1	1
-DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
-DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
-DatabaseFolder	Next	NewDialog	SetupType	1	1
-DestinationFolder	Back	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-DestinationFolder	Back	NewDialog	InstallWelcome	HIDEEULA = 1	0
-DestinationFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DestinationFolder	ChangeFolder	[_BrowseProperty]	INSTALLLOCATION	1	2
-DestinationFolder	ChangeFolder	NewDialog	InstallChangeFolder	1	1
-DestinationFolder	Next	NewDialog	ReadyToInstall	1	0
-DiskSpaceRequirements	OK	EndDialog	Return	1	0
-FilesInUse	Exit	EndDialog	Exit	1	0
-FilesInUse	Ignore	EndDialog	Ignore	1	0
-FilesInUse	Retry	EndDialog	Retry	1	0
-FileTypeDialog	Back	NewDialog	CustomSetup	Installed OR _IsSetupTypeMin = "Custom"	2
-FileTypeDialog	Back	NewDialog	SetupType	NOT Installed AND _IsSetupTypeMin <> "Custom"	1
-FileTypeDialog	Cancel	SpawnDialog	CancelSetup	1	0
-FileTypeDialog	Next	NewDialog	ReadyToInstall	1	0
-InstallChangeFolder	Cancel	NewDialog	DestinationFolder	1	2
-InstallChangeFolder	Cancel	Reset	0	1	1
-InstallChangeFolder	OK	NewDialog	DestinationFolder	1	3
-InstallChangeFolder	OK	SetTargetPath	[_BrowseProperty]	1	2
-InstallChangeFolder	Up	DirectoryListUp	0	1	0
-InstallWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	1
-InstallWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-InstallWelcome	Next	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-InstallWelcome	Next	NewDialog	DestinationFolder	HIDEEULA = 1	0
-LicenseAgreement	Back	NewDialog	InstallWelcome	1	0
-LicenseAgreement	Cancel	SpawnDialog	CancelSetup	1	0
-LicenseAgreement	Next	NewDialog	DestinationFolder	AgreeToLicense = "Yes"	0
-MaintenanceType	Back	NewDialog	MaintenanceWelcome	1	0
-MaintenanceType	Cancel	SpawnDialog	CancelSetup	1	0
-MaintenanceType	Next	[ProgressType0]	Modify	_IsMaintenance = "Change"	2
-MaintenanceType	Next	[ProgressType0]	Repair	_IsMaintenance = "Reinstall"	1
-MaintenanceType	Next	[ProgressType1]	Modifying	_IsMaintenance = "Change"	3
-MaintenanceType	Next	[ProgressType1]	Repairing	_IsMaintenance = "Reinstall"	4
-MaintenanceType	Next	[ProgressType2]	modified	_IsMaintenance = "Change"	6
-MaintenanceType	Next	[ProgressType2]	repairs	_IsMaintenance = "Reinstall"	5
-MaintenanceType	Next	[ProgressType3]	modifies	_IsMaintenance = "Change"	7
-MaintenanceType	Next	[ProgressType3]	repairs	_IsMaintenance = "Reinstall"	8
-MaintenanceType	Next	NewDialog	CustomSetup	_IsMaintenance = "Change"	12
-MaintenanceType	Next	NewDialog	ReadyToInstall	_IsMaintenance = "Reinstall"	13
-MaintenanceType	Next	NewDialog	ReadyToRemove	_IsMaintenance = "Remove"	11
-MaintenanceType	Next	Reinstall	ALL	_IsMaintenance = "Reinstall"	10
-MaintenanceType	Next	ReinstallMode	[ReinstallModeText]	_IsMaintenance = "Reinstall"	9
-MaintenanceWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-MaintenanceWelcome	Next	NewDialog	MaintenanceType	1	0
-OutOfSpace	Resume	NewDialog	AdminNetworkLocation	ACTION = "ADMIN"	0
-OutOfSpace	Resume	NewDialog	DestinationFolder	ACTION <> "ADMIN"	0
-PatchWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	0
-PatchWelcome	Cancel	SpawnDialog	CancelSetup	1	1
-PatchWelcome	Next	EndDialog	Return	1	3
-PatchWelcome	Next	Reinstall	ALL	PATCH And REINSTALL=""	1
-PatchWelcome	Next	ReinstallMode	omus	PATCH And REINSTALLMODE=""	2
-ReadyToInstall	Back	NewDialog	DestinationFolder	Installed OR _IsSetupTypeMin = "Custom"	2
-ReadyToInstall	Back	NewDialog	DestinationFolder	Installed AND _IsMaintenance = "Reinstall"	3
-ReadyToInstall	Back	NewDialog	DestinationFolder	NOT Installed	1
-ReadyToInstall	Cancel	SpawnDialog	CancelSetup	1	0
-ReadyToInstall	InstallNow	[ProgressType1]	Installing	1	0
-ReadyToInstall	InstallNow	[ProgressType2]	installed	1	0
-ReadyToInstall	InstallNow	[ProgressType3]	installs	1	0
-ReadyToInstall	InstallNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
-ReadyToInstall	InstallNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-ReadyToRemove	Back	NewDialog	MaintenanceType	1	0
-ReadyToRemove	Cancel	SpawnDialog	CancelSetup	1	0
-ReadyToRemove	RemoveNow	[ProgressType1]	Uninstalling	1	0
-ReadyToRemove	RemoveNow	[ProgressType2]	uninstalled	1	0
-ReadyToRemove	RemoveNow	[ProgressType3]	uninstalls	1	0
-ReadyToRemove	RemoveNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	2
-ReadyToRemove	RemoveNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	2
-ReadyToRemove	RemoveNow	Remove	ALL	1	1
-SetupCompleteError	Back	[Suspend]	{}	1	1
-SetupCompleteError	Back	EndDialog	Return	1	2
-SetupCompleteError	Cancel	[Suspend]	1	1	1
-SetupCompleteError	Cancel	EndDialog	Return	1	2
-SetupCompleteError	Finish	EndDialog	Exit	1	2
-SetupCompleteSuccess	OK	DoAction	CheckForProductUpdates	ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And NOT ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL"	4
-SetupCompleteSuccess	OK	DoAction	CheckForProductUpdatesOnReboot	ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL"	5
-SetupCompleteSuccess	OK	EndDialog	Exit	1	2
-SetupError	A	EndDialog	ErrorAbort	1	0
-SetupError	C	EndDialog	ErrorCancel	1	0
-SetupError	I	EndDialog	ErrorIgnore	1	0
-SetupError	N	EndDialog	ErrorNo	1	0
-SetupError	O	EndDialog	ErrorOk	1	0
-SetupError	R	EndDialog	ErrorRetry	1	0
-SetupError	Y	EndDialog	ErrorYes	1	0
-SetupInitialization	Cancel	SpawnDialog	CancelSetup	1	0
-SetupInterrupted	Back	[Suspend]	{}	1	1
-SetupInterrupted	Back	EndDialog	Exit	1	2
-SetupInterrupted	Cancel	[Suspend]	1	1	1
-SetupInterrupted	Cancel	EndDialog	Exit	1	2
-SetupInterrupted	Finish	EndDialog	Exit	1	2
-SetupProgress	Cancel	SpawnDialog	CancelSetup	1	0
-SetupResume	Cancel	SpawnDialog	CancelSetup	1	0
-SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
-SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-SetupType	Back	NewDialog	CustomerInformation	1	0
-SetupType	Cancel	SpawnDialog	CancelSetup	1	0
-SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
-SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	0
-SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
-SplashBitmap	Next	NewDialog	InstallWelcome	1	0
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
deleted file mode 100644
index 7af1c7b26..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
+++ /dev/null
@@ -1,10 +0,0 @@
-Action	Type	Source	Target
-s72	i2	S64	S255
-CustomAction	Action
-setAllUsersProfile2K	51	ALLUSERSPROFILE	[%ALLUSERSPROFILE]
-SetAllUsersProfileNT	51	ALLUSERSPROFILE	[%SystemRoot]\Profiles\All Users
-setUserProfileNT	51	USERPROFILE	[%USERPROFILE]
-SetARPInstallLocation	51	ARPINSTALLLOCATION	[INSTALLLOCATION]
-NewProductFound	19		OOO_CUSTOMACTION_1
-SameProductFound	19		OOO_CUSTOMACTION_2
-RunningOffice	19		OOO_CUSTOMACTION_4
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt
deleted file mode 100644
index 100074c40..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt
+++ /dev/null
@@ -1,33 +0,0 @@
-Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control_Default	Control_Cancel
-s72	i2	i2	i2	i2	I4	L128	s50	S50	S50
-Dialog	Dialog
-AdminChangeFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	TailText	OK	Cancel
-AdminNetworkLocation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	InstallNow	InstallNow	Cancel
-AdminWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-CancelSetup	50	50	260	85	3	[ProductName] [Setup]	No	No	No
-CustomerInformation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	NameLabel	Next	Cancel
-CustomSetup	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	Tree	Next	Cancel
-CustomSetupTips	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-DatabaseFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-DestinationFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-DiskSpaceRequirements	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-FilesInUse	50	50	374	266	19	[ProductName] - [STR_INSTALLATION_WIZARD]	Retry	Retry	Exit
-FileTypeDialog	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	CheckBox1	Next	Cancel
-InstallChangeFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	TailText	OK	Cancel
-InstallWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-LicenseAgreement	50	50	374	266	2	[ProductName] - [STR_INSTALLATION_WIZARD]	Agree	Next	Cancel
-MaintenanceType	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RadioGroup	Next	Cancel
-MaintenanceWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-OutOfSpace	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Resume	Resume	Resume
-PatchWelcome	50	50	374	266	3	[ProductName] Patch - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-ReadyToInstall	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	InstallNow	InstallNow	Cancel
-ReadyToRemove	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RemoveNow	RemoveNow	Cancel
-SetupCompleteError	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Finish	Finish	Finish
-SetupCompleteSuccess	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-SetupError	50	10	270	110	65543	[ProductName] [STR_INSTALLATION_WIZARD]	ErrorText	O	C
-SetupInitialization	50	50	374	266	5	[ProductName] - [STR_INSTALLATION_WIZARD]	Cancel	Cancel	Cancel
-SetupInterrupted	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Finish	Finish	Finish
-SetupProgress	50	50	374	266	5	[ProductName] - [STR_INSTALLATION_WIZARD]	Cancel	Cancel	Cancel
-SetupResume	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-SetupType	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RadioGroup	Next	Cancel
-SplashBitmap	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Error.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Error.idt
deleted file mode 100644
index 9789d0cf5..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Error.idt
+++ /dev/null
@@ -1,133 +0,0 @@
-Error	Message
-i2	L0
-WINDOWSENCODINGTEMPLATE	Error	Error
-0	OOO_ERROR_1
-1	OOO_ERROR_2
-2	OOO_ERROR_3 
-4	OOO_ERROR_4 
-5	OOO_ERROR_5
-7	OOO_ERROR_6
-8	OOO_ERROR_7
-9	OOO_ERROR_8
-10	OOO_ERROR_9
-11	OOO_ERROR_10
-12	OOO_ERROR_11
-13	OOO_ERROR_12
-14	OOO_ERROR_13
-15	OOO_ERROR_14
-16	OOO_ERROR_15
-17	OOO_ERROR_16
-18	OOO_ERROR_17
-19	OOO_ERROR_18
-20	OOO_ERROR_19
-21	OOO_ERROR_20
-22	OOO_ERROR_21
-23	OOO_ERROR_22
-32	OOO_ERROR_23
-33	OOO_ERROR_24
-1101	OOO_ERROR_25
-1301	OOO_ERROR_26
-1302	OOO_ERROR_27
-1303	OOO_ERROR_28
-1304	OOO_ERROR_29
-1305	OOO_ERROR_30
-1306	OOO_ERROR_31.
-1307	OOO_ERROR_32
-1308	OOO_ERROR_33
-1309	OOO_ERROR_34
-1310	OOO_ERROR_35
-1311	OOO_ERROR_36
-1312	OOO_ERROR_37
-1313	OOO_ERROR_38
-1314	OOO_ERROR_39
-1315	OOO_ERROR_40
-1316	OOO_ERROR_41.
-1317	OOO_ERROR_42
-1318	OOO_ERROR_43
-1319	OOO_ERROR_44
-1320	OOO_ERROR_45
-1321	OOO_ERROR_46
-1322	OOO_ERROR_47
-1323	OOO_ERROR_48
-1324	OOO_ERROR_49
-1325	OOO_ERROR_50
-1326	OOO_ERROR_51
-1327	OOO_ERROR_52
-1328	OOO_ERROR_53
-1401	OOO_ERROR_54 
-1402	OOO_ERROR_55 
-1403	OOO_ERROR_56 
-1404	OOO_ERROR_57 
-1405	OOO_ERROR_58 
-1406	OOO_ERROR_59
-1407	OOO_ERROR_60
-1408	OOO_ERROR_61 
-1409	OOO_ERROR_62
-1410	OOO_ERROR_63
-1500	OOO_ERROR_64
-1501	OOO_ERROR_65
-1502	OOO_ERROR_66
-1503	OOO_ERROR_67
-1601	OOO_ERROR_68
-1602	OOO_ERROR_69
-1603	OOO_ERROR_70
-1604	OOO_ERROR_71
-1605	OOO_ERROR_72
-1606	OOO_ERROR_73
-1607	OOO_ERROR_74
-1608	OOO_ERROR_75
-1701	OOO_ERROR_76
-1702	OOO_ERROR_77
-1703	OOO_ERROR_78
-1704	OOO_ERROR_79
-1705	OOO_ERROR_80
-1706	OOO_ERROR_81
-1707	OOO_ERROR_82
-1708	OOO_ERROR_83
-1709	OOO_ERROR_84
-1710	OOO_ERROR_85
-1711	OOO_ERROR_86
-1712	OOO_ERROR_87
-1713	OOO_ERROR_88
-1714	OOO_ERROR_89
-1801	OOO_ERROR_90
-1802	OOO_ERROR_91
-1803	OOO_ERROR_92
-1804	OOO_ERROR_93
-1805	OOO_ERROR_94
-1806	OOO_ERROR_95
-1807	OOO_ERROR_96
-1901	OOO_ERROR_97
-1902	OOO_ERROR_98
-1903	OOO_ERROR_99
-1904	OOO_ERROR_100.
-1905	OOO_ERROR_101
-1906	OOO_ERROR_102
-1907	OOO_ERROR_103
-1908	OOO_ERROR_104
-1909	OOO_ERROR_105
-1910	OOO_ERROR_106
-1911	OOO_ERROR_107
-1912	OOO_ERROR_108
-1913	OOO_ERROR_109
-1914	OOO_ERROR_110
-1915	OOO_ERROR_111
-1916	OOO_ERROR_112
-1917	OOO_ERROR_113
-1918	OOO_ERROR_114
-1919	OOO_ERROR_115
-1920	OOO_ERROR_116
-1921	OOO_ERROR_117
-1922	OOO_ERROR_118
-1923	OOO_ERROR_119
-1924	OOO_ERROR_120
-1925	OOO_ERROR_121
-1926	OOO_ERROR_122
-1927	OOO_ERROR_123
-1928	OOO_ERROR_124
-1929	OOO_ERROR_125
-1930	OOO_ERROR_126
-1931	OOO_ERROR_127
-1932	OOO_ERROR_128
-1933	OOO_ERROR_129
-1934	OOO_ERROR_130
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/EventMap.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/EventMap.idt
deleted file mode 100644
index ae76b6af0..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/EventMap.idt
+++ /dev/null
@@ -1,19 +0,0 @@
-Dialog_	Control_	Event	Attribute
-s72	s50	s50	s50
-EventMapping	Dialog_	Control_	Event
-CustomSetup	ItemDescription	SelectionDescription	Text
-CustomSetup	Location	SelectionPath	Text
-CustomSetup	Next	SelectionPathOn	Enabled
-CustomSetup	Size	SelectionSize	Text
-SetupInitialization	ActionData	ActionData	Text
-SetupInitialization	ActionText	ActionText	Text
-SetupProgress	ActionProgress95	AdminInstallFinalize	Progress
-SetupProgress	ActionProgress95	InstallFiles	Progress
-SetupProgress	ActionProgress95	MoveFiles	Progress
-SetupProgress	ActionProgress95	RemoveFiles	Progress
-SetupProgress	ActionProgress95	RemoveRegistryValues	Progress
-SetupProgress	ActionProgress95	SetProgress	Progress
-SetupProgress	ActionProgress95	UnmoveFiles	Progress
-SetupProgress	ActionProgress95	WriteIniValues	Progress
-SetupProgress	ActionProgress95	WriteRegistryValues	Progress
-SetupProgress	ActionText	ActionText	Text
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
deleted file mode 100644
index 90ba9c6a6..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
+++ /dev/null
@@ -1,74 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-InstallExecuteSequence	Action
-AllocateRegistrySpace	NOT Installed	750
-AppSearch		25
-BindImage		2100
-CCPSearch	CCP_TEST	200
-CostFinalize		500
-CostInitialize		350
-CreateFolders		1850
-CreateShortcuts		2150
-DeleteServices	VersionNT	1000
-DuplicateFiles		2050
-FileCost		400
-FindRelatedProducts	NOT ISSETUPDRIVEN	100
-InstallFiles		1950
-InstallFinalize		3150
-InstallInitialize		700
-InstallODBC		2600
-InstallServices	VersionNT	2750
-InstallValidate		650
-IsolateComponents		450
-LaunchConditions		50
-MigrateFeatureStates		600
-MoveFiles		1900
-MsiPublishAssemblies		3025
-MsiUnpublishAssemblies		875
-NewProductFound	NEWPRODUCTS	110
-PatchFiles		2000
-ProcessComponents		800
-PublishComponents		3000
-PublishFeatures		3050
-PublishProduct		3100
-RegisterClassInfo		2200
-RegisterComPlus		2700
-RegisterExtensionInfo		2250
-RegisterFonts		2550
-RegisterMIMEInfo		2350
-RegisterProduct		2950
-RegisterProgIdInfo		2300
-RegisterTypeLibraries		2650
-RegisterUser		2900
-RemoveDuplicateFiles		1700
-RemoveEnvironmentStrings		1650
-RemoveExistingProducts		675
-RemoveFiles		1750
-RemoveFolders		1800
-RemoveIniValues		1550
-RemoveODBC		1200
-RemoveRegistryValues		1300
-RemoveShortcuts		1600
-RunningOffice	OFFICERUNS="1"	135
-RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	250
-SameProductFound	SAMEPRODUCTS	120
-ScheduleReboot	ISSCHEDULEREBOOT	3125
-SelfRegModules		2850
-SelfUnregModules		1100
-SetARPInstallLocation		990
-SetODBCFolders		550
-StartServices	VersionNT	2800
-StopServices	VersionNT	950
-UnpublishComponents		850
-UnpublishFeatures		900
-UnregisterClassInfo		1350
-UnregisterComPlus		1050
-UnregisterExtensionInfo		1400
-UnregisterFonts		1250
-UnregisterMIMEInfo		1500
-UnregisterProgIdInfo		1450
-UnregisterTypeLibraries		1150
-ValidateProductID		300
-WriteEnvironmentStrings		2500
-WriteIniValues		2450
-WriteRegistryValues		2400
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallU.idt
deleted file mode 100644
index 7b6bbd411..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallU.idt
+++ /dev/null
@@ -1,30 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-InstallUISequence	Action
-AppSearch		25
-CCPSearch	CCP_TEST	250
-CostFinalize		550
-CostInitialize		400
-ExecuteAction		850
-FileCost		450
-FindRelatedProducts		150
-InstallWelcome	Not Installed	650
-IsolateComponents		500
-LaunchConditions		50
-MaintenanceWelcome	Installed And Not RESUME And Not Preselected And Not PATCH	750
-MigrateFeatureStates		600
-NewProductFound	NEWPRODUCTS	160
-PatchWelcome	Installed And PATCH And Not IS_MAJOR_UPGRADE	625
-ResolveSource	Not Installed And Not PATCH	525
-RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	300
-SameProductFound	SAMEPRODUCTS	170
-setAllUsersProfile2K	VersionNT >= 500	512
-SetAllUsersProfileNT	VersionNT = 400	511
-SetupCompleteError		-3
-SetupCompleteSuccess		-1
-SetupInitialization		100
-SetupInterrupted		-2
-SetupProgress		800
-SetupResume	Installed And (RESUME Or Preselected) And Not PATCH	700
-setUserProfileNT	VersionNT	510
-ValidateProductID		350
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/LaunchCo.idt
deleted file mode 100644
index 35d78694a..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/LaunchCo.idt
+++ /dev/null
@@ -1,4 +0,0 @@
-Condition	Description
-s255	l255
-WINDOWSENCODINGTEMPLATE	LaunchCondition	Condition
-Privileged	OOO_LAUNCH_1
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ListBox.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ListBox.idt
deleted file mode 100644
index e62653df9..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ListBox.idt
+++ /dev/null
@@ -1,3 +0,0 @@
-Property	Order	Value	Text
-s72	i2	s64	L64
-ListBox	Property	Order
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
deleted file mode 100644
index 0f3ed1e1b..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ /dev/null
@@ -1,56 +0,0 @@
-Property	Value
-s72	l0
-WINDOWSENCODINGTEMPLATE	Property	Property
-_IsMaintenance	Reinstall
-_IsSetupTypeMin	Typical
-AgreeToLicense	No
-ApplicationUsers	AllUsers
-ALLUSERS	1
-ARPCOMMENTS	ARPCOMMENTSTEMPLATE
-ARPCONTACT	OOO_ARPCONTACTTEMPLATE
-ARPHELPLINK	OOO_ARPHELPLINKTEMPLATE
-ARPHELPTELEPHONE	OOO_ARPHELPTELEPHONETEMPLATE
-ARPURLINFOABOUT	OOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO	OOO_ARPURLUPDATEINFOTEMPLATE
-DefaultUIFont	Tahoma8
-DialogCaption	Windows Installer
-DiskPrompt	[1]
-Display_IsBitmapDlg	1
-DisplayNameCustom	IDPROP_SETUPTYPE_CUSTOM
-DisplayNameMinimal	IDPROP_SETUPTYPE_COMPACT
-DisplayNameTypical	IDPROP_SETUPTYPE_TYPICAL
-DWUSINTERVAL	30
-ErrorDialog	SetupError
-InstallChoice	AR
-INSTALLLEVEL	INSTALLLEVELTEMPLATE
-ISCHECKFORPRODUCTUPDATES	ISCHECKFORPRODUCTUPDATESTEMPLATE
-ISSCRIPT_VERSION_MISSING	IDS_ISSCRIPT_VERSION_MISSING
-ISSCRIPT_VERSION_OLD	IDS_ISSCRIPT_VERSION_OLD
-ISVROOT_PORT_NO	0
-Manufacturer	MANUFACTURERTEMPLATE
-OFFICERUNS	0
-PIDTemplate	12345<###-%%%%%%%>@@@@@
-ProductCode	PRODUCTCODETEMPLATE
-ProductID	none
-ProductLanguage	PRODUCTLANGUAGETEMPLATE
-ProductName	PRODUCTNAMETEMPLATE
-ProductVersion	PRODUCTVERSIONTEMPLATE
-ProgressType0	install
-ProgressType1	Installing
-ProgressType2	installed
-ProgressType3	installs
-RebootYesNo	Yes
-ReinstallModeText	omus
-SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
-SetupType	Typical
-STR_NEW_DISPLAY_NAME	OOO_STR_NEW_DISPLAY_NAME
-STR_EDIT	OOO_STR_EDIT
-STR_MS_WORD_DOCUMENT	OOO_STR_MS_WORD_DOCUMENT
-STR_MS_WORD_TEMPLATE	OOO_STR_MS_WORD_TEMPLATE
-STR_MS_EXCEL_WORKSHEET	OOO_STR_MS_EXCEL_WORKSHEET
-STR_MS_EXCEL_TEMPLATE	OOO_STR_MS_EXCEL_TEMPLATE
-STR_MS_POWERPOINT_PRESENTATION	OOO_STR_MS_POWERPOINT_PRESENTATION
-STR_MS_POWERPOINT_TEMPLATE	OOO_STR_MS_POWERPOINT_TEMPLATE
-STR_MS_POWERPOINT_SHOW	OOO_STR_MS_POWERPOINT_SHOW
-STR_INSTALLATION_WIZARD	OOO_STR_INSTALLATION_WIZARD
-UpgradeCode	UPGRADECODETEMPLATE
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RadioBut.idt
deleted file mode 100644
index ddbf7e1cc..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/RadioBut.idt
+++ /dev/null
@@ -1,11 +0,0 @@
-Property	Order	Value	X	Y	Width	Height	Text	Help
-s72	i2	s64	i2	i2	i2	i2	L64	L50
-WINDOWSENCODINGTEMPLATE	RadioButton	Property	Order
-_IsMaintenance	1	Reinstall	0	0	290	14	OOO_RADIOBUTTON_2	
-_IsMaintenance	2	Remove	0	60	290	14	OOO_RADIOBUTTON_3	
-_IsSetupTypeMin	1	Typical	0	0	264	14	OOO_RADIOBUTTON_4	
-_IsSetupTypeMin	2	Custom	0	60	264	14	OOO_RADIOBUTTON_5	
-AgreeToLicense	1	No	0	15	295	15	OOO_RADIOBUTTON_6	
-AgreeToLicense	2	Yes	0	0	295	15	OOO_RADIOBUTTON_7	
-ApplicationUsers	1	AllUsers	1	7	290	14	OOO_RADIOBUTTON_8	
-ApplicationUsers	2	OnlyCurrentUser	1	23	290	14	OOO_RADIOBUTTON_9	
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/TextStyl.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/TextStyl.idt
deleted file mode 100644
index b4575c15d..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/TextStyl.idt
+++ /dev/null
@@ -1,25 +0,0 @@
-TextStyle	FaceName	Size	Color	StyleBits
-s72	s32	i2	I4	I2
-TextStyle	TextStyle
-Arial8	Arial	8		
-Arial9	Arial	9		
-ArialBlue10	Arial	10	16711680	
-ArialBlueStrike10	Arial	10	16711680	8
-CourierNew8	Courier New	8		
-CourierNew9	Courier New	9		
-MSGothic9	MS Gothic	9		
-MSSansBold8	Tahoma	8		1
-MSSansSerif8	MS Sans Serif	8		
-MSSansSerif9	MS Sans Serif	9		
-MSSGreySerif8	MS Sans Serif	8	8421504	
-MSSWhiteSerif8	Tahoma	8	16777215	
-Tahoma10	Tahoma	10		
-Tahoma8	Tahoma	8		
-Tahoma9	Tahoma	9		
-TahomaBold10	Tahoma	10		1
-TahomaBold8	Tahoma	8		1
-Times8	Times New Roman	8		
-Times9	Times New Roman	9		
-TimesItalic12	Times New Roman	12		2
-TimesItalicBlue10	Times New Roman	10	16711680	2
-TimesRed16	Times New Roman	16	255	
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/UIText.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/UIText.idt
deleted file mode 100644
index ea581bff4..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/UIText.idt
+++ /dev/null
@@ -1,53 +0,0 @@
-Key	Text
-s72	L255
-WINDOWSENCODINGTEMPLATE	UIText	Key
-AbsentPath	
-bytes	OOO_UITEXT_1
-GB	OOO_UITEXT_2
-KB	OOO_UITEXT_3
-MB	OOO_UITEXT_4
-MenuAbsent	OOO_UITEXT_5
-MenuAdvertise	OOO_UITEXT_6
-MenuAllCD	OOO_UITEXT_7
-MenuAllLocal	OOO_UITEXT_8
-MenuAllNetwork	OOO_UITEXT_9
-MenuCD	OOO_UITEXT_10
-MenuLocal	OOO_UITEXT_11
-MenuNetwork	OOO_UITEXT_12
-NewFolder	OOO_UITEXT_13
-SelAbsentAbsent	OOO_UITEXT_14
-SelAbsentAdvertise	OOO_UITEXT_15
-SelAbsentCD	OOO_UITEXT_16
-SelAbsentLocal	OOO_UITEXT_17
-SelAbsentNetwork	OOO_UITEXT_18
-SelAdvertiseAbsent	OOO_UITEXT_19
-SelAdvertiseAdvertise	OOO_UITEXT_20
-SelAdvertiseCD	OOO_UITEXT_21
-SelAdvertiseLocal	OOO_UITEXT_22
-SelAdvertiseNetwork	OOO_UITEXT_23
-SelCDAbsent	OOO_UITEXT_24
-SelCDAdvertise	OOO_UITEXT_25
-SelCDCD	OOO_UITEXT_26
-SelCDLocal	OOO_UITEXT_27
-SelChildCostNeg	OOO_UITEXT_28
-SelChildCostPos	OOO_UITEXT_29
-SelCostPending	OOO_UITEXT_30
-SelLocalAbsent	OOO_UITEXT_31
-SelLocalAdvertise	OOO_UITEXT_32
-SelLocalCD	OOO_UITEXT_33
-SelLocalLocal	OOO_UITEXT_34
-SelLocalNetwork	OOO_UITEXT_35
-SelNetworkAbsent	OOO_UITEXT_36
-SelNetworkAdvertise	OOO_UITEXT_37
-SelNetworkLocal	OOO_UITEXT_38
-SelNetworkNetwork	OOO_UITEXT_39
-SelParentCostNegNeg	OOO_UITEXT_40
-SelParentCostNegPos	OOO_UITEXT_41
-SelParentCostPosNeg	OOO_UITEXT_42
-SelParentCostPosPos	OOO_UITEXT_43
-TimeRemaining	OOO_UITEXT_44
-VolumeCostAvailable	OOO_UITEXT_45
-VolumeCostDifference	OOO_UITEXT_46
-VolumeCostRequired	OOO_UITEXT_47
-VolumeCostSize	OOO_UITEXT_48
-VolumeCostVolume	OOO_UITEXT_49
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
deleted file mode 100644
index 4098f92c3..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
+++ /dev/null
@@ -1,461 +0,0 @@
-Table	Column	Nullable	MinValue	MaxValue	KeyTable	KeyColumn	Category	Set	Description
-s32	s32	s4	I4	I4	S255	I2	S32	S255	S255
-_Validation	Table	Column
-_Validation	Category	Y						Text;Formatted;Template;Condition;Guid;Path;Version;Language;Identifier;Binary;UpperCase;LowerCase;Filename;Paths;AnyPath;WildCardFilename;RegPath;KeyFormatted;CustomSource;Property;Cabinet;Shortcut;URL	String category
-_Validation	Column	N					Identifier		Name of column
-_Validation	Description	Y					Text		Description of column
-_Validation	KeyColumn	Y	1	32					Column to which foreign key connects
-_Validation	KeyTable	Y					Identifier		For foreign key, Name of table to which data must link
-_Validation	MaxValue	Y	-2147483647	2147483647					Maximum value allowed
-_Validation	MinValue	Y	-2147483647	2147483647					Minimum value allowed
-_Validation	Nullable	N						Y;N	Whether the column is nullable
-_Validation	Set	Y					Text		Set of values that are permitted
-_Validation	Table	N					Identifier		Name of table
-ActionText	Action	N					Identifier		Name of action to be described.
-ActionText	Description	Y					Text		Localized description displayed in progress dialog and log when action is executing.
-ActionText	Template	Y					Template		Optional localized format template used to format action data records for display during action execution.
-AdminExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdminExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdminExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdminUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdminUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdminUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdvtExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdvtExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdvtExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdvtUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdvtUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdvtUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AppId	ActivateAtStorage	Y	0	1					
-AppId	AppId	N					Guid		
-AppId	DllSurrogate	Y					Text		
-AppId	LocalService	Y					Text		
-AppId	RemoteServerName	Y					Formatted		
-AppId	RunAsInteractiveUser	Y	0	1					
-AppId	ServiceParameters	Y					Text		
-AppSearch	Property	N					Identifier		The property associated with a Signature
-AppSearch	Signature_	N			Signature;RegLocator;IniLocator;DrLocator;CompLocator	1	Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables.
-BBControl	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this control.
-BBControl	BBControl	N					Identifier		Name of the control. This name must be unique within a billboard, but can repeat on different billboard.
-BBControl	Billboard_	N			Billboard	1	Identifier		External key to the Billboard table, name of the billboard.
-BBControl	Height	N	0	32767					Height of the bounding rectangle of the control.
-BBControl	Text	Y					Text		A string used to set the initial text contained within a control (if appropriate).
-BBControl	Type	N					Identifier		The type of the control.
-BBControl	Width	N	0	32767					Width of the bounding rectangle of the control.
-BBControl	X	N	0	32767					Horizontal coordinate of the upper left corner of the bounding rectangle of the control.
-BBControl	Y	N	0	32767					Vertical coordinate of the upper left corner of the bounding rectangle of the control.
-Billboard	Action	Y					Identifier		The name of an action. The billboard is displayed during the progress messages received from this action.
-Billboard	Billboard	N					Identifier		Name of the billboard.
-Billboard	Feature_	N			Feature	1	Identifier		An external key to the Feature Table. The billboard is shown only if this feature is being installed.
-Billboard	Ordering	Y	0	32767					A positive integer. If there is more than one billboard corresponding to an action they will be shown in the order defined by this column.
-Binary	Data	N					Binary		The unformatted binary data.
-Binary	Name	N					Identifier		Unique key identifying the binary data.
-BindImage	File_	N			File	1	Identifier		The index into the File table. This must be an executable file.
-BindImage	Path	Y					Paths		A list of ;  delimited paths that represent the paths to be searched for the import DLLS. The list is usually a list of properties each enclosed within square brackets [] .
-CCPSearch	Signature_	N			Signature;RegLocator;IniLocator;DrLocator;CompLocator	1	Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables.
-CheckBox	Property	N					Identifier		A named property to be tied to the item.
-CheckBox	Value	Y					Formatted		The value string associated with the item.
-Class	AppId_	Y			AppId	1	Guid		Optional AppID containing DCOM information for associated application (string GUID).
-Class	Argument	Y					Formatted		optional argument for LocalServers.
-Class	Attributes	Y		32767					Class registration attributes.
-Class	CLSID	N					Guid		The CLSID of an OLE factory.
-Class	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-Class	Context	N					Identifier		The numeric server context for this server. CLSCTX_xxxx
-Class	DefInprocHandler	Y					Filename	1;2;3	Optional default inproc handler.  Only optionally provided if Context=CLSCTX_LOCAL_SERVER.  Typically "ole32.dll" or "mapi32.dll"
-Class	Description	Y					Text		Localized description for the Class.
-Class	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational.
-Class	FileTypeMask	Y					Text		Optional string containing information for the HKCRthis CLSID) key. If multiple patterns exist, they must be delimited by a semicolon, and numeric subkeys will be generated: 0,1,2...
-Class	Icon_	Y			Icon	1	Identifier		Optional foreign key into the Icon Table, specifying the icon file associated with this CLSID. Will be written under the DefaultIcon key.
-Class	IconIndex	Y	-32767	32767					Optional icon index.
-Class	ProgId_Default	Y			ProgId	1	Text		Optional ProgId associated with this CLSID.
-ComboBox	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list.The integers do not have to be consecutive.
-ComboBox	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same combobox.
-ComboBox	Text	Y					Formatted		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ComboBox	Value	N					Formatted		The value string associated with this item. Selecting the line will set the associated property to this value.
-CompLocator	ComponentId	N					Guid		A string GUID unique to this component, version, and language.
-CompLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-CompLocator	Type	Y	0	1					A boolean value that determines if the registry value is a filename or a directory location.
-Complus	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the ComPlus component.
-Complus	ExpType	Y	0	32767					ComPlus component attributes.
-Component	Attributes	N							Remote execution option, one of irsEnum
-Component	Component	N					Identifier		Primary key used to identify a particular component record.
-Component	ComponentId	Y					Guid		A string GUID unique to this component, version, and language.
-Component	Condition	Y					Condition		A conditional statement that will disable this component if the specified condition evaluates to the 'True' state. If a component is disabled, it will not be installed, regardless of the 'Action' state associated with the component.
-Component	Directory_	N			Directory	1	Identifier		Required key of a Directory table record. This is actually a property name whose value contains the actual path, set either by the AppSearch action or with the default setting obtained from the Directory table.
-Component	KeyPath	Y			File;Registry;ODBCDataSource	1	Identifier		Either the primary key into the File table, Registry table, or ODBCDataSource table. This extract path is stored when the component is installed, and is used to detect the presence of the component and to return the path to it.
-Condition	Condition	Y					Condition		Expression evaluated to determine if Level in the Feature table is to change.
-Condition	Feature_	N			Feature	1	Identifier		Reference to a Feature entry in Feature table.
-Condition	Level	N	0	32767					New selection Level to set in Feature table if Condition evaluates to TRUE.
-Control	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this control.
-Control	Control	N					Identifier		Name of the control. This name must be unique within a dialog, but can repeat on different dialogs. 
-Control	Control_Next	Y			Control	2	Identifier		The name of an other control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!
-Control	Dialog_	N			Dialog	1	Identifier		External key to the Dialog table, name of the dialog.
-Control	Height	N	0	32767					Height of the bounding rectangle of the control.
-Control	Help	Y					Text		The help strings used with the button. The text is optional. 
-Control	Property	Y					Identifier		The name of a defined property to be linked to this control. 
-Control	Text	Y					Formatted		A string used to set the initial text contained within a control (if appropriate).
-Control	Type	N					Identifier		The type of the control.
-Control	Width	N	0	32767					Width of the bounding rectangle of the control.
-Control	X	N	0	32767					Horizontal coordinate of the upper left corner of the bounding rectangle of the control.
-Control	Y	N	0	32767					Vertical coordinate of the upper left corner of the bounding rectangle of the control.
-ControlCondition	Action	N						Default;Disable;Enable;Hide;Show	The desired action to be taken on the specified control.
-ControlCondition	Condition	N					Condition		A standard conditional statement that specifies under which conditions the action should be triggered.
-ControlCondition	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control.
-ControlCondition	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the dialog.
-ControlEvent	Argument	N					Formatted		A value to be used as a modifier when triggering a particular event.
-ControlEvent	Condition	Y					Condition		A standard conditional statement that specifies under which conditions an event should be triggered.
-ControlEvent	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control
-ControlEvent	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the dialog.
-ControlEvent	Event	N					Formatted		An identifier that specifies the type of the event that should take place when the user interacts with control specified by the first two entries.
-ControlEvent	Ordering	Y	0	2147483647					An integer used to order several events tied to the same control. Can be left blank.
-CreateFolder	Component_	N			Component	1	Identifier		Foreign key into the Component table.
-CreateFolder	Directory_	N			Directory	1	Identifier		Primary key, could be foreign key into the Directory table.
-CustomAction	Action	N					Identifier		Primary key, name of action, normally appears in sequence table unless private use.
-CustomAction	Source	Y					CustomSource		The table reference of the source of the code.
-CustomAction	Target	Y					Formatted		Excecution parameter, depends on the type of custom action
-CustomAction	Type	N	1	32767					The numeric custom action type, consisting of source location, code type, entry, option flags.
-Dialog	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this dialog.
-Dialog	Control_Cancel	Y			Control	2	Identifier		Defines the cancel control. Hitting escape or clicking on the close icon on the dialog is equivalent to pushing this button.
-Dialog	Control_Default	Y			Control	2	Identifier		Defines the default control. Hitting return is equivalent to pushing this button.
-Dialog	Control_First	N			Control	2	Identifier		Defines the control that has the focus when the dialog is created.
-Dialog	Dialog	N					Identifier		Name of the dialog.
-Dialog	HCentering	N	0	100					Horizontal position of the dialog on a 0-100 scale. 0 means left end, 100 means right end of the screen, 50 center.
-Dialog	Height	N	0	32767					Height of the bounding rectangle of the dialog.
-Dialog	Title	Y					Formatted		A text string specifying the title to be displayed in the title bar of the dialog's window.
-Dialog	VCentering	N	0	100					Vertical position of the dialog on a 0-100 scale. 0 means top end, 100 means bottom end of the screen, 50 center.
-Dialog	Width	N	0	32767					Width of the bounding rectangle of the dialog.
-Directory	DefaultDir	N					DefaultDir		The default sub-path under parent's path.
-Directory	Directory	N					Identifier		Unique identifier for directory entry, primary key. If a property by this name is defined, it contains the full path to the directory.
-Directory	Directory_Parent	Y			Directory	1	Identifier		Reference to the entry in this table specifying the default parent directory. A record parented to itself or with a Null parent represents a root of the install tree.
-DrLocator	Depth	Y	0	32767					The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0.
-DrLocator	Parent	Y					Identifier		The parent file signature. It is also a foreign key in the Signature table. If null and the Path column does not expand to a full path, then all the fixed drives of the user system are searched using the Path.
-DrLocator	Path	Y					AnyPath		The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.
-DrLocator	Signature_	N					Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-DuplicateFile	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the duplicate file.
-DuplicateFile	DestFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full pathname to a destination folder.
-DuplicateFile	DestName	Y					Filename		Filename to be given to the duplicate file.
-DuplicateFile	File_	N			File	1	Identifier		Foreign key referencing the source file to be duplicated.
-DuplicateFile	FileKey	N					Identifier		Primary key used to identify a particular file entry
-Environment	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the environmental value.
-Environment	Environment	N					Identifier		Unique identifier for the environmental variable setting
-Environment	Name	N					Text		The name of the environmental value.
-Environment	Value	Y					Formatted		The value to set in the environmental settings.
-Error	Error	N	0	32767					Integer error number, obtained from header file IError(...) macros.
-Error	Message	Y					Template		Error formatting template, obtained from user ed. or localizers.
-EventMapping	Attribute	N					Identifier		The name of the control attribute, that is set when this event is received.
-EventMapping	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control.
-EventMapping	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the Dialog.
-EventMapping	Event	N					Identifier		An identifier that specifies the type of the event that the control subscribes to.
-Extension	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-Extension	Extension	N					Text		The extension associated with the table row.
-Extension	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational.
-Extension	MIME_	Y			MIME	1	Text		Optional Context identifier, typically "type/format" associated with the extension
-Extension	ProgId_	Y			ProgId	1	Text		Optional ProgId associated with this extension.
-Feature	Attributes	N						0;1;2;4;5;6;8;9;10;16;17;18;20;21;22;24;25;26;32;33;34;36;37;38;48;49;50;52;53;54	Feature attributes
-Feature	Description	Y					Text		Longer descriptive text describing a visible feature item.
-Feature	Directory_	Y			Directory	1	UpperCase		The name of the Directory that can be configured by the UI. A non-null value will enable the browse button.
-Feature	Display	Y	0	32767					Numeric sort order, used to force a specific display ordering.
-Feature	Feature	N					Identifier		Primary key used to identify a particular feature record.
-Feature	Feature_Parent	Y			Feature	1	Identifier		Optional key of a parent record in the same table. If the parent is not selected, then the record will not be installed. Null indicates a root item.
-Feature	Level	N	0	32767					The install level at which record will be initially selected. An install level of 0 will disable an item and prevent its display.
-Feature	Title	Y					Text		Short text identifying a visible feature item.
-FeatureComponents	Component_	N			Component	1	Identifier		Foreign key into Component table.
-FeatureComponents	Feature_	N			Feature	1	Identifier		Foreign key into Feature table.
-File	Attributes	Y	0	32767					Integer containing bit flags representing file attributes (with the decimal value of each bit position in parentheses)
-File	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the file.
-File	File	N					Identifier		Primary key, non-localized token, must match identifier in cabinet.  For uncompressed files, this field is ignored.
-File	FileName	N					Filename		File name used for installation, may be localized.  This may contain a "short name|long name" pair.
-File	FileSize	N	0	2147483647					Size of file in bytes (long integer).
-File	Language	Y					Language		List of decimal language Ids, comma-separated if more than one.
-File	Sequence	N	1	2147483647					Sequence with respect to the media images; order must track cabinet order.
-File	Version	Y			File	1	Version		Version string for versioned files;  Blank for unversioned files.
-FileSFPCatalog	File_	N			File	1	Identifier		File associated with the catalog
-FileSFPCatalog	SFPCatalog_	N			SFPCatalog	1	Filename		Catalog associated with the file
-Font	File_	N			File	1	Identifier		Primary key, foreign key into File table referencing font file.
-Font	FontTitle	Y					Text		Font name.
-Icon	Data	N					Binary		Binary stream. The binary icon data in PE (.DLL or .EXE) or icon (.ICO) format.
-Icon	Name	N					Identifier		Primary key. Name of the icon file.
-IniFile	Action	N						0;1;3	The type of modification to be made, one of iifEnum
-IniFile	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the .INI value.
-IniFile	DirProperty	Y					Identifier		Foreign key into the Directory table denoting the directory where the .INI file is.
-IniFile	FileName	N					Filename		The .INI file name in which to write the information
-IniFile	IniFile	N					Identifier		Primary key, non-localized token.
-IniFile	Key	N					Formatted		The .INI file key below Section.
-IniFile	Section	N					Formatted		The .INI file Section.
-IniFile	Value	N					Formatted		The value to be written.
-IniLocator	Field	Y	0	32767					The field in the .INI line. If Field is null or 0 the entire line is read.
-IniLocator	FileName	N					Filename		The .INI file name.
-IniLocator	Key	N					Text		Key value (followed by an equals sign in INI file).
-IniLocator	Section	N					Text		Section name within in file (within square brackets in INI file).
-IniLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-IniLocator	Type	Y	0	2					An integer value that determines if the .INI value read is a filename or a directory location or to be used as is w/o interpretation.
-InstallExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-InstallExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-InstallExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-InstallUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-InstallUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-InstallUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-IsolatedComponent	Component_Application	N			Component	1	Identifier		Key to Component table item for application
-IsolatedComponent	Component_Shared	N			Component	1	Identifier		Key to Component table item to be isolated
-LaunchCondition	Condition	N					Condition		Expression which must evaluate to TRUE in order for install to commence.
-LaunchCondition	Description	N					Formatted		Localizable text to display when condition fails and install must abort.
-ListBox	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-ListBox	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same listbox.
-ListBox	Text	Y					Text		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ListBox	Value	N					Formatted		The value string associated with this item. Selecting the line will set the associated property to this value.
-ListView	Binary_	Y			Binary	1	Identifier		The name of the icon to be displayed with the icon. The binary information is looked up from the Binary Table.
-ListView	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-ListView	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same listview.
-ListView	Text	Y					Text		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ListView	Value	N					Identifier		The value string associated with this item. Selecting the line will set the associated property to this value.
-LockPermissions	Domain	Y					Formatted		Domain name for user whose permissions are being set. (usually a property)
-LockPermissions	LockObject	N					Identifier		Foreign key into Registry or File table
-LockPermissions	Permission	Y	-2147483647	2147483647					Permission Access mask.  Full Control = 268435456 (GENERIC_ALL = 0x10000000)
-LockPermissions	Table	N					Identifier	Directory;File;Registry	Reference to another table name
-LockPermissions	User	N					Formatted		User for permissions to be set.  (usually a property)
-Media	Cabinet	Y					Cabinet		If some or all of the files stored on the media are compressed in a cabinet, the name of that cabinet.
-Media	DiskId	N	1	32767					Primary key, integer to determine sort order for table.
-Media	DiskPrompt	Y					Text		Disk name: the visible text actually printed on the disk.  This will be used to prompt the user when this disk needs to be inserted.
-Media	LastSequence	N	0	32767					File sequence number for the last file for this media.
-Media	Source	Y					Property		The property defining the location of the cabinet file.
-Media	VolumeLabel	Y					Text		The label attributed to the volume.
-MIME	CLSID	Y					Guid		Optional associated CLSID.
-MIME	ContentType	N					Text		Primary key. Context identifier, typically "type/format".
-MIME	Extension_	N			Extension	1	Text		Optional associated extension (without dot)
-ModuleAdminExecuteSequence	Action	N					Identifier		Action to insert
-ModuleAdminExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdminExecuteSequence	BaseAction	Y			ModuleAdminExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleAdminExecuteSequence	Condition	Y					Condition		
-ModuleAdminExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdminUISequence	Action	N					Identifier		Action to insert
-ModuleAdminUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdminUISequence	BaseAction	Y			ModuleAdminUISequence	1	Identifier		Base action to determine insert location.
-ModuleAdminUISequence	Condition	Y					Condition		
-ModuleAdminUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdvtExecuteSequence	Action	N					Identifier		Action to insert
-ModuleAdvtExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdvtExecuteSequence	BaseAction	Y			ModuleAdvtExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleAdvtExecuteSequence	Condition	Y					Condition		
-ModuleAdvtExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdvtUISequence	Action	N					Identifier		Action to insert
-ModuleAdvtUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdvtUISequence	BaseAction	Y			ModuleAdvtUISequence	1	Identifier		Base action to determine insert location.
-ModuleAdvtUISequence	Condition	Y					Condition		
-ModuleAdvtUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleComponents	Component	N			Component	1	Identifier		Component contained in the module.
-ModuleComponents	Language	N			ModuleSignature	2			Default language ID for module (may be changed by transform).
-ModuleComponents	ModuleID	N			ModuleSignature	1	Identifier		Module containing the component.
-ModuleDependency	ModuleID	N			ModuleSignature	1	Identifier		Module requiring the dependency.
-ModuleDependency	ModuleLanguage	N			ModuleSignature	2			Language of module requiring the dependency.
-ModuleDependency	RequiredID	N							String.GUID of required module.
-ModuleDependency	RequiredLanguage	N							LanguageID of the required module.
-ModuleDependency	RequiredVersion	Y					Version		Version of the required version.
-ModuleExclusion	ExcludedID	N							String.GUID of excluded module.
-ModuleExclusion	ExcludedLanguage	N							Language of excluded module.
-ModuleExclusion	ExcludedMaxVersion	Y					Version		Maximum version of excluded module.
-ModuleExclusion	ExcludedMinVersion	Y					Version		Minimum version of excluded module.
-ModuleExclusion	ModuleID	N			ModuleSignature	1	Identifier		String.GUID of module with exclusion requirement.
-ModuleExclusion	ModuleLanguage	N			ModuleSignature	2			LanguageID of module with exclusion requirement.
-ModuleIgnoreTable	Table	N					Identifier		Table name to ignore during merge operation.
-ModuleInstallExecuteSequence	Action	N					Identifier		Action to insert
-ModuleInstallExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleInstallExecuteSequence	BaseAction	Y			ModuleInstallExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleInstallExecuteSequence	Condition	Y					Condition		
-ModuleInstallExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleInstallUISequence	Action	N					Identifier		Action to insert
-ModuleInstallUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleInstallUISequence	BaseAction	Y			ModuleInstallUISequence	1	Identifier		Base action to determine insert location.
-ModuleInstallUISequence	Condition	Y					Condition		
-ModuleInstallUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleSignature	Language	N							Default decimal language of module.
-ModuleSignature	ModuleID	N					Identifier		Module identifier (String.GUID).
-ModuleSignature	Version	N					Version		Version of the module.
-MoveFile	Component_	N			Component	1	Identifier		If this component is not "selected" for installation or removal, no action will be taken on the associated MoveFile entry
-MoveFile	DestFolder	N					Identifier		Name of a property whose value is assumed to resolve to the full path to the destination directory
-MoveFile	DestName	Y					Filename		Name to be given to the original file after it is moved or copied.  If blank, the destination file will be given the same name as the source file
-MoveFile	FileKey	N					Identifier		Primary key that uniquely identifies a particular MoveFile record
-MoveFile	Options	N	0	1					Integer value specifying the MoveFile operating mode, one of imfoEnum
-MoveFile	SourceFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full path to the source directory
-MoveFile	SourceName	Y					Text		Name of the source file(s) to be moved or copied.  Can contain the '*' or '?' wildcards.
-MsiAssembly	Attributes	Y							Assembly attributes
-MsiAssembly	Component_	N			Component	1	Identifier		Foreign key into Component table.
-MsiAssembly	Feature_	N			Feature	1	Identifier		Foreign key into Feature table.
-MsiAssembly	File_Application	Y			File	1	Identifier		Foreign key into File table, denoting the application context for private assemblies. Null for global assemblies.
-MsiAssembly	File_Manifest	Y			File	1	Identifier		Foreign key into the File table denoting the manifest file for the assembly.
-MsiAssemblyName	Component_	N			Component	1	Identifier		Foreign key into Component table.
-MsiAssemblyName	Name	N					Text		The name part of the name-value pairs for the assembly name.
-MsiAssemblyName	Value	N					Text		The value part of the name-value pairs for the assembly name.
-MsiDigitalCertificate	CertData	N					Binary		A certificate context blob for a signer certificate
-MsiDigitalCertificate	DigitalCertificate	N					Identifier		A unique identifier for the row
-MsiDigitalSignature	DigitalCertificate_	N			MsiDigitalCertificate	1	Identifier		Foreign key to MsiDigitalCertificate table identifying the signer certificate
-MsiDigitalSignature	Hash	Y					Binary		The encoded hash blob from the digital signature
-MsiDigitalSignature	SignObject	N					Text		Foreign key to Media table
-MsiDigitalSignature	Table	N						Media	Reference to another table name (only Media table is supported)
-MsiFileHash	File_	N			File	1	Identifier		Primary key, foreign key into File table referencing file with this hash
-MsiFileHash	HashPart1	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart2	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart3	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart4	N							Size of file in bytes (long integer).
-MsiFileHash	Options	N	0	32767					Various options and attributes for this hash.
-ODBCAttribute	Attribute	N					Text		Name of ODBC driver attribute
-ODBCAttribute	Driver_	N			ODBCDriver	1	Identifier		Reference to ODBC driver in ODBCDriver table
-ODBCAttribute	Value	Y					Text		Value for ODBC driver attribute
-ODBCDataSource	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCDataSource	DataSource	N					Identifier		Primary key, non-localized.internal token for data source
-ODBCDataSource	Description	N					Text		Text used as registered name for data source
-ODBCDataSource	DriverDescription	N					Text		Reference to driver description, may be existing driver
-ODBCDataSource	Registration	N	0	1					Registration option: 0=machine, 1=user, others t.b.d.
-ODBCDriver	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCDriver	Description	N					Text		Text used as registered name for driver, non-localized
-ODBCDriver	Driver	N					Identifier		Primary key, non-localized.internal token for driver
-ODBCDriver	File_	N			File	1	Identifier		Reference to key driver file
-ODBCDriver	File_Setup	Y			File	1	Identifier		Optional reference to key driver setup DLL
-ODBCSourceAttribute	Attribute	N					Text		Name of ODBC data source attribute
-ODBCSourceAttribute	DataSource_	N			ODBCDataSource	1	Identifier		Reference to ODBC data source in ODBCDataSource table
-ODBCSourceAttribute	Value	Y					Text		Value for ODBC data source attribute
-ODBCTranslator	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCTranslator	Description	N					Text		Text used as registered name for translator
-ODBCTranslator	File_	N			File	1	Identifier		Reference to key translator file
-ODBCTranslator	File_Setup	Y			File	1	Identifier		Optional reference to key translator setup DLL
-ODBCTranslator	Translator	N					Identifier		Primary key, non-localized.internal token for translator
-Patch	Attributes	N	0	32767					Integer containing bit flags representing patch attributes
-Patch	File_	N					Identifier		Primary key, non-localized token, foreign key to File table, must match identifier in cabinet.
-Patch	Header	Y					Binary		Binary stream. The patch header, used for patch validation.
-Patch	PatchSize	N	0	2147483647					Size of patch in bytes (long integer).
-Patch	Sequence	N	0	32767					Primary key, sequence with respect to the media images; order must track cabinet order.
-PatchPackage	Media_	N	0	32767					Foreign key to DiskId column of Media table. Indicates the disk containing the patch package.
-PatchPackage	PatchId	N					Guid		A unique string GUID representing this patch.
-ProgId	Class_	Y			Class	1	Guid		The CLSID of an OLE factory corresponding to the ProgId.
-ProgId	Description	Y					Text		Localized description for the Program identifier.
-ProgId	Icon_	Y			Icon	1	Identifier		Optional foreign key into the Icon Table, specifying the icon file associated with this ProgId. Will be written under the DefaultIcon key.
-ProgId	IconIndex	Y	-32767	32767					Optional icon index.
-ProgId	ProgId	N					Text		The Program Identifier. Primary key.
-ProgId	ProgId_Parent	Y			ProgId	1	Text		The Parent Program Identifier. If specified, the ProgId column becomes a version independent prog id.
-Property	Property	N					Identifier		Name of property, uppercase if settable by launcher or loader.
-Property	Value	N					Text		String value for property.  Never null or empty.
-PublishComponent	AppData	Y					Text		This is localisable Application specific data that can be associated with a Qualified Component.
-PublishComponent	Component_	N			Component	1	Identifier		Foreign key into the Component table.
-PublishComponent	ComponentId	N					Guid		A string GUID that represents the component id that will be requested by the alien product.
-PublishComponent	Feature_	N			Feature	1	Identifier		Foreign key into the Feature table.
-PublishComponent	Qualifier	N					Text		This is defined only when the ComponentId column is an Qualified Component Id. This is the Qualifier for ProvideComponentIndirect.
-RadioButton	Height	N	0	32767					The height of the button.
-RadioButton	Help	Y					Text		The help strings used with the button. The text is optional.
-RadioButton	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-RadioButton	Property	N					Identifier		A named property to be tied to this radio button. All the buttons tied to the same property become part of the same group.
-RadioButton	Text	Y					Text		The visible title to be assigned to the radio button.
-RadioButton	Value	N					Formatted		The value string associated with this button. Selecting the button will set the associated property to this value.
-RadioButton	Width	N	0	32767					The width of the button.
-RadioButton	X	N	0	32767					The horizontal coordinate of the upper left corner of the bounding rectangle of the radio button.
-RadioButton	Y	N	0	32767					The vertical coordinate of the upper left corner of the bounding rectangle of the radio button.
-Reg64	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
-Reg64	Key	N					RegPath		The key for the registry value.
-Reg64	Name	Y					Formatted		The registry value name.
-Reg64	Registry	N					Identifier		Primary key, non-localized token.
-Reg64	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
-Reg64	Value	Y					Formatted		The registry value.
-Registry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
-Registry	Key	N					RegPath		The key for the registry value.
-Registry	Name	Y					Formatted		The registry value name.
-Registry	Registry	N					Identifier		Primary key, non-localized token.
-Registry	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
-Registry	Value	Y					Formatted		The registry value.
-RegLocator	Key	N					RegPath		The key for the registry value.
-RegLocator	Name	Y					Formatted		The registry value name.
-RegLocator	Root	N	0	3					The predefined root key for the registry value, one of rrkEnum.
-RegLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table. If the type is 0, the registry values refers a directory, and _Signature is not a foreign key.
-RegLocator	Type	Y	0	18					An integer value that determines if the registry value is a filename or a directory location or to be used as is w/o interpretation.
-RemoveFile	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the file to be removed.
-RemoveFile	DirProperty	N					Identifier		Name of a property whose value is assumed to resolve to the full pathname to the folder of the file to be removed.
-RemoveFile	FileKey	N					Identifier		Primary key used to identify a particular file entry
-RemoveFile	FileName	Y					WildCardFilename		Name of the file to be removed.
-RemoveFile	InstallMode	N						1;2;3	Installation option, one of iimEnum.
-RemoveIniFile	Action	N						2;4	The type of modification to be made, one of iifEnum.
-RemoveIniFile	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the deletion of the .INI value.
-RemoveIniFile	DirProperty	Y					Identifier		Foreign key into the Directory table denoting the directory where the .INI file is.
-RemoveIniFile	FileName	N					Filename		The .INI file name in which to delete the information
-RemoveIniFile	Key	N					Formatted		The .INI file key below Section.
-RemoveIniFile	RemoveIniFile	N					Identifier		Primary key, non-localized token.
-RemoveIniFile	Section	N					Formatted		The .INI file Section.
-RemoveIniFile	Value	Y					Formatted		The value to be deleted. The value is required when Action is iifIniRemoveTag
-RemoveRegistry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the deletion of the registry value.
-RemoveRegistry	Key	N					RegPath		The key for the registry value.
-RemoveRegistry	Name	Y					Formatted		The registry value name.
-RemoveRegistry	RemoveRegistry	N					Identifier		Primary key, non-localized token.
-RemoveRegistry	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum
-ReserveCost	Component_	N			Component	1	Identifier		Reserve a specified amount of space if this component is to be installed.
-ReserveCost	ReserveFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full path to the destination directory
-ReserveCost	ReserveKey	N					Identifier		Primary key that uniquely identifies a particular ReserveCost record
-ReserveCost	ReserveLocal	N	0	2147483647					Disk space to reserve if linked component is installed locally.
-ReserveCost	ReserveSource	N	0	2147483647					Disk space to reserve if linked component is installed to run from the source location.
-SelfReg	Cost	Y	0	32767					The cost of registering the module.
-SelfReg	File_	N			File	1	Identifier		Foreign key into the File table denoting the module that needs to be registered.
-ServiceControl	Arguments	Y					Formatted		Arguments for the service.  Separate by [~].
-ServiceControl	Component_	N			Component	1	Identifier		Required foreign key into the Component Table that controls the startup of the service
-ServiceControl	Event	N	0	187					Bit field:  Install:  0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete
-ServiceControl	Name	N					Formatted		Name of a service. /, \, comma and space are invalid
-ServiceControl	ServiceControl	N					Identifier		Primary key, non-localized token.
-ServiceControl	Wait	Y	0	1					Boolean for whether to wait for the service to fully start
-ServiceInstall	Arguments	Y					Formatted		Arguments to include in every start of the service, passed to WinMain
-ServiceInstall	Component_	N			Component	1	Identifier		Required foreign key into the Component Table that controls the startup of the service
-ServiceInstall	Dependencies	Y					Formatted		Other services this depends on to start.  Separate by [~], and end with [~][~]
-ServiceInstall	Description	Y					Text		Description of service.
-ServiceInstall	DisplayName	Y					Formatted		External Name of the Service
-ServiceInstall	ErrorControl	N	-2147483647	2147483647					Severity of error if service fails to start
-ServiceInstall	LoadOrderGroup	Y					Formatted		LoadOrderGroup
-ServiceInstall	Name	N					Formatted		Internal Name of the Service
-ServiceInstall	Password	Y					Formatted		password to run service with.  (with StartName)
-ServiceInstall	ServiceInstall	N					Identifier		Primary key, non-localized token.
-ServiceInstall	ServiceType	N	-2147483647	2147483647					Type of the service
-ServiceInstall	StartName	Y					Formatted		User or object name to run service as
-ServiceInstall	StartType	N	0	4					Type of the service
-SFPCatalog	Catalog	N					Binary		SFP Catalog
-SFPCatalog	Dependency	Y					Formatted		Parent catalog - only used by SFP
-SFPCatalog	SFPCatalog	N					Filename		File name for the catalog.
-Shortcut	Arguments	Y					Formatted		The command-line arguments for the shortcut.
-Shortcut	Component_	N			Component	1	Identifier		Foreign key into the Component table denoting the component whose selection gates the the shortcut creation/deletion.
-Shortcut	Description	Y					Text		The description for the shortcut.
-Shortcut	Directory_	N			Directory	1	Identifier		Foreign key into the Directory table denoting the directory where the shortcut file is created.
-Shortcut	Hotkey	Y	0	32767					The hotkey for the shortcut. It has the virtual-key code for the key in the low-order byte, and the modifier flags in the high-order byte. 
-Shortcut	Icon_	Y			Icon	1	Identifier		Foreign key into the File table denoting the external icon file for the shortcut.
-Shortcut	IconIndex	Y	-32767	32767					The icon index for the shortcut.
-Shortcut	Name	N					Filename		The name of the shortcut to be created.
-Shortcut	Shortcut	N					Identifier		Primary key, non-localized token.
-Shortcut	ShowCmd	Y						1;3;7	The show command for the application window.The following values may be used.
-Shortcut	Target	N					Shortcut		The shortcut target. This is usually a property that is expanded to a file or a folder that the shortcut points to.
-Shortcut	WkDir	Y					Identifier		Name of property defining location of working directory.
-Signature	FileName	N					Filename		The name of the file. This may contain a "short name|long name" pair.
-Signature	Languages	Y					Language		The languages supported by the file.
-Signature	MaxDate	Y	0	2147483647					The maximum creation date of the file.
-Signature	MaxSize	Y	0	2147483647					The maximum size of the file. 
-Signature	MaxVersion	Y					Text		The maximum version of the file.
-Signature	MinDate	Y	0	2147483647					The minimum creation date of the file.
-Signature	MinSize	Y	0	2147483647					The minimum size of the file.
-Signature	MinVersion	Y					Text		The minimum version of the file.
-Signature	Signature	N					Identifier		The table key. The Signature represents a unique file signature.
-TextStyle	Color	Y	0	16777215					A long integer indicating the color of the string in the RGB format (Red, Green, Blue each 0-255, RGB = R + 256*G + 256^2*B).
-TextStyle	FaceName	N					Text		A string indicating the name of the font used. Required. The string must be at most 31 characters long.
-TextStyle	Size	N	0	32767					The size of the font used. This size is given in our units (1/12 of the system font height). Assuming that the system font is set to 12 point size, this is equivalent to the point size.
-TextStyle	StyleBits	Y	0	15					A combination of style bits.
-TextStyle	TextStyle	N					Identifier		Name of the style. The primary key of this table. This name is embedded in the texts to indicate a style change.
-TypeLib	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-TypeLib	Cost	Y	0	2147483647					The cost associated with the registration of the typelib. This column is currently optional.
-TypeLib	Description	Y					Text		
-TypeLib	Directory_	Y			Directory	1	Identifier		Optional. The foreign key into the Directory table denoting the path to the help file for the type library.
-TypeLib	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the type library to be operational.
-TypeLib	Language	N	0	32767					The language of the library.
-TypeLib	LibID	N					Guid		The GUID that represents the library.
-TypeLib	Version	Y	0	16777215					The version of the library. The minor version is in the lower 8 bits of the integer. The major version is in the next 16 bits. 
-UIText	Key	N					Identifier		A unique key that identifies the particular string.
-UIText	Text	Y					Text		The localized version of the string.
-Upgrade	ActionProperty	N					UpperCase		The property to set when a product in this set is found.
-Upgrade	Attributes	N	0	2147483647					The attributes of this product set.
-Upgrade	Language	Y					Language		A comma-separated list of languages for either products in this set or products not in this set.
-Upgrade	Remove	Y					Formatted		The list of features to remove when uninstalling a product from this set.  The default is "ALL".
-Upgrade	UpgradeCode	N					Guid		The UpgradeCode GUID belonging to the products in this set.
-Upgrade	VersionMax	Y					Text		The maximum ProductVersion of the products in this set.  The set may or may not include products with this particular version.
-Upgrade	VersionMin	Y					Text		The minimum ProductVersion of the products in this set.  The set may or may not include products with this particular version.
-Verb	Argument	Y					Formatted		Optional value for the command arguments.
-Verb	Command	Y					Formatted		The command text.
-Verb	Extension_	N			Extension	1	Text		The extension associated with the table row.
-Verb	Sequence	Y	0	32767					Order within the verbs for a particular extension. Also used simply to specify the default verb.
-Verb	Verb	N					Text		The verb for the command.
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt
deleted file mode 100644
index cc1c30329..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{1552EC17-8CE9-4E58-A009-991468B8E806}	# OOo UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt
deleted file mode 100644
index daf492715..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{D8B206B8-6822-48C2-A799-E35BFD585035}	# OOo UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
deleted file mode 100644
index b833e912a..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
+++ /dev/null
@@ -1,152 +0,0 @@
-[PRODUCTCODE]
-en-US = "{0F961BE5-98E8-408E-9F74-23CBA0523922}"
-pt = "{2C127D50-B7E4-46C3-A845-CF6684481024}"
-ru = "{8B523028-4AAC-4607-9711-667AA6C37D45}"
-el = "{F980E77E-21FD-40B8-BE66-8BC60284D24B}"
-nl = "{7FE69A49-6825-47E0-8179-72336E7B4250}"
-fr = "{3BB61EBF-5BC1-4E4D-859F-3ED5D92DD25E}"
-es = "{12A4616B-D51B-4013-964B-0ACCCA5E9AF2}"
-fi = "{89623507-9F44-44CF-BD4C-042F9E26F903}"
-hu = "{2246FA05-4B7A-499B-A19E-AA6599EA28D0}"
-ca = "{9810C5F8-C061-4D02-AD98-049452A5DC76}"
-it = "{2F78D54B-CE1D-4607-AA5B-D52114BDEBDB}"
-cs = "{781C904C-8768-4271-AA69-1A2CFA248002}"
-sk = "{A1D39E12-FF85-4619-BC69-001C55AD5B35}"
-en-GB = "{DD0CE074-E875-4428-991B-A9B3734701F9}"
-da = "{92CA37C8-B2E6-403F-932C-1A33E48BCD7E}"
-sv = "{942C29ED-A013-436E-861C-28271FD60AAE}"
-no = "{0EF3EE40-3690-472E-A693-5C9AE4FA7D5A}"
-pl = "{2A7F7A26-EF8B-4990-8836-688508886215}"
-de = "{5014304D-99B3-4451-8EB3-97D34658E4E7}"
-pt-BR = "{55837A64-5B73-4CDC-8950-AF56E09A7961}"
-th = "{2EEACF3C-C38E-4043-8B4D-33A461083348}"
-et = "{956362F1-C89B-4008-B15F-968BD4023F3F}"
-ja = "{01C118C0-57AB-4745-8D4C-5A34E6677E8D}"
-ko = "{B0DEE1A7-88FC-423B-AA1F-F51D94D02996}"
-zh-CN = "{0C596167-BA94-4D5A-B63B-6566FE06259A}"
-zh-TW = "{C31C87A1-5918-4178-8696-DDD36EDAEE99}"
-tr = "{467D9E65-2614-4D19-B40F-0B12FE6E472F}"
-hi = "{61B2E7EA-DC12-4A51-B152-2B95A4FC2ABF}"
-ar = "{FF72555B-A96D-49F8-8998-9359E9F9F7E1}"
-he = "{F59C6731-12DA-4A46-BE6D-30934E7CD763}"
-multiwestern = "{FA30E08E-DD61-4E47-B3D6-51B2814CA881}"
-multiasia = "{222033CB-A588-4302-9942-311F160B63B1}"
-
-[UPGRADECODE]
-af = "{07F4C39E-72F9-495A-A8DE-8B3691607EA7}"
-ar = "{4B19ECA4-EB7B-420E-A2F3-0D456CA1CA3F}"
-as-IN = "{8B39DB32-6AF6-461F-8289-50655601C8FE}"
-be = "{0EE4C97D-D8C7-441E-866A-CF277858E4E4}"
-bo = "{C8D912D8-AA2E-47E2-9FEF-62C6580FB93C}"
-bg = "{961EFB5A-0CA0-41E8-8C9C-CB3BA52B73EC}"
-br = "{D5D79970-08FA-4CCC-B465-76948149E141}"
-brx = "{13A1CCE8-A020-4F7D-84DE-2FC89E4F0086}"
-bn = "{C552DC5D-BAEE-4707-B090-5BC08E01162F}"
-bn-BD = "{37A07926-2192-4701-908A-D414D26CB864}"
-bn-IN = "{F82875DF-7BFC-4CF1-A7E7-85E5AAD90F07}"
-bs = "{9F84BC57-8E00-4C27-81AA-5CCB6280A98B}"
-by = "{195CFF07-2848-4F7A-9770-98D1419A37F8}"
-ca = "{63DF72A2-1F4E-456E-A4E1-26342034BC19}"
-cs = "{A0B8FD56-2D0D-4487-B999-19D32FCF5F56}"
-cy = "{40487026-D109-40C8-AE09-A5E4147815DE}"
-da = "{6221C926-E7C7-4122-A3E4-66285ACD0B79}"
-de = "{56F769C8-29D9-4DA0-AAC5-6165D0180483}"
-dgo = "{43E5D518-02EA-4C82-AAB5-98954C12109A}"
-dz = "{0E79A6B5-D088-4670-ACDF-E0081C9ABFAE}"
-el = "{1E5DDBF3-B05A-4E78-A496-332C8193F4C8}"
-en-GB = "{3EBBFCD8-8009-4D31-AA5E-C1BED7B17A61}"
-en-US = "{40C2DB8E-E9D6-4451-BE31-DAD1343EC3DF}"
-en-ZA = "{764FA135-A8CE-4C79-A5D7-0B413CC9E911}"
-eo = "{1955D5A5-375E-410F-B84F-9FDB4E6A05E5}"
-es = "{4F776850-4235-4E93-847F-C657E04A35AB}"
-et = "{026CD9C5-6B53-421B-89A9-A5933C3E4BA6}"
-eu = "{B343946D-65A4-418E-B594-AC7035FDA5C2}"
-fa = "{D17D8C22-9161-42BF-A4A3-31248273EFB8}"
-fi = "{B26D2BEF-C380-46DD-8206-DD014E51AE7E}"
-fr = "{D7B9854C-4B88-4AE6-9FF6-7CDD7E8CEB90}"
-ga = "{ADDC53E1-2AFC-4234-A4A2-253C19932351}"
-gd = "{122EB716-EA92-4294-ADFB-4EDCC350E9D9}"
-gl = "{56F49C99-23C1-44C6-8EE3-2DCE72391BF8}"
-gu = "{1B1246FD-B318-49D1-8B5D-9475F55DF033}"
-gu-IN = "{982DC803-C9C1-4D8E-9B9E-A42335A2092E}"
-he = "{363942BE-A51D-43CE-8F09-2D94DFFDBB2E}"
-hi = "{4FFECDE8-8121-43DC-81F7-9FB7C82F24F4}"
-hi-IN = "{DE6A446A-BEC4-450D-94BD-B393B9898E76}"
-hr = "{8BC12666-3F41-43C7-9530-05A5A69A269D}"
-hu = "{63C087E6-5AC1-4C87-B663-6CEC4BD57935}"
-is = "{AD579FC7-4AFF-46A6-A756-110EC862FD17}"
-it = "{E9FFB21F-C41B-4A4C-87D1-885D97FE4D4A}"
-ja = "{D5E8AF54-134D-4370-BEF6-62BD3049C516}"
-kid = "{4A5C3C73-4392-4399-A57C-B0056289FD32}"
-ky = "{7854115C-C451-4BCB-86AC-F2257E60373C}"
-ka = "{5793EE6E-74B2-4965-A790-0C33ACEF75F0}"
-kk = "{BB0063B5-BFFE-4BD8-9FB8-A4778B79E2BC}"
-km = "{D906DD83-52C5-4B45-A887-DABEED8A6936}"
-kn = "{6785479C-863D-4533-9D28-46984FD067BE}"
-ko = "{918E7DC4-5641-4FB6-8A98-F3C0CCDFCC2D}"
-kok = "{4FF53BC0-C0E8-45B0-B7ED-3DE12B7865D2}"
-ks = "{55C379A7-D00F-4174-9073-F08CEF7FA40B}"
-ku = "{3FF9E717-28E4-49E5-96F7-B7EAC7C3890C}"
-lo = "{25F500C7-E3CA-413A-BB45-F298420533CB}"
-lt = "{7D5B38B0-3E15-4F96-AFFE-F8E455CE666B}"
-lv = "{DAC92857-35AC-44E2-BB10-F2F91173128C}"
-mai = "{0DCE1B05-2A48-4485-8C7E-6FBB1003F0F7}"
-mk = "{97BD11C0-13A0-416D-AB9A-9128DBEF707A}"
-mn = "{646294EB-E2E7-4110-B3CF-06D82F2BEE6F}"
-mni = "{2E614D32-5AA3-4525-B2F2-BE6F995F529D}"
-ms = "{7278D44D-9673-4157-AC6F-839520312A42}"
-ml-IN = "{250DC1C1-630E-4AD3-B25B-F57E9CC66572}"
-mr-IN = "{50031E0A-6AA2-43BB-89A7-2341F75B5C91}"
-my = "{C4B4A0EF-3B09-4198-825E-7381653FCF13}"
-ne = "{B4F43785-36D1-4716-AFCF-894B1AF36C1D}"
-nb = "{95CDD114-AB99-47E9-A6CA-C50C7460B1DA}"
-nl = "{E25D3CC2-AC90-4861-9E9C-DA41B5DF8A03}"
-nn = "{8D2FABA5-79CD-4109-A274-DEE14E279233}"
-no = "{226856FB-734F-40FB-BDF3-7DCCA74BCA5E}"
-nr = "{73FB2891-79DB-4F4E-A2B6-EB4A07D2903A}"
-nso = "{BA8033C9-6C42-4D4D-8160-46B6A19C08F9}"
-om = "{AC220121-97DE-4D37-9554-8877DAF713E6}"
-oc = "{E1D22BDB-C23D-4849-88AF-9B05F6B396E1}"
-or-IN = "{A3382AC1-D71B-4C13-BF1C-99C0C9C085A6}"
-pap = "{7E56C1DB-94E0-4C55-8D71-C27B1F971DB5}"
-pa-IN = "{8984AB31-BED3-49EB-92DD-E163B17132B1}"
-pl = "{EF16C1BF-539B-4EEE-91E5-0D44C4B72840}"
-ps = "{030AFC27-901D-4DA7-B651-E4F3F4AEE708}"
-pt = "{EFBDEE97-65AB-4575-B117-976D2EE639D0}"
-pt-BR = "{8EE0FF44-307B-4FDC-85F1-EA178C788FA8}"
-ru = "{2CCF1EF8-A263-4B77-8BDD-92D66B30531F}"
-rw = "{D27E719E-A9E7-4204-92E8-1FE882264F27}"
-sat = "{86E940A4-BE79-4D7C-818F-AE0B190F8AF6}"
-sa-IN = "{1F95BC4C-67F2-42DF-B4C7-A40EF727624A}"
-si = "{49438D51-91A0-4E2C-8415-E48CF3C82DB4}"
-sc = "{03889A8E-008C-438D-A4F8-F220470C182E}"
-sd = "{DDDD2117-DF91-4F9F-B403-9010E9B1A45E}"
-sk = "{31812C7E-CD25-455E-BEDD-F7A5F1E3AA57}"
-sl = "{F4B8D208-4566-4C4D-AFA0-3D2729084555}"
-sh = "{930AEAB7-E847-474A-84FE-FE5C2BCD9CE3}"
-sr = "{8C45020E-085A-44F7-8E13-7B4A94C6925A}"
-ss = "{9F41FCB5-A63D-49C1-A69C-9CBBCE73518D}"
-st = "{00B8BCE0-A647-4DC8-8E58-3D1B4CFF3F0F}"
-sv = "{234E7342-71BD-4B78-946D-06531FD46FA7}"
-sw = "{86433EBB-25D9-41E0-8F56-3DCB9534E027}"
-sw-TZ = "{397132BF-8878-4AD0-8943-1894B41692A1}"
-te-IN = "{A9688928-501B-4435-94A2-3A046C1EF29D}"
-ti-ER = "{293095EC-889D-4426-AE8A-C2E96DE8C78D}"
-ta-IN = "{5A98005B-D78A-41D4-9B2B-FFE739FF6D1A}"
-th = "{58BEC02C-44C7-43D8-BD07-35A866E20AE7}"
-tn = "{DD26B7C9-F027-4AB3-8F98-E8EB4FBA9C89}"
-tr = "{AA132C49-A480-4B5D-AAD3-811362B60A42}"
-ts = "{4BAF4D75-1E1E-4B15-A288-B4527E3C7CEE}"
-tg = "{4175B9EA-56CA-4311-9F96-937EABCEA1C8}"
-ug = "{1D09B009-8003-44FB-B2E1-49387F1112B9}"
-ur-IN = "{A7F4EC06-A6DC-4847-A510-41D435614014}"
-uk = "{52E53AB3-FAE4-4025-9B6F-FA401C9B10AE}"
-uz = "{D551A1C1-AF36-4FE4-BEF4-9CA72267D70A}"
-ve = "{20CA0658-5768-4B9E-8E3B-D9DF58332739}"
-vi = "{67A6C9E2-C285-48E4-A620-40D905E8D3F8}"
-xh = "{BF5684DA-C18A-43CE-B21D-97A7A0FAA486}"
-zh-CN = "{47574572-9963-441B-8A42-0B1A61880608}"
-zh-TW = "{6800BE26-76E9-4280-A174-5A952A18E643}"
-zu = "{65BA1A0C-9D3F-49A2-8ABB-7437C50A0AC7}"
-multiwestern = "{5050975D-CA7F-4F15-A3F5-F0A80B37AC35}"
-multiasia = "{07E6F67B-2A5B-45D7-984D-773F76612B9C}"
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt
deleted file mode 100644
index 204c6082b..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-[PRODUCTCODE]
-en-US = "{7FFF1607-39C1-45D7-8D6A-DE97A3FE26A1}"
-pt = "{4BF466E8-7FF4-4422-9FCE-1F0AE3DA00EE}"
-ru = "{34A3166C-BF5E-4751-A52E-CA68C139F688}"
-el = "{614C96E4-DBB0-4EFF-A9BB-2744E75919EB}"
-nl = "{76ABABE4-11C3-4783-BA87-6E76EC58F4DB}"
-fr = "{A8D2F106-57BF-437A-85F2-6FDE96D5E923}"
-es = "{74E55CA0-5F61-4B3F-AFE9-C450C352177F}"
-fi = "{7B47880A-4C73-4052-B41E-9CFDDC09D9B2}"
-hu = "{797671B4-BC60-4171-9084-D97F87B15B99}"
-ca = "{EB478242-B1CC-402C-AAB0-B038446E1BC3}"
-it = "{ED45979C-7EE4-4D04-89C5-489DCEAD1009}"
-cs = "{8DDBA77B-86FB-4AFC-A9CE-7960585108E3}"
-sk = "{7664A926-AA39-4DB6-AE12-98B7305B708B}"
-en-GB = "{4B514E15-F8EB-457D-924E-0C4EA6C29FE5}"
-da = "{6321486D-351A-451F-9C23-FF334A4E41FA}"
-sv = "{76B88102-58E7-4F89-90B9-B21185AA45E5}"
-no = "{1E36FA46-AC57-47FB-94FE-EF7B32B9056C}"
-pl = "{A316E11D-7907-460E-8E64-DEEFCD0F929A}"
-de = "{A3BE065F-8E3B-46CA-946A-101A8E077D2B}"
-pt-BR = "{45B77400-62B3-4469-8B12-A0813B0FE13F}"
-th = "{C37B84EC-EB6B-4909-9866-D582A0E4B27D}"
-et = "{A4107B22-C84B-4783-B1AA-454A884144B7}"
-ja = "{F68C3D57-AB20-4106-B3F2-4A51E8F12D27}"
-ko = "{D6C21010-B224-4121-83BE-BCFD41E2780F}"
-zh-CN = "{D27CE6D1-50E5-4895-8CC0-5D1D25D882F9}"
-zh-TW = "{1203F697-9652-44B2-A806-3F13A53101AC}"
-tr = "{DB6EBF02-F0A5-44ED-AF5C-BF97E2C6570A}"
-hi = "{9BA2E02E-ACFA-4D4A-8F34-12E3F2BA29E5}"
-ar = "{5B8ADBF2-5377-44C7-8ADA-3A3AF516E401}"
-he = "{F893A538-DA46-4667-B580-84DFB3CD5336}"
-multiwestern = "{E954C6C0-1C6E-4BB6-B8F2-F655429E6D73}"
-multiasia = "{881B24EF-5676-481C-B1C4-49964E203329}"
-
-[UPGRADECODE]
-en-US = "{DB4A0242-FD72-41DA-87A2-5466AE05BE03}"
-pt = "{AA393994-0DBE-45A1-8393-BCA1927527F6}"
-ru = "{626BAA92-954C-4A6C-9AF3-F9C146FAEEAB}"
-el = "{B884FE02-C0B1-40A5-9A05-3D92923B10E8}"
-nl = "{83D4730E-7069-4ED8-8D2C-50E2878A84CF}"
-fr = "{2F7D3F37-6191-44BB-8C14-5A0F3D1CDC06}"
-es = "{FCBF48CD-EBE3-4B65-9A9F-C73399CE2BF4}"
-fi = "{CA1322F8-8213-401D-8501-2B70F8F944E0}"
-hu = "{A5FD8B52-2E09-45C5-A84B-67DA1DA8BD93}"
-ca = "{80DD06D1-ABEE-4E85-8C23-E1031FC024B0}"
-it = "{7CA64ED6-373D-4C92-8224-360F1451E828}"
-cs = "{C16BE41C-1534-47E2-9D6F-EE3F45EFB075}"
-sk = "{82ACA684-1BD8-4A22-AC70-5E9754047357}"
-en-GB = "{B2583886-6021-42B5-BB84-71D2C7D9B91E}"
-da = "{953E09D5-4C1E-483A-A792-DD6C9A51D4E9}"
-sv = "{B6DF5C8D-177F-47DE-A9F6-0C6E4FCDF668}"
-no = "{52CFD54B-A5AE-4296-A02C-806083B90FFF}"
-pl = "{9EB27D9C-891F-4B40-A1FA-176D72088860}"
-de = "{73531239-44BD-4EE8-81B1-7EA9A63E2BE1}"
-pt-BR = "{EB286FF5-8182-4F12-8B58-320DABC7472F}"
-th = "{3B67E9E0-7177-420E-AF69-B58A0B9D22D2}"
-et = "{6718E3FB-C936-4699-82C0-E59F45E30D99}"
-ja = "{EDD352F1-431A-4275-A658-C9A516290616}"
-ko = "{69BB5E59-48BC-4906-B700-7E76EAEB076C}"
-zh-CN = "{9D3F52D5-2464-4F4D-9F2A-281B85911F7B}"
-zh-TW = "{8D0A9A70-F424-4FE2-AC27-50F8A409C602}"
-tr = "{CF7A11FA-FE24-427F-979C-016A7E1B2E8E}"
-hi = "{0D1A91F3-4B2D-4893-A720-8795F1DA848B}"
-ar = "{20A9E4BF-6D89-4183-BE25-24C5F693B141}"
-he = "{CC37C202-D6B7-4821-9015-0A25EB4E6CD8}"
-multiwestern = "{B2269A43-2FC5-44AF-A0EE-D85CD2C6135C}"
-multiasia = "{3B4B8C3C-AC32-4644-B7C5-79836EBD6784}"
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
deleted file mode 100644
index 0564ebc4c..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
+++ /dev/null
@@ -1,152 +0,0 @@
-[PRODUCTCODE]
-en-US = "{0FA6115B-EB2C-4878-AE77-A6BB9BD95DE3}"
-pt = "{5908E447-DD83-466C-989A-4DD73EEB9E1C}"
-ru = "{A2FA035D-6AD1-4A42-8C94-514862DDF9F1}"
-el = "{ED03F985-453B-4C05-9D4F-5A5DABC5E383}"
-nl = "{3F832B47-935F-45D2-870F-59CBC55EBAF5}"
-fr = "{C96C5113-0A94-4D78-8B56-63335845A6DB}"
-es = "{00393DC6-C022-4013-85D6-7421431A1BBC}"
-fi = "{B2414CEC-4AF1-4943-88F8-C5011A860483}"
-hu = "{F09E48BA-14EE-44B2-9B28-2603A18CE1D6}"
-ca = "{A398A8FC-7E6B-45D0-9869-63D67B38AEEE}"
-it = "{38490E45-A1A0-47CC-971A-F0E4CD27E055}"
-cs = "{2288EAF3-AC96-4EE5-BEFB-1384DC1C4703}"
-sk = "{79B7F92B-168B-4E9D-8944-4AF49DEB0632}"
-en-GB = "{4840BF58-E8E1-4625-9F65-D7A6B26438C7}"
-da = "{DBF68601-B962-4B0F-8791-E91225E6AF4E}"
-sv = "{D9B02C11-188E-4471-8CD7-FB457264A752}"
-no = "{E5694849-306C-4771-8101-521F445918AD}"
-pl = "{C640D2B5-97E7-45C9-9FC6-7866BB6C8F5E}"
-de = "{5A5DE00E-D6F0-426E-A510-AFCD45564AFB}"
-pt-BR = "{A3FFB78D-681B-4EEE-B279-EA638040F82A}"
-th = "{4BFE4253-A149-49D1-ACFB-45B780DBE45B}"
-et = "{5A742EFB-07B8-42AB-A451-60BBE2461102}"
-ja = "{77A4C487-FD10-461F-9F0D-C4DF9FA79C86}"
-ko = "{59F981B5-1F49-4B5C-AC14-E7EA635C17F9}"
-zh-CN = "{7A31AF55-3974-46E2-B11D-FA6FDFE9576B}"
-zh-TW = "{9B4ABC89-CB93-4083-A529-7647D74EBB7D}"
-tr = "{B2D2C818-F752-428B-9F42-5093E525AD19}"
-hi = "{20765149-8D90-4BF2-9878-54C01A52AA2C}"
-ar = "{11EDE09B-CE84-4042-B40D-09F3A9CF7484}"
-he = "{CEDA775B-2A1E-45EE-8163-5A7223022389}"
-multiwestern = "{7964A534-4526-46AD-8A1B-71BAF6AFE746}"
-multiasia = "{180F666D-555D-4F90-A53E-DD861CD9D6F0}"
-
-[UPGRADECODE]
-af = "{E5ABA9DC-0B05-49C7-AE79-42621CF9273F}"
-ar = "{D6770BC4-9500-4BF9-8137-72AFD7F9366E}"
-as-IN = "{539E1B86-87BD-4E73-9B4D-5F3FC1ADA817}"
-be = "{375F00E6-C1ED-4131-A5C9-D21E34718781}"
-bo = "{0BADD0FD-13B3-4CAB-9ECD-860FBEB09E6C}"
-bg = "{6561C433-322A-4EED-B31C-D9CE0F70F182}"
-br = "{45188701-42C2-4217-BCC2-5FC4DE740FA1}"
-brx = "{B0123EF4-1590-4436-B8C7-45778BCC53C9}"
-bn = "{B7A54DFF-DDAE-4BB6-A355-FAF0D4E11952}"
-bn-BD = "{300DE45C-94AA-4DA2-9E83-A450DA8FB9AA}"
-bn-IN = "{22BA4E19-764F-4D37-8FF0-254DFE566E7E}"
-bs = "{944202C0-A80D-413E-A673-3E3CB5078FAB}"
-by = "{968FB518-842E-4807-8331-7E20E88A2C89}"
-ca = "{89196DBD-4B4D-45EA-89D5-5C57C69E5B16}"
-cs = "{A62880EF-F164-4037-BB2A-76FBE37D3BEB}"
-cy = "{07219764-70AF-4461-BF24-B89C8F48717F}"
-da = "{FFEE4E5F-196A-46A9-A99C-11966D5ECC35}"
-de = "{7D03B08A-2F82-4F22-8F2A-C045DFC13566}"
-dgo = "{71C0B453-FF1A-4C57-A52D-1322088D3D3F}"
-dz = "{5DF8F595-6890-45CD-BD85-234DD7FB5435}"
-el = "{5CF9A133-6C59-486F-BB16-BB7AB12826DA}"
-en-GB = "{965C704A-7328-4039-A865-914E6091BD38}"
-en-US = "{97F3F678-0371-457E-893C-EFD7447A7985}"
-en-ZA = "{4ACCB25D-FF84-473F-8AE5-472777DE15AD}"
-eo = "{785BAF17-30F1-482D-8419-C3186963A37B}"
-es = "{EAE42234-4244-443D-93D8-D99235A80E2D}"
-et = "{15FAC7D1-931C-462C-98ED-9151E5BA4E87}"
-eu = "{2F192244-3116-42E7-A382-656026BC47F4}"
-fa = "{F313287C-222D-4917-8266-FA9E2EE4F204}"
-fi = "{22635154-DAF3-4E3C-8280-07F208C1132A}"
-fr = "{DBE8EF0B-1BDE-4AFA-B6D1-EB6D39934388}"
-ga = "{4AAAD846-9721-496E-A2BF-2E761A00A163}"
-gd = "{4E63B45A-AE8A-4189-B74D-DEF23F8DB2D8}"
-gl = "{9D6DB52A-986C-4CE9-8494-3156AC40405E}"
-gu = "{601D42F5-C928-477A-8FF9-C13116BAF889}"
-gu-IN = "{ECF408BB-8554-4566-9230-083B3A61D5ED}"
-he = "{9EC0DEF1-601C-4775-9884-B22C347824E1}"
-hi = "{518E46AB-6372-4303-A0FD-40AE042D6898}"
-hi-IN = "{2E784EF5-2240-4940-ACAC-240860D5B0FF}"
-hr = "{7D881D43-F1AA-49CE-83E2-420990672098}"
-hu = "{1F70AB81-E96B-414C-AEE1-BD69BAF954CC}"
-is = "{27125E19-DCFE-402F-AB8C-82CD9F584D77}"
-it = "{6AFA47B1-9285-40CF-A98C-80F9F339A9EE}"
-ja = "{B7573A6E-083B-4E1D-8AFF-7003B5401971}"
-kid = "{E16377E5-4C78-4016-A355-8CE512DA85B4}"
-ky = "{18590BB8-8598-4781-BEDE-4BA660D7DCA3}"
-ka = "{6FBAFC4D-EBE8-4880-8644-E87698F5D169}"
-kk = "{CDDF1704-0468-4F47-B191-C5D44FF301DA}"
-km = "{4F24C267-C4D8-4A60-BEFB-415A4FC12C8B}"
-kn = "{3699C099-D492-4206-B4D8-EBAB427432D8}"
-ko = "{2501A052-8F1D-4A7F-B4DE-4CB851B1840A}"
-kok = "{FB347C9D-7A6E-494B-8FB0-DC6041A927EA}"
-ks = "{08E36D6D-6FED-45F0-A87E-D742F9161250}"
-ku = "{7A2CA172-09EB-4B2D-96D8-A370084757E1}"
-lo = "{31CE78E7-B3BB-48DF-9543-B2DF21F420A7}"
-lt = "{E6953E1E-674F-4890-A99B-CBCE09445C13}"
-lv = "{27B24D10-F706-4ABD-B1DA-08C569637759}"
-mai = "{826EEF83-3FC8-4245-9A8E-0F7CC9F47497}"
-mk = "{D2654ED2-5D65-4281-A118-09A3F25914B0}"
-mn = "{3355D11E-5906-4226-81FE-1413EA06E88B}"
-mni = "{DE13CC7E-1C6E-4CB9-864E-EA87162EFCB2}"
-ms = "{6C5A78EF-563A-4B86-A3FA-C6431AA92E98}"
-ml-IN = "{8047890F-2CD5-48D2-A73B-50DD2D06A9C8}"
-mr-IN = "{95BC02E6-5498-4879-AE16-FFCB9CABE1AE}"
-my = "{7002CA01-C610-411C-BD18-FE1E670C1F52}"
-ne = "{C89923C9-9061-42D4-B531-60498D929C06}"
-nb = "{1BED5361-E88F-4833-B707-B39901731676}"
-nl = "{49D204A8-21E6-48C6-9B29-B25AB3D6A137}"
-nn = "{23276245-2A01-444F-B878-4BB1B54638C3}"
-no = "{05134802-8C30-412A-89DD-CC662D1AB84F}"
-nr = "{B156D653-2AB4-4C57-A1A7-F8E50309356A}"
-nso = "{8226A004-F62B-45A0-85B0-042687103114}"
-om = "{B1A720C2-8B81-492F-8F78-7BC92147AD45}"
-oc = "{96392323-8828-42E5-86F4-3CBD2036A609}"
-or-IN = "{CF291629-172B-496B-8E86-017EB7392CFC}"
-pap = "{4ACBFC0D-A5B6-41FF-AAD1-9856CBDCF057}"
-pa-IN = "{DE14FDEF-E87A-4335-94B7-09D8FC30FE56}"
-pl = "{C3CFF998-06D1-48B0-925F-8B2CE21105F2}"
-ps = "{0C9FF6FF-3539-4C64-8068-E15FA08BA03D}"
-pt = "{7A5DEAF9-2687-447F-803D-594E0966A2E1}"
-pt-BR = "{4C644036-3E74-44A6-AE94-55D9E7F2C541}"
-ru = "{C1E77DC8-0C1C-4C2D-B67D-581E91C5BEDF}"
-rw = "{CF0171A7-E3C2-4120-AF79-90D426D61204}"
-sat = "{53951156-6BF5-416F-8CD2-E37A724A3779}"
-sa-IN = "{91B68ACD-6E12-4D96-822F-4715B87535CE}"
-si = "{43B0FA53-3B78-4920-B264-8D2DDF566B7C}"
-sc = "{D163A41F-FB45-4CC4-9644-4818953792EA}"
-sd = "{A6C60A32-84E3-4AB9-93DC-CBFFF437DD9B}"
-sk = "{E44612CD-1AC0-4D8B-9DBE-EFEAF5A2BC31}"
-sl = "{32DDC93C-0B62-42D9-9627-417CC947851A}"
-sh = "{5C7E8CBE-6D6D-4DAD-B8DC-D10F85A2B36B}"
-sr = "{65233590-D233-4A02-91C3-DF83D00AEDA7}"
-ss = "{E4C66A70-4597-4BD2-BDA3-25912A6FD81E}"
-st = "{E683C485-4034-4B51-8E4F-D389D1C87B5E}"
-sv = "{40FE345C-D3C7-48C4-8CC6-3B21845B9E2C}"
-sw = "{15829530-145E-4628-88EB-C2D1EF872A3E}"
-sw-TZ = "{BC988E86-1498-411C-978B-9EEA114602A2}"
-te-IN = "{3EA81EA3-0AD1-4833-8E27-C42455BA82DD}"
-ti-ER = "{1264E7B9-2286-4E43-8F95-E56DF0992E60}"
-ta-IN = "{A9DA9C7E-5DAE-419F-A213-A9BE4EFCE9B6}"
-th = "{148ACBA8-D6DA-4127-AB23-1787B0178278}"
-tn = "{2F8628DE-8765-475F-8265-3E535FBCE8B2}"
-tr = "{961A44B0-E927-4823-9BC6-C1E1B665DCC9}"
-ts = "{6D364115-17E5-4128-A46A-C48FFCDA7CAB}"
-tg = "{BF2D424E-87FE-4E79-B6BD-69ABB39925FF}"
-ug = "{AA212944-F6D4-4892-9FCF-F5AB00F48637}"
-ur-IN = "{DF853049-BFE4-4021-B072-4DA7128BC80B}"
-uk = "{AB349EA3-BBFD-444D-BB7F-E34B51D3C83F}"
-uz = "{E50DBC97-9AE2-4D8A-A8A5-9D3FAEE63D9A}"
-ve = "{CC948F7B-2223-4CF4-B6DA-589D091E2897}"
-vi = "{96E6D257-71C9-4E36-8BCF-01F3E60F42F1}"
-xh = "{0B4F6199-8EEE-45B0-B9B9-A80ECBEC5B8D}"
-zh-CN = "{85F565F6-4853-4AFD-8CF3-7A57201489C7}"
-zh-TW = "{115A4904-16B0-487F-846E-A27588FC28A2}"
-zu = "{D83DA940-56D9-4D11-AA20-8E70FD1C549A}"
-multiwestern = "{11F95BB5-D403-49A6-B704-C48C26783253}"
-multiiasia = "{6874DCF5-E0AC-464A-8002-BD48A76ADDF9}"
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/components.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/components.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/components.txt
+++ /dev/null
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooo_patchcodes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooo_patchcodes.txt
deleted file mode 100644
index 4831c3b21..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooo_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{7C35B9AB-2CE3-4C18-BE7C-5B97EA089EB3}	# OOo UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooodev_patchcodes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooodev_patchcodes.txt
deleted file mode 100644
index cbc09ea89..000000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooodev_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice Dev UpgradeCode
-
-{E54FAE36-AEA4-4964-B4BB-CE9D4CEB4B3E}	# OOo Dev UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt
deleted file mode 100644
index 7263a0a9e..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt
+++ /dev/null
@@ -1,73 +0,0 @@
-Action	Description	Template
-s72	L0	L0
-WINDOWSENCODINGTEMPLATE	ActionText	Action
-Advertise	OOO_ACTIONTEXT_1	
-AllocateRegistrySpace	OOO_ACTIONTEXT_2	OOO_ACTIONTEXT_3
-AppSearch	OOO_ACTIONTEXT_4	OOO_ACTIONTEXT_5
-BindImage	OOO_ACTIONTEXT_6	OOO_ACTIONTEXT_7
-caCreateVRoots	OOO_ACTIONTEXT_8	
-caRemoveVRoots	OOO_ACTIONTEXT_9	
-CCPSearch	OOO_ACTIONTEXT_10	
-CostFinalize	OOO_ACTIONTEXT_11	
-CostInitialize	OOO_ACTIONTEXT_12	
-CreateFolders	OOO_ACTIONTEXT_13	OOO_ACTIONTEXT_14
-CreateShortcuts	OOO_ACTIONTEXT_15	OOO_ACTIONTEXT_16
-DeleteServices	OOO_ACTIONTEXT_17	OOO_ACTIONTEXT_18
-DuplicateFiles	OOO_ACTIONTEXT_19	OOO_ACTIONTEXT_20
-FileCost	OOO_ACTIONTEXT_21	
-FindRelatedProducts	OOO_ACTIONTEXT_22	OOO_ACTIONTEXT_23
-GenerateScript	OOO_ACTIONTEXT_24	OOO_ACTIONTEXT_25
-InstallAdminPackage	OOO_ACTIONTEXT_26	OOO_ACTIONTEXT_27
-InstallFiles	OOO_ACTIONTEXT_28	OOO_ACTIONTEXT_29
-InstallODBC	OOO_ACTIONTEXT_30	
-InstallServices	OOO_ACTIONTEXT_31	OOO_ACTIONTEXT_32
-InstallSFPCatalogFile	OOO_ACTIONTEXT_33	OOO_ACTIONTEXT_34
-InstallValidate	OOO_ACTIONTEXT_35	
-LaunchConditions	OOO_ACTIONTEXT_36	
-MigrateFeatureStates	OOO_ACTIONTEXT_37	OOO_ACTIONTEXT_38
-MoveFiles	OOO_ACTIONTEXT_39	OOO_ACTIONTEXT_40
-PatchFiles	OOO_ACTIONTEXT_41	OOO_ACTIONTEXT_42
-ProcessComponents	OOO_ACTIONTEXT_43	
-PublishComponents	OOO_ACTIONTEXT_44	OOO_ACTIONTEXT_45
-PublishFeatures	OOO_ACTIONTEXT_46	OOO_ACTIONTEXT_47
-PublishProduct	OOO_ACTIONTEXT_48	
-RegisterClassInfo	OOO_ACTIONTEXT_49	OOO_ACTIONTEXT_50
-RegisterComPlus	OOO_ACTIONTEXT_51	OOO_ACTIONTEXT_52
-RegisterExtensionInfo	OOO_ACTIONTEXT_53	OOO_ACTIONTEXT_54
-RegisterFonts	OOO_ACTIONTEXT_55	OOO_ACTIONTEXT_56
-RegisterMIMEInfo	OOO_ACTIONTEXT_57	OOO_ACTIONTEXT_58
-RegisterProduct	OOO_ACTIONTEXT_59	OOO_ACTIONTEXT_60
-RegisterProgIdInfo	OOO_ACTIONTEXT_61	OOO_ACTIONTEXT_62
-RegisterTypeLibraries	OOO_ACTIONTEXT_63	OOO_ACTIONTEXT_64
-RegisterUser	OOO_ACTIONTEXT_65	OOO_ACTIONTEXT_66
-RemoveDuplicateFiles	OOO_ACTIONTEXT_67	OOO_ACTIONTEXT_68
-RemoveEnvironmentStrings	OOO_ACTIONTEXT_69	OOO_ACTIONTEXT_70
-RemoveExistingProducts	OOO_ACTIONTEXT_71	OOO_ACTIONTEXT_72
-RemoveFiles	OOO_ACTIONTEXT_73	OOO_ACTIONTEXT_74
-RemoveFolders	OOO_ACTIONTEXT_75	OOO_ACTIONTEXT_76
-RemoveIniValues	OOO_ACTIONTEXT_77	OOO_ACTIONTEXT_78
-RemoveODBC	OOO_ACTIONTEXT_79	
-RemoveRegistryValues	OOO_ACTIONTEXT_80	OOO_ACTIONTEXT_81
-RemoveShortcuts	OOO_ACTIONTEXT_82	OOO_ACTIONTEXT_83
-RMCCPSearch	OOO_ACTIONTEXT_84	
-Rollback	OOO_ACTIONTEXT_85	OOO_ACTIONTEXT_86
-RollbackCleanup	OOO_ACTIONTEXT_87	OOO_ACTIONTEXT_88
-SelfRegModules	OOO_ACTIONTEXT_89	OOO_ACTIONTEXT_90
-SelfUnregModules	OOO_ACTIONTEXT_91	OOO_ACTIONTEXT_92
-SetODBCFolders	OOO_ACTIONTEXT_93	
-StartServices	OOO_ACTIONTEXT_94	OOO_ACTIONTEXT_95
-StopServices	OOO_ACTIONTEXT_96	OOO_ACTIONTEXT_97
-UnmoveFiles	OOO_ACTIONTEXT_98	OOO_ACTIONTEXT_99
-UnpublishComponents	OOO_ACTIONTEXT_100	OOO_ACTIONTEXT_101
-UnpublishFeatures	OOO_ACTIONTEXT_102	OOO_ACTIONTEXT_103
-UnpublishProduct	OOO_ACTIONTEXT_104	
-UnregisterClassInfo	OOO_ACTIONTEXT_105	OOO_ACTIONTEXT_106
-UnregisterComPlus	OOO_ACTIONTEXT_107	OOO_ACTIONTEXT_108
-UnregisterExtensionInfo	OOO_ACTIONTEXT_109	OOO_ACTIONTEXT_110
-UnregisterFonts	OOO_ACTIONTEXT_111	OOO_ACTIONTEXT_112
-UnregisterMIMEInfo	OOO_ACTIONTEXT_113	OOO_ACTIONTEXT_114
-UnregisterProgIdInfo	OOO_ACTIONTEXT_115	OOO_ACTIONTEXT_116
-UnregisterTypeLibraries	OOO_ACTIONTEXT_117	OOO_ACTIONTEXT_118
-WriteEnvironmentStrings	OOO_ACTIONTEXT_119	OOO_ACTIONTEXT_120
-WriteIniValues	OOO_ACTIONTEXT_121	OOO_ACTIONTEXT_122
-WriteRegistryValues	OOO_ACTIONTEXT_123	OOO_ACTIONTEXT_124
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminExe.idt
deleted file mode 100644
index ede3f7cb4..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminExe.idt
+++ /dev/null
@@ -1,13 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdminExecuteSequence	Action
-CostFinalize		150
-CostInitialize		50
-CreateFolders		325
-FileCost		100
-InstallAdminPackage		300
-InstallFiles		350
-InstallFinalize		400
-InstallInitialize		250
-InstallValidate		200
-ScheduleReboot	ISSCHEDULEREBOOT	375
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminUIS.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminUIS.idt
deleted file mode 100644
index 3d92e28a4..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdminUIS.idt
+++ /dev/null
@@ -1,14 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdminUISequence	Action
-AdminWelcome	Not PATCH	250
-CostFinalize		200
-CostInitialize		100
-ExecuteAction		350
-FileCost		150
-PatchWelcome	PATCH	260
-SetupCompleteError		-3
-SetupCompleteSuccess		-1
-SetupInitialization		50
-SetupInterrupted		-2
-SetupProgress		300
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdvtExec.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdvtExec.idt
deleted file mode 100644
index 32b74d61a..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/AdvtExec.idt
+++ /dev/null
@@ -1,19 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdvtExecuteSequence	Action
-CostFinalize		100
-CostInitialize		50
-CreateShortcuts		250
-InstallFinalize		700
-InstallInitialize		200
-InstallValidate		150
-MsiPublishAssemblies		575
-PublishComponents		550
-PublishFeatures		600
-PublishProduct		650
-RegisterClassInfo		300
-RegisterExtensionInfo		350
-RegisterMIMEInfo		450
-RegisterProgIdInfo		400
-RegisterTypeLibraries		500
-ScheduleReboot	ISSCHEDULEREBOOT	675
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary.idt
deleted file mode 100644
index 0b638cb0e..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary.idt
+++ /dev/null
@@ -1,20 +0,0 @@
-Name	Data
-s72	v0
-Binary	Name
-ImageBmp	Image.bmp
-BannerBmp	Banner.bmp
-CautionIco	caution.ico
-DontInstallIco	dontinstall.ico
-OpenFolderIco	openfolder.ico
-InstallIco	install.ico
-InstallFirstUseIco	installfirstuse.ico
-InstallPartialIco	installpartial.ico
-InstallStateMenuIco	installstatemenu.ico
-NetworkInstallIco	networkinstall.ico
-NewFolderIco	newfolder.ico
-SetupCompleteIco	setupcomplete.ico
-SetupIco	setup.ico
-SetupPartialIco	setuppartial.ico
-SetupRepairIco	setuprepair.ico
-TrashcanIco	trashcan.ico
-UpIco	up.ico
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
deleted file mode 100644
index a453f1fcd..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
deleted file mode 100644
index 25b5b11be..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/caution.ico
deleted file mode 100644
index 1c6f14ee0..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/caution.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/dontinstall.ico
deleted file mode 100644
index e7136d0e8..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/dontinstall.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/install.ico
deleted file mode 100644
index 2eb32becb..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/install.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installfirstuse.ico
deleted file mode 100644
index dc1e6542e..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installfirstuse.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installpartial.ico
deleted file mode 100644
index bd5767969..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installpartial.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installstatemenu.ico
deleted file mode 100644
index 914340dbb..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installstatemenu.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/networkinstall.ico
deleted file mode 100644
index ae11ed113..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/networkinstall.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/newfolder.ico
deleted file mode 100644
index 324adbcba..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/newfolder.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/openfolder.ico
deleted file mode 100644
index ef88d2e47..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/openfolder.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setup.ico
deleted file mode 100644
index 3580448fe..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setup.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setupcomplete.ico
deleted file mode 100644
index 609276af0..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setupcomplete.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuppartial.ico
deleted file mode 100644
index ac158ab39..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuppartial.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuprepair.ico
deleted file mode 100644
index 2f4a24d0b..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuprepair.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/trashcan.ico
deleted file mode 100644
index f1cc8083f..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/trashcan.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/up.ico
deleted file mode 100644
index 5dc25fae6..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/up.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CheckBox.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CheckBox.idt
deleted file mode 100644
index c7c8e06d7..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CheckBox.idt
+++ /dev/null
@@ -1,4 +0,0 @@
-Property	Value
-s72	S64
-CheckBox	Property
-ISCHECKFORPRODUCTUPDATES	1
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
deleted file mode 100644
index e5be5e4d6..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ /dev/null
@@ -1,380 +0,0 @@
-Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
-s72	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L50
-WINDOWSENCODINGTEMPLATE	Control	Dialog_	Control
-AdminChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-AdminChangeFolder	BannerLine	Line	0	44	374	0	1				
-AdminChangeFolder	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-AdminChangeFolder	Branding2	Text	3	228	140	13	65537		[ProductName]		
-AdminChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_3	ComboText	
-AdminChangeFolder	Combo	DirectoryCombo	21	64	277	80	458755	TARGETDIR		Up	
-AdminChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_5	Combo	
-AdminChangeFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_6		
-AdminChangeFolder	DlgLine	Line	145	234	229	0	1				
-AdminChangeFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_7		
-AdminChangeFolder	List	DirectoryList	21	90	332	97	7	TARGETDIR		TailText	
-AdminChangeFolder	NewFolder	PushButton	335	66	19	19	3670019		NewFolderIco	List	OOO_CONTROL_9
-AdminChangeFolder	OK	PushButton	230	243	66	17	3		OOO_CONTROL_10	Cancel	
-AdminChangeFolder	Tail	PathEdit	21	207	332	17	3	TARGETDIR		OK	
-AdminChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_12	Tail	
-AdminChangeFolder	Up	PushButton	310	66	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_13
-AdminNetworkLocation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_14	InstallNow	
-AdminNetworkLocation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-AdminNetworkLocation	BannerLine	Line	0	44	374	0	1				
-AdminNetworkLocation	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-AdminNetworkLocation	Branding2	Text	3	228	140	13	65537		[ProductName]		
-AdminNetworkLocation	Browse	PushButton	286	124	66	17	3		OOO_CONTROL_17	Back	
-AdminNetworkLocation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_18	LBBrowse	
-AdminNetworkLocation	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_19		
-AdminNetworkLocation	DlgLine	Line	145	234	229	0	1				
-AdminNetworkLocation	DlgText	Text	21	51	326	40	3		OOO_CONTROL_20		
-AdminNetworkLocation	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_21		
-AdminNetworkLocation	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_22	Cancel	
-AdminNetworkLocation	LBBrowse	Text	21	90	100	10	3		OOO_CONTROL_23	SetupPathEdit	
-AdminNetworkLocation	SetupPathEdit	PathEdit	21	102	330	17	3	TARGETDIR		Browse	
-AdminWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_24	Next	
-AdminWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_25	Back	
-AdminWelcome	DlgLine	Line	0	234	326	0	1				
-AdminWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-AdminWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_26	Cancel	
-AdminWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_27		
-AdminWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_28		
-CancelSetup	Icon	Icon	15	15	24	24	5242881		CautionIco		
-CancelSetup	No	PushButton	135	57	66	17	3		OOO_CONTROL_29	Yes	
-CancelSetup	Text	Text	48	15	194	30	3		OOO_CONTROL_30		
-CancelSetup	Yes	PushButton	62	57	66	17	3		OOO_CONTROL_31	No	
-CustomerInformation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_32	Next	
-CustomerInformation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomerInformation	BannerLine	Line	0	44	374	0	1				
-CustomerInformation	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomerInformation	Branding2	Text	3	228	140	13	65537		[ProductName]		
-CustomerInformation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_35	NameLabel	
-CustomerInformation	CompanyEdit	Edit	21	100	237	17	3	COMPANYNAME	OOO_CONTROL_36	SerialLabel	
-CustomerInformation	CompanyLabel	Text	21	89	75	10	3		OOO_CONTROL_37	CompanyEdit	
-CustomerInformation	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_38		
-CustomerInformation	DlgLine	Line	145	234	229	0	1				
-CustomerInformation	DlgRadioGroupText	Text	21	161	300	14	3		OOO_CONTROL_39		
-CustomerInformation	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_40		
-CustomerInformation	NameEdit	Edit	21	63	237	17	3	USERNAME	OOO_CONTROL_41	CompanyLabel	
-CustomerInformation	NameLabel	Text	21	52	75	10	3		OOO_CONTROL_42	NameEdit	
-CustomerInformation	Next	PushButton	230	243	66	17	3		OOO_CONTROL_43	Cancel	
-CustomerInformation	RadioGroup	RadioButtonGroup	63	170	300	50	3	ApplicationUsers		Back	
-CustomerInformation	SerialLabel	Text	21	127	109	10	2		OOO_CONTROL_45	SerialNumber	
-CustomerInformation	SerialNumber	MaskedEdit	21	138	237	17	2	ISX_SERIALNUM		RadioGroup	
-CustomSetup	Back	PushButton	164	243	66	17	3		OOO_CONTROL_46	Next	
-CustomSetup	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomSetup	BannerLine	Line	0	44	374	0	1				
-CustomSetup	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomSetup	Branding2	Text	3	228	140	13	65537		[ProductName]		
-CustomSetup	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_49	Tree	
-CustomSetup	ChangeFolder	PushButton	301	203	66	17	3		OOO_CONTROL_50	Help	
-CustomSetup	Details	PushButton	93	243	66	17	3		OOO_CONTROL_51	Back	
-CustomSetup	DlgDesc	Text	17	23	276	25	65539		OOO_CONTROL_52		
-CustomSetup	DlgLine	Line	145	234	229	0	1				
-CustomSetup	DlgText	Text	9	51	360	10	3		OOO_CONTROL_53		
-CustomSetup	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_54		
-CustomSetup	FeatureGroup	GroupBox	235	67	131	120	1		OOO_CONTROL_55		
-CustomSetup	Help	PushButton	22	243	66	17	3		OOO_CONTROL_56	Details	
-CustomSetup	InstallLabel	Text	8	190	360	10	3		OOO_CONTROL_57		
-CustomSetup	ItemDescription	Text	241	80	120	50	3		OOO_CONTROL_58		
-CustomSetup	Location	Text	8	203	291	20	3		OOO_CONTROL_59		
-CustomSetup	Next	PushButton	230	243	66	17	3		OOO_CONTROL_60	Cancel	
-CustomSetup	Size	Text	241	133	120	50	3		OOO_CONTROL_61		
-CustomSetup	Tree	SelectionTree	8	70	220	118	7	_BrowseProperty		ChangeFolder	
-CustomSetupTips	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomSetupTips	BannerLine	Line	0	44	374	0	1				
-CustomSetupTips	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomSetupTips	Branding2	Text	3	228	140	13	65537		[ProductName]		
-CustomSetupTips	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_64		
-CustomSetupTips	DlgLine	Line	145	234	229	0	1				
-CustomSetupTips	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_65		
-CustomSetupTips	DontInstall	Icon	21	155	24	24	5242881		DontInstallIco		
-CustomSetupTips	DontInstallText	Text	60	155	300	20	3		OOO_CONTROL_66		
-CustomSetupTips	Install	Icon	21	105	24	24	5242881		InstallIco		
-CustomSetupTips	InstallPartial	Icon	21	130	24	24	5242881		InstallPartialIco		
-CustomSetupTips	InstallStateMenu	Icon	21	52	24	24	5242881		InstallStateMenuIco		
-CustomSetupTips	InstallStateText	Text	21	91	300	10	3		OOO_CONTROL_68		
-CustomSetupTips	InstallText	Text	60	105	300	20	3		OOO_CONTROL_69		
-CustomSetupTips	MenuText	Text	50	52	300	36	3		OOO_CONTROL_70		
-CustomSetupTips	OK	PushButton	301	243	66	17	3		OOO_CONTROL_72		
-CustomSetupTips	PartialText	Text	60	130	300	20	3		OOO_CONTROL_73		
-DatabaseFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_74	Next	
-DatabaseFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DatabaseFolder	BannerLine	Line	0	44	374	0	1				
-DatabaseFolder	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-DatabaseFolder	Branding2	Text	3	228	140	13	65537		[ProductName]		
-DatabaseFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_77	ChangeFolder	
-DatabaseFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_78	Back	
-DatabaseFolder	DatabaseFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
-DatabaseFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_79		
-DatabaseFolder	DlgLine	Line	145	234	229	0	1				
-DatabaseFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_80		
-DatabaseFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_81		
-DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
-DatabaseFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_83	Cancel	
-DestinationFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_84	Next	
-DestinationFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DestinationFolder	BannerLine	Line	0	44	374	0	1				
-DestinationFolder	Branding1	Text	4	229	110	13	3		{&MSSWhiteSerif8}[ProductName]		
-DestinationFolder	Branding2	Text	3	228	110	13	65537		[ProductName]		
-DestinationFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_87	ChangeFolder	
-DestinationFolder	ChangeFolder	PushButton	301	125	66	17	3		OOO_CONTROL_88	Back	
-DestinationFolder	DestFolder	Icon	21	112	24	24	5242881		OpenFolderIco		
-DestinationFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_304		
-DestinationFolder	DlgLine	Line	114	234	260	0	1				
-DestinationFolder	DlgTitle	Text	13	6	280	25	65539		{&MSSansBold8}[ProductName]		
-DestinationFolder	Location	Text	57	128	240	40	3	_BrowseProperty	[INSTALLLOCATION]		
-DestinationFolder	LocLabel	Text	57	115	290	10	3		OOO_CONTROL_92		
-DestinationFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_93	Cancel	
-DestinationFolder	LabelStartInstall	Text	21	52	290	30	2		OOO_CONTROL_300		
-DestinationFolder	LabelInvalidDir	Text	21	52	290	30	2		OOO_CONTROL_301		
-DestinationFolder	LabelWrongProduct	Text	21	52	290	30	2		OOO_CONTROL_303		
-DestinationFolder	LabelStartInstall2	Text	21	82	290	30	2		OOO_CONTROL_305		
-DestinationFolder	LabelInvalidDir2	Text	21	82	290	30	2		OOO_CONTROL_307		
-DestinationFolder	LabelWrongProduct2	Text	21	82	290	30	2		OOO_CONTROL_306		
-DiskSpaceRequirements	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DiskSpaceRequirements	BannerLine	Line	0	44	374	0	1				
-DiskSpaceRequirements	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-DiskSpaceRequirements	Branding2	Text	3	228	140	13	65537		[ProductName]		
-DiskSpaceRequirements	DlgDesc	Text	17	23	276	25	65539		OOO_CONTROL_96		
-DiskSpaceRequirements	DlgLine	Line	145	234	229	0	1				
-DiskSpaceRequirements	DlgText	Text	10	185	358	41	3		OOO_CONTROL_97		
-DiskSpaceRequirements	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_98		
-DiskSpaceRequirements	List	VolumeCostList	8	55	358	125	393223		{120}{70}{70}{70}{70}		
-DiskSpaceRequirements	OK	PushButton	301	243	66	17	3		OOO_CONTROL_100		
-FilesInUse	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-FilesInUse	BannerLine	Line	0	44	374	0	1				
-FilesInUse	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-FilesInUse	Branding2	Text	3	228	140	13	65537		[ProductName]		
-FilesInUse	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_103		
-FilesInUse	DlgLine	Line	145	234	229	0	1				
-FilesInUse	DlgText	Text	21	51	348	29	3		OOO_CONTROL_104		
-FilesInUse	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_105		
-FilesInUse	Exit	PushButton	301	243	66	17	3		OOO_CONTROL_106	List	
-FilesInUse	Ignore	PushButton	230	243	66	17	3		OOO_CONTROL_107	Exit	
-FilesInUse	List	ListBox	21	87	331	135	7	FileInUseProcess		Retry	
-FilesInUse	Retry	PushButton	164	243	66	17	3		OOO_CONTROL_108	Ignore	
-FileTypeDialog	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
-FileTypeDialog	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-FileTypeDialog	BannerLine	Line	0	44	374	0	1				
-FileTypeDialog	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-FileTypeDialog	Branding2	Text	3	228	140	13	65537		[ProductName]		
-FileTypeDialog	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_138	CheckBox1	
-FileTypeDialog	CheckBox1	CheckBox	41	106	200	10	3	SELECT_WORD	 OOO_CONTROL_270	CheckBox2	
-FileTypeDialog	CheckBox2	CheckBox	41	131	200	10	3	SELECT_EXCEL	 OOO_CONTROL_271	CheckBox3	
-FileTypeDialog	CheckBox3	CheckBox	41	156	200	10	3	SELECT_POWERPOINT	 OOO_CONTROL_272	Back	
-FileTypeDialog	DlgDesc	Text	21	20	272	25	65539		OOO_CONTROL_274		
-FileTypeDialog	DlgLine	Line	145	234	229	0	1				
-FileTypeDialog	DlgText	Text	21	56	326	40	3		OOO_CONTROL_275		
-FileTypeDialog	DlgText2	Text	21	190	326	30	3		OOO_CONTROL_309		
-FileTypeDialog	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_278		
-FileTypeDialog	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-InstallChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-InstallChangeFolder	BannerLine	Line	0	44	374	0	1				
-InstallChangeFolder	Branding1	Text	4	229	110	13	3		{&MSSWhiteSerif8}[ProductName]		
-InstallChangeFolder	Branding2	Text	3	228	110	13	65537		[ProductName]		
-InstallChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_111	ComboText	
-InstallChangeFolder	Combo	DirectoryCombo	21	64	302	80	4128779	_BrowseProperty		Up	
-InstallChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_113	Combo	
-InstallChangeFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_114		
-InstallChangeFolder	DlgLine	Line	114	234	260	0	1				
-InstallChangeFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_115		
-InstallChangeFolder	List	DirectoryList	21	90	332	97	15	_BrowseProperty		TailText	
-InstallChangeFolder	OK	PushButton	230	243	66	17	3		OOO_CONTROL_118	Cancel	
-InstallChangeFolder	Tail	PathEdit	21	207	332	17	15	_BrowseProperty		OK	
-InstallChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_120	Tail	
-InstallChangeFolder	Up	PushButton	333	64	19	19	3670019		UpIco	List	OOO_CONTROL_121
-InstallWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_122	Copyright	
-InstallWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_123	Back	
-InstallWelcome	Copyright	Text	135	144	228	73	65539		OOO_CONTROL_124	Next	
-InstallWelcome	DlgLine	Line	0	234	374	0	1				
-InstallWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-InstallWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_125	Cancel	
-InstallWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_126		
-InstallWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_127		
-LicenseAgreement	Agree	RadioButtonGroup	8	190	330	40	3	AgreeToLicense		Back	
-LicenseAgreement	Back	PushButton	164	243	66	17	3		OOO_CONTROL_128	Next	
-LicenseAgreement	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-LicenseAgreement	BannerLine	Line	0	44	374	0	1				
-LicenseAgreement	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-LicenseAgreement	Branding2	Text	3	228	140	13	65537		[ProductName]		
-LicenseAgreement	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_131	Agree	
-LicenseAgreement	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_132		
-LicenseAgreement	DlgLine	Line	145	234	229	0	1				
-LicenseAgreement	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_133		
-LicenseAgreement	Memo	ScrollableText	8	54	358	130	7				
-LicenseAgreement	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-MaintenanceType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
-MaintenanceType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-MaintenanceType	BannerLine	Line	0	44	374	0	1				
-MaintenanceType	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-MaintenanceType	Branding2	Text	3	228	140	13	65537		[ProductName]		
-MaintenanceType	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_138	RadioGroup	
-MaintenanceType	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_139		
-MaintenanceType	DlgLine	Line	145	234	229	0	1				
-MaintenanceType	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_140		
-MaintenanceType	Ico1	Icon	35	75	24	24	5242881		SetupRepairIco		
-MaintenanceType	Ico2	Icon	35	135	24	24	5242881		TrashcanIco		
-MaintenanceType	Next	PushButton	230	243	66	17	3		OOO_CONTROL_141	Cancel	
-MaintenanceType	RadioGroup	RadioButtonGroup	21	55	290	170	3	_IsMaintenance		Back	
-MaintenanceType	Text1	Text	80	72	260	35	3		OOO_CONTROL_144		
-MaintenanceType	Text2	Text	80	135	260	35	3		OOO_CONTROL_145		
-MaintenanceWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_146	Next	
-MaintenanceWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_147	Back	
-MaintenanceWelcome	DlgLine	Line	0	234	374	0	1				
-MaintenanceWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-MaintenanceWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_148	Cancel	
-MaintenanceWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_149		
-MaintenanceWelcome	TextLine2	Text	135	55	228	50	65539		OOO_CONTROL_150		
-OutOfSpace	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-OutOfSpace	BannerLine	Line	0	44	374	0	1				
-OutOfSpace	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-OutOfSpace	Branding2	Text	3	228	140	13	65537		[ProductName]		
-OutOfSpace	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_153		
-OutOfSpace	DlgLine	Line	145	234	229	0	1				
-OutOfSpace	DlgText	Text	21	51	326	43	3		OOO_CONTROL_154		
-OutOfSpace	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_155		
-OutOfSpace	List	VolumeCostList	21	95	332	120	393223		OOO_CONTROL_156		
-OutOfSpace	Resume	PushButton	301	243	66	17	3		OOO_CONTROL_157		
-PatchWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_158	Next	
-PatchWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_159	Back	
-PatchWelcome	DlgLine	Line	0	234	374	0	1				
-PatchWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-PatchWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_160	Cancel	
-PatchWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_161		
-PatchWelcome	TextLine2	Text	135	54	228	45	65539		OOO_CONTROL_162		
-ReadyToInstall	Back	PushButton	164	243	66	17	3		OOO_CONTROL_163	InstallNow	
-ReadyToInstall	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-ReadyToInstall	BannerLine	Line	0	44	374	0	1				
-ReadyToInstall	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-ReadyToInstall	Branding2	Text	3	228	140	13	65537		[ProductName]		
-ReadyToInstall	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_166	Back	
-ReadyToInstall	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_167		
-ReadyToInstall	DlgLine	Line	145	234	229	0	1				
-ReadyToInstall	DlgText	Text	21	51	326	20	3		OOO_CONTROL_168		
-ReadyToInstall	DlgText1	Text	21	70	330	24	3		OOO_CONTROL_169		
-ReadyToInstall	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_170		
-ReadyToInstall	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_171		
-ReadyToInstall	DlgTitle3	Text	13	6	280	25	65538		OOO_CONTROL_172		
-ReadyToInstall	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_173	Cancel	
-ReadyToRemove	Back	PushButton	164	243	66	17	3		OOO_CONTROL_174	RemoveNow	
-ReadyToRemove	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-ReadyToRemove	BannerLine	Line	0	44	374	0	1				
-ReadyToRemove	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-ReadyToRemove	Branding2	Text	3	228	140	13	65537		[ProductName]		
-ReadyToRemove	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_177	Back	
-ReadyToRemove	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_178		
-ReadyToRemove	DlgLine	Line	145	234	229	0	1				
-ReadyToRemove	DlgText	Text	21	51	326	24	3		OOO_CONTROL_179		
-ReadyToRemove	DlgText1	Text	21	79	330	23	3		OOO_CONTROL_180		
-ReadyToRemove	DlgText2	Text	21	102	330	24	3				
-ReadyToRemove	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_181		
-ReadyToRemove	RemoveNow	PushButton	230	243	66	17	3		OOO_CONTROL_182	Cancel	
-SetupCompleteError	Back	PushButton	164	243	66	17	1		OOO_CONTROL_183	Finish	
-SetupCompleteError	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_184	Back	
-SetupCompleteError	DlgLine	Line	0	234	374	0	1				
-SetupCompleteError	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_185	Cancel	
-SetupCompleteError	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_186		
-SetupCompleteError	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_187		
-SetupCompleteError	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupCompleteError	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_188		
-SetupCompleteError	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_189		
-SetupCompleteError	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_190		
-SetupCompleteError	TextLine2	Text	135	55	228	25	65539		OOO_CONTROL_191		
-SetupCompleteSuccess	Back	PushButton	164	243	66	17	1		OOO_CONTROL_192	OK	
-SetupCompleteSuccess	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_193	Image	
-SetupCompleteSuccess	CheckBoxUpdates	CheckBox	135	164	10	9	2	ISCHECKFORPRODUCTUPDATES	CheckBox1	Back	
-SetupCompleteSuccess	CheckForUpdatesText	Text	152	162	190	30	65538		OOO_CONTROL_194		
-SetupCompleteSuccess	CheckLaunchProgram	CheckBox	151	114	10	9	2	LAUNCHPROGRAM			
-SetupCompleteSuccess	CheckLaunchReadme	CheckBox	151	148	10	9	2	LAUNCHREADME			
-SetupCompleteSuccess	DlgLine	Line	0	234	374	0	1				
-SetupCompleteSuccess	Image	Bitmap	0	0	122	234	1		ImageBmp	CheckBoxUpdates	
-SetupCompleteSuccess	LaunchProgramText	Text	164	112	198	15	65538		OOO_CONTROL_195		
-SetupCompleteSuccess	LaunchReadmeText	Text	164	148	198	13	65538		OOO_CONTROL_196		
-SetupCompleteSuccess	OK	PushButton	230	243	66	17	3		OOO_CONTROL_197	Cancel	
-SetupCompleteSuccess	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_198		
-SetupCompleteSuccess	TextLine2	Text	135	55	228	45	65538		OOO_CONTROL_199		
-SetupCompleteSuccess	TextLine3	Text	135	55	228	45	65538		OOO_CONTROL_200		
-SetupCompleteSuccess	UpdateTextLine1	Text	135	30	228	45	65538		OOO_CONTROL_201		
-SetupCompleteSuccess	UpdateTextLine2	Text	135	80	228	45	65538		OOO_CONTROL_202		
-SetupCompleteSuccess	UpdateTextLine3	Text	135	120	228	45	65538		OOO_CONTROL_203		
-SetupError	A	PushButton	192	80	66	17	3		OOO_CONTROL_204		
-SetupError	C	PushButton	192	80	66	17	3		OOO_CONTROL_205		
-SetupError	ErrorText	Text	50	15	200	50	3		OOO_CONTROL_206		
-SetupError	I	PushButton	192	80	66	17	3		OOO_CONTROL_207		
-SetupError	N	PushButton	192	80	66	17	3		OOO_CONTROL_208		
-SetupError	O	PushButton	192	80	66	17	3		OOO_CONTROL_209		
-SetupError	R	PushButton	192	80	66	17	3		OOO_CONTROL_210		
-SetupError	WarningIcon	Icon	15	15	24	24	5242881		CautionIco		
-SetupError	Y	PushButton	192	80	66	17	3		OOO_CONTROL_211		
-SetupInitialization	ActionData	Text	135	125	228	12	65539				
-SetupInitialization	ActionText	Text	135	109	220	36	65539				
-SetupInitialization	Back	PushButton	164	243	66	17	1		OOO_CONTROL_214		
-SetupInitialization	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_215		
-SetupInitialization	DlgLine	Line	0	234	374	0	1				
-SetupInitialization	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupInitialization	Next	PushButton	230	243	66	17	1		OOO_CONTROL_216		
-SetupInitialization	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_217		
-SetupInitialization	TextLine2	Text	135	55	228	30	65539		OOO_CONTROL_218		
-SetupInterrupted	Back	PushButton	164	243	66	17	1		OOO_CONTROL_219		
-SetupInterrupted	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_220		
-SetupInterrupted	DlgLine	Line	0	234	374	0	1				
-SetupInterrupted	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_221		
-SetupInterrupted	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_222		
-SetupInterrupted	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_223		
-SetupInterrupted	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupInterrupted	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_224		
-SetupInterrupted	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_225		
-SetupInterrupted	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_226		
-SetupInterrupted	TextLine2	Text	135	55	228	25	65539		OOO_CONTROL_227		
-SetupProgress	ActionProgress95	ProgressBar	59	113	275	12	65537		OOO_CONTROL_228		
-SetupProgress	ActionText	Text	59	100	275	12	3				
-SetupProgress	Back	PushButton	164	243	66	17	1		OOO_CONTROL_230	Next	
-SetupProgress	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-SetupProgress	BannerLine	Line	0	44	374	0	1				
-SetupProgress	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-SetupProgress	Branding2	Text	3	228	140	13	65537		[ProductName]		
-SetupProgress	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_233	Back	
-SetupProgress	DlgDesc	Text	21	23	272	25	65538		OOO_CONTROL_234		
-SetupProgress	DlgDesc2	Text	21	23	272	25	65538		OOO_CONTROL_235		
-SetupProgress	DlgLine	Line	145	234	229	0	1				
-SetupProgress	DlgText	Text	59	51	275	30	65538		OOO_CONTROL_236		
-SetupProgress	DlgText2	Text	59	51	275	30	65538		OOO_CONTROL_237		
-SetupProgress	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_238		
-SetupProgress	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_239		
-SetupProgress	LbSec	Text	172	139	32	12	2		OOO_CONTROL_240		
-SetupProgress	LbStatus	Text	59	85	70	12	3		OOO_CONTROL_241		
-SetupProgress	Next	PushButton	230	243	66	17	1		OOO_CONTROL_242	Cancel	
-SetupProgress	SetupIcon	Icon	21	51	24	24	5242881		SetupIco		
-SetupProgress	ShowTime	Text	155	139	17	12	2				
-SetupProgress	TextTime	Text	59	139	96	12	2		OOO_CONTROL_244		
-SetupResume	Back	PushButton	164	243	66	17	1		OOO_CONTROL_245	Next	
-SetupResume	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_246	Back	
-SetupResume	DlgLine	Line	0	234	374	0	1				
-SetupResume	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupResume	Next	PushButton	230	243	66	17	3		OOO_CONTROL_247	Cancel	
-SetupResume	PreselectedText	Text	135	55	228	45	65539		OOO_CONTROL_248		
-SetupResume	ResumeText	Text	135	46	228	45	65539		OOO_CONTROL_249		
-SetupResume	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_250		
-SetupType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_251	Next	
-SetupType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-SetupType	BannerLine	Line	0	44	374	0	1				
-SetupType	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-SetupType	Branding2	Text	3	228	140	13	65537		[ProductName]		
-SetupType	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_254	RadioGroup	
-SetupType	CompleteIco	Icon	34	94	24	24	5242881		SetupCompleteIco		
-SetupType	CompText	Text	80	94	246	35	3		OOO_CONTROL_255		
-SetupType	CustomIco	Icon	34	154	24	24	5242881		SetupPartialIco		
-SetupType	CustText	Text	80	154	246	35	3		OOO_CONTROL_256		
-SetupType	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_257		
-SetupType	DlgLine	Line	145	234	229	0	1				
-SetupType	DlgText	Text	21	51	326	10	3		OOO_CONTROL_258		
-SetupType	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_259		
-SetupType	Next	PushButton	230	243	66	17	3		OOO_CONTROL_260	Cancel	
-SetupType	RadioGroup	RadioButtonGroup	21	79	264	120	3	_IsSetupTypeMin		Back	
-SplashBitmap	Back	PushButton	164	243	66	17	1		OOO_CONTROL_262	Next	
-SplashBitmap	Branding1	Text	4	229	140	13	3		{&MSSWhiteSerif8}[ProductName]		
-SplashBitmap	Branding2	Text	3	228	140	13	65537		[ProductName]		
-SplashBitmap	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_265	Back	
-SplashBitmap	DlgLine	Line	145	234	229	0	1				
-SplashBitmap	Image	Bitmap	13	12	114	211	1		ImageBmp		
-SplashBitmap	Next	PushButton	230	243	66	17	3		OOO_CONTROL_266	Cancel	
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
deleted file mode 100644
index 6f6e3cb59..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
+++ /dev/null
@@ -1,70 +0,0 @@
-Dialog_	Control_	Action	Condition
-s72	s50	s50	s255
-ControlCondition	Dialog_	Control_	Action	Condition
-CustomerInformation	DlgRadioGroupText	Hide	NOT Privileged
-CustomerInformation	DlgRadioGroupText	Hide	ProductState > 0
-CustomerInformation	DlgRadioGroupText	Hide	Version9X
-CustomerInformation	RadioGroup	Hide	NOT Privileged
-CustomerInformation	RadioGroup	Hide	ProductState > 0
-CustomerInformation	RadioGroup	Hide	Version9X
-CustomerInformation	SerialLabel	Show	SERIALNUMSHOW
-CustomerInformation	SerialNumber	Show	SERIALNUMSHOW
-CustomSetup	ChangeFolder	Hide	Installed
-CustomSetup	Details	Hide	Installed
-CustomSetup	InstallLabel	Hide	Installed
-InstallWelcome	Copyright	Hide	SHOWCOPYRIGHT="No"
-InstallWelcome	Copyright	Show	SHOWCOPYRIGHT="Yes"
-LicenseAgreement	Next	Disable	AgreeToLicense <> "Yes"
-LicenseAgreement	Next	Enable	AgreeToLicense = "Yes"
-ReadyToInstall	DlgTitle	Show	ProgressType0="Modify"
-ReadyToInstall	DlgTitle2	Show	ProgressType0="Repair"
-ReadyToInstall	DlgTitle3	Show	ProgressType0="install"
-SetupCompleteError	Back	Default	UpdateStarted
-SetupCompleteError	Back	Disable	NOT UpdateStarted
-SetupCompleteError	Back	Enable	UpdateStarted
-SetupCompleteError	Cancel	Disable	NOT UpdateStarted
-SetupCompleteError	Cancel	Enable	UpdateStarted
-SetupCompleteError	Finish	Default	NOT UpdateStarted
-SetupCompleteError	FinishText1	Hide	UpdateStarted
-SetupCompleteError	FinishText1	Show	NOT UpdateStarted
-SetupCompleteError	FinishText2	Hide	UpdateStarted
-SetupCompleteError	FinishText2	Show	NOT UpdateStarted
-SetupCompleteError	RestContText1	Hide	NOT UpdateStarted
-SetupCompleteError	RestContText1	Show	UpdateStarted
-SetupCompleteError	RestContText2	Hide	NOT UpdateStarted
-SetupCompleteError	RestContText2	Show	UpdateStarted
-SetupCompleteSuccess	CheckBoxUpdates	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	CheckForUpdatesText	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	CheckLaunchProgram	Show	SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	CheckLaunchReadme	Show	SHOWLAUNCHREADME="-1"  And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	LaunchProgramText	Show	SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	LaunchReadmeText	Show	SHOWLAUNCHREADME="-1"  And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	TextLine2	Show	ProgressType2="installed" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess	TextLine3	Show	ProgressType2="uninstalled" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess	UpdateTextLine1	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	UpdateTextLine2	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	UpdateTextLine3	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupInterrupted	Back	Default	UpdateStarted
-SetupInterrupted	Back	Disable	NOT UpdateStarted
-SetupInterrupted	Back	Enable	UpdateStarted
-SetupInterrupted	Cancel	Disable	NOT UpdateStarted
-SetupInterrupted	Cancel	Enable	UpdateStarted
-SetupInterrupted	Finish	Default	NOT UpdateStarted
-SetupInterrupted	FinishText1	Hide	UpdateStarted
-SetupInterrupted	FinishText1	Show	NOT UpdateStarted
-SetupInterrupted	FinishText2	Hide	UpdateStarted
-SetupInterrupted	FinishText2	Show	NOT UpdateStarted
-SetupInterrupted	RestContText1	Hide	NOT UpdateStarted
-SetupInterrupted	RestContText1	Show	UpdateStarted
-SetupInterrupted	RestContText2	Hide	NOT UpdateStarted
-SetupInterrupted	RestContText2	Show	UpdateStarted
-SetupProgress	DlgDesc	Show	ProgressType2="installed"
-SetupProgress	DlgDesc2	Show	ProgressType2="uninstalled"
-SetupProgress	DlgText	Show	ProgressType3="installs"
-SetupProgress	DlgText2	Show	ProgressType3="uninstalls"
-SetupProgress	DlgTitle	Show	ProgressType1="Installing"
-SetupProgress	DlgTitle2	Show	ProgressType1="Uninstalling"
-SetupResume	PreselectedText	Hide	RESUME
-SetupResume	PreselectedText	Show	NOT RESUME
-SetupResume	ResumeText	Hide	NOT RESUME
-SetupResume	ResumeText	Show	RESUME
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
deleted file mode 100644
index 21f7fe772..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ /dev/null
@@ -1,138 +0,0 @@
-Dialog_	Control_	Event	Argument	Condition	Ordering
-s72	s50	s50	s255	S255	I2
-ControlEvent	Dialog_	Control_	Event	Argument	Condition
-AdminChangeFolder	Cancel	EndDialog	Return	1	2
-AdminChangeFolder	Cancel	Reset	0	1	1
-AdminChangeFolder	NewFolder	DirectoryListNew	0	1	0
-AdminChangeFolder	OK	EndDialog	Return	1	0
-AdminChangeFolder	OK	SetTargetPath	TARGETDIR	1	1
-AdminChangeFolder	Up	DirectoryListUp	0	1	0
-AdminNetworkLocation	Back	NewDialog	AdminWelcome	1	0
-AdminNetworkLocation	Browse	SpawnDialog	AdminChangeFolder	1	0
-AdminNetworkLocation	Cancel	SpawnDialog	CancelSetup	1	0
-AdminNetworkLocation	InstallNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	3
-AdminNetworkLocation	InstallNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	2
-AdminNetworkLocation	InstallNow	SetTargetPath	TARGETDIR	1	1
-AdminWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-AdminWelcome	Next	NewDialog	AdminNetworkLocation	1	0
-CancelSetup	No	EndDialog	Return	1	0
-CancelSetup	Yes	EndDialog	Exit	1	2
-CustomerInformation	Back	NewDialog	LicenseAgreement	1	1
-CustomerInformation	Cancel	SpawnDialog	CancelSetup	1	0
-CustomerInformation	Next	[ALLUSERS]	{}	ApplicationUsers = "OnlyCurrentUser" And Privileged	2
-CustomerInformation	Next	[ALLUSERS]	1	ApplicationUsers = "AllUsers" And Privileged	1
-CustomerInformation	Next	EndDialog	Exit	(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT<0) And (SERIALNUMVALRETURN<>SERIALNUMVALSUCCESSRETVAL)	3
-CustomerInformation	Next	NewDialog	SetupType	((Not SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))	4
-CustomSetup	Back	NewDialog	MaintenanceType	Installed	0
-CustomSetup	Back	NewDialog	SetupType	NOT Installed	0
-CustomSetup	Cancel	SpawnDialog	CancelSetup	1	0
-CustomSetup	ChangeFolder	SelectionBrowse	InstallChangeFolder	1	0
-CustomSetup	Details	SelectionBrowse	DiskSpaceRequirements	1	1
-CustomSetup	Help	SpawnDialog	CustomSetupTips	1	1
-CustomSetup	Next	[_IsSetupTypeMin]	Custom	1	0
-CustomSetup	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-CustomSetup	Next	NewDialog	ReadyToInstall	OutOfNoRbDiskSpace <> 1	0
-CustomSetupTips	OK	EndDialog	Return	1	1
-DatabaseFolder	Back	NewDialog	CustomerInformation	1	1
-DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
-DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
-DatabaseFolder	Next	NewDialog	SetupType	1	1
-DestinationFolder	Back	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-DestinationFolder	Back	NewDialog	InstallWelcome	HIDEEULA = 1	0
-DestinationFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DestinationFolder	ChangeFolder	[_BrowseProperty]	INSTALLLOCATION	1	2
-DestinationFolder	ChangeFolder	NewDialog	InstallChangeFolder	1	1
-DestinationFolder	Next	NewDialog	ReadyToInstall	1	0
-DiskSpaceRequirements	OK	EndDialog	Return	1	0
-FilesInUse	Exit	EndDialog	Exit	1	0
-FilesInUse	Ignore	EndDialog	Ignore	1	0
-FilesInUse	Retry	EndDialog	Retry	1	0
-FileTypeDialog	Back	NewDialog	CustomSetup	Installed OR _IsSetupTypeMin = "Custom"	2
-FileTypeDialog	Back	NewDialog	SetupType	NOT Installed AND _IsSetupTypeMin <> "Custom"	1
-FileTypeDialog	Cancel	SpawnDialog	CancelSetup	1	0
-FileTypeDialog	Next	NewDialog	ReadyToInstall	1	0
-InstallChangeFolder	Cancel	NewDialog	DestinationFolder	1	2
-InstallChangeFolder	Cancel	Reset	0	1	1
-InstallChangeFolder	OK	NewDialog	DestinationFolder	1	3
-InstallChangeFolder	OK	SetTargetPath	[_BrowseProperty]	1	2
-InstallChangeFolder	Up	DirectoryListUp	0	1	0
-InstallWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	1
-InstallWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-InstallWelcome	Next	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-InstallWelcome	Next	NewDialog	DestinationFolder	HIDEEULA = 1	0
-LicenseAgreement	Back	NewDialog	InstallWelcome	1	0
-LicenseAgreement	Cancel	SpawnDialog	CancelSetup	1	0
-LicenseAgreement	Next	NewDialog	DestinationFolder	AgreeToLicense = "Yes"	0
-MaintenanceType	Back	NewDialog	MaintenanceWelcome	1	0
-MaintenanceType	Cancel	SpawnDialog	CancelSetup	1	0
-MaintenanceType	Next	[ProgressType0]	Modify	_IsMaintenance = "Change"	2
-MaintenanceType	Next	[ProgressType0]	Repair	_IsMaintenance = "Reinstall"	1
-MaintenanceType	Next	[ProgressType1]	Modifying	_IsMaintenance = "Change"	3
-MaintenanceType	Next	[ProgressType1]	Repairing	_IsMaintenance = "Reinstall"	4
-MaintenanceType	Next	[ProgressType2]	modified	_IsMaintenance = "Change"	6
-MaintenanceType	Next	[ProgressType2]	repairs	_IsMaintenance = "Reinstall"	5
-MaintenanceType	Next	[ProgressType3]	modifies	_IsMaintenance = "Change"	7
-MaintenanceType	Next	[ProgressType3]	repairs	_IsMaintenance = "Reinstall"	8
-MaintenanceType	Next	NewDialog	CustomSetup	_IsMaintenance = "Change"	12
-MaintenanceType	Next	NewDialog	ReadyToInstall	_IsMaintenance = "Reinstall"	13
-MaintenanceType	Next	NewDialog	ReadyToRemove	_IsMaintenance = "Remove"	11
-MaintenanceType	Next	Reinstall	ALL	_IsMaintenance = "Reinstall"	10
-MaintenanceType	Next	ReinstallMode	[ReinstallModeText]	_IsMaintenance = "Reinstall"	9
-MaintenanceWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-MaintenanceWelcome	Next	NewDialog	MaintenanceType	1	0
-OutOfSpace	Resume	NewDialog	AdminNetworkLocation	ACTION = "ADMIN"	0
-OutOfSpace	Resume	NewDialog	DestinationFolder	ACTION <> "ADMIN"	0
-PatchWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	0
-PatchWelcome	Cancel	SpawnDialog	CancelSetup	1	1
-PatchWelcome	Next	EndDialog	Return	1	3
-PatchWelcome	Next	Reinstall	ALL	PATCH And REINSTALL=""	1
-PatchWelcome	Next	ReinstallMode	omus	PATCH And REINSTALLMODE=""	2
-ReadyToInstall	Back	NewDialog	DestinationFolder	Installed OR _IsSetupTypeMin = "Custom"	2
-ReadyToInstall	Back	NewDialog	DestinationFolder	Installed AND _IsMaintenance = "Reinstall"	3
-ReadyToInstall	Back	NewDialog	DestinationFolder	NOT Installed	1
-ReadyToInstall	Cancel	SpawnDialog	CancelSetup	1	0
-ReadyToInstall	InstallNow	[ProgressType1]	Installing	1	0
-ReadyToInstall	InstallNow	[ProgressType2]	installed	1	0
-ReadyToInstall	InstallNow	[ProgressType3]	installs	1	0
-ReadyToInstall	InstallNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
-ReadyToInstall	InstallNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-ReadyToRemove	Back	NewDialog	MaintenanceType	1	0
-ReadyToRemove	Cancel	SpawnDialog	CancelSetup	1	0
-ReadyToRemove	RemoveNow	[ProgressType1]	Uninstalling	1	0
-ReadyToRemove	RemoveNow	[ProgressType2]	uninstalled	1	0
-ReadyToRemove	RemoveNow	[ProgressType3]	uninstalls	1	0
-ReadyToRemove	RemoveNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	2
-ReadyToRemove	RemoveNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	2
-ReadyToRemove	RemoveNow	Remove	ALL	1	1
-SetupCompleteError	Back	[Suspend]	{}	1	1
-SetupCompleteError	Back	EndDialog	Return	1	2
-SetupCompleteError	Cancel	[Suspend]	1	1	1
-SetupCompleteError	Cancel	EndDialog	Return	1	2
-SetupCompleteError	Finish	EndDialog	Exit	1	2
-SetupCompleteSuccess	OK	DoAction	CheckForProductUpdates	ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And NOT ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL"	4
-SetupCompleteSuccess	OK	DoAction	CheckForProductUpdatesOnReboot	ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL"	5
-SetupCompleteSuccess	OK	EndDialog	Exit	1	2
-SetupError	A	EndDialog	ErrorAbort	1	0
-SetupError	C	EndDialog	ErrorCancel	1	0
-SetupError	I	EndDialog	ErrorIgnore	1	0
-SetupError	N	EndDialog	ErrorNo	1	0
-SetupError	O	EndDialog	ErrorOk	1	0
-SetupError	R	EndDialog	ErrorRetry	1	0
-SetupError	Y	EndDialog	ErrorYes	1	0
-SetupInitialization	Cancel	SpawnDialog	CancelSetup	1	0
-SetupInterrupted	Back	[Suspend]	{}	1	1
-SetupInterrupted	Back	EndDialog	Exit	1	2
-SetupInterrupted	Cancel	[Suspend]	1	1	1
-SetupInterrupted	Cancel	EndDialog	Exit	1	2
-SetupInterrupted	Finish	EndDialog	Exit	1	2
-SetupProgress	Cancel	SpawnDialog	CancelSetup	1	0
-SetupResume	Cancel	SpawnDialog	CancelSetup	1	0
-SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
-SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-SetupType	Back	NewDialog	CustomerInformation	1	0
-SetupType	Cancel	SpawnDialog	CancelSetup	1	0
-SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
-SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	0
-SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
-SplashBitmap	Next	NewDialog	InstallWelcome	1	0
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
deleted file mode 100644
index 7af1c7b26..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
+++ /dev/null
@@ -1,10 +0,0 @@
-Action	Type	Source	Target
-s72	i2	S64	S255
-CustomAction	Action
-setAllUsersProfile2K	51	ALLUSERSPROFILE	[%ALLUSERSPROFILE]
-SetAllUsersProfileNT	51	ALLUSERSPROFILE	[%SystemRoot]\Profiles\All Users
-setUserProfileNT	51	USERPROFILE	[%USERPROFILE]
-SetARPInstallLocation	51	ARPINSTALLLOCATION	[INSTALLLOCATION]
-NewProductFound	19		OOO_CUSTOMACTION_1
-SameProductFound	19		OOO_CUSTOMACTION_2
-RunningOffice	19		OOO_CUSTOMACTION_4
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
deleted file mode 100644
index 100074c40..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt
+++ /dev/null
@@ -1,33 +0,0 @@
-Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control_Default	Control_Cancel
-s72	i2	i2	i2	i2	I4	L128	s50	S50	S50
-Dialog	Dialog
-AdminChangeFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	TailText	OK	Cancel
-AdminNetworkLocation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	InstallNow	InstallNow	Cancel
-AdminWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-CancelSetup	50	50	260	85	3	[ProductName] [Setup]	No	No	No
-CustomerInformation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	NameLabel	Next	Cancel
-CustomSetup	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	Tree	Next	Cancel
-CustomSetupTips	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-DatabaseFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-DestinationFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-DiskSpaceRequirements	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-FilesInUse	50	50	374	266	19	[ProductName] - [STR_INSTALLATION_WIZARD]	Retry	Retry	Exit
-FileTypeDialog	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	CheckBox1	Next	Cancel
-InstallChangeFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	TailText	OK	Cancel
-InstallWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-LicenseAgreement	50	50	374	266	2	[ProductName] - [STR_INSTALLATION_WIZARD]	Agree	Next	Cancel
-MaintenanceType	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RadioGroup	Next	Cancel
-MaintenanceWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-OutOfSpace	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Resume	Resume	Resume
-PatchWelcome	50	50	374	266	3	[ProductName] Patch - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-ReadyToInstall	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	InstallNow	InstallNow	Cancel
-ReadyToRemove	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RemoveNow	RemoveNow	Cancel
-SetupCompleteError	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Finish	Finish	Finish
-SetupCompleteSuccess	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-SetupError	50	10	270	110	65543	[ProductName] [STR_INSTALLATION_WIZARD]	ErrorText	O	C
-SetupInitialization	50	50	374	266	5	[ProductName] - [STR_INSTALLATION_WIZARD]	Cancel	Cancel	Cancel
-SetupInterrupted	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Finish	Finish	Finish
-SetupProgress	50	50	374	266	5	[ProductName] - [STR_INSTALLATION_WIZARD]	Cancel	Cancel	Cancel
-SetupResume	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-SetupType	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RadioGroup	Next	Cancel
-SplashBitmap	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Error.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Error.idt
deleted file mode 100644
index 9789d0cf5..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Error.idt
+++ /dev/null
@@ -1,133 +0,0 @@
-Error	Message
-i2	L0
-WINDOWSENCODINGTEMPLATE	Error	Error
-0	OOO_ERROR_1
-1	OOO_ERROR_2
-2	OOO_ERROR_3 
-4	OOO_ERROR_4 
-5	OOO_ERROR_5
-7	OOO_ERROR_6
-8	OOO_ERROR_7
-9	OOO_ERROR_8
-10	OOO_ERROR_9
-11	OOO_ERROR_10
-12	OOO_ERROR_11
-13	OOO_ERROR_12
-14	OOO_ERROR_13
-15	OOO_ERROR_14
-16	OOO_ERROR_15
-17	OOO_ERROR_16
-18	OOO_ERROR_17
-19	OOO_ERROR_18
-20	OOO_ERROR_19
-21	OOO_ERROR_20
-22	OOO_ERROR_21
-23	OOO_ERROR_22
-32	OOO_ERROR_23
-33	OOO_ERROR_24
-1101	OOO_ERROR_25
-1301	OOO_ERROR_26
-1302	OOO_ERROR_27
-1303	OOO_ERROR_28
-1304	OOO_ERROR_29
-1305	OOO_ERROR_30
-1306	OOO_ERROR_31.
-1307	OOO_ERROR_32
-1308	OOO_ERROR_33
-1309	OOO_ERROR_34
-1310	OOO_ERROR_35
-1311	OOO_ERROR_36
-1312	OOO_ERROR_37
-1313	OOO_ERROR_38
-1314	OOO_ERROR_39
-1315	OOO_ERROR_40
-1316	OOO_ERROR_41.
-1317	OOO_ERROR_42
-1318	OOO_ERROR_43
-1319	OOO_ERROR_44
-1320	OOO_ERROR_45
-1321	OOO_ERROR_46
-1322	OOO_ERROR_47
-1323	OOO_ERROR_48
-1324	OOO_ERROR_49
-1325	OOO_ERROR_50
-1326	OOO_ERROR_51
-1327	OOO_ERROR_52
-1328	OOO_ERROR_53
-1401	OOO_ERROR_54 
-1402	OOO_ERROR_55 
-1403	OOO_ERROR_56 
-1404	OOO_ERROR_57 
-1405	OOO_ERROR_58 
-1406	OOO_ERROR_59
-1407	OOO_ERROR_60
-1408	OOO_ERROR_61 
-1409	OOO_ERROR_62
-1410	OOO_ERROR_63
-1500	OOO_ERROR_64
-1501	OOO_ERROR_65
-1502	OOO_ERROR_66
-1503	OOO_ERROR_67
-1601	OOO_ERROR_68
-1602	OOO_ERROR_69
-1603	OOO_ERROR_70
-1604	OOO_ERROR_71
-1605	OOO_ERROR_72
-1606	OOO_ERROR_73
-1607	OOO_ERROR_74
-1608	OOO_ERROR_75
-1701	OOO_ERROR_76
-1702	OOO_ERROR_77
-1703	OOO_ERROR_78
-1704	OOO_ERROR_79
-1705	OOO_ERROR_80
-1706	OOO_ERROR_81
-1707	OOO_ERROR_82
-1708	OOO_ERROR_83
-1709	OOO_ERROR_84
-1710	OOO_ERROR_85
-1711	OOO_ERROR_86
-1712	OOO_ERROR_87
-1713	OOO_ERROR_88
-1714	OOO_ERROR_89
-1801	OOO_ERROR_90
-1802	OOO_ERROR_91
-1803	OOO_ERROR_92
-1804	OOO_ERROR_93
-1805	OOO_ERROR_94
-1806	OOO_ERROR_95
-1807	OOO_ERROR_96
-1901	OOO_ERROR_97
-1902	OOO_ERROR_98
-1903	OOO_ERROR_99
-1904	OOO_ERROR_100.
-1905	OOO_ERROR_101
-1906	OOO_ERROR_102
-1907	OOO_ERROR_103
-1908	OOO_ERROR_104
-1909	OOO_ERROR_105
-1910	OOO_ERROR_106
-1911	OOO_ERROR_107
-1912	OOO_ERROR_108
-1913	OOO_ERROR_109
-1914	OOO_ERROR_110
-1915	OOO_ERROR_111
-1916	OOO_ERROR_112
-1917	OOO_ERROR_113
-1918	OOO_ERROR_114
-1919	OOO_ERROR_115
-1920	OOO_ERROR_116
-1921	OOO_ERROR_117
-1922	OOO_ERROR_118
-1923	OOO_ERROR_119
-1924	OOO_ERROR_120
-1925	OOO_ERROR_121
-1926	OOO_ERROR_122
-1927	OOO_ERROR_123
-1928	OOO_ERROR_124
-1929	OOO_ERROR_125
-1930	OOO_ERROR_126
-1931	OOO_ERROR_127
-1932	OOO_ERROR_128
-1933	OOO_ERROR_129
-1934	OOO_ERROR_130
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/EventMap.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/EventMap.idt
deleted file mode 100644
index ae76b6af0..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/EventMap.idt
+++ /dev/null
@@ -1,19 +0,0 @@
-Dialog_	Control_	Event	Attribute
-s72	s50	s50	s50
-EventMapping	Dialog_	Control_	Event
-CustomSetup	ItemDescription	SelectionDescription	Text
-CustomSetup	Location	SelectionPath	Text
-CustomSetup	Next	SelectionPathOn	Enabled
-CustomSetup	Size	SelectionSize	Text
-SetupInitialization	ActionData	ActionData	Text
-SetupInitialization	ActionText	ActionText	Text
-SetupProgress	ActionProgress95	AdminInstallFinalize	Progress
-SetupProgress	ActionProgress95	InstallFiles	Progress
-SetupProgress	ActionProgress95	MoveFiles	Progress
-SetupProgress	ActionProgress95	RemoveFiles	Progress
-SetupProgress	ActionProgress95	RemoveRegistryValues	Progress
-SetupProgress	ActionProgress95	SetProgress	Progress
-SetupProgress	ActionProgress95	UnmoveFiles	Progress
-SetupProgress	ActionProgress95	WriteIniValues	Progress
-SetupProgress	ActionProgress95	WriteRegistryValues	Progress
-SetupProgress	ActionText	ActionText	Text
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
deleted file mode 100644
index 90ba9c6a6..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
+++ /dev/null
@@ -1,74 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-InstallExecuteSequence	Action
-AllocateRegistrySpace	NOT Installed	750
-AppSearch		25
-BindImage		2100
-CCPSearch	CCP_TEST	200
-CostFinalize		500
-CostInitialize		350
-CreateFolders		1850
-CreateShortcuts		2150
-DeleteServices	VersionNT	1000
-DuplicateFiles		2050
-FileCost		400
-FindRelatedProducts	NOT ISSETUPDRIVEN	100
-InstallFiles		1950
-InstallFinalize		3150
-InstallInitialize		700
-InstallODBC		2600
-InstallServices	VersionNT	2750
-InstallValidate		650
-IsolateComponents		450
-LaunchConditions		50
-MigrateFeatureStates		600
-MoveFiles		1900
-MsiPublishAssemblies		3025
-MsiUnpublishAssemblies		875
-NewProductFound	NEWPRODUCTS	110
-PatchFiles		2000
-ProcessComponents		800
-PublishComponents		3000
-PublishFeatures		3050
-PublishProduct		3100
-RegisterClassInfo		2200
-RegisterComPlus		2700
-RegisterExtensionInfo		2250
-RegisterFonts		2550
-RegisterMIMEInfo		2350
-RegisterProduct		2950
-RegisterProgIdInfo		2300
-RegisterTypeLibraries		2650
-RegisterUser		2900
-RemoveDuplicateFiles		1700
-RemoveEnvironmentStrings		1650
-RemoveExistingProducts		675
-RemoveFiles		1750
-RemoveFolders		1800
-RemoveIniValues		1550
-RemoveODBC		1200
-RemoveRegistryValues		1300
-RemoveShortcuts		1600
-RunningOffice	OFFICERUNS="1"	135
-RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	250
-SameProductFound	SAMEPRODUCTS	120
-ScheduleReboot	ISSCHEDULEREBOOT	3125
-SelfRegModules		2850
-SelfUnregModules		1100
-SetARPInstallLocation		990
-SetODBCFolders		550
-StartServices	VersionNT	2800
-StopServices	VersionNT	950
-UnpublishComponents		850
-UnpublishFeatures		900
-UnregisterClassInfo		1350
-UnregisterComPlus		1050
-UnregisterExtensionInfo		1400
-UnregisterFonts		1250
-UnregisterMIMEInfo		1500
-UnregisterProgIdInfo		1450
-UnregisterTypeLibraries		1150
-ValidateProductID		300
-WriteEnvironmentStrings		2500
-WriteIniValues		2450
-WriteRegistryValues		2400
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallU.idt
deleted file mode 100644
index 7b6bbd411..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallU.idt
+++ /dev/null
@@ -1,30 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-InstallUISequence	Action
-AppSearch		25
-CCPSearch	CCP_TEST	250
-CostFinalize		550
-CostInitialize		400
-ExecuteAction		850
-FileCost		450
-FindRelatedProducts		150
-InstallWelcome	Not Installed	650
-IsolateComponents		500
-LaunchConditions		50
-MaintenanceWelcome	Installed And Not RESUME And Not Preselected And Not PATCH	750
-MigrateFeatureStates		600
-NewProductFound	NEWPRODUCTS	160
-PatchWelcome	Installed And PATCH And Not IS_MAJOR_UPGRADE	625
-ResolveSource	Not Installed And Not PATCH	525
-RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	300
-SameProductFound	SAMEPRODUCTS	170
-setAllUsersProfile2K	VersionNT >= 500	512
-SetAllUsersProfileNT	VersionNT = 400	511
-SetupCompleteError		-3
-SetupCompleteSuccess		-1
-SetupInitialization		100
-SetupInterrupted		-2
-SetupProgress		800
-SetupResume	Installed And (RESUME Or Preselected) And Not PATCH	700
-setUserProfileNT	VersionNT	510
-ValidateProductID		350
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt
deleted file mode 100644
index 35d78694a..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/LaunchCo.idt
+++ /dev/null
@@ -1,4 +0,0 @@
-Condition	Description
-s255	l255
-WINDOWSENCODINGTEMPLATE	LaunchCondition	Condition
-Privileged	OOO_LAUNCH_1
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ListBox.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ListBox.idt
deleted file mode 100644
index e62653df9..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ListBox.idt
+++ /dev/null
@@ -1,3 +0,0 @@
-Property	Order	Value	Text
-s72	i2	s64	L64
-ListBox	Property	Order
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
deleted file mode 100644
index 0f3ed1e1b..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
+++ /dev/null
@@ -1,56 +0,0 @@
-Property	Value
-s72	l0
-WINDOWSENCODINGTEMPLATE	Property	Property
-_IsMaintenance	Reinstall
-_IsSetupTypeMin	Typical
-AgreeToLicense	No
-ApplicationUsers	AllUsers
-ALLUSERS	1
-ARPCOMMENTS	ARPCOMMENTSTEMPLATE
-ARPCONTACT	OOO_ARPCONTACTTEMPLATE
-ARPHELPLINK	OOO_ARPHELPLINKTEMPLATE
-ARPHELPTELEPHONE	OOO_ARPHELPTELEPHONETEMPLATE
-ARPURLINFOABOUT	OOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO	OOO_ARPURLUPDATEINFOTEMPLATE
-DefaultUIFont	Tahoma8
-DialogCaption	Windows Installer
-DiskPrompt	[1]
-Display_IsBitmapDlg	1
-DisplayNameCustom	IDPROP_SETUPTYPE_CUSTOM
-DisplayNameMinimal	IDPROP_SETUPTYPE_COMPACT
-DisplayNameTypical	IDPROP_SETUPTYPE_TYPICAL
-DWUSINTERVAL	30
-ErrorDialog	SetupError
-InstallChoice	AR
-INSTALLLEVEL	INSTALLLEVELTEMPLATE
-ISCHECKFORPRODUCTUPDATES	ISCHECKFORPRODUCTUPDATESTEMPLATE
-ISSCRIPT_VERSION_MISSING	IDS_ISSCRIPT_VERSION_MISSING
-ISSCRIPT_VERSION_OLD	IDS_ISSCRIPT_VERSION_OLD
-ISVROOT_PORT_NO	0
-Manufacturer	MANUFACTURERTEMPLATE
-OFFICERUNS	0
-PIDTemplate	12345<###-%%%%%%%>@@@@@
-ProductCode	PRODUCTCODETEMPLATE
-ProductID	none
-ProductLanguage	PRODUCTLANGUAGETEMPLATE
-ProductName	PRODUCTNAMETEMPLATE
-ProductVersion	PRODUCTVERSIONTEMPLATE
-ProgressType0	install
-ProgressType1	Installing
-ProgressType2	installed
-ProgressType3	installs
-RebootYesNo	Yes
-ReinstallModeText	omus
-SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
-SetupType	Typical
-STR_NEW_DISPLAY_NAME	OOO_STR_NEW_DISPLAY_NAME
-STR_EDIT	OOO_STR_EDIT
-STR_MS_WORD_DOCUMENT	OOO_STR_MS_WORD_DOCUMENT
-STR_MS_WORD_TEMPLATE	OOO_STR_MS_WORD_TEMPLATE
-STR_MS_EXCEL_WORKSHEET	OOO_STR_MS_EXCEL_WORKSHEET
-STR_MS_EXCEL_TEMPLATE	OOO_STR_MS_EXCEL_TEMPLATE
-STR_MS_POWERPOINT_PRESENTATION	OOO_STR_MS_POWERPOINT_PRESENTATION
-STR_MS_POWERPOINT_TEMPLATE	OOO_STR_MS_POWERPOINT_TEMPLATE
-STR_MS_POWERPOINT_SHOW	OOO_STR_MS_POWERPOINT_SHOW
-STR_INSTALLATION_WIZARD	OOO_STR_INSTALLATION_WIZARD
-UpgradeCode	UPGRADECODETEMPLATE
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/RadioBut.idt
deleted file mode 100644
index ddbf7e1cc..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/RadioBut.idt
+++ /dev/null
@@ -1,11 +0,0 @@
-Property	Order	Value	X	Y	Width	Height	Text	Help
-s72	i2	s64	i2	i2	i2	i2	L64	L50
-WINDOWSENCODINGTEMPLATE	RadioButton	Property	Order
-_IsMaintenance	1	Reinstall	0	0	290	14	OOO_RADIOBUTTON_2	
-_IsMaintenance	2	Remove	0	60	290	14	OOO_RADIOBUTTON_3	
-_IsSetupTypeMin	1	Typical	0	0	264	14	OOO_RADIOBUTTON_4	
-_IsSetupTypeMin	2	Custom	0	60	264	14	OOO_RADIOBUTTON_5	
-AgreeToLicense	1	No	0	15	295	15	OOO_RADIOBUTTON_6	
-AgreeToLicense	2	Yes	0	0	295	15	OOO_RADIOBUTTON_7	
-ApplicationUsers	1	AllUsers	1	7	290	14	OOO_RADIOBUTTON_8	
-ApplicationUsers	2	OnlyCurrentUser	1	23	290	14	OOO_RADIOBUTTON_9	
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/TextStyl.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/TextStyl.idt
deleted file mode 100644
index b4575c15d..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/TextStyl.idt
+++ /dev/null
@@ -1,25 +0,0 @@
-TextStyle	FaceName	Size	Color	StyleBits
-s72	s32	i2	I4	I2
-TextStyle	TextStyle
-Arial8	Arial	8		
-Arial9	Arial	9		
-ArialBlue10	Arial	10	16711680	
-ArialBlueStrike10	Arial	10	16711680	8
-CourierNew8	Courier New	8		
-CourierNew9	Courier New	9		
-MSGothic9	MS Gothic	9		
-MSSansBold8	Tahoma	8		1
-MSSansSerif8	MS Sans Serif	8		
-MSSansSerif9	MS Sans Serif	9		
-MSSGreySerif8	MS Sans Serif	8	8421504	
-MSSWhiteSerif8	Tahoma	8	16777215	
-Tahoma10	Tahoma	10		
-Tahoma8	Tahoma	8		
-Tahoma9	Tahoma	9		
-TahomaBold10	Tahoma	10		1
-TahomaBold8	Tahoma	8		1
-Times8	Times New Roman	8		
-Times9	Times New Roman	9		
-TimesItalic12	Times New Roman	12		2
-TimesItalicBlue10	Times New Roman	10	16711680	2
-TimesRed16	Times New Roman	16	255	
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/UIText.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/UIText.idt
deleted file mode 100644
index ea581bff4..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/UIText.idt
+++ /dev/null
@@ -1,53 +0,0 @@
-Key	Text
-s72	L255
-WINDOWSENCODINGTEMPLATE	UIText	Key
-AbsentPath	
-bytes	OOO_UITEXT_1
-GB	OOO_UITEXT_2
-KB	OOO_UITEXT_3
-MB	OOO_UITEXT_4
-MenuAbsent	OOO_UITEXT_5
-MenuAdvertise	OOO_UITEXT_6
-MenuAllCD	OOO_UITEXT_7
-MenuAllLocal	OOO_UITEXT_8
-MenuAllNetwork	OOO_UITEXT_9
-MenuCD	OOO_UITEXT_10
-MenuLocal	OOO_UITEXT_11
-MenuNetwork	OOO_UITEXT_12
-NewFolder	OOO_UITEXT_13
-SelAbsentAbsent	OOO_UITEXT_14
-SelAbsentAdvertise	OOO_UITEXT_15
-SelAbsentCD	OOO_UITEXT_16
-SelAbsentLocal	OOO_UITEXT_17
-SelAbsentNetwork	OOO_UITEXT_18
-SelAdvertiseAbsent	OOO_UITEXT_19
-SelAdvertiseAdvertise	OOO_UITEXT_20
-SelAdvertiseCD	OOO_UITEXT_21
-SelAdvertiseLocal	OOO_UITEXT_22
-SelAdvertiseNetwork	OOO_UITEXT_23
-SelCDAbsent	OOO_UITEXT_24
-SelCDAdvertise	OOO_UITEXT_25
-SelCDCD	OOO_UITEXT_26
-SelCDLocal	OOO_UITEXT_27
-SelChildCostNeg	OOO_UITEXT_28
-SelChildCostPos	OOO_UITEXT_29
-SelCostPending	OOO_UITEXT_30
-SelLocalAbsent	OOO_UITEXT_31
-SelLocalAdvertise	OOO_UITEXT_32
-SelLocalCD	OOO_UITEXT_33
-SelLocalLocal	OOO_UITEXT_34
-SelLocalNetwork	OOO_UITEXT_35
-SelNetworkAbsent	OOO_UITEXT_36
-SelNetworkAdvertise	OOO_UITEXT_37
-SelNetworkLocal	OOO_UITEXT_38
-SelNetworkNetwork	OOO_UITEXT_39
-SelParentCostNegNeg	OOO_UITEXT_40
-SelParentCostNegPos	OOO_UITEXT_41
-SelParentCostPosNeg	OOO_UITEXT_42
-SelParentCostPosPos	OOO_UITEXT_43
-TimeRemaining	OOO_UITEXT_44
-VolumeCostAvailable	OOO_UITEXT_45
-VolumeCostDifference	OOO_UITEXT_46
-VolumeCostRequired	OOO_UITEXT_47
-VolumeCostSize	OOO_UITEXT_48
-VolumeCostVolume	OOO_UITEXT_49
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt
deleted file mode 100644
index 4098f92c3..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt
+++ /dev/null
@@ -1,461 +0,0 @@
-Table	Column	Nullable	MinValue	MaxValue	KeyTable	KeyColumn	Category	Set	Description
-s32	s32	s4	I4	I4	S255	I2	S32	S255	S255
-_Validation	Table	Column
-_Validation	Category	Y						Text;Formatted;Template;Condition;Guid;Path;Version;Language;Identifier;Binary;UpperCase;LowerCase;Filename;Paths;AnyPath;WildCardFilename;RegPath;KeyFormatted;CustomSource;Property;Cabinet;Shortcut;URL	String category
-_Validation	Column	N					Identifier		Name of column
-_Validation	Description	Y					Text		Description of column
-_Validation	KeyColumn	Y	1	32					Column to which foreign key connects
-_Validation	KeyTable	Y					Identifier		For foreign key, Name of table to which data must link
-_Validation	MaxValue	Y	-2147483647	2147483647					Maximum value allowed
-_Validation	MinValue	Y	-2147483647	2147483647					Minimum value allowed
-_Validation	Nullable	N						Y;N	Whether the column is nullable
-_Validation	Set	Y					Text		Set of values that are permitted
-_Validation	Table	N					Identifier		Name of table
-ActionText	Action	N					Identifier		Name of action to be described.
-ActionText	Description	Y					Text		Localized description displayed in progress dialog and log when action is executing.
-ActionText	Template	Y					Template		Optional localized format template used to format action data records for display during action execution.
-AdminExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdminExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdminExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdminUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdminUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdminUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdvtExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdvtExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdvtExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdvtUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdvtUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdvtUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AppId	ActivateAtStorage	Y	0	1					
-AppId	AppId	N					Guid		
-AppId	DllSurrogate	Y					Text		
-AppId	LocalService	Y					Text		
-AppId	RemoteServerName	Y					Formatted		
-AppId	RunAsInteractiveUser	Y	0	1					
-AppId	ServiceParameters	Y					Text		
-AppSearch	Property	N					Identifier		The property associated with a Signature
-AppSearch	Signature_	N			Signature;RegLocator;IniLocator;DrLocator;CompLocator	1	Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables.
-BBControl	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this control.
-BBControl	BBControl	N					Identifier		Name of the control. This name must be unique within a billboard, but can repeat on different billboard.
-BBControl	Billboard_	N			Billboard	1	Identifier		External key to the Billboard table, name of the billboard.
-BBControl	Height	N	0	32767					Height of the bounding rectangle of the control.
-BBControl	Text	Y					Text		A string used to set the initial text contained within a control (if appropriate).
-BBControl	Type	N					Identifier		The type of the control.
-BBControl	Width	N	0	32767					Width of the bounding rectangle of the control.
-BBControl	X	N	0	32767					Horizontal coordinate of the upper left corner of the bounding rectangle of the control.
-BBControl	Y	N	0	32767					Vertical coordinate of the upper left corner of the bounding rectangle of the control.
-Billboard	Action	Y					Identifier		The name of an action. The billboard is displayed during the progress messages received from this action.
-Billboard	Billboard	N					Identifier		Name of the billboard.
-Billboard	Feature_	N			Feature	1	Identifier		An external key to the Feature Table. The billboard is shown only if this feature is being installed.
-Billboard	Ordering	Y	0	32767					A positive integer. If there is more than one billboard corresponding to an action they will be shown in the order defined by this column.
-Binary	Data	N					Binary		The unformatted binary data.
-Binary	Name	N					Identifier		Unique key identifying the binary data.
-BindImage	File_	N			File	1	Identifier		The index into the File table. This must be an executable file.
-BindImage	Path	Y					Paths		A list of ;  delimited paths that represent the paths to be searched for the import DLLS. The list is usually a list of properties each enclosed within square brackets [] .
-CCPSearch	Signature_	N			Signature;RegLocator;IniLocator;DrLocator;CompLocator	1	Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables.
-CheckBox	Property	N					Identifier		A named property to be tied to the item.
-CheckBox	Value	Y					Formatted		The value string associated with the item.
-Class	AppId_	Y			AppId	1	Guid		Optional AppID containing DCOM information for associated application (string GUID).
-Class	Argument	Y					Formatted		optional argument for LocalServers.
-Class	Attributes	Y		32767					Class registration attributes.
-Class	CLSID	N					Guid		The CLSID of an OLE factory.
-Class	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-Class	Context	N					Identifier		The numeric server context for this server. CLSCTX_xxxx
-Class	DefInprocHandler	Y					Filename	1;2;3	Optional default inproc handler.  Only optionally provided if Context=CLSCTX_LOCAL_SERVER.  Typically "ole32.dll" or "mapi32.dll"
-Class	Description	Y					Text		Localized description for the Class.
-Class	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational.
-Class	FileTypeMask	Y					Text		Optional string containing information for the HKCRthis CLSID) key. If multiple patterns exist, they must be delimited by a semicolon, and numeric subkeys will be generated: 0,1,2...
-Class	Icon_	Y			Icon	1	Identifier		Optional foreign key into the Icon Table, specifying the icon file associated with this CLSID. Will be written under the DefaultIcon key.
-Class	IconIndex	Y	-32767	32767					Optional icon index.
-Class	ProgId_Default	Y			ProgId	1	Text		Optional ProgId associated with this CLSID.
-ComboBox	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list.The integers do not have to be consecutive.
-ComboBox	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same combobox.
-ComboBox	Text	Y					Formatted		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ComboBox	Value	N					Formatted		The value string associated with this item. Selecting the line will set the associated property to this value.
-CompLocator	ComponentId	N					Guid		A string GUID unique to this component, version, and language.
-CompLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-CompLocator	Type	Y	0	1					A boolean value that determines if the registry value is a filename or a directory location.
-Complus	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the ComPlus component.
-Complus	ExpType	Y	0	32767					ComPlus component attributes.
-Component	Attributes	N							Remote execution option, one of irsEnum
-Component	Component	N					Identifier		Primary key used to identify a particular component record.
-Component	ComponentId	Y					Guid		A string GUID unique to this component, version, and language.
-Component	Condition	Y					Condition		A conditional statement that will disable this component if the specified condition evaluates to the 'True' state. If a component is disabled, it will not be installed, regardless of the 'Action' state associated with the component.
-Component	Directory_	N			Directory	1	Identifier		Required key of a Directory table record. This is actually a property name whose value contains the actual path, set either by the AppSearch action or with the default setting obtained from the Directory table.
-Component	KeyPath	Y			File;Registry;ODBCDataSource	1	Identifier		Either the primary key into the File table, Registry table, or ODBCDataSource table. This extract path is stored when the component is installed, and is used to detect the presence of the component and to return the path to it.
-Condition	Condition	Y					Condition		Expression evaluated to determine if Level in the Feature table is to change.
-Condition	Feature_	N			Feature	1	Identifier		Reference to a Feature entry in Feature table.
-Condition	Level	N	0	32767					New selection Level to set in Feature table if Condition evaluates to TRUE.
-Control	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this control.
-Control	Control	N					Identifier		Name of the control. This name must be unique within a dialog, but can repeat on different dialogs. 
-Control	Control_Next	Y			Control	2	Identifier		The name of an other control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!
-Control	Dialog_	N			Dialog	1	Identifier		External key to the Dialog table, name of the dialog.
-Control	Height	N	0	32767					Height of the bounding rectangle of the control.
-Control	Help	Y					Text		The help strings used with the button. The text is optional. 
-Control	Property	Y					Identifier		The name of a defined property to be linked to this control. 
-Control	Text	Y					Formatted		A string used to set the initial text contained within a control (if appropriate).
-Control	Type	N					Identifier		The type of the control.
-Control	Width	N	0	32767					Width of the bounding rectangle of the control.
-Control	X	N	0	32767					Horizontal coordinate of the upper left corner of the bounding rectangle of the control.
-Control	Y	N	0	32767					Vertical coordinate of the upper left corner of the bounding rectangle of the control.
-ControlCondition	Action	N						Default;Disable;Enable;Hide;Show	The desired action to be taken on the specified control.
-ControlCondition	Condition	N					Condition		A standard conditional statement that specifies under which conditions the action should be triggered.
-ControlCondition	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control.
-ControlCondition	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the dialog.
-ControlEvent	Argument	N					Formatted		A value to be used as a modifier when triggering a particular event.
-ControlEvent	Condition	Y					Condition		A standard conditional statement that specifies under which conditions an event should be triggered.
-ControlEvent	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control
-ControlEvent	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the dialog.
-ControlEvent	Event	N					Formatted		An identifier that specifies the type of the event that should take place when the user interacts with control specified by the first two entries.
-ControlEvent	Ordering	Y	0	2147483647					An integer used to order several events tied to the same control. Can be left blank.
-CreateFolder	Component_	N			Component	1	Identifier		Foreign key into the Component table.
-CreateFolder	Directory_	N			Directory	1	Identifier		Primary key, could be foreign key into the Directory table.
-CustomAction	Action	N					Identifier		Primary key, name of action, normally appears in sequence table unless private use.
-CustomAction	Source	Y					CustomSource		The table reference of the source of the code.
-CustomAction	Target	Y					Formatted		Excecution parameter, depends on the type of custom action
-CustomAction	Type	N	1	32767					The numeric custom action type, consisting of source location, code type, entry, option flags.
-Dialog	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this dialog.
-Dialog	Control_Cancel	Y			Control	2	Identifier		Defines the cancel control. Hitting escape or clicking on the close icon on the dialog is equivalent to pushing this button.
-Dialog	Control_Default	Y			Control	2	Identifier		Defines the default control. Hitting return is equivalent to pushing this button.
-Dialog	Control_First	N			Control	2	Identifier		Defines the control that has the focus when the dialog is created.
-Dialog	Dialog	N					Identifier		Name of the dialog.
-Dialog	HCentering	N	0	100					Horizontal position of the dialog on a 0-100 scale. 0 means left end, 100 means right end of the screen, 50 center.
-Dialog	Height	N	0	32767					Height of the bounding rectangle of the dialog.
-Dialog	Title	Y					Formatted		A text string specifying the title to be displayed in the title bar of the dialog's window.
-Dialog	VCentering	N	0	100					Vertical position of the dialog on a 0-100 scale. 0 means top end, 100 means bottom end of the screen, 50 center.
-Dialog	Width	N	0	32767					Width of the bounding rectangle of the dialog.
-Directory	DefaultDir	N					DefaultDir		The default sub-path under parent's path.
-Directory	Directory	N					Identifier		Unique identifier for directory entry, primary key. If a property by this name is defined, it contains the full path to the directory.
-Directory	Directory_Parent	Y			Directory	1	Identifier		Reference to the entry in this table specifying the default parent directory. A record parented to itself or with a Null parent represents a root of the install tree.
-DrLocator	Depth	Y	0	32767					The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0.
-DrLocator	Parent	Y					Identifier		The parent file signature. It is also a foreign key in the Signature table. If null and the Path column does not expand to a full path, then all the fixed drives of the user system are searched using the Path.
-DrLocator	Path	Y					AnyPath		The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.
-DrLocator	Signature_	N					Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-DuplicateFile	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the duplicate file.
-DuplicateFile	DestFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full pathname to a destination folder.
-DuplicateFile	DestName	Y					Filename		Filename to be given to the duplicate file.
-DuplicateFile	File_	N			File	1	Identifier		Foreign key referencing the source file to be duplicated.
-DuplicateFile	FileKey	N					Identifier		Primary key used to identify a particular file entry
-Environment	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the environmental value.
-Environment	Environment	N					Identifier		Unique identifier for the environmental variable setting
-Environment	Name	N					Text		The name of the environmental value.
-Environment	Value	Y					Formatted		The value to set in the environmental settings.
-Error	Error	N	0	32767					Integer error number, obtained from header file IError(...) macros.
-Error	Message	Y					Template		Error formatting template, obtained from user ed. or localizers.
-EventMapping	Attribute	N					Identifier		The name of the control attribute, that is set when this event is received.
-EventMapping	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control.
-EventMapping	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the Dialog.
-EventMapping	Event	N					Identifier		An identifier that specifies the type of the event that the control subscribes to.
-Extension	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-Extension	Extension	N					Text		The extension associated with the table row.
-Extension	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational.
-Extension	MIME_	Y			MIME	1	Text		Optional Context identifier, typically "type/format" associated with the extension
-Extension	ProgId_	Y			ProgId	1	Text		Optional ProgId associated with this extension.
-Feature	Attributes	N						0;1;2;4;5;6;8;9;10;16;17;18;20;21;22;24;25;26;32;33;34;36;37;38;48;49;50;52;53;54	Feature attributes
-Feature	Description	Y					Text		Longer descriptive text describing a visible feature item.
-Feature	Directory_	Y			Directory	1	UpperCase		The name of the Directory that can be configured by the UI. A non-null value will enable the browse button.
-Feature	Display	Y	0	32767					Numeric sort order, used to force a specific display ordering.
-Feature	Feature	N					Identifier		Primary key used to identify a particular feature record.
-Feature	Feature_Parent	Y			Feature	1	Identifier		Optional key of a parent record in the same table. If the parent is not selected, then the record will not be installed. Null indicates a root item.
-Feature	Level	N	0	32767					The install level at which record will be initially selected. An install level of 0 will disable an item and prevent its display.
-Feature	Title	Y					Text		Short text identifying a visible feature item.
-FeatureComponents	Component_	N			Component	1	Identifier		Foreign key into Component table.
-FeatureComponents	Feature_	N			Feature	1	Identifier		Foreign key into Feature table.
-File	Attributes	Y	0	32767					Integer containing bit flags representing file attributes (with the decimal value of each bit position in parentheses)
-File	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the file.
-File	File	N					Identifier		Primary key, non-localized token, must match identifier in cabinet.  For uncompressed files, this field is ignored.
-File	FileName	N					Filename		File name used for installation, may be localized.  This may contain a "short name|long name" pair.
-File	FileSize	N	0	2147483647					Size of file in bytes (long integer).
-File	Language	Y					Language		List of decimal language Ids, comma-separated if more than one.
-File	Sequence	N	1	2147483647					Sequence with respect to the media images; order must track cabinet order.
-File	Version	Y			File	1	Version		Version string for versioned files;  Blank for unversioned files.
-FileSFPCatalog	File_	N			File	1	Identifier		File associated with the catalog
-FileSFPCatalog	SFPCatalog_	N			SFPCatalog	1	Filename		Catalog associated with the file
-Font	File_	N			File	1	Identifier		Primary key, foreign key into File table referencing font file.
-Font	FontTitle	Y					Text		Font name.
-Icon	Data	N					Binary		Binary stream. The binary icon data in PE (.DLL or .EXE) or icon (.ICO) format.
-Icon	Name	N					Identifier		Primary key. Name of the icon file.
-IniFile	Action	N						0;1;3	The type of modification to be made, one of iifEnum
-IniFile	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the .INI value.
-IniFile	DirProperty	Y					Identifier		Foreign key into the Directory table denoting the directory where the .INI file is.
-IniFile	FileName	N					Filename		The .INI file name in which to write the information
-IniFile	IniFile	N					Identifier		Primary key, non-localized token.
-IniFile	Key	N					Formatted		The .INI file key below Section.
-IniFile	Section	N					Formatted		The .INI file Section.
-IniFile	Value	N					Formatted		The value to be written.
-IniLocator	Field	Y	0	32767					The field in the .INI line. If Field is null or 0 the entire line is read.
-IniLocator	FileName	N					Filename		The .INI file name.
-IniLocator	Key	N					Text		Key value (followed by an equals sign in INI file).
-IniLocator	Section	N					Text		Section name within in file (within square brackets in INI file).
-IniLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-IniLocator	Type	Y	0	2					An integer value that determines if the .INI value read is a filename or a directory location or to be used as is w/o interpretation.
-InstallExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-InstallExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-InstallExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-InstallUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-InstallUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-InstallUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-IsolatedComponent	Component_Application	N			Component	1	Identifier		Key to Component table item for application
-IsolatedComponent	Component_Shared	N			Component	1	Identifier		Key to Component table item to be isolated
-LaunchCondition	Condition	N					Condition		Expression which must evaluate to TRUE in order for install to commence.
-LaunchCondition	Description	N					Formatted		Localizable text to display when condition fails and install must abort.
-ListBox	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-ListBox	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same listbox.
-ListBox	Text	Y					Text		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ListBox	Value	N					Formatted		The value string associated with this item. Selecting the line will set the associated property to this value.
-ListView	Binary_	Y			Binary	1	Identifier		The name of the icon to be displayed with the icon. The binary information is looked up from the Binary Table.
-ListView	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-ListView	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same listview.
-ListView	Text	Y					Text		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ListView	Value	N					Identifier		The value string associated with this item. Selecting the line will set the associated property to this value.
-LockPermissions	Domain	Y					Formatted		Domain name for user whose permissions are being set. (usually a property)
-LockPermissions	LockObject	N					Identifier		Foreign key into Registry or File table
-LockPermissions	Permission	Y	-2147483647	2147483647					Permission Access mask.  Full Control = 268435456 (GENERIC_ALL = 0x10000000)
-LockPermissions	Table	N					Identifier	Directory;File;Registry	Reference to another table name
-LockPermissions	User	N					Formatted		User for permissions to be set.  (usually a property)
-Media	Cabinet	Y					Cabinet		If some or all of the files stored on the media are compressed in a cabinet, the name of that cabinet.
-Media	DiskId	N	1	32767					Primary key, integer to determine sort order for table.
-Media	DiskPrompt	Y					Text		Disk name: the visible text actually printed on the disk.  This will be used to prompt the user when this disk needs to be inserted.
-Media	LastSequence	N	0	32767					File sequence number for the last file for this media.
-Media	Source	Y					Property		The property defining the location of the cabinet file.
-Media	VolumeLabel	Y					Text		The label attributed to the volume.
-MIME	CLSID	Y					Guid		Optional associated CLSID.
-MIME	ContentType	N					Text		Primary key. Context identifier, typically "type/format".
-MIME	Extension_	N			Extension	1	Text		Optional associated extension (without dot)
-ModuleAdminExecuteSequence	Action	N					Identifier		Action to insert
-ModuleAdminExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdminExecuteSequence	BaseAction	Y			ModuleAdminExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleAdminExecuteSequence	Condition	Y					Condition		
-ModuleAdminExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdminUISequence	Action	N					Identifier		Action to insert
-ModuleAdminUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdminUISequence	BaseAction	Y			ModuleAdminUISequence	1	Identifier		Base action to determine insert location.
-ModuleAdminUISequence	Condition	Y					Condition		
-ModuleAdminUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdvtExecuteSequence	Action	N					Identifier		Action to insert
-ModuleAdvtExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdvtExecuteSequence	BaseAction	Y			ModuleAdvtExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleAdvtExecuteSequence	Condition	Y					Condition		
-ModuleAdvtExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdvtUISequence	Action	N					Identifier		Action to insert
-ModuleAdvtUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdvtUISequence	BaseAction	Y			ModuleAdvtUISequence	1	Identifier		Base action to determine insert location.
-ModuleAdvtUISequence	Condition	Y					Condition		
-ModuleAdvtUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleComponents	Component	N			Component	1	Identifier		Component contained in the module.
-ModuleComponents	Language	N			ModuleSignature	2			Default language ID for module (may be changed by transform).
-ModuleComponents	ModuleID	N			ModuleSignature	1	Identifier		Module containing the component.
-ModuleDependency	ModuleID	N			ModuleSignature	1	Identifier		Module requiring the dependency.
-ModuleDependency	ModuleLanguage	N			ModuleSignature	2			Language of module requiring the dependency.
-ModuleDependency	RequiredID	N							String.GUID of required module.
-ModuleDependency	RequiredLanguage	N							LanguageID of the required module.
-ModuleDependency	RequiredVersion	Y					Version		Version of the required version.
-ModuleExclusion	ExcludedID	N							String.GUID of excluded module.
-ModuleExclusion	ExcludedLanguage	N							Language of excluded module.
-ModuleExclusion	ExcludedMaxVersion	Y					Version		Maximum version of excluded module.
-ModuleExclusion	ExcludedMinVersion	Y					Version		Minimum version of excluded module.
-ModuleExclusion	ModuleID	N			ModuleSignature	1	Identifier		String.GUID of module with exclusion requirement.
-ModuleExclusion	ModuleLanguage	N			ModuleSignature	2			LanguageID of module with exclusion requirement.
-ModuleIgnoreTable	Table	N					Identifier		Table name to ignore during merge operation.
-ModuleInstallExecuteSequence	Action	N					Identifier		Action to insert
-ModuleInstallExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleInstallExecuteSequence	BaseAction	Y			ModuleInstallExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleInstallExecuteSequence	Condition	Y					Condition		
-ModuleInstallExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleInstallUISequence	Action	N					Identifier		Action to insert
-ModuleInstallUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleInstallUISequence	BaseAction	Y			ModuleInstallUISequence	1	Identifier		Base action to determine insert location.
-ModuleInstallUISequence	Condition	Y					Condition		
-ModuleInstallUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleSignature	Language	N							Default decimal language of module.
-ModuleSignature	ModuleID	N					Identifier		Module identifier (String.GUID).
-ModuleSignature	Version	N					Version		Version of the module.
-MoveFile	Component_	N			Component	1	Identifier		If this component is not "selected" for installation or removal, no action will be taken on the associated MoveFile entry
-MoveFile	DestFolder	N					Identifier		Name of a property whose value is assumed to resolve to the full path to the destination directory
-MoveFile	DestName	Y					Filename		Name to be given to the original file after it is moved or copied.  If blank, the destination file will be given the same name as the source file
-MoveFile	FileKey	N					Identifier		Primary key that uniquely identifies a particular MoveFile record
-MoveFile	Options	N	0	1					Integer value specifying the MoveFile operating mode, one of imfoEnum
-MoveFile	SourceFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full path to the source directory
-MoveFile	SourceName	Y					Text		Name of the source file(s) to be moved or copied.  Can contain the '*' or '?' wildcards.
-MsiAssembly	Attributes	Y							Assembly attributes
-MsiAssembly	Component_	N			Component	1	Identifier		Foreign key into Component table.
-MsiAssembly	Feature_	N			Feature	1	Identifier		Foreign key into Feature table.
-MsiAssembly	File_Application	Y			File	1	Identifier		Foreign key into File table, denoting the application context for private assemblies. Null for global assemblies.
-MsiAssembly	File_Manifest	Y			File	1	Identifier		Foreign key into the File table denoting the manifest file for the assembly.
-MsiAssemblyName	Component_	N			Component	1	Identifier		Foreign key into Component table.
-MsiAssemblyName	Name	N					Text		The name part of the name-value pairs for the assembly name.
-MsiAssemblyName	Value	N					Text		The value part of the name-value pairs for the assembly name.
-MsiDigitalCertificate	CertData	N					Binary		A certificate context blob for a signer certificate
-MsiDigitalCertificate	DigitalCertificate	N					Identifier		A unique identifier for the row
-MsiDigitalSignature	DigitalCertificate_	N			MsiDigitalCertificate	1	Identifier		Foreign key to MsiDigitalCertificate table identifying the signer certificate
-MsiDigitalSignature	Hash	Y					Binary		The encoded hash blob from the digital signature
-MsiDigitalSignature	SignObject	N					Text		Foreign key to Media table
-MsiDigitalSignature	Table	N						Media	Reference to another table name (only Media table is supported)
-MsiFileHash	File_	N			File	1	Identifier		Primary key, foreign key into File table referencing file with this hash
-MsiFileHash	HashPart1	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart2	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart3	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart4	N							Size of file in bytes (long integer).
-MsiFileHash	Options	N	0	32767					Various options and attributes for this hash.
-ODBCAttribute	Attribute	N					Text		Name of ODBC driver attribute
-ODBCAttribute	Driver_	N			ODBCDriver	1	Identifier		Reference to ODBC driver in ODBCDriver table
-ODBCAttribute	Value	Y					Text		Value for ODBC driver attribute
-ODBCDataSource	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCDataSource	DataSource	N					Identifier		Primary key, non-localized.internal token for data source
-ODBCDataSource	Description	N					Text		Text used as registered name for data source
-ODBCDataSource	DriverDescription	N					Text		Reference to driver description, may be existing driver
-ODBCDataSource	Registration	N	0	1					Registration option: 0=machine, 1=user, others t.b.d.
-ODBCDriver	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCDriver	Description	N					Text		Text used as registered name for driver, non-localized
-ODBCDriver	Driver	N					Identifier		Primary key, non-localized.internal token for driver
-ODBCDriver	File_	N			File	1	Identifier		Reference to key driver file
-ODBCDriver	File_Setup	Y			File	1	Identifier		Optional reference to key driver setup DLL
-ODBCSourceAttribute	Attribute	N					Text		Name of ODBC data source attribute
-ODBCSourceAttribute	DataSource_	N			ODBCDataSource	1	Identifier		Reference to ODBC data source in ODBCDataSource table
-ODBCSourceAttribute	Value	Y					Text		Value for ODBC data source attribute
-ODBCTranslator	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCTranslator	Description	N					Text		Text used as registered name for translator
-ODBCTranslator	File_	N			File	1	Identifier		Reference to key translator file
-ODBCTranslator	File_Setup	Y			File	1	Identifier		Optional reference to key translator setup DLL
-ODBCTranslator	Translator	N					Identifier		Primary key, non-localized.internal token for translator
-Patch	Attributes	N	0	32767					Integer containing bit flags representing patch attributes
-Patch	File_	N					Identifier		Primary key, non-localized token, foreign key to File table, must match identifier in cabinet.
-Patch	Header	Y					Binary		Binary stream. The patch header, used for patch validation.
-Patch	PatchSize	N	0	2147483647					Size of patch in bytes (long integer).
-Patch	Sequence	N	0	32767					Primary key, sequence with respect to the media images; order must track cabinet order.
-PatchPackage	Media_	N	0	32767					Foreign key to DiskId column of Media table. Indicates the disk containing the patch package.
-PatchPackage	PatchId	N					Guid		A unique string GUID representing this patch.
-ProgId	Class_	Y			Class	1	Guid		The CLSID of an OLE factory corresponding to the ProgId.
-ProgId	Description	Y					Text		Localized description for the Program identifier.
-ProgId	Icon_	Y			Icon	1	Identifier		Optional foreign key into the Icon Table, specifying the icon file associated with this ProgId. Will be written under the DefaultIcon key.
-ProgId	IconIndex	Y	-32767	32767					Optional icon index.
-ProgId	ProgId	N					Text		The Program Identifier. Primary key.
-ProgId	ProgId_Parent	Y			ProgId	1	Text		The Parent Program Identifier. If specified, the ProgId column becomes a version independent prog id.
-Property	Property	N					Identifier		Name of property, uppercase if settable by launcher or loader.
-Property	Value	N					Text		String value for property.  Never null or empty.
-PublishComponent	AppData	Y					Text		This is localisable Application specific data that can be associated with a Qualified Component.
-PublishComponent	Component_	N			Component	1	Identifier		Foreign key into the Component table.
-PublishComponent	ComponentId	N					Guid		A string GUID that represents the component id that will be requested by the alien product.
-PublishComponent	Feature_	N			Feature	1	Identifier		Foreign key into the Feature table.
-PublishComponent	Qualifier	N					Text		This is defined only when the ComponentId column is an Qualified Component Id. This is the Qualifier for ProvideComponentIndirect.
-RadioButton	Height	N	0	32767					The height of the button.
-RadioButton	Help	Y					Text		The help strings used with the button. The text is optional.
-RadioButton	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-RadioButton	Property	N					Identifier		A named property to be tied to this radio button. All the buttons tied to the same property become part of the same group.
-RadioButton	Text	Y					Text		The visible title to be assigned to the radio button.
-RadioButton	Value	N					Formatted		The value string associated with this button. Selecting the button will set the associated property to this value.
-RadioButton	Width	N	0	32767					The width of the button.
-RadioButton	X	N	0	32767					The horizontal coordinate of the upper left corner of the bounding rectangle of the radio button.
-RadioButton	Y	N	0	32767					The vertical coordinate of the upper left corner of the bounding rectangle of the radio button.
-Reg64	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
-Reg64	Key	N					RegPath		The key for the registry value.
-Reg64	Name	Y					Formatted		The registry value name.
-Reg64	Registry	N					Identifier		Primary key, non-localized token.
-Reg64	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
-Reg64	Value	Y					Formatted		The registry value.
-Registry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
-Registry	Key	N					RegPath		The key for the registry value.
-Registry	Name	Y					Formatted		The registry value name.
-Registry	Registry	N					Identifier		Primary key, non-localized token.
-Registry	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
-Registry	Value	Y					Formatted		The registry value.
-RegLocator	Key	N					RegPath		The key for the registry value.
-RegLocator	Name	Y					Formatted		The registry value name.
-RegLocator	Root	N	0	3					The predefined root key for the registry value, one of rrkEnum.
-RegLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table. If the type is 0, the registry values refers a directory, and _Signature is not a foreign key.
-RegLocator	Type	Y	0	18					An integer value that determines if the registry value is a filename or a directory location or to be used as is w/o interpretation.
-RemoveFile	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the file to be removed.
-RemoveFile	DirProperty	N					Identifier		Name of a property whose value is assumed to resolve to the full pathname to the folder of the file to be removed.
-RemoveFile	FileKey	N					Identifier		Primary key used to identify a particular file entry
-RemoveFile	FileName	Y					WildCardFilename		Name of the file to be removed.
-RemoveFile	InstallMode	N						1;2;3	Installation option, one of iimEnum.
-RemoveIniFile	Action	N						2;4	The type of modification to be made, one of iifEnum.
-RemoveIniFile	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the deletion of the .INI value.
-RemoveIniFile	DirProperty	Y					Identifier		Foreign key into the Directory table denoting the directory where the .INI file is.
-RemoveIniFile	FileName	N					Filename		The .INI file name in which to delete the information
-RemoveIniFile	Key	N					Formatted		The .INI file key below Section.
-RemoveIniFile	RemoveIniFile	N					Identifier		Primary key, non-localized token.
-RemoveIniFile	Section	N					Formatted		The .INI file Section.
-RemoveIniFile	Value	Y					Formatted		The value to be deleted. The value is required when Action is iifIniRemoveTag
-RemoveRegistry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the deletion of the registry value.
-RemoveRegistry	Key	N					RegPath		The key for the registry value.
-RemoveRegistry	Name	Y					Formatted		The registry value name.
-RemoveRegistry	RemoveRegistry	N					Identifier		Primary key, non-localized token.
-RemoveRegistry	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum
-ReserveCost	Component_	N			Component	1	Identifier		Reserve a specified amount of space if this component is to be installed.
-ReserveCost	ReserveFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full path to the destination directory
-ReserveCost	ReserveKey	N					Identifier		Primary key that uniquely identifies a particular ReserveCost record
-ReserveCost	ReserveLocal	N	0	2147483647					Disk space to reserve if linked component is installed locally.
-ReserveCost	ReserveSource	N	0	2147483647					Disk space to reserve if linked component is installed to run from the source location.
-SelfReg	Cost	Y	0	32767					The cost of registering the module.
-SelfReg	File_	N			File	1	Identifier		Foreign key into the File table denoting the module that needs to be registered.
-ServiceControl	Arguments	Y					Formatted		Arguments for the service.  Separate by [~].
-ServiceControl	Component_	N			Component	1	Identifier		Required foreign key into the Component Table that controls the startup of the service
-ServiceControl	Event	N	0	187					Bit field:  Install:  0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete
-ServiceControl	Name	N					Formatted		Name of a service. /, \, comma and space are invalid
-ServiceControl	ServiceControl	N					Identifier		Primary key, non-localized token.
-ServiceControl	Wait	Y	0	1					Boolean for whether to wait for the service to fully start
-ServiceInstall	Arguments	Y					Formatted		Arguments to include in every start of the service, passed to WinMain
-ServiceInstall	Component_	N			Component	1	Identifier		Required foreign key into the Component Table that controls the startup of the service
-ServiceInstall	Dependencies	Y					Formatted		Other services this depends on to start.  Separate by [~], and end with [~][~]
-ServiceInstall	Description	Y					Text		Description of service.
-ServiceInstall	DisplayName	Y					Formatted		External Name of the Service
-ServiceInstall	ErrorControl	N	-2147483647	2147483647					Severity of error if service fails to start
-ServiceInstall	LoadOrderGroup	Y					Formatted		LoadOrderGroup
-ServiceInstall	Name	N					Formatted		Internal Name of the Service
-ServiceInstall	Password	Y					Formatted		password to run service with.  (with StartName)
-ServiceInstall	ServiceInstall	N					Identifier		Primary key, non-localized token.
-ServiceInstall	ServiceType	N	-2147483647	2147483647					Type of the service
-ServiceInstall	StartName	Y					Formatted		User or object name to run service as
-ServiceInstall	StartType	N	0	4					Type of the service
-SFPCatalog	Catalog	N					Binary		SFP Catalog
-SFPCatalog	Dependency	Y					Formatted		Parent catalog - only used by SFP
-SFPCatalog	SFPCatalog	N					Filename		File name for the catalog.
-Shortcut	Arguments	Y					Formatted		The command-line arguments for the shortcut.
-Shortcut	Component_	N			Component	1	Identifier		Foreign key into the Component table denoting the component whose selection gates the the shortcut creation/deletion.
-Shortcut	Description	Y					Text		The description for the shortcut.
-Shortcut	Directory_	N			Directory	1	Identifier		Foreign key into the Directory table denoting the directory where the shortcut file is created.
-Shortcut	Hotkey	Y	0	32767					The hotkey for the shortcut. It has the virtual-key code for the key in the low-order byte, and the modifier flags in the high-order byte. 
-Shortcut	Icon_	Y			Icon	1	Identifier		Foreign key into the File table denoting the external icon file for the shortcut.
-Shortcut	IconIndex	Y	-32767	32767					The icon index for the shortcut.
-Shortcut	Name	N					Filename		The name of the shortcut to be created.
-Shortcut	Shortcut	N					Identifier		Primary key, non-localized token.
-Shortcut	ShowCmd	Y						1;3;7	The show command for the application window.The following values may be used.
-Shortcut	Target	N					Shortcut		The shortcut target. This is usually a property that is expanded to a file or a folder that the shortcut points to.
-Shortcut	WkDir	Y					Identifier		Name of property defining location of working directory.
-Signature	FileName	N					Filename		The name of the file. This may contain a "short name|long name" pair.
-Signature	Languages	Y					Language		The languages supported by the file.
-Signature	MaxDate	Y	0	2147483647					The maximum creation date of the file.
-Signature	MaxSize	Y	0	2147483647					The maximum size of the file. 
-Signature	MaxVersion	Y					Text		The maximum version of the file.
-Signature	MinDate	Y	0	2147483647					The minimum creation date of the file.
-Signature	MinSize	Y	0	2147483647					The minimum size of the file.
-Signature	MinVersion	Y					Text		The minimum version of the file.
-Signature	Signature	N					Identifier		The table key. The Signature represents a unique file signature.
-TextStyle	Color	Y	0	16777215					A long integer indicating the color of the string in the RGB format (Red, Green, Blue each 0-255, RGB = R + 256*G + 256^2*B).
-TextStyle	FaceName	N					Text		A string indicating the name of the font used. Required. The string must be at most 31 characters long.
-TextStyle	Size	N	0	32767					The size of the font used. This size is given in our units (1/12 of the system font height). Assuming that the system font is set to 12 point size, this is equivalent to the point size.
-TextStyle	StyleBits	Y	0	15					A combination of style bits.
-TextStyle	TextStyle	N					Identifier		Name of the style. The primary key of this table. This name is embedded in the texts to indicate a style change.
-TypeLib	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-TypeLib	Cost	Y	0	2147483647					The cost associated with the registration of the typelib. This column is currently optional.
-TypeLib	Description	Y					Text		
-TypeLib	Directory_	Y			Directory	1	Identifier		Optional. The foreign key into the Directory table denoting the path to the help file for the type library.
-TypeLib	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the type library to be operational.
-TypeLib	Language	N	0	32767					The language of the library.
-TypeLib	LibID	N					Guid		The GUID that represents the library.
-TypeLib	Version	Y	0	16777215					The version of the library. The minor version is in the lower 8 bits of the integer. The major version is in the next 16 bits. 
-UIText	Key	N					Identifier		A unique key that identifies the particular string.
-UIText	Text	Y					Text		The localized version of the string.
-Upgrade	ActionProperty	N					UpperCase		The property to set when a product in this set is found.
-Upgrade	Attributes	N	0	2147483647					The attributes of this product set.
-Upgrade	Language	Y					Language		A comma-separated list of languages for either products in this set or products not in this set.
-Upgrade	Remove	Y					Formatted		The list of features to remove when uninstalling a product from this set.  The default is "ALL".
-Upgrade	UpgradeCode	N					Guid		The UpgradeCode GUID belonging to the products in this set.
-Upgrade	VersionMax	Y					Text		The maximum ProductVersion of the products in this set.  The set may or may not include products with this particular version.
-Upgrade	VersionMin	Y					Text		The minimum ProductVersion of the products in this set.  The set may or may not include products with this particular version.
-Verb	Argument	Y					Formatted		Optional value for the command arguments.
-Verb	Command	Y					Formatted		The command text.
-Verb	Extension_	N			Extension	1	Text		The extension associated with the table row.
-Verb	Sequence	Y	0	32767					Order within the verbs for a particular extension. Also used simply to specify the default verb.
-Verb	Verb	N					Text		The verb for the command.
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt
deleted file mode 100644
index cc1c30329..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{1552EC17-8CE9-4E58-A009-991468B8E806}	# OOo UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt
deleted file mode 100644
index daf492715..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{D8B206B8-6822-48C2-A799-E35BFD585035}	# OOo UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
deleted file mode 100644
index b833e912a..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
+++ /dev/null
@@ -1,152 +0,0 @@
-[PRODUCTCODE]
-en-US = "{0F961BE5-98E8-408E-9F74-23CBA0523922}"
-pt = "{2C127D50-B7E4-46C3-A845-CF6684481024}"
-ru = "{8B523028-4AAC-4607-9711-667AA6C37D45}"
-el = "{F980E77E-21FD-40B8-BE66-8BC60284D24B}"
-nl = "{7FE69A49-6825-47E0-8179-72336E7B4250}"
-fr = "{3BB61EBF-5BC1-4E4D-859F-3ED5D92DD25E}"
-es = "{12A4616B-D51B-4013-964B-0ACCCA5E9AF2}"
-fi = "{89623507-9F44-44CF-BD4C-042F9E26F903}"
-hu = "{2246FA05-4B7A-499B-A19E-AA6599EA28D0}"
-ca = "{9810C5F8-C061-4D02-AD98-049452A5DC76}"
-it = "{2F78D54B-CE1D-4607-AA5B-D52114BDEBDB}"
-cs = "{781C904C-8768-4271-AA69-1A2CFA248002}"
-sk = "{A1D39E12-FF85-4619-BC69-001C55AD5B35}"
-en-GB = "{DD0CE074-E875-4428-991B-A9B3734701F9}"
-da = "{92CA37C8-B2E6-403F-932C-1A33E48BCD7E}"
-sv = "{942C29ED-A013-436E-861C-28271FD60AAE}"
-no = "{0EF3EE40-3690-472E-A693-5C9AE4FA7D5A}"
-pl = "{2A7F7A26-EF8B-4990-8836-688508886215}"
-de = "{5014304D-99B3-4451-8EB3-97D34658E4E7}"
-pt-BR = "{55837A64-5B73-4CDC-8950-AF56E09A7961}"
-th = "{2EEACF3C-C38E-4043-8B4D-33A461083348}"
-et = "{956362F1-C89B-4008-B15F-968BD4023F3F}"
-ja = "{01C118C0-57AB-4745-8D4C-5A34E6677E8D}"
-ko = "{B0DEE1A7-88FC-423B-AA1F-F51D94D02996}"
-zh-CN = "{0C596167-BA94-4D5A-B63B-6566FE06259A}"
-zh-TW = "{C31C87A1-5918-4178-8696-DDD36EDAEE99}"
-tr = "{467D9E65-2614-4D19-B40F-0B12FE6E472F}"
-hi = "{61B2E7EA-DC12-4A51-B152-2B95A4FC2ABF}"
-ar = "{FF72555B-A96D-49F8-8998-9359E9F9F7E1}"
-he = "{F59C6731-12DA-4A46-BE6D-30934E7CD763}"
-multiwestern = "{FA30E08E-DD61-4E47-B3D6-51B2814CA881}"
-multiasia = "{222033CB-A588-4302-9942-311F160B63B1}"
-
-[UPGRADECODE]
-af = "{07F4C39E-72F9-495A-A8DE-8B3691607EA7}"
-ar = "{4B19ECA4-EB7B-420E-A2F3-0D456CA1CA3F}"
-as-IN = "{8B39DB32-6AF6-461F-8289-50655601C8FE}"
-be = "{0EE4C97D-D8C7-441E-866A-CF277858E4E4}"
-bo = "{C8D912D8-AA2E-47E2-9FEF-62C6580FB93C}"
-bg = "{961EFB5A-0CA0-41E8-8C9C-CB3BA52B73EC}"
-br = "{D5D79970-08FA-4CCC-B465-76948149E141}"
-brx = "{13A1CCE8-A020-4F7D-84DE-2FC89E4F0086}"
-bn = "{C552DC5D-BAEE-4707-B090-5BC08E01162F}"
-bn-BD = "{37A07926-2192-4701-908A-D414D26CB864}"
-bn-IN = "{F82875DF-7BFC-4CF1-A7E7-85E5AAD90F07}"
-bs = "{9F84BC57-8E00-4C27-81AA-5CCB6280A98B}"
-by = "{195CFF07-2848-4F7A-9770-98D1419A37F8}"
-ca = "{63DF72A2-1F4E-456E-A4E1-26342034BC19}"
-cs = "{A0B8FD56-2D0D-4487-B999-19D32FCF5F56}"
-cy = "{40487026-D109-40C8-AE09-A5E4147815DE}"
-da = "{6221C926-E7C7-4122-A3E4-66285ACD0B79}"
-de = "{56F769C8-29D9-4DA0-AAC5-6165D0180483}"
-dgo = "{43E5D518-02EA-4C82-AAB5-98954C12109A}"
-dz = "{0E79A6B5-D088-4670-ACDF-E0081C9ABFAE}"
-el = "{1E5DDBF3-B05A-4E78-A496-332C8193F4C8}"
-en-GB = "{3EBBFCD8-8009-4D31-AA5E-C1BED7B17A61}"
-en-US = "{40C2DB8E-E9D6-4451-BE31-DAD1343EC3DF}"
-en-ZA = "{764FA135-A8CE-4C79-A5D7-0B413CC9E911}"
-eo = "{1955D5A5-375E-410F-B84F-9FDB4E6A05E5}"
-es = "{4F776850-4235-4E93-847F-C657E04A35AB}"
-et = "{026CD9C5-6B53-421B-89A9-A5933C3E4BA6}"
-eu = "{B343946D-65A4-418E-B594-AC7035FDA5C2}"
-fa = "{D17D8C22-9161-42BF-A4A3-31248273EFB8}"
-fi = "{B26D2BEF-C380-46DD-8206-DD014E51AE7E}"
-fr = "{D7B9854C-4B88-4AE6-9FF6-7CDD7E8CEB90}"
-ga = "{ADDC53E1-2AFC-4234-A4A2-253C19932351}"
-gd = "{122EB716-EA92-4294-ADFB-4EDCC350E9D9}"
-gl = "{56F49C99-23C1-44C6-8EE3-2DCE72391BF8}"
-gu = "{1B1246FD-B318-49D1-8B5D-9475F55DF033}"
-gu-IN = "{982DC803-C9C1-4D8E-9B9E-A42335A2092E}"
-he = "{363942BE-A51D-43CE-8F09-2D94DFFDBB2E}"
-hi = "{4FFECDE8-8121-43DC-81F7-9FB7C82F24F4}"
-hi-IN = "{DE6A446A-BEC4-450D-94BD-B393B9898E76}"
-hr = "{8BC12666-3F41-43C7-9530-05A5A69A269D}"
-hu = "{63C087E6-5AC1-4C87-B663-6CEC4BD57935}"
-is = "{AD579FC7-4AFF-46A6-A756-110EC862FD17}"
-it = "{E9FFB21F-C41B-4A4C-87D1-885D97FE4D4A}"
-ja = "{D5E8AF54-134D-4370-BEF6-62BD3049C516}"
-kid = "{4A5C3C73-4392-4399-A57C-B0056289FD32}"
-ky = "{7854115C-C451-4BCB-86AC-F2257E60373C}"
-ka = "{5793EE6E-74B2-4965-A790-0C33ACEF75F0}"
-kk = "{BB0063B5-BFFE-4BD8-9FB8-A4778B79E2BC}"
-km = "{D906DD83-52C5-4B45-A887-DABEED8A6936}"
-kn = "{6785479C-863D-4533-9D28-46984FD067BE}"
-ko = "{918E7DC4-5641-4FB6-8A98-F3C0CCDFCC2D}"
-kok = "{4FF53BC0-C0E8-45B0-B7ED-3DE12B7865D2}"
-ks = "{55C379A7-D00F-4174-9073-F08CEF7FA40B}"
-ku = "{3FF9E717-28E4-49E5-96F7-B7EAC7C3890C}"
-lo = "{25F500C7-E3CA-413A-BB45-F298420533CB}"
-lt = "{7D5B38B0-3E15-4F96-AFFE-F8E455CE666B}"
-lv = "{DAC92857-35AC-44E2-BB10-F2F91173128C}"
-mai = "{0DCE1B05-2A48-4485-8C7E-6FBB1003F0F7}"
-mk = "{97BD11C0-13A0-416D-AB9A-9128DBEF707A}"
-mn = "{646294EB-E2E7-4110-B3CF-06D82F2BEE6F}"
-mni = "{2E614D32-5AA3-4525-B2F2-BE6F995F529D}"
-ms = "{7278D44D-9673-4157-AC6F-839520312A42}"
-ml-IN = "{250DC1C1-630E-4AD3-B25B-F57E9CC66572}"
-mr-IN = "{50031E0A-6AA2-43BB-89A7-2341F75B5C91}"
-my = "{C4B4A0EF-3B09-4198-825E-7381653FCF13}"
-ne = "{B4F43785-36D1-4716-AFCF-894B1AF36C1D}"
-nb = "{95CDD114-AB99-47E9-A6CA-C50C7460B1DA}"
-nl = "{E25D3CC2-AC90-4861-9E9C-DA41B5DF8A03}"
-nn = "{8D2FABA5-79CD-4109-A274-DEE14E279233}"
-no = "{226856FB-734F-40FB-BDF3-7DCCA74BCA5E}"
-nr = "{73FB2891-79DB-4F4E-A2B6-EB4A07D2903A}"
-nso = "{BA8033C9-6C42-4D4D-8160-46B6A19C08F9}"
-om = "{AC220121-97DE-4D37-9554-8877DAF713E6}"
-oc = "{E1D22BDB-C23D-4849-88AF-9B05F6B396E1}"
-or-IN = "{A3382AC1-D71B-4C13-BF1C-99C0C9C085A6}"
-pap = "{7E56C1DB-94E0-4C55-8D71-C27B1F971DB5}"
-pa-IN = "{8984AB31-BED3-49EB-92DD-E163B17132B1}"
-pl = "{EF16C1BF-539B-4EEE-91E5-0D44C4B72840}"
-ps = "{030AFC27-901D-4DA7-B651-E4F3F4AEE708}"
-pt = "{EFBDEE97-65AB-4575-B117-976D2EE639D0}"
-pt-BR = "{8EE0FF44-307B-4FDC-85F1-EA178C788FA8}"
-ru = "{2CCF1EF8-A263-4B77-8BDD-92D66B30531F}"
-rw = "{D27E719E-A9E7-4204-92E8-1FE882264F27}"
-sat = "{86E940A4-BE79-4D7C-818F-AE0B190F8AF6}"
-sa-IN = "{1F95BC4C-67F2-42DF-B4C7-A40EF727624A}"
-si = "{49438D51-91A0-4E2C-8415-E48CF3C82DB4}"
-sc = "{03889A8E-008C-438D-A4F8-F220470C182E}"
-sd = "{DDDD2117-DF91-4F9F-B403-9010E9B1A45E}"
-sk = "{31812C7E-CD25-455E-BEDD-F7A5F1E3AA57}"
-sl = "{F4B8D208-4566-4C4D-AFA0-3D2729084555}"
-sh = "{930AEAB7-E847-474A-84FE-FE5C2BCD9CE3}"
-sr = "{8C45020E-085A-44F7-8E13-7B4A94C6925A}"
-ss = "{9F41FCB5-A63D-49C1-A69C-9CBBCE73518D}"
-st = "{00B8BCE0-A647-4DC8-8E58-3D1B4CFF3F0F}"
-sv = "{234E7342-71BD-4B78-946D-06531FD46FA7}"
-sw = "{86433EBB-25D9-41E0-8F56-3DCB9534E027}"
-sw-TZ = "{397132BF-8878-4AD0-8943-1894B41692A1}"
-te-IN = "{A9688928-501B-4435-94A2-3A046C1EF29D}"
-ti-ER = "{293095EC-889D-4426-AE8A-C2E96DE8C78D}"
-ta-IN = "{5A98005B-D78A-41D4-9B2B-FFE739FF6D1A}"
-th = "{58BEC02C-44C7-43D8-BD07-35A866E20AE7}"
-tn = "{DD26B7C9-F027-4AB3-8F98-E8EB4FBA9C89}"
-tr = "{AA132C49-A480-4B5D-AAD3-811362B60A42}"
-ts = "{4BAF4D75-1E1E-4B15-A288-B4527E3C7CEE}"
-tg = "{4175B9EA-56CA-4311-9F96-937EABCEA1C8}"
-ug = "{1D09B009-8003-44FB-B2E1-49387F1112B9}"
-ur-IN = "{A7F4EC06-A6DC-4847-A510-41D435614014}"
-uk = "{52E53AB3-FAE4-4025-9B6F-FA401C9B10AE}"
-uz = "{D551A1C1-AF36-4FE4-BEF4-9CA72267D70A}"
-ve = "{20CA0658-5768-4B9E-8E3B-D9DF58332739}"
-vi = "{67A6C9E2-C285-48E4-A620-40D905E8D3F8}"
-xh = "{BF5684DA-C18A-43CE-B21D-97A7A0FAA486}"
-zh-CN = "{47574572-9963-441B-8A42-0B1A61880608}"
-zh-TW = "{6800BE26-76E9-4280-A174-5A952A18E643}"
-zu = "{65BA1A0C-9D3F-49A2-8ABB-7437C50A0AC7}"
-multiwestern = "{5050975D-CA7F-4F15-A3F5-F0A80B37AC35}"
-multiasia = "{07E6F67B-2A5B-45D7-984D-773F76612B9C}"
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt
deleted file mode 100644
index 204c6082b..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-[PRODUCTCODE]
-en-US = "{7FFF1607-39C1-45D7-8D6A-DE97A3FE26A1}"
-pt = "{4BF466E8-7FF4-4422-9FCE-1F0AE3DA00EE}"
-ru = "{34A3166C-BF5E-4751-A52E-CA68C139F688}"
-el = "{614C96E4-DBB0-4EFF-A9BB-2744E75919EB}"
-nl = "{76ABABE4-11C3-4783-BA87-6E76EC58F4DB}"
-fr = "{A8D2F106-57BF-437A-85F2-6FDE96D5E923}"
-es = "{74E55CA0-5F61-4B3F-AFE9-C450C352177F}"
-fi = "{7B47880A-4C73-4052-B41E-9CFDDC09D9B2}"
-hu = "{797671B4-BC60-4171-9084-D97F87B15B99}"
-ca = "{EB478242-B1CC-402C-AAB0-B038446E1BC3}"
-it = "{ED45979C-7EE4-4D04-89C5-489DCEAD1009}"
-cs = "{8DDBA77B-86FB-4AFC-A9CE-7960585108E3}"
-sk = "{7664A926-AA39-4DB6-AE12-98B7305B708B}"
-en-GB = "{4B514E15-F8EB-457D-924E-0C4EA6C29FE5}"
-da = "{6321486D-351A-451F-9C23-FF334A4E41FA}"
-sv = "{76B88102-58E7-4F89-90B9-B21185AA45E5}"
-no = "{1E36FA46-AC57-47FB-94FE-EF7B32B9056C}"
-pl = "{A316E11D-7907-460E-8E64-DEEFCD0F929A}"
-de = "{A3BE065F-8E3B-46CA-946A-101A8E077D2B}"
-pt-BR = "{45B77400-62B3-4469-8B12-A0813B0FE13F}"
-th = "{C37B84EC-EB6B-4909-9866-D582A0E4B27D}"
-et = "{A4107B22-C84B-4783-B1AA-454A884144B7}"
-ja = "{F68C3D57-AB20-4106-B3F2-4A51E8F12D27}"
-ko = "{D6C21010-B224-4121-83BE-BCFD41E2780F}"
-zh-CN = "{D27CE6D1-50E5-4895-8CC0-5D1D25D882F9}"
-zh-TW = "{1203F697-9652-44B2-A806-3F13A53101AC}"
-tr = "{DB6EBF02-F0A5-44ED-AF5C-BF97E2C6570A}"
-hi = "{9BA2E02E-ACFA-4D4A-8F34-12E3F2BA29E5}"
-ar = "{5B8ADBF2-5377-44C7-8ADA-3A3AF516E401}"
-he = "{F893A538-DA46-4667-B580-84DFB3CD5336}"
-multiwestern = "{E954C6C0-1C6E-4BB6-B8F2-F655429E6D73}"
-multiasia = "{881B24EF-5676-481C-B1C4-49964E203329}"
-
-[UPGRADECODE]
-en-US = "{DB4A0242-FD72-41DA-87A2-5466AE05BE03}"
-pt = "{AA393994-0DBE-45A1-8393-BCA1927527F6}"
-ru = "{626BAA92-954C-4A6C-9AF3-F9C146FAEEAB}"
-el = "{B884FE02-C0B1-40A5-9A05-3D92923B10E8}"
-nl = "{83D4730E-7069-4ED8-8D2C-50E2878A84CF}"
-fr = "{2F7D3F37-6191-44BB-8C14-5A0F3D1CDC06}"
-es = "{FCBF48CD-EBE3-4B65-9A9F-C73399CE2BF4}"
-fi = "{CA1322F8-8213-401D-8501-2B70F8F944E0}"
-hu = "{A5FD8B52-2E09-45C5-A84B-67DA1DA8BD93}"
-ca = "{80DD06D1-ABEE-4E85-8C23-E1031FC024B0}"
-it = "{7CA64ED6-373D-4C92-8224-360F1451E828}"
-cs = "{C16BE41C-1534-47E2-9D6F-EE3F45EFB075}"
-sk = "{82ACA684-1BD8-4A22-AC70-5E9754047357}"
-en-GB = "{B2583886-6021-42B5-BB84-71D2C7D9B91E}"
-da = "{953E09D5-4C1E-483A-A792-DD6C9A51D4E9}"
-sv = "{B6DF5C8D-177F-47DE-A9F6-0C6E4FCDF668}"
-no = "{52CFD54B-A5AE-4296-A02C-806083B90FFF}"
-pl = "{9EB27D9C-891F-4B40-A1FA-176D72088860}"
-de = "{73531239-44BD-4EE8-81B1-7EA9A63E2BE1}"
-pt-BR = "{EB286FF5-8182-4F12-8B58-320DABC7472F}"
-th = "{3B67E9E0-7177-420E-AF69-B58A0B9D22D2}"
-et = "{6718E3FB-C936-4699-82C0-E59F45E30D99}"
-ja = "{EDD352F1-431A-4275-A658-C9A516290616}"
-ko = "{69BB5E59-48BC-4906-B700-7E76EAEB076C}"
-zh-CN = "{9D3F52D5-2464-4F4D-9F2A-281B85911F7B}"
-zh-TW = "{8D0A9A70-F424-4FE2-AC27-50F8A409C602}"
-tr = "{CF7A11FA-FE24-427F-979C-016A7E1B2E8E}"
-hi = "{0D1A91F3-4B2D-4893-A720-8795F1DA848B}"
-ar = "{20A9E4BF-6D89-4183-BE25-24C5F693B141}"
-he = "{CC37C202-D6B7-4821-9015-0A25EB4E6CD8}"
-multiwestern = "{B2269A43-2FC5-44AF-A0EE-D85CD2C6135C}"
-multiasia = "{3B4B8C3C-AC32-4644-B7C5-79836EBD6784}"
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
deleted file mode 100644
index 0564ebc4c..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
+++ /dev/null
@@ -1,152 +0,0 @@
-[PRODUCTCODE]
-en-US = "{0FA6115B-EB2C-4878-AE77-A6BB9BD95DE3}"
-pt = "{5908E447-DD83-466C-989A-4DD73EEB9E1C}"
-ru = "{A2FA035D-6AD1-4A42-8C94-514862DDF9F1}"
-el = "{ED03F985-453B-4C05-9D4F-5A5DABC5E383}"
-nl = "{3F832B47-935F-45D2-870F-59CBC55EBAF5}"
-fr = "{C96C5113-0A94-4D78-8B56-63335845A6DB}"
-es = "{00393DC6-C022-4013-85D6-7421431A1BBC}"
-fi = "{B2414CEC-4AF1-4943-88F8-C5011A860483}"
-hu = "{F09E48BA-14EE-44B2-9B28-2603A18CE1D6}"
-ca = "{A398A8FC-7E6B-45D0-9869-63D67B38AEEE}"
-it = "{38490E45-A1A0-47CC-971A-F0E4CD27E055}"
-cs = "{2288EAF3-AC96-4EE5-BEFB-1384DC1C4703}"
-sk = "{79B7F92B-168B-4E9D-8944-4AF49DEB0632}"
-en-GB = "{4840BF58-E8E1-4625-9F65-D7A6B26438C7}"
-da = "{DBF68601-B962-4B0F-8791-E91225E6AF4E}"
-sv = "{D9B02C11-188E-4471-8CD7-FB457264A752}"
-no = "{E5694849-306C-4771-8101-521F445918AD}"
-pl = "{C640D2B5-97E7-45C9-9FC6-7866BB6C8F5E}"
-de = "{5A5DE00E-D6F0-426E-A510-AFCD45564AFB}"
-pt-BR = "{A3FFB78D-681B-4EEE-B279-EA638040F82A}"
-th = "{4BFE4253-A149-49D1-ACFB-45B780DBE45B}"
-et = "{5A742EFB-07B8-42AB-A451-60BBE2461102}"
-ja = "{77A4C487-FD10-461F-9F0D-C4DF9FA79C86}"
-ko = "{59F981B5-1F49-4B5C-AC14-E7EA635C17F9}"
-zh-CN = "{7A31AF55-3974-46E2-B11D-FA6FDFE9576B}"
-zh-TW = "{9B4ABC89-CB93-4083-A529-7647D74EBB7D}"
-tr = "{B2D2C818-F752-428B-9F42-5093E525AD19}"
-hi = "{20765149-8D90-4BF2-9878-54C01A52AA2C}"
-ar = "{11EDE09B-CE84-4042-B40D-09F3A9CF7484}"
-he = "{CEDA775B-2A1E-45EE-8163-5A7223022389}"
-multiwestern = "{7964A534-4526-46AD-8A1B-71BAF6AFE746}"
-multiasia = "{180F666D-555D-4F90-A53E-DD861CD9D6F0}"
-
-[UPGRADECODE]
-af = "{E5ABA9DC-0B05-49C7-AE79-42621CF9273F}"
-ar = "{D6770BC4-9500-4BF9-8137-72AFD7F9366E}"
-as-IN = "{539E1B86-87BD-4E73-9B4D-5F3FC1ADA817}"
-be = "{375F00E6-C1ED-4131-A5C9-D21E34718781}"
-bo = "{0BADD0FD-13B3-4CAB-9ECD-860FBEB09E6C}"
-bg = "{6561C433-322A-4EED-B31C-D9CE0F70F182}"
-br = "{45188701-42C2-4217-BCC2-5FC4DE740FA1}"
-brx = "{B0123EF4-1590-4436-B8C7-45778BCC53C9}"
-bn = "{B7A54DFF-DDAE-4BB6-A355-FAF0D4E11952}"
-bn-BD = "{300DE45C-94AA-4DA2-9E83-A450DA8FB9AA}"
-bn-IN = "{22BA4E19-764F-4D37-8FF0-254DFE566E7E}"
-bs = "{944202C0-A80D-413E-A673-3E3CB5078FAB}"
-by = "{968FB518-842E-4807-8331-7E20E88A2C89}"
-ca = "{89196DBD-4B4D-45EA-89D5-5C57C69E5B16}"
-cs = "{A62880EF-F164-4037-BB2A-76FBE37D3BEB}"
-cy = "{07219764-70AF-4461-BF24-B89C8F48717F}"
-da = "{FFEE4E5F-196A-46A9-A99C-11966D5ECC35}"
-de = "{7D03B08A-2F82-4F22-8F2A-C045DFC13566}"
-dgo = "{71C0B453-FF1A-4C57-A52D-1322088D3D3F}"
-dz = "{5DF8F595-6890-45CD-BD85-234DD7FB5435}"
-el = "{5CF9A133-6C59-486F-BB16-BB7AB12826DA}"
-en-GB = "{965C704A-7328-4039-A865-914E6091BD38}"
-en-US = "{97F3F678-0371-457E-893C-EFD7447A7985}"
-en-ZA = "{4ACCB25D-FF84-473F-8AE5-472777DE15AD}"
-eo = "{785BAF17-30F1-482D-8419-C3186963A37B}"
-es = "{EAE42234-4244-443D-93D8-D99235A80E2D}"
-et = "{15FAC7D1-931C-462C-98ED-9151E5BA4E87}"
-eu = "{2F192244-3116-42E7-A382-656026BC47F4}"
-fa = "{F313287C-222D-4917-8266-FA9E2EE4F204}"
-fi = "{22635154-DAF3-4E3C-8280-07F208C1132A}"
-fr = "{DBE8EF0B-1BDE-4AFA-B6D1-EB6D39934388}"
-ga = "{4AAAD846-9721-496E-A2BF-2E761A00A163}"
-gd = "{4E63B45A-AE8A-4189-B74D-DEF23F8DB2D8}"
-gl = "{9D6DB52A-986C-4CE9-8494-3156AC40405E}"
-gu = "{601D42F5-C928-477A-8FF9-C13116BAF889}"
-gu-IN = "{ECF408BB-8554-4566-9230-083B3A61D5ED}"
-he = "{9EC0DEF1-601C-4775-9884-B22C347824E1}"
-hi = "{518E46AB-6372-4303-A0FD-40AE042D6898}"
-hi-IN = "{2E784EF5-2240-4940-ACAC-240860D5B0FF}"
-hr = "{7D881D43-F1AA-49CE-83E2-420990672098}"
-hu = "{1F70AB81-E96B-414C-AEE1-BD69BAF954CC}"
-is = "{27125E19-DCFE-402F-AB8C-82CD9F584D77}"
-it = "{6AFA47B1-9285-40CF-A98C-80F9F339A9EE}"
-ja = "{B7573A6E-083B-4E1D-8AFF-7003B5401971}"
-kid = "{E16377E5-4C78-4016-A355-8CE512DA85B4}"
-ky = "{18590BB8-8598-4781-BEDE-4BA660D7DCA3}"
-ka = "{6FBAFC4D-EBE8-4880-8644-E87698F5D169}"
-kk = "{CDDF1704-0468-4F47-B191-C5D44FF301DA}"
-km = "{4F24C267-C4D8-4A60-BEFB-415A4FC12C8B}"
-kn = "{3699C099-D492-4206-B4D8-EBAB427432D8}"
-ko = "{2501A052-8F1D-4A7F-B4DE-4CB851B1840A}"
-kok = "{FB347C9D-7A6E-494B-8FB0-DC6041A927EA}"
-ks = "{08E36D6D-6FED-45F0-A87E-D742F9161250}"
-ku = "{7A2CA172-09EB-4B2D-96D8-A370084757E1}"
-lo = "{31CE78E7-B3BB-48DF-9543-B2DF21F420A7}"
-lt = "{E6953E1E-674F-4890-A99B-CBCE09445C13}"
-lv = "{27B24D10-F706-4ABD-B1DA-08C569637759}"
-mai = "{826EEF83-3FC8-4245-9A8E-0F7CC9F47497}"
-mk = "{D2654ED2-5D65-4281-A118-09A3F25914B0}"
-mn = "{3355D11E-5906-4226-81FE-1413EA06E88B}"
-mni = "{DE13CC7E-1C6E-4CB9-864E-EA87162EFCB2}"
-ms = "{6C5A78EF-563A-4B86-A3FA-C6431AA92E98}"
-ml-IN = "{8047890F-2CD5-48D2-A73B-50DD2D06A9C8}"
-mr-IN = "{95BC02E6-5498-4879-AE16-FFCB9CABE1AE}"
-my = "{7002CA01-C610-411C-BD18-FE1E670C1F52}"
-ne = "{C89923C9-9061-42D4-B531-60498D929C06}"
-nb = "{1BED5361-E88F-4833-B707-B39901731676}"
-nl = "{49D204A8-21E6-48C6-9B29-B25AB3D6A137}"
-nn = "{23276245-2A01-444F-B878-4BB1B54638C3}"
-no = "{05134802-8C30-412A-89DD-CC662D1AB84F}"
-nr = "{B156D653-2AB4-4C57-A1A7-F8E50309356A}"
-nso = "{8226A004-F62B-45A0-85B0-042687103114}"
-om = "{B1A720C2-8B81-492F-8F78-7BC92147AD45}"
-oc = "{96392323-8828-42E5-86F4-3CBD2036A609}"
-or-IN = "{CF291629-172B-496B-8E86-017EB7392CFC}"
-pap = "{4ACBFC0D-A5B6-41FF-AAD1-9856CBDCF057}"
-pa-IN = "{DE14FDEF-E87A-4335-94B7-09D8FC30FE56}"
-pl = "{C3CFF998-06D1-48B0-925F-8B2CE21105F2}"
-ps = "{0C9FF6FF-3539-4C64-8068-E15FA08BA03D}"
-pt = "{7A5DEAF9-2687-447F-803D-594E0966A2E1}"
-pt-BR = "{4C644036-3E74-44A6-AE94-55D9E7F2C541}"
-ru = "{C1E77DC8-0C1C-4C2D-B67D-581E91C5BEDF}"
-rw = "{CF0171A7-E3C2-4120-AF79-90D426D61204}"
-sat = "{53951156-6BF5-416F-8CD2-E37A724A3779}"
-sa-IN = "{91B68ACD-6E12-4D96-822F-4715B87535CE}"
-si = "{43B0FA53-3B78-4920-B264-8D2DDF566B7C}"
-sc = "{D163A41F-FB45-4CC4-9644-4818953792EA}"
-sd = "{A6C60A32-84E3-4AB9-93DC-CBFFF437DD9B}"
-sk = "{E44612CD-1AC0-4D8B-9DBE-EFEAF5A2BC31}"
-sl = "{32DDC93C-0B62-42D9-9627-417CC947851A}"
-sh = "{5C7E8CBE-6D6D-4DAD-B8DC-D10F85A2B36B}"
-sr = "{65233590-D233-4A02-91C3-DF83D00AEDA7}"
-ss = "{E4C66A70-4597-4BD2-BDA3-25912A6FD81E}"
-st = "{E683C485-4034-4B51-8E4F-D389D1C87B5E}"
-sv = "{40FE345C-D3C7-48C4-8CC6-3B21845B9E2C}"
-sw = "{15829530-145E-4628-88EB-C2D1EF872A3E}"
-sw-TZ = "{BC988E86-1498-411C-978B-9EEA114602A2}"
-te-IN = "{3EA81EA3-0AD1-4833-8E27-C42455BA82DD}"
-ti-ER = "{1264E7B9-2286-4E43-8F95-E56DF0992E60}"
-ta-IN = "{A9DA9C7E-5DAE-419F-A213-A9BE4EFCE9B6}"
-th = "{148ACBA8-D6DA-4127-AB23-1787B0178278}"
-tn = "{2F8628DE-8765-475F-8265-3E535FBCE8B2}"
-tr = "{961A44B0-E927-4823-9BC6-C1E1B665DCC9}"
-ts = "{6D364115-17E5-4128-A46A-C48FFCDA7CAB}"
-tg = "{BF2D424E-87FE-4E79-B6BD-69ABB39925FF}"
-ug = "{AA212944-F6D4-4892-9FCF-F5AB00F48637}"
-ur-IN = "{DF853049-BFE4-4021-B072-4DA7128BC80B}"
-uk = "{AB349EA3-BBFD-444D-BB7F-E34B51D3C83F}"
-uz = "{E50DBC97-9AE2-4D8A-A8A5-9D3FAEE63D9A}"
-ve = "{CC948F7B-2223-4CF4-B6DA-589D091E2897}"
-vi = "{96E6D257-71C9-4E36-8BCF-01F3E60F42F1}"
-xh = "{0B4F6199-8EEE-45B0-B9B9-A80ECBEC5B8D}"
-zh-CN = "{85F565F6-4853-4AFD-8CF3-7A57201489C7}"
-zh-TW = "{115A4904-16B0-487F-846E-A27588FC28A2}"
-zu = "{D83DA940-56D9-4D11-AA20-8E70FD1C549A}"
-multiwestern = "{11F95BB5-D403-49A6-B704-C48C26783253}"
-multiiasia = "{6874DCF5-E0AC-464A-8002-BD48A76ADDF9}"
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/components.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/components.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/components.txt
+++ /dev/null
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ooo_patchcodes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ooo_patchcodes.txt
deleted file mode 100644
index 4831c3b21..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ooo_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{7C35B9AB-2CE3-4C18-BE7C-5B97EA089EB3}	# OOo UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ooodev_patchcodes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ooodev_patchcodes.txt
deleted file mode 100644
index cbc09ea89..000000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ooodev_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice Dev UpgradeCode
-
-{E54FAE36-AEA4-4964-B4BB-CE9D4CEB4B3E}	# OOo Dev UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
deleted file mode 100644
index fbd0a6982..000000000
--- a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-cat > /dev/null
-[[ "${OUTPATH}" == unxlngx* ]] && mark64="()(64bit)"
-if [[ "${OUTPATH}" == unxaig* ]]; then
-  echo "libgnomevfs-2.a(libgnomevfs-2.so.0${mark64})"
-  echo "libgconf-2.a(libgconf-2.so.4${mark64})"
-else
-  echo "libgnomevfs-2.so.0${mark64}"
-  echo "libgconf-2.so.4${mark64}"
-fi
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
deleted file mode 100644
index eab975ae4..000000000
--- a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-cat > /dev/null
-[[ "${OUTPATH}" == unxlngx* ]] && mark64="()(64bit)"
-if [[ "${OUTPATH}" == unxaig* ]]; then
-  echo "libfreetype.a(libfreetype.so.6${mark64})"
-else
-  echo "libfreetype.so.6${mark64}"
-fi
diff --git a/instsetoo_native/inc_openoffice/unix/makefile.mk b/instsetoo_native/inc_openoffice/unix/makefile.mk
deleted file mode 100644
index 3dec2ab1a..000000000
--- a/instsetoo_native/inc_openoffice/unix/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=instsetoo_native
-TARGET=find-requires
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-FINDREQUIRES = \
-    $(BIN)$/find-requires-gnome.sh \
-    $(BIN)$/find-requires-x11.sh
-    
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-.IF "$(RPM)" != ""
-
-ALLTAR : $(FINDREQUIRES)
-
-$(FINDREQUIRES) : $$(@:f)
-    @cat $(@:f) | tr -d "\015" > $@
-    @chmod a+x $@
-
-.ENDIF
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf
deleted file mode 100644
index e62f26c6e..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf
+++ /dev/null
@@ -1,373 +0,0 @@
-[OOO_ACTIONTEXT_1]
-en-US = "Advertising application"
-
-[OOO_ACTIONTEXT_2]
-en-US = "Allocating registry space"
-
-[OOO_ACTIONTEXT_3]
-en-US = "Free space: [1]"
-
-[OOO_ACTIONTEXT_4]
-en-US = "Searching for installed applications"
-
-[OOO_ACTIONTEXT_5]
-en-US = "Property: [1], Signature: [2]"
-
-[OOO_ACTIONTEXT_6]
-en-US = "Binding executables"
-
-[OOO_ACTIONTEXT_7]
-en-US = "File: [1]"
-
-[OOO_ACTIONTEXT_8]
-en-US = "Creating IIS Virtual Roots..."
-
-[OOO_ACTIONTEXT_9]
-en-US = "Removing IIS Virtual Roots..."
-
-[OOO_ACTIONTEXT_10]
-en-US = "Searching for qualifying products"
-
-[OOO_ACTIONTEXT_11]
-en-US = "Computing space requirements"
-
-[OOO_ACTIONTEXT_12]
-en-US = "Computing space requirements"
-
-[OOO_ACTIONTEXT_13]
-en-US = "Creating folders"
-
-[OOO_ACTIONTEXT_14]
-en-US = "Folder: [1]"
-
-[OOO_ACTIONTEXT_15]
-en-US = "Creating shortcuts"
-
-[OOO_ACTIONTEXT_16]
-en-US = "Shortcut: [1]"
-
-[OOO_ACTIONTEXT_17]
-en-US = "Deleting services"
-
-[OOO_ACTIONTEXT_18]
-en-US = "Service: [1]"
-
-[OOO_ACTIONTEXT_19]
-en-US = "Creating duplicate files"
-
-[OOO_ACTIONTEXT_20]
-en-US = "File: [1],  Directory: [9],  Size: [6]"
-
-[OOO_ACTIONTEXT_21]
-en-US = "Computing space requirements"
-
-[OOO_ACTIONTEXT_22]
-en-US = "Searching for related applications"
-
-[OOO_ACTIONTEXT_23]
-en-US = "Found application"
-
-[OOO_ACTIONTEXT_24]
-en-US = "Generating script operations for action:"
-
-[OOO_ACTIONTEXT_25]
-en-US = "[1]"
-
-[OOO_ACTIONTEXT_26]
-en-US = "Copying files to the network"
-
-[OOO_ACTIONTEXT_27]
-en-US = "File: [1], Directory: [9], Size: [6]"
-
-[OOO_ACTIONTEXT_28]
-en-US = "Copying new files"
-
-[OOO_ACTIONTEXT_29]
-en-US = "File: [1],  Directory: [9],  Size: [6]"
-
-[OOO_ACTIONTEXT_30]
-en-US = "Installing ODBC components"
-
-[OOO_ACTIONTEXT_31]
-en-US = "Installing new services"
-
-[OOO_ACTIONTEXT_32]
-en-US = "Service: [2]"
-
-[OOO_ACTIONTEXT_33]
-en-US = "Installing system catalog"
-
-[OOO_ACTIONTEXT_34]
-en-US = "File: [1],  Dependencies: [2]"
-
-[OOO_ACTIONTEXT_35]
-en-US = "Validating install"
-
-[OOO_ACTIONTEXT_36]
-en-US = "Evaluating launch conditions"
-
-[OOO_ACTIONTEXT_37]
-en-US = "Migrating feature states from related applications"
-
-[OOO_ACTIONTEXT_38]
-en-US = "Application: [1]"
-
-[OOO_ACTIONTEXT_39]
-en-US = "Moving files"
-
-[OOO_ACTIONTEXT_40]
-en-US = "File: [1],  Directory: [9],  Size: [6]"
-
-[OOO_ACTIONTEXT_41]
-en-US = "Patching files"
-
-[OOO_ACTIONTEXT_42]
-en-US = "File: [1],  Directory: [2],  Size: [3]"
-
-[OOO_ACTIONTEXT_43]
-en-US = "Updating component registration"
-
-[OOO_ACTIONTEXT_44]
-en-US = "Publishing qualified components"
-
-[OOO_ACTIONTEXT_45]
-en-US = "Component ID: [1], Qualifier: [2]"
-
-[OOO_ACTIONTEXT_46]
-en-US = "Publishing product features"
-
-[OOO_ACTIONTEXT_47]
-en-US = "Feature: [1]"
-
-[OOO_ACTIONTEXT_48]
-en-US = "Publishing product information"
-
-[OOO_ACTIONTEXT_49]
-en-US = "Registering class servers"
-
-[OOO_ACTIONTEXT_50]
-en-US = "Class ID: [1]"
-
-[OOO_ACTIONTEXT_51]
-en-US = "Registering COM+ Applications and Components"
-
-[OOO_ACTIONTEXT_52]
-en-US = "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}"
-
-[OOO_ACTIONTEXT_53]
-en-US = "Registering extension servers"
-
-[OOO_ACTIONTEXT_54]
-en-US = "Extension: [1]"
-
-[OOO_ACTIONTEXT_55]
-en-US = "Registering fonts"
-
-[OOO_ACTIONTEXT_56]
-en-US = "Font: [1]"
-
-[OOO_ACTIONTEXT_57]
-en-US = "Registering MIME info"
-
-[OOO_ACTIONTEXT_58]
-en-US = "MIME Content Type: [1], Extension: [2]"
-
-[OOO_ACTIONTEXT_59]
-en-US = "Registering product"
-
-[OOO_ACTIONTEXT_60]
-en-US = "[1]"
-
-[OOO_ACTIONTEXT_61]
-en-US = "Registering program identifiers"
-
-[OOO_ACTIONTEXT_62]
-en-US = "ProgID: [1]"
-
-[OOO_ACTIONTEXT_63]
-en-US = "Registering type libraries"
-
-[OOO_ACTIONTEXT_64]
-en-US = "LibID: [1]"
-
-[OOO_ACTIONTEXT_65]
-en-US = "Registering user"
-
-[OOO_ACTIONTEXT_66]
-en-US = "[1]"
-
-[OOO_ACTIONTEXT_67]
-en-US = "Removing duplicated files"
-
-[OOO_ACTIONTEXT_68]
-en-US = "File: [1], Directory: [9]"
-
-[OOO_ACTIONTEXT_69]
-en-US = "Updating environment strings"
-
-[OOO_ACTIONTEXT_70]
-en-US = "Name: [1], Value: [2], Action [3]"
-
-[OOO_ACTIONTEXT_71]
-en-US = "Removing applications"
-
-[OOO_ACTIONTEXT_72]
-en-US = "Application: [1], Command line: [2]"
-
-[OOO_ACTIONTEXT_73]
-en-US = "Removing files"
-
-[OOO_ACTIONTEXT_74]
-en-US = "File: [1], Directory: [9]"
-
-[OOO_ACTIONTEXT_75]
-en-US = "Removing folders"
-
-[OOO_ACTIONTEXT_76]
-en-US = "Folder: [1]"
-
-[OOO_ACTIONTEXT_77]
-en-US = "Removing INI file entries"
-
-[OOO_ACTIONTEXT_78]
-en-US = "File: [1],  Section: [2],  Key: [3], Value: [4]"
-
-[OOO_ACTIONTEXT_79]
-en-US = "Removing ODBC components"
-
-[OOO_ACTIONTEXT_80]
-en-US = "Removing system registry values"
-
-[OOO_ACTIONTEXT_81]
-en-US = "Key: [1], Name: [2]"
-
-[OOO_ACTIONTEXT_82]
-en-US = "Removing shortcuts"
-
-[OOO_ACTIONTEXT_83]
-en-US = "Shortcut: [1]"
-
-[OOO_ACTIONTEXT_84]
-en-US = "Searching for qualifying products"
-
-[OOO_ACTIONTEXT_85]
-en-US = "Rolling back action:"
-
-[OOO_ACTIONTEXT_86]
-en-US = "[1]"
-
-[OOO_ACTIONTEXT_87]
-en-US = "Removing backup files"
-
-[OOO_ACTIONTEXT_88]
-en-US = "File: [1]"
-
-[OOO_ACTIONTEXT_89]
-en-US = "Registering modules"
-
-[OOO_ACTIONTEXT_90]
-en-US = "File: [1], Folder: [2]"
-
-[OOO_ACTIONTEXT_91]
-en-US = "Unregistering modules"
-
-[OOO_ACTIONTEXT_92]
-en-US = "File: [1], Folder: [2]"
-
-[OOO_ACTIONTEXT_93]
-en-US = "Initializing ODBC directories"
-
-[OOO_ACTIONTEXT_94]
-en-US = "Starting services"
-
-[OOO_ACTIONTEXT_95]
-en-US = "Service: [1]"
-
-[OOO_ACTIONTEXT_96]
-en-US = "Stopping services"
-
-[OOO_ACTIONTEXT_97]
-en-US = "Service: [1]"
-
-[OOO_ACTIONTEXT_98]
-en-US = "Removing moved files"
-
-[OOO_ACTIONTEXT_99]
-en-US = "File: [1], Directory: [9]"
-
-[OOO_ACTIONTEXT_100]
-en-US = "Unpublishing Qualified Components"
-
-[OOO_ACTIONTEXT_101]
-en-US = "Component ID: [1], Qualifier: [2]"
-
-[OOO_ACTIONTEXT_102]
-en-US = "Unpublishing product features"
-
-[OOO_ACTIONTEXT_103]
-en-US = "Feature: [1]"
-
-[OOO_ACTIONTEXT_104]
-en-US = "Unpublishing product information"
-
-[OOO_ACTIONTEXT_105]
-en-US = "Unregister class servers"
-
-[OOO_ACTIONTEXT_106]
-en-US = "Class ID: [1]"
-
-[OOO_ACTIONTEXT_107]
-en-US = "Unregistering COM+ Applications and Components"
-
-[OOO_ACTIONTEXT_108]
-en-US = "AppId: [1]{{, AppType: [2]}}"
-
-[OOO_ACTIONTEXT_109]
-en-US = "Unregistering extension servers"
-
-[OOO_ACTIONTEXT_110]
-en-US = "Extension: [1]"
-
-[OOO_ACTIONTEXT_111]
-en-US = "Unregistering fonts"
-
-[OOO_ACTIONTEXT_112]
-en-US = "Font: [1]"
-
-[OOO_ACTIONTEXT_113]
-en-US = "Unregistering MIME info"
-
-[OOO_ACTIONTEXT_114]
-en-US = "MIME Content Type: [1], Extension: [2]"
-
-[OOO_ACTIONTEXT_115]
-en-US = "Unregistering program identifiers"
-
-[OOO_ACTIONTEXT_116]
-en-US = "ProgID: [1]"
-
-[OOO_ACTIONTEXT_117]
-en-US = "Unregistering type libraries"
-
-[OOO_ACTIONTEXT_118]
-en-US = "LibID: [1]"
-
-[OOO_ACTIONTEXT_119]
-en-US = "Updating environment strings"
-
-[OOO_ACTIONTEXT_120]
-en-US = "Name: [1], Value: [2], Action [3]"
-
-[OOO_ACTIONTEXT_121]
-en-US = "Writing INI file values"
-
-[OOO_ACTIONTEXT_122]
-en-US = "File: [1],  Section: [2],  Key: [3], Value: [4]"
-
-[OOO_ACTIONTEXT_123]
-en-US = "Writing system registry values"
-
-[OOO_ACTIONTEXT_124]
-en-US = "Key: [1], Name: [2], Value: [3]"
-
-
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
deleted file mode 100644
index aad2b7ee3..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ /dev/null
@@ -1,736 +0,0 @@
-[OOO_CONTROL_3]
-en-US = "Cancel"
-
-[OOO_CONTROL_5]
-en-US = "&Look in:"
-
-[OOO_CONTROL_6]
-en-US = "Browse to the destination folder."
-
-[OOO_CONTROL_7]
-en-US = "{&MSSansBold8}Change Current Destination Folder"
-
-[OOO_CONTROL_9]
-en-US = "Create new folder|"
-
-[OOO_CONTROL_10]
-en-US = "OK"
-
-[OOO_CONTROL_12]
-en-US = "&Folder name:"
-
-[OOO_CONTROL_13]
-en-US = "Up one level|"
-
-[OOO_CONTROL_14]
-en-US = "< &Back"
-
-[OOO_CONTROL_17]
-en-US = "&Change..."
-
-[OOO_CONTROL_18]
-en-US = "Cancel"
-
-[OOO_CONTROL_19]
-en-US = "Specify a network location for the server image of the product."
-
-[OOO_CONTROL_20]
-en-US = "Enter the network location or click Change to browse to a location.  Click Install to create a server image of [ProductName] at the specified network location or click Cancel to exit the wizard."
-
-[OOO_CONTROL_21]
-en-US = "{&MSSansBold8}Network Location"
-
-[OOO_CONTROL_22]
-en-US = "&Install"
-
-[OOO_CONTROL_23]
-en-US = "&Network location:"
-
-[OOO_CONTROL_24]
-en-US = "< &Back"
-
-[OOO_CONTROL_25]
-en-US = "Cancel"
-
-[OOO_CONTROL_26]
-en-US = "&Next >"
-
-[OOO_CONTROL_27]
-en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
-
-[OOO_CONTROL_28]
-en-US = "The Installation Wizard will create a server image of [ProductName] at a specified network location. To continue, click Next."
-
-[OOO_CONTROL_29]
-en-US = "&No"
-
-[OOO_CONTROL_30]
-en-US = "Are you sure you want to cancel [ProductName] installation?"
-
-[OOO_CONTROL_31]
-en-US = "&Yes"
-
-[OOO_CONTROL_32]
-en-US = "< &Back"
-
-[OOO_CONTROL_35]
-en-US = "Cancel"
-
-[OOO_CONTROL_36]
-en-US = "{\Tahoma8}{80}"
-
-[OOO_CONTROL_37]
-en-US = "&Organization:"
-
-[OOO_CONTROL_38]
-en-US = "Please enter your information."
-
-[OOO_CONTROL_39]
-en-US = "Install this application for:"
-
-[OOO_CONTROL_40]
-en-US = "{&MSSansBold8}Customer Information"
-
-[OOO_CONTROL_41]
-en-US = "{\Tahoma8}{50}"
-
-[OOO_CONTROL_42]
-en-US = "&User Name:"
-
-[OOO_CONTROL_43]
-en-US = "&Next >"
-
-[OOO_CONTROL_45]
-en-US = "&Serial Number:"
-
-[OOO_CONTROL_46]
-en-US = "< &Back"
-
-[OOO_CONTROL_49]
-en-US = "Cancel"
-
-[OOO_CONTROL_50]
-en-US = "&Change..."
-
-[OOO_CONTROL_51]
-en-US = "&Space"
-
-[OOO_CONTROL_52]
-en-US = "Select the program features you want installed."
-
-[OOO_CONTROL_53]
-en-US = "Click on an icon in the list below to change how a feature is installed."
-
-[OOO_CONTROL_54]
-en-US = "{&MSSansBold8}Custom Setup"
-
-[OOO_CONTROL_55]
-en-US = "Feature Description:"
-
-[OOO_CONTROL_56]
-en-US = "&Help"
-
-[OOO_CONTROL_57]
-en-US = "Install to:"
-
-[OOO_CONTROL_58]
-en-US = "Multiline description of the currently selected item"
-
-[OOO_CONTROL_59]
-en-US = "<selected feature path>"
-
-[OOO_CONTROL_60]
-en-US = "&Next >"
-
-[OOO_CONTROL_61]
-en-US = "Feature size"
-
-[OOO_CONTROL_64]
-en-US = "Custom Setup allows you to selectively install program features."
-
-[OOO_CONTROL_65]
-en-US = "{&MSSansBold8}Custom Setup Tips"
-
-[OOO_CONTROL_66]
-en-US = "Will not be installed."
-
-[OOO_CONTROL_67]
-en-US = "Will be installed on first use. (Available only if the feature supports this option.)"
-
-[OOO_CONTROL_68]
-en-US = "This install state means the feature..."
-
-[OOO_CONTROL_69]
-en-US = "Will be completely installed to the local hard drive."
-
-[OOO_CONTROL_70]
-en-US = "The icon next to the feature name indicates the install state of the feature. Click the icon to drop down the install state menu for each feature."
-
-[OOO_CONTROL_71]
-en-US = "Will be installed to run from the network. (Available only if the feature supports this option.)"
-
-[OOO_CONTROL_72]
-en-US = "OK"
-
-[OOO_CONTROL_73]
-en-US = "Will have some subfeatures installed to the local hard drive. (Available only if the feature has subfeatures.)"
-
-[OOO_CONTROL_74]
-en-US = "< &Back"
-
-[OOO_CONTROL_77]
-en-US = "Cancel"
-
-[OOO_CONTROL_78]
-en-US = "&Change..."
-
-[OOO_CONTROL_79]
-en-US = "Click Next to install to this folder, or click Change to install to a different folder."
-
-[OOO_CONTROL_80]
-en-US = "{&MSSansBold8}Database Folder"
-
-[OOO_CONTROL_81]
-en-US = "[DATABASEDIR]"
-
-[OOO_CONTROL_82]
-en-US = "Install [ProductName] database to:"
-
-[OOO_CONTROL_83]
-en-US = "&Next >"
-
-[OOO_CONTROL_84]
-en-US = "< &Back"
-
-[OOO_CONTROL_87]
-en-US = "Cancel"
-
-[OOO_CONTROL_88]
-en-US = "&Change..."
-
-[OOO_CONTROL_89]
-en-US = "Click Next to install to this folder, or click Change to install to a different folder."
-
-[OOO_CONTROL_90]
-en-US = "{&MSSansBold8}Destination Folder"
-
-[OOO_CONTROL_91]
-en-US = "[INSTALLDIR]"
-
-[OOO_CONTROL_92]
-en-US = "Install [ProductName] to:"
-
-[OOO_CONTROL_93]
-en-US = "&Next >"
-
-[OOO_CONTROL_96]
-en-US = "The disk space required for the installation of the selected features."
-
-[OOO_CONTROL_97]
-en-US = "The highlighted volumes do not have enough disk space available for the currently selected features. You can remove files from the highlighted volumes, choose to install less features onto local drives, or select different destination drives."
-
-[OOO_CONTROL_98]
-en-US = "{&MSSansBold8}Disk Space Requirements"
-
-[OOO_CONTROL_100]
-en-US = "OK"
-
-[OOO_CONTROL_103]
-en-US = "Some files that need to be updated are currently in use."
-
-[OOO_CONTROL_104]
-en-US = "The following applications are using files that need to be updated by this setup. Close these applications and click Retry to continue."
-
-[OOO_CONTROL_105]
-en-US = "{&MSSansBold8}Files in Use"
-
-[OOO_CONTROL_106]
-en-US = "&Exit"
-
-[OOO_CONTROL_107]
-en-US = "&Ignore"
-
-[OOO_CONTROL_108]
-en-US = "&Retry"
-
-[OOO_CONTROL_111]
-en-US = "Cancel"
-
-[OOO_CONTROL_113]
-en-US = "&Look in:"
-
-[OOO_CONTROL_114]
-en-US = "Browse to the destination folder."
-
-[OOO_CONTROL_115]
-en-US = "{&MSSansBold8}Change Current Destination Folder"
-
-[OOO_CONTROL_117]
-en-US = "Create New Folder|"
-
-[OOO_CONTROL_118]
-en-US = "OK"
-
-[OOO_CONTROL_120]
-en-US = "&Folder name:"
-
-[OOO_CONTROL_121]
-en-US = "Up One Level|"
-
-[OOO_CONTROL_122]
-en-US = "< &Back"
-
-[OOO_CONTROL_123]
-en-US = "Cancel"
-
-[OOO_CONTROL_124]
-en-US = "Build contributed in collaboration with the community by The Document Foundation. For credits, see: http://www.documentfoundation.org"
-
-[OOO_CONTROL_125]
-en-US = "&Next >"
-
-[OOO_CONTROL_126]
-en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
-
-[OOO_CONTROL_127]
-en-US = "The Installation Wizard will install [ProductName] on your computer. To continue, click Next."
-
-[OOO_CONTROL_128]
-en-US = "< &Back"
-
-[OOO_CONTROL_131]
-en-US = "Cancel"
-
-[OOO_CONTROL_132]
-en-US = "Please read the following license agreement carefully."
-
-[OOO_CONTROL_133]
-en-US = "{&MSSansBold8}License Agreement"
-
-[OOO_CONTROL_134]
-en-US = "&Next >"
-
-[OOO_CONTROL_135]
-en-US = "< &Back"
-
-[OOO_CONTROL_138]
-en-US = "Cancel"
-
-[OOO_CONTROL_139]
-en-US = "Modify, repair, or remove the program."
-
-[OOO_CONTROL_140]
-en-US = "{&MSSansBold8}Program Maintenance"
-
-[OOO_CONTROL_141]
-en-US = "&Next >"
-
-[OOO_CONTROL_143]
-en-US = "Change which program features are installed. This option displays the Custom Selection dialog in which you can change the way features are installed."
-
-[OOO_CONTROL_144]
-en-US = "Repair installation errors in the program. This option fixes missing or corrupt files, shortcuts, and registry entries."
-
-[OOO_CONTROL_145]
-en-US = "Remove [ProductName] from your computer."
-
-[OOO_CONTROL_146]
-en-US = "< &Back"
-
-[OOO_CONTROL_147]
-en-US = "Cancel"
-
-[OOO_CONTROL_148]
-en-US = "&Next >"
-
-[OOO_CONTROL_149]
-en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
-
-[OOO_CONTROL_150]
-en-US = "The Installation Wizard will allow you to modify, repair, or remove [ProductName]. To continue, click Next."
-
-[OOO_CONTROL_153]
-en-US = "Disk space required for the installation exceeds available disk space."
-
-[OOO_CONTROL_154]
-en-US = "The highlighted volumes do not have enough disk space available for the currently selected features. You can remove files from the highlighted volumes, choose to install less features onto local drives, or select different destination drives."
-
-[OOO_CONTROL_155]
-en-US = "{&MSSansBold8}Out of Disk Space"
-
-[OOO_CONTROL_156]
-en-US = "{120}{70}{70}{70}{70}"
-
-[OOO_CONTROL_157]
-en-US = "OK"
-
-[OOO_CONTROL_158]
-en-US = "< &Back"
-
-[OOO_CONTROL_159]
-en-US = "Cancel"
-
-[OOO_CONTROL_160]
-en-US = "&Update >"
-
-[OOO_CONTROL_161]
-en-US = "{&TahomaBold10}Welcome to the Patch for [ProductName]"
-
-[OOO_CONTROL_162]
-en-US = "The Installation Wizard will install the Patch for [ProductName] on your computer.  To continue, click Update."
-
-[OOO_CONTROL_163]
-en-US = "< &Back"
-
-[OOO_CONTROL_166]
-en-US = "Cancel"
-
-[OOO_CONTROL_167]
-en-US = "The wizard is ready to begin installation."
-
-[OOO_CONTROL_168]
-en-US = "Click Install to begin the installation."
-
-[OOO_CONTROL_169]
-en-US = "If you want to review or change any of your installation settings, click Back. Click Cancel to exit the wizard."
-
-[OOO_CONTROL_170]
-en-US = "{&MSSansBold8}Ready to Modify the Program"
-
-[OOO_CONTROL_171]
-en-US = "{&MSSansBold8}Ready to Repair the Program"
-
-[OOO_CONTROL_172]
-en-US = "{&MSSansBold8}Ready to Install the Program"
-
-[OOO_CONTROL_173]
-en-US = "&Install"
-
-[OOO_CONTROL_174]
-en-US = "< &Back"
-
-[OOO_CONTROL_177]
-en-US = "Cancel"
-
-[OOO_CONTROL_178]
-en-US = "You have chosen to remove the program from your system."
-
-[OOO_CONTROL_179]
-en-US = "Click Remove to remove [ProductName] from your computer. After removal, this program will no longer be available for use."
-
-[OOO_CONTROL_180]
-en-US = "If you want to review or change any settings, click Back."
-
-[OOO_CONTROL_181]
-en-US = "{&MSSansBold8}Remove the Program"
-
-[OOO_CONTROL_182]
-en-US = "&Remove"
-
-[OOO_CONTROL_183]
-en-US = "< &Back"
-
-[OOO_CONTROL_184]
-en-US = "Cancel"
-
-[OOO_CONTROL_185]
-en-US = "&Finish"
-
-[OOO_CONTROL_186]
-en-US = "Your system has not been modified. To complete installation at another time, please run setup again."
-
-[OOO_CONTROL_187]
-en-US = "Click Finish to exit the wizard."
-
-[OOO_CONTROL_188]
-en-US = "You can either keep any existing installed elements on your system to continue this installation at a later time or you can restore your system to its original state prior to the installation."
-
-[OOO_CONTROL_189]
-en-US = "Click Restore or Continue Later to exit the wizard."
-
-[OOO_CONTROL_190]
-en-US = "{&TahomaBold10}Installation Wizard Completed"
-
-[OOO_CONTROL_191]
-en-US = "The wizard was interrupted before [ProductName] could be completely installed."
-
-[OOO_CONTROL_192]
-en-US = "< &Back"
-
-[OOO_CONTROL_193]
-en-US = "Cancel"
-
-[OOO_CONTROL_194]
-en-US = "&Yes, check for program updates (Recommended) after the setup completes."
-
-[OOO_CONTROL_195]
-en-US = "Launch the program"
-
-[OOO_CONTROL_196]
-en-US = "Show the readme file"
-
-[OOO_CONTROL_197]
-en-US = "&Finish"
-
-[OOO_CONTROL_198]
-en-US = "{&TahomaBold10}Installation Wizard Completed"
-
-[OOO_CONTROL_199]
-en-US = "The Installation Wizard has successfully installed [ProductName]. Click Finish to exit the wizard."
-
-[OOO_CONTROL_200]
-en-US = "The Installation Wizard has successfully uninstalled [ProductName]. Click Finish to exit the wizard."
-
-[OOO_CONTROL_201]
-en-US = "Setup has finished installing [ProductName]."
-
-[OOO_CONTROL_202]
-en-US = "Some program files might have been updated since you purchased your copy of [ProductName]."
-
-[OOO_CONTROL_203]
-en-US = "Your Internet connection can be used to make sure that you have the latest updates."
-
-[OOO_CONTROL_204]
-en-US = "&Abort"
-
-[OOO_CONTROL_205]
-en-US = "&Cancel"
-
-[OOO_CONTROL_206]
-en-US = "error text goes here  error text goes here  error text goes here  error text goes here  error text goes here  error text goes here  error text goes here  error text goes here  error text goes here  error text goes here"
-
-[OOO_CONTROL_207]
-en-US = "&Ignore"
-
-[OOO_CONTROL_208]
-en-US = "&No"
-
-[OOO_CONTROL_209]
-en-US = "&OK"
-
-[OOO_CONTROL_210]
-en-US = "&Retry"
-
-[OOO_CONTROL_211]
-en-US = "&Yes"
-
-[OOO_CONTROL_214]
-en-US = "< &Back"
-
-[OOO_CONTROL_215]
-en-US = "Cancel"
-
-[OOO_CONTROL_216]
-en-US = "&Next >"
-
-[OOO_CONTROL_217]
-en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
-
-[OOO_CONTROL_218]
-en-US = "[ProductName] Setup is preparing the Installation Wizard which will guide you through the program setup process.  Please wait."
-
-[OOO_CONTROL_219]
-en-US = "< &Back"
-
-[OOO_CONTROL_220]
-en-US = "Cancel"
-
-[OOO_CONTROL_221]
-en-US = "&Finish"
-
-[OOO_CONTROL_222]
-en-US = "Your system has not been modified. To install this program at a later time, please run the installation again."
-
-[OOO_CONTROL_223]
-en-US = "Click Finish to exit the wizard."
-
-[OOO_CONTROL_224]
-en-US = "You can either keep any existing installed elements on your system to continue this installation at a later time or you can restore your system to its original state prior to the installation."
-
-[OOO_CONTROL_225]
-en-US = "Click Restore or Continue Later to exit the wizard."
-
-[OOO_CONTROL_226]
-en-US = "{&TahomaBold10}Installation Wizard Completed"
-
-[OOO_CONTROL_227]
-en-US = "The wizard was interrupted before [ProductName] could be completely installed."
-
-[OOO_CONTROL_228]
-en-US = "Progress done"
-
-[OOO_CONTROL_230]
-en-US = "< &Back"
-
-[OOO_CONTROL_233]
-en-US = "Cancel"
-
-[OOO_CONTROL_234]
-en-US = "The program features you selected are being installed."
-
-[OOO_CONTROL_235]
-en-US = "The program features you selected are being uninstalled."
-
-[OOO_CONTROL_236]
-en-US = "Please wait while the Installation Wizard installs [ProductName]. This may take several minutes."
-
-[OOO_CONTROL_237]
-en-US = "Please wait while the Installation Wizard uninstalls [ProductName]. This may take several minutes."
-
-[OOO_CONTROL_238]
-en-US = "{&MSSansBold8}Installing [ProductName]"
-
-[OOO_CONTROL_239]
-en-US = "{&MSSansBold8}Uninstalling [ProductName]"
-
-[OOO_CONTROL_240]
-en-US = "Sec."
-
-[OOO_CONTROL_241]
-en-US = "Status:"
-
-[OOO_CONTROL_242]
-en-US = "&Next >"
-
-[OOO_CONTROL_244]
-en-US = "Estimated time remaining:"
-
-[OOO_CONTROL_245]
-en-US = "< &Back"
-
-[OOO_CONTROL_246]
-en-US = "Cancel"
-
-[OOO_CONTROL_247]
-en-US = "&Next >"
-
-[OOO_CONTROL_248]
-en-US = "The Installation Wizard will complete the installation of [ProductName] on your computer. To continue, click Next."
-
-[OOO_CONTROL_249]
-en-US = "The Installation Wizard will complete the suspended installation of [ProductName] on your computer. To continue, click Next."
-
-[OOO_CONTROL_250]
-en-US = "{&TahomaBold10}Resuming the Installation Wizard for [ProductName]"
-
-[OOO_CONTROL_251]
-en-US = "< &Back"
-
-[OOO_CONTROL_254]
-en-US = "Cancel"
-
-[OOO_CONTROL_255]
-en-US = "The main components will be installed. Recommended for most users."
-
-[OOO_CONTROL_256]
-en-US = "Choose which program features you want installed and where they will be installed. Recommended for advanced users."
-
-[OOO_CONTROL_257]
-en-US = "Choose the setup type that best suits your needs."
-
-[OOO_CONTROL_258]
-en-US = "Please select a setup type."
-
-[OOO_CONTROL_259]
-en-US = "{&MSSansBold8}Setup Type"
-
-[OOO_CONTROL_260]
-en-US = "&Next >"
-
-[OOO_CONTROL_262]
-en-US = "< &Back"
-
-[OOO_CONTROL_265]
-en-US = "Cancel"
-
-[OOO_CONTROL_266]
-en-US = "&Next >"
-
-[OOO_CONTROL_267]
-en-US = "Please select the product language for [ProductName]."
-
-[OOO_CONTROL_268]
-en-US = "{&MSSansBold8}Language Selection"
-
-[OOO_CONTROL_269]
-en-US = "Repair or remove the program."
-
-[OOO_CONTROL_270]
-en-US = "&Microsoft Word Documents"
-
-[OOO_CONTROL_271]
-en-US = "Microsoft &Excel Spreadsheets"
-
-[OOO_CONTROL_272]
-en-US = "Microsoft Po&werPoint Presentations"
-
-[OOO_CONTROL_273]
-en-US = "&[ProductName] Writer/Web"
-
-[OOO_CONTROL_274]
-en-US = "Set [DEFINEDPRODUCT] to be the default application for Microsoft Office file types."
-
-[OOO_CONTROL_275]
-en-US = "[ProductName] can be set as the default application to open Microsoft Office file types. This means, for instance, that if you double click on one of these files, [ProductName] will open it, not the program that opens it now."
-
-[OOO_CONTROL_276]
-en-US = "File types"
-
-[OOO_CONTROL_277]
-en-US = "Default HTML editor"
-
-[OOO_CONTROL_278]
-en-US = "{&MSSansBold8}File Type"
-
-[OOO_CONTROL_300]
-en-US = "A version of [DEFINEDPRODUCT] [DEFINEDVERSION] was found by the [ProductName] Installation Wizard. This version will be updated."
-
-[OOO_CONTROL_301]
-en-US = "The destination folder specified below does not contain a [DEFINEDPRODUCT] [DEFINEDVERSION] version."
-
-[OOO_CONTROL_302]
-en-US = "A newer [DEFINEDPRODUCT] [DEFINEDVERSION] has been found."
-
-[OOO_CONTROL_303]
-en-US = "The version specified in the folder below cannot be updated."
-
-[OOO_CONTROL_304]
-en-US = "Check the destination folder."
-
-[OOO_CONTROL_305]
-en-US = "To continue, click "Next"."
-
-[OOO_CONTROL_306]
-en-US = "To select a different version, click "Change". Otherwise click "Cancel" to abort the Installation Wizard."
-
-[OOO_CONTROL_307]
-en-US = "To select a different folder, click "Change"."
-
-[OOO_CONTROL_308]
-en-US  = "Install [ProductName] to:"
-
-[OOO_CONTROL_309]
-en-US = "If you are just trying out [ProductName], you probably don't want this to happen, so leave the boxes unchecked."
-
-[OOO_CONTROL_317]
-en-US = "No languages have been selected for installation. Click OK to select one or more languages for installation."
-
-[OOO_CONTROL_318]
-en-US = "No applications have been selected for installation. Click OK to select one or more applications for installation."
-
-[OOO_CONTROL_319]
-en-US  = "Create a start link on desktop"
-
-[OOO_CONTROL_320]
-en-US  = "Remove all older product versions"
-
-[OOO_CONTROL_LANG_1033]
-en-US = "English"
-
-[OOO_CONTROL_LANG_1031]
-en-US = "German"
-
-[OOO_CONTROL_LANG_1034]
-en-US = "Spanish"
-
-
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
deleted file mode 100644
index 110925c8d..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
+++ /dev/null
@@ -1,11 +0,0 @@
-[OOO_CUSTOMACTION_1]
-en-US  = "A newer version of [ProductName] was found. To install an older version, the newer version needs to be removed first."
-
-[OOO_CUSTOMACTION_2]
-en-US  = "The same version of this product is already installed."
-
-[OOO_CUSTOMACTION_3]
-en-US = "An older version of [ProductName] was found. To install a newer version, the older version needs to be removed first."
-
-[OOO_CUSTOMACTION_4]
-en-US = "Please exit [DEFINEDPRODUCT] [DEFINEDVERSION] and the [DEFINEDPRODUCT] [DEFINEDVERSION] Quickstarter before you continue. If you are using a multi-user system, also make sure that no other user has [DEFINEDPRODUCT] [DEFINEDVERSION] open."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
deleted file mode 100644
index a53711504..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
+++ /dev/null
@@ -1,391 +0,0 @@
-[OOO_ERROR_1]
-en-US = "{{Fatal error: }}"
-
-[OOO_ERROR_2]
-en-US = "Error [1]."
-
-[OOO_ERROR_3]
-en-US = "Warning [1]."
-
-[OOO_ERROR_4]
-en-US = "Info [1]."
-
-[OOO_ERROR_5]
-en-US = "Internal Error [1]. [2]{, [3]}{, [4]}"
-
-[OOO_ERROR_6]
-en-US = "{{Disk full: }}"
-
-[OOO_ERROR_7]
-en-US = "Action [Time]: [1]. [2]"
-
-[OOO_ERROR_8]
-en-US = "[ProductName]"
-
-[OOO_ERROR_9]
-en-US = "{[2]}{, [3]}{, [4]}"
-
-[OOO_ERROR_10]
-en-US = "Message type: [1], Argument: [2]"
-
-[OOO_ERROR_11]
-en-US = "=== Logging started: [Date]  [Time] ==="
-
-[OOO_ERROR_12]
-en-US = "=== Logging stopped: [Date]  [Time] ==="
-
-[OOO_ERROR_13]
-en-US = "Action start [Time]: [1]."
-
-[OOO_ERROR_14]
-en-US = "Action ended [Time]: [1]. Return value [2]."
-
-[OOO_ERROR_15]
-en-US = "Time remaining: {[1] minutes }{[2] seconds}"
-
-[OOO_ERROR_16]
-en-US = "Out of memory. Shut down other applications before retrying."
-
-[OOO_ERROR_17]
-en-US = "Installer is no longer responding."
-
-[OOO_ERROR_18]
-en-US = "Installer terminated prematurely."
-
-[OOO_ERROR_19]
-en-US = "Please wait while Windows configures [ProductName]"
-
-[OOO_ERROR_20]
-en-US = "Gathering required information..."
-
-[OOO_ERROR_21]
-en-US = "Removing older versions of this application"
-
-[OOO_ERROR_22]
-en-US = "Preparing to remove older versions of this application"
-
-[OOO_ERROR_23]
-en-US = "{[ProductName] }Setup completed successfully."
-
-[OOO_ERROR_24]
-en-US = "{[ProductName] }Setup failed."
-
-[OOO_ERROR_25]
-en-US = "Error reading from file: [2]. {{ System error [3].}}  Verify that the file exists and that you can access it."
-
-[OOO_ERROR_26]
-en-US = "Cannot create the file [3].  A directory with this name already exists.  Cancel the installation and try installing to a different location."
-
-[OOO_ERROR_27]
-en-US = "Please insert the disk: [2]"
-
-[OOO_ERROR_28]
-en-US = "The installer has insufficient privileges to access this directory: [2].  The installation cannot continue.  Log on as an administrator or contact your system administrator."
-
-[OOO_ERROR_29]
-en-US = "Error writing to file [2].  Verify that you have access to that directory."
-
-[OOO_ERROR_30]
-en-US = "Error reading from file [2].  Verify that the file exists and that you can access it."
-
-[OOO_ERROR_31]
-en-US = "Another application has exclusive access to the file [2].  Please shut down all other applications, then click Retry."
-
-[OOO_ERROR_32]
-en-US = "There is not enough disk space to install the file [2].  Free some disk space and click Retry, or click Cancel to exit."
-
-[OOO_ERROR_33]
-en-US = "Source file not found: [2].  Verify that the file exists and that you can access it."
-
-[OOO_ERROR_34]
-en-US = "Error reading from file: [3]. {{ System error [2].}}  Verify that the file exists and that you can access it."
-
-[OOO_ERROR_35]
-en-US = "Error writing to file: [3]. {{ System error [2].}}  Verify that you have access to that directory."
-
-[OOO_ERROR_36]
-en-US = "Source file not found{{(cabinet)}}: [2].  Verify that the file exists and that you can access it."
-
-[OOO_ERROR_37]
-en-US = "Cannot create the directory [2].  A file with this name already exists.  Please rename or remove the file and click Retry, or click Cancel to exit."
-
-[OOO_ERROR_38]
-en-US = "The volume [2] is currently unavailable.  Please select another."
-
-[OOO_ERROR_39]
-en-US = "The specified path [2] is unavailable."
-
-[OOO_ERROR_40]
-en-US = "Unable to write to the specified folder [2]."
-
-[OOO_ERROR_41]
-en-US = "A network error occurred while attempting to read from the file [2]"
-
-[OOO_ERROR_42]
-en-US = "An error occurred while attempting to create the directory [2]"
-
-[OOO_ERROR_43]
-en-US = "A network error occurred while attempting to create the directory [2]"
-
-[OOO_ERROR_44]
-en-US = "A network error occurred while attempting to open the source file cabinet [2]."
-
-[OOO_ERROR_45]
-en-US = "The specified path is too long [2]."
-
-[OOO_ERROR_46]
-en-US = "The Installer has insufficient privileges to modify the file [2]."
-
-[OOO_ERROR_47]
-en-US = "A portion of the path [2] exceeds the length allowed by the system."
-
-[OOO_ERROR_48]
-en-US = "The path [2] contains words that are not valid in folders."
-
-[OOO_ERROR_49]
-en-US = "The path [2] contains an invalid character."
-
-[OOO_ERROR_50]
-en-US = "[2] is not a valid short file name."
-
-[OOO_ERROR_51]
-en-US = "Error getting file security: [3] GetLastError: [2]"
-
-[OOO_ERROR_52]
-en-US = "Invalid Drive: [2]"
-
-[OOO_ERROR_53]
-en-US = "Error applying patch to file [2].  It has probably been updated by other means, and can no longer be modified by this patch.  For more information contact your patch vendor.  {{System Error: [3]}}"
-
-[OOO_ERROR_54]
-en-US = "Could not create key [2]. {{ System error [3].}}  Verify that you have sufficient access to that key, or contact your support personnel."
-
-[OOO_ERROR_55]
-en-US = "Could not open key: [2]. {{ System error [3].}}  Verify that you have sufficient access to that key, or contact your support personnel."
-
-[OOO_ERROR_56]
-en-US = "Could not delete value [2] from key [3]. {{ System error [4].}}  Verify that you have sufficient access to that key, or contact your support personnel."
-
-[OOO_ERROR_57]
-en-US = "Could not delete key [2]. {{ System error [3].}}  Verify that you have sufficient access to that key, or contact your support personnel."
-
-[OOO_ERROR_58]
-en-US = "Could not read value [2] from key [3]. {{ System error [4].}}  Verify that you have sufficient access to that key, or contact your support personnel."
-
-[OOO_ERROR_59]
-en-US = "Could not write value [2] to key [3]. {{ System error [4].}}  Verify that you have sufficient access to that key, or contact your support personnel."
-
-[OOO_ERROR_60]
-en-US = "Could not get value names for key [2]. {{ System error [3].}}  Verify that you have sufficient access to that key, or contact your support personnel."
-
-[OOO_ERROR_61]
-en-US = "Could not get sub key names for key [2]. {{ System error [3].}}  Verify that you have sufficient access to that key, or contact your support personnel."
-
-[OOO_ERROR_62]
-en-US = "Could not read security information for key [2]. {{ System error [3].}}  Verify that you have sufficient access to that key, or contact your support personnel."
-
-[OOO_ERROR_63]
-en-US = "Could not increase the available registry space. [2] KB of free registry space is required for the installation of this application."
-
-[OOO_ERROR_64]
-en-US = "Another installation is in progress. You must complete that installation before continuing this one."
-
-[OOO_ERROR_65]
-en-US = "Error accessing secured data. Please make sure the Windows Installer is configured properly and try the installation again."
-
-[OOO_ERROR_66]
-en-US = "User [2] has previously initiated an installation for product [3].  That user will need to run that installation again before using that product.  Your current installation will now continue."
-
-[OOO_ERROR_67]
-en-US = "User [2] has previously initiated an installation for product [3].  That user will need to run that installation again before using that product."
-
-[OOO_ERROR_68]
-en-US = "Out of disk space -- Volume: '[2]'; required space: [3] KB; available space: [4] KB.  Free some disk space and retry."
-
-[OOO_ERROR_69]
-en-US = "Are you sure you want to cancel?"
-
-[OOO_ERROR_70]
-en-US = "The file [2][3] is being held in use {by the following process: Name: [4], ID: [5], Window Title: [6]}.  Close that application and retry."
-
-[OOO_ERROR_71]
-en-US = "The product [2] is already installed, preventing the installation of this product.  The two products are incompatible."
-
-[OOO_ERROR_72]
-en-US = "Out of disk space -- Volume: [2]; required space: [3] KB; available space: [4] KB.  If rollback is disabled, enough space is available. Click Cancel to quit, Retry to check available disk space again, or Ignore to continue without rollback."
-
-[OOO_ERROR_73]
-en-US = "Could not access network location [2]."
-
-[OOO_ERROR_74]
-en-US = "The following applications should be closed before continuing the installation:"
-
-[OOO_ERROR_75]
-en-US = "Could not find any previously installed compliant products on the machine for installing this product."
-
-[OOO_ERROR_76]
-en-US = "The key [2] is not valid.  Verify that you entered the correct key."
-
-[OOO_ERROR_77]
-en-US = "The installer must restart your system before configuration of [2] can continue.  Click Yes to restart now or No if you plan to restart later."
-
-[OOO_ERROR_78]
-en-US = "You must restart your system for the configuration changes made to [2] to take effect. Click Yes to restart now or No if you plan to restart later."
-
-[OOO_ERROR_79]
-en-US = "An installation for [2] is currently suspended.  You must undo the changes made by that installation to continue.  Do you want to undo those changes?"
-
-[OOO_ERROR_80]
-en-US = "A previous installation for this product is in progress.  You must undo the changes made by that installation to continue.  Do you want to undo those changes?"
-
-[OOO_ERROR_81]
-en-US = "No valid source could be found for product [2].  The Windows Installer cannot continue."
-
-[OOO_ERROR_82]
-en-US = "Installation operation completed successfully."
-
-[OOO_ERROR_83]
-en-US = "Installation operation failed."
-
-[OOO_ERROR_84]
-en-US = "Product: [2] -- [3]"
-
-[OOO_ERROR_85]
-en-US = "You may either restore your computer to its previous state or continue the installation later. Would you like to restore?"
-
-[OOO_ERROR_86]
-en-US = "An error occurred while writing installation information to disk.  Check to make sure enough disk space is available, and click Retry, or Cancel to end the installation."
-
-[OOO_ERROR_87]
-en-US = "One or more of the files required to restore your computer to its previous state could not be found.  Restoration will not be possible."
-
-[OOO_ERROR_88]
-en-US = "[2] cannot install one of its required products. Contact your technical support group.  {{System Error: [3].}}"
-
-[OOO_ERROR_89]
-en-US = "The older version of [2] cannot be removed.  Contact your technical support group.  {{System Error [3].}}"
-
-[OOO_ERROR_90]
-en-US = "The path [2] is not valid.  Please specify a valid path."
-
-[OOO_ERROR_91]
-en-US = "Out of memory. Shut down other applications before retrying."
-
-[OOO_ERROR_92]
-en-US = "There is no disk in drive [2]. Please insert one and click Retry, or click Cancel to go back to the previously selected volume."
-
-[OOO_ERROR_93]
-en-US = "There is no disk in drive [2]. Please insert one and click Retry, or click Cancel to return to the browse dialog and select a different volume."
-
-[OOO_ERROR_94]
-en-US = "The folder [2] does not exist.  Please enter a path to an existing folder."
-
-[OOO_ERROR_95]
-en-US = "You have insufficient privileges to read this folder."
-
-[OOO_ERROR_96]
-en-US = "A valid destination folder for the installation could not be determined."
-
-[OOO_ERROR_97]
-en-US = "Error attempting to read from the source installation database: [2]."
-
-[OOO_ERROR_98]
-en-US = "Scheduling reboot operation: Renaming file [2] to [3]. Must reboot to complete operation."
-
-[OOO_ERROR_99]
-en-US = "Scheduling reboot operation: Deleting file [2]. Must reboot to complete operation."
-
-[OOO_ERROR_100]
-en-US = "Module [2] failed to register.  HRESULT [3].  Contact your support personnel."
-
-[OOO_ERROR_101]
-en-US = "Module [2] failed to unregister.  HRESULT [3].  Contact your support personnel."
-
-[OOO_ERROR_102]
-en-US = "Failed to cache package [2]. Error: [3]. Contact your support personnel."
-
-[OOO_ERROR_103]
-en-US = "Could not register font [2].  Verify that you have sufficient permissions to install fonts, and that the system supports this font."
-
-[OOO_ERROR_104]
-en-US = "Could not unregister font [2]. Verify that you have sufficient permissions to remove fonts."
-
-[OOO_ERROR_105]
-en-US = "Could not create shortcut [2]. Verify that the destination folder exists and that you can access it."
-
-[OOO_ERROR_106]
-en-US = "Could not remove shortcut [2]. Verify that the shortcut file exists and that you can access it."
-
-[OOO_ERROR_107]
-en-US = "Could not register type library for file [2].  Contact your support personnel."
-
-[OOO_ERROR_108]
-en-US = "Could not unregister type library for file [2].  Contact your support personnel."
-
-[OOO_ERROR_109]
-en-US = "Could not update the INI file [2][3].  Verify that the file exists and that you can access it."
-
-[OOO_ERROR_110]
-en-US = "Could not schedule file [2] to replace file [3] on reboot.  Verify that you have write permissions to file [3]."
-
-[OOO_ERROR_111]
-en-US = "Error removing ODBC driver manager, ODBC error [2]: [3]. Contact your support personnel."
-
-[OOO_ERROR_112]
-en-US = "Error installing ODBC driver manager, ODBC error [2]: [3]. Contact your support personnel."
-
-[OOO_ERROR_113]
-en-US = "Error removing ODBC driver [4], ODBC error [2]: [3]. Verify that you have sufficient privileges to remove ODBC drivers."
-
-[OOO_ERROR_114]
-en-US = "Error installing ODBC driver [4], ODBC error [2]: [3]. Verify that the file [4] exists and that you can access it."
-
-[OOO_ERROR_115]
-en-US = "Error configuring ODBC data source [4], ODBC error [2]: [3]. Verify that the file [4] exists and that you can access it."
-
-[OOO_ERROR_116]
-en-US = "Service [2] ([3]) failed to start.  Verify that you have sufficient privileges to start system services."
-
-[OOO_ERROR_117]
-en-US = "Service [2] ([3]) could not be stopped.  Verify that you have sufficient privileges to stop system services."
-
-[OOO_ERROR_118]
-en-US = "Service [2] ([3]) could not be deleted.  Verify that you have sufficient privileges to remove system services."
-
-[OOO_ERROR_119]
-en-US = "Service [2] ([3]) could not be installed.  Verify that you have sufficient privileges to install system services."
-
-[OOO_ERROR_120]
-en-US = "Could not update environment variable [2].  Verify that you have sufficient privileges to modify environment variables."
-
-[OOO_ERROR_121]
-en-US = "You do not have sufficient privileges to complete this installation for all users of the machine.  Log on as an administrator and then retry this installation."
-
-[OOO_ERROR_122]
-en-US = "Could not set file security for file [3]. Error: [2].  Verify that you have sufficient privileges to modify the security permissions for this file."
-
-[OOO_ERROR_123]
-en-US = "Component Services (COM+ 1.0) are not installed on this computer.  This installation requires Component Services in order to complete successfully.  Component Services are available on Windows 2000."
-
-[OOO_ERROR_124]
-en-US = "Error registering COM+ application.  Contact your support personnel for more information."
-
-[OOO_ERROR_125]
-en-US = "Error unregistering COM+ application.  Contact your support personnel for more information."
-
-[OOO_ERROR_126]
-en-US = "The description for service '[2]' ([3]) could not be changed."
-
-[OOO_ERROR_127]
-en-US = "The Windows Installer service cannot update the system file [2] because the file is protected by Windows.  You may need to update your operating system for this program to work correctly. {{Package version: [3], OS Protected version: [4]}}"
-
-[OOO_ERROR_128]
-en-US = "The Windows Installer service cannot update the protected Windows file [2]. {{Package version: [3], OS Protected version: [4], SFP Error: [5]}}"
-
-[OOO_ERROR_129]
-en-US = "This setup requires Internet Information Server 4.0 or higher for configuring IIS Virtual Roots. Please make sure that you have IIS 4.0 or higher."
-
-[OOO_ERROR_130]
-en-US = "This setup requires Administrator privileges for configuring IIS Virtual Roots."
-
-
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
deleted file mode 100644
index 20f2a60dd..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
+++ /dev/null
@@ -1,4 +0,0 @@
-[OOO_LAUNCH_1]
-en-US = "The Installation Wizard cannot be run properly because you are logged in as a user without sufficient administrator rights for this system."
-[OOO_LAUNCH_2]
-en-US = "Please use the file setup.exe to start the installation."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Nsis.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Nsis.ulf
deleted file mode 100644
index ee210a4ff..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Nsis.ulf
+++ /dev/null
@@ -1,41 +0,0 @@
-[SetupCaption]
-en-US = "%PRODUCTNAME %PRODUCTVERSION Installation Preparation"
-
-[MUI_TEXT_WELCOME_INFO_TITLE]
-en-US = "Thank you for downloading %PRODUCTNAME %PRODUCTVERSION."
-
-[MUI_TEXT_WELCOME_INFO_TEXT]
-en-US = "The installation files must be unpacked and copied to your hard disk in preparation for the installation. After that, the %PRODUCTNAME installation will start automatically.\n\nClick \'Next\' to continue."
-
-[MUI_TEXT_DIRECTORY_TITLE]
-en-US = "Select Folder"
-
-[MUI_TEXT_DIRECTORY_SUBTITLE]
-en-US = "Select the folder in which to save the unpacked files."
-
-[InstallBtn]
-en-US = "&Unpack"
-
-[DirText]
-en-US = "The %PRODUCTNAME %PRODUCTVERSION installation files will be unpacked and saved in the folder shown below. If you would like to save %PRODUCTNAME to a different folder, click \'Browse\' to select another folder."
-
-[DirSubText]
-en-US = "Destination Folder"
-
-[SpaceRequired]
-en-US = "Space required: "
-
-[SpaceAvailable]
-en-US = "Space available: "
-
-[MUI_TEXT_INSTALLING_TITLE]
-en-US = "Unpacking"
-
-[MUI_TEXT_INSTALLING_SUBTITLE]
-en-US = "Please wait while the installation files are being unpacked."
-
-[Extract]
-en-US = "Extract: "
-
-[MUI_TEXT_ABORTWARNING]
-en-US = "Are you sure you want to quit the %PRODUCTNAME %PRODUCTVERSION Installation Preparation"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
deleted file mode 100644
index 28a1219d0..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
+++ /dev/null
@@ -1,47 +0,0 @@
-[OOO_ARPCOMMENTSTEMPLATE]
-en-US = "Comment in the Add-Remove-Programs Applet"
-
-[OOO_ARPCONTACTTEMPLATE]
-en-US = "Department for technical support"
-
-[OOO_ARPHELPLINKTEMPLATE]
-en-US = "http://www.documentfoundation.org"
-
-[OOO_ARPHELPTELEPHONETEMPLATE]
-en-US = "x-xxx-xxx-xxx"
-
-[OOO_ARPURLINFOABOUTTEMPLATE]
-en-US = "http://www.documentfoundation.org"
-
-[OOO_ARPURLUPDATEINFOTEMPLATE]
-en-US = "http://www.documentfoundation.org"
-
-[OOO_STR_NEW_DISPLAY_NAME]
-en-US = "~New"
-
-[OOO_STR_EDIT]
-en-US = "~Edit"
-
-[OOO_STR_MS_WORD_DOCUMENT]
-en-US = "Microsoft Word Document"
-
-[OOO_STR_MS_WORD_TEMPLATE]
-en-US = "Microsoft Word Template"
-
-[OOO_STR_MS_EXCEL_WORKSHEET]
-en-US = "Microsoft Excel Worksheet"
-
-[OOO_STR_MS_EXCEL_TEMPLATE]
-en-US = "Microsoft Excel Template"
-
-[OOO_STR_MS_POWERPOINT_PRESENTATION]
-en-US = "Microsoft PowerPoint Presentation"
-
-[OOO_STR_MS_POWERPOINT_TEMPLATE]
-en-US = "Microsoft PowerPoint Template"
-
-[OOO_STR_MS_POWERPOINT_SHOW]
-en-US = "Microsoft PowerPoint Show"
-
-[OOO_STR_INSTALLATION_WIZARD]
-en-US = "Installation Wizard"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
deleted file mode 100644
index 24b51774b..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
+++ /dev/null
@@ -1,27 +0,0 @@
-[OOO_RADIOBUTTON_1]
-en-US = "{&MSSansBold8}&Modify"
-
-[OOO_RADIOBUTTON_2]
-en-US = "{&MSSansBold8}Re&pair"
-
-[OOO_RADIOBUTTON_3]
-en-US = "{&MSSansBold8}&Remove"
-
-[OOO_RADIOBUTTON_4]
-en-US = "{&MSSansBold8}&Typical"
-
-[OOO_RADIOBUTTON_5]
-en-US = "{&MSSansBold8}Cu&stom"
-
-[OOO_RADIOBUTTON_6]
-en-US = "I &do not accept the terms in the license agreement"
-
-[OOO_RADIOBUTTON_7]
-en-US = "I &accept the terms in the license agreement"
-
-[OOO_RADIOBUTTON_8]
-en-US = "&Anyone who uses this computer (all users)"
-
-[OOO_RADIOBUTTON_9]
-en-US = "Only for &me ([USERNAME])"
-
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf
deleted file mode 100644
index 642903707..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf
+++ /dev/null
@@ -1,18 +0,0 @@
-[OOO_SIS_TITLE]
-en-US = "Installation database"
-
-[OOO_SIS_AUTHOR]
-en-US = "Author"
-
-[OOO_SIS_SUBJECT]
-en-US = "Subject"
-
-[OOO_SIS_COMMENT]
-en-US = "Comment"
-
-[OOO_SIS_KEYWORDS]
-en-US = "Install,MSI"
-
-[OOO_SIS_APPNAME]
-en-US = "Windows Installer"
-
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/UIText.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/UIText.ulf
deleted file mode 100644
index a00f70ac6..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/UIText.ulf
+++ /dev/null
@@ -1,148 +0,0 @@
-[OOO_UITEXT_1]
-en-US = "bytes"
-
-[OOO_UITEXT_2]
-en-US = "GB"
-
-[OOO_UITEXT_3]
-en-US = "KB"
-
-[OOO_UITEXT_4]
-en-US = "MB"
-
-[OOO_UITEXT_5]
-en-US = "This feature will not be available."
-
-[OOO_UITEXT_6]
-en-US = "This feature will be installed when required."
-
-[OOO_UITEXT_7]
-en-US = "This feature, and all subfeatures, will be installed to run from the CD."
-
-[OOO_UITEXT_8]
-en-US = "This feature, and all subfeatures, will be installed on local hard drive."
-
-[OOO_UITEXT_9]
-en-US = "This feature, and all subfeatures, will be installed to run from the network."
-
-[OOO_UITEXT_10]
-en-US = "This feature will be installed to run from CD."
-
-[OOO_UITEXT_11]
-en-US = "This feature will be installed on local hard drive."
-
-[OOO_UITEXT_12]
-en-US = "This feature will be installed to run from network."
-
-[OOO_UITEXT_13]
-en-US = "Fldr|New Folder"
-
-[OOO_UITEXT_14]
-en-US = "This feature will remain uninstalled."
-
-[OOO_UITEXT_15]
-en-US = "This feature will be set to be installed when required."
-
-[OOO_UITEXT_16]
-en-US = "This feature will be installed to run from CD."
-
-[OOO_UITEXT_17]
-en-US = "This feature will be installed on the local hard drive."
-
-[OOO_UITEXT_18]
-en-US = "This feature will be installed to run from the network."
-
-[OOO_UITEXT_19]
-en-US = "This feature will become unavailable."
-
-[OOO_UITEXT_20]
-en-US = "Will be installed when required."
-
-[OOO_UITEXT_21]
-en-US = "This feature will be available to run from CD."
-
-[OOO_UITEXT_22]
-en-US = "This feature will be installed on your local hard drive."
-
-[OOO_UITEXT_23]
-en-US = "This feature will be available to run from the network."
-
-[OOO_UITEXT_24]
-en-US = "This feature will be uninstalled completely, and you won't be able to run it from CD."
-
-[OOO_UITEXT_25]
-en-US = "This feature was run from the CD but will be set to be installed when required."
-
-[OOO_UITEXT_26]
-en-US = "This feature will continue to be run from the CD"
-
-[OOO_UITEXT_27]
-en-US = "This feature was run from the CD but will be installed on the local hard drive."
-
-[OOO_UITEXT_28]
-en-US = "This feature frees up [1] on your hard drive."
-
-[OOO_UITEXT_29]
-en-US = "This feature requires [1] on your hard drive."
-
-[OOO_UITEXT_30]
-en-US = "Compiling cost for this feature..."
-
-[OOO_UITEXT_31]
-en-US = "This feature will be completely removed."
-
-[OOO_UITEXT_32]
-en-US = "This feature will be removed from your local hard drive but will be set to be installed when required."
-
-[OOO_UITEXT_33]
-en-US = "This feature will be removed from your local hard drive but will still be available to run from CD."
-
-[OOO_UITEXT_34]
-en-US = "This feature will remain on your local hard drive."
-
-[OOO_UITEXT_35]
-en-US = "This feature will be removed from your local hard drive, but will be still available to run from the network."
-
-[OOO_UITEXT_36]
-en-US = "This feature will be uninstalled completely, and you won't be able to run it from the network."
-
-[OOO_UITEXT_37]
-en-US = "This feature was run from the network but will be installed when required."
-
-[OOO_UITEXT_38]
-en-US = "This feature was run from the network but will be installed on the local hard drive."
-
-[OOO_UITEXT_39]
-en-US = "This feature will continue to be run from the network"
-
-[OOO_UITEXT_40]
-en-US = "This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive."
-
-[OOO_UITEXT_41]
-en-US = "This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive."
-
-[OOO_UITEXT_42]
-en-US = "This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive."
-
-[OOO_UITEXT_43]
-en-US = "This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive."
-
-[OOO_UITEXT_44]
-en-US = "Time remaining: {[1] min }[2] sec"
-
-[OOO_UITEXT_45]
-en-US = "Available"
-
-[OOO_UITEXT_46]
-en-US = "Differences"
-
-[OOO_UITEXT_47]
-en-US = "Required"
-
-[OOO_UITEXT_48]
-en-US = "Disk Size"
-
-[OOO_UITEXT_49]
-en-US = "Volume"
-
-
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
deleted file mode 100644
index 0a854df4f..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=instsetoo_native
-TARGET=win_ulffiles
-
-# --- Settings -----------------------------------------------------
-
-common_build:=
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-ULFFILES = \
-    ActionTe.ulf \
-    Control.ulf  \
-    CustomAc.ulf \
-    Error.ulf    \
-    LaunchCo.ulf \
-    Property.ulf \
-    RadioBut.ulf \
-    Nsis.ulf     \
-    SIS.ulf      \
-    UIText.ulf 
-    
-MLFFILES = $(foreach,i,$(ULFFILES) $(MISC)$/$(TARGET)$/$(i:b).mlf)
-UULFFILES = $(MISC)$/$(TARGET)$/Nsis.uulf
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(GUI)"=="WNT"
-
-ALLTAR : $(MLFFILES) $(UULFFILES)
-
-.ENDIF
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt
deleted file mode 100644
index 7263a0a9e..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt
+++ /dev/null
@@ -1,73 +0,0 @@
-Action	Description	Template
-s72	L0	L0
-WINDOWSENCODINGTEMPLATE	ActionText	Action
-Advertise	OOO_ACTIONTEXT_1	
-AllocateRegistrySpace	OOO_ACTIONTEXT_2	OOO_ACTIONTEXT_3
-AppSearch	OOO_ACTIONTEXT_4	OOO_ACTIONTEXT_5
-BindImage	OOO_ACTIONTEXT_6	OOO_ACTIONTEXT_7
-caCreateVRoots	OOO_ACTIONTEXT_8	
-caRemoveVRoots	OOO_ACTIONTEXT_9	
-CCPSearch	OOO_ACTIONTEXT_10	
-CostFinalize	OOO_ACTIONTEXT_11	
-CostInitialize	OOO_ACTIONTEXT_12	
-CreateFolders	OOO_ACTIONTEXT_13	OOO_ACTIONTEXT_14
-CreateShortcuts	OOO_ACTIONTEXT_15	OOO_ACTIONTEXT_16
-DeleteServices	OOO_ACTIONTEXT_17	OOO_ACTIONTEXT_18
-DuplicateFiles	OOO_ACTIONTEXT_19	OOO_ACTIONTEXT_20
-FileCost	OOO_ACTIONTEXT_21	
-FindRelatedProducts	OOO_ACTIONTEXT_22	OOO_ACTIONTEXT_23
-GenerateScript	OOO_ACTIONTEXT_24	OOO_ACTIONTEXT_25
-InstallAdminPackage	OOO_ACTIONTEXT_26	OOO_ACTIONTEXT_27
-InstallFiles	OOO_ACTIONTEXT_28	OOO_ACTIONTEXT_29
-InstallODBC	OOO_ACTIONTEXT_30	
-InstallServices	OOO_ACTIONTEXT_31	OOO_ACTIONTEXT_32
-InstallSFPCatalogFile	OOO_ACTIONTEXT_33	OOO_ACTIONTEXT_34
-InstallValidate	OOO_ACTIONTEXT_35	
-LaunchConditions	OOO_ACTIONTEXT_36	
-MigrateFeatureStates	OOO_ACTIONTEXT_37	OOO_ACTIONTEXT_38
-MoveFiles	OOO_ACTIONTEXT_39	OOO_ACTIONTEXT_40
-PatchFiles	OOO_ACTIONTEXT_41	OOO_ACTIONTEXT_42
-ProcessComponents	OOO_ACTIONTEXT_43	
-PublishComponents	OOO_ACTIONTEXT_44	OOO_ACTIONTEXT_45
-PublishFeatures	OOO_ACTIONTEXT_46	OOO_ACTIONTEXT_47
-PublishProduct	OOO_ACTIONTEXT_48	
-RegisterClassInfo	OOO_ACTIONTEXT_49	OOO_ACTIONTEXT_50
-RegisterComPlus	OOO_ACTIONTEXT_51	OOO_ACTIONTEXT_52
-RegisterExtensionInfo	OOO_ACTIONTEXT_53	OOO_ACTIONTEXT_54
-RegisterFonts	OOO_ACTIONTEXT_55	OOO_ACTIONTEXT_56
-RegisterMIMEInfo	OOO_ACTIONTEXT_57	OOO_ACTIONTEXT_58
-RegisterProduct	OOO_ACTIONTEXT_59	OOO_ACTIONTEXT_60
-RegisterProgIdInfo	OOO_ACTIONTEXT_61	OOO_ACTIONTEXT_62
-RegisterTypeLibraries	OOO_ACTIONTEXT_63	OOO_ACTIONTEXT_64
-RegisterUser	OOO_ACTIONTEXT_65	OOO_ACTIONTEXT_66
-RemoveDuplicateFiles	OOO_ACTIONTEXT_67	OOO_ACTIONTEXT_68
-RemoveEnvironmentStrings	OOO_ACTIONTEXT_69	OOO_ACTIONTEXT_70
-RemoveExistingProducts	OOO_ACTIONTEXT_71	OOO_ACTIONTEXT_72
-RemoveFiles	OOO_ACTIONTEXT_73	OOO_ACTIONTEXT_74
-RemoveFolders	OOO_ACTIONTEXT_75	OOO_ACTIONTEXT_76
-RemoveIniValues	OOO_ACTIONTEXT_77	OOO_ACTIONTEXT_78
-RemoveODBC	OOO_ACTIONTEXT_79	
-RemoveRegistryValues	OOO_ACTIONTEXT_80	OOO_ACTIONTEXT_81
-RemoveShortcuts	OOO_ACTIONTEXT_82	OOO_ACTIONTEXT_83
-RMCCPSearch	OOO_ACTIONTEXT_84	
-Rollback	OOO_ACTIONTEXT_85	OOO_ACTIONTEXT_86
-RollbackCleanup	OOO_ACTIONTEXT_87	OOO_ACTIONTEXT_88
-SelfRegModules	OOO_ACTIONTEXT_89	OOO_ACTIONTEXT_90
-SelfUnregModules	OOO_ACTIONTEXT_91	OOO_ACTIONTEXT_92
-SetODBCFolders	OOO_ACTIONTEXT_93	
-StartServices	OOO_ACTIONTEXT_94	OOO_ACTIONTEXT_95
-StopServices	OOO_ACTIONTEXT_96	OOO_ACTIONTEXT_97
-UnmoveFiles	OOO_ACTIONTEXT_98	OOO_ACTIONTEXT_99
-UnpublishComponents	OOO_ACTIONTEXT_100	OOO_ACTIONTEXT_101
-UnpublishFeatures	OOO_ACTIONTEXT_102	OOO_ACTIONTEXT_103
-UnpublishProduct	OOO_ACTIONTEXT_104	
-UnregisterClassInfo	OOO_ACTIONTEXT_105	OOO_ACTIONTEXT_106
-UnregisterComPlus	OOO_ACTIONTEXT_107	OOO_ACTIONTEXT_108
-UnregisterExtensionInfo	OOO_ACTIONTEXT_109	OOO_ACTIONTEXT_110
-UnregisterFonts	OOO_ACTIONTEXT_111	OOO_ACTIONTEXT_112
-UnregisterMIMEInfo	OOO_ACTIONTEXT_113	OOO_ACTIONTEXT_114
-UnregisterProgIdInfo	OOO_ACTIONTEXT_115	OOO_ACTIONTEXT_116
-UnregisterTypeLibraries	OOO_ACTIONTEXT_117	OOO_ACTIONTEXT_118
-WriteEnvironmentStrings	OOO_ACTIONTEXT_119	OOO_ACTIONTEXT_120
-WriteIniValues	OOO_ACTIONTEXT_121	OOO_ACTIONTEXT_122
-WriteRegistryValues	OOO_ACTIONTEXT_123	OOO_ACTIONTEXT_124
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
deleted file mode 100644
index 18b3ca47b..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
+++ /dev/null
@@ -1,14 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdminExecuteSequence	Action
-CostFinalize		150
-CostInitialize		50
-CreateFolders		325
-FileCost		100
-InstallAdminPackage		300
-InstallFiles		350
-InstallFinalize		400
-InstallInitialize		250
-InstallValidate		200
-ScheduleReboot	ISSCHEDULEREBOOT	375
-SetInstalllocation		390
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminUIS.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminUIS.idt
deleted file mode 100644
index 3d92e28a4..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminUIS.idt
+++ /dev/null
@@ -1,14 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdminUISequence	Action
-AdminWelcome	Not PATCH	250
-CostFinalize		200
-CostInitialize		100
-ExecuteAction		350
-FileCost		150
-PatchWelcome	PATCH	260
-SetupCompleteError		-3
-SetupCompleteSuccess		-1
-SetupInitialization		50
-SetupInterrupted		-2
-SetupProgress		300
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt
deleted file mode 100644
index 32b74d61a..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt
+++ /dev/null
@@ -1,19 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdvtExecuteSequence	Action
-CostFinalize		100
-CostInitialize		50
-CreateShortcuts		250
-InstallFinalize		700
-InstallInitialize		200
-InstallValidate		150
-MsiPublishAssemblies		575
-PublishComponents		550
-PublishFeatures		600
-PublishProduct		650
-RegisterClassInfo		300
-RegisterExtensionInfo		350
-RegisterMIMEInfo		450
-RegisterProgIdInfo		400
-RegisterTypeLibraries		500
-ScheduleReboot	ISSCHEDULEREBOOT	675
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
deleted file mode 100644
index 3968375a8..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ /dev/null
@@ -1,7 +0,0 @@
-Property	Signature_
-s72	s72
-AppSearch	Property	Signature_
-INSTALLLOCATION	installuser
-INSTALLLOCATION	installuser_
-INSTALLLOCATION	installmachine
-INSTALLLOCATION	installmachine_
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary.idt
deleted file mode 100644
index 0b638cb0e..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary.idt
+++ /dev/null
@@ -1,20 +0,0 @@
-Name	Data
-s72	v0
-Binary	Name
-ImageBmp	Image.bmp
-BannerBmp	Banner.bmp
-CautionIco	caution.ico
-DontInstallIco	dontinstall.ico
-OpenFolderIco	openfolder.ico
-InstallIco	install.ico
-InstallFirstUseIco	installfirstuse.ico
-InstallPartialIco	installpartial.ico
-InstallStateMenuIco	installstatemenu.ico
-NetworkInstallIco	networkinstall.ico
-NewFolderIco	newfolder.ico
-SetupCompleteIco	setupcomplete.ico
-SetupIco	setup.ico
-SetupPartialIco	setuppartial.ico
-SetupRepairIco	setuprepair.ico
-TrashcanIco	trashcan.ico
-UpIco	up.ico
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
deleted file mode 100644
index a453f1fcd..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
deleted file mode 100644
index 25b5b11be..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/caution.ico
deleted file mode 100644
index 1c6f14ee0..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/caution.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/dontinstall.ico
deleted file mode 100644
index e7136d0e8..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/dontinstall.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/install.ico
deleted file mode 100644
index 2eb32becb..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/install.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installfirstuse.ico
deleted file mode 100644
index dc1e6542e..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installfirstuse.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installpartial.ico
deleted file mode 100644
index bd5767969..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installpartial.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installstatemenu.ico
deleted file mode 100644
index 914340dbb..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installstatemenu.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/networkinstall.ico
deleted file mode 100644
index ae11ed113..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/networkinstall.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/newfolder.ico
deleted file mode 100644
index 324adbcba..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/newfolder.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/openfolder.ico
deleted file mode 100644
index ef88d2e47..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/openfolder.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setup.ico
deleted file mode 100644
index 3580448fe..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setup.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setupcomplete.ico
deleted file mode 100644
index 609276af0..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setupcomplete.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuppartial.ico
deleted file mode 100644
index ac158ab39..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuppartial.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuprepair.ico
deleted file mode 100644
index 2f4a24d0b..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuprepair.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/trashcan.ico
deleted file mode 100644
index f1cc8083f..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/trashcan.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/up.ico
deleted file mode 100644
index 5dc25fae6..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/up.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
deleted file mode 100644
index 55fa8776f..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
+++ /dev/null
@@ -1,6 +0,0 @@
-Property	Value
-s72	S64
-CheckBox	Property
-ISCHECKFORPRODUCTUPDATES	1
-CREATEDESKTOPLINK	1
-REMOVEOLDPRODUCTS	1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
deleted file mode 100644
index bd48e9ad6..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ /dev/null
@@ -1,395 +0,0 @@
-Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
-s72	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L50
-WINDOWSENCODINGTEMPLATE	Control	Dialog_	Control
-AdminChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-AdminChangeFolder	BannerLine	Line	0	44	374	0	1				
-AdminChangeFolder	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-AdminChangeFolder	Branding2	Text	3	228	88	13	65537		[ProductName]		
-AdminChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_3	ComboText	
-AdminChangeFolder	Combo	DirectoryCombo	21	64	277	80	458755	TARGETDIR		Up	
-AdminChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_5	Combo	
-AdminChangeFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_6		
-AdminChangeFolder	DlgLine	Line	90	234	284	0	1				
-AdminChangeFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_7		
-AdminChangeFolder	List	DirectoryList	21	90	332	97	7	TARGETDIR		TailText	
-AdminChangeFolder	NewFolder	PushButton	335	66	19	19	3670019		NewFolderIco	List	OOO_CONTROL_9
-AdminChangeFolder	OK	PushButton	230	243	66	17	3		OOO_CONTROL_10	Cancel	
-AdminChangeFolder	Tail	PathEdit	21	207	332	17	3	TARGETDIR		OK	
-AdminChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_12	Tail	
-AdminChangeFolder	Up	PushButton	310	66	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_13
-AdminNetworkLocation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_14	InstallNow	
-AdminNetworkLocation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-AdminNetworkLocation	BannerLine	Line	0	44	374	0	1				
-AdminNetworkLocation	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-AdminNetworkLocation	Branding2	Text	3	228	88	13	65537		[ProductName]		
-AdminNetworkLocation	Browse	PushButton	286	124	66	17	3		OOO_CONTROL_17	Back	
-AdminNetworkLocation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_18	LBBrowse	
-AdminNetworkLocation	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_19		
-AdminNetworkLocation	DlgLine	Line	90	234	284	0	1				
-AdminNetworkLocation	DlgText	Text	21	51	326	40	3		OOO_CONTROL_20		
-AdminNetworkLocation	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_21		
-AdminNetworkLocation	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_22	Cancel	
-AdminNetworkLocation	LBBrowse	Text	21	90	100	10	3		OOO_CONTROL_23	SetupPathEdit	
-AdminNetworkLocation	SetupPathEdit	PathEdit	21	102	330	17	3	TARGETDIR		Browse	
-AdminWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_24	Next	
-AdminWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_25	Back	
-AdminWelcome	DlgLine	Line	0	234	326	0	1				
-AdminWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-AdminWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_26	Cancel	
-AdminWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_27		
-AdminWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_28		
-ApplicationInfo1	Icon	Icon	15	15	24	24	5242881		CautionIco		
-ApplicationInfo1	OK	PushButton	100	57	66	17	3		OOO_CONTROL_10		
-ApplicationInfo1	Text	Text	48	15	194	30	3		OOO_CONTROL_318		
-CancelSetup	Icon	Icon	15	15	24	24	5242881		CautionIco		
-CancelSetup	No	PushButton	135	57	66	17	3		OOO_CONTROL_29	Yes	
-CancelSetup	Text	Text	48	15	194	30	3		OOO_CONTROL_30		
-CancelSetup	Yes	PushButton	62	57	66	17	3		OOO_CONTROL_31	No	
-CustomerInformation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_32	Next	
-CustomerInformation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomerInformation	BannerLine	Line	0	44	374	0	1				
-CustomerInformation	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomerInformation	Branding2	Text	3	228	88	13	65537		[ProductName]		
-CustomerInformation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_35	NameLabel	
-CustomerInformation	CompanyEdit	Edit	21	100	237	17	3	COMPANYNAME	OOO_CONTROL_36	SerialLabel	
-CustomerInformation	CompanyLabel	Text	21	89	75	10	3		OOO_CONTROL_37	CompanyEdit	
-CustomerInformation	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_38		
-CustomerInformation	DlgLine	Line	90	234	284	0	1				
-CustomerInformation	DlgRadioGroupText	Text	21	161	300	14	3		OOO_CONTROL_39		
-CustomerInformation	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_40		
-CustomerInformation	NameEdit	Edit	21	63	237	17	3	USERNAME	OOO_CONTROL_41	CompanyLabel	
-CustomerInformation	NameLabel	Text	21	52	75	10	3		OOO_CONTROL_42	NameEdit	
-CustomerInformation	Next	PushButton	230	243	66	17	3		OOO_CONTROL_43	Cancel	
-CustomerInformation	RadioGroup	RadioButtonGroup	63	170	300	50	3	ApplicationUsers		Back	
-CustomerInformation	SerialLabel	Text	21	127	109	10	2		OOO_CONTROL_45	SerialNumber	
-CustomerInformation	SerialNumber	MaskedEdit	21	138	237	17	2	ISX_SERIALNUM		RadioGroup	
-CustomSetup	Back	PushButton	164	243	66	17	3		OOO_CONTROL_46	Next	
-CustomSetup	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomSetup	BannerLine	Line	0	44	374	0	1				
-CustomSetup	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomSetup	Branding2	Text	3	228	88	13	65537		[ProductName]		
-CustomSetup	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_49	Tree	
-CustomSetup	ChangeFolder	PushButton	164	203	66	17	3		OOO_CONTROL_50	Help	
-CustomSetup	Details	PushButton	93	243	66	17	3		OOO_CONTROL_51	Back	
-CustomSetup	DlgDesc	Text	17	23	276	25	65539		OOO_CONTROL_52		
-CustomSetup	DlgLine	Line	90	234	284	0	1				
-CustomSetup	DlgText	Text	9	47	360	20	3		OOO_CONTROL_53		
-CustomSetup	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_54		
-CustomSetup	FeatureGroup	GroupBox	235	67	131	152	1		OOO_CONTROL_55		
-CustomSetup	Help	PushButton	22	243	66	17	3		OOO_CONTROL_56	Details	
-CustomSetup	InstallLabel	Text	8	190	220	10	3		OOO_CONTROL_57		
-CustomSetup	ItemDescription	Text	241	80	120	65	3		OOO_CONTROL_58		
-CustomSetup	Location	Text	8	203	154	20	3		OOO_CONTROL_59		
-CustomSetup	Next	PushButton	230	243	66	17	3		OOO_CONTROL_60	Cancel	
-CustomSetup	Size	Text	241	148	120	65	3		OOO_CONTROL_61		
-CustomSetup	Tree	SelectionTree	8	70	220	118	7	_BrowseProperty		ChangeFolder	
-CustomSetupTips	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomSetupTips	BannerLine	Line	0	44	374	0	1				
-CustomSetupTips	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomSetupTips	Branding2	Text	3	228	88	13	65537		[ProductName]		
-CustomSetupTips	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_64		
-CustomSetupTips	DlgLine	Line	90	234	284	0	1				
-CustomSetupTips	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_65		
-CustomSetupTips	DontInstall	Icon	21	155	24	24	5242881		DontInstallIco		
-CustomSetupTips	DontInstallText	Text	60	155	300	20	3		OOO_CONTROL_66		
-CustomSetupTips	Install	Icon	21	105	24	24	5242881		InstallIco		
-CustomSetupTips	InstallPartial	Icon	21	130	24	24	5242881		InstallPartialIco		
-CustomSetupTips	InstallStateMenu	Icon	21	52	24	24	5242881		InstallStateMenuIco		
-CustomSetupTips	InstallStateText	Text	21	91	300	10	3		OOO_CONTROL_68		
-CustomSetupTips	InstallText	Text	60	105	300	20	3		OOO_CONTROL_69		
-CustomSetupTips	MenuText	Text	50	52	300	36	3		OOO_CONTROL_70		
-CustomSetupTips	OK	PushButton	301	243	66	17	3		OOO_CONTROL_72		
-CustomSetupTips	PartialText	Text	60	130	300	20	3		OOO_CONTROL_73		
-DatabaseFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_74	Next	
-DatabaseFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DatabaseFolder	BannerLine	Line	0	44	374	0	1				
-DatabaseFolder	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-DatabaseFolder	Branding2	Text	3	228	88	13	65537		[ProductName]		
-DatabaseFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_77	ChangeFolder	
-DatabaseFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_78	Back	
-DatabaseFolder	DatabaseFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
-DatabaseFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_79		
-DatabaseFolder	DlgLine	Line	90	234	284	0	1				
-DatabaseFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_80		
-DatabaseFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_81		
-DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
-DatabaseFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_83	Cancel	
-DestinationFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_84	Next	
-DestinationFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DestinationFolder	BannerLine	Line	0	44	374	0	1				
-DestinationFolder	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-DestinationFolder	Branding2	Text	3	228	88	13	65537		[ProductName]		
-DestinationFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_87	ChangeFolder	
-DestinationFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_88	Back	
-DestinationFolder	DestFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
-DestinationFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_89		
-DestinationFolder	DlgLine	Line	90	234	284	0	1				
-DestinationFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_90		
-DestinationFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_91		
-DestinationFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_92		
-DestinationFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_93	Cancel	
-DiskSpaceRequirements	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DiskSpaceRequirements	BannerLine	Line	0	44	374	0	1				
-DiskSpaceRequirements	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-DiskSpaceRequirements	Branding2	Text	3	228	88	13	65537		[ProductName]		
-DiskSpaceRequirements	DlgDesc	Text	17	23	276	25	65539		OOO_CONTROL_96		
-DiskSpaceRequirements	DlgLine	Line	90	234	284	0	1				
-DiskSpaceRequirements	DlgText	Text	10	185	358	41	3		OOO_CONTROL_97		
-DiskSpaceRequirements	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_98		
-DiskSpaceRequirements	List	VolumeCostList	8	55	358	125	393223		{120}{70}{70}{70}{70}		
-DiskSpaceRequirements	OK	PushButton	301	243	66	17	3		OOO_CONTROL_100		
-FilesInUse	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-FilesInUse	BannerLine	Line	0	44	374	0	1				
-FilesInUse	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-FilesInUse	Branding2	Text	3	228	88	13	65537		[ProductName]		
-FilesInUse	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_103		
-FilesInUse	DlgLine	Line	90	234	284	0	1				
-FilesInUse	DlgText	Text	21	51	348	29	3		OOO_CONTROL_104		
-FilesInUse	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_105		
-FilesInUse	Exit	PushButton	301	243	66	17	3		OOO_CONTROL_106	List	
-FilesInUse	Ignore	PushButton	230	243	66	17	3		OOO_CONTROL_107	Exit	
-FilesInUse	List	ListBox	21	87	331	135	7	FileInUseProcess		Retry	
-FilesInUse	Retry	PushButton	164	243	66	17	3		OOO_CONTROL_108	Ignore	
-FileTypeDialog	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
-FileTypeDialog	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-FileTypeDialog	BannerLine	Line	0	44	374	0	1				
-FileTypeDialog	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-FileTypeDialog	Branding2	Text	3	228	88	13	65537		[ProductName]		
-FileTypeDialog	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_138	CheckBox1	
-FileTypeDialog	CheckBox1	CheckBox	41	106	200	10	3	SELECT_WORD	 OOO_CONTROL_270	CheckBox2	
-FileTypeDialog	CheckBox2	CheckBox	41	131	200	10	3	SELECT_EXCEL	 OOO_CONTROL_271	CheckBox3	
-FileTypeDialog	CheckBox3	CheckBox	41	156	200	10	3	SELECT_POWERPOINT	 OOO_CONTROL_272	Back	
-FileTypeDialog	DlgDesc	Text	21	20	272	25	65539		OOO_CONTROL_274		
-FileTypeDialog	DlgLine	Line	90	234	284	0	1				
-FileTypeDialog	DlgText	Text	21	56	326	40	3		OOO_CONTROL_275		
-FileTypeDialog	DlgText2	Text	21	190	326	30	3		OOO_CONTROL_309		
-FileTypeDialog	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_278		
-FileTypeDialog	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-InstallChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-InstallChangeFolder	BannerLine	Line	0	44	374	0	1				
-InstallChangeFolder	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-InstallChangeFolder	Branding2	Text	3	228	88	13	65537		[ProductName]		
-InstallChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_111	ComboText	
-InstallChangeFolder	Combo	DirectoryCombo	21	64	277	80	4128779	_BrowseProperty		Up	
-InstallChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_113	Combo	
-InstallChangeFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_114		
-InstallChangeFolder	DlgLine	Line	90	234	284	0	1				
-InstallChangeFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_115		
-InstallChangeFolder	List	DirectoryList	21	90	332	97	15	_BrowseProperty		TailText	
-InstallChangeFolder	NewFolder	PushButton	335	66	19	19	3670019		NewFolderIco	List	OOO_CONTROL_117
-InstallChangeFolder	OK	PushButton	230	243	66	17	3		OOO_CONTROL_118	Cancel	
-InstallChangeFolder	Tail	PathEdit	21	207	332	17	15	_BrowseProperty		OK	
-InstallChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_120	Tail	
-InstallChangeFolder	Up	PushButton	310	66	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_121
-InstallWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_122	Copyright	
-InstallWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_123	Back	
-InstallWelcome	Copyright	Text	135	144	228	73	65539		OOO_CONTROL_124	Next	
-InstallWelcome	DlgLine	Line	0	234	374	0	1				
-InstallWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-InstallWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_125	Cancel	
-InstallWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_126		
-InstallWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_127		
-LanguageInfo1	Icon	Icon	15	15	24	24	5242881		CautionIco		
-LanguageInfo1	OK	PushButton	100	57	66	17	3		OOO_CONTROL_10		
-LanguageInfo1	Text	Text	48	15	194	30	3		OOO_CONTROL_317		
-LanguageSelection	Back	PushButton	164	243	66	17	3		OOO_CONTROL_122	CheckBox1	
-LanguageSelection	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-LanguageSelection	BannerLine	Line	0	44	374	0	1				
-LanguageSelection	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-LanguageSelection	Branding2	Text	3	228	88	13	65537		[ProductName]		
-LanguageSelection	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_131	Back	
-LanguageSelection	DlgDesc	Text	21	23	292	25	65539		OOO_CONTROL_267		
-LanguageSelection	DlgLine	Line	90	234	284	0	1				
-LanguageSelection	DlgTitle	Text	13	6	292	25	65539		OOO_CONTROL_268		
-LanguageSelection	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-LicenseAgreement	Agree	RadioButtonGroup	8	190	330	40	3	AgreeToLicense		Back	
-LicenseAgreement	Back	PushButton	164	243	66	17	3		OOO_CONTROL_128	Next	
-LicenseAgreement	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-LicenseAgreement	BannerLine	Line	0	44	374	0	1				
-LicenseAgreement	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-LicenseAgreement	Branding2	Text	3	228	88	13	65537		[ProductName]		
-LicenseAgreement	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_131	Agree	
-LicenseAgreement	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_132		
-LicenseAgreement	DlgLine	Line	90	234	284	0	1				
-LicenseAgreement	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_133		
-LicenseAgreement	Memo	ScrollableText	8	54	358	130	7				
-LicenseAgreement	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-MaintenanceType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
-MaintenanceType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-MaintenanceType	BannerLine	Line	0	44	374	0	1				
-MaintenanceType	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-MaintenanceType	Branding2	Text	3	228	88	13	65537		[ProductName]		
-MaintenanceType	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_138	RadioGroup	
-MaintenanceType	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_139		
-MaintenanceType	DlgLine	Line	90	234	284	0	1				
-MaintenanceType	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_140		
-MaintenanceType	Ico1	Icon	35	75	24	24	5242881		SetupPartialIco		
-MaintenanceType	Ico2	Icon	35	135	24	24	5242881		SetupRepairIco		
-MaintenanceType	Ico3	Icon	35	195	24	24	5242881		TrashcanIco		
-MaintenanceType	Next	PushButton	230	243	66	17	3		OOO_CONTROL_141	Cancel	
-MaintenanceType	RadioGroup	RadioButtonGroup	21	55	290	170	3	_IsMaintenance		Back	
-MaintenanceType	Text1	Text	80	72	260	35	3		OOO_CONTROL_143		
-MaintenanceType	Text2	Text	80	135	260	35	3		OOO_CONTROL_144		
-MaintenanceType	Text3	Text	80	192	260	35	3		OOO_CONTROL_145		
-MaintenanceWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_146	Next	
-MaintenanceWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_147	Back	
-MaintenanceWelcome	DlgLine	Line	0	234	374	0	1				
-MaintenanceWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-MaintenanceWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_148	Cancel	
-MaintenanceWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_149		
-MaintenanceWelcome	TextLine2	Text	135	55	228	50	65539		OOO_CONTROL_150		
-OutOfSpace	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-OutOfSpace	BannerLine	Line	0	44	374	0	1				
-OutOfSpace	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-OutOfSpace	Branding2	Text	3	228	88	13	65537		[ProductName]		
-OutOfSpace	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_153		
-OutOfSpace	DlgLine	Line	90	234	284	0	1				
-OutOfSpace	DlgText	Text	21	51	326	43	3		OOO_CONTROL_154		
-OutOfSpace	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_155		
-OutOfSpace	List	VolumeCostList	21	95	332	120	393223		OOO_CONTROL_156		
-OutOfSpace	Resume	PushButton	301	243	66	17	3		OOO_CONTROL_157		
-PatchWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_158	Next	
-PatchWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_159	Back	
-PatchWelcome	DlgLine	Line	0	234	374	0	1				
-PatchWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-PatchWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_160	Cancel	
-PatchWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_161		
-PatchWelcome	TextLine2	Text	135	54	228	45	65539		OOO_CONTROL_162		
-ReadyToInstall	Back	PushButton	164	243	66	17	3		OOO_CONTROL_163	InstallNow	
-ReadyToInstall	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-ReadyToInstall	BannerLine	Line	0	44	374	0	1				
-ReadyToInstall	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-ReadyToInstall	Branding2	Text	3	228	88	13	65537		[ProductName]		
-ReadyToInstall	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_166	Back	
-ReadyToInstall	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_167		
-ReadyToInstall	DlgLine	Line	90	234	284	0	1				
-ReadyToInstall	DlgText	Text	21	51	326	20	3		OOO_CONTROL_168		
-ReadyToInstall	DlgText1	Text	21	70	330	24	3		OOO_CONTROL_169		
-ReadyToInstall	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_170		
-ReadyToInstall	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_171		
-ReadyToInstall	DlgTitle3	Text	13	6	280	25	65538		OOO_CONTROL_172		
-ReadyToInstall	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_173	Cancel	
-ReadyToInstall	DesktopLink	CheckBox	21	100	300	10	3	CREATEDESKTOPLINK	OOO_CONTROL_319		
-ReadyToInstall	UpdateCheckBox	CheckBox	21	120	200	10	3	REMOVEOLDPRODUCTS	OOO_CONTROL_320		
-ReadyToRemove	Back	PushButton	164	243	66	17	3		OOO_CONTROL_174	RemoveNow	
-ReadyToRemove	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-ReadyToRemove	BannerLine	Line	0	44	374	0	1				
-ReadyToRemove	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-ReadyToRemove	Branding2	Text	3	228	88	13	65537		[ProductName]		
-ReadyToRemove	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_177	Back	
-ReadyToRemove	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_178		
-ReadyToRemove	DlgLine	Line	90	234	284	0	1				
-ReadyToRemove	DlgText	Text	21	51	326	24	3		OOO_CONTROL_179		
-ReadyToRemove	DlgText1	Text	21	79	330	23	3		OOO_CONTROL_180		
-ReadyToRemove	DlgText2	Text	21	102	330	24	3				
-ReadyToRemove	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_181		
-ReadyToRemove	RemoveNow	PushButton	230	243	66	17	3		OOO_CONTROL_182	Cancel	
-SetupCompleteError	Back	PushButton	164	243	66	17	1		OOO_CONTROL_183	Finish	
-SetupCompleteError	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_184	Back	
-SetupCompleteError	DlgLine	Line	0	234	374	0	1				
-SetupCompleteError	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_185	Cancel	
-SetupCompleteError	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_186		
-SetupCompleteError	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_187		
-SetupCompleteError	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupCompleteError	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_188		
-SetupCompleteError	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_189		
-SetupCompleteError	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_190		
-SetupCompleteError	TextLine2	Text	135	55	228	25	65539		OOO_CONTROL_191		
-SetupCompleteSuccess	Back	PushButton	164	243	66	17	1		OOO_CONTROL_192	OK	
-SetupCompleteSuccess	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_193	Image	
-SetupCompleteSuccess	CheckBoxUpdates	CheckBox	135	164	10	9	2	ISCHECKFORPRODUCTUPDATES	CheckBox1	Back	
-SetupCompleteSuccess	CheckForUpdatesText	Text	152	162	190	30	65538		OOO_CONTROL_194		
-SetupCompleteSuccess	CheckLaunchProgram	CheckBox	151	114	10	9	2	LAUNCHPROGRAM			
-SetupCompleteSuccess	CheckLaunchReadme	CheckBox	151	148	10	9	2	LAUNCHREADME			
-SetupCompleteSuccess	DlgLine	Line	0	234	374	0	1				
-SetupCompleteSuccess	Image	Bitmap	0	0	122	234	1		ImageBmp	CheckBoxUpdates	
-SetupCompleteSuccess	LaunchProgramText	Text	164	112	198	15	65538		OOO_CONTROL_195		
-SetupCompleteSuccess	LaunchReadmeText	Text	164	148	198	13	65538		OOO_CONTROL_196		
-SetupCompleteSuccess	OK	PushButton	230	243	66	17	3		OOO_CONTROL_197	Cancel	
-SetupCompleteSuccess	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_198		
-SetupCompleteSuccess	TextLine2	Text	135	55	228	45	65538		OOO_CONTROL_199		
-SetupCompleteSuccess	TextLine3	Text	135	55	228	45	65538		OOO_CONTROL_200		
-SetupCompleteSuccess	UpdateTextLine1	Text	135	30	228	45	65538		OOO_CONTROL_201		
-SetupCompleteSuccess	UpdateTextLine2	Text	135	80	228	45	65538		OOO_CONTROL_202		
-SetupCompleteSuccess	UpdateTextLine3	Text	135	120	228	45	65538		OOO_CONTROL_203		
-SetupError	A	PushButton	192	80	66	17	3		OOO_CONTROL_204		
-SetupError	C	PushButton	192	80	66	17	3		OOO_CONTROL_205		
-SetupError	ErrorText	Text	50	15	200	50	3		OOO_CONTROL_206		
-SetupError	I	PushButton	192	80	66	17	3		OOO_CONTROL_207		
-SetupError	N	PushButton	192	80	66	17	3		OOO_CONTROL_208		
-SetupError	O	PushButton	192	80	66	17	3		OOO_CONTROL_209		
-SetupError	R	PushButton	192	80	66	17	3		OOO_CONTROL_210		
-SetupError	WarningIcon	Icon	15	15	24	24	5242881		CautionIco		
-SetupError	Y	PushButton	192	80	66	17	3		OOO_CONTROL_211		
-SetupInitialization	ActionData	Text	135	125	228	12	65539				
-SetupInitialization	ActionText	Text	135	109	220	36	65539				
-SetupInitialization	Back	PushButton	164	243	66	17	1		OOO_CONTROL_214		
-SetupInitialization	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_215		
-SetupInitialization	DlgLine	Line	0	234	374	0	1				
-SetupInitialization	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupInitialization	Next	PushButton	230	243	66	17	1		OOO_CONTROL_216		
-SetupInitialization	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_217		
-SetupInitialization	TextLine2	Text	135	55	228	30	65539		OOO_CONTROL_218		
-SetupInterrupted	Back	PushButton	164	243	66	17	1		OOO_CONTROL_219		
-SetupInterrupted	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_220		
-SetupInterrupted	DlgLine	Line	0	234	374	0	1				
-SetupInterrupted	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_221		
-SetupInterrupted	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_222		
-SetupInterrupted	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_223		
-SetupInterrupted	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupInterrupted	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_224		
-SetupInterrupted	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_225		
-SetupInterrupted	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_226		
-SetupInterrupted	TextLine2	Text	135	55	228	25	65539		OOO_CONTROL_227		
-SetupProgress	ActionProgress95	ProgressBar	59	113	275	12	65537		OOO_CONTROL_228		
-SetupProgress	ActionText	Text	59	100	275	12	3				
-SetupProgress	Back	PushButton	164	243	66	17	1		OOO_CONTROL_230	Next	
-SetupProgress	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-SetupProgress	BannerLine	Line	0	44	374	0	1				
-SetupProgress	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-SetupProgress	Branding2	Text	3	228	88	13	65537		[ProductName]		
-SetupProgress	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_233	Back	
-SetupProgress	DlgDesc	Text	21	23	272	25	65538		OOO_CONTROL_234		
-SetupProgress	DlgDesc2	Text	21	23	272	25	65538		OOO_CONTROL_235		
-SetupProgress	DlgLine	Line	90	234	284	0	1				
-SetupProgress	DlgText	Text	59	51	275	30	65538		OOO_CONTROL_236		
-SetupProgress	DlgText2	Text	59	51	275	30	65538		OOO_CONTROL_237		
-SetupProgress	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_238		
-SetupProgress	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_239		
-SetupProgress	LbSec	Text	172	139	32	12	2		OOO_CONTROL_240		
-SetupProgress	LbStatus	Text	59	85	70	12	3		OOO_CONTROL_241		
-SetupProgress	Next	PushButton	230	243	66	17	1		OOO_CONTROL_242	Cancel	
-SetupProgress	SetupIcon	Icon	21	51	24	24	5242881		SetupIco		
-SetupProgress	ShowTime	Text	155	139	17	12	2				
-SetupProgress	TextTime	Text	59	139	96	12	2		OOO_CONTROL_244		
-SetupResume	Back	PushButton	164	243	66	17	1		OOO_CONTROL_245	Next	
-SetupResume	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_246	Back	
-SetupResume	DlgLine	Line	0	234	374	0	1				
-SetupResume	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupResume	Next	PushButton	230	243	66	17	3		OOO_CONTROL_247	Cancel	
-SetupResume	PreselectedText	Text	135	55	228	45	65539		OOO_CONTROL_248		
-SetupResume	ResumeText	Text	135	46	228	45	65539		OOO_CONTROL_249		
-SetupResume	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_250		
-SetupType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_251	Next	
-SetupType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-SetupType	BannerLine	Line	0	44	374	0	1				
-SetupType	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-SetupType	Branding2	Text	3	228	88	13	65537		[ProductName]		
-SetupType	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_254	RadioGroup	
-SetupType	CompleteIco	Icon	34	94	24	24	5242881		SetupCompleteIco		
-SetupType	CompText	Text	80	94	246	35	3		OOO_CONTROL_255		
-SetupType	CustomIco	Icon	34	154	24	24	5242881		SetupPartialIco		
-SetupType	CustText	Text	80	154	246	35	3		OOO_CONTROL_256		
-SetupType	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_257		
-SetupType	DlgLine	Line	90	234	284	0	1				
-SetupType	DlgText	Text	21	51	326	10	3		OOO_CONTROL_258		
-SetupType	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_259		
-SetupType	Next	PushButton	230	243	66	17	3		OOO_CONTROL_260	Cancel	
-SetupType	RadioGroup	RadioButtonGroup	21	79	264	120	3	_IsSetupTypeMin		Back	
-SplashBitmap	Back	PushButton	164	243	66	17	1		OOO_CONTROL_262	Next	
-SplashBitmap	Branding1	Text	4	229	88	13	3		{&MSSWhiteSerif8}[ProductName]		
-SplashBitmap	Branding2	Text	3	228	88	13	65537		[ProductName]		
-SplashBitmap	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_265	Back	
-SplashBitmap	DlgLine	Line	90	234	284	0	1				
-SplashBitmap	Image	Bitmap	13	12	114	211	1		ImageBmp		
-SplashBitmap	Next	PushButton	230	243	66	17	3		OOO_CONTROL_266	Cancel	
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
deleted file mode 100644
index f335fb682..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
+++ /dev/null
@@ -1,79 +0,0 @@
-Dialog_	Control_	Action	Condition
-s72	s50	s50	s255
-ControlCondition	Dialog_	Control_	Action	Condition
-CustomerInformation	DlgRadioGroupText	Hide	NOT Privileged
-CustomerInformation	DlgRadioGroupText	Hide	ProductState > 0
-CustomerInformation	DlgRadioGroupText	Hide	Version9X
-CustomerInformation	RadioGroup	Hide	NOT Privileged
-CustomerInformation	RadioGroup	Hide	ProductState > 0
-CustomerInformation	RadioGroup	Hide	Version9X
-CustomerInformation	SerialLabel	Show	SERIALNUMSHOW
-CustomerInformation	SerialNumber	Show	SERIALNUMSHOW
-CustomSetup	ChangeFolder	Hide	Installed
-CustomSetup	Details	Hide	Installed
-CustomSetup	InstallLabel	Hide	Installed
-FileTypeDialog	CheckBox1	Enable	&gm_p_Wrt=3 OR ( !gm_p_Wrt=3 AND &gm_p_Wrt=-1 )
-FileTypeDialog	CheckBox1	Disable	NOT ( &gm_p_Wrt=3 OR ( !gm_p_Wrt=3 AND &gm_p_Wrt=-1 ) )
-FileTypeDialog	CheckBox2	Enable	&gm_p_Calc=3 OR ( !gm_p_Calc=3 AND &gm_p_Calc=-1 )
-FileTypeDialog	CheckBox2	Disable	NOT ( &gm_p_Calc=3 OR ( !gm_p_Calc=3 AND &gm_p_Calc=-1 ) )
-FileTypeDialog	CheckBox3	Enable	&gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 )
-FileTypeDialog	CheckBox3	Disable	NOT ( &gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 ) )
-InstallWelcome	Copyright	Hide	SHOWCOPYRIGHT="No"
-InstallWelcome	Copyright	Show	SHOWCOPYRIGHT="Yes"
-LicenseAgreement	Next	Disable	AgreeToLicense <> "Yes"
-LicenseAgreement	Next	Enable	AgreeToLicense = "Yes"
-ReadyToInstall	DlgTitle	Show	ProgressType0="Modify"
-ReadyToInstall	DlgTitle2	Show	ProgressType0="Repair"
-ReadyToInstall	DlgTitle3	Show	ProgressType0="install"
-ReadyToInstall	DesktopLink	Hide	NOT DESKTOPLINKEXISTS
-ReadyToInstall	UpdateCheckBox	Hide	OLDPRODUCTS=""
-ReadyToInstall	UpdateCheckBox	Show	OLDPRODUCTS<>""
-SetupCompleteError	Back	Default	UpdateStarted
-SetupCompleteError	Back	Disable	NOT UpdateStarted
-SetupCompleteError	Back	Enable	UpdateStarted
-SetupCompleteError	Cancel	Disable	NOT UpdateStarted
-SetupCompleteError	Cancel	Enable	UpdateStarted
-SetupCompleteError	Finish	Default	NOT UpdateStarted
-SetupCompleteError	FinishText1	Hide	UpdateStarted
-SetupCompleteError	FinishText1	Show	NOT UpdateStarted
-SetupCompleteError	FinishText2	Hide	UpdateStarted
-SetupCompleteError	FinishText2	Show	NOT UpdateStarted
-SetupCompleteError	RestContText1	Hide	NOT UpdateStarted
-SetupCompleteError	RestContText1	Show	UpdateStarted
-SetupCompleteError	RestContText2	Hide	NOT UpdateStarted
-SetupCompleteError	RestContText2	Show	UpdateStarted
-SetupCompleteSuccess	CheckBoxUpdates	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	CheckForUpdatesText	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	CheckLaunchProgram	Show	SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	CheckLaunchReadme	Show	SHOWLAUNCHREADME="-1"  And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	LaunchProgramText	Show	SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	LaunchReadmeText	Show	SHOWLAUNCHREADME="-1"  And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	TextLine2	Show	ProgressType2="installed" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess	TextLine3	Show	ProgressType2="uninstalled" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess	UpdateTextLine1	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	UpdateTextLine2	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	UpdateTextLine3	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupInterrupted	Back	Default	UpdateStarted
-SetupInterrupted	Back	Disable	NOT UpdateStarted
-SetupInterrupted	Back	Enable	UpdateStarted
-SetupInterrupted	Cancel	Disable	NOT UpdateStarted
-SetupInterrupted	Cancel	Enable	UpdateStarted
-SetupInterrupted	Finish	Default	NOT UpdateStarted
-SetupInterrupted	FinishText1	Hide	UpdateStarted
-SetupInterrupted	FinishText1	Show	NOT UpdateStarted
-SetupInterrupted	FinishText2	Hide	UpdateStarted
-SetupInterrupted	FinishText2	Show	NOT UpdateStarted
-SetupInterrupted	RestContText1	Hide	NOT UpdateStarted
-SetupInterrupted	RestContText1	Show	UpdateStarted
-SetupInterrupted	RestContText2	Hide	NOT UpdateStarted
-SetupInterrupted	RestContText2	Show	UpdateStarted
-SetupProgress	DlgDesc	Show	ProgressType2="installed"
-SetupProgress	DlgDesc2	Show	ProgressType2="uninstalled"
-SetupProgress	DlgText	Show	ProgressType3="installs"
-SetupProgress	DlgText2	Show	ProgressType3="uninstalls"
-SetupProgress	DlgTitle	Show	ProgressType1="Installing"
-SetupProgress	DlgTitle2	Show	ProgressType1="Uninstalling"
-SetupResume	PreselectedText	Hide	RESUME
-SetupResume	PreselectedText	Show	NOT RESUME
-SetupResume	ResumeText	Hide	NOT RESUME
-SetupResume	ResumeText	Show	RESUME
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
deleted file mode 100644
index 56bf6b92d..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ /dev/null
@@ -1,152 +0,0 @@
-Dialog_	Control_	Event	Argument	Condition	Ordering
-s72	s50	s50	s255	S255	I2
-ControlEvent	Dialog_	Control_	Event	Argument	Condition
-AdminChangeFolder	Cancel	EndDialog	Return	1	2
-AdminChangeFolder	Cancel	Reset	0	1	1
-AdminChangeFolder	NewFolder	DirectoryListNew	0	1	0
-AdminChangeFolder	OK	EndDialog	Return	1	0
-AdminChangeFolder	OK	SetTargetPath	TARGETDIR	1	1
-AdminChangeFolder	Up	DirectoryListUp	0	1	0
-AdminNetworkLocation	Back	NewDialog	AdminWelcome	1	0
-AdminNetworkLocation	Browse	SpawnDialog	AdminChangeFolder	1	0
-AdminNetworkLocation	Cancel	SpawnDialog	CancelSetup	1	0
-AdminNetworkLocation	InstallNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	3
-AdminNetworkLocation	InstallNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	2
-AdminNetworkLocation	InstallNow	SetTargetPath	TARGETDIR	1	1
-AdminWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-AdminWelcome	Next	NewDialog	AdminNetworkLocation	1	0
-ApplicationInfo1	OK	EndDialog	Return	1	0
-CancelSetup	No	EndDialog	Return	1	0
-CancelSetup	Yes	EndDialog	Exit	1	2
-CustomerInformation	Back	NewDialog	LicenseAgreement	HIDEEULA <> 1	1
-CustomerInformation	Back	NewDialog	InstallWelcome	HIDEEULA = 1	1
-CustomerInformation	Cancel	SpawnDialog	CancelSetup	1	0
-CustomerInformation	Next	[ALLUSERS]	{}	ApplicationUsers = "OnlyCurrentUser" And Privileged	2
-CustomerInformation	Next	[ALLUSERS]	1	ApplicationUsers = "AllUsers" And Privileged	1
-CustomerInformation	Next	EndDialog	Exit	(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT<0) And (SERIALNUMVALRETURN<>SERIALNUMVALSUCCESSRETVAL)	3
-CustomerInformation	Next	NewDialog	SetupType	((Not SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))	4
-CustomSetup	Back	NewDialog	MaintenanceType	Installed	0
-CustomSetup	Back	NewDialog	SetupType	NOT Installed	0
-CustomSetup	Cancel	SpawnDialog	CancelSetup	1	0
-CustomSetup	ChangeFolder	SelectionBrowse	InstallChangeFolder	1	0
-CustomSetup	Details	SelectionBrowse	DiskSpaceRequirements	1	1
-CustomSetup	Help	SpawnDialog	CustomSetupTips	1	1
-CustomSetup	Next	[_IsSetupTypeMin]	Custom	1	0
-CustomSetup	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-CustomSetup	Next	NewDialog	FileTypeDialog	OutOfNoRbDiskSpace <> 1 And (LANG_SELECTED = 1) And (APP_SELECTED = 1)	9
-CustomSetup	Next	DoAction	ResetLanguageSelected	1	1
-CustomSetup	Next	DoAction	SetLanguageSelected	(isMulti <> 1) Or Installed	3
-CustomSetup	Next	DoAction	SetLanguageSelected	(isMulti = 1) And Not Installed And (LANGUAGECONDITIONINSTALL)	4
-CustomSetup	Next	SpawnDialog	LanguageInfo1	(isMulti = 1) And (LANG_SELECTED <> 1)	7
-CustomSetup	Next	DoAction	ResetApplicationSelected	1	2
-CustomSetup	Next	DoAction	SetApplicationSelected	Not Installed And (APPLICATIONCONDITIONINSTALL)	5
-CustomSetup	Next	DoAction	SetApplicationSelected	Installed	5
-CustomSetup	Next	SpawnDialog	ApplicationInfo1	APP_SELECTED <> 1	6
-CustomSetupTips	OK	EndDialog	Return	1	1
-DatabaseFolder	Back	NewDialog	CustomerInformation	1	1
-DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
-DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
-DatabaseFolder	Next	NewDialog	SetupType	1	1
-DestinationFolder	Back	NewDialog	CustomerInformation	1	0
-DestinationFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DestinationFolder	ChangeFolder	[_BrowseProperty]	INSTALLLOCATION	1	2
-DestinationFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
-DestinationFolder	Next	NewDialog	SetupType	1	0
-DiskSpaceRequirements	OK	EndDialog	Return	1	0
-FilesInUse	Exit	EndDialog	Exit	1	0
-FilesInUse	Ignore	EndDialog	Ignore	1	0
-FilesInUse	Retry	EndDialog	Retry	1	0
-FileTypeDialog	Back	NewDialog	CustomSetup	1	1
-FileTypeDialog	Cancel	SpawnDialog	CancelSetup	1	0
-FileTypeDialog	Next	NewDialog	ReadyToInstall	1	0
-InstallChangeFolder	Cancel	EndDialog	Return	1	2
-InstallChangeFolder	Cancel	Reset	0	1	1
-InstallChangeFolder	NewFolder	DirectoryListNew	0	1	0
-InstallChangeFolder	OK	EndDialog	Return	1	3
-InstallChangeFolder	OK	SetTargetPath	[_BrowseProperty]	1	2
-InstallChangeFolder	Up	DirectoryListUp	0	1	0
-InstallWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	1
-InstallWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-InstallWelcome	Next	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-InstallWelcome	Next	NewDialog	CustomerInformation	HIDEEULA = 1	0
-LanguageInfo1	OK	EndDialog	Return	1	0
-LanguageSelection	Back	NewDialog	CustomerInformation	1	1
-LanguageSelection	Cancel	SpawnDialog	CancelSetup	1	1
-LanguageSelection	Next	NewDialog	SetupType	1	1
-LicenseAgreement	Back	NewDialog	InstallWelcome	1	0
-LicenseAgreement	Cancel	SpawnDialog	CancelSetup	1	0
-LicenseAgreement	Next	NewDialog	CustomerInformation	AgreeToLicense = "Yes"	0
-MaintenanceType	Back	NewDialog	MaintenanceWelcome	1	0
-MaintenanceType	Cancel	SpawnDialog	CancelSetup	1	0
-MaintenanceType	Next	[ProgressType0]	Modify	_IsMaintenance = "Change"	2
-MaintenanceType	Next	[ProgressType0]	Repair	_IsMaintenance = "Reinstall"	1
-MaintenanceType	Next	[ProgressType1]	Modifying	_IsMaintenance = "Change"	3
-MaintenanceType	Next	[ProgressType1]	Repairing	_IsMaintenance = "Reinstall"	4
-MaintenanceType	Next	[ProgressType2]	modified	_IsMaintenance = "Change"	6
-MaintenanceType	Next	[ProgressType2]	repairs	_IsMaintenance = "Reinstall"	5
-MaintenanceType	Next	[ProgressType3]	modifies	_IsMaintenance = "Change"	7
-MaintenanceType	Next	[ProgressType3]	repairs	_IsMaintenance = "Reinstall"	8
-MaintenanceType	Next	NewDialog	CustomSetup	_IsMaintenance = "Change"	12
-MaintenanceType	Next	NewDialog	ReadyToInstall	_IsMaintenance = "Reinstall"	13
-MaintenanceType	Next	NewDialog	ReadyToRemove	_IsMaintenance = "Remove"	11
-MaintenanceType	Next	Reinstall	ALL	_IsMaintenance = "Reinstall"	10
-MaintenanceType	Next	ReinstallMode	[ReinstallModeText]	_IsMaintenance = "Reinstall"	9
-MaintenanceWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-MaintenanceWelcome	Next	NewDialog	MaintenanceType	1	0
-OutOfSpace	Resume	NewDialog	AdminNetworkLocation	ACTION = "ADMIN"	0
-OutOfSpace	Resume	NewDialog	CustomSetup	ACTION <> "ADMIN"	0
-PatchWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	0
-PatchWelcome	Cancel	SpawnDialog	CancelSetup	1	1
-PatchWelcome	Next	EndDialog	Return	1	3
-PatchWelcome	Next	Reinstall	ALL	PATCH And REINSTALL=""	1
-PatchWelcome	Next	ReinstallMode	omus	PATCH And REINSTALLMODE=""	2
-ReadyToInstall	Back	NewDialog	FileTypeDialog	Installed OR _IsSetupTypeMin = "Custom"	2
-ReadyToInstall	Back	NewDialog	MaintenanceType	Installed AND _IsMaintenance = "Reinstall"	3
-ReadyToInstall	Back	NewDialog	SetupType	NOT Installed AND _IsSetupTypeMin <> "Custom"	1
-ReadyToInstall	Cancel	SpawnDialog	CancelSetup	1	0
-ReadyToInstall	InstallNow	[ProgressType1]	Installing	1	0
-ReadyToInstall	InstallNow	[ProgressType2]	installed	1	0
-ReadyToInstall	InstallNow	[ProgressType3]	installs	1	0
-ReadyToInstall	InstallNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
-ReadyToInstall	InstallNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-ReadyToRemove	Back	NewDialog	MaintenanceType	1	0
-ReadyToRemove	Cancel	SpawnDialog	CancelSetup	1	0
-ReadyToRemove	RemoveNow	[ProgressType1]	Uninstalling	1	0
-ReadyToRemove	RemoveNow	[ProgressType2]	uninstalled	1	0
-ReadyToRemove	RemoveNow	[ProgressType3]	uninstalls	1	0
-ReadyToRemove	RemoveNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	2
-ReadyToRemove	RemoveNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	2
-ReadyToRemove	RemoveNow	Remove	ALL	1	1
-SetupCompleteError	Back	[Suspend]	{}	1	1
-SetupCompleteError	Back	EndDialog	Return	1	2
-SetupCompleteError	Cancel	[Suspend]	1	1	1
-SetupCompleteError	Cancel	EndDialog	Return	1	2
-SetupCompleteError	Finish	EndDialog	Exit	1	2
-SetupCompleteSuccess	OK	DoAction	CheckForProductUpdates	ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And NOT ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL"	4
-SetupCompleteSuccess	OK	DoAction	CheckForProductUpdatesOnReboot	ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL"	5
-SetupCompleteSuccess	OK	EndDialog	Exit	1	2
-SetupError	A	EndDialog	ErrorAbort	1	0
-SetupError	C	EndDialog	ErrorCancel	1	0
-SetupError	I	EndDialog	ErrorIgnore	1	0
-SetupError	N	EndDialog	ErrorNo	1	0
-SetupError	O	EndDialog	ErrorOk	1	0
-SetupError	R	EndDialog	ErrorRetry	1	0
-SetupError	Y	EndDialog	ErrorYes	1	0
-SetupInitialization	Cancel	SpawnDialog	CancelSetup	1	0
-SetupInterrupted	Back	[Suspend]	{}	1	1
-SetupInterrupted	Back	EndDialog	Exit	1	2
-SetupInterrupted	Cancel	[Suspend]	1	1	1
-SetupInterrupted	Cancel	EndDialog	Exit	1	2
-SetupInterrupted	Finish	EndDialog	Exit	1	2
-SetupProgress	Cancel	SpawnDialog	CancelSetup	1	0
-SetupResume	Cancel	SpawnDialog	CancelSetup	1	0
-SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
-SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-SetupType	Back	NewDialog	CustomerInformation	1	0
-SetupType	Cancel	SpawnDialog	CancelSetup	1	0
-SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
-SetupType	Next	[FILETYPEDIALOGUSED]	0	_IsSetupTypeMin <> "Custom"	5
-SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	6
-SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
-SplashBitmap	Next	NewDialog	InstallWelcome	1	0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
deleted file mode 100644
index 8708803f2..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ /dev/null
@@ -1,132 +0,0 @@
-Action	Type	Source	Target
-s72	i2	S64	S255
-CustomAction	Action
-ISInitAllUsers	307	ALLUSERS	1
-DontRemoveProducts	51	OLDPRODUCTS	{}
-DontRemoveLpafProducts	51	O2LPAF	{}
-DontRemoveLparProducts	51	O2LPAR	{}
-DontRemoveLpasinProducts	51	O2LPASIN	{}
-DontRemoveLpbebyProducts	51	O2LPBEBY	{}
-DontRemoveLpboProducts	51	O2LPBO	{}
-DontRemoveLpbgProducts	51	O2LPBG	{}
-DontRemoveLpbrProducts	51	O2LPBR	{}
-DontRemoveLpbrxProducts	51	O2LPBRX	{}
-DontRemoveLpbnProducts	51	O2LPBN	{}
-DontRemoveLpbnbdProducts	51	O2LPBNBD	{}
-DontRemoveLpbninProducts	51	O2LPBNIN	{}
-DontRemoveLpbsProducts	51	O2LPBS	{}
-DontRemoveLpbyProducts	51	O2LPBY	{}
-DontRemoveLpcaProducts	51	O2LPCA	{}
-DontRemoveLpcsProducts	51	O2LPCS	{}
-DontRemoveLpcyProducts	51	O2LPCY	{}
-DontRemoveLpdaProducts	51	O2LPDA	{}
-DontRemoveLpdeProducts	51	O2LPDE	{}
-DontRemoveLpdgoProducts	51	O2LPDGO	{}
-DontRemoveLpdzProducts	51	O2LPDZ	{}
-DontRemoveLpelProducts	51	O2LPEL	{}
-DontRemoveLpengbProducts	51	O2LPENGB	{}
-DontRemoveLpenusProducts	51	O2LPENUS	{}
-DontRemoveLpenzaProducts	51	O2LPENZA	{}
-DontRemoveLpeoProducts	51	O2LPEO	{}
-DontRemoveLpesProducts	51	O2LPES	{}
-DontRemoveLpetProducts	51	O2LPET	{}
-DontRemoveLpeuProducts	51	O2LPEU	{}
-DontRemoveLpfaProducts	51	O2LPFA	{}
-DontRemoveLpfiProducts	51	O2LPFI	{}
-DontRemoveLpfrProducts	51	O2LPFR	{}
-DontRemoveLpgaProducts	51	O2LPGA	{}
-DontRemoveLpgdProducts	51	O2LPGD	{}
-DontRemoveLpglProducts	51	O2LPGL	{}
-DontRemoveLpguProducts	51	O2LPGU	{}
-DontRemoveLpguinProducts	51	O2LPGUIN	{}
-DontRemoveLpheProducts	51	O2LPHE	{}
-DontRemoveLphiProducts	51	O2LPHI	{}
-DontRemoveLphiinProducts	51	O2LPHIIN	{}
-DontRemoveLphrProducts	51	O2LPHR	{}
-DontRemoveLphuProducts	51	O2LPHU	{}
-DontRemoveLpisProducts	51	O2LPIS	{}
-DontRemoveLpitProducts	51	O2LPIT	{}
-DontRemoveLpjaProducts	51	O2LPJA	{}
-DontRemoveLpkidProducts	51	O2LPKID	{}
-DontRemoveLpkyProducts	51	O2LPKY	{}
-DontRemoveLpkaProducts	51	O2LPKA	{}
-DontRemoveLpkkProducts	51	O2LPKK	{}
-DontRemoveLpkmProducts	51	O2LPKM	{}
-DontRemoveLpknProducts	51	O2LPKN	{}
-DontRemoveLpkoProducts	51	O2LPKO	{}
-DontRemoveLpkokProducts	51	O2LPKOK	{}
-DontRemoveLpksProducts	51	O2LPKS	{}
-DontRemoveLpkuProducts	51	O2LPKU	{}
-DontRemoveLploProducts	51	O2LPLO	{}
-DontRemoveLpltProducts	51	O2LPLT	{}
-DontRemoveLplvProducts	51	O2LPLV	{}
-DontRemoveLpmaiProducts	51	O2LPMAI	{}
-DontRemoveLpmkProducts	51	O2LPMK	{}
-DontRemoveLpmnProducts	51	O2LPMN	{}
-DontRemoveLpmniProducts	51	O2LPMNI	{}
-DontRemoveLpmsProducts	51	O2LPMS	{}
-DontRemoveLpmlinProducts	51	O2LPMLIN	{}
-DontRemoveLpmrinProducts	51	O2LPMRIN	{}
-DontRemoveLpmyProducts	51	O2LPMY	{}
-DontRemoveLpneProducts	51	O2LPNE	{}
-DontRemoveLpnbProducts	51	O2LPNB	{}
-DontRemoveLpnlProducts	51	O2LPNL	{}
-DontRemoveLpnnProducts	51	O2LPNN	{}
-DontRemoveLpnoProducts	51	O2LPNO	{}
-DontRemoveLpnrProducts	51	O2LPNR	{}
-DontRemoveLpnsProducts	51	O2LPNS	{}
-DontRemoveLpomProducts	51	O2LPOM	{}
-DontRemoveLpocProducts	51	O2LPOC	{}
-DontRemoveLporinProducts	51	O2LPORIN	{}
-DontRemoveLppapProducts	51	O2LPPAP	{}
-DontRemoveLppainProducts	51	O2LPPAIN	{}
-DontRemoveLpplProducts	51	O2LPPL	{}
-DontRemoveLppsProducts	51	O2LPPS	{}
-DontRemoveLpptProducts	51	O2LPPT	{}
-DontRemoveLpptbrProducts	51	O2LPPTBR	{}
-DontRemoveLpruProducts	51	O2LPRU	{}
-DontRemoveLprwProducts	51	O2LPRW	{}
-DontRemoveLpsatProducts	51	O2LPSAT	{}
-DontRemoveLpsainProducts	51	O2LPSAIN	{}
-DontRemoveLpsiProducts	51	O2LPSI	{}
-DontRemoveLpscProducts	51	O2LPSC	{}
-DontRemoveLpsdProducts	51	O2LPSD	{}
-DontRemoveLpskProducts	51	O2LPSK	{}
-DontRemoveLpslProducts	51	O2LPSL	{}
-DontRemoveLpshProducts	51	O2LPSH	{}
-DontRemoveLpsrProducts	51	O2LPSR	{}
-DontRemoveLpssProducts	51	O2LPSS	{}
-DontRemoveLpstProducts	51	O2LPST	{}
-DontRemoveLpsvProducts	51	O2LPSV	{}
-DontRemoveLpswProducts	51	O2LPSW	{}
-DontRemoveLpswtzProducts	51	O2LPSWTZ	{}
-DontRemoveLpteinProducts	51	O2LPTEIN	{}
-DontRemoveLptierProducts	51	O2LPTIER	{}
-DontRemoveLptainProducts	51	O2LPTAIN	{}
-DontRemoveLpthProducts	51	O2LPTH	{}
-DontRemoveLptnProducts	51	O2LPTN	{}
-DontRemoveLptrProducts	51	O2LPTR	{}
-DontRemoveLptsProducts	51	O2LPTS	{}
-DontRemoveLptgProducts	51	O2LPTG	{}
-DontRemoveLpugProducts	51	O2LPUG	{}
-DontRemoveLpurinProducts	51	O2LPURIN	{}
-DontRemoveLpukProducts	51	O2LPUK	{}
-DontRemoveLpuzProducts	51	O2LPUZ	{}
-DontRemoveLpveProducts	51	O2LPVE	{}
-DontRemoveLpviProducts	51	O2LPVI	{}
-DontRemoveLpxhProducts	51	O2LPXH	{}
-DontRemoveLpzhcnProducts	51	O2LPZHCN	{}
-DontRemoveLpzhtwProducts	51	O2LPZHTW	{}
-DontRemoveLpzuProducts	51	O2LPZU	{}
-setAllUsersProfile2K	51	ALLUSERSPROFILE	[%ALLUSERSPROFILE]
-SetAllUsersProfileNT	51	ALLUSERSPROFILE	[%SystemRoot]\Profiles\All Users
-setUserProfileNT	51	USERPROFILE	[%USERPROFILE]
-SetARPInstallLocation	51	ARPINSTALLLOCATION	[INSTALLLOCATION]
-SetInstalllocation	51	RegisterExtensions	[INSTALLLOCATION]
-NewProductFound	19		OOO_CUSTOMACTION_1
-SameProductFound	19		OOO_CUSTOMACTION_2
-SetLanguageSelected	51	LANG_SELECTED	1
-ResetLanguageSelected	51	LANG_SELECTED	0
-SetApplicationSelected	51	APP_SELECTED	1
-ResetApplicationSelected	51	APP_SELECTED	0
-RunningOffice	19		OOO_CUSTOMACTION_4
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
deleted file mode 100644
index 48f5d2aa3..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
+++ /dev/null
@@ -1,36 +0,0 @@
-Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control_Default	Control_Cancel
-s72	i2	i2	i2	i2	I4	L128	s50	S50	S50
-Dialog	Dialog
-AdminChangeFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	TailText	OK	Cancel
-AdminNetworkLocation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	InstallNow	InstallNow	Cancel
-AdminWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-ApplicationInfo1	50	50	260	85	3	[ProductName]  - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-CancelSetup	50	50	260	85	3	[ProductName] [Setup]	No	No	No
-CustomerInformation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	NameLabel	Next	Cancel
-CustomSetup	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	Tree	Next	Cancel
-CustomSetupTips	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-DatabaseFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-DestinationFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-DiskSpaceRequirements	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-FilesInUse	50	50	374	266	19	[ProductName] - [STR_INSTALLATION_WIZARD]	Retry	Retry	Exit
-FileTypeDialog	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	CheckBox1	Next	Cancel
-InstallChangeFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	TailText	OK	Cancel
-InstallWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-LanguageInfo1	50	50	260	85	3	[ProductName]  - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-LanguageSelection	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-LicenseAgreement	50	50	374	266	2	[ProductName] - [STR_INSTALLATION_WIZARD]	Agree	Next	Cancel
-MaintenanceType	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RadioGroup	Next	Cancel
-MaintenanceWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-OutOfSpace	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Resume	Resume	Resume
-PatchWelcome	50	50	374	266	3	[ProductName] Patch - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-ReadyToInstall	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	InstallNow	InstallNow	Cancel
-ReadyToRemove	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RemoveNow	RemoveNow	Cancel
-SetupCompleteError	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Finish	Finish	Finish
-SetupCompleteSuccess	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-SetupError	50	10	270	110	65543	[ProductName] [STR_INSTALLATION_WIZARD]	ErrorText	O	C
-SetupInitialization	50	50	374	266	5	[ProductName] - [STR_INSTALLATION_WIZARD]	Cancel	Cancel	Cancel
-SetupInterrupted	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Finish	Finish	Finish
-SetupProgress	50	50	374	266	5	[ProductName] - [STR_INSTALLATION_WIZARD]	Cancel	Cancel	Cancel
-SetupResume	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-SetupType	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RadioGroup	Next	Cancel
-SplashBitmap	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt
deleted file mode 100644
index 9789d0cf5..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt
+++ /dev/null
@@ -1,133 +0,0 @@
-Error	Message
-i2	L0
-WINDOWSENCODINGTEMPLATE	Error	Error
-0	OOO_ERROR_1
-1	OOO_ERROR_2
-2	OOO_ERROR_3 
-4	OOO_ERROR_4 
-5	OOO_ERROR_5
-7	OOO_ERROR_6
-8	OOO_ERROR_7
-9	OOO_ERROR_8
-10	OOO_ERROR_9
-11	OOO_ERROR_10
-12	OOO_ERROR_11
-13	OOO_ERROR_12
-14	OOO_ERROR_13
-15	OOO_ERROR_14
-16	OOO_ERROR_15
-17	OOO_ERROR_16
-18	OOO_ERROR_17
-19	OOO_ERROR_18
-20	OOO_ERROR_19
-21	OOO_ERROR_20
-22	OOO_ERROR_21
-23	OOO_ERROR_22
-32	OOO_ERROR_23
-33	OOO_ERROR_24
-1101	OOO_ERROR_25
-1301	OOO_ERROR_26
-1302	OOO_ERROR_27
-1303	OOO_ERROR_28
-1304	OOO_ERROR_29
-1305	OOO_ERROR_30
-1306	OOO_ERROR_31.
-1307	OOO_ERROR_32
-1308	OOO_ERROR_33
-1309	OOO_ERROR_34
-1310	OOO_ERROR_35
-1311	OOO_ERROR_36
-1312	OOO_ERROR_37
-1313	OOO_ERROR_38
-1314	OOO_ERROR_39
-1315	OOO_ERROR_40
-1316	OOO_ERROR_41.
-1317	OOO_ERROR_42
-1318	OOO_ERROR_43
-1319	OOO_ERROR_44
-1320	OOO_ERROR_45
-1321	OOO_ERROR_46
-1322	OOO_ERROR_47
-1323	OOO_ERROR_48
-1324	OOO_ERROR_49
-1325	OOO_ERROR_50
-1326	OOO_ERROR_51
-1327	OOO_ERROR_52
-1328	OOO_ERROR_53
-1401	OOO_ERROR_54 
-1402	OOO_ERROR_55 
-1403	OOO_ERROR_56 
-1404	OOO_ERROR_57 
-1405	OOO_ERROR_58 
-1406	OOO_ERROR_59
-1407	OOO_ERROR_60
-1408	OOO_ERROR_61 
-1409	OOO_ERROR_62
-1410	OOO_ERROR_63
-1500	OOO_ERROR_64
-1501	OOO_ERROR_65
-1502	OOO_ERROR_66
-1503	OOO_ERROR_67
-1601	OOO_ERROR_68
-1602	OOO_ERROR_69
-1603	OOO_ERROR_70
-1604	OOO_ERROR_71
-1605	OOO_ERROR_72
-1606	OOO_ERROR_73
-1607	OOO_ERROR_74
-1608	OOO_ERROR_75
-1701	OOO_ERROR_76
-1702	OOO_ERROR_77
-1703	OOO_ERROR_78
-1704	OOO_ERROR_79
-1705	OOO_ERROR_80
-1706	OOO_ERROR_81
-1707	OOO_ERROR_82
-1708	OOO_ERROR_83
-1709	OOO_ERROR_84
-1710	OOO_ERROR_85
-1711	OOO_ERROR_86
-1712	OOO_ERROR_87
-1713	OOO_ERROR_88
-1714	OOO_ERROR_89
-1801	OOO_ERROR_90
-1802	OOO_ERROR_91
-1803	OOO_ERROR_92
-1804	OOO_ERROR_93
-1805	OOO_ERROR_94
-1806	OOO_ERROR_95
-1807	OOO_ERROR_96
-1901	OOO_ERROR_97
-1902	OOO_ERROR_98
-1903	OOO_ERROR_99
-1904	OOO_ERROR_100.
-1905	OOO_ERROR_101
-1906	OOO_ERROR_102
-1907	OOO_ERROR_103
-1908	OOO_ERROR_104
-1909	OOO_ERROR_105
-1910	OOO_ERROR_106
-1911	OOO_ERROR_107
-1912	OOO_ERROR_108
-1913	OOO_ERROR_109
-1914	OOO_ERROR_110
-1915	OOO_ERROR_111
-1916	OOO_ERROR_112
-1917	OOO_ERROR_113
-1918	OOO_ERROR_114
-1919	OOO_ERROR_115
-1920	OOO_ERROR_116
-1921	OOO_ERROR_117
-1922	OOO_ERROR_118
-1923	OOO_ERROR_119
-1924	OOO_ERROR_120
-1925	OOO_ERROR_121
-1926	OOO_ERROR_122
-1927	OOO_ERROR_123
-1928	OOO_ERROR_124
-1929	OOO_ERROR_125
-1930	OOO_ERROR_126
-1931	OOO_ERROR_127
-1932	OOO_ERROR_128
-1933	OOO_ERROR_129
-1934	OOO_ERROR_130
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/EventMap.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/EventMap.idt
deleted file mode 100644
index 794eaf1a5..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/EventMap.idt
+++ /dev/null
@@ -1,18 +0,0 @@
-Dialog_	Control_	Event	Attribute
-s72	s50	s50	s50
-EventMapping	Dialog_	Control_	Event
-CustomSetup	ItemDescription	SelectionDescription	Text
-CustomSetup	Location	SelectionPath	Text
-CustomSetup	Size	SelectionSize	Text
-SetupInitialization	ActionData	ActionData	Text
-SetupInitialization	ActionText	ActionText	Text
-SetupProgress	ActionProgress95	AdminInstallFinalize	Progress
-SetupProgress	ActionProgress95	InstallFiles	Progress
-SetupProgress	ActionProgress95	MoveFiles	Progress
-SetupProgress	ActionProgress95	RemoveFiles	Progress
-SetupProgress	ActionProgress95	RemoveRegistryValues	Progress
-SetupProgress	ActionProgress95	SetProgress	Progress
-SetupProgress	ActionProgress95	UnmoveFiles	Progress
-SetupProgress	ActionProgress95	WriteIniValues	Progress
-SetupProgress	ActionProgress95	WriteRegistryValues	Progress
-SetupProgress	ActionText	ActionText	Text
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
deleted file mode 100644
index 13ac5a5aa..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ /dev/null
@@ -1,192 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-InstallExecuteSequence	Action
-AllocateRegistrySpace	NOT Installed	750
-AppSearch		25
-BindImage		2100
-CCPSearch	CCP_TEST	200
-CostFinalize		500
-CostInitialize		350
-CreateFolders		1850
-CreateShortcuts		2150
-DeleteServices	VersionNT	1000
-DontRemoveProducts	REMOVEOLDPRODUCTS<>"1"	155
-DontRemoveLpafProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLparProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpasinProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpbebyProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpboProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpbgProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpbrProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpbrxProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpbnProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpbnbdProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpbninProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpbsProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpbyProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpcaProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpcsProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpcyProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpdaProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpdeProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpdgoProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpdzProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpelProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpengbProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpenusProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpenzaProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpeoProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpesProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpetProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpeuProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpfaProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpfiProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpfrProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpgaProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpgdProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpglProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpguProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpguinProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpheProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLphiProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLphiinProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLphrProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLphuProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpisProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpitProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpjaProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpkidProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpkyProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpkaProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpkkProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpkmProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpknProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpkoProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpkokProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpksProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpkuProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLploProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpltProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLplvProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpmaiProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpmkProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpmnProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpmniProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpmsProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpmlinProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpmrinProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpmyProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpneProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpnbProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpnlProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpnnProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpnoProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpnrProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpnsProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpomProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpocProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLporinProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLppapProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLppainProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpplProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLppsProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpptProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpptbrProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpruProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLprwProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpsatProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpsainProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpsiProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpscProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpsdProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpskProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpslProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpshProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpsrProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpssProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpstProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpsvProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpswProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpswtzProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpteinProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLptierProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLptainProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpthProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLptnProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLptrProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLptsProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLptgProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpugProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpurinProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpukProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpuzProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpveProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpviProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpxhProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpzhcnProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpzhtwProducts	REMOVEOLDPRODUCTS<>"1"	160
-DontRemoveLpzuProducts	REMOVEOLDPRODUCTS<>"1"	160
-DuplicateFiles		2050
-FileCost		400
-FindRelatedProducts	NOT ISSETUPDRIVEN	100
-InstallFiles		1950
-InstallFinalize		3150
-InstallInitialize		700
-InstallODBC		2600
-InstallServices	VersionNT	2750
-InstallValidate		650
-ISInitAllUsers	VersionNT And NOT Installed And Privileged	525
-IsolateComponents		450
-LaunchConditions		50
-MigrateFeatureStates		600
-MoveFiles		1900
-MsiPublishAssemblies		3025
-MsiUnpublishAssemblies		875
-NewProductFound	NEWPRODUCTS	110
-PatchFiles		2000
-ProcessComponents		800
-PublishComponents		3000
-PublishFeatures		3050
-PublishProduct		3100
-RegisterClassInfo		2200
-RegisterComPlus		2700
-RegisterExtensionInfo		2250
-RegisterFonts		2550
-RegisterMIMEInfo		2350
-RegisterProduct		2950
-RegisterProgIdInfo		2300
-RegisterTypeLibraries		2650
-RegisterUser		2900
-RemoveDuplicateFiles		1700
-RemoveEnvironmentStrings		1650
-RemoveExistingProducts		675
-RemoveFiles		1750
-RemoveFolders		1800
-RemoveIniValues		1550
-RemoveODBC		1200
-RemoveRegistryValues		1300
-RemoveShortcuts		1600
-RunningOffice	OFFICERUNS="1"	135
-RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	250
-SameProductFound	SAMEPRODUCTS	120
-ScheduleReboot	ISSCHEDULEREBOOT	3125
-SelfRegModules		2850
-SelfUnregModules		1100
-SetARPInstallLocation		990
-SetInstalllocation		3140
-SetODBCFolders		550
-StartServices	VersionNT	2800
-StopServices	VersionNT	950
-UnpublishComponents		850
-UnpublishFeatures		900
-UnregisterClassInfo		1350
-UnregisterComPlus		1050
-UnregisterExtensionInfo		1400
-UnregisterFonts		1250
-UnregisterMIMEInfo		1500
-UnregisterProgIdInfo		1450
-UnregisterTypeLibraries		1150
-ValidateProductID		300
-WriteEnvironmentStrings		2500
-WriteIniValues		2450
-WriteRegistryValues		2400
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
deleted file mode 100644
index 135987f10..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
+++ /dev/null
@@ -1,31 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-InstallUISequence	Action
-AppSearch		25
-CCPSearch	CCP_TEST	250
-CostFinalize		550
-CostInitialize		400
-ExecuteAction		850
-FileCost		450
-FindRelatedProducts		150
-InstallWelcome	Not Installed	650
-ISInitAllUsers	VersionNT And NOT Installed And Privileged	575
-IsolateComponents		500
-LaunchConditions		50
-MaintenanceWelcome	Installed And Not RESUME And Not Preselected And Not PATCH	750
-MigrateFeatureStates		600
-NewProductFound	NEWPRODUCTS	160
-PatchWelcome	Installed And PATCH And Not IS_MAJOR_UPGRADE	625
-ResolveSource	Not Installed And Not PATCH	525
-RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	300
-SameProductFound	SAMEPRODUCTS	170
-setAllUsersProfile2K	VersionNT >= 500	512
-SetAllUsersProfileNT	VersionNT = 400	511
-SetupCompleteError		-3
-SetupCompleteSuccess		-1
-SetupInitialization		100
-SetupInterrupted		-2
-SetupProgress		800
-SetupResume	Installed And (RESUME Or Preselected) And Not PATCH	700
-setUserProfileNT	VersionNT	510
-ValidateProductID		350
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
deleted file mode 100644
index 7c8ee157f..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
+++ /dev/null
@@ -1,5 +0,0 @@
-Condition	Description
-s255	l255
-WINDOWSENCODINGTEMPLATE	LaunchCondition	Condition
-Privileged	OOO_LAUNCH_1
-(VersionNT < 900) or (SETUP_USED=1) or Installed	OOO_LAUNCH_2
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ListBox.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ListBox.idt
deleted file mode 100644
index e62653df9..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ListBox.idt
+++ /dev/null
@@ -1,3 +0,0 @@
-Property	Order	Value	Text
-s72	i2	s64	L64
-ListBox	Property	Order
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
deleted file mode 100644
index edc952694..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ /dev/null
@@ -1,62 +0,0 @@
-Property	Value
-s72	l0
-WINDOWSENCODINGTEMPLATE	Property	Property
-_IsMaintenance	Change
-_IsSetupTypeMin	Typical
-AgreeToLicense	No
-ApplicationUsers	AllUsers
-ALLUSERS	1
-ARPCOMMENTS	ARPCOMMENTSTEMPLATE
-ARPCONTACT	OOO_ARPCONTACTTEMPLATE
-ARPHELPLINK	OOO_ARPHELPLINKTEMPLATE
-ARPHELPTELEPHONE	OOO_ARPHELPTELEPHONETEMPLATE
-ARPURLINFOABOUT	OOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO	OOO_ARPURLUPDATEINFOTEMPLATE
-DefaultUIFont	Tahoma8
-DialogCaption	Windows Installer
-DiskPrompt	[1]
-Display_IsBitmapDlg	1
-DisplayNameCustom	IDPROP_SETUPTYPE_CUSTOM
-DisplayNameMinimal	IDPROP_SETUPTYPE_COMPACT
-DisplayNameTypical	IDPROP_SETUPTYPE_TYPICAL
-DWUSINTERVAL	30
-ErrorDialog	SetupError
-FILETYPEDIALOGUSED	0
-InstallChoice	AR
-INSTALLLEVEL	INSTALLLEVELTEMPLATE
-ISCHECKFORPRODUCTUPDATES	ISCHECKFORPRODUCTUPDATESTEMPLATE
-ISSCRIPT_VERSION_MISSING	IDS_ISSCRIPT_VERSION_MISSING
-ISSCRIPT_VERSION_OLD	IDS_ISSCRIPT_VERSION_OLD
-ISVROOT_PORT_NO	0
-Manufacturer	MANUFACTURERTEMPLATE
-OFFICERUNS	0
-PIDTemplate	12345<###-%%%%%%%>@@@@@
-ProductCode	PRODUCTCODETEMPLATE
-ProductID	none
-ProductLanguage	PRODUCTLANGUAGETEMPLATE
-ProductName	PRODUCTNAMETEMPLATE
-ProductVersion	PRODUCTVERSIONTEMPLATE
-ProgressType0	install
-ProgressType1	Installing
-ProgressType2	installed
-ProgressType3	installs
-Quickstarterlinkname	QUICKSTARTERLINKNAMETEMPLATE
-RebootYesNo	Yes
-ReinstallModeText	omus
-REMOVEOLDPRODUCTS	1
-SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS;O2LPAF;O2LPAR;O2LPASIN;O2LPBEBY;O2LPBO;O2LPBG;O2LPBR;O2LPBRX;O2LPBN;O2LPBNBD;O2LPBNIN;O2LPBS;O2LPBY;O2LPCA;O2LPCS;O2LPCY;O2LPDA;O2LPDE;O2LPDGO;O2LPDZ;O2LPEL;O2LPENGB;O2LPENUS;O2LPENZA;O2LPEO;O2LPES;O2LPET;O2LPEU;O2LPFA;O2LPFI;O2LPFR;O2LPGA;O2LPGD;O2LPGL;O2LPGU;O2LPGUIN;O2LPHE;O2LPHI;O2LPHIIN;O2LPHR;O2LPHU;O2LPIS;O2LPIT;O2LPJA;O2LPKID;O2LPKY;O2LPKA;O2LPKK;O2LPKM;O2LPKN;O2LPKO;O2LPKOK;O2LPKS;O2LPKU;O2LPLO;O2LPLT;O2LPLV;O2LPMAI;O2LPMK;O2LPMN;O2LPMNI;O2LPMS;O2LPMLIN;O2LPMRIN;O2LPMY;O2LPNE;O2LPNB;O2LPNL;O2LPNN;O2LPNO;O2LPNR;O2LPNS;O2LPOM;O2LPOC;O2LPORIN;O2LPPAP;O2LPPAIN;O2LPPL;O2LPPS;O2LPPT;O2LPPTBR;O2LPRU;O2LPRW;O2LPSAT;O2LPSAIN;O2LPSI;O2LPSC;O2LPSD;O2LPSK;O2LPSL;O2LPSH;O2LPSR;O2LPSS;O2LPST;O2LPSV;O2LPSW;O2LPSWTZ;O2LPTEIN;O2LPTIER;O2LPTAIN;O2LPTH;O2LPTN;O2LPTR;O2LPTS;O2LPTG;O2LPUG;O2LPURIN;O2LPUK;O2LPUZ;O2LPVE;O2LPVI;O2LPXH;O2LPZHCN;O2LPZHTW;O2LPZU
-SetupType	Typical
-SELECT_WORD	0
-SELECT_EXCEL	0
-SELECT_POWERPOINT	0
-STR_NEW_DISPLAY_NAME	OOO_STR_NEW_DISPLAY_NAME
-STR_EDIT	OOO_STR_EDIT
-STR_MS_WORD_DOCUMENT	OOO_STR_MS_WORD_DOCUMENT
-STR_MS_WORD_TEMPLATE	OOO_STR_MS_WORD_TEMPLATE
-STR_MS_EXCEL_WORKSHEET	OOO_STR_MS_EXCEL_WORKSHEET
-STR_MS_EXCEL_TEMPLATE	OOO_STR_MS_EXCEL_TEMPLATE
-STR_MS_POWERPOINT_PRESENTATION	OOO_STR_MS_POWERPOINT_PRESENTATION
-STR_MS_POWERPOINT_TEMPLATE	OOO_STR_MS_POWERPOINT_TEMPLATE
-STR_MS_POWERPOINT_SHOW	OOO_STR_MS_POWERPOINT_SHOW
-STR_INSTALLATION_WIZARD	OOO_STR_INSTALLATION_WIZARD
-UpgradeCode	UPGRADECODETEMPLATE
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt
deleted file mode 100644
index e1d000070..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt
+++ /dev/null
@@ -1,12 +0,0 @@
-Property	Order	Value	X	Y	Width	Height	Text	Help
-s72	i2	s64	i2	i2	i2	i2	L64	L50
-WINDOWSENCODINGTEMPLATE	RadioButton	Property	Order
-_IsMaintenance	1	Change	0	0	290	14	OOO_RADIOBUTTON_1	
-_IsMaintenance	2	Reinstall	0	60	290	14	OOO_RADIOBUTTON_2	
-_IsMaintenance	3	Remove	0	120	290	14	OOO_RADIOBUTTON_3	
-_IsSetupTypeMin	1	Typical	0	0	264	14	OOO_RADIOBUTTON_4	
-_IsSetupTypeMin	2	Custom	0	60	264	14	OOO_RADIOBUTTON_5	
-AgreeToLicense	1	No	0	15	295	15	OOO_RADIOBUTTON_6	
-AgreeToLicense	2	Yes	0	0	295	15	OOO_RADIOBUTTON_7	
-ApplicationUsers	1	AllUsers	1	7	290	14	OOO_RADIOBUTTON_8	
-ApplicationUsers	2	OnlyCurrentUser	1	23	290	14	OOO_RADIOBUTTON_9	
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
deleted file mode 100644
index c08232208..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ /dev/null
@@ -1,7 +0,0 @@
-Signature_	Root	Key	Name	Type
-s72	i2	s255	S255	I2
-RegLocator	Signature_
-installuser	1	Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installuser_	1	Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installmachine	2	Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installmachine_	2	Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt
deleted file mode 100644
index 5004a5586..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Signatur.idt
+++ /dev/null
@@ -1,3 +0,0 @@
-Signature	FileName	MinVersion	MaxVersion	MinSize	MaxSize	MinDate	MaxDate	Languages
-s72	s255	S20	S20	I4	I4	I4	I4	S255
-Signature	Signature
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/TextStyl.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/TextStyl.idt
deleted file mode 100644
index b4575c15d..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/TextStyl.idt
+++ /dev/null
@@ -1,25 +0,0 @@
-TextStyle	FaceName	Size	Color	StyleBits
-s72	s32	i2	I4	I2
-TextStyle	TextStyle
-Arial8	Arial	8		
-Arial9	Arial	9		
-ArialBlue10	Arial	10	16711680	
-ArialBlueStrike10	Arial	10	16711680	8
-CourierNew8	Courier New	8		
-CourierNew9	Courier New	9		
-MSGothic9	MS Gothic	9		
-MSSansBold8	Tahoma	8		1
-MSSansSerif8	MS Sans Serif	8		
-MSSansSerif9	MS Sans Serif	9		
-MSSGreySerif8	MS Sans Serif	8	8421504	
-MSSWhiteSerif8	Tahoma	8	16777215	
-Tahoma10	Tahoma	10		
-Tahoma8	Tahoma	8		
-Tahoma9	Tahoma	9		
-TahomaBold10	Tahoma	10		1
-TahomaBold8	Tahoma	8		1
-Times8	Times New Roman	8		
-Times9	Times New Roman	9		
-TimesItalic12	Times New Roman	12		2
-TimesItalicBlue10	Times New Roman	10	16711680	2
-TimesRed16	Times New Roman	16	255	
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/UIText.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/UIText.idt
deleted file mode 100644
index ea581bff4..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/UIText.idt
+++ /dev/null
@@ -1,53 +0,0 @@
-Key	Text
-s72	L255
-WINDOWSENCODINGTEMPLATE	UIText	Key
-AbsentPath	
-bytes	OOO_UITEXT_1
-GB	OOO_UITEXT_2
-KB	OOO_UITEXT_3
-MB	OOO_UITEXT_4
-MenuAbsent	OOO_UITEXT_5
-MenuAdvertise	OOO_UITEXT_6
-MenuAllCD	OOO_UITEXT_7
-MenuAllLocal	OOO_UITEXT_8
-MenuAllNetwork	OOO_UITEXT_9
-MenuCD	OOO_UITEXT_10
-MenuLocal	OOO_UITEXT_11
-MenuNetwork	OOO_UITEXT_12
-NewFolder	OOO_UITEXT_13
-SelAbsentAbsent	OOO_UITEXT_14
-SelAbsentAdvertise	OOO_UITEXT_15
-SelAbsentCD	OOO_UITEXT_16
-SelAbsentLocal	OOO_UITEXT_17
-SelAbsentNetwork	OOO_UITEXT_18
-SelAdvertiseAbsent	OOO_UITEXT_19
-SelAdvertiseAdvertise	OOO_UITEXT_20
-SelAdvertiseCD	OOO_UITEXT_21
-SelAdvertiseLocal	OOO_UITEXT_22
-SelAdvertiseNetwork	OOO_UITEXT_23
-SelCDAbsent	OOO_UITEXT_24
-SelCDAdvertise	OOO_UITEXT_25
-SelCDCD	OOO_UITEXT_26
-SelCDLocal	OOO_UITEXT_27
-SelChildCostNeg	OOO_UITEXT_28
-SelChildCostPos	OOO_UITEXT_29
-SelCostPending	OOO_UITEXT_30
-SelLocalAbsent	OOO_UITEXT_31
-SelLocalAdvertise	OOO_UITEXT_32
-SelLocalCD	OOO_UITEXT_33
-SelLocalLocal	OOO_UITEXT_34
-SelLocalNetwork	OOO_UITEXT_35
-SelNetworkAbsent	OOO_UITEXT_36
-SelNetworkAdvertise	OOO_UITEXT_37
-SelNetworkLocal	OOO_UITEXT_38
-SelNetworkNetwork	OOO_UITEXT_39
-SelParentCostNegNeg	OOO_UITEXT_40
-SelParentCostNegPos	OOO_UITEXT_41
-SelParentCostPosNeg	OOO_UITEXT_42
-SelParentCostPosPos	OOO_UITEXT_43
-TimeRemaining	OOO_UITEXT_44
-VolumeCostAvailable	OOO_UITEXT_45
-VolumeCostDifference	OOO_UITEXT_46
-VolumeCostRequired	OOO_UITEXT_47
-VolumeCostSize	OOO_UITEXT_48
-VolumeCostVolume	OOO_UITEXT_49
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
deleted file mode 100644
index 4098f92c3..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
+++ /dev/null
@@ -1,461 +0,0 @@
-Table	Column	Nullable	MinValue	MaxValue	KeyTable	KeyColumn	Category	Set	Description
-s32	s32	s4	I4	I4	S255	I2	S32	S255	S255
-_Validation	Table	Column
-_Validation	Category	Y						Text;Formatted;Template;Condition;Guid;Path;Version;Language;Identifier;Binary;UpperCase;LowerCase;Filename;Paths;AnyPath;WildCardFilename;RegPath;KeyFormatted;CustomSource;Property;Cabinet;Shortcut;URL	String category
-_Validation	Column	N					Identifier		Name of column
-_Validation	Description	Y					Text		Description of column
-_Validation	KeyColumn	Y	1	32					Column to which foreign key connects
-_Validation	KeyTable	Y					Identifier		For foreign key, Name of table to which data must link
-_Validation	MaxValue	Y	-2147483647	2147483647					Maximum value allowed
-_Validation	MinValue	Y	-2147483647	2147483647					Minimum value allowed
-_Validation	Nullable	N						Y;N	Whether the column is nullable
-_Validation	Set	Y					Text		Set of values that are permitted
-_Validation	Table	N					Identifier		Name of table
-ActionText	Action	N					Identifier		Name of action to be described.
-ActionText	Description	Y					Text		Localized description displayed in progress dialog and log when action is executing.
-ActionText	Template	Y					Template		Optional localized format template used to format action data records for display during action execution.
-AdminExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdminExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdminExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdminUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdminUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdminUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdvtExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdvtExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdvtExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdvtUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdvtUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdvtUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AppId	ActivateAtStorage	Y	0	1					
-AppId	AppId	N					Guid		
-AppId	DllSurrogate	Y					Text		
-AppId	LocalService	Y					Text		
-AppId	RemoteServerName	Y					Formatted		
-AppId	RunAsInteractiveUser	Y	0	1					
-AppId	ServiceParameters	Y					Text		
-AppSearch	Property	N					Identifier		The property associated with a Signature
-AppSearch	Signature_	N			Signature;RegLocator;IniLocator;DrLocator;CompLocator	1	Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables.
-BBControl	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this control.
-BBControl	BBControl	N					Identifier		Name of the control. This name must be unique within a billboard, but can repeat on different billboard.
-BBControl	Billboard_	N			Billboard	1	Identifier		External key to the Billboard table, name of the billboard.
-BBControl	Height	N	0	32767					Height of the bounding rectangle of the control.
-BBControl	Text	Y					Text		A string used to set the initial text contained within a control (if appropriate).
-BBControl	Type	N					Identifier		The type of the control.
-BBControl	Width	N	0	32767					Width of the bounding rectangle of the control.
-BBControl	X	N	0	32767					Horizontal coordinate of the upper left corner of the bounding rectangle of the control.
-BBControl	Y	N	0	32767					Vertical coordinate of the upper left corner of the bounding rectangle of the control.
-Billboard	Action	Y					Identifier		The name of an action. The billboard is displayed during the progress messages received from this action.
-Billboard	Billboard	N					Identifier		Name of the billboard.
-Billboard	Feature_	N			Feature	1	Identifier		An external key to the Feature Table. The billboard is shown only if this feature is being installed.
-Billboard	Ordering	Y	0	32767					A positive integer. If there is more than one billboard corresponding to an action they will be shown in the order defined by this column.
-Binary	Data	N					Binary		The unformatted binary data.
-Binary	Name	N					Identifier		Unique key identifying the binary data.
-BindImage	File_	N			File	1	Identifier		The index into the File table. This must be an executable file.
-BindImage	Path	Y					Paths		A list of ;  delimited paths that represent the paths to be searched for the import DLLS. The list is usually a list of properties each enclosed within square brackets [] .
-CCPSearch	Signature_	N			Signature;RegLocator;IniLocator;DrLocator;CompLocator	1	Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables.
-CheckBox	Property	N					Identifier		A named property to be tied to the item.
-CheckBox	Value	Y					Formatted		The value string associated with the item.
-Class	AppId_	Y			AppId	1	Guid		Optional AppID containing DCOM information for associated application (string GUID).
-Class	Argument	Y					Formatted		optional argument for LocalServers.
-Class	Attributes	Y		32767					Class registration attributes.
-Class	CLSID	N					Guid		The CLSID of an OLE factory.
-Class	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-Class	Context	N					Identifier		The numeric server context for this server. CLSCTX_xxxx
-Class	DefInprocHandler	Y					Filename	1;2;3	Optional default inproc handler.  Only optionally provided if Context=CLSCTX_LOCAL_SERVER.  Typically "ole32.dll" or "mapi32.dll"
-Class	Description	Y					Text		Localized description for the Class.
-Class	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational.
-Class	FileTypeMask	Y					Text		Optional string containing information for the HKCRthis CLSID) key. If multiple patterns exist, they must be delimited by a semicolon, and numeric subkeys will be generated: 0,1,2...
-Class	Icon_	Y			Icon	1	Identifier		Optional foreign key into the Icon Table, specifying the icon file associated with this CLSID. Will be written under the DefaultIcon key.
-Class	IconIndex	Y	-32767	32767					Optional icon index.
-Class	ProgId_Default	Y			ProgId	1	Text		Optional ProgId associated with this CLSID.
-ComboBox	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list.The integers do not have to be consecutive.
-ComboBox	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same combobox.
-ComboBox	Text	Y					Formatted		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ComboBox	Value	N					Formatted		The value string associated with this item. Selecting the line will set the associated property to this value.
-CompLocator	ComponentId	N					Guid		A string GUID unique to this component, version, and language.
-CompLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-CompLocator	Type	Y	0	1					A boolean value that determines if the registry value is a filename or a directory location.
-Complus	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the ComPlus component.
-Complus	ExpType	Y	0	32767					ComPlus component attributes.
-Component	Attributes	N							Remote execution option, one of irsEnum
-Component	Component	N					Identifier		Primary key used to identify a particular component record.
-Component	ComponentId	Y					Guid		A string GUID unique to this component, version, and language.
-Component	Condition	Y					Condition		A conditional statement that will disable this component if the specified condition evaluates to the 'True' state. If a component is disabled, it will not be installed, regardless of the 'Action' state associated with the component.
-Component	Directory_	N			Directory	1	Identifier		Required key of a Directory table record. This is actually a property name whose value contains the actual path, set either by the AppSearch action or with the default setting obtained from the Directory table.
-Component	KeyPath	Y			File;Registry;ODBCDataSource	1	Identifier		Either the primary key into the File table, Registry table, or ODBCDataSource table. This extract path is stored when the component is installed, and is used to detect the presence of the component and to return the path to it.
-Condition	Condition	Y					Condition		Expression evaluated to determine if Level in the Feature table is to change.
-Condition	Feature_	N			Feature	1	Identifier		Reference to a Feature entry in Feature table.
-Condition	Level	N	0	32767					New selection Level to set in Feature table if Condition evaluates to TRUE.
-Control	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this control.
-Control	Control	N					Identifier		Name of the control. This name must be unique within a dialog, but can repeat on different dialogs. 
-Control	Control_Next	Y			Control	2	Identifier		The name of an other control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!
-Control	Dialog_	N			Dialog	1	Identifier		External key to the Dialog table, name of the dialog.
-Control	Height	N	0	32767					Height of the bounding rectangle of the control.
-Control	Help	Y					Text		The help strings used with the button. The text is optional. 
-Control	Property	Y					Identifier		The name of a defined property to be linked to this control. 
-Control	Text	Y					Formatted		A string used to set the initial text contained within a control (if appropriate).
-Control	Type	N					Identifier		The type of the control.
-Control	Width	N	0	32767					Width of the bounding rectangle of the control.
-Control	X	N	0	32767					Horizontal coordinate of the upper left corner of the bounding rectangle of the control.
-Control	Y	N	0	32767					Vertical coordinate of the upper left corner of the bounding rectangle of the control.
-ControlCondition	Action	N						Default;Disable;Enable;Hide;Show	The desired action to be taken on the specified control.
-ControlCondition	Condition	N					Condition		A standard conditional statement that specifies under which conditions the action should be triggered.
-ControlCondition	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control.
-ControlCondition	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the dialog.
-ControlEvent	Argument	N					Formatted		A value to be used as a modifier when triggering a particular event.
-ControlEvent	Condition	Y					Condition		A standard conditional statement that specifies under which conditions an event should be triggered.
-ControlEvent	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control
-ControlEvent	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the dialog.
-ControlEvent	Event	N					Formatted		An identifier that specifies the type of the event that should take place when the user interacts with control specified by the first two entries.
-ControlEvent	Ordering	Y	0	2147483647					An integer used to order several events tied to the same control. Can be left blank.
-CreateFolder	Component_	N			Component	1	Identifier		Foreign key into the Component table.
-CreateFolder	Directory_	N			Directory	1	Identifier		Primary key, could be foreign key into the Directory table.
-CustomAction	Action	N					Identifier		Primary key, name of action, normally appears in sequence table unless private use.
-CustomAction	Source	Y					CustomSource		The table reference of the source of the code.
-CustomAction	Target	Y					Formatted		Excecution parameter, depends on the type of custom action
-CustomAction	Type	N	1	32767					The numeric custom action type, consisting of source location, code type, entry, option flags.
-Dialog	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this dialog.
-Dialog	Control_Cancel	Y			Control	2	Identifier		Defines the cancel control. Hitting escape or clicking on the close icon on the dialog is equivalent to pushing this button.
-Dialog	Control_Default	Y			Control	2	Identifier		Defines the default control. Hitting return is equivalent to pushing this button.
-Dialog	Control_First	N			Control	2	Identifier		Defines the control that has the focus when the dialog is created.
-Dialog	Dialog	N					Identifier		Name of the dialog.
-Dialog	HCentering	N	0	100					Horizontal position of the dialog on a 0-100 scale. 0 means left end, 100 means right end of the screen, 50 center.
-Dialog	Height	N	0	32767					Height of the bounding rectangle of the dialog.
-Dialog	Title	Y					Formatted		A text string specifying the title to be displayed in the title bar of the dialog's window.
-Dialog	VCentering	N	0	100					Vertical position of the dialog on a 0-100 scale. 0 means top end, 100 means bottom end of the screen, 50 center.
-Dialog	Width	N	0	32767					Width of the bounding rectangle of the dialog.
-Directory	DefaultDir	N					DefaultDir		The default sub-path under parent's path.
-Directory	Directory	N					Identifier		Unique identifier for directory entry, primary key. If a property by this name is defined, it contains the full path to the directory.
-Directory	Directory_Parent	Y			Directory	1	Identifier		Reference to the entry in this table specifying the default parent directory. A record parented to itself or with a Null parent represents a root of the install tree.
-DrLocator	Depth	Y	0	32767					The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0.
-DrLocator	Parent	Y					Identifier		The parent file signature. It is also a foreign key in the Signature table. If null and the Path column does not expand to a full path, then all the fixed drives of the user system are searched using the Path.
-DrLocator	Path	Y					AnyPath		The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.
-DrLocator	Signature_	N					Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-DuplicateFile	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the duplicate file.
-DuplicateFile	DestFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full pathname to a destination folder.
-DuplicateFile	DestName	Y					Filename		Filename to be given to the duplicate file.
-DuplicateFile	File_	N			File	1	Identifier		Foreign key referencing the source file to be duplicated.
-DuplicateFile	FileKey	N					Identifier		Primary key used to identify a particular file entry
-Environment	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the environmental value.
-Environment	Environment	N					Identifier		Unique identifier for the environmental variable setting
-Environment	Name	N					Text		The name of the environmental value.
-Environment	Value	Y					Formatted		The value to set in the environmental settings.
-Error	Error	N	0	32767					Integer error number, obtained from header file IError(...) macros.
-Error	Message	Y					Template		Error formatting template, obtained from user ed. or localizers.
-EventMapping	Attribute	N					Identifier		The name of the control attribute, that is set when this event is received.
-EventMapping	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control.
-EventMapping	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the Dialog.
-EventMapping	Event	N					Identifier		An identifier that specifies the type of the event that the control subscribes to.
-Extension	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-Extension	Extension	N					Text		The extension associated with the table row.
-Extension	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational.
-Extension	MIME_	Y			MIME	1	Text		Optional Context identifier, typically "type/format" associated with the extension
-Extension	ProgId_	Y			ProgId	1	Text		Optional ProgId associated with this extension.
-Feature	Attributes	N						0;1;2;4;5;6;8;9;10;16;17;18;20;21;22;24;25;26;32;33;34;36;37;38;48;49;50;52;53;54	Feature attributes
-Feature	Description	Y					Text		Longer descriptive text describing a visible feature item.
-Feature	Directory_	Y			Directory	1	UpperCase		The name of the Directory that can be configured by the UI. A non-null value will enable the browse button.
-Feature	Display	Y	0	32767					Numeric sort order, used to force a specific display ordering.
-Feature	Feature	N					Identifier		Primary key used to identify a particular feature record.
-Feature	Feature_Parent	Y			Feature	1	Identifier		Optional key of a parent record in the same table. If the parent is not selected, then the record will not be installed. Null indicates a root item.
-Feature	Level	N	0	32767					The install level at which record will be initially selected. An install level of 0 will disable an item and prevent its display.
-Feature	Title	Y					Text		Short text identifying a visible feature item.
-FeatureComponents	Component_	N			Component	1	Identifier		Foreign key into Component table.
-FeatureComponents	Feature_	N			Feature	1	Identifier		Foreign key into Feature table.
-File	Attributes	Y	0	32767					Integer containing bit flags representing file attributes (with the decimal value of each bit position in parentheses)
-File	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the file.
-File	File	N					Identifier		Primary key, non-localized token, must match identifier in cabinet.  For uncompressed files, this field is ignored.
-File	FileName	N					Filename		File name used for installation, may be localized.  This may contain a "short name|long name" pair.
-File	FileSize	N	0	2147483647					Size of file in bytes (long integer).
-File	Language	Y					Language		List of decimal language Ids, comma-separated if more than one.
-File	Sequence	N	1	2147483647					Sequence with respect to the media images; order must track cabinet order.
-File	Version	Y			File	1	Version		Version string for versioned files;  Blank for unversioned files.
-FileSFPCatalog	File_	N			File	1	Identifier		File associated with the catalog
-FileSFPCatalog	SFPCatalog_	N			SFPCatalog	1	Filename		Catalog associated with the file
-Font	File_	N			File	1	Identifier		Primary key, foreign key into File table referencing font file.
-Font	FontTitle	Y					Text		Font name.
-Icon	Data	N					Binary		Binary stream. The binary icon data in PE (.DLL or .EXE) or icon (.ICO) format.
-Icon	Name	N					Identifier		Primary key. Name of the icon file.
-IniFile	Action	N						0;1;3	The type of modification to be made, one of iifEnum
-IniFile	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the .INI value.
-IniFile	DirProperty	Y					Identifier		Foreign key into the Directory table denoting the directory where the .INI file is.
-IniFile	FileName	N					Filename		The .INI file name in which to write the information
-IniFile	IniFile	N					Identifier		Primary key, non-localized token.
-IniFile	Key	N					Formatted		The .INI file key below Section.
-IniFile	Section	N					Formatted		The .INI file Section.
-IniFile	Value	N					Formatted		The value to be written.
-IniLocator	Field	Y	0	32767					The field in the .INI line. If Field is null or 0 the entire line is read.
-IniLocator	FileName	N					Filename		The .INI file name.
-IniLocator	Key	N					Text		Key value (followed by an equals sign in INI file).
-IniLocator	Section	N					Text		Section name within in file (within square brackets in INI file).
-IniLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-IniLocator	Type	Y	0	2					An integer value that determines if the .INI value read is a filename or a directory location or to be used as is w/o interpretation.
-InstallExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-InstallExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-InstallExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-InstallUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-InstallUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-InstallUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-IsolatedComponent	Component_Application	N			Component	1	Identifier		Key to Component table item for application
-IsolatedComponent	Component_Shared	N			Component	1	Identifier		Key to Component table item to be isolated
-LaunchCondition	Condition	N					Condition		Expression which must evaluate to TRUE in order for install to commence.
-LaunchCondition	Description	N					Formatted		Localizable text to display when condition fails and install must abort.
-ListBox	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-ListBox	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same listbox.
-ListBox	Text	Y					Text		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ListBox	Value	N					Formatted		The value string associated with this item. Selecting the line will set the associated property to this value.
-ListView	Binary_	Y			Binary	1	Identifier		The name of the icon to be displayed with the icon. The binary information is looked up from the Binary Table.
-ListView	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-ListView	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same listview.
-ListView	Text	Y					Text		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ListView	Value	N					Identifier		The value string associated with this item. Selecting the line will set the associated property to this value.
-LockPermissions	Domain	Y					Formatted		Domain name for user whose permissions are being set. (usually a property)
-LockPermissions	LockObject	N					Identifier		Foreign key into Registry or File table
-LockPermissions	Permission	Y	-2147483647	2147483647					Permission Access mask.  Full Control = 268435456 (GENERIC_ALL = 0x10000000)
-LockPermissions	Table	N					Identifier	Directory;File;Registry	Reference to another table name
-LockPermissions	User	N					Formatted		User for permissions to be set.  (usually a property)
-Media	Cabinet	Y					Cabinet		If some or all of the files stored on the media are compressed in a cabinet, the name of that cabinet.
-Media	DiskId	N	1	32767					Primary key, integer to determine sort order for table.
-Media	DiskPrompt	Y					Text		Disk name: the visible text actually printed on the disk.  This will be used to prompt the user when this disk needs to be inserted.
-Media	LastSequence	N	0	32767					File sequence number for the last file for this media.
-Media	Source	Y					Property		The property defining the location of the cabinet file.
-Media	VolumeLabel	Y					Text		The label attributed to the volume.
-MIME	CLSID	Y					Guid		Optional associated CLSID.
-MIME	ContentType	N					Text		Primary key. Context identifier, typically "type/format".
-MIME	Extension_	N			Extension	1	Text		Optional associated extension (without dot)
-ModuleAdminExecuteSequence	Action	N					Identifier		Action to insert
-ModuleAdminExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdminExecuteSequence	BaseAction	Y			ModuleAdminExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleAdminExecuteSequence	Condition	Y					Condition		
-ModuleAdminExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdminUISequence	Action	N					Identifier		Action to insert
-ModuleAdminUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdminUISequence	BaseAction	Y			ModuleAdminUISequence	1	Identifier		Base action to determine insert location.
-ModuleAdminUISequence	Condition	Y					Condition		
-ModuleAdminUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdvtExecuteSequence	Action	N					Identifier		Action to insert
-ModuleAdvtExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdvtExecuteSequence	BaseAction	Y			ModuleAdvtExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleAdvtExecuteSequence	Condition	Y					Condition		
-ModuleAdvtExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdvtUISequence	Action	N					Identifier		Action to insert
-ModuleAdvtUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdvtUISequence	BaseAction	Y			ModuleAdvtUISequence	1	Identifier		Base action to determine insert location.
-ModuleAdvtUISequence	Condition	Y					Condition		
-ModuleAdvtUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleComponents	Component	N			Component	1	Identifier		Component contained in the module.
-ModuleComponents	Language	N			ModuleSignature	2			Default language ID for module (may be changed by transform).
-ModuleComponents	ModuleID	N			ModuleSignature	1	Identifier		Module containing the component.
-ModuleDependency	ModuleID	N			ModuleSignature	1	Identifier		Module requiring the dependency.
-ModuleDependency	ModuleLanguage	N			ModuleSignature	2			Language of module requiring the dependency.
-ModuleDependency	RequiredID	N							String.GUID of required module.
-ModuleDependency	RequiredLanguage	N							LanguageID of the required module.
-ModuleDependency	RequiredVersion	Y					Version		Version of the required version.
-ModuleExclusion	ExcludedID	N							String.GUID of excluded module.
-ModuleExclusion	ExcludedLanguage	N							Language of excluded module.
-ModuleExclusion	ExcludedMaxVersion	Y					Version		Maximum version of excluded module.
-ModuleExclusion	ExcludedMinVersion	Y					Version		Minimum version of excluded module.
-ModuleExclusion	ModuleID	N			ModuleSignature	1	Identifier		String.GUID of module with exclusion requirement.
-ModuleExclusion	ModuleLanguage	N			ModuleSignature	2			LanguageID of module with exclusion requirement.
-ModuleIgnoreTable	Table	N					Identifier		Table name to ignore during merge operation.
-ModuleInstallExecuteSequence	Action	N					Identifier		Action to insert
-ModuleInstallExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleInstallExecuteSequence	BaseAction	Y			ModuleInstallExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleInstallExecuteSequence	Condition	Y					Condition		
-ModuleInstallExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleInstallUISequence	Action	N					Identifier		Action to insert
-ModuleInstallUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleInstallUISequence	BaseAction	Y			ModuleInstallUISequence	1	Identifier		Base action to determine insert location.
-ModuleInstallUISequence	Condition	Y					Condition		
-ModuleInstallUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleSignature	Language	N							Default decimal language of module.
-ModuleSignature	ModuleID	N					Identifier		Module identifier (String.GUID).
-ModuleSignature	Version	N					Version		Version of the module.
-MoveFile	Component_	N			Component	1	Identifier		If this component is not "selected" for installation or removal, no action will be taken on the associated MoveFile entry
-MoveFile	DestFolder	N					Identifier		Name of a property whose value is assumed to resolve to the full path to the destination directory
-MoveFile	DestName	Y					Filename		Name to be given to the original file after it is moved or copied.  If blank, the destination file will be given the same name as the source file
-MoveFile	FileKey	N					Identifier		Primary key that uniquely identifies a particular MoveFile record
-MoveFile	Options	N	0	1					Integer value specifying the MoveFile operating mode, one of imfoEnum
-MoveFile	SourceFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full path to the source directory
-MoveFile	SourceName	Y					Text		Name of the source file(s) to be moved or copied.  Can contain the '*' or '?' wildcards.
-MsiAssembly	Attributes	Y							Assembly attributes
-MsiAssembly	Component_	N			Component	1	Identifier		Foreign key into Component table.
-MsiAssembly	Feature_	N			Feature	1	Identifier		Foreign key into Feature table.
-MsiAssembly	File_Application	Y			File	1	Identifier		Foreign key into File table, denoting the application context for private assemblies. Null for global assemblies.
-MsiAssembly	File_Manifest	Y			File	1	Identifier		Foreign key into the File table denoting the manifest file for the assembly.
-MsiAssemblyName	Component_	N			Component	1	Identifier		Foreign key into Component table.
-MsiAssemblyName	Name	N					Text		The name part of the name-value pairs for the assembly name.
-MsiAssemblyName	Value	N					Text		The value part of the name-value pairs for the assembly name.
-MsiDigitalCertificate	CertData	N					Binary		A certificate context blob for a signer certificate
-MsiDigitalCertificate	DigitalCertificate	N					Identifier		A unique identifier for the row
-MsiDigitalSignature	DigitalCertificate_	N			MsiDigitalCertificate	1	Identifier		Foreign key to MsiDigitalCertificate table identifying the signer certificate
-MsiDigitalSignature	Hash	Y					Binary		The encoded hash blob from the digital signature
-MsiDigitalSignature	SignObject	N					Text		Foreign key to Media table
-MsiDigitalSignature	Table	N						Media	Reference to another table name (only Media table is supported)
-MsiFileHash	File_	N			File	1	Identifier		Primary key, foreign key into File table referencing file with this hash
-MsiFileHash	HashPart1	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart2	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart3	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart4	N							Size of file in bytes (long integer).
-MsiFileHash	Options	N	0	32767					Various options and attributes for this hash.
-ODBCAttribute	Attribute	N					Text		Name of ODBC driver attribute
-ODBCAttribute	Driver_	N			ODBCDriver	1	Identifier		Reference to ODBC driver in ODBCDriver table
-ODBCAttribute	Value	Y					Text		Value for ODBC driver attribute
-ODBCDataSource	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCDataSource	DataSource	N					Identifier		Primary key, non-localized.internal token for data source
-ODBCDataSource	Description	N					Text		Text used as registered name for data source
-ODBCDataSource	DriverDescription	N					Text		Reference to driver description, may be existing driver
-ODBCDataSource	Registration	N	0	1					Registration option: 0=machine, 1=user, others t.b.d.
-ODBCDriver	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCDriver	Description	N					Text		Text used as registered name for driver, non-localized
-ODBCDriver	Driver	N					Identifier		Primary key, non-localized.internal token for driver
-ODBCDriver	File_	N			File	1	Identifier		Reference to key driver file
-ODBCDriver	File_Setup	Y			File	1	Identifier		Optional reference to key driver setup DLL
-ODBCSourceAttribute	Attribute	N					Text		Name of ODBC data source attribute
-ODBCSourceAttribute	DataSource_	N			ODBCDataSource	1	Identifier		Reference to ODBC data source in ODBCDataSource table
-ODBCSourceAttribute	Value	Y					Text		Value for ODBC data source attribute
-ODBCTranslator	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCTranslator	Description	N					Text		Text used as registered name for translator
-ODBCTranslator	File_	N			File	1	Identifier		Reference to key translator file
-ODBCTranslator	File_Setup	Y			File	1	Identifier		Optional reference to key translator setup DLL
-ODBCTranslator	Translator	N					Identifier		Primary key, non-localized.internal token for translator
-Patch	Attributes	N	0	32767					Integer containing bit flags representing patch attributes
-Patch	File_	N					Identifier		Primary key, non-localized token, foreign key to File table, must match identifier in cabinet.
-Patch	Header	Y					Binary		Binary stream. The patch header, used for patch validation.
-Patch	PatchSize	N	0	2147483647					Size of patch in bytes (long integer).
-Patch	Sequence	N	0	32767					Primary key, sequence with respect to the media images; order must track cabinet order.
-PatchPackage	Media_	N	0	32767					Foreign key to DiskId column of Media table. Indicates the disk containing the patch package.
-PatchPackage	PatchId	N					Guid		A unique string GUID representing this patch.
-ProgId	Class_	Y			Class	1	Guid		The CLSID of an OLE factory corresponding to the ProgId.
-ProgId	Description	Y					Text		Localized description for the Program identifier.
-ProgId	Icon_	Y			Icon	1	Identifier		Optional foreign key into the Icon Table, specifying the icon file associated with this ProgId. Will be written under the DefaultIcon key.
-ProgId	IconIndex	Y	-32767	32767					Optional icon index.
-ProgId	ProgId	N					Text		The Program Identifier. Primary key.
-ProgId	ProgId_Parent	Y			ProgId	1	Text		The Parent Program Identifier. If specified, the ProgId column becomes a version independent prog id.
-Property	Property	N					Identifier		Name of property, uppercase if settable by launcher or loader.
-Property	Value	N					Text		String value for property.  Never null or empty.
-PublishComponent	AppData	Y					Text		This is localisable Application specific data that can be associated with a Qualified Component.
-PublishComponent	Component_	N			Component	1	Identifier		Foreign key into the Component table.
-PublishComponent	ComponentId	N					Guid		A string GUID that represents the component id that will be requested by the alien product.
-PublishComponent	Feature_	N			Feature	1	Identifier		Foreign key into the Feature table.
-PublishComponent	Qualifier	N					Text		This is defined only when the ComponentId column is an Qualified Component Id. This is the Qualifier for ProvideComponentIndirect.
-RadioButton	Height	N	0	32767					The height of the button.
-RadioButton	Help	Y					Text		The help strings used with the button. The text is optional.
-RadioButton	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-RadioButton	Property	N					Identifier		A named property to be tied to this radio button. All the buttons tied to the same property become part of the same group.
-RadioButton	Text	Y					Text		The visible title to be assigned to the radio button.
-RadioButton	Value	N					Formatted		The value string associated with this button. Selecting the button will set the associated property to this value.
-RadioButton	Width	N	0	32767					The width of the button.
-RadioButton	X	N	0	32767					The horizontal coordinate of the upper left corner of the bounding rectangle of the radio button.
-RadioButton	Y	N	0	32767					The vertical coordinate of the upper left corner of the bounding rectangle of the radio button.
-Reg64	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
-Reg64	Key	N					RegPath		The key for the registry value.
-Reg64	Name	Y					Formatted		The registry value name.
-Reg64	Registry	N					Identifier		Primary key, non-localized token.
-Reg64	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
-Reg64	Value	Y					Formatted		The registry value.
-Registry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
-Registry	Key	N					RegPath		The key for the registry value.
-Registry	Name	Y					Formatted		The registry value name.
-Registry	Registry	N					Identifier		Primary key, non-localized token.
-Registry	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
-Registry	Value	Y					Formatted		The registry value.
-RegLocator	Key	N					RegPath		The key for the registry value.
-RegLocator	Name	Y					Formatted		The registry value name.
-RegLocator	Root	N	0	3					The predefined root key for the registry value, one of rrkEnum.
-RegLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table. If the type is 0, the registry values refers a directory, and _Signature is not a foreign key.
-RegLocator	Type	Y	0	18					An integer value that determines if the registry value is a filename or a directory location or to be used as is w/o interpretation.
-RemoveFile	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the file to be removed.
-RemoveFile	DirProperty	N					Identifier		Name of a property whose value is assumed to resolve to the full pathname to the folder of the file to be removed.
-RemoveFile	FileKey	N					Identifier		Primary key used to identify a particular file entry
-RemoveFile	FileName	Y					WildCardFilename		Name of the file to be removed.
-RemoveFile	InstallMode	N						1;2;3	Installation option, one of iimEnum.
-RemoveIniFile	Action	N						2;4	The type of modification to be made, one of iifEnum.
-RemoveIniFile	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the deletion of the .INI value.
-RemoveIniFile	DirProperty	Y					Identifier		Foreign key into the Directory table denoting the directory where the .INI file is.
-RemoveIniFile	FileName	N					Filename		The .INI file name in which to delete the information
-RemoveIniFile	Key	N					Formatted		The .INI file key below Section.
-RemoveIniFile	RemoveIniFile	N					Identifier		Primary key, non-localized token.
-RemoveIniFile	Section	N					Formatted		The .INI file Section.
-RemoveIniFile	Value	Y					Formatted		The value to be deleted. The value is required when Action is iifIniRemoveTag
-RemoveRegistry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the deletion of the registry value.
-RemoveRegistry	Key	N					RegPath		The key for the registry value.
-RemoveRegistry	Name	Y					Formatted		The registry value name.
-RemoveRegistry	RemoveRegistry	N					Identifier		Primary key, non-localized token.
-RemoveRegistry	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum
-ReserveCost	Component_	N			Component	1	Identifier		Reserve a specified amount of space if this component is to be installed.
-ReserveCost	ReserveFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full path to the destination directory
-ReserveCost	ReserveKey	N					Identifier		Primary key that uniquely identifies a particular ReserveCost record
-ReserveCost	ReserveLocal	N	0	2147483647					Disk space to reserve if linked component is installed locally.
-ReserveCost	ReserveSource	N	0	2147483647					Disk space to reserve if linked component is installed to run from the source location.
-SelfReg	Cost	Y	0	32767					The cost of registering the module.
-SelfReg	File_	N			File	1	Identifier		Foreign key into the File table denoting the module that needs to be registered.
-ServiceControl	Arguments	Y					Formatted		Arguments for the service.  Separate by [~].
-ServiceControl	Component_	N			Component	1	Identifier		Required foreign key into the Component Table that controls the startup of the service
-ServiceControl	Event	N	0	187					Bit field:  Install:  0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete
-ServiceControl	Name	N					Formatted		Name of a service. /, \, comma and space are invalid
-ServiceControl	ServiceControl	N					Identifier		Primary key, non-localized token.
-ServiceControl	Wait	Y	0	1					Boolean for whether to wait for the service to fully start
-ServiceInstall	Arguments	Y					Formatted		Arguments to include in every start of the service, passed to WinMain
-ServiceInstall	Component_	N			Component	1	Identifier		Required foreign key into the Component Table that controls the startup of the service
-ServiceInstall	Dependencies	Y					Formatted		Other services this depends on to start.  Separate by [~], and end with [~][~]
-ServiceInstall	Description	Y					Text		Description of service.
-ServiceInstall	DisplayName	Y					Formatted		External Name of the Service
-ServiceInstall	ErrorControl	N	-2147483647	2147483647					Severity of error if service fails to start
-ServiceInstall	LoadOrderGroup	Y					Formatted		LoadOrderGroup
-ServiceInstall	Name	N					Formatted		Internal Name of the Service
-ServiceInstall	Password	Y					Formatted		password to run service with.  (with StartName)
-ServiceInstall	ServiceInstall	N					Identifier		Primary key, non-localized token.
-ServiceInstall	ServiceType	N	-2147483647	2147483647					Type of the service
-ServiceInstall	StartName	Y					Formatted		User or object name to run service as
-ServiceInstall	StartType	N	0	4					Type of the service
-SFPCatalog	Catalog	N					Binary		SFP Catalog
-SFPCatalog	Dependency	Y					Formatted		Parent catalog - only used by SFP
-SFPCatalog	SFPCatalog	N					Filename		File name for the catalog.
-Shortcut	Arguments	Y					Formatted		The command-line arguments for the shortcut.
-Shortcut	Component_	N			Component	1	Identifier		Foreign key into the Component table denoting the component whose selection gates the the shortcut creation/deletion.
-Shortcut	Description	Y					Text		The description for the shortcut.
-Shortcut	Directory_	N			Directory	1	Identifier		Foreign key into the Directory table denoting the directory where the shortcut file is created.
-Shortcut	Hotkey	Y	0	32767					The hotkey for the shortcut. It has the virtual-key code for the key in the low-order byte, and the modifier flags in the high-order byte. 
-Shortcut	Icon_	Y			Icon	1	Identifier		Foreign key into the File table denoting the external icon file for the shortcut.
-Shortcut	IconIndex	Y	-32767	32767					The icon index for the shortcut.
-Shortcut	Name	N					Filename		The name of the shortcut to be created.
-Shortcut	Shortcut	N					Identifier		Primary key, non-localized token.
-Shortcut	ShowCmd	Y						1;3;7	The show command for the application window.The following values may be used.
-Shortcut	Target	N					Shortcut		The shortcut target. This is usually a property that is expanded to a file or a folder that the shortcut points to.
-Shortcut	WkDir	Y					Identifier		Name of property defining location of working directory.
-Signature	FileName	N					Filename		The name of the file. This may contain a "short name|long name" pair.
-Signature	Languages	Y					Language		The languages supported by the file.
-Signature	MaxDate	Y	0	2147483647					The maximum creation date of the file.
-Signature	MaxSize	Y	0	2147483647					The maximum size of the file. 
-Signature	MaxVersion	Y					Text		The maximum version of the file.
-Signature	MinDate	Y	0	2147483647					The minimum creation date of the file.
-Signature	MinSize	Y	0	2147483647					The minimum size of the file.
-Signature	MinVersion	Y					Text		The minimum version of the file.
-Signature	Signature	N					Identifier		The table key. The Signature represents a unique file signature.
-TextStyle	Color	Y	0	16777215					A long integer indicating the color of the string in the RGB format (Red, Green, Blue each 0-255, RGB = R + 256*G + 256^2*B).
-TextStyle	FaceName	N					Text		A string indicating the name of the font used. Required. The string must be at most 31 characters long.
-TextStyle	Size	N	0	32767					The size of the font used. This size is given in our units (1/12 of the system font height). Assuming that the system font is set to 12 point size, this is equivalent to the point size.
-TextStyle	StyleBits	Y	0	15					A combination of style bits.
-TextStyle	TextStyle	N					Identifier		Name of the style. The primary key of this table. This name is embedded in the texts to indicate a style change.
-TypeLib	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-TypeLib	Cost	Y	0	2147483647					The cost associated with the registration of the typelib. This column is currently optional.
-TypeLib	Description	Y					Text		
-TypeLib	Directory_	Y			Directory	1	Identifier		Optional. The foreign key into the Directory table denoting the path to the help file for the type library.
-TypeLib	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the type library to be operational.
-TypeLib	Language	N	0	32767					The language of the library.
-TypeLib	LibID	N					Guid		The GUID that represents the library.
-TypeLib	Version	Y	0	16777215					The version of the library. The minor version is in the lower 8 bits of the integer. The major version is in the next 16 bits. 
-UIText	Key	N					Identifier		A unique key that identifies the particular string.
-UIText	Text	Y					Text		The localized version of the string.
-Upgrade	ActionProperty	N					UpperCase		The property to set when a product in this set is found.
-Upgrade	Attributes	N	0	2147483647					The attributes of this product set.
-Upgrade	Language	Y					Language		A comma-separated list of languages for either products in this set or products not in this set.
-Upgrade	Remove	Y					Formatted		The list of features to remove when uninstalling a product from this set.  The default is "ALL".
-Upgrade	UpgradeCode	N					Guid		The UpgradeCode GUID belonging to the products in this set.
-Upgrade	VersionMax	Y					Text		The maximum ProductVersion of the products in this set.  The set may or may not include products with this particular version.
-Upgrade	VersionMin	Y					Text		The minimum ProductVersion of the products in this set.  The set may or may not include products with this particular version.
-Verb	Argument	Y					Formatted		Optional value for the command arguments.
-Verb	Command	Y					Formatted		The command text.
-Verb	Extension_	N			Extension	1	Text		The extension associated with the table row.
-Verb	Sequence	Y	0	32767					Order within the verbs for a particular extension. Also used simply to specify the default verb.
-Verb	Verb	N					Text		The verb for the command.
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt
deleted file mode 100644
index c893b6a9e..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[PRODUCTCODE]
-en-US = "{B53C819A-A084-42F1-A18E-D7C6DD1CCB59}"
-pt = "{C3E6BC6A-034D-490D-866E-AFCAE0F4595F}"
-ru = "{2AE6A570-1393-4D9D-B044-D3067FC28769}"
-el = "{C61808D3-AE08-4EAA-9427-8B1E71B66973}"
-nl = "{7A20B473-85A8-4A57-AAFA-F74362FCDE2E}"
-fr = "{DBB9D6BC-F016-4771-A089-24CF853C8C78}"
-es = "{48A6F206-C8E5-4E40-8A2B-EED45A576821}"
-fi = "{BD481859-9803-4606-91D5-10ABEF4C4ADC}"
-hu = "{6DA595F9-4F00-4288-858B-A281C90D87D5}"
-ca = "{4CE05198-6F3F-46AF-866D-7865B41BA4C2}"
-it = "{2C1B2B2A-303B-499E-AE35-929EB2B8FDE7}"
-cs = "{214393CC-3F6C-4E37-91A2-B5D9C22A9067}"
-sk = "{D1C2E067-824A-4425-92EC-7242B4E28DE4}"
-en-GB = "{D6502F20-0CE2-4644-A7A2-C44337A84E54}"
-da = "{16F54808-4A44-4C87-9A9B-AE038D4E1003}"
-sv = "{2D4C8A15-DDBC-48D7-A37E-F095D331EDD1}"
-no = "{08B1A917-7FA7-474A-952A-AC0CE00ABDDB}"
-pl = "{A069E3EB-E23C-43A7-8D95-80C92971C981}"
-de = "{C54B62B7-32CA-4A12-90AD-425F68965DF2}"
-pt-BR = "{54D3D90D-A34A-47F8-873E-6FEC914F9CDC}"
-th = "{B27DED2F-51D7-4C0E-A011-F243E53814A1}"
-et = "{C6C1A6A0-0112-4A6C-9EF1-25672676D909}"
-km = "{062A1AD1-05AD-4D46-872B-B0ADA08DC3FC}"
-ja = "{1FBD7128-5220-4F02-B94D-40AA38A63A16}"
-ko = "{B5B62297-3658-4C79-A3E3-CD714250DE0C}"
-zh-CN = "{DEE49DC3-8651-4336-BFAF-EDB82F1F8096}"
-zh-TW = "{2C5F5940-CAA5-4637-B07E-7CBDD812E04F}"
-tr = "{F8FB0DCF-96C0-4C03-B748-951C679FD7C6}"
-hi = "{CA5E7AB5-DA2A-4F3B-8728-E97164034DD6}"
-ar = "{19F11268-068A-488F-B139-848ACA080B94}"
-he = "{CDF16F28-D75D-4BE8-AF81-EB85825DA252}"
-multiwestern = "{0DECDE88-DD1C-4E9F-8348-19C5BC6FDF26}"
-multiasia = "{122A65B5-E37E-453A-924B-E52B808EDA31}"
-
-[UPGRADECODE]
-en-US = "{4B17E523-5D91-4E69-BD96-7FD81CFA81BB}"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broo.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broo.txt
deleted file mode 100644
index 43fe6eb7c..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broo.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[PRODUCTCODE]
-en-US = "{98DE3411-B458-4E3C-B9D8-CA2D5667C22A}"
-
-[UPGRADECODE]
-en-US = "{1552EC17-8CE9-4E58-A009-991468B8E806}"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broodev.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broodev.txt
deleted file mode 100644
index ddf30c17f..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broodev.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[PRODUCTCODE]
-en-US = "{0BC79FED-8EB6-4308-8150-D756BEC28383}"
-
-[UPGRADECODE]
-en-US = "{D8B206B8-6822-48C2-A799-E35BFD585035}"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt
deleted file mode 100644
index 3b34c42e9..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[PRODUCTCODE]
-en-US = "{B53C819A-A084-42F1-A18E-D7C6DD1CCB59}"
-pt = "{C3E6BC6A-034D-490D-866E-AFCAE0F4595F}"
-ru = "{2AE6A570-1393-4D9D-B044-D3067FC28769}"
-el = "{C61808D3-AE08-4EAA-9427-8B1E71B66973}"
-nl = "{7A20B473-85A8-4A57-AAFA-F74362FCDE2E}"
-fr = "{DBB9D6BC-F016-4771-A089-24CF853C8C78}"
-es = "{48A6F206-C8E5-4E40-8A2B-EED45A576821}"
-fi = "{BD481859-9803-4606-91D5-10ABEF4C4ADC}"
-hu = "{6DA595F9-4F00-4288-858B-A281C90D87D5}"
-ca = "{4CE05198-6F3F-46AF-866D-7865B41BA4C2}"
-it = "{2C1B2B2A-303B-499E-AE35-929EB2B8FDE7}"
-cs = "{214393CC-3F6C-4E37-91A2-B5D9C22A9067}"
-sk = "{D1C2E067-824A-4425-92EC-7242B4E28DE4}"
-en-GB = "{D6502F20-0CE2-4644-A7A2-C44337A84E54}"
-da = "{16F54808-4A44-4C87-9A9B-AE038D4E1003}"
-sv = "{2D4C8A15-DDBC-48D7-A37E-F095D331EDD1}"
-no = "{08B1A917-7FA7-474A-952A-AC0CE00ABDDB}"
-pl = "{A069E3EB-E23C-43A7-8D95-80C92971C981}"
-de = "{C54B62B7-32CA-4A12-90AD-425F68965DF2}"
-pt-BR = "{54D3D90D-A34A-47F8-873E-6FEC914F9CDC}"
-th = "{B27DED2F-51D7-4C0E-A011-F243E53814A1}"
-et = "{C6C1A6A0-0112-4A6C-9EF1-25672676D909}"
-km = "{062A1AD1-05AD-4D46-872B-B0ADA08DC3FC}"
-ja = "{1FBD7128-5220-4F02-B94D-40AA38A63A16}"
-ko = "{B5B62297-3658-4C79-A3E3-CD714250DE0C}"
-zh-CN = "{DEE49DC3-8651-4336-BFAF-EDB82F1F8096}"
-zh-TW = "{2C5F5940-CAA5-4637-B07E-7CBDD812E04F}"
-tr = "{F8FB0DCF-96C0-4C03-B748-951C679FD7C6}"
-hi = "{CA5E7AB5-DA2A-4F3B-8728-E97164034DD6}"
-ar = "{19F11268-068A-488F-B139-848ACA080B94}"
-he = "{CDF16F28-D75D-4BE8-AF81-EB85825DA252}"
-multiwestern = "{0DECDE88-DD1C-4E9F-8348-19C5BC6FDF26}"
-multiasia = "{122A65B5-E37E-453A-924B-E52B808EDA31}"
-
-[UPGRADECODE]
-en-US = "{910006D2-BDF1-440C-89D3-8F1DD93790FE}"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/components.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/components.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/components.txt
+++ /dev/null
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt
deleted file mode 100644
index 5f26cbd5d..000000000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-# Comment lines start with "#"
-# Syntax of this file like upgrade.idt:
-# UpgradeCode	VersionMin	VersionMax	Language	Attributes	Remove	ActionProperty
-# s38	S20	S20	S255	i4	S255	s72
-# Upgrade	UpgradeCode	VersionMin	VersionMax	Language	Attributes
-
-{3E85B9F2-0AC3-4E57-8072-260A6FE05D02}		3.0.0		0		O2LPAF
-{DF297699-3040-48E0-B0E6-B54385D76018}		3.0.0		0		O2LPAR
-{62E2F6A6-4521-4E36-A751-46E91A58CFB5}		3.0.0		0		O2LPASIN
-{E6DC8D4C-F68E-4BE1-8F00-F0C84ED0F974}		3.0.0		0		O2LPBEBY
-{5F9461CD-2937-4EE0-AF03-24E72987244E}		3.0.0		0		O2LPBO
-{29FF0FAA-B831-4398-BE3F-FC13949D1CAE}		3.0.0		0		O2LPBG
-{6E4658DD-79B0-4707-93C2-B022D66157A1}		3.0.0		0		O2LPBR
-{6DD492EA-45CD-483E-8563-23355FD37E28}		3.0.0		0		O2LPBRX
-{4D1449E7-D10B-44D8-AAB0-257D6930B0C2}		3.0.0		0		O2LPBN
-{3195C77E-8462-45DA-BEFC-37F1299D889E}		3.0.0		0		O2LPBNBD
-{763F5343-47FC-4909-8C18-D9E0CEED533A}		3.0.0		0		O2LPBNIN
-{DCC737A4-531E-4DCD-A3C4-376DA4C76D00}		3.0.0		0		O2LPBS
-{F190162C-DCD0-4266-B9AB-1B1FD7C24C2E}		3.0.0		0		O2LPBY
-{8EEC9A45-3BD3-431F-81D0-394F41185BD9}		3.0.0		0		O2LPCA
-{DBA607B3-0805-4A18-A45D-769C70D90AB7}		3.0.0		0		O2LPCS
-{3CE6CA2E-6ECF-45BC-B26A-348FA03A25D3}		3.0.0		0		O2LPCY
-{4E7025EF-909F-4609-97BA-304684C4833D}		3.0.0		0		O2LPDA
-{481E648E-D8AD-478A-A3F6-68FC563FFD8F}		3.0.0		0		O2LPDE
-{205ADC32-F775-476A-B68E-949F85D0B0E3}		3.0.0		0		O2LPDGO
-{3D391D0A-66D3-4141-8554-65DECA138208}		3.0.0		0		O2LPDZ
-{39772F91-1D37-4866-BBA4-900AB53590B0}		3.0.0		0		O2LPEL
-{E60BC5AC-2513-40AF-A41B-64118A287662}		3.0.0		0		O2LPENGB
-{8B909084-2220-49AC-A421-142180519088}		3.0.0		0		O2LPENUS
-{047EB419-DF2F-4D02-A3B5-E1B2FAFEDC93}		3.0.0		0		O2LPENZA
-{A256340D-4065-4B6F-AC1D-EB0D5127EBCE}		3.0.0		0		O2LPEO
-{01588DD5-C6C5-4C9D-A1BD-1A63E779DA1A}		3.0.0		0		O2LPES
-{34FBD5D3-3F88-4C91-8B9B-A10AE833250F}		3.0.0		0		O2LPET
-{A73CB85E-760B-4E5D-AB26-7DF091C25F16}		3.0.0		0		O2LPEU
-{12D1FE4A-95E1-4BED-B377-2E8EA93B2461}		3.0.0		0		O2LPFA
-{481B0FE0-8313-442E-8A53-7C5139ADA3DC}		3.0.0		0		O2LPFI
-{B0FDE9B8-D066-4FB2-885D-615A6D58E02F}		3.0.0		0		O2LPFR
-{39B343FE-EC1F-451E-930A-47D85E96DE67}		3.0.0		0		O2LPGA
-{DE408221-68E9-418D-9B20-10BE458268F2}		3.0.0		0		O2LPGD
-{38616841-D0DB-4768-B9B8-27D61A91FB47}		3.0.0		0		O2LPGL
-{382A0F08-CF86-45C4-8119-67C87E275EFE}		3.0.0		0		O2LPGU
-{25FF47C5-9FBB-4FBA-89FC-D0FB73336E2B}		3.0.0		0		O2LPGUIN
-{13484272-CE60-4867-B494-D56F9049B95A}		3.0.0		0		O2LPHE
-{2C70F320-6771-42D6-B3F5-97678C822B20}		3.0.0		0		O2LPHI
-{DDAB0849-CC63-475C-AC87-388B93579A28}		3.0.0		0		O2LPHIIN
-{0750A25E-7492-4681-8DFD-E04E89E45C0A}		3.0.0		0		O2LPHR
-{5981EE94-6763-40AD-A8A0-EEB01CCA153C}		3.0.0		0		O2LPHU
-{ED6D0C4C-2746-40A9-A672-4D9950C421C0}		3.0.0		0		O2LPIS
-{50087605-A504-441B-B514-67F13A284C10}		3.0.0		0		O2LPIT
-{74F683CC-8356-4BF7-9098-B85AAB7C1A0C}		3.0.0		0		O2LPJA
-{1A4DA798-78EB-46B8-A5CE-4E32F883314C}		3.0.0		0		O2LPKID
-{3110031F-1B5D-4457-BB5C-F6A330F15419}		3.0.0		0		O2LPKY
-{08E10841-B5EF-4BF9-9688-AE25573E6DA7}		3.0.0		0		O2LPKA
-{1527983C-2953-45B4-87A5-C7D67A1F6C60}		3.0.0		0		O2LPKK
-{B4E6E1AC-C45E-48BB-A038-073C32693B65}		3.0.0		0		O2LPKM
-{28FDEA4F-1DAB-4EAC-986E-604B7BB6EF11}		3.0.0		0		O2LPKN
-{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB}		3.0.0		0		O2LPKO
-{CC3129BA-331A-42CC-8569-93F9E05B6400}		3.0.0		0		O2LPKOK
-{BADB1F2A-B03A-4521-9A4A-61C3EDD365EC}		3.0.0		0		O2LPKS
-{2C5FB742-9A33-410D-AC5C-A376D4967D69}		3.0.0		0		O2LPKU
-{3968BFB2-35F7-4BBC-9E3E-C640BF09587D}		3.0.0		0		O2LPLO
-{3526DA6A-7EA6-471C-973E-C0461DE85909}		3.0.0		0		O2LPLT
-{BC085A1A-38A6-462A-889F-6E7CA442D9D8}		3.0.0		0		O2LPLV
-{BE522738-E05A-431A-B535-29349EBF86AE}		3.0.0		0		O2LPMAI
-{9B8D68D5-6903-4C22-AC8F-CA0D2D124FD8}		3.0.0		0		O2LPMK
-{A9E2C897-8193-4DBD-9FDE-F9BE9AB7F92E}		3.0.0		0		O2LPMN
-{3CBD068D-E6AE-4C02-8091-DD4F2866336A}		3.0.0		0		O2LPMNI
-{F300CABB-ED67-468E-A336-87DEC6E22CFC}		3.0.0		0		O2LPMS
-{F2F04B66-9996-425D-A026-0AE99F5DB878}		3.0.0		0		O2LPMLIN
-{4B87A651-94B3-48DF-800C-9458C3A93179}		3.0.0		0		O2LPMRIN
-{E1C174A0-8126-43A8-B696-9F9DE676E1ED}		3.0.0		0		O2LPMY
-{FF4DA93A-205F-40A2-9F01-2A5EB6663E6C}		3.0.0		0		O2LPNE
-{6E732530-FCDD-484C-A575-1289731020FD}		3.0.0		0		O2LPNB
-{7D14314D-DAF7-4A97-A6EE-97C475080A73}		3.0.0		0		O2LPNL
-{2F1F8A99-B3C4-4F22-BB08-5F0D217C0BE5}		3.0.0		0		O2LPNN
-{00C1656C-6386-42ED-BE8C-5D6C553EF125}		3.0.0		0		O2LPNO
-{0E64C806-9EB2-4651-BB94-B8D9814FD9E5}		3.0.0		0		O2LPNR
-{5142883F-6084-4723-907B-EFD4A5097817}		3.0.0		0		O2LPNS
-{8D6EE539-9E74-41C0-8DED-807F91D68467}		3.0.0		0		O2LPOM
-{73B96B61-E98E-4BB1-8E16-BABEBF6D58FB}		3.0.0		0		O2LPOC
-{11771BE2-44D3-4ACD-882B-26C4947237C5}		3.0.0		0		O2LPORIN
-{C4AC769D-F356-4D1A-A3A4-62E6729CF403}		3.0.0		0		O2LPPAP
-{1869854A-30BE-40EF-B72C-AF0CCA1A5A91}		3.0.0		0		O2LPPAIN
-{9C92258E-9A41-4A03-AA5C-FD8EF15189BA}		3.0.0		0		O2LPPL
-{277B630B-64D9-4105-A542-6F279A31A72C}		3.0.0		0		O2LPPS
-{CBFA6A61-D310-4A90-8F49-C7BE2735D58D}		3.0.0		0		O2LPPT
-{7364F154-089D-400B-B275-751AAB9A6122}		3.0.0		0		O2LPPTBR
-{DF67ADAA-4755-4184-9E32-1020F40DDA81}		3.0.0		0		O2LPRU
-{D1D013B7-9570-4165-8421-BBDC97842260}		3.0.0		0		O2LPRW
-{233A2442-D417-458E-A67F-4C3E58B54387}		3.0.0		0		O2LPSAT
-{180CEB68-8F15-4533-B2C2-43D47DED7ABB}		3.0.0		0		O2LPSAIN
-{6CFE884D-10C2-42F7-A60F-52A8284E8D45}		3.0.0		0		O2LPSI
-{AC0B0CE3-DF64-4CCF-88EC-CBF594D63183}		3.0.0		0		O2LPSC
-{638AEB7C-B611-4DBE-AD2C-A91BB7D13B75}		3.0.0		0		O2LPSD
-{19B49960-B58C-48A7-9761-F0B325E00C31}		3.0.0		0		O2LPSK
-{0FBEEB90-0C80-4C77-8CEE-E6347CC465FD}		3.0.0		0		O2LPSL
-{8DA3BE37-E70B-41BD-BBBC-C2169FBE01F4}		3.0.0		0		O2LPSH
-{49A004A2-3B8B-4029-B403-89919CB52355}		3.0.0		0		O2LPSR
-{5B0E4353-AB4E-497E-B38F-2E784C7B1F35}		3.0.0		0		O2LPSS
-{FC92FF2C-0E4B-4EB1-A962-682861EE4C33}		3.0.0		0		O2LPST
-{5E751B0D-FE96-4D0E-BAC1-5E7501294940}		3.0.0		0		O2LPSV
-{90672FAA-14CA-4F63-8FE9-40E572A3969A}		3.0.0		0		O2LPSW
-{905F971E-91FC-4F85-90D6-F6217A4FF01A}		3.0.0		0		O2LPSWTZ
-{79ADE5C5-96C5-4CAB-B8A3-1024E6A639E7}		3.0.0		0		O2LPTEIN
-{1FEF45BC-1315-46F4-B89B-6660226758DE}		3.0.0		0		O2LPTIER
-{76D5C227-D097-4B4E-B4C7-B2370B4F7932}		3.0.0		0		O2LPTAIN
-{1F9BC074-55AA-496A-9EC5-05E65CF64AE6}		3.0.0		0		O2LPTH
-{685C3085-DCD2-40F6-85C9-5084402D7E0F}		3.0.0		0		O2LPTN
-{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D}		3.0.0		0		O2LPTR
-{AC285965-9D0F-4D55-8885-0F0A9B9888B1}		3.0.0		0		O2LPTS
-{6C238E70-72FA-45FA-BC58-C508CD3AF6FC}		3.0.0		0		O2LPTG
-{57836D3D-879A-4288-8C47-691ECC4EECBE}		3.0.0		0		O2LPUG
-{CE89FED1-6E4E-41B0-95B2-C39295B6A6BD}		3.0.0		0		O2LPURIN
-{CB7AB32F-5218-4B5A-982E-F1AA5F00CFC0}		3.0.0		0		O2LPUK
-{CD74D285-6FAB-4737-B8C3-2FAA2B0B047D}		3.0.0		0		O2LPUZ
-{95AD70B2-CE4A-4362-975E-6C48DC70179C}		3.0.0		0		O2LPVE
-{9B664C3A-CD48-4717-A40D-3B02475D7E20}		3.0.0		0		O2LPVI
-{1BCF7835-9CD6-454E-9530-64222CCF29E7}		3.0.0		0		O2LPXH
-{5B45DC72-0755-4EC2-BB12-65A1FEADDDE7}		3.0.0		0		O2LPZHCN
-{08B2CED3-CFB5-491F-ADC4-FD0CD2366C60}		3.0.0		0		O2LPZHTW
-{924D7527-25C6-4B95-95C7-7B68DABEC93E}		3.0.0		0		O2LPZU
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt
deleted file mode 100644
index 7263a0a9e..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt
+++ /dev/null
@@ -1,73 +0,0 @@
-Action	Description	Template
-s72	L0	L0
-WINDOWSENCODINGTEMPLATE	ActionText	Action
-Advertise	OOO_ACTIONTEXT_1	
-AllocateRegistrySpace	OOO_ACTIONTEXT_2	OOO_ACTIONTEXT_3
-AppSearch	OOO_ACTIONTEXT_4	OOO_ACTIONTEXT_5
-BindImage	OOO_ACTIONTEXT_6	OOO_ACTIONTEXT_7
-caCreateVRoots	OOO_ACTIONTEXT_8	
-caRemoveVRoots	OOO_ACTIONTEXT_9	
-CCPSearch	OOO_ACTIONTEXT_10	
-CostFinalize	OOO_ACTIONTEXT_11	
-CostInitialize	OOO_ACTIONTEXT_12	
-CreateFolders	OOO_ACTIONTEXT_13	OOO_ACTIONTEXT_14
-CreateShortcuts	OOO_ACTIONTEXT_15	OOO_ACTIONTEXT_16
-DeleteServices	OOO_ACTIONTEXT_17	OOO_ACTIONTEXT_18
-DuplicateFiles	OOO_ACTIONTEXT_19	OOO_ACTIONTEXT_20
-FileCost	OOO_ACTIONTEXT_21	
-FindRelatedProducts	OOO_ACTIONTEXT_22	OOO_ACTIONTEXT_23
-GenerateScript	OOO_ACTIONTEXT_24	OOO_ACTIONTEXT_25
-InstallAdminPackage	OOO_ACTIONTEXT_26	OOO_ACTIONTEXT_27
-InstallFiles	OOO_ACTIONTEXT_28	OOO_ACTIONTEXT_29
-InstallODBC	OOO_ACTIONTEXT_30	
-InstallServices	OOO_ACTIONTEXT_31	OOO_ACTIONTEXT_32
-InstallSFPCatalogFile	OOO_ACTIONTEXT_33	OOO_ACTIONTEXT_34
-InstallValidate	OOO_ACTIONTEXT_35	
-LaunchConditions	OOO_ACTIONTEXT_36	
-MigrateFeatureStates	OOO_ACTIONTEXT_37	OOO_ACTIONTEXT_38
-MoveFiles	OOO_ACTIONTEXT_39	OOO_ACTIONTEXT_40
-PatchFiles	OOO_ACTIONTEXT_41	OOO_ACTIONTEXT_42
-ProcessComponents	OOO_ACTIONTEXT_43	
-PublishComponents	OOO_ACTIONTEXT_44	OOO_ACTIONTEXT_45
-PublishFeatures	OOO_ACTIONTEXT_46	OOO_ACTIONTEXT_47
-PublishProduct	OOO_ACTIONTEXT_48	
-RegisterClassInfo	OOO_ACTIONTEXT_49	OOO_ACTIONTEXT_50
-RegisterComPlus	OOO_ACTIONTEXT_51	OOO_ACTIONTEXT_52
-RegisterExtensionInfo	OOO_ACTIONTEXT_53	OOO_ACTIONTEXT_54
-RegisterFonts	OOO_ACTIONTEXT_55	OOO_ACTIONTEXT_56
-RegisterMIMEInfo	OOO_ACTIONTEXT_57	OOO_ACTIONTEXT_58
-RegisterProduct	OOO_ACTIONTEXT_59	OOO_ACTIONTEXT_60
-RegisterProgIdInfo	OOO_ACTIONTEXT_61	OOO_ACTIONTEXT_62
-RegisterTypeLibraries	OOO_ACTIONTEXT_63	OOO_ACTIONTEXT_64
-RegisterUser	OOO_ACTIONTEXT_65	OOO_ACTIONTEXT_66
-RemoveDuplicateFiles	OOO_ACTIONTEXT_67	OOO_ACTIONTEXT_68
-RemoveEnvironmentStrings	OOO_ACTIONTEXT_69	OOO_ACTIONTEXT_70
-RemoveExistingProducts	OOO_ACTIONTEXT_71	OOO_ACTIONTEXT_72
-RemoveFiles	OOO_ACTIONTEXT_73	OOO_ACTIONTEXT_74
-RemoveFolders	OOO_ACTIONTEXT_75	OOO_ACTIONTEXT_76
-RemoveIniValues	OOO_ACTIONTEXT_77	OOO_ACTIONTEXT_78
-RemoveODBC	OOO_ACTIONTEXT_79	
-RemoveRegistryValues	OOO_ACTIONTEXT_80	OOO_ACTIONTEXT_81
-RemoveShortcuts	OOO_ACTIONTEXT_82	OOO_ACTIONTEXT_83
-RMCCPSearch	OOO_ACTIONTEXT_84	
-Rollback	OOO_ACTIONTEXT_85	OOO_ACTIONTEXT_86
-RollbackCleanup	OOO_ACTIONTEXT_87	OOO_ACTIONTEXT_88
-SelfRegModules	OOO_ACTIONTEXT_89	OOO_ACTIONTEXT_90
-SelfUnregModules	OOO_ACTIONTEXT_91	OOO_ACTIONTEXT_92
-SetODBCFolders	OOO_ACTIONTEXT_93	
-StartServices	OOO_ACTIONTEXT_94	OOO_ACTIONTEXT_95
-StopServices	OOO_ACTIONTEXT_96	OOO_ACTIONTEXT_97
-UnmoveFiles	OOO_ACTIONTEXT_98	OOO_ACTIONTEXT_99
-UnpublishComponents	OOO_ACTIONTEXT_100	OOO_ACTIONTEXT_101
-UnpublishFeatures	OOO_ACTIONTEXT_102	OOO_ACTIONTEXT_103
-UnpublishProduct	OOO_ACTIONTEXT_104	
-UnregisterClassInfo	OOO_ACTIONTEXT_105	OOO_ACTIONTEXT_106
-UnregisterComPlus	OOO_ACTIONTEXT_107	OOO_ACTIONTEXT_108
-UnregisterExtensionInfo	OOO_ACTIONTEXT_109	OOO_ACTIONTEXT_110
-UnregisterFonts	OOO_ACTIONTEXT_111	OOO_ACTIONTEXT_112
-UnregisterMIMEInfo	OOO_ACTIONTEXT_113	OOO_ACTIONTEXT_114
-UnregisterProgIdInfo	OOO_ACTIONTEXT_115	OOO_ACTIONTEXT_116
-UnregisterTypeLibraries	OOO_ACTIONTEXT_117	OOO_ACTIONTEXT_118
-WriteEnvironmentStrings	OOO_ACTIONTEXT_119	OOO_ACTIONTEXT_120
-WriteIniValues	OOO_ACTIONTEXT_121	OOO_ACTIONTEXT_122
-WriteRegistryValues	OOO_ACTIONTEXT_123	OOO_ACTIONTEXT_124
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/AdminExe.idt
deleted file mode 100644
index ede3f7cb4..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/AdminExe.idt
+++ /dev/null
@@ -1,13 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdminExecuteSequence	Action
-CostFinalize		150
-CostInitialize		50
-CreateFolders		325
-FileCost		100
-InstallAdminPackage		300
-InstallFiles		350
-InstallFinalize		400
-InstallInitialize		250
-InstallValidate		200
-ScheduleReboot	ISSCHEDULEREBOOT	375
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/AdminUIS.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/AdminUIS.idt
deleted file mode 100644
index 3d92e28a4..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/AdminUIS.idt
+++ /dev/null
@@ -1,14 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdminUISequence	Action
-AdminWelcome	Not PATCH	250
-CostFinalize		200
-CostInitialize		100
-ExecuteAction		350
-FileCost		150
-PatchWelcome	PATCH	260
-SetupCompleteError		-3
-SetupCompleteSuccess		-1
-SetupInitialization		50
-SetupInterrupted		-2
-SetupProgress		300
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/AdvtExec.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/AdvtExec.idt
deleted file mode 100644
index 32b74d61a..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/AdvtExec.idt
+++ /dev/null
@@ -1,19 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdvtExecuteSequence	Action
-CostFinalize		100
-CostInitialize		50
-CreateShortcuts		250
-InstallFinalize		700
-InstallInitialize		200
-InstallValidate		150
-MsiPublishAssemblies		575
-PublishComponents		550
-PublishFeatures		600
-PublishProduct		650
-RegisterClassInfo		300
-RegisterExtensionInfo		350
-RegisterMIMEInfo		450
-RegisterProgIdInfo		400
-RegisterTypeLibraries		500
-ScheduleReboot	ISSCHEDULEREBOOT	675
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
deleted file mode 100644
index 9a3dac511..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
+++ /dev/null
@@ -1,7 +0,0 @@
-Property	Signature_
-s72	s72
-AppSearch	Property	Signature_
-INSTALLLOCATION	basisinstalluser
-INSTALLLOCATION	basisinstalluser_
-INSTALLLOCATION	basisinstallmachine
-INSTALLLOCATION	basisinstallmachine_
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary.idt
deleted file mode 100644
index 0b638cb0e..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary.idt
+++ /dev/null
@@ -1,20 +0,0 @@
-Name	Data
-s72	v0
-Binary	Name
-ImageBmp	Image.bmp
-BannerBmp	Banner.bmp
-CautionIco	caution.ico
-DontInstallIco	dontinstall.ico
-OpenFolderIco	openfolder.ico
-InstallIco	install.ico
-InstallFirstUseIco	installfirstuse.ico
-InstallPartialIco	installpartial.ico
-InstallStateMenuIco	installstatemenu.ico
-NetworkInstallIco	networkinstall.ico
-NewFolderIco	newfolder.ico
-SetupCompleteIco	setupcomplete.ico
-SetupIco	setup.ico
-SetupPartialIco	setuppartial.ico
-SetupRepairIco	setuprepair.ico
-TrashcanIco	trashcan.ico
-UpIco	up.ico
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp
deleted file mode 100644
index d7f7f6359..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
deleted file mode 100644
index 86a48d509..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/caution.ico
deleted file mode 100644
index 1c6f14ee0..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/caution.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/dontinstall.ico
deleted file mode 100644
index e7136d0e8..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/dontinstall.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/install.ico
deleted file mode 100644
index 2eb32becb..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/install.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installfirstuse.ico
deleted file mode 100644
index dc1e6542e..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installfirstuse.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installpartial.ico
deleted file mode 100644
index bd5767969..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installpartial.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installstatemenu.ico
deleted file mode 100644
index 914340dbb..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installstatemenu.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/networkinstall.ico
deleted file mode 100644
index ae11ed113..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/networkinstall.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/newfolder.ico
deleted file mode 100644
index 324adbcba..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/newfolder.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/openfolder.ico
deleted file mode 100644
index ef88d2e47..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/openfolder.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setup.ico
deleted file mode 100644
index 3580448fe..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setup.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setupcomplete.ico
deleted file mode 100644
index 609276af0..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setupcomplete.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuppartial.ico
deleted file mode 100644
index ac158ab39..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuppartial.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuprepair.ico
deleted file mode 100644
index 2f4a24d0b..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuprepair.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/trashcan.ico
deleted file mode 100644
index f1cc8083f..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/trashcan.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/up.ico
deleted file mode 100644
index 5dc25fae6..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/up.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/CheckBox.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/CheckBox.idt
deleted file mode 100644
index c7c8e06d7..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/CheckBox.idt
+++ /dev/null
@@ -1,4 +0,0 @@
-Property	Value
-s72	S64
-CheckBox	Property
-ISCHECKFORPRODUCTUPDATES	1
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
deleted file mode 100644
index b9a811eb1..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
+++ /dev/null
@@ -1,377 +0,0 @@
-Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
-s72	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L50
-WINDOWSENCODINGTEMPLATE	Control	Dialog_	Control
-AdminChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-AdminChangeFolder	BannerLine	Line	0	44	374	0	1				
-AdminChangeFolder	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-AdminChangeFolder	Branding2	Text	3	228	92	13	65537		[ProductName]		
-AdminChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_3	ComboText	
-AdminChangeFolder	Combo	DirectoryCombo	21	64	277	80	458755	TARGETDIR		Up	
-AdminChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_5	Combo	
-AdminChangeFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_6		
-AdminChangeFolder	DlgLine	Line	95	234	279	0	1				
-AdminChangeFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_7		
-AdminChangeFolder	List	DirectoryList	21	90	332	97	7	TARGETDIR		TailText	
-AdminChangeFolder	NewFolder	PushButton	335	66	19	19	3670019		NewFolderIco	List	OOO_CONTROL_9
-AdminChangeFolder	OK	PushButton	230	243	66	17	3		OOO_CONTROL_10	Cancel	
-AdminChangeFolder	Tail	PathEdit	21	207	332	17	3	TARGETDIR		OK	
-AdminChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_12	Tail	
-AdminChangeFolder	Up	PushButton	310	66	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_13
-AdminNetworkLocation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_14	InstallNow	
-AdminNetworkLocation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-AdminNetworkLocation	BannerLine	Line	0	44	374	0	1				
-AdminNetworkLocation	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-AdminNetworkLocation	Branding2	Text	3	228	92	13	65537		[ProductName]		
-AdminNetworkLocation	Browse	PushButton	286	124	66	17	3		OOO_CONTROL_17	Back	
-AdminNetworkLocation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_18	LBBrowse	
-AdminNetworkLocation	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_19		
-AdminNetworkLocation	DlgLine	Line	95	234	279	0	1				
-AdminNetworkLocation	DlgText	Text	21	51	326	40	3		OOO_CONTROL_20		
-AdminNetworkLocation	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_21		
-AdminNetworkLocation	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_22	Cancel	
-AdminNetworkLocation	LBBrowse	Text	21	90	100	10	3		OOO_CONTROL_23	SetupPathEdit	
-AdminNetworkLocation	SetupPathEdit	PathEdit	21	102	330	17	3	TARGETDIR		Browse	
-AdminWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_24	Next	
-AdminWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_25	Back	
-AdminWelcome	DlgLine	Line	0	234	326	0	1				
-AdminWelcome	Image	Bitmap	0	0	125	234	1		ImageBmp		
-AdminWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_26	Cancel	
-AdminWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_27		
-AdminWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_28		
-CancelSetup	Icon	Icon	15	15	24	24	5242881		CautionIco		
-CancelSetup	No	PushButton	135	57	66	17	3		OOO_CONTROL_29	Yes	
-CancelSetup	Text	Text	48	15	194	30	3		OOO_CONTROL_30		
-CancelSetup	Yes	PushButton	62	57	66	17	3		OOO_CONTROL_31	No	
-CustomerInformation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_32	Next	
-CustomerInformation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomerInformation	BannerLine	Line	0	44	374	0	1				
-CustomerInformation	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomerInformation	Branding2	Text	3	228	92	13	65537		[ProductName]		
-CustomerInformation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_35	NameLabel	
-CustomerInformation	CompanyEdit	Edit	21	100	237	17	3	COMPANYNAME	OOO_CONTROL_36	SerialLabel	
-CustomerInformation	CompanyLabel	Text	21	89	75	10	3		OOO_CONTROL_37	CompanyEdit	
-CustomerInformation	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_38		
-CustomerInformation	DlgLine	Line	95	234	279	0	1				
-CustomerInformation	DlgRadioGroupText	Text	21	161	300	14	3		OOO_CONTROL_39		
-CustomerInformation	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_40		
-CustomerInformation	NameEdit	Edit	21	63	237	17	3	USERNAME	OOO_CONTROL_41	CompanyLabel	
-CustomerInformation	NameLabel	Text	21	52	75	10	3		OOO_CONTROL_42	NameEdit	
-CustomerInformation	Next	PushButton	230	243	66	17	3		OOO_CONTROL_43	Cancel	
-CustomerInformation	RadioGroup	RadioButtonGroup	63	170	300	50	3	ApplicationUsers		Back	
-CustomerInformation	SerialLabel	Text	21	127	109	10	2		OOO_CONTROL_45	SerialNumber	
-CustomerInformation	SerialNumber	MaskedEdit	21	138	237	17	2	ISX_SERIALNUM		RadioGroup	
-CustomSetup	Back	PushButton	164	243	66	17	3		OOO_CONTROL_46	Next	
-CustomSetup	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomSetup	BannerLine	Line	0	44	374	0	1				
-CustomSetup	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomSetup	Branding2	Text	3	228	92	13	65537		[ProductName]		
-CustomSetup	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_49	Tree	
-CustomSetup	ChangeFolder	PushButton	301	203	66	17	3		OOO_CONTROL_50	Help	
-CustomSetup	Details	PushButton	93	243	66	17	3		OOO_CONTROL_51	Back	
-CustomSetup	DlgDesc	Text	17	23	276	25	65539		OOO_CONTROL_52		
-CustomSetup	DlgLine	Line	95	234	279	0	1				
-CustomSetup	DlgText	Text	9	51	360	10	3		OOO_CONTROL_53		
-CustomSetup	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_54		
-CustomSetup	FeatureGroup	GroupBox	235	67	131	120	1		OOO_CONTROL_55		
-CustomSetup	Help	PushButton	22	243	66	17	3		OOO_CONTROL_56	Details	
-CustomSetup	InstallLabel	Text	8	190	360	10	3		OOO_CONTROL_57		
-CustomSetup	ItemDescription	Text	241	80	120	50	3		OOO_CONTROL_58		
-CustomSetup	Location	Text	8	203	291	20	3		OOO_CONTROL_59		
-CustomSetup	Next	PushButton	230	243	66	17	3		OOO_CONTROL_60	Cancel	
-CustomSetup	Size	Text	241	133	120	50	3		OOO_CONTROL_61		
-CustomSetup	Tree	SelectionTree	8	70	220	118	7	_BrowseProperty		ChangeFolder	
-CustomSetupTips	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomSetupTips	BannerLine	Line	0	44	374	0	1				
-CustomSetupTips	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomSetupTips	Branding2	Text	3	228	92	13	65537		[ProductName]		
-CustomSetupTips	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_64		
-CustomSetupTips	DlgLine	Line	95	234	279	0	1				
-CustomSetupTips	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_65		
-CustomSetupTips	DontInstall	Icon	21	155	24	24	5242881		DontInstallIco		
-CustomSetupTips	DontInstallText	Text	60	155	300	20	3		OOO_CONTROL_66		
-CustomSetupTips	Install	Icon	21	105	24	24	5242881		InstallIco		
-CustomSetupTips	InstallPartial	Icon	21	130	24	24	5242881		InstallPartialIco		
-CustomSetupTips	InstallStateMenu	Icon	21	52	24	24	5242881		InstallStateMenuIco		
-CustomSetupTips	InstallStateText	Text	21	91	300	10	3		OOO_CONTROL_68		
-CustomSetupTips	InstallText	Text	60	105	300	20	3		OOO_CONTROL_69		
-CustomSetupTips	MenuText	Text	50	52	300	36	3		OOO_CONTROL_70		
-CustomSetupTips	OK	PushButton	301	243	66	17	3		OOO_CONTROL_72		
-CustomSetupTips	PartialText	Text	60	130	300	20	3		OOO_CONTROL_73		
-DatabaseFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_74	Next	
-DatabaseFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DatabaseFolder	BannerLine	Line	0	44	374	0	1				
-DatabaseFolder	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-DatabaseFolder	Branding2	Text	3	228	92	13	65537		[ProductName]		
-DatabaseFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_77	ChangeFolder	
-DatabaseFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_78	Back	
-DatabaseFolder	DatabaseFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
-DatabaseFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_79		
-DatabaseFolder	DlgLine	Line	95	234	279	0	1				
-DatabaseFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_80		
-DatabaseFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_81		
-DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
-DatabaseFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_83	Cancel	
-DestinationFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_84	Next	
-DestinationFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DestinationFolder	BannerLine	Line	0	44	374	0	1				
-DestinationFolder	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-DestinationFolder	Branding2	Text	3	228	92	13	65537		[ProductName]		
-DestinationFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_87	ChangeFolder	
-DestinationFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_88	Back	
-DestinationFolder	DestFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
-DestinationFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_89		
-DestinationFolder	DlgLine	Line	95	234	279	0	1				
-DestinationFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_90		
-DestinationFolder	Location	Text	57	65	240	40	3	_BrowseProperty	[INSTALLLOCATION]		
-DestinationFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_92		
-DestinationFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_93	Cancel	
-DiskSpaceRequirements	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DiskSpaceRequirements	BannerLine	Line	0	44	374	0	1				
-DiskSpaceRequirements	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-DiskSpaceRequirements	Branding2	Text	3	228	92	13	65537		[ProductName]		
-DiskSpaceRequirements	DlgDesc	Text	17	23	276	25	65539		OOO_CONTROL_96		
-DiskSpaceRequirements	DlgLine	Line	95	234	279	0	1				
-DiskSpaceRequirements	DlgText	Text	10	185	358	41	3		OOO_CONTROL_97		
-DiskSpaceRequirements	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_98		
-DiskSpaceRequirements	List	VolumeCostList	8	55	358	125	393223		{120}{70}{70}{70}{70}		
-DiskSpaceRequirements	OK	PushButton	301	243	66	17	3		OOO_CONTROL_100		
-FilesInUse	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-FilesInUse	BannerLine	Line	0	44	374	0	1				
-FilesInUse	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-FilesInUse	Branding2	Text	3	228	92	13	65537		[ProductName]		
-FilesInUse	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_103		
-FilesInUse	DlgLine	Line	95	234	279	0	1				
-FilesInUse	DlgText	Text	21	51	348	29	3		OOO_CONTROL_104		
-FilesInUse	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_105		
-FilesInUse	Exit	PushButton	301	243	66	17	3		OOO_CONTROL_106	List	
-FilesInUse	Ignore	PushButton	230	243	66	17	3		OOO_CONTROL_107	Exit	
-FilesInUse	List	ListBox	21	87	331	135	7	FileInUseProcess		Retry	
-FilesInUse	Retry	PushButton	164	243	66	17	3		OOO_CONTROL_108	Ignore	
-FileTypeDialog	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
-FileTypeDialog	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-FileTypeDialog	BannerLine	Line	0	44	374	0	1				
-FileTypeDialog	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-FileTypeDialog	Branding2	Text	3	228	92	13	65537		[ProductName]		
-FileTypeDialog	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_138	CheckBox1	
-FileTypeDialog	CheckBox1	CheckBox	41	106	200	10	3	SELECT_WORD	 OOO_CONTROL_270	CheckBox2	
-FileTypeDialog	CheckBox2	CheckBox	41	131	200	10	3	SELECT_EXCEL	 OOO_CONTROL_271	CheckBox3	
-FileTypeDialog	CheckBox3	CheckBox	41	156	200	10	3	SELECT_POWERPOINT	 OOO_CONTROL_272	Back	
-FileTypeDialog	DlgDesc	Text	21	20	272	25	65539		OOO_CONTROL_274		
-FileTypeDialog	DlgLine	Line	95	234	279	0	1				
-FileTypeDialog	DlgText	Text	21	56	326	40	3		OOO_CONTROL_275		
-FileTypeDialog	DlgText2	Text	21	190	326	30	3		OOO_CONTROL_309		
-FileTypeDialog	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_278		
-FileTypeDialog	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-InstallChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-InstallChangeFolder	BannerLine	Line	0	44	374	0	1				
-InstallChangeFolder	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-InstallChangeFolder	Branding2	Text	3	228	92	13	65537		[ProductName]		
-InstallChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_111	ComboText	
-InstallChangeFolder	Combo	DirectoryCombo	21	64	277	80	4128779	_BrowseProperty		Up	
-InstallChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_113	Combo	
-InstallChangeFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_114		
-InstallChangeFolder	DlgLine	Line	95	234	279	0	1				
-InstallChangeFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_115		
-InstallChangeFolder	List	DirectoryList	21	90	332	97	15	_BrowseProperty		TailText	
-InstallChangeFolder	NewFolder	PushButton	335	66	19	19	3670019		NewFolderIco	List	OOO_CONTROL_117
-InstallChangeFolder	OK	PushButton	230	243	66	17	3		OOO_CONTROL_118	Cancel	
-InstallChangeFolder	Tail	PathEdit	21	207	332	17	15	_BrowseProperty		OK	
-InstallChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_120	Tail	
-InstallChangeFolder	Up	PushButton	310	66	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_121
-InstallWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_122	Copyright	
-InstallWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_123	Back	
-InstallWelcome	Copyright	Text	135	144	228	73	65539		OOO_CONTROL_124	Next	
-InstallWelcome	DlgLine	Line	0	234	374	0	1				
-InstallWelcome	Image	Bitmap	0	0	125	234	1		ImageBmp		
-InstallWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_125	Cancel	
-InstallWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_126		
-InstallWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_127		
-LicenseAgreement	Agree	RadioButtonGroup	8	190	330	40	3	AgreeToLicense		Back	
-LicenseAgreement	Back	PushButton	164	243	66	17	3		OOO_CONTROL_128	Next	
-LicenseAgreement	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-LicenseAgreement	BannerLine	Line	0	44	374	0	1				
-LicenseAgreement	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-LicenseAgreement	Branding2	Text	3	228	92	13	65537		[ProductName]		
-LicenseAgreement	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_131	Agree	
-LicenseAgreement	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_132		
-LicenseAgreement	DlgLine	Line	95	234	279	0	1				
-LicenseAgreement	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_133		
-LicenseAgreement	Memo	ScrollableText	8	54	358	130	7				
-LicenseAgreement	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-MaintenanceType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
-MaintenanceType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-MaintenanceType	BannerLine	Line	0	44	374	0	1				
-MaintenanceType	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-MaintenanceType	Branding2	Text	3	228	92	13	65537		[ProductName]		
-MaintenanceType	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_138	RadioGroup	
-MaintenanceType	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_139		
-MaintenanceType	DlgLine	Line	95	234	279	0	1				
-MaintenanceType	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_140		
-MaintenanceType	Ico1	Icon	35	75	24	24	5242881		SetupPartialIco		
-MaintenanceType	Ico2	Icon	35	135	24	24	5242881		SetupRepairIco		
-MaintenanceType	Ico3	Icon	35	195	24	24	5242881		TrashcanIco		
-MaintenanceType	Next	PushButton	230	243	66	17	3		OOO_CONTROL_141	Cancel	
-MaintenanceType	RadioGroup	RadioButtonGroup	21	55	290	170	3	_IsMaintenance		Back	
-MaintenanceType	Text1	Text	80	72	260	35	3		OOO_CONTROL_143		
-MaintenanceType	Text2	Text	80	135	260	35	3		OOO_CONTROL_144		
-MaintenanceType	Text3	Text	80	192	260	35	3		OOO_CONTROL_145		
-MaintenanceWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_146	Next	
-MaintenanceWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_147	Back	
-MaintenanceWelcome	DlgLine	Line	0	234	374	0	1				
-MaintenanceWelcome	Image	Bitmap	0	0	125	234	1		ImageBmp		
-MaintenanceWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_148	Cancel	
-MaintenanceWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_149		
-MaintenanceWelcome	TextLine2	Text	135	55	228	50	65539		OOO_CONTROL_150		
-OutOfSpace	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-OutOfSpace	BannerLine	Line	0	44	374	0	1				
-OutOfSpace	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-OutOfSpace	Branding2	Text	3	228	92	13	65537		[ProductName]		
-OutOfSpace	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_153		
-OutOfSpace	DlgLine	Line	95	234	279	0	1				
-OutOfSpace	DlgText	Text	21	51	326	43	3		OOO_CONTROL_154		
-OutOfSpace	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_155		
-OutOfSpace	List	VolumeCostList	21	95	332	120	393223		OOO_CONTROL_156		
-OutOfSpace	Resume	PushButton	301	243	66	17	3		OOO_CONTROL_157		
-PatchWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_158	Next	
-PatchWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_159	Back	
-PatchWelcome	DlgLine	Line	0	234	374	0	1				
-PatchWelcome	Image	Bitmap	0	0	125	234	1		ImageBmp		
-PatchWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_160	Cancel	
-PatchWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_161		
-PatchWelcome	TextLine2	Text	135	54	228	45	65539		OOO_CONTROL_162		
-ReadyToInstall	Back	PushButton	164	243	66	17	3		OOO_CONTROL_163	InstallNow	
-ReadyToInstall	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-ReadyToInstall	BannerLine	Line	0	44	374	0	1				
-ReadyToInstall	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-ReadyToInstall	Branding2	Text	3	228	92	13	65537		[ProductName]		
-ReadyToInstall	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_166	Back	
-ReadyToInstall	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_167		
-ReadyToInstall	DlgLine	Line	95	234	279	0	1				
-ReadyToInstall	DlgText	Text	21	51	326	20	3		OOO_CONTROL_168		
-ReadyToInstall	DlgText1	Text	21	70	330	24	3		OOO_CONTROL_169		
-ReadyToInstall	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_170		
-ReadyToInstall	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_171		
-ReadyToInstall	DlgTitle3	Text	13	6	280	25	65538		OOO_CONTROL_172		
-ReadyToInstall	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_173	Cancel	
-ReadyToRemove	Back	PushButton	164	243	66	17	3		OOO_CONTROL_174	RemoveNow	
-ReadyToRemove	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-ReadyToRemove	BannerLine	Line	0	44	374	0	1				
-ReadyToRemove	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-ReadyToRemove	Branding2	Text	3	228	92	13	65537		[ProductName]		
-ReadyToRemove	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_177	Back	
-ReadyToRemove	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_178		
-ReadyToRemove	DlgLine	Line	95	234	279	0	1				
-ReadyToRemove	DlgText	Text	21	51	326	24	3		OOO_CONTROL_179		
-ReadyToRemove	DlgText1	Text	21	79	330	23	3		OOO_CONTROL_180		
-ReadyToRemove	DlgText2	Text	21	102	330	24	3				
-ReadyToRemove	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_181		
-ReadyToRemove	RemoveNow	PushButton	230	243	66	17	3		OOO_CONTROL_182	Cancel	
-SetupCompleteError	Back	PushButton	164	243	66	17	1		OOO_CONTROL_183	Finish	
-SetupCompleteError	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_184	Back	
-SetupCompleteError	DlgLine	Line	0	234	374	0	1				
-SetupCompleteError	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_185	Cancel	
-SetupCompleteError	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_186		
-SetupCompleteError	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_187		
-SetupCompleteError	Image	Bitmap	0	0	125	234	1		ImageBmp		
-SetupCompleteError	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_188		
-SetupCompleteError	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_189		
-SetupCompleteError	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_190		
-SetupCompleteError	TextLine2	Text	135	55	228	25	65539		OOO_CONTROL_191		
-SetupCompleteSuccess	Back	PushButton	164	243	66	17	1		OOO_CONTROL_192	OK	
-SetupCompleteSuccess	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_193	Image	
-SetupCompleteSuccess	CheckBoxUpdates	CheckBox	135	164	10	9	2	ISCHECKFORPRODUCTUPDATES	CheckBox1	Back	
-SetupCompleteSuccess	CheckForUpdatesText	Text	152	162	190	30	65538		OOO_CONTROL_194		
-SetupCompleteSuccess	CheckLaunchProgram	CheckBox	151	114	10	9	2	LAUNCHPROGRAM			
-SetupCompleteSuccess	CheckLaunchReadme	CheckBox	151	148	10	9	2	LAUNCHREADME			
-SetupCompleteSuccess	DlgLine	Line	0	234	374	0	1				
-SetupCompleteSuccess	Image	Bitmap	0	0	125	234	1		ImageBmp	CheckBoxUpdates	
-SetupCompleteSuccess	LaunchProgramText	Text	164	112	198	15	65538		OOO_CONTROL_195		
-SetupCompleteSuccess	LaunchReadmeText	Text	164	148	198	13	65538		OOO_CONTROL_196		
-SetupCompleteSuccess	OK	PushButton	230	243	66	17	3		OOO_CONTROL_197	Cancel	
-SetupCompleteSuccess	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_198		
-SetupCompleteSuccess	TextLine2	Text	135	55	228	45	65538		OOO_CONTROL_199		
-SetupCompleteSuccess	TextLine3	Text	135	55	228	45	65538		OOO_CONTROL_200		
-SetupCompleteSuccess	UpdateTextLine1	Text	135	30	228	45	65538		OOO_CONTROL_201		
-SetupCompleteSuccess	UpdateTextLine2	Text	135	80	228	45	65538		OOO_CONTROL_202		
-SetupCompleteSuccess	UpdateTextLine3	Text	135	120	228	45	65538		OOO_CONTROL_203		
-SetupError	A	PushButton	192	80	66	17	3		OOO_CONTROL_204		
-SetupError	C	PushButton	192	80	66	17	3		OOO_CONTROL_205		
-SetupError	ErrorText	Text	50	15	200	50	3		OOO_CONTROL_206		
-SetupError	I	PushButton	192	80	66	17	3		OOO_CONTROL_207		
-SetupError	N	PushButton	192	80	66	17	3		OOO_CONTROL_208		
-SetupError	O	PushButton	192	80	66	17	3		OOO_CONTROL_209		
-SetupError	R	PushButton	192	80	66	17	3		OOO_CONTROL_210		
-SetupError	WarningIcon	Icon	15	15	24	24	5242881		CautionIco		
-SetupError	Y	PushButton	192	80	66	17	3		OOO_CONTROL_211		
-SetupInitialization	ActionData	Text	135	125	228	12	65539				
-SetupInitialization	ActionText	Text	135	109	220	36	65539				
-SetupInitialization	Back	PushButton	164	243	66	17	1		OOO_CONTROL_214		
-SetupInitialization	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_215		
-SetupInitialization	DlgLine	Line	0	234	374	0	1				
-SetupInitialization	Image	Bitmap	0	0	125	234	1		ImageBmp		
-SetupInitialization	Next	PushButton	230	243	66	17	1		OOO_CONTROL_216		
-SetupInitialization	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_217		
-SetupInitialization	TextLine2	Text	135	55	228	30	65539		OOO_CONTROL_218		
-SetupInterrupted	Back	PushButton	164	243	66	17	1		OOO_CONTROL_219		
-SetupInterrupted	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_220		
-SetupInterrupted	DlgLine	Line	0	234	374	0	1				
-SetupInterrupted	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_221		
-SetupInterrupted	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_222		
-SetupInterrupted	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_223		
-SetupInterrupted	Image	Bitmap	0	0	125	234	1		ImageBmp		
-SetupInterrupted	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_224		
-SetupInterrupted	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_225		
-SetupInterrupted	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_226		
-SetupInterrupted	TextLine2	Text	135	55	228	25	65539		OOO_CONTROL_227		
-SetupProgress	ActionProgress95	ProgressBar	59	113	275	12	65537		OOO_CONTROL_228		
-SetupProgress	ActionText	Text	59	100	275	12	3				
-SetupProgress	Back	PushButton	164	243	66	17	1		OOO_CONTROL_230	Next	
-SetupProgress	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-SetupProgress	BannerLine	Line	0	44	374	0	1				
-SetupProgress	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-SetupProgress	Branding2	Text	3	228	92	13	65537		[ProductName]		
-SetupProgress	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_233	Back	
-SetupProgress	DlgDesc	Text	21	23	272	25	65538		OOO_CONTROL_234		
-SetupProgress	DlgDesc2	Text	21	23	272	25	65538		OOO_CONTROL_235		
-SetupProgress	DlgLine	Line	95	234	279	0	1				
-SetupProgress	DlgText	Text	59	51	275	30	65538		OOO_CONTROL_236		
-SetupProgress	DlgText2	Text	59	51	275	30	65538		OOO_CONTROL_237		
-SetupProgress	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_238		
-SetupProgress	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_239		
-SetupProgress	LbSec	Text	172	139	32	12	2		OOO_CONTROL_240		
-SetupProgress	LbStatus	Text	59	85	70	12	3		OOO_CONTROL_241		
-SetupProgress	Next	PushButton	230	243	66	17	1		OOO_CONTROL_242	Cancel	
-SetupProgress	SetupIcon	Icon	21	51	24	24	5242881		SetupIco		
-SetupProgress	ShowTime	Text	155	139	17	12	2				
-SetupProgress	TextTime	Text	59	139	96	12	2		OOO_CONTROL_244		
-SetupResume	Back	PushButton	164	243	66	17	1		OOO_CONTROL_245	Next	
-SetupResume	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_246	Back	
-SetupResume	DlgLine	Line	0	234	374	0	1				
-SetupResume	Image	Bitmap	0	0	125	234	1		ImageBmp		
-SetupResume	Next	PushButton	230	243	66	17	3		OOO_CONTROL_247	Cancel	
-SetupResume	PreselectedText	Text	135	55	228	45	65539		OOO_CONTROL_248		
-SetupResume	ResumeText	Text	135	46	228	45	65539		OOO_CONTROL_249		
-SetupResume	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_250		
-SetupType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_251	Next	
-SetupType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-SetupType	BannerLine	Line	0	44	374	0	1				
-SetupType	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-SetupType	Branding2	Text	3	228	92	13	65537		[ProductName]		
-SetupType	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_254	RadioGroup	
-SetupType	CompleteIco	Icon	34	94	24	24	5242881		SetupCompleteIco		
-SetupType	CompText	Text	80	94	246	35	3		OOO_CONTROL_255		
-SetupType	CustomIco	Icon	34	154	24	24	5242881		SetupPartialIco		
-SetupType	CustText	Text	80	154	246	35	3		OOO_CONTROL_256		
-SetupType	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_257		
-SetupType	DlgLine	Line	95	234	279	0	1				
-SetupType	DlgText	Text	21	51	326	10	3		OOO_CONTROL_258		
-SetupType	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_259		
-SetupType	Next	PushButton	230	243	66	17	3		OOO_CONTROL_260	Cancel	
-SetupType	RadioGroup	RadioButtonGroup	21	79	264	120	3	_IsSetupTypeMin		Back	
-SplashBitmap	Back	PushButton	164	243	66	17	1		OOO_CONTROL_262	Next	
-SplashBitmap	Branding1	Text	4	229	92	13	3		{&MSSWhiteSerif8}[ProductName]		
-SplashBitmap	Branding2	Text	3	228	92	13	65537		[ProductName]		
-SplashBitmap	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_265	Back	
-SplashBitmap	DlgLine	Line	95	234	279	0	1				
-SplashBitmap	Image	Bitmap	13	12	113	211	1		ImageBmp		
-SplashBitmap	Next	PushButton	230	243	66	17	3		OOO_CONTROL_266	Cancel	
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
deleted file mode 100644
index 6f6e3cb59..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt
+++ /dev/null
@@ -1,70 +0,0 @@
-Dialog_	Control_	Action	Condition
-s72	s50	s50	s255
-ControlCondition	Dialog_	Control_	Action	Condition
-CustomerInformation	DlgRadioGroupText	Hide	NOT Privileged
-CustomerInformation	DlgRadioGroupText	Hide	ProductState > 0
-CustomerInformation	DlgRadioGroupText	Hide	Version9X
-CustomerInformation	RadioGroup	Hide	NOT Privileged
-CustomerInformation	RadioGroup	Hide	ProductState > 0
-CustomerInformation	RadioGroup	Hide	Version9X
-CustomerInformation	SerialLabel	Show	SERIALNUMSHOW
-CustomerInformation	SerialNumber	Show	SERIALNUMSHOW
-CustomSetup	ChangeFolder	Hide	Installed
-CustomSetup	Details	Hide	Installed
-CustomSetup	InstallLabel	Hide	Installed
-InstallWelcome	Copyright	Hide	SHOWCOPYRIGHT="No"
-InstallWelcome	Copyright	Show	SHOWCOPYRIGHT="Yes"
-LicenseAgreement	Next	Disable	AgreeToLicense <> "Yes"
-LicenseAgreement	Next	Enable	AgreeToLicense = "Yes"
-ReadyToInstall	DlgTitle	Show	ProgressType0="Modify"
-ReadyToInstall	DlgTitle2	Show	ProgressType0="Repair"
-ReadyToInstall	DlgTitle3	Show	ProgressType0="install"
-SetupCompleteError	Back	Default	UpdateStarted
-SetupCompleteError	Back	Disable	NOT UpdateStarted
-SetupCompleteError	Back	Enable	UpdateStarted
-SetupCompleteError	Cancel	Disable	NOT UpdateStarted
-SetupCompleteError	Cancel	Enable	UpdateStarted
-SetupCompleteError	Finish	Default	NOT UpdateStarted
-SetupCompleteError	FinishText1	Hide	UpdateStarted
-SetupCompleteError	FinishText1	Show	NOT UpdateStarted
-SetupCompleteError	FinishText2	Hide	UpdateStarted
-SetupCompleteError	FinishText2	Show	NOT UpdateStarted
-SetupCompleteError	RestContText1	Hide	NOT UpdateStarted
-SetupCompleteError	RestContText1	Show	UpdateStarted
-SetupCompleteError	RestContText2	Hide	NOT UpdateStarted
-SetupCompleteError	RestContText2	Show	UpdateStarted
-SetupCompleteSuccess	CheckBoxUpdates	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	CheckForUpdatesText	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	CheckLaunchProgram	Show	SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	CheckLaunchReadme	Show	SHOWLAUNCHREADME="-1"  And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	LaunchProgramText	Show	SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	LaunchReadmeText	Show	SHOWLAUNCHREADME="-1"  And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	TextLine2	Show	ProgressType2="installed" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess	TextLine3	Show	ProgressType2="uninstalled" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess	UpdateTextLine1	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	UpdateTextLine2	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	UpdateTextLine3	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupInterrupted	Back	Default	UpdateStarted
-SetupInterrupted	Back	Disable	NOT UpdateStarted
-SetupInterrupted	Back	Enable	UpdateStarted
-SetupInterrupted	Cancel	Disable	NOT UpdateStarted
-SetupInterrupted	Cancel	Enable	UpdateStarted
-SetupInterrupted	Finish	Default	NOT UpdateStarted
-SetupInterrupted	FinishText1	Hide	UpdateStarted
-SetupInterrupted	FinishText1	Show	NOT UpdateStarted
-SetupInterrupted	FinishText2	Hide	UpdateStarted
-SetupInterrupted	FinishText2	Show	NOT UpdateStarted
-SetupInterrupted	RestContText1	Hide	NOT UpdateStarted
-SetupInterrupted	RestContText1	Show	UpdateStarted
-SetupInterrupted	RestContText2	Hide	NOT UpdateStarted
-SetupInterrupted	RestContText2	Show	UpdateStarted
-SetupProgress	DlgDesc	Show	ProgressType2="installed"
-SetupProgress	DlgDesc2	Show	ProgressType2="uninstalled"
-SetupProgress	DlgText	Show	ProgressType3="installs"
-SetupProgress	DlgText2	Show	ProgressType3="uninstalls"
-SetupProgress	DlgTitle	Show	ProgressType1="Installing"
-SetupProgress	DlgTitle2	Show	ProgressType1="Uninstalling"
-SetupResume	PreselectedText	Hide	RESUME
-SetupResume	PreselectedText	Show	NOT RESUME
-SetupResume	ResumeText	Hide	NOT RESUME
-SetupResume	ResumeText	Show	RESUME
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
deleted file mode 100644
index 49407d477..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
+++ /dev/null
@@ -1,139 +0,0 @@
-Dialog_	Control_	Event	Argument	Condition	Ordering
-s72	s50	s50	s255	S255	I2
-ControlEvent	Dialog_	Control_	Event	Argument	Condition
-AdminChangeFolder	Cancel	EndDialog	Return	1	2
-AdminChangeFolder	Cancel	Reset	0	1	1
-AdminChangeFolder	NewFolder	DirectoryListNew	0	1	0
-AdminChangeFolder	OK	EndDialog	Return	1	0
-AdminChangeFolder	OK	SetTargetPath	TARGETDIR	1	1
-AdminChangeFolder	Up	DirectoryListUp	0	1	0
-AdminNetworkLocation	Back	NewDialog	AdminWelcome	1	0
-AdminNetworkLocation	Browse	SpawnDialog	AdminChangeFolder	1	0
-AdminNetworkLocation	Cancel	SpawnDialog	CancelSetup	1	0
-AdminNetworkLocation	InstallNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	3
-AdminNetworkLocation	InstallNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	2
-AdminNetworkLocation	InstallNow	SetTargetPath	TARGETDIR	1	1
-AdminWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-AdminWelcome	Next	NewDialog	AdminNetworkLocation	1	0
-CancelSetup	No	EndDialog	Return	1	0
-CancelSetup	Yes	EndDialog	Exit	1	2
-CustomerInformation	Back	NewDialog	LicenseAgreement	1	1
-CustomerInformation	Cancel	SpawnDialog	CancelSetup	1	0
-CustomerInformation	Next	[ALLUSERS]	{}	ApplicationUsers = "OnlyCurrentUser" And Privileged	2
-CustomerInformation	Next	[ALLUSERS]	1	ApplicationUsers = "AllUsers" And Privileged	1
-CustomerInformation	Next	EndDialog	Exit	(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT<0) And (SERIALNUMVALRETURN<>SERIALNUMVALSUCCESSRETVAL)	3
-CustomerInformation	Next	NewDialog	SetupType	((Not SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))	4
-CustomSetup	Back	NewDialog	MaintenanceType	Installed	0
-CustomSetup	Back	NewDialog	SetupType	NOT Installed	0
-CustomSetup	Cancel	SpawnDialog	CancelSetup	1	0
-CustomSetup	ChangeFolder	SelectionBrowse	InstallChangeFolder	1	0
-CustomSetup	Details	SelectionBrowse	DiskSpaceRequirements	1	1
-CustomSetup	Help	SpawnDialog	CustomSetupTips	1	1
-CustomSetup	Next	[_IsSetupTypeMin]	Custom	1	0
-CustomSetup	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-CustomSetup	Next	NewDialog	ReadyToInstall	OutOfNoRbDiskSpace <> 1	0
-CustomSetupTips	OK	EndDialog	Return	1	1
-DatabaseFolder	Back	NewDialog	CustomerInformation	1	1
-DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
-DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
-DatabaseFolder	Next	NewDialog	SetupType	1	1
-DestinationFolder	Back	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-DestinationFolder	Back	NewDialog	InstallWelcome	HIDEEULA = 1	0
-DestinationFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DestinationFolder	ChangeFolder	[_BrowseProperty]	INSTALLLOCATION	1	2
-DestinationFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
-DestinationFolder	Next	NewDialog	ReadyToInstall	1	0
-DiskSpaceRequirements	OK	EndDialog	Return	1	0
-FilesInUse	Exit	EndDialog	Exit	1	0
-FilesInUse	Ignore	EndDialog	Ignore	1	0
-FilesInUse	Retry	EndDialog	Retry	1	0
-FileTypeDialog	Back	NewDialog	CustomSetup	Installed OR _IsSetupTypeMin = "Custom"	2
-FileTypeDialog	Back	NewDialog	SetupType	NOT Installed AND _IsSetupTypeMin <> "Custom"	1
-FileTypeDialog	Cancel	SpawnDialog	CancelSetup	1	0
-FileTypeDialog	Next	NewDialog	ReadyToInstall	1	0
-InstallChangeFolder	Cancel	EndDialog	Return	1	2
-InstallChangeFolder	Cancel	Reset	0	1	1
-InstallChangeFolder	NewFolder	DirectoryListNew	0	1	0
-InstallChangeFolder	OK	EndDialog	Return	1	3
-InstallChangeFolder	OK	SetTargetPath	[_BrowseProperty]	1	2
-InstallChangeFolder	Up	DirectoryListUp	0	1	0
-InstallWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	1
-InstallWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-InstallWelcome	Next	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-InstallWelcome	Next	NewDialog	DestinationFolder	HIDEEULA = 1	0
-LicenseAgreement	Back	NewDialog	InstallWelcome	1	0
-LicenseAgreement	Cancel	SpawnDialog	CancelSetup	1	0
-LicenseAgreement	Next	NewDialog	DestinationFolder	AgreeToLicense = "Yes"	0
-MaintenanceType	Back	NewDialog	MaintenanceWelcome	1	0
-MaintenanceType	Cancel	SpawnDialog	CancelSetup	1	0
-MaintenanceType	Next	[ProgressType0]	Modify	_IsMaintenance = "Change"	2
-MaintenanceType	Next	[ProgressType0]	Repair	_IsMaintenance = "Reinstall"	1
-MaintenanceType	Next	[ProgressType1]	Modifying	_IsMaintenance = "Change"	3
-MaintenanceType	Next	[ProgressType1]	Repairing	_IsMaintenance = "Reinstall"	4
-MaintenanceType	Next	[ProgressType2]	modified	_IsMaintenance = "Change"	6
-MaintenanceType	Next	[ProgressType2]	repairs	_IsMaintenance = "Reinstall"	5
-MaintenanceType	Next	[ProgressType3]	modifies	_IsMaintenance = "Change"	7
-MaintenanceType	Next	[ProgressType3]	repairs	_IsMaintenance = "Reinstall"	8
-MaintenanceType	Next	NewDialog	CustomSetup	_IsMaintenance = "Change"	12
-MaintenanceType	Next	NewDialog	ReadyToInstall	_IsMaintenance = "Reinstall"	13
-MaintenanceType	Next	NewDialog	ReadyToRemove	_IsMaintenance = "Remove"	11
-MaintenanceType	Next	Reinstall	ALL	_IsMaintenance = "Reinstall"	10
-MaintenanceType	Next	ReinstallMode	[ReinstallModeText]	_IsMaintenance = "Reinstall"	9
-MaintenanceWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-MaintenanceWelcome	Next	NewDialog	MaintenanceType	1	0
-OutOfSpace	Resume	NewDialog	AdminNetworkLocation	ACTION = "ADMIN"	0
-OutOfSpace	Resume	NewDialog	DestinationFolder	ACTION <> "ADMIN"	0
-PatchWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	0
-PatchWelcome	Cancel	SpawnDialog	CancelSetup	1	1
-PatchWelcome	Next	EndDialog	Return	1	3
-PatchWelcome	Next	Reinstall	ALL	PATCH And REINSTALL=""	1
-PatchWelcome	Next	ReinstallMode	omus	PATCH And REINSTALLMODE=""	2
-ReadyToInstall	Back	NewDialog	DestinationFolder	Installed OR _IsSetupTypeMin = "Custom"	2
-ReadyToInstall	Back	NewDialog	DestinationFolder	Installed AND _IsMaintenance = "Reinstall"	3
-ReadyToInstall	Back	NewDialog	DestinationFolder	NOT Installed AND _IsSetupTypeMin <> "Custom"	1
-ReadyToInstall	Cancel	SpawnDialog	CancelSetup	1	0
-ReadyToInstall	InstallNow	[ProgressType1]	Installing	1	0
-ReadyToInstall	InstallNow	[ProgressType2]	installed	1	0
-ReadyToInstall	InstallNow	[ProgressType3]	installs	1	0
-ReadyToInstall	InstallNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
-ReadyToInstall	InstallNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-ReadyToRemove	Back	NewDialog	MaintenanceType	1	0
-ReadyToRemove	Cancel	SpawnDialog	CancelSetup	1	0
-ReadyToRemove	RemoveNow	[ProgressType1]	Uninstalling	1	0
-ReadyToRemove	RemoveNow	[ProgressType2]	uninstalled	1	0
-ReadyToRemove	RemoveNow	[ProgressType3]	uninstalls	1	0
-ReadyToRemove	RemoveNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	2
-ReadyToRemove	RemoveNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	2
-ReadyToRemove	RemoveNow	Remove	ALL	1	1
-SetupCompleteError	Back	[Suspend]	{}	1	1
-SetupCompleteError	Back	EndDialog	Return	1	2
-SetupCompleteError	Cancel	[Suspend]	1	1	1
-SetupCompleteError	Cancel	EndDialog	Return	1	2
-SetupCompleteError	Finish	EndDialog	Exit	1	2
-SetupCompleteSuccess	OK	DoAction	CheckForProductUpdates	ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And NOT ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL"	4
-SetupCompleteSuccess	OK	DoAction	CheckForProductUpdatesOnReboot	ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL"	5
-SetupCompleteSuccess	OK	EndDialog	Exit	1	2
-SetupError	A	EndDialog	ErrorAbort	1	0
-SetupError	C	EndDialog	ErrorCancel	1	0
-SetupError	I	EndDialog	ErrorIgnore	1	0
-SetupError	N	EndDialog	ErrorNo	1	0
-SetupError	O	EndDialog	ErrorOk	1	0
-SetupError	R	EndDialog	ErrorRetry	1	0
-SetupError	Y	EndDialog	ErrorYes	1	0
-SetupInitialization	Cancel	SpawnDialog	CancelSetup	1	0
-SetupInterrupted	Back	[Suspend]	{}	1	1
-SetupInterrupted	Back	EndDialog	Exit	1	2
-SetupInterrupted	Cancel	[Suspend]	1	1	1
-SetupInterrupted	Cancel	EndDialog	Exit	1	2
-SetupInterrupted	Finish	EndDialog	Exit	1	2
-SetupProgress	Cancel	SpawnDialog	CancelSetup	1	0
-SetupResume	Cancel	SpawnDialog	CancelSetup	1	0
-SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
-SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-SetupType	Back	NewDialog	CustomerInformation	1	0
-SetupType	Cancel	SpawnDialog	CancelSetup	1	0
-SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
-SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	0
-SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
-SplashBitmap	Next	NewDialog	InstallWelcome	1	0
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt
deleted file mode 100644
index e787b9383..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt
+++ /dev/null
@@ -1,8 +0,0 @@
-Action	Type	Source	Target
-s72	i2	S64	S255
-CustomAction	Action
-ISInitAllUsers	307	ALLUSERS	1
-setAllUsersProfile2K	51	ALLUSERSPROFILE	[%ALLUSERSPROFILE]
-SetAllUsersProfileNT	51	ALLUSERSPROFILE	[%SystemRoot]\Profiles\All Users
-setUserProfileNT	51	USERPROFILE	[%USERPROFILE]
-SetARPInstallLocation	51	ARPINSTALLLOCATION	[INSTALLLOCATION]
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt
deleted file mode 100644
index 54a594fd9..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt
+++ /dev/null
@@ -1,33 +0,0 @@
-Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control_Default	Control_Cancel
-s72	i2	i2	i2	i2	I4	L128	s50	S50	S50
-Dialog	Dialog
-AdminChangeFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	TailText	OK	Cancel
-AdminNetworkLocation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	InstallNow	InstallNow	Cancel
-AdminWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-CancelSetup	50	50	260	85	3	[ProductName] [Setup]	No	No	No
-CustomerInformation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	NameLabel	Next	Cancel
-CustomSetup	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	Tree	Next	Cancel
-CustomSetupTips	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-DatabaseFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-DestinationFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-DiskSpaceRequirements	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-FilesInUse	50	50	374	266	19	[ProductName] - [STR_INSTALLATION_WIZARD]	Retry	Retry	Exit
-FileTypeDialog	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	CheckBox1	Next	Cancel
-InstallChangeFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	TailText	OK	Cancel
-InstallWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-LicenseAgreement	50	50	374	266	2	[ProductName] - [STR_INSTALLATION_WIZARD]	Agree	Next	Cancel
-MaintenanceType	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RadioGroup	Next	Cancel
-MaintenanceWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-OutOfSpace	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Resume	Resume	Resume
-PatchWelcome	50	50	374	266	3	[ProductName] Patch - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-ReadyToInstall	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	InstallNow	InstallNow	Cancel
-ReadyToRemove	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RemoveNow	RemoveNow	Cancel
-SetupCompleteError	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Finish	Finish	Finish
-SetupCompleteSuccess	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-SetupError	50	10	270	110	65543	[ProductName] Installerinformationen	ErrorText	O	C
-SetupInitialization	50	50	374	266	5	[ProductName] - [STR_INSTALLATION_WIZARD]	Cancel	Cancel	Cancel
-SetupInterrupted	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Finish	Finish	Finish
-SetupProgress	50	50	374	266	5	[ProductName] - [STR_INSTALLATION_WIZARD]	Cancel	Cancel	Cancel
-SetupResume	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-SetupType	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RadioGroup	Next	Cancel
-SplashBitmap	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Error.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Error.idt
deleted file mode 100644
index 9789d0cf5..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Error.idt
+++ /dev/null
@@ -1,133 +0,0 @@
-Error	Message
-i2	L0
-WINDOWSENCODINGTEMPLATE	Error	Error
-0	OOO_ERROR_1
-1	OOO_ERROR_2
-2	OOO_ERROR_3 
-4	OOO_ERROR_4 
-5	OOO_ERROR_5
-7	OOO_ERROR_6
-8	OOO_ERROR_7
-9	OOO_ERROR_8
-10	OOO_ERROR_9
-11	OOO_ERROR_10
-12	OOO_ERROR_11
-13	OOO_ERROR_12
-14	OOO_ERROR_13
-15	OOO_ERROR_14
-16	OOO_ERROR_15
-17	OOO_ERROR_16
-18	OOO_ERROR_17
-19	OOO_ERROR_18
-20	OOO_ERROR_19
-21	OOO_ERROR_20
-22	OOO_ERROR_21
-23	OOO_ERROR_22
-32	OOO_ERROR_23
-33	OOO_ERROR_24
-1101	OOO_ERROR_25
-1301	OOO_ERROR_26
-1302	OOO_ERROR_27
-1303	OOO_ERROR_28
-1304	OOO_ERROR_29
-1305	OOO_ERROR_30
-1306	OOO_ERROR_31.
-1307	OOO_ERROR_32
-1308	OOO_ERROR_33
-1309	OOO_ERROR_34
-1310	OOO_ERROR_35
-1311	OOO_ERROR_36
-1312	OOO_ERROR_37
-1313	OOO_ERROR_38
-1314	OOO_ERROR_39
-1315	OOO_ERROR_40
-1316	OOO_ERROR_41.
-1317	OOO_ERROR_42
-1318	OOO_ERROR_43
-1319	OOO_ERROR_44
-1320	OOO_ERROR_45
-1321	OOO_ERROR_46
-1322	OOO_ERROR_47
-1323	OOO_ERROR_48
-1324	OOO_ERROR_49
-1325	OOO_ERROR_50
-1326	OOO_ERROR_51
-1327	OOO_ERROR_52
-1328	OOO_ERROR_53
-1401	OOO_ERROR_54 
-1402	OOO_ERROR_55 
-1403	OOO_ERROR_56 
-1404	OOO_ERROR_57 
-1405	OOO_ERROR_58 
-1406	OOO_ERROR_59
-1407	OOO_ERROR_60
-1408	OOO_ERROR_61 
-1409	OOO_ERROR_62
-1410	OOO_ERROR_63
-1500	OOO_ERROR_64
-1501	OOO_ERROR_65
-1502	OOO_ERROR_66
-1503	OOO_ERROR_67
-1601	OOO_ERROR_68
-1602	OOO_ERROR_69
-1603	OOO_ERROR_70
-1604	OOO_ERROR_71
-1605	OOO_ERROR_72
-1606	OOO_ERROR_73
-1607	OOO_ERROR_74
-1608	OOO_ERROR_75
-1701	OOO_ERROR_76
-1702	OOO_ERROR_77
-1703	OOO_ERROR_78
-1704	OOO_ERROR_79
-1705	OOO_ERROR_80
-1706	OOO_ERROR_81
-1707	OOO_ERROR_82
-1708	OOO_ERROR_83
-1709	OOO_ERROR_84
-1710	OOO_ERROR_85
-1711	OOO_ERROR_86
-1712	OOO_ERROR_87
-1713	OOO_ERROR_88
-1714	OOO_ERROR_89
-1801	OOO_ERROR_90
-1802	OOO_ERROR_91
-1803	OOO_ERROR_92
-1804	OOO_ERROR_93
-1805	OOO_ERROR_94
-1806	OOO_ERROR_95
-1807	OOO_ERROR_96
-1901	OOO_ERROR_97
-1902	OOO_ERROR_98
-1903	OOO_ERROR_99
-1904	OOO_ERROR_100.
-1905	OOO_ERROR_101
-1906	OOO_ERROR_102
-1907	OOO_ERROR_103
-1908	OOO_ERROR_104
-1909	OOO_ERROR_105
-1910	OOO_ERROR_106
-1911	OOO_ERROR_107
-1912	OOO_ERROR_108
-1913	OOO_ERROR_109
-1914	OOO_ERROR_110
-1915	OOO_ERROR_111
-1916	OOO_ERROR_112
-1917	OOO_ERROR_113
-1918	OOO_ERROR_114
-1919	OOO_ERROR_115
-1920	OOO_ERROR_116
-1921	OOO_ERROR_117
-1922	OOO_ERROR_118
-1923	OOO_ERROR_119
-1924	OOO_ERROR_120
-1925	OOO_ERROR_121
-1926	OOO_ERROR_122
-1927	OOO_ERROR_123
-1928	OOO_ERROR_124
-1929	OOO_ERROR_125
-1930	OOO_ERROR_126
-1931	OOO_ERROR_127
-1932	OOO_ERROR_128
-1933	OOO_ERROR_129
-1934	OOO_ERROR_130
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/EventMap.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/EventMap.idt
deleted file mode 100644
index 794eaf1a5..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/EventMap.idt
+++ /dev/null
@@ -1,18 +0,0 @@
-Dialog_	Control_	Event	Attribute
-s72	s50	s50	s50
-EventMapping	Dialog_	Control_	Event
-CustomSetup	ItemDescription	SelectionDescription	Text
-CustomSetup	Location	SelectionPath	Text
-CustomSetup	Size	SelectionSize	Text
-SetupInitialization	ActionData	ActionData	Text
-SetupInitialization	ActionText	ActionText	Text
-SetupProgress	ActionProgress95	AdminInstallFinalize	Progress
-SetupProgress	ActionProgress95	InstallFiles	Progress
-SetupProgress	ActionProgress95	MoveFiles	Progress
-SetupProgress	ActionProgress95	RemoveFiles	Progress
-SetupProgress	ActionProgress95	RemoveRegistryValues	Progress
-SetupProgress	ActionProgress95	SetProgress	Progress
-SetupProgress	ActionProgress95	UnmoveFiles	Progress
-SetupProgress	ActionProgress95	WriteIniValues	Progress
-SetupProgress	ActionProgress95	WriteRegistryValues	Progress
-SetupProgress	ActionText	ActionText	Text
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt
deleted file mode 100644
index 5cd178ea4..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt
+++ /dev/null
@@ -1,72 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-InstallExecuteSequence	Action
-AllocateRegistrySpace	NOT Installed	750
-AppSearch		25
-BindImage		2100
-CCPSearch	CCP_TEST	200
-CostFinalize		500
-CostInitialize		350
-CreateFolders		1850
-CreateShortcuts		2150
-DeleteServices	VersionNT	1000
-DuplicateFiles		2050
-FileCost		400
-FindRelatedProducts	NOT ISSETUPDRIVEN	100
-InstallFiles		1950
-InstallFinalize		3150
-InstallInitialize		700
-InstallODBC		2600
-InstallServices	VersionNT	2750
-InstallValidate		650
-ISInitAllUsers	VersionNT And NOT Installed And Privileged	525
-IsolateComponents		450
-LaunchConditions		50
-MigrateFeatureStates		600
-MoveFiles		1900
-MsiPublishAssemblies		3025
-MsiUnpublishAssemblies		875
-PatchFiles		2000
-ProcessComponents		800
-PublishComponents		3000
-PublishFeatures		3050
-PublishProduct		3100
-RegisterClassInfo		2200
-RegisterComPlus		2700
-RegisterExtensionInfo		2250
-RegisterFonts		2550
-RegisterMIMEInfo		2350
-RegisterProduct		2950
-RegisterProgIdInfo		2300
-RegisterTypeLibraries		2650
-RegisterUser		2900
-RemoveDuplicateFiles		1700
-RemoveEnvironmentStrings		1650
-RemoveExistingProducts		675
-RemoveFiles		1750
-RemoveFolders		1800
-RemoveIniValues		1550
-RemoveODBC		1200
-RemoveRegistryValues		1300
-RemoveShortcuts		1600
-RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	250
-ScheduleReboot	ISSCHEDULEREBOOT	3125
-SelfRegModules		2850
-SelfUnregModules		1100
-SetARPInstallLocation		990
-SetODBCFolders		550
-StartServices	VersionNT	2800
-StopServices	VersionNT	950
-UnpublishComponents		850
-UnpublishFeatures		900
-UnregisterClassInfo		1350
-UnregisterComPlus		1050
-UnregisterExtensionInfo		1400
-UnregisterFonts		1250
-UnregisterMIMEInfo		1500
-UnregisterProgIdInfo		1450
-UnregisterTypeLibraries		1150
-ValidateProductID		300
-WriteEnvironmentStrings		2500
-WriteIniValues		2450
-WriteRegistryValues		2400
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallU.idt
deleted file mode 100644
index b9ebc07d3..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallU.idt
+++ /dev/null
@@ -1,29 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-InstallUISequence	Action
-AppSearch		25
-CCPSearch	CCP_TEST	250
-CostFinalize		550
-CostInitialize		400
-ExecuteAction		850
-FileCost		450
-FindRelatedProducts		150
-InstallWelcome	Not Installed	650
-ISInitAllUsers	VersionNT And NOT Installed And Privileged	575
-IsolateComponents		500
-LaunchConditions		50
-MaintenanceWelcome	Installed And Not RESUME And Not Preselected And Not PATCH	750
-MigrateFeatureStates		600
-PatchWelcome	Installed And PATCH And Not IS_MAJOR_UPGRADE	625
-ResolveSource	Not Installed And Not PATCH	525
-RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	300
-setAllUsersProfile2K	VersionNT >= 500	512
-SetAllUsersProfileNT	VersionNT = 400	511
-SetupCompleteError		-3
-SetupCompleteSuccess		-1
-SetupInitialization		100
-SetupInterrupted		-2
-SetupProgress		800
-SetupResume	Installed And (RESUME Or Preselected) And Not PATCH	700
-setUserProfileNT	VersionNT	510
-ValidateProductID		350
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/LaunchCo.idt
deleted file mode 100644
index 35d78694a..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/LaunchCo.idt
+++ /dev/null
@@ -1,4 +0,0 @@
-Condition	Description
-s255	l255
-WINDOWSENCODINGTEMPLATE	LaunchCondition	Condition
-Privileged	OOO_LAUNCH_1
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ListBox.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ListBox.idt
deleted file mode 100644
index e62653df9..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ListBox.idt
+++ /dev/null
@@ -1,3 +0,0 @@
-Property	Order	Value	Text
-s72	i2	s64	L64
-ListBox	Property	Order
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
deleted file mode 100644
index 6514eaaec..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
+++ /dev/null
@@ -1,56 +0,0 @@
-Property	Value
-s72	l0
-WINDOWSENCODINGTEMPLATE	Property	Property
-_IsMaintenance	Change
-_IsSetupTypeMin	Typical
-AgreeToLicense	No
-ApplicationUsers	AllUsers
-ARPCOMMENTS	ARPCOMMENTSTEMPLATE
-ARPCONTACT	OOO_ARPCONTACTTEMPLATE
-ARPHELPLINK	OOO_ARPHELPLINKTEMPLATE
-ARPHELPTELEPHONE	OOO_ARPHELPTELEPHONETEMPLATE
-ARPURLINFOABOUT	OOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO	OOO_ARPURLUPDATEINFOTEMPLATE
-ARPNOREPAIR	1
-ARPNOMODIFY	1
-DefaultUIFont	Tahoma8
-DialogCaption	Windows Installer
-DiskPrompt	[1]
-Display_IsBitmapDlg	1
-DisplayNameCustom	IDPROP_SETUPTYPE_CUSTOM
-DisplayNameMinimal	IDPROP_SETUPTYPE_COMPACT
-DisplayNameTypical	IDPROP_SETUPTYPE_TYPICAL
-DWUSINTERVAL	30
-ErrorDialog	SetupError
-InstallChoice	AR
-INSTALLLEVEL	INSTALLLEVELTEMPLATE
-ISCHECKFORPRODUCTUPDATES	ISCHECKFORPRODUCTUPDATESTEMPLATE
-ISSCRIPT_VERSION_MISSING	IDS_ISSCRIPT_VERSION_MISSING
-ISSCRIPT_VERSION_OLD	IDS_ISSCRIPT_VERSION_OLD
-ISVROOT_PORT_NO	0
-Manufacturer	MANUFACTURERTEMPLATE
-PIDTemplate	12345<###-%%%%%%%>@@@@@
-ProductCode	PRODUCTCODETEMPLATE
-ProductID	none
-ProductLanguage	PRODUCTLANGUAGETEMPLATE
-ProductName	PRODUCTNAMETEMPLATE
-ProductVersion	PRODUCTVERSIONTEMPLATE
-ProgressType0	install
-ProgressType1	Installing
-ProgressType2	installed
-ProgressType3	installs
-RebootYesNo	Yes
-ReinstallModeText	omus
-SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
-SetupType	Typical
-STR_NEW_DISPLAY_NAME	OOO_STR_NEW_DISPLAY_NAME
-STR_EDIT	OOO_STR_EDIT
-STR_MS_WORD_DOCUMENT	OOO_STR_MS_WORD_DOCUMENT
-STR_MS_WORD_TEMPLATE	OOO_STR_MS_WORD_TEMPLATE
-STR_MS_EXCEL_WORKSHEET	OOO_STR_MS_EXCEL_WORKSHEET
-STR_MS_EXCEL_TEMPLATE	OOO_STR_MS_EXCEL_TEMPLATE
-STR_MS_POWERPOINT_PRESENTATION	OOO_STR_MS_POWERPOINT_PRESENTATION
-STR_MS_POWERPOINT_TEMPLATE	OOO_STR_MS_POWERPOINT_TEMPLATE
-STR_MS_POWERPOINT_SHOW	OOO_STR_MS_POWERPOINT_SHOW
-STR_INSTALLATION_WIZARD	OOO_STR_INSTALLATION_WIZARD
-UpgradeCode	UPGRADECODETEMPLATE
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt
deleted file mode 100644
index e1d000070..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt
+++ /dev/null
@@ -1,12 +0,0 @@
-Property	Order	Value	X	Y	Width	Height	Text	Help
-s72	i2	s64	i2	i2	i2	i2	L64	L50
-WINDOWSENCODINGTEMPLATE	RadioButton	Property	Order
-_IsMaintenance	1	Change	0	0	290	14	OOO_RADIOBUTTON_1	
-_IsMaintenance	2	Reinstall	0	60	290	14	OOO_RADIOBUTTON_2	
-_IsMaintenance	3	Remove	0	120	290	14	OOO_RADIOBUTTON_3	
-_IsSetupTypeMin	1	Typical	0	0	264	14	OOO_RADIOBUTTON_4	
-_IsSetupTypeMin	2	Custom	0	60	264	14	OOO_RADIOBUTTON_5	
-AgreeToLicense	1	No	0	15	295	15	OOO_RADIOBUTTON_6	
-AgreeToLicense	2	Yes	0	0	295	15	OOO_RADIOBUTTON_7	
-ApplicationUsers	1	AllUsers	1	7	290	14	OOO_RADIOBUTTON_8	
-ApplicationUsers	2	OnlyCurrentUser	1	23	290	14	OOO_RADIOBUTTON_9	
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
deleted file mode 100644
index 995f91999..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ /dev/null
@@ -1,7 +0,0 @@
-Signature_	Root	Key	Name	Type
-s72	i2	s255	S255	I2
-RegLocator	Signature_
-basisinstalluser	1	Software\LibreOffice\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
-basisinstalluser_	1	Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
-basisinstallmachine	2	Software\LibreOffice\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
-basisinstallmachine_	2	Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Signatur.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Signatur.idt
deleted file mode 100644
index 5004a5586..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Signatur.idt
+++ /dev/null
@@ -1,3 +0,0 @@
-Signature	FileName	MinVersion	MaxVersion	MinSize	MaxSize	MinDate	MaxDate	Languages
-s72	s255	S20	S20	I4	I4	I4	I4	S255
-Signature	Signature
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/TextStyl.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/TextStyl.idt
deleted file mode 100644
index b4575c15d..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/TextStyl.idt
+++ /dev/null
@@ -1,25 +0,0 @@
-TextStyle	FaceName	Size	Color	StyleBits
-s72	s32	i2	I4	I2
-TextStyle	TextStyle
-Arial8	Arial	8		
-Arial9	Arial	9		
-ArialBlue10	Arial	10	16711680	
-ArialBlueStrike10	Arial	10	16711680	8
-CourierNew8	Courier New	8		
-CourierNew9	Courier New	9		
-MSGothic9	MS Gothic	9		
-MSSansBold8	Tahoma	8		1
-MSSansSerif8	MS Sans Serif	8		
-MSSansSerif9	MS Sans Serif	9		
-MSSGreySerif8	MS Sans Serif	8	8421504	
-MSSWhiteSerif8	Tahoma	8	16777215	
-Tahoma10	Tahoma	10		
-Tahoma8	Tahoma	8		
-Tahoma9	Tahoma	9		
-TahomaBold10	Tahoma	10		1
-TahomaBold8	Tahoma	8		1
-Times8	Times New Roman	8		
-Times9	Times New Roman	9		
-TimesItalic12	Times New Roman	12		2
-TimesItalicBlue10	Times New Roman	10	16711680	2
-TimesRed16	Times New Roman	16	255	
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/UIText.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/UIText.idt
deleted file mode 100644
index ea581bff4..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/UIText.idt
+++ /dev/null
@@ -1,53 +0,0 @@
-Key	Text
-s72	L255
-WINDOWSENCODINGTEMPLATE	UIText	Key
-AbsentPath	
-bytes	OOO_UITEXT_1
-GB	OOO_UITEXT_2
-KB	OOO_UITEXT_3
-MB	OOO_UITEXT_4
-MenuAbsent	OOO_UITEXT_5
-MenuAdvertise	OOO_UITEXT_6
-MenuAllCD	OOO_UITEXT_7
-MenuAllLocal	OOO_UITEXT_8
-MenuAllNetwork	OOO_UITEXT_9
-MenuCD	OOO_UITEXT_10
-MenuLocal	OOO_UITEXT_11
-MenuNetwork	OOO_UITEXT_12
-NewFolder	OOO_UITEXT_13
-SelAbsentAbsent	OOO_UITEXT_14
-SelAbsentAdvertise	OOO_UITEXT_15
-SelAbsentCD	OOO_UITEXT_16
-SelAbsentLocal	OOO_UITEXT_17
-SelAbsentNetwork	OOO_UITEXT_18
-SelAdvertiseAbsent	OOO_UITEXT_19
-SelAdvertiseAdvertise	OOO_UITEXT_20
-SelAdvertiseCD	OOO_UITEXT_21
-SelAdvertiseLocal	OOO_UITEXT_22
-SelAdvertiseNetwork	OOO_UITEXT_23
-SelCDAbsent	OOO_UITEXT_24
-SelCDAdvertise	OOO_UITEXT_25
-SelCDCD	OOO_UITEXT_26
-SelCDLocal	OOO_UITEXT_27
-SelChildCostNeg	OOO_UITEXT_28
-SelChildCostPos	OOO_UITEXT_29
-SelCostPending	OOO_UITEXT_30
-SelLocalAbsent	OOO_UITEXT_31
-SelLocalAdvertise	OOO_UITEXT_32
-SelLocalCD	OOO_UITEXT_33
-SelLocalLocal	OOO_UITEXT_34
-SelLocalNetwork	OOO_UITEXT_35
-SelNetworkAbsent	OOO_UITEXT_36
-SelNetworkAdvertise	OOO_UITEXT_37
-SelNetworkLocal	OOO_UITEXT_38
-SelNetworkNetwork	OOO_UITEXT_39
-SelParentCostNegNeg	OOO_UITEXT_40
-SelParentCostNegPos	OOO_UITEXT_41
-SelParentCostPosNeg	OOO_UITEXT_42
-SelParentCostPosPos	OOO_UITEXT_43
-TimeRemaining	OOO_UITEXT_44
-VolumeCostAvailable	OOO_UITEXT_45
-VolumeCostDifference	OOO_UITEXT_46
-VolumeCostRequired	OOO_UITEXT_47
-VolumeCostSize	OOO_UITEXT_48
-VolumeCostVolume	OOO_UITEXT_49
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
deleted file mode 100644
index 4098f92c3..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
+++ /dev/null
@@ -1,461 +0,0 @@
-Table	Column	Nullable	MinValue	MaxValue	KeyTable	KeyColumn	Category	Set	Description
-s32	s32	s4	I4	I4	S255	I2	S32	S255	S255
-_Validation	Table	Column
-_Validation	Category	Y						Text;Formatted;Template;Condition;Guid;Path;Version;Language;Identifier;Binary;UpperCase;LowerCase;Filename;Paths;AnyPath;WildCardFilename;RegPath;KeyFormatted;CustomSource;Property;Cabinet;Shortcut;URL	String category
-_Validation	Column	N					Identifier		Name of column
-_Validation	Description	Y					Text		Description of column
-_Validation	KeyColumn	Y	1	32					Column to which foreign key connects
-_Validation	KeyTable	Y					Identifier		For foreign key, Name of table to which data must link
-_Validation	MaxValue	Y	-2147483647	2147483647					Maximum value allowed
-_Validation	MinValue	Y	-2147483647	2147483647					Minimum value allowed
-_Validation	Nullable	N						Y;N	Whether the column is nullable
-_Validation	Set	Y					Text		Set of values that are permitted
-_Validation	Table	N					Identifier		Name of table
-ActionText	Action	N					Identifier		Name of action to be described.
-ActionText	Description	Y					Text		Localized description displayed in progress dialog and log when action is executing.
-ActionText	Template	Y					Template		Optional localized format template used to format action data records for display during action execution.
-AdminExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdminExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdminExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdminUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdminUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdminUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdvtExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdvtExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdvtExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdvtUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdvtUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdvtUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AppId	ActivateAtStorage	Y	0	1					
-AppId	AppId	N					Guid		
-AppId	DllSurrogate	Y					Text		
-AppId	LocalService	Y					Text		
-AppId	RemoteServerName	Y					Formatted		
-AppId	RunAsInteractiveUser	Y	0	1					
-AppId	ServiceParameters	Y					Text		
-AppSearch	Property	N					Identifier		The property associated with a Signature
-AppSearch	Signature_	N			Signature;RegLocator;IniLocator;DrLocator;CompLocator	1	Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables.
-BBControl	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this control.
-BBControl	BBControl	N					Identifier		Name of the control. This name must be unique within a billboard, but can repeat on different billboard.
-BBControl	Billboard_	N			Billboard	1	Identifier		External key to the Billboard table, name of the billboard.
-BBControl	Height	N	0	32767					Height of the bounding rectangle of the control.
-BBControl	Text	Y					Text		A string used to set the initial text contained within a control (if appropriate).
-BBControl	Type	N					Identifier		The type of the control.
-BBControl	Width	N	0	32767					Width of the bounding rectangle of the control.
-BBControl	X	N	0	32767					Horizontal coordinate of the upper left corner of the bounding rectangle of the control.
-BBControl	Y	N	0	32767					Vertical coordinate of the upper left corner of the bounding rectangle of the control.
-Billboard	Action	Y					Identifier		The name of an action. The billboard is displayed during the progress messages received from this action.
-Billboard	Billboard	N					Identifier		Name of the billboard.
-Billboard	Feature_	N			Feature	1	Identifier		An external key to the Feature Table. The billboard is shown only if this feature is being installed.
-Billboard	Ordering	Y	0	32767					A positive integer. If there is more than one billboard corresponding to an action they will be shown in the order defined by this column.
-Binary	Data	N					Binary		The unformatted binary data.
-Binary	Name	N					Identifier		Unique key identifying the binary data.
-BindImage	File_	N			File	1	Identifier		The index into the File table. This must be an executable file.
-BindImage	Path	Y					Paths		A list of ;  delimited paths that represent the paths to be searched for the import DLLS. The list is usually a list of properties each enclosed within square brackets [] .
-CCPSearch	Signature_	N			Signature;RegLocator;IniLocator;DrLocator;CompLocator	1	Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables.
-CheckBox	Property	N					Identifier		A named property to be tied to the item.
-CheckBox	Value	Y					Formatted		The value string associated with the item.
-Class	AppId_	Y			AppId	1	Guid		Optional AppID containing DCOM information for associated application (string GUID).
-Class	Argument	Y					Formatted		optional argument for LocalServers.
-Class	Attributes	Y		32767					Class registration attributes.
-Class	CLSID	N					Guid		The CLSID of an OLE factory.
-Class	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-Class	Context	N					Identifier		The numeric server context for this server. CLSCTX_xxxx
-Class	DefInprocHandler	Y					Filename	1;2;3	Optional default inproc handler.  Only optionally provided if Context=CLSCTX_LOCAL_SERVER.  Typically "ole32.dll" or "mapi32.dll"
-Class	Description	Y					Text		Localized description for the Class.
-Class	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational.
-Class	FileTypeMask	Y					Text		Optional string containing information for the HKCRthis CLSID) key. If multiple patterns exist, they must be delimited by a semicolon, and numeric subkeys will be generated: 0,1,2...
-Class	Icon_	Y			Icon	1	Identifier		Optional foreign key into the Icon Table, specifying the icon file associated with this CLSID. Will be written under the DefaultIcon key.
-Class	IconIndex	Y	-32767	32767					Optional icon index.
-Class	ProgId_Default	Y			ProgId	1	Text		Optional ProgId associated with this CLSID.
-ComboBox	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list.The integers do not have to be consecutive.
-ComboBox	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same combobox.
-ComboBox	Text	Y					Formatted		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ComboBox	Value	N					Formatted		The value string associated with this item. Selecting the line will set the associated property to this value.
-CompLocator	ComponentId	N					Guid		A string GUID unique to this component, version, and language.
-CompLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-CompLocator	Type	Y	0	1					A boolean value that determines if the registry value is a filename or a directory location.
-Complus	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the ComPlus component.
-Complus	ExpType	Y	0	32767					ComPlus component attributes.
-Component	Attributes	N							Remote execution option, one of irsEnum
-Component	Component	N					Identifier		Primary key used to identify a particular component record.
-Component	ComponentId	Y					Guid		A string GUID unique to this component, version, and language.
-Component	Condition	Y					Condition		A conditional statement that will disable this component if the specified condition evaluates to the 'True' state. If a component is disabled, it will not be installed, regardless of the 'Action' state associated with the component.
-Component	Directory_	N			Directory	1	Identifier		Required key of a Directory table record. This is actually a property name whose value contains the actual path, set either by the AppSearch action or with the default setting obtained from the Directory table.
-Component	KeyPath	Y			File;Registry;ODBCDataSource	1	Identifier		Either the primary key into the File table, Registry table, or ODBCDataSource table. This extract path is stored when the component is installed, and is used to detect the presence of the component and to return the path to it.
-Condition	Condition	Y					Condition		Expression evaluated to determine if Level in the Feature table is to change.
-Condition	Feature_	N			Feature	1	Identifier		Reference to a Feature entry in Feature table.
-Condition	Level	N	0	32767					New selection Level to set in Feature table if Condition evaluates to TRUE.
-Control	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this control.
-Control	Control	N					Identifier		Name of the control. This name must be unique within a dialog, but can repeat on different dialogs. 
-Control	Control_Next	Y			Control	2	Identifier		The name of an other control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!
-Control	Dialog_	N			Dialog	1	Identifier		External key to the Dialog table, name of the dialog.
-Control	Height	N	0	32767					Height of the bounding rectangle of the control.
-Control	Help	Y					Text		The help strings used with the button. The text is optional. 
-Control	Property	Y					Identifier		The name of a defined property to be linked to this control. 
-Control	Text	Y					Formatted		A string used to set the initial text contained within a control (if appropriate).
-Control	Type	N					Identifier		The type of the control.
-Control	Width	N	0	32767					Width of the bounding rectangle of the control.
-Control	X	N	0	32767					Horizontal coordinate of the upper left corner of the bounding rectangle of the control.
-Control	Y	N	0	32767					Vertical coordinate of the upper left corner of the bounding rectangle of the control.
-ControlCondition	Action	N						Default;Disable;Enable;Hide;Show	The desired action to be taken on the specified control.
-ControlCondition	Condition	N					Condition		A standard conditional statement that specifies under which conditions the action should be triggered.
-ControlCondition	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control.
-ControlCondition	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the dialog.
-ControlEvent	Argument	N					Formatted		A value to be used as a modifier when triggering a particular event.
-ControlEvent	Condition	Y					Condition		A standard conditional statement that specifies under which conditions an event should be triggered.
-ControlEvent	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control
-ControlEvent	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the dialog.
-ControlEvent	Event	N					Formatted		An identifier that specifies the type of the event that should take place when the user interacts with control specified by the first two entries.
-ControlEvent	Ordering	Y	0	2147483647					An integer used to order several events tied to the same control. Can be left blank.
-CreateFolder	Component_	N			Component	1	Identifier		Foreign key into the Component table.
-CreateFolder	Directory_	N			Directory	1	Identifier		Primary key, could be foreign key into the Directory table.
-CustomAction	Action	N					Identifier		Primary key, name of action, normally appears in sequence table unless private use.
-CustomAction	Source	Y					CustomSource		The table reference of the source of the code.
-CustomAction	Target	Y					Formatted		Excecution parameter, depends on the type of custom action
-CustomAction	Type	N	1	32767					The numeric custom action type, consisting of source location, code type, entry, option flags.
-Dialog	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this dialog.
-Dialog	Control_Cancel	Y			Control	2	Identifier		Defines the cancel control. Hitting escape or clicking on the close icon on the dialog is equivalent to pushing this button.
-Dialog	Control_Default	Y			Control	2	Identifier		Defines the default control. Hitting return is equivalent to pushing this button.
-Dialog	Control_First	N			Control	2	Identifier		Defines the control that has the focus when the dialog is created.
-Dialog	Dialog	N					Identifier		Name of the dialog.
-Dialog	HCentering	N	0	100					Horizontal position of the dialog on a 0-100 scale. 0 means left end, 100 means right end of the screen, 50 center.
-Dialog	Height	N	0	32767					Height of the bounding rectangle of the dialog.
-Dialog	Title	Y					Formatted		A text string specifying the title to be displayed in the title bar of the dialog's window.
-Dialog	VCentering	N	0	100					Vertical position of the dialog on a 0-100 scale. 0 means top end, 100 means bottom end of the screen, 50 center.
-Dialog	Width	N	0	32767					Width of the bounding rectangle of the dialog.
-Directory	DefaultDir	N					DefaultDir		The default sub-path under parent's path.
-Directory	Directory	N					Identifier		Unique identifier for directory entry, primary key. If a property by this name is defined, it contains the full path to the directory.
-Directory	Directory_Parent	Y			Directory	1	Identifier		Reference to the entry in this table specifying the default parent directory. A record parented to itself or with a Null parent represents a root of the install tree.
-DrLocator	Depth	Y	0	32767					The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0.
-DrLocator	Parent	Y					Identifier		The parent file signature. It is also a foreign key in the Signature table. If null and the Path column does not expand to a full path, then all the fixed drives of the user system are searched using the Path.
-DrLocator	Path	Y					AnyPath		The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.
-DrLocator	Signature_	N					Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-DuplicateFile	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the duplicate file.
-DuplicateFile	DestFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full pathname to a destination folder.
-DuplicateFile	DestName	Y					Filename		Filename to be given to the duplicate file.
-DuplicateFile	File_	N			File	1	Identifier		Foreign key referencing the source file to be duplicated.
-DuplicateFile	FileKey	N					Identifier		Primary key used to identify a particular file entry
-Environment	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the environmental value.
-Environment	Environment	N					Identifier		Unique identifier for the environmental variable setting
-Environment	Name	N					Text		The name of the environmental value.
-Environment	Value	Y					Formatted		The value to set in the environmental settings.
-Error	Error	N	0	32767					Integer error number, obtained from header file IError(...) macros.
-Error	Message	Y					Template		Error formatting template, obtained from user ed. or localizers.
-EventMapping	Attribute	N					Identifier		The name of the control attribute, that is set when this event is received.
-EventMapping	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control.
-EventMapping	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the Dialog.
-EventMapping	Event	N					Identifier		An identifier that specifies the type of the event that the control subscribes to.
-Extension	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-Extension	Extension	N					Text		The extension associated with the table row.
-Extension	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational.
-Extension	MIME_	Y			MIME	1	Text		Optional Context identifier, typically "type/format" associated with the extension
-Extension	ProgId_	Y			ProgId	1	Text		Optional ProgId associated with this extension.
-Feature	Attributes	N						0;1;2;4;5;6;8;9;10;16;17;18;20;21;22;24;25;26;32;33;34;36;37;38;48;49;50;52;53;54	Feature attributes
-Feature	Description	Y					Text		Longer descriptive text describing a visible feature item.
-Feature	Directory_	Y			Directory	1	UpperCase		The name of the Directory that can be configured by the UI. A non-null value will enable the browse button.
-Feature	Display	Y	0	32767					Numeric sort order, used to force a specific display ordering.
-Feature	Feature	N					Identifier		Primary key used to identify a particular feature record.
-Feature	Feature_Parent	Y			Feature	1	Identifier		Optional key of a parent record in the same table. If the parent is not selected, then the record will not be installed. Null indicates a root item.
-Feature	Level	N	0	32767					The install level at which record will be initially selected. An install level of 0 will disable an item and prevent its display.
-Feature	Title	Y					Text		Short text identifying a visible feature item.
-FeatureComponents	Component_	N			Component	1	Identifier		Foreign key into Component table.
-FeatureComponents	Feature_	N			Feature	1	Identifier		Foreign key into Feature table.
-File	Attributes	Y	0	32767					Integer containing bit flags representing file attributes (with the decimal value of each bit position in parentheses)
-File	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the file.
-File	File	N					Identifier		Primary key, non-localized token, must match identifier in cabinet.  For uncompressed files, this field is ignored.
-File	FileName	N					Filename		File name used for installation, may be localized.  This may contain a "short name|long name" pair.
-File	FileSize	N	0	2147483647					Size of file in bytes (long integer).
-File	Language	Y					Language		List of decimal language Ids, comma-separated if more than one.
-File	Sequence	N	1	2147483647					Sequence with respect to the media images; order must track cabinet order.
-File	Version	Y			File	1	Version		Version string for versioned files;  Blank for unversioned files.
-FileSFPCatalog	File_	N			File	1	Identifier		File associated with the catalog
-FileSFPCatalog	SFPCatalog_	N			SFPCatalog	1	Filename		Catalog associated with the file
-Font	File_	N			File	1	Identifier		Primary key, foreign key into File table referencing font file.
-Font	FontTitle	Y					Text		Font name.
-Icon	Data	N					Binary		Binary stream. The binary icon data in PE (.DLL or .EXE) or icon (.ICO) format.
-Icon	Name	N					Identifier		Primary key. Name of the icon file.
-IniFile	Action	N						0;1;3	The type of modification to be made, one of iifEnum
-IniFile	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the .INI value.
-IniFile	DirProperty	Y					Identifier		Foreign key into the Directory table denoting the directory where the .INI file is.
-IniFile	FileName	N					Filename		The .INI file name in which to write the information
-IniFile	IniFile	N					Identifier		Primary key, non-localized token.
-IniFile	Key	N					Formatted		The .INI file key below Section.
-IniFile	Section	N					Formatted		The .INI file Section.
-IniFile	Value	N					Formatted		The value to be written.
-IniLocator	Field	Y	0	32767					The field in the .INI line. If Field is null or 0 the entire line is read.
-IniLocator	FileName	N					Filename		The .INI file name.
-IniLocator	Key	N					Text		Key value (followed by an equals sign in INI file).
-IniLocator	Section	N					Text		Section name within in file (within square brackets in INI file).
-IniLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-IniLocator	Type	Y	0	2					An integer value that determines if the .INI value read is a filename or a directory location or to be used as is w/o interpretation.
-InstallExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-InstallExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-InstallExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-InstallUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-InstallUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-InstallUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-IsolatedComponent	Component_Application	N			Component	1	Identifier		Key to Component table item for application
-IsolatedComponent	Component_Shared	N			Component	1	Identifier		Key to Component table item to be isolated
-LaunchCondition	Condition	N					Condition		Expression which must evaluate to TRUE in order for install to commence.
-LaunchCondition	Description	N					Formatted		Localizable text to display when condition fails and install must abort.
-ListBox	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-ListBox	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same listbox.
-ListBox	Text	Y					Text		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ListBox	Value	N					Formatted		The value string associated with this item. Selecting the line will set the associated property to this value.
-ListView	Binary_	Y			Binary	1	Identifier		The name of the icon to be displayed with the icon. The binary information is looked up from the Binary Table.
-ListView	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-ListView	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same listview.
-ListView	Text	Y					Text		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ListView	Value	N					Identifier		The value string associated with this item. Selecting the line will set the associated property to this value.
-LockPermissions	Domain	Y					Formatted		Domain name for user whose permissions are being set. (usually a property)
-LockPermissions	LockObject	N					Identifier		Foreign key into Registry or File table
-LockPermissions	Permission	Y	-2147483647	2147483647					Permission Access mask.  Full Control = 268435456 (GENERIC_ALL = 0x10000000)
-LockPermissions	Table	N					Identifier	Directory;File;Registry	Reference to another table name
-LockPermissions	User	N					Formatted		User for permissions to be set.  (usually a property)
-Media	Cabinet	Y					Cabinet		If some or all of the files stored on the media are compressed in a cabinet, the name of that cabinet.
-Media	DiskId	N	1	32767					Primary key, integer to determine sort order for table.
-Media	DiskPrompt	Y					Text		Disk name: the visible text actually printed on the disk.  This will be used to prompt the user when this disk needs to be inserted.
-Media	LastSequence	N	0	32767					File sequence number for the last file for this media.
-Media	Source	Y					Property		The property defining the location of the cabinet file.
-Media	VolumeLabel	Y					Text		The label attributed to the volume.
-MIME	CLSID	Y					Guid		Optional associated CLSID.
-MIME	ContentType	N					Text		Primary key. Context identifier, typically "type/format".
-MIME	Extension_	N			Extension	1	Text		Optional associated extension (without dot)
-ModuleAdminExecuteSequence	Action	N					Identifier		Action to insert
-ModuleAdminExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdminExecuteSequence	BaseAction	Y			ModuleAdminExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleAdminExecuteSequence	Condition	Y					Condition		
-ModuleAdminExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdminUISequence	Action	N					Identifier		Action to insert
-ModuleAdminUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdminUISequence	BaseAction	Y			ModuleAdminUISequence	1	Identifier		Base action to determine insert location.
-ModuleAdminUISequence	Condition	Y					Condition		
-ModuleAdminUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdvtExecuteSequence	Action	N					Identifier		Action to insert
-ModuleAdvtExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdvtExecuteSequence	BaseAction	Y			ModuleAdvtExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleAdvtExecuteSequence	Condition	Y					Condition		
-ModuleAdvtExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdvtUISequence	Action	N					Identifier		Action to insert
-ModuleAdvtUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdvtUISequence	BaseAction	Y			ModuleAdvtUISequence	1	Identifier		Base action to determine insert location.
-ModuleAdvtUISequence	Condition	Y					Condition		
-ModuleAdvtUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleComponents	Component	N			Component	1	Identifier		Component contained in the module.
-ModuleComponents	Language	N			ModuleSignature	2			Default language ID for module (may be changed by transform).
-ModuleComponents	ModuleID	N			ModuleSignature	1	Identifier		Module containing the component.
-ModuleDependency	ModuleID	N			ModuleSignature	1	Identifier		Module requiring the dependency.
-ModuleDependency	ModuleLanguage	N			ModuleSignature	2			Language of module requiring the dependency.
-ModuleDependency	RequiredID	N							String.GUID of required module.
-ModuleDependency	RequiredLanguage	N							LanguageID of the required module.
-ModuleDependency	RequiredVersion	Y					Version		Version of the required version.
-ModuleExclusion	ExcludedID	N							String.GUID of excluded module.
-ModuleExclusion	ExcludedLanguage	N							Language of excluded module.
-ModuleExclusion	ExcludedMaxVersion	Y					Version		Maximum version of excluded module.
-ModuleExclusion	ExcludedMinVersion	Y					Version		Minimum version of excluded module.
-ModuleExclusion	ModuleID	N			ModuleSignature	1	Identifier		String.GUID of module with exclusion requirement.
-ModuleExclusion	ModuleLanguage	N			ModuleSignature	2			LanguageID of module with exclusion requirement.
-ModuleIgnoreTable	Table	N					Identifier		Table name to ignore during merge operation.
-ModuleInstallExecuteSequence	Action	N					Identifier		Action to insert
-ModuleInstallExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleInstallExecuteSequence	BaseAction	Y			ModuleInstallExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleInstallExecuteSequence	Condition	Y					Condition		
-ModuleInstallExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleInstallUISequence	Action	N					Identifier		Action to insert
-ModuleInstallUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleInstallUISequence	BaseAction	Y			ModuleInstallUISequence	1	Identifier		Base action to determine insert location.
-ModuleInstallUISequence	Condition	Y					Condition		
-ModuleInstallUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleSignature	Language	N							Default decimal language of module.
-ModuleSignature	ModuleID	N					Identifier		Module identifier (String.GUID).
-ModuleSignature	Version	N					Version		Version of the module.
-MoveFile	Component_	N			Component	1	Identifier		If this component is not "selected" for installation or removal, no action will be taken on the associated MoveFile entry
-MoveFile	DestFolder	N					Identifier		Name of a property whose value is assumed to resolve to the full path to the destination directory
-MoveFile	DestName	Y					Filename		Name to be given to the original file after it is moved or copied.  If blank, the destination file will be given the same name as the source file
-MoveFile	FileKey	N					Identifier		Primary key that uniquely identifies a particular MoveFile record
-MoveFile	Options	N	0	1					Integer value specifying the MoveFile operating mode, one of imfoEnum
-MoveFile	SourceFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full path to the source directory
-MoveFile	SourceName	Y					Text		Name of the source file(s) to be moved or copied.  Can contain the '*' or '?' wildcards.
-MsiAssembly	Attributes	Y							Assembly attributes
-MsiAssembly	Component_	N			Component	1	Identifier		Foreign key into Component table.
-MsiAssembly	Feature_	N			Feature	1	Identifier		Foreign key into Feature table.
-MsiAssembly	File_Application	Y			File	1	Identifier		Foreign key into File table, denoting the application context for private assemblies. Null for global assemblies.
-MsiAssembly	File_Manifest	Y			File	1	Identifier		Foreign key into the File table denoting the manifest file for the assembly.
-MsiAssemblyName	Component_	N			Component	1	Identifier		Foreign key into Component table.
-MsiAssemblyName	Name	N					Text		The name part of the name-value pairs for the assembly name.
-MsiAssemblyName	Value	N					Text		The value part of the name-value pairs for the assembly name.
-MsiDigitalCertificate	CertData	N					Binary		A certificate context blob for a signer certificate
-MsiDigitalCertificate	DigitalCertificate	N					Identifier		A unique identifier for the row
-MsiDigitalSignature	DigitalCertificate_	N			MsiDigitalCertificate	1	Identifier		Foreign key to MsiDigitalCertificate table identifying the signer certificate
-MsiDigitalSignature	Hash	Y					Binary		The encoded hash blob from the digital signature
-MsiDigitalSignature	SignObject	N					Text		Foreign key to Media table
-MsiDigitalSignature	Table	N						Media	Reference to another table name (only Media table is supported)
-MsiFileHash	File_	N			File	1	Identifier		Primary key, foreign key into File table referencing file with this hash
-MsiFileHash	HashPart1	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart2	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart3	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart4	N							Size of file in bytes (long integer).
-MsiFileHash	Options	N	0	32767					Various options and attributes for this hash.
-ODBCAttribute	Attribute	N					Text		Name of ODBC driver attribute
-ODBCAttribute	Driver_	N			ODBCDriver	1	Identifier		Reference to ODBC driver in ODBCDriver table
-ODBCAttribute	Value	Y					Text		Value for ODBC driver attribute
-ODBCDataSource	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCDataSource	DataSource	N					Identifier		Primary key, non-localized.internal token for data source
-ODBCDataSource	Description	N					Text		Text used as registered name for data source
-ODBCDataSource	DriverDescription	N					Text		Reference to driver description, may be existing driver
-ODBCDataSource	Registration	N	0	1					Registration option: 0=machine, 1=user, others t.b.d.
-ODBCDriver	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCDriver	Description	N					Text		Text used as registered name for driver, non-localized
-ODBCDriver	Driver	N					Identifier		Primary key, non-localized.internal token for driver
-ODBCDriver	File_	N			File	1	Identifier		Reference to key driver file
-ODBCDriver	File_Setup	Y			File	1	Identifier		Optional reference to key driver setup DLL
-ODBCSourceAttribute	Attribute	N					Text		Name of ODBC data source attribute
-ODBCSourceAttribute	DataSource_	N			ODBCDataSource	1	Identifier		Reference to ODBC data source in ODBCDataSource table
-ODBCSourceAttribute	Value	Y					Text		Value for ODBC data source attribute
-ODBCTranslator	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCTranslator	Description	N					Text		Text used as registered name for translator
-ODBCTranslator	File_	N			File	1	Identifier		Reference to key translator file
-ODBCTranslator	File_Setup	Y			File	1	Identifier		Optional reference to key translator setup DLL
-ODBCTranslator	Translator	N					Identifier		Primary key, non-localized.internal token for translator
-Patch	Attributes	N	0	32767					Integer containing bit flags representing patch attributes
-Patch	File_	N					Identifier		Primary key, non-localized token, foreign key to File table, must match identifier in cabinet.
-Patch	Header	Y					Binary		Binary stream. The patch header, used for patch validation.
-Patch	PatchSize	N	0	2147483647					Size of patch in bytes (long integer).
-Patch	Sequence	N	0	32767					Primary key, sequence with respect to the media images; order must track cabinet order.
-PatchPackage	Media_	N	0	32767					Foreign key to DiskId column of Media table. Indicates the disk containing the patch package.
-PatchPackage	PatchId	N					Guid		A unique string GUID representing this patch.
-ProgId	Class_	Y			Class	1	Guid		The CLSID of an OLE factory corresponding to the ProgId.
-ProgId	Description	Y					Text		Localized description for the Program identifier.
-ProgId	Icon_	Y			Icon	1	Identifier		Optional foreign key into the Icon Table, specifying the icon file associated with this ProgId. Will be written under the DefaultIcon key.
-ProgId	IconIndex	Y	-32767	32767					Optional icon index.
-ProgId	ProgId	N					Text		The Program Identifier. Primary key.
-ProgId	ProgId_Parent	Y			ProgId	1	Text		The Parent Program Identifier. If specified, the ProgId column becomes a version independent prog id.
-Property	Property	N					Identifier		Name of property, uppercase if settable by launcher or loader.
-Property	Value	N					Text		String value for property.  Never null or empty.
-PublishComponent	AppData	Y					Text		This is localisable Application specific data that can be associated with a Qualified Component.
-PublishComponent	Component_	N			Component	1	Identifier		Foreign key into the Component table.
-PublishComponent	ComponentId	N					Guid		A string GUID that represents the component id that will be requested by the alien product.
-PublishComponent	Feature_	N			Feature	1	Identifier		Foreign key into the Feature table.
-PublishComponent	Qualifier	N					Text		This is defined only when the ComponentId column is an Qualified Component Id. This is the Qualifier for ProvideComponentIndirect.
-RadioButton	Height	N	0	32767					The height of the button.
-RadioButton	Help	Y					Text		The help strings used with the button. The text is optional.
-RadioButton	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-RadioButton	Property	N					Identifier		A named property to be tied to this radio button. All the buttons tied to the same property become part of the same group.
-RadioButton	Text	Y					Text		The visible title to be assigned to the radio button.
-RadioButton	Value	N					Formatted		The value string associated with this button. Selecting the button will set the associated property to this value.
-RadioButton	Width	N	0	32767					The width of the button.
-RadioButton	X	N	0	32767					The horizontal coordinate of the upper left corner of the bounding rectangle of the radio button.
-RadioButton	Y	N	0	32767					The vertical coordinate of the upper left corner of the bounding rectangle of the radio button.
-Reg64	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
-Reg64	Key	N					RegPath		The key for the registry value.
-Reg64	Name	Y					Formatted		The registry value name.
-Reg64	Registry	N					Identifier		Primary key, non-localized token.
-Reg64	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
-Reg64	Value	Y					Formatted		The registry value.
-Registry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
-Registry	Key	N					RegPath		The key for the registry value.
-Registry	Name	Y					Formatted		The registry value name.
-Registry	Registry	N					Identifier		Primary key, non-localized token.
-Registry	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
-Registry	Value	Y					Formatted		The registry value.
-RegLocator	Key	N					RegPath		The key for the registry value.
-RegLocator	Name	Y					Formatted		The registry value name.
-RegLocator	Root	N	0	3					The predefined root key for the registry value, one of rrkEnum.
-RegLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table. If the type is 0, the registry values refers a directory, and _Signature is not a foreign key.
-RegLocator	Type	Y	0	18					An integer value that determines if the registry value is a filename or a directory location or to be used as is w/o interpretation.
-RemoveFile	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the file to be removed.
-RemoveFile	DirProperty	N					Identifier		Name of a property whose value is assumed to resolve to the full pathname to the folder of the file to be removed.
-RemoveFile	FileKey	N					Identifier		Primary key used to identify a particular file entry
-RemoveFile	FileName	Y					WildCardFilename		Name of the file to be removed.
-RemoveFile	InstallMode	N						1;2;3	Installation option, one of iimEnum.
-RemoveIniFile	Action	N						2;4	The type of modification to be made, one of iifEnum.
-RemoveIniFile	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the deletion of the .INI value.
-RemoveIniFile	DirProperty	Y					Identifier		Foreign key into the Directory table denoting the directory where the .INI file is.
-RemoveIniFile	FileName	N					Filename		The .INI file name in which to delete the information
-RemoveIniFile	Key	N					Formatted		The .INI file key below Section.
-RemoveIniFile	RemoveIniFile	N					Identifier		Primary key, non-localized token.
-RemoveIniFile	Section	N					Formatted		The .INI file Section.
-RemoveIniFile	Value	Y					Formatted		The value to be deleted. The value is required when Action is iifIniRemoveTag
-RemoveRegistry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the deletion of the registry value.
-RemoveRegistry	Key	N					RegPath		The key for the registry value.
-RemoveRegistry	Name	Y					Formatted		The registry value name.
-RemoveRegistry	RemoveRegistry	N					Identifier		Primary key, non-localized token.
-RemoveRegistry	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum
-ReserveCost	Component_	N			Component	1	Identifier		Reserve a specified amount of space if this component is to be installed.
-ReserveCost	ReserveFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full path to the destination directory
-ReserveCost	ReserveKey	N					Identifier		Primary key that uniquely identifies a particular ReserveCost record
-ReserveCost	ReserveLocal	N	0	2147483647					Disk space to reserve if linked component is installed locally.
-ReserveCost	ReserveSource	N	0	2147483647					Disk space to reserve if linked component is installed to run from the source location.
-SelfReg	Cost	Y	0	32767					The cost of registering the module.
-SelfReg	File_	N			File	1	Identifier		Foreign key into the File table denoting the module that needs to be registered.
-ServiceControl	Arguments	Y					Formatted		Arguments for the service.  Separate by [~].
-ServiceControl	Component_	N			Component	1	Identifier		Required foreign key into the Component Table that controls the startup of the service
-ServiceControl	Event	N	0	187					Bit field:  Install:  0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete
-ServiceControl	Name	N					Formatted		Name of a service. /, \, comma and space are invalid
-ServiceControl	ServiceControl	N					Identifier		Primary key, non-localized token.
-ServiceControl	Wait	Y	0	1					Boolean for whether to wait for the service to fully start
-ServiceInstall	Arguments	Y					Formatted		Arguments to include in every start of the service, passed to WinMain
-ServiceInstall	Component_	N			Component	1	Identifier		Required foreign key into the Component Table that controls the startup of the service
-ServiceInstall	Dependencies	Y					Formatted		Other services this depends on to start.  Separate by [~], and end with [~][~]
-ServiceInstall	Description	Y					Text		Description of service.
-ServiceInstall	DisplayName	Y					Formatted		External Name of the Service
-ServiceInstall	ErrorControl	N	-2147483647	2147483647					Severity of error if service fails to start
-ServiceInstall	LoadOrderGroup	Y					Formatted		LoadOrderGroup
-ServiceInstall	Name	N					Formatted		Internal Name of the Service
-ServiceInstall	Password	Y					Formatted		password to run service with.  (with StartName)
-ServiceInstall	ServiceInstall	N					Identifier		Primary key, non-localized token.
-ServiceInstall	ServiceType	N	-2147483647	2147483647					Type of the service
-ServiceInstall	StartName	Y					Formatted		User or object name to run service as
-ServiceInstall	StartType	N	0	4					Type of the service
-SFPCatalog	Catalog	N					Binary		SFP Catalog
-SFPCatalog	Dependency	Y					Formatted		Parent catalog - only used by SFP
-SFPCatalog	SFPCatalog	N					Filename		File name for the catalog.
-Shortcut	Arguments	Y					Formatted		The command-line arguments for the shortcut.
-Shortcut	Component_	N			Component	1	Identifier		Foreign key into the Component table denoting the component whose selection gates the the shortcut creation/deletion.
-Shortcut	Description	Y					Text		The description for the shortcut.
-Shortcut	Directory_	N			Directory	1	Identifier		Foreign key into the Directory table denoting the directory where the shortcut file is created.
-Shortcut	Hotkey	Y	0	32767					The hotkey for the shortcut. It has the virtual-key code for the key in the low-order byte, and the modifier flags in the high-order byte. 
-Shortcut	Icon_	Y			Icon	1	Identifier		Foreign key into the File table denoting the external icon file for the shortcut.
-Shortcut	IconIndex	Y	-32767	32767					The icon index for the shortcut.
-Shortcut	Name	N					Filename		The name of the shortcut to be created.
-Shortcut	Shortcut	N					Identifier		Primary key, non-localized token.
-Shortcut	ShowCmd	Y						1;3;7	The show command for the application window.The following values may be used.
-Shortcut	Target	N					Shortcut		The shortcut target. This is usually a property that is expanded to a file or a folder that the shortcut points to.
-Shortcut	WkDir	Y					Identifier		Name of property defining location of working directory.
-Signature	FileName	N					Filename		The name of the file. This may contain a "short name|long name" pair.
-Signature	Languages	Y					Language		The languages supported by the file.
-Signature	MaxDate	Y	0	2147483647					The maximum creation date of the file.
-Signature	MaxSize	Y	0	2147483647					The maximum size of the file. 
-Signature	MaxVersion	Y					Text		The maximum version of the file.
-Signature	MinDate	Y	0	2147483647					The minimum creation date of the file.
-Signature	MinSize	Y	0	2147483647					The minimum size of the file.
-Signature	MinVersion	Y					Text		The minimum version of the file.
-Signature	Signature	N					Identifier		The table key. The Signature represents a unique file signature.
-TextStyle	Color	Y	0	16777215					A long integer indicating the color of the string in the RGB format (Red, Green, Blue each 0-255, RGB = R + 256*G + 256^2*B).
-TextStyle	FaceName	N					Text		A string indicating the name of the font used. Required. The string must be at most 31 characters long.
-TextStyle	Size	N	0	32767					The size of the font used. This size is given in our units (1/12 of the system font height). Assuming that the system font is set to 12 point size, this is equivalent to the point size.
-TextStyle	StyleBits	Y	0	15					A combination of style bits.
-TextStyle	TextStyle	N					Identifier		Name of the style. The primary key of this table. This name is embedded in the texts to indicate a style change.
-TypeLib	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-TypeLib	Cost	Y	0	2147483647					The cost associated with the registration of the typelib. This column is currently optional.
-TypeLib	Description	Y					Text		
-TypeLib	Directory_	Y			Directory	1	Identifier		Optional. The foreign key into the Directory table denoting the path to the help file for the type library.
-TypeLib	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the type library to be operational.
-TypeLib	Language	N	0	32767					The language of the library.
-TypeLib	LibID	N					Guid		The GUID that represents the library.
-TypeLib	Version	Y	0	16777215					The version of the library. The minor version is in the lower 8 bits of the integer. The major version is in the next 16 bits. 
-UIText	Key	N					Identifier		A unique key that identifies the particular string.
-UIText	Text	Y					Text		The localized version of the string.
-Upgrade	ActionProperty	N					UpperCase		The property to set when a product in this set is found.
-Upgrade	Attributes	N	0	2147483647					The attributes of this product set.
-Upgrade	Language	Y					Language		A comma-separated list of languages for either products in this set or products not in this set.
-Upgrade	Remove	Y					Formatted		The list of features to remove when uninstalling a product from this set.  The default is "ALL".
-Upgrade	UpgradeCode	N					Guid		The UpgradeCode GUID belonging to the products in this set.
-Upgrade	VersionMax	Y					Text		The maximum ProductVersion of the products in this set.  The set may or may not include products with this particular version.
-Upgrade	VersionMin	Y					Text		The minimum ProductVersion of the products in this set.  The set may or may not include products with this particular version.
-Verb	Argument	Y					Formatted		Optional value for the command arguments.
-Verb	Command	Y					Formatted		The command text.
-Verb	Extension_	N			Extension	1	Text		The extension associated with the table row.
-Verb	Sequence	Y	0	32767					Order within the verbs for a particular extension. Also used simply to specify the default verb.
-Verb	Verb	N					Text		The verb for the command.
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt b/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt
deleted file mode 100644
index 0a3af9a88..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-[PRODUCTCODE]
-en-US = "{04D01DA9-024B-4C37-A69C-F7BA76A95702}"
-pt = "{F859617C-7885-49B3-827A-8C9617C622F6}"
-ru = "{1D812984-FD08-415C-9967-CF228C28767C}"
-el = "{71057736-397D-44E4-AE0E-39A15F4E3CDE}"
-nl = "{3BEDD097-FF77-4E6A-A8DA-888A0911C0EB}"
-fr = "{38ED5703-6901-4CED-BD61-0C09DD972C9A}"
-es = "{CFFFB160-317A-4A75-A279-6D2691BE949D}"
-fi = "{9DFB7BF7-CD4C-4F85-B3D0-FAEE6470CFB4}"
-hu = "{C6A8BDB3-48E5-4302-85EA-DFA4E4E9C2BA}"
-ca = "{0B9E04F3-A1FA-4A82-B710-E7B4221AF77D}"
-it = "{ED565020-41A2-4990-B0C2-B7043D4CFA9D}"
-cs = "{9504A85C-5E31-420E-88BD-12C50B9528C7}"
-sk = "{B7EA5EEF-5834-4B3E-B774-115ED16A8797}"
-en-GB = "{985D8E18-263F-42C8-A913-FD2556EC7161}"
-da = "{64F8DC46-2087-41B4-B82D-39D55BBC8A48}"
-sv = "{9A8E6339-779C-4B0B-A3E5-B4CBBD2E271D}"
-no = "{C99FCCE7-9478-4EE0-9B5E-AC46BA2874D7}"
-pl = "{B5AD6AF9-16C3-4F57-8F63-DF341762CC5B}"
-de = "{9695B172-6236-4057-BE81-3B2002B2EABA}"
-pt-BR = "{740FB449-BE5F-42C5-8982-24FE4A165992}"
-th = "{3D0D7BAC-56EC-4BAB-98BC-DD3D1F276390}"
-et = "{F44C6B10-CBEB-402B-A634-A809AE4E4DED}"
-ja = "{27F0C5E9-4DDC-4D8E-9477-D25C99B98FE4}"
-ko = "{71256996-7D5B-4460-AD23-66F68A99155B}"
-zh-CN = "{11173006-B5BD-41EF-B071-87DD6D7D639B}"
-zh-TW = "{66401593-6930-4B87-8283-2AAA4B1FA978}"
-tr = "{3E02284B-AD3B-4716-8908-0D008D795378}"
-hi = "{2455F7CF-1D9C-4FCE-A90A-A059C037A758}"
-ar = "{6DBB85B9-99A1-45A4-99F2-E174D4825F14}"
-he = "{3EC2568D-8AEE-4968-8B3D-075E360D3A53}"
-multiwestern = "{0050B5A3-CD83-4155-A72D-740BBF0D9E34}"
-multiasia = "{1C121AF5-5B2C-4A87-AB4B-2AA85A6DCAE7}"
-
-[UPGRADECODE]
-en-US = "{EFD2F52B-6C0E-4F84-9E95-79C5F69DF479}"
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/components.txt b/instsetoo_native/inc_sdkoo/windows/msi_templates/components.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/components.txt
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt
deleted file mode 100644
index 7263a0a9e..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt
+++ /dev/null
@@ -1,73 +0,0 @@
-Action	Description	Template
-s72	L0	L0
-WINDOWSENCODINGTEMPLATE	ActionText	Action
-Advertise	OOO_ACTIONTEXT_1	
-AllocateRegistrySpace	OOO_ACTIONTEXT_2	OOO_ACTIONTEXT_3
-AppSearch	OOO_ACTIONTEXT_4	OOO_ACTIONTEXT_5
-BindImage	OOO_ACTIONTEXT_6	OOO_ACTIONTEXT_7
-caCreateVRoots	OOO_ACTIONTEXT_8	
-caRemoveVRoots	OOO_ACTIONTEXT_9	
-CCPSearch	OOO_ACTIONTEXT_10	
-CostFinalize	OOO_ACTIONTEXT_11	
-CostInitialize	OOO_ACTIONTEXT_12	
-CreateFolders	OOO_ACTIONTEXT_13	OOO_ACTIONTEXT_14
-CreateShortcuts	OOO_ACTIONTEXT_15	OOO_ACTIONTEXT_16
-DeleteServices	OOO_ACTIONTEXT_17	OOO_ACTIONTEXT_18
-DuplicateFiles	OOO_ACTIONTEXT_19	OOO_ACTIONTEXT_20
-FileCost	OOO_ACTIONTEXT_21	
-FindRelatedProducts	OOO_ACTIONTEXT_22	OOO_ACTIONTEXT_23
-GenerateScript	OOO_ACTIONTEXT_24	OOO_ACTIONTEXT_25
-InstallAdminPackage	OOO_ACTIONTEXT_26	OOO_ACTIONTEXT_27
-InstallFiles	OOO_ACTIONTEXT_28	OOO_ACTIONTEXT_29
-InstallODBC	OOO_ACTIONTEXT_30	
-InstallServices	OOO_ACTIONTEXT_31	OOO_ACTIONTEXT_32
-InstallSFPCatalogFile	OOO_ACTIONTEXT_33	OOO_ACTIONTEXT_34
-InstallValidate	OOO_ACTIONTEXT_35	
-LaunchConditions	OOO_ACTIONTEXT_36	
-MigrateFeatureStates	OOO_ACTIONTEXT_37	OOO_ACTIONTEXT_38
-MoveFiles	OOO_ACTIONTEXT_39	OOO_ACTIONTEXT_40
-PatchFiles	OOO_ACTIONTEXT_41	OOO_ACTIONTEXT_42
-ProcessComponents	OOO_ACTIONTEXT_43	
-PublishComponents	OOO_ACTIONTEXT_44	OOO_ACTIONTEXT_45
-PublishFeatures	OOO_ACTIONTEXT_46	OOO_ACTIONTEXT_47
-PublishProduct	OOO_ACTIONTEXT_48	
-RegisterClassInfo	OOO_ACTIONTEXT_49	OOO_ACTIONTEXT_50
-RegisterComPlus	OOO_ACTIONTEXT_51	OOO_ACTIONTEXT_52
-RegisterExtensionInfo	OOO_ACTIONTEXT_53	OOO_ACTIONTEXT_54
-RegisterFonts	OOO_ACTIONTEXT_55	OOO_ACTIONTEXT_56
-RegisterMIMEInfo	OOO_ACTIONTEXT_57	OOO_ACTIONTEXT_58
-RegisterProduct	OOO_ACTIONTEXT_59	OOO_ACTIONTEXT_60
-RegisterProgIdInfo	OOO_ACTIONTEXT_61	OOO_ACTIONTEXT_62
-RegisterTypeLibraries	OOO_ACTIONTEXT_63	OOO_ACTIONTEXT_64
-RegisterUser	OOO_ACTIONTEXT_65	OOO_ACTIONTEXT_66
-RemoveDuplicateFiles	OOO_ACTIONTEXT_67	OOO_ACTIONTEXT_68
-RemoveEnvironmentStrings	OOO_ACTIONTEXT_69	OOO_ACTIONTEXT_70
-RemoveExistingProducts	OOO_ACTIONTEXT_71	OOO_ACTIONTEXT_72
-RemoveFiles	OOO_ACTIONTEXT_73	OOO_ACTIONTEXT_74
-RemoveFolders	OOO_ACTIONTEXT_75	OOO_ACTIONTEXT_76
-RemoveIniValues	OOO_ACTIONTEXT_77	OOO_ACTIONTEXT_78
-RemoveODBC	OOO_ACTIONTEXT_79	
-RemoveRegistryValues	OOO_ACTIONTEXT_80	OOO_ACTIONTEXT_81
-RemoveShortcuts	OOO_ACTIONTEXT_82	OOO_ACTIONTEXT_83
-RMCCPSearch	OOO_ACTIONTEXT_84	
-Rollback	OOO_ACTIONTEXT_85	OOO_ACTIONTEXT_86
-RollbackCleanup	OOO_ACTIONTEXT_87	OOO_ACTIONTEXT_88
-SelfRegModules	OOO_ACTIONTEXT_89	OOO_ACTIONTEXT_90
-SelfUnregModules	OOO_ACTIONTEXT_91	OOO_ACTIONTEXT_92
-SetODBCFolders	OOO_ACTIONTEXT_93	
-StartServices	OOO_ACTIONTEXT_94	OOO_ACTIONTEXT_95
-StopServices	OOO_ACTIONTEXT_96	OOO_ACTIONTEXT_97
-UnmoveFiles	OOO_ACTIONTEXT_98	OOO_ACTIONTEXT_99
-UnpublishComponents	OOO_ACTIONTEXT_100	OOO_ACTIONTEXT_101
-UnpublishFeatures	OOO_ACTIONTEXT_102	OOO_ACTIONTEXT_103
-UnpublishProduct	OOO_ACTIONTEXT_104	
-UnregisterClassInfo	OOO_ACTIONTEXT_105	OOO_ACTIONTEXT_106
-UnregisterComPlus	OOO_ACTIONTEXT_107	OOO_ACTIONTEXT_108
-UnregisterExtensionInfo	OOO_ACTIONTEXT_109	OOO_ACTIONTEXT_110
-UnregisterFonts	OOO_ACTIONTEXT_111	OOO_ACTIONTEXT_112
-UnregisterMIMEInfo	OOO_ACTIONTEXT_113	OOO_ACTIONTEXT_114
-UnregisterProgIdInfo	OOO_ACTIONTEXT_115	OOO_ACTIONTEXT_116
-UnregisterTypeLibraries	OOO_ACTIONTEXT_117	OOO_ACTIONTEXT_118
-WriteEnvironmentStrings	OOO_ACTIONTEXT_119	OOO_ACTIONTEXT_120
-WriteIniValues	OOO_ACTIONTEXT_121	OOO_ACTIONTEXT_122
-WriteRegistryValues	OOO_ACTIONTEXT_123	OOO_ACTIONTEXT_124
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_ure/windows/msi_templates/AdminExe.idt
deleted file mode 100644
index ede3f7cb4..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/AdminExe.idt
+++ /dev/null
@@ -1,13 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdminExecuteSequence	Action
-CostFinalize		150
-CostInitialize		50
-CreateFolders		325
-FileCost		100
-InstallAdminPackage		300
-InstallFiles		350
-InstallFinalize		400
-InstallInitialize		250
-InstallValidate		200
-ScheduleReboot	ISSCHEDULEREBOOT	375
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/AdminUIS.idt b/instsetoo_native/inc_ure/windows/msi_templates/AdminUIS.idt
deleted file mode 100644
index 3d92e28a4..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/AdminUIS.idt
+++ /dev/null
@@ -1,14 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdminUISequence	Action
-AdminWelcome	Not PATCH	250
-CostFinalize		200
-CostInitialize		100
-ExecuteAction		350
-FileCost		150
-PatchWelcome	PATCH	260
-SetupCompleteError		-3
-SetupCompleteSuccess		-1
-SetupInitialization		50
-SetupInterrupted		-2
-SetupProgress		300
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/AdvtExec.idt b/instsetoo_native/inc_ure/windows/msi_templates/AdvtExec.idt
deleted file mode 100644
index 32b74d61a..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/AdvtExec.idt
+++ /dev/null
@@ -1,19 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-AdvtExecuteSequence	Action
-CostFinalize		100
-CostInitialize		50
-CreateShortcuts		250
-InstallFinalize		700
-InstallInitialize		200
-InstallValidate		150
-MsiPublishAssemblies		575
-PublishComponents		550
-PublishFeatures		600
-PublishProduct		650
-RegisterClassInfo		300
-RegisterExtensionInfo		350
-RegisterMIMEInfo		450
-RegisterProgIdInfo		400
-RegisterTypeLibraries		500
-ScheduleReboot	ISSCHEDULEREBOOT	675
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_ure/windows/msi_templates/AppSearc.idt
deleted file mode 100644
index 9b3d7df77..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/AppSearc.idt
+++ /dev/null
@@ -1,3 +0,0 @@
-Property	Signature_
-s72	s72
-AppSearch	Property	Signature_
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary.idt b/instsetoo_native/inc_ure/windows/msi_templates/Binary.idt
deleted file mode 100644
index 0b638cb0e..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary.idt
+++ /dev/null
@@ -1,20 +0,0 @@
-Name	Data
-s72	v0
-Binary	Name
-ImageBmp	Image.bmp
-BannerBmp	Banner.bmp
-CautionIco	caution.ico
-DontInstallIco	dontinstall.ico
-OpenFolderIco	openfolder.ico
-InstallIco	install.ico
-InstallFirstUseIco	installfirstuse.ico
-InstallPartialIco	installpartial.ico
-InstallStateMenuIco	installstatemenu.ico
-NetworkInstallIco	networkinstall.ico
-NewFolderIco	newfolder.ico
-SetupCompleteIco	setupcomplete.ico
-SetupIco	setup.ico
-SetupPartialIco	setuppartial.ico
-SetupRepairIco	setuprepair.ico
-TrashcanIco	trashcan.ico
-UpIco	up.ico
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp
deleted file mode 100644
index 5078e379c..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ure/windows/msi_templates/Binary/Image.bmp
deleted file mode 100644
index e69b561f9..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Image.bmp
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/caution.ico
deleted file mode 100644
index 1c6f14ee0..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/caution.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/dontinstall.ico
deleted file mode 100644
index e7136d0e8..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/dontinstall.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/install.ico
deleted file mode 100644
index 2eb32becb..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/install.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/installfirstuse.ico
deleted file mode 100644
index dc1e6542e..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installfirstuse.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/installpartial.ico
deleted file mode 100644
index bd5767969..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installpartial.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/installstatemenu.ico
deleted file mode 100644
index 914340dbb..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installstatemenu.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/networkinstall.ico
deleted file mode 100644
index ae11ed113..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/networkinstall.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/newfolder.ico
deleted file mode 100644
index 324adbcba..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/newfolder.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/openfolder.ico
deleted file mode 100644
index ef88d2e47..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/openfolder.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/setup.ico
deleted file mode 100644
index 3580448fe..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setup.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/setupcomplete.ico
deleted file mode 100644
index 609276af0..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setupcomplete.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuppartial.ico
deleted file mode 100644
index ac158ab39..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuppartial.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuprepair.ico
deleted file mode 100644
index 2f4a24d0b..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuprepair.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/trashcan.ico
deleted file mode 100644
index f1cc8083f..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/trashcan.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/up.ico
deleted file mode 100644
index 5dc25fae6..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/up.ico
+++ /dev/null
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/CheckBox.idt b/instsetoo_native/inc_ure/windows/msi_templates/CheckBox.idt
deleted file mode 100644
index c7c8e06d7..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/CheckBox.idt
+++ /dev/null
@@ -1,4 +0,0 @@
-Property	Value
-s72	S64
-CheckBox	Property
-ISCHECKFORPRODUCTUPDATES	1
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
deleted file mode 100644
index 61fdd6390..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt
+++ /dev/null
@@ -1,377 +0,0 @@
-Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
-s72	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L50
-WINDOWSENCODINGTEMPLATE	Control	Dialog_	Control
-AdminChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-AdminChangeFolder	BannerLine	Line	0	44	374	0	1				
-AdminChangeFolder	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-AdminChangeFolder	Branding2	Text	3	228	32	13	65537		[ProductName]		
-AdminChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_3	ComboText	
-AdminChangeFolder	Combo	DirectoryCombo	21	64	277	80	458755	TARGETDIR		Up	
-AdminChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_5	Combo	
-AdminChangeFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_6		
-AdminChangeFolder	DlgLine	Line	35	234	339	0	1				
-AdminChangeFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_7		
-AdminChangeFolder	List	DirectoryList	21	90	332	97	7	TARGETDIR		TailText	
-AdminChangeFolder	NewFolder	PushButton	335	66	19	19	3670019		NewFolderIco	List	OOO_CONTROL_9
-AdminChangeFolder	OK	PushButton	230	243	66	17	3		OOO_CONTROL_10	Cancel	
-AdminChangeFolder	Tail	PathEdit	21	207	332	17	3	TARGETDIR		OK	
-AdminChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_12	Tail	
-AdminChangeFolder	Up	PushButton	310	66	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_13
-AdminNetworkLocation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_14	InstallNow	
-AdminNetworkLocation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-AdminNetworkLocation	BannerLine	Line	0	44	374	0	1				
-AdminNetworkLocation	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-AdminNetworkLocation	Branding2	Text	3	228	32	13	65537		[ProductName]		
-AdminNetworkLocation	Browse	PushButton	286	124	66	17	3		OOO_CONTROL_17	Back	
-AdminNetworkLocation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_18	LBBrowse	
-AdminNetworkLocation	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_19		
-AdminNetworkLocation	DlgLine	Line	35	234	339	0	1				
-AdminNetworkLocation	DlgText	Text	21	51	326	40	3		OOO_CONTROL_20		
-AdminNetworkLocation	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_21		
-AdminNetworkLocation	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_22	Cancel	
-AdminNetworkLocation	LBBrowse	Text	21	90	100	10	3		OOO_CONTROL_23	SetupPathEdit	
-AdminNetworkLocation	SetupPathEdit	PathEdit	21	102	330	17	3	TARGETDIR		Browse	
-AdminWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_24	Next	
-AdminWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_25	Back	
-AdminWelcome	DlgLine	Line	0	234	326	0	1				
-AdminWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-AdminWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_26	Cancel	
-AdminWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_27		
-AdminWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_28		
-CancelSetup	Icon	Icon	15	15	24	24	5242881		CautionIco		
-CancelSetup	No	PushButton	135	57	66	17	3		OOO_CONTROL_29	Yes	
-CancelSetup	Text	Text	48	15	194	30	3		OOO_CONTROL_30		
-CancelSetup	Yes	PushButton	62	57	66	17	3		OOO_CONTROL_31	No	
-CustomerInformation	Back	PushButton	164	243	66	17	3		OOO_CONTROL_32	Next	
-CustomerInformation	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomerInformation	BannerLine	Line	0	44	374	0	1				
-CustomerInformation	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomerInformation	Branding2	Text	3	228	32	13	65537		[ProductName]		
-CustomerInformation	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_35	NameLabel	
-CustomerInformation	CompanyEdit	Edit	21	100	237	17	3	COMPANYNAME	OOO_CONTROL_36	SerialLabel	
-CustomerInformation	CompanyLabel	Text	21	89	75	10	3		OOO_CONTROL_37	CompanyEdit	
-CustomerInformation	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_38		
-CustomerInformation	DlgLine	Line	35	234	339	0	1				
-CustomerInformation	DlgRadioGroupText	Text	21	161	300	14	3		OOO_CONTROL_39		
-CustomerInformation	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_40		
-CustomerInformation	NameEdit	Edit	21	63	237	17	3	USERNAME	OOO_CONTROL_41	CompanyLabel	
-CustomerInformation	NameLabel	Text	21	52	75	10	3		OOO_CONTROL_42	NameEdit	
-CustomerInformation	Next	PushButton	230	243	66	17	3		OOO_CONTROL_43	Cancel	
-CustomerInformation	RadioGroup	RadioButtonGroup	63	170	300	50	3	ApplicationUsers		Back	
-CustomerInformation	SerialLabel	Text	21	127	109	10	2		OOO_CONTROL_45	SerialNumber	
-CustomerInformation	SerialNumber	MaskedEdit	21	138	237	17	2	ISX_SERIALNUM		RadioGroup	
-CustomSetup	Back	PushButton	164	243	66	17	3		OOO_CONTROL_46	Next	
-CustomSetup	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomSetup	BannerLine	Line	0	44	374	0	1				
-CustomSetup	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomSetup	Branding2	Text	3	228	32	13	65537		[ProductName]		
-CustomSetup	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_49	Tree	
-CustomSetup	ChangeFolder	PushButton	301	203	66	17	3		OOO_CONTROL_50	Help	
-CustomSetup	Details	PushButton	93	243	66	17	3		OOO_CONTROL_51	Back	
-CustomSetup	DlgDesc	Text	17	23	276	25	65539		OOO_CONTROL_52		
-CustomSetup	DlgLine	Line	35	234	339	0	1				
-CustomSetup	DlgText	Text	9	51	360	10	3		OOO_CONTROL_53		
-CustomSetup	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_54		
-CustomSetup	FeatureGroup	GroupBox	235	67	131	120	1		OOO_CONTROL_55		
-CustomSetup	Help	PushButton	22	243	66	17	3		OOO_CONTROL_56	Details	
-CustomSetup	InstallLabel	Text	8	190	360	10	3		OOO_CONTROL_57		
-CustomSetup	ItemDescription	Text	241	80	120	50	3		OOO_CONTROL_58		
-CustomSetup	Location	Text	8	203	291	20	3		OOO_CONTROL_59		
-CustomSetup	Next	PushButton	230	243	66	17	3		OOO_CONTROL_60	Cancel	
-CustomSetup	Size	Text	241	133	120	50	3		OOO_CONTROL_61		
-CustomSetup	Tree	SelectionTree	8	70	220	118	7	_BrowseProperty		ChangeFolder	
-CustomSetupTips	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-CustomSetupTips	BannerLine	Line	0	44	374	0	1				
-CustomSetupTips	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-CustomSetupTips	Branding2	Text	3	228	32	13	65537		[ProductName]		
-CustomSetupTips	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_64		
-CustomSetupTips	DlgLine	Line	35	234	339	0	1				
-CustomSetupTips	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_65		
-CustomSetupTips	DontInstall	Icon	21	155	24	24	5242881		DontInstallIco		
-CustomSetupTips	DontInstallText	Text	60	155	300	20	3		OOO_CONTROL_66		
-CustomSetupTips	Install	Icon	21	105	24	24	5242881		InstallIco		
-CustomSetupTips	InstallPartial	Icon	21	130	24	24	5242881		InstallPartialIco		
-CustomSetupTips	InstallStateMenu	Icon	21	52	24	24	5242881		InstallStateMenuIco		
-CustomSetupTips	InstallStateText	Text	21	91	300	10	3		OOO_CONTROL_68		
-CustomSetupTips	InstallText	Text	60	105	300	20	3		OOO_CONTROL_69		
-CustomSetupTips	MenuText	Text	50	52	300	36	3		OOO_CONTROL_70		
-CustomSetupTips	OK	PushButton	301	243	66	17	3		OOO_CONTROL_72		
-CustomSetupTips	PartialText	Text	60	130	300	20	3		OOO_CONTROL_73		
-DatabaseFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_74	Next	
-DatabaseFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DatabaseFolder	BannerLine	Line	0	44	374	0	1				
-DatabaseFolder	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-DatabaseFolder	Branding2	Text	3	228	32	13	65537		[ProductName]		
-DatabaseFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_77	ChangeFolder	
-DatabaseFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_78	Back	
-DatabaseFolder	DatabaseFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
-DatabaseFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_79		
-DatabaseFolder	DlgLine	Line	35	234	339	0	1				
-DatabaseFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_80		
-DatabaseFolder	Location	Text	57	65	240	40	3	_BrowseProperty	OOO_CONTROL_81		
-DatabaseFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_82		
-DatabaseFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_83	Cancel	
-DestinationFolder	Back	PushButton	164	243	66	17	3		OOO_CONTROL_84	Next	
-DestinationFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DestinationFolder	BannerLine	Line	0	44	374	0	1				
-DestinationFolder	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-DestinationFolder	Branding2	Text	3	228	32	13	65537		[ProductName]		
-DestinationFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_87	ChangeFolder	
-DestinationFolder	ChangeFolder	PushButton	301	65	66	17	3		OOO_CONTROL_88	Back	
-DestinationFolder	DestFolder	Icon	21	52	24	24	5242881		OpenFolderIco		
-DestinationFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_89		
-DestinationFolder	DlgLine	Line	35	234	339	0	1				
-DestinationFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_90		
-DestinationFolder	Location	Text	57	65	240	40	3	_BrowseProperty	[INSTALLLOCATION]		
-DestinationFolder	LocLabel	Text	57	52	290	10	3		OOO_CONTROL_92		
-DestinationFolder	Next	PushButton	230	243	66	17	3		OOO_CONTROL_93	Cancel	
-DiskSpaceRequirements	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-DiskSpaceRequirements	BannerLine	Line	0	44	374	0	1				
-DiskSpaceRequirements	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-DiskSpaceRequirements	Branding2	Text	3	228	32	13	65537		[ProductName]		
-DiskSpaceRequirements	DlgDesc	Text	17	23	276	25	65539		OOO_CONTROL_96		
-DiskSpaceRequirements	DlgLine	Line	35	234	339	0	1				
-DiskSpaceRequirements	DlgText	Text	10	185	358	41	3		OOO_CONTROL_97		
-DiskSpaceRequirements	DlgTitle	Text	9	6	284	25	65539		OOO_CONTROL_98		
-DiskSpaceRequirements	List	VolumeCostList	8	55	358	125	393223		{120}{70}{70}{70}{70}		
-DiskSpaceRequirements	OK	PushButton	301	243	66	17	3		OOO_CONTROL_100		
-FilesInUse	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-FilesInUse	BannerLine	Line	0	44	374	0	1				
-FilesInUse	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-FilesInUse	Branding2	Text	3	228	32	13	65537		[ProductName]		
-FilesInUse	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_103		
-FilesInUse	DlgLine	Line	35	234	339	0	1				
-FilesInUse	DlgText	Text	21	51	348	29	3		OOO_CONTROL_104		
-FilesInUse	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_105		
-FilesInUse	Exit	PushButton	301	243	66	17	3		OOO_CONTROL_106	List	
-FilesInUse	Ignore	PushButton	230	243	66	17	3		OOO_CONTROL_107	Exit	
-FilesInUse	List	ListBox	21	87	331	135	7	FileInUseProcess		Retry	
-FilesInUse	Retry	PushButton	164	243	66	17	3		OOO_CONTROL_108	Ignore	
-FileTypeDialog	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
-FileTypeDialog	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-FileTypeDialog	BannerLine	Line	0	44	374	0	1				
-FileTypeDialog	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-FileTypeDialog	Branding2	Text	3	228	32	13	65537		[ProductName]		
-FileTypeDialog	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_138	CheckBox1	
-FileTypeDialog	CheckBox1	CheckBox	41	106	200	10	3	SELECT_WORD	 OOO_CONTROL_270	CheckBox2	
-FileTypeDialog	CheckBox2	CheckBox	41	131	200	10	3	SELECT_EXCEL	 OOO_CONTROL_271	CheckBox3	
-FileTypeDialog	CheckBox3	CheckBox	41	156	200	10	3	SELECT_POWERPOINT	 OOO_CONTROL_272	Back	
-FileTypeDialog	DlgDesc	Text	21	20	272	25	65539		OOO_CONTROL_274		
-FileTypeDialog	DlgLine	Line	35	234	339	0	1				
-FileTypeDialog	DlgText	Text	21	56	326	40	3		OOO_CONTROL_275		
-FileTypeDialog	DlgText2	Text	21	190	326	30	3		OOO_CONTROL_309		
-FileTypeDialog	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_278		
-FileTypeDialog	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-InstallChangeFolder	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-InstallChangeFolder	BannerLine	Line	0	44	374	0	1				
-InstallChangeFolder	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-InstallChangeFolder	Branding2	Text	3	228	32	13	65537		[ProductName]		
-InstallChangeFolder	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_111	ComboText	
-InstallChangeFolder	Combo	DirectoryCombo	21	64	277	80	4128779	_BrowseProperty		Up	
-InstallChangeFolder	ComboText	Text	21	50	99	14	3		OOO_CONTROL_113	Combo	
-InstallChangeFolder	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_114		
-InstallChangeFolder	DlgLine	Line	35	234	339	0	1				
-InstallChangeFolder	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_115		
-InstallChangeFolder	List	DirectoryList	21	90	332	97	15	_BrowseProperty		TailText	
-InstallChangeFolder	NewFolder	PushButton	335	66	19	19	3670019		NewFolderIco	List	OOO_CONTROL_117
-InstallChangeFolder	OK	PushButton	230	243	66	17	3		OOO_CONTROL_118	Cancel	
-InstallChangeFolder	Tail	PathEdit	21	207	332	17	15	_BrowseProperty		OK	
-InstallChangeFolder	TailText	Text	21	193	99	13	3		OOO_CONTROL_120	Tail	
-InstallChangeFolder	Up	PushButton	310	66	19	19	3670019		UpIco	NewFolder	OOO_CONTROL_121
-InstallWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_122	Copyright	
-InstallWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_123	Back	
-InstallWelcome	Copyright	Text	135	144	228	73	65539		OOO_CONTROL_124	Next	
-InstallWelcome	DlgLine	Line	0	234	374	0	1				
-InstallWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-InstallWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_125	Cancel	
-InstallWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_126		
-InstallWelcome	TextLine2	Text	135	55	228	45	65539		OOO_CONTROL_127		
-LicenseAgreement	Agree	RadioButtonGroup	8	190	330	40	3	AgreeToLicense		Back	
-LicenseAgreement	Back	PushButton	164	243	66	17	3		OOO_CONTROL_128	Next	
-LicenseAgreement	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-LicenseAgreement	BannerLine	Line	0	44	374	0	1				
-LicenseAgreement	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-LicenseAgreement	Branding2	Text	3	228	32	13	65537		[ProductName]		
-LicenseAgreement	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_131	Agree	
-LicenseAgreement	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_132		
-LicenseAgreement	DlgLine	Line	35	234	339	0	1				
-LicenseAgreement	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_133		
-LicenseAgreement	Memo	ScrollableText	8	54	358	130	7				
-LicenseAgreement	Next	PushButton	230	243	66	17	3		OOO_CONTROL_134	Cancel	
-MaintenanceType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_135	Next	
-MaintenanceType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-MaintenanceType	BannerLine	Line	0	44	374	0	1				
-MaintenanceType	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-MaintenanceType	Branding2	Text	3	228	32	13	65537		[ProductName]		
-MaintenanceType	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_138	RadioGroup	
-MaintenanceType	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_139		
-MaintenanceType	DlgLine	Line	35	234	339	0	1				
-MaintenanceType	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_140		
-MaintenanceType	Ico1	Icon	35	75	24	24	5242881		SetupPartialIco		
-MaintenanceType	Ico2	Icon	35	135	24	24	5242881		SetupRepairIco		
-MaintenanceType	Ico3	Icon	35	195	24	24	5242881		TrashcanIco		
-MaintenanceType	Next	PushButton	230	243	66	17	3		OOO_CONTROL_141	Cancel	
-MaintenanceType	RadioGroup	RadioButtonGroup	21	55	290	170	3	_IsMaintenance		Back	
-MaintenanceType	Text1	Text	80	72	260	35	3		OOO_CONTROL_143		
-MaintenanceType	Text2	Text	80	135	260	35	3		OOO_CONTROL_144		
-MaintenanceType	Text3	Text	80	192	260	35	3		OOO_CONTROL_145		
-MaintenanceWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_146	Next	
-MaintenanceWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_147	Back	
-MaintenanceWelcome	DlgLine	Line	0	234	374	0	1				
-MaintenanceWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-MaintenanceWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_148	Cancel	
-MaintenanceWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_149		
-MaintenanceWelcome	TextLine2	Text	135	55	228	50	65539		OOO_CONTROL_150		
-OutOfSpace	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-OutOfSpace	BannerLine	Line	0	44	374	0	1				
-OutOfSpace	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-OutOfSpace	Branding2	Text	3	228	32	13	65537		[ProductName]		
-OutOfSpace	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_153		
-OutOfSpace	DlgLine	Line	35	234	339	0	1				
-OutOfSpace	DlgText	Text	21	51	326	43	3		OOO_CONTROL_154		
-OutOfSpace	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_155		
-OutOfSpace	List	VolumeCostList	21	95	332	120	393223		OOO_CONTROL_156		
-OutOfSpace	Resume	PushButton	301	243	66	17	3		OOO_CONTROL_157		
-PatchWelcome	Back	PushButton	164	243	66	17	1		OOO_CONTROL_158	Next	
-PatchWelcome	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_159	Back	
-PatchWelcome	DlgLine	Line	0	234	374	0	1				
-PatchWelcome	Image	Bitmap	0	0	122	234	1		ImageBmp		
-PatchWelcome	Next	PushButton	230	243	66	17	3		OOO_CONTROL_160	Cancel	
-PatchWelcome	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_161		
-PatchWelcome	TextLine2	Text	135	54	228	45	65539		OOO_CONTROL_162		
-ReadyToInstall	Back	PushButton	164	243	66	17	3		OOO_CONTROL_163	InstallNow	
-ReadyToInstall	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-ReadyToInstall	BannerLine	Line	0	44	374	0	1				
-ReadyToInstall	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-ReadyToInstall	Branding2	Text	3	228	32	13	65537		[ProductName]		
-ReadyToInstall	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_166	Back	
-ReadyToInstall	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_167		
-ReadyToInstall	DlgLine	Line	35	234	339	0	1				
-ReadyToInstall	DlgText	Text	21	51	326	20	3		OOO_CONTROL_168		
-ReadyToInstall	DlgText1	Text	21	70	330	24	3		OOO_CONTROL_169		
-ReadyToInstall	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_170		
-ReadyToInstall	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_171		
-ReadyToInstall	DlgTitle3	Text	13	6	280	25	65538		OOO_CONTROL_172		
-ReadyToInstall	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_173	Cancel	
-ReadyToRemove	Back	PushButton	164	243	66	17	3		OOO_CONTROL_174	RemoveNow	
-ReadyToRemove	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-ReadyToRemove	BannerLine	Line	0	44	374	0	1				
-ReadyToRemove	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-ReadyToRemove	Branding2	Text	3	228	32	13	65537		[ProductName]		
-ReadyToRemove	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_177	Back	
-ReadyToRemove	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_178		
-ReadyToRemove	DlgLine	Line	35	234	339	0	1				
-ReadyToRemove	DlgText	Text	21	51	326	24	3		OOO_CONTROL_179		
-ReadyToRemove	DlgText1	Text	21	79	330	23	3		OOO_CONTROL_180		
-ReadyToRemove	DlgText2	Text	21	102	330	24	3				
-ReadyToRemove	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_181		
-ReadyToRemove	RemoveNow	PushButton	230	243	66	17	3		OOO_CONTROL_182	Cancel	
-SetupCompleteError	Back	PushButton	164	243	66	17	1		OOO_CONTROL_183	Finish	
-SetupCompleteError	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_184	Back	
-SetupCompleteError	DlgLine	Line	0	234	374	0	1				
-SetupCompleteError	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_185	Cancel	
-SetupCompleteError	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_186		
-SetupCompleteError	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_187		
-SetupCompleteError	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupCompleteError	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_188		
-SetupCompleteError	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_189		
-SetupCompleteError	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_190		
-SetupCompleteError	TextLine2	Text	135	55	228	25	65539		OOO_CONTROL_191		
-SetupCompleteSuccess	Back	PushButton	164	243	66	17	1		OOO_CONTROL_192	OK	
-SetupCompleteSuccess	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_193	Image	
-SetupCompleteSuccess	CheckBoxUpdates	CheckBox	135	164	10	9	2	ISCHECKFORPRODUCTUPDATES	CheckBox1	Back	
-SetupCompleteSuccess	CheckForUpdatesText	Text	152	162	190	30	65538		OOO_CONTROL_194		
-SetupCompleteSuccess	CheckLaunchProgram	CheckBox	151	114	10	9	2	LAUNCHPROGRAM			
-SetupCompleteSuccess	CheckLaunchReadme	CheckBox	151	148	10	9	2	LAUNCHREADME			
-SetupCompleteSuccess	DlgLine	Line	0	234	374	0	1				
-SetupCompleteSuccess	Image	Bitmap	0	0	122	234	1		ImageBmp	CheckBoxUpdates	
-SetupCompleteSuccess	LaunchProgramText	Text	164	112	198	15	65538		OOO_CONTROL_195		
-SetupCompleteSuccess	LaunchReadmeText	Text	164	148	198	13	65538		OOO_CONTROL_196		
-SetupCompleteSuccess	OK	PushButton	230	243	66	17	3		OOO_CONTROL_197	Cancel	
-SetupCompleteSuccess	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_198		
-SetupCompleteSuccess	TextLine2	Text	135	55	228	45	65538		OOO_CONTROL_199		
-SetupCompleteSuccess	TextLine3	Text	135	55	228	45	65538		OOO_CONTROL_200		
-SetupCompleteSuccess	UpdateTextLine1	Text	135	30	228	45	65538		OOO_CONTROL_201		
-SetupCompleteSuccess	UpdateTextLine2	Text	135	80	228	45	65538		OOO_CONTROL_202		
-SetupCompleteSuccess	UpdateTextLine3	Text	135	120	228	45	65538		OOO_CONTROL_203		
-SetupError	A	PushButton	192	80	66	17	3		OOO_CONTROL_204		
-SetupError	C	PushButton	192	80	66	17	3		OOO_CONTROL_205		
-SetupError	ErrorText	Text	50	15	200	50	3		OOO_CONTROL_206		
-SetupError	I	PushButton	192	80	66	17	3		OOO_CONTROL_207		
-SetupError	N	PushButton	192	80	66	17	3		OOO_CONTROL_208		
-SetupError	O	PushButton	192	80	66	17	3		OOO_CONTROL_209		
-SetupError	R	PushButton	192	80	66	17	3		OOO_CONTROL_210		
-SetupError	WarningIcon	Icon	15	15	24	24	5242881		CautionIco		
-SetupError	Y	PushButton	192	80	66	17	3		OOO_CONTROL_211		
-SetupInitialization	ActionData	Text	135	125	228	12	65539				
-SetupInitialization	ActionText	Text	135	109	220	36	65539				
-SetupInitialization	Back	PushButton	164	243	66	17	1		OOO_CONTROL_214		
-SetupInitialization	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_215		
-SetupInitialization	DlgLine	Line	0	234	374	0	1				
-SetupInitialization	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupInitialization	Next	PushButton	230	243	66	17	1		OOO_CONTROL_216		
-SetupInitialization	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_217		
-SetupInitialization	TextLine2	Text	135	55	228	30	65539		OOO_CONTROL_218		
-SetupInterrupted	Back	PushButton	164	243	66	17	1		OOO_CONTROL_219		
-SetupInterrupted	Cancel	PushButton	301	243	66	17	1		OOO_CONTROL_220		
-SetupInterrupted	DlgLine	Line	0	234	374	0	1				
-SetupInterrupted	Finish	PushButton	230	243	66	17	3		OOO_CONTROL_221		
-SetupInterrupted	FinishText1	Text	135	80	228	50	65539		OOO_CONTROL_222		
-SetupInterrupted	FinishText2	Text	135	135	228	25	65539		OOO_CONTROL_223		
-SetupInterrupted	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupInterrupted	RestContText1	Text	135	80	228	50	65539		OOO_CONTROL_224		
-SetupInterrupted	RestContText2	Text	135	135	228	25	65539		OOO_CONTROL_225		
-SetupInterrupted	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_226		
-SetupInterrupted	TextLine2	Text	135	55	228	25	65539		OOO_CONTROL_227		
-SetupProgress	ActionProgress95	ProgressBar	59	113	275	12	65537		OOO_CONTROL_228		
-SetupProgress	ActionText	Text	59	100	275	12	3				
-SetupProgress	Back	PushButton	164	243	66	17	1		OOO_CONTROL_230	Next	
-SetupProgress	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-SetupProgress	BannerLine	Line	0	44	374	0	1				
-SetupProgress	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-SetupProgress	Branding2	Text	3	228	32	13	65537		[ProductName]		
-SetupProgress	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_233	Back	
-SetupProgress	DlgDesc	Text	21	23	272	25	65538		OOO_CONTROL_234		
-SetupProgress	DlgDesc2	Text	21	23	272	25	65538		OOO_CONTROL_235		
-SetupProgress	DlgLine	Line	35	234	339	0	1				
-SetupProgress	DlgText	Text	59	51	275	30	65538		OOO_CONTROL_236		
-SetupProgress	DlgText2	Text	59	51	275	30	65538		OOO_CONTROL_237		
-SetupProgress	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_238		
-SetupProgress	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_239		
-SetupProgress	LbSec	Text	172	139	32	12	2		OOO_CONTROL_240		
-SetupProgress	LbStatus	Text	59	85	70	12	3		OOO_CONTROL_241		
-SetupProgress	Next	PushButton	230	243	66	17	1		OOO_CONTROL_242	Cancel	
-SetupProgress	SetupIcon	Icon	21	51	24	24	5242881		SetupIco		
-SetupProgress	ShowTime	Text	155	139	17	12	2				
-SetupProgress	TextTime	Text	59	139	96	12	2		OOO_CONTROL_244		
-SetupResume	Back	PushButton	164	243	66	17	1		OOO_CONTROL_245	Next	
-SetupResume	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_246	Back	
-SetupResume	DlgLine	Line	0	234	374	0	1				
-SetupResume	Image	Bitmap	0	0	122	234	1		ImageBmp		
-SetupResume	Next	PushButton	230	243	66	17	3		OOO_CONTROL_247	Cancel	
-SetupResume	PreselectedText	Text	135	55	228	45	65539		OOO_CONTROL_248		
-SetupResume	ResumeText	Text	135	46	228	45	65539		OOO_CONTROL_249		
-SetupResume	TextLine1	Text	135	8	225	45	65539		OOO_CONTROL_250		
-SetupType	Back	PushButton	164	243	66	17	3		OOO_CONTROL_251	Next	
-SetupType	Banner	Bitmap	297	0	77	44	1		BannerBmp		
-SetupType	BannerLine	Line	0	44	374	0	1				
-SetupType	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-SetupType	Branding2	Text	3	228	32	13	65537		[ProductName]		
-SetupType	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_254	RadioGroup	
-SetupType	CompleteIco	Icon	34	94	24	24	5242881		SetupCompleteIco		
-SetupType	CompText	Text	80	94	246	35	3		OOO_CONTROL_255		
-SetupType	CustomIco	Icon	34	154	24	24	5242881		SetupPartialIco		
-SetupType	CustText	Text	80	154	246	35	3		OOO_CONTROL_256		
-SetupType	DlgDesc	Text	21	23	272	25	65539		OOO_CONTROL_257		
-SetupType	DlgLine	Line	35	234	339	0	1				
-SetupType	DlgText	Text	21	51	326	10	3		OOO_CONTROL_258		
-SetupType	DlgTitle	Text	13	6	280	25	65539		OOO_CONTROL_259		
-SetupType	Next	PushButton	230	243	66	17	3		OOO_CONTROL_260	Cancel	
-SetupType	RadioGroup	RadioButtonGroup	21	79	264	120	3	_IsSetupTypeMin		Back	
-SplashBitmap	Back	PushButton	164	243	66	17	1		OOO_CONTROL_262	Next	
-SplashBitmap	Branding1	Text	4	229	32	13	3		{&MSSWhiteSerif8}[ProductName]		
-SplashBitmap	Branding2	Text	3	228	32	13	65537		[ProductName]		
-SplashBitmap	Cancel	PushButton	301	243	66	17	3		OOO_CONTROL_265	Back	
-SplashBitmap	DlgLine	Line	35	234	339	0	1				
-SplashBitmap	Image	Bitmap	13	12	114	211	1		ImageBmp		
-SplashBitmap	Next	PushButton	230	243	66	17	3		OOO_CONTROL_266	Cancel	
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
deleted file mode 100644
index 6f6e3cb59..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt
+++ /dev/null
@@ -1,70 +0,0 @@
-Dialog_	Control_	Action	Condition
-s72	s50	s50	s255
-ControlCondition	Dialog_	Control_	Action	Condition
-CustomerInformation	DlgRadioGroupText	Hide	NOT Privileged
-CustomerInformation	DlgRadioGroupText	Hide	ProductState > 0
-CustomerInformation	DlgRadioGroupText	Hide	Version9X
-CustomerInformation	RadioGroup	Hide	NOT Privileged
-CustomerInformation	RadioGroup	Hide	ProductState > 0
-CustomerInformation	RadioGroup	Hide	Version9X
-CustomerInformation	SerialLabel	Show	SERIALNUMSHOW
-CustomerInformation	SerialNumber	Show	SERIALNUMSHOW
-CustomSetup	ChangeFolder	Hide	Installed
-CustomSetup	Details	Hide	Installed
-CustomSetup	InstallLabel	Hide	Installed
-InstallWelcome	Copyright	Hide	SHOWCOPYRIGHT="No"
-InstallWelcome	Copyright	Show	SHOWCOPYRIGHT="Yes"
-LicenseAgreement	Next	Disable	AgreeToLicense <> "Yes"
-LicenseAgreement	Next	Enable	AgreeToLicense = "Yes"
-ReadyToInstall	DlgTitle	Show	ProgressType0="Modify"
-ReadyToInstall	DlgTitle2	Show	ProgressType0="Repair"
-ReadyToInstall	DlgTitle3	Show	ProgressType0="install"
-SetupCompleteError	Back	Default	UpdateStarted
-SetupCompleteError	Back	Disable	NOT UpdateStarted
-SetupCompleteError	Back	Enable	UpdateStarted
-SetupCompleteError	Cancel	Disable	NOT UpdateStarted
-SetupCompleteError	Cancel	Enable	UpdateStarted
-SetupCompleteError	Finish	Default	NOT UpdateStarted
-SetupCompleteError	FinishText1	Hide	UpdateStarted
-SetupCompleteError	FinishText1	Show	NOT UpdateStarted
-SetupCompleteError	FinishText2	Hide	UpdateStarted
-SetupCompleteError	FinishText2	Show	NOT UpdateStarted
-SetupCompleteError	RestContText1	Hide	NOT UpdateStarted
-SetupCompleteError	RestContText1	Show	UpdateStarted
-SetupCompleteError	RestContText2	Hide	NOT UpdateStarted
-SetupCompleteError	RestContText2	Show	UpdateStarted
-SetupCompleteSuccess	CheckBoxUpdates	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	CheckForUpdatesText	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	CheckLaunchProgram	Show	SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	CheckLaunchReadme	Show	SHOWLAUNCHREADME="-1"  And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	LaunchProgramText	Show	SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	LaunchReadmeText	Show	SHOWLAUNCHREADME="-1"  And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG
-SetupCompleteSuccess	TextLine2	Show	ProgressType2="installed" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess	TextLine3	Show	ProgressType2="uninstalled" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed))
-SetupCompleteSuccess	UpdateTextLine1	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	UpdateTextLine2	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupCompleteSuccess	UpdateTextLine3	Show	ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL"
-SetupInterrupted	Back	Default	UpdateStarted
-SetupInterrupted	Back	Disable	NOT UpdateStarted
-SetupInterrupted	Back	Enable	UpdateStarted
-SetupInterrupted	Cancel	Disable	NOT UpdateStarted
-SetupInterrupted	Cancel	Enable	UpdateStarted
-SetupInterrupted	Finish	Default	NOT UpdateStarted
-SetupInterrupted	FinishText1	Hide	UpdateStarted
-SetupInterrupted	FinishText1	Show	NOT UpdateStarted
-SetupInterrupted	FinishText2	Hide	UpdateStarted
-SetupInterrupted	FinishText2	Show	NOT UpdateStarted
-SetupInterrupted	RestContText1	Hide	NOT UpdateStarted
-SetupInterrupted	RestContText1	Show	UpdateStarted
-SetupInterrupted	RestContText2	Hide	NOT UpdateStarted
-SetupInterrupted	RestContText2	Show	UpdateStarted
-SetupProgress	DlgDesc	Show	ProgressType2="installed"
-SetupProgress	DlgDesc2	Show	ProgressType2="uninstalled"
-SetupProgress	DlgText	Show	ProgressType3="installs"
-SetupProgress	DlgText2	Show	ProgressType3="uninstalls"
-SetupProgress	DlgTitle	Show	ProgressType1="Installing"
-SetupProgress	DlgTitle2	Show	ProgressType1="Uninstalling"
-SetupResume	PreselectedText	Hide	RESUME
-SetupResume	PreselectedText	Show	NOT RESUME
-SetupResume	ResumeText	Hide	NOT RESUME
-SetupResume	ResumeText	Show	RESUME
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
deleted file mode 100644
index 49407d477..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
+++ /dev/null
@@ -1,139 +0,0 @@
-Dialog_	Control_	Event	Argument	Condition	Ordering
-s72	s50	s50	s255	S255	I2
-ControlEvent	Dialog_	Control_	Event	Argument	Condition
-AdminChangeFolder	Cancel	EndDialog	Return	1	2
-AdminChangeFolder	Cancel	Reset	0	1	1
-AdminChangeFolder	NewFolder	DirectoryListNew	0	1	0
-AdminChangeFolder	OK	EndDialog	Return	1	0
-AdminChangeFolder	OK	SetTargetPath	TARGETDIR	1	1
-AdminChangeFolder	Up	DirectoryListUp	0	1	0
-AdminNetworkLocation	Back	NewDialog	AdminWelcome	1	0
-AdminNetworkLocation	Browse	SpawnDialog	AdminChangeFolder	1	0
-AdminNetworkLocation	Cancel	SpawnDialog	CancelSetup	1	0
-AdminNetworkLocation	InstallNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	3
-AdminNetworkLocation	InstallNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	2
-AdminNetworkLocation	InstallNow	SetTargetPath	TARGETDIR	1	1
-AdminWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-AdminWelcome	Next	NewDialog	AdminNetworkLocation	1	0
-CancelSetup	No	EndDialog	Return	1	0
-CancelSetup	Yes	EndDialog	Exit	1	2
-CustomerInformation	Back	NewDialog	LicenseAgreement	1	1
-CustomerInformation	Cancel	SpawnDialog	CancelSetup	1	0
-CustomerInformation	Next	[ALLUSERS]	{}	ApplicationUsers = "OnlyCurrentUser" And Privileged	2
-CustomerInformation	Next	[ALLUSERS]	1	ApplicationUsers = "AllUsers" And Privileged	1
-CustomerInformation	Next	EndDialog	Exit	(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT<0) And (SERIALNUMVALRETURN<>SERIALNUMVALSUCCESSRETVAL)	3
-CustomerInformation	Next	NewDialog	SetupType	((Not SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))	4
-CustomSetup	Back	NewDialog	MaintenanceType	Installed	0
-CustomSetup	Back	NewDialog	SetupType	NOT Installed	0
-CustomSetup	Cancel	SpawnDialog	CancelSetup	1	0
-CustomSetup	ChangeFolder	SelectionBrowse	InstallChangeFolder	1	0
-CustomSetup	Details	SelectionBrowse	DiskSpaceRequirements	1	1
-CustomSetup	Help	SpawnDialog	CustomSetupTips	1	1
-CustomSetup	Next	[_IsSetupTypeMin]	Custom	1	0
-CustomSetup	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-CustomSetup	Next	NewDialog	ReadyToInstall	OutOfNoRbDiskSpace <> 1	0
-CustomSetupTips	OK	EndDialog	Return	1	1
-DatabaseFolder	Back	NewDialog	CustomerInformation	1	1
-DatabaseFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DatabaseFolder	ChangeFolder	[_BrowseProperty]	DATABASEDIR	1	2
-DatabaseFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
-DatabaseFolder	Next	NewDialog	SetupType	1	1
-DestinationFolder	Back	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-DestinationFolder	Back	NewDialog	InstallWelcome	HIDEEULA = 1	0
-DestinationFolder	Cancel	SpawnDialog	CancelSetup	1	1
-DestinationFolder	ChangeFolder	[_BrowseProperty]	INSTALLLOCATION	1	2
-DestinationFolder	ChangeFolder	SpawnDialog	InstallChangeFolder	1	1
-DestinationFolder	Next	NewDialog	ReadyToInstall	1	0
-DiskSpaceRequirements	OK	EndDialog	Return	1	0
-FilesInUse	Exit	EndDialog	Exit	1	0
-FilesInUse	Ignore	EndDialog	Ignore	1	0
-FilesInUse	Retry	EndDialog	Retry	1	0
-FileTypeDialog	Back	NewDialog	CustomSetup	Installed OR _IsSetupTypeMin = "Custom"	2
-FileTypeDialog	Back	NewDialog	SetupType	NOT Installed AND _IsSetupTypeMin <> "Custom"	1
-FileTypeDialog	Cancel	SpawnDialog	CancelSetup	1	0
-FileTypeDialog	Next	NewDialog	ReadyToInstall	1	0
-InstallChangeFolder	Cancel	EndDialog	Return	1	2
-InstallChangeFolder	Cancel	Reset	0	1	1
-InstallChangeFolder	NewFolder	DirectoryListNew	0	1	0
-InstallChangeFolder	OK	EndDialog	Return	1	3
-InstallChangeFolder	OK	SetTargetPath	[_BrowseProperty]	1	2
-InstallChangeFolder	Up	DirectoryListUp	0	1	0
-InstallWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	1
-InstallWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-InstallWelcome	Next	NewDialog	LicenseAgreement	HIDEEULA <> 1	0
-InstallWelcome	Next	NewDialog	DestinationFolder	HIDEEULA = 1	0
-LicenseAgreement	Back	NewDialog	InstallWelcome	1	0
-LicenseAgreement	Cancel	SpawnDialog	CancelSetup	1	0
-LicenseAgreement	Next	NewDialog	DestinationFolder	AgreeToLicense = "Yes"	0
-MaintenanceType	Back	NewDialog	MaintenanceWelcome	1	0
-MaintenanceType	Cancel	SpawnDialog	CancelSetup	1	0
-MaintenanceType	Next	[ProgressType0]	Modify	_IsMaintenance = "Change"	2
-MaintenanceType	Next	[ProgressType0]	Repair	_IsMaintenance = "Reinstall"	1
-MaintenanceType	Next	[ProgressType1]	Modifying	_IsMaintenance = "Change"	3
-MaintenanceType	Next	[ProgressType1]	Repairing	_IsMaintenance = "Reinstall"	4
-MaintenanceType	Next	[ProgressType2]	modified	_IsMaintenance = "Change"	6
-MaintenanceType	Next	[ProgressType2]	repairs	_IsMaintenance = "Reinstall"	5
-MaintenanceType	Next	[ProgressType3]	modifies	_IsMaintenance = "Change"	7
-MaintenanceType	Next	[ProgressType3]	repairs	_IsMaintenance = "Reinstall"	8
-MaintenanceType	Next	NewDialog	CustomSetup	_IsMaintenance = "Change"	12
-MaintenanceType	Next	NewDialog	ReadyToInstall	_IsMaintenance = "Reinstall"	13
-MaintenanceType	Next	NewDialog	ReadyToRemove	_IsMaintenance = "Remove"	11
-MaintenanceType	Next	Reinstall	ALL	_IsMaintenance = "Reinstall"	10
-MaintenanceType	Next	ReinstallMode	[ReinstallModeText]	_IsMaintenance = "Reinstall"	9
-MaintenanceWelcome	Cancel	SpawnDialog	CancelSetup	1	0
-MaintenanceWelcome	Next	NewDialog	MaintenanceType	1	0
-OutOfSpace	Resume	NewDialog	AdminNetworkLocation	ACTION = "ADMIN"	0
-OutOfSpace	Resume	NewDialog	DestinationFolder	ACTION <> "ADMIN"	0
-PatchWelcome	Back	NewDialog	SplashBitmap	Display_IsBitmapDlg	0
-PatchWelcome	Cancel	SpawnDialog	CancelSetup	1	1
-PatchWelcome	Next	EndDialog	Return	1	3
-PatchWelcome	Next	Reinstall	ALL	PATCH And REINSTALL=""	1
-PatchWelcome	Next	ReinstallMode	omus	PATCH And REINSTALLMODE=""	2
-ReadyToInstall	Back	NewDialog	DestinationFolder	Installed OR _IsSetupTypeMin = "Custom"	2
-ReadyToInstall	Back	NewDialog	DestinationFolder	Installed AND _IsMaintenance = "Reinstall"	3
-ReadyToInstall	Back	NewDialog	DestinationFolder	NOT Installed AND _IsSetupTypeMin <> "Custom"	1
-ReadyToInstall	Cancel	SpawnDialog	CancelSetup	1	0
-ReadyToInstall	InstallNow	[ProgressType1]	Installing	1	0
-ReadyToInstall	InstallNow	[ProgressType2]	installed	1	0
-ReadyToInstall	InstallNow	[ProgressType3]	installs	1	0
-ReadyToInstall	InstallNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
-ReadyToInstall	InstallNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-ReadyToRemove	Back	NewDialog	MaintenanceType	1	0
-ReadyToRemove	Cancel	SpawnDialog	CancelSetup	1	0
-ReadyToRemove	RemoveNow	[ProgressType1]	Uninstalling	1	0
-ReadyToRemove	RemoveNow	[ProgressType2]	uninstalled	1	0
-ReadyToRemove	RemoveNow	[ProgressType3]	uninstalls	1	0
-ReadyToRemove	RemoveNow	EndDialog	Return	OutOfNoRbDiskSpace <> 1	2
-ReadyToRemove	RemoveNow	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	2
-ReadyToRemove	RemoveNow	Remove	ALL	1	1
-SetupCompleteError	Back	[Suspend]	{}	1	1
-SetupCompleteError	Back	EndDialog	Return	1	2
-SetupCompleteError	Cancel	[Suspend]	1	1	1
-SetupCompleteError	Cancel	EndDialog	Return	1	2
-SetupCompleteError	Finish	EndDialog	Exit	1	2
-SetupCompleteSuccess	OK	DoAction	CheckForProductUpdates	ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And NOT ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL"	4
-SetupCompleteSuccess	OK	DoAction	CheckForProductUpdatesOnReboot	ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL"	5
-SetupCompleteSuccess	OK	EndDialog	Exit	1	2
-SetupError	A	EndDialog	ErrorAbort	1	0
-SetupError	C	EndDialog	ErrorCancel	1	0
-SetupError	I	EndDialog	ErrorIgnore	1	0
-SetupError	N	EndDialog	ErrorNo	1	0
-SetupError	O	EndDialog	ErrorOk	1	0
-SetupError	R	EndDialog	ErrorRetry	1	0
-SetupError	Y	EndDialog	ErrorYes	1	0
-SetupInitialization	Cancel	SpawnDialog	CancelSetup	1	0
-SetupInterrupted	Back	[Suspend]	{}	1	1
-SetupInterrupted	Back	EndDialog	Exit	1	2
-SetupInterrupted	Cancel	[Suspend]	1	1	1
-SetupInterrupted	Cancel	EndDialog	Exit	1	2
-SetupInterrupted	Finish	EndDialog	Exit	1	2
-SetupProgress	Cancel	SpawnDialog	CancelSetup	1	0
-SetupResume	Cancel	SpawnDialog	CancelSetup	1	0
-SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
-SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
-SetupType	Back	NewDialog	CustomerInformation	1	0
-SetupType	Cancel	SpawnDialog	CancelSetup	1	0
-SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
-SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	0
-SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
-SplashBitmap	Next	NewDialog	InstallWelcome	1	0
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ure/windows/msi_templates/CustomAc.idt
deleted file mode 100644
index ed030dc3e..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/CustomAc.idt
+++ /dev/null
@@ -1,10 +0,0 @@
-Action	Type	Source	Target
-s72	i2	S64	S255
-CustomAction	Action
-ISInitAllUsers	307	ALLUSERS	1
-setAllUsersProfile2K	51	ALLUSERSPROFILE	[%ALLUSERSPROFILE]
-SetAllUsersProfileNT	51	ALLUSERSPROFILE	[%SystemRoot]\Profiles\All Users
-setUserProfileNT	51	USERPROFILE	[%USERPROFILE]
-SetARPInstallLocation	51	ARPINSTALLLOCATION	[INSTALLLOCATION]
-SameProductFound	19		The same version of this product is already installed.
-NewProductFound	19		A newer version of [ProductName] was found. To install an older version, the newer version needs to be removed first.
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt
deleted file mode 100644
index 54a594fd9..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt
+++ /dev/null
@@ -1,33 +0,0 @@
-Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control_Default	Control_Cancel
-s72	i2	i2	i2	i2	I4	L128	s50	S50	S50
-Dialog	Dialog
-AdminChangeFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	TailText	OK	Cancel
-AdminNetworkLocation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	InstallNow	InstallNow	Cancel
-AdminWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-CancelSetup	50	50	260	85	3	[ProductName] [Setup]	No	No	No
-CustomerInformation	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	NameLabel	Next	Cancel
-CustomSetup	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	Tree	Next	Cancel
-CustomSetupTips	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-DatabaseFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-DestinationFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-DiskSpaceRequirements	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-FilesInUse	50	50	374	266	19	[ProductName] - [STR_INSTALLATION_WIZARD]	Retry	Retry	Exit
-FileTypeDialog	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	CheckBox1	Next	Cancel
-InstallChangeFolder	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	TailText	OK	Cancel
-InstallWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-LicenseAgreement	50	50	374	266	2	[ProductName] - [STR_INSTALLATION_WIZARD]	Agree	Next	Cancel
-MaintenanceType	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RadioGroup	Next	Cancel
-MaintenanceWelcome	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-OutOfSpace	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Resume	Resume	Resume
-PatchWelcome	50	50	374	266	3	[ProductName] Patch - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-ReadyToInstall	50	50	374	266	35	[ProductName] - [STR_INSTALLATION_WIZARD]	InstallNow	InstallNow	Cancel
-ReadyToRemove	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RemoveNow	RemoveNow	Cancel
-SetupCompleteError	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Finish	Finish	Finish
-SetupCompleteSuccess	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	OK	OK	OK
-SetupError	50	10	270	110	65543	[ProductName] Installerinformationen	ErrorText	O	C
-SetupInitialization	50	50	374	266	5	[ProductName] - [STR_INSTALLATION_WIZARD]	Cancel	Cancel	Cancel
-SetupInterrupted	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Finish	Finish	Finish
-SetupProgress	50	50	374	266	5	[ProductName] - [STR_INSTALLATION_WIZARD]	Cancel	Cancel	Cancel
-SetupResume	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
-SetupType	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	RadioGroup	Next	Cancel
-SplashBitmap	50	50	374	266	3	[ProductName] - [STR_INSTALLATION_WIZARD]	Next	Next	Cancel
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Error.idt b/instsetoo_native/inc_ure/windows/msi_templates/Error.idt
deleted file mode 100644
index 9789d0cf5..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Error.idt
+++ /dev/null
@@ -1,133 +0,0 @@
-Error	Message
-i2	L0
-WINDOWSENCODINGTEMPLATE	Error	Error
-0	OOO_ERROR_1
-1	OOO_ERROR_2
-2	OOO_ERROR_3 
-4	OOO_ERROR_4 
-5	OOO_ERROR_5
-7	OOO_ERROR_6
-8	OOO_ERROR_7
-9	OOO_ERROR_8
-10	OOO_ERROR_9
-11	OOO_ERROR_10
-12	OOO_ERROR_11
-13	OOO_ERROR_12
-14	OOO_ERROR_13
-15	OOO_ERROR_14
-16	OOO_ERROR_15
-17	OOO_ERROR_16
-18	OOO_ERROR_17
-19	OOO_ERROR_18
-20	OOO_ERROR_19
-21	OOO_ERROR_20
-22	OOO_ERROR_21
-23	OOO_ERROR_22
-32	OOO_ERROR_23
-33	OOO_ERROR_24
-1101	OOO_ERROR_25
-1301	OOO_ERROR_26
-1302	OOO_ERROR_27
-1303	OOO_ERROR_28
-1304	OOO_ERROR_29
-1305	OOO_ERROR_30
-1306	OOO_ERROR_31.
-1307	OOO_ERROR_32
-1308	OOO_ERROR_33
-1309	OOO_ERROR_34
-1310	OOO_ERROR_35
-1311	OOO_ERROR_36
-1312	OOO_ERROR_37
-1313	OOO_ERROR_38
-1314	OOO_ERROR_39
-1315	OOO_ERROR_40
-1316	OOO_ERROR_41.
-1317	OOO_ERROR_42
-1318	OOO_ERROR_43
-1319	OOO_ERROR_44
-1320	OOO_ERROR_45
-1321	OOO_ERROR_46
-1322	OOO_ERROR_47
-1323	OOO_ERROR_48
-1324	OOO_ERROR_49
-1325	OOO_ERROR_50
-1326	OOO_ERROR_51
-1327	OOO_ERROR_52
-1328	OOO_ERROR_53
-1401	OOO_ERROR_54 
-1402	OOO_ERROR_55 
-1403	OOO_ERROR_56 
-1404	OOO_ERROR_57 
-1405	OOO_ERROR_58 
-1406	OOO_ERROR_59
-1407	OOO_ERROR_60
-1408	OOO_ERROR_61 
-1409	OOO_ERROR_62
-1410	OOO_ERROR_63
-1500	OOO_ERROR_64
-1501	OOO_ERROR_65
-1502	OOO_ERROR_66
-1503	OOO_ERROR_67
-1601	OOO_ERROR_68
-1602	OOO_ERROR_69
-1603	OOO_ERROR_70
-1604	OOO_ERROR_71
-1605	OOO_ERROR_72
-1606	OOO_ERROR_73
-1607	OOO_ERROR_74
-1608	OOO_ERROR_75
-1701	OOO_ERROR_76
-1702	OOO_ERROR_77
-1703	OOO_ERROR_78
-1704	OOO_ERROR_79
-1705	OOO_ERROR_80
-1706	OOO_ERROR_81
-1707	OOO_ERROR_82
-1708	OOO_ERROR_83
-1709	OOO_ERROR_84
-1710	OOO_ERROR_85
-1711	OOO_ERROR_86
-1712	OOO_ERROR_87
-1713	OOO_ERROR_88
-1714	OOO_ERROR_89
-1801	OOO_ERROR_90
-1802	OOO_ERROR_91
-1803	OOO_ERROR_92
-1804	OOO_ERROR_93
-1805	OOO_ERROR_94
-1806	OOO_ERROR_95
-1807	OOO_ERROR_96
-1901	OOO_ERROR_97
-1902	OOO_ERROR_98
-1903	OOO_ERROR_99
-1904	OOO_ERROR_100.
-1905	OOO_ERROR_101
-1906	OOO_ERROR_102
-1907	OOO_ERROR_103
-1908	OOO_ERROR_104
-1909	OOO_ERROR_105
-1910	OOO_ERROR_106
-1911	OOO_ERROR_107
-1912	OOO_ERROR_108
-1913	OOO_ERROR_109
-1914	OOO_ERROR_110
-1915	OOO_ERROR_111
-1916	OOO_ERROR_112
-1917	OOO_ERROR_113
-1918	OOO_ERROR_114
-1919	OOO_ERROR_115
-1920	OOO_ERROR_116
-1921	OOO_ERROR_117
-1922	OOO_ERROR_118
-1923	OOO_ERROR_119
-1924	OOO_ERROR_120
-1925	OOO_ERROR_121
-1926	OOO_ERROR_122
-1927	OOO_ERROR_123
-1928	OOO_ERROR_124
-1929	OOO_ERROR_125
-1930	OOO_ERROR_126
-1931	OOO_ERROR_127
-1932	OOO_ERROR_128
-1933	OOO_ERROR_129
-1934	OOO_ERROR_130
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/EventMap.idt b/instsetoo_native/inc_ure/windows/msi_templates/EventMap.idt
deleted file mode 100644
index 794eaf1a5..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/EventMap.idt
+++ /dev/null
@@ -1,18 +0,0 @@
-Dialog_	Control_	Event	Attribute
-s72	s50	s50	s50
-EventMapping	Dialog_	Control_	Event
-CustomSetup	ItemDescription	SelectionDescription	Text
-CustomSetup	Location	SelectionPath	Text
-CustomSetup	Size	SelectionSize	Text
-SetupInitialization	ActionData	ActionData	Text
-SetupInitialization	ActionText	ActionText	Text
-SetupProgress	ActionProgress95	AdminInstallFinalize	Progress
-SetupProgress	ActionProgress95	InstallFiles	Progress
-SetupProgress	ActionProgress95	MoveFiles	Progress
-SetupProgress	ActionProgress95	RemoveFiles	Progress
-SetupProgress	ActionProgress95	RemoveRegistryValues	Progress
-SetupProgress	ActionProgress95	SetProgress	Progress
-SetupProgress	ActionProgress95	UnmoveFiles	Progress
-SetupProgress	ActionProgress95	WriteIniValues	Progress
-SetupProgress	ActionProgress95	WriteRegistryValues	Progress
-SetupProgress	ActionText	ActionText	Text
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt
deleted file mode 100644
index c1de8e4a1..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt
+++ /dev/null
@@ -1,74 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-InstallExecuteSequence	Action
-AllocateRegistrySpace	NOT Installed	750
-AppSearch		25
-BindImage		2100
-CCPSearch	CCP_TEST	200
-CostFinalize		500
-CostInitialize		350
-CreateFolders		1850
-CreateShortcuts		2150
-DeleteServices	VersionNT	1000
-DuplicateFiles		2050
-FileCost		400
-FindRelatedProducts	NOT ISSETUPDRIVEN	100
-InstallFiles		1950
-InstallFinalize		3150
-InstallInitialize		700
-InstallODBC		2600
-InstallServices	VersionNT	2750
-InstallValidate		650
-ISInitAllUsers	VersionNT And NOT Installed And Privileged	525
-IsolateComponents		450
-LaunchConditions		50
-MigrateFeatureStates		600
-MoveFiles		1900
-MsiPublishAssemblies		3025
-MsiUnpublishAssemblies		875
-NewProductFound	NEWPRODUCTS	110
-PatchFiles		2000
-ProcessComponents		800
-PublishComponents		3000
-PublishFeatures		3050
-PublishProduct		3100
-RegisterClassInfo		2200
-RegisterComPlus		2700
-RegisterExtensionInfo		2250
-RegisterFonts		2550
-RegisterMIMEInfo		2350
-RegisterProduct		2950
-RegisterProgIdInfo		2300
-RegisterTypeLibraries		2650
-RegisterUser		2900
-RemoveDuplicateFiles		1700
-RemoveEnvironmentStrings		1650
-RemoveExistingProducts		675
-RemoveFiles		1750
-RemoveFolders		1800
-RemoveIniValues		1550
-RemoveODBC		1200
-RemoveRegistryValues		1300
-RemoveShortcuts		1600
-RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	250
-SameProductFound	SAMEPRODUCTS	120
-ScheduleReboot	ISSCHEDULEREBOOT	3125
-SelfRegModules		2850
-SelfUnregModules		1100
-SetARPInstallLocation	Not Installed	990
-SetODBCFolders		550
-StartServices	VersionNT	2800
-StopServices	VersionNT	950
-UnpublishComponents		850
-UnpublishFeatures		900
-UnregisterClassInfo		1350
-UnregisterComPlus		1050
-UnregisterExtensionInfo		1400
-UnregisterFonts		1250
-UnregisterMIMEInfo		1500
-UnregisterProgIdInfo		1450
-UnregisterTypeLibraries		1150
-ValidateProductID		300
-WriteEnvironmentStrings		2500
-WriteIniValues		2450
-WriteRegistryValues		2400
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_ure/windows/msi_templates/InstallU.idt
deleted file mode 100644
index 135987f10..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/InstallU.idt
+++ /dev/null
@@ -1,31 +0,0 @@
-Action	Condition	Sequence
-s72	S255	I2
-InstallUISequence	Action
-AppSearch		25
-CCPSearch	CCP_TEST	250
-CostFinalize		550
-CostInitialize		400
-ExecuteAction		850
-FileCost		450
-FindRelatedProducts		150
-InstallWelcome	Not Installed	650
-ISInitAllUsers	VersionNT And NOT Installed And Privileged	575
-IsolateComponents		500
-LaunchConditions		50
-MaintenanceWelcome	Installed And Not RESUME And Not Preselected And Not PATCH	750
-MigrateFeatureStates		600
-NewProductFound	NEWPRODUCTS	160
-PatchWelcome	Installed And PATCH And Not IS_MAJOR_UPGRADE	625
-ResolveSource	Not Installed And Not PATCH	525
-RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	300
-SameProductFound	SAMEPRODUCTS	170
-setAllUsersProfile2K	VersionNT >= 500	512
-SetAllUsersProfileNT	VersionNT = 400	511
-SetupCompleteError		-3
-SetupCompleteSuccess		-1
-SetupInitialization		100
-SetupInterrupted		-2
-SetupProgress		800
-SetupResume	Installed And (RESUME Or Preselected) And Not PATCH	700
-setUserProfileNT	VersionNT	510
-ValidateProductID		350
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_ure/windows/msi_templates/LaunchCo.idt
deleted file mode 100644
index 35d78694a..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/LaunchCo.idt
+++ /dev/null
@@ -1,4 +0,0 @@
-Condition	Description
-s255	l255
-WINDOWSENCODINGTEMPLATE	LaunchCondition	Condition
-Privileged	OOO_LAUNCH_1
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ListBox.idt b/instsetoo_native/inc_ure/windows/msi_templates/ListBox.idt
deleted file mode 100644
index e62653df9..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/ListBox.idt
+++ /dev/null
@@ -1,3 +0,0 @@
-Property	Order	Value	Text
-s72	i2	s64	L64
-ListBox	Property	Order
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Property.idt b/instsetoo_native/inc_ure/windows/msi_templates/Property.idt
deleted file mode 100644
index e296bb754..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Property.idt
+++ /dev/null
@@ -1,57 +0,0 @@
-Property	Value
-s72	l0
-WINDOWSENCODINGTEMPLATE	Property	Property
-_IsMaintenance	Change
-_IsSetupTypeMin	Typical
-AgreeToLicense	No
-ALLUSERS	2
-ApplicationUsers	AllUsers
-ARPCOMMENTS	ARPCOMMENTSTEMPLATE
-ARPCONTACT	OOO_ARPCONTACTTEMPLATE
-ARPHELPLINK	OOO_ARPHELPLINKTEMPLATE
-ARPHELPTELEPHONE	OOO_ARPHELPTELEPHONETEMPLATE
-ARPURLINFOABOUT	OOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO	OOO_ARPURLUPDATEINFOTEMPLATE
-ARPNOREPAIR	1
-ARPNOMODIFY	1
-DefaultUIFont	Tahoma8
-DialogCaption	Windows Installer
-DiskPrompt	[1]
-Display_IsBitmapDlg	1
-DisplayNameCustom	IDPROP_SETUPTYPE_CUSTOM
-DisplayNameMinimal	IDPROP_SETUPTYPE_COMPACT
-DisplayNameTypical	IDPROP_SETUPTYPE_TYPICAL
-DWUSINTERVAL	30
-ErrorDialog	SetupError
-InstallChoice	AR
-INSTALLLEVEL	INSTALLLEVELTEMPLATE
-ISCHECKFORPRODUCTUPDATES	ISCHECKFORPRODUCTUPDATESTEMPLATE
-ISSCRIPT_VERSION_MISSING	IDS_ISSCRIPT_VERSION_MISSING
-ISSCRIPT_VERSION_OLD	IDS_ISSCRIPT_VERSION_OLD
-ISVROOT_PORT_NO	0
-Manufacturer	MANUFACTURERTEMPLATE
-PIDTemplate	12345<###-%%%%%%%>@@@@@
-ProductCode	PRODUCTCODETEMPLATE
-ProductID	none
-ProductLanguage	PRODUCTLANGUAGETEMPLATE
-ProductName	PRODUCTNAMETEMPLATE
-ProductVersion	PRODUCTVERSIONTEMPLATE
-ProgressType0	install
-ProgressType1	Installing
-ProgressType2	installed
-ProgressType3	installs
-RebootYesNo	Yes
-ReinstallModeText	omus
-SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
-SetupType	Typical
-STR_NEW_DISPLAY_NAME	OOO_STR_NEW_DISPLAY_NAME
-STR_EDIT	OOO_STR_EDIT
-STR_MS_WORD_DOCUMENT	OOO_STR_MS_WORD_DOCUMENT
-STR_MS_WORD_TEMPLATE	OOO_STR_MS_WORD_TEMPLATE
-STR_MS_EXCEL_WORKSHEET	OOO_STR_MS_EXCEL_WORKSHEET
-STR_MS_EXCEL_TEMPLATE	OOO_STR_MS_EXCEL_TEMPLATE
-STR_MS_POWERPOINT_PRESENTATION	OOO_STR_MS_POWERPOINT_PRESENTATION
-STR_MS_POWERPOINT_TEMPLATE	OOO_STR_MS_POWERPOINT_TEMPLATE
-STR_MS_POWERPOINT_SHOW	OOO_STR_MS_POWERPOINT_SHOW
-STR_INSTALLATION_WIZARD	OOO_STR_INSTALLATION_WIZARD
-UpgradeCode	UPGRADECODETEMPLATE
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_ure/windows/msi_templates/RadioBut.idt
deleted file mode 100644
index e1d000070..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/RadioBut.idt
+++ /dev/null
@@ -1,12 +0,0 @@
-Property	Order	Value	X	Y	Width	Height	Text	Help
-s72	i2	s64	i2	i2	i2	i2	L64	L50
-WINDOWSENCODINGTEMPLATE	RadioButton	Property	Order
-_IsMaintenance	1	Change	0	0	290	14	OOO_RADIOBUTTON_1	
-_IsMaintenance	2	Reinstall	0	60	290	14	OOO_RADIOBUTTON_2	
-_IsMaintenance	3	Remove	0	120	290	14	OOO_RADIOBUTTON_3	
-_IsSetupTypeMin	1	Typical	0	0	264	14	OOO_RADIOBUTTON_4	
-_IsSetupTypeMin	2	Custom	0	60	264	14	OOO_RADIOBUTTON_5	
-AgreeToLicense	1	No	0	15	295	15	OOO_RADIOBUTTON_6	
-AgreeToLicense	2	Yes	0	0	295	15	OOO_RADIOBUTTON_7	
-ApplicationUsers	1	AllUsers	1	7	290	14	OOO_RADIOBUTTON_8	
-ApplicationUsers	2	OnlyCurrentUser	1	23	290	14	OOO_RADIOBUTTON_9	
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_ure/windows/msi_templates/RegLocat.idt
deleted file mode 100644
index 097349ae3..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/RegLocat.idt
+++ /dev/null
@@ -1,3 +0,0 @@
-Signature_	Root	Key	Name	Type
-s72	i2	s255	S255	I2
-RegLocator	Signature_
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Signatur.idt b/instsetoo_native/inc_ure/windows/msi_templates/Signatur.idt
deleted file mode 100644
index 5004a5586..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/Signatur.idt
+++ /dev/null
@@ -1,3 +0,0 @@
-Signature	FileName	MinVersion	MaxVersion	MinSize	MaxSize	MinDate	MaxDate	Languages
-s72	s255	S20	S20	I4	I4	I4	I4	S255
-Signature	Signature
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/TextStyl.idt b/instsetoo_native/inc_ure/windows/msi_templates/TextStyl.idt
deleted file mode 100644
index b4575c15d..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/TextStyl.idt
+++ /dev/null
@@ -1,25 +0,0 @@
-TextStyle	FaceName	Size	Color	StyleBits
-s72	s32	i2	I4	I2
-TextStyle	TextStyle
-Arial8	Arial	8		
-Arial9	Arial	9		
-ArialBlue10	Arial	10	16711680	
-ArialBlueStrike10	Arial	10	16711680	8
-CourierNew8	Courier New	8		
-CourierNew9	Courier New	9		
-MSGothic9	MS Gothic	9		
-MSSansBold8	Tahoma	8		1
-MSSansSerif8	MS Sans Serif	8		
-MSSansSerif9	MS Sans Serif	9		
-MSSGreySerif8	MS Sans Serif	8	8421504	
-MSSWhiteSerif8	Tahoma	8	16777215	
-Tahoma10	Tahoma	10		
-Tahoma8	Tahoma	8		
-Tahoma9	Tahoma	9		
-TahomaBold10	Tahoma	10		1
-TahomaBold8	Tahoma	8		1
-Times8	Times New Roman	8		
-Times9	Times New Roman	9		
-TimesItalic12	Times New Roman	12		2
-TimesItalicBlue10	Times New Roman	10	16711680	2
-TimesRed16	Times New Roman	16	255	
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/UIText.idt b/instsetoo_native/inc_ure/windows/msi_templates/UIText.idt
deleted file mode 100644
index ea581bff4..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/UIText.idt
+++ /dev/null
@@ -1,53 +0,0 @@
-Key	Text
-s72	L255
-WINDOWSENCODINGTEMPLATE	UIText	Key
-AbsentPath	
-bytes	OOO_UITEXT_1
-GB	OOO_UITEXT_2
-KB	OOO_UITEXT_3
-MB	OOO_UITEXT_4
-MenuAbsent	OOO_UITEXT_5
-MenuAdvertise	OOO_UITEXT_6
-MenuAllCD	OOO_UITEXT_7
-MenuAllLocal	OOO_UITEXT_8
-MenuAllNetwork	OOO_UITEXT_9
-MenuCD	OOO_UITEXT_10
-MenuLocal	OOO_UITEXT_11
-MenuNetwork	OOO_UITEXT_12
-NewFolder	OOO_UITEXT_13
-SelAbsentAbsent	OOO_UITEXT_14
-SelAbsentAdvertise	OOO_UITEXT_15
-SelAbsentCD	OOO_UITEXT_16
-SelAbsentLocal	OOO_UITEXT_17
-SelAbsentNetwork	OOO_UITEXT_18
-SelAdvertiseAbsent	OOO_UITEXT_19
-SelAdvertiseAdvertise	OOO_UITEXT_20
-SelAdvertiseCD	OOO_UITEXT_21
-SelAdvertiseLocal	OOO_UITEXT_22
-SelAdvertiseNetwork	OOO_UITEXT_23
-SelCDAbsent	OOO_UITEXT_24
-SelCDAdvertise	OOO_UITEXT_25
-SelCDCD	OOO_UITEXT_26
-SelCDLocal	OOO_UITEXT_27
-SelChildCostNeg	OOO_UITEXT_28
-SelChildCostPos	OOO_UITEXT_29
-SelCostPending	OOO_UITEXT_30
-SelLocalAbsent	OOO_UITEXT_31
-SelLocalAdvertise	OOO_UITEXT_32
-SelLocalCD	OOO_UITEXT_33
-SelLocalLocal	OOO_UITEXT_34
-SelLocalNetwork	OOO_UITEXT_35
-SelNetworkAbsent	OOO_UITEXT_36
-SelNetworkAdvertise	OOO_UITEXT_37
-SelNetworkLocal	OOO_UITEXT_38
-SelNetworkNetwork	OOO_UITEXT_39
-SelParentCostNegNeg	OOO_UITEXT_40
-SelParentCostNegPos	OOO_UITEXT_41
-SelParentCostPosNeg	OOO_UITEXT_42
-SelParentCostPosPos	OOO_UITEXT_43
-TimeRemaining	OOO_UITEXT_44
-VolumeCostAvailable	OOO_UITEXT_45
-VolumeCostDifference	OOO_UITEXT_46
-VolumeCostRequired	OOO_UITEXT_47
-VolumeCostSize	OOO_UITEXT_48
-VolumeCostVolume	OOO_UITEXT_49
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt
deleted file mode 100644
index 4098f92c3..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt
+++ /dev/null
@@ -1,461 +0,0 @@
-Table	Column	Nullable	MinValue	MaxValue	KeyTable	KeyColumn	Category	Set	Description
-s32	s32	s4	I4	I4	S255	I2	S32	S255	S255
-_Validation	Table	Column
-_Validation	Category	Y						Text;Formatted;Template;Condition;Guid;Path;Version;Language;Identifier;Binary;UpperCase;LowerCase;Filename;Paths;AnyPath;WildCardFilename;RegPath;KeyFormatted;CustomSource;Property;Cabinet;Shortcut;URL	String category
-_Validation	Column	N					Identifier		Name of column
-_Validation	Description	Y					Text		Description of column
-_Validation	KeyColumn	Y	1	32					Column to which foreign key connects
-_Validation	KeyTable	Y					Identifier		For foreign key, Name of table to which data must link
-_Validation	MaxValue	Y	-2147483647	2147483647					Maximum value allowed
-_Validation	MinValue	Y	-2147483647	2147483647					Minimum value allowed
-_Validation	Nullable	N						Y;N	Whether the column is nullable
-_Validation	Set	Y					Text		Set of values that are permitted
-_Validation	Table	N					Identifier		Name of table
-ActionText	Action	N					Identifier		Name of action to be described.
-ActionText	Description	Y					Text		Localized description displayed in progress dialog and log when action is executing.
-ActionText	Template	Y					Template		Optional localized format template used to format action data records for display during action execution.
-AdminExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdminExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdminExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdminUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdminUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdminUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdvtExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdvtExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdvtExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AdvtUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-AdvtUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-AdvtUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-AppId	ActivateAtStorage	Y	0	1					
-AppId	AppId	N					Guid		
-AppId	DllSurrogate	Y					Text		
-AppId	LocalService	Y					Text		
-AppId	RemoteServerName	Y					Formatted		
-AppId	RunAsInteractiveUser	Y	0	1					
-AppId	ServiceParameters	Y					Text		
-AppSearch	Property	N					Identifier		The property associated with a Signature
-AppSearch	Signature_	N			Signature;RegLocator;IniLocator;DrLocator;CompLocator	1	Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables.
-BBControl	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this control.
-BBControl	BBControl	N					Identifier		Name of the control. This name must be unique within a billboard, but can repeat on different billboard.
-BBControl	Billboard_	N			Billboard	1	Identifier		External key to the Billboard table, name of the billboard.
-BBControl	Height	N	0	32767					Height of the bounding rectangle of the control.
-BBControl	Text	Y					Text		A string used to set the initial text contained within a control (if appropriate).
-BBControl	Type	N					Identifier		The type of the control.
-BBControl	Width	N	0	32767					Width of the bounding rectangle of the control.
-BBControl	X	N	0	32767					Horizontal coordinate of the upper left corner of the bounding rectangle of the control.
-BBControl	Y	N	0	32767					Vertical coordinate of the upper left corner of the bounding rectangle of the control.
-Billboard	Action	Y					Identifier		The name of an action. The billboard is displayed during the progress messages received from this action.
-Billboard	Billboard	N					Identifier		Name of the billboard.
-Billboard	Feature_	N			Feature	1	Identifier		An external key to the Feature Table. The billboard is shown only if this feature is being installed.
-Billboard	Ordering	Y	0	32767					A positive integer. If there is more than one billboard corresponding to an action they will be shown in the order defined by this column.
-Binary	Data	N					Binary		The unformatted binary data.
-Binary	Name	N					Identifier		Unique key identifying the binary data.
-BindImage	File_	N			File	1	Identifier		The index into the File table. This must be an executable file.
-BindImage	Path	Y					Paths		A list of ;  delimited paths that represent the paths to be searched for the import DLLS. The list is usually a list of properties each enclosed within square brackets [] .
-CCPSearch	Signature_	N			Signature;RegLocator;IniLocator;DrLocator;CompLocator	1	Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature,  RegLocator, IniLocator, CompLocator and the DrLocator tables.
-CheckBox	Property	N					Identifier		A named property to be tied to the item.
-CheckBox	Value	Y					Formatted		The value string associated with the item.
-Class	AppId_	Y			AppId	1	Guid		Optional AppID containing DCOM information for associated application (string GUID).
-Class	Argument	Y					Formatted		optional argument for LocalServers.
-Class	Attributes	Y		32767					Class registration attributes.
-Class	CLSID	N					Guid		The CLSID of an OLE factory.
-Class	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-Class	Context	N					Identifier		The numeric server context for this server. CLSCTX_xxxx
-Class	DefInprocHandler	Y					Filename	1;2;3	Optional default inproc handler.  Only optionally provided if Context=CLSCTX_LOCAL_SERVER.  Typically "ole32.dll" or "mapi32.dll"
-Class	Description	Y					Text		Localized description for the Class.
-Class	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational.
-Class	FileTypeMask	Y					Text		Optional string containing information for the HKCRthis CLSID) key. If multiple patterns exist, they must be delimited by a semicolon, and numeric subkeys will be generated: 0,1,2...
-Class	Icon_	Y			Icon	1	Identifier		Optional foreign key into the Icon Table, specifying the icon file associated with this CLSID. Will be written under the DefaultIcon key.
-Class	IconIndex	Y	-32767	32767					Optional icon index.
-Class	ProgId_Default	Y			ProgId	1	Text		Optional ProgId associated with this CLSID.
-ComboBox	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list.The integers do not have to be consecutive.
-ComboBox	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same combobox.
-ComboBox	Text	Y					Formatted		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ComboBox	Value	N					Formatted		The value string associated with this item. Selecting the line will set the associated property to this value.
-CompLocator	ComponentId	N					Guid		A string GUID unique to this component, version, and language.
-CompLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-CompLocator	Type	Y	0	1					A boolean value that determines if the registry value is a filename or a directory location.
-Complus	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the ComPlus component.
-Complus	ExpType	Y	0	32767					ComPlus component attributes.
-Component	Attributes	N							Remote execution option, one of irsEnum
-Component	Component	N					Identifier		Primary key used to identify a particular component record.
-Component	ComponentId	Y					Guid		A string GUID unique to this component, version, and language.
-Component	Condition	Y					Condition		A conditional statement that will disable this component if the specified condition evaluates to the 'True' state. If a component is disabled, it will not be installed, regardless of the 'Action' state associated with the component.
-Component	Directory_	N			Directory	1	Identifier		Required key of a Directory table record. This is actually a property name whose value contains the actual path, set either by the AppSearch action or with the default setting obtained from the Directory table.
-Component	KeyPath	Y			File;Registry;ODBCDataSource	1	Identifier		Either the primary key into the File table, Registry table, or ODBCDataSource table. This extract path is stored when the component is installed, and is used to detect the presence of the component and to return the path to it.
-Condition	Condition	Y					Condition		Expression evaluated to determine if Level in the Feature table is to change.
-Condition	Feature_	N			Feature	1	Identifier		Reference to a Feature entry in Feature table.
-Condition	Level	N	0	32767					New selection Level to set in Feature table if Condition evaluates to TRUE.
-Control	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this control.
-Control	Control	N					Identifier		Name of the control. This name must be unique within a dialog, but can repeat on different dialogs. 
-Control	Control_Next	Y			Control	2	Identifier		The name of an other control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!
-Control	Dialog_	N			Dialog	1	Identifier		External key to the Dialog table, name of the dialog.
-Control	Height	N	0	32767					Height of the bounding rectangle of the control.
-Control	Help	Y					Text		The help strings used with the button. The text is optional. 
-Control	Property	Y					Identifier		The name of a defined property to be linked to this control. 
-Control	Text	Y					Formatted		A string used to set the initial text contained within a control (if appropriate).
-Control	Type	N					Identifier		The type of the control.
-Control	Width	N	0	32767					Width of the bounding rectangle of the control.
-Control	X	N	0	32767					Horizontal coordinate of the upper left corner of the bounding rectangle of the control.
-Control	Y	N	0	32767					Vertical coordinate of the upper left corner of the bounding rectangle of the control.
-ControlCondition	Action	N						Default;Disable;Enable;Hide;Show	The desired action to be taken on the specified control.
-ControlCondition	Condition	N					Condition		A standard conditional statement that specifies under which conditions the action should be triggered.
-ControlCondition	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control.
-ControlCondition	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the dialog.
-ControlEvent	Argument	N					Formatted		A value to be used as a modifier when triggering a particular event.
-ControlEvent	Condition	Y					Condition		A standard conditional statement that specifies under which conditions an event should be triggered.
-ControlEvent	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control
-ControlEvent	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the dialog.
-ControlEvent	Event	N					Formatted		An identifier that specifies the type of the event that should take place when the user interacts with control specified by the first two entries.
-ControlEvent	Ordering	Y	0	2147483647					An integer used to order several events tied to the same control. Can be left blank.
-CreateFolder	Component_	N			Component	1	Identifier		Foreign key into the Component table.
-CreateFolder	Directory_	N			Directory	1	Identifier		Primary key, could be foreign key into the Directory table.
-CustomAction	Action	N					Identifier		Primary key, name of action, normally appears in sequence table unless private use.
-CustomAction	Source	Y					CustomSource		The table reference of the source of the code.
-CustomAction	Target	Y					Formatted		Excecution parameter, depends on the type of custom action
-CustomAction	Type	N	1	32767					The numeric custom action type, consisting of source location, code type, entry, option flags.
-Dialog	Attributes	Y	0	2147483647					A 32-bit word that specifies the attribute flags to be applied to this dialog.
-Dialog	Control_Cancel	Y			Control	2	Identifier		Defines the cancel control. Hitting escape or clicking on the close icon on the dialog is equivalent to pushing this button.
-Dialog	Control_Default	Y			Control	2	Identifier		Defines the default control. Hitting return is equivalent to pushing this button.
-Dialog	Control_First	N			Control	2	Identifier		Defines the control that has the focus when the dialog is created.
-Dialog	Dialog	N					Identifier		Name of the dialog.
-Dialog	HCentering	N	0	100					Horizontal position of the dialog on a 0-100 scale. 0 means left end, 100 means right end of the screen, 50 center.
-Dialog	Height	N	0	32767					Height of the bounding rectangle of the dialog.
-Dialog	Title	Y					Formatted		A text string specifying the title to be displayed in the title bar of the dialog's window.
-Dialog	VCentering	N	0	100					Vertical position of the dialog on a 0-100 scale. 0 means top end, 100 means bottom end of the screen, 50 center.
-Dialog	Width	N	0	32767					Width of the bounding rectangle of the dialog.
-Directory	DefaultDir	N					DefaultDir		The default sub-path under parent's path.
-Directory	Directory	N					Identifier		Unique identifier for directory entry, primary key. If a property by this name is defined, it contains the full path to the directory.
-Directory	Directory_Parent	Y			Directory	1	Identifier		Reference to the entry in this table specifying the default parent directory. A record parented to itself or with a Null parent represents a root of the install tree.
-DrLocator	Depth	Y	0	32767					The depth below the path to which the Signature_ is recursively searched. If absent, the depth is assumed to be 0.
-DrLocator	Parent	Y					Identifier		The parent file signature. It is also a foreign key in the Signature table. If null and the Path column does not expand to a full path, then all the fixed drives of the user system are searched using the Path.
-DrLocator	Path	Y					AnyPath		The path on the user system. This is a either a subpath below the value of the Parent or a full path. The path may contain properties enclosed within [ ] that will be expanded.
-DrLocator	Signature_	N					Identifier		The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-DuplicateFile	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the duplicate file.
-DuplicateFile	DestFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full pathname to a destination folder.
-DuplicateFile	DestName	Y					Filename		Filename to be given to the duplicate file.
-DuplicateFile	File_	N			File	1	Identifier		Foreign key referencing the source file to be duplicated.
-DuplicateFile	FileKey	N					Identifier		Primary key used to identify a particular file entry
-Environment	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the environmental value.
-Environment	Environment	N					Identifier		Unique identifier for the environmental variable setting
-Environment	Name	N					Text		The name of the environmental value.
-Environment	Value	Y					Formatted		The value to set in the environmental settings.
-Error	Error	N	0	32767					Integer error number, obtained from header file IError(...) macros.
-Error	Message	Y					Template		Error formatting template, obtained from user ed. or localizers.
-EventMapping	Attribute	N					Identifier		The name of the control attribute, that is set when this event is received.
-EventMapping	Control_	N			Control	2	Identifier		A foreign key to the Control table, name of the control.
-EventMapping	Dialog_	N			Dialog	1	Identifier		A foreign key to the Dialog table, name of the Dialog.
-EventMapping	Event	N					Identifier		An identifier that specifies the type of the event that the control subscribes to.
-Extension	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-Extension	Extension	N					Text		The extension associated with the table row.
-Extension	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the CLSID factory to be operational.
-Extension	MIME_	Y			MIME	1	Text		Optional Context identifier, typically "type/format" associated with the extension
-Extension	ProgId_	Y			ProgId	1	Text		Optional ProgId associated with this extension.
-Feature	Attributes	N						0;1;2;4;5;6;8;9;10;16;17;18;20;21;22;24;25;26;32;33;34;36;37;38;48;49;50;52;53;54	Feature attributes
-Feature	Description	Y					Text		Longer descriptive text describing a visible feature item.
-Feature	Directory_	Y			Directory	1	UpperCase		The name of the Directory that can be configured by the UI. A non-null value will enable the browse button.
-Feature	Display	Y	0	32767					Numeric sort order, used to force a specific display ordering.
-Feature	Feature	N					Identifier		Primary key used to identify a particular feature record.
-Feature	Feature_Parent	Y			Feature	1	Identifier		Optional key of a parent record in the same table. If the parent is not selected, then the record will not be installed. Null indicates a root item.
-Feature	Level	N	0	32767					The install level at which record will be initially selected. An install level of 0 will disable an item and prevent its display.
-Feature	Title	Y					Text		Short text identifying a visible feature item.
-FeatureComponents	Component_	N			Component	1	Identifier		Foreign key into Component table.
-FeatureComponents	Feature_	N			Feature	1	Identifier		Foreign key into Feature table.
-File	Attributes	Y	0	32767					Integer containing bit flags representing file attributes (with the decimal value of each bit position in parentheses)
-File	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the file.
-File	File	N					Identifier		Primary key, non-localized token, must match identifier in cabinet.  For uncompressed files, this field is ignored.
-File	FileName	N					Filename		File name used for installation, may be localized.  This may contain a "short name|long name" pair.
-File	FileSize	N	0	2147483647					Size of file in bytes (long integer).
-File	Language	Y					Language		List of decimal language Ids, comma-separated if more than one.
-File	Sequence	N	1	2147483647					Sequence with respect to the media images; order must track cabinet order.
-File	Version	Y			File	1	Version		Version string for versioned files;  Blank for unversioned files.
-FileSFPCatalog	File_	N			File	1	Identifier		File associated with the catalog
-FileSFPCatalog	SFPCatalog_	N			SFPCatalog	1	Filename		Catalog associated with the file
-Font	File_	N			File	1	Identifier		Primary key, foreign key into File table referencing font file.
-Font	FontTitle	Y					Text		Font name.
-Icon	Data	N					Binary		Binary stream. The binary icon data in PE (.DLL or .EXE) or icon (.ICO) format.
-Icon	Name	N					Identifier		Primary key. Name of the icon file.
-IniFile	Action	N						0;1;3	The type of modification to be made, one of iifEnum
-IniFile	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the .INI value.
-IniFile	DirProperty	Y					Identifier		Foreign key into the Directory table denoting the directory where the .INI file is.
-IniFile	FileName	N					Filename		The .INI file name in which to write the information
-IniFile	IniFile	N					Identifier		Primary key, non-localized token.
-IniFile	Key	N					Formatted		The .INI file key below Section.
-IniFile	Section	N					Formatted		The .INI file Section.
-IniFile	Value	N					Formatted		The value to be written.
-IniLocator	Field	Y	0	32767					The field in the .INI line. If Field is null or 0 the entire line is read.
-IniLocator	FileName	N					Filename		The .INI file name.
-IniLocator	Key	N					Text		Key value (followed by an equals sign in INI file).
-IniLocator	Section	N					Text		Section name within in file (within square brackets in INI file).
-IniLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table.
-IniLocator	Type	Y	0	2					An integer value that determines if the .INI value read is a filename or a directory location or to be used as is w/o interpretation.
-InstallExecuteSequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-InstallExecuteSequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-InstallExecuteSequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-InstallUISequence	Action	N					Identifier		Name of action to invoke, either in the engine or the handler DLL.
-InstallUISequence	Condition	Y					Condition		Optional expression which skips the action if evaluates to expFalse.If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
-InstallUISequence	Sequence	Y	-4	32767					Number that determines the sort order in which the actions are to be executed.  Leave blank to suppress action.
-IsolatedComponent	Component_Application	N			Component	1	Identifier		Key to Component table item for application
-IsolatedComponent	Component_Shared	N			Component	1	Identifier		Key to Component table item to be isolated
-LaunchCondition	Condition	N					Condition		Expression which must evaluate to TRUE in order for install to commence.
-LaunchCondition	Description	N					Formatted		Localizable text to display when condition fails and install must abort.
-ListBox	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-ListBox	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same listbox.
-ListBox	Text	Y					Text		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ListBox	Value	N					Formatted		The value string associated with this item. Selecting the line will set the associated property to this value.
-ListView	Binary_	Y			Binary	1	Identifier		The name of the icon to be displayed with the icon. The binary information is looked up from the Binary Table.
-ListView	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-ListView	Property	N					Identifier		A named property to be tied to this item. All the items tied to the same property become part of the same listview.
-ListView	Text	Y					Text		The visible text to be assigned to the item. Optional. If this entry or the entire column is missing, the text is the same as the value.
-ListView	Value	N					Identifier		The value string associated with this item. Selecting the line will set the associated property to this value.
-LockPermissions	Domain	Y					Formatted		Domain name for user whose permissions are being set. (usually a property)
-LockPermissions	LockObject	N					Identifier		Foreign key into Registry or File table
-LockPermissions	Permission	Y	-2147483647	2147483647					Permission Access mask.  Full Control = 268435456 (GENERIC_ALL = 0x10000000)
-LockPermissions	Table	N					Identifier	Directory;File;Registry	Reference to another table name
-LockPermissions	User	N					Formatted		User for permissions to be set.  (usually a property)
-Media	Cabinet	Y					Cabinet		If some or all of the files stored on the media are compressed in a cabinet, the name of that cabinet.
-Media	DiskId	N	1	32767					Primary key, integer to determine sort order for table.
-Media	DiskPrompt	Y					Text		Disk name: the visible text actually printed on the disk.  This will be used to prompt the user when this disk needs to be inserted.
-Media	LastSequence	N	0	32767					File sequence number for the last file for this media.
-Media	Source	Y					Property		The property defining the location of the cabinet file.
-Media	VolumeLabel	Y					Text		The label attributed to the volume.
-MIME	CLSID	Y					Guid		Optional associated CLSID.
-MIME	ContentType	N					Text		Primary key. Context identifier, typically "type/format".
-MIME	Extension_	N			Extension	1	Text		Optional associated extension (without dot)
-ModuleAdminExecuteSequence	Action	N					Identifier		Action to insert
-ModuleAdminExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdminExecuteSequence	BaseAction	Y			ModuleAdminExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleAdminExecuteSequence	Condition	Y					Condition		
-ModuleAdminExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdminUISequence	Action	N					Identifier		Action to insert
-ModuleAdminUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdminUISequence	BaseAction	Y			ModuleAdminUISequence	1	Identifier		Base action to determine insert location.
-ModuleAdminUISequence	Condition	Y					Condition		
-ModuleAdminUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdvtExecuteSequence	Action	N					Identifier		Action to insert
-ModuleAdvtExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdvtExecuteSequence	BaseAction	Y			ModuleAdvtExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleAdvtExecuteSequence	Condition	Y					Condition		
-ModuleAdvtExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleAdvtUISequence	Action	N					Identifier		Action to insert
-ModuleAdvtUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleAdvtUISequence	BaseAction	Y			ModuleAdvtUISequence	1	Identifier		Base action to determine insert location.
-ModuleAdvtUISequence	Condition	Y					Condition		
-ModuleAdvtUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleComponents	Component	N			Component	1	Identifier		Component contained in the module.
-ModuleComponents	Language	N			ModuleSignature	2			Default language ID for module (may be changed by transform).
-ModuleComponents	ModuleID	N			ModuleSignature	1	Identifier		Module containing the component.
-ModuleDependency	ModuleID	N			ModuleSignature	1	Identifier		Module requiring the dependency.
-ModuleDependency	ModuleLanguage	N			ModuleSignature	2			Language of module requiring the dependency.
-ModuleDependency	RequiredID	N							String.GUID of required module.
-ModuleDependency	RequiredLanguage	N							LanguageID of the required module.
-ModuleDependency	RequiredVersion	Y					Version		Version of the required version.
-ModuleExclusion	ExcludedID	N							String.GUID of excluded module.
-ModuleExclusion	ExcludedLanguage	N							Language of excluded module.
-ModuleExclusion	ExcludedMaxVersion	Y					Version		Maximum version of excluded module.
-ModuleExclusion	ExcludedMinVersion	Y					Version		Minimum version of excluded module.
-ModuleExclusion	ModuleID	N			ModuleSignature	1	Identifier		String.GUID of module with exclusion requirement.
-ModuleExclusion	ModuleLanguage	N			ModuleSignature	2			LanguageID of module with exclusion requirement.
-ModuleIgnoreTable	Table	N					Identifier		Table name to ignore during merge operation.
-ModuleInstallExecuteSequence	Action	N					Identifier		Action to insert
-ModuleInstallExecuteSequence	After	Y	0	1					Before (0) or After (1)
-ModuleInstallExecuteSequence	BaseAction	Y			ModuleInstallExecuteSequence	1	Identifier		Base action to determine insert location.
-ModuleInstallExecuteSequence	Condition	Y					Condition		
-ModuleInstallExecuteSequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleInstallUISequence	Action	N					Identifier		Action to insert
-ModuleInstallUISequence	After	Y	0	1					Before (0) or After (1)
-ModuleInstallUISequence	BaseAction	Y			ModuleInstallUISequence	1	Identifier		Base action to determine insert location.
-ModuleInstallUISequence	Condition	Y					Condition		
-ModuleInstallUISequence	Sequence	Y	-4	32767					Standard Sequence number
-ModuleSignature	Language	N							Default decimal language of module.
-ModuleSignature	ModuleID	N					Identifier		Module identifier (String.GUID).
-ModuleSignature	Version	N					Version		Version of the module.
-MoveFile	Component_	N			Component	1	Identifier		If this component is not "selected" for installation or removal, no action will be taken on the associated MoveFile entry
-MoveFile	DestFolder	N					Identifier		Name of a property whose value is assumed to resolve to the full path to the destination directory
-MoveFile	DestName	Y					Filename		Name to be given to the original file after it is moved or copied.  If blank, the destination file will be given the same name as the source file
-MoveFile	FileKey	N					Identifier		Primary key that uniquely identifies a particular MoveFile record
-MoveFile	Options	N	0	1					Integer value specifying the MoveFile operating mode, one of imfoEnum
-MoveFile	SourceFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full path to the source directory
-MoveFile	SourceName	Y					Text		Name of the source file(s) to be moved or copied.  Can contain the '*' or '?' wildcards.
-MsiAssembly	Attributes	Y							Assembly attributes
-MsiAssembly	Component_	N			Component	1	Identifier		Foreign key into Component table.
-MsiAssembly	Feature_	N			Feature	1	Identifier		Foreign key into Feature table.
-MsiAssembly	File_Application	Y			File	1	Identifier		Foreign key into File table, denoting the application context for private assemblies. Null for global assemblies.
-MsiAssembly	File_Manifest	Y			File	1	Identifier		Foreign key into the File table denoting the manifest file for the assembly.
-MsiAssemblyName	Component_	N			Component	1	Identifier		Foreign key into Component table.
-MsiAssemblyName	Name	N					Text		The name part of the name-value pairs for the assembly name.
-MsiAssemblyName	Value	N					Text		The value part of the name-value pairs for the assembly name.
-MsiDigitalCertificate	CertData	N					Binary		A certificate context blob for a signer certificate
-MsiDigitalCertificate	DigitalCertificate	N					Identifier		A unique identifier for the row
-MsiDigitalSignature	DigitalCertificate_	N			MsiDigitalCertificate	1	Identifier		Foreign key to MsiDigitalCertificate table identifying the signer certificate
-MsiDigitalSignature	Hash	Y					Binary		The encoded hash blob from the digital signature
-MsiDigitalSignature	SignObject	N					Text		Foreign key to Media table
-MsiDigitalSignature	Table	N						Media	Reference to another table name (only Media table is supported)
-MsiFileHash	File_	N			File	1	Identifier		Primary key, foreign key into File table referencing file with this hash
-MsiFileHash	HashPart1	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart2	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart3	N							Size of file in bytes (long integer).
-MsiFileHash	HashPart4	N							Size of file in bytes (long integer).
-MsiFileHash	Options	N	0	32767					Various options and attributes for this hash.
-ODBCAttribute	Attribute	N					Text		Name of ODBC driver attribute
-ODBCAttribute	Driver_	N			ODBCDriver	1	Identifier		Reference to ODBC driver in ODBCDriver table
-ODBCAttribute	Value	Y					Text		Value for ODBC driver attribute
-ODBCDataSource	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCDataSource	DataSource	N					Identifier		Primary key, non-localized.internal token for data source
-ODBCDataSource	Description	N					Text		Text used as registered name for data source
-ODBCDataSource	DriverDescription	N					Text		Reference to driver description, may be existing driver
-ODBCDataSource	Registration	N	0	1					Registration option: 0=machine, 1=user, others t.b.d.
-ODBCDriver	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCDriver	Description	N					Text		Text used as registered name for driver, non-localized
-ODBCDriver	Driver	N					Identifier		Primary key, non-localized.internal token for driver
-ODBCDriver	File_	N			File	1	Identifier		Reference to key driver file
-ODBCDriver	File_Setup	Y			File	1	Identifier		Optional reference to key driver setup DLL
-ODBCSourceAttribute	Attribute	N					Text		Name of ODBC data source attribute
-ODBCSourceAttribute	DataSource_	N			ODBCDataSource	1	Identifier		Reference to ODBC data source in ODBCDataSource table
-ODBCSourceAttribute	Value	Y					Text		Value for ODBC data source attribute
-ODBCTranslator	Component_	N			Component	1	Identifier		Reference to associated component
-ODBCTranslator	Description	N					Text		Text used as registered name for translator
-ODBCTranslator	File_	N			File	1	Identifier		Reference to key translator file
-ODBCTranslator	File_Setup	Y			File	1	Identifier		Optional reference to key translator setup DLL
-ODBCTranslator	Translator	N					Identifier		Primary key, non-localized.internal token for translator
-Patch	Attributes	N	0	32767					Integer containing bit flags representing patch attributes
-Patch	File_	N					Identifier		Primary key, non-localized token, foreign key to File table, must match identifier in cabinet.
-Patch	Header	Y					Binary		Binary stream. The patch header, used for patch validation.
-Patch	PatchSize	N	0	2147483647					Size of patch in bytes (long integer).
-Patch	Sequence	N	0	32767					Primary key, sequence with respect to the media images; order must track cabinet order.
-PatchPackage	Media_	N	0	32767					Foreign key to DiskId column of Media table. Indicates the disk containing the patch package.
-PatchPackage	PatchId	N					Guid		A unique string GUID representing this patch.
-ProgId	Class_	Y			Class	1	Guid		The CLSID of an OLE factory corresponding to the ProgId.
-ProgId	Description	Y					Text		Localized description for the Program identifier.
-ProgId	Icon_	Y			Icon	1	Identifier		Optional foreign key into the Icon Table, specifying the icon file associated with this ProgId. Will be written under the DefaultIcon key.
-ProgId	IconIndex	Y	-32767	32767					Optional icon index.
-ProgId	ProgId	N					Text		The Program Identifier. Primary key.
-ProgId	ProgId_Parent	Y			ProgId	1	Text		The Parent Program Identifier. If specified, the ProgId column becomes a version independent prog id.
-Property	Property	N					Identifier		Name of property, uppercase if settable by launcher or loader.
-Property	Value	N					Text		String value for property.  Never null or empty.
-PublishComponent	AppData	Y					Text		This is localisable Application specific data that can be associated with a Qualified Component.
-PublishComponent	Component_	N			Component	1	Identifier		Foreign key into the Component table.
-PublishComponent	ComponentId	N					Guid		A string GUID that represents the component id that will be requested by the alien product.
-PublishComponent	Feature_	N			Feature	1	Identifier		Foreign key into the Feature table.
-PublishComponent	Qualifier	N					Text		This is defined only when the ComponentId column is an Qualified Component Id. This is the Qualifier for ProvideComponentIndirect.
-RadioButton	Height	N	0	32767					The height of the button.
-RadioButton	Help	Y					Text		The help strings used with the button. The text is optional.
-RadioButton	Order	N	1	32767					A positive integer used to determine the ordering of the items within one list..The integers do not have to be consecutive.
-RadioButton	Property	N					Identifier		A named property to be tied to this radio button. All the buttons tied to the same property become part of the same group.
-RadioButton	Text	Y					Text		The visible title to be assigned to the radio button.
-RadioButton	Value	N					Formatted		The value string associated with this button. Selecting the button will set the associated property to this value.
-RadioButton	Width	N	0	32767					The width of the button.
-RadioButton	X	N	0	32767					The horizontal coordinate of the upper left corner of the bounding rectangle of the radio button.
-RadioButton	Y	N	0	32767					The vertical coordinate of the upper left corner of the bounding rectangle of the radio button.
-Reg64	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
-Reg64	Key	N					RegPath		The key for the registry value.
-Reg64	Name	Y					Formatted		The registry value name.
-Reg64	Registry	N					Identifier		Primary key, non-localized token.
-Reg64	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
-Reg64	Value	Y					Formatted		The registry value.
-Registry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the installing of the registry value.
-Registry	Key	N					RegPath		The key for the registry value.
-Registry	Name	Y					Formatted		The registry value name.
-Registry	Registry	N					Identifier		Primary key, non-localized token.
-Registry	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum.
-Registry	Value	Y					Formatted		The registry value.
-RegLocator	Key	N					RegPath		The key for the registry value.
-RegLocator	Name	Y					Formatted		The registry value name.
-RegLocator	Root	N	0	3					The predefined root key for the registry value, one of rrkEnum.
-RegLocator	Signature_	N					Identifier		The table key. The Signature_ represents a unique file signature and is also the foreign key in the Signature table. If the type is 0, the registry values refers a directory, and _Signature is not a foreign key.
-RegLocator	Type	Y	0	18					An integer value that determines if the registry value is a filename or a directory location or to be used as is w/o interpretation.
-RemoveFile	Component_	N			Component	1	Identifier		Foreign key referencing Component that controls the file to be removed.
-RemoveFile	DirProperty	N					Identifier		Name of a property whose value is assumed to resolve to the full pathname to the folder of the file to be removed.
-RemoveFile	FileKey	N					Identifier		Primary key used to identify a particular file entry
-RemoveFile	FileName	Y					WildCardFilename		Name of the file to be removed.
-RemoveFile	InstallMode	N						1;2;3	Installation option, one of iimEnum.
-RemoveIniFile	Action	N						2;4	The type of modification to be made, one of iifEnum.
-RemoveIniFile	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the deletion of the .INI value.
-RemoveIniFile	DirProperty	Y					Identifier		Foreign key into the Directory table denoting the directory where the .INI file is.
-RemoveIniFile	FileName	N					Filename		The .INI file name in which to delete the information
-RemoveIniFile	Key	N					Formatted		The .INI file key below Section.
-RemoveIniFile	RemoveIniFile	N					Identifier		Primary key, non-localized token.
-RemoveIniFile	Section	N					Formatted		The .INI file Section.
-RemoveIniFile	Value	Y					Formatted		The value to be deleted. The value is required when Action is iifIniRemoveTag
-RemoveRegistry	Component_	N			Component	1	Identifier		Foreign key into the Component table referencing component that controls the deletion of the registry value.
-RemoveRegistry	Key	N					RegPath		The key for the registry value.
-RemoveRegistry	Name	Y					Formatted		The registry value name.
-RemoveRegistry	RemoveRegistry	N					Identifier		Primary key, non-localized token.
-RemoveRegistry	Root	N	-1	3					The predefined root key for the registry value, one of rrkEnum
-ReserveCost	Component_	N			Component	1	Identifier		Reserve a specified amount of space if this component is to be installed.
-ReserveCost	ReserveFolder	Y					Identifier		Name of a property whose value is assumed to resolve to the full path to the destination directory
-ReserveCost	ReserveKey	N					Identifier		Primary key that uniquely identifies a particular ReserveCost record
-ReserveCost	ReserveLocal	N	0	2147483647					Disk space to reserve if linked component is installed locally.
-ReserveCost	ReserveSource	N	0	2147483647					Disk space to reserve if linked component is installed to run from the source location.
-SelfReg	Cost	Y	0	32767					The cost of registering the module.
-SelfReg	File_	N			File	1	Identifier		Foreign key into the File table denoting the module that needs to be registered.
-ServiceControl	Arguments	Y					Formatted		Arguments for the service.  Separate by [~].
-ServiceControl	Component_	N			Component	1	Identifier		Required foreign key into the Component Table that controls the startup of the service
-ServiceControl	Event	N	0	187					Bit field:  Install:  0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete
-ServiceControl	Name	N					Formatted		Name of a service. /, \, comma and space are invalid
-ServiceControl	ServiceControl	N					Identifier		Primary key, non-localized token.
-ServiceControl	Wait	Y	0	1					Boolean for whether to wait for the service to fully start
-ServiceInstall	Arguments	Y					Formatted		Arguments to include in every start of the service, passed to WinMain
-ServiceInstall	Component_	N			Component	1	Identifier		Required foreign key into the Component Table that controls the startup of the service
-ServiceInstall	Dependencies	Y					Formatted		Other services this depends on to start.  Separate by [~], and end with [~][~]
-ServiceInstall	Description	Y					Text		Description of service.
-ServiceInstall	DisplayName	Y					Formatted		External Name of the Service
-ServiceInstall	ErrorControl	N	-2147483647	2147483647					Severity of error if service fails to start
-ServiceInstall	LoadOrderGroup	Y					Formatted		LoadOrderGroup
-ServiceInstall	Name	N					Formatted		Internal Name of the Service
-ServiceInstall	Password	Y					Formatted		password to run service with.  (with StartName)
-ServiceInstall	ServiceInstall	N					Identifier		Primary key, non-localized token.
-ServiceInstall	ServiceType	N	-2147483647	2147483647					Type of the service
-ServiceInstall	StartName	Y					Formatted		User or object name to run service as
-ServiceInstall	StartType	N	0	4					Type of the service
-SFPCatalog	Catalog	N					Binary		SFP Catalog
-SFPCatalog	Dependency	Y					Formatted		Parent catalog - only used by SFP
-SFPCatalog	SFPCatalog	N					Filename		File name for the catalog.
-Shortcut	Arguments	Y					Formatted		The command-line arguments for the shortcut.
-Shortcut	Component_	N			Component	1	Identifier		Foreign key into the Component table denoting the component whose selection gates the the shortcut creation/deletion.
-Shortcut	Description	Y					Text		The description for the shortcut.
-Shortcut	Directory_	N			Directory	1	Identifier		Foreign key into the Directory table denoting the directory where the shortcut file is created.
-Shortcut	Hotkey	Y	0	32767					The hotkey for the shortcut. It has the virtual-key code for the key in the low-order byte, and the modifier flags in the high-order byte. 
-Shortcut	Icon_	Y			Icon	1	Identifier		Foreign key into the File table denoting the external icon file for the shortcut.
-Shortcut	IconIndex	Y	-32767	32767					The icon index for the shortcut.
-Shortcut	Name	N					Filename		The name of the shortcut to be created.
-Shortcut	Shortcut	N					Identifier		Primary key, non-localized token.
-Shortcut	ShowCmd	Y						1;3;7	The show command for the application window.The following values may be used.
-Shortcut	Target	N					Shortcut		The shortcut target. This is usually a property that is expanded to a file or a folder that the shortcut points to.
-Shortcut	WkDir	Y					Identifier		Name of property defining location of working directory.
-Signature	FileName	N					Filename		The name of the file. This may contain a "short name|long name" pair.
-Signature	Languages	Y					Language		The languages supported by the file.
-Signature	MaxDate	Y	0	2147483647					The maximum creation date of the file.
-Signature	MaxSize	Y	0	2147483647					The maximum size of the file. 
-Signature	MaxVersion	Y					Text		The maximum version of the file.
-Signature	MinDate	Y	0	2147483647					The minimum creation date of the file.
-Signature	MinSize	Y	0	2147483647					The minimum size of the file.
-Signature	MinVersion	Y					Text		The minimum version of the file.
-Signature	Signature	N					Identifier		The table key. The Signature represents a unique file signature.
-TextStyle	Color	Y	0	16777215					A long integer indicating the color of the string in the RGB format (Red, Green, Blue each 0-255, RGB = R + 256*G + 256^2*B).
-TextStyle	FaceName	N					Text		A string indicating the name of the font used. Required. The string must be at most 31 characters long.
-TextStyle	Size	N	0	32767					The size of the font used. This size is given in our units (1/12 of the system font height). Assuming that the system font is set to 12 point size, this is equivalent to the point size.
-TextStyle	StyleBits	Y	0	15					A combination of style bits.
-TextStyle	TextStyle	N					Identifier		Name of the style. The primary key of this table. This name is embedded in the texts to indicate a style change.
-TypeLib	Component_	N			Component	1	Identifier		Required foreign key into the Component Table, specifying the component for which to return a path when called through LocateComponent.
-TypeLib	Cost	Y	0	2147483647					The cost associated with the registration of the typelib. This column is currently optional.
-TypeLib	Description	Y					Text		
-TypeLib	Directory_	Y			Directory	1	Identifier		Optional. The foreign key into the Directory table denoting the path to the help file for the type library.
-TypeLib	Feature_	N			Feature	1	Identifier		Required foreign key into the Feature Table, specifying the feature to validate or install in order for the type library to be operational.
-TypeLib	Language	N	0	32767					The language of the library.
-TypeLib	LibID	N					Guid		The GUID that represents the library.
-TypeLib	Version	Y	0	16777215					The version of the library. The minor version is in the lower 8 bits of the integer. The major version is in the next 16 bits. 
-UIText	Key	N					Identifier		A unique key that identifies the particular string.
-UIText	Text	Y					Text		The localized version of the string.
-Upgrade	ActionProperty	N					UpperCase		The property to set when a product in this set is found.
-Upgrade	Attributes	N	0	2147483647					The attributes of this product set.
-Upgrade	Language	Y					Language		A comma-separated list of languages for either products in this set or products not in this set.
-Upgrade	Remove	Y					Formatted		The list of features to remove when uninstalling a product from this set.  The default is "ALL".
-Upgrade	UpgradeCode	N					Guid		The UpgradeCode GUID belonging to the products in this set.
-Upgrade	VersionMax	Y					Text		The maximum ProductVersion of the products in this set.  The set may or may not include products with this particular version.
-Upgrade	VersionMin	Y					Text		The minimum ProductVersion of the products in this set.  The set may or may not include products with this particular version.
-Verb	Argument	Y					Formatted		Optional value for the command arguments.
-Verb	Command	Y					Formatted		The command text.
-Verb	Extension_	N			Extension	1	Text		The extension associated with the table row.
-Verb	Sequence	Y	0	32767					Order within the verbs for a particular extension. Also used simply to specify the default verb.
-Verb	Verb	N					Text		The verb for the command.
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/codes.txt b/instsetoo_native/inc_ure/windows/msi_templates/codes.txt
deleted file mode 100644
index 934c95109..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/codes.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-[PRODUCTCODE]
-en-US = "{BD608D70-94EE-4793-A942-D4978B56B735}"
-pt = "{395C0DE6-BFAB-4100-836D-6633D9FAF84D}"
-ru = "{B020E61C-4577-4092-AED9-7E29A3CBA2CA}"
-el = "{83A626D6-E9EC-4F93-8D8C-0C0FF909924F}"
-nl = "{97D63D2B-878E-4A1F-907B-E5A71B225FB5}"
-fr = "{BAD1536A-5351-4D37-A4A4-DD486537474F}"
-es = "{A4A5F141-B49A-4058-9DEB-FCA6DBBA1821}"
-fi = "{E094BD07-9E0A-4235-B202-CF254F0EA4A7}"
-hu = "{BCAB02B1-D876-4307-A2D6-6A730F423B45}"
-ca = "{6AA0063F-CA6C-48D2-9B17-61C1B6EF169F}"
-it = "{CECEB3CB-386A-4F16-8A88-C80850E09BDA}"
-cs = "{DA8AF4CC-BF82-4076-9B3A-AA93B49BAC6B}"
-sk = "{F7AD5F59-4824-466F-BF27-C3F2658DA7F6}"
-en-GB = "{D008C4D9-64C7-4ABF-82B7-DF8D4917FFB4}"
-da = "{BAF99FD3-A5C8-4628-B836-69F0056BC6D6}"
-sv = "{1E2C32F9-FB99-4861-90D2-805C44CDE2E8}"
-no = "{FBF48667-A68E-4F53-BD54-F85179B1CE1C}"
-pl = "{F8496E9B-FA31-48A1-BBF6-549BAEB34815}"
-de = "{5E960786-F4F3-4744-B402-FF7C01432987}"
-pt-BR = "{CA076406-011C-4B94-9667-BEA2020ABFC8}"
-th = "{847CFC65-88E2-4F23-ABB8-2AAA468090EB}"
-et = "{E6D97841-28E4-4BA8-A52F-A3BAFE3E250E}"
-ja = "{53B387F3-FC9F-4143-B309-B18E4498AC14}"
-ko = "{9A0B32AC-9D4D-4035-974D-66052C7F06AC}"
-zh-CN = "{56339959-E94E-4697-8C22-357855F3DA2C}"
-zh-TW = "{540D1E5D-B770-44EB-A1B1-5E1B1E88E6C0}"
-tr = "{AFA20894-DAFA-4733-B0E4-16019BFE7D9D}"
-hi = "{E8569C57-B57A-41A6-90A5-7D2A4C1B8D5C}"
-ar = "{F3843E12-0254-43D1-B8A1-3BB00F939BE6}"
-he = "{733B8C44-7982-4676-A7C5-950A3280C056}"
-multiwestern = "{3954C0B9-5E4A-48AC-BA53-5DBD14A478CE}"
-multiasia = "{67D6E6A3-26F3-403C-AEB0-CB9F7E415C7F}"
-
-[UPGRADECODE]
-en-US = "{D1543E64-64B6-40F9-A5FC-696E95E2DE87}"
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/components.txt b/instsetoo_native/inc_ure/windows/msi_templates/components.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/instsetoo_native/inc_ure/windows/msi_templates/components.txt
+++ /dev/null
diff --git a/instsetoo_native/prj/build.lst b/instsetoo_native/prj/build.lst
deleted file mode 100644
index 5f3912d6b..000000000
--- a/instsetoo_native/prj/build.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-oon	instsetoo_native	::	TRANSLATIONS:translations postprocess packimages testautomation NULL
-oon	instsetoo_native						usr1	-	all	oon_mkout NULL
-oon	instsetoo_native\inc_openoffice\unix	nmake	-	u	oon_unix NULL
-oon	instsetoo_native\inc_openoffice\windows\msi_languages	nmake	-	all	oon_msilang NULL
-oon	instsetoo_native\util					nmake	-	all	oon_util oon_msilang oon_unix.u NULL
diff --git a/instsetoo_native/prj/d.lst b/instsetoo_native/prj/d.lst
deleted file mode 100644
index c4156b75b..000000000
--- a/instsetoo_native/prj/d.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\pus
-..\%COMMON_OUTDIR%\bin\hid\userfeedback_VCL_names.csv %COMMON_DEST%\bin\userfeedback_VCL_names.csv
-..\%__SRC%\misc\*.update.xml %_DEST%\pus\*.update.xml
diff --git a/instsetoo_native/res/nologobanner.bmp b/instsetoo_native/res/nologobanner.bmp
deleted file mode 100644
index 3bd088711..000000000
--- a/instsetoo_native/res/nologobanner.bmp
+++ /dev/null
diff --git a/instsetoo_native/res/nologoinstall.bmp b/instsetoo_native/res/nologoinstall.bmp
deleted file mode 100644
index 8af9fc41f..000000000
--- a/instsetoo_native/res/nologoinstall.bmp
+++ /dev/null
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
deleted file mode 100644
index 8132e8c72..000000000
--- a/instsetoo_native/util/makefile.mk
+++ /dev/null
@@ -1,378 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=instsetoo_native
-TARGET=util
-
-.INCLUDE:  settings.mk
-.INCLUDE: $(SOLARINCDIR)$/rtlbootstrap.mk
-
-# PERL:=@echo
-
-# watch for the path delimiter
-.IF "$(GUI)"=="WNT"
-PYTHONPATH:=$(PWD)$/$(BIN);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload
-.ELSE			# "$(GUI)"=="WNT"
-PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python$/lib-dynload
-.ENDIF			# "$(GUI)"=="WNT"
-.EXPORT: PYTHONPATH
-
-ENABLE_DOWNLOADSETS*=TRUE
-
-.EXPORT: ENABLE_DOWNLOADSETS
-.EXPORT: LAST_MINOR
-.EXPORT: PRJ
-.EXPORT: PRJNAME
-
-.IF "$(OS)"=="LINUX"
-DONT_REMOVE_PACKAGE:=TRUE
-.EXPORT: DONT_REMOVE_PACKAGE
-.ENDIF          # "$(OS)"=="LINUX"
-
-.INCLUDE .IGNORE: $(SRC_ROOT)$/cwsname.mk
-
-SHARED_COM_SDK_PATH*:=.
-
-INSTALLDIR=$(OUT)
-
-.INCLUDE: target.mk
-
-.IF "$(DISABLE_PYTHON)" != "TRUE"
-LOCALPYFILES= \
-    $(BIN)$/uno.py \
-    $(BIN)$/unohelper.py \
-    $(BIN)$/pythonloader.py \
-    $(BIN)$/officehelper.py \
-    $(BIN)$/mailmerge.py \
-    $(BIN)$/msgbox.py
-.ENDIF
-
-help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" 2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
-
-allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j  $i $(NULL))))
-
-xxxx:
-    echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
-
-.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO"
-ALLTAR  : $(LOCALPYFILES)
-    @echo "No EPM: do no packaging at this stage"
-.ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO"
-.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
-.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-.IF "$(GUI)"=="WNT"
-ALLTAR : openofficeall ooohelppack
-.ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack)
-.ENDIF
-.ELSE
-.IF "$(GUI)"=="WNT"
-ALLTAR : openofficeall ooohelppack sdkooall
-.ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) sdkoo_en-US ure_en-US
-.ENDIF
-.ENDIF
-.ELSE
-.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack)
-.ELSE
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) sdkoodev_en-US ure_en-US
-.ENDIF
-.ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
-.ENDIF			# "$(GUI)"!="WNT" && "$(EPM)"=="NO"
-
-.IF "$(FORCE2ARCHIVE)" == "TRUE"
-PKGFORMAT = archive
-.END
-
-.IF "$(MAKETARGETS:e)"!=""
-PKGFORMAT+=$(MAKETARGETS:e:s/.//)
-.ENDIF			# "$(MAKETARGETS:e)"!=""
-
-# Independent of PKGFORMAT, always build a default-language openoffice product
-# also in archive format, so that tests that require an OOo installation (like
-# smoketestoo_native) have one available:
-openoffice_$(defaultlangiso) : $$@.archive
-
-.IF "$(VERBOSE)"=="TRUE"
-VERBOSESWITCH=-verbose
-.ENDIF
-.IF "$(VERBOSE)"=="FALSE"
-VERBOSESWITCH=-quiet
-.ENDIF
-
-updatepack:
-    $(PERL) -w $(SOLARENV)$/bin$/packager.pl
-
-.IF "$(alllangiso)"!=""
-
-openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
-
-openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
-
-openofficewithjre: $(foreach,i,$(alllangiso) openofficewithjre_$i)
-
-ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
-
-ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
-
-ooohelppack : $(foreach,i,$(allhelplangiso) ooohelppack_$i)
-
-ooodevhelppack: $(foreach,i,$(allhelplangiso) ooodevhelppack_$i)
-
-sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
-
-sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
-
-ure: $(foreach,i,$(alllangiso) ure_$i)
-
-oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i)
-
-oxygenofficewithjre: $(foreach,i,$(alllangiso) oxygenofficewithjre_$i)
-
-oxygenofficelanguagepack : $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i)
-
-oxygenofficehelppack : $(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i)
-
-MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
-MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
-MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates
-MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates
-MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
-
-.IF "$(BUILD_SPECIAL)"!=""
-MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE)
-MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE)
-MSIHELPPACKTEMPLATEDIR=$(MSIHELPPACKTEMPLATESOURCE)
-MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE)
-MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
-.ELSE			# "$(BUILD_SPECIAL)"!=""
-NOLOGOSPLASH:=$(BIN)$/intro.zip
-DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
-MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
-MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
-MSIHELPPACKTEMPLATEDIR=$(MISC)$/ooohelppack$/msi_templates
-MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
-MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
-
-ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
-.IF "$(OS)" == "WNT"
-ADDDEPS+=hack_msitemplates
-.ENDIF
-
-$(foreach,i,$(alllangiso) openoffice_$i) : $(ADDDEPS)
-openoffice_$(defaultlangiso).archive : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) openofficedev_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(allhelplangiso) ooohelppack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(allhelplangiso) ooodevhelppack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) : $(ADDDEPS)
-
-.IF "$(MAKETARGETS)"!=""
-$(MAKETARGETS) : $(ADDDEPS)
-.ENDIF			# "$(MAKETARGETS)"!=""
-
-.ENDIF			# "$(BUILD_SPECIAL)"!=""
-
-$(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
-.IF "$(MAKETARGETS)"!=""
-.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
-$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
-.ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-.ENDIF			# "$(MAKETARGETS)"!=""
-openoffice_%{$(PKGFORMAT:^".") .archive} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
-openofficewithjre_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
-openofficedev_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
-$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-ooolanguagepack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(allhelplangiso) ooohelppack_$i) : $$@{$(PKGFORMAT:^".")}
-ooohelppack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(allhelplangiso) ooodevhelppack_$i) : $$@{$(PKGFORMAT:^".")}
-ooodevhelppack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
-sdkoo_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
-sdkoodev_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
-ure_%{$(PKGFORMAT:^".")} :
-.IF "$(OS)" == "MACOSX"
-    @echo 'for now, there is no standalone URE for Mac OS X'
-.ELSE
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst \
-        -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) -format $(@:e:s/.//) $(VERBOSESWITCH) \
-        -msitemplate $(MSIURETEMPLATEDIR) \
-        -msilanguage $(COMMONMISC)$/win_ulffiles
-.ENDIF
-
-$(foreach,i,$(alllangiso) oxygenoffice_$i) : $$@{$(PKGFORMAT:^".")}
-.IF "$(MAKETARGETS)"!=""
-.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
-$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
-.ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-.ENDIF			# "$(MAKETARGETS)"!=""
-oxygenoffice_%{$(PKGFORMAT:^".") .archive} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OxygenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
-$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
-oxygenofficewithjre_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-oxygenofficelanguagepack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) : $$@{$(PKGFORMAT:^".")}
-oxygenofficehelppack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-.ELSE			# "$(alllangiso)"!=""
-openoffice:
-    @echo cannot pack anything...
-
-.ENDIF			# "$(alllangiso)"!=""
-
-.IF "$(DISABLE_PYTHON)" != "TRUE"
-.IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
-.ENDIF			# "$(LOCALPYFILES)"!=""
-
-$(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
-    @$(COPY) $< $@
-.ENDIF			# "$(DISABLE_PYTHON)" != "TRUE"
-
-$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/intro.zip
-    $(COPY) $< $@
-
-$(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/brand_dev$/intro.zip
-    @-$(MKDIR) $(@:d)
-    $(COPY) $< $@
-
-hack_msitemplates .PHONY:
-    -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
-    -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
-    -$(MKDIRHIER) $(MSIHELPPACKTEMPLATEDIR)
-    -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
-    -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
-    -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary
-    -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
-    -$(MKDIRHIER) $(MSIHELPPACKTEMPLATEDIR)$/Binary
-    -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
-    -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
-    $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
-    $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
-    $(GNUCOPY) -u $(MSIHELPPACKTEMPLATESOURCE)$/*.* $(MSIHELPPACKTEMPLATEDIR)
-    $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
-    $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
-    $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
-    $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
-    $(GNUCOPY) -u $(MSIHELPPACKTEMPLATESOURCE)$/Binary$/*.* $(MSIHELPPACKTEMPLATEDIR)$/Binary
-    $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
-    $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
-    $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-    $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-    $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
-    $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-    $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-    $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-    $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-    $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-    $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
-    $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
-    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
-    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-
-.IF "$(OS)" == "WNT"
-
-ALLLANGSTRING:=$(alllangiso)
-
-openofficeall: hack_msitemplates $(LOCALPYFILES) openoffice_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
-
-openofficedevall: hack_msitemplates $(LOCALPYFILES) openofficedev_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
-
-sdkooall: hack_msitemplates $(LOCALPYFILES) sdkoo_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
-
-sdkoodevall: hack_msitemplates $(LOCALPYFILES) sdkoodev_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
-
-.ENDIF			# "$(OS)" == "WNT"
-
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
deleted file mode 100644
index 35c927d39..000000000
--- a/instsetoo_native/util/openoffice.lst
+++ /dev/null
@@ -1,529 +0,0 @@
-Globals
-{
-	Settings
-	{
-		variables
-		{
-			OOOBASEVERSION 3.5
-  			OOOPACKAGEVERSION 3.5.0
-			UREPACKAGEVERSION 3.5.0
-			URELAYERVERSION 1
-			BASISROOTNAME LibreOffice
-			UNIXBASISROOTNAME libreoffice3.5
-			SERVICETAG_PRODUCTNAME LibreOffice 3.5
-			SERVICETAG_PRODUCTVERSION 3.5
-			SERVICETAG_PARENTNAME LibreOffice 3.5
-			SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
-			SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
-			HIDELICENSEDIALOG 1
-			PACKAGEPREFIX 
-			BASISPACKAGEPREFIX libobasis
-			UREPACKAGEPREFIX libreoffice
-			SOLSUREPACKAGEPREFIX libreoffice
-			USE_FILEVERSION 1
-			LIBRARYVERSION 9.4.0
-            POOLPRODUCT 1
-            REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
-			REGISTRATIONURL http://survey.libreoffice.org/user/index.php
-			PROGRESSBARCOLOR 126,170,23
-			PROGRESSSIZE 319,10
-			PROGRESSPOSITION 164,225
-			PROGRESSFRAMECOLOR 207,208,211
-			NATIVEPROGRESS true
-			REGISTRYLAYERNAME Layers
-            SERVICEPACK 1
-            UPDATE_DATABASE 1
-            CREATE_MSP_INSTALLSET 0
-            UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
- 			PACKAGEMAP package_names.txt,package_names_ext.txt
-			WINDOWSPATCHLEVEL 8
-            OOOVENDOR The Document Foundation
-			OOODOWNLOADNAME 1
-			STARTCENTER_LAYOUT_STYLE 0
-			BUILDIDCWS {buildidcws}
-            OPENSOURCE 1
-		}
-	}
-}
-
-LibreOffice
-{
-	Settings
-	{
-		variables
-		{
-			PRODUCTNAME LibreOffice
-			PRODUCTVERSION 3.5
-			PRODUCTEXTENSION 
-			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION alpha0
-            POSTVERSIONEXTENSION
-            POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3.5
-			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.5.0
-			BASEPRODUCTVERSION 3.5
-            PCPFILENAME openoffice.pcp
-			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
-			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
-			ADDSYSTEMINTEGRATION 1
-			EVAL
-			FILEFORMATNAME OpenOffice.org
-			FILEFORMATVERSION 1.0
-			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.5.0
-			PACKAGEREVISION {buildid}
-			LICENSENAME LGPL
-			GLOBALFILEGID gid_File_Lib_Vcl
-			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
-			SPELLCHECKERFILE spellchecker_selection.txt
-			OPENSOURCE 1
-			SETSTATICPATH 1
-			OOODOWNLOADNAME 1
-			XPDINSTALLER 0
-			BETAUPGRADECODE
-			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
-			CHANGETARGETDIR 1
-			USE_FILEVERSION 1
-			LIBRARYVERSION 9.4.0
-			PATCHCODEFILE ooo_patchcodes.txt
-			DOWNLOADBANNER	ooobanner.bmp
-			DOWNLOADBITMAP	ooobitmap.bmp
-			DOWNLOADSETUPICO	ooosetup.ico
-			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL http://www.libreoffice.org/
-            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
-            STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT LibreOffice
-            REGISTRATION_CID 926117
-            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
-		}
-		active			1
-		compression		5
-		script			setup_osl
-		downloadname	LibO_{productversion}_{os}_install_{languages}
-		langpackdownloadname	LibO_{productversion}_languagepack_{os}_install_{languages}
-		helppackdownloadname	LibO_{productversion}_helppack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
-	}
-}
-
-LibreOffice_wJRE
-{
-	Settings
-	{
-		variables
-		{
-			PRODUCTNAME LibreOffice
-			PRODUCTVERSION 3.5
-			PRODUCTEXTENSION 
-			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION alpha0
-            POSTVERSIONEXTENSION
-            POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3.5
-			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.5.0
-			BASEPRODUCTVERSION 3.5
-			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
-			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
-			ADDSYSTEMINTEGRATION 1
-			EVAL
-			FILEFORMATNAME OpenOffice.org
-			FILEFORMATVERSION 1.0
-			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.5.0
-			PACKAGEREVISION {buildid}
-			LICENSENAME LGPL
-			WITHJREPRODUCT 1
-			GLOBALFILEGID gid_File_Lib_Vcl
-			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
-			SPELLCHECKERFILE spellchecker_selection.txt
-			OPENSOURCE 1
-			SETSTATICPATH 1
-			OOODOWNLOADNAME 1
-			XPDINSTALLER 1
-			BETAUPGRADECODE
-			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
-			CHANGETARGETDIR 1
-			USE_FILEVERSION 1
-			LIBRARYVERSION 9.4.0
-			PATCHCODEFILE ooo_patchcodes.txt
-			JAVAPRODUCT 1
-			DOWNLOADBANNER	ooobanner.bmp
-			DOWNLOADBITMAP	ooobitmap.bmp
-			DOWNLOADSETUPICO	ooosetup.ico
-			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL http://www.libreoffice.org/
-            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
-            STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT LibreOffice
-            REGISTRATION_CID 926117
-            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
-		}
-		active			1
-		compression		5
-		script			setup_osljre
-		downloadname	LibO_{productversion}_{os}_installwjre_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
-	}
-}
-
-LibreOffice_Dev
-{
-	Settings
-	{
-		variables
-		{
-			PRODUCTNAME LibO-dev
-			PRODUCTVERSION 3.5
-			PRODUCTEXTENSION 
-			LONG_PRODUCTEXTENSION 
-			SHORT_PRODUCTEXTENSION alpha0
-			BASISROOTNAME LibO-dev
-			UNIXBASISROOTNAME lo-dev
-            POSTVERSIONEXTENSION
-            POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3.5
-			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.5.0
-			BASEPRODUCTVERSION 3.5
-			DEVELOPMENTPRODUCT 1
-			BASISPACKAGEPREFIX libobasis-dev
-			UREPACKAGEPREFIX lodev
-			SOLSUREPACKAGEPREFIX lodev
-			REGISTRYLAYERNAME LayerDev
-			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
-			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
-			EVAL
-			FILEFORMATNAME OpenOffice.org
-			FILEFORMATVERSION 1.0
-			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.5.0
-			PACKAGEREVISION {buildid}
-			LICENSENAME LGPL
-			GLOBALFILEGID gid_File_Lib_Vcl
-			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
-			SPELLCHECKERFILE spellchecker_selection.txt
-			OPENSOURCE 1
-			SETSTATICPATH 1
-			OOODOWNLOADNAME 1
-			XPDINSTALLER 0
-			BETAUPGRADECODE
-			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
-			CHANGETARGETDIR 1
-			USE_FILEVERSION 1
-			LIBRARYVERSION 9.4.0
-			PATCHCODEFILE ooodev_patchcodes.txt
-			CODEFILENAME codes_ooodev.txt
-			DOWNLOADBANNER	ooobanner.bmp
-			DOWNLOADBITMAP	ooobitmap.bmp
-			DOWNLOADSETUPICO	ooosetup.ico
-			LOCALUSERDIR $ORIGIN/..
-			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL http://www.libreoffice.org/
-            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
-            STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT LibreOffice
-            REGISTRATION_CID 926117
-            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
-		}
-		active			1
-		compression		5
-		script			setup_osl
-		downloadname	LibO-dev_{productversion}_{os}_install_{languages}
-		langpackdownloadname	LibO_{productversion}_languagepack_{os}_install_{languages}
-		helppackdownloadname	LibO_{productversion}_helppack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
-	}
-}
-
-URE
-{
-    Settings
-    {
-        downloadname URE_{productversion}_{os}_install_{languages}
-        variables
-        {
-            PRODUCTNAME URE
-            PRODUCTVERSION 3.5
-            PACKAGEVERSION 3.5
-            PACKAGEREVISION 1
-            PRODUCTEXTENSION
-            BRANDPACKAGEVERSION 3.5
-            LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha0
-            LICENSENAME LGPL
-            SETSTATICPATH 1
-            NOVERSIONINDIRNAME 1
-            PCPFILENAME ure.pcp
-            POOLPRODUCT 0
-            GLOBALFILEGID gid_File_Dl_Cppu
-            DOWNLOADBANNER urebanner.bmp
-            DOWNLOADBITMAP urebitmap.bmp
-            DOWNLOADSETUPICO ooosetup.ico
-            DONTUSESTARTMENUFOLDER 1
-            RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL http://www.libreoffice.org/
-            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
-            STARTCENTER_LAYOUT_STYLE 0
-            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst
-			PACKAGEMAP package_names_ext.txt
-            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
-        }
-        active 1
-        compression 5
-        script ure
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/ure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/xml.{minor},{solarenvpath}/{os}/MS
-    }
-}
-
-LibreOffice_SDK
-{
-    Settings
-    {
-        downloadname OOo-SDK_{packageversion}_{os}_install_{languages}
-        variables
-        {
-            PRODUCTNAME LibreOffice
-            PRODUCTVERSION 3.5
-            PRODUCTEXTENSION
-            LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha0
-            POSTVERSIONEXTENSION SDK
-            POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3.5
-            PACKAGEVERSION 3.5.0
-            PACKAGEREVISION {buildid}
-            PACK_INSTALLED 1
-            POOLPRODUCT 0
-            DMG_VOLUMEEXTENSION SDK
-            DATABASENAME libreoffice33sdk
-            NO_README_IN_ROOTDIR 1
-            LICENSENAME LGPL
-            IGNOREDIRECTORYLAYER 1
-            NOVERSIONINDIRNAME 0
-            NOSPACEINDIRECTORYNAME 1
-            NOSHORTDIRECTORYNAMES 1
-            CHANGETARGETDIR 1
-            DOWNLOADBANNER ooosdkbanner.bmp
-            DOWNLOADBITMAP ooosdkbitmap.bmp
-            DOWNLOADSETUPICO ooosetup.ico
-            DONTUSESTARTMENUFOLDER 1
-            RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL http://www.libreoffice.org/
-            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
-            STARTCENTER_LAYOUT_STYLE 0
-            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
-        }
-        active 1
-        compression 5
-        script sdkoo
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
-    }
-}
-
-LibreOffice_Dev_SDK
-{
-    Settings
-    {
-        downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages}
-        variables
-        {
-            PRODUCTNAME LibO-dev
-            PRODUCTVERSION 3.5
-            PRODUCTEXTENSION
-            LONG_PRODUCTEXTENSION
-            SHORT_PRODUCTEXTENSION alpha0
-            BASISROOTNAME LibO-dev
-            UNIXBASISROOTNAME lo-dev
-            POSTVERSIONEXTENSION SDK
-            POSTVERSIONEXTENSIONUNIX sdk
-            BRANDPACKAGEVERSION 3.5
-            PACKAGEVERSION 3.5.0
-            PACKAGEREVISION {buildid}
-            BASISPACKAGEPREFIX libobasis-dev
-            UREPACKAGEPREFIX lodev
-            SOLSUREPACKAGEPREFIX lodev
-            REGISTRYLAYERNAME LayerDev
-			DEVELOPMENTPRODUCT 1
-            PACK_INSTALLED 1
-            POOLPRODUCT 0
-            DMG_VOLUMEEXTENSION SDK
-            DATABASENAME libreoffice33devsdk
-            NO_README_IN_ROOTDIR 1
-            LICENSENAME LGPL
-            IGNOREDIRECTORYLAYER 1
-            NOVERSIONINDIRNAME 0
-            NOSPACEINDIRECTORYNAME 1
-            NOSHORTDIRECTORYNAMES 1
-            CHANGETARGETDIR 1
-            DOWNLOADBANNER ooosdkbanner.bmp
-            DOWNLOADBITMAP ooosdkbitmap.bmp
-            DOWNLOADSETUPICO ooosetup.ico
-            DONTUSESTARTMENUFOLDER 1
-            RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL http://www.libreoffice.org/
-            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
-            STARTCENTER_LAYOUT_STYLE 0
-            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
-        }
-        active 1
-        compression 5
-        script sdkoo
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
-    }
-}
-
-OxygenOffice
-{
-	Settings
-	{
-		variables
-		{
-			PRODUCTNAME OxygenOffice
-			PRODUCTVERSION 3.5
-			PRODUCTEXTENSION
-			LONG_PRODUCTEXTENSION
-			SHORT_PRODUCTEXTENSION  alpha0
-            POSTVERSIONEXTENSION
-            POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3.5
-			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.5.0
-			BASEPRODUCTVERSION 3.5
-            PCPFILENAME openoffice.pcp
-			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
-			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
-			ADDSYSTEMINTEGRATION 1
-			EVAL
-			FILEFORMATNAME OpenOffice.org
-			FILEFORMATVERSION 1.0
-			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.5.0
-			PACKAGEREVISION {buildid}
-			LICENSENAME LGPL
-			SERVICESPROJEKT 1
-			GLOBALFILEGID gid_File_Lib_Vcl
-			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
-			SPELLCHECKERFILE spellchecker_selection.txt
-			OPENSOURCE 1
-			SETSTATICPATH 1
-			OOODOWNLOADNAME 1
-			XPDINSTALLER 0
-			BETAUPGRADECODE
-			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
-			CHANGETARGETDIR 1
-			USE_FILEVERSION 1
-			LIBRARYVERSION 9.4.0
-			PATCHCODEFILE ooo_patchcodes.txt
-			DOWNLOADBANNER	ooobanner_ooop.bmp
-			DOWNLOADBITMAP	ooobitmap_ooop.bmp
-			PROGRESSBARCOLOR 126,170,23
-			PROGRESSSIZE 430,5
-			PROGRESSPOSITION 5,230
-			PROGRESSFRAMECOLOR 207,208,211
-			DOWNLOADSETUPICO	ooosetup.ico
-			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL http://www.libreoffice.org/
-            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
-            STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OxygenOffice
-            REGISTRATION_CID 926117
-            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
-		}
-		active			1
-		compression		5
-		script			setup_osl
-		downloadname	OOOP_{productversion}_{os}_install_{languages}
-		langpackdownloadname	OOOP_{productversion}_languagepack_{os}_install_{languages}
-		helppackdownloadname	OOOP_{productversion}_helppack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
-	}
-}
-
-OxygenOffice_wJRE
-{
-	Settings
-	{
-		variables
-		{
-			PRODUCTNAME OxygenOffice
-			PRODUCTVERSION 3.5
-			PRODUCTEXTENSION
-			LONG_PRODUCTEXTENSION
-			SHORT_PRODUCTEXTENSION alpha0
-            POSTVERSIONEXTENSION
-            POSTVERSIONEXTENSIONUNIX
-			BRANDPACKAGEVERSION 3.5
-			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.5.0
-			BASEPRODUCTVERSION 3.5
-			UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
-            ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
-			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
-			ADDSYSTEMINTEGRATION 1
-			EVAL
-			FILEFORMATNAME OpenOffice.org
-			FILEFORMATVERSION 1.0
-			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.5.0
-			PACKAGEREVISION {buildid}
-			LICENSENAME LGPL
-			SERVICESPROJEKT 1
-			WITHJREPRODUCT 1
-			GLOBALFILEGID gid_File_Lib_Vcl
-			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
-			SPELLCHECKERFILE spellchecker_selection.txt
-			OPENSOURCE 1
-			SETSTATICPATH 1
-			OOODOWNLOADNAME 1
-			XPDINSTALLER 1
-			BETAUPGRADECODE
-			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
-			CHANGETARGETDIR 1
-			USE_FILEVERSION 1
-			LIBRARYVERSION 9.4.0
-			PATCHCODEFILE ooo_patchcodes.txt
-			JAVAPRODUCT 1
-			DOWNLOADBANNER	ooobanner_ooop.bmp
-			DOWNLOADBITMAP	ooobitmap_ooop.bmp
-			DOWNLOADSETUPICO	ooosetup.ico
-			PROGRESSBARCOLOR 126,170,23
-			PROGRESSSIZE 430,5
-			PROGRESSPOSITION 5,230
-			PROGRESSFRAMECOLOR 207,208,211
-			RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL http://www.libreoffice.org/
-            STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
-            STARTCENTER_LAYOUT_STYLE 0
-            REGISTRATION_PRODUCT OxygenOffice
-            REGISTRATION_CID 926117
-            DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
-		}
-		active			1
-		compression		5
-		script			setup_osljre
-		downloadname	OOOP_{productversion}_{os}_installwjre_{languages}
-		langpackdownloadname	OOOP_{productversion}_languagepack_{os}_installwjre_{languages}
-		helppackdownloadname	OOOP_{productversion}_helppack_{os}_installwjre_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
-	}
-}
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
deleted file mode 100644
index 2832afb3c..000000000
--- a/instsetoo_native/util/pack.lst
+++ /dev/null
@@ -1,20 +0,0 @@
-# Comment line
-# Pack.lst: Contains the packaging information for the update packaging process.
-# Syntax: Product, list of platforms, list of languages, target	(Separator: spaces)
-# Syntax for list of languages: One multilingual installation set uses separator ","
-# (Example: "en-US,de" creates english-german multilingual installation set)
-# Different installation sets use the "|" as separator
-
-# Product       List_of_platforms                                                   List_of_languages   Target
-
-LibreOffice             unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|bg|bn|ca|ca-XV|cs|da|de|el|en-GB|es|et|eu|fi|fr|ga|gl|he|hu|it|ja|km|ko|lt|mk|nb|nl|om|pl|pt|pt-BR|ru|sh|sl|sr|sv|tr|vi|zh-CN|zh-TW openoffice
-#LibreOffice      unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12                                  en-US   openoffice
-LibreOffice_wJRE        unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|bg|bn|ca|ca-XV|cs|da|de|el|en-GB|es|et|eu|fi|fr|ga|gl|he|hu|it|ja|km|ko|lt|mk|nb|nl|om|pl|pt|pt-BR|ru|sh|sl|sr|sv|tr|vi|zh-CN|zh-TW openofficewithjre
-#LibreOffice_Dev  unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro    en-US   openofficedev
-LibreOffice_SDK         unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro  en-US   sdkoo
-#LibreOffice_Dev_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro  en-US   sdkoodev
-#URE             unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12  en-US   ure
-LibreOfficeLanguagepack unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US|ar|as|ast|be|bg|bn|ca|ca-XV|cs|da|de|dz|el|en-GB|eo|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW ooolanguagepack
-#LibreOfficeLanguagepack   unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi                                     de      ooolanguagepack
-#LibreOfficeDevLanguagepack   unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro     ar|as|ast|bg|bn|ca|ca-XV|cs|da|de|dz|el|en-GB|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|km|kn|ko|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|vi|zh-CN|zh-TW   ooodevlanguagepack
-
diff --git a/instsetoo_native/util/update.xml b/instsetoo_native/util/update.xml
deleted file mode 100644
index 832de6bff..000000000
--- a/instsetoo_native/util/update.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inst:description xmlns:inst="http://installation.openoffice.org/description">
-  <inst:id></inst:id>
-  <inst:name></inst:name>
-  <inst:version></inst:version>
-  <inst:buildid></inst:buildid>
-  <inst:os></inst:os>
-  <inst:arch></inst:arch>
-  <inst:update type="text/html" src="http://update.libreoffice.org/ooo/snapshot.html" />
-</inst:description>
diff --git a/m4/mac/pkg.m4 b/m4/mac/pkg.m4
deleted file mode 100644
index 2cd2290fd..000000000
--- a/m4/mac/pkg.m4
+++ /dev/null
@@ -1,154 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-#
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-        else
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
diff --git a/ooo.lst.in b/ooo.lst.in
deleted file mode 100644
index 9a5c4085a..000000000
--- a/ooo.lst.in
+++ /dev/null
@@ -1,120 +0,0 @@
-http://download.go-oo.org/src
-48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
-63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
-09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
-0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
-128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
-17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
-18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
-26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
-284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
-2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz
-35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
-39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
-48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz
-4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
-4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz
-599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
-7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
-7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
-798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
-8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
-bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
-a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
-a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
-a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
-c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
-ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
-d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
-d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
-e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
-e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
-e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
-ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
-ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
-ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
-fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
-fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
-fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip
-831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
-067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
-3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
-3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz
-9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz
-a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
-3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz
-22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz
-0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz
-d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz
-220035f111ea045a51e290906025e8b5-libpng-1.5.1.tar.gz
-a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
-c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
-314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz
-451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
-90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
-0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
-71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
-5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2
-8d265a592619166f29c4672ea54812b7-libwpd-0.9.2.tar.bz2
-29721a16f25967d59969d5f0ae485b4a-libwps-0.2.2.tar.bz2
-0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
-0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
-90882496f9ff4cd6d75d61dac2f62f66-libvisio-0.0.3.tar.bz2
-http://download.go-oo.org/extern
-185d60944ea767075d27247c3162b3bc-unowinreg.dll
-b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
-http://www.numbertext.org/linux
-881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip
-http://ooo.itc.hu/oxygenoffice/download/libreoffice/
-@OOOP_GALLERY_PACK@
-@OOOP_TEMPLATES_PACK@
-@OOOP_FONTS_PACK@
-@OOOP_SAMPLES_PACK@
-@CT2N_EXTENSION_PACK@
-@BARCODE_EXTENSION_PACK@
-@DIAGRAM_EXTENSION_PACK@
-@VALIDATOR_EXTENSION_PACK@
-@WATCH_WINDOW_EXTENSION_PACK@
-@NUMBERTEXT_EXTENSION_PACK@
-@HUNART_EXTENSION_PACK@
-@TYPO_EXTENSION_PACK@
-@GOOGLE_DOCS_EXTENSION_PACK@
-@OOOBLOGGER_EXTENSION_PACK@
-@LIGHTPROOF_EN_US_PACK@
-@LIGHTPROOF_HU_PACK@
-@SUNTEMPLATES_DE_PACK@
-@SUNTEMPLATES_EN_US_PACK@
-@SUNTEMPLATES_ES_PACK@
-@SUNTEMPLATES_FR_PACK@
-@SUNTEMPLATES_HU_PACK@
-@SUNTEMPLATES_IT_PACK@
-
diff --git a/oowintool b/oowintool
deleted file mode 100755
index fc18a8dd0..000000000
--- a/oowintool
+++ /dev/null
@@ -1,336 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Copy;
-
-my $output_format = 'u';
-
-sub reg_get_value($)
-{
-    # it is believed that the registry moves keys around
-    # depending on OS version, this will de-mangle that
-    my $key = shift;
-    my $fhandle;
-    my $value;
-
-    open ($fhandle, "/proc/registry/$key") || return;
-    # reg keys have 0x00 0x5c at the end
-    $value = (split /\0/, <$fhandle>)[0];
-    close ($fhandle);
-
-    if ( defined $value ) {
-        chomp ($value);
-        $value =~ s|\r\n||;
-#    print "Value '$value' at '$key'\n";
-    }
-
-    return $value;
-}
-
-sub reg_find_key($)
-{
-    # it is believed that the registry moves keys around
-    # depending on OS version, this will de-mangle that
-    my $key = shift;
-    $key =~ s| |\\ |;
-    $key = `cd /proc/registry/ ; ls $key`;
-
-    return $key;
-}
-
-sub print_syntax()
-{
-    print "oowintool [option] ...\n";
-    print " encoding options\n";  
-    print "   -w   - windows form\n";
-    print "   -u   - unix form (default)\n";
-    print " commands:\n";
-    print "   --msvc-ver              - dump version of MSVC eg. 6.0\n";
-    print "   --msvc-copy-dlls <dest> - copy msvc[pr]??.dlls into <dest>/msvcp??/\n";
-    print "   --msvc-productdir       - dump productdir\n";
-    print "   --msvs-productdir       - dump productdir\n";
-    print "   --dotnetsdk-dir         - dump .NET SDK path\n";
-    print "   --csc-compilerdir       - dump .NET SDK compiler path\n";
-    print "   --windows-sdk-home      - dump Windows SDK install dir\n";
-    print "   --jdk-home              - dump the jdk install dir\n";
-    print "   --nsis-dir              - dump NSIS path\n";
-    print "   --help                  - this message\n";
-}
-
-sub cygpath($$$)
-{
-    my ($path, $input_format, $format) = @_;
-
-    return $path if ( ! defined $path );
-    # Strip trailing path separators
-    if ($input_format eq 'u') {
-	$path =~ s|/*\s*$||;
-    } else {
-	$path =~ s|\\*\s*$||;
-    }
-
-    # 'Unterminated quoted string errors' from 'ash' when 
-    # forking cygpath  so - reimplement cygpath in perl [ gack ]
-    if ($format eq 'u' && $input_format eq 'w') {
-	$path =~ s|\\|/|g;
-	$path =~ s|([a-zA-Z]):/|/cygdrive/$1/|g;
-    }
-    elsif ($format eq 'w' && $input_format eq 'u') {
-	$path =~ s|/cygdrive/([a-zA-Z])/|/$1/|g;
-	$path =~ s|/|\\|g;
-    }
-
-    return $path;
-}
-
-sub print_path($$)
-{
-    my ($path, $unix) = @_;
-
-    $path = cygpath ($path, $unix, $output_format);
-    
-    print $path;
-}
-
-sub print_windows_sdk_home()
-{
-    my ($value, $key);
-    $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v6.1/InstallationFolder');
-    if (!defined $value)
-    {
-        $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/CurrentInstallFolder');
-	}
-    if (!defined $value)
-    {
-	    $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
-	}
-    if (!defined $value)
-    {
-	    $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install Dir');
-	    $value = reg_get_value ($key);
-	}
-    if (!defined $value)
-    {
-        my $dir = cygpath (find_msvc()->{'product_dir'}, 'w', $output_format);
-		$value = `/bin/find "$dir" -iname platformsdk | head -n 1`;
-    }
-
-    defined $value || die "Windows Sdk not found";
-
-    print cygpath ($value, 'w', $output_format);
-}
-
-my %msvs_2008 = (
-    'ver' => '9.0',
-    'key' => 'Microsoft/VisualStudio/9.0/Setup/VS/ProductDir',
-    'dll_path' => 'VC/redist/x86/Microsoft.VC90.CRT',
-    'dll_suffix' => '90'
-);
-my %msvc_2008 = (
-    'ver' => '9.0',
-    'key' => 'Microsoft/VisualStudio/9.0/Setup/VC/ProductDir',
-    'dll_path' => 'redist/x86/Microsoft.VC90.CRT',
-    'dll_suffix' => '90'
-);
-my %msvs_express_2008 = (
-    'ver' => '9.0',
-    'key' => 'Microsoft/VCExpress/9.0/Setup/VS/ProductDir',
-    'dll_path' => 'VC/redist/x86/Microsoft.VC90.CRT',
-    'dll_suffix' => '90'
-);
-my %msvc_express_2008 = (
-    'ver' => '9.0',
-    'key' => 'Microsoft/VCExpress/9.0/Setup/VC/ProductDir',
-    'dll_path' => 'redist/x86/Microsoft.VC90.CRT',
-    'dll_suffix' => '90'
-);
-my %msvs_2010 = (
-    'ver' => '10.0',
-    'key' => 'Microsoft/VisualStudio/10.0/Setup/VS/ProductDir',
-    'dll_path' => 'VC/redist/x86/Microsoft.VC100.CRT',
-    'dll_suffix' => '100'
-);
-my %msvc_2010 = (
-    'ver' => '10.0',
-    'key' => 'Microsoft/VisualStudio/10.0/Setup/VC/ProductDir',
-    'dll_path' => 'redist/x86/Microsoft.VC100.CRT',
-    'dll_suffix' => '100'
-);
-
-sub find_msvs()
-{
-    my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2010 );
-
-    for $ver (@ms_versions)
-    {
-	my $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/" . $ver->{'key'});
-	if (defined $install && $install ne '') {
-	    $ver->{'product_dir'} = $install;
-	    return $ver;
-	}
-    }
-    die "Can't find MS Visual Studio / VC++";
-}
-
-sub find_msvc()
-{
-    my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2010 );
-
-    for $ver (@ms_versions)
-    {
-	my $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/" . $ver->{'key'});
-	if (defined $install && $install ne '') {
-	    $ver->{'product_dir'} = $install;
-	    return $ver;
-	}
-    }
-    die "Can't find MS Visual Studio / VC++";
-}
-
-sub print_msvc_ver()
-{
-    my $ver = find_msvc();
-    print $ver->{'ver'};
-}
-
-sub print_msvc_product_dir()
-{
-    my $ver = find_msvc();
-    print cygpath ($ver->{'product_dir'}, 'w', $output_format);
-}
-
-sub print_msvs_productdir()
-{
-    my $ver = find_msvs();
-    print cygpath ($ver->{'product_dir'}, 'w', $output_format);
-}
-
-sub print_csc_compiler_dir()
-{
-    my $dir = cygpath (reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/InstallRoot"), 'w', $output_format);
-    my $csc_exe = `/bin/find "$dir" -iname csc.exe | grep "v3\.5\." | head -n 1` ||
-                  `/bin/find "$dir" -iname csc.exe | grep "v4\." | head -n 1` ||
-                  `/bin/find "$dir" -iname csc.exe | grep "v2\." | head -n 1`;
-    print `dirname $csc_exe`;
-}
-
-sub print_dotnetsdk_dir()
-{
-    my $dir = 
-          reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1") ||
-          reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0");
-    if ($dir) {
-      print cygpath ($dir, 'w', $output_format);
-    }
-}
-
-sub print_jdk_dir()
-{
-    my $dir =
-	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.5/JavaHome") ||
-      reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.6/JavaHome") ||
-	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.4/JavaHome") ||
-	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.3/JavaHome");
-    print cygpath($dir, 'w', $output_format); 
-}
-
-sub print_nsis_dir()
-{
-    my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/NSIS/@");
-    print cygpath ($dir, 'w', $output_format) if defined $dir;
-}
-
-sub copy_dll($$$)
-{
-    my ($src, $fname, $dest) = @_;
-
-    -f "$src/$fname" || die "can't find $src";
-    -d $dest || die "no directory $dest";
-
-	print STDERR "Copying $src/$fname to $dest\n";
-    copy ("$src/$fname", $dest) || die "copy failed: $!";
-    chmod (0755, "$dest/$fname") || die "failed to set dll executable: $!";
-}
-
-sub msvc_find_version($)
-{
-    my $checkpath = shift;
-    my $ver = find_msvc();
-    my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' . 
-		  $ver->{$checkpath});
-    -d $srcdir && return $ver;
-    $ver = find_msvs();
-    $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' . 
-		  $ver->{$checkpath});
-    -d $srcdir && return $ver;
-    return undef;
-}
-
-sub msvc_copy_dlls($)
-{
-    my $dest = shift;
-    my $ver = msvc_find_version('dll_path');
-    defined $ver || return;
-    my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' . 
-		  $ver->{'dll_path'});
-
-    copy_dll ($srcdir, "msvcp" . $ver->{'dll_suffix'} . ".dll",
-	      $dest . $ver->{'dll_suffix'});
-    copy_dll ($srcdir, "msvcr" . $ver->{'dll_suffix'} . ".dll",
-	      $dest . $ver->{'dll_suffix'});
-    if ($ver->{'dll_suffix'} == 90) {
-        copy_dll ($srcdir, "msvcm" . $ver->{'dll_suffix'} . ".dll",
-                  $dest . $ver->{'dll_suffix'});
-        copy_dll ($srcdir, "Microsoft.VC90.CRT.manifest", $dest . $ver->{'dll_suffix'});
-    }
-}
-
-if (!@ARGV) {
-    print_syntax();
-    exit 1;
-}
-
-my @commands = ();
-my $opt;
-while (@ARGV) {
-    $opt = shift @ARGV;
-    
-    if ($opt eq '-w' || $opt eq '-u') {
-	$output_format = substr($opt, 1, 1);
-    } else {
-	push @commands, $opt;
-    }
-}
-
-while (@commands) {
-    $opt = shift @commands;
-
-    if (0) {
-    } elsif ($opt eq '--msvc-ver') {
-	print_msvc_ver();
-    } elsif ($opt eq '--msvc-copy-dlls') {
-	my $dest = shift @commands;
-	defined $dest || die "copy-dlls requires a destination directory";
-	msvc_copy_dlls( $dest );
-    } elsif ($opt eq '--msvs-productdir') {
-	print_msvs_productdir();
-    } elsif ($opt eq '--msvc-productdir') {
-	print_msvc_product_dir();
-    } elsif ($opt eq '--dotnetsdk-dir') {
-	print_dotnetsdk_dir();
-    } elsif ($opt eq '--csc-compilerdir') {
-	print_csc_compiler_dir();
-    } elsif ($opt eq '--windows-sdk-home') {
-	print_windows_sdk_home();
-    } elsif ($opt eq '--jdk-home') {
-	print_jdk_dir();
-    } elsif ($opt eq '--nsis-dir') {
-	print_nsis_dir();
-    } elsif ($opt eq '--help' || $opt eq '/?') {
-	print_syntax();
-    } else {
-	print "Unknown option '$opt'\n";
-	print_syntax();
-	exit 1;
-    }
-}
-
diff --git a/post_download.in b/post_download.in
deleted file mode 100755
index d7fa19a47..000000000
--- a/post_download.in
+++ /dev/null
@@ -1,115 +0,0 @@
-AC_INIT([LibreOffice], [3.4],,, [http://documentfoundation.org/])
-AC_PREREQ(2.50)
-
-echo "********************************************************************"
-echo "*"
-echo "*   Running the post download checks."
-echo "*"
-echo "********************************************************************"
-
-dnl ===================================================================
-dnl The following is a list of supported systems.
-dnl ===================================================================
-AC_CANONICAL_SYSTEM
-case "$host_os" in
-    solaris*)
-        _os=SunOS
-        ;;
-    linux-gnu*|k*bsd*-gnu*)
-        _os=Linux
-        ;;
-    gnu)
-        _os=GNU
-        ;;
-    cygwin*|mingw32*) # Windows
-        _os=WINNT
-        ;;
-    darwin*) # Mac OS X or iOS
-        _os=Darwin
-        ;;
-    freebsd*)
-        _os=FreeBSD
-        ;;
-    *netbsd*)
-        _os=NetBSD
-        ;;
-    aix*)
-        _os=AIX
-        ;;
-    openbsd*)
-        _os=OpenBSD
-        ;;
-    dragonfly*)
-        _os=DragonFly
-        ;;
-    androideabi*)
-        _os=Android
-        ;;
-   *)
-   AC_MSG_ERROR([$host_os operating system is not suitable for LibreOffice!])
-   ;;
-esac
-
-dnl ===================================================================
-dnl Windows builds need dbghelp.dll in external/dbghelp/
-dnl ===================================================================
-if test "$_os" = "WINNT"; then
-   AC_MSG_CHECKING([for dbghelp.dll])
-   if test -f ./external/dbghelp/dbghelp.dll; then
-      AC_MSG_RESULT([found])
-   else
-      AC_MSG_ERROR([dbghelp.dll is missing in external/dbghelp/.
-Get it from the Microsoft site and put it into external/dbghelp.
-(Note: Microsoft seems to enjoy changing the exact location of this file. You
-may have to search Microsoft's website.) Last time it was seen at:
-<http://www.microsoft.com/downloads/release.asp?releaseid=30682>.])
-   fi
-fi
-
-dnl ===================================================================
-dnl Windows builds - use oowintool to copy CRT dlls and manifest
-dnl ===================================================================
-if test "$COM" = "MSC"; then
-   if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
-       :
-    else
-       AC_MSG_ERROR([oowintool failed to copy CRT])
-    fi
-fi
-
-dnl ===================================================================
-dnl Windows builds need gdiplus.dll in external/gdiplus/
-dnl ===================================================================
-if test "$_os" = "WINNT"; then
-   AC_MSG_CHECKING([for gdiplus.dll])
-   if test -x ./external/gdiplus/gdiplus.dll; then
-      AC_MSG_RESULT([found])
-   else
-      AC_MSG_ERROR([gdiplus.dll is missing in external/gdiplus/.
-Get it from the Microsoft site and put it into external/gdiplus.
-You may have to search Microsoft's website. Last time it was seen at:
-<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>.])
-   fi
-fi
-
-dnl ===================================================================
-dnl Windows builds need vcredist_x86.exe and vcredist_x64.exe in external/vcredist/
-dnl ===================================================================
-if test "$COM" = "MSC"; then
-   AC_MSG_CHECKING([for vcredist_x86.exe])
-   if test -e ./external/vcredist/vcredist_x86.exe; then
-      AC_MSG_RESULT([found])
-   else
-      AC_MSG_ERROR([vcredist_x86.exe is missing in external/vcredist/.
-Get the version corresponding to your Visual Studio from the Microsoft site
-and put it into external/vcredist.])
-   fi
-   AC_MSG_CHECKING([for vcredist_x64.exe])
-   if test -e ./external/vcredist/vcredist_x64.exe; then
-      AC_MSG_RESULT([found])
-   else
-      AC_MSG_ERROR([vcredist_x64.exe is missing in external/vcredist/.
-Get the version corresponding to your Visual Studio from the Microsoft site
-and put it into external/vcredist.])
-   fi
-fi
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
deleted file mode 100755
index 677bf2843..000000000
--- a/scp2/inc/macros.inc
+++ /dev/null
@@ -1,547 +0,0 @@
-#ifndef MACROS_INC
-#define MACROS_INC
-/* =====================================================
- * global helper macros
- * =====================================================*/
-
-#define DOSTRING( x )                           #x
-#define STRING( x )                             DOSTRING( x )
-#define DOCONCAT2( x, y )                       x##y
-#define CONCAT2( x, y)                          DOCONCAT2(x,y)
-#define DOCONCAT3( x, y, z )                    x##y##z
-#define CONCAT3( x, y, z )                      DOCONCAT3(x,y,z)
-#define DOCONCAT4( x, y, z, a )                 x##y##z##a
-#define CONCAT4( x, y, z, a )                   DOCONCAT4(x,y,z,a)
-#define DOCONCAT5( x, y, z, a, b )              x##y##z##a##b
-#define CONCAT5( x, y, z, a, b )                DOCONCAT5(x,y,z,a,b)
-#define DOCONCAT6( x, y, z, a, b, c )           x##y##z##a##b##c
-#define CONCAT6( x, y, z, a, b, c )             DOCONCAT6(x,y,z,a,b,c)
-#define DOCONCAT7( x, y, z, a, b, c, u)         x##y##z##a##b##c##u
-#define CONCAT7( x, y, z, a, b, c, u)           DOCONCAT7(x,y,z,a,b,c,u)
-#define DOCONCAT8( x, y, z, a, b, c, u, v)      x##y##z##a##b##c##u##v
-#define CONCAT8( x, y, z, a, b, c, u, v)        DOCONCAT8(x,y,z,a,b,c,u,v)
-#define DOCONCAT9( x, y, z, a, b, c, u, v, w)   x##y##z##a##b##c##u##v##w
-#define CONCAT9( x, y, z, a, b, c, u, v, w)     DOCONCAT9(x,y,z,a,b,c,u,v,w)
-
-#define MOD_NAME_DESC(id) \
-        ALL_LANG(Name,STR_NAME_##id); \
-        ALL_LANG(Description,STR_DESC_##id)
-
-#define MOD_NAME_DESC_ON_DESELECT(id) \
-        MOD_NAME_DESC(id); \
-        ALL_LANG(OnDeselect,STR_DESELECT_##id)
-
-#define REG_VALUE_LNG(id) \
-        ALL_LANG(Value,STR_REG_VAL_##id);
-
-#define FOLDERITEM_NAME_LNG(id) \
-        ALL_LANG(Name,STR_FI_NAME_##id);
-
-#define ALL_LANG_STR_KEY(ident) \
-        ALL_LANG(Key,ident)
-
-#define ALL_LANG_STR_KEY_LNG(ident) \
-        ALL_LANG(Key,STR_KEY_##ident)
-
-#define ALL_LANG_STR_VALUE_LNG(ident) \
-        ALL_LANG(Value,STR_VALUE_##ident)
-
-#define ALL_LANG_VALUE(vident) \
-        ALL_LANG(Value,vident)
-
-#define ALL_LANG_KEY(vident) \
-        ALL_LANG(Key,vident)
-
-
-#ifdef UNX
-    #ifdef MACOSX
-        #define UNXSUFFIX .dylib
-    #else
-        #define UNXSUFFIX .so
-    #endif
-#endif
-
-#ifdef UNX
-    #define LIBNAME(name)                     STRING(CONCAT4(lib,name,DLLPOSTFIX,UNXSUFFIX))
-    #define FILTER_LIBNAME(name)              LIBNAME(name)
-    #define EXENAME(name)                     STRING(name)
-    #define PROFILENAME(name)                 STRING(CONCAT2(name,rc))
-    #define SPECIAL_NAME(name)                STRING(CONCAT3(lib,name,UNXSUFFIX))
-    #define SPECIAL_COMPONENT_LIB_NAME(name)  STRING(CONCAT2(name,UNXSUFFIX))
-#else
-    #define LIBNAME(name)                     STRING(CONCAT3(name,DLLPOSTFIX,.dll))
-    #define FILTER_LIBNAME(name)              LIBNAME(name)
-    #define EXENAME(name)                     STRING(CONCAT2(name,.exe))
-    #define PROFILENAME(name)                 STRING(CONCAT2(name,.ini))
-    #define SPECIAL_NAME(name)                STRING(CONCAT2(name,.dll))
-    #define SPECIAL_COMPONENT_LIB_NAME(name)  STRING(CONCAT2(name,.dll))
-#endif
-
-#define RESFILENAME(name,lang)                STRING(CONCAT3(name,lang,.res))
-#define SHORTRESFILENAME(name,lang)           STRING(CONCAT3(name,lang,.res))
-#define READMETXTFILENAME(name,lang,ext)      STRING(CONCAT4(name,lang,.,ext))
-#define READMEFILENAME(name,lang)             STRING(CONCAT2(name,lang))
-#define HELPFILENAME(name,endung)             STRING(CONCAT3(name,.,endung))
-#define EXTRAFILENAME(name,lang)              STRING(CONCAT3(name,lang,.zip))
-#define CONFIGLANGFILENAME(name,lang,ext)     STRING(CONCAT4(name,lang,.,ext))
-
-#if defined WNT
-#define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program
-#else
-#define SCP2_OOO_BIN_DIR gid_Dir_Program
-#endif
-
-#define BIN_FILE_BODY \
-        UnixRights   = 555
-
-#define TXT_FILE_BODY \
-        UnixRights   = 444
-
-#define USER_FILE_BODY \
-        UnixRights   = 644
-
-#define PACKED_TXT_FILE_BODY \
-        TXT_FILE_BODY; \
-        Styles = (PACKED)
-
-#define PACKED_TXT_FILE_BODY_PATCH \
-        TXT_FILE_BODY; \
-        Styles = (PACKED,PATCH)
-
-#define ARCHIVE_TXT_FILE_BODY \
-        TXT_FILE_BODY; \
-        Styles = (ARCHIVE)
-
-#define ARCHIVE_TXT_FILE_BODY_PATCH \
-        TXT_FILE_BODY; \
-        Styles = (ARCHIVE,PATCH)
-
-#ifdef WITH_HELPPACK_INTEGRATION
-#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
-        TXT_FILE_BODY; \
-        Styles = (ARCHIVE,FORCEHELPPACK,LANGUAGEMODULE)
-#else
-#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
-        TXT_FILE_BODY; \
-        Styles = (ARCHIVE,HELPPACK,LANGUAGEMODULE)
-#endif
-
-#define ARCHIVE_SUBST_FILE_BODY \
-        TXT_FILE_BODY; \
-        Styles = (ARCHIVE,SUBSTITUTE)
-
-#define ARCHIVE_SUBST_FILE_BODY_PATCH \
-        TXT_FILE_BODY; \
-        Styles = (ARCHIVE,SUBSTITUTE,PATCH)
-
-#define PACKED_LIB_FILE_BODY \
-        TXT_FILE_BODY; \
-        Styles = (PACKED); \
-        Dir    = SCP2_OOO_BIN_DIR
-
-#define PACKED_LIB_FILE_BODY_PATCH \
-        TXT_FILE_BODY; \
-        Styles = (PACKED,PATCH); \
-        Dir    = SCP2_OOO_BIN_DIR
-
-#define PACKED_FILTER_FILE_BODY \
-        TXT_FILE_BODY; \
-        Styles = (PACKED); \
-        Dir    = gid_Dir_Filter
-
-#define PACKED_FILTER_FILE_BODY_PATCH \
-        TXT_FILE_BODY; \
-        Styles = (PACKED,PATCH); \
-        Dir    = gid_Dir_Filter
-
-#define STD_LIB_FILE(id,name) \
-    File id \
-        Name   = LIBNAME(name); \
-        PACKED_LIB_FILE_BODY; \
-    End
-
-#define STD_LIB_FILE_PATCH(id,name) \
-    File id \
-        Name   = LIBNAME(name); \
-        PACKED_LIB_FILE_BODY_PATCH; \
-    End
-
-#define SPECIAL_LIB_FILE(id,name) \
-    File id \
-        Name    = SPECIAL_NAME(name); \
-        PACKED_LIB_FILE_BODY; \
-    End
-
-#define SPECIAL_LIB_FILE_PATCH(id,name) \
-    File id \
-        Name    = SPECIAL_NAME(name); \
-        PACKED_LIB_FILE_BODY_PATCH; \
-    End
- 
-#define STD_RES_FILE(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        RESFILE_ALL_LANG(name); \
-        Dir     = gid_Dir_Resource; \
-        Styles  = (PACKED); \
-    End
-
-#define BINFILTER_RES_FILE(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Name    = STRING(CONCAT3(name,en-US,.res)); \
-        Dir     = gid_Dir_Resource; \
-        Styles  = (PACKED); \
-    End
-
-#define BRAND_RES_FILE(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        RESFILE_ALL_LANG(name); \
-        Dir     = gid_Brand_Dir_Program_Resource; \
-        Styles  = (PACKED); \
-    End
-
-#define STD_RES_FILE_PATCH(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        RESFILE_ALL_LANG(name); \
-        Dir     = gid_Dir_Resource; \
-        Styles  = (PACKED,PATCH); \
-    End
-
-#define STD_RES_FILE_ONLY_PATCH(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        RESFILE_ALL_LANG(name); \
-        Dir     = gid_Dir_Resource; \
-        Styles  = (PACKED,PATCH,PATCH_ONLY); \
-    End
-
-#define STD_FILTER_FILE(id,name) \
-    File id \
-        PACKED_LIB_FILE_BODY; \
-        Name = FILTER_LIBNAME(name); \
-    End
-
-#define STD_FILTER_FILE_PATCH(id,name) \
-    File id \
-        PACKED_LIB_FILE_BODY_PATCH; \
-        Name = FILTER_LIBNAME(name); \
-    End
-
-#define STD_FONTUNX_FILE(id,name,fontname) \
-    File id \
-        TXT_FILE_BODY; \
-        Dir       = gid_Dir_Fonts_Truetype; \
-        Styles    = (PACKED, FONT_WARN_IF_EXISTS); \
-        Name      = STRING(name) ; \
-    End
-
-#define STD_FONTWIN_FILE(id,name,fontname) \
-    File id \
-        TXT_FILE_BODY; \
-        Dir      = PREDEFINED_OSSYSTEMFONTDIR; \
-        Styles   = (PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \
-        Name     = STRING(name) ; \
-        FontName = STRING(fontname) ; \
-        NetDir   = gid_Dir_Winfonts; \
-    End
-
-#ifdef UNX
-#define STD_FONT_FILE(id,name,fontname) \
-    File id \
-        TXT_FILE_BODY; \
-        Dir       = gid_Dir_Fonts_Truetype; \
-        Styles    = (PACKED, FONT_WARN_IF_EXISTS); \
-        Name      = STRING(name) ; \
-    End
-#endif
-
-#ifdef UNX
-#define STD_FONT_FILE_DUO(id,name,unxfontname,winfontname) \
-    File id \
-        TXT_FILE_BODY; \
-        Dir       = gid_Dir_Fonts_Truetype; \
-        Styles    = (PACKED, FONT_WARN_IF_EXISTS); \
-        Name      = STRING(name) ; \
-    End
-#endif
-
-#ifdef WNT
-#define STD_FONT_FILE(id,name,fontname) \
-    File id \
-        TXT_FILE_BODY; \
-        Dir      = PREDEFINED_OSSYSTEMFONTDIR; \
-        Styles   = (PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \
-        Name     = STRING(name) ; \
-        FontName = STRING(fontname) ; \
-        NetDir   = gid_Dir_Winfonts; \
-    End
-#endif
-
-#ifdef WNT
-#define STD_FONT_FILE_DUO(id,name,unxfontname,winfontname) \
-    File id \
-        TXT_FILE_BODY; \
-        Dir      = PREDEFINED_OSSYSTEMFONTDIR; \
-        Styles   = (PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \
-        Name     = STRING(name) ; \
-        FontName = STRING(winfontname) ; \
-        NetDir   = gid_Dir_Winfonts; \
-    End
-#endif
-
-#define STD_JAR_FILE(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Name     = STRING(CONCAT2(name,.jar)); \
-        Dir      = gid_Dir_Classes; \
-        Styles   = (PACKED,DONT_OVERWRITE); \
-    End
-
-#define STD_JAR_FILE_PATCH(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Name     = STRING(CONCAT2(name,.jar)); \
-        Dir      = gid_Dir_Classes; \
-        Styles   = (PACKED,DONT_OVERWRITE,PATCH); \
-    End
-
-#define JARFILENAME(name) STRING(CONCAT2(name,.jar))
-
-#define PACKED_SHELLNEW_FILE_BODY \
-        TXT_FILE_BODY; \
-        Styles = (PACKED,WORKSTATION, OVERWRITE); \
-        Dir    = PREDEFINED_OSSHELLNEWDIR; \
-        NetDir = gid_Dir_Shellnew
-
-#define STD_SHELLNEW_FILE(id,name) \
-    File id \
-        PACKED_SHELLNEW_FILE_BODY; \
-        Name      = STRING(name) ; \
-    End
-
-#define SPECIAL_COMPONENT_LIB_FILE(id,name) \
-    File id \
-        Name     = SPECIAL_COMPONENT_LIB_NAME(name); \
-        PACKED_LIB_FILE_BODY; \
-    End
-
-#define SPECIAL_COMPONENT_LIB_FILE_PATCH(id,name) \
-    File id \
-        Name     = SPECIAL_COMPONENT_LIB_NAME(name); \
-        PACKED_LIB_FILE_BODY_PATCH; \
-    End
-
-#define SPECIAL_NO_WARNING_IF_NOT_EXISTS_FILE(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Name = LIBNAME(name); \
-        Dir = SCP2_OOO_BIN_DIR; \
-        Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS); \
-    End
-
-// ---------------------------------------
-#define CONDITIONAL_MODULE_ENTRY(name,modid) \
-    Module gid_Module_Root_Reg_##name \
-	ParentID = modid; \
-	Name = STRING(CONCAT2(gid_Module_Root_,name)); \
-	Description = STRING(CONCAT2(gid_Module_Root_,name)); \
-	Default = YES; \
-	Styles = (HIDDEN_ROOT); \
-End
-
-#define REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
-    RegistryItem gid_Regitem_OpenOffice_##cond##_OpenWith_##doc_type \
-        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = modid; \
-        Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-        Name = STRING(CONCAT2(OpenOffice.org.,name)); \
-        Value = " "; \
-    End
-
-#define REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \
-    RegistryItem gid_Regitem_OpenOffice_##cond##_OpenWith_##doc_type \
-        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = modid; \
-        Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-        Name = STRING(CONCAT2(OpenOffice.org.,name)); \
-        Value = " "; \
-    End
-
-#define CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
-    RegistryItem gid_Regitem__##name \
-        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = gid_Module_Root_Reg_##name; \
-        Subkey = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
-        ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
-    End
-
-#define REGISTRY_ENTRY_DOC(name,modid,disp_name) \
-    RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
-        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = modid; \
-        Subkey = STRING(CONCAT2(OpenOffice.org.,name)); \
-        REG_VALUE_LNG(disp_name) \
-    End
-
-#define REGISTRY_ENTRY_ICON(name,modid,icon_id) \
-    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
-        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\DefaultIcon)); \
-        Value = "<progpath>\program\soffice.exe," STRING(icon_id); \
-    End
-
-#define REGISTRY_ENTRY_SHELL(name,default,modid) \
-    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
-        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell)); \
-        Value = STRING(default); \
-    End
-
-#define REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
-    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
-        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new)); \
-        REG_VALUE_LNG(NEW) \
-    End \
-    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
-        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new\command)); \
-        Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \
-    End
-
-#define REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
-    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
-        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\open\command)); \
-        Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \
-    End
-
-#define REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
-    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
-        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\print\command)); \
-        Value = "\"<progpath>\program\\" STRING(app) "\" -p \"%1\""; \
-    End
-
-#define REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
-    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
-        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\printto\command)); \
-        Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
-    End
-
-#define REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
-    RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_,name) \
-        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
-        ModuleID = modid; \
-        Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
-        Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
-        Styles = (); \
-    End
-
-#define REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
-    RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_,name) \
-        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
-        ModuleID = modid; \
-        Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
-        Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
-        Styles = (); \
-    End
-
-#define CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
-    CONDITIONAL_MODULE_ENTRY(name,modid) \
-    REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
-    CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
-    REGISTRY_ENTRY_DOC(name,modid,disp_name) \
-    REGISTRY_ENTRY_ICON(name,modid,icon_id) \
-    REGISTRY_ENTRY_SHELL(name,default,modid) \
-    REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
-    REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
-    REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
-    REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
-    REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
-
-#define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
-    CONDITIONAL_MODULE_ENTRY(name,modid) \
-    REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \
-    CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
-    REGISTRY_ENTRY_DOC(name,modid,disp_name) \
-    REGISTRY_ENTRY_ICON(name,modid,icon_id) \
-    REGISTRY_ENTRY_SHELL(name,default,modid) \
-    REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
-    REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
-    REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
-    REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
-    REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
-
-// ---------------------------------------
-
-#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
-    RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \
-        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
-        ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; \
-        ComponentCondition = "VersionNT >= 600"; \
-        Styles = (X64); \
-        Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \
-        Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
-        Val64 = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
-    End
-
-// ---------------------------------------
-
-#if defined WNT
-#define SCP2_URE_DL_DIR gid_Dir_Ure_Bin
-#define SCP2_URE_DL_NORMAL(n) n ".dll"
-#define SCP2_URE_DL_BARE(n) n ".dll"
-#define SCP2_URE_DL_VER(n, v) n v ".dll"
-#define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
-#define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
-#define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
-#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
-#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
-#if defined _DEBUG_RUNTIME
-#define SCP2_STDLP_DEBUG "d"
-#else
-#define SCP2_STDLP_DEBUG ""
-#endif
-#else
-#define SCP2_URE_DL_DIR gid_Dir_Ure_Lib
-#define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX)
-#define SCP2_URE_DL_BARE(n) n STRING(UNXSUFFIX)
-#define SCP2_URE_DL_VER(n, v) "lib" n STRING(UNXSUFFIX) "." v
-#define SCP2_URE_DL_COMID_VER(n, v) \
-    "lib" n STRING(COMID) STRING(UNXSUFFIX) "." v
-#define SCP2_URE_DL_COMID_NORMAL(n) \
-    "lib" n STRING(COMID) STRING(UNXSUFFIX)
-#define SCP2_URE_DL_UNO_VER(n, v) "libuno_" n STRING(UNXSUFFIX) "." v
-#define SCP2_URE_DL_UNO_NORMAL(n) "libuno_" n STRING(UNXSUFFIX)
-#define SCP2_URE_DL_UNO_COMID_VER(n, v)	\
-    "libuno_" n STRING(COMID) STRING(UNXSUFFIX) "." v
-#define SCP2_URE_DL_UNO_COMID_NORMAL(n)	\
-    "libuno_" n STRING(COMID) STRING(UNXSUFFIX)
-#define SCP2_URE_SHARE_DIR gid_Dir_Ure_Share
-#endif
-#if defined MACOSX
-#define SCP2_URE_JDL_NORMAL(n) "lib" n ".jnilib"
-#else
-#define SCP2_URE_JDL_NORMAL(n) SCP2_URE_DL_NORMAL(n)
-#endif
-
-#include <langmacros.inc>
-
-
-#endif // MACROS_INC
-
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
deleted file mode 100644
index 20a7b291a..000000000
--- a/scp2/macros/macro.pl
+++ /dev/null
@@ -1,303 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-my $outfile;
-my $destfile;
-my $config_stamp;
-my $lastcompletelangiso_var;
-my $completelangiso_var = $ENV{COMPLETELANGISO_VAR};
-
-if ( !defined $completelangiso_var) {
-    print STDERR "ERROR: No language defined!\n";
-    exit 1;
-}
-
-my $poorhelplocalizations_var = $ENV{WITH_POOR_HELP_LOCALIZATIONS};
-$poorhelplocalizations_var = $completelangiso_var if ( $poorhelplocalizations_var eq "ALL" );
-my %poorhelplocalizations;
-foreach $lang (split (/ /, $poorhelplocalizations_var)) {
-  next if ( $lang eq "en-US");
-  $poorhelplocalizations{$lang}++;
-}
-
-if (!args_require_build()) {
-    print STDERR "No new languages, or config. Keeping old file\n";
-    exit 0;
-}
-print STDERR "re-building macros\n";
-
-my @completelangiso = split " +", $completelangiso_var;
-
-open OUTFILE, ">$outfile" or die "$0 ERROR: cannot open $outfile for writing!\n";
-
-print OUTFILE "// generated file, do not edit\n\n";
-print OUTFILE "// languages used for last time generation\n";
-print OUTFILE "// completelangiso: $completelangiso_var\n\n";
-write_ALL_LANG();
-write_OTHER_LANGS();
-write_DIR_ISOLANGUAGE_ALL_LANG_2();
-write_DIR_ISOLANGUAGE_ALL_LANG();
-write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ();
-write_DIR_IDENT_ALL_LANG();
-write_EXTRA_ALL_LANG();
-write_EXTRA_ALL_LANG_BUT_EN_US();
-write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG();
-write_EXTRA_IDENT_ALL_LANG();
-write_RESFILE_ALL_LANG();
-write_SHORT_RESFILE_ALL_LANG();
-write_README_ALL_LANG();
-write_README_TXT_ALL_LANG();
-write_VALUE_ALL_LANG_LETTER_DIR();
-write_KEY_ALL_LANG_LETTER();
-write_FILE_ALL_LANG_LETTER();
-
-close OUTFILE;
-
-rename $outfile, $destfile;
-
-sub write_ALL_LANG
-{
-    print OUTFILE "#define ALL_LANG(ident, resid) ";
-    foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tident ($lang) = resid";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-    print OUTFILE "\n\n";
-}
-
-sub write_OTHER_LANGS
-{
-    print OUTFILE "#define OTHER_LANGS ";
-    foreach $lang (@completelangiso) {
-        next if ( $lang eq "en-US");
-        print OUTFILE "\\\n\tDosName ($lang) = \"$lang\"";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-        print OUTFILE "\n\n";
-}
-
-sub write_DIR_ISOLANGUAGE_ALL_LANG_2
-{
-    print OUTFILE "#define DIR_ISOLANGUAGE_ALL_LANG_2 ";
-    print OUTFILE "\\\n\tDosName (en-US) = \"en-US\"; \\\n\t";
-    print OUTFILE "OTHER_LANGS";
-        print OUTFILE "\n\n";
-}
-
-sub write_DIR_ISOLANGUAGE_ALL_LANG
-{
-    print OUTFILE "#define DIR_ISOLANGUAGE_ALL_LANG ";
-    print OUTFILE "\\\n\tDosName (en-US) = \"en\"; \\\n\t";
-    print OUTFILE "OTHER_LANGS";
-        print OUTFILE "\n\n";
-}
-
-sub write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ
-{
-    print OUTFILE "#define DIR_ISOLANGUAGE_ALL_LANG_LPROJ ";
-    foreach $lang (@completelangiso) {
-        my $speciallang = $lang;
-        if ( $speciallang eq "en-US" ) { $speciallang = "en"; }
-        print OUTFILE "\\\n\tDosName ($lang) = \"$speciallang.lproj\"";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-    print OUTFILE "\n\n";
-}
-
-sub write_DIR_IDENT_ALL_LANG
-{
-    print OUTFILE "#define DIR_IDENT_ALL_LANG(name) ";
-    foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tDosName ($lang) = STRING(name)";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-    print OUTFILE "\n\n";
-}
-
-sub write_EXTRA_ALL_LANG
-{
-    print OUTFILE "#define EXTRA_ALL_LANG(name,ext) ";
-    foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-    print OUTFILE "\n\n";
-}
-
-sub write_EXTRA_ALL_LANG_BUT_EN_US
-{
-    print OUTFILE "#define EXTRA_ALL_LANG_BUT_EN_US(name,ext) ";
-    my $first = 1;
-    foreach $lang (@completelangiso) {
-        if ($lang ne "en-US") {
-            print OUTFILE "; " unless $first;
-            $first = 0;
-            print OUTFILE
-                "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)";
-        }
-    }
-    print OUTFILE "\n\n";
-}
-
-sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG
-{
-    my $first = 1;
-    print OUTFILE "#define EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(name) ";
-    foreach $lang (@completelangiso) {
-        next if ( $poorhelplocalizations{$lang} );
-        print OUTFILE ";" unless $first;
-        $first = 0;
-        print OUTFILE "\\\n\tName ($lang) = EXTRAFILENAME(name,_$lang)";
-    }
-    print OUTFILE "\n\n";
-}
-
-sub write_EXTRA_IDENT_ALL_LANG
-{
-    print OUTFILE "#define EXTRA_IDENT_ALL_LANG(name) ";
-    foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tName ($lang) = STRING(name)";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-    print OUTFILE "\n\n";
-}
-
-sub write_RESFILE_ALL_LANG
-{
-    print OUTFILE "#define RESFILE_ALL_LANG(name) ";
-    foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tName ($lang) = RESFILENAME(name,$lang)";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-    print OUTFILE "\n\n";
-}
-
-sub write_SHORT_RESFILE_ALL_LANG
-{
-    print OUTFILE "#define SHORT_RESFILE_ALL_LANG(name) ";
-    foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tName ($lang) = SHORTRESFILENAME(name,$lang)";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-    print OUTFILE "\n\n";
-}
-
-sub write_README_ALL_LANG
-{
-    print OUTFILE "#define README_ALL_LANG(key, name) ";
-    foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tkey ($lang) = READMEFILENAME(name,_$lang)";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-    print OUTFILE "\n\n";
-}
-
-sub write_README_TXT_ALL_LANG
-{
-    print OUTFILE "#define README_TXT_ALL_LANG(key, name, ext) ";
-    foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tkey ($lang) = READMETXTFILENAME(name,_$lang,ext)";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-    print OUTFILE "\n\n";
-}
-
-# FIXME: Not used at all in OOo?, #i38597#
-sub write_VALUE_ALL_LANG_LETTER_DIR
-{
-    print OUTFILE "#define VALUE_ALL_LANG_LETTER_DIR ";
-    print OUTFILE "\\\n\tValue (en-US) = STRING(en);";
-    foreach $lang (@completelangiso) {
-        next if ( $lang eq "en-US");
-        print OUTFILE "\\\n\tValue ($lang) = STRING($lang)";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-    print OUTFILE "\n\n";
-}
-
-sub write_KEY_ALL_LANG_LETTER
-{
-    print OUTFILE "#define KEY_ALL_LANG_LETTER ";
-    foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tKey ($lang) = STRING($lang)";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-    print OUTFILE "\n\n";
-}
-
-sub write_FILE_ALL_LANG_LETTER
-{
-    print OUTFILE "#define FILE_ALL_LANG_LETTER(name, ext) ";
-    foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,$lang,ext)";
-        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
-    }
-    print OUTFILE "\n\n";
-}
-
-sub args_require_build
-{
-    while (@ARGV) {
-        $opt = shift @ARGV;
-        $destfile = shift @ARGV if ($opt eq '-o');
-        $config_stamp = shift @ARGV if ($opt eq '-c');
-    }
-    usage() if (!defined ($destfile) || !defined ($config_stamp));
-    $outfile = "$destfile.tmp";
-
-    if ( -f "$destfile" ) {
-        # changed script - run always
-        return 1 if (stat($0))[9] > (stat("$destfile"))[9] ;
-
-        # changed set_soenv.stamp - run always
-        if (-f "$config_stamp") {
-            return 1 if (stat($config_stamp))[9] > (stat($destfile))[9];
-        }
-
-        open OLDFILE, "$destfile" or die "$0 - ERROR: $outfile exists but isn't readable.\n";
-        while ( $line = <OLDFILE> ) {
-            if ( $line =~ /^\/\/.*completelangiso:/ ) {
-                $lastcompletelangiso_var = $line;
-                chomp $lastcompletelangiso_var;
-                $lastcompletelangiso_var =~ s/^\/\/.*completelangiso:\s*//;
-                last;
-            }
-                
-        }
-        close OLDFILE;
-
-        return 0 if ( "$completelangiso_var" eq "$lastcompletelangiso_var" );
-    }
-    return 1;
-}
-
-sub usage
-{
-    print STDERR "Generate language dependend macros use in *.scp files\n";
-    print STDERR "perl $0 -o <outputfile> -c <config_stamp_file>\n";
-    exit  1;
-}
diff --git a/scp2/macros/makefile.mk b/scp2/macros/makefile.mk
deleted file mode 100644
index 790a27385..000000000
--- a/scp2/macros/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=scp2
-TARGET=macros
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.INCLUDE :  target.mk
-
-# force expanding
-COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
-.EXPORT : COMPLETELANGISO_VAR
-
-ALLTAR : $(INCCOM)$/langmacros.inc
-
-.PHONY $(INCCOM)$/langmacros.inc:
-    @echo ------------------------------
-    @echo Making: $@  
-    $(COMMAND_ECHO)$(PERL) macro.pl $(VERBOSITY) -o $@ -c $(SOLARSRC)/set_soenv.stamp
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
deleted file mode 100644
index f225c3e3e..000000000
--- a/scp2/prj/build.lst
+++ /dev/null
@@ -1,30 +0,0 @@
-cp    scp2    :    TRANSLATIONS:translations i18npool DESKTOP:setup_native DESKTOP:l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
-cp    scp2                        usr1     -    all    cp_mkout NULL
-cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
-cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
-cp    scp2\source\activex         nmake    -    all    cp_activex cp_langmacros cp_langtemplates NULL
-cp    scp2\source\binfilter       nmake    -    all    cp_binfilter cp_langmacros cp_langtemplates NULL
-cp    scp2\source\calc            nmake    -    all    cp_calc cp_langmacros cp_langtemplates NULL
-cp    scp2\source\canvas          nmake    -    all    cp_canvas cp_langmacros cp_langtemplates NULL
-cp    scp2\source\crashrep        nmake    -    all    cp_crashrep cp_langmacros cp_langtemplates NULL
-cp    scp2\source\draw            nmake    -    all    cp_draw cp_langmacros cp_langtemplates NULL
-cp    scp2\source\extensions      nmake    -    all    cp_extensions cp_langmacros cp_langtemplates NULL
-cp    scp2\source\gnome           nmake    -    all    cp_gnome cp_langmacros cp_langtemplates NULL
-cp    scp2\source\graphicfilter   nmake    -    all    cp_graphicfilter cp_langmacros cp_langtemplates NULL
-cp    scp2\source\impress         nmake    -    all    cp_impress cp_langmacros cp_langtemplates NULL
-cp    scp2\source\javafilter      nmake    -    all    cp_javafilter cp_langmacros cp_langtemplates NULL
-cp    scp2\source\kde             nmake    -    all    cp_kde cp_langmacros cp_langtemplates NULL
-cp    scp2\source\layout          nmake    -    all    cp_layout cp_langmacros NULL
-cp    scp2\source\math            nmake    -    all    cp_math cp_langmacros cp_langtemplates NULL
-cp    scp2\source\ooo             nmake    -    all    cp_ooo cp_langmacros cp_langtemplates NULL
-cp    scp2\source\python          nmake    -    all    cp_python cp_langmacros cp_langtemplates NULL
-cp    scp2\source\quickstart      nmake    -    all    cp_quickstart cp_langmacros cp_langtemplates NULL
-cp    scp2\source\sdkoo           nmake    -    all    cp_sdkoo cp_langmacros cp_langtemplates NULL
-cp    scp2\source\testtool        nmake    -    all    cp_testtool cp_langmacros cp_langtemplates NULL
-cp    scp2\source\writer          nmake    -    all    cp_writer cp_langmacros cp_langtemplates NULL
-cp    scp2\source\base            nmake    -    all    cp_base cp_langmacros cp_langtemplates NULL
-cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
-cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
-cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
-cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
diff --git a/scp2/prj/d.lst b/scp2/prj/d.lst
deleted file mode 100644
index 37aaabbba..000000000
--- a/scp2/prj/d.lst
+++ /dev/null
@@ -1,27 +0,0 @@
-..\%__SRC%\bin\osl\setup_osl.inf %_DEST%\bin\setup_osl.inf
-..\%__SRC%\bin\osl\setup_osl.ins %_DEST%\bin\setup_osl.ins
-..\%__SRC%\bin\osl\ure.inf %_DEST%\bin\ure.inf
-..\%__SRC%\bin\osl\ure.ins %_DEST%\bin\ure.ins
-..\%__SRC%\bin\osl\sdkoo.inf %_DEST%\bin\sdkoo.inf
-..\%__SRC%\bin\osl\sdkoo.ins %_DEST%\bin\sdkoo.ins
-..\%__SRC%\bin\osl\setup_osljre.inf %_DEST%\bin\setup_osljre.inf
-..\%__SRC%\bin\osl\setup_osljre.ins %_DEST%\bin\setup_osljre.ins
-
-mkdir: %_DEST%\par
-
-mkdir: %_DEST%\par\osl
-mkdir: %_DEST%\par\fat
-mkdir: %_DEST%\par\fam
-mkdir: %_DEST%\par\ada
-mkdir: %_DEST%\par\adm
-mkdir: %_DEST%\par\omc
-
-..\%__SRC%\par\osl\*.par %_DEST%\par\osl\*.par
-..\%__SRC%\par\fat\*.par %_DEST%\par\fat\*.par
-..\%__SRC%\par\fam\*.par %_DEST%\par\fam\*.par
-..\%__SRC%\par\ada\*.par %_DEST%\par\ada\*.par
-..\%__SRC%\par\adm\*.par %_DEST%\par\adm\*.par
-..\%__SRC%\par\omc\*.par %_DEST%\par\omc\*.par
-
-..\inc\macros.inc %_DEST%\inc\macros.inc
-..\%__SRC%\inc\langmacros.inc %_DEST%\inc\langmacros.inc
diff --git a/scp2/source/accessories/file_font_accessories.scp b/scp2/source/accessories/file_font_accessories.scp
deleted file mode 100644
index 9adbe4bdf..000000000
--- a/scp2/source/accessories/file_font_accessories.scp
+++ /dev/null
@@ -1,882 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "macros.inc"
-
-/* Airmole font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole ) 
-#endif 
-
-/* Airmole Antique font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique ) 
-#endif 
-
-/* Airmole Shaded font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded ) 
-#endif 
-
-/* Airmole Stripe font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe ) 
-#endif 
-
-/* Astron Boy font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy ) 
-#endif 
-
-/* Astron Boy Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic ) 
-#endif 
-
-/* Astron Boy Video font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video ) 
-#endif 
-
-/* Astron Boy Wonder font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder ) 
-#endif 
-
-/* Baveuse font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse ) 
-#endif 
-
-/* Berylium font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium ) 
-#endif 
-
-/* Berylium Bold font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold )
-#endif 
-
-/* Berylium Bold Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic ) 
-#endif 
-
-/* Berylium Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic ) 
-#endif 
-
-/* Betsy Flanagan 2 font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 ) 
-#endif 
-
-/* Blue Highway font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway ) 
-#endif 
-
-/* Blue Highway Bold font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold ) 
-#endif 
-
-/* Blue Highway Condensed font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed ) 
-#endif 
-
-/* Blue Highway Linocut font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut ) 
-#endif 
-
-/* Bullpen font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen ) 
-#endif 
-
-/* Bullpen 3D font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D ) 
-#endif 
-
-/* Bullpen Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic ) 
-#endif 
-
-/* Colourbars font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars ) 
-#endif 
-
-/* Colourbars Bold font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold ) 
-#endif 
-
-/* Counterscraps font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps ) 
-#endif 
-
-/* Credit Valley font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley ) 
-#endif 
-
-/* Credit Valley Bold font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold ) 
-#endif 
-
-/* Credit Valley Bold Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic ) 
-#endif 
-
-/* Credit Valley Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic ) 
-#endif 
-
-/* Edmunds font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds ) 
-#endif 
-
-/* Edmunds Distressed font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed ) 
-#endif 
-
-/* Engebrechtre font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre ) 
-#endif
-
-/* Engebrechtre Bold font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold ) 
-#endif
-
-/* Engebrechtre Bold Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic ) 
-#endif
-
-/* Engebrechtre Expanded font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded ) 
-#endif
-
-/* Engebrechtre Expanded Bold font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold ) 
-#endif
-
-/* Engebrechtre Expanded Bold Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic ) 
-#endif
-
-/* Engebrechtre Expanded Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic ) 
-#endif
-
-/* Engebrechtre Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic ) 
-#endif
-
-/* Goodfish font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish ) 
-#endif
-
-/* Goodfish Bold font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold ) 
-#endif
-
-/* Goodfish Bold Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic ) 
-#endif
-
-/* Goodfish Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic ) 
-#endif
-
-/* Guanine font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine ) 
-#endif
-
-/* Gunplay font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay ) 
-#endif
-
-/* Kirsty font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty ) 
-#endif
-
-/* Kirsty Bold font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold ) 
-#endif
-
-/* Kirsty Bold Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic ) 
-#endif
-
-/* Kirsty Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic ) 
-#endif
-
-/* Kirsty Ink font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink ) 
-#endif
-
-/* Mufferaw font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw ) 
-#endif
-
-/* Nasalization font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization ) 
-#endif
-
-/* Neuropol font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol ) 
-#endif
-
-/* Numberpile font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile ) 
-#endif
-
-/* Pricedown font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown ) 
-#endif
-
-/* Pupcat font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat ) 
-#endif
-
-/* Rina font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_rina, rina.ttf, Rina ) 
-#endif
-
-/* Sandoval font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval ) 
-#endif
-
-/* Sappy Mugs font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs ) 
-#endif
-
-/* Screengem font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem ) 
-#endif
-
-/* Steelfish font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish ) 
-#endif
-
-/* Steelfish Bold font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold ) 
-#endif
-
-/* Steelfish Outline font */ 
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline ) 
-#endif
-
-/* Strenuous font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous ) 
-#endif
-
-/* Strenuous 3D font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D ) 
-#endif
-
-/* Subpear font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear ) 
-#endif
-
-/* Teen font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen ) 
-#endif
-
-/* Teen Bold font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold ) 
-#endif
-
-/* Teen Bold Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic ) 
-#endif
-
-/* Teen Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic ) 
-#endif
-
-/* Teen Light font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light ) 
-#endif
-
-/* Teen Light Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic ) 
-#endif
-
-/* Typodermic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic ) 
-#endif
-
-/* Vahika font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika ) 
-#endif
-
-/* Vahika Bold font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold ) 
-#endif
-
-/* Vahika Bold Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic ) 
-#endif
-
-/* Vahika Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic ) 
-#endif
-
-/* Vectroid font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid ) 
-#endif
-
-/* Velvenda Cooler font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler ) 
-#endif
-
-/* Velvenda Megablack font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack ) 
-#endif
-
-/* Vibrocentric font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric ) 
-#endif
-
-/* Vibrocentric Bold font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold ) 
-#endif
-
-/* Vibrocentric Bold Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic ) 
-#endif
-
-/* Vibrocentric Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic ) 
-#endif
-
-/* Wintermute font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute ) 
-#endif
-
-/* You're Gone font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
-#endif
-
-/* You're Gone Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic )
-#endif
-
-/* Zekton font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton ) 
-#endif
-
-/* Zekton Bold font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold ) 
-#endif
-
-/* Zekton Bold Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic ) 
-#endif
-
-/* Zekton Italic font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic )
-#endif
-
-/* Zorque font */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque ) 
-#endif
-
-/* Additional fonts for 2.0.3 */
-
-/* URW Gothic L */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Avantgarde, a010013l.ttf, URW Gothic L ) 
-#endif
- 
-/* URW Gothic L Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Bold_Avantgarde, a010015l.ttf, URW Gothic L Bold ) 
-#endif
- 
-/* URW Gothic L Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Italic_Avantgarde, a010033l.ttf, URW Gothic L Italic ) 
-#endif
- 
-/* URW Gothic L Bold Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, URW Gothic L Bold Italic ) 
-#endif
- 
-/* URW Bookman L */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bookman, b018012l.ttf, URW Bookman L ) 
-#endif
- 
-/* URW Bookman L Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bold_Bookman, b018015l.ttf, URW Bookman L Bold ) 
-#endif
- 
-/* URW Bookman L Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Italic_Bookman, b018032l.ttf, URW Bookman L Italic ) 
-#endif
- 
-/* URW Bookman L Bold Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bold_Italic_Bookman, b018035l.ttf, URW Bookman L Bold Italic ) 
-#endif
- 
-/* URW Century Schoolbook L */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, URW Century Schoolbook L ) 
-#endif
- 
-/* URW Century Schoolbook L Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, URW Century Schoolbook L Bold ) 
-#endif
- 
-/* URW Century Schoolbook L Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, URW Century Schoolbook L Italic ) 
-#endif
- 
-/* URW Century Schoolbook L Bold Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, URW Century Schoolbook L Bold Italic ) 
-#endif
- 
-/* URW Nimbus Sans L */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica, n019003l.ttf, URW Nimbus Sans L ) 
-#endif
- 
-/* URW Nimbus Sans L Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, URW Nimbus Sans L Bold ) 
-#endif
- 
-/* URW Nimbus Sans L Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, URW Nimbus Sans L Italic ) 
-#endif
- 
-/* URW Nimbus Sans L Bold Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, URW Nimbus Sans L Bold Italic ) 
-#endif
- 
-/* URW Nimbus Sans L Condensed */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, URW Nimbus Sans L Condensed ) 
-#endif
- 
-/* URW Nimbus Sans L Bold Condensed */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, URW Nimbus Sans L Bold Condensed ) 
-#endif
- 
-/* URW Nimbus Sans L Italic Condensed */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, URW Nimbus Sans L Italic Condensed ) 
-#endif
- 
-/* URW Nimbus Sans L Bold Italic Condensed */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, URW Nimbus Sans L Bold Italic Condensed ) 
-#endif
- 
-/* URW Nimbus Roman No9 L */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Times, n021003l.ttf, URW Nimbus Roman No9 L ) 
-#endif
- 
-/* URW Nimbus Roman No9 L Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, URW Nimbus Roman No9 L Bold ) 
-#endif
- 
-/* URW Nimbus Roman No9 L Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, URW Nimbus Roman No9 L Italic ) 
-#endif
- 
-/* URW Nimbus Roman No9 L Bold Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, URW Nimbus Roman No9 L Bold Italic ) 
-#endif
- 
-/* URW Nimbus Mono L */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Courier, n022003l.ttf, URW Nimbus Mono L ) 
-#endif
- 
-/* URW Nimbus Mono L Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Courier, n022004l.ttf, URW Nimbus Mono L Bold ) 
-#endif
- 
-/* URW Nimbus Mono LK Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, URW Nimbus Mono LK Italic ) 
-#endif
- 
-/* URW Nimbus Mono L Bold Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, URW Nimbus Mono L Bold Italic ) 
-#endif
- 
-/* URW Palladio L */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Palitino, p052003l.ttf, URW Palladio L ) 
-#endif
- 
-/* URW Palladio L Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Bold_Palitino, p052004l.ttf, URW Palladio L Bold ) 
-#endif
- 
-/* URW Palladio L Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Italic_Palitino, p052023l.ttf, URW Palladio L Italic ) 
-#endif
- 
-/* URW Palladio L Bold Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Bold_Italic_Palitino, p052024l.ttf, URW Palladio L Bold Italic ) 
-#endif
- 
-/* URW Standard Symbols L */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Standard_Symbols_L_Symbol, s050000l.ttf, URW Standard Symbols L ) 
-#endif
- 
-/* URW Chancery L */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_URW_Chancery_L_Zapf_Chancery, z003034l.ttf, URW Chancery L ) 
-#endif
- 
-/* Dingbats */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats ) 
-#endif
- 
-/* Luxi Mono Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold ) 
-#endif
- 
-/* Luxi Mono Bold Oblique */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique ) 
-#endif
- 
-/* Luxi Mono Regular */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular ) 
-#endif
- 
-/* Luxi Mono Oblique */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique ) 
-#endif
- 
-/* Luxi Serif Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold ) 
-#endif
- 
-/* Luxi Serif Bold Oblique */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique ) 
-#endif
- 
-/* Luxi Serif Regular */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular ) 
-#endif
- 
-/* Luxi Serif Oblique */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique ) 
-#endif
- 
-/* Luxi Sans Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold ) 
-#endif
- 
-/* Luxi Sans Bold Oblique */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique ) 
-#endif
- 
-/* Luxi Sans Regular */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular ) 
-#endif
- 
-/* Luxi Sans Oblique */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
-#endif
-
-/* Gentium */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
-#endif
-
-/* Gentium Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
-#endif
-
-/* GentiumAlt */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
-#endif
-
-/* GentiumAlt Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
-#endif
-
-/* MgOpen Canonica Bold */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
-#endif
-
-/* MgOpen Canonica Bold Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
-#endif
-
-/* MgOpen Canonica Italic */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
-#endif
-
-/* MgOpen Canonica Regular */
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
-#endif
-
-/* Chopin Script */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Chopin_Script, CHOPS___.TTF, Chopin Script ) 
-#endif
-
-/* DTP Dingbats */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_DTPDingbats, DTPDingbats.ttf, DTP Dingbats ) 
-#endif
-
-/* Justus Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Justus_Bold, Justus-Bold.ttf, Justus Bold ) 
-#endif
-
-/* Justus Italic Oldstyle */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Justus_ItalicOldstyle, Justus-ItalicOldstyle.ttf, Justus Italic Oldstyle ) 
-#endif
-
-/* Justus Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Justus_Italic, Justus-Italic.ttf, Justus Italic ) 
-#endif
-
-/* Justus Oldstyle */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Justus_Oldstyle, Justus-Oldstyle.ttf, Justus Oldstyle ) 
-#endif
-
-/* Justus Roman */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Justus_Roman, Justus-Roman.ttf, Justus Roman ) 
-#endif
-
-/* Justus Versalitas */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Justus_Versalitas, Justus-Versalitas.ttf, Justus Versalitas ) 
-#endif
-
-/* Let's trace basic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Lets_trace_basic, letstracebasic.ttf, Lets trace basic  ) 
-#endif
-
-/* Let's trace ruled */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Lets_trace_ruled, letstraceruled.ttf, Lets trace ruled ) 
-#endif
-
-/* Tuffy Bold Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold_Italic, Tuffy_Bold_Italic.ttf, Tuffy Bold Italic ) 
-#endif
-
-/* Tuffy Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold, Tuffy_Bold.ttf, Tuffy Bold ) 
-#endif
-
-/* Tuffy Italic */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Tuffy_Italic, Tuffy_Italic.ttf, Tuffy Italic ) 
-#endif
-
-/* Tuffy */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Tuffy, Tuffy.ttf, Tuffy ) 
-#endif
-
-/* Verina Sans Bold Oblique */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold_Oblique, Verina_Sans_Bold_Oblique.otf, Verina Sans Bold Oblique ) 
-#endif
-
-/* Verina Sans Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold, Verina_Sans_Bold.otf, Verina Sans Bold ) 
-#endif
-
-/* Verina Sans Mono Bold Oblique */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold_Oblique, Verina_Sans_Mono_Bold_Oblique.otf, Verina Sans Mono Bold Oblique ) 
-#endif
-
-/* Verina Sans Mono Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold, Verina_Sans_Mono_Bold.otf, Verina Sans Mono Bold ) 
-#endif
-
-/* Verina Sans Mono Oblique */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Oblique, Verina_Sans_Mono_Oblique.otf, Verina Sans Mono Oblique ) 
-#endif
-
-/* Verina Sans Mono */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono, Verina_Sans_Mono.otf, Verina Sans Mono ) 
-#endif
-
-/* Verina Sans Oblique */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Oblique, Verina_Sans_Oblique.otf, Verina Sans Oblique ) 
-#endif
-
-/* Verina Sans Roman */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Roman, Verina_Sans_Roman.otf, Verina Sans Roman ) 
-#endif
-
-/* Verina Serif Bold */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Verina_Serif_Bold, Verina_Serif_Bold.otf, Verina Serif Bold ) 
-#endif
-
-/* Verina Serif */ 
-#ifdef WITH_EXTRA_FONT 
-STD_FONT_FILE( gid_File_Fnt_Verina_Serif, Verina_Serif.otf, Verina Serif ) 
-#endif
-
diff --git a/scp2/source/accessories/file_gallery_accessories.scp b/scp2/source/accessories/file_gallery_accessories.scp
deleted file mode 100644
index 46706e1ab..000000000
--- a/scp2/source/accessories/file_gallery_accessories.scp
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "macros.inc"
-
-/* *** Accessories Extras *** */
-
-/* ** Gallery ** */
-
-#ifdef WITH_EXTRA_GALLERY
-
-File gid_File_Extra_Gallery_Accessories
-    Dir = gid_Dir_Gallery;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgallery.zip";
-End
-
-File gid_File_Extra_Gallery_Draws_People_Accessories
-    Dir = gid_Dir_Gallery_Draws_People;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgallerydrawspeople.zip";
-End
-
-File gid_File_Extra_Gallery_Photos_Plants_Accessories
-    Dir = gid_Dir_Gallery_Photos_Plants;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosplants.zip";
-End
-
-File gid_File_Extra_Gallery_Photos_Celebration_Accessories
-    Dir = gid_Dir_Gallery_Photos_Celebration;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotoscelebration.zip";
-End
-
-File gid_File_Extra_Gallery_Photos_Fauna_Accessories
-    Dir = gid_Dir_Gallery_Photos_Fauna;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosfauna.zip";
-End
-
-File gid_File_Extra_Gallery_Photos_Flowers_Accessories
-    Dir = gid_Dir_Gallery_Photos_Flowers;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosflowers.zip";
-End
-
-File gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories
-    Dir = gid_Dir_Gallery_Photos_FoodsandDrinks;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosfoodsanddrinks.zip";
-End
-
-File gid_File_Extra_Gallery_Photos_Humans_Accessories
-    Dir = gid_Dir_Gallery_Photos_Humans;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotoshumans.zip";
-End
-
-File gid_File_Extra_Gallery_Photos_Landscapes_Accessories
-    Dir = gid_Dir_Gallery_Photos_Landscapes;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotoslandscapes.zip";
-End
-
-File gid_File_Extra_Gallery_Photos_Buildings_Accessories
-    Dir = gid_Dir_Gallery_Photos_Buildings;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosbuildings.zip";
-End
-
-File gid_File_Extra_Gallery_Photos_Objects_Accessories
-    Dir = gid_Dir_Gallery_Photos_Objects;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosobjects.zip";
-End
-
-File gid_File_Extra_Gallery_Photos_Cities_Accessories
-    Dir = gid_Dir_Gallery_Photos_Cities;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotoscities.zip";
-End
-
-File gid_File_Extra_Gallery_Photos_Space_Accessories
-    Dir = gid_Dir_Gallery_Photos_Space;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosspace.zip";
-End
-
-File gid_File_Extra_Gallery_Photos_Statues_Accessories
-    Dir = gid_Dir_Gallery_Photos_Statues;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosstatues.zip";
-End
-
-File gid_File_Extra_Gallery_Photos_Travel_Accessories
-    Dir = gid_Dir_Gallery_Photos_Travel;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotostravel.zip";
-End
-
-File gid_File_Extra_Gallery_Elements_Bullets2_Accessories
-    Dir = gid_Dir_Gallery_Elements_Bullets2;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryelementsbullets2.zip";
-End
-
-File gid_File_Extra_Gallery_NONFREE_Accessories
-    Dir = gid_Dir_Gallery;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgallerynonfree.zip";
-End
-
-#endif
diff --git a/scp2/source/accessories/file_samples_accessories.scp b/scp2/source/accessories/file_samples_accessories.scp
deleted file mode 100644
index 7b4486fee..000000000
--- a/scp2/source/accessories/file_samples_accessories.scp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "macros.inc"
-
-/* *** Accessories Extras *** */
-
-/* ** Samples ** */
-
-#ifdef WITH_EXTRA_SAMPLE
-
-File gid_File_Extra_Samples_Accessories
-    Dir = gid_Dir_Samples_Language;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriessamples,zip);
-End
-
-File gid_File_Extra_Samples_Documentations_Accessories
-    Dir = gid_Dir_Samples_Documentations;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriessamplesdocumentation,zip);
-End
-
-File gid_File_Extra_Samples_Advertisement_Accessories
-    Dir = gid_Dir_Samples_Advertisement;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriessamplesadvertisement,zip);
-End
-
-/* ** Samples - NON FREE** */
-
-File gid_File_Extra_Samples_NONFREE_Accessories
-    Dir = gid_Dir_Samples_Language;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriessamplesnonfree,zip);
-End
-
-File gid_File_Extra_Samples_NONFREE_Documentations_Accessories
-    Dir = gid_Dir_Samples_Documentations;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriessamplesnonfreedocumentation,zip);
-End
-
-File gid_File_Extra_Samples_NONFREE_Advertisement_Accessories
-    Dir = gid_Dir_Samples_Advertisement;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriessamplesnonfreeadvertisement,zip);
-End
-
-#endif
diff --git a/scp2/source/accessories/file_templates_accessories.scp b/scp2/source/accessories/file_templates_accessories.scp
deleted file mode 100644
index 55689d907..000000000
--- a/scp2/source/accessories/file_templates_accessories.scp
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "macros.inc"
-
-/* *** Accessories Extras *** */
-
-/* ** Templates ** */
-
-#ifdef WITH_EXTRA_TEMPLATE
-
-File gid_File_Extra_Templates_Accessories
-    Dir = gid_Dir_Template_Language;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplates,zip);
-End
-
-File gid_File_Extra_Templates_Layout_Accessories
-    Dir = gid_Dir_Template_Layout;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplateslayout,zip);
-End
-
-File gid_File_Extra_Templates_Present_Accessories
-    Dir = gid_Dir_Template_Presnt;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatespresent,zip);
-End
-
-File gid_File_Extra_Templates_Educate_Accessories
-    Dir = gid_Dir_Template_Educate;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplateseducate,zip);
-End
-
-File gid_File_Extra_Templates_Finance_Accessories
-    Dir = gid_Dir_Template_Finance;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesfinance,zip);
-End
-
-File gid_File_Extra_Templates_Forms_Accessories
-    Dir = gid_Dir_Template_Forms;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesforms,zip);
-End
-
-File gid_File_Extra_Templates_Labels_Accessories
-    Dir = gid_Dir_Template_Labels;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplateslabels,zip);
-End
-
-File gid_File_Extra_Templates_Misc_Accessories
-    Dir = gid_Dir_Template_Misc;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesmisc,zip);
-End
-
-File gid_File_Extra_Templates_Officorr_Accessories
-    Dir = gid_Dir_Template_Officorr;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesofficorr,zip);
-End
-
-File gid_File_Extra_Templates_Offimisc_Accessories
-    Dir = gid_Dir_Template_Offimisc;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesoffimisc,zip);
-End
-
-File gid_File_Extra_Templates_Personal_Accessories
-    Dir = gid_Dir_Template_Personal;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatespersonal,zip);
-End
-
-/* ** Templates - Common ** */
-
-File gid_File_Extra_Templates_Common
-    Dir = gid_Dir_Template_Common;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "accessoriestemplatescommon.zip";
-End
-
-File gid_File_Extra_Templates_Common_Layout
-    Dir = gid_Dir_Template_Common_Layout;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "accessoriestemplatescommonlayout.zip";
-End
-
-File gid_File_Extra_Templates_Common_Present
-    Dir = gid_Dir_Template_Common_Presnt;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "accessoriestemplatescommonpresent.zip";
-End
-
-File gid_File_Extra_Templates_Common_Educate
-    Dir = gid_Dir_Template_Common_Educate;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "accessoriestemplatescommoneducate.zip";
-End
-
-File gid_File_Extra_Templates_Common_Finance
-    Dir = gid_Dir_Template_Common_Finance;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "accessoriestemplatescommonfinance.zip";
-End
-
-File gid_File_Extra_Templates_Common_Forms
-    Dir = gid_Dir_Template_Common_Forms;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "accessoriestemplatescommonforms.zip";
-End
-
-File gid_File_Extra_Templates_Common_Labels
-    Dir = gid_Dir_Template_Common_Labels;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "accessoriestemplatescommonlabels.zip";
-End
-
-File gid_File_Extra_Templates_Common_Misc
-    Dir = gid_Dir_Template_Common_Misc;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "accessoriestemplatescommonmisc.zip";
-End
-
-File gid_File_Extra_Templates_Common_Officorr
-    Dir = gid_Dir_Template_Common_Officorr;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "accessoriestemplatescommonofficorr.zip";
-End
-
-File gid_File_Extra_Templates_Common_Offimisc
-    Dir = gid_Dir_Template_Common_Offimisc;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "accessoriestemplatescommonoffimisc.zip";
-End
-
-File gid_File_Extra_Templates_Common_Personal
-    Dir = gid_Dir_Template_Common_Personal;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "accessoriestemplatescommonpersonal.zip";
-End
-
-/* ** Templates - NON FREE ** */
-
-File gid_File_Extra_Templates_NONFREE_Accessories
-    Dir = gid_Dir_Template_Language;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfree,zip);
-End
-
-File gid_File_Extra_Templates_NONFREE_Layout_Accessories
-    Dir = gid_Dir_Template_Layout;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreelayout,zip);
-End
-
-File gid_File_Extra_Templates_NONFREE_Present_Accessories
-    Dir = gid_Dir_Template_Presnt;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreepresent,zip);
-End
-
-File gid_File_Extra_Templates_NONFREE_Educate_Accessories
-    Dir = gid_Dir_Template_Educate;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreeeducate,zip);
-End
-
-File gid_File_Extra_Templates_NONFREE_Finance_Accessories
-    Dir = gid_Dir_Template_Finance;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreefinance,zip);
-End
-
-File gid_File_Extra_Templates_NONFREE_Forms_Accessories
-    Dir = gid_Dir_Template_Forms;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreeforms,zip);
-End
-
-File gid_File_Extra_Templates_NONFREE_Labels_Accessories
-    Dir = gid_Dir_Template_Labels;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreelabels,zip);
-End
-
-File gid_File_Extra_Templates_NONFREE_Misc_Accessories
-    Dir = gid_Dir_Template_Misc;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreemisc,zip);
-End
-
-File gid_File_Extra_Templates_NONFREE_Officorr_Accessories
-    Dir = gid_Dir_Template_Officorr;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreeofficorr,zip);
-End
-
-File gid_File_Extra_Templates_NONFREE_Offimisc_Accessories
-    Dir = gid_Dir_Template_Offimisc;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreeoffimisc,zip);
-End
-
-File gid_File_Extra_Templates_NONFREE_Personal_Accessories
-    Dir = gid_Dir_Template_Personal;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(accessoriestemplatesnonfreepersonal,zip);
-End
-
-#endif
diff --git a/scp2/source/accessories/makefile.mk b/scp2/source/accessories/makefile.mk
deleted file mode 100644
index 45c81ca14..000000000
--- a/scp2/source/accessories/makefile.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Kálmán Szalai - KAMI <kami911@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
-#
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=accessories
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-PARFILES= \
-        module_accessories.par
-.IF "$(WITH_EXTRA_GALLERY)" != ""
-PARFILES += \
-        module_gallery_accessories.par     \
-        file_gallery_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_TEMPLATE)" != ""
-PARFILES += \
-        module_templates_accessories.par   \
-        file_templates_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_SAMPLE)" != ""
-PARFILES += \
-        module_samples_accessories.par     \
-        file_samples_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_FONT)" != ""
-PARFILES += \
-        module_font_accessories.par        \
-        file_font_accessories.par
-.ENDIF
-
-ULFFILES= \
-        module_accessories.ulf
-.IF "$(WITH_EXTRA_GALLERY)" != ""
-ULFFILES += \
-        module_gallery_accessories.ulf
-.ENDIF
-.IF "$(WITH_EXTRA_TEMPLATE)" != ""
-ULFFILES += \
-        module_templates_accessories.ulf
-.ENDIF
-.IF "$(WITH_EXTRA_SAMPLE)" != ""
-ULFFILES += \
-        module_samples_accessories.ulf
-.ENDIF
-.IF "$(WITH_EXTRA_FONT)" != ""
-ULFFILES += \
-        module_font_accessories.ulf
-.ENDIF
-
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/accessories/module_accessories.scp b/scp2/source/accessories/module_accessories.scp
deleted file mode 100644
index ded4717f4..000000000
--- a/scp2/source/accessories/module_accessories.scp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Accessories
-    ParentID = gid_Module_Optional;
-    Files = (
-  ); 
-    Sortkey = "300";
-    Minimal = NO;
-    Default = YES;
-    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES);
-End
-
diff --git a/scp2/source/accessories/module_accessories.ulf b/scp2/source/accessories/module_accessories.ulf
deleted file mode 100644
index 4c1adde8a..000000000
--- a/scp2/source/accessories/module_accessories.ulf
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-[STR_NAME_MODULE_OPTIONAL_ACCESSORIES]
-en-US = "Accessories"
-
-[STR_DESC_MODULE_OPTIONAL_ACCESSORIES]
-en-US = "Useful %PRODUCTNAME accessories including various Galleries, Templates, Sample documents and Fonts."
diff --git a/scp2/source/accessories/module_font_accessories.scp b/scp2/source/accessories/module_font_accessories.scp
deleted file mode 100644
index b41eb09cb..000000000
--- a/scp2/source/accessories/module_font_accessories.scp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "macros.inc"
-
-#ifdef WITH_EXTRA_FONT
-
-Module gid_Module_Optional_Accessories_Fonts
-    PackageInfo = "packinfo_accessories.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_FONTS);
-    ParentID = gid_Module_Optional_Accessories;
-    Files = ( 
-        gid_File_Fnt_airmole,
-        gid_File_Fnt_airmolea,
-        gid_File_Fnt_airmoles,
-        gid_File_Fnt_airmoleq,
-        gid_File_Fnt_astronbo,
-        gid_File_Fnt_astronbi,
-        gid_File_Fnt_astronbv,
-        gid_File_Fnt_astronbw,
-        gid_File_Fnt_baveuse,
-        gid_File_Fnt_Berylium,
-        gid_File_Fnt_Beryliub,
-        gid_File_Fnt_Berylibi,
-        gid_File_Fnt_Beryliui,
-        gid_File_Fnt_BETSY2,
-        gid_File_Fnt_bluehigh,
-        gid_File_Fnt_bluebold,
-        gid_File_Fnt_bluecond,
-        gid_File_Fnt_bluehigl,
-        gid_File_Fnt_bullpen_,
-        gid_File_Fnt_bullpen3,
-        gid_File_Fnt_bullpeni,
-        gid_File_Fnt_colourba,
-        gid_File_Fnt_colourbb,
-        gid_File_Fnt_counters,
-        gid_File_Fnt_creditva,
-        gid_File_Fnt_creditvb,
-        gid_File_Fnt_creditvz,
-        gid_File_Fnt_creditvi,
-        gid_File_Fnt_edmunds,
-        gid_File_Fnt_edmundis,
-        gid_File_Fnt_engeregu,
-        gid_File_Fnt_engebold,
-        gid_File_Fnt_engeboit,
-        gid_File_Fnt_engeexpa,
-        gid_File_Fnt_engeexbo,
-        gid_File_Fnt_engeexbi,
-        gid_File_Fnt_engeexit,
-        gid_File_Fnt_engeital,
-        gid_File_Fnt_goodfish,
-        gid_File_Fnt_goodfisb,
-        gid_File_Fnt_goodfisc,
-        gid_File_Fnt_goodfisi,
-        gid_File_Fnt_guanine_,
-        gid_File_Fnt_gunplay,
-        gid_File_Fnt_kirsty__,
-        gid_File_Fnt_kirsty_b,
-        gid_File_Fnt_kirstybi,
-        gid_File_Fnt_kirsty_i,
-        gid_File_Fnt_kirstyin,
-        gid_File_Fnt_mufferaw,
-        gid_File_Fnt_nasaliza,
-        gid_File_Fnt_NEUROPOL,
-        gid_File_Fnt_numberpi,
-        gid_File_Fnt_pricedow,
-        gid_File_Fnt_pupcat__,
-        gid_File_Fnt_rina,
-        gid_File_Fnt_sandoval,
-        gid_File_Fnt_SAPPM___,
-        gid_File_Fnt_screenge,
-        gid_File_Fnt_steelfis,
-        gid_File_Fnt_steelfib,
-        gid_File_Fnt_steelout,
-        gid_File_Fnt_strenuou,
-        gid_File_Fnt_strenu3d,
-        gid_File_Fnt_subpear_,
-        gid_File_Fnt_teen____,
-        gid_File_Fnt_teenbold,
-        gid_File_Fnt_teenbdit,
-        gid_File_Fnt_teenital,
-        gid_File_Fnt_teenlite,
-        gid_File_Fnt_teenlita,
-        gid_File_Fnt_typoderm,
-        gid_File_Fnt_vahika_,
-        gid_File_Fnt_vahikab,
-        gid_File_Fnt_vahikac,
-        gid_File_Fnt_vahikai,
-        gid_File_Fnt_vectroid,
-        gid_File_Fnt_velvendc,
-        gid_File_Fnt_velvenda,
-        gid_File_Fnt_vibrocen,
-        gid_File_Fnt_vibroceb,
-        gid_File_Fnt_vibrocex,
-        gid_File_Fnt_vibrocei,
-        gid_File_Fnt_wintermu,
-        gid_File_Fnt_youregon,
-        gid_File_Fnt_youregoi,
-        gid_File_Fnt_zekton__,
-        gid_File_Fnt_zektonbo,
-        gid_File_Fnt_zektonbi,
-        gid_File_Fnt_zektonit,
-        gid_File_Fnt_zorque,
-        gid_File_Fnt_URW_Gothic_L_Avantgarde,
-        gid_File_Fnt_URW_Gothic_L_Bold_Avantgarde,
-        gid_File_Fnt_URW_Gothic_L_Italic_Avantgarde,
-        gid_File_Fnt_URW_Gothic_L_Bold_Italic_Avantgarde,
-        gid_File_Fnt_URW_Bookman_L_Bookman,
-        gid_File_Fnt_URW_Bookman_L_Bold_Bookman,
-        gid_File_Fnt_URW_Bookman_L_Italic_Bookman,
-        gid_File_Fnt_URW_Bookman_L_Bold_Italic_Bookman,
-        gid_File_Fnt_URW_Century_Schoolbook_L_New_Century_SchoolBook,
-        gid_File_Fnt_URW_Century_Schoolbook_L_Bold_New_Century_SchoolBook,
-        gid_File_Fnt_URW_Century_Schoolbook_L_Italic_New_Century_SchoolBook,
-        gid_File_Fnt_URW_Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook,
-        gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica,
-        gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica,
-        gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica,
-        gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica,
-        gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica_Condensed,
-        gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica_Condensed,
-        gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica_Condensed,
-        gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed,
-        gid_File_Fnt_URW_Nimbus_Roman_No9_L_Times,
-        gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Times,
-        gid_File_Fnt_URW_Nimbus_Roman_No9_L_Italic_Times,
-        gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Italic_Times,
-        gid_File_Fnt_URW_Nimbus_Mono_L_Courier,
-        gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Courier,
-        gid_File_Fnt_URW_Nimbus_Mono_LK_Italic_Courier,
-        gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Italic_Courier,
-        gid_File_Fnt_URW_Palladio_L_Palitino,
-        gid_File_Fnt_URW_Palladio_L_Bold_Palitino,
-        gid_File_Fnt_URW_Palladio_L_Italic_Palitino,
-        gid_File_Fnt_URW_Palladio_L_Bold_Italic_Palitino,
-        gid_File_Fnt_URW_Standard_Symbols_L_Symbol,
-        gid_File_Fnt_URW_Chancery_L_Zapf_Chancery,
-        gid_File_Fnt_Dingbats,
-        gid_File_Fnt_Luxi_Mono_Bold,
-        gid_File_Fnt_Luxi_Mono_Bold_Oblique,
-        gid_File_Fnt_Luxi_Mono_Regular,
-        gid_File_Fnt_Luxi_Mono_Oblique,
-        gid_File_Fnt_Luxi_Serif_Bold,
-        gid_File_Fnt_Luxi_Serif_Bold_Oblique,
-        gid_File_Fnt_Luxi_Serif_Regular,
-        gid_File_Fnt_Luxi_Serif_Oblique,
-        gid_File_Fnt_Luxi_Sans_Bold,
-        gid_File_Fnt_Luxi_Sans_Bold_Oblique,
-        gid_File_Fnt_Luxi_Sans_Regular,
-        gid_File_Fnt_Luxi_Sans_Oblique,
-        gid_File_Fnt_Gentium,
-        gid_File_Fnt_Gentium_Italic,
-        gid_File_Fnt_GentiumAlt,
-        gid_File_Fnt_GentiumAlt_Italic,
-        gid_File_Fnt_MgOpen_Canonica_Bold,
-        gid_File_Fnt_MgOpen_Canonica_Bold_Italic,
-        gid_File_Fnt_MgOpen_Canonica_Italic,
-        gid_File_Fnt_MgOpen_Canonica_Regular,
-        gid_File_Fnt_MagyarLinBiolinum,
-        gid_File_Fnt_MagyarLinBiolinumB,
-        gid_File_Fnt_MagyarLinLibertine,
-        gid_File_Fnt_MagyarLinLibertineB,
-        gid_File_Fnt_MagyarLinLibertineBI,
-        gid_File_Fnt_MagyarLinLibertineC,
-        gid_File_Fnt_MagyarLinLibertineG,
-        gid_File_Fnt_MagyarLinLibertineGB,
-        gid_File_Fnt_MagyarLinLibertineGBI,
-        gid_File_Fnt_MagyarLinLibertineGI,
-        gid_File_Fnt_MagyarLinLibertineI,
-        gid_File_Fnt_MagyarLinLibertineN,
-        gid_File_Fnt_MagyarLinLibertineNB,
-        gid_File_Fnt_MagyarLinLibertineNBI,
-        gid_File_Fnt_MagyarLinLibertineNI,
-        gid_File_Fnt_MagyarLinLibertineNC );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-#endif
diff --git a/scp2/source/accessories/module_font_accessories.ulf b/scp2/source/accessories/module_font_accessories.ulf
deleted file mode 100644
index 1fc26c1db..000000000
--- a/scp2/source/accessories/module_font_accessories.ulf
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_FONTS]
-en-US = "Fonts"
-
-[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_FONTS]
-en-US = "Additional fonts for %PRODUCTNAME and other applications."
diff --git a/scp2/source/accessories/module_gallery_accessories.scp b/scp2/source/accessories/module_gallery_accessories.scp
deleted file mode 100644
index 533183d49..000000000
--- a/scp2/source/accessories/module_gallery_accessories.scp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "macros.inc"
-
-#ifdef WITH_EXTRA_GALLERY
-
-Module gid_Module_Optional_Accessories_Gallery
-    PackageInfo = "packinfo_accessories.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_GALLERY);
-    ParentID = gid_Module_Optional_Accessories;
-    Files = (
-        gid_File_Extra_Gallery_Accessories,
-        gid_File_Extra_Gallery_Draws_People_Accessories,
-        gid_File_Extra_Gallery_Photos_Plants_Accessories,
-        gid_File_Extra_Gallery_Photos_Celebration_Accessories,
-        gid_File_Extra_Gallery_Photos_Fauna_Accessories,
-        gid_File_Extra_Gallery_Photos_Flowers_Accessories,
-        gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories,
-        gid_File_Extra_Gallery_Photos_Humans_Accessories,
-        gid_File_Extra_Gallery_Photos_Landscapes_Accessories,
-        gid_File_Extra_Gallery_Photos_Objects_Accessories,
-        gid_File_Extra_Gallery_Photos_Buildings_Accessories,
-        gid_File_Extra_Gallery_Photos_Cities_Accessories,
-        gid_File_Extra_Gallery_Photos_Space_Accessories,
-        gid_File_Extra_Gallery_Photos_Statues_Accessories,
-        gid_File_Extra_Gallery_Photos_Travel_Accessories,
-        gid_File_Extra_Gallery_Elements_Bullets2_Accessories,
-        gid_File_Extra_Gallery_NONFREE_Accessories );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-#endif
diff --git a/scp2/source/accessories/module_gallery_accessories.ulf b/scp2/source/accessories/module_gallery_accessories.ulf
deleted file mode 100644
index 31745dfff..000000000
--- a/scp2/source/accessories/module_gallery_accessories.ulf
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_GALLERY]
-en-US = "Additional Gallery Themes"
-
-[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_GALLERY]
-en-US = "The %PRODUCTNAME Gallery contains more than 3400 elements in various themes."
diff --git a/scp2/source/accessories/module_samples_accessories.scp b/scp2/source/accessories/module_samples_accessories.scp
deleted file mode 100644
index 672774c68..000000000
--- a/scp2/source/accessories/module_samples_accessories.scp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "macros.inc"
-
-#ifdef WITH_EXTRA_SAMPLE
-
-Module gid_Module_Optional_Accessories_Advertisement
-    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT);
-    ParentID = gid_Module_Optional_Accessories;
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-Module gid_Module_Optional_Accessories_Documentations
-    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS);
-    ParentID = gid_Module_Optional_Accessories;
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-Module gid_Module_Optional_Accessories_Samples
-    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_SAMPLES);
-    ParentID = gid_Module_Optional_Accessories;
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-#include "alllangmodules_accessories_samples_root.inc"
-
-Module gid_Module_Optional_Accessories_Adv_Template
-    ParentID = gid_Module_Optional_Accessories_Advertisement;
-    Name = "gid_Module_Optional_Accessories_Adv_Template";
-    Description = "gid_Module_Optional_Accessories_Adv_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (
-        gid_File_Extra_Samples_Advertisement_Accessories,
-        gid_File_Extra_Samples_NONFREE_Advertisement_Accessories );
-    Minimal = NO;
-    Default = YES;
-End
-
-Module gid_Module_Optional_Accessories_Doc_Template
-    ParentID = gid_Module_Optional_Accessories_Documentations;
-    Name = "gid_Module_Optional_Accessories_Doc_Template";
-    Description = "gid_Module_Optional_Accessories_Doc_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (
-        gid_File_Extra_Samples_Documentations_Accessories,
-        gid_File_Extra_Samples_NONFREE_Documentations_Accessories );
-    Minimal = YES;
-    Default = YES;
-End
-
-Module gid_Module_Optional_Accessories_Sam_Template
-    ParentID = gid_Module_Optional_Accessories_Samples;
-    Name = "gid_Module_Optional_Accessories_Sam_Template";
-    Description = "gid_Module_Optional_Accessories_Sam_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (
-        gid_File_Extra_Samples_Accessories,
-        gid_File_Extra_Samples_NONFREE_Accessories  );
-    Minimal = NO;
-    Default = YES;
-End
-
-#include "alllangmodules_accessories_samples.inc"
-
-#endif
-
diff --git a/scp2/source/accessories/module_samples_accessories.ulf b/scp2/source/accessories/module_samples_accessories.ulf
deleted file mode 100644
index b6a0f5229..000000000
--- a/scp2/source/accessories/module_samples_accessories.ulf
+++ /dev/null
@@ -1,712 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_SAMPLES]
-en-US = "Sample documents"
-
-[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_SAMPLES]
-en-US = "Sample documents are good for learning."
-
-[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS]
-en-US = "Documentations"
-
-[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS]
-en-US = "%PRODUCTNAME documentations."
-
-[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT]
-en-US = "Advertisement"
-
-[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT]
-en-US = "%PRODUCTNAME advertisement materials."
-
-[STR_NAME_MODULE_LANGPACK_EN_US]
-en-US = "English"
-
-[STR_DESC_MODULE_LANGPACK_EN_US]
-en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DE]
-en-US = "German"
-
-[STR_DESC_MODULE_LANGPACK_DE]
-en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FR]
-en-US = "French"
-
-[STR_DESC_MODULE_LANGPACK_FR]
-en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_IT]
-en-US = "Italian"
-
-[STR_DESC_MODULE_LANGPACK_IT]
-en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ES]
-en-US = "Spanish"
-
-[STR_DESC_MODULE_LANGPACK_ES]
-en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SV]
-en-US = "Swedish"
-
-[STR_DESC_MODULE_LANGPACK_SV]
-en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PT]
-en-US = "Portuguese"
-
-[STR_DESC_MODULE_LANGPACK_PT]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PT_BR]
-en-US = "Portuguese (Brazil)"
-
-[STR_DESC_MODULE_LANGPACK_PT_BR]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_JA]
-en-US = "Japanese"
-
-[STR_DESC_MODULE_LANGPACK_JA]
-en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KO]
-en-US = "Korean"
-
-[STR_DESC_MODULE_LANGPACK_KO]
-en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZH_CN]
-en-US = "Chinese (simplified)"
-
-[STR_DESC_MODULE_LANGPACK_ZH_CN]
-en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZH_TW]
-en-US = "Chinese (traditional)"
-
-[STR_DESC_MODULE_LANGPACK_ZH_TW]
-en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NL]
-en-US = "Dutch"
-
-[STR_DESC_MODULE_LANGPACK_NL]
-en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HU]
-en-US = "Hungarian"
-
-[STR_DESC_MODULE_LANGPACK_HU]
-en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PL]
-en-US = "Polish"
-
-[STR_DESC_MODULE_LANGPACK_PL]
-en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RU]
-en-US = "Russian"
-
-[STR_DESC_MODULE_LANGPACK_RU]
-en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TR]
-en-US = "Turkish"
-
-[STR_DESC_MODULE_LANGPACK_TR]
-en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EL]
-en-US = "Greek"
-
-[STR_DESC_MODULE_LANGPACK_EL]
-en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TH]
-en-US = "Thai"
-
-[STR_DESC_MODULE_LANGPACK_TH]
-en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CS]
-en-US = "Czech"
-
-[STR_DESC_MODULE_LANGPACK_CS]
-en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SK]
-en-US = "Slovak"
-
-[STR_DESC_MODULE_LANGPACK_SK]
-en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HR]
-en-US = "Croatian"
-
-[STR_DESC_MODULE_LANGPACK_HR]
-en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ET]
-en-US = "Estonian"
-
-[STR_DESC_MODULE_LANGPACK_ET]
-en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_VI]
-en-US = "Vietnamese"
-
-[STR_DESC_MODULE_LANGPACK_VI]
-en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BG]
-en-US = "Bulgarian"
-
-[STR_DESC_MODULE_LANGPACK_BG]
-en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KM]
-en-US = "Khmer"
-
-[STR_DESC_MODULE_LANGPACK_KM]
-en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PA_IN]
-en-US = "Punjabi"
-
-[STR_DESC_MODULE_LANGPACK_PA_IN]
-en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GU_IN]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_LANGPACK_GU_IN]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TA]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_LANGPACK_TA]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TA_IN]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_LANGPACK_TA_IN]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HI]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_LANGPACK_HI]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HI_IN]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_LANGPACK_HI_IN]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ST]
-en-US = "Southern Sotho (Sutu)"
-
-[STR_DESC_MODULE_LANGPACK_ST]
-en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TN]
-en-US = "Tswana"
-
-[STR_DESC_MODULE_LANGPACK_TN]
-en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_XH]
-en-US = "Xhosa"
-
-[STR_DESC_MODULE_LANGPACK_XH]
-en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZU]
-en-US = "Zulu"
-
-[STR_DESC_MODULE_LANGPACK_ZU]
-en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AF]
-en-US = "Afrikaans"
-
-[STR_DESC_MODULE_LANGPACK_AF]
-en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SW]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_LANGPACK_SW]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SW_TZ]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_LANGPACK_SW_TZ]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LO]
-en-US = "Lao"
-
-[STR_DESC_MODULE_LANGPACK_LO]
-en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MY]
-en-US = "Burmese"
-
-[STR_DESC_MODULE_LANGPACK_MY]
-en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NSO]
-en-US = "Northern Sotho"
-
-[STR_DESC_MODULE_LANGPACK_NSO]
-en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN]
-en-US = "Bengali"
-
-[STR_DESC_MODULE_LANGPACK_BN]
-en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN_BD]
-en-US = "Bengali (Bangladesh)"
-
-[STR_DESC_MODULE_LANGPACK_BN_BD]
-en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN_IN]
-en-US = "Bengali (India)"
-
-[STR_DESC_MODULE_LANGPACK_BN_IN]
-en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_OR]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_LANGPACK_OR]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_OR_IN]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_LANGPACK_OR_IN]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MR]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_LANGPACK_MR]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MR_IN]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_LANGPACK_MR_IN]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NE]
-en-US = "Nepali"
-
-[STR_DESC_MODULE_LANGPACK_NE]
-en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AR]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_LANGPACK_AR]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AR_SA]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_LANGPACK_AR_SA]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CA]
-en-US = "Catalan"
-
-[STR_DESC_MODULE_LANGPACK_CA]
-en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DA]
-en-US = "Danish"
-
-[STR_DESC_MODULE_LANGPACK_DA]
-en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FI]
-en-US = "Finnish"
-
-[STR_DESC_MODULE_LANGPACK_FI]
-en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HE]
-en-US = "Hebrew"
-
-[STR_DESC_MODULE_LANGPACK_HE]
-en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_IS]
-en-US = "Icelandic"
-
-[STR_DESC_MODULE_LANGPACK_IS]
-en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NB]
-en-US = "Norwegian (Bokmal)"
-
-[STR_DESC_MODULE_LANGPACK_NB]
-en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NN]
-en-US = "Norwegian (Nynorsk)"
-
-[STR_DESC_MODULE_LANGPACK_NN]
-en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RM]
-en-US = "Rhaeto-Romance"
-
-[STR_DESC_MODULE_LANGPACK_RM]
-en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RO]
-en-US = "Romanian"
-
-[STR_DESC_MODULE_LANGPACK_RO]
-en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SQ]
-en-US = "Albanian"
-
-[STR_DESC_MODULE_LANGPACK_SQ]
-en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UR]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_LANGPACK_UR]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ID]
-en-US = "Indonesian"
-
-[STR_DESC_MODULE_LANGPACK_ID]
-en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UK]
-en-US = "Ukrainian"
-
-[STR_DESC_MODULE_LANGPACK_UK]
-en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BE]
-en-US = "Belarusian"
-
-[STR_DESC_MODULE_LANGPACK_BE]
-en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SL]
-en-US = "Slovenian"
-
-[STR_DESC_MODULE_LANGPACK_SL]
-en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LV]
-en-US = "Latvian"
-
-[STR_DESC_MODULE_LANGPACK_LV]
-en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LT]
-en-US = "Lithuanian"
-
-[STR_DESC_MODULE_LANGPACK_LT]
-en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HY]
-en-US = "Armenian"
-
-[STR_DESC_MODULE_LANGPACK_HY]
-en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EU]
-en-US = "Basque"
-
-[STR_DESC_MODULE_LANGPACK_EU]
-en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MK]
-en-US = "Macedonian"
-
-[STR_DESC_MODULE_LANGPACK_MK]
-en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MT]
-en-US = "Maltese"
-
-[STR_DESC_MODULE_LANGPACK_MT]
-en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CY]
-en-US = "Welsh"
-
-[STR_DESC_MODULE_LANGPACK_CY]
-en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GL]
-en-US = "Galician"
-
-[STR_DESC_MODULE_LANGPACK_GL]
-en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SH_YU]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_LANGPACK_SH_YU]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SH]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_LANGPACK_SH]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GA]
-en-US = "Irish"
-
-[STR_DESC_MODULE_LANGPACK_GA]
-en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SR_CS]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_LANGPACK_SR_CS]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SR]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_LANGPACK_SR]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BS]
-en-US = "Bosnian"
-
-[STR_DESC_MODULE_LANGPACK_BS]
-en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AS_IN]
-en-US = "Assamese"
-
-[STR_DESC_MODULE_LANGPACK_AS_IN]
-en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RW]
-en-US = "Kinyarwanda"
-
-[STR_DESC_MODULE_LANGPACK_RW]
-en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SA]
-en-US = "Sanskrit"
-
-[STR_DESC_MODULE_LANGPACK_SA]
-en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FA]
-en-US = "Farsi"
-
-[STR_DESC_MODULE_LANGPACK_FA]
-en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FO]
-en-US = "Faroese"
-
-[STR_DESC_MODULE_LANGPACK_FO]
-en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SB]
-en-US = "Sorbian"
-
-[STR_DESC_MODULE_LANGPACK_SB]
-en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TT]
-en-US = "Tatar"
-
-[STR_DESC_MODULE_LANGPACK_TT]
-en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TS]
-en-US = "Tsonga"
-
-[STR_DESC_MODULE_LANGPACK_TS]
-en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_YI]
-en-US = "Yiddish"
-
-[STR_DESC_MODULE_LANGPACK_YI]
-en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BR]
-en-US = "Breton"
-
-[STR_DESC_MODULE_LANGPACK_BR]
-en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NR]
-en-US = "Ndebele South"
-
-[STR_DESC_MODULE_LANGPACK_NR]
-en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SS]
-en-US = "Swazi"
-
-[STR_DESC_MODULE_LANGPACK_SS]
-en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_VE]
-en-US = "Venda"
-
-[STR_DESC_MODULE_LANGPACK_VE]
-en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KN]
-en-US = "Kannada"
-
-[STR_DESC_MODULE_LANGPACK_KN]
-en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MS]
-en-US = "Malay (Malaysian)"
-
-[STR_DESC_MODULE_LANGPACK_MS]
-en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TG]
-en-US = "Tajik"
-
-[STR_DESC_MODULE_LANGPACK_TG]
-en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KU]
-en-US = "Kurdish"
-
-[STR_DESC_MODULE_LANGPACK_KU]
-en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DZ]
-en-US = "Dzongkha"
-
-[STR_DESC_MODULE_LANGPACK_DZ]
-en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KA]
-en-US = "Georgian"
-
-[STR_DESC_MODULE_LANGPACK_KA]
-en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EO]
-en-US = "Esperanto"
-
-[STR_DESC_MODULE_LANGPACK_EO]
-en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GU]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_LANGPACK_GU]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EN_ZA]
-en-US = "English (South Africa)"
-
-[STR_DESC_MODULE_LANGPACK_EN_ZA]
-en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EN_GB]
-en-US = "English (United Kingdom)"
-
-[STR_DESC_MODULE_LANGPACK_EN_GB]
-en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UR_IN]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_LANGPACK_UR_IN]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ML_IN]
-en-US = "Malayalam"
-
-[STR_DESC_MODULE_LANGPACK_ML_IN]
-en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TE_IN]
-en-US = "Telugu"
-
-[STR_DESC_MODULE_LANGPACK_TE_IN]
-en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TI_ER]
-en-US = "Tigrinya"
-
-[STR_DESC_MODULE_LANGPACK_TI_ER]
-en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UZ]
-en-US = "Uzbek"
-
-[STR_DESC_MODULE_LANGPACK_UZ]
-en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MN]
-en-US = "Mongolian"
-
-[STR_DESC_MODULE_LANGPACK_MN]
-en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KK]
-en-US = "Kazakh"
-
-[STR_DESC_MODULE_LANGPACK_KK]
-en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
-
diff --git a/scp2/source/accessories/module_templates_accessories.scp b/scp2/source/accessories/module_templates_accessories.scp
deleted file mode 100644
index 917cf69b9..000000000
--- a/scp2/source/accessories/module_templates_accessories.scp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "macros.inc"
-
-#ifdef WITH_EXTRA_TEMPLATE
-
-Module gid_Module_Optional_Accessories_Templates
-    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_TEMPLATES);
-    ParentID = gid_Module_Optional_Accessories;
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-#include "alllangmodules_accessories_templates_root.inc"
-
-Module gid_Module_Optional_Accessories_Tem_Template
-    ParentID = gid_Module_Optional_Accessories_Templates;
-    Name = "gid_Module_Optional_Accessories_Tem_Template";
-    Description = "gid_Module_Optional_Accessories_Tem_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (
-        gid_File_Extra_Templates_Accessories,
-        gid_File_Extra_Templates_Layout_Accessories,
-        gid_File_Extra_Templates_Present_Accessories,
-        gid_File_Extra_Templates_Educate_Accessories,
-        gid_File_Extra_Templates_Finance_Accessories,
-        gid_File_Extra_Templates_Forms_Accessories,
-        gid_File_Extra_Templates_Labels_Accessories,
-        gid_File_Extra_Templates_Misc_Accessories,
-        gid_File_Extra_Templates_Officorr_Accessories,
-        gid_File_Extra_Templates_Offimisc_Accessories,
-        gid_File_Extra_Templates_Personal_Accessories,
-        gid_File_Extra_Templates_NONFREE_Accessories,
-        gid_File_Extra_Templates_NONFREE_Layout_Accessories,
-        gid_File_Extra_Templates_NONFREE_Present_Accessories,
-        gid_File_Extra_Templates_NONFREE_Educate_Accessories,
-        gid_File_Extra_Templates_NONFREE_Finance_Accessories,
-        gid_File_Extra_Templates_NONFREE_Forms_Accessories,
-        gid_File_Extra_Templates_NONFREE_Labels_Accessories,
-        gid_File_Extra_Templates_NONFREE_Misc_Accessories,
-        gid_File_Extra_Templates_NONFREE_Officorr_Accessories,
-        gid_File_Extra_Templates_NONFREE_Offimisc_Accessories,
-        gid_File_Extra_Templates_NONFREE_Personal_Accessories );
-    Minimal = NO;
-    Default = YES;
-End
-
-Module gid_Module_Optional_Accessories_Tem_Common
-    PackageInfo = "packinfo_accessories.txt";
-    ParentID = gid_Module_Optional_Accessories;
-    Name = "gid_Module_Optional_Accessories_Tem_Common";
-    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON);
-    Files = (
-        gid_File_Extra_Templates_Common,
-        gid_File_Extra_Templates_Common_Layout,
-        gid_File_Extra_Templates_Common_Present,
-        gid_File_Extra_Templates_Common_Educate,
-        gid_File_Extra_Templates_Common_Finance,
-        gid_File_Extra_Templates_Common_Forms,
-        gid_File_Extra_Templates_Common_Labels,
-        gid_File_Extra_Templates_Common_Misc,
-        gid_File_Extra_Templates_Common_Officorr,
-        gid_File_Extra_Templates_Common_Offimisc,
-        gid_File_Extra_Templates_Common_Personal );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-#include "alllangmodules_accessories_templates.inc"
-
-#endif
diff --git a/scp2/source/accessories/module_templates_accessories.ulf b/scp2/source/accessories/module_templates_accessories.ulf
deleted file mode 100644
index da17fc112..000000000
--- a/scp2/source/accessories/module_templates_accessories.ulf
+++ /dev/null
@@ -1,707 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Kálmán Szalai - KAMI <kami911@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-
-[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES]
-en-US = "Templates"
-
-[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES]
-en-US = "Create perfect documents within seconds with document templates."
-
-[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON]
-en-US = "Common templates"
-
-[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON]
-en-US = "Create perfect documents within seconds with document templates. Common templates contain language independent templates."
-
-[STR_NAME_MODULE_LANGPACK_EN_US]
-en-US = "English"
-
-[STR_DESC_MODULE_LANGPACK_EN_US]
-en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DE]
-en-US = "German"
-
-[STR_DESC_MODULE_LANGPACK_DE]
-en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FR]
-en-US = "French"
-
-[STR_DESC_MODULE_LANGPACK_FR]
-en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_IT]
-en-US = "Italian"
-
-[STR_DESC_MODULE_LANGPACK_IT]
-en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ES]
-en-US = "Spanish"
-
-[STR_DESC_MODULE_LANGPACK_ES]
-en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SV]
-en-US = "Swedish"
-
-[STR_DESC_MODULE_LANGPACK_SV]
-en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PT]
-en-US = "Portuguese"
-
-[STR_DESC_MODULE_LANGPACK_PT]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PT_BR]
-en-US = "Portuguese (Brazil)"
-
-[STR_DESC_MODULE_LANGPACK_PT_BR]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_JA]
-en-US = "Japanese"
-
-[STR_DESC_MODULE_LANGPACK_JA]
-en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KO]
-en-US = "Korean"
-
-[STR_DESC_MODULE_LANGPACK_KO]
-en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZH_CN]
-en-US = "Chinese (simplified)"
-
-[STR_DESC_MODULE_LANGPACK_ZH_CN]
-en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZH_TW]
-en-US = "Chinese (traditional)"
-
-[STR_DESC_MODULE_LANGPACK_ZH_TW]
-en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NL]
-en-US = "Dutch"
-
-[STR_DESC_MODULE_LANGPACK_NL]
-en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HU]
-en-US = "Hungarian"
-
-[STR_DESC_MODULE_LANGPACK_HU]
-en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PL]
-en-US = "Polish"
-
-[STR_DESC_MODULE_LANGPACK_PL]
-en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RU]
-en-US = "Russian"
-
-[STR_DESC_MODULE_LANGPACK_RU]
-en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TR]
-en-US = "Turkish"
-
-[STR_DESC_MODULE_LANGPACK_TR]
-en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EL]
-en-US = "Greek"
-
-[STR_DESC_MODULE_LANGPACK_EL]
-en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TH]
-en-US = "Thai"
-
-[STR_DESC_MODULE_LANGPACK_TH]
-en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CS]
-en-US = "Czech"
-
-[STR_DESC_MODULE_LANGPACK_CS]
-en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SK]
-en-US = "Slovak"
-
-[STR_DESC_MODULE_LANGPACK_SK]
-en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HR]
-en-US = "Croatian"
-
-[STR_DESC_MODULE_LANGPACK_HR]
-en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ET]
-en-US = "Estonian"
-
-[STR_DESC_MODULE_LANGPACK_ET]
-en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_VI]
-en-US = "Vietnamese"
-
-[STR_DESC_MODULE_LANGPACK_VI]
-en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BG]
-en-US = "Bulgarian"
-
-[STR_DESC_MODULE_LANGPACK_BG]
-en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KM]
-en-US = "Khmer"
-
-[STR_DESC_MODULE_LANGPACK_KM]
-en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PA_IN]
-en-US = "Punjabi"
-
-[STR_DESC_MODULE_LANGPACK_PA_IN]
-en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GU_IN]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_LANGPACK_GU_IN]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TA]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_LANGPACK_TA]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TA_IN]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_LANGPACK_TA_IN]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HI]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_LANGPACK_HI]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HI_IN]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_LANGPACK_HI_IN]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ST]
-en-US = "Southern Sotho (Sutu)"
-
-[STR_DESC_MODULE_LANGPACK_ST]
-en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TN]
-en-US = "Tswana"
-
-[STR_DESC_MODULE_LANGPACK_TN]
-en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_XH]
-en-US = "Xhosa"
-
-[STR_DESC_MODULE_LANGPACK_XH]
-en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZU]
-en-US = "Zulu"
-
-[STR_DESC_MODULE_LANGPACK_ZU]
-en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AF]
-en-US = "Afrikaans"
-
-[STR_DESC_MODULE_LANGPACK_AF]
-en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SW]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_LANGPACK_SW]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SW_TZ]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_LANGPACK_SW_TZ]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LO]
-en-US = "Lao"
-
-[STR_DESC_MODULE_LANGPACK_LO]
-en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MY]
-en-US = "Burmese"
-
-[STR_DESC_MODULE_LANGPACK_MY]
-en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NSO]
-en-US = "Northern Sotho"
-
-[STR_DESC_MODULE_LANGPACK_NSO]
-en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN]
-en-US = "Bengali"
-
-[STR_DESC_MODULE_LANGPACK_BN]
-en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN_BD]
-en-US = "Bengali (Bangladesh)"
-
-[STR_DESC_MODULE_LANGPACK_BN_BD]
-en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN_IN]
-en-US = "Bengali (India)"
-
-[STR_DESC_MODULE_LANGPACK_BN_IN]
-en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_OR]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_LANGPACK_OR]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_OR_IN]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_LANGPACK_OR_IN]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MR]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_LANGPACK_MR]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MR_IN]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_LANGPACK_MR_IN]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NE]
-en-US = "Nepali"
-
-[STR_DESC_MODULE_LANGPACK_NE]
-en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AR]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_LANGPACK_AR]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AR_SA]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_LANGPACK_AR_SA]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CA]
-en-US = "Catalan"
-
-[STR_DESC_MODULE_LANGPACK_CA]
-en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DA]
-en-US = "Danish"
-
-[STR_DESC_MODULE_LANGPACK_DA]
-en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FI]
-en-US = "Finnish"
-
-[STR_DESC_MODULE_LANGPACK_FI]
-en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HE]
-en-US = "Hebrew"
-
-[STR_DESC_MODULE_LANGPACK_HE]
-en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_IS]
-en-US = "Icelandic"
-
-[STR_DESC_MODULE_LANGPACK_IS]
-en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NB]
-en-US = "Norwegian (Bokmal)"
-
-[STR_DESC_MODULE_LANGPACK_NB]
-en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NN]
-en-US = "Norwegian (Nynorsk)"
-
-[STR_DESC_MODULE_LANGPACK_NN]
-en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RM]
-en-US = "Rhaeto-Romance"
-
-[STR_DESC_MODULE_LANGPACK_RM]
-en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RO]
-en-US = "Romanian"
-
-[STR_DESC_MODULE_LANGPACK_RO]
-en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SQ]
-en-US = "Albanian"
-
-[STR_DESC_MODULE_LANGPACK_SQ]
-en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UR]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_LANGPACK_UR]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ID]
-en-US = "Indonesian"
-
-[STR_DESC_MODULE_LANGPACK_ID]
-en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UK]
-en-US = "Ukrainian"
-
-[STR_DESC_MODULE_LANGPACK_UK]
-en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BE]
-en-US = "Belarusian"
-
-[STR_DESC_MODULE_LANGPACK_BE]
-en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SL]
-en-US = "Slovenian"
-
-[STR_DESC_MODULE_LANGPACK_SL]
-en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LV]
-en-US = "Latvian"
-
-[STR_DESC_MODULE_LANGPACK_LV]
-en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LT]
-en-US = "Lithuanian"
-
-[STR_DESC_MODULE_LANGPACK_LT]
-en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HY]
-en-US = "Armenian"
-
-[STR_DESC_MODULE_LANGPACK_HY]
-en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EU]
-en-US = "Basque"
-
-[STR_DESC_MODULE_LANGPACK_EU]
-en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MK]
-en-US = "Macedonian"
-
-[STR_DESC_MODULE_LANGPACK_MK]
-en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MT]
-en-US = "Maltese"
-
-[STR_DESC_MODULE_LANGPACK_MT]
-en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CY]
-en-US = "Welsh"
-
-[STR_DESC_MODULE_LANGPACK_CY]
-en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GL]
-en-US = "Galician"
-
-[STR_DESC_MODULE_LANGPACK_GL]
-en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SH_YU]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_LANGPACK_SH_YU]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SH]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_LANGPACK_SH]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GA]
-en-US = "Irish"
-
-[STR_DESC_MODULE_LANGPACK_GA]
-en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SR_CS]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_LANGPACK_SR_CS]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SR]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_LANGPACK_SR]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BS]
-en-US = "Bosnian"
-
-[STR_DESC_MODULE_LANGPACK_BS]
-en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AS_IN]
-en-US = "Assamese"
-
-[STR_DESC_MODULE_LANGPACK_AS_IN]
-en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RW]
-en-US = "Kinyarwanda"
-
-[STR_DESC_MODULE_LANGPACK_RW]
-en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SA]
-en-US = "Sanskrit"
-
-[STR_DESC_MODULE_LANGPACK_SA]
-en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FA]
-en-US = "Farsi"
-
-[STR_DESC_MODULE_LANGPACK_FA]
-en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FO]
-en-US = "Faroese"
-
-[STR_DESC_MODULE_LANGPACK_FO]
-en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SB]
-en-US = "Sorbian"
-
-[STR_DESC_MODULE_LANGPACK_SB]
-en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TT]
-en-US = "Tatar"
-
-[STR_DESC_MODULE_LANGPACK_TT]
-en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TS]
-en-US = "Tsonga"
-
-[STR_DESC_MODULE_LANGPACK_TS]
-en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_YI]
-en-US = "Yiddish"
-
-[STR_DESC_MODULE_LANGPACK_YI]
-en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BR]
-en-US = "Breton"
-
-[STR_DESC_MODULE_LANGPACK_BR]
-en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NR]
-en-US = "Ndebele South"
-
-[STR_DESC_MODULE_LANGPACK_NR]
-en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SS]
-en-US = "Swazi"
-
-[STR_DESC_MODULE_LANGPACK_SS]
-en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_VE]
-en-US = "Venda"
-
-[STR_DESC_MODULE_LANGPACK_VE]
-en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KN]
-en-US = "Kannada"
-
-[STR_DESC_MODULE_LANGPACK_KN]
-en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MS]
-en-US = "Malay (Malaysian)"
-
-[STR_DESC_MODULE_LANGPACK_MS]
-en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TG]
-en-US = "Tajik"
-
-[STR_DESC_MODULE_LANGPACK_TG]
-en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KU]
-en-US = "Kurdish"
-
-[STR_DESC_MODULE_LANGPACK_KU]
-en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DZ]
-en-US = "Dzongkha"
-
-[STR_DESC_MODULE_LANGPACK_DZ]
-en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KA]
-en-US = "Georgian"
-
-[STR_DESC_MODULE_LANGPACK_KA]
-en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EO]
-en-US = "Esperanto"
-
-[STR_DESC_MODULE_LANGPACK_EO]
-en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GU]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_LANGPACK_GU]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EN_ZA]
-en-US = "English (South Africa)"
-
-[STR_DESC_MODULE_LANGPACK_EN_ZA]
-en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EN_GB]
-en-US = "English (United Kingdom)"
-
-[STR_DESC_MODULE_LANGPACK_EN_GB]
-en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UR_IN]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_LANGPACK_UR_IN]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ML_IN]
-en-US = "Malayalam"
-
-[STR_DESC_MODULE_LANGPACK_ML_IN]
-en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TE_IN]
-en-US = "Telugu"
-
-[STR_DESC_MODULE_LANGPACK_TE_IN]
-en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TI_ER]
-en-US = "Tigrinya"
-
-[STR_DESC_MODULE_LANGPACK_TI_ER]
-en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UZ]
-en-US = "Uzbek"
-
-[STR_DESC_MODULE_LANGPACK_UZ]
-en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MN]
-en-US = "Mongolian"
-
-[STR_DESC_MODULE_LANGPACK_MN]
-en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KK]
-en-US = "Kazakh"
-
-[STR_DESC_MODULE_LANGPACK_KK]
-en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
-
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
deleted file mode 100644
index db9b028de..000000000
--- a/scp2/source/activex/file_activex.scp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-File gid_File_Lib_Soactivex
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "so_activex.dll";
-End
-
-#ifdef BUILD_X64
-	File gid_File_Lib_Soactivex64
-		TXT_FILE_BODY;
-		Styles = (PACKED);
-		Dir = SCP2_OOO_BIN_DIR;
-		Name = "so_activex_x64.dll";
-		ComponentCondition = "VersionNT64";
-	End
-#endif
-
-File gid_File_Lib_Regactivex_Msi
-    TXT_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "regactivex.dll";
-End
-
-File gid_File_Lib_Regpatchactivex_Msi
-    TXT_FILE_BODY;
-    Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "regpatchactivex.dll";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
diff --git a/scp2/source/activex/makefile.mk b/scp2/source/activex/makefile.mk
deleted file mode 100644
index fb4342e4a..000000000
--- a/scp2/source/activex/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=activex
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(BUILD_X64)"!=""
-SCPDEFS+=-DBUILD_X64
-.ENDIF
-
-SCP_PRODUCT_TYPE=osl
-
-.IF "$(GUI)"=="WNT"
-PARFILES= \
-        module_activex.par        \
-        file_activex.par
-.ENDIF
-
-ULFFILES= \
-        module_activex.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp
deleted file mode 100644
index aaac49d80..000000000
--- a/scp2/source/activex/module_activex.scp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-Module gid_Module_Optional_Activexcontrol
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_OPTIONAL_ACTIVEXCONTROL );
-    Sortkey = "1000";
-    Default = NO;
-    Minimal = NO;
-    ParentID = gid_Module_Optional;
-    Files = (gid_File_Lib_Soactivex, gid_File_Lib_Soactivex64, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi);
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
diff --git a/scp2/source/activex/module_activex.ulf b/scp2/source/activex/module_activex.ulf
deleted file mode 100644
index fb7e101da..000000000
--- a/scp2/source/activex/module_activex.ulf
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_ACTIVEXCONTROL]
-en-US = "ActiveX Control"
-
-[STR_DESC_MODULE_OPTIONAL_ACTIVEXCONTROL]
-en-US = "Component to enable Microsoft Internet Explorer to display %PRODUCTNAME documents."
-
-
-
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
deleted file mode 100644
index 4da10dd79..000000000
--- a/scp2/source/base/file_base.scp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-File gid_File_Exe_Sbase
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(sbase);
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Base";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
-    Styles = (PACKED);
-  #endif
-End
-
-#if defined WNT
-File gid_File_Exe_Odbcconfig
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = EXENAME(odbcconfig);
-    Styles = (PACKED);
-End
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Abp, abp)
-STD_RES_FILE( gid_File_Res_Abp, abp)
-
-STD_LIB_FILE( gid_File_Lib_Dbp, dbp)
-STD_RES_FILE( gid_File_Res_Dbp, dbp)
-
-STD_LIB_FILE( gid_File_Lib_Dbu, dbu )
-STD_RES_FILE( gid_File_Res_Dbu, dbu)
-
-STD_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
-STD_RES_FILE( gid_File_Res_Adabasui, adabasui)
-
-STD_RES_FILE( gid_File_Res_Cnr, cnr)
-STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
-STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
-
-STD_LIB_FILE( gid_File_Lib_Rpt, rpt )
-STD_RES_FILE( gid_File_Res_Rpt, rpt)
-
-STD_LIB_FILE( gid_File_Lib_Rptui, rptui )
-STD_RES_FILE( gid_File_Res_Rptui, rptui)
-
-STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
-
-File gid_File_Help_Sdatabase_Zip
-    Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY_HELPPACK;
-    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdatabase);
-    Patchfiles = (); 
-End
-
-File gid_File_Share_Registry_Base_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "base.xcd";
-End
diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp
deleted file mode 100644
index c678e7424..000000000
--- a/scp2/source/base/folderitem_base.scp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-FolderItem gid_Folderitem_Sbase
-    Name = "%PRODUCTNAME Base";
-    ModuleID = gid_Module_Prg_Base_Bin;
-    FolderID = gid_Folder_Staroffice51;
-    FileID = gid_File_Exe_Sbase;
-    IconFile = gid_File_Exe_Sbase;
-    IconID = 0;
-    WkDir = gid_Dir_Program;
-    Parameter = "";
-    Styles = (NOWEB, NON_ADVERTISED);
-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
-End
diff --git a/scp2/source/base/folderitem_base.ulf b/scp2/source/base/folderitem_base.ulf
deleted file mode 100644
index 3bea2fd72..000000000
--- a/scp2/source/base/folderitem_base.ulf
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_FI_TOOLTIP_BASE]
-en-US = "Manage databases, create queries and reports to track and manage your information by using Base."
-
diff --git a/scp2/source/base/makefile.mk b/scp2/source/base/makefile.mk
deleted file mode 100644
index ead15b197..000000000
--- a/scp2/source/base/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=base
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(ENABLE_REPORTBUILDER)" == "YES"
-SCPDEFS += -DENABLE_REPORTBUILDER
-.ENDIF
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_base.par             \
-        file_base.par
-
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_base.par        \
-        folderitem_base.par
-.ENDIF
-
-ULFFILES= \
-        module_base.ulf              \
-        registryitem_base.ulf        \
-        folderitem_base.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
deleted file mode 100644
index 1a245a657..000000000
--- a/scp2/source/base/module_base.scp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Prg_Base
-    MOD_NAME_DESC(MODULE_PRG_BASE);
-    ParentID = gid_Module_Prg;
-    Sortkey = "500";
-    Styles =(APPLICATIONMODULE);
-End
-
-Module gid_Module_Prg_Base_Bin
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_PRG_BASE_BIN );
-    ParentID = gid_Module_Prg_Base;
-    Sortkey = "100";
-    Minimal = NO;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (
-        gid_File_Share_Registry_Base_Xcd
-        ,gid_File_Lib_Abp
-        ,gid_File_Lib_Dbp
-        ,gid_File_Lib_Dbu
-        ,gid_File_Lib_Adabasui
-        ,gid_File_Lib_Rpt
-        ,gid_File_Lib_Rptui
-        ,gid_File_Lib_Rptxml
-    );
-End
-
-Module gid_Module_Brand_Prg_Base
-    PackageInfo = "packinfo_brand.txt";
-    Name = "gid_Module_Brand_Prg_Base";
-    Description = "gid_Module_Brand_Prg_Base";
-    ParentID = gid_Module_Prg_Base;
-    Sortkey = "100";
-    InstallOrder = "1040";
-    Minimal = YES;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Exe_Sbase);
-End
-
-Module gid_Module_Langpack_Base_Template
-    ParentID = gid_Module_Prg_Base_Bin;
-    Name = "gid_Module_Langpack_Base_Template";
-    Description = "gid_Module_Langpack_Base_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_Abp,
-             gid_File_Res_Adabasui,
-             gid_File_Res_Cnr,
-             gid_File_Res_Dbp,
-             gid_File_Res_Dbu,
-             gid_File_Res_Rpt,
-             gid_File_Res_Rptui,
-             gid_File_Res_Sdbcl,
-             gid_File_Res_Sdberr);
-End
-
-#include "alllangmodules_base.inc"
diff --git a/scp2/source/base/module_base.ulf b/scp2/source/base/module_base.ulf
deleted file mode 100644
index 1cd8b2e77..000000000
--- a/scp2/source/base/module_base.ulf
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_PRG_BASE]
-en-US = "%PRODUCTNAME Base"
-
-[STR_DESC_MODULE_PRG_BASE]
-en-US = "Create and edit databases by using %PRODUCTNAME Base."
-
-[STR_NAME_MODULE_PRG_BASE_BIN]
-en-US = "Program Module"
-
-[STR_DESC_MODULE_PRG_BASE_BIN]
-en-US = "The application %PRODUCTNAME Base"
-
-[STR_NAME_MODULE_PRG_BASE_HELP]
-en-US = "%PRODUCTNAME Base Help"
-
-[STR_DESC_MODULE_PRG_BASE_HELP]
-en-US = "Help about %PRODUCTNAME Base"
-
-
-
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
deleted file mode 100644
index 833ed3905..000000000
--- a/scp2/source/base/registryitem_base.scp
+++ /dev/null
@@ -1,163 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-// new odb file extension
-
-RegistryItem gid_Regitem_Odb
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".odb";
-    ModuleID = gid_Module_Prg_Base_Bin;
-    Value = "opendocument.DatabaseDocument.1";
-End
-
-RegistryItem gid_Regitem_Odb_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Base_Bin;
-    Subkey = ".odb\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Odb_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Base_Bin;
-    Subkey = ".odb\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Odb_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Base_Bin;
-    Subkey = ".odb\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_DatabaseDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Base_Bin;
-    Subkey = "opendocument.DatabaseDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Odb_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Base_Bin;
-    Subkey = ".odb";
-    Name = "Content Type";
-    Value = "application/vnd.sun.xml.base";
-End
-
-RegistryItem gid_Regitem_Odb_Mime_Database
-	ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-	ModuleID = gid_Module_Prg_Base_Bin;
-	Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.base";
-	Name = "Extension";
-	Value = ".odb";
-End
-
-RegistryItem gid_Regitem_Openoffice_Databasedocument_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DatabaseDocument.1";
-    ModuleID = gid_Module_Prg_Base_Bin;
-    REG_VALUE_LNG(OO_DATABASE)
-End
-
-RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DatabaseDocument.1\DefaultIcon";
-    ModuleID = gid_Module_Prg_Base_Bin;
-    Value = "<progpath>\program\soffice.exe,13";
-End
-
-RegistryItem gid_Regitem_odb_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.DatabaseDocument.1";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DatabaseDocument.1\shell";
-    ModuleID = gid_Module_Prg_Base_Bin;
-    Value = "open";
-End
-
-// RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell_Open_Command
-//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     Subkey = "opendocument.DatabaseDocument.1\shell\open\command";
-//     ModuleID = gid_Module_Prg_Base_Bin;
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
-RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DatabaseDocument.1\shell\open\command";
-    ModuleID = gid_Module_Prg_Base_Bin;
-    Value = "\"<progpath>\program\sbase.exe\" -o \"%1\"";
-    Styles = ();
-End
-
-// "OpenWith" Windows Registry keys for .odb
-
-RegistryItem gid_Regitem_OpenOffice_ODB_OpenWith_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".odb\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Base_Bin;
-    Name = "opendocument.DatabaseDocument.1";
-    Value = " ";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odb
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Base_Bin;
-    Name = ".odb";
-    Value = "opendocument.DatabaseDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sbase_Exe
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\sbase.exe";
-    ModuleID = gid_Module_Prg_Base_Bin;
-    Value = "<progpath>\program\sbase.exe";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sbase_Exepath
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\sbase.exe";
-    ModuleID = gid_Module_Prg_Base_Bin;
-    Name = "Path";
-    Value = "<progpath>";
-End
-
-// registering the property handler for the supported file types
-
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odb )
diff --git a/scp2/source/base/registryitem_base.ulf b/scp2/source/base/registryitem_base.ulf
deleted file mode 100644
index bf6942ecf..000000000
--- a/scp2/source/base/registryitem_base.ulf
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_REG_VAL_OO_DATABASE]
-en-US = "OpenDocument Database"
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
deleted file mode 100644
index 140a430af..000000000
--- a/scp2/source/binfilter/file_binfilter.scp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "macros.inc"
-
-File gid_File_Share_Registry_Binfilter_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "binfilter.xcd";
-End
-
-File gid_Starregistry_Legacy_Binfilters_Rdb
-    TXT_FILE_BODY;
-    Name = "legacy_binfilters.rdb";
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-End
-
-
-
-STD_LIB_FILE( gid_File_Lib_Bf_Go, bf_go)
-STD_LIB_FILE( gid_File_Lib_Bf_Sch, bf_sch)
-STD_LIB_FILE( gid_File_Lib_Bf_Xo, bf_xo)
-STD_LIB_FILE( gid_File_Lib_Bf_Svx, bf_svx)
-STD_LIB_FILE( gid_File_Lib_Bf_Svt, bf_svt)
-STD_LIB_FILE( gid_File_Lib_Bf_Frm, bf_frm)
-STD_LIB_FILE( gid_File_Lib_Bf_Ofa, bf_ofa)
-STD_LIB_FILE( gid_File_Lib_Bf_Sb, bf_sb)
-STD_LIB_FILE( gid_File_Lib_Bf_Sc, bf_sc)
-STD_LIB_FILE( gid_File_Lib_Bf_Sd, bf_sd)
-STD_LIB_FILE( gid_File_Lib_Bf_Sm, bf_sm)
-STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw)
-STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper)
-STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters)
-STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so)
-STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
-STD_LIB_FILE( gid_File_Lib_Bindet, bindet)
-
-BINFILTER_RES_FILE( gid_File_Res_Bf_Sch, bf_sch )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Svx, bf_svx )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Svt, bf_svt )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Frm, bf_frm )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Sc, bf_sc )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Sd, bf_sd )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Sm, bf_sm)
-BINFILTER_RES_FILE( gid_File_Res_Bf_Sw, bf_sw )
diff --git a/scp2/source/binfilter/makefile.mk b/scp2/source/binfilter/makefile.mk
deleted file mode 100644
index f7882a304..000000000
--- a/scp2/source/binfilter/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=binfilter
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_binfilter.par            \
-        file_binfilter.par              \
-        registryitem_binfilter.par
-
-ULFFILES= \
-        module_binfilter.ulf            \
-        registryitem_binfilter.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
deleted file mode 100644
index 873652e6e..000000000
--- a/scp2/source/binfilter/module_binfilter.scp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Binfilter
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_OPTIONAL_BINFILTER );
-    Sortkey = "700";
-    InstallOrder = "1100";
-    ParentID = gid_Module_Optional;
-    Default = NO;
-    Files = (gid_File_Share_Registry_Binfilter_Xcd,
-    gid_Starregistry_Legacy_Binfilters_Rdb,
-    gid_File_Lib_Bf_Go,
-    gid_File_Lib_Bf_Sch,
-    gid_File_Lib_Bf_Lng,
-    gid_File_Lib_Bf_Xo,
-    gid_File_Lib_Bf_Svx,
-    gid_File_Lib_Bf_Svt,
-    gid_File_Lib_Bf_Frm,
-    gid_File_Lib_Bf_Ofa,
-    gid_File_Lib_Bf_Sb,
-    gid_File_Lib_Bf_Sc,
-    gid_File_Lib_Bf_Sd,
-    gid_File_Lib_Bf_Sm,
-    gid_File_Lib_Bf_So,
-    gid_File_Lib_Bf_Sw,
-    gid_File_Lib_Bf_Wrapper,
-    gid_File_Lib_Legacy_Binfilters,
-    gid_File_Lib_Bf_Migratefilter,
-    gid_File_Lib_Bindet,
-    gid_File_Res_Bf_Sch,
-    gid_File_Res_Bf_Svx,
-    gid_File_Res_Bf_Svt,
-    gid_File_Res_Bf_Frm,
-    gid_File_Res_Bf_Ofa,
-    gid_File_Res_Bf_Sc,
-    gid_File_Res_Bf_Sd,
-    gid_File_Res_Bf_Sm,
-    gid_File_Res_Bf_Sw,
-    gid_File_Res_Bf_Sfx);
-End
diff --git a/scp2/source/binfilter/module_binfilter.ulf b/scp2/source/binfilter/module_binfilter.ulf
deleted file mode 100644
index 9b7fc77e9..000000000
--- a/scp2/source/binfilter/module_binfilter.ulf
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_BINFILTER]
-en-US = "Legacy Filters"
-
-[STR_DESC_MODULE_OPTIONAL_BINFILTER]
-en-US = "Legacy filters, e.g. StarOffice 5.2 binary file formats."
diff --git a/scp2/source/binfilter/registryitem_binfilter.scp b/scp2/source/binfilter/registryitem_binfilter.scp
deleted file mode 100644
index fa4e22975..000000000
--- a/scp2/source/binfilter/registryitem_binfilter.scp
+++ /dev/null
@@ -1,931 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-RegistryItem gid_Regitem_Sdw_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdw";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.writer";
-End
-
-RegistryItem gid_Regitem_Sdw_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.writer";
-    Name = "Extension";
-    Value = ".sdw";
-End
-
-RegistryItem gid_Regitem_Sdw_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starwriter";
-    Name = "Extension";
-    Value = ".sdw";
-End
-
-RegistryItem gid_Regitem_Sgl_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sgl";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.writer-global";
-End
-
-RegistryItem gid_Regitem_Sgl_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.writer-global";
-    Name = "Extension";
-    Value = ".sgl";
-End
-
-RegistryItem gid_Regitem__Sdw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdw";
-    Value = "soffice.StarWriterDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdw
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sdw";
-    Value = "soffice.StarWriterDocument.5";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sgl
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sgl";
-    Value = "soffice.StarWriterGlobalDocument.5";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem__Sgl
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sgl";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "soffice.StarWriterGlobalDocument.5";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterDocument.5";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(SO52_TEXT_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,27";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(SO51_MASTERDOC_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\DefaultIcon";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "<progpath>\program\soffice.exe,35";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\new";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\new\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\open\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\print\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\printto\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-// calc
-
-RegistryItem gid_Regitem_Sdc_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdc";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.calc";
-End
-
-RegistryItem gid_Regitem_Sdc_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.calc";
-    Name = "Extension";
-    Value = ".sdc";
-End
-
-RegistryItem gid_Regitem_Sdc_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starcalc";
-    Name = "Extension";
-    Value = ".sdc";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5";
-    REG_VALUE_LNG(SO51_SPREADSHEET_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,29";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Sdc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdc";
-    Value = "soffice.StarCalcDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdc
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sdc";
-    Value = "soffice.StarCalcDocument.5";
-    Styles = ();
-End
-
-// impress
-RegistryItem gid_Regitem_Sdd_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdd";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.impress";
-End
-
-RegistryItem gid_Regitem_Sdd_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.impress";
-    Name = "Extension";
-    Value = ".sdd";
-End
-
-RegistryItem gid_Regitem_Sdd_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starimpress";
-    Name = "Extension";
-    Value = ".sdd";
-End
-
-RegistryItem gid_Regitem_Sdp_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdp";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.impress-packed";
-End
-
-RegistryItem gid_Regitem_Sdp_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.impress-packed";
-    Name = "Extension";
-    Value = ".sdp";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5";
-    REG_VALUE_LNG(SO51_PRESENT_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,33";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Sdd
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdd";
-    Value = "soffice.StarImpressDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdd
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sdd";
-    Value = "soffice.StarImpressDocument.5";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem__Sdp
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdp";
-    Value = "soffice.StarStorageDocument.5";
-End
-
-// .sdp no longer supported
-// RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdp
-//     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-//     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-//     ModuleID = gid_Module_Optional_Binfilter;
-//     Name = ".sdp";
-//     Value = "soffice.StarStorageDocument.5";
-//     Styles = ();
-// End
-
-// draw
-
-RegistryItem gid_Regitem_Sda_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sda";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.draw";
-End
-
-RegistryItem gid_Regitem_Sda_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.draw";
-    Name = "Extension";
-    Value = ".sda";
-End
-
-RegistryItem gid_Regitem_Sda_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-stardraw";
-    Name = "Extension";
-    Value = ".sda";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5";
-    REG_VALUE_LNG(SO51_DRAWING_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,31";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Sda
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sda";
-    Value = "soffice.StarDrawDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sda
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sda";
-    Value = "soffice.StarDrawDocument.5";
-    Styles = ();
-End
-
-// chart
-RegistryItem gid_Regitem_Sds_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sds";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.chart";
-End
-
-RegistryItem gid_Regitem_Sds_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.chart";
-    Name = "Extension";
-    Value = ".sds";
-End
-
-RegistryItem gid_Regitem_Sds_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starchart";
-    Name = "Extension";
-    Value = ".sds";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(SO52_CHART_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\DefaultIcon";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "<progpath>\program\soffice.exe,36";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\new";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\new\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\open\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\print\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\printto\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument\CurVer";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "soffice.StarChartDocument.5";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(SO50_TEMPLATE_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\DefaultIcon";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "<progpath>\program\soffice.exe,15";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "new";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\new";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\new\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\open\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\print\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\printto\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Sds
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sds";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "soffice.StarChartDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sds
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sds";
-    Value = "soffice.StarChartDocument.5";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem__Vor
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "soffice.StarOfficeTemplate.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_vor
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".vor";
-    Value = "soffice.StarOfficeTemplate.5";
-    Styles = ();
-End
-
-// StarMath
-RegistryItem gid_Regitem_Smf_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".smf";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.math";
-End
-
-RegistryItem gid_Regitem_Smf_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.math";
-    Name = "Extension";
-    Value = ".smf";
-End
-
-RegistryItem gid_Regitem_Smf_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starmath";
-    Name = "Extension";
-    Value = ".smf";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5";
-    REG_VALUE_LNG(SO51_FORMULA_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,38";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Smf
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".smf";
-    Value = "soffice.StarMathDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_smf
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".smf";
-    Value = "soffice.StarMathDocument.5";
-    Styles = ();
-End
-
-
-// .SDW
-RegistryItem gid_Regitem_OpenOffice_SDW_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdw\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarWriterDocument.5";
-    Value = " ";
-End
-
-// .VOR
-RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarWriterDocument.5";
-    Value = " ";
-End
-
-// .SGL
-RegistryItem gid_Regitem_OpenOffice_SGL_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sgl\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarWriterGlobalDocument.5";
-    Value = " ";
-End
-
-// .SDC
-RegistryItem gid_Regitem_OpenOffice_SDC_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdc\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarCalcDocument.5";
-    Value = " ";
-End
-
-// .VOR
-RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarCalcDocument.5";
-    Value = " ";
-End
-
-// .SDD
-RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdd\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarImpressDocument.5";
-    Value = " ";
-End
-
-// .SDP
-RegistryItem gid_Regitem_OpenOffice_SDP_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdp\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarImpressDocument.5";
-    Value = " ";
-End
-
-// .SDA
-RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sda\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarImpressDocument.5";
-    Value = " ";
-End
-
-// .VOR
-RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarImpressDocument.5";
-    Value = " ";
-End
-
-// .SDA
-RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Draw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sda\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarDrawDocument.5";
-    Value = " ";
-End
-
-// .SDD
-RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Draw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdd\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarDrawDocument.5";
-    Value = " ";
-End
-
-// .VOR
-RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Draw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarDrawDocument.5";
-    Value = " ";
-End
-
-// .SMF
-RegistryItem gid_Regitem_OpenOffice_SMF_OpenWith_Math
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".smf\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarMathDocument.5";
-    Value = " ";
-End
-
-
diff --git a/scp2/source/binfilter/registryitem_binfilter.ulf b/scp2/source/binfilter/registryitem_binfilter.ulf
deleted file mode 100644
index 6af0f0e02..000000000
--- a/scp2/source/binfilter/registryitem_binfilter.ulf
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_REG_VAL_NEW]
-en-US = "&New"
-
-[STR_REG_VAL_SO52_TEXT_OOO]
-en-US = "StarOffice 5.0 Text Document"
-
-[STR_REG_VAL_SO51_MASTERDOC_OOO]
-en-US = "StarOffice 5.0 Master Document"
-
-[STR_REG_VAL_SO51_SPREADSHEET_OOO]
-en-US = "StarOffice 5.0 Spreadsheet"
-
-[STR_REG_VAL_SO51_PRESENT_OOO]
-en-US = "StarOffice 5.0 Presentation"
-
-[STR_REG_VAL_SO51_DRAWING_OOO]
-en-US = "StarOffice 5.0 Drawing"
-
-[STR_REG_VAL_SO51_FORMULA_OOO]
-en-US = "StarOffice 5.0 Formula"
-
-[STR_REG_VAL_SO52_CHART_OOO]
-en-US = "StarOffice 5.0 Chart"
-
-[STR_REG_VAL_SO50_TEMPLATE_OOO]
-en-US = "StarOffice 5.0 Template"
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
deleted file mode 100644
index b1fd14b40..000000000
--- a/scp2/source/calc/file_calc.scp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-STD_LIB_FILE( gid_File_Lib_Solver, solver)
-
-#ifndef SYSTEM_LPSOLVE
-File gid_File_Lib_Lpsolve
-    Name = SPECIAL_NAME(lpsolve55);
-    PACKED_LIB_FILE_BODY;
-End
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Analysis, analysis)
-
-File gid_File_Share_Registry_Calc_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "calc.xcd";
-End
-
-STD_LIB_FILE( gid_File_Lib_Calc, calc)
-
-STD_LIB_FILE( gid_File_Lib_Date, date)
-
-STD_LIB_FILE( gid_File_Lib_Sc, sc)
-
-STD_LIB_FILE( gid_File_Lib_Scui, scui)
-
-STD_FILTER_FILE( gid_File_Lib_Scfilt, scfilt)
-
-STD_LIB_FILE( gid_File_Lib_Scd, scd)
-
-STD_RES_FILE( gid_File_Res_Solver, solver)
-
-STD_RES_FILE( gid_File_Res_Analysis, analysis)
-
-STD_RES_FILE( gid_File_Res_Date, date)
-
-STD_RES_FILE( gid_File_Res_Sc, sc )
-
-File gid_File_Help_Scalc_Zip
-    Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY_HELPPACK;
-    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(scalc);
-    Patchfiles = ();
-End
-
-// new user interface configuration files
-/*
-File gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Config_Sofficecfg_Scalc_Menubar;
-    Name = "/uiconfig/scalc/menubar/menubar.xml";
-End
-*/
-File gid_File_Exe_Scalc
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(scalc);
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Calc";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
-    Styles = (PACKED);
-  #endif
-End
diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp
deleted file mode 100644
index 36cd965cb..000000000
--- a/scp2/source/calc/folderitem_calc.scp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-FolderItem gid_Folderitem_Scalc
-    Name = "%PRODUCTNAME Calc";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    FolderID = gid_Folder_Staroffice51;
-    FileID = gid_File_Exe_Scalc;
-    IconFile = gid_File_Exe_Scalc;
-    IconID = 0;
-    WkDir = gid_Dir_Program;
-    Parameter = "";
-    Styles = (NOWEB, NON_ADVERTISED);
-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
-End
diff --git a/scp2/source/calc/folderitem_calc.ulf b/scp2/source/calc/folderitem_calc.ulf
deleted file mode 100644
index 0b4368fdd..000000000
--- a/scp2/source/calc/folderitem_calc.ulf
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_FI_NAME_TABELLENDOKUMENT]
-en-US = "Spreadsheet"
-
-[STR_FI_TOOLTIP_CALC]
-en-US = "Perform calculations, analyze information and manage lists in spreadsheets by using Calc."
diff --git a/scp2/source/calc/makefile.mk b/scp2/source/calc/makefile.mk
deleted file mode 100644
index e049057f7..000000000
--- a/scp2/source/calc/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=calc
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_LPSOLVE)" == "YES"
-SCPDEFS+=-DSYSTEM_LPSOLVE
-.ENDIF
-
-SCP_PRODUCT_TYPE=osl
-PARFILES= \
-        module_calc.par              \
-        file_calc.par 
-
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_calc.par        \
-        folderitem_calc.par
-.ENDIF
-
-ULFFILES= \
-        module_calc.ulf              \
-        registryitem_calc.ulf        \
-        folderitem_calc.ulf 
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
deleted file mode 100644
index 0e5e7903e..000000000
--- a/scp2/source/calc/module_calc.scp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Prg_Calc
-    MOD_NAME_DESC ( MODULE_PRG_CALC );
-    ParentID = gid_Module_Prg;
-    Sortkey = "200";
-    Styles =(APPLICATIONMODULE);
-End
-
-Module gid_Module_Prg_Calc_Bin
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_PRG_CALC_BIN );
-    ParentID = gid_Module_Prg_Calc;
-    Sortkey = "100";
-    Minimal = YES;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
-    gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
-    gid_File_Tmp_Userinstall_Calc_Inf);
-End
-
-Module gid_Module_Prg_Calc_Addins
-    MOD_NAME_DESC ( MODULE_OPTIONAL_ADDINS );
-    Styles = (HIDDEN_ROOT);
-    ParentID = gid_Module_Prg_Calc_Bin;
-    Sortkey = "700";
-    Default = YES;
-    Files = (gid_File_Lib_Date,gid_File_Zip_Addin,gid_File_Lib_Rot,gid_File_Lib_Dfa,gid_File_Lib_Analysis);
-End
-
-Module gid_Module_Brand_Prg_Calc
-    PackageInfo = "packinfo_brand.txt";
-    Name = "gid_Module_Brand_Prg_Calc";
-    Description = "gid_Module_Brand_Prg_Calc";
-    ParentID = gid_Module_Prg_Calc;
-    Sortkey = "100";
-    InstallOrder = "1040";
-    Minimal = YES;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Exe_Scalc);
-End
-
-Module gid_Module_Langpack_Calc_Template
-    ParentID = gid_Module_Prg_Calc_Bin;
-    Name = "gid_Module_Langpack_Calc_Template";
-    Description = "gid_Module_Langpack_Calc_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_Analysis,
-             gid_File_Res_Date,
-             gid_File_Res_Sc,
-             gid_File_Res_Solver);
-End
-
-Module gid_Module_Prg_Calc_MSO_Reg
-    ParentID = gid_Module_Prg_Calc;
-    Name = "gid_Module_Prg_Calc_MSO_Reg";
-    Description = "gid_Module_Prg_Calc_MSO_Reg";
-    Styles = (HIDDEN_ROOT);
-    Minimal = YES;
-    Default = YES;
-End
-
-#include "alllangmodules_calc.inc"
diff --git a/scp2/source/calc/module_calc.ulf b/scp2/source/calc/module_calc.ulf
deleted file mode 100644
index 561de59a4..000000000
--- a/scp2/source/calc/module_calc.ulf
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-[STR_NAME_MODULE_PRG_CALC]
-en-US = "%PRODUCTNAME Calc"
-
-[STR_DESC_MODULE_PRG_CALC]
-en-US = "Perform calculations, analyze information and manage lists in spreadsheets by using %PRODUCTNAME Calc."
-
-[STR_NAME_MODULE_PRG_CALC_BIN]
-en-US = "Program Module"
-
-[STR_DESC_MODULE_PRG_CALC_BIN]
-en-US = "The application %PRODUCTNAME Calc"
-
-[STR_NAME_MODULE_PRG_CALC_HELP]
-en-US = "%PRODUCTNAME Calc Help"
-
-[STR_DESC_MODULE_PRG_CALC_HELP]
-en-US = "Help about %PRODUCTNAME Calc"
-
-[STR_NAME_MODULE_OPTIONAL_ADDINS]
-en-US = "Add-in"
-
-[STR_DESC_MODULE_OPTIONAL_ADDINS]
-en-US = "Add-ins are additional programs that make new functions available in %PRODUCTNAME Calc."
-
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
deleted file mode 100644
index 8220610ec..000000000
--- a/scp2/source/calc/registryitem_calc.scp
+++ /dev/null
@@ -1,1179 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-// MSOLE embedded object in SO7 file format
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}";
-    REG_VALUE_LNG(SO60_SPREADSHEET)
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Auxusertype_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\AuxUserType\2";
-    Value = "%PRODUCTNAME";
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Auxusertype_3
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\AuxUserType\3";
-    REG_VALUE_LNG(SO60_SPREADSHEET)
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Dataformats_Getset_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\DataFormats\GetSet\0";
-    Value = "Embed Source,1,8,1";
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Dataformats_Getset_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\DataFormats\GetSet\1";
-    Value = "3,1,32,1";
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Dataformats_Getset_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\DataFormats\GetSet\2";
-    Value = "2,1,16,1";
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Inprochandler32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\Insertable";
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Localserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\LocalServer32";
-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Miscstatus
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\MiscStatus";
-    Value = "16";
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Progid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\ProgID";
-    Value = "soffice.StarCalcDocument.6";
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Programmable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\Programmable";
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\verb\0";
-    Value = "&Edit,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\verb\-1";
-    Value = "Show,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\verb\-2";
-    Value = "Open,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Versionindependentprogid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\VersionIndependentProgID";
-    Value = "soffice.StarCalcDocument.6";
-End
-
-// MSOLE embedded object in OASIS file format
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}";
-    REG_VALUE_LNG(OO_CALC)
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Auxusertype_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\AuxUserType\2";
-    Value = "%PRODUCTNAME";
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Auxusertype_3
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\AuxUserType\3";
-    REG_VALUE_LNG(OO_CALC)
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Dataformats_Getset_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\DataFormats\GetSet\0";
-    Value = "Embed Source,1,8,1";
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Dataformats_Getset_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\DataFormats\GetSet\1";
-    Value = "3,1,32,1";
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Dataformats_Getset_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\DataFormats\GetSet\2";
-    Value = "2,1,16,1";
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Inprochandler32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\Insertable";
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Localserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\LocalServer32";
-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Miscstatus
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\MiscStatus";
-    Value = "16";
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Progid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\ProgID";
-    Value = "opendocument.CalcDocument.1";
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Programmable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\Programmable";
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\verb\0";
-    Value = "&Edit,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\verb\-1";
-    Value = "Show,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\verb\-2";
-    Value = "Open,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Versionindependentprogid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\VersionIndependentProgID";
-    Value = "opendocument.CalcDocument.1";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6";
-    REG_VALUE_LNG(SO60_SPREADSHEET)
-End
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Clsid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\CLSID";
-    Value = "{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,29";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\Insertable";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Protocol_Stdfileediting_Server
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\protocol\StdFileEditing\server";
-    Value = "<progpath>\program\soffice.exe";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Protocol_Stdfileediting_Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\protocol\StdFileEditing\verb\0";
-    Value = "&Edit";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Protocol_Stdfileediting_Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\protocol\StdFileEditing\verb\-1";
-    Value = "&Show";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Protocol_Stdfileediting_Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\protocol\StdFileEditing\verb\-2";
-    Value = "&Open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument\CurVer";
-    Value = "soffice.StarCalcDocument.6";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalctemplate_6
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarCalcTemplate.6";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    REG_VALUE_LNG(SO60_CALC_TEMPLATE)
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarCalcTemplate.6\DefaultIcon";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "<progpath>\program\soffice.exe,30";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarCalcTemplate.6\shell";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "new";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarCalcTemplate.6\shell\new";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarCalcTemplate.6\shell\new\command";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarCalcTemplate.6\shell\open\command";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarCalcTemplate.6\shell\print\command";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarCalcTemplate.6\shell\printto\command";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Sxc_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".sxc\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Sxc_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".sxc\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Sxc_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".sxc\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_StarCalcDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Stc_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".stc\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Stc_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".stc\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Stc_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".stc\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_StarCalcTemplate_6_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcTemplate.6\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Stc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".stc";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "soffice.StarCalcTemplate.6";
-End
-
-RegistryItem gid_Regitem_Stc_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".stc";
-    Name = "Content Type";
-    Value = "application/vnd.sun.xml.calc.template";
-End
-
-RegistryItem gid_Regitem_stc_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "soffice.StarCalcTemplate.6";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Sxc_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".sxc";
-    Name = "Content Type";
-    Value = "application/vnd.sun.xml.calc";
-End
-
-RegistryItem gid_Regitem_Sxc_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.calc";
-    Name = "Extension";
-    Value = ".sxc";
-End
-
-
-RegistryItem gid_Regitem__Sxc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".sxc";
-    Value = "soffice.StarCalcDocument.6";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxc
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = ".sxc";
-    Value = "soffice.StarCalcDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_sxc_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "soffice.StarCalcDocument.6";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-
-// new ods file extension 
-
-RegistryItem gid_Regitem_Ods_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".ods\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Ods_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".ods\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Ods_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".ods\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_CalcDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem__Ods
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".ods";
-    Value = "opendocument.CalcDocument.1";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_ods
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = ".ods";
-    Value = "opendocument.CalcDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_ods
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "application/vnd.oasis.opendocument.spreadsheet";
-    Value = "opendocument.CalcDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Ods_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".ods";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.spreadsheet";
-End
-
-RegistryItem gid_Regitem_Ods_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.spreadsheet";
-    Name = "Extension";
-    Value = ".ods";
-End
-
-RegistryItem gid_Regitem_Ods_Openoffice_Calcdocument_1_Shellnew
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".ods\opendocument.CalcDocument.1\ShellNew";
-    Name = "FileName";
-    Value = "soffice.ods";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument\CurVer";
-    Value = "opendocument.CalcDocument.1";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1";
-    REG_VALUE_LNG(OO_CALC)
-End
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Clsid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\CLSID";
-    Value = "{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,3";
-End
-
-RegistryItem gid_Regitem_ods_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.CalcDocument.1";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\Insertable";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Server
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\server";
-    Value = "<progpath>\program\soffice.exe";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\verb\0";
-    Value = "&Edit";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\verb\-1";
-    Value = "&Show";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\verb\-2";
-    Value = "&Open";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shell\open\command";
-    Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcDocument.1\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-// .fods
-
-RegistryItem gid_Regitem_Fods_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".fods\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Fods_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".fods\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Fods_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".fods\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem__Fods
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".fods";
-    Value = "opendocument.CalcDocument.1";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fods
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".fods";
-    Value = "opendocument.CalcDocument.1";
-    Styles = (PATCH);
-End
-
-RegistryItem gid_Regitem_Fods_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".fods";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.spreadsheet";
-End
-
-// new ots file extension 
-
-RegistryItem gid_Regitem_Ots_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".ots\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Ots_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".ots\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Ots_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".ots\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_CalcTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "opendocument.CalcTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Ots
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".ots";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "opendocument.CalcTemplate.1";
-End
-
-RegistryItem gid_Regitem_Ots_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".ots";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.spreadsheet-template";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calctemplate_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    REG_VALUE_LNG(OO_CALC_TEMPLATE)
-End
-
-RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\DefaultIcon";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "<progpath>\program\soffice.exe,4";
-End
-
-RegistryItem gid_Regitem_ots_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.CalcTemplate.1";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\shell";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "new";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\shell\new";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\shell\new\command";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\shell\open\command";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\shell\print\command";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.CalcTemplate.1\shell\printto\command";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-// "OpenWith" Windows Registry keys for extensions supported by Calc
-
-// .ODS
-RegistryItem gid_Regitem_OpenOffice_ODS_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".ods\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
-    Value = " ";
-End
-
-// .OTS
-RegistryItem gid_Regitem_OpenOffice_OTS_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".ots\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcTemplate.1";
-    Value = " ";
-End
-
-// .SXC
-RegistryItem gid_Regitem_OpenOffice_SXC_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sxc\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// .STC
-RegistryItem gid_Regitem_OpenOffice_STC_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".stc\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcTemplate.6";
-    Value = " ";
-End
-
-// .DIF
-RegistryItem gid_Regitem_OpenOffice_DIF_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".dif\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// .DBF
-RegistryItem gid_Regitem_OpenOffice_DBF_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".dbf\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// .XLW
-RegistryItem gid_Regitem_OpenOffice_XLW_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".xlw\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// .RTF
-RegistryItem gid_Regitem_OpenOffice_RTF_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".rtf\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// .SLK
-RegistryItem gid_Regitem_OpenOffice_SLK_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".slk\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// .CSV
-RegistryItem gid_Regitem_OpenOffice_CSV_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".csv\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// .TXT
-RegistryItem gid_Regitem_OpenOffice_TXT_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".txt\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// .HTM
-RegistryItem gid_Regitem_OpenOffice_HTM_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".htm\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// .HTML
-RegistryItem gid_Regitem_OpenOffice_HTML_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".html\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// .WK1
-RegistryItem gid_Regitem_OpenOffice_WK1_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".wk1\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// .WKS
-RegistryItem gid_Regitem_OpenOffice_WKS_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".wks\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// .123
-RegistryItem gid_Regitem_OpenOffice_123_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".123\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// .XML
-RegistryItem gid_Regitem_OpenOffice_XML_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".xml\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "soffice.StarCalcDocument.6";
-    Value = " ";
-End
-
-// "FileAssociations" entries
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Stc
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = ".stc";
-    Value = "soffice.StarCalcTemplate.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Dif
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = ".dif";
-    Value = "soffice.StarCalcDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Dbf
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = ".dbf";
-    Value = "soffice.StarCalcDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Slk
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = ".slk";
-    Value = "soffice.StarCalcDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Csv
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = ".csv";
-    Value = "soffice.StarCalcDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xlw
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = ".xlw";
-    Value = "soffice.StarCalcDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wk1
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = ".wk1";
-    Value = "soffice.StarCalcDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wks
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = ".wks";
-    Value = "soffice.StarCalcDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_123
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = ".123";
-    Value = "soffice.StarCalcDocument.6";
-    Styles = ();
-End
-
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scalc_Exe
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\scalc.exe";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "<progpath>\program\scalc.exe";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scalc_Exepath
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\scalc.exe";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "Path";
-    Value = "<progpath>";
-End
-
-// registering the property handler for the supported file types
-
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ods )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ots )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxc )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc )
-
-// registering the mso file types
-
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_MSO_Reg, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 29, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt,  gid_Module_Prg_Calc_MSO_Reg, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 30, scalc.exe, new, Calc )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
-
diff --git a/scp2/source/calc/registryitem_calc.ulf b/scp2/source/calc/registryitem_calc.ulf
deleted file mode 100644
index da0739ee1..000000000
--- a/scp2/source/calc/registryitem_calc.ulf
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_REG_VAL_NEW]
-en-US = "&New"
-
-[STR_REG_VAL_SO60_SPREADSHEET]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet"
-
-[STR_REG_VAL_SO60_CALC_TEMPLATE]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet Template"
-
-[STR_REG_VAL_OO_CALC]
-en-US = "OpenDocument Spreadsheet"
-
-[STR_REG_VAL_OO_CALC_TEMPLATE]
-en-US = "OpenDocument Spreadsheet Template"
-
-[STR_REG_VAL_MS_EXCEL_WORKSHEET_OLD]
-en-US = "Microsoft Excel 97-2003 Worksheet"
-
-[STR_REG_VAL_MS_EXCEL_WORKSHEET]
-en-US = "Microsoft Excel Worksheet"
-
-[STR_REG_VAL_MS_EXCEL_TEMPLATE_OLD]
-en-US = "Microsoft Excel 97-2003 Template"
-
-[STR_REG_VAL_MS_EXCEL_TEMPLATE]
-en-US = "Microsoft Excel Template"
-
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp
deleted file mode 100644
index 2d7af5321..000000000
--- a/scp2/source/canvas/cairocanvas.scp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-File gid_File_Lib_CairoCanvas
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX));
-  #else
-    Name = "cairocanvas.uno.dll";
-  #endif
-End
-
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
deleted file mode 100644
index cd2dc9c2d..000000000
--- a/scp2/source/canvas/canvascommons.scp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
-STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
-
-SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp
deleted file mode 100644
index e79f711aa..000000000
--- a/scp2/source/canvas/directxcanvas.scp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-#ifdef WNT
-# ifdef USE_DIRECTX5
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno)
-# endif
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas,  gdipluscanvas.uno)
-#endif
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
deleted file mode 100644
index 442f21266..000000000
--- a/scp2/source/canvas/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=canvas
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= canvascommons.par		\
-          vclcanvas.par         \
-		  mtfrenderer.par
-
-.IF "$(GUI)"=="UNX"
-#X11 MacOSX has no cairo-canvas
-.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
-PARFILES+= cairocanvas.par
-.ENDIF
-.ENDIF
-
-.IF "$(ENABLE_DIRECTX)" != ""
-.IF "$(USE_DIRECTX5)" != ""
-SCPDEFS+=-DUSE_DIRECTX5
-.ENDIF
-PARFILES+= directxcanvas.par
-.ENDIF
-
-# --- File ---------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp
deleted file mode 100644
index 7e239bed7..000000000
--- a/scp2/source/canvas/mtfrenderer.scp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2010 Novell, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-File gid_File_Lib_MtfRenderer
-    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(mtfrenderer.uno,UNXSUFFIX));
-  #else
-    Name = "mtfrenderer.uno.dll";
-  #endif
-End
diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp
deleted file mode 100644
index c17301f56..000000000
--- a/scp2/source/canvas/vclcanvas.scp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno)
diff --git a/scp2/source/crashrep/file_crashrep.scp b/scp2/source/crashrep/file_crashrep.scp
deleted file mode 100644
index 53ec1ac24..000000000
--- a/scp2/source/crashrep/file_crashrep.scp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-// crashreporter files
-
-File gid_Brand_File_Bin_Crashreport
-    BIN_FILE_BODY;
-    Name = EXENAME(crashrep);
-    Dir = gid_Brand_Dir_Program;
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Crashreporter";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
-    Styles = (PACKED);
-  #endif
-End
-
-#ifdef WNT
-
-File gid_Brand_File_Bin_Crashreport_Com
-    BIN_FILE_BODY;
-    Name = "crashrep.com";
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_Brand_File_Lib_Dbghelp
-    TXT_FILE_BODY;
-    Name = "dbghelp.dll";
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-End
-
-#endif
diff --git a/scp2/source/crashrep/makefile.mk b/scp2/source/crashrep/makefile.mk
deleted file mode 100644
index 5e8101488..000000000
--- a/scp2/source/crashrep/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=crashrep
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(ENABLE_CRASHDUMP)" != ""
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES = \
-    file_crashrep.par
-
-.ENDIF # "$(ENABLE_CRASHDUMP)" != ""
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
deleted file mode 100644
index ed5aa45b6..000000000
--- a/scp2/source/draw/file_draw.scp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-File gid_File_Share_Registry_Draw_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "draw.xcd";
-End
-
-File gid_File_Help_Sdraw_Zip
-    Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY_HELPPACK;
-    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdraw);
-    Patchfiles = (); 
-End
-
-File gid_File_Exe_Sdraw
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(sdraw);
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Draw";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
-    Styles = (PACKED);
-  #endif
-End
-
-// new user interface configuration files
-/*
-File gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Config_Sofficecfg_Sdraw_Menubar;
-    Name = "/uiconfig/sdraw/menubar/menubar.xml";
-End
-*/
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
deleted file mode 100644
index 4a73948ce..000000000
--- a/scp2/source/draw/folderitem_draw.scp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-FolderItem gid_Folderitem_Sdraw
-    Name = "%PRODUCTNAME Draw";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    FolderID = gid_Folder_Staroffice51;
-    FileID = gid_File_Exe_Sdraw;
-    IconFile = gid_File_Exe_Sdraw;
-    IconID = 0;
-    WkDir = gid_Dir_Program;
-    Parameter = "";
-    Styles = (NOWEB, NON_ADVERTISED);
-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
-End
diff --git a/scp2/source/draw/folderitem_draw.ulf b/scp2/source/draw/folderitem_draw.ulf
deleted file mode 100644
index 5eea77b3e..000000000
--- a/scp2/source/draw/folderitem_draw.ulf
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_FI_NAME_ZEICHNUNG]
-en-US = "Drawing"
-
-[STR_FI_TOOLTIP_DRAW]
-en-US = "Create and edit drawings, flow charts, and logos by using Draw."
-
-
diff --git a/scp2/source/draw/makefile.mk b/scp2/source/draw/makefile.mk
deleted file mode 100644
index 605300dad..000000000
--- a/scp2/source/draw/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=draw
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-PARFILES= \
-        module_draw.par              \
-        file_draw.par  
-
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_draw.par        \
-        folderitem_draw.par
-.ENDIF
-
-
-ULFFILES= \
-        module_draw.ulf              \
-        registryitem_draw.ulf        \
-        folderitem_draw.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
deleted file mode 100644
index b5bec12dc..000000000
--- a/scp2/source/draw/module_draw.scp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Prg_Draw
-    MOD_NAME_DESC ( MODULE_PRG_DRAW );
-    ParentID = gid_Module_Prg;
-    Sortkey = "300";
-    Styles =(APPLICATIONMODULE);
-End
-
-Module gid_Module_Prg_Draw_Bin
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_PRG_DRAW_BIN );
-    ParentID = gid_Module_Prg_Draw;
-    Sortkey = "100";
-    Minimal = YES;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml,
-    gid_File_Share_Registry_Draw_Xcd,
-    gid_File_Tmp_Userinstall_Draw_Inf);
-End
-
-Module gid_Module_Brand_Prg_Draw
-    PackageInfo = "packinfo_brand.txt";
-    Name = "gid_Module_Brand_Prg_Draw";
-    Description = "gid_Module_Brand_Prg_Draw";
-    ParentID = gid_Module_Prg_Draw;
-    Sortkey = "100";
-    InstallOrder = "1040";
-    Minimal = YES;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Exe_Sdraw);
-End
-
-Module gid_Module_Langpack_Draw_Template
-    ParentID = gid_Module_Prg_Draw_Bin;
-    Name = "gid_Module_Langpack_Draw_Template";
-    Description = "gid_Module_Langpack_Draw_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = ();
-End
-
-#include "alllangmodules_draw.inc"
diff --git a/scp2/source/draw/module_draw.ulf b/scp2/source/draw/module_draw.ulf
deleted file mode 100644
index 2d8bc0c38..000000000
--- a/scp2/source/draw/module_draw.ulf
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_PRG_DRAW]
-en-US = "%PRODUCTNAME Draw"
-
-[STR_DESC_MODULE_PRG_DRAW]
-en-US = "Create and edit drawings, flow charts, and logos by using %PRODUCTNAME Draw."
-
-[STR_NAME_MODULE_PRG_DRAW_BIN]
-en-US = "Program Module"
-
-[STR_DESC_MODULE_PRG_DRAW_BIN]
-en-US = "The application %PRODUCTNAME Draw"
-
-[STR_NAME_MODULE_PRG_DRAW_HELP]
-en-US = "%PRODUCTNAME Draw Help"
-
-[STR_DESC_MODULE_PRG_DRAW_HELP]
-en-US = "Help about %PRODUCTNAME Draw"
-
-
-
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
deleted file mode 100644
index d72231964..000000000
--- a/scp2/source/draw/registryitem_draw.scp
+++ /dev/null
@@ -1,984 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-// MSOLE embedded object in SO7 file format
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}";
-    REG_VALUE_LNG(SO60_DRAWING)
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Auxusertype_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\AuxUserType\2";
-    Value = "%PRODUCTNAME";
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Auxusertype_3
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\AuxUserType\3";
-    REG_VALUE_LNG(SO60_DRAWING)
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Dataformats_Getset_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\DataFormats\GetSet\0";
-    Value = "Embed Source,1,8,1";
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Dataformats_Getset_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\DataFormats\GetSet\1";
-    Value = "3,1,32,1";
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Dataformats_Getset_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\DataFormats\GetSet\2";
-    Value = "2,1,16,1";
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Inprochandler32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\Insertable";
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Localserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\LocalServer32";
-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Miscstatus
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\MiscStatus";
-    Value = "16";
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Progid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\ProgID";
-    Value = "soffice.StarDrawDocument.6";
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Programmable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\Programmable";
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\verb\0";
-    Value = "&Edit,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\verb\-1";
-    Value = "Show,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\verb\-2";
-    Value = "Open,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Versionindependentprogid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\VersionIndependentProgID";
-    Value = "soffice.StarDrawDocument.6";
-End
-
-// MSOLE embedded object in OASIS file format
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}";
-    REG_VALUE_LNG(OO_DRAW)
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Auxusertype_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\AuxUserType\2";
-    Value = "%PRODUCTNAME";
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Auxusertype_3
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\AuxUserType\3";
-    REG_VALUE_LNG(OO_DRAW)
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Dataformats_Getset_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\DataFormats\GetSet\0";
-    Value = "Embed Source,1,8,1";
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Dataformats_Getset_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\DataFormats\GetSet\1";
-    Value = "3,1,32,1";
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Dataformats_Getset_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\DataFormats\GetSet\2";
-    Value = "2,1,16,1";
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Inprochandler32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\Insertable";
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Localserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\LocalServer32";
-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Miscstatus
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\MiscStatus";
-    Value = "16";
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Progid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\ProgID";
-    Value = "opendocument.DrawDocument.1";
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Programmable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\Programmable";
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\verb\0";
-    Value = "&Edit,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\verb\-1";
-    Value = "Show,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\verb\-2";
-    Value = "Open,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Versionindependentprogid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\VersionIndependentProgID";
-    Value = "opendocument.DrawDocument.1";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_6
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6";
-    REG_VALUE_LNG(SO60_DRAWING)
-End
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Clsid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\CLSID";
-    Value = "{41662FC2-0D57-4aff-AB27-AD2E12E7C273}";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,31";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarDrawDocument\CurVer";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "soffice.StarDrawDocument.6";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\Insertable";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Protocol_Stdfileediting_Server
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\protocol\StdFileEditing\server";
-    Value = "<progpath>\program\soffice.exe";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Protocol_Stdfileediting_Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\protocol\StdFileEditing\verb\0";
-    Value = "&Edit";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Protocol_Stdfileediting_Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\protocol\StdFileEditing\verb\-1";
-    Value = "&Show";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Protocol_Stdfileediting_Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\protocol\StdFileEditing\verb\-2";
-    Value = "&Open";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarDrawTemplate.6";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    REG_VALUE_LNG(SO60_DRAW_TEMPLATE)
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarDrawTemplate.6\DefaultIcon";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "<progpath>\program\soffice.exe,32";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarDrawTemplate.6\shell";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "new";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarDrawTemplate.6\shell\new";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarDrawTemplate.6\shell\new\command";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarDrawTemplate.6\shell\open\command";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarDrawTemplate.6\shell\print\command";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarDrawTemplate.6\shell\printto\command";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Std_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".std\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Std_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".std\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Std_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".std\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_StarDrawTemplate_6_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawTemplate.6\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Std
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".std";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "soffice.StarDrawTemplate.6";
-End
-
-RegistryItem gid_Regitem_Std_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".std";
-    Name = "Content Type";
-    Value = "application/vnd.sun.xml.draw.template";
-End
-
-RegistryItem gid_Regitem_std_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "soffice.StarDrawTemplate.6";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Sxd_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".sxd\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Sxd_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".sxd\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Sxd_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".sxd\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_StarDrawDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "soffice.StarDrawDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Sxd_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".sxd";
-    Name = "Content Type";
-    Value = "application/vnd.sun.xml.draw";
-End
-
-RegistryItem gid_Regitem_Sxd_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.draw";
-    Name = "Extension";
-    Value = ".sxd";
-End
-
-RegistryItem gid_Regitem__Sxd
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".sxd";
-    Value = "soffice.StarDrawDocument.6";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxd
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = ".sxd";
-    Value = "soffice.StarDrawDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_sxd_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "soffice.StarDrawDocument.6";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-// new odg file extension 
-
-RegistryItem gid_Regitem_Odg_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".odg\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Odg_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".odg\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Odg_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".odg\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_DrawDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Odg_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".odg";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.graphics";
-End
-
-RegistryItem gid_Regitem_Odg_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.graphics";
-    Name = "Extension";
-    Value = ".odg";
-End
-
-RegistryItem gid_Regitem__Odg
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".odg";
-    Value = "opendocument.DrawDocument.1";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odg
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = ".odg";
-    Value = "opendocument.DrawDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odg
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "application/vnd.oasis.opendocument.graphics";
-    Value = "opendocument.DrawDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Odg_Openoffice_Drawdocument_1_Shellnew
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".odg\opendocument.DrawDocument.1\ShellNew";
-    Name = "FileName";
-    Value = "soffice.odg";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawDocument\CurVer";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "opendocument.DrawDocument.1";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawdocument_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1";
-    REG_VALUE_LNG(OO_DRAW)
-End
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Clsid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\CLSID";
-    Value = "{448BB771-CFE2-47C4-BCDF-1FBF378E202C}";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,5";
-End
-
-RegistryItem gid_Regitem_odg_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.DrawDocument.1";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shell\open\command";
-    Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\Insertable";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Server
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\protocol\StdFileEditing\server";
-    Value = "<progpath>\program\soffice.exe";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\protocol\StdFileEditing\verb\0";
-    Value = "&Edit";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\protocol\StdFileEditing\verb\-1";
-    Value = "&Show";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawDocument.1\protocol\StdFileEditing\verb\-2";
-    Value = "&Open";
-End
-
-// .fodg
-
-RegistryItem gid_Regitem_Fodg_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".fodg\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Fodg_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".fodg\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Fodg_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".fodg\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_Fodg_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".fodg";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.graphics";
-End
-
-RegistryItem gid_Regitem__Fodg
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".fodg";
-    Value = "opendocument.DrawDocument.1";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodg
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".fodg";
-    Value = "opendocument.DrawDocument.1";
-    Styles = (PATCH);
-End
-
-// new otg file extension 
-
-RegistryItem gid_Regitem_Otg_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".otg\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Otg_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".otg\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Otg_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".otg\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_DrawTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "opendocument.DrawTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Otg
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".otg";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "opendocument.DrawTemplate.1";
-End
-
-RegistryItem gid_Regitem_Otg_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".otg";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.graphics-template";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawtemplate_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    REG_VALUE_LNG(OO_DRAW_TEMPLATE)
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\DefaultIcon";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "<progpath>\program\soffice.exe,6";
-End
-
-RegistryItem gid_Regitem_otg_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.DrawTemplate.1";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\shell";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "new";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\shell\new";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\shell\new\command";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\shell\open\command";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\shell\print\command";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.DrawTemplate.1\shell\printto\command";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-// "OpenWith" Windows Registry keys for extensions supported by Draw
-
-// .ODG
-RegistryItem gid_Regitem_OpenOffice_ODG_OpenWith_Draw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".odg\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "opendocument.DrawDocument.1";
-    Value = " ";
-End
-
-// .OTG
-RegistryItem gid_Regitem_OpenOffice_OTG_OpenWith_Draw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".otg\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "opendocument.DrawTemplate.1";
-    Value = " ";
-End
-
-// .SXD
-RegistryItem gid_Regitem_OpenOffice_SXD_OpenWith_Draw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sxd\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "soffice.StarDrawDocument.6";
-    Value = " ";
-End
-
-// .STD
-RegistryItem gid_Regitem_OpenOffice_STD_OpenWith_Draw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".std\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "soffice.StarDrawTemplate.6";
-    Value = " ";
-End
-
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Otg
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = ".otg";
-    Value = "opendocument.DrawTemplate.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Std
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = ".std";
-    Value = "soffice.StarDrawTemplate.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sdraw_Exe
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\sdraw.exe";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "<progpath>\program\sdraw.exe";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sdraw_Exepath
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\sdraw.exe";
-    ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "Path";
-    Value = "<progpath>";
-End
-
-// registering the property handler for the supported file types
-
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odg )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otg )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxd )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( std )
diff --git a/scp2/source/draw/registryitem_draw.ulf b/scp2/source/draw/registryitem_draw.ulf
deleted file mode 100644
index 7e6bce29f..000000000
--- a/scp2/source/draw/registryitem_draw.ulf
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_REG_VAL_NEW]
-en-US = "&New"
-
-[STR_REG_VAL_SO60_DRAWING]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing"
-
-[STR_REG_VAL_SO60_DRAW_TEMPLATE]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing Template"
-
-[STR_REG_VAL_OO_DRAW]
-en-US = "OpenDocument Drawing"
-
-[STR_REG_VAL_OO_DRAW_TEMPLATE]
-en-US = "OpenDocument Drawing Template"
-
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
deleted file mode 100644
index a36885d3d..000000000
--- a/scp2/source/extensions/directory_extensions.scp
+++ /dev/null
@@ -1,303 +0,0 @@
-/*************************************************************************
-*
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: directory_extensions.scp,v $
- *
- *  $Revision: 1.2 $
- *
- *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 3.
- *
- *
- *    GNU Lesser General Public License Version 3
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    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
- *
-************************************************************************/
-
-#include "macros.inc"
-
-/* *** Additional Extensions *** */
-
-#ifdef WITH_EXTENSION_INTEGRATION
-
-/* ** Presentation Minimizer ** */
-
-#ifndef WITHOUT_EXTENSION_MINIMIZER
-
-Directory gid_Brand_Dir_Share_Extensions_Presentation_Minimizer
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "presentation-minimizer";
-End
-
-#endif
-
-/* ** Report Builder ** */
-
-#ifndef WITHOUT_EXTENSION_REPORTDESIGN
-
-Directory gid_Brand_Dir_Share_Extensions_Report_Builder
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "report-builder";
-End
-
-#endif
-
-/* ** MediaWiki Publisher** */
-
-#ifndef WITHOUT_EXTENSION_MEDIAWIKI
-
-Directory gid_Brand_Dir_Share_Extensions_MediaWiki
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "wiki-publisher";
-End
-
-#endif
-
-/* ** Presenter Screen ** */
-
-#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
-
-Directory gid_Brand_Dir_Share_Extensions_Presenter_Screen
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "presenter-screen";
-End
-
-#endif
-
-/* ** PDF Import ** */
-
-#ifndef WITHOUT_EXTENSION_PDFIMPORT
-
-Directory gid_Brand_Dir_Share_Extensions_PDF_Import
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "pdfimport";
-End
-
-#endif
-
-/* ** Lightproof ** */
-
-#ifdef WITH_EXTENSION_LIGHTPROOF
-
-Directory gid_Brand_Dir_Share_Extensions_LightProof
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName (en-US) = "lightproof-en-US-0.1";
-    DosName (hu) = "lightproof-hu-1.2";
-    DosName = "lightproof";
-End
-
-#endif
-
-/* ** Numbertext ** */
-
-#ifdef WITH_EXTENSION_NUMBERTEXT
-
-Directory gid_Brand_Dir_Share_Extensions_NumberText
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "numbertext";
-End
-
-#endif
-
-/* ** ConvertTextToNumber ** */
-
-#ifdef WITH_EXTENSION_CT2N
-
-Directory gid_Brand_Dir_Share_Extensions_CT2N
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "ConvertTextToNumber";
-End
-
-#endif
-
-/* ** Hungarian Cross-reference Toolbar** */
-
-#ifdef WITH_EXTENSION_HUNART
-
-Directory gid_Brand_Dir_Share_Extensions_HunArt
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "hunart";
-End
-
-#endif
-
-/* ** Typography Toolbar** */
-
-#ifdef WITH_EXTENSION_TYPO
-
-Directory gid_Brand_Dir_Share_Extensions_Typo
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "typo";
-End
-
-#endif
-
-/* ** Watch Window ** */
-
-#ifdef WITH_EXTENSION_WATCH_WINDOW
-
-Directory gid_Brand_Dir_Share_Extensions_Watch_Window
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "WatchWindow";
-End
-
-#endif
-
-/* ** Diagram ** */
-
-#ifdef WITH_EXTENSION_DIAGRAM
-
-Directory gid_Brand_Dir_Share_Extensions_Diagram
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "Diagram";
-End
-
-#endif
-
-/* ** Validator ** */
-
-#ifdef WITH_EXTENSION_VALIDATOR
-
-Directory gid_Brand_Dir_Share_Extensions_Validator
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "Validator";
-End
-
-#endif
-
-/* ** Barcode ** */
-
-#ifdef WITH_EXTENSION_BARCODE
-
-Directory gid_Brand_Dir_Share_Extensions_Barcode
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "Barcode";
-End
-
-#endif
-
-/* ** Google Docs ** */
-
-#ifdef WITH_EXTENSION_GOOGLE_DOCS
-
-Directory gid_Brand_Dir_Share_Extensions_Google_Docs
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "gdocs";
-End
-
-#endif
-
-/* ** NLPSolver ** */
-
-#ifdef WITH_EXTENSION_NLPSOLVER
-
-Directory gid_Brand_Dir_Share_Extensions_NLPSolver
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "NLPSolver";
-End
-
-#endif
-
-/* ** LanguageTool ** */
-
-#ifdef WITH_EXTENSION_LANGUAGETOOL
-
-Directory gid_Brand_Dir_Share_Extensions_LanguageTool
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "LanguageTool";
-End
-
-#endif
-
-/* ** MySQL Connector ** */
-
-#ifdef WITH_EXTENSION_MYSQLC
-
-Directory gid_Brand_Dir_Share_Extensions_MySQLConnector
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "mysql-connector-ooo";
-End
-
-#endif
-
-/* ** oooblogger ** */
-
-#ifdef WITH_EXTENSION_OOOBLOGGER
-
-Directory gid_Brand_Dir_Share_Extensions_OOoBlogger
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "oooblogger";
-End
-
-#endif
-
-/* ** Sun Template Pack ** */
-
-#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
-
-Directory gid_Brand_Dir_Share_Extensions_Sun_Template_Pack
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName (en-US) = "Sun_ODF_Template_Pack_en-US";
-    DosName (de) = "Sun_ODF_Template_Pack_de";
-    DosName (es) = "Sun_ODF_Template_Pack_es";
-    DosName (fr) = "Sun_ODF_Template_Pack_fr";
-    DosName (hu) = "Sun_ODF_Template_Pack_hu";
-    DosName (it) = "Sun_ODF_Template_Pack_it";
-    DosName = "Sun_ODF_Template_Pack";
-End
-
-#endif
-
-/* ** Script provider for BeanShell ** */
-
-#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
-
-Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "script-provider-for-beanshell";
-End
-
-#endif
-
-/* ** Script provider for JavaScript ** */
-
-#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
-
-Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "script-provider-for-javascript";
-End
-
-#endif
-
-/* ** Script provider for Python ** */
-
-#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON
-
-Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "script-provider-for-python";
-End
-
-#endif
-
-#endif
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
deleted file mode 100644
index a2b48ecba..000000000
--- a/scp2/source/extensions/file_extensions.scp
+++ /dev/null
@@ -1,347 +0,0 @@
-/*************************************************************************
-*
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: file_extensions.scp,v $
- *
- *  $Revision: 1.4 $
- *
- *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 3.
- *
- *
- *    GNU Lesser General Public License Version 3
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    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
- *
-************************************************************************/
-
-#include "macros.inc"
-
-/* *** Additional Extensions *** */
-
-#ifdef WITH_EXTENSION_INTEGRATION
-
-/* ** Presentation Minimizer ** */
-
-#ifndef WITHOUT_EXTENSION_MINIMIZER
-
-File gid_File_Oxt_Presentation_Minimizer
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Presentation_Minimizer;
-    Name = "presentation-minimizer.oxt";
-End
-
-#endif
-
-/* ** Report Builder ** */
-
-#ifndef WITHOUT_EXTENSION_REPORTDESIGN
-
-File gid_File_Oxt_Report_Builder
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Report_Builder;
-    Name = "report-builder.oxt";
-End
-
-#endif
-
-/* ** MediaWiki Publisher** */
-
-#ifndef WITHOUT_EXTENSION_MEDIAWIKI
-
-File gid_File_Oxt_MediaWiki
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_MediaWiki;
-    Name = "wiki-publisher.oxt";
-End
-
-#endif
-
-/* ** Presenter Screen ** */
-
-#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
-
-File gid_File_Oxt_Presenter_Screen
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Presenter_Screen;
-    Name = "presenter-screen.oxt";
-End
-
-#endif
-
-/* ** PDF Import ** */
-
-#ifndef WITHOUT_EXTENSION_PDFIMPORT
-
-File gid_File_Oxt_PDF_Import
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_PDF_Import;
-    Name = "pdfimport.oxt";
-End
-
-#endif
-
-/* ** Lightproof ** */
-
-#ifdef WITH_EXTENSION_LIGHTPROOF
-
-File gid_File_Oxt_LightProof
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_LightProof;
-    Name (en-US) = "lightproof-en-US.oxt";
-    Name (hu) = "lightproof-hu.oxt";
-End
-
-#endif
-
-/* ** Numbertext ** */
-
-#ifdef WITH_EXTENSION_NUMBERTEXT
-
-File gid_File_Oxt_NumberText
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_NumberText;
-    Name = "numbertext.oxt";
-End
-
-#endif
-
-/* ** ConvertTextToNumber ** */
-
-#ifdef WITH_EXTENSION_CT2N
-
-File gid_File_Oxt_CT2N
-	TXT_FILE_BODY;
-	Styles = (PACKED, ARCHIVE);
-	Dir = gid_Brand_Dir_Share_Extensions_CT2N;
-	Name = "ConvertTextToNumber.oxt";
-End
-
-#endif
-
-/* ** Hungarian Cross-reference Toolbar** */
-
-#ifdef WITH_EXTENSION_HUNART
-
-File gid_File_Oxt_HunArt
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_HunArt;
-    Name = "hunart.oxt";
-End
-
-#endif
-
-/* ** Typography Toolbar** */
-
-#ifdef WITH_EXTENSION_TYPO
-
-File gid_File_Oxt_Typo
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Typo;
-    Name = "typo.oxt";
-End
-
-#endif
-
-/* ** Watch Window ** */
-
-#ifdef WITH_EXTENSION_WATCH_WINDOW
-
-File gid_File_Oxt_Watch_Window
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Watch_Window;
-    Name = "WatchWindow.oxt";
-End
-
-#endif
-
-/* ** Diagram ** */
-
-#ifdef WITH_EXTENSION_DIAGRAM
-
-File gid_File_Oxt_Diagram
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Diagram;
-    Name = "Diagram.oxt";
-End
-
-#endif
-
-/* ** Validator ** */
-
-#ifdef WITH_EXTENSION_VALIDATOR
-
-File gid_File_Oxt_Validator
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Validator;
-    Name = "Validator.oxt";
-End
-
-#endif
-
-/* ** Barcode ** */
-
-#ifdef WITH_EXTENSION_BARCODE
-
-File gid_File_Oxt_Barcode
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Barcode;
-    Name = "Barcode.oxt";
-End
-
-#endif
-
-/* ** Google Docs ** */
-
-#ifdef WITH_EXTENSION_GOOGLE_DOCS
-
-File gid_File_Oxt_Google_Docs
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Google_Docs;
-    Name = "gdocs.oxt";
-End
-
-#endif
-
-/* ** NLPSolver ** */
-
-#ifdef WITH_EXTENSION_NLPSOLVER
-
-File gid_File_Oxt_NLPSolver
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_NLPSolver;
-    Name = "NLPSolver.oxt";
-End
-
-#endif
-
-/* ** LanguageTool ** */
-
-#ifdef WITH_EXTENSION_LANGUAGETOOL
-
-File gid_File_Oxt_LanguageTool
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_LanguageTool;
-    Name = "LanguageTool.oxt";
-End
-
-#endif
-
-/* ** MySQL Connector ** */
-
-#ifdef WITH_EXTENSION_MYSQLC
-
-File gid_File_Oxt_MySQLConnector
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_MySQLConnector;
-    Name = "mysql-connector-ooo.oxt";
-End
-
-#endif
-
-/* ** oooblogger ** */
-
-#ifdef WITH_EXTENSION_OOOBLOGGER
-
-File gid_File_Oxt_OOoBlogger
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_OOoBlogger;
-    Name = "oooblogger.oxt";
-End
-
-#endif
-
-/* ** Sun Template Pack ** */
-
-#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
-
-File gid_File_Optional_Extensions_Sun_Template_Pack
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Sun_Template_Pack;
-    Name (en-US) = "Sun-ODF-Template-Pack-en-US.oxt";
-    Name (de) = "Sun-ODF-Template-Pack-de.oxt";
-    Name (it) = "Sun-ODF-Template-Pack-it.oxt";
-    Name (fr) = "Sun-ODF-Template-Pack-fr.oxt";
-    Name (es) = "Sun-ODF-Template-Pack-es.oxt";
-    Name (hu) = "Sun-ODF-Template-Pack-hu.oxt";
-End
-
-#endif
-
-/* ** Script provider for BeanShell ** */
-
-#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
-
-File gid_File_Oxt_Script_Provider_For_Beanshell
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell;
-    Name = "script-provider-for-beanshell.oxt";
-End
-
-#endif
-
-/* ** Script provider for JavaScript ** */
-
-#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
-
-File gid_File_Oxt_Script_Provider_For_Javascript
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript;
-    Name = "script-provider-for-javascript.oxt";
-End
-
-#endif
-
-/* ** Script provider for Python ** */
-
-#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON
-
-File gid_File_Oxt_Script_Provider_For_Python
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python;
-    Name = "script-provider-for-python.oxt";
-End
-
-#endif
-
-#endif
diff --git a/scp2/source/extensions/makefile.mk b/scp2/source/extensions/makefile.mk
deleted file mode 100644
index fef302b2e..000000000
--- a/scp2/source/extensions/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-#  OpenOffice.org - a multi-platform office productivity suite
-#
-#  $RCSfile: makefile.mk,v $
-#
-#  $Revision: 1.1 $
-#
-#  last change: $Author: KAMI $ $Date: 2010/08/12 22:05:54 $
-#
-#  The Contents of this file are made available subject to
-#  the terms of GNU Lesser General Public License Version 3.
-#
-#
-#    GNU Lesser General Public License Version 3
-#    =============================================
-#    Copyright 2005 by Sun Microsystems, Inc.
-#    901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#    This library is free software; you can redistribute it and/or
-#    modify it under the terms of the GNU Lesser General Public
-#    License version 2.1, as published by the Free Software Foundation.
-#
-#    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
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=extensions
-TARGETTYPE=CUI
-
-#--- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-PARFILES= \
-        module_extensions.par                        \
-        module_extensions_sun_templates.par          \
-        module_extensions_lightproof.par             \
-        directory_extensions.par                     \
-        file_extensions.par
-
-ULFFILES= \
-        module_extensions.ulf                        \
-        module_extensions_sun_templates.ulf          \
-        module_extensions_lightproof.ulf
-
-#--- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
deleted file mode 100644
index 568b2e1ec..000000000
--- a/scp2/source/extensions/module_extensions.scp
+++ /dev/null
@@ -1,397 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: module_accessories.scp,v $
- *
- *  $Revision: 1.2 $
- *
- *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 3.
- *
- *
- *    GNU Lesser General Public License Version 3
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    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
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Extensions
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS);
-    ParentID = gid_Module_Optional;
-    Files = ( );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-/* *** Additional Extensions *** */
-
-#ifdef WITH_EXTENSION_INTEGRATION
-
-/* ** Presentation Minimizer ** */
-
-#ifndef WITHOUT_EXTENSION_MINIMIZER
-Module gid_Module_Optional_Extensions_MINIMIZER
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MINIMIZER);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Presentation_Minimizer );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** Report Builder ** */
-
-#ifndef WITHOUT_EXTENSION_REPORTDESIGN
-Module gid_Module_Optional_Extensions_REPORTDESIGN
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Report_Builder );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** MediaWiki Publisher** */
-
-#ifndef WITHOUT_EXTENSION_MEDIAWIKI
-Module gid_Module_Optional_Extensions_MEDIAWIKI
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_MediaWiki );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** Presenter Screen ** */
-
-#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
-Module gid_Module_Optional_Extensions_PRESENTER_SCREEN
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Presenter_Screen );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** PDF Import ** */
-
-#ifndef WITHOUT_EXTENSION_PDFIMPORT
-Module gid_Module_Optional_Extensions_PDFIMPORT
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_PDF_Import );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** Lightproof ** */
-
-#ifdef WITH_EXTENSION_LIGHTPROOF
-Module gid_Module_Optional_Extensions_LightProof
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF);
-    ParentID = gid_Module_Optional_Extensions;
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-#endif
-
-/* ** Numbertext ** */
-
-#ifdef WITH_EXTENSION_NUMBERTEXT
-Module gid_Module_Optional_Extensions_NumberText
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_NumberText );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** Hungarian Cross-reference Toolbar ** */
-
-#ifdef WITH_EXTENSION_HUNART
-Module gid_Module_Optional_Extensions_HunArt
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_HUNART);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_HunArt );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** Typography Toolbar ** */
-
-#ifdef WITH_EXTENSION_TYPO
-Module gid_Module_Optional_Extensions_Typo
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TYPO);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Typo );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** ConvertTextToNumber ** */
-
-#ifdef WITH_EXTENSION_CT2N
-Module gid_Module_Optional_Extensions_CT2N
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_CT2N);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_CT2N );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** Watch Window ** */
-
-#ifdef WITH_EXTENSION_WATCH_WINDOW
-Module gid_Module_Optional_Extensions_Watch_Window
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Watch_Window );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** Diagram ** */
-
-#ifdef WITH_EXTENSION_DIAGRAM
-Module gid_Module_Optional_Extensions_Diagram
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_DIAGRAM);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Diagram );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** Validator ** */
-
-#ifdef WITH_EXTENSION_VALIDATOR
-Module gid_Module_Optional_Extensions_Validator
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_VALIDATOR);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Validator );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** Barcode ** */
-
-#ifdef WITH_EXTENSION_BARCODE
-Module gid_Module_Optional_Extensions_Barcode
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_BARCODE);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Barcode );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** Google Docs ** */
-
-#ifdef WITH_EXTENSION_GOOGLE_DOCS
-Module gid_Module_Optional_Extensions_Google_Docs
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Google_Docs );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** NLPSolver ** */
-
-#ifdef WITH_EXTENSION_NLPSOLVER
-Module gid_Module_Optional_Extensions_NLPSolver
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_NLPSolver );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** LanguageTool ** */
-
-#ifdef WITH_EXTENSION_LANGUAGETOOL
-Module gid_Module_Optional_Extensions_LanguageTool
- PackageInfo = "packinfo_extensions.txt";
- MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL);
- ParentID = gid_Module_Optional_Extensions;
- Files = (
- gid_File_Oxt_LanguageTool );
- Minimal = NO;
- Default = YES;
- Styles = ( );
-End
-#endif
-
-/* ** MySQL Connector ** */
-
-#ifdef WITH_EXTENSION_MYSQLC
-Module gid_Module_Optional_Extensions_MySQLConnector
- PackageInfo = "packinfo_extensions.txt";
- MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MYSQLC);
- ParentID = gid_Module_Optional_Extensions;
- Files = (
- gid_File_Oxt_MySQLConnector );
- Minimal = NO;
- Default = YES;
- Styles = ( );
-End
-#endif
-
-/* ** oooblogger ** */
-
-#ifdef WITH_EXTENSION_OOOBLOGGER
-Module gid_Module_Optional_Extensions_OOoBlogger
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_OOoBlogger );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** Sun Template Pack ** */
-
-#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
-Module gid_Module_Optional_Extensions_Sun_Template_Pack
-    ParentID = gid_Module_Optional_Extensions;
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK);
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
-/* ** Script provider for BeanShell ** */
-
-#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
-
-Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Script_Provider_For_Beanshell );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-#endif
-
-/* ** Script provider for JavaScript ** */
-
-#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
-
-Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Script_Provider_For_Javascript );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-#endif
-
-/* ** Script provider for Python ** */
-
-#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON
-
-Module gid_Module_Optional_Extensions_Script_Provider_For_Python
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_Script_Provider_For_Python );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-#endif
-
-#endif
diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
deleted file mode 100644
index 73c91d699..000000000
--- a/scp2/source/extensions/module_extensions.ulf
+++ /dev/null
@@ -1,178 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: module_accessories.ulf,v $
- *
- *  $Revision: 1.2 $
- *
- *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 3.
- *
- *
- *    GNU Lesser General Public License Version 3
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    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
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS]
-en-US = "Extensions"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS]
-en-US = "Useful %PRODUCTNAME extensions."
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER]
-en-US = "Presentation Minimizer"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER]
-en-US = "Presentation Minimizer"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
-en-US = "Report Builder"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
-en-US = "Report Builder"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
-en-US = "MediaWiki Publisher"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
-en-US = "MediaWiki Publisher"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN]
-en-US = "Presenter Screen"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN]
-en-US = "Presenter Screen"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
-en-US = "PDF Import"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
-en-US = "PDF Import"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF]
-en-US = "Lightproof"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF]
-en-US = "Lightproof"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
-en-US = "Numbertext"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
-en-US = "Numbertext"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_HUNART]
-en-US = "Hungarian cross-reference toolbar"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_HUNART]
-en-US = "Toolbar to add cross-references with automatic conditional Hungarian articles (eg. *az* 5. ábra, *a* 6. ábra) to avoid bad article and number combination in cross-references."
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_TYPO]
-en-US = "Typography toolbar"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TYPO]
-en-US = "Toolbar for Graphite smart font features: ligatures, small caps, old style numbers, proportional or monospaced numbers, automatic thousand separators, minus sign, real superscript and subscript, German umlaut variants, fractions."
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_CT2N]
-en-US = "Convert Text to Number"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_CT2N]
-en-US = "Convert Text to Number"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW]
-en-US = "Watch Window"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW]
-en-US = "Watch Window"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_DIAGRAM]
-en-US = "Diagram"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_DIAGRAM]
-en-US = "Diagram"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_VALIDATOR]
-en-US = "Validator"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_VALIDATOR]
-en-US = "Validator"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_BARCODE]
-en-US = "Barcode"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_BARCODE]
-en-US = "Barcode"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS]
-en-US = "Google Docs & Zoho"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS]
-en-US = "Google Docs & Zoho"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER]
-en-US = "Solver for Nonlinear Programming"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER]
-en-US = "Solver for Nonlinear Programming"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL]
-en-US = "LanguageTool Open Source language checker"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL]
-en-US = "LanguageTool Open Source language checker"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MYSQLC]
-en-US = "MySQL Connector"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MYSQLC]
-en-US = "MySQL Connector"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
-en-US = "Metaweblog Support"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
-en-US = "Metaweblog Support"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK]
-en-US = "Sun Professional Template Pack"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK]
-en-US = "Sun Professional Template Pack"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
-en-US = "Script provider for BeanShell"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
-en-US = "Script provider for BeanShell"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT]
-en-US = "Script provider for JavaScript"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT]
-en-US = "Script provider for JavaScript"
-
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON]
-en-US = "Script provider for Python"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON]
-en-US = "Script provider for Python"
diff --git a/scp2/source/extensions/module_extensions_lightproof.scp b/scp2/source/extensions/module_extensions_lightproof.scp
deleted file mode 100644
index 58aa59ad1..000000000
--- a/scp2/source/extensions/module_extensions_lightproof.scp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: module_extensions_sun_templates.scp,v $
- *
- *  $Revision: 1.0 $
- *
- *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 3.
- *
- *
- *    GNU Lesser General Public License Version 3
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    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
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-/* ** LightProof ** */
-
-#ifdef WITH_EXTENSION_INTEGRATION
-
-#ifdef WITH_EXTENSION_LIGHTPROOF
-
-Module gid_Module_Optional_Extensions_LightProof_Template
-    ParentID = gid_Module_Optional_Extensions_LightProof;
-    Name = "gid_Module_Optional_Extensions_LightProof_Template";
-    Description = "gid_Module_Optional_Extensions_LightProof_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = ( gid_File_Oxt_LightProof );
-    Minimal = NO;
-    Default = YES;
-End
-
-#include "alllangmodules_extensions_lightproof.inc"
-
-#endif
-
-#endif
diff --git a/scp2/source/extensions/module_extensions_lightproof.ulf b/scp2/source/extensions/module_extensions_lightproof.ulf
deleted file mode 100644
index b78fe12a0..000000000
--- a/scp2/source/extensions/module_extensions_lightproof.ulf
+++ /dev/null
@@ -1,701 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: module_accessories.ulf,v $
- *
- *  $Revision: 1.0 $
- *
- *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 3.
- *
- *
- *    GNU Lesser General Public License Version 3
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    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
- *
- ************************************************************************/
-
-
-[STR_NAME_MODULE_LANGPACK_EN_US]
-en-US = "English"
-
-[STR_DESC_MODULE_LANGPACK_EN_US]
-en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DE]
-en-US = "German"
-
-[STR_DESC_MODULE_LANGPACK_DE]
-en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FR]
-en-US = "French"
-
-[STR_DESC_MODULE_LANGPACK_FR]
-en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_IT]
-en-US = "Italian"
-
-[STR_DESC_MODULE_LANGPACK_IT]
-en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ES]
-en-US = "Spanish"
-
-[STR_DESC_MODULE_LANGPACK_ES]
-en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SV]
-en-US = "Swedish"
-
-[STR_DESC_MODULE_LANGPACK_SV]
-en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PT]
-en-US = "Portuguese"
-
-[STR_DESC_MODULE_LANGPACK_PT]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PT_BR]
-en-US = "Portuguese (Brazil)"
-
-[STR_DESC_MODULE_LANGPACK_PT_BR]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_JA]
-en-US = "Japanese"
-
-[STR_DESC_MODULE_LANGPACK_JA]
-en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KO]
-en-US = "Korean"
-
-[STR_DESC_MODULE_LANGPACK_KO]
-en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZH_CN]
-en-US = "Chinese (simplified)"
-
-[STR_DESC_MODULE_LANGPACK_ZH_CN]
-en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZH_TW]
-en-US = "Chinese (traditional)"
-
-[STR_DESC_MODULE_LANGPACK_ZH_TW]
-en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NL]
-en-US = "Dutch"
-
-[STR_DESC_MODULE_LANGPACK_NL]
-en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HU]
-en-US = "Hungarian"
-
-[STR_DESC_MODULE_LANGPACK_HU]
-en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PL]
-en-US = "Polish"
-
-[STR_DESC_MODULE_LANGPACK_PL]
-en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RU]
-en-US = "Russian"
-
-[STR_DESC_MODULE_LANGPACK_RU]
-en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TR]
-en-US = "Turkish"
-
-[STR_DESC_MODULE_LANGPACK_TR]
-en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EL]
-en-US = "Greek"
-
-[STR_DESC_MODULE_LANGPACK_EL]
-en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TH]
-en-US = "Thai"
-
-[STR_DESC_MODULE_LANGPACK_TH]
-en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CS]
-en-US = "Czech"
-
-[STR_DESC_MODULE_LANGPACK_CS]
-en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SK]
-en-US = "Slovak"
-
-[STR_DESC_MODULE_LANGPACK_SK]
-en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HR]
-en-US = "Croatian"
-
-[STR_DESC_MODULE_LANGPACK_HR]
-en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ET]
-en-US = "Estonian"
-
-[STR_DESC_MODULE_LANGPACK_ET]
-en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_VI]
-en-US = "Vietnamese"
-
-[STR_DESC_MODULE_LANGPACK_VI]
-en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BG]
-en-US = "Bulgarian"
-
-[STR_DESC_MODULE_LANGPACK_BG]
-en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KM]
-en-US = "Khmer"
-
-[STR_DESC_MODULE_LANGPACK_KM]
-en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PA_IN]
-en-US = "Punjabi"
-
-[STR_DESC_MODULE_LANGPACK_PA_IN]
-en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GU_IN]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_LANGPACK_GU_IN]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TA]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_LANGPACK_TA]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TA_IN]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_LANGPACK_TA_IN]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HI]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_LANGPACK_HI]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HI_IN]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_LANGPACK_HI_IN]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ST]
-en-US = "Southern Sotho (Sutu)"
-
-[STR_DESC_MODULE_LANGPACK_ST]
-en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TN]
-en-US = "Tswana"
-
-[STR_DESC_MODULE_LANGPACK_TN]
-en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_XH]
-en-US = "Xhosa"
-
-[STR_DESC_MODULE_LANGPACK_XH]
-en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZU]
-en-US = "Zulu"
-
-[STR_DESC_MODULE_LANGPACK_ZU]
-en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AF]
-en-US = "Afrikaans"
-
-[STR_DESC_MODULE_LANGPACK_AF]
-en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SW]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_LANGPACK_SW]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SW_TZ]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_LANGPACK_SW_TZ]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LO]
-en-US = "Lao"
-
-[STR_DESC_MODULE_LANGPACK_LO]
-en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MY]
-en-US = "Burmese"
-
-[STR_DESC_MODULE_LANGPACK_MY]
-en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NSO]
-en-US = "Northern Sotho"
-
-[STR_DESC_MODULE_LANGPACK_NSO]
-en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN]
-en-US = "Bengali"
-
-[STR_DESC_MODULE_LANGPACK_BN]
-en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN_BD]
-en-US = "Bengali (Bangladesh)"
-
-[STR_DESC_MODULE_LANGPACK_BN_BD]
-en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN_IN]
-en-US = "Bengali (India)"
-
-[STR_DESC_MODULE_LANGPACK_BN_IN]
-en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_OR]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_LANGPACK_OR]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_OR_IN]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_LANGPACK_OR_IN]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MR]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_LANGPACK_MR]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MR_IN]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_LANGPACK_MR_IN]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NE]
-en-US = "Nepali"
-
-[STR_DESC_MODULE_LANGPACK_NE]
-en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AR]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_LANGPACK_AR]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AR_SA]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_LANGPACK_AR_SA]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CA]
-en-US = "Catalan"
-
-[STR_DESC_MODULE_LANGPACK_CA]
-en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DA]
-en-US = "Danish"
-
-[STR_DESC_MODULE_LANGPACK_DA]
-en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FI]
-en-US = "Finnish"
-
-[STR_DESC_MODULE_LANGPACK_FI]
-en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HE]
-en-US = "Hebrew"
-
-[STR_DESC_MODULE_LANGPACK_HE]
-en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_IS]
-en-US = "Icelandic"
-
-[STR_DESC_MODULE_LANGPACK_IS]
-en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NB]
-en-US = "Norwegian (Bokmal)"
-
-[STR_DESC_MODULE_LANGPACK_NB]
-en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NN]
-en-US = "Norwegian (Nynorsk)"
-
-[STR_DESC_MODULE_LANGPACK_NN]
-en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RM]
-en-US = "Rhaeto-Romance"
-
-[STR_DESC_MODULE_LANGPACK_RM]
-en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RO]
-en-US = "Romanian"
-
-[STR_DESC_MODULE_LANGPACK_RO]
-en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SQ]
-en-US = "Albanian"
-
-[STR_DESC_MODULE_LANGPACK_SQ]
-en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UR]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_LANGPACK_UR]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ID]
-en-US = "Indonesian"
-
-[STR_DESC_MODULE_LANGPACK_ID]
-en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UK]
-en-US = "Ukrainian"
-
-[STR_DESC_MODULE_LANGPACK_UK]
-en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BE]
-en-US = "Belarusian"
-
-[STR_DESC_MODULE_LANGPACK_BE]
-en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SL]
-en-US = "Slovenian"
-
-[STR_DESC_MODULE_LANGPACK_SL]
-en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LV]
-en-US = "Latvian"
-
-[STR_DESC_MODULE_LANGPACK_LV]
-en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LT]
-en-US = "Lithuanian"
-
-[STR_DESC_MODULE_LANGPACK_LT]
-en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HY]
-en-US = "Armenian"
-
-[STR_DESC_MODULE_LANGPACK_HY]
-en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EU]
-en-US = "Basque"
-
-[STR_DESC_MODULE_LANGPACK_EU]
-en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MK]
-en-US = "Macedonian"
-
-[STR_DESC_MODULE_LANGPACK_MK]
-en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MT]
-en-US = "Maltese"
-
-[STR_DESC_MODULE_LANGPACK_MT]
-en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CY]
-en-US = "Welsh"
-
-[STR_DESC_MODULE_LANGPACK_CY]
-en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GL]
-en-US = "Galician"
-
-[STR_DESC_MODULE_LANGPACK_GL]
-en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SH_YU]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_LANGPACK_SH_YU]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SH]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_LANGPACK_SH]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GA]
-en-US = "Irish"
-
-[STR_DESC_MODULE_LANGPACK_GA]
-en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SR_CS]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_LANGPACK_SR_CS]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SR]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_LANGPACK_SR]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BS]
-en-US = "Bosnian"
-
-[STR_DESC_MODULE_LANGPACK_BS]
-en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AS_IN]
-en-US = "Assamese"
-
-[STR_DESC_MODULE_LANGPACK_AS_IN]
-en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RW]
-en-US = "Kinyarwanda"
-
-[STR_DESC_MODULE_LANGPACK_RW]
-en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SA]
-en-US = "Sanskrit"
-
-[STR_DESC_MODULE_LANGPACK_SA]
-en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FA]
-en-US = "Farsi"
-
-[STR_DESC_MODULE_LANGPACK_FA]
-en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FO]
-en-US = "Faroese"
-
-[STR_DESC_MODULE_LANGPACK_FO]
-en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SB]
-en-US = "Sorbian"
-
-[STR_DESC_MODULE_LANGPACK_SB]
-en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TT]
-en-US = "Tatar"
-
-[STR_DESC_MODULE_LANGPACK_TT]
-en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TS]
-en-US = "Tsonga"
-
-[STR_DESC_MODULE_LANGPACK_TS]
-en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_YI]
-en-US = "Yiddish"
-
-[STR_DESC_MODULE_LANGPACK_YI]
-en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BR]
-en-US = "Breton"
-
-[STR_DESC_MODULE_LANGPACK_BR]
-en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NR]
-en-US = "Ndebele South"
-
-[STR_DESC_MODULE_LANGPACK_NR]
-en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SS]
-en-US = "Swazi"
-
-[STR_DESC_MODULE_LANGPACK_SS]
-en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_VE]
-en-US = "Venda"
-
-[STR_DESC_MODULE_LANGPACK_VE]
-en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KN]
-en-US = "Kannada"
-
-[STR_DESC_MODULE_LANGPACK_KN]
-en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MS]
-en-US = "Malay (Malaysian)"
-
-[STR_DESC_MODULE_LANGPACK_MS]
-en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TG]
-en-US = "Tajik"
-
-[STR_DESC_MODULE_LANGPACK_TG]
-en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KU]
-en-US = "Kurdish"
-
-[STR_DESC_MODULE_LANGPACK_KU]
-en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DZ]
-en-US = "Dzongkha"
-
-[STR_DESC_MODULE_LANGPACK_DZ]
-en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KA]
-en-US = "Georgian"
-
-[STR_DESC_MODULE_LANGPACK_KA]
-en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EO]
-en-US = "Esperanto"
-
-[STR_DESC_MODULE_LANGPACK_EO]
-en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GU]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_LANGPACK_GU]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EN_ZA]
-en-US = "English (South Africa)"
-
-[STR_DESC_MODULE_LANGPACK_EN_ZA]
-en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EN_GB]
-en-US = "English (United Kingdom)"
-
-[STR_DESC_MODULE_LANGPACK_EN_GB]
-en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UR_IN]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_LANGPACK_UR_IN]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ML_IN]
-en-US = "Malayalam"
-
-[STR_DESC_MODULE_LANGPACK_ML_IN]
-en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TE_IN]
-en-US = "Telugu"
-
-[STR_DESC_MODULE_LANGPACK_TE_IN]
-en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TI_ER]
-en-US = "Tigrinya"
-
-[STR_DESC_MODULE_LANGPACK_TI_ER]
-en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UZ]
-en-US = "Uzbek"
-
-[STR_DESC_MODULE_LANGPACK_UZ]
-en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MN]
-en-US = "Mongolian"
-
-[STR_DESC_MODULE_LANGPACK_MN]
-en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KK]
-en-US = "Kazakh"
-
-[STR_DESC_MODULE_LANGPACK_KK]
-en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
diff --git a/scp2/source/extensions/module_extensions_sun_templates.scp b/scp2/source/extensions/module_extensions_sun_templates.scp
deleted file mode 100644
index 6e5897ee5..000000000
--- a/scp2/source/extensions/module_extensions_sun_templates.scp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: module_extensions_sun_templates.scp,v $
- *
- *  $Revision: 1.0 $
- *
- *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 3.
- *
- *
- *    GNU Lesser General Public License Version 3
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    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
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-/* ** Sun Template Pack ** */
-
-#ifdef WITH_EXTENSION_INTEGRATION
-
-#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
-
-Module gid_Module_Optional_Extensions_Sun_T_Pack_Template
-    ParentID = gid_Module_Optional_Extensions_Sun_Template_Pack;
-    Name = "gid_Module_Optional_Extensions_Sun_T_Pack_Template";
-    Description = "gid_Module_Optional_Extensions_Sun_T_Pack_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = ( gid_File_Optional_Extensions_Sun_Template_Pack );
-    Minimal = NO;
-    Default = YES;
-End
-
-#include "alllangmodules_extensions_templates.inc"
-
-#endif
-
-#endif
diff --git a/scp2/source/extensions/module_extensions_sun_templates.ulf b/scp2/source/extensions/module_extensions_sun_templates.ulf
deleted file mode 100644
index b78fe12a0..000000000
--- a/scp2/source/extensions/module_extensions_sun_templates.ulf
+++ /dev/null
@@ -1,701 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: module_accessories.ulf,v $
- *
- *  $Revision: 1.0 $
- *
- *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 3.
- *
- *
- *    GNU Lesser General Public License Version 3
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    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
- *
- ************************************************************************/
-
-
-[STR_NAME_MODULE_LANGPACK_EN_US]
-en-US = "English"
-
-[STR_DESC_MODULE_LANGPACK_EN_US]
-en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DE]
-en-US = "German"
-
-[STR_DESC_MODULE_LANGPACK_DE]
-en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FR]
-en-US = "French"
-
-[STR_DESC_MODULE_LANGPACK_FR]
-en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_IT]
-en-US = "Italian"
-
-[STR_DESC_MODULE_LANGPACK_IT]
-en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ES]
-en-US = "Spanish"
-
-[STR_DESC_MODULE_LANGPACK_ES]
-en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SV]
-en-US = "Swedish"
-
-[STR_DESC_MODULE_LANGPACK_SV]
-en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PT]
-en-US = "Portuguese"
-
-[STR_DESC_MODULE_LANGPACK_PT]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PT_BR]
-en-US = "Portuguese (Brazil)"
-
-[STR_DESC_MODULE_LANGPACK_PT_BR]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_JA]
-en-US = "Japanese"
-
-[STR_DESC_MODULE_LANGPACK_JA]
-en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KO]
-en-US = "Korean"
-
-[STR_DESC_MODULE_LANGPACK_KO]
-en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZH_CN]
-en-US = "Chinese (simplified)"
-
-[STR_DESC_MODULE_LANGPACK_ZH_CN]
-en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZH_TW]
-en-US = "Chinese (traditional)"
-
-[STR_DESC_MODULE_LANGPACK_ZH_TW]
-en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NL]
-en-US = "Dutch"
-
-[STR_DESC_MODULE_LANGPACK_NL]
-en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HU]
-en-US = "Hungarian"
-
-[STR_DESC_MODULE_LANGPACK_HU]
-en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PL]
-en-US = "Polish"
-
-[STR_DESC_MODULE_LANGPACK_PL]
-en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RU]
-en-US = "Russian"
-
-[STR_DESC_MODULE_LANGPACK_RU]
-en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TR]
-en-US = "Turkish"
-
-[STR_DESC_MODULE_LANGPACK_TR]
-en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EL]
-en-US = "Greek"
-
-[STR_DESC_MODULE_LANGPACK_EL]
-en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TH]
-en-US = "Thai"
-
-[STR_DESC_MODULE_LANGPACK_TH]
-en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CS]
-en-US = "Czech"
-
-[STR_DESC_MODULE_LANGPACK_CS]
-en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SK]
-en-US = "Slovak"
-
-[STR_DESC_MODULE_LANGPACK_SK]
-en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HR]
-en-US = "Croatian"
-
-[STR_DESC_MODULE_LANGPACK_HR]
-en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ET]
-en-US = "Estonian"
-
-[STR_DESC_MODULE_LANGPACK_ET]
-en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_VI]
-en-US = "Vietnamese"
-
-[STR_DESC_MODULE_LANGPACK_VI]
-en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BG]
-en-US = "Bulgarian"
-
-[STR_DESC_MODULE_LANGPACK_BG]
-en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KM]
-en-US = "Khmer"
-
-[STR_DESC_MODULE_LANGPACK_KM]
-en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PA_IN]
-en-US = "Punjabi"
-
-[STR_DESC_MODULE_LANGPACK_PA_IN]
-en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GU_IN]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_LANGPACK_GU_IN]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TA]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_LANGPACK_TA]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TA_IN]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_LANGPACK_TA_IN]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HI]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_LANGPACK_HI]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HI_IN]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_LANGPACK_HI_IN]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ST]
-en-US = "Southern Sotho (Sutu)"
-
-[STR_DESC_MODULE_LANGPACK_ST]
-en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TN]
-en-US = "Tswana"
-
-[STR_DESC_MODULE_LANGPACK_TN]
-en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_XH]
-en-US = "Xhosa"
-
-[STR_DESC_MODULE_LANGPACK_XH]
-en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZU]
-en-US = "Zulu"
-
-[STR_DESC_MODULE_LANGPACK_ZU]
-en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AF]
-en-US = "Afrikaans"
-
-[STR_DESC_MODULE_LANGPACK_AF]
-en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SW]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_LANGPACK_SW]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SW_TZ]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_LANGPACK_SW_TZ]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LO]
-en-US = "Lao"
-
-[STR_DESC_MODULE_LANGPACK_LO]
-en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MY]
-en-US = "Burmese"
-
-[STR_DESC_MODULE_LANGPACK_MY]
-en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NSO]
-en-US = "Northern Sotho"
-
-[STR_DESC_MODULE_LANGPACK_NSO]
-en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN]
-en-US = "Bengali"
-
-[STR_DESC_MODULE_LANGPACK_BN]
-en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN_BD]
-en-US = "Bengali (Bangladesh)"
-
-[STR_DESC_MODULE_LANGPACK_BN_BD]
-en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN_IN]
-en-US = "Bengali (India)"
-
-[STR_DESC_MODULE_LANGPACK_BN_IN]
-en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_OR]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_LANGPACK_OR]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_OR_IN]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_LANGPACK_OR_IN]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MR]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_LANGPACK_MR]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MR_IN]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_LANGPACK_MR_IN]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NE]
-en-US = "Nepali"
-
-[STR_DESC_MODULE_LANGPACK_NE]
-en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AR]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_LANGPACK_AR]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AR_SA]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_LANGPACK_AR_SA]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CA]
-en-US = "Catalan"
-
-[STR_DESC_MODULE_LANGPACK_CA]
-en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DA]
-en-US = "Danish"
-
-[STR_DESC_MODULE_LANGPACK_DA]
-en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FI]
-en-US = "Finnish"
-
-[STR_DESC_MODULE_LANGPACK_FI]
-en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HE]
-en-US = "Hebrew"
-
-[STR_DESC_MODULE_LANGPACK_HE]
-en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_IS]
-en-US = "Icelandic"
-
-[STR_DESC_MODULE_LANGPACK_IS]
-en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NB]
-en-US = "Norwegian (Bokmal)"
-
-[STR_DESC_MODULE_LANGPACK_NB]
-en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NN]
-en-US = "Norwegian (Nynorsk)"
-
-[STR_DESC_MODULE_LANGPACK_NN]
-en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RM]
-en-US = "Rhaeto-Romance"
-
-[STR_DESC_MODULE_LANGPACK_RM]
-en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RO]
-en-US = "Romanian"
-
-[STR_DESC_MODULE_LANGPACK_RO]
-en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SQ]
-en-US = "Albanian"
-
-[STR_DESC_MODULE_LANGPACK_SQ]
-en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UR]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_LANGPACK_UR]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ID]
-en-US = "Indonesian"
-
-[STR_DESC_MODULE_LANGPACK_ID]
-en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UK]
-en-US = "Ukrainian"
-
-[STR_DESC_MODULE_LANGPACK_UK]
-en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BE]
-en-US = "Belarusian"
-
-[STR_DESC_MODULE_LANGPACK_BE]
-en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SL]
-en-US = "Slovenian"
-
-[STR_DESC_MODULE_LANGPACK_SL]
-en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LV]
-en-US = "Latvian"
-
-[STR_DESC_MODULE_LANGPACK_LV]
-en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LT]
-en-US = "Lithuanian"
-
-[STR_DESC_MODULE_LANGPACK_LT]
-en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HY]
-en-US = "Armenian"
-
-[STR_DESC_MODULE_LANGPACK_HY]
-en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EU]
-en-US = "Basque"
-
-[STR_DESC_MODULE_LANGPACK_EU]
-en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MK]
-en-US = "Macedonian"
-
-[STR_DESC_MODULE_LANGPACK_MK]
-en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MT]
-en-US = "Maltese"
-
-[STR_DESC_MODULE_LANGPACK_MT]
-en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CY]
-en-US = "Welsh"
-
-[STR_DESC_MODULE_LANGPACK_CY]
-en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GL]
-en-US = "Galician"
-
-[STR_DESC_MODULE_LANGPACK_GL]
-en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SH_YU]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_LANGPACK_SH_YU]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SH]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_LANGPACK_SH]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GA]
-en-US = "Irish"
-
-[STR_DESC_MODULE_LANGPACK_GA]
-en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SR_CS]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_LANGPACK_SR_CS]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SR]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_LANGPACK_SR]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BS]
-en-US = "Bosnian"
-
-[STR_DESC_MODULE_LANGPACK_BS]
-en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AS_IN]
-en-US = "Assamese"
-
-[STR_DESC_MODULE_LANGPACK_AS_IN]
-en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RW]
-en-US = "Kinyarwanda"
-
-[STR_DESC_MODULE_LANGPACK_RW]
-en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SA]
-en-US = "Sanskrit"
-
-[STR_DESC_MODULE_LANGPACK_SA]
-en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FA]
-en-US = "Farsi"
-
-[STR_DESC_MODULE_LANGPACK_FA]
-en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FO]
-en-US = "Faroese"
-
-[STR_DESC_MODULE_LANGPACK_FO]
-en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SB]
-en-US = "Sorbian"
-
-[STR_DESC_MODULE_LANGPACK_SB]
-en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TT]
-en-US = "Tatar"
-
-[STR_DESC_MODULE_LANGPACK_TT]
-en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TS]
-en-US = "Tsonga"
-
-[STR_DESC_MODULE_LANGPACK_TS]
-en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_YI]
-en-US = "Yiddish"
-
-[STR_DESC_MODULE_LANGPACK_YI]
-en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BR]
-en-US = "Breton"
-
-[STR_DESC_MODULE_LANGPACK_BR]
-en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NR]
-en-US = "Ndebele South"
-
-[STR_DESC_MODULE_LANGPACK_NR]
-en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SS]
-en-US = "Swazi"
-
-[STR_DESC_MODULE_LANGPACK_SS]
-en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_VE]
-en-US = "Venda"
-
-[STR_DESC_MODULE_LANGPACK_VE]
-en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KN]
-en-US = "Kannada"
-
-[STR_DESC_MODULE_LANGPACK_KN]
-en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MS]
-en-US = "Malay (Malaysian)"
-
-[STR_DESC_MODULE_LANGPACK_MS]
-en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TG]
-en-US = "Tajik"
-
-[STR_DESC_MODULE_LANGPACK_TG]
-en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KU]
-en-US = "Kurdish"
-
-[STR_DESC_MODULE_LANGPACK_KU]
-en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DZ]
-en-US = "Dzongkha"
-
-[STR_DESC_MODULE_LANGPACK_DZ]
-en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KA]
-en-US = "Georgian"
-
-[STR_DESC_MODULE_LANGPACK_KA]
-en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EO]
-en-US = "Esperanto"
-
-[STR_DESC_MODULE_LANGPACK_EO]
-en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GU]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_LANGPACK_GU]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EN_ZA]
-en-US = "English (South Africa)"
-
-[STR_DESC_MODULE_LANGPACK_EN_ZA]
-en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EN_GB]
-en-US = "English (United Kingdom)"
-
-[STR_DESC_MODULE_LANGPACK_EN_GB]
-en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UR_IN]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_LANGPACK_UR_IN]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ML_IN]
-en-US = "Malayalam"
-
-[STR_DESC_MODULE_LANGPACK_ML_IN]
-en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TE_IN]
-en-US = "Telugu"
-
-[STR_DESC_MODULE_LANGPACK_TE_IN]
-en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TI_ER]
-en-US = "Tigrinya"
-
-[STR_DESC_MODULE_LANGPACK_TI_ER]
-en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UZ]
-en-US = "Uzbek"
-
-[STR_DESC_MODULE_LANGPACK_UZ]
-en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MN]
-en-US = "Mongolian"
-
-[STR_DESC_MODULE_LANGPACK_MN]
-en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KK]
-en-US = "Kazakh"
-
-[STR_DESC_MODULE_LANGPACK_KK]
-en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
deleted file mode 100644
index 7cfd4556f..000000000
--- a/scp2/source/gnome/file_gnome.scp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "macros.inc"
-
-#ifdef ENABLE_GIO
-File gid_File_Lib_GIO
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
-End
-#endif
-
-#ifdef ENABLE_GNOMEVFS
-File gid_File_Lib_Gnomevfs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX));
-End
-#endif
-
-#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
-File gid_File_Share_Registry_Gnome_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "gnome.xcd";
-End
-#endif
-
-#ifdef ENABLE_GCONF
-File gid_File_Lib_Gconfbe
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
-End
-#endif
-
-#ifdef ENABLE_SYSTRAY_GTK
-File gid_File_Lib_QStart_Gtk
-    Name = LIBNAME(qstart_gtk);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
deleted file mode 100644
index 43c244069..000000000
--- a/scp2/source/gnome/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=gnome
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-.IF "$(ENABLE_SYSTRAY_GTK)" != ""
-SCPDEFS+=-DENABLE_SYSTRAY_GTK
-.ENDIF
-
-.IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!=""
-
-.IF "$(ENABLE_GCONF)" != ""
-SCPDEFS+=-DENABLE_GCONF
-.ENDIF
-
-.IF "$(ENABLE_LOCKDOWN)" == "YES"
-SCPDEFS+=-DENABLE_LOCKDOWN
-.ENDIF
-
-.IF "$(ENABLE_GNOMEVFS)" != ""
-SCPDEFS+=-DENABLE_GNOMEVFS
-.ENDIF
-
-.IF "$(ENABLE_GIO)" != ""
-SCPDEFS+=-DENABLE_GIO
-.ENDIF
-
-.IF "$(ENABLE_GTK3)" != ""
-SCPDEFS+=-DENABLE_GTK3
-.ENDIF
-
-PARFILES =                   \
-        module_gnome.par     \
-        file_gnome.par
-
-ULFFILES= \
-        module_gnome.ulf
-
-.ENDIF
-
-# --- File ---------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
deleted file mode 100644
index 8b8491617..000000000
--- a/scp2/source/gnome/module_gnome.scp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Gnome
-    ParentID = gid_Module_Optional;
-    Default = YES;
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
-#ifdef UNX
-    Styles = ();
-#else
-    Styles = (DONTSHOWINUSERINSTALL);
-#endif
-#ifdef ENABLE_GNOMEVFS
-    XpdCheckSolaris = "SUNWgnome-vfs";
-#endif
-    Files = (
-      gid_File_Lib_Evoab_2,
-      gid_File_Lib_Fps_Gnome,
-      gid_File_Lib_Vclplug_Gtk,
-#ifdef ENABLE_GTK3
-      gid_File_Lib_Vclplug_Gtk3,
-#endif
-      gid_File_Bin_Gnome_Open_Url,
-      gid_File_Bin_Gnome_Open_Url_Bin,
-#ifdef ENABLE_SYSTRAY_GTK
-      gid_File_Lib_QStart_Gtk,
-#endif
-#ifdef ENABLE_GNOMEVFS
-      gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application,
-#endif
-#ifdef ENABLE_GIO
-      gid_File_Lib_GIO,
-#endif
-#ifdef ENABLE_GCONF
-      gid_File_Lib_Gconfbe
-#endif
-#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
-      gid_File_Share_Registry_Gnome_Xcd
-#endif
-    );
-End
-
diff --git a/scp2/source/gnome/module_gnome.ulf b/scp2/source/gnome/module_gnome.ulf
deleted file mode 100644
index e39d1c626..000000000
--- a/scp2/source/gnome/module_gnome.ulf
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_GNOME]
-en-US = "GNOME Integration"
-
-[STR_DESC_MODULE_OPTIONAL_GNOME]
-en-US = "System integration of %PRODUCTNAME %PRODUCTVERSION into Gnome Desktop Environment."
-
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
deleted file mode 100644
index 15a18d297..000000000
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-File gid_File_Share_Registry_Graphicfilter_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "graphicfilter.xcd";
-End
-
-STD_LIB_FILE( gid_File_Lib_Flash, flash )
-
-STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
-
-STD_FILTER_FILE( gid_File_Lib_WPGImport, wpgimport )
-
-STD_FILTER_FILE( gid_File_Lib_VisioImport, visioimport )
diff --git a/scp2/source/graphicfilter/makefile.mk b/scp2/source/graphicfilter/makefile.mk
deleted file mode 100644
index 522a22d36..000000000
--- a/scp2/source/graphicfilter/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=graphicfilter
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_graphicfilter.par            \
-        file_graphicfilter.par
-
-ULFFILES= \
-        module_graphicfilter.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
deleted file mode 100644
index 5b6dffb7d..000000000
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Grfflt
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_OPTIONAL_GRFFLT );
-    Sortkey = "600";
-    ParentID = gid_Module_Optional;
-    Default = YES;
-    Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport,
-    		 gid_File_Share_Registry_Graphicfilter_Xcd);
-End
diff --git a/scp2/source/graphicfilter/module_graphicfilter.ulf b/scp2/source/graphicfilter/module_graphicfilter.ulf
deleted file mode 100644
index f152392a9..000000000
--- a/scp2/source/graphicfilter/module_graphicfilter.ulf
+++ /dev/null
@@ -1,119 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT]
-en-US = "Graphics Filters"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT]
-en-US = "Additional filters required to read alien graphic formats."
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_ADOBE]
-en-US = "Adobe Photoshop Import Filter"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_ADOBE]
-en-US = "Adobe Photoshop Import Filter"
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_TGA]
-en-US = "TGA Import"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_TGA]
-en-US = "TGA TrueVision TARGA Import Filter"
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_EPS]
-en-US = "EPS Import/Export Filter"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_EPS]
-en-US = "Encapsulated Postscript Import/Export Filter"
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_XPM]
-en-US = "XPM Export Filter"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_XPM]
-en-US = "XPM Export Filter"
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_PBMP]
-en-US = "Portable Bitmap Import/Export"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_PBMP]
-en-US = "Portable Bitmap Import/Export Filters"
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_SUNRST]
-en-US = "SUN Rasterfile Import/Export"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_SUNRST]
-en-US = "SUN Rasterfile Import/Export Filters"
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_ACAD]
-en-US = "AutoCAD Import"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_ACAD]
-en-US = "AutoCAD Import Filter"
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_KODAC]
-en-US = "Kodak Photo-CD Import"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_KODAC]
-en-US = "Kodak Photo-CD Import Filter"
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_MACPICT]
-en-US = "Mac-Pict Import/Export"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_MACPICT]
-en-US = "Mac-Pict Import/Export Filters"
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_OS2META]
-en-US = "OS/2 Metafile Import/Export"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_OS2META]
-en-US = "OS/2 Metafile Import/Export Filters"
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_PCX]
-en-US = "PCX Import"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_PCX]
-en-US = "Z-Soft PCX Import"
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_TIFF]
-en-US = "TIFF Import/Export"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_TIFF]
-en-US = "TIFF Import and Export Filter"
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_SVG]
-en-US = "SVG Export"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_SVG]
-en-US = "SVG Export Filter"
-
-[STR_NAME_MODULE_OPTIONAL_GRFFLT_FLASH]
-en-US = "Macromedia Flash (SWF)"
-
-[STR_DESC_MODULE_OPTIONAL_GRFFLT_FLASH]
-en-US = "Macromedia Flash (SWF) Export Filter"
-
-
-
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
deleted file mode 100644
index 1e7594298..000000000
--- a/scp2/source/impress/file_impress.scp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-File gid_File_Lib_Placeware
-    Name = LIBNAME(placeware);
-    PACKED_LIB_FILE_BODY;
-End
-
-File gid_File_Lib_Animcore
-	Name = LIBNAME(animcore);
-	PACKED_LIB_FILE_BODY;
-End
-
-File gid_File_Share_Registry_Impress_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "impress.xcd";
-End
-
-File gid_File_Help_Simpress_Zip
-    Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY_HELPPACK;
-    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
-    Patchfiles = (); 
-End
-
-File gid_File_Exe_Simpress
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(simpress);
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Impress";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
-    Styles = (PACKED);
-  #endif
-End
-
-// new user interface configuration files
-/*
-File gid_File_Share_Config_Sofficecfg_Impress_Menubar_Xml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Config_Sofficecfg_Simpress_Menubar;
-    Name = "/uiconfig/simpress/menubar/menubar.xml";
-End
-*/
-
-// configuration files for custom animation effects
-
-File gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Config_Sofficecfg_Simpress;
-    Name = "effects.xml";
-End
-
-File gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Config_Sofficecfg_Simpress;
-    Name = "transitions.xml";
-End
diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp
deleted file mode 100644
index db7b0c379..000000000
--- a/scp2/source/impress/folderitem_impress.scp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-FolderItem gid_Folderitem_Simpress
-    Name = "%PRODUCTNAME Impress";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    FolderID = gid_Folder_Staroffice51;
-    FileID = gid_File_Exe_Simpress;
-    IconFile = gid_File_Exe_Simpress;
-    IconID = 0;
-    WkDir = gid_Dir_Program;
-    Parameter = "";
-    Styles = (NOWEB, NON_ADVERTISED);
-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
-End
diff --git a/scp2/source/impress/folderitem_impress.ulf b/scp2/source/impress/folderitem_impress.ulf
deleted file mode 100644
index d633e5759..000000000
--- a/scp2/source/impress/folderitem_impress.ulf
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_FI_NAME_PRAESENTATION]
-en-US = "Presentation"
-
-[STR_FI_TOOLTIP_IMPRESS]
-en-US = "Create and edit presentations for slideshows, meeting and Web pages by using Impress."
-
-
diff --git a/scp2/source/impress/makefile.mk b/scp2/source/impress/makefile.mk
deleted file mode 100644
index 0a67e8608..000000000
--- a/scp2/source/impress/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=impress
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-.IF "$(ENABLE_OPENGL)"=="TRUE"
-SCPDEFS+=-DENABLE_OPENGL
-.ENDIF
-
-PARFILES= \
-        module_impress.par              \
-        file_impress.par 
-
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_impress.par        \
-        folderitem_impress.par
-.ENDIF
-
-ULFFILES= \
-        module_impress.ulf              \
-        registryitem_impress.ulf        \
-        folderitem_impress.ulf
-
-.IF "$(ENABLE_OPENGL)" == "TRUE"
-PARFILES+=\
-        module_ogltrans.par
-ULFFILES+=\
-    module_ogltrans.ulf
-.ENDIF
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
deleted file mode 100644
index e3313c821..000000000
--- a/scp2/source/impress/module_impress.scp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Prg_Impress
-    MOD_NAME_DESC ( MODULE_PRG_IMPRESS );
-    ParentID = gid_Module_Prg;
-    Sortkey = "400";
-    Styles =(APPLICATIONMODULE);
-End
-
-Module gid_Module_Prg_Impress_Bin
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_PRG_IMPRESS_BIN );
-    ParentID = gid_Module_Prg_Impress;
-    Sortkey = "100";
-    Minimal = YES;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
-    gid_File_Share_Registry_Impress_Xcd,
-    gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
-    gid_File_Tmp_Userinstall_Impress_Inf);
-End
-
-Module gid_Module_Brand_Prg_Impress
-    PackageInfo = "packinfo_brand.txt";
-    Name = "gid_Module_Brand_Prg_Impress";
-    Description = "gid_Module_Brand_Prg_Impress";
-    ParentID = gid_Module_Prg_Impress;
-    Sortkey = "100";
-    InstallOrder = "1040";
-    Minimal = YES;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Exe_Simpress);
-End
-
-Module gid_Module_Langpack_Impress_Template
-    ParentID = gid_Module_Prg_Impress_Bin;
-    Name = "gid_Module_Langpack_Impress_Template";
-    Description = "gid_Module_Langpack_Impress_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = ();
-End
-
-Module gid_Module_Prg_Impress_MSO_Reg
-    ParentID = gid_Module_Prg_Impress;
-    Name = "gid_Module_Prg_Impress_MSO_Reg";
-    Description = "gid_Module_Prg_Impress_MSO_Reg";
-    Styles = (HIDDEN_ROOT);
-    Minimal = YES;
-    Default = YES;
-End
-
-#include "alllangmodules_impress.inc"
diff --git a/scp2/source/impress/module_impress.ulf b/scp2/source/impress/module_impress.ulf
deleted file mode 100644
index 6d795644a..000000000
--- a/scp2/source/impress/module_impress.ulf
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-[STR_NAME_MODULE_PRG_IMPRESS]
-en-US = "%PRODUCTNAME Impress"
-
-[STR_DESC_MODULE_PRG_IMPRESS]
-en-US = "Create and edit presentations for slideshows, meeting and Web pages by using %PRODUCTNAME Impress."
-
-[STR_NAME_MODULE_PRG_IMPRESS_BIN]
-en-US = "Program Module"
-
-[STR_DESC_MODULE_PRG_IMPRESS_BIN]
-en-US = "The application %PRODUCTNAME Impress"
-
-[STR_NAME_MODULE_PRG_IMPRESS_HELP]
-en-US = "%PRODUCTNAME Impress Help"
-
-[STR_DESC_MODULE_PRG_IMPRESS_HELP]
-en-US = "Help about %PRODUCTNAME Impress"
-
-
-
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
deleted file mode 100644
index 300deca7a..000000000
--- a/scp2/source/impress/module_ogltrans.scp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_OGLTrans
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_OGLTRANS);
-    ParentID = gid_Module_Optional;
-    Files = ( gid_File_Lib_OpenGLTransitions, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Share_Registry_Ogltrans_Xcd );
-    Minimal = NO;
-    Default = NO;
-End
-
-File gid_File_Lib_OpenGLTransitions
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX));
-  #else
-    Name = "OGLTrans.uno.dll";
-  #endif
-End
-
-File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Config_Sofficecfg_Simpress;
-    Name = "transitions-ogl.xml";
-End
-
-File gid_File_Share_Registry_Ogltrans_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "ogltrans.xcd";
-End
diff --git a/scp2/source/impress/module_ogltrans.ulf b/scp2/source/impress/module_ogltrans.ulf
deleted file mode 100644
index 555e88a0f..000000000
--- a/scp2/source/impress/module_ogltrans.ulf
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-MODULE_OPTIONAL_OGLTRANS
-
-[STR_NAME_MODULE_OPTIONAL_OGLTRANS]
-en-US = "OpenGL slide transitions for %PRODUCTNAME Impress"
-
-[STR_DESC_MODULE_MODULE_OPTIONAL_OGLTRANS]
-en-US = "OpenGL slide transitions for %PRODUCTNAME Impress."
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
deleted file mode 100644
index 063bcf91f..000000000
--- a/scp2/source/impress/registryitem_impress.scp
+++ /dev/null
@@ -1,1041 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-// MSOLE embedded object in SO7 file format
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}";
-    REG_VALUE_LNG(SO60_PRESENT)
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Auxusertype_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\AuxUserType\2";
-    Value = "%PRODUCTNAME";
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Auxusertype_3
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\AuxUserType\3";
-    REG_VALUE_LNG(SO60_PRESENT)
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Dataformats_Getset_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\DataFormats\GetSet\0";
-    Value = "Embed Source,1,8,1";
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Dataformats_Getset_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\DataFormats\GetSet\1";
-    Value = "3,1,32,1";
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Dataformats_Getset_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\DataFormats\GetSet\2";
-    Value = "2,1,16,1";
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Inprochandler32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\Insertable";
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Localserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\LocalServer32";
-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Miscstatus
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\MiscStatus";
-    Value = "16";
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Progid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\ProgID";
-    Value = "soffice.StarImpressDocument.6";
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Programmable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\Programmable";
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\verb\0";
-    Value = "&Edit,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\verb\-1";
-    Value = "Show,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\verb\-2";
-    Value = "Open,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Versionindependentprogid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\VersionIndependentProgID";
-    Value = "soffice.StarImpressDocument.6";
-End
-
-// MSOLE embedded object in OASIS file format
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}";
-    REG_VALUE_LNG(OO_PRESENT)
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Auxusertype_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\AuxUserType\2";
-    Value = "%PRODUCTNAME";
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Auxusertype_3
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\AuxUserType\3";
-    REG_VALUE_LNG(OO_PRESENT)
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Dataformats_Getset_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\DataFormats\GetSet\0";
-    Value = "Embed Source,1,8,1";
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Dataformats_Getset_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\DataFormats\GetSet\1";
-    Value = "3,1,32,1";
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Dataformats_Getset_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\DataFormats\GetSet\2";
-    Value = "2,1,16,1";
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Inprochandler32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\Insertable";
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Localserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\LocalServer32";
-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Miscstatus
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\MiscStatus";
-    Value = "16";
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Progid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\ProgID";
-    Value = "opendocument.ImpressDocument.1";
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Programmable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\Programmable";
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\verb\0";
-    Value = "&Edit,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\verb\-1";
-    Value = "Show,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\verb\-2";
-    Value = "Open,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Versionindependentprogid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\VersionIndependentProgID";
-    Value = "opendocument.ImpressDocument.1";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6";
-    REG_VALUE_LNG(SO60_PRESENT)
-End
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Clsid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\CLSID";
-    Value = "{E5A0B632-DFBA-4549-9346-E414DA06E6F8}";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,33";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\Insertable";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Protocol_Stdfileediting_Server
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\protocol\StdFileEditing\server";
-    Value = "<progpath>\program\soffice.exe";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Protocol_Stdfileediting_Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\protocol\StdFileEditing\verb\0";
-    Value = "&Edit";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Protocol_Stdfileediting_Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\protocol\StdFileEditing\verb\-1";
-    Value = "&Show";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Protocol_Stdfileediting_Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\protocol\StdFileEditing\verb\-2";
-    Value = "&Open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Show
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\shell\show";
-    REG_VALUE_LNG(SO60_SHOW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Show_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\shell\show\command";
-    Value = "\"<progpath>\program\soffice.exe\" -show \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarImpressDocument\CurVer";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "soffice.StarImpressDocument.6";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarImpressTemplate.6";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    REG_VALUE_LNG(SO60_IMPRESS_TEMPLATE)
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarImpressTemplate.6\DefaultIcon";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "<progpath>\program\soffice.exe,34";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarImpressTemplate.6\shell";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "new";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarImpressTemplate.6\shell\new";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarImpressTemplate.6\shell\new\command";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarImpressTemplate.6\shell\open\command";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarImpressTemplate.6\shell\print\command";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarImpressTemplate.6\shell\printto\command";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Sti
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sti";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "soffice.StarImpressTemplate.6";
-End
-
-RegistryItem gid_Regitem_Sti_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".sti\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Sti_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".sti\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Sti_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".sti\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_StarImpressTemplate_6_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressTemplate.6\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Sti_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".sti";
-    Name = "Content Type";
-    Value = "application/vnd.sun.xml.impress.template";
-End
-
-RegistryItem gid_Regitem_sti_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "soffice.StarImpressTemplate.6";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Sxi_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".sxi\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Sxi_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".sxi\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Sxi_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".sxi\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_StarImpressDocument_6_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "soffice.StarImpressDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Sxi_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".sxi";
-    Name = "Content Type";
-    Value = "application/vnd.sun.xml.impress";
-End
-
-RegistryItem gid_Regitem_Sxi_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.impress";
-    Name = "Extension";
-    Value = ".sxi";
-End
-
-RegistryItem gid_Regitem__Sxi
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".sxi";
-    Value = "soffice.StarImpressDocument.6";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxi
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = ".sxi";
-    Value = "soffice.StarImpressDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_sxi_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "soffice.StarImpressDocument.6";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-// new odp file extension
-
-RegistryItem gid_Regitem_Odp_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".odp\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Odp_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".odp\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Odp_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".odp\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_ImpressDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem__Odp
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".odp";
-    Value = "opendocument.ImpressDocument.1";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odp
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = ".odp";
-    Value = "opendocument.ImpressDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odp
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "application/vnd.oasis.opendocument.presentation";
-    Value = "opendocument.ImpressDocument.1";
-    Styles = ();
-End
-
-
-RegistryItem gid_Regitem_Odp_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".odp";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.presentation";
-End
-
-RegistryItem gid_Regitem_Odp_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.presentation";
-    Name = "Extension";
-    Value = ".odp";
-End
-
-RegistryItem gid_Regitem_Odp_Openoffice_Impressdocument_1_Shellnew
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".odp\opendocument.ImpressDocument.1\ShellNew";
-    Name = "FileName";
-    Value = "soffice.odp";
-End
-
-RegistryItem gid_Regitem_Openoffice_Starimpressdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarImpressDocument\CurVer";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "opendocument.ImpressDocument.1";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1";
-    REG_VALUE_LNG(OO_PRESENT)
-End
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Clsid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\CLSID";
-    Value = "{EE5D1EA4-D445-4289-B2FC-55FC93693917}";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,7";
-End
-
-RegistryItem gid_Regitem_odp_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.ImpressDocument.1";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\Insertable";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Server
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\protocol\StdFileEditing\server";
-    Value = "<progpath>\program\soffice.exe";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\protocol\StdFileEditing\verb\0";
-    Value = "&Edit";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\protocol\StdFileEditing\verb\-1";
-    Value = "&Show";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\protocol\StdFileEditing\verb\-2";
-    Value = "&Open";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\open\command";
-    Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Show
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\show";
-    REG_VALUE_LNG(SO60_SHOW)
-End
-
-RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Show_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressDocument.1\shell\show\command";
-    Value = "\"<progpath>\program\soffice.exe\" -show \"%1\"";
-End
-
-// .fodp
-
-RegistryItem gid_Regitem_Fodp_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".fodp\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Fodp_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".fodp\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Fodp_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".fodp\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem__Fodp
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".fodp";
-    Value = "opendocument.ImpressDocument.1";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodp
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".fodp";
-    Value = "opendocument.ImpressDocument.1";
-    Styles = (PATCH);
-End
-
-RegistryItem gid_Regitem_Fodp_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".fodp";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.presentation";
-End
-
-// new otp file extension
-
-RegistryItem gid_Regitem_Otp_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".otp\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Otp_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".otp\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Otp_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".otp\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_ImpressTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "opendocument.ImpressTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Otp
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".otp";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "opendocument.ImpressTemplate.1";
-End
-
-RegistryItem gid_Regitem_Otp_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".otp";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.presentation-template";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impresstemplate_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    REG_VALUE_LNG(OO_PRESENT_TEMPLATE)
-End
-
-RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\DefaultIcon";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "<progpath>\program\soffice.exe,8";
-End
-
-RegistryItem gid_Regitem_otp_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.ImpressTemplate.1";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\shell";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "new";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\shell\new";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\shell\new\command";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\shell\open\command";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\shell\print\command";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.ImpressTemplate.1\shell\printto\command";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-// "OpenWith" Windows Registry keys for extensions supported by Impress
-
-// .ODP
-RegistryItem gid_Regitem_OpenOffice_ODP_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".odp\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
-    Value = " ";
-End
-
-// .OTP
-RegistryItem gid_Regitem_OpenOffice_OTP_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".otp\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressTemplate.1";
-    Value = " ";
-End
-
-// .SXI
-RegistryItem gid_Regitem_OpenOffice_SXI_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sxi\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "soffice.StarImpressDocument.6";
-    Value = " ";
-End
-
-// .STI
-RegistryItem gid_Regitem_OpenOffice_STI_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sti\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "soffice.StarImpressTemplate.6";
-    Value = " ";
-End
-
-// .SXD
-RegistryItem gid_Regitem_OpenOffice_SXD_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sxd\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "soffice.StarImpressDocument.6";
-    Value = " ";
-End
-
-// .ODG
-RegistryItem gid_Regitem_OpenOffice_ODG_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".odg\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
-    Value = " ";
-End
-
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Otp
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = ".otp";
-    Value = "opendocument.ImpressTemplate.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sti
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = ".sti";
-    Value = "soffice.StarImpressTemplate.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Simpress_Exe
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\simpress.exe";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "<progpath>\program\simpress.exe";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Simpress_Exepath
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\simpress.exe";
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "Path";
-    Value = "<progpath>";
-End
-
-// registering the property handler for the supported file types
-
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odp )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otp )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxi )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti )
-
-// registering the mso file types
-
-CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_MSO_Reg, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_MSO_Reg, pps,  PPS,  MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,  gid_Module_Prg_Impress_MSO_Reg, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
diff --git a/scp2/source/impress/registryitem_impress.ulf b/scp2/source/impress/registryitem_impress.ulf
deleted file mode 100644
index 0221ab122..000000000
--- a/scp2/source/impress/registryitem_impress.ulf
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_REG_VAL_NEW]
-en-US = "&New"
-
-[STR_REG_VAL_SO60_SHOW]
-en-US = "Show"
-
-[STR_REG_VAL_SO60_PRESENT]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation"
-
-[STR_REG_VAL_SO60_IMPRESS_TEMPLATE]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation Template"
-
-[STR_REG_VAL_OO_PRESENT]
-en-US = "OpenDocument Presentation"
-
-[STR_REG_VAL_OO_PRESENT_TEMPLATE]
-en-US = "OpenDocument Presentation Template"
-
-[STR_REG_VAL_MS_POWERPOINT_PRESENTATION_OLD]
-en-US = "Microsoft PowerPoint 97-2003 Presentation"
-
-[STR_REG_VAL_MS_POWERPOINT_SHOW]
-en-US = "Microsoft PowerPoint Show"
-
-[STR_REG_VAL_MS_POWERPOINT_PRESENTATION]
-en-US = "Microsoft PowerPoint Presentation"
-
-[STR_REG_VAL_MS_POWERPOINT_TEMPLATE_OLD]
-en-US = "Microsoft PowerPoint 97-2003 Template"
-
-[STR_REG_VAL_MS_POWERPOINT_TEMPLATE]
-en-US = "Microsoft PowerPoint Template"
-
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
deleted file mode 100644
index a6d3f3329..000000000
--- a/scp2/source/javafilter/file_javafilter.scp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifdef WNT
-
-File gid_File_Lib_Xmergesync
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "xmergesync.dll";
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Lib_Jfregca
-    TXT_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "jfregca.dll";
-End
-
-#endif
-
-File gid_File_Share_Registry_Palm_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "palm.xcd";
-End
-
-File gid_File_Share_Registry_Pocketexcel_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "pocketexcel.xcd";
-End
-
-File gid_File_Share_Registry_Pocketword_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "pocketword.xcd";
-End
-
-#ifdef SOLAR_JAVA
-
-STD_JAR_FILE( gid_File_Jar_Aportisdoc, aportisdoc )
-STD_JAR_FILE( gid_File_Jar_Pexcel, pexcel )
-STD_JAR_FILE( gid_File_Jar_Pocketword, pocketword )
-STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge )
-STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
-
-#endif
diff --git a/scp2/source/javafilter/makefile.mk b/scp2/source/javafilter/makefile.mk
deleted file mode 100644
index 49f50ab16..000000000
--- a/scp2/source/javafilter/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=javafilter
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SOLAR_JAVA)"=="TRUE"
-SCP_PRODUCT_TYPE=osl
-PARFILES= \
-        module_javafilter.par              \
-        file_javafilter.par
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"=="TRUE"
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_javafilter.par
-.ENDIF
-.ENDIF
-
-ULFFILES= \
-        module_javafilter.ulf              \
-        registryitem_javafilter.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/javafilter/module_javafilter.scp b/scp2/source/javafilter/module_javafilter.scp
deleted file mode 100644
index dd69d014c..000000000
--- a/scp2/source/javafilter/module_javafilter.scp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Javafilter
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER);
-    Sortkey = "900";
-    ParentID = gid_Module_Optional;
-    Files = ( gid_File_Lib_Jfregca );
-    Minimal = NO;
-    Default = NO;
-    Styles (en-US) = ();
-    Styles (de) = ();
-    Styles (ja) = (HIDDEN_ROOT);
-    Styles (ko) = (HIDDEN_ROOT);
-    Styles (zh-CN) = (HIDDEN_ROOT);
-    Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Palm
-    MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_PALM);
-    ParentID = gid_Module_Optional_Javafilter;
-    Sortkey = "100";
-    Minimal = NO;
-    Default = NO;
-    Styles (en-US) = ();
-    Styles (de) = ();
-    Styles (ja) = (HIDDEN_ROOT);
-    Styles (ko) = (HIDDEN_ROOT);
-    Styles (zh-CN) = (HIDDEN_ROOT);
-    Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Palm_Aportisdoc
-    MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC);
-    ParentID = gid_Module_Optional_Javafilter_Palm;
-    Files = ( gid_File_Jar_Aportisdoc, gid_File_Share_Registry_Palm_Xcd );
-    Sortkey = "100";
-    Minimal = NO;
-    Default = NO;
-    Styles (en-US) = ();
-    Styles (de) = ();
-    Styles (ja) = (HIDDEN_ROOT);
-    Styles (ko) = (HIDDEN_ROOT);
-    Styles (zh-CN) = (HIDDEN_ROOT);
-    Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Pocketpc
-    ALL_LANG(Name,STR_NAME_MODULE_OPTIONAL_JAVAFILTER_POCKETPC);
-  #ifdef WNT
-    ALL_LANG(Description,STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_WNT);
-  #else
-    ALL_LANG(Description,STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_UNIX);
-  #endif
-    ParentID = gid_Module_Optional_Javafilter;
-    Sortkey = "200";
-    Files = ( gid_File_Lib_Xmergesync );
-    Minimal = NO;
-    Default = NO;
-    Styles (en-US) = ();
-    Styles (de) = ();
-    Styles (ja) = (HIDDEN_ROOT);
-    Styles (ko) = (HIDDEN_ROOT);
-    Styles (zh-CN) = (HIDDEN_ROOT);
-    Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word
-    MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD);
-    ParentID = gid_Module_Optional_Javafilter_Pocketpc;
-    Sortkey = "100";
-    Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pocketword, gid_File_Share_Registry_Pocketword_Xcd, gid_File_Tmp_Userinstall_Pocketpcword_Inf );
-    Minimal = NO;
-    Default = NO;
-    Styles (en-US) = ();
-    Styles (de) = ();
-    Styles (ja) = (HIDDEN_ROOT);
-    Styles (ko) = (HIDDEN_ROOT);
-    Styles (zh-CN) = (HIDDEN_ROOT);
-    Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel
-    MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL);
-    ParentID = gid_Module_Optional_Javafilter_Pocketpc;
-    Sortkey = "200";
-    Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pexcel, gid_File_Share_Registry_Pocketexcel_Xcd, gid_File_Tmp_Userinstall_Pocketpcexcel_Inf );
-    Minimal = NO;
-    Default = NO;
-    Styles (en-US) = ();
-    Styles (de) = ();
-    Styles (ja) = (HIDDEN_ROOT);
-    Styles (ko) = (HIDDEN_ROOT);
-    Styles (zh-CN) = (HIDDEN_ROOT);
-    Styles (zh-TW) = (HIDDEN_ROOT);
-End
diff --git a/scp2/source/javafilter/module_javafilter.ulf b/scp2/source/javafilter/module_javafilter.ulf
deleted file mode 100644
index 64ae9c420..000000000
--- a/scp2/source/javafilter/module_javafilter.ulf
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER]
-en-US = "Mobile Device Filters"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER]
-en-US = "Text and spreadsheet filters to support import/export for Palm handheld or Pocket PC (Java required)."
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_PALM]
-en-US = "Palm"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_PALM]
-en-US = "Filters for Palm OS compatible handhelds"
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC]
-en-US = "AportisDoc"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC]
-en-US = "Support for the AportisDoc format"
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_POCKETPC]
-en-US = "Pocket PC"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_WNT]
-en-US = "Filters and ActiveSync support for Pocket PC compatible handhelds"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_UNIX]
-en-US = "Filters for Pocket PC compatible handhelds."
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD]
-en-US = "Pocket Word"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD]
-en-US = "Support for Pocket Word"
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL]
-en-US = "Pocket Excel"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL]
-en-US = "Support for Pocket Excel"
-
-
-
diff --git a/scp2/source/javafilter/registryitem_javafilter.scp b/scp2/source/javafilter/registryitem_javafilter.scp
deleted file mode 100644
index 3626d914b..000000000
--- a/scp2/source/javafilter/registryitem_javafilter.scp
+++ /dev/null
@@ -1,437 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    ALL_LANG_STR_VALUE_LNG(_43887C67_4D5D_4127_BAAC_87A288494C7C_);
-End
-
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\DefaultIcon";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "[INSTALLLOCATION]program\xmergesync.dll";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserver32_Threadingmodel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "ThreadingModel";
-    Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Pegasusfilter
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Pegasusfilter_Description
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "Description";
-    ALL_LANG_STR_VALUE_LNG(_43887C67_4D5D_4127_BAAC_87A288494C7C__PEGASUSFILTER_DESCRIPTION);
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Pegasusfilter_Import
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "Import";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Pegasusfilter_Newextension
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "NewExtension";
-    Value = "pxl";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    ALL_LANG_STR_VALUE_LNG(_BDD611C3_7BAB_460F_8711_5B9AC9EF6020_);
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\DefaultIcon";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "[INSTALLLOCATION]program\xmergesync.dll";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserver32_Threadingmodel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "ThreadingModel";
-    Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Pegasusfilter
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Pegasusfilter_Description
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "Description";
-    ALL_LANG_STR_VALUE_LNG(_BDD611C3_7BAB_460F_8711_5B9AC9EF6020__PEGASUSFILTER_DESCRIPTION);
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Pegasusfilter_Export
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "Export";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Pegasusfilter_Newextension
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "NewExtension";
-    Value = "sxw";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    ALL_LANG_STR_VALUE_LNG(_C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C_);
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\DefaultIcon";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "[INSTALLLOCATION]program\xmergesync.dll";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserver32_Threadingmodel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "ThreadingModel";
-    Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Pegasusfilter
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Pegasusfilter_Description
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "Description";
-    ALL_LANG_STR_VALUE_LNG(_C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C__PEGASUSFILTER_DESCRIPTION);
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Pegasusfilter_Export
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "Export";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Pegasusfilter_Newextension
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "NewExtension";
-    Value = "sxc";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    ALL_LANG_STR_VALUE_LNG(_CB43F086_838D_4FA4_B5F6_3406B9A57439_);
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\DefaultIcon";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "[INSTALLLOCATION]program\xmergesync.dll";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserver32_Threadingmodel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "ThreadingModel";
-    Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Pegasusfilter
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Pegasusfilter_Description
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "Description";
-    ALL_LANG_STR_VALUE_LNG(_CB43F086_838D_4FA4_B5F6_3406B9A57439__PEGASUSFILTER_DESCRIPTION);
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Pegasusfilter_Import
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "Import";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Pegasusfilter_Newextension
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "NewExtension";
-    Value = "psw";
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Classpath_Pocket_Excel
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "Classpath";
-    ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_CLASSPATH);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Classpath_Pocket_Word
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "Classpath";
-    ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_CLASSPATH);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Java_Pocket_Excel
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "Java";
-    ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVA);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Java_Pocket_Word
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "Java";
-    ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVA);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Javainit_Pocket_Excel
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "JavaInit";
-    ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVAINIT);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Javainit_Pocket_Word
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "JavaInit";
-    ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVAINIT);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Pocket_Excel
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Pocket_Word
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Pocket_Excel
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Pocket_Word
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Psw_Writer
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.psw\InstalledFilters";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Pxl_Calc
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.pxl\InstalledFilters";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc_Default_Export
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "DefaultExport";
-    Value = "Binary Copy";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc_Default_Import
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "DefaultImport";
-    Value = "{43887C67-4D5D-4127-BAAC-87A288494C7C}";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc_Installed_Filters
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc\InstalledFilters";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc_Installed_Filters_Pxl
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc\InstalledFilters";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "{43887C67-4D5D-4127-BAAC-87A288494C7C}";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw_Default_Export
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "DefaultExport";
-    Value = "Binary Copy";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw_Default_Import
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "DefaultImport";
-    Value = "{CB43F086-838D-4FA4-B5F6-3406B9A57439}";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw_Installed_Filters
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw\InstalledFilters";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw_Installed_Filters_Psw
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw\InstalledFilters";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "{CB43F086-838D-4FA4-B5F6-3406B9A57439}";
-    Value = "";
-End
diff --git a/scp2/source/javafilter/registryitem_javafilter.ulf b/scp2/source/javafilter/registryitem_javafilter.ulf
deleted file mode 100644
index fb2478dd8..000000000
--- a/scp2/source/javafilter/registryitem_javafilter.ulf
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_VALUE__43887C67_4D5D_4127_BAAC_87A288494C7C_]
-en-US = "Pocket Excel"
-
-[STR_VALUE__43887C67_4D5D_4127_BAAC_87A288494C7C__PEGASUSFILTER_DESCRIPTION]
-en-US = "Pocket Excel Workbook"
-
-[STR_VALUE__BDD611C3_7BAB_460F_8711_5B9AC9EF6020_]
-en-US = "%PRODUCTNAME Writer"
-
-[STR_VALUE__BDD611C3_7BAB_460F_8711_5B9AC9EF6020__PEGASUSFILTER_DESCRIPTION]
-en-US = "%PRODUCTNAME Writer XML Document"
-
-[STR_VALUE__C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C_]
-en-US = "%PRODUCTNAME Calc"
-
-[STR_VALUE__C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C__PEGASUSFILTER_DESCRIPTION]
-en-US = "%PRODUCTNAME Calc XML Document"
-
-[STR_VALUE__CB43F086_838D_4FA4_B5F6_3406B9A57439_]
-en-US = "Pocket Word"
-
-[STR_VALUE__CB43F086_838D_4FA4_B5F6_3406B9A57439__PEGASUSFILTER_DESCRIPTION]
-en-US = "Pocket Word Document - Pocket PC"
-
-[STR_VALUE_HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_CLASSPATH]
-en-US = "The %PRODUCTNAME mobile device filters cannot be located."
-
-[STR_VALUE_HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVA]
-en-US = "A Java 1.4 installation cannot be located."
-
-[STR_VALUE_HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVAINIT]
-en-US = "There was an error while initializing the Java Runtime Environment."
diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp
deleted file mode 100644
index 3d139b797..000000000
--- a/scp2/source/kde/file_kde.scp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "macros.inc"
-
-#ifdef ENABLE_KDE
-File gid_File_Lib_Kdebe
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(kdebe1.uno,UNXSUFFIX));
-End
-#endif
-
-#ifdef ENABLE_KDE4
-File gid_File_Lib_Kde4be
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX));
-End
-#endif
diff --git a/scp2/source/kde/makefile.mk b/scp2/source/kde/makefile.mk
deleted file mode 100644
index 32d713812..000000000
--- a/scp2/source/kde/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=kde
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE"
-
-.IF "$(ENABLE_KDE)" != ""
-SCPDEFS+=-DENABLE_KDE
-.ENDIF
-
-.IF "$(ENABLE_KDE4)" != ""
-SCPDEFS+=-DENABLE_KDE4
-.ENDIF
-
-PARFILES =                   \
-        module_kde.par     \
-        file_kde.par
-
-ULFFILES= \
-        module_kde.ulf
-.ENDIF
-
-# --- File ---------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
deleted file mode 100644
index 55180c57b..000000000
--- a/scp2/source/kde/module_kde.scp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#if defined( ENABLE_KDE ) || defined( ENABLE_KDE4 )
-Module gid_Module_Optional_Kde
-    ParentID = gid_Module_Optional;
-    Default = YES;
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
-    Styles = (DONTSHOWINUSERINSTALL);
-    Files = (
-#ifdef ENABLE_KDE
-    gid_File_Lib_Kdebe
-#ifdef ENABLE_KDE4
-    ,
-#endif // ENABLE_KDE4
-#endif // ENABLE_KDE
-#ifdef ENABLE_KDE4
-    gid_File_Lib_Kde4be
-#endif // ENABLE_KDE4
-    );
-End
-#endif
-
diff --git a/scp2/source/kde/module_kde.ulf b/scp2/source/kde/module_kde.ulf
deleted file mode 100644
index 3d9be78ef..000000000
--- a/scp2/source/kde/module_kde.ulf
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_KDE]
-en-US = "KDE Integration"
-
-[STR_DESC_MODULE_OPTIONAL_KDE]
-en-US = "System integration of %PRODUCTNAME %PRODUCTVERSION into KDE."
-
diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
deleted file mode 100644
index c801808a4..000000000
--- a/scp2/source/layout/layout.scp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Directory gid_Dir_Share_Layout
-    ParentID = gid_Dir_Share;
-    DosName = "layout";
-End
-
-File gid_File_Zip_Toolkit_Layout
-   Dir = gid_Dir_Share_Layout;
-   USER_FILE_BODY;
-   Styles = (ARCHIVE);
-   Name = "toolkit-layout.zip";
-End
-
-File gid_File_Zip_Sc_Layout
-   Dir = gid_Dir_Share_Layout;
-   USER_FILE_BODY;
-   Styles = (ARCHIVE);
-   Name = "sc-layout.zip";
-End
-
-File gid_File_Zip_Svx_Layout
-   Dir = gid_Dir_Share_Layout;
-   USER_FILE_BODY;
-   Styles = (ARCHIVE);
-   Name = "svx-layout.zip";
-End
-
-File gid_File_Zip_Sw_Layout
-   Dir = gid_Dir_Share_Layout;
-   USER_FILE_BODY;
-   Styles = (ARCHIVE);
-   Name = "sw-layout.zip";
-End
-
diff --git a/scp2/source/layout/makefile.mk b/scp2/source/layout/makefile.mk
deleted file mode 100644
index 55fddf86e..000000000
--- a/scp2/source/layout/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=layout
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES=
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-PARFILES+= layout.par
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-# --- File ---------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
deleted file mode 100644
index c554296d4..000000000
--- a/scp2/source/math/file_math.scp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifndef WITHOUT_MATHMLDTD
-File gid_File_Html_W3c_Ipr
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Math_1_01;
-    Name = "w3c_ipr_software_notice.html";
-End
-
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Sm , sm)
-
-STD_LIB_FILE( gid_File_Lib_Smd , smd)
-
-STD_RES_FILE( gid_File_Res_Sm, sm )
-
-File gid_File_Share_Registry_Math_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "math.xcd";
-End
-
-File gid_File_Help_Smath_Zip
-    Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY_HELPPACK;
-    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(smath);
-    Patchfiles = ();
-End
-
-File gid_File_Exe_Smath
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(smath);
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Math";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
-    Styles = (PACKED);
-  #endif
-End
-
-// new user interface configuration files
-/*
-File gid_File_Share_Config_Sofficecfg_Math_Menubar_Xml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Config_Sofficecfg_Smath_Menubar;
-    Name = "/uiconfig/smath/menubar/menubar.xml";
-End
-*/
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
deleted file mode 100644
index 2decfb208..000000000
--- a/scp2/source/math/folderitem_math.scp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-FolderItem gid_Folderitem_Smath
-    Name = "%PRODUCTNAME Math";
-    ModuleID = gid_Module_Prg_Math_Bin;
-    FolderID = gid_Folder_Staroffice51;
-    FileID = gid_File_Exe_Smath;
-    IconFile = gid_File_Exe_Smath;
-    IconID = 0;
-    WkDir = gid_Dir_Program;
-    Parameter = "";
-    Styles = (NOWEB, NON_ADVERTISED);
-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
-End
diff --git a/scp2/source/math/folderitem_math.ulf b/scp2/source/math/folderitem_math.ulf
deleted file mode 100644
index 4458d7115..000000000
--- a/scp2/source/math/folderitem_math.ulf
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_FI_TOOLTIP_MATH]
-en-US = "Create and edit scientific formulas and equations by using Math."
-
-
diff --git a/scp2/source/math/makefile.mk b/scp2/source/math/makefile.mk
deleted file mode 100644
index b622097ee..000000000
--- a/scp2/source/math/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=math
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-PARFILES= \
-        module_math.par              \
-        file_math.par 
-
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_math.par        \
-        folderitem_math.par
-.ENDIF
-
-ULFFILES= \
-        module_math.ulf              \
-        folderitem_math.ulf          \
-        registryitem_math.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
deleted file mode 100644
index 960c3203b..000000000
--- a/scp2/source/math/module_math.scp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Prg_Math
-    MOD_NAME_DESC ( MODULE_PRG_MATH );
-    ParentID = gid_Module_Prg;
-    Sortkey = "600";
-    Styles =(APPLICATIONMODULE);
-End
-
-Module gid_Module_Prg_Math_Bin
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_PRG_MATH_BIN );
-    ParentID = gid_Module_Prg_Math;
-    Sortkey = "100";
-    Minimal = YES;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Html_W3c_Ipr,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
-    gid_File_Share_Registry_Math_Xcd,
-    gid_File_Tmp_Userinstall_Math_Inf);
-End
-
-Module gid_Module_Brand_Prg_Math
-    PackageInfo = "packinfo_brand.txt";
-    Name = "gid_Module_Brand_Prg_Math";
-    Description = "gid_Module_Brand_Prg_Math";
-    ParentID = gid_Module_Prg_Math;
-    Sortkey = "100";
-    InstallOrder = "1040";
-    Minimal = YES;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Exe_Smath);
-End
-
-Module gid_Module_Langpack_Math_Template
-    ParentID = gid_Module_Prg_Math_Bin;
-    Name = "gid_Module_Langpack_Math_Template";
-    Description = "gid_Module_Langpack_Math_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_Sm);
-End
-
-#include "alllangmodules_math.inc"
diff --git a/scp2/source/math/module_math.ulf b/scp2/source/math/module_math.ulf
deleted file mode 100644
index 25fd59018..000000000
--- a/scp2/source/math/module_math.ulf
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_PRG_MATH]
-en-US = "%PRODUCTNAME Math"
-
-[STR_DESC_MODULE_PRG_MATH]
-en-US = "Create and edit scientific formulas and equations by using %PRODUCTNAME Math."
-
-[STR_NAME_MODULE_PRG_MATH_BIN]
-en-US = "Program Module"
-
-[STR_DESC_MODULE_PRG_MATH_BIN]
-en-US = "The application %PRODUCTNAME Math"
-
-[STR_NAME_MODULE_PRG_MATH_HELP]
-en-US = "%PRODUCTNAME Math Help"
-
-[STR_DESC_MODULE_PRG_MATH_HELP]
-en-US = "Help about %PRODUCTNAME Math"
-
-
-
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
deleted file mode 100644
index b58e15e52..000000000
--- a/scp2/source/math/registryitem_math.scp
+++ /dev/null
@@ -1,691 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "macros.inc"
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-// MSOLE embedded object in SO7 file format
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}";
-    REG_VALUE_LNG(SO60_FORMULA)
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Auxusertype_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\AuxUserType\2";
-    Value = "%PRODUCTNAME";
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Auxusertype_3
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\AuxUserType\3";
-    REG_VALUE_LNG(SO60_FORMULA)
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Dataformats_Getset_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\DataFormats\GetSet\0";
-    Value = "Embed Source,1,8,1";
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Dataformats_Getset_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\DataFormats\GetSet\1";
-    Value = "3,1,32,1";
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Dataformats_Getset_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\DataFormats\GetSet\2";
-    Value = "2,1,16,1";
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Inprochandler32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\Insertable";
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Localserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\LocalServer32";
-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Miscstatus
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\MiscStatus";
-    Value = "16";
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Progid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\ProgID";
-    Value = "soffice.StarMathDocument.6";
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Programmable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\Programmable";
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\verb\0";
-    Value = "&Edit,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\verb\-1";
-    Value = "Show,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\verb\-2";
-    Value = "Open,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Versionindependentprogid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\VersionIndependentProgID";
-    Value = "soffice.StarMathDocument.6";
-End
-
-// MSOLE embedded object in SO7 file format
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}";
-    REG_VALUE_LNG(OO_FORMULA)
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Auxusertype_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\AuxUserType\2";
-    Value = "%PRODUCTNAME";
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Auxusertype_3
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\AuxUserType\3";
-    REG_VALUE_LNG(OO_FORMULA)
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Dataformats_Getset_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\DataFormats\GetSet\0";
-    Value = "Embed Source,1,8,1";
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Dataformats_Getset_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\DataFormats\GetSet\1";
-    Value = "3,1,32,1";
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Dataformats_Getset_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\DataFormats\GetSet\2";
-    Value = "2,1,16,1";
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Inprochandler32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\Insertable";
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Localserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\LocalServer32";
-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Miscstatus
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\MiscStatus";
-    Value = "16";
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Progid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\ProgID";
-    Value = "opendocument.MathDocument.1";
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Programmable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\Programmable";
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\verb\0";
-    Value = "&Edit,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\verb\-1";
-    Value = "Show,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\verb\-2";
-    Value = "Open,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Versionindependentprogid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\VersionIndependentProgID";
-    Value = "opendocument.MathDocument.1";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6";
-    REG_VALUE_LNG(SO60_FORMULA)
-End
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Clsid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\CLSID";
-    Value = "{D0484DE6-AAEE-468a-991F-8D4B0737B57A}";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,38";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\Insertable";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Protocol_Stdfileediting_Server
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\protocol\StdFileEditing\server";
-    Value = "<progpath>\program\soffice.exe";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Protocol_Stdfileediting_Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\protocol\StdFileEditing\verb\0";
-    Value = "&Edit";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Protocol_Stdfileediting_Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\protocol\StdFileEditing\verb\-1";
-    Value = "&Show";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Protocol_Stdfileediting_Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\protocol\StdFileEditing\verb\-2";
-    Value = "&Open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\smath.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarMathDocument\CurVer";
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Value = "soffice.StarMathDocument.6";
-End
-
-RegistryItem gid_Regitem_Sxm_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = ".sxm\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Sxm_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = ".sxm\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Sxm_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = ".sxm\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_StarMathDocument_6_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "soffice.StarMathDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Sxm_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = ".sxm";
-    Name = "Content Type";
-    Value = "application/vnd.sun.xml.math";
-End
-
-RegistryItem gid_Regitem_Sxm_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.math";
-    Name = "Extension";
-    Value = ".sxm";
-End
-
-RegistryItem gid_Regitem__Mml
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = ".sxm";
-    Value = "soffice.StarMathDocument.6";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxm
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Name = ".sxm";
-    Value = "soffice.StarMathDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_sxm_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "soffice.StarMathDocument.6";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-// new odf file extension
-
-RegistryItem gid_Regitem_Odf_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = ".odf\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Odf_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = ".odf\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Odf_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = ".odf\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_MathDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Odf_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = ".odf";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.formula";
-End
-
-RegistryItem gid_Regitem_Odf_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.formula";
-    Name = "Extension";
-    Value = ".odf";
-End
-
-RegistryItem gid_Regitem__Odf
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = ".odf";
-    Value = "opendocument.MathDocument.1";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odf
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Name = ".odf";
-    Value = "opendocument.MathDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odf
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Name = "application/vnd.oasis.opendocument.formula";
-    Value = "opendocument.MathDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.MathDocument\CurVer";
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Value = "opendocument.MathDocument.1";
-End
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1";
-    REG_VALUE_LNG(OO_FORMULA)
-End
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Clsid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\CLSID";
-    Value = "{D2D59CD1-0A6A-4D36-AE20-47817077D57C}";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,14";
-End
-
-RegistryItem gid_Regitem_odf_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.MathDocument.1";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\Insertable";
-End
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Protocol_Stdfileediting_Server
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\protocol\StdFileEditing\server";
-    Value = "<progpath>\program\soffice.exe";
-End
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Protocol_Stdfileediting_Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\protocol\StdFileEditing\verb\0";
-    Value = "&Edit";
-End
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Protocol_Stdfileediting_Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\protocol\StdFileEditing\verb\-1";
-    Value = "&Show";
-End
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Protocol_Stdfileediting_Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\protocol\StdFileEditing\verb\-2";
-    Value = "&Open";
-End
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shell\open\command";
-    Value = "\"<progpath>\program\smath.exe\" -o \"%1\"";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Subkey = "opendocument.MathDocument.1\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-// "OpenWith" Windows Registry keys for extensions supported by Math
-
-// .ODF
-RegistryItem gid_Regitem_OpenOffice_ODF_OpenWith_Math
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".odf\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Name = "opendocument.MathDocument.1";
-    Value = " ";
-End
-
-// .SXM
-RegistryItem gid_Regitem_OpenOffice_SXM_OpenWith_Math
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sxm\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Name = "soffice.StarMathDocument.6";
-    Value = " ";
-End
-
-// .MML
-RegistryItem gid_Regitem_OpenOffice_MML_OpenWith_Math
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".mml\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Name = "soffice.StarMathDocument.6";
-    Value = " ";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Mml
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Name = ".mml";
-    Value = "soffice.StarMathDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Smath_Exe
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\smath.exe";
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Value = "<progpath>\program\smath.exe";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Smath_Exepath
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\smath.exe";
-    ModuleID = gid_Module_Prg_Math_Bin;
-    Name = "Path";
-    Value = "<progpath>";
-End
-
-// registering the property handler for the supported file types
-
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odf )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxm )
diff --git a/scp2/source/math/registryitem_math.ulf b/scp2/source/math/registryitem_math.ulf
deleted file mode 100644
index c7cfb663f..000000000
--- a/scp2/source/math/registryitem_math.ulf
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_REG_VAL_NEW]
-en-US = "&New"
-
-[STR_REG_VAL_SO60_FORMULA]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Formula"
-
-[STR_REG_VAL_OO_FORMULA]
-en-US = "OpenDocument Formula"
-de = "OpenDocument Formel"
diff --git a/scp2/source/mkopenwith.btm b/scp2/source/mkopenwith.btm
deleted file mode 100755
index 0c09f3b5e..000000000
--- a/scp2/source/mkopenwith.btm
+++ /dev/null
@@ -1,52 +0,0 @@
-@ECHO OFF
-IF '%1'==' GOTO End
-IF NOT EXIST %1\. GOTO Module_Error
-
-SET OUTPUT=%1\OpenWith.SCP
-
-SET FILE=%@FILEOPEN[supported_extensions.txt,read,t]
-
-ECHO // "OpenWith" Windows Registry keys for extensions supported by %1		> %OUTPUT%
-ECHO.																		>> %OUTPUT%
-
-:While_Read_File
-SET LINE=%@FILEREAD[%FILE%]
-IF '%LINE%'=='' GOTO While_Read_File
-IF '%@LEFT[1,%LINE%]'==';' GOTO While_Read_File
-IF '%LINE%'=='**EOF**' GOTO End_Read_File
-
-IF NOT '%@LEFT[1,%LINE%]'=='[' GOTO Register_Extension
-
-SET MODULE=%@UPPER[%@WORD["[]",0,%LINE%]]
-GOTO While_Read_File
-
-:Register_Extension
-IF NOT '%MODULE%'=='%@UPPER[%1]' GOTO While_Read_File
-
-ECHO // .%LINE%													>> %OUTPUT%
-ECHO RegistryItem gid_Regitem_OpenOffice_%LINE%_OpenWith_%1		>> %OUTPUT%
-ECHO     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;				>> %OUTPUT%
-ECHO     Subkey = ".%LINE%\OpenWithProgIDs";					>> %OUTPUT%
-ECHO     ModuleID = gid_Module_Prg_%1_Bin;						>> %OUTPUT%
-ECHO     Name = "opendocument.%1Document.1";					>> %OUTPUT%
-ECHO     Value = "%PRODUCTNAME %PRODUCTVERSION";				>> %OUTPUT%
-ECHO End														>> %OUTPUT%
-ECHO.															>> %OUTPUT%
-
-REM GOTO End_Read_File
-GOTO While_Read_File
-
-:End_Read_File
-SET ERROR=%@FILECLOSE[%FILE%]
-GOTO End
-
-:Help
-ECHO Usage:		%0 Module
-ECHO Example:	%0 Calc
-GOTO End
-
-:Module_Error
-ECHO Module %1 not found !
-GOTO End
-
-:End
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
deleted file mode 100644
index 2a7ddd376..000000000
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
-
-File gid_File_Share_Registry_Onlineupdate_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "onlineupdate.xcd";
-End
-
-#if defined LINUX || defined SOLARIS
-File gid_File_Bin_UnpackUpdate
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "unpack_update";
-    Styles = (PACKED);
-End
-#endif
diff --git a/scp2/source/onlineupdate/makefile.mk b/scp2/source/onlineupdate/makefile.mk
deleted file mode 100644
index 4b3ce9304..000000000
--- a/scp2/source/onlineupdate/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=update
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_onlineupdate.par        \
-        file_onlineupdate.par
-
-ULFFILES= \
-        module_onlineupdate.ulf
-
-# --- File ---------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp
deleted file mode 100644
index 668545077..000000000
--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Onlineupdate
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC(MODULE_OPT_ONLINEUPDATE);
-    Sortkey = "800";
-    ParentID = gid_Module_Optional;
-    Default = YES;
-    Styles = (DONTSHOWINUSERINSTALL);
-    Files = (gid_File_Lib_Updchk, gid_File_Share_Registry_Onlineupdate_Xcd, gid_File_Bin_UnpackUpdate);
-End
diff --git a/scp2/source/onlineupdate/module_onlineupdate.ulf b/scp2/source/onlineupdate/module_onlineupdate.ulf
deleted file mode 100644
index be6d799de..000000000
--- a/scp2/source/onlineupdate/module_onlineupdate.ulf
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPT_ONLINEUPDATE]
-en-US = "Online Update"
-
-[STR_DESC_MODULE_OPT_ONLINEUPDATE]
-en-US = "Get automatically notified when a new update of %PRODUCTNAME becomes available." 
-
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
deleted file mode 100644
index 6809f7422..000000000
--- a/scp2/source/ooo/common_brand.scp
+++ /dev/null
@@ -1,1484 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Root_Brand
-    ParentID = gid_Module_Root;
-    InstallOrder = "150";
-    Name = "ooobrand";
-    Description = "OOo Brand";
-    Sortkey = "1030";
-    Default = YES;
-    Styles = (HIDDEN_ROOT,ROOT_BRAND_PACKAGE,ISUPDATEPACKAGE);
-    PackageInfo = "packinfo_brand.txt";
-    Dirs = (gid_Brand_Dir_Program,
-            gid_Brand_Dir_Share,
-            gid_Brand_Dir_Share_C05,
-            gid_Brand_Dir_Share_C05_Rgt,
-            gid_Brand_Dir_Share_C05_Faq,
-            gid_Brand_Dir_Share_Config,
-            gid_Brand_Dir_Share_Extension,
-            gid_Brand_Dir_Share_Extensions,            
-            gid_Brand_Dir_Share_Prereg,    
-            gid_Brand_Dir_Share_Uno_Packages,
-            gid_Brand_Dir_Share_Uno_Packages_Cache,
-            gid_Brand_Dir_Share_Registry,
-            gid_Brand_Dir_Share_Xdg);
-    Files = (gid_Brand_File_BasisLink,
-             gid_Brand_File_Bin_Crashreport,
-             gid_Brand_File_Bin_Crashreport_Script,
-             gid_Brand_File_Bin_Crashreport_Com,
-             gid_Brand_File_Bin_Python,
-             gid_Brand_File_Gdb_Trace,
-             gid_Brand_File_Bin_Soffice,
-             gid_Brand_File_Bin_Soffice_Bin,
-             gid_Brand_File_Bin_Soffice_Bin_Manifest,
-             gid_Brand_File_Bin_Spadmin,
-             gid_Brand_File_Bin_Unoinfo,
-             gid_Brand_File_Bin_Unopkgcom,
-             gid_Brand_File_Bin_Unopkgexe,
-             gid_Brand_File_Bin_Unopkg,
-             gid_Brand_File_Bin_Libxml2,
-             gid_Brand_File_Bmp_Shell,
-             gid_Brand_File_Bmp_IntroAbout,
-             gid_Brand_File_C05_Zip_Faq,
-             gid_Brand_File_C05_Zip_Register,
-             gid_Brand_File_C05_Htm_Faq,
-             gid_Brand_File_C05_Htm_Rgt,
-             gid_Brand_File_C05_Pdf_Gettingstartedguide,
-             gid_Brand_File_C05_Exe_Suptool,
-             gid_Brand_File_Desktophelper_Txt,
-             gid_Brand_File_Html_Thirdpartylicensereadme,
-             gid_Brand_File_Images_Brand_Zip,
-             gid_Brand_File_Lib_Dbghelp,
-             gid_Brand_File_Lib_Mingw_GccS,
-             gid_Brand_File_Lib_Mingw_Stdcpp,
-             gid_Brand_File_Lib_Mingwm10,
-             gid_Brand_File_Lib_Msvcr80,
-             gid_Brand_File_Lib_Msvcp80,
-             gid_Brand_File_Lib_Msvcm80,
-			 gid_Brand_File_Lib_Oirm,
-			 gid_Brand_File_Lib_Oirm2,
-             gid_Brand_File_Msvcm80crt_Manifest,
-             gid_Brand_File_Lib_Npsoplugin,
-             gid_Brand_File_Lib_Subscrib_C05,
-             gid_Brand_File_ServicesRdb,
-             gid_Brand_File_Share_Registry_Brand_Xcd,
-             gid_Brand_File_Share_Registry_O5oo_Xcd,
-             gid_Brand_File_Script_Unopkg,
-             gid_Brand_File_Share_Xdg_Base,
-             gid_Brand_File_Share_Xdg_Calc,
-             gid_Brand_File_Share_Xdg_Draw,
-             gid_Brand_File_Share_Xdg_Extension,
-             gid_Brand_File_Share_Xdg_Impress,
-             gid_Brand_File_Share_Xdg_JavaFilter,
-             gid_Brand_File_Share_Xdg_Math,
-             gid_Brand_File_Share_Xdg_Printeradmin,
-             gid_Brand_File_Share_Xdg_QStart,
-             gid_Brand_File_Share_Xdg_StartCenter,
-             gid_Brand_File_Share_Xdg_Writer,
-             gid_Brand_File_Txt_Package,
-	     gid_License_Txt,
-	     git_License_Odt,
-	     gid_Credits_Odt);
-    Unixlinks = (gid_Brand_Unixlink_BasisLink,
-                 gid_Brand_Unixlink_Program,
-                 gid_Brand_Unixlink_Unopkg,
-                 gid_Brand_Unixlink_Urelibs);
-End
-
-// Language specific brand module
-
-Module gid_Module_Langpack_Brand_Template
-    ParentID = gid_Module_Langpack_Languageroot;
-    Name = "gid_Module_Langpack_Brand_Template";
-    Description = "gid_Module_Langpack_Brand_Template";
-    Styles = (TEMPLATEMODULE);
-    InstallOrder = "1050";
-    Dirs = (gid_Brand_Dir_Program,
-            gid_Brand_Dir_Program_Shell,
-            gid_Brand_Dir_Program_Resource,
-            gid_Brand_Dir_Readme);
-    Files = (gid_Brand_File_Res_Iso,
-             gid_Brand_File_Res_Ooo,
-             gid_Brand_File_Res_Oirm,
-             gid_Brand_File_Help_C05_Sdatabase_Zip,
-             gid_Brand_File_Help_C05_Scalc_Zip,
-             gid_Brand_File_Help_C05_Sdraw_Zip,
-             gid_Brand_File_Help_C05_Swriter_Zip,
-             gid_Brand_File_Readme_Readme,
-             gid_Brand_File_Share_Registry_Cjk_Xcd,
-             gid_Brand_File_Share_Registry_Korea_Xcd,
-             gid_Brand_File_Txt_Readme);
-End
-
-// Directories
-
-Directory gid_Brand_Dir_Program
-#if defined MACOSX
-    ParentID = gid_Dir_Bundle_Contents;
-    DosName = "MacOS";
-#else
-    ParentID = gid_Dir_Brand_Root;
-    DosName = "program";
-#endif
-End
-
-Directory gid_Brand_Dir_Program_Resource
-    ParentID = gid_Brand_Dir_Program;
-    DosName = "resource";
-End
-
-Directory gid_Brand_Dir_Program_Shell
-    ParentID = gid_Brand_Dir_Program;
-    DosName = "shell";
-End
-
-Directory gid_Brand_Dir_Readme
-#if defined MACOSX
-    ParentID = gid_Brand_Dir_BasisLink;
-#else
-    ParentID = gid_Dir_Brand_Root;
-#endif
-    DosName = "readmes";
-End
-
-Directory gid_Brand_Dir_Help
-#if defined MACOSX
-    ParentID = gid_Dir_Bundle_Contents;
-#else
-    ParentID = gid_Dir_Brand_Root;
-#endif
-    DosName = "help";
-End
-
-Directory gid_Brand_Dir_Help_Isolanguage
-    ParentID = gid_Brand_Dir_Help;
-    DIR_ISOLANGUAGE_ALL_LANG;
-End
-
-Directory gid_Brand_Dir_Share
-#if defined MACOSX
-    ParentID = gid_Dir_Bundle_Contents;
-#else
-    ParentID = gid_Dir_Brand_Root;
-#endif
-    DosName = "share";
-End
-
-Directory gid_Brand_Dir_Share_Config
-    ParentID = gid_Brand_Dir_Share;
-    DosName = "config";
-End
-
-Directory gid_Brand_Dir_Share_Extension
-    ParentID = gid_Brand_Dir_Share;
-    DosName = "extension";
-End
-
-Directory gid_Brand_Dir_Share_Extensions
-    ParentID = gid_Brand_Dir_Share;
-    DosName = "extensions";
-End
-
-Directory gid_Brand_Dir_Share_Prereg
-    ParentID = gid_Brand_Dir_Share;
-    DosName = "prereg";
-    Styles = (CREATE);
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Install
-    ParentID = gid_Brand_Dir_Share_Extension;
-    DosName = "install";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Af
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-af";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Br
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-br";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Ca
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-ca";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Cs
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-cs";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Da
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-da";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_De_At
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-de-AT";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_De_Ch
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-de-CH";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_De_De
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-de-DE";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_En
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-en";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Es
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-es";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Et
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-et";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Fr
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-fr";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Gl
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-gl";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_He
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-he";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Hu
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-hu";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Hr
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-hr";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_It
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-it";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-ku-TR";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Lt
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-lt";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Ne
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-ne";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Nl
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-nl";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_No
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-no";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Oc
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-oc";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Pl
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-pl";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Pt
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-pt";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Ro
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-ro";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Ru
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-ru";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Sk
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-sk";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Sl
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-sl";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Sr
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-sr";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Sv
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-sv";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Sw
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-sw";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Th
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-th";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Uk
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-uk";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Vi
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-vi";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Zu
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-zu";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Oooimprovement
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "OOoImprovement";
-End
-
-Directory gid_Brand_Dir_Share_Uno_Packages
-    ParentID = gid_Brand_Dir_Share;
-    DosName = "uno_packages";
-    Styles = (CREATE);
-End
-
-Directory gid_Brand_Dir_Share_Uno_Packages_Cache
-    ParentID = gid_Brand_Dir_Share_Uno_Packages;
-    DosName = "cache";
-    Styles = (CREATE);
-End
-
-Directory gid_Brand_Dir_Share_Registry
-    ParentID = gid_Brand_Dir_Share;
-    DosName = "registry";
-End
-
-#if defined UNX && ! defined MACOSX
-Directory gid_Brand_Dir_Share_Xdg
-    ParentID = gid_Brand_Dir_Share;
-    DosName = "xdg";
-End
-#endif
-
-// Link to basis
-
-#if defined WNT
-File gid_Brand_File_BasisLink
-   TXT_FILE_BODY;
-   Dir = gid_Dir_Brand_Root;
-   Name = "basis-link";
-   Styles = (PACKED);
-End
-#elif defined MACOSX
-Directory gid_Brand_Dir_BasisLink
-    ParentID = gid_Dir_Bundle_Contents;
-    DosName = "basis-link";
-End
-#else
-Unixlink gid_Brand_Unixlink_BasisLink
-    BIN_FILE_BODY;
-    Styles = ();
-    // Styles = (LAYERLINK);
-    Name = "basis-link";
-    Dir = gid_Dir_Brand_Root;
-    Target = "basis${OOOBASEVERSION}";
-End
-#endif
-
-// UnixLinks
-
-#if defined MACOSX
-Unixlink gid_Brand_Unixlink_Urelibs
-    Dir = gid_Brand_Dir_Program;
-    Name = "urelibs";
-    Target = "../basis-link/ure-link/lib";
-End
-#endif
-
-#if defined MACOSX
-Unixlink gid_Brand_Unixlink_Program
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Bundle_Contents;
-    Name = "program";
-    Target = "MacOS";
-    Styles = ();
-End
-#endif
-
-// Files
-
-File gid_Brand_File_Html_Thirdpartylicensereadme
-    Name = "THIRDPARTYLICENSEREADME.html";
-#ifdef MACOSX
-    Dir = gid_Brand_Dir_BasisLink;
-#else
-    Dir = gid_Dir_Brand_Root;
-#endif
-    Styles = (WORKSTATION);
-    TXT_FILE_BODY;
-End
-
-#if defined UNX
-
-File gid_Brand_File_Gdb_Trace
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = gdbtrace;
-    Styles = (PACKED);
-End
-
-#endif
-
-File gid_Brand_File_Bin_Soffice
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(soffice);
-  #ifdef WNT
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
-    Styles = (PACKED);
-  #endif
-End
-
-#if defined(UNX) && !defined(QUARTZ)
-File gid_Brand_File_Bin_Spadmin
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "spadmin";
-    Styles = (PACKED);
-End
-#endif
-
-File gid_Brand_File_Bin_Soffice_Bin
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-#if defined WNT
-    Styles = (PACKED, PATCH_SO_NAME);
-#else
-    Styles = (PACKED);
-#endif
-    Name = "soffice.bin";
-End
-
-#if defined UNX && ! defined MACOSX
-
-File gid_File_Bin_QStart_Bin
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED, PATCH);
-    Name = "oosplash.bin";
-End
-
-#endif
-
-// use this for high detail file open dialog >= 5.1 windows
-#ifdef WNT
-File gid_Brand_File_Bin_Soffice_Bin_Manifest
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-    Name = "soffice.bin.manifest";
-End
-#endif
-
-#ifdef WNT
-File gid_Brand_File_Desktophelper_Txt
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-    Name = "desktophelper.txt";
-    ComponentCondition = "CREATEDESKTOPLINK=1";
-End
-#endif
-
-File gid_Brand_File_Bin_Unoinfo
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(unoinfo);
-    Styles = (PACKED);
-End
-
-#ifdef WNT
-File gid_Brand_File_Bin_Unopkgcom
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "unopkg.com";
-End
-#endif
-
-#ifdef WNT
-File gid_Brand_File_Bin_Unopkgexe
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "unopkg.exe";
-End
-#endif
-
-#if defined UNX && !defined MACOSX
-File gid_Brand_File_Script_Unopkg
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "unopkg";
-End
-#endif
-
-#if defined MACOSX
-Unixlink gid_Brand_Unixlink_Unopkg
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "unopkg";
-    Target = "unopkg.bin";
-    Styles = ();
-End
-#endif
-
-File gid_Brand_File_Bin_Unopkg
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "unopkg.bin";
-End
-
-// Due to Windows DLL search order, OOo executables might pick up a libxml2 DLL
-// from a Windows system directory instead of the one from the URE; to avoid
-// problems, as a HACK, for now a copy of the URE libxml2 DLL is placed next to
-// the OOo executables (where it takes precedence even over DLLs from the
-// Windows system directory):
-#if defined WNT && !defined SYSTEM_LIBXML
-File gid_Brand_File_Bin_Libxml2
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-#if defined _gcc3
-    Name = SCP2_URE_DL_NORMAL("libxml2-2");
-#else
-    Name = SCP2_URE_DL_NORMAL("libxml2");
-#endif
-    Styles = (PACKED);
-End
-#endif
-
-#if !defined WITHOUT_MOZILLA && (!defined UNX || defined ENABLE_GTK)
-File gid_Brand_File_Lib_Npsoplugin
-    BIN_FILE_BODY;
-    Name = SPECIAL_NAME(npsoplugin);
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-End
-#endif
-
-File gid_Brand_File_Bmp_IntroAbout
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "intro.zip";
-    Styles = (ARCHIVE);
-End
-
-File gid_Brand_File_Images_Brand_Zip
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Config;
-    Name = "images_brand.zip";
-    Styles = (PACKED);
-End
-
-File gid_Brand_File_Bmp_Shell
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program_Shell;
-    Name = "shell.zip";
-    Styles = (ARCHIVE);
-End
-
-File gid_Brand_File_Txt_Package
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Extensions;
-    Name = "package.txt";
-    Styles = (PACKED);
-End
-
-File gid_Brand_File_Share_Registry_Brand_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Brand_Dir_Share_Registry;
-    Name = "brand.xcd";
-End
-
-File gid_Brand_File_Share_Registry_Cjk_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED,MAKE_LANG_SPECIFIC);
-    Dir = gid_Brand_Dir_Share_Registry;
-    Name (ja) = "cjk.xcd";
-    Name (ko) = "cjk.xcd";
-    Name (zh-CN) = "cjk.xcd";
-    Name (zh-TW) = "cjk.xcd";
-End
-
-File gid_Brand_File_Share_Registry_Korea_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Share_Registry;
-    Name (ko) = "korea.xcd";
-End
-
-#if defined UNX && ! defined MACOSX
-File gid_Brand_File_Share_Xdg_Base
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Styles = (PACKED,SCPZIP_REPLACE);
-    Name = "base.desktop";
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
-File gid_Brand_File_Share_Xdg_Calc
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Name = "calc.desktop";
-    Styles = (PACKED,SCPZIP_REPLACE);
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
-File gid_Brand_File_Share_Xdg_Draw
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Name = "draw.desktop";
-    Styles = (PACKED,SCPZIP_REPLACE);
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
-File gid_Brand_File_Share_Xdg_Impress
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Name = "impress.desktop";
-    Styles = (PACKED,SCPZIP_REPLACE);
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
-File gid_Brand_File_Share_Xdg_Math
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Name = "math.desktop";
-    Styles = (PACKED,SCPZIP_REPLACE);
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
-File gid_Brand_File_Share_Xdg_Printeradmin
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Styles = (PACKED,SCPZIP_REPLACE);
-    Name = "printeradmin.desktop";
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
-#ifdef ENABLE_GTK
-File gid_Brand_File_Share_Xdg_QStart
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Styles = (PACKED,SCPZIP_REPLACE);
-    Name = "qstart.desktop";
-End
-#endif
-#endif
-
-#if defined UNX && ! defined MACOSX
-File gid_Brand_File_Share_Xdg_Writer
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Name = "writer.desktop";
-    Styles = (PACKED,SCPZIP_REPLACE);
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
-File gid_Brand_File_Share_Xdg_StartCenter
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Name = "startcenter.desktop";
-    Styles = (PACKED,SCPZIP_REPLACE);
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
-File gid_Brand_File_Share_Xdg_JavaFilter
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Name = "javafilter.desktop";
-    Styles = (PACKED,SCPZIP_REPLACE);
-End
-#endif
-
-
-#if defined WNT && defined(_gcc3)
-File gid_Brand_File_Lib_Mingwm10
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-    Name = "mingwm10.dll";
-End
-#endif
-
-#if defined(WNT) && defined( _gcc3 )
-
-#if defined(MINGW_GCCDLL)
-
-File gid_Brand_File_Lib_Mingw_GccS
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = MINGW_GCCDLL;
-    Styles = (PACKED);
-End
-
-#endif
-
-#if defined(MINGW_GXXDLL)
-
-File gid_Brand_File_Lib_Mingw_Stdcpp
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = MINGW_GXXDLL;
-    Styles = (PACKED);
-End
-
-#endif
-
-#endif
-
-// Profiles
-
-Profile gid_Brand_Profile_Bootstrap_Ini
-    ModuleID = gid_Module_Root_Brand;
-    Name = PROFILENAME(bootstrap);
-    Dir = gid_Brand_Dir_Program;
-    Styles = (NETWORK);
-End
-
-Profile gid_Brand_Profile_Soffice_Ini
-    ModuleID = gid_Module_Root_Brand;
-    Name = PROFILENAME(soffice);
-    Dir = gid_Brand_Dir_Program;
-    Styles = (NETWORK);
-End
-
-Profile gid_Brand_Profile_Setup_Ini
-    ModuleID = gid_Module_Root_Brand;
-    Name = PROFILENAME(setup);
-    Dir = gid_Brand_Dir_Program;
-    Styles = (NETWORK);
-End
-
-Profile gid_Brand_Profile_Version_Ini
-    ModuleID = gid_Module_Root_Brand;
-    Name = PROFILENAME(version);
-    Dir = gid_Brand_Dir_Program;
-    Styles = (NETWORK);
-End
-
-Profile gid_Brand_Profile_Fundamental_Ini
-    ModuleID = gid_Module_Root_Brand;
-    Name = PROFILENAME(fundamental);
-    Dir = gid_Brand_Dir_Program;
-End
-
-#if !defined MACOSX
-Profile gid_Brand_Profile_Redirect_Ini
-    ModuleID = gid_Module_Root_Brand;
-    Name = PROFILENAME(redirect);
-    Dir = gid_Brand_Dir_Program;
-End
-#endif
-
-// ProfileItems
-
-ProfileItem gid_Brand_Profileitem_Bootstrap_Baseinstall
-    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 2;
-    Key = "BaseInstallation";
-    Value = "${OOO_BASE_DIR}";
-End
-
-ProfileItem gid_Brand_Profileitem_Bootstrap_Productkey
-    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "ProductKey";
-    Value = "<productkey>";
-End
-
-ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Port
-    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "ErrorReport";
-    Order = 7;
-    Key = "ErrorReportPort";
-    Value = "80";
-End
-
-ProfileItem gid_Brand_Profileitem_Bootstrap_Installmode
-    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 5;
-    Key = "InstallMode";
-    Value = "<installmode>";
-End
-
-ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
-    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 3;
-    Key = "UserInstallation";
-  #ifdef WNT
-    Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
-  #elif defined MACOSX
-    Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
-  #else
-    Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
-  #endif
-End
-
-ProfileItem gid_Brand_Profileitem_Soffice_UreBootstrap
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Soffice_Ini;
-    Section = "Bootstrap";
-    Key = "URE_BOOTSTRAP";
-    Value = "${ORIGIN}/" PROFILENAME(fundamental);
-End
-
-ProfileItem gid_Brand_Profileitem_Soffice_Logo
-    ProfileID = gid_Brand_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "Logo";
-    Value = "1";
-End
-
-ProfileItem gid_Brand_Profileitem_Soffice_ProgressBarColor_So
-    ProfileID = gid_Brand_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 2;
-    Key = "ProgressBarColor";
-    Value = "${PROGRESSBARCOLOR}";
-End
-
-ProfileItem gid_Brand_Profileitem_Soffice_ProgressSize_So
-    ProfileID = gid_Brand_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 3;
-    Key = "ProgressSize";
-    Value = "${PROGRESSSIZE}";
-End
-
-ProfileItem gid_Brand_Profileitem_Soffice_ProgressPosition_So
-    ProfileID = gid_Brand_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 4;
-    Key = "ProgressPosition";
-    Value = "${PROGRESSPOSITION}";
-End
-
-ProfileItem gid_Brand_Profileitem_Soffice_ProgressFrameColor_So
-    ProfileID = gid_Brand_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 5;
-    Key = "ProgressFrameColor";
-    Value = "${PROGRESSFRAMECOLOR}";
-End
-
-ProfileItem gid_Brand_Profileitem_Soffice_NativeProgress_So
-    ProfileID = gid_Brand_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 6;
-    Key = "NativeProgress";
-    Value = "${NATIVEPROGRESS}";
-End
-
-ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
-    ProfileID = gid_Brand_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 7;
-    Key = "HideEula";
-    Value = "1";
-End
-
-#ifdef WNT
-ProfileItem gid_Brand_Profileitem_Soffice_Startlang
-    ProfileID = gid_Brand_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 8;
-    Key = "STARTLANG";
-    Value = "[STARTLANG]";
-    Inifiletablekey = "STARTLANG";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
-End
-#endif
-
-ProfileItem gid_Brand_Profileitem_Version_Buildid
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 4;
-    Key = "buildid";
-    Value = "<buildid>";
-End
-
-ProfileItem gid_Brand_Profileitem_Version_Productsource
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 7;
-    Key = "ProductSource";
-    Value = "<sourceid>";
-End
-
-#ifdef WNT
-
-ProfileItem gid_Brand_Profileitem_Version_Productcode
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 8;
-    Key = "ProductCode";
-    Value = "<productcode>";
-End
-
-#endif
-
-#ifdef WNT
-
-ProfileItem gid_Brand_Profileitem_Version_Upgradecode
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 9;
-    Key = "UpgradeCode";
-    Value = "<upgradecode>";
-End
-
-#endif
-
-ProfileItem gid_Brand_Profileitem_Version_Productmajor
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 10;
-    Key = "ProductMajor";
-    Value = "<productmajor>";
-End
-
-ProfileItem gid_Brand_Profileitem_Version_Productminor
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 11;
-    Key = "ProductMinor";
-    Value = "<productminor>";
-End
-
-ProfileItem gid_Brand_Profileitem_Version_Productbuildid
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 12;
-    Key = "ProductBuildid";
-    Value = "<productbuildid>";
-End
-
-ProfileItem gid_Brand_Profileitem_Version_Alllanguages
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 13;
-    Key = "AllLanguages";
-    Value = "<alllanguages>";
-End
-
-#ifdef WNT
-
-ProfileItem gid_Brand_Profileitem_Version_Msiproductversion
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 14;
-    Key = "MsiProductVersion";
-    Value = "<msiproductversion>";
-End
-
-#endif
-
-ProfileItem gid_Brand_Profileitem_Version_Updateurl
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 15;
-    Key = "UpdateURL";
-  #if defined(ENABLE_ONLINE_UPDATE)
-  #ifdef WNT
-    Value = "${UPDATEURL}";
-  #else  // defined WNT
-    Value = "${UPDATEURL}?pkgfmt=<pkgformat>";
-  #endif //defined WNT
-  #else
-    Value = "";
-  #endif
-End
-
-ProfileItem gid_Brand_Profileitem_Version_Updateid
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 16;
-    Key = "UpdateID";
-    Value = "<updateid>";
-End
-
-ProfileItem gid_Brand_Profileitem_Version_Useragent
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 17;
-    Key = "UpdateUserAgent";
-    Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH}; BundledLanguages=${AllLanguages})";
-End
-
-ProfileItem gid_Brand_Profileitem_Version_Vendor
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 16;
-    Key = "Vendor";
-    Value = "<vendor>";
-End
-
-ProfileItem gid_Brand_Profileitem_Version_BuildVersion
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 17;
-    Key = "BuildVersion";
-    Value = "<buildversion>";
-End
-
-ProfileItem gid_Brand_Profileitem_Version_Ooobaseversion
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 18;
-    Key = "OOOBaseVersion";
-    Value = "${OOOBASEVERSION}";
-End
-
-ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
-    ProfileID = gid_Brand_Profile_Version_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Version";
-    Order = 18;
-    Key = "ExtensionUpdateURL";
-    Value = "http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "BRAND_BASE_DIR";
-    Value = "${ORIGIN}/..";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Ooo_Base_Dir
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "OOO_BASE_DIR";
-#if defined WNT
-    Value = "${.link:${BRAND_BASE_DIR}/basis-link}";
-#else
-    Value = "${BRAND_BASE_DIR}/basis-link";
-#endif
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "BUNDLED_EXTENSIONS";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS}";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_User
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "BUNDLED_EXTENSIONS_USER";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS_USER}";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_Prereg
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "BUNDLED_EXTENSIONS_PREREG";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS_PREREG}";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "UNO_SHARED_PACKAGES_CACHE";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":UNO_SHARED_PACKAGES_CACHE}";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Extensions_User
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "SHARED_EXTENSIONS_USER";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":SHARED_EXTENSIONS_USER}";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Uno_User_Packages_Cache
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "UNO_USER_PACKAGES_CACHE";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":UNO_USER_PACKAGES_CACHE}";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "TMP_EXTENSIONS";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":TMP_EXTENSIONS}";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "URE_MORE_TYPES";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_TYPES}";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "URE_MORE_SERVICES";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_SERVICES} $ORIGIN/services.rdb";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "URE_MORE_JAVA_TYPES";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_JAVA_TYPES}";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "URE_OVERRIDE_JAVA_JFW_SHARED_DATA";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_OVERRIDE_JAVA_JFW_SHARED_DATA}";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_User_Data
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "URE_OVERRIDE_JAVA_JFW_USER_DATA";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_OVERRIDE_JAVA_JFW_USER_DATA}";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "URE_MORE_JAVA_CLASSPATH_URLS";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_JAVA_CLASSPATH_URLS}";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "URE_BIN_DIR";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_BIN_DIR}";
-End
-
-ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Lib_Dir
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "URE_LIB_DIR";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_LIB_DIR}";
-End
-
-#if !defined MACOSX
-ProfileItem gid_Brand_Profileitem_Redirect_Ure_Bootstrap
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Redirect_Ini;
-    Section = "Bootstrap";
-    Key = "URE_BOOTSTRAP";
-    Value = "${ORIGIN}/" PROFILENAME(fundamental);
-End
-#endif
-
-#ifdef WNT
-ProfileItem gid_Brand_Profileitem_Setup_Alluserset
-    ProfileID = gid_Brand_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 4;
-    Key = "ALLUSERS";
-    Value = "[ALLUSERS]";
-    Inifiletablekey = "AllUsersSet";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
-End
-#endif
-
-#ifdef WNT
-ProfileItem gid_Brand_Profileitem_Setup_Findproduct
-    ProfileID = gid_Brand_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 5;
-    Key = "FINDPRODUCT";
-    Value = "[FINDPRODUCT]";
-    Inifiletablekey = "FindProductSet";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
-End
-#endif
-
-#ifdef WNT
-ProfileItem gid_Brand_Profileitem_Setup_Productcode
-    ProfileID = gid_Brand_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 6;
-    Key = "ProductCode";
-    Value = "<productcode>";
-End
-#endif
-
-#ifdef WNT
-ProfileItem gid_Brand_Profileitem_Setup_Upgradecode
-    ProfileID = gid_Brand_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 7;
-    Key = "UpgradeCode";
-    Value = "<upgradecode>";
-End
-#endif
-
-ProfileItem gid_Brand_Profileitem_Setup_Productbuildid
-    ProfileID = gid_Brand_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 8;
-    Key = "ProductBuildid";
-    Value = "<productbuildid>";
-End
-
-ProfileItem gid_Brand_Profileitem_Setup_Buildid
-    ProfileID = gid_Brand_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 9;
-    Key = "buildid";
-    Value = "<buildid>";
-End
-
-#ifdef WNT
-ProfileItem gid_Brand_Profileitem_Setup_Ureinstall
-    ProfileID = gid_Brand_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 4;
-    Key = "UREINSTALLLOCATION";
-    Value = "[INSTALLLOCATION]URE\\";
-    Inifiletablekey = "UreInstallLocation";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
-End
-#endif
-
-#ifdef WNT
-ProfileItem gid_Brand_Profileitem_Setup_Basisinstall
-    ProfileID = gid_Brand_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 4;
-    Key = "BASISINSTALLLOCATION";
-    Value = "[INSTALLLOCATION]Basis\\";
-    Inifiletablekey = "BasisInstallLocation";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
-End
-#endif
-
-#ifdef WNT
-ProfileItem gid_Brand_Profileitem_Setup_Officeinstall
-    ProfileID = gid_Brand_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 4;
-    Key = "OFFICEINSTALLLOCATION";
-    Value = "[INSTALLLOCATION]";
-    Inifiletablekey = "OfficeInstallLocation";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
-End
-#endif
-
-#ifdef WNT
-ProfileItem gid_Brand_Profileitem_Setup_Install
-    ProfileID = gid_Brand_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 4;
-    Key = "INSTALLLOCATION";
-    Value = "[INSTALLLOCATION]";
-    Inifiletablekey = "InstallLocation";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
-End
-#endif
-
-//TODO: This actually belongs into a module of its own:
-#if !defined DISABLE_PYUNO && !defined SYSTEM_PYTHON
-File gid_Brand_File_Bin_Python
-    BIN_FILE_BODY;
-    Name = EXENAME(pyuno/python);
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-End
-#endif
-
-File gid_License_Txt
-  TXT_FILE_BODY;
-#if defined MACOSX
-    Dir = gid_Brand_Dir_BasisLink;
-#else
-    Dir = gid_Dir_Brand_Root;
-#endif
-  #ifdef UNX
-    Name = "LICENSE";
-  #endif
-  #ifdef WNT
-    Name = "license.txt";
-  #endif
-    Styles = (PACKED);
-End
-
-File gid_License_Odt
-    BIN_FILE_BODY;
-#if defined MACOSX
-    Dir = gid_Brand_Dir_BasisLink;
-#else
-    Dir = gid_Dir_Brand_Root;
-#endif
-    Name = "LICENSE.odt";
-    Styles = (PACKED);
-End
-
-File gid_Credits_Odt
-    BIN_FILE_BODY;
-#if defined MACOSX
-    Dir = gid_Brand_Dir_BasisLink;
-#else
-    Dir = gid_Dir_Brand_Root;
-#endif
-    Name = "CREDITS.odt";
-    Styles = (PACKED);
-End
diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp
deleted file mode 100644
index 77aabc823..000000000
--- a/scp2/source/ooo/common_brand_readme.scp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-// Files
-
-File gid_Brand_File_Readme_Readme
-  TXT_FILE_BODY;
-  Dir = gid_Brand_Dir_Readme;
-  #ifdef UNX
-    README_ALL_LANG(Name, README);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, readme, txt);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
deleted file mode 100644
index 0393302ce..000000000
--- a/scp2/source/ooo/directory_ooo.scp
+++ /dev/null
@@ -1,1521 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-#ifdef MACOSX
-Directory gid_Dir_Bundle_Contents_Resources
-    ParentID = gid_Dir_Bundle_Contents;
-    HostName = "Resources";
-End
-#endif
-
-#ifdef MACOSX
-Directory gid_Dir_Bundle_Contents_Resources_Lang
-    ParentID = gid_Dir_Bundle_Contents_Resources;
-    DIR_ISOLANGUAGE_ALL_LANG_LPROJ;
-End
-#endif
-
-#ifdef MACOSX
-Directory gid_Dir_Bundle_Contents_Library
-    ParentID = gid_Dir_Bundle_Contents;
-    HostName = "Library";
-End
-#endif
-
-#ifdef MACOSX
-Directory gid_Dir_Bundle_Contents_Library_Spotlight
-    ParentID = gid_Dir_Bundle_Contents_Library;
-    HostName = "Spotlight";
-End
-#endif
-
-#ifdef MACOSX
-Directory gid_Dir_Bundle_Contents_Library_Spotlight_Bundle
-    ParentID = gid_Dir_Bundle_Contents_Library_Spotlight;
-    HostName = "OOoSpotlightImporter.mdimporter";
-End
-#endif
-
-#ifdef MACOSX
-Directory gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents
-    ParentID = gid_Dir_Bundle_Contents_Library_Spotlight_Bundle;
-    HostName = "Contents";
-End
-#endif
-
-#ifndef MACOSX
-Directory gid_Dir_Ooo_Openofficeorg
-    ParentID = PREDEFINED_PROGDIR;
-  #ifdef WNT
-    HostName = "${BASISROOTNAME}";
-  #else
-    HostName = ".";
-  #endif
-End
-#endif
-
-#ifndef MACOSX
-Directory gid_Dir_Ooo_Basis
-  #ifdef WNT
-    ParentID = gid_Dir_Brand_Root;
-  #else
-    ParentID = gid_Dir_Ooo_Openofficeorg;
-  #endif
-  #ifdef WNT
-    HostName = "Basis";
-  #else
-    HostName = "basis${OOOBASEVERSION}";
-  #endif
-    Styles = (BASISDIRECTORY);
-End
-#endif
-
-Directory gid_Dir_Program
-#if defined MACOSX
-    ParentID = gid_Brand_Dir_BasisLink;
-#else
-    ParentID = gid_Dir_Ooo_Basis;
-#endif
-    DosName = "program";
-End
-
-#if defined MACOSX
-Unixlink gid_Unixlink_Applications
-    BIN_FILE_BODY;
-    Styles = ();
-    Dir = PD_PROGDIR;
-    Name = "Applications";
-    Target = "/Applications";
-End
-#endif
-
-Directory gid_Dir_Program_Remote
-    ParentID = gid_Dir_Program;
-    DosName = "remote";
-End
-
-Directory gid_Dir_Program_Local
-    ParentID = gid_Dir_Program;
-    DosName = "local";
-End
-
-Directory gid_Dir_Addin
-    Styles = (CREATE);
-    ParentID = gid_Dir_Program;
-    DosName = "addin";
-End
-
-Directory gid_Dir_Addin_Source
-    ParentID = gid_Dir_Addin;
-    DosName = "source";
-End
-
-Directory gid_Dir_Filter
-    ParentID = gid_Dir_Program;
-    DosName = "filter";
-End
-
-Directory gid_Dir_Resource
-    ParentID = gid_Dir_Program;
-    DosName = "resource";
-End
-
-Directory gid_Dir_Httphome
-    ParentID = gid_Dir_Program;
-    DosName = "httphome";
-End
-
-Directory gid_Dir_Classes
-    ParentID = gid_Dir_Program;
-    DosName = "classes";
-End
-
-#ifdef WNT
-
-Directory gid_Dir_Shellnew
-    ParentID = gid_Dir_Program;
-    DosName = "shellnew";
-End
-
-Directory gid_Dir_ShellnewToo
-    ParentID = gid_Dir_Program;
-    DosName = "2shellnew";
-End
-
-#endif
-
-Directory gid_Dir_User
-#if defined MACOSX
-    ParentID = gid_Brand_Dir_BasisLink;
-#else
-    ParentID = gid_Dir_Ooo_Basis;
-#endif
-    DosName = "presets";
-End
-
-Directory gid_Dir_User_Xslt
-    ParentID = gid_Dir_User;
-    DosName = "xslt";
-End
-
-Directory gid_Dir_User_Autotext
-    ParentID = gid_Dir_User;
-    DosName = "autotext";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Autotext_Language
-    ParentID = gid_Dir_User_Autotext;
-    DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
-Directory gid_Dir_User_Uno_Packages
-    ParentID = gid_Dir_User;
-    DosName = "uno_packages";
-    Styles = (CREATE);
-End
-
-Directory gid_Dir_User_Uno_Packages_Cache
-    ParentID = gid_Dir_User_Uno_Packages;
-    DosName = "cache";
-    Styles = (CREATE);
-End
-
-Directory gid_Dir_User_Temp
-    ParentID = gid_Dir_User;
-    DosName = "temp";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Autocorr
-    ParentID = gid_Dir_User;
-    DosName = "autocorr";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Bookmark
-    ParentID = gid_Dir_User;
-    DosName = "bookmark";
-    Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Cache
-    ParentID = gid_Dir_User;
-    DosName = "cache";
-End
-
-Directory gid_Dir_User_Scripts
-    ParentID = gid_Dir_User;
-    DosName = "Scripts";
-    Styles = (WORKSTATION,CREATE);
-End
-
-Directory gid_Dir_Backup
-    ParentID = gid_Dir_User;
-    DosName = "backup";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Basic
-    ParentID = gid_Dir_User;
-    DosName = "basic";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Basic_Standard
-    ParentID = gid_Dir_User_Basic;
-    DosName = "Standard";
-End
-
-Directory gid_Dir_User_Config
-    ParentID = gid_Dir_User;
-    DosName = "config";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Config_Sofficecfg
-    ParentID = gid_Dir_User_Config;
-    DosName = "soffice.cfg";
-    Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Config_Sofficecfg_Metainf
-    ParentID = gid_Dir_User_Config_Sofficecfg;
-    DosName = "META-INF";
-    Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Config_Sofficecfg_Bitmaps
-    ParentID = gid_Dir_User_Config_Sofficecfg;
-    DosName = "Bitmaps";
-    Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Template
-    ParentID = gid_Dir_User;
-    DosName = "template";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Database
-    ParentID = gid_Dir_User;
-    DosName = "database";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Database_Biblio
-    ParentID = gid_Dir_Database;
-    DosName = "biblio";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Desktop
-    ParentID = gid_Dir_User;
-    DosName = "desktop";
-    Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Explorer
-    ParentID = gid_Dir_User;
-    DosName = "explorer";
-    Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_User_Gallery
-    ParentID = gid_Dir_User;
-    DosName = "gallery";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_User_Wordbook
-    ParentID = gid_Dir_User;
-    DosName = "wordbook";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Store
-    ParentID = gid_Dir_User;
-    DosName = "store";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Store_Trash
-    ParentID = gid_Dir_Store;
-    DosName = "trash";
-    Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_Download
-    ParentID = gid_Dir_User;
-    DosName = "download";
-    Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_Work
-    ParentID = gid_Dir_User;
-    DosName = "work";
-    Styles = (WORKSTATION);
-End
-
-Directory gid_Dir_Plugin
-    ParentID = gid_Dir_Program;
-    DosName = "plugin";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Share
-#if defined MACOSX
-    ParentID = gid_Brand_Dir_BasisLink;
-#else
-    ParentID = gid_Dir_Ooo_Basis;
-#endif
-    DosName = "share";
-End
-
-Directory gid_Dir_Share_Migration
-    ParentID = gid_Dir_Share;
-    DosName = "migration";
-End
-
-Directory gid_Dir_Fonts
-    ParentID = gid_Dir_Share;
-    DosName = "fonts";
-End
-
-#ifdef WNT
-
-Directory gid_Dir_Winfonts
-    ParentID = gid_Dir_Fonts;
-    DosName = "truetype";
-End
-
-#endif
-
-Directory gid_Dir_Share_Xslt
-    ParentID = gid_Dir_Share;
-    DosName = "xslt";
-End
-
-Directory gid_Dir_Share_Xslt_Docbook
-    ParentID = gid_Dir_Share_Xslt;
-    DosName = "docbook";
-End
-
-Directory gid_Dir_Share_Xslt_Common
-    ParentID = gid_Dir_Share_Xslt;
-    DosName = "common";
-End
-
-Directory gid_Dir_Share_Xslt_Export
-    ParentID = gid_Dir_Share_Xslt;
-    DosName = "export";
-End
-
-Directory gid_Dir_Share_Xslt_Export_Common
-    ParentID = gid_Dir_Share_Xslt_Export;
-    DosName = "common";
-End
-
-Directory gid_Dir_Share_Xslt_Export_Common_Body
-    ParentID = gid_Dir_Share_Xslt_Export_Common;
-    DosName = "body";
-End
-
-Directory gid_Dir_Share_Xslt_Export_Common_Styles
-    ParentID = gid_Dir_Share_Xslt_Export_Common;
-    DosName = "styles";
-End
-
-Directory gid_Dir_Share_Xslt_Export_Common_Table
-    ParentID = gid_Dir_Share_Xslt_Export_Common;
-    DosName = "table";
-End
-
-Directory gid_Dir_Share_Xslt_Export_Spreadsheetml
-    ParentID = gid_Dir_Share_Xslt_Export;
-    DosName = "spreadsheetml";
-End
-Directory gid_Dir_Share_Xslt_Export_uof
-    ParentID = gid_Dir_Share_Xslt_Export;
-    DosName = "uof";
-End
-Directory gid_Dir_Share_Xslt_Import_uof
-    ParentID = gid_Dir_Share_Xslt_Import;
-    DosName = "uof";
-End
-Directory gid_Dir_Share_Xslt_Export_Wordml
-    ParentID = gid_Dir_Share_Xslt_Export;
-    DosName = "wordml";
-End
-
-Directory gid_Dir_Share_Xslt_Export_Xhtml
-    ParentID = gid_Dir_Share_Xslt_Export;
-    DosName = "xhtml";
-End
-
-Directory gid_Dir_Share_Xslt_Import
-    ParentID = gid_Dir_Share_Xslt;
-    DosName = "import";
-End
-
-Directory gid_Dir_Share_Xslt_Import_Spreadsheetml
-    ParentID = gid_Dir_Share_Xslt_Import;
-    DosName = "spreadsheetml";
-End
-
-Directory gid_Dir_Share_Xslt_Import_Wordml
-    ParentID = gid_Dir_Share_Xslt_Import;
-    DosName = "wordml";
-End
-
-Directory gid_Dir_Share_Xslt_Import_Common
-    ParentID = gid_Dir_Share_Xslt_Import;
-    DosName = "common";
-End
-
-Directory gid_Dir_Share_Dtd
-    ParentID = gid_Dir_Share;
-    DosName = "dtd";
-End
-
-Directory gid_Dir_Share_Dtd_Ooo
-    ParentID = gid_Dir_Share_Dtd;
-    DosName = "officedocument";
-End
-
-Directory gid_Dir_Share_Dtd_Ooo_1_0
-    ParentID = gid_Dir_Share_Dtd_Ooo;
-    DosName = "1_0";
-End
-
-Directory gid_Dir_Share_Dtd_Math
-    ParentID = gid_Dir_Share_Dtd;
-    DosName = "math";
-End
-
-Directory gid_Dir_Share_Dtd_Math_1_01
-    ParentID = gid_Dir_Share_Dtd_Math;
-    DosName = "1_01";
-End
-
-Directory gid_Dir_Share_Pqa
-    ParentID = gid_Dir_Share;
-    DosName = "pqa";
-End
-
-Directory gid_Dir_Share_Config
-    ParentID = gid_Dir_Share;
-    DosName = "config";
-End
-
-Directory gid_Dir_Share_Config_Wizard
-    ParentID = gid_Dir_Share_Config;
-    DosName = "wizard";
-End
-
-Directory gid_Dir_Share_Config_Wizard_Web
-    ParentID = gid_Dir_Share_Config_Wizard;
-    DosName = "web";
-End
-
-Directory gid_Dir_Share_Config_Wizard_Web_Buttons
-    ParentID = gid_Dir_Share_Config_Wizard_Web;
-    DosName = "buttons";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg
-    ParentID = gid_Dir_Share_Config;
-    DosName = "soffice.cfg";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Basicide
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "BasicIDE";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Basicide_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Basicide;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbquery
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "dbquery";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbquery_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Dbquery;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbbrowser
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "dbbrowser";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbbrowser_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Dbbrowser;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbapp
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "dbapp";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbapp_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Dbapp;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbrelation
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "dbrelation";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbrelation_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Dbrelation;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbtable
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "dbtable";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbtable_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Dbtable;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sbibliography
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "sbibliography";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sbibliography_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Sbibliography;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Scalc
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "scalc";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Scalc_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Scalc;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Schart
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "schart";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Schart_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Schart;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sdraw
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "sdraw";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sdraw_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Sdraw;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sglobal
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "sglobal";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sglobal_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Sglobal;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Simpress
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "simpress";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Simpress_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Simpress;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Smath
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "smath";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Smath_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Smath;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Startmodule
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "StartModule";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Startmodule_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Startmodule;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sweb
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "sweb";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sweb_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Sweb;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Swriter
-    ParentID = gid_Dir_Share_Config_Sofficecfg;
-    DosName = "swriter";
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Swriter_Menubar
-    ParentID = gid_Dir_Share_Config_Sofficecfg_Swriter;
-    DosName = "menubar";
-End
-
-Directory gid_Dir_Share_Registry
-    ParentID = gid_Dir_Share;
-    DosName = "registry";
-End
-
-Directory gid_Dir_Share_Registry_Res
-    ParentID = gid_Dir_Share_Registry;
-    HostName = "res";
-End
-
-Directory gid_Dir_Autotext
-    ParentID = gid_Dir_Share;
-    DosName = "autotext";
-End
-
-Directory gid_Dir_Autotext_Language
-    ParentID = gid_Dir_Autotext;
-    DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
-Directory gid_Dir_Share_Autocorr
-    ParentID = gid_Dir_Share;
-    DosName = "autocorr";
-    Styles = (WORKSTATION, CREATE);
-End
-
-Directory gid_Dir_Basic
-    ParentID = gid_Dir_Share;
-    DosName = "basic";
-End
-
-Directory gid_Dir_Basic_Euro
-    ParentID = gid_Dir_Basic;
-    DosName = "Euro";
-End
-
-Directory gid_Dir_Basic_Gimmicks
-    ParentID = gid_Dir_Basic;
-    DosName = "Gimmicks";
-End
-
-Directory gid_Dir_Basic_Depot
-    ParentID = gid_Dir_Basic;
-    DosName = "Depot";
-End
-
-Directory gid_Dir_Basic_Schedule
-    ParentID = gid_Dir_Basic;
-    DosName = "Schedule";
-End
-
-Directory gid_Dir_Basic_Template
-    ParentID = gid_Dir_Basic;
-    DosName = "Template";
-End
-
-Directory gid_Dir_Basic_Tools
-    ParentID = gid_Dir_Basic;
-    DosName = "Tools";
-End
-
-Directory gid_Dir_Basic_Importwiz
-    ParentID = gid_Dir_Basic;
-    DosName = "ImportWizard";
-End
-
-Directory gid_Dir_Basic_Formwiz
-    ParentID = gid_Dir_Basic;
-    DosName = "FormWizard";
-End
-
-Directory gid_Dir_Basic_Webwiz
-    ParentID = gid_Dir_Basic;
-    DosName = "WebWizard";
-End
-
-Directory gid_Dir_Basic_Tutorials
-    ParentID = gid_Dir_Basic;
-    DosName = "Tutorials";
-End
-
-Directory gid_Dir_Basic_Scriptbindinglib
-    ParentID = gid_Dir_Basic;
-    DosName = "ScriptBindingLibrary";
-End
-
-Directory gid_Dir_Share_Scripts
-    ParentID = gid_Dir_Share;
-    DosName = "Scripts";
-End
-
-Directory gid_Dir_Share_Dict
-    ParentID = gid_Dir_Share;
-    DosName = "dict";
-End
-
-Directory gid_Dir_Config
-    ParentID = gid_Dir_Share;
-    DosName = "config";
-End
-
-Directory gid_Dir_Config_Language
-    ParentID = gid_Dir_Config;
-    DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
-Directory gid_Dir_Share_Config_Help
-    ParentID = gid_Dir_Config;
-    DosName = "help";
-End
-
-Directory gid_Dir_Config_More
-    ParentID = gid_Dir_Config;
-    DosName = "more";
-End
-
-Directory gid_Dir_Config_Start
-    ParentID = gid_Dir_Config;
-    DosName = "start";
-End
-
-Directory gid_Dir_Config_Tasks
-    ParentID = gid_Dir_Config;
-    DosName = "tasks";
-End
-
-Directory gid_Dir_Config_Settings
-    ParentID = gid_Dir_Config;
-    DosName = "settings";
-End
-
-Directory gid_Dir_Config_Symbol
-    ParentID = gid_Dir_Config;
-    DosName = "symbol";
-End
-
-Directory gid_Dir_Config_Webcast
-    ParentID = gid_Dir_Config;
-    DosName = "webcast";
-End
-
-Directory gid_Dir_Gallery
-    ParentID = gid_Dir_Share;
-    DosName = "gallery";
-End
-
-Directory gid_Dir_Gallery_Arrows
-    ParentID = gid_Dir_Gallery;
-    DosName = "arrows";
-End
-
-Directory gid_Dir_Gallery_Balloons
-    ParentID = gid_Dir_Gallery;
-    DosName = "balloons";
-End
-
-Directory gid_Dir_Gallery_Calendar
-    ParentID = gid_Dir_Gallery;
-    DosName = "calendar";
-End
-
-Directory gid_Dir_Gallery_Communic
-    ParentID = gid_Dir_Gallery;
-    DosName = "communic";
-End
-
-Directory gid_Dir_Gallery_Computer
-    ParentID = gid_Dir_Gallery;
-    DosName = "computer";
-End
-
-Directory gid_Dir_Gallery_Emoticons
-    ParentID = gid_Dir_Gallery;
-    DosName = "emoticons";
-End
-
-Directory gid_Dir_Gallery_Finances
-    ParentID = gid_Dir_Gallery;
-    DosName = "finances";
-End
-
-Directory gid_Dir_Gallery_Keyboard
-    ParentID = gid_Dir_Gallery;
-    DosName = "keyboard";
-End
-
-Directory gid_Dir_Gallery_Navi_2d
-    ParentID = gid_Dir_Gallery;
-    DosName = "navi-2d";
-End
-
-Directory gid_Dir_Gallery_Officeart
-    ParentID = gid_Dir_Gallery;
-    DosName = "officeart";
-End
-
-Directory gid_Dir_Gallery_People
-    ParentID = gid_Dir_Gallery;
-    DosName = "people";
-End
-
-Directory gid_Dir_Gallery_Time
-    ParentID = gid_Dir_Gallery;
-    DosName = "time";
-End
-
-Directory gid_Dir_Gallery_Clipart
-    ParentID = gid_Dir_Gallery;
-    DosName = "clipart";
-End
-
-Directory gid_Dir_Gallery_Bullets
-    ParentID = gid_Dir_Gallery;
-    DosName = "bullets";
-End
-
-Directory gid_Dir_Gallery_Flags
-    ParentID = gid_Dir_Gallery;
-    DosName = "flags";
-End
-
-Directory gid_Dir_Gallery_Htmlexpo
-    ParentID = gid_Dir_Gallery;
-    DosName = "htmlexpo";
-End
-
-Directory gid_Dir_Gallery_Photo
-    ParentID = gid_Dir_Gallery;
-    DosName = "photos";
-End
-
-Directory gid_Dir_Gallery_Clima
-    ParentID = gid_Dir_Gallery;
-    DosName = "clima";
-End
-
-Directory gid_Dir_Gallery_Education
-    ParentID = gid_Dir_Gallery;
-    DosName = "education";
-End
-
-Directory gid_Dir_Gallery_Trouble
-    ParentID = gid_Dir_Gallery;
-    DosName = "troubleshooting";
-End
-
-Directory gid_Dir_Gallery_Screenbeans
-    ParentID = gid_Dir_Gallery;
-    DosName = "screenbeans";
-End
-
-Directory gid_Dir_Gallery_Rulers
-    ParentID = gid_Dir_Gallery;
-    DosName = "rulers";
-End
-
-Directory gid_Dir_Gallery_Sounds
-    ParentID = gid_Dir_Gallery;
-    DosName = "sounds";
-End
-
-Directory gid_Dir_Gallery_Surface
-    ParentID = gid_Dir_Gallery;
-    DosName = "surface";
-End
-
-Directory gid_Dir_Gallery_Symbols
-    ParentID = gid_Dir_Gallery;
-    DosName = "symbols";
-End
-
-Directory gid_Dir_Gallery_Wwwanim
-    ParentID = gid_Dir_Gallery;
-    DosName = "www-anim";
-End
-
-Directory gid_Dir_Gallery_Wwwback
-    ParentID = gid_Dir_Gallery;
-    DosName = "www-back";
-End
-
-Directory gid_Dir_Gallery_Wwwgraf
-    ParentID = gid_Dir_Gallery;
-    DosName = "www-graf";
-End
-
-Directory gid_Dir_Template
-    ParentID = gid_Dir_Share;
-    DosName = "template";
-End
-
-Directory gid_Dir_Share_Template_Wizard
-    ParentID = gid_Dir_Template;
-    DosName = "wizard";
-End
-
-Directory gid_Dir_Share_Template_Wizard_Bitmap
-    ParentID = gid_Dir_Share_Template_Wizard;
-    DosName = "bitmap";
-End
-
-Directory gid_Dir_Share_Template_Wizard_Letter
-    ParentID = gid_Dir_Share_Template_Wizard;
-    DosName = "letter";
-End
-
-Directory gid_Dir_Template_Language
-    ParentID = gid_Dir_Template;
-    DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
-Directory gid_Dir_Template_Educate
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(educate);
-End
-
-Directory gid_Dir_Template_Finance
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(finance);
-End
-
-Directory gid_Dir_Template_Forms
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(forms);
-End
-
-Directory gid_Dir_Template_Labels
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(labels);
-End
-
-Directory gid_Dir_Template_Layout
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(layout);
-End
-
-Directory gid_Dir_Template_Misc
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(misc);
-End
-
-Directory gid_Dir_Template_Officorr
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(officorr);
-End
-
-Directory gid_Dir_Template_Offimisc
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(offimisc);
-End
-
-Directory gid_Dir_Template_Personal
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(personal);
-End
-
-Directory gid_Dir_Template_Presnt
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(presnt);
-End
-
-Directory gid_Dir_Template_Wizard
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(wizard);
-End
-
-Directory gid_Dir_Template_Wizard_Web
-    ParentID = gid_Dir_Template_Wizard;
-    DIR_IDENT_ALL_LANG(web);
-End
-
-Directory gid_Dir_Template_Wizard_Report
-    ParentID = gid_Dir_Template_Wizard;
-    DIR_IDENT_ALL_LANG(report);
-End
-
-Directory gid_Dir_Template_Wizard_Letter
-    ParentID = gid_Dir_Template_Wizard;
-    DIR_IDENT_ALL_LANG(letter);
-End
-
-Directory gid_Dir_Template_Wizard_Fax
-    ParentID = gid_Dir_Template_Wizard;
-    DIR_IDENT_ALL_LANG(fax);
-End
-
-Directory gid_Dir_Template_Wizard_Agenda
-    ParentID = gid_Dir_Template_Wizard;
-    DIR_IDENT_ALL_LANG(agenda);
-End
-
-Directory gid_Dir_Template_Wizard_Styles
-    ParentID = gid_Dir_Template_Wizard;
-    DIR_IDENT_ALL_LANG(styles);
-End
-
-Directory gid_Dir_Template_Internal
-    ParentID = gid_Dir_Template_Language;
-    DIR_IDENT_ALL_LANG(internal);
-End
-
-Directory gid_Dir_Share_Database
-    ParentID = gid_Dir_Share;
-    DosName = "database";
-End
-
-Directory gid_Dir_Share_Database_Language
-    ParentID = gid_Dir_Share_Database;
-    DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
-Directory gid_Dir_Explorer
-    ParentID = gid_Dir_Share;
-    DosName = "explorer";
-End
-
-Directory gid_Dir_Bookmark
-    ParentID = gid_Dir_Share;
-    DosName = "bookmark";
-End
-
-Directory gid_Dir_Bookmark_Language
-    ParentID = gid_Dir_Bookmark;
-    DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
-Directory gid_Dir_Bookmark_Info
-    ParentID = gid_Dir_Bookmark_Language;
-    ALL_LANG(DosName, STR_DIR_INFO);
-End
-
-Directory gid_Dir_Bookmark_Internet
-    ParentID = gid_Dir_Bookmark_Language;
-    ALL_LANG(DosName, STR_DIR_INTERNET);
-End
-
-Directory gid_Dir_Bookmark_Java
-    ParentID = gid_Dir_Bookmark_Language;
-    ALL_LANG(DosName, STR_DIR_JAVA);
-End
-
-Directory gid_Dir_Bookmark_Freizeit
-    ParentID = gid_Dir_Bookmark_Language;
-    ALL_LANG(DosName, STR_DIR_FREIZEIT);
-End
-
-Directory gid_Dir_Bookmark_Starone
-    ParentID = gid_Dir_Bookmark_Language;
-    ALL_LANG(DosName, STR_DIR_STARONE);
-End
-
-Directory gid_Dir_Bookmark_Tourismus
-    ParentID = gid_Dir_Bookmark_Language;
-    ALL_LANG(DosName, STR_DIR_TOURISMUS);
-End
-
-Directory gid_Dir_Palmpilot
-    ParentID = gid_Dir_Share;
-    DosName = "palmpilot";
-End
-
-Directory gid_Dir_Samples
-    ParentID = gid_Dir_Share;
-    DosName = "samples";
-End
-
-Directory gid_Dir_Samples_Language
-    ParentID = gid_Dir_Samples;
-    DIR_ISOLANGUAGE_ALL_LANG_2;
-    Styles = (CREATE);
-End
-
-Directory gid_Dir_Samples_Drawings
-    ParentID = gid_Dir_Samples_Language;
-    DIR_IDENT_ALL_LANG(drawings);
-End
-
-Directory gid_Dir_Samples_Formulas
-    ParentID = gid_Dir_Samples_Language;
-    DIR_IDENT_ALL_LANG(formulas);
-End
-
-Directory gid_Dir_Samples_Presentations
-    ParentID = gid_Dir_Samples_Language;
-    DIR_IDENT_ALL_LANG(presentations);
-End
-
-Directory gid_Dir_Samples_Spreadsheets
-    ParentID = gid_Dir_Samples_Language;
-    DIR_IDENT_ALL_LANG(spreadsheets);
-End
-
-Directory gid_Dir_Samples_Texts
-    ParentID = gid_Dir_Samples_Language;
-    DIR_IDENT_ALL_LANG(texts);
-End
-
-Directory gid_Dir_Samples_Texts_Kapitel
-    ParentID = gid_Dir_Samples_Texts;
-    ALL_LANG(DosName, STR_DIR_KAPITEL);
-End
-
-Directory gid_Dir_Samples_Databases
-    ParentID = gid_Dir_Samples_Language;
-    DIR_IDENT_ALL_LANG(databases);
-End
-
-Directory gid_Dir_Samples_Databases_Dateien
-    ParentID = gid_Dir_Samples_Databases;
-    ALL_LANG(DosName, STR_DIR_DATEIEN);
-End
-
-Directory gid_Dir_Wordbook
-    ParentID = gid_Dir_Share;
-    DosName = "wordbook";
-End
-
-Directory gid_Dir_Share_Plugin
-    ParentID = gid_Dir_Share;
-    DosName = "plugin";
-End
-
-Directory gid_Dir_Share_Fingerprint
-    ParentID = gid_Dir_Share;
-    DosName = "fingerprint";
-End
-
-Directory gid_Dir_Basis_Sdk
-#if defined MACOSX
-    ParentID = gid_Brand_Dir_BasisLink;
-#else
-    ParentID = gid_Dir_Ooo_Basis;
-#endif
-    DosName = "sdk";
-End
-
-Directory gid_Dir_Help
-#if defined MACOSX
-    ParentID = gid_Brand_Dir_BasisLink;
-#else
-    ParentID = gid_Dir_Ooo_Basis;
-#endif
-    DosName = "help";
-End
-
-Directory gid_Dir_Help_Isolanguage
-    ParentID = gid_Dir_Help;
-    DIR_ISOLANGUAGE_ALL_LANG;
-#ifdef WITH_HELPPACK_INTEGRATION
-    Styles = (FORCEHELPPACK);
-#else
-    Styles = (HELPPACK);
-#endif
-End
-
-#ifdef UNX
-
-Directory gid_Dir_User_Psprint
-    ParentID = gid_Dir_User;
-    DosName = "psprint";
-    Styles = (CREATE);
-End
-
-#endif
-
-#ifdef UNX
-
-Directory gid_Dir_User_Psprint_Driver
-    ParentID = gid_Dir_User_Psprint;
-    DosName = "driver";
-    Styles = (CREATE);
-End
-
-#endif
-
-#ifdef UNX
-
-Directory gid_Dir_User_Psprint_Fontmetric
-    ParentID = gid_Dir_User_Psprint;
-    DosName = "fontmetric";
-    Styles = (CREATE);
-End
-
-#endif
-
-#ifdef UNX
-
-Directory gid_Dir_Fonts_Truetype
-    ParentID = gid_Dir_Fonts;
-    DosName = "truetype";
-End
-
-#endif
-
-#ifdef UNX
-
-Directory gid_Dir_Fonts_Truetypeserver
-    ParentID = gid_Dir_Fonts;
-    DosName = "serverfonts";
-End
-
-#endif
-
-#ifdef UNX
-
-Directory gid_Dir_Fonts_75dpi
-    ParentID = gid_Dir_Fonts;
-    DosName = "75dpi";
-End
-
-#endif
-
-#ifdef UNX
-
-Directory gid_Dir_Fonts_75dpi_Bdf
-    ParentID = gid_Dir_Fonts_75dpi;
-    DosName = "bdf";
-End
-
-#endif
-
-#ifdef UNX
-
-Directory gid_Dir_Fonts_Type1
-    ParentID = gid_Dir_Fonts;
-    DosName = "type1";
-End
-
-#endif
-
-#ifdef UNX
-
-Directory gid_Dir_Psprint
-    ParentID = gid_Dir_Share;
-    DosName = "psprint";
-End
-
-#endif
-
-#ifdef UNX
-
-Directory gid_Dir_Psprint_Driver
-    ParentID = gid_Dir_Psprint;
-    DosName = "driver";
-End
-
-#endif
-
-#ifdef UNX
-
-Directory gid_Dir_Psprint_Fontmetric
-    ParentID = gid_Dir_Psprint;
-    DosName = "fontmetric";
-End
-
-#endif
-
-#ifdef UNX
-
-Directory gid_Dir_Share_Icons
-    ParentID = gid_Dir_Share;
-    DosName = "icons";
-End
-
-#endif
-
-/* *** Accessories Extras *** */
-
-/* ** Gallery ** */
-
-/* Draws */
-Directory gid_Dir_Gallery_Draws
-    ParentID = gid_Dir_Gallery;
-    DosName = "Draws";
-End
-
-/* Draws - People */
-Directory gid_Dir_Gallery_Draws_People
-    ParentID = gid_Dir_Gallery_Draws;
-    DosName = "People";
-End
-
-/* Photos */
-Directory gid_Dir_Gallery_Photos
-    ParentID = gid_Dir_Gallery;
-    DosName = "Photos";
-End
-
-/* Photos - Cities */
-Directory gid_Dir_Gallery_Photos_Cities
-    ParentID = gid_Dir_Gallery_Photos;
-    DosName = "Cities";
-End
-
-/* Photos - Buildings */
-Directory gid_Dir_Gallery_Photos_Buildings
-    ParentID = gid_Dir_Gallery_Photos;
-    DosName = "Buildings";
-End
-
-/* Photos - Plants */
-Directory gid_Dir_Gallery_Photos_Plants
-    ParentID = gid_Dir_Gallery_Photos;
-    DosName = "Plants";
-End
-
-/* Photos - Fauna */
-Directory gid_Dir_Gallery_Photos_Fauna
-    ParentID = gid_Dir_Gallery_Photos;
-    DosName = "Fauna";
-End
-
-/* Photos - Flowers */
-Directory gid_Dir_Gallery_Photos_Flowers
-    ParentID = gid_Dir_Gallery_Photos;
-    DosName = "Flowers";
-End
-
-/* Photos - Landscapes */
-Directory gid_Dir_Gallery_Photos_Landscapes
-    ParentID = gid_Dir_Gallery_Photos;
-    DosName = "Landscapes";
-End
-
-/* Photos - Statues */
-Directory gid_Dir_Gallery_Photos_Statues
-    ParentID = gid_Dir_Gallery_Photos;
-    DosName = "Statues";
-End
-
-/* Photos - Space */
-Directory gid_Dir_Gallery_Photos_Space
-    ParentID = gid_Dir_Gallery_Photos;
-    DosName = "Space";
-End
-
-/* Photos - Travel */
-Directory gid_Dir_Gallery_Photos_Travel
-    ParentID = gid_Dir_Gallery_Photos;
-    DosName = "Travel";
-End
-
-/* Photos - Objects */
-Directory gid_Dir_Gallery_Photos_Objects
-    ParentID = gid_Dir_Gallery_Photos;
-    DosName = "Objects";
-End
-
-/* Photos - Humans */
-Directory gid_Dir_Gallery_Photos_Humans
-    ParentID = gid_Dir_Gallery_Photos;
-    DosName = "Humans";
-End
-
-/* Photos - FoodsandDrinks */
-Directory gid_Dir_Gallery_Photos_FoodsandDrinks
-    ParentID = gid_Dir_Gallery_Photos;
-    DosName = "FoodsandDrinks";
-End
-
-/* Photos - Celebration */
-Directory gid_Dir_Gallery_Photos_Celebration
-    ParentID = gid_Dir_Gallery_Photos;
-    DosName = "Celebration";
-End
-
-/* Samples - Documentations */
-Directory gid_Dir_Samples_Documentations
-    ParentID = gid_Dir_Samples_Language;
-    DosName = "Documentations";
-End
-
-/* Samples - Advertisement */
-Directory gid_Dir_Samples_Advertisement
-    ParentID = gid_Dir_Samples_Language;
-    DosName = "Advertisement";
-End
-
-/* Elements */
-Directory gid_Dir_Gallery_Elements
-    ParentID = gid_Dir_Gallery;
-    DosName = "Elements";
-End
-
-/* Elements - Bullets 2 */
-Directory gid_Dir_Gallery_Elements_Bullets2
-    ParentID = gid_Dir_Gallery_Elements;
-    DosName = "Bullets2";
-End
-
- /* Templates - Common */
-Directory gid_Dir_Template_Common
-    ParentID = gid_Dir_Template;
-    DosName = "common";
-End
-
-Directory gid_Dir_Template_Common_Educate
-    ParentID = gid_Dir_Template_Common;
-    DosName = "educate";
-End
-
-Directory gid_Dir_Template_Common_Finance
-    ParentID = gid_Dir_Template_Common;
-    DosName = "finance";
-End
-
-Directory gid_Dir_Template_Common_Forms
-    ParentID = gid_Dir_Template_Common;
-    DosName = "forms";
-End
-
-Directory gid_Dir_Template_Common_Labels
-    ParentID = gid_Dir_Template_Common;
-    DosName = "labels";
-End
-
-Directory gid_Dir_Template_Common_Layout
-    ParentID = gid_Dir_Template_Common;
-    DosName = "layout";
-End
-
-Directory gid_Dir_Template_Common_Misc
-    ParentID = gid_Dir_Template_Common;
-    DosName = "misc";
-End
-
-Directory gid_Dir_Template_Common_Officorr
-    ParentID = gid_Dir_Template_Common;
-    DosName = "officorr";
-End
-
-Directory gid_Dir_Template_Common_Offimisc
-    ParentID = gid_Dir_Template_Common;
-    DosName = "offimisc";
-End
-
-Directory gid_Dir_Template_Common_Personal
-    ParentID = gid_Dir_Template_Common;
-    DosName = "personal";
-End
-
-Directory gid_Dir_Template_Common_Presnt
-    ParentID = gid_Dir_Template_Common;
-    DosName = "presnt";
-End
diff --git a/scp2/source/ooo/directory_ooo.ulf b/scp2/source/ooo/directory_ooo.ulf
deleted file mode 100644
index 6102bc4cf..000000000
--- a/scp2/source/ooo/directory_ooo.ulf
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_DIR_INFO]
-en-US = "Information"
-
-[STR_DIR_INTERNET]
-en-US = "Internet"
-
-[STR_DIR_JAVA]
-en-US = "Java"
-
-[STR_DIR_FREIZEIT]
-en-US = "Fun&More"
-
-[STR_DIR_STARONE]
-en-US = "%PRODUCTNAME API"
-
-[STR_DIR_TOURISMUS]
-en-US = "Travel"
-
-[STR_DIR_KAPITEL]
-en-US = "Chapters"
-
-[STR_DIR_DATEIEN]
-en-US = "Files"
-
-
-
-
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
deleted file mode 100644
index ab1138d70..000000000
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-#ifdef MACOSX
-Directory gid_Dir_Bundle
-    ParentID = PD_PROGDIR;
-    HostName = "%PRODUCTNAME.app";
-    LangPackHostName = "%PRODUCTNAME Language Pack.app";
-    PatchHostName = "%PRODUCTNAME Patch.app";
-End
-
-Directory gid_Dir_Bundle_Contents
-    ParentID = gid_Dir_Bundle;
-    HostName = "Contents";
-    Styles = (OFFICEDIRECTORY);
-End
-#endif
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
deleted file mode 100644
index 993161786..000000000
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ /dev/null
@@ -1,423 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-File gid_File_Extra_Autocorr
-    Dir = gid_Dir_Share_Autocorr;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "autocorr.zip";
-End
-
-File gid_File_Extra_Autotextshare_Lang
-    Dir = gid_Dir_Autotext_Language;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(autotextshare,zip);
-End
-
-File gid_File_Extra_Autotextuser
-    Dir = gid_Dir_User_Autotext;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DOCLANG, DONT_OVERWRITE);
-    Name = "autotextuser.zip";
-End
-
-#ifdef UNX
-
-File gid_File_Extra_Cfgsrv_Bitmap_Unx
-    Dir = gid_Dir_Config;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "cfgsrvbitmapunx.zip";
-End
-
-#endif
-
-File gid_File_Extra_Cfgusr
-    Dir = gid_Dir_User_Config;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "cfgusr.zip";
-End
-
-File gid_File_Extra_Cfgsrv
-    Dir = gid_Dir_Config;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "cfgsrvnolang.zip";
-    Patchfiles = ();
-End
-
-File gid_File_Extra_Common_Inc
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "common.inc";
-End
-
-File gid_File_Extra_Common_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "common.pl";
-End
-
-File gid_File_Extra_Database
-    Dir = gid_Dir_Database;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "database.zip";
-End
-
-File gid_File_Extra_Databasebiblio
-    Dir = gid_Dir_Database_Biblio;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "databasebiblio.zip";
-End
-
-File gid_File_Extra_Edit_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "edit.asp";
-End
-
-File gid_File_Extra_Edit_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "edit.pl";
-End
-
-File gid_File_Extra_Editpic_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "editpic.asp";
-End
-
-File gid_File_Extra_Editpic_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "editpic.pl";
-End
-
-File gid_File_Extra_Glas_Blue_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "glas-blue.zip";
-End
-
-File gid_File_Extra_Glas_Green_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "glas-green.zip";
-End
-
-File gid_File_Extra_Glas_Red_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "glas-red.zip";
-End
-
-File gid_File_Extra_Round_Gorilla_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "round-gorilla.zip";
-End
-
-File gid_File_Extra_Round_White_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "round-white.zip";
-End
-File gid_File_Extra_Simple_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "simple.zip";
-End
-File gid_File_Extra_Square_Blue_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "square-blue.zip";
-End
-File gid_File_Extra_Square_Gray_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "square-gray.zip";
-End
-File gid_File_Extra_Square_Green_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "square-green.zip";
-End
-File gid_File_Extra_Square_Red_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "square-red.zip";
-End
-File gid_File_Extra_Square_Yellow_Zip
-    Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
-    USER_FILE_BODY;
-	Styles = ();
-    Name = "square-yellow.zip";
-End
-
-#ifdef UNX
-
-#ifndef WITHOUT_AFMS
-File gid_File_Extra_Fontunxafm
-    Dir = gid_Dir_Psprint_Fontmetric;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "fontunxafm.zip";
-End
-#endif
-
-#endif
-
-#ifdef UNX
-
-#ifndef WITHOUT_PPDS
-File gid_File_Extra_Fontunxppds
-    Dir = gid_Dir_Psprint_Driver;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "fontunxppds.zip";
-End
-#endif
-
-#endif
-
-#ifdef UNX
-
-File gid_File_Extra_Fontunxpsprint
-    Dir = gid_Dir_Psprint;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "fontunxpsprint.zip";
-End
-
-#endif
-
-File gid_File_Extra_Gallbullets
-    Dir = gid_Dir_Gallery_Bullets;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallbullets.zip";
-End
-
-File gid_File_Extra_Gallhtmlexpo
-    Dir = gid_Dir_Gallery_Htmlexpo;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallhtmlexpo.zip";
-End
-
-File gid_File_Extra_Gallroot
-    Dir = gid_Dir_Gallery;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallroot.zip";
-End
-
-File gid_File_Extra_Gallrulers
-    Dir = gid_Dir_Gallery_Rulers;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallrulers.zip";
-End
-
-File gid_File_Extra_Gallsound
-    Dir = gid_Dir_User_Gallery;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "gallsound.zip";
-End
-
-File gid_File_Extra_Gallsounds
-    Dir = gid_Dir_Gallery_Sounds;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallsounds.zip";
-End
-
-File gid_File_Extra_Gallsystem
-    Dir = gid_Dir_Gallery;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallsystem.zip";
-    Patchfiles = ();
-End
-
-File gid_File_Extra_Gallwwwback
-    Dir = gid_Dir_Gallery_Wwwback;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallwwwback.zip";
-End
-
-File gid_File_Extra_Gallwwwgraf
-    Dir = gid_Dir_Gallery_Wwwgraf;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallwwwgraf.zip";
-End
-
-File gid_File_Extra_Index_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "index.pl";
-End
-
-File gid_File_Extra_Palettes
-    Dir = gid_Dir_User_Config;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "palettes.zip";
-    Patchfiles = ();
-End
-
-File gid_File_Extra_Poll_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "poll.asp";
-End
-
-File gid_File_Extra_Poll_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "poll.pl";
-End
-
-File gid_File_Extra_Savepic_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "savepic.asp";
-End
-
-File gid_File_Extra_Savepic_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "savepic.pl";
-End
-
-File gid_File_Extra_Show_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "show.asp";
-End
-
-File gid_File_Extra_Show_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "show.pl";
-End
-
-File gid_File_Extra_Symbols
-    Dir = gid_Dir_Config_Symbol;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "symbols.zip";
-End
-
-File gid_File_Extra_Tplpresntimpr_Lang
-    Dir = gid_Dir_Template_Presnt;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplpresntimpr,zip);
-End
-
-File gid_File_Extra_Tpllayoutimpr
-    Dir = gid_Dir_Template_Common_Layout;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "tpllayoutimpr.zip";
-End
-
-File gid_File_Extra_Tplwizbitmap
-    Dir = gid_Dir_Share_Template_Wizard_Bitmap;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "tplwizbitmap.zip";
-End
-
-File gid_File_Extra_Tplwizdesktop_Lang
-    Dir = gid_Dir_Template_Internal;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizdesktop,zip);
-End
-
-File gid_File_Extra_Tplwizletter
-    Dir = gid_Dir_Share_Template_Wizard_Letter;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "tplwizletter.zip";
-End
-
-File gid_File_Extra_Tplwizfax_Lang
-    Dir = gid_Dir_Template_Wizard_Fax;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizfax,zip);
-End
-
-File gid_File_Extra_Tplwizagenda_Lang
-    Dir = gid_Dir_Template_Wizard_Agenda;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizagenda,zip);
-End
-
-File gid_File_Extra_Tplwizreport_Lang
-    Dir = gid_Dir_Template_Wizard_Report;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizreport,zip);
-End
-
-File gid_File_Extra_Tplwizstyles_Lang
-    Dir = gid_Dir_Template_Wizard_Styles;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tplwizstyles,zip);
-End
-
-File gid_File_Extra_Webcast_Asp
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "webcast.asp";
-End
-
-File gid_File_Extra_Webcast_Pl
-    Dir = gid_Dir_Config_Webcast;
-    PACKED_TXT_FILE_BODY;
-    Name = "webcast.pl";
-End
-
-File gid_File_Extra_Wordbook
-    Dir = gid_Dir_Wordbook;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "wordbook.zip";
-End
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
deleted file mode 100644
index 8b42a944f..000000000
--- a/scp2/source/ooo/file_font_ooo.scp
+++ /dev/null
@@ -1,189 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-// OpenSymbol
-
-STD_FONT_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol)
-
-// DejaVu fonts
-
-// DejaVuSans Proportional
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSans, DejaVuSans.ttf, DejaVu Sans) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSans-Bold.ttf, DejaVu Sans Bold) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique) 
-#endif 
-
-// DejaVuSans ExtraLight
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSans-ExtraLight.ttf, DejaVu Sans ExtraLight) 
-#endif
-
-// DejaVuSans Condensed
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuSansCondensed-BoldOblique.ttf, DejaVu Sans Condensed Bold Oblique) 
-#endif 
-
-// DejaVuSans Mono
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuSansMono.ttf, DejaVu Sans Mono) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuSansMono-BoldOblique.ttf, DejaVu Sans Mono Bold Oblique) 
-#endif
-
-// DejaVuSerif Proportional
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif, DejaVuSerif.ttf, DejaVu Serif) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerif-Italic.ttf, DejaVu Serif Italic) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerif-BoldItalic.ttf, DejaVu Serif Bold Italic) 
-#endif 
-
-// DejaVuSerif Condensed
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuSerifCondensed.ttf, DejaVu Serif Condensed) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuSerifCondensed-Bold.ttf, DejaVu Serif Condensed Bold) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuSerifCondensed-Italic.ttf, DejaVu Serif Condensed Italic) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondensed-BoldItalic.ttf, DejaVu Serif Condensed Bold Italic) 
-#endif 
-
-
-// Liberation fonts
-
-// Liberation Sans Narrow
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Regular, LiberationSansNarrow-Regular.ttf, Liberation Sans Narrow Regular) 
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Bold, LiberationSansNarrow-Bold.ttf, Liberation Sans Narrow Bold) 
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Italic, LiberationSansNarrow-Italic.ttf, Liberation Sans Narrow Italic) 
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LiberationSansNarrow-BoldItalic.ttf, Liberation Sans Narrow Bold Italic) 
-#endif
-
-// Liberation Mono
-#ifndef WITHOUT_FONTS 
-#ifndef WNT 
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular) 
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold) 
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic) 
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic) 
-#endif
-#endif
-
-// Liberation Sans
-#ifndef WITHOUT_FONTS 
-#ifndef WNT 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic) 
-#endif
-#endif
-
-// Liberation Serif
-#ifndef WITHOUT_FONTS 
-#ifndef WNT 
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic) 
-#endif
-#endif
-
-// Gentium fonts
-
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_GentiumBasicRegular, GenBasR.ttf, Gentium Basic)
-STD_FONT_FILE( gid_File_Fnt_GentiumBasicBold, GenBasB.ttf, Gentium Basic Bold)
-STD_FONT_FILE( gid_File_Fnt_GentiumBasicItalic, GenBasI.ttf, Gentium Basic Bold)
-STD_FONT_FILE( gid_File_Fnt_GentiumBasicBoldItalic, GenBasBI.ttf, Gentium Basic Bold Italic)
-#endif 
-
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicRegular, GenBkBasR.ttf, Gentium Book Basic)
-STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBold, GenBkBasB.ttf, Gentium Book Basic Bold)
-STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book Basic Bold)
-STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic)
-#endif 
-
-// Linux Libertine G and Linux Biolinum G fonts
-
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Regular, LinLibertineG_Re.ttf, Linux Libertine G Regular)
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Bold, LinLibertineG_Bd.ttf, Linux Libertine G Bold)
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Italic, LinLibertineG_It.ttf, Linux Libertine G Italic)
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_BoldItalic, LinLibertineG_BI.ttf, Linux Libertine G Bold Italic)
-STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Regular, LinBiolinumG_Re.ttf, Linux Biolinum G Regular)
-STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Bold, LinBiolinumG_Bd.ttf, Linux Biolinum G Bold)
-STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Italic, LinBiolinumG_It.ttf, Linux Biolinum G Italic)
-#endif
-
-// fontconfig updates to allow proper use of local fonts
-
-#ifdef UNX
-#ifndef WITHOUT_FONTS 
-File gid_File_FcLocal_Conf
-    Dir = gid_Dir_Fonts_Truetype;
-    USER_FILE_BODY;
-//  Styles = ();
-    Name = "fc_local.conf";
-End
-#endif
-#endif
-
-#ifdef WNT
-#ifdef WITH_AGFA_MONOTYPE_FONTS
-STD_FONTWIN_FILE( gid_File_Fnt_albw, albw.ttf, AlbanyAMT)
-STD_FONTWIN_FILE( gid_File_Fnt_albwb, albwb.ttf, AlbanyAMT Bold)
-STD_FONTWIN_FILE( gid_File_Fnt_albwbi, albwbi.ttf, AlbanyAMT Bold Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_albwi, albwi.ttf, AlbanyAMT Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_andybol, andybol_.ttf, AndyMT Bold)
-STD_FONTWIN_FILE( gid_File_Fnt_andyreg, andyreg_.ttf, AndyMT)
-STD_FONTWIN_FILE( gid_File_Fnt_ans, ans_____.ttf, Andale Sans)
-STD_FONTWIN_FILE( gid_File_Fnt_ansb, ansb____.ttf, Andale Sans Bold)
-STD_FONTWIN_FILE( gid_File_Fnt_ansbi, ansbi___.ttf, Andale Sans Bold Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_ansi, ansi____.ttf, Andale Sans Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_bl, bl______.ttf, BellMT)
-STD_FONTWIN_FILE( gid_File_Fnt_blb, blb_____.ttf, BellMT Bold)
-STD_FONTWIN_FILE( gid_File_Fnt_blbi, blbi____.ttf, BellMT Bold Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_bli, bli_____.ttf, BellMT Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_cumbwb, cumbwb__.ttf, CumberlandAMT Bold)
-STD_FONTWIN_FILE( gid_File_Fnt_cumbwbi, cumbwbi_.ttf, CumberlandAMT Bold Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_cumbwi, cumbwi__.ttf, CumberlandAMT Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_cumbwr, cumbwr__.ttf, CumberlandAMT)
-STD_FONTWIN_FILE( gid_File_Fnt_mtsorts, mtsorts_.ttf, Monotype Sorts)
-STD_FONTWIN_FILE( gid_File_Fnt_thowb, thowb___.ttf, ThorndaleAMT Bold)
-STD_FONTWIN_FILE( gid_File_Fnt_thowbi, thowbi__.ttf, ThorndaleAMT Bold Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_thowi, thowi___.ttf, ThorndaleAMT Italic)
-STD_FONTWIN_FILE( gid_File_Fnt_thowr, thowr___.ttf, ThorndaleAMT)
-#endif
-#endif
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
deleted file mode 100644
index cd6cfe715..000000000
--- a/scp2/source/ooo/file_improvement.scp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-#if defined(BUILD_SPECIAL)
-File gid_File_Share_Registry_Oooimprovement_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "oooimprovement.xcd";
-End
-#endif
-
-#if defined(BUILD_SPECIAL)
-STD_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement)
-#endif
diff --git a/scp2/source/ooo/file_jre_ooo.scp b/scp2/source/ooo/file_jre_ooo.scp
deleted file mode 100644
index 8800db4c6..000000000
--- a/scp2/source/ooo/file_jre_ooo.scp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-#ifdef WNT
-Directory gid_Dir_Jre
-    ParentID = PREDEFINED_PROGDIR;
-    HostName = "JRE";
-End
-#endif
-
-File gid_File_Exe_Java
-    BIN_FILE_BODY;
-  #ifdef WNT
-	InstallName = "jre-windows-i586.exe";
-	Styles = (DONT_PACK,JAVAFILE,SUBST_FILENAME);
-  #else
-	Styles = (DONT_PACK,JAVAFILE);
-  #endif
-	Dir = gid_Dir_Jre;
-	Name = "${WINDOWSJAVAFILENAME}";
-	Javaversion = "${WINDOWSJAVAREGISTRYENTRY}";
-	Subdir = "java";
-End
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
deleted file mode 100644
index b89deeecf..000000000
--- a/scp2/source/ooo/file_library_ooo.scp
+++ /dev/null
@@ -1,1883 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "macros.inc"
-
-#if defined SOLAR_JAVA && defined WNT
-File gid_File_Lib_Accessbridge
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "java_uno_accessbridge.dll";
-End
-#endif
-
-#if defined(WNT)
-STD_LIB_FILE( gid_File_Lib_Ado, ado)
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Basctl, basctl)
-
-File gid_File_Lib_Basprov
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,.dll));
-  #endif
-End
-
-File gid_File_Lib_Vbaevent
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll));
-  #endif
-End
-
-STD_LIB_FILE( gid_File_Lib_Bib , bib)
-
-File gid_File_Lib_Cached1
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libcached1,UNXSUFFIX));
-  #else
-    Name = "cached1.dll";
-  #endif
-End
-
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno)
-
-#ifdef WITH_LDAP
-File gid_File_Lib_Ldapbe2
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(ldapbe2.uno,UNXSUFFIX));
-  #else
-    Name = "ldapbe2.uno.dll";
-  #endif
-End
-#endif
-
-STD_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
-STD_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
-STD_LIB_FILE(gid_File_Lib_Charttools, charttools)
-STD_LIB_FILE(gid_File_Lib_Chartview, chartview)
-
-
-#if defined WNT && defined _MSC
-
-File gid_File_Lib_Cli_Oootypes_Assembly
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
-    Name = "cli_oootypes.dll";
-    Dir = gid_Dir_Program;
-    Assemblyname = "cli_oootypes";
-    PublicKeyToken = "ce2cb7e279207b9e";
-    Version = "${CLI_OOOTYPES_NEW_VERSION}";
-    Culture = "neutral";
-    Attributes = "0";
-    ProcessorArchitecture = "MSIL";
-End
-
-#endif
-
-#if defined WNT && defined _MSC
-File gid_File_Lib_Policy_Cli_Oootypes_Assembly
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
-    Name = "${CLI_OOOTYPES_POLICY_ASSEMBLY}.dll";
-    Dir = gid_Dir_Program;
-    Assemblyname = "${CLI_OOOTYPES_POLICY_ASSEMBLY}";
-    PublicKeyToken = "ce2cb7e279207b9e";
-    Version = "${CLI_OOOTYPES_POLICY_VERSION}";
-    Culture = "neutral";
-    Attributes = "0";
-    ProcessorArchitecture = "MSIL";
-End
-
-#endif
-
-#if defined WNT && defined _MSC
-
-File gid_File_Lib_Policy_Cli_Oootypes_Config
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
-    Name = "cli_oootypes.config";
-    Dir = gid_Dir_Program;
-    AssignComponent = gid_File_Lib_Policy_Cli_Oootypes_Assembly;
-End
-
-#endif
-
-
-#if ! defined WNT // no longer supported on Windows
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno )
-#endif
-
-
-File gid_File_Lib_Comphelper2
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT3(libcomphelp,COMID,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(comphelp,COMID,.dll));
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-STD_LIB_FILE( gid_File_Lib_Ctl , ctl)
-
-STD_LIB_FILE( gid_File_Lib_Cui, cui)
-
-#ifndef SYSTEM_CURL
-
-File gid_File_Lib_Curl
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    #ifdef MACOSX
-       Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX));
-    #else
-       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4));
-    #endif
-  #else
-   #ifdef _gcc3
-    Name = "libcurl-4.dll";
-   #else
-    Name = "libcurl.dll";
-   #endif
-  #endif
-End
-
-#endif
-
-#ifndef SYSTEM_DB
-
-File gid_File_Lib_Db
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libdb-4.7,UNXSUFFIX));
-  #else
-    Name = "libdb47.dll";
-  #endif
-End
-
-#endif
-
-#ifdef UNX
-#ifdef ENABLE_GTK
-#ifdef ENABLE_SYSTRAY_GTK
-File gid_File_Lib_QStart_Gtk
-    Name = LIBNAME(qstart_gtk);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-#endif
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Dba, dba)
-
-STD_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
-
-STD_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
-
-STD_LIB_FILE( gid_File_Lib_Dbase2, dbase )
-
-STD_LIB_FILE( gid_File_Lib_Dbfile , file)
-STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
-
-
-File gid_File_Lib_Dbpool
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX));
-  #else
-    Name = "dbpool2.dll";
-  #endif
-End
-
-STD_LIB_FILE( gid_File_Lib_Dbt, dbtools )
-
-STD_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
-
-File gid_File_Lib_Dict_Ja
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libdict_ja,UNXSUFFIX));
-  #else
-    Name = "dict_ja.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Dict_Zh
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libdict_zh,UNXSUFFIX));
-  #else
-    Name = "dict_zh.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Collator_Data
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libcollator_data,UNXSUFFIX));
-  #else
-    Name = "collator_data.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Index_Data
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libindex_data,UNXSUFFIX));
-  #else
-    Name = "index_data.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Textconv_Dict
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libtextconv_dict,UNXSUFFIX));
-  #else
-    Name = "textconv_dict.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Dlgprov
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,.dll));
-  #endif
-End
-
-File gid_File_Lib_Stringresource
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,.dll));
-  #endif
-End
-
-File gid_File_Lib_Vbaobj
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT3(vbaobj,.uno,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(vbaobj,.uno,.dll));
-  #endif
-End
-
-File gid_File_Lib_Vbaswobj
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(vbaswobj,.uno,.dll));
-  #endif
-End
-
-File gid_File_Lib_Vbamsforms
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT3(msforms,.uno,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(msforms,.uno,.dll));
-  #endif
-End
-
-File gid_File_Lib_Vbahelper
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(vbahelper,DLLPOSTFIX,.dll));
-  #endif
-End
-
-
-#ifdef WNT
-
-File gid_File_Lib_Dnd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "dnd.dll";
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Lib_Dtrans
-    TXT_FILE_BODY;
-    Name = "dtrans.dll";
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-#endif
-
-STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
-
-SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj)
-
-#ifndef DISABLE_ATL
-SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
-#endif
-
-#if defined(WNT) && !defined(DISABLE_ATL)
-
-STD_LIB_FILE( gid_File_Lib_Emser, emser )
-
-File gid_File_Lib_Inprocserv
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "inprocserv.dll";
-End
-
-#endif
-
-#ifdef UNX
-
-#ifdef ENABLE_KAB
-File gid_File_Lib_Kab_1
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(libkab1,UNXSUFFIX));
-End
-
-File gid_File_Lib_Kab_Drv_1
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(libkabdrv1,UNXSUFFIX));
-End
-
-#endif
-
-#ifdef MACOSX
-File gid_File_Lib_Macab_1
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(libmacab1,UNXSUFFIX));
-End
-
-File gid_File_Lib_Macab_Drv_1
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(libmacabdrv1,UNXSUFFIX));
-End
-
-#endif  // #ifdef ENABLE_KAB
-
-#ifdef ENABLE_EVOAB2
-
-STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
-
-#endif  // #ifdef ENABLE_EVOAB2
-
-#endif  // #ifdef UNX
-
-File gid_File_Lib_Evtatt
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libevtatt,UNXSUFFIX));
-  #else
-    Name = "evtatt.dll";
-  #endif
-End
-
-SPECIAL_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
-
-File gid_File_Lib_Filterconfig1
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = SPECIAL_NAME(filterconfig1);
-End
-
-STD_LIB_FILE( gid_File_Lib_Flat, flat)
-
-#ifdef WNT
-
-File gid_File_Lib_Fop
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "fop.dll";
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Lib_Fps
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "fps.dll";
-End
-
-#endif
-
-#if defined UNX && ! defined MACOSX
-
-File gid_File_Lib_Desktopbe
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX));
-End
-
-#if defined(ENABLE_GTK) && !defined(ENABLE_GTK3)
-#ifdef GTK_TWO_FOUR
-File gid_File_Lib_Fps_Gnome
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = SPECIAL_COMPONENT_LIB_NAME(fps_gnome.uno);
-End
-#endif
-#endif
-#ifdef ENABLE_KDE4
-#ifndef MACOSX
-File gid_File_Lib_Fps_Kde4
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-    Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno);
-End
-#endif
-#endif
-#ifdef ENABLE_KDE
-#ifndef MACOSX
-File gid_File_Lib_Fps_Kde
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-    Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde.uno);
-End
-File gid_File_Bin_KdeFilePicker
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-    Name = "kdefilepicker";
-End
-#endif
-#endif
-#endif
-
-#ifdef QUARTZ
-File gid_File_Lib_Fps_Aqua
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
-End
-
-File gid_File_Lib_MacOSXSpell
-	TXT_FILE_BODY;
-	Styles = (PACKED);
-	Name = LIBNAME(MacOSXSpell);
-	Dir = SCP2_OOO_BIN_DIR;
-End
-
-File gid_File_Lib_avmediaQuickTime
-	TXT_FILE_BODY;
-	Styles = (PACKED);
-	Name = LIBNAME(avmediaQuickTime);
-	Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-
-#ifdef WNT
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_ODMA, fps_odma.uno )
-#endif
-
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
-
-
-#ifndef SYSTEM_CAIRO
-
-File gid_File_Lib_Cairo
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    #ifdef MACOSX
-       Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX));
-    #else
-       Name = STRING(CONCAT3(libcairo,UNXSUFFIX,.2));
-    #endif
-  #elif defined(WNT)
-    #ifdef _gcc3
-       Name = "libcairo-2.dll";
-    #else
-       Name = "cairo.dll";
-    #endif
-  #endif
-End
-
-#ifndef WNT
-
-File gid_File_Lib_Pixman
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-  #ifdef UNX
-    #ifdef MACOSX
-       Name = "libpixman-1.a";
-    #else
-       Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
-    #endif
-  #endif
-End
-
-#endif
-
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Frm , frm)
-
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
-
-#ifdef WNT
-
-File gid_File_Lib_Ftransl
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "ftransl.dll";
-End
-
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Fwe , fwe)
-
-STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
-
-File gid_File_Lib_Fwk
-    Name = LIBNAME(fwk);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
-STD_LIB_FILE( gid_File_Lib_Fwl , fwl)
-
-STD_LIB_FILE( gid_File_Lib_Fwm , fwm)
-
-#ifdef WNT
-File gid_File_Lib_Gdiplus
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "gdiplus.dll";
-End
-#endif
-
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
-
-STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
-
-File gid_File_Lib_I18npool
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(i18npool.uno,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT2(i18npool.uno,.dll));
-  #endif
-End
-
-STD_LIB_FILE( gid_File_I18nregexp, i18nregexp )
-
-File gid_File_Lib_I18nsearch
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(i18nsearch.uno,UNXSUFFIX));
-  #else
-    Name = "i18nsearch.uno.dll";
-  #endif
-End
-
-File gid_File_Lib_I18nisolang
-  #ifdef UNX
-    Name = STRING(CONCAT4(libi18nisolang,ISOLANG_MAJOR,COMID,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT4(i18nisolang,ISOLANG_MAJOR,COMID,.dll));
-  #endif
-    PACKED_LIB_FILE_BODY;
-End
-
-File gid_File_Lib_I18nutil
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT3(libi18nutil,COMID,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(i18nutil,COMID,.dll));
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-STD_LIB_FILE( gid_File_Lib_I18npaper, i18npaper)
-
-#ifndef SYSTEM_ICU
-
-File gid_File_Lib_Icudata
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT7(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
-  #else
-    Name = STRING(CONCAT4(icudt,ICU_MAJOR,ICU_MINOR,.dll));
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Icui18n
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT7(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
-  #else
-    Name = STRING(CONCAT4(icuin,ICU_MAJOR,ICU_MINOR,.dll));
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Icule
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT7(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
-  #else
-    Name = STRING(CONCAT4(icule,ICU_MAJOR,ICU_MINOR,.dll));
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Icuuc
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT7(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
-  #else
-    Name = STRING(CONCAT4(icuuc,ICU_MAJOR,ICU_MINOR,.dll));
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-#endif
-
-#ifdef SOLAR_JAVA
-
-STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
-
-#endif
-
-#ifdef SOLAR_JAVA
-File gid_File_Lib_Hsqldb_2
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libhsqldb,UNXSUFFIX));
-  #else
-    Name = "hsqldb.dll";
-  #endif
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Lib_Lngpckinsthlp
-    BIN_FILE_BODY;
-    Styles = (PACKED, LANGUAGEPACK, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "lngpckinsthlp.dll";
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Lib_sn_tools
-    BIN_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "sn_tools.dll";
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Lib_Patchmsi
-    TXT_FILE_BODY;
-    Name = "patchmsi.dll";
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Lib_Rebasemsi
-    TXT_FILE_BODY;
-    Name = "rebase.dll";
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
-End
-
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Lng, lng)
-
-File gid_File_Lib_Localedata_En
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(liblocaledata_en,UNXSUFFIX));
-  #else
-    Name = "localedata_en.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Localedata_Es
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(liblocaledata_es,UNXSUFFIX));
-  #else
-    Name = "localedata_es.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Localedata_Euro
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(liblocaledata_euro,UNXSUFFIX));
-  #else
-    Name = "localedata_euro.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Localedata_Others
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(liblocaledata_others,UNXSUFFIX));
-  #else
-    Name = "localedata_others.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Mcnttype
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libmcnttype,UNXSUFFIX));
-  #else
-    Name = "mcnttype.dll";
-  #endif
-End
-
-#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
-                                                                // #i91209#
-STD_LIB_FILE(gid_File_Lib_Mozab,mozab)
-STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
-
-#else
-
-File gid_File_Lib_Mozbootstrap
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
-  #else
-    Name = "mozbootstrap.dll";
-  #endif
-End
-
-#endif
-
-STD_LIB_FILE(gid_File_Lib_Wpft,wpft)
-
-STD_LIB_FILE(gid_File_Lib_Msworks,msworks)
-
-STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
-
-STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
-
-STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
-
-STD_LIB_FILE(gid_File_Lib_Resource,resourcemodel)
-
-STD_LIB_FILE(gid_File_Lib_Doctok,doctok)
-
-STD_LIB_FILE(gid_File_Lib_ooxml,ooxml)
-
-STD_LIB_FILE(gid_File_Lib_Rtftok,rtftok)
-
-#ifdef WNT
-#if defined(_gcc3)
-
-File gid_File_Lib_Mingwm10
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-    Name = "mingwm10.dll";
-End
-
-#endif
-#endif
-
-#if defined(WNT) && defined( _gcc3 )
-
-#if defined(MINGW_GCCDLL)
-
-File gid_File_Lib_Mingw_GccS
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = MINGW_GCCDLL;
-    Styles = (PACKED);
-End
-
-#endif
-
-#if defined(MINGW_GXXDLL)
-
-File gid_File_Lib_Mingw_Stdcpp
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = MINGW_GXXDLL;
-    Styles = (PACKED);
-End
-
-#endif
-
-#endif
-
-STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
-STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
-
-// STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
-
-STD_LIB_FILE( gid_File_Lib_Offacc, offacc)
-
-#ifdef SOLAR_JAVA
-#ifndef MACOSX
-
-File gid_File_Lib_Officebean
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libofficebean,UNXSUFFIX));
-  #else
-    Name = "officebean.dll";
-  #endif
-End
-
-#endif
-#endif
-
-#if defined(WNT) && !defined(DISABLE_ATL)
-
-File gid_File_Lib_Ole
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "oleautobridge.uno.dll";
-End
-
-#endif
-
-SPECIAL_LIB_FILE(gid_File_Lib_Package2,package2)
-
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno )
-
-STD_LIB_FILE( gid_File_Lib_Pcr, pcr)
-
-STD_LIB_FILE( gid_File_Lib_Log, log)
-
-STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
-
-File gid_File_Lib_Deployment
-#if defined UNX
-    Name = STRING(CONCAT4(deployment,DLLPOSTFIX,.uno,UNXSUFFIX));
-#else
-    Name = STRING(CONCAT3(deployment,DLLPOSTFIX,.uno.dll));
-#endif
-    PACKED_LIB_FILE_BODY;
-End
-
-File gid_File_Lib_DeploymentGui
-#if defined UNX
-    Name = STRING(CONCAT4(deploymentgui,DLLPOSTFIX,.uno,UNXSUFFIX));
-#else
-    Name = STRING(CONCAT3(deploymentgui,DLLPOSTFIX,.uno.dll));
-#endif
-    PACKED_LIB_FILE_BODY;
-End
-
-STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
-
-#ifndef WITHOUT_MOZILLA
-STD_LIB_FILE( gid_File_Lib_Pl , pl)
-#endif
-
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno )
-
-#if defined(UNX) && ! defined(QUARTZ)
-File gid_File_Lib_Desktop_Detector
-    Name = LIBNAME(desktop_detector);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-File gid_File_Lib_Vclplug_Gen
-    Name = LIBNAME(vclplug_gen);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-
-#if defined(UNX) && ! defined(QUARTZ)
-#ifdef ENABLE_GTK
-File gid_File_Lib_Vclplug_Gtk
-    Name = LIBNAME(vclplug_gtk);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-#ifdef ENABLE_GTK3
-File gid_File_Lib_Vclplug_Gtk3
-    Name = LIBNAME(vclplug_gtk3);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-#ifdef ENABLE_KDE
-#ifndef MACOSX
-File gid_File_Lib_Vclplug_Kde
-    Name = LIBNAME(vclplug_kde);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-#endif
-#ifdef ENABLE_KDE4
-#ifndef MACOSX
-File gid_File_Lib_Vclplug_Kde4
-    Name = LIBNAME(vclplug_kde4);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-End
-#endif
-#endif
-#endif
-
-#if defined(QUARTZ)
-File gid_File_Lib_AppleRemote
-    Name = LIBNAME(AppleRemote);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-
-#if defined(QUARTZ)
-File gid_File_Lib_Basebmp
-    Name = LIBNAME(basebmp);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-
-#if defined UNX && ! defined QUARTZ
-STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
-STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
-#endif
-
-#if defined UNX && ! defined MACOSX
-
-File gid_File_Lib_Recentfile
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Lib_Reg4allmsdoc
-    TXT_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "reg4allmsdoc.dll";
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Lib_Qslnkmsi
-    TXT_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "qslnkmsi.dll";
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Lib_Sdqsmsi
-    TXT_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "sdqsmsi.dll";
-End
-
-#endif
-
-File gid_File_Lib_Res
-    Name = LIBNAME(res);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
-File gid_File_Lib_Expwrap_Uno
-    TXT_FILE_BODY;
-    Styles = (PACKED,DONT_OVERWRITE);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(expwrap.uno,UNXSUFFIX));
-  #else
-    Name = "expwrap.uno.dll";
-  #endif
-End
-
-File gid_File_Lib_Fastsax_Uno
-    TXT_FILE_BODY;
-    Styles = (PACKED,DONT_OVERWRITE);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(fastsax.uno,UNXSUFFIX));
-  #else
-    Name = "fastsax.uno.dll";
-  #endif
-End
-
-STD_LIB_FILE( gid_File_Lib_Sax , sax)
-
-STD_LIB_FILE( gid_File_Lib_Oox , oox)
-
-STD_LIB_FILE( gid_File_Lib_Sb , sb)
-
-STD_LIB_FILE( gid_File_Lib_Scn, scn)
-
-File gid_File_Lib_Scriptframe
-    TXT_FILE_BODY;
-  #ifdef UNX
-    #ifdef MACOSX
-       Name = "libscriptframe.dylib";
-    #else
-       Name = "libscriptframe.so";
-    #endif
-  #else
-    Name = "scriptframe.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-STD_LIB_FILE( gid_File_Lib_Sd , sd)
-STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
-
-File gid_File_Lib_Slideshow
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(slideshow.uno,UNXSUFFIX));
-  #else
-    Name = "slideshow.uno.dll";
-  #endif
-End
-
-File gid_File_Lib_Sdbc_2
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libsdbc2,UNXSUFFIX));
-  #else
-    Name = "sdbc2.dll";
-  #endif
-End
-
-STD_LIB_FILE( gid_File_Lib_Sdd , sdd)
-
-STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
-
-File gid_File_Lib_Sfx
-    Name = LIBNAME(sfx);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
-#ifdef WNT
-
-File gid_File_Lib_Instooofiltmsi
-    TXT_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "instooofiltmsi.dll";
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Lib_Smplmail
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "smplmail.uno.dll";
-End
-
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Sot, sot )
-
-#if defined(UNX) && !defined(QUARTZ)
-
-File gid_File_Lib_Spa
-    Name = LIBNAME(spa);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
-#endif
-
-File gid_File_Lib_Spell
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Name = LIBNAME(spell);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
-STD_LIB_FILE( gid_File_Lib_Spl, spl)
-
-#if defined UNX && !defined MACOSX
-STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
-#endif
-
-SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
-
-STD_LIB_FILE( gid_File_Lib_Sts , sts)
-
-STD_LIB_FILE( gid_File_Lib_Svl, svl )
-STD_LIB_FILE( gid_File_Lib_Svtools, svt )
-
-STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
-STD_LIB_FILE( gid_File_Lib_Svx, svx)
-STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
-STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
-
-STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
-
-STD_LIB_FILE( gid_File_Lib_Sw , sw)
-STD_LIB_FILE( gid_File_Lib_Swui, swui)
-
-STD_LIB_FILE( gid_File_Lib_Msword, msword )
-
-#if ! defined UNX
-File gid_File_Lib_Sysdtrans
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "sysdtrans.dll";
-End
-#endif
-
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno )
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno )
-
-#ifdef WNT
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
-#endif
-
-#ifdef MACOSX
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Tk, tk )
-STD_LIB_FILE( gid_File_Lib_Acc, acc )
-
-STD_LIB_FILE( gid_File_Lib_Tools, tl )
-
-File gid_File_Lib_Tvhlp1
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libtvhlp1,UNXSUFFIX));
-  #else
-    Name = "tvhlp1.dll";
-  #endif
-End
-
-File gid_File_Lib_Ucb1
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libucb1,UNXSUFFIX));
-  #else
-    Name = "ucb1.dll";
-  #endif
-End
-
-File gid_File_Lib_Ucbhelper
-    TXT_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-  #ifdef UNX
-    Name = STRING(CONCAT3(libucbhelper4,COMID,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(ucbhelper4,COMID,.dll));
-  #endif
-End
-
-File gid_File_Lib_Ucpchelp1
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libucpchelp1,UNXSUFFIX));
-  #else
-    Name = "ucpchelp1.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-#ifndef DISABLE_NEON
-SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
- #ifndef SYSTEM_NEON
-   SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
- #endif
-#endif
-
-SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
-
-SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
-
-SPECIAL_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1)
-
-SPECIAL_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1)
-
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno)
-
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
-
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
-
-#ifdef WNT
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
-#endif
-
-File gid_File_Lib_Lnth
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Name = LIBNAME(lnth);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
-File gid_File_Lib_Hyph
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Name = LIBNAME(hyphen);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
-STD_LIB_FILE( gid_File_Lib_Utl , utl)
-
-STD_LIB_FILE( gid_File_Lib_Uui, uui )
-
-STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
-
-File gid_File_Lib_Vcl
-    Name = LIBNAME(vcl);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
-STD_LIB_FILE( gid_File_Lib_Xcr, xcr)
-STD_LIB_FILE( gid_File_Lib_Xmx , xmx)
-STD_LIB_FILE( gid_File_Lib_Xof , xof)
-
-File gid_File_Lib_Xo
-    Name = LIBNAME(xo);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
-SPECIAL_LIB_FILE(gid_File_Lib_Xstor,xstor)
-
-STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg )
-STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter )
-STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
-STD_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd )
-STD_LIB_FILE( gid_File_Lib_Odfflatxml, odfflatxml )
-
-#ifdef SOLAR_JAVA
-STD_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter )
-STD_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
-#endif
-
-#ifndef SYSTEM_LIBXSLT
-File gid_File_Lib_Xslt
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    #ifdef MACOSX
-       Name = STRING(CONCAT4(libxslt,.,LIBXSLT_MAJOR,UNXSUFFIX));
-    #else
-       Name = STRING(CONCAT4(libxslt,UNXSUFFIX,.,LIBXSLT_MAJOR));
-    #endif
-  #else
-   #ifdef _gcc3
-    Name = "libxslt-1.dll";
-   #else
-    Name = "libxslt.dll";
-   #endif
-  #endif
-End
-#endif
-
-
-STD_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
-
-// AVMedia
-STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
-
-#ifdef GSTREAMER
-SPECIAL_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst )
-#else
-#if defined UNX
-#ifdef SOLAR_JAVA
-STD_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
-#endif
-#elif defined WNT
-#ifdef ENABLE_DIRECTX
-SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
-#endif
-#endif
-#endif
-
-#ifndef WITHOUT_MOZILLA
-File gid_File_Lib_XSec_Framework
-    TXT_FILE_BODY;
-	#ifdef UNX
-        Name = STRING(CONCAT2(libxsec_fw,UNXSUFFIX));
-    #else
-        Name = "xsec_fw.dll";
-    #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_XSec_XmlSec
-    TXT_FILE_BODY;
-	#ifdef UNX
-        Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
-    #else
-        Name = "xsec_xmlsec.dll";
-    #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_XSec_XMLSecurity
-    TXT_FILE_BODY;
-	#ifdef UNX
-        Name = STRING(CONCAT2(libxmlsecurity,UNXSUFFIX));
-    #else
-        Name = "xmlsecurity.dll";
-    #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-#ifdef WNT
-File gid_File_Lib_LibXMLSec_xmlseccore
-    TXT_FILE_BODY;
-    #ifdef _gcc3
-      Name = "libxmlsec1.dll";
-    #else
-      Name = "libxmlsec.dll";
-    #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_LibXMLSec_xmlsecmscrypto
-    TXT_FILE_BODY;
-  #ifdef _gcc3
-    Name = "libxmlsec1-mscrypto.dll";
-  #else
-    Name = "libxmlsec-mscrypto.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-#endif
-
-//i20156 - end
-#endif
-
-File gid_File_Lib_Migrationoo2
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(migrationoo2.uno,UNXSUFFIX));
-  #else
-    Name = "migrationoo2.uno.dll";
-  #endif
-End
-
-File gid_File_Lib_Migrationoo3
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(migrationoo3.uno,UNXSUFFIX));
-  #else
-    Name = "migrationoo3.uno.dll";
-  #endif
-End
-
-#ifndef SYSTEM_LIBTEXTCAT
-File gid_File_Lib_Libtextcat
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libtextcat,UNXSUFFIX));
-  #else
-    Name = "libtextcat.dll";
-  #endif
-End
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
-
-STD_LIB_FILE( gid_File_Lib_Updchkui , updchk )
-
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
-
-#ifdef WNT
-File gid_File_Lib_Onlinecheck
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "onlinecheck.dll";
-End
-#endif
-
-#ifdef OPENSSL
-File gid_File_Lib_Openssl
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef WNT
-    Name = "ssleay32.dll";
-  #endif
-End
-#endif
-
-#ifdef OPENSSL
-File gid_File_Lib_Crypto
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-
-	#ifdef WNT
-	  Name = "libeay32.dll";
-	#endif
-End
-#endif
-
-File gid_File_Lib_Soffice
-    TXT_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = SCP2_URE_DL_NORMAL("sofficeapp");
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Unopkgapp
-    TXT_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = SCP2_URE_DL_NORMAL("unopkgapp");
-    Styles = (PACKED);
-End
-
-STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
-
-#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA
-        // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
-        // gid_Brand_File_Lib_Msvcr80
-File gid_File_Moz_Msvcp80
-    TXT_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = SCP2_URE_DL_NORMAL("msvcp80");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-File gid_File_Moz_Msvcr80
-    TXT_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = SCP2_URE_DL_NORMAL("msvcr80");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-File gid_File_Moz_Msvc80crt_Manifest
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-    Name = "Microsoft.VC80.CRT.manifest";
-End
-#endif
-
-#ifndef SYSTEM_REDLAND
-File gid_File_Lib_Raptor
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    #ifdef MACOSX
-       Name = STRING(CONCAT4(libraptor,.,RAPTOR_MAJOR,UNXSUFFIX));
-    #else
-       Name = STRING(CONCAT4(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR));
-    #endif
-  #else
-   #ifdef _gcc3
-    Name = "libraptor-1.dll";
-   #else
-    Name = "raptor.dll";
-   #endif
-  #endif
-End
-
-File gid_File_Lib_Rasqal
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    #ifdef MACOSX
-       Name = STRING(CONCAT4(librasqal,.,RASQAL_MAJOR,UNXSUFFIX));
-    #else
-       Name = STRING(CONCAT4(librasqal,UNXSUFFIX,.,RASQAL_MAJOR));
-    #endif
-  #else
-   #ifdef _gcc3
-       Name = STRING(CONCAT3(librasqal-,RASQAL_MAJOR,.dll));
-   #else
-    Name = "rasqal.dll";
-   #endif
-  #endif
-End
-
-File gid_File_Lib_Rdf
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    #ifdef MACOSX
-       Name = STRING(CONCAT4(librdf,.,REDLAND_MAJOR,UNXSUFFIX));
-    #else
-       Name = STRING(CONCAT4(librdf,UNXSUFFIX,.,REDLAND_MAJOR));
-    #endif
-  #else
-   #ifdef _gcc3
-    Name = "librdf-0.dll";
-   #else
-    Name = "librdf.dll";
-   #endif
-  #endif
-End
-#endif // SYSTEM_REDLAND
-
-STD_LIB_FILE(gid_File_Lib_Unordf, unordf)
-
-STD_LIB_FILE( gid_File_Lib_For, for)
-STD_LIB_FILE( gid_File_Lib_Forui, forui)
-
-// RSVG and dependencies
-#if ! defined (SYSTEM_GETTEXT)
-File gid_File_Lib_Intl
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libintl.8.dylib";
-    #elif defined WNT
-    Name = "intl.dll";
-    #endif
-End
-#endif
-
-#if ! defined SYSTEM_GLIB
-File gid_File_Lib_Glib
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libglib-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gliblo.dll";
-    #endif
-End
-File gid_File_Lib_Gthread
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgthread-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gthreadlo.dll";
-    #endif
-End
-File gid_File_Lib_Gobject
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgobject-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gobjectlo.dll";
-    #endif
-End
-File gid_File_Lib_Gio
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgio-2.0.0.dylib";
-    #elif defined WNT
-    Name = "giolo.dll";
-    #endif
-End
-File gid_File_Lib_Gmodule
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgmodule-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gmodulelo.dll";
-    #endif
-End
-#endif
-
-#if ENABLE_LIBRSVG
-
-#if ! defined SYSTEM_GDKPIXBUF
-File gid_File_Lib_Gdkpixbuf
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgdk_pixbuf-2.0.0.dylib";
-    #elif defined WNT
-    Name = "libgdk_pixbuf-2.0-0.dll";
-    #endif
-End
-#endif
-
-#if ! defined SYSTEM_LIBCROCO
-File gid_File_Lib_Libcroco
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libcroco-0.6.3.0.1.dylib";
-    #elif defined WNT
-    Name = "libcroco-0.6-3.dll";
-    #endif
-End
-#endif
-
-#if ! defined SYSTEM_PANGO
-File gid_File_Lib_Libpango
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libpango-1.0.0.dylib";
-    #elif defined WNT
-    Name = "pangolo.dll";
-    #endif
-End
-File gid_File_Lib_Libpangocairo
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libpangocairo-1.0.0.dylib";
-    #elif defined WNT
-    Name = "pangocairolo.dll";
-    #endif
-End
-#if defined WNT
-File gid_File_Lib_Libpangowin32
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "pangowin32lo.dll";
-End
-#endif
-#endif
-
-#if ! defined SYSTEM_LIBGSF
-File gid_File_Lib_Libgsf
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-#ifdef WNT
-    Name = "gsf-1.dll";
-#endif
-End
-#endif
-
-#if ! defined SYSTEM_LIBRSVG
-File gid_File_Lib_Librsvg
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "librsvg-2.2.dylib";
-    #elif defined WNT
-    Name = "librsvg-2-2.dll";
-    #endif
-End
-#endif
-
-#endif
-
-#ifdef WNT
-File gid_File_Lib_sellangmsi
-    TXT_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = gid_Dir_Program;
-    Name = "sellangmsi.dll";
-End
-#endif
-
-#ifdef ENABLE_LOMENUBAR
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Lomenubar, lomenubar.uno )
-#endif
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
deleted file mode 100644
index fb85ddf0f..000000000
--- a/scp2/source/ooo/file_ooo.scp
+++ /dev/null
@@ -1,2135 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-File gid_File_Basic_Depot
-    Dir = gid_Dir_Basic_Depot;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvdepot.zip";
-End
-
-File gid_File_Basic_Euro
-    Dir = gid_Dir_Basic_Euro;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrveuro.zip";
-End
-
-File gid_File_Basic_Gimmicks
-    Dir = gid_Dir_Basic_Gimmicks;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvgimmicks.zip";
-End
-
-File gid_File_Basic_Importwiz
-    Dir = gid_Dir_Basic_Importwiz;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvimport.zip";
-End
-
-File gid_File_Basic_Formwiz
-    Dir = gid_Dir_Basic_Formwiz;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvform.zip";
-End
-
-File gid_File_Basic_Schedule
-    Dir = gid_Dir_Basic_Schedule;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvschedule.zip";
-End
-
-File gid_File_Basic_Scriptbindinglib
-    Dir = gid_Dir_Basic_Scriptbindinglib;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "scriptbindinglib.zip";
-End
-
-File gid_File_Basic_Template
-    Dir = gid_Dir_Basic_Template;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvtemplate.zip";
-End
-
-File gid_File_Basic_Tools
-    Dir = gid_Dir_Basic_Tools;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvtools.zip";
-End
-
-File gid_File_Basic_User
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Dir = gid_Dir_User_Basic;
-    Name = "basicusr.zip";
-End
-
-File gid_File_Basic_Share
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Dir = gid_Dir_Basic;
-    Name = "basicshare.zip";
-End
-
-File gid_File_Basic_User_Standard
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Dir = gid_Dir_Basic_Standard;
-    Name = "basicsrvstandard.zip";
-End
-
-File gid_File_Basic_Tutorials
-    Dir = gid_Dir_Basic_Tutorials;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvtutorials.zip";
-End
-
-#ifndef WITHOUT_MOZILLA
-
-#if !defined(UNX) || defined(ENABLE_GTK)
-File gid_File_Exe_Nsplugin
-        BIN_FILE_BODY;
-        Styles          = (PACKED);
-        Dir             = gid_Dir_Program;
- #ifdef UNX
-        Name            = "nsplugin";
- #else
-    Name = "nsplugin.exe";
-  #endif
-End
-#endif
-#endif
-
-#if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
-
-File gid_File_Bin_Pluginapp
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "pluginapp.bin";
-    Styles = (PACKED);
-End
-
-#endif
-
-#ifdef UNX
-
-File gid_File_Bin_Open_Url
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "open-url";
-    Styles = (PACKED);
-End
-
-#endif
-
-#if defined UNX && ! defined MACOSX
-
-File gid_File_Bin_Gnome_Open_Url
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "gnome-open-url";
-    Styles = (PACKED);
-End
-
-File gid_File_Bin_Gnome_Open_Url_Bin
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "gnome-open-url.bin";
-    Styles = (PACKED);
-End
-
-File gid_File_Bin_Kde_Open_Url
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "kde-open-url";
-    Styles = (PACKED);
-End
-
-File gid_File_Bin_Cde_Open_Url
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "cde-open-url";
-    Styles = (PACKED);
-End
-
-#endif
-
-#ifdef UNX
-
-File gid_File_Bin_Uri_Encode
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "uri-encode";
-    Styles = (PACKED);
-End
-
-#endif
-
-File gid_File_Bin_Senddoc
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-  #ifdef UNX
-    Name = "senddoc";
-    Styles = (PACKED);
-  #else
-    Name = "senddoc.exe";
-    Styles = (PACKED);
-  #endif
-End
-
-#if defined(UNX) && !defined(QUARTZ)
-
-File gid_File_Bin_Spadmin_Bin
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "spadmin.bin";
-End
-
-#endif
-
-File gid_File_Dtd_Accelerator
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "accelerator.dtd";
-End
-
-File gid_File_Dtd_Dialog
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "dialog.dtd";
-End
-
-File gid_File_Dtd_Event
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "event.dtd";
-End
-
-File gid_File_Dtd_Groupuinames
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "groupuinames.dtd";
-End
-
-File gid_File_Dtd_Image
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "image.dtd";
-End
-
-File gid_File_Dtd_Libraries
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "libraries.dtd";
-End
-
-File gid_File_Dtd_Library
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "library.dtd";
-End
-
-File gid_File_Dtd_Manifest
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "Manifest.dtd";
-End
-
-File gid_File_Dtd_Menubar
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "menubar.dtd";
-End
-
-File gid_File_Dtd_Module
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "module.dtd";
-End
-
-File gid_File_Dtd_Office
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "office.dtd";
-End
-
-File gid_File_Dtd_Statusbar
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "statusbar.dtd";
-End
-
-File gid_File_Dtd_Toolbar
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "toolbar.dtd";
-End
-
-STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt)
-
-STD_FILTER_FILE( gid_File_Filter_Eme, eme)
-
-STD_FILTER_FILE( gid_File_Filter_Icg, icg)
-
-STD_FILTER_FILE( gid_File_Filter_Egi, egi)
-
-STD_FILTER_FILE( gid_File_Filter_Epb, epb)
-
-STD_FILTER_FILE( gid_File_Filter_Epg, epg)
-
-STD_FILTER_FILE( gid_File_Filter_Epp, epp)
-
-STD_FILTER_FILE( gid_File_Filter_Eps, eps)
-
-STD_FILTER_FILE( gid_File_Filter_Ept, ept)
-
-STD_FILTER_FILE( gid_File_Filter_Era, era)
-
-STD_FILTER_FILE( gid_File_Filter_Eti, eti)
-
-STD_FILTER_FILE( gid_File_Filter_Exp, exp)
-
-STD_FILTER_FILE( gid_File_Filter_Icd, icd)
-
-STD_FILTER_FILE( gid_File_Filter_Idx, idx)
-
-STD_FILTER_FILE( gid_File_Filter_Ime, ime)
-
-STD_FILTER_FILE( gid_File_Filter_Ipb, ipb)
-
-STD_FILTER_FILE( gid_File_Filter_Ipd, ipd)
-
-STD_FILTER_FILE( gid_File_Filter_Ips, ips)
-
-STD_FILTER_FILE( gid_File_Filter_Ipt, ipt)
-
-STD_FILTER_FILE( gid_File_Filter_Ipx, ipx)
-
-STD_FILTER_FILE( gid_File_Filter_Ira, ira)
-
-STD_FILTER_FILE( gid_File_Filter_Itg, itg)
-
-STD_FILTER_FILE( gid_File_Filter_Iti, iti)
-
-STD_RES_FILE( gid_File_Res_Eps, eps )
-
-File gid_File_Help_Common_Zip
-    Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY_HELPPACK;
-    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(shared);
-    Patchfiles = ();
-End
-
-File gid_File_Help_Help_Zip
-    Dir = gid_Dir_Help;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "helpxsl.zip";
-End
-
-File gid_File_Help_Sbasic_Zip
-    Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY_HELPPACK;
-    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sbasic);
-    Patchfiles = ();
-End
-
-File gid_File_Help_Schart_Zip
-    Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY_HELPPACK;
-    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
-End
-
-#if defined WNT
-
-File gid_File_Jar_Accessbridge
-    TXT_FILE_BODY;
-    Name = "java_uno_accessbridge.jar";
-    Dir = gid_Dir_Classes;
-    Styles = (PACKED,DONT_OVERWRITE);
-End
-
-#endif
-
-#ifdef SOLAR_JAVA
-#ifndef SYSTEM_BSH
-STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
-#endif
-#endif
-
-#ifdef SOLAR_JAVA
-#ifndef SYSTEM_LUCENE
-STD_JAR_FILE( gid_File_Jar_Lucene_Core, lucene-core-2.3 )
-STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.3 )
-#endif
-#endif
-
-#ifdef SOLAR_JAVA
-STD_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
-#endif
-
-#ifdef SOLAR_JAVA
-
-#ifndef MACOSX
-
-File gid_File_Jar_Officebean
-    TXT_FILE_BODY;
-    Name = JARFILENAME(officebean);
-    Dir = gid_Dir_Classes;
-    Styles = (PACKED);
-End
-
-#endif
-
-#endif
-
-
-#ifdef SOLAR_JAVA
-STD_JAR_FILE( gid_File_Jar_Report, report )
-STD_JAR_FILE( gid_File_Jar_Table, table )
-STD_JAR_FILE( gid_File_Jar_Letter, letter )
-STD_JAR_FILE( gid_File_Jar_Form, form )
-STD_JAR_FILE( gid_File_Jar_Fax, fax )
-STD_JAR_FILE( gid_File_Jar_Agenda, agenda )
-STD_JAR_FILE( gid_File_Jar_Query, query )
-STD_JAR_FILE( gid_File_Jar_Web, web )
-#endif
-
-#ifdef SOLAR_JAVA
-#ifndef SYSTEM_HSQLDB
-STD_JAR_FILE( gid_File_Jar_Hsqldb, hsqldb )
-#endif
-STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
-#endif
-
-#ifdef SOLAR_JAVA
-File gid_File_Jar_Commonwizards
-    TXT_FILE_BODY;
-    Name = JARFILENAME(commonwizards);
-    Dir = gid_Dir_Classes;
-    Styles = (PACKED);
-End
-#endif
-
-#ifdef SOLAR_JAVA
-STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
-STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
-#endif
-
-#ifdef SOLAR_JAVA
-
-File gid_File_Jar_Unoil
-    TXT_FILE_BODY;
-    Name = "unoil.jar";
-    Dir = gid_Dir_Classes;
-    Styles = (PACKED,DONT_OVERWRITE);
-End
-
-#endif
-
-#ifdef SOLAR_JAVA
-#ifndef SYSTEM_SAXON
-STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
-#endif
-#endif
-
-#ifndef SYSTEM_LIBTEXTCAT_DATA
-// fingerprint files (lm)
-
-File gid_File_Conf_Fpdb
-    TXT_FILE_BODY;
-    Name = "fpdb.conf";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Afrikaans
-    TXT_FILE_BODY;
-    Name = "afrikaans.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Albanian
-    TXT_FILE_BODY;
-    Name = "albanian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Amharic_Utf
-    TXT_FILE_BODY;
-    Name = "amharic_utf.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Arabic
-    TXT_FILE_BODY;
-    Name = "arabic.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Armenian
-    TXT_FILE_BODY;
-    Name = "armenian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Basque
-    TXT_FILE_BODY;
-    Name = "basque.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Belarus
-    TXT_FILE_BODY;
-    Name = "belarus.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Bosnian
-    TXT_FILE_BODY;
-    Name = "bosnian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Breton
-    TXT_FILE_BODY;
-    Name = "breton.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Catalan
-    TXT_FILE_BODY;
-    Name = "catalan.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Chinese_Simplified
-    TXT_FILE_BODY;
-    Name = "chinese_simplified.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Chinese_Traditional
-    TXT_FILE_BODY;
-    Name = "chinese_traditional.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Croatian
-    TXT_FILE_BODY;
-    Name = "croatian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Czech
-    TXT_FILE_BODY;
-    Name = "czech.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Danish
-    TXT_FILE_BODY;
-    Name = "danish.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Drents
-    TXT_FILE_BODY;
-    Name = "drents.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Dutch
-    TXT_FILE_BODY;
-    Name = "dutch.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_English
-    TXT_FILE_BODY;
-    Name = "english.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Esperanto
-    TXT_FILE_BODY;
-    Name = "esperanto.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Estonian
-    TXT_FILE_BODY;
-    Name = "estonian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Finnish
-    TXT_FILE_BODY;
-    Name = "finnish.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_French
-    TXT_FILE_BODY;
-    Name = "french.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Frisian
-    TXT_FILE_BODY;
-    Name = "frisian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Georgian
-    TXT_FILE_BODY;
-    Name = "georgian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_German
-    TXT_FILE_BODY;
-    Name = "german.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Greek
-    TXT_FILE_BODY;
-    Name = "greek.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Hebrew
-    TXT_FILE_BODY;
-    Name = "hebrew.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Hindi
-    TXT_FILE_BODY;
-    Name = "hindi.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Hungarian
-    TXT_FILE_BODY;
-    Name = "hungarian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Icelandic
-    TXT_FILE_BODY;
-    Name = "icelandic.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Indonesian
-    TXT_FILE_BODY;
-    Name = "indonesian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Irish_Gaelic
-    TXT_FILE_BODY;
-    Name = "irish_gaelic.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-
-File gid_File_Lm_Italian
-    TXT_FILE_BODY;
-    Name = "italian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Japanese
-    TXT_FILE_BODY;
-    Name = "japanese.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Korean
-    TXT_FILE_BODY;
-    Name = "korean.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Latin
-    TXT_FILE_BODY;
-    Name = "latin.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Latvian
-    TXT_FILE_BODY;
-    Name = "latvian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Lithuanian
-    TXT_FILE_BODY;
-    Name = "lithuanian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Luxembourgish
-    TXT_FILE_BODY;
-    Name = "luxembourgish.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Malay
-    TXT_FILE_BODY;
-    Name = "malay.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Manx_Gaelic
-    TXT_FILE_BODY;
-    Name = "manx_gaelic.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Marathi
-    TXT_FILE_BODY;
-    Name = "marathi.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Middle_Frisian
-    TXT_FILE_BODY;
-    Name = "middle_frisian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Mingo
-    TXT_FILE_BODY;
-    Name = "mingo.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Mongolian_Cyrillic
-    TXT_FILE_BODY;
-    Name = "mongolian_cyrillic.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Nepali
-    TXT_FILE_BODY;
-    Name = "nepali.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Norwegian
-    TXT_FILE_BODY;
-    Name = "norwegian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Persian
-    TXT_FILE_BODY;
-    Name = "persian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Polish
-    TXT_FILE_BODY;
-    Name = "polish.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Portuguese
-    TXT_FILE_BODY;
-    Name = "portuguese.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Quechua
-    TXT_FILE_BODY;
-    Name = "quechua.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Romanian
-    TXT_FILE_BODY;
-    Name = "romanian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Romansh
-    TXT_FILE_BODY;
-    Name = "romansh.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Russian
-    TXT_FILE_BODY;
-    Name = "russian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Sanskrit
-    TXT_FILE_BODY;
-    Name = "sanskrit.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Scots
-    TXT_FILE_BODY;
-    Name = "scots.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Scots_Gaelic
-    TXT_FILE_BODY;
-    Name = "scots_gaelic.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Serbian
-    TXT_FILE_BODY;
-    Name = "serbian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Serbian_Latin
-    TXT_FILE_BODY;
-    Name = "serbian-latin.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Slovak_Ascii
-    TXT_FILE_BODY;
-    Name = "slovak_ascii.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Slovenian
-    TXT_FILE_BODY;
-    Name = "slovenian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Spanish
-    TXT_FILE_BODY;
-    Name = "spanish.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Swahili
-    TXT_FILE_BODY;
-    Name = "swahili.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Swedish
-    TXT_FILE_BODY;
-    Name = "swedish.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Tagalog
-    TXT_FILE_BODY;
-    Name = "tagalog.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Tamil
-    TXT_FILE_BODY;
-    Name = "tamil.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Thai
-    TXT_FILE_BODY;
-    Name = "thai.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Turkish
-    TXT_FILE_BODY;
-    Name = "turkish.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Ukrainian
-    TXT_FILE_BODY;
-    Name = "ukrainian.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Vietnamese
-    TXT_FILE_BODY;
-    Name = "vietnamese.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Welsh
-    TXT_FILE_BODY;
-    Name = "welsh.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Yiddish_Utf
-    TXT_FILE_BODY;
-    Name = "yiddish_utf.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-
-File gid_File_Lm_Zulu
-    TXT_FILE_BODY;
-    Name = "zulu.lm";
-    Dir = gid_Dir_Share_Fingerprint;
-    Styles = (PACKED);
-End
-#endif
-
-// mod files
-
-File gid_File_Mod_Chart
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "chart.mod";
-End
-
-File gid_File_Mod_Datastyl
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "datastyl.mod";
-End
-
-File gid_File_Mod_Defs
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "defs.mod";
-End
-
-File gid_File_Mod_Drawing
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "drawing.mod";
-End
-
-File gid_File_Mod_Dtypes
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "dtypes.mod";
-End
-
-File gid_File_Mod_Form
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "form.mod";
-End
-
-File gid_File_Mod_Meta
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "meta.mod";
-End
-
-File gid_File_Mod_Nmspace
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "nmspace.mod";
-End
-
-File gid_File_Mod_Office
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "office.mod";
-End
-
-File gid_File_Mod_Script
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "script.mod";
-End
-
-File gid_File_Mod_Settings
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "settings.mod";
-End
-
-File gid_File_Mod_Style
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "style.mod";
-End
-
-File gid_File_Mod_Table
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "table.mod";
-End
-
-File gid_File_Mod_Text
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "text.mod";
-End
-
-#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) 
-
-File gid_File_Mozilla_Runtime
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "mozruntime.zip";
-End
-
-#endif
-
-File gid_File_Share_Registry_Main_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Dir_Share_Registry;
-    Name = "main.xcd";
-End
-
-#ifdef WNT
-
-File gid_File_Share_Registry_Forcedefault_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE, SET_OFFICE_LANGUAGE);
-    Dir = gid_Dir_Share_Registry;
-    Name = "forcedefault.xcd";
-End
-
-#endif
-
-File gid_File_Oo_Ldap_Xcd_Sample
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "oo-ldap.xcd.sample";
-End
-
-File gid_File_Oo_Ad_Ldap_Xcd_Sample
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "oo-ad-ldap.xcd.sample";
-End
-
-File gid_File_Rdb_Offapi
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "offapi.rdb";
-End
-
-File gid_File_Rdb_TypesVba
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED, OVERWRITE);
-    Name = "oovbaapi.rdb";
-End
-
-File gid_File_Registry_Lang
-    Dir = gid_Dir_Share_Registry_Res;
-    TXT_FILE_BODY;
-    EXTRA_ALL_LANG_BUT_EN_US(registry,xcd);
-End
-
-File gid_File_Registry_Filter_Zip
-    Dir = gid_Dir_Share_Registry_Res;
-    TXT_FILE_BODY;
-    EXTRA_ALL_LANG(fcfg_langpack,xcd);
-End
-
-File gid_File_Registry_Spool_Langpack_Lang
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    FILE_ALL_LANG_LETTER(Langpack-,xcd);
-End
-
-File gid_File_Share_Registry_Ctl_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED,MAKE_LANG_SPECIFIC);
-    Dir = gid_Dir_Share_Registry;
-    Name (ar) = "ctl.xcd";
-    Name (dz) = "ctl.xcd";
-    Name (fa) = "ctl.xcd";
-    Name (gu) = "ctl.xcd";
-    Name (he) = "ctl.xcd";
-    Name (hi) = "ctl.xcd";
-    Name (km) = "ctl.xcd";
-    Name (lo) = "ctl.xcd";
-    Name (my) = "ctl.xcd";
-    Name (ne) = "ctl.xcd";
-    Name (or) = "ctl.xcd";
-    Name (pa-IN) = "ctl.xcd";
-    Name (ta) = "ctl.xcd";
-    Name (th) = "ctl.xcd";
-End
-
-File gid_File_Share_Registry_Ctlseqcheck_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED,MAKE_LANG_SPECIFIC);
-    Dir = gid_Dir_Share_Registry;
-    Name (km) = "ctlseqcheck.xcd";
-    Name (lo) = "ctlseqcheck.xcd";
-    Name (th) = "ctlseqcheck.xcd";
-End
-
-File gid_File_Scripts_Beanshell
-    Dir = gid_Dir_Share_Scripts;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "ScriptsBeanShell.zip";
-End
-
-#ifdef SOLAR_JAVA
-File gid_File_Scripts_Java
-    Dir = gid_Dir_Share_Scripts;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "ScriptsJava.zip";
-End
-#endif
-
-File gid_File_Scripts_Javascript
-    Dir = gid_Dir_Share_Scripts;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "ScriptsJavaScript.zip";
-End
-
-// new user interface configuration files
-File gid_File_Share_Config_Sofficecfg_uiconfig_Zip
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Dir = gid_Dir_Share_Config_Sofficecfg;
-    Name = "uiconfig.zip";
-    Patchfiles = ();
-End
-
-#ifdef WNT
-
-STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods)
-
-File gid_File_Shellnew2_Ods_Soffice
-    TXT_FILE_BODY;
-    Styles = (PACKED,WORKSTATION, OVERWRITE);
-    Dir = PREDEFINED_OSWINSHELLNEWDIR;
-    NetDir = gid_Dir_ShellnewToo;
-    Name = "soffice.ods";
-End
-
-#endif
-
-#ifdef WNT
-
-STD_SHELLNEW_FILE(gid_File_Shellnew_Odg_Soffice, soffice.odg)
-
-File gid_File_Shellnew2_Odg_Soffice
-    TXT_FILE_BODY;
-    Styles = (PACKED,WORKSTATION, OVERWRITE);
-    Dir = PREDEFINED_OSWINSHELLNEWDIR;
-    NetDir = gid_Dir_ShellnewToo;
-    Name = "soffice.odg";
-End
-
-#endif
-
-#ifdef WNT
-
-STD_SHELLNEW_FILE(gid_File_Shellnew_Odp_Soffice, soffice.odp)
-
-File gid_File_Shellnew2_Odp_Soffice
-    TXT_FILE_BODY;
-    Styles = (PACKED,WORKSTATION, OVERWRITE);
-    Dir = PREDEFINED_OSWINSHELLNEWDIR;
-    NetDir = gid_Dir_ShellnewToo;
-    Name = "soffice.odp";
-End
-
-#endif
-
-#ifdef WNT
-
-STD_SHELLNEW_FILE(gid_File_Shellnew_Odt_Soffice, soffice.odt)
-
-File gid_File_Shellnew2_Odt_Soffice
-    TXT_FILE_BODY;
-    Styles = (PACKED,WORKSTATION, OVERWRITE);
-    Dir = PREDEFINED_OSWINSHELLNEWDIR;
-    NetDir = gid_Dir_ShellnewToo;
-    Name = "soffice.odt";
-End
-
-#endif
-
-#if defined UNX && ! defined MACOSX
-
-File gid_File_Txt_Pagein_Calc
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "pagein-calc";
-End
-
-File gid_File_Txt_Pagein_Common
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "pagein-common";
-End
-
-File gid_File_Txt_Pagein_Draw
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "pagein-draw";
-End
-
-File gid_File_Txt_Pagein_Impress
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "pagein-impress";
-End
-
-File gid_File_Txt_Pagein_Writer
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "pagein-writer";
-End
-
-#endif
-
-File gid_File_Xsl_Common_Measure_Conversion
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Common;
-    Name = "/xslt/common/measure_conversion.xsl";
-End
-
-File gid_File_Xsl_Common_Math_Functions
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Common;
-    Name = "/xslt/common/math.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Body
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Common;
-    Name = "/xslt/export/common/body.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Table_Of_Content
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Common;
-    Name = "/xslt/export/common/table_of_content.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Ooo2ms_Docpr
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Common;
-    Name = "/xslt/export/common/ooo2ms_docpr.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Styles_Styles_Collector
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Common_Styles;
-    Name = "/xslt/export/common/styles/style_collector.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Styles_Style_Mapping_Css
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Common_Styles;
-    Name = "/xslt/export/common/styles/style_mapping_css.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Table_Table
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Common_Table;
-    Name = "/xslt/export/common/table/table.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Table_Table_Cells
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Common_Table;
-    Name = "/xslt/export/common/table/table_cells.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Table_Table_Columns
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Common_Table;
-    Name = "/xslt/export/common/table/table_columns.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Table_Table_Rows
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Common_Table;
-    Name = "/xslt/export/common/table/table_rows.xsl";
-End
-
-File gid_File_Xsl_Export_Spreadsheetml_Formular
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Spreadsheetml;
-    Name = "/xslt/export/spreadsheetml/formular.xsl";
-End
-
-File gid_File_Xsl_Export_Spreadsheetml_Ooo2spreadsheetml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Spreadsheetml;
-    Name = "/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl";
-End
-
-File gid_File_Xsl_Export_Spreadsheetml_Style_Mapping
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Spreadsheetml;
-    Name = "/xslt/export/spreadsheetml/style_mapping.xsl";
-End
-
-File gid_File_Xsl_Export_Spreadsheetml_Styles
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Spreadsheetml;
-    Name = "/xslt/export/spreadsheetml/styles.xsl";
-End
-
-File gid_File_Xsl_Export_Spreadsheetml_Table
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Spreadsheetml;
-    Name = "/xslt/export/spreadsheetml/table.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Wordml;
-    Name = "/xslt/export/wordml/ooo2wordml.xsl";
-End
-File gid_File_Xsl_Export_uof_odf2uof_text
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_uof;
-    Name = "/xslt/export/uof/odf2uof_text.xsl";
-End
-File gid_File_Xsl_Export_uof_odf2uof_spreadsheet
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_uof;
-    Name = "/xslt/export/uof/odf2uof_spreadsheet.xsl";
-End
-File gid_File_Xsl_Export_uof_odf2uof_presentation
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_uof;
-    Name = "/xslt/export/uof/odf2uof_presentation.xsl";
-End
-File gid_File_Xsl_Import_uof_uof2odf_text
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_uof;
-    Name = "/xslt/import/uof/uof2odf_text.xsl";
-End
-File gid_File_Xsl_Import_uof_uof2odf_spreadsheet
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_uof;
-    Name = "/xslt/import/uof/uof2odf_spreadsheet.xsl";
-End
-File gid_File_Xsl_Import_uof_uof2odf_presentation
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_uof;
-    Name = "/xslt/import/uof/uof2odf_presentation.xsl";
-End
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Border
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Wordml;
-    Name = "/xslt/export/wordml/ooo2wordml_border.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Custom_Draw
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Wordml;
-    Name = "/xslt/export/wordml/ooo2wordml_custom_draw.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Draw
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Wordml;
-    Name = "/xslt/export/wordml/ooo2wordml_draw.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Field
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Wordml;
-    Name = "/xslt/export/wordml/ooo2wordml_field.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_List
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Wordml;
-    Name = "/xslt/export/wordml/ooo2wordml_list.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Page
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Wordml;
-    Name = "/xslt/export/wordml/ooo2wordml_page.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Path
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Wordml;
-    Name = "/xslt/export/wordml/ooo2wordml_path.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Settings
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Wordml;
-    Name = "/xslt/export/wordml/ooo2wordml_settings.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Table
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Wordml;
-    Name = "/xslt/export/wordml/ooo2wordml_table.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Text
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Wordml;
-    Name = "/xslt/export/wordml/ooo2wordml_text.xsl";
-End
-
-File gid_File_Xsl_Import_Common_Ms2ooo_Docpr
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_Common;
-    Name = "/xslt/import/common/ms2ooo_docpr.xsl";
-End
-
-File gid_File_Xsl_Import_Spreadsheetml_Spreadsheetml2ooo
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_Spreadsheetml;
-    Name = "/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_Wordml;
-    Name = "/xslt/import/wordml/wordml2ooo.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Custom_Draw
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_Wordml;
-    Name = "/xslt/import/wordml/wordml2ooo_custom_draw.xsl";
-End
-
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Draw
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_Wordml;
-    Name = "/xslt/import/wordml/wordml2ooo_draw.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Field
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_Wordml;
-    Name = "/xslt/import/wordml/wordml2ooo_field.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_List
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_Wordml;
-    Name = "/xslt/import/wordml/wordml2ooo_list.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Page
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_Wordml;
-    Name = "/xslt/import/wordml/wordml2ooo_page.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Settings
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_Wordml;
-    Name = "/xslt/import/wordml/wordml2ooo_settings.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Table
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_Wordml;
-    Name = "/xslt/import/wordml/wordml2ooo_table.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Text
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_Wordml;
-    Name = "/xslt/import/wordml/wordml2ooo_text.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Path
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_Wordml;
-    Name = "/xslt/import/wordml/wordml2ooo_path.xsl";
-End
-
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Props
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Import_Wordml;
-    Name = "/xslt/import/wordml/wordml2ooo_props.xsl";
-End
-
-#ifdef WNT
-File gid_File_Txt_Patchfiles
-    TXT_FILE_BODY;
-    Name = "patchlist.txt";
-    Dir = gid_Dir_Program;
-    Styles = (PACKED,PATCH,PATCH_ONLY,DONTRENAMEINPATCH);
-End
-#endif
-
-File gid_Starregistry_Services_Rdb
-    TXT_FILE_BODY;
-    Name = "services.rdb";
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-End
-
-#ifdef LINUX
-File gid_File_Dat_Root3
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "root3.dat";
-    Styles = (PACKED);
-End
-#endif
-
-#ifdef LINUX
-File gid_File_Dat_Root4
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "root4.dat";
-    Styles = (PACKED);
-End
-#endif
-
-#ifdef LINUX
-File gid_File_Dat_Root5
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "root5.dat";
-    Styles = (PACKED);
-End
-#endif
-
-#ifdef MACOSX 
-File gid_File_App_PkgInfo
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Bundle_Contents;
-    Name = "PkgInfo";
-End
-#endif
-
-#ifdef MACOSX 
-File gid_File_App_InfoPlist
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Bundle_Contents;
-    Name = "Info.plist";
-    Styles = (SCPZIP_REPLACE);
-End
-#endif
-
-#ifdef MACOSX
-File gid_File_Icns_Bundle
-    ARCHIVE_TXT_FILE_BODY;
-    Dir = gid_Dir_Bundle_Contents_Resources;
-    Name = "osxicons.zip";
-    Styles = (ARCHIVE);
-End
-#endif
-
-#ifdef MACOSX
-File gid_File_Res_Bundle
-    ARCHIVE_TXT_FILE_BODY;
-    Dir = gid_Dir_Bundle_Contents_Resources;
-    Name = "osxres.zip";
-    Styles = (ARCHIVE);
-End
-#endif
-
-#ifdef MACOSX
-File gid_File_InfoPlist_Lang
-    Dir = gid_Dir_Bundle_Contents_Resources_Lang;
-    ARCHIVE_TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    EXTRA_ALL_LANG(InfoPlist,zip);
-End
-#endif
-
-#ifdef MACOSX
-File gid_File_Spotlight_Bundle
-    ARCHIVE_TXT_FILE_BODY;
-    Dir = gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents;
-    Name = "mdibundle.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
-End
-#endif
-
-File gid_File_Config_Javasettingsunopkginstall
-    USER_FILE_BODY;
-    Dir = gid_Dir_Config;
-    Name = "javasettingsunopkginstall.xml";
-  #ifdef SOLARIS
-    Styles = (PACKED,VOLATILEFILE);
-  #else
-    Styles = (PACKED);
-  #endif
-End
-
-#ifdef THEME_DEFAULT
-File gid_File_Images_Zip
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
-    Name = "images.zip";
-    Styles = (PACKED);
-End
-#endif
-
-#ifdef THEME_CRYSTAL
-File gid_File_ImagesCrystal_Zip
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
-    Name = "images_crystal.zip";
-    Styles = (PACKED);
-End
-#endif
-
-#ifdef THEME_OXYGEN
-File gid_File_ImagesOxygen_Zip
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
-    Name = "images_oxygen.zip";
-    Styles = (PACKED);
-End
-#endif
-
-#ifdef THEME_HICONTRAST
-File gid_File_ImagesHicontrast_Zip
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
-    Name = "images_hicontrast.zip";
-    Styles = (PACKED);
-End
-#endif
-
-#ifdef THEME_TANGO
-File gid_File_ImagesTango_Zip
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
-    Name = "images_tango.zip";
-    Styles = (PACKED);
-End
-#endif
-
-File gid_File_Share_Registry_Lingucomponent_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "lingucomponent.xcd";
-End
-
-// Dictionary extensions
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Af
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Af;
-	Name = "dict-af.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Br
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Br;
-	Name = "dict-br.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Ca
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_Ca;
-    Name = "dict-ca.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Cs
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Cs;
-	Name = "dict-cs.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Da
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Da;
-	Name = "dict-da.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_De_AT
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_De_At;
-	Name = "dict-de-AT.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_De_CH
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_De_Ch;
-    Name = "dict-de-CH.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_De_DE
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_De_De;
-    Name = "dict-de-DE.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_En
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_En;
-	Name = "dict-en.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Es
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Es;
-	Name = "dict-es.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Et
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Et;
-	Name = "dict-et.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Fr
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Fr;
-	Name = "dict-fr.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Gl
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Gl;
-	Name = "dict-gl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_He
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_He;
-    Name = "dict-he.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Hu
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Hu;
-	Name = "dict-hu.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Hr
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Hr;
-	Name = "dict-hr.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_It
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_It;
-	Name = "dict-it.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Ku_Tr
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr;
-	Name = "dict-ku-TR.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Lt
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Lt;
-	Name = "dict-lt.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Ne
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ne;
-	Name = "dict-ne.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Nl
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Nl;
-	Name = "dict-nl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_No
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_No;
-    Name = "dict-no.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Oc
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Oc;
-	Name = "dict-oc.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Pl
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pl;
-	Name = "dict-pl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Pt
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pt;
-	Name = "dict-pt.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Ro
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_Ro;
-    Name = "dict-ro.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Ru
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ru;
-	Name = "dict-ru.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Sk
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sk;
-	Name = "dict-sk.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Sl
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sl;
-	Name = "dict-sl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Sr
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sr;
-	Name = "dict-sr.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Sv
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sv;
-	Name = "dict-sv.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Sw
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sw;
-	Name = "dict-sw.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Th
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Th;
-	Name = "dict-th.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Uk
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Uk;
-	Name = "dict-uk.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Vi
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Vi;
-	Name = "dict-vi.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_Zu
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Zu;
-	Name = "dict-zu.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-	UnixRights = 444;
-End
-#endif
-
-// #ifdef BUILD_SPECIAL
-// File gid_File_Extension_Oxt_Oooimprovement
-//    Name = "OOoImprovement.oxt";
-//    Dir = gid_Brand_Dir_Share_Extensions_Oooimprovement;
-//    Styles = (PACKED, ARCHIVE);
-//    UnixRights = 444;
-// End
-// #endif
-
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
deleted file mode 100644
index 7cfbb4fc2..000000000
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-STD_RES_FILE( gid_File_Res_Basctl, basctl)
-
-STD_RES_FILE( gid_File_Res_Bib, bib )
-
-STD_RES_FILE( gid_File_Res_Cal, cal )
-
-STD_RES_FILE( gid_File_Res_Chartcontroller, chartcontroller )
-
-STD_RES_FILE( gid_File_Res_Dba, dba)
-
-STD_RES_FILE( gid_File_Res_Sdbt, sdbt)
-
-STD_RES_FILE( gid_File_Res_Dbmm, dbmm)
-
-STD_RES_FILE( gid_File_Res_Dbw, dbw )
-
-STD_RES_FILE( gid_File_Res_Dkt, dkt)
-
-STD_RES_FILE( gid_File_Res_Eur, eur )
-
-STD_RES_FILE( gid_File_Res_Frm, frm)
-
-STD_RES_FILE( gid_File_Res_Fwe, fwe)
-
-STD_RES_FILE( gid_File_Res_Fps_Office, fps_office)
-
-STD_RES_FILE( gid_File_Res_Gal, gal )
-
-STD_RES_FILE( gid_File_Res_Imp, imp )
-
-STD_RES_FILE( gid_File_Res_Deployment, deployment )
-STD_RES_FILE( gid_File_Res_DeploymentGui, deploymentgui )
-
-STD_RES_FILE( gid_File_Res_Ofa, ofa )
-
-STD_RES_FILE( gid_File_Res_Pcr, pcr)
-
-STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter)
-
-STD_RES_FILE( gid_File_Res_Productregistration, productregistration)
-
-#ifdef UNX
-
-STD_RES_FILE( gid_File_Res_San, san )
-
-#endif
-
-STD_RES_FILE( gid_File_Res_Sd, sd )
-
-STD_RES_FILE( gid_File_Res_Sfx, sfx )
-
-#if defined(UNX) && !defined(QUARTZ)
-
-STD_RES_FILE( gid_File_Res_Spa, spa )
-
-#endif
-
-STD_RES_FILE( gid_File_Res_Stt, stt )
-STD_RES_FILE( gid_File_Res_Sb, sb )
-
-STD_RES_FILE( gid_File_Res_Svl, svl )
-
-STD_RES_FILE( gid_File_Res_Svt, svt )
-
-STD_RES_FILE( gid_File_Res_Svx, svx )
-STD_RES_FILE( gid_File_Res_Editeng, editeng )
-STD_RES_FILE( gid_File_Res_TextConversionDlgs, textconversiondlgs )
-
-STD_RES_FILE( gid_File_Res_Cui, cui )
-
-STD_RES_FILE( gid_File_Res_Sw, sw )
-
-STD_RES_FILE( gid_File_Res_Tk, tk )
-STD_RES_FILE( gid_File_Res_Acc, acc )
-
-STD_RES_FILE( gid_File_Res_Tpl, tpl )
-
-STD_RES_FILE( gid_File_Res_Uui, uui )
-
-STD_RES_FILE( gid_File_Res_Vcl, vcl )
-
-STD_RES_FILE( gid_File_Res_Wzi, wzi )
-
-//STD_RES_FILE( gid_File_Res_Wwz, wwz )
-
-STD_RES_FILE( gid_File_Res_Xsltdlg, xsltdlg )
-
-STD_RES_FILE( gid_File_Res_AVMedia, avmedia )
-
-#ifndef WITHOUT_MOZILLA
-STD_RES_FILE( gid_File_Res_XMLSecurity, xmlsec )
-#endif
-
-STD_RES_FILE( gid_File_Res_UpdChk, updchk )
-
-STD_RES_FILE( gid_File_Res_Upd, upd )
-
-STD_RES_FILE( gid_File_Res_T602Filter, t602filter )
-
-STD_RES_FILE( gid_File_Res_Forui, forui )
-STD_RES_FILE( gid_File_Res_For, for )
-
diff --git a/scp2/source/ooo/folder_ooo.scp b/scp2/source/ooo/folder_ooo.scp
deleted file mode 100644
index 88e406296..000000000
--- a/scp2/source/ooo/folder_ooo.scp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Folder gid_Folder_Staroffice51
-    Name = ".";
-End
-
diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
deleted file mode 100644
index b6ef81eff..000000000
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-FolderItem gid_Folderitem_Soffice
-    Name = "%PRODUCTNAME";
-    ModuleID = gid_Module_Root;
-    FolderID = gid_Folder_Staroffice51;
-    FileID = gid_Brand_File_Bin_Soffice;
-    IconFile = gid_Brand_File_Bin_Soffice;
-    IconID = 0;
-    WkDir = gid_Dir_Program;
-    Parameter = "";
-    Styles = (NOWEB, NON_ADVERTISED);
-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
-End
-
-FolderItem gid_Folderitem_Soffice_Desktop
-    Name = "%PRODUCTNAME %PRODUCTVERSION";
-    ModuleID = gid_Module_Root;
-    FolderID = PREDEFINED_DESKTOP;
-    FileID = gid_Brand_File_Bin_Soffice;
-    IconFile = gid_Brand_File_Bin_Soffice;
-    IconID = 0;
-    ComponentIDFile = "gid_Brand_File_Desktophelper_Txt";
-    WkDir = gid_Dir_Program;
-    Parameter = "";
-	Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME);
-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
-    ComponentCondition = "CREATEDESKTOPLINK=1";
-End
diff --git a/scp2/source/ooo/folderitem_ooo.ulf b/scp2/source/ooo/folderitem_ooo.ulf
deleted file mode 100644
index 2c4696dac..000000000
--- a/scp2/source/ooo/folderitem_ooo.ulf
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
-[STR_FI_NAME_FROMTEMPLATE]
-en-US = "From Template"
-
-[STR_FI_NAME_OPENDOCUMENT]
-en-US = "Open Document"
-
-[STR_FI_TOOLTIP_SOFFICE]
-en-US = "LibreOffice, the office productivity suite provided by The Document Foundation. See http://www.documentfoundation.org"
diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp
deleted file mode 100644
index 26bdc09ed..000000000
--- a/scp2/source/ooo/installation_ooo.scp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Installation gid_Installation_Ooo
-    ProductName = "${PRODUCTNAME}";
-    ProductVersion = "${PRODUCTVERSION}";
-    ProductExtension = "${PRODUCTEXTENSION}";
-    OOoBaseVersion = "${OOOBASEVERSION}";
-    UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
-    JavaVersion = "${JAVAVERSION}";
-    SxwFormatName = "OpenOffice.org";
-    SxwFormatVersion = "1.1";
-    VendorName = "OpenOffice.org";
-  #ifdef WNT
-    DefaultDestPath = "<winprogpath>\${PRODUCTNAME}${PRODUCTVERSION}";
-  #else
-	DefaultDestPath = "/opt";
-  #endif
-    UpdateFor = "${UPDATEFOR}";
-    PatchLevel = 0;
-    Styles = (KEEP_OLD_VERSION);
-End
-
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
deleted file mode 100644
index d24715f2c..000000000
--- a/scp2/source/ooo/makefile.mk
+++ /dev/null
@@ -1,354 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=ooo
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  i18npool/version.mk
-
-.IF "$(COM)" == "MSC"
-SCPDEFS+=-D_MSC
-.ENDIF
-
-.IF "$(BUILD_SPECIAL)"!=""
-SCPDEFS+=-DBUILD_SPECIAL
-.ENDIF
-
-.IF "$(ENABLE_ONLINE_UPDATE)"!=""
-SCPDEFS+=-DENABLE_ONLINE_UPDATE
-.ENDIF
-
-.IF "$(BUILD_X64)"!=""
-SCPDEFS+=-DBUILD_X64
-.ENDIF
-
-.IF "$(ENABLE_OPENGL)"=="TRUE"
-SCPDEFS+=-DENABLE_OPENGL
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-.IF "$(ENABLE_GTK)" != ""
-SCPDEFS+=-DENABLE_GTK
-PKGCONFIG_MODULES=gtk+-2.0
-.INCLUDE: pkg_config.mk
-GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
-.IF "$(GTK_TWO_FOUR)" != ""
-SCPDEFS+=-DGTK_TWO_FOUR
-.ENDIF
-.ENDIF
-.IF "$(ENABLE_GTK3)" != ""
-SCPDEFS+=-DENABLE_GTK3
-.ENDIF
-.ENDIF			# "$(GUI)"=="UNX"
-
-.IF "$(ENABLE_KDE)" != ""
-SCPDEFS+=-DENABLE_KDE
-.ENDIF
-
-.IF "$(ENABLE_KDE4)" != ""
-SCPDEFS+=-DENABLE_KDE4
-.ENDIF
-
-.IF "$(ENABLE_KAB)" != ""
-SCPDEFS+=-DENABLE_KAB
-.ENDIF
-
-.IF "$(ENABLE_EVOAB2)" != ""
-SCPDEFS+=-DENABLE_EVOAB2
-.ENDIF
-
-.IF "$(ENABLE_DIRECTX)" != ""
-SCPDEFS+=-DENABLE_DIRECTX
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-#X11 MacOSX has no cairo-canvas
-.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
-SCPDEFS+=-DENABLE_CAIROCANVAS
-.ENDIF
-.ENDIF
-
-.IF "$(SYSTEM_CAIRO)" == "YES"
-SCPDEFS+=-DSYSTEM_CAIRO
-.ENDIF
-
-.IF "$(SYSTEM_LIBXML)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBXML
-.ENDIF
-
-.IF "$(SYSTEM_LIBXSLT)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBXSLT
-.ELSE
-.INCLUDE :  libxsltversion.mk
-SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
-.ENDIF
-
-.IF "$(SYSTEM_DB)" == "YES"
-SCPDEFS+=-DSYSTEM_DB
-.ENDIF
-
-.IF "$(WITH_MOZILLA)" == "NO"
-SCPDEFS+=-DWITHOUT_MOZILLA
-.ENDIF
-
-.IF "$(WITH_MYSPELL_DICTS)" == "NO"
-SCPDEFS+=-DWITHOUT_MYSPELL_DICTS
-.ENDIF
-
-.IF "$(SYSTEM_MOZILLA)" == "YES"
-SCPDEFS+=-DSYSTEM_MOZILLA
-.ENDIF
-
-.IF "$(WITH_LDAP)" == "YES"
-SCPDEFS+=-DWITH_LDAP
-.ENDIF
-
-.IF "$(SYSTEM_CURL)" == "YES"
-SCPDEFS+=-DSYSTEM_CURL
-.ENDIF
-
-.IF "$(SYSTEM_STDLIBS)" == "YES"
-SCPDEFS+=-DSYSTEM_STDLIBS
-.ENDIF
-
-.IF "$(SYSTEM_SNDFILE)" == "YES"
-SCPDEFS+=-DSYSTEM_SNDFILE
-.ENDIF
-
-.IF "$(SYSTEM_PORTAUDIO)" == "YES"
-SCPDEFS+=-DSYSTEM_PORTAUDIO
-.ENDIF
-
-.IF "$(SYSTEM_HUNSPELL)" == "YES"
-SCPDEFS+=-DSYSTEM_HUNSPELL
-.ENDIF
-
-.IF "$(SYSTEM_REDLAND)" == "YES"
-SCPDEFS+=-DSYSTEM_REDLAND
-.ELSE
-.INCLUDE :  redlandversion.mk
-SCPDEFS+=\
-    -DRAPTOR_MAJOR=$(RAPTOR_MAJOR) \
-    -DRASQAL_MAJOR=$(RASQAL_MAJOR) \
-    -DREDLAND_MAJOR=$(REDLAND_MAJOR)
-.ENDIF
-
-.IF "$(SYSTEM_BSH)" == "YES"
-SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\"
-.ENDIF
-
-.IF "$(SYSTEM_HSQLDB)" == "YES"
-SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
-.ENDIF
-
-.IF "$(SYSTEM_SAXON)" == "YES"
-SCPDEFS+=-DSYSTEM_SAXON -DSAXON_JAR=\""file://$(SAXON_JAR)"\"
-.ENDIF
-
-.IF "$(JDK)" == "gcj"
-SCPDEFS+=-DGCJ
-.ENDIF
-
-.IF "$(SYSTEM_LUCENE)" == "YES"
-SCPDEFS+=-DSYSTEM_LUCENE
-.ENDIF
-
-.IF "$(SYSTEM_ICU)" == "YES"
-SCPDEFS+=-DSYSTEM_ICU
-.ELSE
-.INCLUDE :  icuversion.mk
-SCPDEFS+=\
-    -DICU_MAJOR=$(ICU_MAJOR) \
-    -DICU_MINOR=$(ICU_MINOR) \
-    -DICU_MICRO=$(ICU_MICRO)
-.ENDIF
-
-SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
-
-.IF "$(DISABLE_NEON)" == "TRUE"
-SCPDEFS+=-DDISABLE_NEON
-.ENDIF
-.IF "$(SYSTEM_NEON)" == "YES"
-SCPDEFS+=-DSYSTEM_NEON
-.ENDIF
-
-# if yes or unset (neon not used) -> do not install openssl library!
-.IF $(SYSTEM_OPENSSL) != "YES"
-SCPDEFS+=-DOPENSSL
-.ENDIF
-
-.IF "$(DISABLE_ATL)"!=""
-SCPDEFS+=-DDISABLE_ATL
-.ENDIF
-
-.IF "$(DISABLE_PYTHON)" == "TRUE"
-SCPDEFS+=-DDISABLE_PYUNO
-.ELSE
-.IF "$(SYSTEM_PYTHON)" == "YES"
-SCPDEFS+=-DSYSTEM_PYTHON
-.ENDIF
-.ENDIF
-
-.IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBTEXTCAT
-.ENDIF
-
-.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
-SCPDEFS+=-DSYSTEM_LIBTEXTCAT_DATA
-.ENDIF
-
-.IF "$(ENABLE_SVCTAGS)" == "YES"
-SCPDEFS+=-DENABLE_SVCTAGS
-.ENDIF
-
-.IF "$(WITH_VC_REDIST)" == "TRUE"
-SCPDEFS+=-DWITH_VC_REDIST
-.ENDIF
-
-.IF "$(MINGW_GCCDLL)"!=""
-SCPDEFS+=-DMINGW_GCCDLL=\""$(MINGW_GCCDLL)"\"
-.ENDIF
-
-.IF "$(MINGW_GXXDLL)"!=""
-SCPDEFS+=-DMINGW_GXXDLL=\""$(MINGW_GXXDLL)"\"
-.ENDIF
-
-.IF "$(SYSTEM_GDKPIXBUF)" == "YES"
-SCPDEFS+=-DSYSTEM_GDKPIXBUF
-.ENDIF
-
-.IF "$(SYSTEM_GETTEXT)" == "YES"
-SCPDEFS+=-DSYSTEM_GETTEXT
-.ENDIF
-
-.IF "$(SYSTEM_GLIB)" == "YES"
-SCPDEFS+=-DSYSTEM_GLIB
-.ENDIF
-
-.IF "$(SYSTEM_LIBCROCO)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBCROCO
-.ENDIF
-
-.IF "$(SYSTEM_LIBJPEG)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBJPEG
-.ENDIF
-
-.IF "$(ENABLE_LIBRSVG)" == "INTERNAL"
-SCPDEFS+=-DENABLE_LIBRSVG
-.ENDIF
-
-.IF "$(SYSTEM_LIBRSVG)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBRSVG
-.ENDIF
-
-.IF "$(SYSTEM_PANGO)" == "YES"
-SCPDEFS+=-DSYSTEM_PANGO
-.ENDIF
-
-.IF "$(SYSTEM_LIBGSF)" == "YES"
-SCPDEFS+=-DSYSTEM_LIBGSF
-.ENDIF
-
-.IF "$(ENABLE_LOMENUBAR)" == "TRUE"
-SCPDEFS+=-DENABLE_LOMENUBAR
-.ENDIF
-
-SCP_PRODUCT_TYPE=osl
-
-ICUVERSION_DEPENDENT_FILES= \
-        $(PAR)$/$(SCP_PRODUCT_TYPE)$/file_library_ooo.par \
-        $(PAR)$/$(SCP_PRODUCT_TYPE)$/shortcut_ooo.par
-
-ISOLANGVERSION_DEPENDENT_FILES= \
-        $(PAR)$/$(SCP_PRODUCT_TYPE)$/file_library_ooo.par
-
-PARFILES=                          \
-        installation_ooo.par       \
-        scpaction_ooo.par          \
-        directory_ooo.par          \
-        directory_ooo_macosx.par   \
-        file_ooo.par               \
-        file_extra_ooo.par         \
-        file_font_ooo.par          \
-        file_library_ooo.par       \
-        file_resource_ooo.par      \
-        file_improvement.par       \
-        shortcut_ooo.par           \
-        module_ooo.par             \
-        module_hidden_ooo.par      \
-        module_langpack.par        \
-        module_lang_template.par   \
-        module_helppack.par        \
-        module_help_template.par   \
-        module_java.par            \
-        module_systemint.par       \
-        module_improvement.par     \
-        profile_ooo.par            \
-        profileitem_ooo.par        \
-        ure.par                    \
-        ure_into_ooo.par           \
-        ure_standalone.par         \
-        common_brand.par           \
-        common_brand_readme.par    \
-        ooo_brand.par
-
-.IF "$(GUI)"=="WNT"
-PARFILES +=                        \
-        file_jre_ooo.par           \
-        folder_ooo.par             \
-        folderitem_ooo.par         \
-        registryitem_ooo.par       \
-        vc_redist.par              \
-        windowscustomaction_ooo.par
-.ENDIF
-
-ULFFILES=                          \
-        directory_ooo.ulf          \
-        folderitem_ooo.ulf         \
-        module_ooo.ulf             \
-        module_langpack.ulf        \
-        module_helppack.ulf        \
-        module_java.ulf            \
-        registryitem_ooo.ulf       \
-        module_systemint.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
-
-.IF "$(SYSTEM_ICU)" != "YES"
-$(ICUVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/icuversion.mk
-.ENDIF
-
-$(ISOLANGVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/i18npool/version.mk
-
diff --git a/scp2/source/ooo/module_headless.scp b/scp2/source/ooo/module_headless.scp
deleted file mode 100644
index bb77b0e2f..000000000
--- a/scp2/source/ooo/module_headless.scp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-#include "macros.inc"
diff --git a/scp2/source/ooo/module_headless.ulf b/scp2/source/ooo/module_headless.ulf
deleted file mode 100644
index e64185dfb..000000000
--- a/scp2/source/ooo/module_headless.ulf
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_HEADLESS]
-en-US = "Headless application support"
-
-[STR_DESC_MODULE_OPTIONAL_HEADLESS]
-en-US = "Component for enabling use %PRODUCTNAME without a display"
diff --git a/scp2/source/ooo/module_help_template.scp b/scp2/source/ooo/module_help_template.scp
deleted file mode 100644
index 4022d5923..000000000
--- a/scp2/source/ooo/module_help_template.scp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-Module gid_Module_Helppack_Help_Template
-    ParentID = gid_Module_Helppack_Helproot;
-    Name = "gid_Module_Helppack_Help_Template";
-    Description = "gid_Module_Helppack_Help_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Common_Zip,
-             gid_File_Help_Sbasic_Zip,
-             gid_File_Help_Scalc_Zip,
-             gid_File_Help_Schart_Zip,
-             gid_File_Help_Sdatabase_Zip,
-             gid_File_Help_Sdraw_Zip,
-             gid_File_Help_Simpress_Zip,
-             gid_File_Help_Smath_Zip,
-             gid_File_Help_Swriter_Zip);
-    Dirs = (gid_Brand_Dir_Help,
-            gid_Brand_Dir_Help_Isolanguage);
-End
-
-#include "allhelpmodules_root.inc"
diff --git a/scp2/source/ooo/module_helppack.scp b/scp2/source/ooo/module_helppack.scp
deleted file mode 100644
index 3614cb987..000000000
--- a/scp2/source/ooo/module_helppack.scp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Helppack_Helproot
-    ParentID = gid_Module_Root;
-    XPDParentID = "root";
-    Sortkey = "300";
-    MOD_NAME_DESC(MODULE_ROOT_HELPPACK);
-#ifdef WITH_HELPPACK_INTEGRATION
-    Styles = (SHOW_MULTILINGUAL_ONLY);
-#else
-    Styles = (HIDDEN_ROOT);
-#endif
-End
-
-#include "allhelpmodules.inc"
diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf
deleted file mode 100644
index b9bb3616f..000000000
--- a/scp2/source/ooo/module_helppack.ulf
+++ /dev/null
@@ -1,848 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
-[STR_NAME_MODULE_ROOT_HELPPACK]
-en-US = "Additional help packs"
-
-[STR_DESC_MODULE_ROOT_HELPPACK]
-en-US = "Additional help packs"
-
-[STR_NAME_MODULE_HELPPACK_EN_US]
-en-US = "English"
-
-[STR_DESC_MODULE_HELPPACK_EN_US]
-en-US = "Installs English help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_DE]
-en-US = "German"
-
-[STR_DESC_MODULE_HELPPACK_DE]
-en-US = "Installs German help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_FR]
-en-US = "French"
-
-[STR_DESC_MODULE_HELPPACK_FR]
-en-US = "Installs French help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_IT]
-en-US = "Italian"
-
-[STR_DESC_MODULE_HELPPACK_IT]
-en-US = "Installs Italian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_ES]
-en-US = "Spanish"
-
-[STR_DESC_MODULE_HELPPACK_ES]
-en-US = "Installs Spanish help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SV]
-en-US = "Swedish"
-
-[STR_DESC_MODULE_HELPPACK_SV]
-en-US = "Installs Swedish help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_PT]
-en-US = "Portuguese"
-
-[STR_DESC_MODULE_HELPPACK_PT]
-en-US = "Installs Portuguese help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_PT_BR]
-en-US = "Portuguese (Brazil)"
-
-[STR_DESC_MODULE_HELPPACK_PT_BR]
-en-US = "Installs Portuguese help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_JA]
-en-US = "Japanese"
-
-[STR_DESC_MODULE_HELPPACK_JA]
-en-US = "Installs Japanese help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_KO]
-en-US = "Korean"
-
-[STR_DESC_MODULE_HELPPACK_KO]
-en-US = "Installs Korean help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_ZH_CN]
-en-US = "Chinese (simplified)"
-
-[STR_DESC_MODULE_HELPPACK_ZH_CN]
-en-US = "Installs Chinese (simplified) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_ZH_TW]
-en-US = "Chinese (traditional)"
-
-[STR_DESC_MODULE_HELPPACK_ZH_TW]
-en-US = "Installs Chinese (traditional) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_NL]
-en-US = "Dutch"
-
-[STR_DESC_MODULE_HELPPACK_NL]
-en-US = "Installs Dutch help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_HU]
-en-US = "Hungarian"
-
-[STR_DESC_MODULE_HELPPACK_HU]
-en-US = "Installs Hungarian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_PL]
-en-US = "Polish"
-
-[STR_DESC_MODULE_HELPPACK_PL]
-en-US = "Installs Polish help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_RU]
-en-US = "Russian"
-
-[STR_DESC_MODULE_HELPPACK_RU]
-en-US = "Installs Russian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_TR]
-en-US = "Turkish"
-
-[STR_DESC_MODULE_HELPPACK_TR]
-en-US = "Installs Turkish help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_EL]
-en-US = "Greek"
-
-[STR_DESC_MODULE_HELPPACK_EL]
-en-US = "Installs Greek help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_TH]
-en-US = "Thai"
-
-[STR_DESC_MODULE_HELPPACK_TH]
-en-US = "Installs Thai help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_CS]
-en-US = "Czech"
-
-[STR_DESC_MODULE_HELPPACK_CS]
-en-US = "Installs Czech help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SK]
-en-US = "Slovak"
-
-[STR_DESC_MODULE_HELPPACK_SK]
-en-US = "Installs Slovak help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_HR]
-en-US = "Croatian"
-
-[STR_DESC_MODULE_HELPPACK_HR]
-en-US = "Installs Croatian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_ET]
-en-US = "Estonian"
-
-[STR_DESC_MODULE_HELPPACK_ET]
-en-US = "Installs Estonian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_VI]
-en-US = "Vietnamese"
-
-[STR_DESC_MODULE_HELPPACK_VI]
-en-US = "Installs Vietnamese help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_BG]
-en-US = "Bulgarian"
-
-[STR_DESC_MODULE_HELPPACK_BG]
-en-US = "Installs Bulgarian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_KM]
-en-US = "Khmer"
-
-[STR_DESC_MODULE_HELPPACK_KM]
-en-US = "Installs Khmer help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_PA_IN]
-en-US = "Punjabi"
-
-[STR_DESC_MODULE_HELPPACK_PA_IN]
-en-US = "Installs Punjabi help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_GU_IN]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_HELPPACK_GU_IN]
-en-US = "Installs Gujarati help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_TA]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_HELPPACK_TA]
-en-US = "Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_TA_IN]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_HELPPACK_TA_IN]
-en-US = "Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_HI]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_HELPPACK_HI]
-en-US = "Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_HI_IN]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_HELPPACK_HI_IN]
-en-US = "Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_ST]
-en-US = "Southern Sotho (Sutu)"
-
-[STR_DESC_MODULE_HELPPACK_ST]
-en-US = "Installs Southern Sotho (Sutu) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_TN]
-en-US = "Tswana"
-
-[STR_DESC_MODULE_HELPPACK_TN]
-en-US = "Installs Tswana help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_XH]
-en-US = "Xhosa"
-
-[STR_DESC_MODULE_HELPPACK_XH]
-en-US = "Installs Xhosa help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_ZU]
-en-US = "Zulu"
-
-[STR_DESC_MODULE_HELPPACK_ZU]
-en-US = "Installs Zulu help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_AF]
-en-US = "Afrikaans"
-
-[STR_DESC_MODULE_HELPPACK_AF]
-en-US = "Installs Afrikaans help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SW]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_HELPPACK_SW]
-en-US = "Installs Swahili help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SW_TZ]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_HELPPACK_SW_TZ]
-en-US = "Installs Swahili help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_LO]
-en-US = "Lao"
-
-[STR_DESC_MODULE_HELPPACK_LO]
-en-US = "Installs Lao help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_NSO]
-en-US = "Northern Sotho"
-
-[STR_DESC_MODULE_HELPPACK_NSO]
-en-US = "Installs Northern Sotho help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_BN]
-en-US = "Bengali"
-
-[STR_DESC_MODULE_HELPPACK_BN]
-en-US = "Installs Bengali help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_BN_BD]
-en-US = "Bengali (Bangladesh)"
-
-[STR_DESC_MODULE_HELPPACK_BN_BD]
-en-US = "Installs Bengali (Bangladesh) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_BN_IN]
-en-US = "Bengali (India)"
-
-[STR_DESC_MODULE_HELPPACK_BN_IN]
-en-US = "Installs Bengali (India) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_OR]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_HELPPACK_OR]
-en-US = "Installs Oriya help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_OR_IN]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_HELPPACK_OR_IN]
-en-US = "Installs Oriya help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_MR]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_HELPPACK_MR]
-en-US = "Installs Marathi help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_MR_IN]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_HELPPACK_MR_IN]
-en-US = "Installs Marathi help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_NE]
-en-US = "Nepali"
-
-[STR_DESC_MODULE_HELPPACK_NE]
-en-US = "Installs Nepali help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_AR]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_HELPPACK_AR]
-en-US = "Installs Arabic help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_AR_SA]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_HELPPACK_AR_SA]
-en-US = "Installs Arabic help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_CA]
-en-US = "Catalan"
-
-[STR_DESC_MODULE_HELPPACK_CA]
-en-US = "Installs Catalan help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_CA_XV]
-en-US = "Catalan (Valencian)"
-
-[STR_DESC_MODULE_HELPPACK_CA_XV]
-en-US = "Installs Catalan (Valencian) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_DA]
-en-US = "Danish"
-
-[STR_DESC_MODULE_HELPPACK_DA]
-en-US = "Installs Danish help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_FI]
-en-US = "Finnish"
-
-[STR_DESC_MODULE_HELPPACK_FI]
-en-US = "Installs Finnish help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_HE]
-en-US = "Hebrew"
-
-[STR_DESC_MODULE_HELPPACK_HE]
-en-US = "Installs Hebrew help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_IS]
-en-US = "Icelandic"
-
-[STR_DESC_MODULE_HELPPACK_IS]
-en-US = "Installs Icelandic help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_NB]
-en-US = "Norwegian (Bokmål)"
-
-[STR_DESC_MODULE_HELPPACK_NB]
-en-US = "Installs Norwegian (Bokmål) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_NN]
-en-US = "Norwegian (Nynorsk)"
-
-[STR_DESC_MODULE_HELPPACK_NN]
-en-US = "Installs Norwegian (Nynorsk) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_RM]
-en-US = "Rhaeto-Romance"
-
-[STR_DESC_MODULE_HELPPACK_RM]
-en-US = "Installs Rhaeto-Romance help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_RO]
-en-US = "Romanian"
-
-[STR_DESC_MODULE_HELPPACK_RO]
-en-US = "Installs Romanian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SQ]
-en-US = "Albanian"
-
-[STR_DESC_MODULE_HELPPACK_SQ]
-en-US = "Installs Albanian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_UR]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_HELPPACK_UR]
-en-US = "Installs Urdu help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_ID]
-en-US = "Indonesian"
-
-[STR_DESC_MODULE_HELPPACK_ID]
-en-US = "Installs Indonesian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_UK]
-en-US = "Ukrainian"
-
-[STR_DESC_MODULE_HELPPACK_UK]
-en-US = "Installs Ukrainian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_BE]
-en-US = "Belarusian"
-
-[STR_DESC_MODULE_HELPPACK_BE]
-en-US = "Installs Belarusian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SL]
-en-US = "Slovenian"
-
-[STR_DESC_MODULE_HELPPACK_SL]
-en-US = "Installs Slovenian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_LV]
-en-US = "Latvian"
-
-[STR_DESC_MODULE_HELPPACK_LV]
-en-US = "Installs Latvian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_LT]
-en-US = "Lithuanian"
-
-[STR_DESC_MODULE_HELPPACK_LT]
-en-US = "Installs Lithuanian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_HY]
-en-US = "Armenian"
-
-[STR_DESC_MODULE_HELPPACK_HY]
-en-US = "Installs Armenian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_EU]
-en-US = "Basque"
-
-[STR_DESC_MODULE_HELPPACK_EU]
-en-US = "Installs Basque help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_MK]
-en-US = "Macedonian"
-
-[STR_DESC_MODULE_HELPPACK_MK]
-en-US = "Installs Macedonian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_MT]
-en-US = "Maltese"
-
-[STR_DESC_MODULE_HELPPACK_MT]
-en-US = "Installs Maltese help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_CY]
-en-US = "Welsh"
-
-[STR_DESC_MODULE_HELPPACK_CY]
-en-US = "Installs Welsh help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_GL]
-en-US = "Galician"
-
-[STR_DESC_MODULE_HELPPACK_GL]
-en-US = "Installs Galician help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SH_YU]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_HELPPACK_SH_YU]
-en-US = "Installs Serbian (Latin) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SH]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_HELPPACK_SH]
-en-US = "Installs Serbian (Latin) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_GA]
-en-US = "Irish"
-
-[STR_DESC_MODULE_HELPPACK_GA]
-en-US = "Installs Irish help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SR_CS]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_HELPPACK_SR_CS]
-en-US = "Installs Serbian (Cyrillic) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SR]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_HELPPACK_SR]
-en-US = "Installs Serbian (Cyrillic) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_BS]
-en-US = "Bosnian"
-
-[STR_DESC_MODULE_HELPPACK_BS]
-en-US = "Installs Bosnian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_AS_IN]
-en-US = "Assamese"
-
-[STR_DESC_MODULE_HELPPACK_AS_IN]
-en-US = "Installs Assamese help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_AST]
-en-US = "Asturian"
-
-[STR_DESC_MODULE_HELPPACK_AST]
-en-US = "Installs Asturian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_RW]
-en-US = "Kinyarwanda"
-
-[STR_DESC_MODULE_HELPPACK_RW]
-en-US = "Installs Kinyarwanda help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SA]
-en-US = "Sanskrit"
-
-[STR_DESC_MODULE_HELPPACK_SA]
-en-US = "Installs Sanskrit help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_FA]
-en-US = "Farsi"
-
-[STR_DESC_MODULE_HELPPACK_FA]
-en-US = "Installs Farsi help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_FO]
-en-US = "Faroese"
-
-[STR_DESC_MODULE_HELPPACK_FO]
-en-US = "Installs Faroese help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SB]
-en-US = "Sorbian"
-
-[STR_DESC_MODULE_HELPPACK_SB]
-en-US = "Installs Sorbian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_TT]
-en-US = "Tatar"
-
-[STR_DESC_MODULE_HELPPACK_TT]
-en-US = "Installs Tatar help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_TS]
-en-US = "Tsonga"
-
-[STR_DESC_MODULE_HELPPACK_TS]
-en-US = "Installs Tsonga help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_YI]
-en-US = "Yiddish"
-
-[STR_DESC_MODULE_HELPPACK_YI]
-en-US = "Installs Yiddish help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_BR]
-en-US = "Breton"
-
-[STR_DESC_MODULE_HELPPACK_BR]
-en-US = "Installs Breton help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_NR]
-en-US = "Ndebele South"
-
-[STR_DESC_MODULE_HELPPACK_NR]
-en-US = "Installs Ndebele South help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SS]
-en-US = "Swazi"
-
-[STR_DESC_MODULE_HELPPACK_SS]
-en-US = "Installs Swazi help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_VE]
-en-US = "Venda"
-
-[STR_DESC_MODULE_HELPPACK_VE]
-en-US = "Installs Venda help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_KN]
-en-US = "Kannada"
-
-[STR_DESC_MODULE_HELPPACK_KN]
-en-US = "Installs Kannada help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_MS]
-en-US = "Malay (Malaysian)"
-
-[STR_DESC_MODULE_HELPPACK_MS]
-en-US = "Installs Malay (Malaysian) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_TG]
-en-US = "Tajik"
-
-[STR_DESC_MODULE_HELPPACK_TG]
-en-US = "Installs Tajik help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_KU]
-en-US = "Kurdish"
-
-[STR_DESC_MODULE_HELPPACK_KU]
-en-US = "Installs Kurdish help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_DZ]
-en-US = "Dzongkha"
-
-[STR_DESC_MODULE_HELPPACK_DZ]
-en-US = "Installs Dzongkha help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_KA]
-en-US = "Georgian"
-
-[STR_DESC_MODULE_HELPPACK_KA]
-en-US = "Installs Georgian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_EO]
-en-US = "Esperanto"
-
-[STR_DESC_MODULE_HELPPACK_EO]
-en-US = "Installs Esperanto help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_GU]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_HELPPACK_GU]
-en-US = "Installs Gujarati help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_EN_ZA]
-en-US = "English (South Africa)"
-
-[STR_DESC_MODULE_HELPPACK_EN_ZA]
-en-US = "Installs English (South Africa) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_EN_GB]
-en-US = "English (United Kingdom)"
-
-[STR_DESC_MODULE_HELPPACK_EN_GB]
-en-US = "Installs English (United Kingdom) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_UR_IN]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_HELPPACK_UR_IN]
-en-US = "Installs Urdu help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_ML_IN]
-en-US = "Malayalam"
-
-[STR_DESC_MODULE_HELPPACK_ML_IN]
-en-US = "Installs Malayalam help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_TE_IN]
-en-US = "Telugu"
-
-[STR_DESC_MODULE_HELPPACK_TE_IN]
-en-US = "Installs Telugu help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_TI_ER]
-en-US = "Tigrinya"
-
-[STR_DESC_MODULE_HELPPACK_TI_ER]
-en-US = "Installs Tigrinya help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_UZ]
-en-US = "Uzbek"
-
-[STR_DESC_MODULE_HELPPACK_UZ]
-en-US = "Installs Uzbek help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_MN]
-en-US = "Mongolian"
-
-[STR_DESC_MODULE_HELPPACK_MN]
-en-US = "Installs Mongolian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_MY]
-en-US = "Burmese"
-
-[STR_DESC_MODULE_HELPPACK_MY]
-en-US = "Installs Burmese (Myanmar) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_BO]
-en-US = "Tibetan"
-
-[STR_DESC_MODULE_HELPPACK_BO]
-en-US = "Installs Tibetan help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_OC]
-en-US = "Occitan"
-
-[STR_DESC_MODULE_HELPPACK_OC]
-en-US = "Installs Occitan help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_OM]
-en-US = "Oromo"
-
-[STR_DESC_MODULE_HELPPACK_OM]
-en-US = "Installs Oromo help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SI]
-en-US = "Sinhala"
-
-[STR_DESC_MODULE_HELPPACK_SI]
-en-US = "Installs Sinhala help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_UG]
-en-US = "Uyghur"
-
-[STR_DESC_MODULE_HELPPACK_UG]
-en-US = "Installs Uyghur help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_AS]
-en-US = "Assamese"
-
-[STR_DESC_MODULE_HELPPACK_AS]
-en-US = "Installs Assamese help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_BRX]
-en-US = "Bodo"
-
-[STR_DESC_MODULE_HELPPACK_BRX]
-en-US = "Installs Bodo help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_DGO]
-en-US = "Dogri"
-
-[STR_DESC_MODULE_HELPPACK_DGO]
-en-US = "Installs Dogri help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_GD]
-en-US = "Scottish Gaelic"
-
-[STR_DESC_MODULE_HELPPACK_GD]
-en-US = "Installs Scottish Gaelic help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_KK]
-en-US = "Kazakh"
-
-[STR_DESC_MODULE_HELPPACK_KK]
-en-US = "Installs Kazakh help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_KOK]
-en-US = "Konkani"
-
-[STR_DESC_MODULE_HELPPACK_KOK]
-en-US = "Installs Konkani help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_KS]
-en-US = "Kashmiri"
-
-[STR_DESC_MODULE_HELPPACK_KS]
-en-US = "Installs Kashmiri help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_KY]
-en-US = "Kyrgyz"
-
-[STR_DESC_MODULE_HELPPACK_KY]
-en-US = "Installs Kyrgyz help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_MAI]
-en-US = "Maithili"
-
-[STR_DESC_MODULE_HELPPACK_MAI]
-en-US = "Installs Maithili help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_ML]
-en-US = "Malayalam"
-
-[STR_DESC_MODULE_HELPPACK_ML]
-en-US = "Installs Malayalam help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_MNI]
-en-US = "Manipuri"
-
-[STR_DESC_MODULE_HELPPACK_MNI]
-en-US = "Installs Manipuri help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_PAP]
-en-US = "Papiamento"
-
-[STR_DESC_MODULE_HELPPACK_PAP]
-en-US = "Installs Papiamento help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_PS]
-en-US = "Pashto"
-
-[STR_DESC_MODULE_HELPPACK_PS]
-en-US = "Installs Pashto help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SA_IN]
-en-US = "Sanskrit (India)"
-
-[STR_DESC_MODULE_HELPPACK_SA_IN]
-en-US = "Installs Sanskrit help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SAT]
-en-US = "Santali"
-
-[STR_DESC_MODULE_HELPPACK_SAT]
-en-US = "Installs Santali help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SC]
-en-US = "Sardinian"
-
-[STR_DESC_MODULE_HELPPACK_SC]
-en-US = "Installs Sardinian help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_SD]
-en-US = "Sindhi"
-
-[STR_DESC_MODULE_HELPPACK_SD]
-en-US = "Installs Sindhi help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_TE]
-en-US = "Telugu"
-
-[STR_DESC_MODULE_HELPPACK_TE]
-en-US = "Installs Telugu help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_TI]
-en-US = "Tigrinya"
-
-[STR_DESC_MODULE_HELPPACK_TI]
-en-US = "Installs Tigrinya help in %PRODUCTNAME %PRODUCTVERSION"
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
deleted file mode 100644
index f9f29be41..000000000
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ /dev/null
@@ -1,888 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-#ifdef AIX
-#ifndef SYSTEM_CURL
-Unixlink gid_Unixlink_File_Lib_Curl
-    BIN_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
-End
-#endif
-#ifndef SYSTEM_REDLAND
-Unixlink gid_Unixlink_File_Lib_Raptor
-    BIN_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(libraptor,UNXSUFFIX));
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = STRING(CONCAT3(libraptor,UNXSUFFIX,.1));
-End
-
-Unixlink gid_Unixlink_File_Lib_Rasqal
-    BIN_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(librasqal,UNXSUFFIX));
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = STRING(CONCAT3(librasqal,UNXSUFFIX,.1));
-End
-
-Unixlink gid_Unixlink_File_Lib_Rdf
-    BIN_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(librdf,UNXSUFFIX));
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = STRING(CONCAT3(librdf,UNXSUFFIX,.0));
-End
-#endif
-#ifndef SYSTEM_LIBXSLT
-Unixlink gid_Unixlink_File_Lib_Xslt
-    BIN_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = STRING(CONCAT2(libxslt,UNXSUFFIX));
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = STRING(CONCAT3(libxslt,UNXSUFFIX,.1));
-End
-#endif
-#endif
-
-Module gid_Module_Root_Files_2
-    PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "50";
-	Name = "gid_Module_Root_Files_2";
-	Description = "gid_Module_Root_Files_2";
-	Sortkey = "1200";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Bin_Cde_Open_Url,
-	gid_File_Bin_Kde_Open_Url,
-	gid_File_Bin_Open_Url,
-	gid_File_Bin_Pagein,
-	gid_File_Bin_Pluginapp,
-	gid_File_Bin_Senddoc,
-	gid_File_Bin_Gengal,
-	gid_File_Script_Gengal,
- 	gid_File_Profile_Gengal,
-	gid_File_Bin_Spadmin_Bin,
-	gid_File_Bin_Uri_Encode,
-	gid_File_Exe_Nsplugin,
-	gid_File_Lib_Npsoplugin,
-        gid_File_Lib_Soffice,
-        gid_File_Lib_Unopkgapp,
-	gid_File_Server_Bonobo_Presentationstarter,
-	gid_File_Txt_Pagein_Common,
-	gid_File_Txt_Pagein_Calc,
-	gid_File_Txt_Pagein_Draw,
-	gid_File_Txt_Pagein_Impress,
-	gid_File_Txt_Pagein_Writer,
-	gid_File_Txt_Patchfiles,
-	gid_File_Bmp_Installation,
-	gid_File_Shellnew_Ods_Soffice,
-	gid_File_Shellnew_Odg_Soffice,
-	gid_File_Shellnew_Odp_Soffice,
-	gid_File_Shellnew_Odt_Soffice,
-	gid_File_Exe_Java,
-	gid_File_Exe_Adabas,
-	gid_File_Exe_Userinst,
-	gid_File_Exe_Userdeinst,
-	gid_File_Regcleanold,
-	gid_File_Exe_Regdeinstall,
-	gid_File_Tmp_Inf_Oldreg,
-	gid_File_Tmp_Userinstall_Inf,
-	gid_File_Config_Javasettingsunopkginstall);
-End
-
-Module gid_Module_Root_Files_3
-    PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "60";
-	Name = "gid_Module_Root_Files_3";
-	Description = "gid_Module_Root_Files_3";
-	Sortkey = "1300";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Dat_Root3,
-	gid_File_Jar_Saxon,
-	gid_File_Jar_Unoil,
-	gid_File_Jar_Hsqldb,
-	gid_File_Jar_Hsqldb_Sdbc,
-	gid_File_Jar_Accessbridge,
-	gid_File_Jar_Officebean,
-	gid_File_Jar_Report,
-	gid_File_Jar_Table,
-	gid_File_Jar_Letter,
-	gid_File_Jar_Form,
-	gid_File_Jar_Fax,
-	gid_File_Jar_Agenda,
-	gid_File_Jar_Web,
-	gid_File_Jar_Query,
-	gid_File_Jar_Commonwizards,
-	gid_File_Jar_Sandbox,
-	gid_File_Jar_Scriptframework,
-	gid_File_Jar_Scriptproviderforjava,
-	gid_File_Jar_Xml_Apis,
-	gid_File_Jar_Bsh,
-	gid_File_Jar_Classes,
-	gid_File_Jar_AVmedia,
-	gid_File_Jar_Xsltfilter,
-	gid_File_Jar_Xsltvalidate,
-	gid_File_Jar_Docbook,
-	gid_File_Jar_Htmlsoff,
-	gid_File_Jar_Xflatxml,
-	gid_File_Jar_Xmerge,
-	gid_File_Jar_Xmergebridge,
-	gid_File_Jar_Lucene_Core,
-	gid_File_Jar_Lucene_Analyzers,
-	gid_File_Jar_Lucenehelpwrapper,
-	gid_File_Rdb_Offapi,
-	gid_Starregistry_Services_Rdb);
-End
-
-Module gid_Module_Root_Files_4
-    PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "30";
-	Name = "gid_Module_Root_Files_4";
-	Description = "gid_Module_Root_Files_4";
-	Sortkey = "1400";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Dat_Root4,
-	gid_File_Filter_Eme,
-	gid_File_Filter_Sdfilt,
-	gid_File_Filter_Icg,
-	gid_File_Filter_Egi,
-	gid_File_Filter_Epb,
-	gid_File_Filter_Epg,
-	gid_File_Filter_Epp,
-	gid_File_Filter_Eps,
-	gid_File_Filter_Ept,
-	gid_File_Filter_Era,
-	gid_File_Filter_Eti,
-	gid_File_Filter_Exp,
-	gid_File_Filter_Icd,
-	gid_File_Filter_Idx,
-	gid_File_Filter_Ime,
-	gid_File_Filter_Ipb,
-	gid_File_Filter_Ipd,
-	gid_File_Filter_Ips,
-	gid_File_Filter_Ipt,
-	gid_File_Filter_Ipx,
-	gid_File_Filter_Ira,
-	gid_File_Filter_Itg,
-	gid_File_Filter_Iti,
-	gid_File_Lib_Bib,
-	gid_File_Lib_Chartmodel,
-	gid_File_Lib_Chartview,
-	gid_File_Lib_Chartcontroller,
-	gid_File_Lib_Charttools,
-	gid_File_Lib_Ctl,
-	gid_File_Lib_Cui,
-    gid_File_Lib_Sdbt,
-    gid_File_Lib_Dbmm,
-	gid_File_Lib_Dba,
-	gid_File_Lib_Dbase2,
-	gid_File_Lib_Dbaxml,
-	gid_File_Lib_Dbt,
-	gid_File_Lib_Dbfile,
-	gid_File_Lib_Drawinglayer,
-        gid_File_Lib_Editeng,
-	gid_File_Lib_Flat,
-	gid_File_Lib_For,
-	gid_File_Lib_Forui,
-	gid_File_Lib_Frm,
-	gid_File_Lib_Fwe,
-	gid_File_Lib_Fwi,
-	gid_File_Lib_Fwk,
-	gid_File_Lib_Fwl,
-	gid_File_Lib_Go,
-	gid_File_Lib_Helplinker,
-	gid_File_Lib_J,
-	gid_File_Lib_Lks,
-	gid_File_Lib_Lng,
-	gid_File_Lib_Offacc,
-	gid_File_Lib_Oox,
-	gid_File_Lib_Pcr,
-	gid_File_Lib_Pdffilter,
-	gid_File_Lib_Pk,
-	gid_File_Lib_Pl,
-	gid_File_Lib_Sf_Prothdlr,
-	gid_File_Lib_Psp,
-	gid_File_Lib_Res,
-	gid_File_Lib_Sax,
-	gid_File_Lib_Sb,
-	gid_File_Lib_Scn,
-	gid_File_Lib_Sd,
-	gid_File_Lib_Sdd,
-	gid_File_Lib_Sdui,
-	gid_File_Lib_Sfx,
-	gid_File_Lib_Sot,
-	gid_File_Lib_Spa,
-	gid_File_Lib_Spl,
-	gid_File_Lib_Sts,
-	gid_File_Lib_Svl,
-	gid_File_Lib_Svtools,
-	gid_File_Lib_Svx,
-	gid_File_Lib_AVMedia,
-	gid_File_Lib_AVMediaWin,
-    gid_File_Lib_AVMediaGStreamer,
-	gid_File_Lib_BaseGfx,
-	gid_File_Lib_Sysdtrans,
-	gid_File_Lib_Sw,
-	gid_File_Lib_TextConversionDlgs,
-	gid_File_Lib_Tk,
-    gid_File_Lib_Acc,
-    gid_File_Lib_BaseBmp,
-	gid_File_Lib_Tools,
-	gid_File_Lib_Utl,
-	gid_File_Lib_Uui,
-	gid_File_Lib_Vcl,
-	gid_File_Lib_Xcr,
-	gid_File_Lib_Xmlfa,
-	gid_File_Lib_Xmlfd,
-	gid_File_Lib_Xmx,
-	gid_File_Lib_Xo,
-	gid_File_Lib_Xof,
-	gid_File_Lib_Xsltdlg,
-	gid_File_Lib_Xsltfilter,
-	gid_File_Lib_Odfflatxml,
-	gid_File_Lib_Zip,
-	gid_File_Lib_Vclplug_Gen,
-	gid_File_Lib_Vclplug_Kde,
-	gid_File_Lib_Vclplug_Kde4,
-	gid_File_Lib_Vclplug_Svp,
-	gid_File_Lib_Basctl,
-	gid_File_Lib_CanvasTools,
-	gid_File_Lib_CppCanvas,
-	gid_File_Lib_Agg,
-	gid_File_Lib_Fwm,
-	gid_File_Lib_Lprx2,
-	gid_File_Lib_Lprxw,
-    gid_File_Lib_Libtextcat,
-    gid_File_Lib_Guesslang,
-	gid_File_Lib_Tfu);
-End
-
-Module gid_Module_Root_Files_5
-    PackageInfo = "packinfo_office.txt";
-    TabPackageInfo = "packinfo_office_tab.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "40";
-	Name = "gid_Module_Root_Files_5";
-	Description = "gid_Module_Root_Files_5";
-	Sortkey = "1500";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Dat_Root5,
-#if ! defined SYSTEM_GETTEXT
-    gid_File_Lib_Intl,
-#endif
-#if ! defined SYSTEM_GLIB
-    gid_File_Lib_Glib,
-    gid_File_Lib_Gobject,
-    gid_File_Lib_Gthread,
-    gid_File_Lib_Gmodule,
-    gid_File_Lib_Gio,
-#endif
-#if ! defined SYSTEM_GDKPIXBUF
-    gid_File_Lib_Gdkpixbuf,
-#endif
-#if ! defined SYSTEM_LIBCROCO
-    gid_File_Lib_Libcroco,
-#endif
-#if ! defined SYSTEM_PANGO
-    gid_File_Lib_Libpango,
-    gid_File_Lib_Libpangocairo,
-#ifdef WNT
-    gid_File_Lib_Libpangowin32,
-#endif
-#endif
-#if ! defined SYSTEM_LIBGSF
-    gid_File_Lib_Libgsf,
-#endif
-	gid_File_Lib_Dict_Ja,
-	gid_File_Lib_Dict_Zh,
-    gid_File_Lib_Collator_Data,
-    gid_File_Lib_Index_Data,
-    gid_File_Lib_Textconv_Dict,
-	gid_File_Lib_Basprov,
-	gid_File_Lib_Configmgr,
-	gid_File_Lib_Crypto,
-	gid_File_Lib_Dlgprov,
-	gid_File_Lib_Stringresource,
-	gid_File_Lib_Ldapbe2,
-	gid_File_Lib_Comphelper2,
-	gid_File_Lib_Adabas,
-	gid_File_Lib_Cached1,
-	gid_File_Lib_Curl,
-	gid_Unixlink_File_Lib_Curl,
-	gid_File_Lib_Db,
-	gid_File_Lib_Dbpool,
-	gid_File_Lib_Embobj,
-	gid_File_Lib_Emboleobj,
-	gid_File_Lib_Kab_1,
-    gid_File_Lib_Kab_Drv_1,
-	gid_File_Lib_Macab_1,
-    gid_File_Lib_Macab_Drv_1,
-	gid_File_Lib_Evtatt,
-	gid_File_Lib_Fileacc,
-	gid_File_Lib_Filterconfig1,
-	gid_File_Lib_Dbodbcbase,
-	gid_File_Lib_I18npool,
-	gid_File_Lib_I18npaper,
-	gid_File_Lib_I18nregexp,
-	gid_File_Lib_I18nsearch,
-    gid_File_Lib_I18nisolang,
-	gid_File_Lib_I18nutil,
-	gid_File_Lib_Icudata,
-	gid_File_Lib_Icui18n,
-	gid_File_Lib_Icule,
-	gid_File_Lib_Icuuc,
-	gid_File_Lib_Localedata_En,
-	gid_File_Lib_Localedata_Es,
-	gid_File_Lib_Localedata_Euro,
-	gid_File_Lib_Localedata_Others,
-	gid_File_Lib_Hsqldb_2,
-	gid_File_Lib_Jdbc,
-	gid_File_Lib_Mcnttype,
-	gid_File_Lib_Mozab_2,
-	gid_File_Lib_Mozabdrv,
-	gid_File_Lib_Mozbootstrap,
-	gid_File_Lib_Mysql,
-	gid_File_Lib_Odbc,
-	gid_File_Lib_Officebean,
-	gid_File_Lib_Openssl,
-	gid_File_Lib_Package2,
-	gid_File_Lib_Deployment,
-	gid_File_Lib_DeploymentGui,
-	gid_File_Lib_Expwrap_Uno,
-	gid_File_Lib_Fastsax_Uno,
-	gid_File_Lib_Slideshow,
-	gid_File_Lib_Recentfile,
-	gid_File_Lib_Scriptframe,
-	gid_File_Lib_Sdbc_2,
-	gid_File_Lib_Srtrs1,
-	gid_File_Lib_Bat,
-	gid_File_Lib_Tab,
-	gid_File_Lib_Tab2,
-	gid_File_Lib_Unoxml,
-	gid_File_Lib_Localebe,
-	gid_File_Lib_Migrationoo2,
-	gid_File_Lib_Migrationoo3,
-	gid_File_Lib_Syssh,
-	gid_File_Ucptdoc1,
-	gid_File_Ucpexpand1,
-	gid_File_Lib_Raptor,
-	gid_Unixlink_File_Lib_Raptor,
-	gid_File_Lib_Rasqal,
-	gid_Unixlink_File_Lib_Rasqal,
-	gid_File_Lib_Rdf,
-	gid_Unixlink_File_Lib_Rdf,
-	gid_File_Lib_Unordf,
-	gid_File_Lib_Sndfile,
-	gid_File_Lib_Tvhlp1,
-	gid_File_Lib_Ucb1,
-	gid_File_Lib_Ucbhelper,
-	gid_File_Lib_Ucpchelp1,
-	gid_File_Lib_Ucpdav1,
-	gid_File_Lib_Neon,
-	gid_File_Lib_Ucpfile1,
-	gid_File_Lib_Ucpftp1,
-	gid_File_Lib_Ucphier1,
-	gid_File_Lib_Ucppkg1,
-	gid_File_Lib_Xslt,
-	gid_Unixlink_File_Lib_Xslt,
-	gid_File_Lib_LibXMLSec_xmlsecnss,
-	gid_File_Lib_LibXMLSec_xmlseccore,
-	gid_File_Lib_LibXMLSec_xmlsecmscrypto,
-	gid_File_Lib_XSec_XMLSecurity,
-	gid_File_Lib_XSec_Framework,
-	gid_File_Lib_XSec_XmlSec,
-	gid_File_Lib_Xstor,
-	gid_File_CanvasFactory,
-	gid_File_SimpleCanvas,
-	gid_File_Lib_Cmdmail,
-	gid_File_Lib_I18n,
-	gid_File_Lib_VCLCanvas,
-	gid_File_Lib_DirectX5Canvas,
-	gid_File_Lib_DirectX9Canvas,
-	gid_File_Lib_GdiPlusCanvas,
-	gid_File_Lib_Hhc_Word,
-	gid_File_Lib_Socomp,
-	gid_File_Lib_Sogpstarter,
-	gid_File_Lib_Stdc_3,
-	gid_File_Lib_Stdc_5,
-	gid_File_Lib_Accessbridge,
-	gid_File_Lib_Ado,
-	gid_File_Lib_Dl,
-	gid_File_Lib_Dnd,
-	gid_File_Lib_Dtrans,
-	gid_File_Lib_Emser,
-	gid_File_Lib_Inprocserv,
-	gid_File_Lib_Fop,
-	gid_File_Lib_Fps,
-	gid_File_Lib_Ftransl,
-	gid_File_Lib_Lngpckinsthlp,
-#ifdef ENABLE_LOMENUBAR
-	gid_File_Lib_Lomenubar,
-#endif
-    gid_File_Lib_sn_tools,
-    GID_FILE_LIB_WPD,
-    gid_File_Lib_Mingw_GccS,
-    gid_File_Lib_Mingw_Stdcpp,
-    gid_File_Lib_Mingwm10,
-	gid_File_Lib_Msvcp70,
-	gid_File_Lib_Msvcr70,
-	gid_File_Lib_Ole,
-	gid_File_Lib_Patchmsi,
-	gid_File_Lib_Reg4allmsdoc,
-	gid_File_Lib_Qslnkmsi,
-	gid_File_Lib_Sdqsmsi,
-	gid_File_Lib_Instooofiltmsi,
-	gid_File_Lib_Smplmail,
-	gid_File_Lib_Gconfebe,
-	gid_File_Lib_Wininetbe,
-	gid_File_Lib_Macbe,
-	gid_File_Lib_Msvcp70_So,
-	gid_File_Lib_Msvcr70_So,
-	gid_File_Lib_Gdiplus,
-	gid_File_Lib_Stlport_Vc6,
-	gid_File_Lib_Stlport_Vc7,
-	gid_File_Tabaction,
-	gid_File_Lib_Fps_Office,
-	gid_File_Lib_Fpicker,
-	gid_File_Lib_Fsstorage,
-	gid_File_Lib_Hatchwindowfactory,
-	gid_File_Lib_Passwordcontainer,
-	gid_File_Lib_Productregistration,
-	gid_File_Lib_Svtmisc,
-    gid_File_Lib_Updchkui,
-    gid_File_Lib_Updatefeed,
-	gid_File_Lib_Onlinecheck,
-	gid_File_Lib_Cli_Oootypes_Assembly,
-	gid_File_Lib_Policy_Cli_Oootypes_Assembly,
-	gid_File_Lib_Policy_Cli_Oootypes_Config);
-    Unixlinks = (gid_Unixlink_File_Lib_Curl,
-	gid_Unixlink_File_Lib_Raptor,
-	gid_Unixlink_File_Lib_Rasqal,
-	gid_Unixlink_File_Lib_Rdf,
-	gid_Unixlink_File_Lib_Xslt);
-End
-
-Module gid_Module_Root_Files_6
-    PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "70";
-	Name = "gid_Module_Root_Files_6";
-	Description = "gid_Module_Root_Files_6";
-	Sortkey = "1600";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Basic_User,
-	gid_File_Basic_Share,
-	gid_File_Basic_User_Standard,
-	gid_File_Extra_Autotextuser,
-	gid_File_Extra_Cfgusr,
-	gid_File_Extra_Palettes,
-	gid_File_Extra_Database,
-	gid_File_Extra_Databasebiblio,
-	gid_File_Extra_Gallsound,
-	gid_File_Extra_Autocorr,
-	gid_File_Extra_Autocorr_Lang,
-	gid_File_Extra_Gallroot,
-	gid_File_Extra_Gallbullets,
-	gid_File_Extra_Gallhtmlexpo,
-	gid_File_Extra_Gallrulers,
-	gid_File_Extra_Gallsystem,
-	gid_File_Extra_Gallflagscontrol,
-	gid_File_Extra_Gallsounds,
-	gid_File_Extra_Gallwwwanim,
-	gid_File_Extra_Gallwwwback,
-	gid_File_Extra_Gallwwwgraf,
-	gid_File_Extra_Migration,
-	gid_File_Extra_Migration_Lang_Multi,
-	gid_File_Extra_Tpllayoutimpr,
-	gid_File_Extra_Tplwizbitmap,
-	gid_File_Extra_Tplwizletter,
-	gid_File_Extra_Tplwizmemo_Lang,
-	gid_File_Extra_Autotextuser_Lang,
-	gid_File_Extra_Dir_Fonts,
-	gid_File_Scripts_Beanshell,
-	gid_File_Scripts_Java,
-	gid_File_Scripts_Javascript,
-	gid_File_Basic_Depot,
-	gid_File_Basic_Euro,
-	gid_File_Basic_Form,
-	gid_File_Basic_Gimmicks,
-	gid_File_Basic_Importwiz,
-	gid_File_Basic_Formwiz,
-	gid_File_Basic_Schedule,
-	gid_File_Basic_Scriptbindinglib,
-	gid_File_Basic_Template,
-	gid_File_Basic_Tools,
-	gid_File_Basic_Tutorials,
-	gid_File_Extra_Cfgsrv,
-	gid_File_Extra_Cfgsrv_Bitmap_Unx,
-	gid_File_Extra_Symbols,
-	gid_File_Extra_Common_Inc,
-	gid_File_Extra_Common_Pl,
-	gid_File_Extra_Edit_Asp,
-	gid_File_Extra_Edit_Pl,
-	gid_File_Extra_Editpic_Asp,
-	gid_File_Extra_Editpic_Pl,
-	gid_File_Extra_Index_Pl,
-	gid_File_Extra_Poll_Asp,
-	gid_File_Extra_Poll_Pl,
-	gid_File_Extra_Savepic_Asp,
-	gid_File_Extra_Savepic_Pl,
-	gid_File_Extra_Show_Asp,
-	gid_File_Extra_Show_Pl,
-	gid_File_Extra_Webcast_Asp,
-	gid_File_Extra_Webcast_Pl,
-	gid_File_Extra_Square_Yellow_Zip,
-	gid_File_Extra_Square_Red_Zip,
-	gid_File_Extra_Square_Green_Zip,
-	gid_File_Extra_Square_Gray_Zip,
-	gid_File_Extra_Square_Blue_Zip,
-	gid_File_Extra_Simple_Zip,
-	gid_File_Extra_Round_White_Zip,
-	gid_File_Extra_Round_Gorilla_Zip,
-	gid_File_Extra_Glas_Red_Zip,
-	gid_File_Extra_Glas_Green_Zip,
-	gid_File_Extra_Glas_Blue_Zip,
-	gid_File_Share_Config_Sofficecfg_uiconfig_Zip,
-	gid_File_Share_Config_Sofficecfg_Basicide_Menubar_Xml,
-	gid_File_Share_Config_Sofficecfg_Bibliography_Menubar_Xml,
-	gid_File_Share_Config_Sofficecfg_Dbuquery_Menubar_Xml,
-	gid_File_Share_Config_Sofficecfg_Dbubrowser_Menubar_Xml,
-	gid_File_Share_Config_Sofficecfg_Dbuapp_Menubar_Xml,
-	gid_File_Share_Config_Sofficecfg_Dburelation_Menubar_Xml,
-	gid_File_Share_Config_Sofficecfg_Dbutable_Menubar_Xml,
-	gid_File_Share_Config_Sofficecfg_Startmodule_Menubar_Xml,
-	gid_File_Share_Config_Sofficecfg_Chart_Menubar_Xml,
-	gid_File_Dtd_Accelerator,
-	gid_File_Dtd_Dialog,
-	gid_File_Dtd_Event,
-	gid_File_Dtd_Groupuinames,
-	gid_File_Dtd_Image,
-	gid_File_Dtd_Libraries,
-	gid_File_Dtd_Library,
-	gid_File_Dtd_Manifest,
-	gid_File_Dtd_Menubar,
-	gid_File_Dtd_Module,
-	gid_File_Dtd_Office,
-	gid_File_Dtd_Statusbar,
-	gid_File_Dtd_Toolbar,
-    gid_File_Conf_Fpdb,
-    gid_File_Lm_Afrikaans,
-    gid_File_Lm_Albanian,
-    gid_File_Lm_Amharic_Utf,
-    gid_File_Lm_Arabic,
-    gid_File_Lm_Armenian,
-    gid_File_Lm_Basque,
-    gid_File_Lm_Belarus,
-    gid_File_Lm_Bosnian,
-    gid_File_Lm_Breton,
-    gid_File_Lm_Catalan,
-    gid_File_Lm_Chinese_Simplified,
-    gid_File_Lm_Chinese_Traditional,
-    gid_File_Lm_Croatian,
-    gid_File_Lm_Czech,
-    gid_File_Lm_Danish,
-    gid_File_Lm_Drents,
-    gid_File_Lm_Dutch,
-    gid_File_Lm_English,
-    gid_File_Lm_Esperanto,
-    gid_File_Lm_Estonian,
-    gid_File_Lm_Finnish,
-    gid_File_Lm_French,
-    gid_File_Lm_Frisian,
-    gid_File_Lm_Georgian,
-    gid_File_Lm_German,
-    gid_File_Lm_Greek,
-    gid_File_Lm_Hebrew,
-    gid_File_Lm_Hindi,
-    gid_File_Lm_Hungarian,
-    gid_File_Lm_Icelandic,
-    gid_File_Lm_Indonesian,
-    gid_File_Lm_Irish_Gaelic,
-    gid_File_Lm_Italian,
-    gid_File_Lm_Japanese,
-    gid_File_Lm_Korean,
-    gid_File_Lm_Latin,
-    gid_File_Lm_Latvian,
-    gid_File_Lm_Lithuanian,
-    gid_File_Lm_Luxembourgish,
-    gid_File_Lm_Malay,
-    gid_File_Lm_Manx_Gaelic,
-    gid_File_Lm_Marathi,
-    gid_File_Lm_Middle_Frisian,
-    gid_File_Lm_Mingo,
-    gid_File_Lm_Mongolian_Cyrillic,
-    gid_File_Lm_Nepali,
-    gid_File_Lm_Norwegian,
-    gid_File_Lm_Persian,
-    gid_File_Lm_Polish,
-    gid_File_Lm_Portuguese,
-    gid_File_Lm_Quechua,
-    gid_File_Lm_Romanian,
-    gid_File_Lm_Romansh,
-    gid_File_Lm_Russian,
-    gid_File_Lm_Sanskrit,
-    gid_File_Lm_Scots,
-    gid_File_Lm_Scots_Gaelic,
-    gid_File_Lm_Serbian,
-    gid_File_Lm_Serbian_Latin,
-    gid_File_Lm_Slovak_Ascii,
-    gid_File_Lm_Slovenian,
-    gid_File_Lm_Spanish,
-    gid_File_Lm_Swahili,
-    gid_File_Lm_Swedish,
-    gid_File_Lm_Tagalog,
-    gid_File_Lm_Tamil,
-    gid_File_Lm_Thai,
-    gid_File_Lm_Turkish,
-    gid_File_Lm_Ukrainian,
-    gid_File_Lm_Vietnamese,
-    gid_File_Lm_Welsh,
-    gid_File_Lm_Yiddish_Utf,
-    gid_File_Lm_Zulu,
-	gid_File_Mod_Chart,
-	gid_File_Mod_Datastyl,
-	gid_File_Mod_Defs,
-	gid_File_Mod_Drawing,
-	gid_File_Mod_Dtypes,
-	gid_File_Mod_Form,
-	gid_File_Mod_Meta,
-	gid_File_Mod_Nmspace,
-	gid_File_Mod_Office,
-	gid_File_Mod_Script,
-	gid_File_Mod_Settings,
-	gid_File_Mod_Style,
-	gid_File_Mod_Table,
-	gid_File_Mod_Text,
-    gid_File_Oo_Ldap_Xcd_Sample,
-    gid_File_Oo_Ad_Ldap_Xcd_Sample,
-    gid_File_Share_Registry_Main_Xcd,
-    gid_File_Share_Registry_Forcedefault_Xcd,
-	gid_File_Pymailmerge,
-	gid_File_Pymailmerge_msgbox,
-    gid_File_Xsl_Common_Measure_Conversion,
-	gid_File_Xsl_Common_Math_Functions,
-	gid_File_Xsl_Export_Common_Body,
-	gid_File_Xsl_Export_Common_Table_Of_Content,
-	gid_File_Xsl_Export_Common_Ooo2ms_Docpr,
-	gid_File_Xsl_Export_Common_Styles_Styles_Collector,
-	gid_File_Xsl_Export_Common_Styles_Style_Mapping_Css,
-	gid_File_Xsl_Export_Common_Styles_Style_Mapping_html32,
-	gid_File_Xsl_Export_Common_Table_Table,
-	gid_File_Xsl_Export_Common_Table_Table_Cells,
-	gid_File_Xsl_Export_Common_Table_Table_Columns,
-	gid_File_Xsl_Export_Common_Table_Table_Rows,
-	gid_File_Xsl_Export_Spreadsheetml_Formular,
-	gid_File_Xsl_Export_Spreadsheetml_Ooo2spreadsheetml,
-	gid_File_Xsl_Export_Spreadsheetml_Style_Mapping,
-	gid_File_Xsl_Export_Spreadsheetml_Styles,
-	gid_File_Xsl_Export_Spreadsheetml_Table,
-	gid_File_Xsl_Export_uof_odf2uof_text,
-	gid_File_Xsl_Export_uof_odf2uof_spreadsheet,
-	gid_File_Xsl_Export_uof_odf2uof_presentation,
-	gid_File_Xsl_Import_uof_uof2odf_text,
-	gid_File_Xsl_Import_uof_uof2odf_spreadsheet,
-	gid_File_Xsl_Import_uof_uof2odf_presentation,
-	gid_File_Xsl_Export_Wordml_Ooo2wordml,
-	gid_File_Xsl_Export_Wordml_Ooo2wordml_Border,
-	gid_File_Xsl_Export_Wordml_Ooo2wordml_Custom_Draw,
-	gid_File_Xsl_Export_Wordml_Ooo2wordml_Draw,
-	gid_File_Xsl_Export_Wordml_Ooo2wordml_Field,
-	gid_File_Xsl_Export_Wordml_Ooo2wordml_List,
-	gid_File_Xsl_Export_Wordml_Ooo2wordml_Page,
-	gid_File_Xsl_Export_Wordml_Ooo2wordml_Path,
-	gid_File_Xsl_Export_Wordml_Ooo2wordml_Settings,
-	gid_File_Xsl_Export_Wordml_Ooo2wordml_Table,
-	gid_File_Xsl_Export_Wordml_Ooo2wordml_Text,
-	gid_File_Xsl_Import_Common_Ms2ooo_Docpr,
-	gid_File_Xsl_Import_Spreadsheetml_Spreadsheetml2ooo,
-	gid_File_Xsl_Import_Wordml_Wordml2ooo_Props,
-	gid_File_Xsl_Import_Wordml_Wordml2ooo,
-	gid_File_Xsl_Import_Wordml_Wordml2ooo_Custom_Draw,
-	gid_File_Xsl_Import_Wordml_Wordml2ooo_Draw,
-	gid_File_Xsl_Import_Wordml_Wordml2ooo_Field,
-	gid_File_Xsl_Import_Wordml_Wordml2ooo_List,
-	gid_File_Xsl_Import_Wordml_Wordml2ooo_Page,
-	gid_File_Xsl_Import_Wordml_Wordml2ooo_Settings,
-	gid_File_Xsl_Import_Wordml_Wordml2ooo_Table,
-	gid_File_Xsl_Import_Wordml_Wordml2ooo_Text,
-	gid_File_Xsl_Import_Wordml_Wordml2ooo_Path,
-	gid_File_Extra_Fontunxpsprint,
-	gid_File_Extra_Fontunxppds,
-	gid_File_Extra_Fontunxafm,
-	gid_File_Kspprof_Ini,
-	gid_File_Sp_Adsf_Mcd,
-	gid_File_Sp_Bnd_Mcd,
-	gid_File_Sp_Fre_Mcd,
-	gid_File_Sp_Jlsf_Mcd,
-	gid_File_Sp_Klsf_Mcd,
-	gid_File_Sp_Subm_Mcd,
-	gid_File_Spuser1_Txt);
-End
-
-Module gid_Module_Root_Files_7
-    PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "80";
-	Name = "gid_Module_Root_Files_7";
-	Description = "gid_Module_Root_Files_7";
-	Sortkey = "1900";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Help_Help_Zip,
-             gid_File_Moz_Msvcp71,
-             gid_File_Moz_Msvcr71,
-             gid_File_Mozilla_Runtime);
-End
-
-Module gid_Module_Root_Files_Images
-    PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "100";
-	Name = "gid_Module_Root_Files_Images";
-	Description = "gid_Module_Root_Files_Images";
-	Sortkey = "2050";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (
-#ifdef THEME_DEFAULT
-	     gid_File_Images_Zip,
-#endif
-#ifdef THEME_CRYSTAL
-             gid_File_ImagesCrystal_Zip,
-#endif
-#ifdef THEME_OXYGEN
-             gid_File_ImagesOxygen_Zip,
-#endif
-#ifdef THEME_HICONTRAST
-             gid_File_ImagesHicontrast_Zip,
-#endif
-#ifdef THEME_TANGO
-             gid_File_ImagesTango_Zip
-#endif
-	);
-End
-
-#ifndef WITHOUT_FONTS
-Module gid_Module_Root_Fonts_OOo_Hidden
-    PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Root;
-    InstallOrder = "100";
-	Name = "gid_Module_Root_Fonts_OOo_Hidden";
-	Description = "gid_Module_Root_Fonts_OOo_Hidden";
-	Sortkey = "2100";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Fnt_Opensymb,
-	gid_File_Fnt_DejaVuSans_Bold,
-	gid_File_Fnt_DejaVuSans_BoldOblique,
-	gid_File_Fnt_DejaVuSans_Oblique,
-	gid_File_Fnt_DejaVuSans,
-	gid_File_Fnt_DejaVuSansCondensed_Bold,
-	gid_File_Fnt_DejaVuSansCondensed_BoldOblique,
-	gid_File_Fnt_DejaVuSansCondensed_Oblique,
-	gid_File_Fnt_DejaVuSansCondensed,
-	gid_File_Fnt_DejaVuSansExtraLight,
-	gid_File_Fnt_DejaVuSansMono_Bold,
-	gid_File_Fnt_DejaVuSansMono_BoldOblique,
-	gid_File_Fnt_DejaVuSansMono_Oblique,
-	gid_File_Fnt_DejaVuSansMono,
-	gid_File_Fnt_DejaVuSerif_Bold,
-	gid_File_Fnt_DejaVuSerif_BoldItalic,
-	gid_File_Fnt_DejaVuSerif_Italic,
-	gid_File_Fnt_DejaVuSerif,
-	gid_File_Fnt_DejaVuSerifCondensed_Bold,
-	gid_File_Fnt_DejaVuSerifCondensed_BoldItalic,
-	gid_File_Fnt_DejaVuSerifCondensed_Italic,
-	gid_File_Fnt_DejaVuSerifCondensed,
-	gid_File_Fnt_LibSansNarrow_Regular, 
-	gid_File_Fnt_LibSansNarrow_Bold,
-	gid_File_Fnt_LibSansNarrow_BoldItalic,
-	gid_File_Fnt_LibSansNarrow_Italic,
-	gid_File_Fnt_LiberationMono_Bold, 
-	gid_File_Fnt_LiberationMono_BoldItalic, 
-	gid_File_Fnt_LiberationMono_Italic,
-	gid_File_Fnt_LiberationMono_Regular, 
-	gid_File_Fnt_LiberationSans_Bold,
-	gid_File_Fnt_LiberationSans_BoldItalic,
-	gid_File_Fnt_LiberationSans_Italic,
-	gid_File_Fnt_LiberationSans_Regular,
-	gid_File_Fnt_LiberationSerif_Bold,
-	gid_File_Fnt_LiberationSerif_BoldItalic,
-	gid_File_Fnt_LiberationSerif_Italic,
-	gid_File_Fnt_LiberationSerif_Regular);
-End
-#endif
-
-Module gid_Module_Oo_Linguistic
-    PackageInfo = "packinfo_office.txt";
-    Name = "gid_Module_Oo_Linguistic";
-    Description = "gid_Module_Oo_Linguistic";
-    ParentID = gid_Module_Root;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Lib_Spell,
-        gid_File_Lib_Hunspell,
-        gid_File_Lib_Hyph,
-        gid_File_Lib_Lnth,
-        gid_File_Share_Registry_Lingucomponent_Xcd);
-End
-
-#ifdef LINUX
-Module gid_Module_Root_Userland
-    ParentID = gid_Module_Root;
-    InstallOrder = "5";
-	Name = "gid_Module_Root_Userland";
-	Description = "gid_Module_Root_Userland";
-	Subdir = "userland";
-    Styles = (HIDDEN_ROOT,USERLANDMODULE,USERINSTALLONLY,NOTRELOCATABLE,XPD_ONLY,INSTALLCANFAIL);
-    PackageName = "${USERLANDPACKAGENAME}";
-End
-#endif
-
-// #ifdef BUILD_SPECIAL
-// Module gid_Module_Root_Extension_Oooimprovement
-//    Name = "gid_Module_Root_Extension_Oooimprovement";
-//    Description = "gid_Module_Root_Extension_Oooimprovement";
-//    Files = (gid_File_Extension_Oxt_Oooimprovement);
-//    InstallOrder = "1990";
-//    PackageInfo = "packinfo_office.txt";
-//    ParentID = gid_Module_Root;
-//    Styles = (HIDDEN_ROOT);
-// End
-// #endif
diff --git a/scp2/source/ooo/module_improvement.scp b/scp2/source/ooo/module_improvement.scp
deleted file mode 100644
index 1380202f3..000000000
--- a/scp2/source/ooo/module_improvement.scp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-// OOo improvement module
-
-#if defined(BUILD_SPECIAL)
-Module gid_Module_Oooimprovement
-    PackageInfo = "packinfo_office.txt";
-    Name = "gid_Module_Oooimprovement";
-    Description = "gid_Module_Oooimprovement";
-    ParentID = gid_Module_Root;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Share_Registry_Oooimprovement_Xcd, gid_File_Lib_Oooimprovement);
-End
-#endif
diff --git a/scp2/source/ooo/module_java.scp b/scp2/source/ooo/module_java.scp
deleted file mode 100644
index e93721ce3..000000000
--- a/scp2/source/ooo/module_java.scp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-// Java modules
-
-Module gid_Module_Optional_Java
-    ParentID = gid_Module_Optional;
-    Sortkey = "100";
-    MOD_NAME_DESC ( MODULE_OPTIONAL_JAVA );
-  #ifdef WNT
-    Styles = (JAVAMODULE);
-  #elif defined (SOLARIS)
-    Styles = (JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE);
-  #else
-    Styles = (JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE,DONTSHOWINUSERINSTALL);
-  #endif
-  #ifdef LINUX
-    #ifdef X86_64
-    PackageName = "${LINUXX64JAVAFILENAME}";
-    #else
-    PackageName = "${LINUXJAVAFILENAME}";
-    #endif
-  #else
-    PackageName = "";
-  #endif
-End
-
-#ifdef SOLARIS
-Module gid_Module_Optional_Java_Runtime
-    ParentID = gid_Module_Optional_Java;
-	Name = "gid_Module_Optional_Java_Runtime";
-	Description = "gid_Module_Optional_Java_Runtime";
-    Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE);
-  #if defined (SOLARIS) && defined (SPARC)
-    PackageName = "${SOLSJAVARTPACKED}";
-  #elif defined (SOLARIS) && defined (INTEL)
-    PackageName = "${SOLIJAVARTPACKED}";
-  #else
-    PackageName = "";
-  #endif
-End
-#endif
-
-#ifdef SOLARIS
-Module gid_Module_Optional_Java_Config
-    ParentID = gid_Module_Optional_Java;
-	Name = "gid_Module_Optional_Java_Config";
-	Description = "gid_Module_Optional_Java_Config";
-    Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE);
-  #if defined (SOLARIS) && defined (SPARC)
-    PackageName = "${SOLSJAVACFGPACKED}";
-  #elif defined (SOLARIS) && defined (INTEL)
-    PackageName = "${SOLIJAVACFGPACKED}";
-  #else
-    PackageName = "";
-  #endif
-End
-#endif
-
-#ifdef SOLARIS
-Module gid_Module_Optional_Java_Manual
-    ParentID = gid_Module_Optional_Java;
-	Name = "gid_Module_Optional_Java_Manual";
-	Description = "gid_Module_Optional_Java_Manual";
-    Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE);
-  #if defined (SOLARIS) && defined (SPARC)
-    PackageName = "${SOLSJAVAMANPACKED}";
-  #elif defined (SOLARIS) && defined (INTEL)
-    PackageName = "${SOLIJAVAMANPACKED}";
-  #else
-    PackageName = "";
-  #endif
-End
-#endif
diff --git a/scp2/source/ooo/module_java.ulf b/scp2/source/ooo/module_java.ulf
deleted file mode 100644
index c3ccedc59..000000000
--- a/scp2/source/ooo/module_java.ulf
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_JAVA]
-en-US = "Java Runtime Environment (%JAVAVERSION)"
-
-[STR_DESC_MODULE_OPTIONAL_JAVA]
-en-US = "Component for setting up the Java Environment"
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
deleted file mode 100644
index efc2d98db..000000000
--- a/scp2/source/ooo/module_lang_template.scp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-Module gid_Module_Langpack_Basis_Template
-    ParentID = gid_Module_Langpack_Languageroot;
-    Name = "gid_Module_Langpack_Root_Template";
-    Description = "gid_Module_Langpack_Root_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Extra_Autotextshare_Lang,
-             gid_File_Extra_Tplpresntimpr_Lang,
-             gid_File_Extra_Tplwizagenda_Lang,
-             gid_File_Extra_Tplwizdesktop_Lang,
-             gid_File_Extra_Tplwizfax_Lang,
-             gid_File_Extra_Tplwizreport_Lang,
-             gid_File_Extra_Tplwizstyles_Lang,
-             gid_File_Registry_Filter_Zip,
-             gid_File_Registry_Lang,
-             gid_File_Registry_Spool_Langpack_Lang,
-             gid_File_Share_Registry_Ctl_Xcd,
-             gid_File_Share_Registry_Ctlseqcheck_Xcd,
-             gid_File_InfoPlist_Lang);
-    Dirs = (gid_Dir_Samples_Language);
-End
-
-Module gid_Module_Langpack_Resource_Template
-    ParentID = gid_Module_Langpack_Languageroot;
-    Name = "gid_Module_Langpack_Resource_Template";
-    Description = "gid_Module_Langpack_Resource_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_Basctl,
-             gid_File_Res_Bib,
-             gid_File_Res_Cal,
-             gid_File_Res_Chartcontroller,
-             gid_File_Res_Sdbt,
-             gid_File_Res_Dbmm,
-             gid_File_Res_Dba,
-             gid_File_Res_Dbw,
-             gid_File_Res_Dkt,
-             gid_File_Res_Editeng,
-             gid_File_Res_Eur,
-             gid_File_Res_For,
-             gid_File_Res_Forui,
-             gid_File_Res_Fps_Office,
-             gid_File_Res_Frm,
-             gid_File_Res_Fwe,
-             gid_File_Res_Gal,
-             gid_File_Res_Imp,
-             gid_File_Res_Deployment,
-             gid_File_Res_DeploymentGui,
-             gid_File_Res_Ofa,
-             gid_File_Res_Pcr,
-             gid_File_Res_Pdffilter,
-             gid_File_Res_San,
-             gid_File_Res_Productregistration,
-             gid_File_Res_Sb,
-             gid_File_Res_Sd,
-             gid_File_Res_Sfx,
-             gid_File_Res_Spa,
-             gid_File_Res_Svl,
-             gid_File_Res_Svt,
-             gid_File_Res_Svx,
-             gid_File_Res_Cui,
-             gid_File_Res_TextConversionDlgs,
-             gid_File_Res_Sw,
-             gid_File_Res_Tab,
-             gid_File_Res_Tk,
-             gid_File_Res_Acc,
-             gid_File_Res_Tpl,
-             gid_File_Res_Uui,
-             gid_File_Res_Vcl,
-             gid_File_Res_Wzi,
-             gid_File_Res_Xsltdlg,
-             gid_File_Res_AVMedia,
-             gid_File_Res_XMLSecurity,
-             gid_File_Res_Gallery,
-             gid_File_Res_Stt,
-             gid_File_Res_Tfu,
-             gid_File_Res_Eps,
-             gid_File_Res_UpdChk,
-             gid_File_Res_Upd);
-End
-Module gid_Module_Langpack_Fonts_Template
-    ParentID = gid_Module_Langpack_Languageroot;
-    Name = "gid_Module_Langpack_Fonts_Template";
-    Description = "gid_Module_Langpack_Fonts_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = ();
-End
-
-#include "alllangmodules_root.inc"
diff --git a/scp2/source/ooo/module_langpack.scp b/scp2/source/ooo/module_langpack.scp
deleted file mode 100644
index bda152b28..000000000
--- a/scp2/source/ooo/module_langpack.scp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Langpack_Languageroot
-    ParentID = gid_Module_Root;
-    XPDParentID = "root";
-    Sortkey = "300";
-    MOD_NAME_DESC(MODULE_ROOT_LANGPACK);
-    Styles = (SHOW_MULTILINGUAL_ONLY);
-End
-
-#include "alllangmodules.inc"
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
deleted file mode 100644
index 01f214053..000000000
--- a/scp2/source/ooo/module_langpack.ulf
+++ /dev/null
@@ -1,854 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
-[STR_NAME_MODULE_ROOT_LANGPACK]
-en-US = "Additional user interface languages"
-
-[STR_DESC_MODULE_ROOT_LANGPACK]
-en-US = "Additional user interface languages"
-
-[STR_NAME_MODULE_LANGPACK_EN_US]
-en-US = "English"
-
-[STR_DESC_MODULE_LANGPACK_EN_US]
-en-US = "Installs the English user interface"
-
-[STR_NAME_MODULE_LANGPACK_DE]
-en-US = "German"
-
-[STR_DESC_MODULE_LANGPACK_DE]
-en-US = "Installs the German user interface"
-
-[STR_NAME_MODULE_LANGPACK_FR]
-en-US = "French"
-
-[STR_DESC_MODULE_LANGPACK_FR]
-en-US = "Installs the French user interface"
-
-[STR_NAME_MODULE_LANGPACK_IT]
-en-US = "Italian"
-
-[STR_DESC_MODULE_LANGPACK_IT]
-en-US = "Installs the Italian user interface"
-
-[STR_NAME_MODULE_LANGPACK_ES]
-en-US = "Spanish"
-
-[STR_DESC_MODULE_LANGPACK_ES]
-en-US = "Installs the Spanish user interface"
-
-[STR_NAME_MODULE_LANGPACK_SV]
-en-US = "Swedish"
-
-[STR_DESC_MODULE_LANGPACK_SV]
-en-US = "Installs the Swedish user interface"
-
-[STR_NAME_MODULE_LANGPACK_PT]
-en-US = "Portuguese"
-
-[STR_DESC_MODULE_LANGPACK_PT]
-en-US = "Installs the Portuguese user interface"
-
-[STR_NAME_MODULE_LANGPACK_PT_BR]
-en-US = "Portuguese (Brazil)"
-
-[STR_DESC_MODULE_LANGPACK_PT_BR]
-en-US = "Installs the Portuguese user interface"
-
-[STR_NAME_MODULE_LANGPACK_JA]
-en-US = "Japanese"
-
-[STR_DESC_MODULE_LANGPACK_JA]
-en-US = "Installs the Japanese user interface"
-
-[STR_NAME_MODULE_LANGPACK_KO]
-en-US = "Korean"
-
-[STR_DESC_MODULE_LANGPACK_KO]
-en-US = "Installs the Korean user interface"
-
-[STR_NAME_MODULE_LANGPACK_ZH_CN]
-en-US = "Chinese (simplified)"
-
-[STR_DESC_MODULE_LANGPACK_ZH_CN]
-en-US = "Installs the Chinese (simplified) user interface"
-
-[STR_NAME_MODULE_LANGPACK_ZH_TW]
-en-US = "Chinese (traditional)"
-
-[STR_DESC_MODULE_LANGPACK_ZH_TW]
-en-US = "Installs the Chinese (traditional) user interface"
-
-[STR_NAME_MODULE_LANGPACK_NL]
-en-US = "Dutch"
-
-[STR_DESC_MODULE_LANGPACK_NL]
-en-US = "Installs the Dutch user interface"
-
-[STR_NAME_MODULE_LANGPACK_HU]
-en-US = "Hungarian"
-
-[STR_DESC_MODULE_LANGPACK_HU]
-en-US = "Installs the Hungarian user interface"
-
-[STR_NAME_MODULE_LANGPACK_PL]
-en-US = "Polish"
-
-[STR_DESC_MODULE_LANGPACK_PL]
-en-US = "Installs the Polish user interface"
-
-[STR_NAME_MODULE_LANGPACK_RU]
-en-US = "Russian"
-
-[STR_DESC_MODULE_LANGPACK_RU]
-en-US = "Installs the Russian user interface"
-
-[STR_NAME_MODULE_LANGPACK_TR]
-en-US = "Turkish"
-
-[STR_DESC_MODULE_LANGPACK_TR]
-en-US = "Installs the Turkish user interface"
-
-[STR_NAME_MODULE_LANGPACK_EL]
-en-US = "Greek"
-
-[STR_DESC_MODULE_LANGPACK_EL]
-en-US = "Installs the Greek user interface"
-
-[STR_NAME_MODULE_LANGPACK_TH]
-en-US = "Thai"
-
-[STR_DESC_MODULE_LANGPACK_TH]
-en-US = "Installs the Thai user interface"
-
-[STR_NAME_MODULE_LANGPACK_CS]
-en-US = "Czech"
-
-[STR_DESC_MODULE_LANGPACK_CS]
-en-US = "Installs the Czech user interface"
-
-[STR_NAME_MODULE_LANGPACK_SK]
-en-US = "Slovak"
-
-[STR_DESC_MODULE_LANGPACK_SK]
-en-US = "Installs the Slovak user interface"
-
-[STR_NAME_MODULE_LANGPACK_HR]
-en-US = "Croatian"
-
-[STR_DESC_MODULE_LANGPACK_HR]
-en-US = "Installs the Croatian user interface"
-
-[STR_NAME_MODULE_LANGPACK_ET]
-en-US = "Estonian"
-
-[STR_DESC_MODULE_LANGPACK_ET]
-en-US = "Installs the Estonian user interface"
-
-[STR_NAME_MODULE_LANGPACK_VI]
-en-US = "Vietnamese"
-
-[STR_DESC_MODULE_LANGPACK_VI]
-en-US = "Installs the Vietnamese user interface"
-
-[STR_NAME_MODULE_LANGPACK_BG]
-en-US = "Bulgarian"
-
-[STR_DESC_MODULE_LANGPACK_BG]
-en-US = "Installs the Bulgarian user interface"
-
-[STR_NAME_MODULE_LANGPACK_KM]
-en-US = "Khmer"
-
-[STR_DESC_MODULE_LANGPACK_KM]
-en-US = "Installs the Khmer user interface"
-
-[STR_NAME_MODULE_LANGPACK_PA_IN]
-en-US = "Punjabi"
-
-[STR_DESC_MODULE_LANGPACK_PA_IN]
-en-US = "Installs the Punjabi user interface"
-
-[STR_NAME_MODULE_LANGPACK_GU_IN]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_LANGPACK_GU_IN]
-en-US = "Installs the Gujarati user interface"
-
-[STR_NAME_MODULE_LANGPACK_TA]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_LANGPACK_TA]
-en-US = "Installs the Tamil user interface"
-
-[STR_NAME_MODULE_LANGPACK_TA_IN]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_LANGPACK_TA_IN]
-en-US = "Installs the Tamil user interface"
-
-[STR_NAME_MODULE_LANGPACK_HI]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_LANGPACK_HI]
-en-US = "Installs the Hindi user interface"
-
-[STR_NAME_MODULE_LANGPACK_HI_IN]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_LANGPACK_HI_IN]
-en-US = "Installs the Hindi user interface"
-
-[STR_NAME_MODULE_LANGPACK_ST]
-en-US = "Southern Sotho (Sutu)"
-
-[STR_DESC_MODULE_LANGPACK_ST]
-en-US = "Installs the Southern Sotho (Sutu) user interface"
-
-[STR_NAME_MODULE_LANGPACK_TN]
-en-US = "Tswana"
-
-[STR_DESC_MODULE_LANGPACK_TN]
-en-US = "Installs the Tswana user interface"
-
-[STR_NAME_MODULE_LANGPACK_XH]
-en-US = "Xhosa"
-
-[STR_DESC_MODULE_LANGPACK_XH]
-en-US = "Installs the Xhosa user interface"
-
-[STR_NAME_MODULE_LANGPACK_ZU]
-en-US = "Zulu"
-
-[STR_DESC_MODULE_LANGPACK_ZU]
-en-US = "Installs the Zulu user interface"
-
-[STR_NAME_MODULE_LANGPACK_AF]
-en-US = "Afrikaans"
-
-[STR_DESC_MODULE_LANGPACK_AF]
-en-US = "Installs the Afrikaans user interface"
-
-[STR_NAME_MODULE_LANGPACK_SW]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_LANGPACK_SW]
-en-US = "Installs the Swahili user interface"
-
-[STR_NAME_MODULE_LANGPACK_SW_TZ]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_LANGPACK_SW_TZ]
-en-US = "Installs the Swahili user interface"
-
-[STR_NAME_MODULE_LANGPACK_LO]
-en-US = "Lao"
-
-[STR_DESC_MODULE_LANGPACK_LO]
-en-US = "Installs the Lao user interface"
-
-[STR_NAME_MODULE_LANGPACK_MY]
-en-US = "Burmese"
-
-[STR_DESC_MODULE_LANGPACK_MY]
-en-US = "Installs the Burmese (Myanmar) user interface"
-
-[STR_NAME_MODULE_LANGPACK_NSO]
-en-US = "Northern Sotho"
-
-[STR_DESC_MODULE_LANGPACK_NSO]
-en-US = "Installs the Northern Sotho user interface"
-
-[STR_NAME_MODULE_LANGPACK_BN]
-en-US = "Bengali"
-
-[STR_DESC_MODULE_LANGPACK_BN]
-en-US = "Installs the Bengali user interface"
-
-[STR_NAME_MODULE_LANGPACK_BN_BD]
-en-US = "Bengali (Bangladesh)"
-
-[STR_DESC_MODULE_LANGPACK_BN_BD]
-en-US = "Installs the Bengali (Bangladesh) user interface"
-
-[STR_NAME_MODULE_LANGPACK_BN_IN]
-en-US = "Bengali (India)"
-
-[STR_DESC_MODULE_LANGPACK_BN_IN]
-en-US = "Installs the Bengali (India) user interface"
-
-[STR_NAME_MODULE_LANGPACK_OR]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_LANGPACK_OR]
-en-US = "Installs the Oriya user interface"
-
-[STR_NAME_MODULE_LANGPACK_OR_IN]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_LANGPACK_OR_IN]
-en-US = "Installs the Oriya user interface"
-
-[STR_NAME_MODULE_LANGPACK_MR]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_LANGPACK_MR]
-en-US = "Installs the Marathi user interface"
-
-[STR_NAME_MODULE_LANGPACK_MR_IN]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_LANGPACK_MR_IN]
-en-US = "Installs the Marathi user interface"
-
-[STR_NAME_MODULE_LANGPACK_NE]
-en-US = "Nepali"
-
-[STR_DESC_MODULE_LANGPACK_NE]
-en-US = "Installs the Nepali user interface"
-
-[STR_NAME_MODULE_LANGPACK_AR]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_LANGPACK_AR]
-en-US = "Installs the Arabic user interface"
-
-[STR_NAME_MODULE_LANGPACK_AR_SA]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_LANGPACK_AR_SA]
-en-US = "Installs the Arabic user interface"
-
-[STR_NAME_MODULE_LANGPACK_CA]
-en-US = "Catalan"
-
-[STR_DESC_MODULE_LANGPACK_CA]
-en-US = "Installs the Catalan user interface"
-
-[STR_NAME_MODULE_LANGPACK_CA_XV]
-en-US = "Catalan (Valencian)"
-
-[STR_DESC_MODULE_LANGPACK_CA_XV]
-en-US = "Installs the Catalan (Valencian) user interface"
-
-[STR_NAME_MODULE_LANGPACK_DA]
-en-US = "Danish"
-
-[STR_DESC_MODULE_LANGPACK_DA]
-en-US = "Installs the Danish user interface"
-
-[STR_NAME_MODULE_LANGPACK_FI]
-en-US = "Finnish"
-
-[STR_DESC_MODULE_LANGPACK_FI]
-en-US = "Installs the Finnish user interface"
-
-[STR_NAME_MODULE_LANGPACK_HE]
-en-US = "Hebrew"
-
-[STR_DESC_MODULE_LANGPACK_HE]
-en-US = "Installs the Hebrew user interface"
-
-[STR_NAME_MODULE_LANGPACK_IS]
-en-US = "Icelandic"
-
-[STR_DESC_MODULE_LANGPACK_IS]
-en-US = "Installs the Icelandic user interface"
-
-[STR_NAME_MODULE_LANGPACK_NB]
-en-US = "Norwegian (Bokmål)"
-
-[STR_DESC_MODULE_LANGPACK_NB]
-en-US = "Installs the Norwegian (Bokmål) user interface"
-
-[STR_NAME_MODULE_LANGPACK_NN]
-en-US = "Norwegian (Nynorsk)"
-
-[STR_DESC_MODULE_LANGPACK_NN]
-en-US = "Installs the Norwegian (Nynorsk) user interface"
-
-[STR_NAME_MODULE_LANGPACK_RM]
-en-US = "Rhaeto-Romance"
-
-[STR_DESC_MODULE_LANGPACK_RM]
-en-US = "Installs the Rhaeto-Romance user interface"
-
-[STR_NAME_MODULE_LANGPACK_RO]
-en-US = "Romanian"
-
-[STR_DESC_MODULE_LANGPACK_RO]
-en-US = "Installs the Romanian user interface"
-
-[STR_NAME_MODULE_LANGPACK_SQ]
-en-US = "Albanian"
-
-[STR_DESC_MODULE_LANGPACK_SQ]
-en-US = "Installs the Albanian user interface"
-
-[STR_NAME_MODULE_LANGPACK_UR]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_LANGPACK_UR]
-en-US = "Installs the Urdu user interface"
-
-[STR_NAME_MODULE_LANGPACK_ID]
-en-US = "Indonesian"
-
-[STR_DESC_MODULE_LANGPACK_ID]
-en-US = "Installs the Indonesian user interface"
-
-[STR_NAME_MODULE_LANGPACK_UK]
-en-US = "Ukrainian"
-
-[STR_DESC_MODULE_LANGPACK_UK]
-en-US = "Installs the Ukrainian user interface"
-
-[STR_NAME_MODULE_LANGPACK_BE]
-en-US = "Belarusian"
-
-[STR_DESC_MODULE_LANGPACK_BE]
-en-US = "Installs the Belarusian user interface"
-
-[STR_NAME_MODULE_LANGPACK_SL]
-en-US = "Slovenian"
-
-[STR_DESC_MODULE_LANGPACK_SL]
-en-US = "Installs the Slovenian user interface"
-
-[STR_NAME_MODULE_LANGPACK_LV]
-en-US = "Latvian"
-
-[STR_DESC_MODULE_LANGPACK_LV]
-en-US = "Installs the Latvian user interface"
-
-[STR_NAME_MODULE_LANGPACK_LT]
-en-US = "Lithuanian"
-
-[STR_DESC_MODULE_LANGPACK_LT]
-en-US = "Installs the Lithuanian user interface"
-
-[STR_NAME_MODULE_LANGPACK_HY]
-en-US = "Armenian"
-
-[STR_DESC_MODULE_LANGPACK_HY]
-en-US = "Installs the Armenian user interface"
-
-[STR_NAME_MODULE_LANGPACK_EU]
-en-US = "Basque"
-
-[STR_DESC_MODULE_LANGPACK_EU]
-en-US = "Installs the Basque user interface"
-
-[STR_NAME_MODULE_LANGPACK_MK]
-en-US = "Macedonian"
-
-[STR_DESC_MODULE_LANGPACK_MK]
-en-US = "Installs the Macedonian user interface"
-
-[STR_NAME_MODULE_LANGPACK_MT]
-en-US = "Maltese"
-
-[STR_DESC_MODULE_LANGPACK_MT]
-en-US = "Installs the Maltese user interface"
-
-[STR_NAME_MODULE_LANGPACK_CY]
-en-US = "Welsh"
-
-[STR_DESC_MODULE_LANGPACK_CY]
-en-US = "Installs the Welsh user interface"
-
-[STR_NAME_MODULE_LANGPACK_GL]
-en-US = "Galician"
-
-[STR_DESC_MODULE_LANGPACK_GL]
-en-US = "Installs the Galician user interface"
-
-[STR_NAME_MODULE_LANGPACK_SH_YU]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_LANGPACK_SH_YU]
-en-US = "Installs the Serbian (Latin) user interface"
-
-[STR_NAME_MODULE_LANGPACK_SH]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_LANGPACK_SH]
-en-US = "Installs the Serbian (Latin) user interface"
-
-[STR_NAME_MODULE_LANGPACK_GA]
-en-US = "Irish"
-
-[STR_DESC_MODULE_LANGPACK_GA]
-en-US = "Installs the Irish user interface"
-
-[STR_NAME_MODULE_LANGPACK_SR_CS]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_LANGPACK_SR_CS]
-en-US = "Installs the Serbian (Cyrillic) user interface"
-
-[STR_NAME_MODULE_LANGPACK_SR]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_LANGPACK_SR]
-en-US = "Installs the Serbian (Cyrillic) user interface"
-
-[STR_NAME_MODULE_LANGPACK_BS]
-en-US = "Bosnian"
-
-[STR_DESC_MODULE_LANGPACK_BS]
-en-US = "Installs the Bosnian user interface"
-
-[STR_NAME_MODULE_LANGPACK_AS_IN]
-en-US = "Assamese"
-
-[STR_DESC_MODULE_LANGPACK_AS_IN]
-en-US = "Installs the Assamese user interface"
-
-[STR_NAME_MODULE_LANGPACK_AST]
-en-US = "Asturian"
-
-[STR_DESC_MODULE_LANGPACK_AST]
-en-US = "Installs the Asturian user interface"
-
-[STR_NAME_MODULE_LANGPACK_RW]
-en-US = "Kinyarwanda"
-
-[STR_DESC_MODULE_LANGPACK_RW]
-en-US = "Installs the Kinyarwanda user interface"
-
-[STR_NAME_MODULE_LANGPACK_SA]
-en-US = "Sanskrit"
-
-[STR_DESC_MODULE_LANGPACK_SA]
-en-US = "Installs the Sanskrit user interface"
-
-[STR_NAME_MODULE_LANGPACK_FA]
-en-US = "Farsi"
-
-[STR_DESC_MODULE_LANGPACK_FA]
-en-US = "Installs the Farsi user interface"
-
-[STR_NAME_MODULE_LANGPACK_FO]
-en-US = "Faroese"
-
-[STR_DESC_MODULE_LANGPACK_FO]
-en-US = "Installs the Faroese user interface"
-
-[STR_NAME_MODULE_LANGPACK_SB]
-en-US = "Sorbian"
-
-[STR_DESC_MODULE_LANGPACK_SB]
-en-US = "Installs the Sorbian user interface"
-
-[STR_NAME_MODULE_LANGPACK_TT]
-en-US = "Tatar"
-
-[STR_DESC_MODULE_LANGPACK_TT]
-en-US = "Installs the Tatar user interface"
-
-[STR_NAME_MODULE_LANGPACK_TS]
-en-US = "Tsonga"
-
-[STR_DESC_MODULE_LANGPACK_TS]
-en-US = "Installs the Tsonga user interface"
-
-[STR_NAME_MODULE_LANGPACK_YI]
-en-US = "Yiddish"
-
-[STR_DESC_MODULE_LANGPACK_YI]
-en-US = "Installs the Yiddish user interface"
-
-[STR_NAME_MODULE_LANGPACK_BR]
-en-US = "Breton"
-
-[STR_DESC_MODULE_LANGPACK_BR]
-en-US = "Installs the Breton user interface"
-
-[STR_NAME_MODULE_LANGPACK_NR]
-en-US = "Ndebele South"
-
-[STR_DESC_MODULE_LANGPACK_NR]
-en-US = "Installs the Ndebele South user interface"
-
-[STR_NAME_MODULE_LANGPACK_SS]
-en-US = "Swazi"
-
-[STR_DESC_MODULE_LANGPACK_SS]
-en-US = "Installs the Swazi user interface"
-
-[STR_NAME_MODULE_LANGPACK_VE]
-en-US = "Venda"
-
-[STR_DESC_MODULE_LANGPACK_VE]
-en-US = "Installs the Venda user interface"
-
-[STR_NAME_MODULE_LANGPACK_KN]
-en-US = "Kannada"
-
-[STR_DESC_MODULE_LANGPACK_KN]
-en-US = "Installs the Kannada user interface"
-
-[STR_NAME_MODULE_LANGPACK_MS]
-en-US = "Malay (Malaysian)"
-
-[STR_DESC_MODULE_LANGPACK_MS]
-en-US = "Installs the Malay (Malaysian) user interface"
-
-[STR_NAME_MODULE_LANGPACK_TG]
-en-US = "Tajik"
-
-[STR_DESC_MODULE_LANGPACK_TG]
-en-US = "Installs the Tajik user interface"
-
-[STR_NAME_MODULE_LANGPACK_KU]
-en-US = "Kurdish"
-
-[STR_DESC_MODULE_LANGPACK_KU]
-en-US = "Installs the Kurdish user interface"
-
-[STR_NAME_MODULE_LANGPACK_DZ]
-en-US = "Dzongkha"
-
-[STR_DESC_MODULE_LANGPACK_DZ]
-en-US = "Installs the Dzongkha user interface"
-
-[STR_NAME_MODULE_LANGPACK_KA]
-en-US = "Georgian"
-
-[STR_DESC_MODULE_LANGPACK_KA]
-en-US = "Installs the Georgian user interface"
-
-[STR_NAME_MODULE_LANGPACK_EO]
-en-US = "Esperanto"
-
-[STR_DESC_MODULE_LANGPACK_EO]
-en-US = "Installs the Esperanto user interface"
-
-[STR_NAME_MODULE_LANGPACK_GU]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_LANGPACK_GU]
-en-US = "Installs the Gujarati user interface"
-
-[STR_NAME_MODULE_LANGPACK_EN_ZA]
-en-US = "English (South Africa)"
-
-[STR_DESC_MODULE_LANGPACK_EN_ZA]
-en-US = "Installs the English (South Africa) user interface"
-
-[STR_NAME_MODULE_LANGPACK_EN_GB]
-en-US = "English (United Kingdom)"
-
-[STR_DESC_MODULE_LANGPACK_EN_GB]
-en-US = "Installs the English (United Kingdom) user interface"
-
-[STR_NAME_MODULE_LANGPACK_UR_IN]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_LANGPACK_UR_IN]
-en-US = "Installs the Urdu user interface"
-
-[STR_NAME_MODULE_LANGPACK_ML_IN]
-en-US = "Malayalam"
-
-[STR_DESC_MODULE_LANGPACK_ML_IN]
-en-US = "Installs the Malayalam user interface"
-
-[STR_NAME_MODULE_LANGPACK_TE_IN]
-en-US = "Telugu"
-
-[STR_DESC_MODULE_LANGPACK_TE_IN]
-en-US = "Installs the Telugu user interface"
-
-[STR_NAME_MODULE_LANGPACK_TI_ER]
-en-US = "Tigrinya"
-
-[STR_DESC_MODULE_LANGPACK_TI_ER]
-en-US = "Installs the Tigrinya user interface"
-
-[STR_NAME_MODULE_LANGPACK_UZ]
-en-US = "Uzbek"
-
-[STR_DESC_MODULE_LANGPACK_UZ]
-en-US = "Installs the Uzbek user interface"
-
-[STR_NAME_MODULE_LANGPACK_MN]
-en-US = "Mongolian"
-
-[STR_DESC_MODULE_LANGPACK_MN]
-en-US = "Installs the Mongolian user interface"
-
-[STR_NAME_MODULE_LANGPACK_BO]
-en-US = "Tibetan"
-
-[STR_DESC_MODULE_LANGPACK_BO]
-en-US = "Installs the Tibetan user interface"
-
-[STR_NAME_MODULE_LANGPACK_OC]
-en-US = "Occitan"
-
-[STR_DESC_MODULE_LANGPACK_OC]
-en-US = "Installs the Occitan user interface"
-
-[STR_NAME_MODULE_LANGPACK_OM]
-en-US = "Oromo"
-
-[STR_DESC_MODULE_LANGPACK_OM]
-en-US = "Installs the Oromo user interface"
-
-[STR_NAME_MODULE_LANGPACK_SI]
-en-US = "Sinhala"
-
-[STR_DESC_MODULE_LANGPACK_SI]
-en-US = "Installs the Sinhala user interface"
-
-[STR_NAME_MODULE_LANGPACK_UG]
-en-US = "Uyghur"
-
-[STR_DESC_MODULE_LANGPACK_UG]
-en-US = "Installs the Uyghur user interface"
-
-[STR_NAME_MODULE_LANGPACK_AS]
-en-US = "Assamese"
-
-[STR_DESC_MODULE_LANGPACK_AS]
-en-US = "Installs the Assamese user interface"
-
-[STR_NAME_MODULE_LANGPACK_BRX]
-en-US = "Bodo"
-
-[STR_DESC_MODULE_LANGPACK_BRX]
-en-US = "Installs the Bodo user interface"
-
-[STR_NAME_MODULE_LANGPACK_DGO]
-en-US = "Dogri"
-
-[STR_DESC_MODULE_LANGPACK_DGO]
-en-US = "Installs the Dogri user interface"
-
-[STR_NAME_MODULE_LANGPACK_GD]
-en-US = "Scottish Gaelic"
-
-[STR_DESC_MODULE_LANGPACK_GD]
-en-US = "Installs the Scottish Gaelic user interface"
-
-[STR_NAME_MODULE_LANGPACK_KK]
-en-US = "Kazakh"
-
-[STR_DESC_MODULE_LANGPACK_KK]
-en-US = "Installs the Kazakh user interface"
-
-[STR_NAME_MODULE_LANGPACK_KOK]
-en-US = "Konkani"
-
-[STR_DESC_MODULE_LANGPACK_KOK]
-en-US = "Installs the Konkani user interface"
-
-[STR_NAME_MODULE_LANGPACK_KS]
-en-US = "Kashmiri"
-
-[STR_DESC_MODULE_LANGPACK_KS]
-en-US = "Installs the Kashmiri user interface"
-
-[STR_NAME_MODULE_LANGPACK_KY]
-en-US = "Kyrgyz"
-
-[STR_DESC_MODULE_LANGPACK_KY]
-en-US = "Installs the Kyrgyz user interface"
-
-[STR_NAME_MODULE_LANGPACK_MAI]
-en-US = "Maithili"
-
-[STR_DESC_MODULE_LANGPACK_MAI]
-en-US = "Installs the Maithili user interface"
-
-[STR_NAME_MODULE_LANGPACK_ML]
-en-US = "Malayalam"
-
-[STR_DESC_MODULE_LANGPACK_ML]
-en-US = "Installs the Malayalam user interface"
-
-[STR_NAME_MODULE_LANGPACK_MNI]
-en-US = "Manipuri"
-
-[STR_DESC_MODULE_LANGPACK_MNI]
-en-US = "Installs the Manipuri user interface"
-
-[STR_NAME_MODULE_LANGPACK_PAP]
-en-US = "Papiamento"
-
-[STR_DESC_MODULE_LANGPACK_PAP]
-en-US = "Installs the Papiamento user interface"
-
-[STR_NAME_MODULE_LANGPACK_PS]
-en-US = "Pashto"
-
-[STR_DESC_MODULE_LANGPACK_PS]
-en-US = "Installs the Pashto user interface"
-
-[STR_NAME_MODULE_LANGPACK_SA_IN]
-en-US = "Sanskrit (India)"
-
-[STR_DESC_MODULE_LANGPACK_SA_IN]
-en-US = "Installs the Sanskrit user interface"
-
-[STR_NAME_MODULE_LANGPACK_SAT]
-en-US = "Santali"
-
-[STR_DESC_MODULE_LANGPACK_SAT]
-en-US = "Installs the Santali user interface"
-
-[STR_NAME_MODULE_LANGPACK_SC]
-en-US = "Sardinian"
-
-[STR_DESC_MODULE_LANGPACK_SC]
-en-US = "Installs the Sardinian user interface"
-
-[STR_NAME_MODULE_LANGPACK_SD]
-en-US = "Sindhi"
-
-[STR_DESC_MODULE_LANGPACK_SD]
-en-US = "Installs the Sindhi user interface"
-
-[STR_NAME_MODULE_LANGPACK_TE]
-en-US = "Telugu"
-
-[STR_DESC_MODULE_LANGPACK_TE]
-en-US = "Installs the Telugu user interface"
-
-[STR_NAME_MODULE_LANGPACK_TI]
-en-US = "Tigrinya"
-
-[STR_DESC_MODULE_LANGPACK_TI]
-en-US = "Installs the Tigrinya user interface"
-
-[STR_NAME_MODULE_LANGPACK_LB]
-en-US = "Luxembourgish"
-
-[STR_DESC_MODULE_LANGPACK_LB]
-en-US = "Installs the Luxembourgish user interface"
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
deleted file mode 100644
index 293878bc9..000000000
--- a/scp2/source/ooo/module_ooo.scp
+++ /dev/null
@@ -1,453 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Root
-    Sortkey = "10";
-    PackageInfo = "packinfo_office.txt";
-    TabPackageInfo = "packinfo_office_tab.txt";
-    InstallOrder = "20";
-    MOD_NAME_DESC(MODULE_ROOT_OSL);
-    XpdPackageName = "gid_Module_Root_Files_1";
-End
-
-Module gid_Module_Prg
-    ParentID = gid_Module_Root;
-    XPDParentID = "root";
-    Sortkey = "100";
-    MOD_NAME_DESC(MODULE_PRG);
-End
-
-Module gid_Module_Optional
-    ParentID = gid_Module_Root;
-    XPDParentID = "root";
-    Sortkey = "200";
-    MOD_NAME_DESC ( MODULE_OPTIONAL );
-End
-
-Module gid_Module_Dictionaries
-    ParentID = gid_Module_Optional;
-    Sortkey = "215";
-    MOD_NAME_DESC ( MODULE_DICTIONARIES );
-End
-
-Module gid_Module_Root_Extension_Dictionary_Af
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AF );
-    Files = (gid_File_Extension_Dictionary_Af);
-    InstallOrder = "2000";
-    Sortkey = "510";
-    Spellcheckerlanguage = "af";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Br
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BR );
-    Files = (gid_File_Extension_Dictionary_Br);
-    InstallOrder = "2000";
-    Sortkey = "515";
-    Spellcheckerlanguage = "br";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ca
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CA );
-    Files = (gid_File_Extension_Dictionary_Ca);
-    InstallOrder = "2000";
-    Sortkey = "520";
-    Spellcheckerlanguage = "ca";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Cs
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CS );
-    Files = (gid_File_Extension_Dictionary_Cs);
-    InstallOrder = "2000";
-    Sortkey = "530";
-    Spellcheckerlanguage = "cs";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Da
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DA );
-    Files = (gid_File_Extension_Dictionary_Da);
-    Sortkey = "540";
-    InstallOrder = "2000";
-    Spellcheckerlanguage = "da";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_De_AT
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_AT );
-    Files = (gid_File_Extension_Dictionary_De_AT);
-    InstallOrder = "2000";
-    Sortkey = "570";
-    Spellcheckerlanguage = "de-AT";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_De_CH
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_CH );
-    Files = (gid_File_Extension_Dictionary_De_CH);
-    InstallOrder = "2000";
-    Sortkey = "580";
-    Spellcheckerlanguage = "de-CH";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_De_DE
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_DE );
-    Files = (gid_File_Extension_Dictionary_De_DE);
-    InstallOrder = "2000";
-    Sortkey = "575";
-    Spellcheckerlanguage = "de-DE";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_En
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EN );
-    Files = (gid_File_Extension_Dictionary_En);
-    InstallOrder = "2000";
-    Sortkey = "550";
-    Spellcheckerlanguage = "en";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Es
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ES );
-    Files = (gid_File_Extension_Dictionary_Es);
-    InstallOrder = "2000";
-    Sortkey = "720";
-    Spellcheckerlanguage = "es";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Et
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ET );
-    Files = (gid_File_Extension_Dictionary_Et);
-    InstallOrder = "2000";
-    Sortkey = "555";
-    Spellcheckerlanguage = "et";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Fr
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_FR );
-    Files = (gid_File_Extension_Dictionary_Fr);
-    InstallOrder = "2000";
-    Sortkey = "560";
-    Spellcheckerlanguage = "fr";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Gl
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_GL );
-    Files = (gid_File_Extension_Dictionary_Gl);
-    InstallOrder = "2000";
-    Sortkey = "565";
-    Spellcheckerlanguage = "gl";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_He
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HE );
-    Files = (gid_File_Extension_Dictionary_He);
-    InstallOrder = "2000";
-    Sortkey = "590";
-    Spellcheckerlanguage = "he";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Hu
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HU );
-    Files = (gid_File_Extension_Dictionary_Hu);
-    InstallOrder = "2000";
-    Sortkey = "600";
-    Spellcheckerlanguage = "hu";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Hr
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HR );
-    Files = (gid_File_Extension_Dictionary_Hr);
-    InstallOrder = "2000";
-    Sortkey = "605";
-    Spellcheckerlanguage = "hr";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_It
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_IT );
-    Files = (gid_File_Extension_Dictionary_It);
-    InstallOrder = "2000";
-    Sortkey = "610";
-    Spellcheckerlanguage = "it";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ku_Tr
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_KU_TR );
-    Files = (gid_File_Extension_Dictionary_Ku_Tr);
-    InstallOrder = "2000";
-    Sortkey = "620";
-    Spellcheckerlanguage = "ku-TR";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Lt
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LT );
-    Files = (gid_File_Extension_Dictionary_Lt);
-    InstallOrder = "2000";
-    Sortkey = "630";
-    Spellcheckerlanguage = "lt";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ne
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NE );
-    Files = (gid_File_Extension_Dictionary_Ne);
-    InstallOrder = "2000";
-    Sortkey = "640";
-    Spellcheckerlanguage = "ne";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Nl
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NL );
-    Files = (gid_File_Extension_Dictionary_Nl);
-    InstallOrder = "2000";
-    Sortkey = "545";
-    Spellcheckerlanguage = "nl";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_No
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NO );
-    Files = (gid_File_Extension_Dictionary_No);
-    InstallOrder = "2000";
-    Sortkey = "650";
-    Spellcheckerlanguage = "no";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Oc
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_OC );
-    Files = (gid_File_Extension_Dictionary_Oc);
-    InstallOrder = "2000";
-    Sortkey = "655";
-    Spellcheckerlanguage = "oc";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Pl
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PL );
-    Files = (gid_File_Extension_Dictionary_Pl);
-    InstallOrder = "2000";
-    Sortkey = "660";
-    Spellcheckerlanguage = "pl";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Pt
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PT );
-    Files = (gid_File_Extension_Dictionary_Pt);
-    InstallOrder = "2000";
-    Sortkey = "515";
-    Spellcheckerlanguage = "pt";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ro
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_RO );
-    Files = (gid_File_Extension_Dictionary_Ro);
-    InstallOrder = "2000";
-    Sortkey = "670";
-    Spellcheckerlanguage = "ro";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Ru
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_RU );
-    Files = (gid_File_Extension_Dictionary_Ru);
-    InstallOrder = "2000";
-    Sortkey = "680";
-    Spellcheckerlanguage = "ru";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Sk
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SK );
-    Files = (gid_File_Extension_Dictionary_Sk);
-    InstallOrder = "2000";
-    Sortkey = "700";
-    Spellcheckerlanguage = "sk";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Sl
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SL );
-    Files = (gid_File_Extension_Dictionary_Sl);
-    InstallOrder = "2000";
-    Sortkey = "710";
-    Spellcheckerlanguage = "sl";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Sr
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SR );
-    Files = (gid_File_Extension_Dictionary_Sr);
-    InstallOrder = "2000";
-    Sortkey = "690";
-    Spellcheckerlanguage = "sr";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Sv
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SV );
-    Files = (gid_File_Extension_Dictionary_Sv);
-    InstallOrder = "2000";
-    Sortkey = "740";
-    Spellcheckerlanguage = "sv";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Sw
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SW );
-    Files = (gid_File_Extension_Dictionary_Sw);
-    InstallOrder = "2000";
-    Sortkey = "730";
-    Spellcheckerlanguage = "sw";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Th
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TH );
-    Files = (gid_File_Extension_Dictionary_Th);
-    InstallOrder = "2000";
-    Sortkey = "750";
-    Spellcheckerlanguage = "th";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Uk
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_UK );
-    Files = (gid_File_Extension_Dictionary_Uk);
-    InstallOrder = "2000";
-    Sortkey = "755";
-    Spellcheckerlanguage = "uk";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Vi
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_VI );
-    Files = (gid_File_Extension_Dictionary_Vi);
-    InstallOrder = "2000";
-    Sortkey = "760";
-    Spellcheckerlanguage = "vi";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_Zu
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ZU );
-    Files = (gid_File_Extension_Dictionary_Zu);
-    InstallOrder = "2000";
-    Sortkey = "770";
-    Spellcheckerlanguage = "zu";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
deleted file mode 100644
index 49219cf76..000000000
--- a/scp2/source/ooo/module_ooo.ulf
+++ /dev/null
@@ -1,266 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
-[STR_NAME_MODULE_ROOT_OSL]
-en-US = "%PRODUCTNAME %PRODUCTVERSION"
-
-[STR_DESC_MODULE_ROOT_OSL]
-en-US = "%PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_PRG]
-en-US = "%PRODUCTNAME Program Modules"
-
-[STR_DESC_MODULE_PRG]
-en-US = "List of all installable %PRODUCTNAME modules."
-
-[STR_NAME_MODULE_OPTIONAL]
-en-US = "Optional Components"
-
-[STR_DESC_MODULE_OPTIONAL]
-en-US = "Common components and additional programs shared by all %PRODUCTNAME programs."
-
-[STR_NAME_MODULE_DICTIONARIES]
-en-US = "Dictionaries"
-
-[STR_DESC_MODULE_DICTIONARIES]
-en-US = "Spelling and hyphenation dictionaries and thesauri."
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_AF]
-en-US = "Afrikaans"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_AF]
-en-US = "Afrikaans spell checker"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_BR]
-en-US = "Breton"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_BR]
-en-US = "Breton spell checker"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_CA]
-en-US = "Catalan"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_CA]
-en-US = "Spelling and hyphenation dictionaries and thesaurus for Catalan language (general)"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_CS]
-en-US = "Czech"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_CS]
-en-US = "Czech thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_DA]
-en-US = "Danish"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_DA]
-en-US = "Spelling and hyphenation dictionary for Danish"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_AT]
-en-US = "German (Austria)"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_AT]
-en-US = "German (AT-frami) spelling, hyphenation, thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_CH]
-en-US = "German (Switzerland)"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_CH]
-en-US = "German (CH-frami) spelling, hyphenation, thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_DE]
-en-US = "German (Germany)"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_DE]
-en-US = "German (DE-frami) spelling, hyphenation, thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_EN]
-en-US = "English"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_EN]
-en-US = "English spelling and hyphenation dictionaries and thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_ES]
-en-US = "Spanish"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_ES]
-en-US = "Spanish spelling dictionary"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_ET]
-en-US = "Estonian"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_ET]
-en-US = "Estonian spelling and hyphenation dictionaries"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_FR]
-en-US = "French"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_FR]
-en-US = "French 'Classic and Reform 1990' spelling, thesaurus and hyphenation"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_GL]
-en-US = "Galician"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_GL]
-en-US = "Galician spellchecker dictionary for %PRODUCTNAME"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_HE]
-en-US = "Hebrew"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_HE]
-en-US = "Hebrew spell check dictionary"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_HU]
-en-US = "Hungarian"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_HU]
-en-US = "Hungarian spelling dictionary, hyphenation patterns, and thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_HR]
-en-US = "Croatian"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_HR]
-en-US = "Croatian spelling dictionary and hyphenation patterns"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_IT]
-en-US = "Italian"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_IT]
-en-US = "Italian spelling and hyphenation dictionaries and thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_KU_TR]
-en-US = "Kurdish (Turkey)"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_KU_TR]
-en-US = "Kurdish (Turkey) spell check dictionary"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_LT]
-en-US = "Lithuanian"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_LT]
-en-US = "Lithuanian spelling and hyphenation dictionaries"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_NE]
-en-US = "Nepali"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_NE]
-en-US = "Nepali spelling dictionary and thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_NL]
-en-US = "Dutch"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_NL]
-en-US = "Dutch spelling and hyphenation dictionaries"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_NO]
-en-US = "Norwegian"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_NO]
-en-US = "Norwegian dictionaries (Nynorsk and Bokmal)"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_OC]
-en-US = "Occitan"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_OC]
-en-US = "Occitan spell check dictionary"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_PL]
-en-US = "Polish"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_PL]
-en-US = "Polish spell check dictionary, hyphenation rules and thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_PT]
-en-US = "Brazilian Portuguese"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_PT]
-en-US = "Brazilian Portuguese Spelling Dictionary - 1990 Spelling Agreement"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_RO]
-en-US = "Romanian"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_RO]
-en-US = "Romanian Dictionaries"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_RU]
-en-US = "Russian"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_RU]
-en-US = "Russian spell check dictionary, hyphenation rules and thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_SK]
-en-US = "Slovak"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_SK]
-en-US = "Slovak spell check dictionary, hyphenation rules and thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_SL]
-en-US = "Slovenian"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_SL]
-en-US = "Slovenian dictionary pack"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_SR]
-en-US = "Serbian"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_SR]
-en-US = "Serbian spelling and hyphenation dictionaries"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_SV]
-en-US = "Swedish"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_SV]
-en-US = "Swedish Dictionary"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_SW]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_SW]
-en-US = "Swahili spelling dictionary"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_TH]
-en-US = "Thai"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_TH]
-en-US = "Thai spelling dictionary"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_UK]
-en-US = "Ukrainian"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_UK]
-en-US = "Ukrainian spell check dictionary, hyphenation rules and thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_VI]
-en-US = "Vietnamese"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_VI]
-en-US = "Vietnamese spellchecker dictionary"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_ZU]
-en-US = "Zulu"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_ZU]
-en-US = "Zulu hyphenation dictionary"
diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp
deleted file mode 100644
index 12ccef46c..000000000
--- a/scp2/source/ooo/module_systemint.scp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Systemintegration
-  #ifdef WNT
-    ParentID = gid_Module_Root;
-  #else
-    ParentID = gid_Module_Optional;
-  #endif
-    Sortkey = "800";
-    MOD_NAME_DESC(MODULE_OPTIONAL_SYSTEMINTEGRATION);
-  #ifdef WNT
-    Styles = (HIDDEN_ROOT);
-  #else
-    Styles = (SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE);
-  #endif
-  #if (defined(LINUX)) || (defined(SOLARIS))
-    PackageName = "${SYSTEMINTUNIXPACKAGENAME}-desktop-integration.tar.gz";
-  #else
-    PackageName = "";
-  #endif
-	InstallOrder = "desktop-integration:1050, suse-menus:1060, freedesktop-menus:1250, redhat-menus:1260";
-End
-
diff --git a/scp2/source/ooo/module_systemint.ulf b/scp2/source/ooo/module_systemint.ulf
deleted file mode 100644
index b178c80fa..000000000
--- a/scp2/source/ooo/module_systemint.ulf
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- 
-[STR_NAME_MODULE_OPTIONAL_SYSTEMINTEGRATION]
-en-US = "Desktop integration"
-
-[STR_DESC_MODULE_OPTIONAL_SYSTEMINTEGRATION]
-en-US = "Desktop integration of %PRODUCTNAME %PRODUCTVERSION."
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
deleted file mode 100644
index dcdf99b17..000000000
--- a/scp2/source/ooo/ooo_brand.scp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifndef MACOSX
-Directory gid_Dir_Brand_Root
-    ParentID = PREDEFINED_PROGDIR;
-  #ifdef WNT
-    HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
-  #else
-    HostName = ".";
-  #endif
-    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE);
-End
-#endif
-
-File gid_Brand_File_ServicesRdb
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "/ooo/services.rdb";
-    Styles = (PACKED);
-End
-
-ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
-    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "ErrorReport";
-    Order = 8;
-    Key = "ErrorReportServer";
-  #if defined(BUILD_SPECIAL)
-    Value = "report.libreoffice.org";
-  #else
-    Value = "";
-  #endif
-End
-
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
deleted file mode 100644
index a2491045c..000000000
--- a/scp2/source/ooo/profile_ooo.scp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Profile gid_Profile_Uno_Ini
-    ModuleID = gid_Module_Root;
-  #ifdef UNX
-    Name = "unorc";
-  #else
-    Name = "uno.ini";
-  #endif
-    Dir = gid_Dir_Program;
-    Styles = (NETWORK);
-End
-
-Profile gid_Profile_Version_Ini_Basis
-    ModuleID = gid_Module_Root;
-    Name = PROFILENAME(version);
-    Dir = gid_Dir_Program;
-    Styles = ();
-End
-
-Profile gid_Profile_Fundamentalbasis_Ini
-    ModuleID = gid_Module_Root;
-    Name = PROFILENAME(fundamentalbasis);
-    Dir = gid_Dir_Program;
-End
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
deleted file mode 100644
index 3c6dfefc1..000000000
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ /dev/null
@@ -1,477 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-ProfileItem gid_Profileitem_Setup_Uno_Java_Comppath
-    ProfileID = gid_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "UNO_JAVA_COMPPATH";
-    Value = "$ORIGIN/classes";
-End
-
-ProfileItem gid_Profileitem_Setup_Uno_Services
-    ProfileID = gid_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 2;
-    Key = "UNO_SERVICES";
-    Value = "$ORIGIN/setup_services.rdb";
-End
-
-ProfileItem gid_Profileitem_Setup_Uno_Types
-    ProfileID = gid_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 3;
-    Key = "UNO_TYPES";
-    Value = "$ORIGIN/types.rdb";
-End
-
-#ifdef WNT
-
-ProfileItem gid_Profileitem_Setup_Alluserset
-    ProfileID = gid_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 4;
-    Key = "ALLUSERS";
-    Value = "[ALLUSERS]";
-    Inifiletablekey = "AllUsersSet";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
-End
-
-#endif
-
-#ifdef WNT
-
-ProfileItem gid_Profileitem_Setup_Findproduct
-    ProfileID = gid_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 5;
-    Key = "FINDPRODUCT";
-    Value = "[FINDPRODUCT]";
-    Inifiletablekey = "FindProductSet";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
-End
-
-#endif
-
-#ifdef WNT
-
-ProfileItem gid_Profileitem_Setup_Productcode
-    ProfileID = gid_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 6;
-    Key = "ProductCode";
-    Value = "<productcode>";
-End
-
-#endif
-
-#ifdef WNT
-
-ProfileItem gid_Profileitem_Setup_Upgradecode
-    ProfileID = gid_Profile_Setup_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 7;
-    Key = "UpgradeCode";
-    Value = "<upgradecode>";
-End
-
-#endif
-
-ProfileItem gid_Profileitem_Soffice_Logo
-    ProfileID = gid_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "Logo";
-    Value = "1";
-End
-
-ProfileItem gid_Profileitem_Soffice_ProgressBarColor
-    ProfileID = gid_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 2;
-    Key = "ProgressBarColor";
-    Value = "0,0,128";
-End
-
-ProfileItem gid_Profileitem_Soffice_ProgressSize
-    ProfileID = gid_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 3;
-    Key = "ProgressSize";
-    Value = "-1,6";
-End
-
-ProfileItem gid_Profileitem_Soffice_ProgressPosition
-    ProfileID = gid_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 4;
-    Key = "ProgressPosition";
-    Value = "-1,-1";
-End
-
-ProfileItem gid_Profileitem_Soffice_NativeProgress
-    ProfileID = gid_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 6;
-    Key = "NativeProgress";
-    Value = "true";
-End
-
-#ifdef WNT
-
-ProfileItem gid_Profileitem_Soffice_Hideeula
-    ProfileID = gid_Profile_Soffice_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 8;
-    Key = "HideEula";
-    Value = "[HIDEEULA]";
-    Inifiletablekey = "HideEula";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
-End
-
-#endif
-
-ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions
-    ProfileID = gid_Profile_Uno_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "BUNDLED_EXTENSIONS";
-    Value = "$BRAND_BASE_DIR/share/extensions";
-End
-
-ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User
-    ProfileID = gid_Profile_Uno_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "BUNDLED_EXTENSIONS_USER";
-    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled";
-End
-
-ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_Prereg
-    ProfileID = gid_Profile_Uno_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "BUNDLED_EXTENSIONS_PREREG";
-    Value = "$BRAND_BASE_DIR/share/prereg/bundled";
-End
-
-
-ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages
-    ProfileID = gid_Profile_Uno_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "UNO_SHARED_PACKAGES";
-    Value = "$BRAND_BASE_DIR/share/uno_packages";
-End
-
-ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages_Cache
-    ProfileID = gid_Profile_Uno_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 2;
-    Key = "UNO_SHARED_PACKAGES_CACHE";
-    Value = "$UNO_SHARED_PACKAGES/cache";
-End
-
-ProfileItem gid_Profileitem_Uno_Uno_Shared_Extensions_User
-    ProfileID = gid_Profile_Uno_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "SHARED_EXTENSIONS_USER";
-    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared";
-End
-
-ProfileItem gid_Profileitem_Uno_Uno_User_Packages
-    ProfileID = gid_Profile_Uno_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 3;
-    Key = "UNO_USER_PACKAGES";
-    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages";
-End
-
-ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
-    ProfileID = gid_Profile_Uno_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "TMP_EXTENSIONS";
-    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp";
-End
-
-ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache
-    ProfileID = gid_Profile_Uno_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 4;
-    Key = "UNO_USER_PACKAGES_CACHE";
-    Value = "$UNO_USER_PACKAGES/cache";
-End
-ProfileItem gid_Profileitem_Uno_Pkg_BundledUnoFile
-    ProfileID = gid_Profile_Uno_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 5;
-    Key = "PKG_BundledUnoFile";
-    Value = "$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
-End
-
-ProfileItem gid_Profileitem_Uno_Pkg_SharedUnoFile
-    ProfileID = gid_Profile_Uno_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 5;
-    Key = "PKG_SharedUnoFile";
-    Value = "$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
-End
-
-ProfileItem gid_Profileitem_Uno_Pkg_UserUnoFile
-    ProfileID = gid_Profile_Uno_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 6;
-    Key = "PKG_UserUnoFile";
-    Value = "$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "BUNDLED_EXTENSIONS";
-    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions_User
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "BUNDLED_EXTENSIONS_USER";
-    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions_Prereg
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "BUNDLED_EXTENSIONS_PREREG";
-    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_PREREG}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Shared_Packages_Cache
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "UNO_SHARED_PACKAGES_CACHE";
-    Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_SHARED_PACKAGES_CACHE}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Shared_Extensions_User
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "SHARED_EXTENSIONS_USER";
-    Value = "${$ORIGIN/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_User_Packages_Cache
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "UNO_USER_PACKAGES_CACHE";
-    Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Tmp_Extensions
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "TMP_EXTENSIONS";
-    Value = "${$ORIGIN/" PROFILENAME(uno) ":TMP_EXTENSIONS}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Types
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "URE_MORE_TYPES";
-    Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "URE_MORE_SERVICES";
-    Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES} $ORIGIN/services.rdb";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "URE_MORE_JAVA_TYPES";
-    Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Jfw_Shared_Data
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "URE_OVERRIDE_JAVA_JFW_SHARED_DATA";
-    Value = "${BRAND_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Jfw_User_Data
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "URE_OVERRIDE_JAVA_JFW_USER_DATA";
-    Value = "${${BRAND_BASE_DIR}/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Classpath_Urls
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "URE_MORE_JAVA_CLASSPATH_URLS";
-    Value = "";
-#ifdef SYSTEM_BSH
-    ValueList1 = BSH_JAR;
-#endif
-#ifdef SYSTEM_HSQLDB
-    ValueList2 = HSQLDB_JAR;
-#endif
-#ifdef SYSTEM_SAXON
-    ValueList3 = SAXON_JAR;
-#endif
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Bin_Dir
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "URE_BIN_DIR";
-#if defined WNT
-    Value = "${.link:$ORIGIN/../ure-link}/bin";
-#else
-    Value = "$ORIGIN/../ure-link/bin";
-#endif
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Lib_Dir
-    ModuleID = gid_Module_Root;
-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
-    Section = "Bootstrap";
-    Key = "URE_LIB_DIR";
-#if defined WNT
-    Value = "${.link:$ORIGIN/../ure-link}/bin";
-#else
-    Value = "$ORIGIN/../ure-link/lib";
-#endif
-End
-
-// Basis layer: gid_Profile_Version_Ini_Basis
-
-ProfileItem gid_Basis_Profileitem_Version_Buildid
-    ProfileID = gid_Profile_Version_Ini_Basis;
-    ModuleID = gid_Module_Root;
-    Section = "Version";
-    Key = "buildid";
-    Value = "<buildid>";
-End
-
-ProfileItem gid_Basis_Profileitem_Version_Productsource
-    ProfileID = gid_Profile_Version_Ini_Basis;
-    ModuleID = gid_Module_Root;
-    Section = "Version";
-    Key = "ProductSource";
-    Value = "<sourceid>";
-End
-
-ProfileItem gid_Basis_Profileitem_Version_Productmajor
-    ProfileID = gid_Profile_Version_Ini_Basis;
-    ModuleID = gid_Module_Root;
-    Section = "Version";
-    Key = "ProductMajor";
-    Value = "<productmajor>";
-End
-
-ProfileItem gid_Basis_Profileitem_Version_Productminor
-    ProfileID = gid_Profile_Version_Ini_Basis;
-    ModuleID = gid_Module_Root;
-    Section = "Version";
-    Key = "ProductMinor";
-    Value = "<productminor>";
-End
-
-ProfileItem gid_Basis_Profileitem_Version_Productbuildid
-    ProfileID = gid_Profile_Version_Ini_Basis;
-    ModuleID = gid_Module_Root;
-    Section = "Version";
-    Key = "ProductBuildid";
-    Value = "<productbuildid>";
-End
-
-ProfileItem gid_Basis_Profileitem_Version_Ooobaseversion
-    ProfileID = gid_Profile_Version_Ini_Basis;
-    ModuleID = gid_Module_Root;
-    Section = "Version";
-    Key = "OOOBaseVersion";
-    Value = "${OOOBASEVERSION}";
-End
-
-ProfileItem gid_Basis_Profileitem_Version_Ooopackageversion
-    ProfileID = gid_Profile_Version_Ini_Basis;
-    ModuleID = gid_Module_Root;
-    Section = "Version";
-    Key = "OOOPackageVersion";
-    Value = "${OOOPACKAGEVERSION}";
-End
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
deleted file mode 100644
index 6aa7c4eb8..000000000
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ /dev/null
@@ -1,676 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-RegistryItem gid_Regitem_Bau
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".bau";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "AppID\{82154420-0FBF-11d4-8313-005004526AB4}";
-    ModuleID = gid_Module_Root;
-    Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
-End
-
-RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e_soffice
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "AppID\soffice.exe";
-    ModuleID = gid_Module_Root;
-    Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
-End
-
-RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}";
-    ModuleID = gid_Module_Root;
-    Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
-End
-
-RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_AppID
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}";
-    ModuleID = gid_Module_Root;
-    Name = "AppID";
-    Value = "{82154420-0FBF-11d4-8313-005004526AB4}";
-End
-
-RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Localserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\LocalServer32";
-    ModuleID = gid_Module_Root;
-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
-End
-
-RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Notinsertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\NotInsertable";
-    ModuleID = gid_Module_Root;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Progid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\ProgID";
-    ModuleID = gid_Module_Root;
-    Value = "com.sun.star.ServiceManager.1";
-End
-
-RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Programmable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\Programmable";
-    ModuleID = gid_Module_Root;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Versionindependentprogid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\VersionIndependentProgID";
-    ModuleID = gid_Module_Root;
-    Value = "com.sun.star.ServiceManager";
-End
-
-RegistryItem gid_Regitem_Sdg
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdg";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_Sdv
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdv";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_Sob
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sob";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_Soc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".soc";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_Sod
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sod";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_Soe
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".soe";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_Soffice_Starconfigfile_6
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarConfigFile.6";
-    ModuleID = gid_Module_Root;
-    REG_VALUE_LNG(SO60_CONFIGFILE)
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Soffice_Exe
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\soffice.exe";
-    ModuleID = gid_Module_Root;
-    Value = "<progpath>\program\soffice.exe";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Soffice_Exepath
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\soffice.exe";
-    ModuleID = gid_Module_Root;
-    Name = "Path";
-    Value = "<progpath>";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Unopkg_Exe
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\unopkg.exe";
-    ModuleID = gid_Module_Root;
-    Value = "<progpath>\program\unopkg.exe";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Unopkg_Exepath
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\unopkg.exe";
-    ModuleID = gid_Module_Root;
-    Name = "Path";
-    Value = "<progpath>";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Displayname
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
-    ModuleID = gid_Module_Root;
-    Name = "DisplayName";
-    Value = "%PRODUCTNAME %PRODUCTVERSION";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Displayname2
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
-    ModuleID = gid_Module_Root;
-    Name = "DisplayIcon";
-    Value = "<progpath>\program\setup.exe";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Displayversion
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    ModuleID = gid_Module_Root;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
-    Name = "DisplayVersion";
-    Value = "%PRODUCTVERSION";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Helplink
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    ModuleID = gid_Module_Root;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
-    Name = "HelpLink";
-    Value = "http://www.libreoffice.org";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Modifypath
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    ModuleID = gid_Module_Root;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
-    Name = "ModifyPath";
-    Value = "<progpath>\program\setup.exe -reinstall";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Publisher
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    ModuleID = gid_Module_Root;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
-    Name = "Publisher";
-    Value = "The The Document Foundation for the LibreOffice Community";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Uninstallstring
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
-    ModuleID = gid_Module_Root;
-    Name = "UninstallString";
-    Value = "<progpath>\program\setup.exe -deinstall";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Urlinfoabout
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    ModuleID = gid_Module_Root;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
-    Name = "URLInfoAbout";
-    Value = "http://www.libreoffice.org/";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Urlupdateinfo
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    ModuleID = gid_Module_Root;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
-    Name = "URLUpdateInfo";
-    Value = "http://download.libreoffice.org";
-End
-
-RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\LibreOffice\%PRODUCTNAME\%PRODUCTVERSION";
-	ModuleID = gid_Module_Root;
-	Name = "Path";
-	Value = "<progpath>\program\soffice.exe";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Install
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-	ModuleID = gid_Module_Root;
-	Name = "INSTALLLOCATION";
-	Value = "[INSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Install
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-	ModuleID = gid_Module_Root;
-	Name = "INSTALLLOCATION";
-	Value = "[INSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
-	ModuleID = gid_Module_Root;
-	Name = "INSTALLLOCATION";
-	Value = "[INSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Officeinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-	ModuleID = gid_Module_Root;
-	Name = "OFFICEINSTALLLOCATION";
-	Value = "[INSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,UPGRADEKEY);
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Productversion
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-	ModuleID = gid_Module_Root;
-	Name = "ProductVersion";
-	Value = "[ProductVersion]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Officeinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-	ModuleID = gid_Module_Root;
-	Name = "OFFICEINSTALLLOCATION";
-	Value = "[INSTALLLOCATION]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Productversion
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-	ModuleID = gid_Module_Root;
-	Name = "ProductVersion";
-	Value = "[ProductVersion]";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
-	ModuleID = gid_Module_Root;
-	Name = "OFFICEINSTALLLOCATION";
-	Value = "[INSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-	ModuleID = gid_Module_Root;
-	Name = "BASISINSTALLLOCATION";
-	Value = "[INSTALLLOCATION]Basis\\";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-	ModuleID = gid_Module_Root;
-	Name = "BASISINSTALLLOCATION";
-	Value = "[INSTALLLOCATION]Basis\\";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
-	ModuleID = gid_Module_Root;
-	Name = "BASISINSTALLLOCATION";
-	Value = "[INSTALLLOCATION]Basis\\";
-	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
-End
-
-RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
-	ModuleID = gid_Module_Root;
-	Name = "BASISINSTALLLOCATION";
-	Value = "[INSTALLLOCATION]Basis\\";
-	Styles = (ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-	ModuleID = gid_Module_Root;
-	Name = "UREINSTALLLOCATION";
-	Value = "[INSTALLLOCATION]URE\\";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-	ModuleID = gid_Module_Root;
-	Name = "UREINSTALLLOCATION";
-	Value = "[INSTALLLOCATION]URE\\";
-	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
-	ModuleID = gid_Module_Root;
-	Name = "UREINSTALLLOCATION";
-	Value = "[INSTALLLOCATION]URE\\";
-	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
-End
-
-RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
-	ModuleID = gid_Module_Root;
-	Name = "UREINSTALLLOCATION";
-	Value = "[INSTALLLOCATION]URE\\";
-	Styles = (ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Sog
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sog";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_Soh
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".soh";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "com.sun.star.ServiceManager";
-    ModuleID = gid_Module_Root;
-    Value = "%PRODUCTNAME Service Manager";
-End
-
-RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "com.sun.star.ServiceManager.1";
-    ModuleID = gid_Module_Root;
-    Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
-End
-
-RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager_1_Clsid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "com.sun.star.ServiceManager.1\CLSID";
-    ModuleID = gid_Module_Root;
-    Value = "{82154420-0FBF-11d4-8313-005004526AB4}";
-End
-
-RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager_1_Notinsertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "com.sun.star.ServiceManager.1\NotInsertable";
-    ModuleID = gid_Module_Root;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager_Clsid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "com.sun.star.ServiceManager\CLSID";
-    ModuleID = gid_Module_Root;
-    Value = "{82154420-0FBF-11d4-8313-005004526AB4}";
-End
-
-RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "com.sun.star.ServiceManager\CurVer";
-    ModuleID = gid_Module_Root;
-    Value = "com.sun.star.ServiceManager.1";
-End
-
-RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager_Notinsertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "com.sun.star.ServiceManager\NotInsertable";
-    ModuleID = gid_Module_Root;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Thm
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".thm";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_Vor_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = ".vor";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.writer";
-End
-
-RegistryItem gid_Regitem_Vor_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.writer";
-    Name = "Extension";
-    Value = ".vor";
-End
-
-RegistryItem gid_Regitem_Xba
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".xba";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_Xcs
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".xcs";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_Xcu
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".xcu";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_Xdl
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".xdl";
-    ModuleID = gid_Module_Root;
-    Value = "soffice.StarConfigFile.6";
-End
-
-RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\LibreOffice\UNO\InstallPath";
-    ModuleID = gid_Module_Root;
-    Value  = "<progpath>\program";
-End
-
-RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\LibreOffice\UNO\InstallPath";
-    ModuleID = gid_Module_Root;
-    Name = "%PRODUCTNAME %PRODUCTVERSION";
-    Value  = "<progpath>\program";
-End
-
-// "OpenWith" Windows Registry keys for extensions supported by OOo
-
-// new oxt file extension for office extension packages
-RegistryItem gid_Regitem_Oxt
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = ".oxt";
-    Value = "office.Extension.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Oxt_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = ".oxt";
-    Name = "Content Type";
-    Value = "application/vnd.openofficeorg.extension";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Oxt_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "MIME\Database\Content Type\application/vnd.openofficeorg.extension";
-    Name = "Extension";
-    Value = ".oxt";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Office_Extension_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "office.Extension\CurVer";
-    Value = "office.Extension.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Office_Extension_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "office.Extension.1";
-    Value = "%PRODUCTNAME Extension";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Office_Extension_1_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "office.Extension.1\shell";
-    Value = "open";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Office_Extension_1_Shell_Open
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "office.Extension.1\shell\open";
-    REG_VALUE_LNG(INSTALL)
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Office_Extension_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "office.Extension.1\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Office_Extension_1_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "office.Extension.1\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,39";
-    Styles = ();
-End
-
-// ----- Vista Default Programs ----------------------------------------
-// Find more information here:
-// URL:
-// ---------------------------------------------------------------------
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_ApplicationDescription
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities";
-	ModuleID = gid_Module_Root;
-	Name = "ApplicationDescription";
-//        Value = "";
-        REG_VALUE_LNG(APPCAPABILITY_DESCRIPTION_OOO)
-	Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_ApplicationName
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities";
-	ModuleID = gid_Module_Root;
-	Name = "ApplicationName";
-    Value = "%PRODUCTNAME %PRODUCTVERSION";
-	Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_ApplicationIcon
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities";
-	ModuleID = gid_Module_Root;
-	Name = "ApplicationIcon";
-    Value = "<progpath>\program\soffice.exe,0";
-	Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Oxt
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".oxt";
-    Value = "office.Extension.1";
-    Styles = ();
-End
-
-// RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_ApplicationName
-// 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities";
-// 	ModuleID = gid_Module_Root;
-// 	Name = "ApplicationName";
-//      Value = "%PRODUCTNAME%PRODUCTADDON %PRODUCTVERSION";
-// 	Styles = ();
-// End
-
-// RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_Description
-// 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities";
-// 	ModuleID = gid_Module_Root;
-// 	Name = "Description";
-//         Value = "blah fasel";
-// 	Styles = ();
-// End
-
-RegistryItem gid_Regitem_Software_RegisteredApplications
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\RegisteredApplications";
-	ModuleID = gid_Module_Root;
-	Name = "%PRODUCTNAME %PRODUCTVERSION";
-    Value = "SOFTWARE\%MANUFACTURER\%PRODUCTNAME\%PRODUCTVERSION\Capabilities";
-	Styles = ();
-End
diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf
deleted file mode 100644
index f8dd53c43..000000000
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_REG_VAL_NEW]
-en-US = "&New"
-
-[STR_REG_VAL_INSTALL]
-en-US = "&Install"
-
-[STR_REG_VAL_SO60_CONFIGFILE]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File"
-
-[STR_REG_VAL_SO50_TEMPLATE_OOO]
-en-US = "StarOffice 5.0 Template"
-
-[STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
-en-US = "LibreOffice"
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
deleted file mode 100644
index 768460ef6..000000000
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ /dev/null
@@ -1,308 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-#ifdef MACOSX
-ScpAction scp_Copy_Thirdpartylicense_Readme_Html
-    Copy = "THIRDPARTYLICENSEREADME.html";
-    Name= "THIRDPARTYLICENSEREADME.html";
-    Subdir = "LICENSEs";
-End
-#endif
-
-ScpAction scp_Copy_Readme_Txt
-  #ifdef UNX
-    README_ALL_LANG(Copy, README);
-    README_ALL_LANG(Name, README);
-  #else
-    README_TXT_ALL_LANG(Copy, readme, txt);
-    README_TXT_ALL_LANG(Name, readme, txt);
-  #endif
-    Styles = (SCPZIP_REPLACE);
-  #ifndef MACOSX
-    Subdir = "readmes";
-  #else
-    Subdir = "READMEs";
-  #endif
-End
-
-#if defined(WNT) && defined(_gcc3)
-ScpAction SCP_COPY_MINGWM10
-    Copy = "mingwm10.dll";
-    Name = "mingwm10.dll";
-End
-#if defined(MINGW_GCCDLL)
-ScpAction SCP_COPY_MINGW_GCCS
-    Copy = MINGW_GCCDLL;
-    Name = MINGW_GCCDLL;
-End
-#endif
-#if defined(MINGW_GXXDLL)
-ScpAction SCP_COPY_MINGW_STDCPP
-    Copy = MINGW_GXXDLL;
-    Name = MINGW_GXXDLL;
-End
-#endif
-#endif
-
-ScpAction scp_Copy_Xpd_Javaloader
-  	Copy = "javaloader.sh";
-    Name = "setup";
-    Styles = (XPD_ONLY);
-    UnixRights = 775;
-End
-
-ScpAction scp_Copy_Xpd_Javajarfile
-  	Copy = "JavaSetup.jar";
-    Name = "JavaSetup.jar";
-    Styles = (XPD_ONLY);
-End
-
-// #ifdef SOLARIS
-// ScpAction scp_Copy_Xpd_Getuidso
-//     Copy = "getuid.so";
-//     Name = "getuid.so";
-//     Styles = (XPD_ONLY);
-//     Subdir = "installdata/getuid";
-// End
-// #endif
-
-// Setup image
-ScpAction scp_Copy_Xpd_Gif_Setup
-  	Copy = "Setup.gif";
-    Name = "Setup.gif";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/images";
-End
-
-// Setup help files
-
-ScpAction scp_Copy_Xpd_Help_Html_Acceptlicense
-    README_TXT_ALL_LANG(Copy, AcceptLicense, html);
-    README_TXT_ALL_LANG(Name, AcceptLicense, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Acceptlicense_En_Us
-    Copy = "AcceptLicense_en-US.html";
-    Name = "AcceptLicense.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Choosecomponents
-    README_TXT_ALL_LANG(Copy, ChooseComponents, html);
-    README_TXT_ALL_LANG(Name, ChooseComponents, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Choosecomponents_En_Us
-    Copy = "ChooseComponents_en-US.html";
-    Name = "ChooseComponents.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Choosedirectory
-    README_TXT_ALL_LANG(Copy, ChooseDirectory, html);
-    README_TXT_ALL_LANG(Name, ChooseDirectory, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Choosedirectory_En_Us
-    Copy = "ChooseDirectory_en-US.html";
-    Name = "ChooseDirectory.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Chooseinstallationtype
-    README_TXT_ALL_LANG(Copy, ChooseInstallationType, html);
-    README_TXT_ALL_LANG(Name, ChooseInstallationType, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Chooseinstallationtype_En_Us
-    Copy = "ChooseInstallationType_en-US.html";
-    Name = "ChooseInstallationType.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-// ScpAction scp_Copy_Xpd_Help_Html_Chooselanguage
-//    README_TXT_ALL_LANG(Copy, ChooseLanguage, html);
-//    README_TXT_ALL_LANG(Name, ChooseLanguage, html);
-//    Styles = (XPD_ONLY);
-//    Subdir = "installdata/html";
-// End
-
-// ScpAction scp_Copy_Xpd_Help_Html_Chooselanguage_En_Us
-//    Copy = "ChooseLanguage_en-US.html";
-//    Name = "ChooseLanguage.html";
-//    Styles = (XPD_ONLY);
-//    Subdir = "installdata/html";
-// End
-
-ScpAction scp_Copy_Xpd_Help_Html_Chooseuninstallationcomponents
-    README_TXT_ALL_LANG(Copy, ChooseUninstallationComponents, html);
-    README_TXT_ALL_LANG(Name, ChooseUninstallationComponents, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Chooseuninstallationcomponents_En_Us
-    Copy = "ChooseUninstallationComponents_en-US.html";
-    Name = "ChooseUninstallationComponents.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Chooseuninstallationtype
-    README_TXT_ALL_LANG(Copy, ChooseUninstallationType, html);
-    README_TXT_ALL_LANG(Name, ChooseUninstallationType, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Chooseuninstallationtype_En_Us
-    Copy = "ChooseUninstallationType_en-US.html";
-    Name = "ChooseUninstallationType.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Installationimminent
-    README_TXT_ALL_LANG(Copy, InstallationImminent, html);
-    README_TXT_ALL_LANG(Name, InstallationImminent, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Installationimminent_En_Us
-    Copy = "InstallationImminent_en-US.html";
-    Name = "InstallationImminent.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Installationongoing
-    README_TXT_ALL_LANG(Copy, InstallationOngoing, html);
-    README_TXT_ALL_LANG(Name, InstallationOngoing, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Installationongoing_En_Us
-    Copy = "InstallationOngoing_en-US.html";
-    Name = "InstallationOngoing.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Prologue
-    README_TXT_ALL_LANG(Copy, Prologue, html);
-    README_TXT_ALL_LANG(Name, Prologue, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Prologue_En_Us
-    Copy = "Prologue_en-US.html";
-    Name = "Prologue.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Uninstallationimminent
-    README_TXT_ALL_LANG(Copy, UninstallationImminent, html);
-    README_TXT_ALL_LANG(Name, UninstallationImminent, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Uninstallationimminent_En_Us
-    Copy = "UninstallationImminent_en-US.html";
-    Name = "UninstallationImminent.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Uninstallationongoing
-    README_TXT_ALL_LANG(Copy, UninstallationOngoing, html);
-    README_TXT_ALL_LANG(Name, UninstallationOngoing, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Uninstallationongoing_En_Us
-    Copy = "UninstallationOngoing_en-US.html";
-    Name = "UninstallationOngoing.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Uninstallationprologue
-    README_TXT_ALL_LANG(Copy, UninstallationPrologue, html);
-    README_TXT_ALL_LANG(Name, UninstallationPrologue, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Help_Html_Uninstallationprologue_En_Us
-    Copy = "UninstallationPrologue_en-US.html";
-    Name = "UninstallationPrologue.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-#ifdef MACOSX
-ScpAction scp_Copy_Dmg_Background_Image
-  #if defined(BUILD_SPECIAL)
-    Copy = "osxdndinstall.png";
-  #else
-    Copy = "osxdndinstall_nologo.png";
-  #endif
-    Name = "background.png";
-    UnixRights = 444;
-    Styles = ();
-    Subdir = ".background";
-End
-
-ScpAction scp_Copy_Ds_Store
-    Copy = "DS_Store";
-    LangPackCopy = "DS_Store_Langpack";
-    PatchCopy = "DS_Store_Patch";
-    Name = ".DS_Store";
-    UnixRights = 444;
-    Styles = (FORCELANGUAGEPACK);
-End
-#endif
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
deleted file mode 100644
index 9f400afbb..000000000
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-#ifdef UNX
-#ifndef SYSTEM_ICU
-
-Shortcut gid_Shortcut_Lib_Icudata
-    FileID = gid_File_Lib_Icudata;
-    Dir = SCP2_OOO_BIN_DIR;
-#ifndef AIX
-    Name = STRING(CONCAT5(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
-#else
-    Name = "libicudata.so";
-#endif
-    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
-End
-
-Shortcut gid_Shortcut_Lib_Icui18n
-    FileID = gid_File_Lib_Icui18n;
-    Dir = SCP2_OOO_BIN_DIR;
-#ifndef AIX
-    Name = STRING(CONCAT5(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
-#else
-    Name = "libicui18n.so";
-#endif
-    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
-End
-
-Shortcut gid_Shortcut_Lib_Icule
-    FileID = gid_File_Lib_Icule;
-    Dir = SCP2_OOO_BIN_DIR;
-#ifndef AIX
-    Name = STRING(CONCAT5(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
-#else
-    Name = "libicule.so";
-#endif
-    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
-End
-
-Shortcut gid_Shortcut_Lib_Icuuc
-    FileID = gid_File_Lib_Icuuc;
-    Dir = SCP2_OOO_BIN_DIR;
-#ifndef AIX
-    Name = STRING(CONCAT5(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
-#else
-    Name = "libicuuc.so";
-#endif
-    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
-End
-
-#endif
-
-#endif
-
-#ifdef MACOSX
-
-Shortcut gid_Shortcut_Lib_Hsqldb_2
-    FileID = gid_File_Lib_Hsqldb_2;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "libhsqldb.jnilib";
-    Styles = (NETWORK, RELATIVE);
-End
-
-Shortcut gid_Shortcut_Lib_Libcroco
-    FileID = gid_File_Lib_Libcroco;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "libcroco-0.6.3.dylib";
-    Styles = (NETWORK, RELATIVE);
-End
-
-#endif
-
-//i44154 -end-
diff --git a/scp2/source/ooo/starregistry_ooo.scp b/scp2/source/ooo/starregistry_ooo.scp
deleted file mode 100644
index 41bacdcec..000000000
--- a/scp2/source/ooo/starregistry_ooo.scp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-StarRegistry gid_Starregistry_Services_Rdb
-    Name = "services.rdb";
-    Dir = gid_Dir_Program;
-End
-
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
deleted file mode 100644
index 6d61daff3..000000000
--- a/scp2/source/ooo/ure.scp
+++ /dev/null
@@ -1,1244 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Directory gid_Dir_Ure_Bin
-#if defined MACOSX
-    ParentID = gid_Dir_UreLink;
-#else
-    ParentID = gid_Dir_Common_Ure;
-#endif
-    DosName = "bin";
-End
-
-#if !defined WNT
-Directory gid_Dir_Ure_Lib
-#if defined MACOSX
-    ParentID = gid_Dir_UreLink;
-#else
-    ParentID = gid_Dir_Common_Ure;
-#endif
-    DosName = "lib";
-End
-#endif
-
-#if !defined WNT
-Directory gid_Dir_Ure_Share
-#if defined MACOSX
-    ParentID = gid_Dir_UreLink;
-#else
-    ParentID = gid_Dir_Common_Ure;
-#endif
-    DosName = "share";
-End
-#endif
-
-#if defined SOLAR_JAVA
-Directory gid_Dir_Ure_Java
-    ParentID = SCP2_URE_SHARE_DIR;
-    DosName = "java";
-End
-#endif
-
-Directory gid_Dir_Ure_Misc
-    ParentID = SCP2_URE_SHARE_DIR;
-    DosName = "misc";
-End
-
-// Public Executables:
-
-#if defined WNT
-File gid_File_Exe_Uno
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(uno);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "C66A9E2B-B16D-46A9-B9EC-772D9D3837F5";
-End
-#endif
-
-#ifndef WNT
-Shortcut gid_Shortcut_Exe_Uno
-    FileID = gid_File_Exe_StartupSh;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(uno);
-    Styles = (RELATIVE);
-End
-#endif
-
-#if defined WNT
-File gid_File_Exe_Regcomp
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(regcomp);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "D51FA672-7C24-4E24-A282-872C4BF690A1";
-End
-#endif
-
-#ifndef WNT
-Shortcut gid_Shortcut_Exe_Regcomp
-    FileID = gid_File_Exe_StartupSh;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(regcomp);
-    Styles = (RELATIVE);
-End
-#endif
-
-File gid_File_Exe_Regmerge
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(regmerge);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "881BCC1D-BA4A-4527-9C7D-D89157C2D03B";
-End
-
-File gid_File_Exe_Regview
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(regview);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "DAB09DCD-8491-4DC8-B153-2BA81A830AC2";
-End
-
-#if !defined MACOSX && !defined WNT && defined SOLAR_JAVA
-File gid_File_Exe_Javaldx
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(javaldx);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1";
-End
-#endif
-
-// Private Executables:
-
-#if !defined WNT
-File gid_File_Exe_StartupSh
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = "/ure/startup.sh";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "C86E816A-4EAE-47E9-BD1F-3E23C80F4EAE";
-End
-#endif
-
-#if !defined WNT
-File gid_File_Exe_UnoBin
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = "uno.bin";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "4AE33B3E-B33E-4BA4-AADC-8D7ED303FDE9";
-End
-#endif
-
-#if !defined WNT
-File gid_File_Exe_RegcompBin
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = "regcomp.bin";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "70FBE546-A228-455F-BCBB-716BF03AD5C6";
-End
-#endif
-
-// Public Dynamic Libraries:
-
-File gid_File_Dl_Cppu
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_VER("cppu", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "36C01AC6-BB0A-4181-A8B8-50B793ADEDB7";
-End
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Cppu
-    BIN_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_NORMAL("cppu");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = SCP2_URE_DL_UNO_VER("cppu", "3");
-End
-#endif
-
-File gid_File_Dl_Cppuhelper
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "D2A191E6-2023-41F5-9032-B98C50C37964";
-End
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Cppuhelper
-    BIN_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
-End
-#endif
-
-File gid_File_Dl_PurpEnvHelper
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "C80146A8-A14C-44D1-AB9F-D9D8BF22277E";
-End
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_PurpEnvHelper
-    BIN_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
-End
-#endif
-
-File gid_File_Dl_Sal
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_VER("sal", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
-End
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Sal
-    BIN_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_NORMAL("sal");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = SCP2_URE_DL_UNO_VER("sal", "3");
-End
-#endif
-
-File gid_File_Dl_Sal_TextEnc
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_VER("sal_textenc", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-
-File gid_File_Dl_Salhelper
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "879B80E0-F6E1-4931-8EE6-7CF867CB6AA5";
-End
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Salhelper
-    BIN_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
-End
-#endif
-
-// Private Dynamic Libraries:
-
-File gid_File_Dl_Profile_Uno
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = PROFILENAME(/ure/uno);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "4681F5C1-8F64-486F-B804-03B4D8CEB41F";
-End
-
-File gid_File_Dl_Reg
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_VER("reg", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "D5313B1F-D09F-401F-B180-891F70D489ED";
-End
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Reg
-    BIN_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("reg");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = SCP2_URE_DL_VER("reg", "3");
-End
-#endif
-
-
-
-File gid_File_Dl_Store
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_VER("store", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "A5477BD7-89A3-44AF-8B42-9E28D55C8066";
-End
-
-
-File gid_File_Dl_Xmlreader
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("xmlreader");
-    Styles = (PACKED);
-End
-
-
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Store
-    BIN_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("store");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = SCP2_URE_DL_VER("store", "3");
-End
-#endif
-
-File gid_File_Dl_Jvmaccess
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "F3D6F794-DA6F-4522-B3A7-C15593C1A577";
-End
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Jvmaccess
-    BIN_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_COMID_NORMAL("jvmaccess");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
-End
-#endif
-
-File gid_File_Dl_Jvmfwk
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_VER("jvmfwk", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "4E128F82-FA30-4077-88DC-F745C3330093";
-End
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Jvmfwk
-    BIN_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("jvmfwk");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = SCP2_URE_DL_VER("jvmfwk", "3");
-End
-#endif
-
-#if defined SOLAR_JAVA
-File gid_File_Dl_Sunjavaplugin
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("sunjavaplugin");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E";
-End
-#endif
-
-#if defined SOLAR_JAVA
-File gid_File_Dl_JrepropertiesClass
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = "JREProperties.class";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "0C4B8DCF-18D1-47D9-8BB7-A5C1D9268016";
-End
-#endif
-
-File gid_File_Dl_Profile_Jvmfwk3rc
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = PROFILENAME(/ure/jvmfwk3);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "1124A984-F905-47DC-ACEF-EDEC037F9B38";
-End
-
-File gid_File_Dl_ComnameUno
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL(STRING(COMNAME) "_uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "3FAFBDCB-96FE-4D9E-B655-CA86FE674711";
-End
-
-#if defined SOLAR_JAVA
-File gid_File_Dl_JavaUno
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("java_uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "5425A018-DAFD-4BC6-A550-377C899DC98A";
-End
-#endif
-
-#if defined SOLAR_JAVA && defined MACOSX
-Shortcut gid_Shortcut_Dl_JavaUno
-    FileID = gid_File_Dl_JavaUno;
-    Dir = SCP2_URE_DL_DIR;
-    Name = "libjava_uno.jnilib";
-    Styles = (RELATIVE);
-End
-#endif
-
-File gid_File_Dl_UnsafeUnoUno
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("unsafe_uno_uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "74C2909A-FDCF-430A-B0F4-CA6D15690D76";
-End
-
-File gid_File_Dl_AffineUnoUno
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("affine_uno_uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "CF542EC3-7A51-4EAA-8480-65D5E8906D05";
-End
-
-File gid_File_Dl_LogUnoUno
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("log_uno_uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-
-#if defined WNT && defined _MSC
-File gid_File_Dl_Cli_Uno
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("cli_uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-
-End
-#endif
-
-#if defined WNT && defined _MSC
-
-File gid_File_Dl_Cli_Ure_Assembly
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
-    Name = "cli_ure.dll";
-    Dir = SCP2_URE_DL_DIR;
-    Assemblyname = "cli_ure";
-    PublicKeyToken = "ce2cb7e279207b9e";
-    Version = "${CLI_URE_NEW_VERSION}";
-    Culture = "neutral";
-    Attributes = "0";
-    ProcessorArchitecture = "MSIL";
-End
-
-#endif
-
-#if defined WNT && defined _MSC
-
-File gid_File_Dl_Policy_Cli_Ure_Assembly
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
-    Name = "${CLI_URE_POLICY_ASSEMBLY}.dll";
-    Dir = SCP2_URE_DL_DIR;
-    Assemblyname = "${CLI_URE_POLICY_ASSEMBLY}";
-    PublicKeyToken = "ce2cb7e279207b9e";
-    Version = "${CLI_URE_POLICY_VERSION}";
-    Culture = "neutral";
-    Attributes = "0";
-    ProcessorArchitecture = "MSIL";
-End
-
-#endif
-
-#if defined WNT && defined _MSC 
-
-File gid_File_Dl_Policy_Cli_Ure_Config
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
-    Name = "cli_ure.config";
-    Dir = SCP2_URE_DL_DIR;
-    AssignComponent = gid_File_Dl_Policy_Cli_Ure_Assembly;
-End
-
-#endif
-
-#if defined WNT && defined _MSC
-
-File gid_File_Dl_Cli_Basetypes_Assembly
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
-    Name = "cli_basetypes.dll";
-    Dir = SCP2_URE_DL_DIR;
-    Assemblyname = "cli_basetypes";
-    PublicKeyToken = "ce2cb7e279207b9e";
-    Version = "${CLI_BASETYPES_NEW_VERSION}";
-    Culture = "neutral";
-    Attributes = "0";
-    ProcessorArchitecture = "MSIL";
-End
-
-#endif
-
-#if defined WNT && defined _MSC
-
-File gid_File_Dl_Policy_Cli_Basetypes_Assembly
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
-    Name = "${CLI_BASETYPES_POLICY_ASSEMBLY}.dll";
-    Dir = SCP2_URE_DL_DIR;
-    Assemblyname = "${CLI_BASETYPES_POLICY_ASSEMBLY}";
-    PublicKeyToken = "ce2cb7e279207b9e";
-    Version = "${CLI_BASETYPES_POLICY_VERSION}";
-    Culture = "neutral";
-    Attributes = "0";
-    ProcessorArchitecture = "MSIL";
-End
-
-#endif
-#if defined WNT && defined _MSC
-
-File gid_File_Dl_Policy_Cli_Basetypes_Config
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
-    Name = "cli_basetypes.config";
-    Dir = SCP2_URE_DL_DIR;
-    AssignComponent = gid_File_Dl_Policy_Cli_Basetypes_Assembly;
-End
-
-#endif
-
-
-#if defined WNT && defined _MSC
-
-File gid_File_Dl_Cli_Uretypes_Assembly
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
-    Name = "cli_uretypes.dll";
-    Dir = SCP2_URE_DL_DIR;
-    Assemblyname = "cli_uretypes";
-    PublicKeyToken = "ce2cb7e279207b9e";
-    Version = "${CLI_URETYPES_NEW_VERSION}";
-    Culture = "neutral";
-    Attributes = "0";
-    ProcessorArchitecture = "MSIL";
-End
-
-#endif
-
-#if defined WNT && defined _MSC
-
-File gid_File_Dl_Policy_Cli_Uretypes_Assembly
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
-    Name = "${CLI_URETYPES_POLICY_ASSEMBLY}.dll";
-    Dir = SCP2_URE_DL_DIR;
-    Assemblyname = "${CLI_URETYPES_POLICY_ASSEMBLY}";
-    PublicKeyToken = "ce2cb7e279207b9e";
-    Version = "${CLI_URETYPES_POLICY_VERSION}";
-    Culture = "neutral";
-    Attributes = "0";
-    ProcessorArchitecture = "MSIL";
-End
-
-#endif
-
-#if defined WNT && defined _MSC 
-
-File gid_File_Dl_Policy_Cli_Uretypes_Config
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
-    Name = "cli_uretypes.config";
-    Dir = SCP2_URE_DL_DIR;
-    AssignComponent = gid_File_Dl_Policy_Cli_Uretypes_Assembly;
-End
-
-#endif
-
-#if defined WNT && defined _MSC
-
-File gid_File_Lib_Cli_Cppuhelper_Assembly
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
-    Name = "cli_cppuhelper.dll";
-    Dir = SCP2_URE_DL_DIR;
-    Assemblyname = "cli_cppuhelper";
-    PublicKeyToken = "ce2cb7e279207b9e";
-    Version = "${CLI_CPPUHELPER_NEW_VERSION}";
-    Culture = "neutral";
-    Attributes = "0";
-    ProcessorArchitecture = "x86";
-End
-
-#endif
-
-#if defined WNT && defined _MSC
-
-File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
-    Name = "${CLI_CPPUHELPER_POLICY_ASSEMBLY}.dll";
-    Dir = SCP2_URE_DL_DIR;
-    Assemblyname = "${CLI_CPPUHELPER_POLICY_ASSEMBLY}";
-    PublicKeyToken = "ce2cb7e279207b9e";
-    Version = "${CLI_CPPUHELPER_POLICY_VERSION}";
-    Culture = "neutral";
-    Attributes = "0";
-    ProcessorArchitecture = "x86";
-End
-
-#endif
-
-#if defined WNT && defined _MSC
-
-File gid_File_Lib_Policy_Cli_Cppuhelper_Config
-    TXT_FILE_BODY;
-    Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
-    Name = "cli_cppuhelper.config";
-    Dir = SCP2_URE_DL_DIR;
-    AssignComponent = gid_File_Lib_Policy_Cli_Cppuhelper_Assembly;
-End
-
-#endif
-
-#if defined SOLAR_JAVA
-File gid_File_Dl_Jpipe
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_JDL_NORMAL("jpipe");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "B1A60DD4-51D7-4898-B899-9BD05DE2DA8F";
-End
-#endif
-
-#if defined SOLAR_JAVA && defined WNT
-File gid_File_Dl_Jpipx
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("jpipx");
-    Styles = (PACKED);
-End
-#endif
-
-#if defined SOLAR_JAVA
-File gid_File_Dl_Juh
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("juh");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "1A001FB0-C469-4517-A3D1-3FA56AD607AF";
-End
-#endif
-
-#if defined SOLAR_JAVA
-File gid_File_Dl_Juhx
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("juhx");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "B152234F-A46A-40BE-B632-48F35A33A29A";
-End
-#endif
-
-File gid_File_Dl_Acceptor
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("acceptor.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "31183C51-C9A4-4D7A-A2F4-103252E1FEB0";
-End
-
-File gid_File_Dl_Binaryurp
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("binaryurp.uno");
-    Styles = (PACKED);
-End
-
-File gid_File_Dl_Bootstrap
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("bootstrap.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "2620B307-25DB-498F-B2B8-46D928165331";
-End
-
-File gid_File_Dl_Connector
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("connector.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "EBCE77E7-E244-40F6-96E2-5319D6571C5D";
-End
-
-File gid_File_Dl_Introspection
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("introspection.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "E99960CF-FE59-4332-A2AC-47418C3A17C1";
-End
-
-File gid_File_Dl_Invocadapt
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("invocadapt.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "77DDC112-1994-49D5-A086-FB16D4328AB9";
-End
-
-File gid_File_Dl_Invocation
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("invocation.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "A79ACB80-DA65-47CA-81BA-7CD9E191C84C";
-End
-
-
-#if defined SOLAR_JAVA
-File gid_File_Dl_Javaloader
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("javaloader.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "19A20968-E654-4E2C-9F58-7B66F07CA346";
-End
-#endif
-
-#if defined SOLAR_JAVA
-File gid_File_Dl_Javavm
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("javavm.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "F1266B2B-80AD-4248-A921-9161759FA4DA";
-End
-#endif
-
-File gid_File_Dl_Namingservice
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("namingservice.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "DD22BE3A-AD21-447D-B3A3-89B0FCDB0B31";
-End
-
-File gid_File_Dl_Stocservices
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("stocservices.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "EBF6BBDE-EC50-4FB8-A0D4-BEC58F1C8C07";
-End
-
-File gid_File_Dl_Proxyfac
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("proxyfac.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "A2CDDEC3-B9C7-48C9-AB35-65008777BC2F";
-End
-
-File gid_File_Dl_Reflection
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("reflection.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "601C7946-CFEB-4F56-9429-6D5963188DF3";
-End
-
-File gid_File_Dl_Streams
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("streams.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "6028CF43-A9B7-40A8-8216-509CAB256A2B";
-End
-
-File gid_File_Dl_Textinstream
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("textinstream.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "DAA39D01-D9C5-40C4-94EC-9E4B2F94EABA";
-End
-
-File gid_File_Dl_Textoutstream
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("textoutstream.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "DD01EB0C-A119-43AE-9100-F7A595D099E4";
-End
-
-File gid_File_Dl_Uuresolver
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("uuresolver.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "377090E1-5008-424F-B0F6-A9EFC9F11206";
-End
-
-#if !defined SYSTEM_LIBXML
-File gid_File_Dl_Libxml2
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-#if defined WNT
-#if defined _gcc3
-    Name = SCP2_URE_DL_NORMAL("libxml2-2");
-#else
-    Name = SCP2_URE_DL_NORMAL("libxml2");
-#endif
-#elif defined MACOSX
-    Name = SCP2_URE_DL_NORMAL("xml2.2");
-#else
-    Name = SCP2_URE_DL_VER("xml2", "2");
-#endif
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "BE6FAD97-F84C-43E3-8392-6FE2CDA04D8E";
-End
-#endif
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Libxml2
-    BIN_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("xml2");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    Target = SCP2_URE_DL_VER("xml2", "2");
-End
-#endif
-
-#if defined WITH_STLPORT
-File gid_File_Dl_Stlport
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-#if defined _gcc3 && defined WNT
-#if defined _DEBUG_RUNTIME
-    Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
-#else
-    Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
-#endif
-#elif defined _gcc3
-#if defined _DEBUG_RUNTIME
-    Name = SCP2_URE_DL_NORMAL("stlport_gcc_stldebug");
-#else
-    Name = SCP2_URE_DL_NORMAL("stlport_gcc");
-#endif
-#elif defined SOLARIS
-#if defined IS_LP64
-    Name = SCP2_URE_DL_VER("stlport", "1");
-#else
-#if defined _DEBUG_RUNTIME
-    Name = SCP2_URE_DL_NORMAL("stlport_sunpro_debug");
-#else
-    Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
-#endif
-#endif
-#elif defined WNT && ((_MSC_VER == 1500) || (_MSC_VER == 1600))
-#if defined _DEBUG_RUNTIME
-    Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
-#else
-    Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
-#endif
-#endif
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "D976338D-D2A5-4D29-B765-D3AC43181C7F";
-End
-#endif
-
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
-	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
-File gid_File_Dl_GccS
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-#ifdef AIX
-    Name = "libgcc_s.a";
-#else
-    Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
-#endif
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
-End
-#endif
-
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
-	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
-File gid_File_Dl_Stdcpp
-    Dir = SCP2_URE_DL_DIR;
-    TXT_FILE_BODY;
-#ifdef AIX
-    Name = "libstdc++.a";
-#else
-    Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
-#endif
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996";
-End
-#endif
-
-#if (defined WNT && defined _gcc3)
-File gid_File_Lib_Mingwm10_Ure
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("mingwm10");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "601FEC1D-8665-4476-9911-83BDCCE83025";
-End
-#endif
-
-#if defined(WNT) && defined( _gcc3 )
-
-#if defined(MINGW_GCCDLL)
-
-File gid_File_Lib_Mingw_GccS_Ure
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = MINGW_GCCDLL;
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-
-#endif
-
-#if defined(MINGW_GXXDLL)
-
-File gid_File_Lib_Mingw_Stdcpp_Ure
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = MINGW_GXXDLL;
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-
-#endif
-
-#endif
-
-#if defined WNT
-File gid_File_Dl_Uwinapi
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("uwinapi");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "EABC9FE3-B296-430F-8513-A3617FFB630D";
-End
-#endif
-
-// Public JARs:
-
-#if defined SOLAR_JAVA
-File gid_File_Java_UnoloaderJar
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
-    Name = "unoloader.jar";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "90F99ED3-814C-4B45-894B-D9248848CEB4";
-End
-#endif
-
-#if defined SOLAR_JAVA
-File gid_File_Java_JuhJar
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
-    Name = "juh.jar";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "E77CC8B5-0345-4B7F-ABED-5EB9DC94E492";
-End
-#endif
-
-#if defined SOLAR_JAVA
-File gid_File_Java_JurtJar
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
-    Name = "jurt.jar";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "EA63EDCC-9152-4560-AB7A-BFC367442E50";
-End
-#endif
-
-#if defined SOLAR_JAVA
-File gid_File_Java_RidlJar
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
-    Name = "ridl.jar";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "4A915C83-6BE3-41B9-BAF9-13AA27034955";
-End
-#endif
-
-// Private JARs:
-
-#if defined SOLAR_JAVA
-File gid_File_Java_JavaUnoJar
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Java;
-    Name = "java_uno.jar";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "ABDC8DDA-5D2B-424C-ABD8-FD22D59658FE";
-End
-#endif
-
-// Public Miscellaneous Files:
-
-File gid_File_Misc_TypesRdb
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Misc;
-    Name = "/ure/types.rdb";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "E5086F6A-855B-4CAE-AD3A-A85A21C5AE44";
-End
-
-File gid_File_Misc_ServicesRdb
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Misc;
-    Name = "/ure/services.rdb";
-    Styles = (PACKED);
-End
-
-// Private Miscellaneous Files:
-
-#if defined SOLAR_JAVA
-File gid_File_Misc_JavavendorsXml
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Ure_Misc;
-    Name = "javavendors.xml";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "403FCCFE-545B-44F6-91D1-5C75F846E587";
-End
-#endif
-
-#if defined MACOSX
-Unixlink gid_Unixlink_Ure_Bin_Urelibs
-    Dir = gid_Dir_Ure_Bin;
-    Name = "urelibs";
-    Target = "../lib";
-End
-#endif
-
-//Module
-
-Module gid_Module_Root_Ure_Hidden
-    ParentID = gid_Module_Root;
-    PackageInfo = "packinfo_ure.txt";
-    InstallOrder = "10";
-    Name = "ure";
-    Description = "ure";
-	Sortkey = "2200";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-    Dirs = (gid_Dir_Ure_Bin,
-            gid_Dir_Ure_Lib,
-            gid_Dir_Ure_Share,
-            gid_Dir_Ure_Java,
-            gid_Dir_Ure_Misc);
-    Files = (gid_File_ThirdpartylicensereadmeHtml_Ure,
-            gid_File_Readme_Ure,
-            gid_File_License_Ure,
-            gid_File_Exe_Uno,
-            gid_File_Exe_Regcomp,
-            gid_File_Exe_Regmerge,
-            gid_File_Exe_Regview,
-            gid_File_Exe_Javaldx,
-            gid_File_Exe_StartupSh,
-            gid_File_Exe_UnoBin,
-            gid_File_Exe_RegcompBin,
-            gid_File_Dl_Cli_Uno,
-            gid_File_Dl_Cli_Ure_Assembly,
-            gid_File_Dl_Policy_Cli_Ure_Assembly,
-            gid_File_Dl_Policy_Cli_Ure_Config,
-            gid_File_Dl_Cli_Basetypes_Assembly,
-            gid_File_Dl_Policy_Cli_Basetypes_Assembly,
-            gid_File_Dl_Policy_Cli_Basetypes_Config,
-            gid_File_Dl_Cli_Uretypes_Assembly,
-            gid_File_Dl_Policy_Cli_Uretypes_Assembly,
-            gid_File_Dl_Policy_Cli_Uretypes_Config,
-            gid_File_Dl_Cli_Cppuhelper_Assembly,
-            gid_File_Dl_Policy_Cli_Cppuhelper_Assembly,
-            gid_File_Dl_Policy_Cli_Cppuhelper_Config,
-            gid_File_Lib_Cli_Cppuhelper_Assembly,
-            gid_File_Lib_Policy_Cli_Cppuhelper_Assembly,
-            gid_File_Lib_Policy_Cli_Cppuhelper_Config,
-            gid_File_Dl_Cppu,
-            gid_Unixlink_File_Dl_Cppu,
-            gid_File_Dl_Cppuhelper,
-            gid_Unixlink_File_Dl_Cppuhelper,
-            gid_File_Dl_PurpEnvHelper,
-            gid_Unixlink_File_Dl_PurpEnvHelper,
-            gid_File_Dl_Sal,
-            gid_Unixlink_File_Dl_Sal,
-            gid_File_Dl_Sal_TextEnc,
-            gid_File_Dl_Salhelper,
-            gid_Unixlink_File_Dl_Salhelper,
-            gid_File_Dl_Profile_Uno,
-            gid_File_Dl_Reg,
-            gid_Unixlink_File_Dl_Reg,
-            gid_Unixlink_File_Dl_Rmcxt,
-            gid_File_Dl_Store,
-            gid_Unixlink_File_Dl_Store,
-            gid_File_Dl_Xmlreader,
-            gid_File_Dl_Jvmaccess,
-            gid_Unixlink_File_Dl_Jvmaccess,
-            gid_File_Dl_Jvmfwk,
-            gid_Unixlink_File_Dl_Jvmfwk,
-            gid_File_Dl_Sunjavaplugin,
-            gid_File_Dl_JrepropertiesClass,
-            gid_File_Dl_Profile_Jvmfwk3rc,
-            gid_File_Dl_ComnameUno,
-            gid_File_Dl_JavaUno,
-            gid_File_Dl_UnsafeUnoUno,
-            gid_File_Dl_AffineUnoUno,
-            gid_File_Dl_LogUnoUno,
-            gid_File_Dl_Jpipe,
-            gid_File_Dl_Jpipx,
-            gid_File_Dl_Juh,
-            gid_File_Dl_Juhx,
-            gid_File_Dl_Acceptor,
-            gid_File_Dl_Binaryurp,
-            gid_File_Dl_Bootstrap,
-            gid_File_Dl_Connector,
-            gid_File_Dl_Introspection,
-            gid_File_Dl_Invocadapt,
-            gid_File_Dl_Invocation,
-            gid_File_Dl_Javaloader,
-            gid_File_Dl_Javavm,
-            gid_File_Dl_Namingservice,
-            gid_File_Dl_Proxyfac,
-            gid_File_Dl_Reflection,
-            gid_File_Dl_Stocservices,
-            gid_File_Dl_Streams,
-            gid_File_Dl_Textinstream,
-            gid_File_Dl_Textoutstream,
-            gid_File_Dl_Uuresolver,
-            gid_File_Dl_Libxml2,
-            gid_File_Dl_Stlport,
-            gid_File_Dl_GccS,
-            gid_File_Dl_Stdcpp,
-            gid_File_Lib_Mingw_GccS_Ure,
-            gid_File_Lib_Mingw_Stdcpp_Ure,
-            gid_File_Lib_Mingwm10_Ure,
-            gid_File_Dl_Unicows,
-            gid_File_Dl_Uwinapi,
-            gid_File_Lib_Msvcr80_Ure,
-            gid_File_Lib_Msvcp80_Ure,
-            gid_File_Lib_Msvcm80_Ure,
-            gid_File_Msvcm80crt_Manifest_Ure,
-            gid_File_Java_UnoloaderJar,
-            gid_File_Java_JuhJar,
-            gid_File_Java_JurtJar,
-            gid_File_Java_RidlJar,
-            gid_File_Java_JavaUnoJar,
-            gid_File_Misc_TypesRdb,
-            gid_File_Misc_ServicesRdb,
-            gid_File_Misc_JavavendorsXml);
-    Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs,
-                 gid_Unixlink_File_Dl_Sal,
-                 gid_Unixlink_File_Dl_Salhelper,
-                 gid_Unixlink_File_Dl_Cppu,
-                 gid_Unixlink_File_Dl_Cppuhelper,
-                 gid_Unixlink_File_Dl_PurpEnvHelper,
-                 gid_Unixlink_File_Dl_Reg,
-                 gid_Unixlink_File_Dl_Rmcxt,
-                 gid_Unixlink_File_Dl_Store,
-                 gid_Unixlink_File_Dl_Jvmaccess,
-                 gid_Unixlink_File_Dl_Jvmfwk,
-                 gid_Unixlink_File_Dl_Libxml2);
-End
-
-// Profile version.ini
-
-Profile gid_Profile_Version_Ini_Ure
-    ModuleID = gid_Module_Root_Ure_Hidden;
-    Name = PROFILENAME(version);
-    Dir = gid_Dir_Ure_Bin;
-    Styles = ();
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Buildid
-    ProfileID = gid_Profile_Version_Ini_Ure;
-    ModuleID = gid_Module_Root_Ure_Hidden;
-    Section = "Version";
-    Key = "buildid";
-    Value = "<buildid>";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productsource
-    ProfileID = gid_Profile_Version_Ini_Ure;
-    ModuleID = gid_Module_Root_Ure_Hidden;
-    Section = "Version";
-    Key = "ProductSource";
-    Value = "<sourceid>";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productmajor
-    ProfileID = gid_Profile_Version_Ini_Ure;
-    ModuleID = gid_Module_Root_Ure_Hidden;
-    Section = "Version";
-    Key = "ProductMajor";
-    Value = "<productmajor>";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productminor
-    ProfileID = gid_Profile_Version_Ini_Ure;
-    ModuleID = gid_Module_Root_Ure_Hidden;
-    Section = "Version";
-    Key = "ProductMinor";
-    Value = "<productminor>";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productbuildid
-    ProfileID = gid_Profile_Version_Ini_Ure;
-    ModuleID = gid_Module_Root_Ure_Hidden;
-    Section = "Version";
-    Key = "ProductBuildid";
-    Value = "<productbuildid>";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Ooobaseversion
-    ProfileID = gid_Profile_Version_Ini_Ure;
-    ModuleID = gid_Module_Root_Ure_Hidden;
-    Section = "Version";
-    Key = "OOOBaseVersion";
-    Value = "${OOOBASEVERSION}";
-End
-
-// Windows Registry:
-
-RegistryItem gid_Regitem_Path
-    ModuleID = gid_Module_Root;
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "Software\OpenOffice.org\%PRODUCTNAME";
-    Name = "Path";
-    Value = "[INSTALLLOCATION]";
-End
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
deleted file mode 100644
index 397d8fd8f..000000000
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifndef MACOSX
-Directory gid_Dir_Common_Ure
-  #ifdef WNT
-    ParentID = gid_Dir_Brand_Root;
-  #else
-    ParentID = gid_Dir_Ooo_Openofficeorg;
-  #endif
-  #ifdef WNT
-    HostName = "URE";
-  #else
-    HostName = "ure";
-  #endif
-    Styles = (UREDIRECTORY);
-End
-#endif
-
-#if defined WNT
-File gid_File_UreLink
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Ooo_Basis;
-    Name = "ure-link";
-    Styles = (PACKED);
-End
-#elif defined MACOSX
-Directory gid_Dir_UreLink
-    ParentID = gid_Brand_Dir_BasisLink;
-    DosName = "ure-link";
-End
-#else
-Unixlink gid_Unixlink_UreLink
-    BIN_FILE_BODY;
-    Styles = ();
-    // Styles = (LAYERLINK);
-    Name = "ure-link";
-    Dir = gid_Dir_Ooo_Basis;
-    Target = "../ure";
-End
-#endif
diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp
deleted file mode 100644
index 8579139f9..000000000
--- a/scp2/source/ooo/ure_standalone.scp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Installation gid_Installation_Ure
-    ProductName = "${PRODUCTNAME}";
-    ProductVersion = "${PRODUCTVERSION}";
-    ProductExtension = "${PRODUCTEXTENSION}";
-    OOoBaseVersion = "${OOOBASEVERSION}";
-#if defined WNT
-    DefaultDestPath = "<winprogpath>\%PRODUCTNAME";
-#else
-    DefaultDestPath = "/opt/%PRODUCTNAME";
-#endif
-End
-
-Directory gid_Dir_Ooo_Openofficeorg
-    ParentID = PREDEFINED_PROGDIR;
-  #ifdef WNT
-    HostName = "LibreOffice";
-  #else
-    HostName = "libreoffice";
-  #endif
-    Styles = (ISINSTALLLOCATION);
-End
-
-Directory gid_Dir_Common_Ure
-    ParentID = gid_Dir_Ooo_Openofficeorg;
-  #ifdef WNT
-    HostName = "URE";
-  #else
-    HostName = "ure";
-  #endif
-    Styles = (UREDIRECTORY);
-End
-
-File gid_File_License_Ure
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Common_Ure;
-    Name = "LICENSE";
-    Styles = (PACKED);
-End
-
-File gid_File_ThirdpartylicensereadmeHtml_Ure
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Common_Ure;
-    Name = "THIRDPARTYLICENSEREADME.html";
-    Styles = (PACKED);
-End
-
-File gid_File_Readme_Ure
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Common_Ure;
-    Name = "README";
-    Styles = (PACKED);
-End
-
-// Module
-
-Module gid_Module_Root
-    Name = "ure";
-    Description = "ure";
-End
-
-// Windows Registry:
-RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Productcode_Install
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-	ModuleID = gid_Module_Root;
-	Name = "INSTALLLOCATION";
-	Value = "[INSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Upgradecode_Install
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-	ModuleID = gid_Module_Root;
-	Name = "INSTALLLOCATION";
-	Value = "[INSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED);
-End
-
-
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
deleted file mode 100644
index 0b71511c7..000000000
--- a/scp2/source/ooo/vc_redist.scp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-#if defined(WITH_VC_REDIST)
-
-ScpAction scp_Copy_vcredist_x86
-  #if defined(BUILD_SPECIAL)
-    Copy = "vcredist_x86_9.0.30729.4148.exe";
-  #else
-    Copy = "vcredist_x86.exe";
-  #endif
-    Name = "vcredist_x86.exe";
-    Subdir = "redist";
-End
-
-ScpAction scp_Copy_vcredist_x64
-  #if defined(BUILD_SPECIAL)
-    Copy = "vcredist_x64_9.0.30729.4148.exe";
-  #else
-    Copy = "vcredist_x64.exe";
-  #endif
-    Name = "vcredist_x64.exe";
-    Subdir = "redist";
-End
-
-#endif
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
deleted file mode 100644
index f35482e4d..000000000
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ /dev/null
@@ -1,497 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-WindowsCustomAction gid_Customaction_RenamePrgFolder
-	Name = "RenamePrgFolder";
-	Typ = "1";
-	Source = "shlxtmsi.dll";
-	Target = "RenamePrgFolder";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID");
-End
-
-WindowsCustomAction gid_Customaction_RemovePrgFolder
-	Name = "RemovePrgFolder";
-	Typ = "1";
-	Source = "shlxtmsi.dll";
-	Target = "RemovePrgFolder";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "end");
-End
-
-WindowsCustomAction gid_Customaction_Regallmsdocdll
-	Name = "Regallmsdocdll";
-	Typ = "65";
-	Source = "reg4allmsdoc.dll";
-	Target = "FindRegisteredExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And _IsSetupTypeMin<>\"Custom\"", "CostFinalize");
-End
-
-WindowsCustomAction gid_Customaction_Restoreregallmsdocdll
-    Name = "Restoreregallmsdocdll";
-    Typ = "65";
-    Source = "reg4allmsdoc.dll";
-    Target = "RestoreRegAllMSDoc";
-    Inbinarytable = 1;
-    Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "end");
-End
-
-WindowsCustomAction gid_Customaction_Regactivexdll1
-	Name = "Regactivexdll1";
-	Typ = "65";
-	Source = "regactivex.dll";
-	Target = "InstallActiveXControl";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "(\&FEATURETEMPLATE=3 Or (\!FEATURETEMPLATE=3 And \&FEATURETEMPLATE=-1)) And Not PATCH", "end");
-End
-
-WindowsCustomAction gid_Customaction_Regactivexdll2
-	Name = "Regactivexdll2";
-	Typ = "65";
-	Source = "regactivex.dll";
-	Target = "DeinstallActiveXControl";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=2 And \!FEATURETEMPLATE=3 And Not PATCH", "RemoveExistingProducts");
-End
-
-WindowsCustomAction gid_Customaction_Reg64dll1
-	Name = "Reg64dll1";
-	Typ = "65";
-	Source = "reg64msi.dll";
-	Target = "InstallReg64";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" and VersionNT64", "end");
-End
-
-WindowsCustomAction gid_Customaction_Reg64dll2
-	Name = "Reg64dll2";
-	Typ = "65";
-	Source = "reg64msi.dll";
-	Target = "DeinstallReg64";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and VersionNT64", "end");
-End
-
-WindowsCustomAction gid_Customaction_Jfregcadll1
-	Name = "Jfregcadll1";
-	Typ = "65";
-	Source = "jfregca.dll";
-	Target = "install_jf";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=3 And Not PATCH", "end");
-End
-
-WindowsCustomAction gid_Customaction_Jfregcadll2
-	Name = "Jfregcadll2";
-	Typ = "65";
-	Source = "jfregca.dll";
-	Target = "uninstall_jf";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=2 And \!FEATURETEMPLATE=3 And Not PATCH", "end");
-End
-
-WindowsCustomAction gid_Customaction_sdqsmsidll
-	Name = "sdqsmsidll";
-	Typ = "65";
-	Source = "sdqsmsi.dll";
-	Target = "ShutDownQuickstarter";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "", "IsOfficeRunning");
-End
-
-WindowsCustomAction gid_Customaction_qslnkmsidll
-	Name = "qslnkmsidll";
-	Typ = "65";
-	Source = "qslnkmsi.dll";
-	Target = "RemoveQuickstarterLink";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "sdqsmsidll");
-End
-
-WindowsCustomAction gid_Customaction_Shellextensionsdll1
-	Name = "Shellextensionsdll1";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "InstallExecSequenceEntry";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=3 And Not PATCH", "end");
-End
-
-WindowsCustomAction gid_Customaction_Shellextensionsdll2
-	Name = "Shellextensionsdll2";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "DeinstallExecSequenceEntry";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=2 And \!FEATURETEMPLATE=3 And Not PATCH", "end");
-End
-
-WindowsCustomAction gid_Customaction_Instooofiltmsidll2
-	Name = "Instooofiltmsidll";
-	Typ = "65";
-	Source = "instooofiltmsi.dll";
-	Target = "RestartIndexingService";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "end");
-End
-
-WindowsCustomAction gid_Customaction_Shellextensionsdll3
-	Name = "Shellextensionsdll3";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "InstallStartmenuFolderIcon";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "end");
-End
-
-WindowsCustomAction gid_Customaction_Shellextensionsdll4
-	Name = "Shellextensionsdll4";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "DeinstallStartmenuFolderIcon";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "MigrateFeatureStates");
-End
-
-WindowsCustomAction gid_Customaction_Shellextensionsdll5
-	Name = "Shellextensionsdll5";
-	Typ = "321";
-	Source = "shlxtmsi.dll";
-	Target = "SetProductInstallMode";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "FindRelatedProducts");
-	Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "FindRelatedProducts");
-End
-
-WindowsCustomAction gid_Customaction_Shellextensionsdll6
-	Name = "Shellextensionsdll6";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "RebuildShellIconCache";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not PATCH", "end");
-End
-
-WindowsCustomAction gid_Customaction_Shellextensionsdll7
-	Name = "Shellextensionsdll7";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "ExecutePostUninstallScript";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "InstallValidate");
-End
-
-WindowsCustomAction gid_Customaction_Register_Extensions
-	Name = "RegisterExtensions";
-	Typ = "1025";
-	Source = "shlxtmsi.dll";
-	Target = "RegisterExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "behind_SetInstalllocation");
-	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "behind_SetInstalllocation");
-End
-
-WindowsCustomAction gid_Customaction_Remove_Extensions
-	Name = "RemoveExtensions";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "RemoveExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "FileCost");
-End
-
-WindowsCustomAction gid_Customaction_Set_Admininstall
-	Name = "SetAdminInstallProperty";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "SetAdminInstallProperty";
-	Inbinarytable = 1;
-	Assignment1 = ("AdminExecuteSequence", "", "InstallInitialize");
-End
-
-WindowsCustomAction gid_Customaction_Check_Install_Directory
-	Name = "CheckInstallDirectory";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "CheckInstallDirectory";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not Installed", "CheckVersions");
-	Assignment2 = ("ControlEvent", "SetupType", "Next", "DoAction", "CheckInstallDirectory", "_IsSetupTypeMin = \"Typical\" And Not Installed", "2");
-	Assignment3 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "CheckInstallDirectory", "Not Installed", "2");
-End
-
-WindowsCustomAction gid_Customaction_Dotnetcheck
-	Name = "DotNetCheck";
-	Typ = "321";
-	Source = "shlxtmsi.dll";
-	Target = "DotNetCheck";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "LaunchConditions");
-	Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\"", "LaunchConditions");
-End
-
-WindowsCustomAction gid_Customaction_CopyEditionData
-    Name = "CopyEditionData";
-    Typ = "1";
-    Source = "shlxtmsi.dll";
-    Target = "copyEditionData";
-    Inbinarytable = 1;
-    Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
-    Assignment2 = ("AdminExecuteSequence", "", "end");
-End
-
-WindowsCustomAction gid_Customaction_CopyExtensionData
-    Name = "CopyExtensionData";
-    Typ = "1";
-    Source = "shlxtmsi.dll";
-    Target = "copyExtensionData";
-    Inbinarytable = 1;
-    Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
-    Assignment2 = ("AdminExecuteSequence", "", "end");
-End
-
-WindowsCustomAction gid_Customaction_RegCleanOld
-	Name = "RegCleanOld";
-	Typ = "65";
-	Source = "regcleanold.dll";
-	Target = "CleanCurUserOldSystemRegistryFromSetup";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And Not ALLUSERS=\"\"", "end");
-End
-
-WindowsCustomAction gid_Customaction_Patch_Regpatchactivex_Patchactivexcontrol
-	Name = "PatchActiveXControl";
-	Typ = "65";
-	Source = "regpatchactivex.dll";
-	Target = "PatchActiveXControl";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=3", "end");
-End
-
-WindowsCustomAction gid_Customaction_Patch_SetProductInstallModeAction
-	Name = "SetProductInstallModeAction";
-	Typ = "321";
-	Source = "patchmsi.dll";
-	Target = "SetProductInstallMode";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not Installed", "FindRelatedProducts");
-	Assignment2 = ("InstallUISequence", "Not Installed", "FindRelatedProducts");
-End
-
-WindowsCustomAction gid_Customaction_Patch_InstallExchangeFiles
-	Name = "InstallExchangeFiles";
-	Typ = "65";
-	Source = "patchmsi.dll";
-	Target = "InstallPatchedFiles";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not Installed", "behind_InstallFinalize");
-	Assignment2 = ("AdminExecuteSequence", "", "behind_InstallFinalize");
-End
-
-WindowsCustomAction gid_Customaction_Langpack_Register_Extensions
-	Name = "RegisterExtensions";
-	Typ = "65";
-	Source = "lngpckinsthlp.dll";
-	Target = "RegisterExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "", "end");
-	Assignment2 = ("AdminExecuteSequence", "", "end");
-End
-
-WindowsCustomAction gid_Customaction_Patch_SetFeatureState
-	Name = "SetFeatureState";
-	Typ = "65";
-	Source = "patchmsi.dll";
-	Target = "SetFeatureState";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not Installed", "SetNewFeatureState");
-End
-
-WindowsCustomAction gid_Customaction_Patch_DeinstallExchangeFiles
-	Name = "DeinstallExchangeFiles";
-	Typ = "65";
-	Source = "patchmsi.dll";
-	Target = "UninstallPatchedFiles";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Installed", "RemoveIniValues");
-End
-
-WindowsCustomAction gid_Customaction_Patch_Shutdownquickstarter
-	Name = "ShutDownQuickstarter";
-	Typ = "65";
-	Source = "patchmsi.dll";
-	Target = "ShutDownQuickstarter";
-	Inbinarytable = 1;
-	Assignment1 = ("ControlEvent", "DestinationFolder", "Next", "DoAction", "ShutDownQuickstarter", "1", "0");
-	Assignment2 = ("InstallExecuteSequence", "", "IsolateComponents");
-End
-
-WindowsCustomAction gid_Customaction_Patch_Isofficerunning
-	Name = "IsOfficeRunning";
-	Typ = "321";
-	Source = "patchmsi.dll";
-	Target = "IsOfficeRunning";
-	Inbinarytable = 1;
-	Assignment1 = ("ControlEvent", "ReadyToInstall", "InstallNow", "DoAction", "IsOfficeRunning", "1", "1");
-	Assignment2 = ("InstallExecuteSequence", "VersionNT < 600", "RunningOffice");
-End
-
-WindowsCustomAction gid_Customaction_Full_Isofficerunning
-	Name = "IsOfficeRunning";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "IsOfficeRunning";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 Or Not PATCH", "RunningOffice");
-End
-
-WindowsCustomAction gid_Customaction_Langpack_Isofficerunning
-	Name = "IsOfficeRunning";
-	Typ = "65";
-	Source = "lngpckinsthlp.dll";
-	Target = "IsOfficeRunning";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "PATCH And VersionNT < 600", "RunningOffice");
-End
-
-WindowsCustomAction gid_Customaction_CheckPatchList
-	Name = "CheckPatchList";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "CheckPatchList";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "PATCH", "Patch1NotInstalled");
-End
-
-WindowsCustomAction gid_Customaction_Patch_SetUserInstallMode
-	Name = "SetUserInstallMode";
-	Typ = "321";
-	Source = "patchmsi.dll";
-	Target = "GetUserInstallMode";
-	Inbinarytable = 1;
-	Assignment1 = ("ControlEvent", "InstallWelcome", "Next", "DoAction", "SetUserInstallMode", "1", "1");
-	Assignment2 = ("ControlEvent", "InstallChangeFolder", "OK", "DoAction", "SetUserInstallMode", "1", "8");
-	Assignment3 = ("ControlCondition", "DestinationFolder", "Next", "Enable", "NOT INVALIDDIRECTORY And NOT PATCHISOLDER And NOT ISWRONGPRODUCT");
-	Assignment4 = ("ControlCondition", "DestinationFolder", "Next", "Disable", "INVALIDDIRECTORY Or PATCHISOLDER Or ISWRONGPRODUCT");
-	Assignment5 = ("ControlCondition", "DestinationFolder", "LabelStartInstall", "Show", "NOT INVALIDDIRECTORY And NOT PATCHISOLDER And NOT ISWRONGPRODUCT");
-	Assignment6 = ("ControlCondition", "DestinationFolder", "LabelInvalidDir", "Show", "INVALIDDIRECTORY");
-	Assignment7 = ("ControlCondition", "DestinationFolder", "LabelPatchOlder", "Show", "PATCHISOLDER");
-	Assignment8 = ("ControlCondition", "DestinationFolder", "LabelWrongProduct", "Show", "ISWRONGPRODUCT");
-	Assignment9 = ("ControlCondition", "DestinationFolder", "LabelStartInstall2", "Show", "NOT INVALIDDIRECTORY And NOT PATCHISOLDER And NOT ISWRONGPRODUCT");
-	Assignment10 = ("ControlCondition", "DestinationFolder", "LabelInvalidDir2", "Show", "INVALIDDIRECTORY");
-	Assignment11 = ("ControlCondition", "DestinationFolder", "LabelPatchOlder2", "Show", "PATCHISOLDER");
-	Assignment12 = ("ControlCondition", "DestinationFolder", "LabelWrongProduct2", "Show", "ISWRONGPRODUCT");
-	Assignment13 = ("InstallExecuteSequence", "Not Installed", "PatchIsOlder");
-End
-
-WindowsCustomAction gid_Customaction_Langpack_SetUserInstallMode
-	Name = "SetUserInstallMode";
-	Typ = "65";
-	Source = "lngpckinsthlp.dll";
-	Target = "GetUserInstallMode";
-	Inbinarytable = 1;
-	Assignment1 = ("ControlEvent", "InstallWelcome", "Next", "DoAction", "SetUserInstallMode", "1", "1");
-	Assignment2 = ("ControlEvent", "InstallChangeFolder", "OK", "DoAction", "SetUserInstallMode", "1", "8");
-	Assignment3 = ("ControlCondition", "DestinationFolder", "Next", "Enable", "NOT INVALIDDIRECTORY And NOT ISWRONGPRODUCT");
-	Assignment4 = ("ControlCondition", "DestinationFolder", "Next", "Disable", "INVALIDDIRECTORY Or ISWRONGPRODUCT");
-	Assignment5 = ("ControlCondition", "DestinationFolder", "LabelStartInstall", "Show", "NOT INVALIDDIRECTORY And NOT ISWRONGPRODUCT");
-	Assignment6 = ("ControlCondition", "DestinationFolder", "LabelInvalidDir", "Show", "INVALIDDIRECTORY");
-	Assignment7 = ("ControlCondition", "DestinationFolder", "LabelWrongProduct", "Show", "ISWRONGPRODUCT");
-	Assignment8 = ("ControlCondition", "DestinationFolder", "LabelStartInstall2", "Show", "NOT INVALIDDIRECTORY And NOT ISWRONGPRODUCT");
-	Assignment9 = ("ControlCondition", "DestinationFolder", "LabelInvalidDir2", "Show", "INVALIDDIRECTORY");
-	Assignment10 = ("ControlCondition", "DestinationFolder", "LabelWrongProduct2", "Show", "ISWRONGPRODUCT");
-End
-
-WindowsCustomAction gid_Customaction_MigrateInstallPath
-      Name = "MigrateInstallPath";
-      Typ = "321";
-      Source = "shlxtmsi.dll";
-      Target = "MigrateInstallPath";
-      Inbinarytable = 1;
-      Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostInitialize");
-      Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostInitialize");
-End
-
-WindowsCustomAction gid_Customaction_CompleteInstallPath
-      Name = "CompleteInstallPath";
-      Typ = "321";
-      Source = "shlxtmsi.dll";
-      Target = "CompleteInstallPath";
-      Inbinarytable = 1;
-      Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "MigrateInstallPath");
-      Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "MigrateInstallPath");
-End
-
-WindowsCustomAction gid_Customaction_CheckVersions
-	Name = "CheckVersions";
-	Typ = "321";
-	Source = "sn_tools.dll";
-	Target = "CheckVersions";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "NOT Installed", "NewProductFound");
-	Assignment2 = ("InstallUISequence", "NOT Installed", "NewProductFound");
-End
-
-WindowsCustomAction gid_Customaction_SelectLanguage
-    Name = "SelectLanguage";
-    Typ = "321";
-    Source = "sellangmsi.dll";
-    Target = "SelectLanguage";
-    Inbinarytable = 1;
-    Assignment1 = ("ControlEvent", "SetupType", "Next", "DoAction", "SelectLanguage", "1", "1");
-End
-
-WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
-	Name = "RebaseLibrariesOnProperties";
-	Typ = "65";
-	Source = "rebase.dll";
-	Target = "RebaseLibrariesOnProperties";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end");
-	Assignment2 = ("AdminExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end");
-End
-
-WindowsCustomAction gid_Customaction_LookForRegisteredExtensions
-	Name = "LookForRegisteredExtensions";
-	Typ = "65";
-	Source = "reg4allmsdoc.dll";
-	Target = "LookForRegisteredExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "LookForRegisteredExtensions", "1", "2");
-End
-
-WindowsCustomAction gid_Customaction_RegisterSomeExtensions
-	Name = "RegisterSomeExtensions";
-	Typ = "65";
-	Source = "reg4allmsdoc.dll";
-	Target = "RegisterSomeExtensions";
-	Inbinarytable = 1;
-	Assignment1 = ("ControlEvent", "FileTypeDialog", "Next", "DoAction", "RegisterSomeExtensions", "1", "1");
-End
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
deleted file mode 100644
index 2895c5c8b..000000000
--- a/scp2/source/python/file_python.scp
+++ /dev/null
@@ -1,318 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifndef DISABLE_PYUNO
-
-File gid_File_Lib_Pyuno
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libpyuno,UNXSUFFIX));
-  #else
-    Name = "pyuno.pyd";
-  #endif
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Pythonloader
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-  #ifdef UNX
-    Name = STRING(CONCAT2(pythonloader.uno,UNXSUFFIX));
-  #else
-    Name = "pythonloader.uno.dll";
-  #endif
-    Styles = (PACKED);
-End
-
-File gid_File_Py_Unohelper
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "unohelper.py";
-    Styles = (PACKED);
-End
-
-File gid_File_Py_Officehelper
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "officehelper.py";
-    Styles = (PACKED);
-End
-
-File gid_File_Py_Uno
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "uno.py";
-    Styles = (PACKED);
-End
-
-File gid_File_Py_Pythonloader
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "pythonloader.py";
-    Styles = (PACKED);
-End
-
-#ifndef SYSTEM_PYTHON
-File gid_File_Py_Python_Core
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-  #ifdef MACOSX
-    Name = "OOoPython.framework.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
-  #else
-    Name = STRING(CONCAT3(python-core-,PYVERSION,.zip));
-    Styles = (ARCHIVE);
-  #endif
-End
-
-#ifdef UNX
-#ifndef MACOSX
-File gid_File_Py_Python_Bin
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "python.bin";
-    Styles = (PACKED);
-End
-#endif
-#endif
-#endif
-
-//Scripting Framework Python example scripts
-
-File gid_File_Scripts_Python
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Dir = gid_Dir_Share_Scripts;
-    Name = "ScriptsPython.zip";
-End
-
-// Scripting Framework Python configuration settings
-
-File gid_File_Share_Registry_Pyuno_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "pyuno.xcd";
-End
-
-#ifndef SYSTEM_PYTHON
-#ifndef MACOSX
-File gid_File_Lib_Python_So
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = STRING(PY_FULL_DLL_NAME);
-    Styles = (PACKED);
-End
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Python_So
-    FileID = gid_File_Lib_Python_So;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT3(libpython,PYMAJMIN,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-#endif //UNX
-#else //MACOSX
-//directory entries solely to be able to create the symlinks
-Directory gid_Dir_PythonFramework
-    ParentID = gid_Dir_Program;
-    HostName = "OOoPython.framework";
-End
-
-Unixlink gid_Unixlink_Python_Headers
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework;
-    Name = "Headers";
-    Target = "Versions/Current/Headers";
-    Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_Resources
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework;
-    Name = "Resources";
-    Target = "Versions/Current/Resources";
-    Styles = ();
-End
-
-Directory gid_Dir_PythonFramework_Versions
-    ParentID = gid_Dir_PythonFramework;
-    HostName = "Versions";
-End
-
-Unixlink gid_Unixlink_Python_Versions_Current
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions;
-    Name = "Current";
-    Target = STRING(PYMAJMIN);
-    Styles = ();
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver
-    ParentID = gid_Dir_PythonFramework_Versions;
-    HostName = STRING(PYMAJMIN);
-End
-
-Unixlink gid_Unixlink_Python_Versions_ver_Headers
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions_ver;
-    Name = "Headers";
-    Target = STRING(CONCAT2(include/python,PYMAJMIN));
-    Styles = ();
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_bin
-    ParentID = gid_Dir_PythonFramework_Versions_ver;
-    HostName = "bin";
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_lib
-    ParentID = gid_Dir_PythonFramework_Versions_ver;
-    HostName = "lib";
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver
-    ParentID = gid_Dir_PythonFramework_Versions_ver_lib;
-    HostName = STRING(CONCAT2(python,PYMAJMIN));
-End
-
-Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config
-    ParentID = gid_Dir_PythonFramework_Versions_ver_lib_pythonver;
-    HostName = "config";
-End
-
-Unixlink gid_Unixlink_Python_OOoPython
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework;
-    Name = "OOoPython";
-    Target = "Versions/Current/OOoPython";
-    Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_idle
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "idle";
-    Target = STRING(CONCAT2(idle,PYMAJMIN));
-    Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_pydoc
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "pydoc";
-    Target = STRING(CONCAT2(pydoc,PYMAJMIN));
-    Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_python_real
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "python";
-    Target = "../Resources/Python.app/Contents/MacOS/OOoPython";
-    Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_python
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "python";
-    Target = STRING(CONCAT2(python,PYMAJMIN));
-    Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_pythonconfig
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "python-config";
-    Target = STRING(CONCAT3(python,PYMAJMIN,-config));
-    Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_pythonw_real
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "pythonw";
-    Target = "../Resources/Python.app/Contents/MacOS/OOoPython";
-    Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_pythonw
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "pythonw";
-    Target = STRING(CONCAT2(pythonw,PYMAJMIN));
-    Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_bin_smtpdpy
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions_ver_bin;
-    Name = "smtpd.py";
-    Target = STRING(CONCAT3(smtpd,PYMAJMIN,.py));
-    Styles = ();
-End
-
-Unixlink gid_Unixlink_Python_libpython
-    BIN_FILE_BODY;
-    Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config;
-    Name = STRING(PY_FULL_DLL_NAME);
-    Target = "../../../OOoPython";
-    Styles = ();
-End
-#endif //MACOSX
-
-#ifdef WNT
-File gid_File_Lib_Python_So_Brand // Fix for system-python-problem on windows
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = STRING(PY_FULL_DLL_NAME);
-    Styles = (PACKED);
-End
-#endif
-#endif
-
-#ifdef UNX
-
-File gid_File_Pyuno
-    TXT_FILE_BODY;
-#ifdef MACOSX
-    // note: Mac OS X use .dylib, even for python modules
-    Name = "pyuno.dylib";
-#else
-    Name = "pyuno.so";
-#endif
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-End
-
-#endif
-
-// DISABLE_PYUNO
-#endif
diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk
deleted file mode 100644
index f3bff44cb..000000000
--- a/scp2/source/python/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=python
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(DISABLE_PYTHON)" == "TRUE"
-SCPDEFS+=-DDISABLE_PYUNO
-.ELSE
-.IF "$(SYSTEM_PYTHON)" == "YES"
-SCPDEFS+=-DSYSTEM_PYTHON
-.ELSE
-.INCLUDE :      pyversion.mk
-.ENDIF
-.ENDIF
-
-SCPDEFS+=\
-    -DPYVERSION=$(PYVERSION) -DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \
-    -DPY_FULL_DLL_NAME=$(PY_FULL_DLL_NAME)
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES=\
-        module_python.par              \
-        module_python_mailmerge.par    \
-        profileitem_python.par         \
-        file_python.par
-
-ULFFILES= \
-        module_python.ulf              \
-        module_python_mailmerge.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
deleted file mode 100644
index eef393917..000000000
--- a/scp2/source/python/module_python.scp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifndef DISABLE_PYUNO
-
-Module gid_Module_Optional_Pyuno
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
-    ParentID = gid_Module_Optional;
-    Sortkey = "750";
-    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Lib_Python_So_Brand,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-#endif
diff --git a/scp2/source/python/module_python.ulf b/scp2/source/python/module_python.ulf
deleted file mode 100644
index 2303dcd8a..000000000
--- a/scp2/source/python/module_python.ulf
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_PYTHON]
-en-US = "Python-UNO Bridge"
-
-[STR_DESC_MODULE_OPTIONAL_PYTHON]
-en-US = "Adds the ability to automate %PRODUCTNAME with the python scripting language. See http://udk.openoffice.org/python/python-bridge.html for a complete documentation."
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
deleted file mode 100644
index 53ed507ac..000000000
--- a/scp2/source/python/module_python_mailmerge.scp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifndef AIX
-#ifndef DISABLE_PYUNO
-File gid_File_Pymailmerge
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "mailmerge.py";
-    Styles = (PACKED);
-End
-File gid_File_Pymailmerge_msgbox
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "msgbox.py";
-    Styles = (PACKED);
-End
-#endif
-#endif
diff --git a/scp2/source/python/module_python_mailmerge.ulf b/scp2/source/python/module_python_mailmerge.ulf
deleted file mode 100755
index b69dda152..000000000
--- a/scp2/source/python/module_python_mailmerge.ulf
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_PYTHON_MAILMERGE]
-en-US = "E-mail Mailmerge"
-
-[STR_DESC_MODULE_OPTIONAL_PYTHON_MAILMERGE]
-en-US = "Module for %PRODUCTNAME E-mail Mailmerge feature"
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
deleted file mode 100644
index e0ceceead..000000000
--- a/scp2/source/python/profileitem_python.scp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifndef DISABLE_PYUNO
-
-Profile gid_Profile_Pythonloader_Uno_Ini
-    ModuleID = gid_Module_Optional_Pyuno;
-  #ifdef UNX
-    Name = "pythonloader.unorc";
-  #else
-    Name = "pythonloader.uno.ini";
-  #endif
-    Dir = gid_Dir_Program;
-    Styles = (NETWORK);
-End
-
-#ifndef SYSTEM_PYTHON
-ProfileItem gid_Profileitem_Pythonloader_Pythonhome
-    ProfileID = gid_Profile_Pythonloader_Uno_Ini;
-    ModuleID = gid_Module_Optional_Pyuno;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "PYUNO_LOADER_PYTHONHOME";
-  #ifdef MACOSX
-    Value = CONCAT2($ORIGIN,"OOoPython.framework");
-  #else
-    Value = CONCAT2($ORIGIN/python-core-,PYVERSION);
-  #endif
-End
-#endif
-
-ProfileItem gid_Profileitem_Pythonloader_Pythonpath
-    ProfileID = gid_Profile_Pythonloader_Uno_Ini;
-    ModuleID = gid_Module_Optional_Pyuno;
-    Section = "Bootstrap";
-    Order = 1;
-    Key = "PYUNO_LOADER_PYTHONPATH";
-#ifdef SYSTEM_PYTHON
-    Value = "$ORIGIN";
-#else
-  #ifdef UNX
-    #ifdef MACOSX
-    #define FRAMEWORKLIB CONCAT4($ORIGIN/OOoPython.framework/Versions/,PYMAJMIN,/lib/python,PYMAJMIN)
-    Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB,
-		   /lib-dynload FRAMEWORKLIB,
-		   /lib-tk FRAMEWORKLIB,
-		   /site-packages $ORIGIN);
-    #else
-    Value = CONCAT9($ORIGIN/python-core-,PYVERSION,
-		   /lib $ORIGIN/python-core-,PYVERSION,
-		   /lib/lib-dynload $ORIGIN/python-core-,PYVERSION,
-		   /lib/lib-tk $ORIGIN/python-core-,PYVERSION,
-		   /lib/site-packages $ORIGIN);
-    #endif
-  #else
-   #ifdef _gcc3
-    Value = STRING(CONCAT9($ORIGIN/python-core-,PYVERSION,
-		   /lib $ORIGIN/python-core-,PYVERSION,
-		   /lib/lib-dynload $ORIGIN/python-core-,PYVERSION,
-		   /lib/lib-tk $ORIGIN/python-core-,PYVERSION,
-		   /lib/site-packages $ORIGIN));
-   #else
-    Value = STRING(CONCAT5($ORIGIN/python-core-,PYVERSION,
-                   /lib $ORIGIN/python-core-,PYVERSION,
-		   /lib/site-packages $ORIGIN));
-   #endif
-  #endif
-#endif
-End
-
-// DISABLE_PYUNO
-#endif
diff --git a/scp2/source/quickstart/file_quickstart.scp b/scp2/source/quickstart/file_quickstart.scp
deleted file mode 100644
index 447dcee04..000000000
--- a/scp2/source/quickstart/file_quickstart.scp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-File gid_File_Exe_Quickstart
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-    Name = "quickstart.exe";
-End
diff --git a/scp2/source/quickstart/folderitem_quickstart.scp b/scp2/source/quickstart/folderitem_quickstart.scp
deleted file mode 100644
index b533637cc..000000000
--- a/scp2/source/quickstart/folderitem_quickstart.scp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-FolderItem gid_Folderitem_Exe_Quickstart
-    ModuleID = gid_Module_Optional_Quickstart;
-    Name = "%PRODUCTNAME %PRODUCTVERSION";
-    FolderID = PREDEFINED_AUTOSTART;
-    FileID = gid_File_Exe_Install_Quickstart;
-End
diff --git a/scp2/source/quickstart/makefile.mk b/scp2/source/quickstart/makefile.mk
deleted file mode 100644
index 283d22073..000000000
--- a/scp2/source/quickstart/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=quickstart
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-.IF "$(GUI)"=="WNT"
-PARFILES= \
-        module_quickstart.par              \
-        file_quickstart.par                \
-        registryitem_quickstart.par
-.ENDIF
-
-ULFFILES= \
-        module_quickstart.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/quickstart/module_quickstart.scp b/scp2/source/quickstart/module_quickstart.scp
deleted file mode 100644
index 078de4b5f..000000000
--- a/scp2/source/quickstart/module_quickstart.scp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Quickstart
-    MOD_NAME_DESC ( MODULE_OPTIONAL_QUICKSTART );
-    Sortkey = "1400";
-    Default = YES;
-    ParentID = gid_Module_Optional;
-    Files = (gid_File_Exe_Quickstart, gid_File_Tmp_Userinstall_Quickstart_Inf);
-End
diff --git a/scp2/source/quickstart/module_quickstart.ulf b/scp2/source/quickstart/module_quickstart.ulf
deleted file mode 100644
index f8a8809f6..000000000
--- a/scp2/source/quickstart/module_quickstart.ulf
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_QUICKSTART]
-en-US = "Quickstarter"
-
-[STR_DESC_MODULE_OPTIONAL_QUICKSTART]
-en-US = "Loads basic components on system start to accelerate start up time of %PRODUCTNAME %PRODUCTVERSION."
-
-
-
diff --git a/scp2/source/quickstart/registryitem_quickstart.scp b/scp2/source/quickstart/registryitem_quickstart.scp
deleted file mode 100644
index 31e0e9511..000000000
--- a/scp2/source/quickstart/registryitem_quickstart.scp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\LibreOffice";
-    ModuleID = gid_Module_Optional_Quickstart;
-    Name = "QuickStarterInstalled";
-    Value = "1";
-End
diff --git a/scp2/source/sdkoo/makefile.mk b/scp2/source/sdkoo/makefile.mk
deleted file mode 100644
index 6b4200b46..000000000
--- a/scp2/source/sdkoo/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=scp2so
-TARGET=sdkoo
-
-.INCLUDE: settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        sdkoo.par          
-
-#.IF "$(OS)" == "MACOSX"
-#PARFILES+= module_sdkoo.par
-#
-#ULFFILES= module_sdkoo.ulf
-#.ENDIF
-
-
-.INCLUDE: target.mk
diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp
deleted file mode 100644
index b24bd7aaf..000000000
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Sdkoo
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_OPTIONAL_SDKOO );
-    Sortkey = "630";
-    ParentID = gid_Module_Optional;
-    Default = NO;
-    Files = (gid_File_Zip_Odkexamples, gid_File_Zip_Odkcommon);
-End
diff --git a/scp2/source/sdkoo/module_sdkoo.ulf b/scp2/source/sdkoo/module_sdkoo.ulf
deleted file mode 100644
index 1bb139979..000000000
--- a/scp2/source/sdkoo/module_sdkoo.ulf
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_SDKOO]
-en-US = "Software Development Kit (SDK)"
-
-[STR_DESC_MODULE_OPTIONAL_SDKOO]
-en-US = "The SDK provides all necessary tools, examples and documentation to program with and for the office."
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
deleted file mode 100644
index a15e4c399..000000000
--- a/scp2/source/sdkoo/sdkoo.scp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Installation gid_Installation_Sdk
-    ProductName = "${PRODUCTNAME}";
-    ProductVersion = "${PRODUCTVERSION}";
-    ProductExtension = "${PRODUCTEXTENSION}";
-    OOoBaseVersion = "${OOOBASEVERSION}";
-#if defined WNT
-    DefaultDestPath = "<winprogpath>\%PRODUCTNAME";
-#else
-    DefaultDestPath = "/opt/%PRODUCTNAME";
-#endif
-End
-
-#ifndef MACOSX
-
-#ifdef WNT
-Directory gid_Dir_Sdkoo_Root
-    ParentID = PREDEFINED_PROGDIR;
-    HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
-    Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
-End
-#endif
-
-#ifndef WNT
-Directory gid_Dir_Ooo_Openofficeorg_Sdk
-    ParentID = PREDEFINED_PROGDIR;
-  #ifdef WNT
-    HostName = "${BASISROOTNAME}";
-  #else
-    HostName = ".";
-  #endif
-End
-#endif
-
-#ifndef WNT
-Directory gid_Dir_Ooo_Basis_Sdk
-    ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
-  #ifdef WNT
-    HostName = "Basis ${OOOBASEVERSION}";
-  #else
-    HostName = "basis${OOOBASEVERSION}";
-  #endif
-    Styles = (BASISDIRECTORY);
-End
-#endif
-
-#endif
-
-Directory gid_Dir_Basis_Sdk
-#if defined MACOSX
-    ParentID = PREDEFINED_PROGDIR;
-    DosName = "LibreOffice${OOOBASEVERSION}_SDK";
-#else
-  #if defined WNT
-    ParentID = gid_Dir_Sdkoo_Root;
-  #else
-    ParentID = gid_Dir_Ooo_Basis_Sdk;
-  #endif
-    DosName = "sdk";
-#endif
-End
-
-Directory gid_Dir_Share_Sdk
-    ParentID = gid_Dir_Basis_Sdk;
-    DosName = "share";
-End
-
-Directory gid_Dir_Share_Readme_Sdk
-    ParentID = gid_Dir_Share_Sdk;
-    DosName = "readme";
-End
-
-
-Module gid_Module_Root_SDK
-    Name = "sdkoo";
-    Description = "sdkoo";
-    PackageInfo = "packinfo_sdkoo.txt";
-End
-
-
-File gid_File_Txt_License
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme_Sdk;
-  #ifdef UNX
-    Name = "LICENSE";
-  #endif
-  #ifdef WNT
-    Name = "license.txt";
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_File_Txt_Readme
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme_Sdk;
-  #ifdef UNX
-    Name = "README_en-US";
-  #endif
-  #ifdef WNT
-    Name = "readme_en-US.txt";
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_File_Zip_Odkexamples
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Basis_Sdk;
-    Name = "odkexamples.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
-End
-
-
-File gid_File_Zip_Odkcommon
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Basis_Sdk;
-    Name = "odkcommon.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
-End
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Directory gid_Dir_Lib_Sdk    
-    Styles = (CREATE);
-    ParentID = gid_Dir_Basis_Sdk;
-    DosName = "lib";
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Sal_Link_Sdk
-    BIN_FILE_BODY;
-    Styles = ();
-    Name = SCP2_URE_DL_UNO_NORMAL("sal");
-    Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("sal", "3");
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Salhelper_Link_Sdk
-    BIN_FILE_BODY;
-    Styles = ();
-    Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
-    Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Cppu_Link_Sdk
-    BIN_FILE_BODY;
-    Styles = ();
-    Name = SCP2_URE_DL_UNO_NORMAL("cppu");
-    Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("cppu", "3");
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Cppuhelper_Link_Sdk
-    BIN_FILE_BODY;
-    Styles = ();
-    // Styles = (LAYERLINK);
-    Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
-    Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Purpenvhelper_Link_Sdk
-    BIN_FILE_BODY;
-    Styles = ();
-    Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
-    Dir = gid_Dir_Lib_Sdk;
-    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
-End
-#endif
diff --git a/scp2/source/supported_extensions.txt b/scp2/source/supported_extensions.txt
deleted file mode 100755
index c45b84ab0..000000000
--- a/scp2/source/supported_extensions.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-[Calc]
-ODS
-OTS
-SXC
-STC
-DIF
-DBF
-XLS
-XLW
-XLT
-RTF
-SDC
-VOR
-SLK
-CSV
-TXT
-HTM
-HTML
-WK1
-WKS
-123
-XML
-
-[Writer]
-ODT
-OTT
-SXW
-STW
-DOC
-DOT
-RTF
-SDW
-VOR
-TXT
-HTM
-HTML
-XML
-WPD
-WPS
-JTD
-JTT
-HWP
-OTH
-ODM
-SXG
-SGL
-
-[Impress]
-ODP
-OTP
-SXI
-STI
-PPT
-PPS
-POT
-SXD
-SDA
-SDD
-SDP
-VOR
-ODG
-
-[Draw]
-ODG
-OTG
-SXD
-STD
-SDA
-SDD
-VOR
-
-;[Database]
-[OOo]
-ODB
-
-[Math]
-ODF
-SXM
-SMF
-MML
diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
deleted file mode 100755
index 46b9ac24d..000000000
--- a/scp2/source/templates/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=scp2
-TARGET=templates
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.INCLUDE :  target.mk
-
-# force expanding
-COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
-.EXPORT : COMPLETELANGISO_VAR
-
-ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_templates_root.inc $(INCCOM)$/alllangmodules_accessories_samples_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_templates.inc $(INCCOM)$/alllangmodules_extensions_lightproof.inc $(INCCOM)$/allhelpmodules.inc $(INCCOM)$/allhelpmodules_root.inc
-
-.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk $(MISC)$/$(TARGET)_help_track.mk
-.IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
-PHONYTEMPL=.PHONY
-.ENDIF			# "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
-$(INCCOM)$/alllangmodules%.inc $(PHONYTEMPL) : module_langpack%.sct
-    @@-$(RENAME) $@ $@.tmp
-    $(COMMAND_ECHO)$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-    @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk
-$(INCCOM)$/allhelpmodules%.inc $(PHONYTEMPL) : module_helppack%.sct
-    @@-$(RENAME) $@ $@.tmp
-    $(COMMAND_ECHO)$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-    @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_help_track.mk
diff --git a/scp2/source/templates/module_helppack.sct b/scp2/source/templates/module_helppack.sct
deleted file mode 100644
index 3b80cd88d..000000000
--- a/scp2/source/templates/module_helppack.sct
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-Module gid_Module_Helppack_Root_<LANGUAGE_>
-    ParentID = gid_Module_Helppack_Helproot;
-    Sortkey = "<SORTKEY>";
-    Language = "<LANGUAGE>";
-    MOD_NAME_DESC(MODULE_HELPPACK_<LANGUAGEBIG_>);
-#ifdef WITH_HELPPACK_INTEGRATION
-    Styles =(FORCEHELPPACK, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME, LANGUAGEMODULE);
-#else
-    Styles =(HELPPACK, HIDDEN_ROOT, USELANGUAGENAME, LANGUAGEMODULE);
-#endif
-End
diff --git a/scp2/source/templates/module_helppack_root.sct b/scp2/source/templates/module_helppack_root.sct
deleted file mode 100644
index 2ddf414e3..000000000
--- a/scp2/source/templates/module_helppack_root.sct
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-Module gid_Module_Helppack_Help_<LANGUAGE_>
-    ParentID = gid_Module_Helppack_Root_<LANGUAGE_>;
-    Sortkey = "200";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Helppack_Help_Template;
-    Name = "gid_Module_Helppack_Help_<LANGUAGE_>";
-    Description = "gid_Module_Helppack_Help_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_help.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/module_langpack.sct b/scp2/source/templates/module_langpack.sct
deleted file mode 100755
index 2876776f5..000000000
--- a/scp2/source/templates/module_langpack.sct
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-Module gid_Module_Langpack_Root_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Languageroot;
-    Sortkey = "<SORTKEY>";
-    Language = "<LANGUAGE>";
-    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-End
diff --git a/scp2/source/templates/module_langpack_accessories_samples.sct b/scp2/source/templates/module_langpack_accessories_samples.sct
deleted file mode 100644
index 5a40a3e19..000000000
--- a/scp2/source/templates/module_langpack_accessories_samples.sct
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: module_langpack_accessories_samples.sct,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Accessories_Adv_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Accessories_Adv_Root_<LANGUAGE_>;
-    Sortkey = "300";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Optional_Accessories_Adv_Template;
-    Name = "gid_Module_Optional_Accessories_Adv_<LANGUAGE_>";
-    Description = "gid_Module_Optional_Accessories_Adv_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
-
-Module gid_Module_Optional_Accessories_Doc_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Accessories_Doc_Root_<LANGUAGE_>;
-    Sortkey = "200";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Optional_Accessories_Doc_Template;
-    Name = "gid_Module_Optional_Accessories_Doc_<LANGUAGE_>";
-    Description = "gid_Module_Optional_Accessories_Doc_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
-
-Module gid_Module_Optional_Accessories_Sam_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Accessories_Sam_Root_<LANGUAGE_>;
-    Sortkey = "100";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Optional_Accessories_Sam_Template;
-    Name = "gid_Module_Optional_Accessories_Sam_<LANGUAGE_>";
-    Description = "gid_Module_Optional_Accessories_Sam_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/module_langpack_accessories_samples_root.sct b/scp2/source/templates/module_langpack_accessories_samples_root.sct
deleted file mode 100644
index dbe08dd09..000000000
--- a/scp2/source/templates/module_langpack_accessories_samples_root.sct
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: module_langpack_accessories_root.sct,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Accessories_Adv_Root_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Accessories_Advertisement;
-    Sortkey = "<SORTKEY>";
-    Language = "<LANGUAGE>";
-    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-End
-
-Module gid_Module_Optional_Accessories_Doc_Root_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Accessories_Documentations;
-    Sortkey = "<SORTKEY>";
-    Language = "<LANGUAGE>";
-    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-End
-
-Module gid_Module_Optional_Accessories_Sam_Root_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Accessories_Samples;
-    Sortkey = "<SORTKEY>";
-    Language = "<LANGUAGE>";
-    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-End
diff --git a/scp2/source/templates/module_langpack_accessories_templates.sct b/scp2/source/templates/module_langpack_accessories_templates.sct
deleted file mode 100644
index 44b519db3..000000000
--- a/scp2/source/templates/module_langpack_accessories_templates.sct
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: module_langpack_accessories_templates.sct,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Accessories_Tem_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Accessories_Tem_Root_<LANGUAGE_>;
-    Sortkey = "50";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Optional_Accessories_Tem_Template;
-    Name = "gid_Module_Optional_Accessories_Tem_<LANGUAGE_>";
-    Description = "gid_Module_Optional_Accessories_Tem_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/module_langpack_accessories_templates_root.sct b/scp2/source/templates/module_langpack_accessories_templates_root.sct
deleted file mode 100644
index fe0da7247..000000000
--- a/scp2/source/templates/module_langpack_accessories_templates_root.sct
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: module_langpack_accessories_root.sct,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Accessories_Tem_Root_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Accessories_Templates;
-    Sortkey = "<SORTKEY>";
-    Language = "<LANGUAGE>";
-    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-End
diff --git a/scp2/source/templates/module_langpack_base.sct b/scp2/source/templates/module_langpack_base.sct
deleted file mode 100755
index 4c569f322..000000000
--- a/scp2/source/templates/module_langpack_base.sct
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-Module gid_Module_Langpack_Base_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "800";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Base_Template;
-    Name = "gid_Module_Langpack_Base_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Base_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct
deleted file mode 100644
index ffcabf0cf..000000000
--- a/scp2/source/templates/module_langpack_binfilter.sct
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-Module gid_Module_Langpack_Binfilter_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "900";
-    Default = YES;
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Binfilter_Template;
-    Name = "gid_Module_Langpack_Binfilter_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Binfilter_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/module_langpack_calc.sct b/scp2/source/templates/module_langpack_calc.sct
deleted file mode 100755
index 865d03ebe..000000000
--- a/scp2/source/templates/module_langpack_calc.sct
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-Module gid_Module_Langpack_Calc_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "450";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Calc_Template;
-    Name = "gid_Module_Langpack_Calc_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Calc_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/module_langpack_draw.sct b/scp2/source/templates/module_langpack_draw.sct
deleted file mode 100755
index b87ff103a..000000000
--- a/scp2/source/templates/module_langpack_draw.sct
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-Module gid_Module_Langpack_Draw_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "600";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Draw_Template;
-    Name = "gid_Module_Langpack_Draw_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Draw_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/module_langpack_extensions_lightproof.sct b/scp2/source/templates/module_langpack_extensions_lightproof.sct
deleted file mode 100644
index 1cadbdea8..000000000
--- a/scp2/source/templates/module_langpack_extensions_lightproof.sct
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: module_langpack_extensions_templates.sctp,v $
- *
- *  $Revision: 1.0 $
- *
- *  last change: $Author: KAMI $ $Date: 2008/11/18 14:50:39 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 3.
- *
- *
- *    GNU Lesser General Public License Version 3
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    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
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Extensions_LightProof_Root_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Extensions_LightProof;
-    Sortkey = "<SORTKEY>";
-    Language = "<LANGUAGE>";
-    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-End
-
-Module gid_Module_Optional_Extensions_LightProof_M_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Extensions_LightProof_Root_<LANGUAGE_>;
-    Sortkey = "50";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Optional_Extensions_LightProof_Template;
-    Name = "gid_Module_Optional_Extensions_LightProof_<LANGUAGE_>";
-    Description = "gid_Module_Optional_Extensions_LightProof_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/module_langpack_extensions_templates.sct b/scp2/source/templates/module_langpack_extensions_templates.sct
deleted file mode 100644
index f5099abdf..000000000
--- a/scp2/source/templates/module_langpack_extensions_templates.sct
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: module_langpack_extensions_templates.sctp,v $
- *
- *  $Revision: 1.0 $
- *
- *  last change: $Author: KAMI $ $Date: 2008/11/18 14:50:39 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 3.
- *
- *
- *    GNU Lesser General Public License Version 3
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    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
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Extensions_Sun_T_Pack_Root_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Extensions_Sun_Template_Pack;
-    Sortkey = "<SORTKEY>";
-    Language = "<LANGUAGE>";
-    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-End
-
-Module gid_Module_Optional_Extensions_Sun_T_Pack_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Extensions_Sun_T_Pack_Root_<LANGUAGE_>;
-    Sortkey = "50";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Optional_Extensions_Sun_T_Pack_Template;
-    Name = "gid_Module_Optional_Extensions_Sun_T_Pack_<LANGUAGE_>";
-    Description = "gid_Module_Optional_Extensions_Sun_T_Pack_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/module_langpack_impress.sct b/scp2/source/templates/module_langpack_impress.sct
deleted file mode 100755
index fe90cfdc8..000000000
--- a/scp2/source/templates/module_langpack_impress.sct
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-Module gid_Module_Langpack_Impress_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "500";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Impress_Template;
-    Name = "gid_Module_Langpack_Impress_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Impress_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/module_langpack_math.sct b/scp2/source/templates/module_langpack_math.sct
deleted file mode 100755
index 5b7722a14..000000000
--- a/scp2/source/templates/module_langpack_math.sct
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-Module gid_Module_Langpack_Math_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "700";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Math_Template;
-    Name = "gid_Module_Langpack_Math_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Math_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/module_langpack_onlineupdate.sct b/scp2/source/templates/module_langpack_onlineupdate.sct
deleted file mode 100755
index 24fb09c35..000000000
--- a/scp2/source/templates/module_langpack_onlineupdate.sct
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-Module gid_Module_Langpack_Onlineupdate_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "900";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Onlineupdate_Template;
-    Name = "gid_Module_Langpack_Onlineupdate_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Onlineupdate_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/module_langpack_root.sct b/scp2/source/templates/module_langpack_root.sct
deleted file mode 100755
index 2db4529c5..000000000
--- a/scp2/source/templates/module_langpack_root.sct
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-Module gid_Module_Langpack_Basis_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    InstallOrder = "200";
-    Sortkey = "50";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Basis_Template;
-    Name = "gid_Module_Langpack_Basis_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Basis_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
-
-Module gid_Module_Langpack_Resource_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "100";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Resource_Template;
-    Name = "gid_Module_Langpack_Resource_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Resource_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
-
-Module gid_Module_Langpack_Fonts_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "300";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Fonts_Template;
-    Name = "gid_Module_Langpack_Fonts_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Fonts_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
-
-Module gid_Module_Langpack_Brand_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "400";
-    InstallOrder = "1050";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Brand_Template;
-    Name = "gid_Module_Langpack_Brand_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Brand_<LANGUAGE_>";
-    PackageInfo = "packinfo_brand.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/module_langpack_writer.sct b/scp2/source/templates/module_langpack_writer.sct
deleted file mode 100755
index d4c59baa6..000000000
--- a/scp2/source/templates/module_langpack_writer.sct
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-Module gid_Module_Langpack_Writer_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "400";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Writer_Template;
-    Name = "gid_Module_Langpack_Writer_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Writer_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/source/templates/modules.pl b/scp2/source/templates/modules.pl
deleted file mode 100755
index 14061d0f2..000000000
--- a/scp2/source/templates/modules.pl
+++ /dev/null
@@ -1,185 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-my $completelangiso_var = $ENV{COMPLETELANGISO_VAR};
-my $lastcompletelangiso_var = "";
-my $outfile = "";
-my $infile = "";
-my @infile = ();
-my $globalcounter = 0;
-my $globallinecounter = 0;
-my $verbose = 0;
-
-if ( !defined $completelangiso_var) {
-    print STDERR "ERROR: No language defined!\n";
-    exit 1;
-}
-
-startup_check();
-
-# if ( "$completelangiso_var" eq "$lastcompletelangiso_var" ) {
-#    print STDERR "No new languages. Keeping old file\n";
-#    exit 0;
-# }
-
-my @completelangiso = split " +", $completelangiso_var;
-
-open OUTFILE, ">$outfile" or die "$0 ERROR: cannot open $outfile for writing!\n";
-print OUTFILE "// generated file, do not edit\n\n";
-print OUTFILE "// languages used for last time generation\n";
-print OUTFILE "// completelangiso: $completelangiso_var\n\n";
-write_ALL_MODULES();
-close OUTFILE;
-check_counter();
-
-sub check_counter
-{
-    print STDERR "Wrote modules for $globalcounter languages ($globallinecounter lines)!\n" if $verbose;
-    if ( $globalcounter == 0 )
-    {
-        print STDERR "ERROR: No languages found!\n";
-        exit 1;
-    }
-
-    if ( $globallinecounter == 0 )
-    {
-        print STDERR "ERROR: No lines written!\n";
-        exit 1;
-    }
-}
-    
-
-sub write_ALL_MODULES
-{
-    my $counter = 0;
-    my $linecounter = 0;
-    my $linecount = $#infile + 1;
-    # print STDERR "Lines in inputfile: $linecount!\n";
-
-    foreach $lang (@completelangiso) {
-        $language = $lang;
-        $language_ = $lang;
-        $language_ =~ s/-/_/;
-        $languagebig_ = uc($lang);
-        $languagebig_ =~ s/-/_/;
-        $counter++;
-        my $sortkey = 100 * $counter;
-
-        for ( $i = 0; $i <= $#infile; $i++) {
-            my $line = $infile[$i];
-            if (( $line =~  /^\s*\*/ ) || ( $line =~  /^\s*\/\*/ )) { next; }
-            $line =~ s/\<LANGUAGE\>/$language/g;
-            $line =~ s/\<LANGUAGE_\>/$language_/g;
-            $line =~ s/\<LANGUAGEBIG_\>/$languagebig_/g;
-            $line =~ s/\<SORTKEY\>/$sortkey/g;
-            print OUTFILE $line;
-            $linecounter++;
-        }
-        print OUTFILE "\n";
-    }
-    print OUTFILE "\n";
-    
-    $globalcounter = $counter;
-    $globallinecounter = $linecounter;
-}
-
-sub startup_check
-{
-    my $i;
-
-    if ( $#ARGV >= 0 )
-    {
-        if ( $ARGV[0] eq "-verbose" )
-        {
-            $verbose = 1;
-            shift @ARGV;
-        }
-        elsif ( $ARGV[0] eq "-quiet" )
-        {
-            # no special quiet flag/mode
-            shift @ARGV;
-        }
-    }
-
-    for ( $i=0; $i <= $#ARGV; $i++) {
-        if ( "$ARGV[$i]" eq "-o" ) {
-            if ( defined $ARGV[ $i + 1] ) {
-                $outfile = $ARGV[ $i + 1];
-                $i++;
-            }
-        } elsif ( "$ARGV[$i]" eq "-i" ) {
-            if ( defined $ARGV[ $i + 1] ) {
-                $infile = $ARGV[ $i + 1];
-                $i++;
-            }
-        } else {
-            usage();
-        }
-    }
-
-    usage() if $i < 3;
-    usage() if "$outfile" eq "";
-    usage() if "$infile" eq "";
-
-    if ( -f "$infile" ) {
-        open INFILE, "$infile" or die "$0 - ERROR: $infile exists but isn't readable.\n";
-        @infile = <INFILE>;
-        close( INFILE );
-        print STDERR "Reading template file: $infile\n" if $verbose;
-        my $num = $#infile + 1;
-        # print STDERR "Number of lines: $num\n";
-    } else {
-        die "Template file \"$infile\" not found!\n";
-        exit 1;
-    }
-
-    if ( -f "$outfile" ) {
-        # changed script - run always
-        return if (stat($0))[9] > (stat("$outfile"))[9] ;
-        # changed template file - run always
-        return if (stat($infile))[9] > (stat("$outfile"))[9] ;
-
-        open OLDFILE, "$outfile" or die "$0 - ERROR: $outfile exists but isn't readable.\n";
-        while ( $line = <OLDFILE> ) {
-            if ( $line =~ /^\/\/.*completelangiso:/ ) {
-                $lastcompletelangiso_var = $line;
-                chomp $lastcompletelangiso_var;
-                $lastcompletelangiso_var =~ s/^\/\/.*completelangiso:\s*//;
-                last;
-            }                
-        }
-        close OLDFILE;
-    }
-
-}
-
-sub usage
-{
-    print STDERR "Generate language modules from language script particle template (*.sct file)\n";
-    print STDERR "perl $0 [-verbose] -o outputfile -i inputfile\n";
-    exit  1;
-}
diff --git a/scp2/source/testtool/file_testtool.scp b/scp2/source/testtool/file_testtool.scp
deleted file mode 100644
index 3b30c157f..000000000
--- a/scp2/source/testtool/file_testtool.scp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-STD_LIB_FILE( gid_File_Lib_Communi, communi )
-STD_LIB_FILE( gid_File_Lib_Simplecm, simplecm )
-
-#if defined WNT
-File gid_File_Exe_Testtool
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "testtool.exe";
-End
-#endif
-
-File gid_File_Bin_Testtool
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "testtool.bin";
-End
-
-File gid_File_Config_Testtool
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-  #ifdef UNX
-    Name = "testtoolrc";
-  #else
-    Name = "testtool.ini";
-  #endif
-End
-
-// On Mac OS X, testtool needs to find the Info.plist and needs to be located in
-// the Content/MacOS directory; since the Mac OS X dmg contains all layers,
-// anyway, this hack works for now:
-#if defined MACOSX
-Unixlink gid_Unixlink_Testtool
-    BIN_FILE_BODY;
-    Styles = ();
-    Name = "testtool";
-    Dir = gid_Brand_Dir_Program;
-    Target = "../basis-link/program/testtool.bin";
-End
-#endif
diff --git a/scp2/source/testtool/makefile.mk b/scp2/source/testtool/makefile.mk
deleted file mode 100644
index edcad2e17..000000000
--- a/scp2/source/testtool/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=testtool
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_testtool.par     \
-        file_testtool.par
-
-ULFFILES= \
-        module_testtool.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/testtool/module_testtool.scp b/scp2/source/testtool/module_testtool.scp
deleted file mode 100644
index 1a6bc0d01..000000000
--- a/scp2/source/testtool/module_testtool.scp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Testtool
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_OPTIONAL_TESTTOOL );
-    Sortkey = "650";
-    ParentID = gid_Module_Optional;
-    Default = NO;
-    Files = (gid_File_Exe_Testtool, gid_File_Bin_Testtool, gid_File_Lib_Communi, gid_File_Lib_Simplecm, gid_File_Hid_Testtool, gid_File_Config_Testtool);
-    Unixlinks = (gid_Unixlink_Testtool);
-End
diff --git a/scp2/source/testtool/module_testtool.ulf b/scp2/source/testtool/module_testtool.ulf
deleted file mode 100644
index 8d219eaab..000000000
--- a/scp2/source/testtool/module_testtool.ulf
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_TESTTOOL]
-en-US = "Testtool"
-
-[STR_DESC_MODULE_OPTIONAL_TESTTOOL]
-en-US = "Testtool"
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
deleted file mode 100644
index a03a55ee9..000000000
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Directory gid_Dir_Shlxthdl
-    ParentID = gid_Dir_Program;
-    DosName = "shlxthdl";
-End
-
-File gid_File_Lib_OOoFilt
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "ooofilt.dll";
-End
-
-#ifdef BUILD_X64
-
-File gid_File_Lib_OOoFilt64
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "ooofilt_x64.dll";
-    ComponentCondition = "VersionNT64";
-End
-
-#endif
-
-File gid_File_Lib_Shlxthdl
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "shlxthdl.dll";
-End
-
-#ifdef BUILD_X64
-	File gid_File_Lib_Shlxthdl64
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "shlxthdl_x64.dll";
-    ComponentCondition = "VersionNT64";
-End
-
-#endif
-
-File gid_File_Lib_PropertyHdl
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "propertyhdl.dll";
-End
-
-#ifdef BUILD_X64
-	File gid_File_Lib_PropertyHdl64
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "propertyhdl_x64.dll";
-    ComponentCondition = "VersionNT64";
-End
-
-#endif
-
-File gid_File_Lib_Shlxtmsi
-    TXT_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "shlxtmsi.dll";
-End
-
-File gid_File_Lib_Reg64
-    TXT_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "reg64msi.dll";
-End
-
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
deleted file mode 100755
index 435ed4399..000000000
--- a/scp2/source/winexplorerext/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=winexpext
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(BUILD_X64)"!=""
-SCPDEFS+=-DBUILD_X64
-.ENDIF
-
-SCP_PRODUCT_TYPE=osl
-
-.IF "$(GUI)"=="WNT"
-PARFILES= \
-        module_winexplorerext.par        \
-        file_winexplorerext.par          \
-        registryitem_winexplorerext.par
-.ENDIF
-
-ULFFILES= \
-        module_winexplorerext.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
deleted file mode 100644
index f20edccc5..000000000
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Winexplorerext
-    MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS );
-    Sortkey = "1205";
-    Default = YES;
-    Minimal = YES;
-    ParentID = gid_Module_Optional;
-    Dirs = (gid_Dir_Shlxthdl);
-    Files = (gid_File_Lib_Shlxthdl,
-			 gid_File_Lib_Shlxthdl64,
-			 gid_File_Lib_OOoFilt,
-			 gid_File_Lib_OOoFilt64,
-             gid_File_Lib_Shlxtmsi,
-             gid_File_Lib_Reg64,
-             gid_File_Tmp_Userinstall_Winexplorerext_Inf);    
-End
-
-Module gid_Module_Optional_Winexplorerext_PropertyHdl
-	ParentID = gid_Module_Optional_Winexplorerext;
-	Name = "gid_Module_Optional_Winexplorerext_PropertyHdl";
-	Description = "gid_Module_Optional_Winexplorerext_PropertyHdl";
-	Sortkey = "1210";
-	Default = YES;
-	Styles = (HIDDEN_ROOT);
-    Dirs = (gid_Dir_Shlxthdl);
-	Files = (gid_File_Lib_PropertyHdl,
-			 gid_File_Lib_PropertyHdl64);
-End
diff --git a/scp2/source/winexplorerext/module_winexplorerext.ulf b/scp2/source/winexplorerext/module_winexplorerext.ulf
deleted file mode 100644
index 506c80d71..000000000
--- a/scp2/source/winexplorerext/module_winexplorerext.ulf
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS]
-en-US = "Windows Explorer Extension"
-
-[STR_DESC_MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS]
-en-US = "Enables the Microsoft Windows Explorer to show information about %PRODUCTNAME documents, such as thumbnail previews."
-
-
-
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
deleted file mode 100644
index 62911d24f..000000000
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ /dev/null
@@ -1,230 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-
-// Begin registry items for the Infotip handler
-
-RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
-    Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
-    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
-End
-
-RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
-    Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
-    Name = "ThreadingModel";
-    Value = "Apartment";
-    Val64 = "Apartment";
-End
-
-// End registry items for the Infotip handler
-
-// Begin registry items for the Thumbnail viewer
-
-RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
-    Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
-    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
-End
-
-RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
-    Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
-    Name = "ThreadingModel";
-    Value = "Apartment";
-    Val64 = "Apartment";
-End
-
-// End registry items for the Thumbnail viewer
-
-// Begin registry items for the Column handler
-
-RegistryItem gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
-    Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
-    Value = "OpenOffice.org Column Handler";
-    Val64 = "OpenOffice.org Column Handler";
-End
-
-RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
-    Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
-    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
-End
-    
-RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
-    Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
-    Name = "ThreadingModel";
-    Value = "Apartment";
-    Val64 = "Apartment";
-End
-    
-// End registry items for the Column handler
-
-// Begin registry items for the MS Indexing server filter component
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-// Better?: "OpenOffice.org Format Filter"
-// old:    Value = "opendocument.org Filter";
-	Styles = (X64_ONLY); // Values: X64
-    Value = "OpenDocument Format Filter";
-    Val64 = "OpenDocument Format Filter";
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
-    Styles = (X64); // Values: X64 / X64_ONLY
-    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt.dll";
-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt_x64.dll";
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
-    Styles = (X64); // Values: X64
-    Name = "ThreadingModel";
-    Value = "Apartment";
-    Val64 = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-//? Better: "OpenOffice.org Persistent Handler"
-// old:    Value = "opendocument.org Persistent Handler";
-	Styles = (X64); // Values: X64
-    Value = "OpenDocument Format Persistent Handler";
-    Val64 = "OpenDocument Format Persistent Handler";
-End
-
-RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Styles = (X64); // Values: X64
-    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}";
-    Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-    Val64 = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-End
-
-// End registry items for the MS Indexing server filter component
-
-// Begin registry entries for the PropertySheet handler
-
-RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
-    Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
-    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
-End
-
-RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext;
-    Styles = (X64);
-    Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
-    Name = "ThreadingModel";
-    Value = "Apartment";
-    Val64 = "Apartment";
-End
-
-// End registry entries for the PropertySheet handler
-
-// Begin registry entries for the Property handler
-
-RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    ComponentCondition = "VersionNT >= 600";
-    Styles = (X64);
-    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
-    Value = "%PRODUCTNAME Property Handler";
-    Val64 = "%PRODUCTNAME Property Handler";
-End
-
-RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    ComponentCondition = "VersionNT >= 600";
-    Styles = (X64);
-    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
-    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl.dll";
-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl_x64.dll";
-End
-
-RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    ComponentCondition = "VersionNT >= 600";
-    Styles = (X64);
-    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
-    Name = "ThreadingModel";
-    Value = "Apartment";
-    Val64 = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    ComponentCondition = "VersionNT >= 600";
-    Styles = (X64);
-    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
-    Name = "{AE424E85-F6DF-4910-A6A9-438797986431}";
-    Value = "%PRODUCTNAME Property Handler";
-    Val64 = "%PRODUCTNAME Property Handler";
-End
-
-// End registry entries for the Property handler
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
deleted file mode 100644
index ea6502445..000000000
--- a/scp2/source/writer/file_writer.scp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-STD_LIB_FILE(gid_File_Lib_Swd, swd)
-
-STD_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
-
-File gid_File_Exe_Swriter
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(swriter);
-  #ifdef WNT
-    FileDescription = "%PRODUCTNAME Writer";
-    Styles = (PACKED, PATCH_SO_NAME);
-  #else
-    Styles = (PACKED);
-  #endif
-End
-
-#ifdef WNT
-File gid_File_Exe_Sweb
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(sweb);
-    FileDescription = "%PRODUCTNAME Writer(Web)";
-    Styles = (PACKED, PATCH_SO_NAME);
-End
-#endif
-
-File gid_File_Help_Swriter_Zip
-    Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY_HELPPACK;
-    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(swriter);
-    Patchfiles = ();
-End
-
-/*
-File gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Config_Sofficecfg_Swriter_Menubar;
-    Name = "/uiconfig/swriter/menubar/menubar.xml";
-End
-
-File gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Config_Sofficecfg_Sweb_Menubar;
-    Name = "/uiconfig/sweb/menubar/menubar.xml";
-End
-
-File gid_File_Share_Config_Sofficecfg_Writerglobal_Menubar_Xml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Config_Sofficecfg_Sglobal_Menubar;
-    Name = "/uiconfig/sglobal/menubar/menubar.xml";
-End
-*/
-
-File gid_File_Share_Registry_Writer_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "writer.xcd";
-End
diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp
deleted file mode 100644
index 7541e1d2d..000000000
--- a/scp2/source/writer/folderitem_writer.scp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-FolderItem gid_Folderitem_Swriter
-    Name = "%PRODUCTNAME Writer";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    FolderID = gid_Folder_Staroffice51;
-    FileID = gid_File_Exe_Swriter;
-    IconFile = gid_File_Exe_Swriter;
-    IconID = 0;
-    WkDir = gid_Dir_Program;
-    Parameter = "";
-    Styles = (NOWEB, NON_ADVERTISED);
-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
-End
diff --git a/scp2/source/writer/folderitem_writer.ulf b/scp2/source/writer/folderitem_writer.ulf
deleted file mode 100644
index a08897866..000000000
--- a/scp2/source/writer/folderitem_writer.ulf
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_FI_NAME_HTMLDOKUMENT]
-en-US = "HTML Document"
-
-[STR_FI_NAME_TEXTDOKUMENT]
-en-US = "Text Document"
-
-[STR_FI_TOOLTIP_WRITER]
-en-US = "Create and edit text and graphics in letters, reports, documents and Web pages by using Writer."
diff --git a/scp2/source/writer/makefile.mk b/scp2/source/writer/makefile.mk
deleted file mode 100644
index 136079bec..000000000
--- a/scp2/source/writer/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=writer
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_writer.par              \
-        file_writer.par
-
-.IF "$(GUI)"=="WNT"
-PARFILES += \
-        registryitem_writer.par        \
-        folderitem_writer.par
-.ENDIF
-
-ULFFILES= \
-        module_writer.ulf              \
-        registryitem_writer.ulf        \
-        folderitem_writer.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
deleted file mode 100644
index e66214bbc..000000000
--- a/scp2/source/writer/module_writer.scp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Prg_Wrt
-    MOD_NAME_DESC(MODULE_PRG_WRT);
-    ParentID = gid_Module_Prg;
-    Sortkey = "100";
-    Styles =(APPLICATIONMODULE);
-End
-
-Module gid_Module_Prg_Wrt_Bin
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_PRG_WRT_BIN );
-    ParentID = gid_Module_Prg_Wrt;
-    Sortkey = "100";
-    Minimal = YES;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
-    gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
-    gid_File_Lib_Hwpreader,
-    gid_File_Lib_Swd,
-    gid_File_Lib_Swui,
-    gid_File_Lib_Msword,
-    gid_File_Lib_Wpft,
-    gid_File_Lib_Msworks,
-    gid_File_Lib_T602Filter,
-    gid_File_Lib_Writerfilter,
-    gid_File_Lib_Wlwp,
-    gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,
-    gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml,
-    gid_File_Share_Config_Sofficecfg_Writerglobal_Menubar_Xml,
-    gid_File_Jar_Email, 
-    gid_File_Jar_Mail, 
-    gid_File_Jar_Activation,
-    gid_File_Share_Registry_Writer_Xcd,
-    gid_File_Tmp_Userinstall_Wrt_Inf);
-End
-
-Module gid_Module_Brand_Prg_Wrt
-    PackageInfo = "packinfo_brand.txt";
-    Name = "gid_Module_Brand_Prg_Wrt";
-    Description = "gid_Module_Brand_Prg_Wrt";
-    ParentID = gid_Module_Prg_Wrt;
-    Sortkey = "100";
-    InstallOrder = "1040";
-    Minimal = YES;
-    Default = YES;
-    Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Exe_Swriter,gid_File_Exe_Sweb);
-End
-
-Module gid_Module_Langpack_Writer_Template
-    ParentID = gid_Module_Prg_Wrt_Bin;
-    Name = "gid_Module_Langpack_Writer_Template";
-    Description = "gid_Module_Langpack_Writer_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_T602Filter);
-End
-
-Module gid_Module_Prg_Wrt_MSO_Reg
-    ParentID = gid_Module_Prg_Wrt;
-    Name = "gid_Module_Prg_Wrt_MSO_Reg";
-    Description = "gid_Module_Prg_Wrt_MSO_Reg";
-    Styles = (HIDDEN_ROOT);
-    Minimal = YES;
-    Default = YES;
-End
-
-
-#include "alllangmodules_writer.inc"
-
diff --git a/scp2/source/writer/module_writer.ulf b/scp2/source/writer/module_writer.ulf
deleted file mode 100644
index 1e02043e1..000000000
--- a/scp2/source/writer/module_writer.ulf
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_PRG_WRT]
-en-US = "%PRODUCTNAME Writer"
-
-[STR_DESC_MODULE_PRG_WRT]
-en-US = "Create and edit text and graphics in letters, reports, documents and Web pages by using %PRODUCTNAME Writer."
-
-[STR_NAME_MODULE_PRG_WRT_BIN]
-en-US = "Program Module"
-
-[STR_DESC_MODULE_PRG_WRT_BIN]
-en-US = "The application %PRODUCTNAME Writer"
-
-[STR_NAME_MODULE_PRG_WRT_HELP]
-en-US = "%PRODUCTNAME Writer Help"
-
-[STR_DESC_MODULE_PRG_WRT_HELP]
-en-US = "Help about %PRODUCTNAME Writer"
-
-[STR_NAME_MODULE_PRG_WRT_WRITER2LATEX]
-en-US = "LaTeX Export"
-
-[STR_DESC_MODULE_PRG_WRT_WRITER2LATEX]
-en-US = "LaTeX export filter for Writer documents."
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
deleted file mode 100644
index 6e3d97414..000000000
--- a/scp2/source/writer/registryitem_writer.scp
+++ /dev/null
@@ -1,1565 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-// MSOLE embedded object in SO7 file format
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}";
-    REG_VALUE_LNG(SO60_TEXT)
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Auxusertype_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\AuxUserType\2";
-    Value = "%PRODUCTNAME";
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Auxusertype_3
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\AuxUserType\3";
-    REG_VALUE_LNG(SO60_TEXT)
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Dataformats_Getset_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\DataFormats\GetSet\0";
-    Value = "Embed Source,1,8,1";
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Dataformats_Getset_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\DataFormats\GetSet\1";
-    Value = "3,1,32,1";
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Dataformats_Getset_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\DataFormats\GetSet\2";
-    Value = "2,1,16,1";
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Inprochandler32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\Insertable";
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Localserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\LocalServer32";
-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Miscstatus
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\MiscStatus";
-    Value = "16";
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Progid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\ProgID";
-    Value = "soffice.StarWriterDocument.6";
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Programmable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\Programmable";
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\verb\0";
-    Value = "&Edit,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\verb\-1";
-    Value = "Show,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\verb\-2";
-    Value = "Open,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Versionindependentprogid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\VersionIndependentProgID";
-    Value = "soffice.StarWriterDocument.6";
-End
-
-// MSOLE embedded object in OASIS file format
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}";
-    REG_VALUE_LNG(OO_WRITER)
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Auxusertype_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\AuxUserType\2";
-    Value = "%PRODUCTNAME";
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Auxusertype_3
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\AuxUserType\3";
-    REG_VALUE_LNG(OO_WRITER)
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Dataformats_Getset_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\DataFormats\GetSet\0";
-    Value = "Embed Source,1,8,1";
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Dataformats_Getset_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\DataFormats\GetSet\1";
-    Value = "3,1,32,1";
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Dataformats_Getset_2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\DataFormats\GetSet\2";
-    Value = "2,1,16,1";
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,0";
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Inprochandler32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\InprocHandler32";
-    Value = "<progpath>\program\inprocserv.dll";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\Insertable";
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Localserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\LocalServer32";
-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Miscstatus
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\MiscStatus";
-    Value = "16";
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Progid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\ProgID";
-    Value = "opendocument.WriterDocument.1";
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Programmable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\Programmable";
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\verb\0";
-    Value = "&Edit,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\verb\-1";
-    Value = "Show,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\verb\-2";
-    Value = "Open,0,0";
-End
-
-RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Versionindependentprogid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\VersionIndependentProgID";
-    Value = "opendocument.WriterDocument.1";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6";
-    REG_VALUE_LNG(SO60_TEXT)
-End
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Clsid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\CLSID";
-    Value = "{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,27";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\Insertable";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Protocol_Stdfileediting_Server
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\protocol\StdFileEditing\server";
-    Value = "<progpath>\program\soffice.exe";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Protocol_Stdfileediting_Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\protocol\StdFileEditing\verb\0";
-    Value = "&Edit";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Protocol_Stdfileediting_Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\protocol\StdFileEditing\verb\-1";
-    Value = "&Show";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Protocol_Stdfileediting_Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\protocol\StdFileEditing\verb\-2";
-    Value = "&Open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument\CurVer";
-    Value = "soffice.StarWriterDocument.6";
-End
-
-RegistryItem gid_Regitem_StarWriterGlobalDocument_6_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterGlobalDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.6";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    REG_VALUE_LNG(SO60_MASTERDOC)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.6\DefaultIcon";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\soffice.exe,35";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.6\shell";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.6\shell\new";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.6\shell\new\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.6\shell\open\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.6\shell\print\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.6\shell\printto\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument\CurVer";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "soffice.StarWriterGlobalDocument.6";
-End
-
-RegistryItem gid_Regitem_StarWriterTemplate_6_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterTemplate.6\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwritertemplate_6
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterTemplate.6";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    REG_VALUE_LNG(SO60_WRITER_TEMPLATE)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterTemplate.6\DefaultIcon";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\soffice.exe,28";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterTemplate.6\shell";
-    Value = "new";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterTemplate.6\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterTemplate.6\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterTemplate.6\shell\open\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterTemplate.6\shell\print\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterTemplate.6\shell\printto\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Stw_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".stw\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Stw_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".stw\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Stw_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".stw\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_Stw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".stw";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "soffice.StarWriterTemplate.6";
-End
-
-RegistryItem gid_Regitem_Stw_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".stw";
-    Name = "Content Type";
-    Value = "application/vnd.sun.xml.writer.template";
-End
-
-RegistryItem gid_Regitem_stw_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "soffice.StarWriterTemplate.6";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Sxg_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".sxg\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Sxg_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".sxg\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Sxg_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".sxg\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_Sxg
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".sxg";
-    Value = "soffice.StarWriterGlobalDocument.6";
-End
-
-RegistryItem gid_Regitem_Sxg_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".sxg";
-    Name = "Content Type";
-    Value = "application/vnd.sun.xml.writer.global";
-End
-
-RegistryItem gid_Regitem_Sxg_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.writer.global";
-    Name = "Extension";
-    Value = ".sxg";
-End
-
-RegistryItem gid_Regitem_sxg_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "soffice.StarWriterGlobalDocument.6";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Sxw_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".sxw\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Sxw_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".sxw\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Sxw_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".sxw\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_Sxw_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".sxw";
-    Name = "Content Type";
-    Value = "application/vnd.sun.xml.writer";
-End
-
-RegistryItem gid_Regitem_Sxw_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.writer";
-    Name = "Extension";
-    Value = ".sxw";
-End
-
-RegistryItem gid_Regitem_StarWriterDocument_6_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "soffice.StarWriterDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem__Sxw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".sxw";
-    Value = "soffice.StarWriterDocument.6";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxw
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".sxw";
-    Value = "soffice.StarWriterDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_sxw_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "soffice.StarWriterDocument.6";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-
-// new odt file extension 
-
-RegistryItem gid_Regitem_Odt_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odt\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Odt_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odt\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Odt_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odt\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_WriterDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem__Odt
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odt";
-    Value = "opendocument.WriterDocument.1";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odt
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".odt";
-    Value = "opendocument.WriterDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odt
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "application/vnd.oasis.opendocument.text";
-    Value = "opendocument.WriterDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Odt_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odt";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.text";
-End
-
-RegistryItem gid_Regitem_Odt_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.text";
-    Name = "Extension";
-    Value = ".odt";
-End
-
-RegistryItem gid_Regitem_Odt_Openoffice_Writerdocument_1_Shellnew
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odt\opendocument.WriterDocument.1\ShellNew";
-    Name = "FileName";
-    Value = "soffice.odt";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument\CurVer";
-    Value = "opendocument.WriterDocument.1";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1";
-    REG_VALUE_LNG(OO_WRITER)
-End
-
-#ifdef WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Clsid
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\CLSID";
-    Value = "{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}";
-End
-
-#endif // WITH_ACTIVEX_COMPONENT
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,1";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\Insertable";
-End
-
-RegistryItem gid_Regitem_odt_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.WriterDocument.1";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\server";
-    Value = "<progpath>\program\soffice.exe";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb_0
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\verb\0";
-    Value = "&Edit";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb__1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\verb\-1";
-    Value = "&Show";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb__2
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\verb\-2";
-    Value = "&Open";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\open\command";
-    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-// Writer Web Document
-RegistryItem gid_Regitem_Openoffice_Writerwebdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebDocument\CurVer";
-    Value = "opendocument.WriterWebDocument.1";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebDocument.1";
-    REG_VALUE_LNG(OO_WRITER)
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebDocument.1\shell\open\command";
-    Value = "\"<progpath>\program\sweb.exe\" -o \"%1\"";
-    Styles = ();
-End
-
-// .fodt
-
-RegistryItem gid_Regitem_Fodt_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".fodt\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Fodt_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".fodt\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Fodt_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".fodt\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem__Fodt
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".fodt";
-    Value = "opendocument.WriterDocument.1";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodt
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".fodt";
-    Value = "opendocument.WriterDocument.1";
-    Styles = (PATCH);
-End
-
-RegistryItem gid_Regitem_Fodt_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".fodt";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.text";
-End
-
-// new ott file extension 
-
-RegistryItem gid_Regitem_Ott_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".ott\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Ott_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".ott\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Ott_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".ott\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_WriterTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Ott
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".ott";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "opendocument.WriterTemplate.1";
-End
-
-RegistryItem gid_Regitem_Ott_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".ott";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.text-template";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwritertemplate_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    REG_VALUE_LNG(OO_WRITER_TEMPLATE)
-End
-
-RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1\DefaultIcon";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\soffice.exe,2";
-End
-
-RegistryItem gid_Regitem_ott_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.WriterTemplate.1";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1\shell";
-    Value = "new";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1\shell\open\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1\shell\print\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1\shell\printto\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-// new odm file extension 
-
-RegistryItem gid_Regitem_Odm_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odm\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Odm_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odm\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Odm_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odm\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_WriterGlobalDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterGlobalDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Odm
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odm";
-    Value = "opendocument.WriterGlobalDocument.1";
-End
-
-RegistryItem gid_Regitem_Odm_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odm";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.text-master";
-End
-
-RegistryItem gid_Regitem_Odm_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.text-master";
-    Name = "Extension";
-    Value = ".odm";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument\CurVer";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "opendocument.WriterGlobalDocument.1";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    REG_VALUE_LNG(OO_MASTERDOC)
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\DefaultIcon";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\soffice.exe,10";
-End
-
-RegistryItem gid_Regitem_odm_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.WriterGlobalDocument.1";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\new";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\new\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\open\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\print\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\printto\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-// new oth file extension 
-
-RegistryItem gid_Regitem_Oth_PersistentHandler
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oth\PersistentHandler";
-    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-End
-
-RegistryItem gid_Regitem_Oth_Shellex_00021500_0000_0000_C000_000000000046
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oth\shellex\{00021500-0000-0000-C000-000000000046}";
-    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
-End
-
-RegistryItem gid_Regitem_Oth_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oth\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
-RegistryItem gid_Regitem_WriterWebTemplate_Shellex_PropertySheetHandlers_MyPropSheet1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
-    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
-End
-
-RegistryItem gid_Regitem_Oth
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oth";
-    Value = "opendocument.WriterWebTemplate.1";
-End
-
-RegistryItem gid_Regitem_Oth_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oth";
-    Name = "Content Type";
-    Value = "application/vnd.oasis.opendocument.text-web";
-End
-
-RegistryItem gid_Regitem_Oth_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.text-web";
-    Name = "Extension";
-    Value = ".oth";
-End
-
-RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate\CurVer";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "opendocument.WriterWebTemplate.1";
-End
-
-RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    REG_VALUE_LNG(OO_WEBDOC)
-End
-
-RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\DefaultIcon";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\soffice.exe,11";
-End
-
-RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\new";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\new\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\open\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\print\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\printto\command";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_oth_FullDetails
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.WriterWebTemplate.1";
-    Name = "FullDetails";
-    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
-End
-
-// "OpenWith" Windows Registry keys for extensions supported by Writer
-
-// .ODT
-RegistryItem gid_Regitem_OpenOffice_ODT_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".odt\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
-    Value = " ";
-End
-
-// .OTT
-RegistryItem gid_Regitem_OpenOffice_OTT_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".ott\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterTemplate.1";
-    Value = " ";
-End
-
-// .OTH
-RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".oth\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterWebTemplate.1";
-    Value = " ";
-End
-
-// .ODM
-RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".odm\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterGlobalDocument.1";
-    Value = " ";
-End
-
-// .SXW
-RegistryItem gid_Regitem_OpenOffice_SXW_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sxw\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "soffice.StarWriterDocument.6";
-    Value = " ";
-End
-
-// .STW
-RegistryItem gid_Regitem_OpenOffice_STW_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".stw\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "soffice.StarWriterTemplate.6";
-    Value = " ";
-End
-
-// .TXT
-RegistryItem gid_Regitem_OpenOffice_TXT_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".txt\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "soffice.StarWriterDocument.6";
-    Value = " ";
-End
-
-// .HTM
-RegistryItem gid_Regitem_OpenOffice_HTM_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".htm\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "soffice.StarWriterDocument.6";
-    Value = " ";
-End
-
-// .HTML
-RegistryItem gid_Regitem_OpenOffice_HTML_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".html\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "soffice.StarWriterDocument.6";
-    Value = " ";
-End
-
-// .XML
-RegistryItem gid_Regitem_OpenOffice_XML_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".xml\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "soffice.StarWriterDocument.6";
-    Value = " ";
-End
-
-// .WPD
-RegistryItem gid_Regitem_OpenOffice_WPD_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".wpd\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "soffice.StarWriterDocument.6";
-    Value = " ";
-End
-
-// .WPS
-RegistryItem gid_Regitem_OpenOffice_WPS_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".wps\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
-    Value = " ";
-End
-
-// .HWP
-RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".hwp\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "soffice.StarWriterDocument.6";
-    Value = " ";
-End
-
-// .SXG
-RegistryItem gid_Regitem_OpenOffice_SXG_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sxg\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "soffice.StarWriterGlobalDocument.6";
-    Value = " ";
-End
-
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Ott
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".ott";
-    Value = "opendocument.WriterTemplate.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Stw
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".stw";
-    Value = "soffice.StarWriterTemplate.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Txt
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".txt";
-    Value = "soffice.StarWriterDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Htm
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".htm";
-    Value = "soffice.StarWriterDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Html
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".html";
-    Value = "soffice.StarWriterDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xml
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".xml";
-    Value = "soffice.StarWriterDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wpd
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".wpd";
-    Value = "soffice.StarWriterDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Hwp
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".hwp";
-    Value = "soffice.StarWriterDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sxg
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".sxg";
-    Name = "soffice.StarWriterGlobalDocument.6";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Oth
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".oth";
-    Value = "opendocument.WriterWebTemplate.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odm
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".odm";
-    Value = "opendocument.WriterGlobalDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Swriter_Exe
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\swriter.exe";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\swriter.exe";
-End
-
-RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Swriter_Exepath
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\swriter.exe";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "Path";
-    Value = "<progpath>";
-End
-
-
-// registering the property handler for the supported file types
-
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odt )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ott )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( oth )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odm )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxw )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stw )
-REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxg )
-
-// registering the mso file types
-// CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,                 key,  cond, disp_name,        icon_id, app, default, dox_type)
-
-CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_MSO_Reg, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 27, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_MSO_Reg, docx, DOCX, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_MSO_Reg, docm, DOCM, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot,  gid_Module_Prg_Wrt_MSO_Reg, dot,  DOT,  MS_WORD_TEMPLATE_OLD, 28, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_MSO_Reg, dotx, DOTX, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, dotm, DOTM, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_MSO_Reg, rtf,  RTF,  MS_RTF_DOCUMENT, 27, swriter.exe, open, Writer )
-
diff --git a/scp2/source/writer/registryitem_writer.ulf b/scp2/source/writer/registryitem_writer.ulf
deleted file mode 100644
index f353df21d..000000000
--- a/scp2/source/writer/registryitem_writer.ulf
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_REG_VAL_NEW]
-en-US = "&New"
-
-[STR_REG_VAL_SO60_TEXT]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document"
-
-[STR_REG_VAL_SO60_MASTERDOC]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Master Document"
-
-[STR_REG_VAL_SO60_WRITER_TEMPLATE]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document Template"
-
-[STR_REG_VAL_OO_WRITER]
-en-US = "OpenDocument Text"
-
-[STR_REG_VAL_OO_WRITER_TEMPLATE]
-en-US = "OpenDocument Text Template"
-
-[STR_REG_VAL_OO_MASTERDOC]
-en-US = "OpenDocument Master Document"
-
-[STR_REG_VAL_OO_WEBDOC]
-en-US = "HTML Document Template"
-
-[STR_REG_VAL_MS_WORD_DOCUMENT_OLD]
-en-US = "Microsoft Word 97-2003 Document"
-
-[STR_REG_VAL_MS_WORD_DOCUMENT]
-en-US = "Microsoft Word Document"
-
-[STR_REG_VAL_MS_WORD_TEMPLATE_OLD]
-en-US = "Microsoft Word 97-2003 Template"
-
-[STR_REG_VAL_MS_WORD_TEMPLATE]
-en-US = "Microsoft Word Template"
-
-[STR_REG_VAL_MS_RTF_DOCUMENT]
-en-US = "Rich Text Document"
-
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
deleted file mode 100644
index 788a51195..000000000
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-File gid_File_Share_Registry_Xsltfilter_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "xsltfilter.xcd";
-End
-
-File gid_File_Stw_Docbooktemplate
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Docbook;
-    Name = "DocBookTemplate.stw";
-End
-
-File gid_File_Xsl_Docbooktosoffheadings
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Docbook;
-    Name = "docbooktosoffheadings.xsl";
-End
-
-File gid_File_Xsl_Sofftodocbookheadings
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Docbook;
-    Name = "sofftodocbookheadings.xsl";
-End
-
-File gid_File_Xsl_Export_Xhtml_Body
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Xhtml;
-    Name = "/xslt/export/xhtml/body.xsl";
-End
-
-File gid_File_Xsl_Export_Xhtml_Header
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Xhtml;
-    Name = "/xslt/export/xhtml/header.xsl";
-End
-
-File gid_File_Xsl_Export_Xhtml_Ooo2xhtml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Xhtml;
-    Name = "/xslt/export/xhtml/opendoc2xhtml.xsl";
-End
-
-File gid_File_Xsl_Export_Xhtml_Table
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Xslt_Export_Xhtml;
-    Name = "/xslt/export/xhtml/table.xsl";
-End
diff --git a/scp2/source/xsltfilter/makefile.mk b/scp2/source/xsltfilter/makefile.mk
deleted file mode 100644
index a9c6c9f77..000000000
--- a/scp2/source/xsltfilter/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=xsltfilter
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_xsltfilter.par     \
-        file_xsltfilter.par
-
-ULFFILES= \
-        module_xsltfilter.ulf
-
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp
deleted file mode 100644
index 7854ce704..000000000
--- a/scp2/source/xsltfilter/module_xsltfilter.scp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-
-Module gid_Module_Optional_Xsltfiltersamples
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_XSLTFILTERSAMPLES);
-    Sortkey = "700";
-    ParentID = gid_Module_Optional;
-    Files = ( gid_File_Xsl_Sofftodocbookheadings,gid_File_Xsl_Docbooktosoffheadings,
-    gid_File_Stw_Docbooktemplate,
-    gid_File_Xsl_Export_Xhtml_Body,
-    gid_File_Xsl_Export_Xhtml_Header,
-    gid_File_Xsl_Export_Xhtml_Master_Chapter_Numbering,
-    gid_File_Xsl_Export_Xhtml_Master_Document,
-    gid_File_Xsl_Export_Xhtml_Master_Refs_Workaround,
-    gid_File_Xsl_Export_Xhtml_Master_Usability_Links,
-    gid_File_Xsl_Export_Xhtml_Ooo2xhtml,
-    gid_File_Xsl_Export_Xhtml_Table,
-    gid_File_Share_Registry_Xsltfilter_Xcd );
-    Minimal = NO;
-    Default = NO;
-    Styles = ( );
-End
diff --git a/scp2/source/xsltfilter/module_xsltfilter.ulf b/scp2/source/xsltfilter/module_xsltfilter.ulf
deleted file mode 100644
index 9561c2dc6..000000000
--- a/scp2/source/xsltfilter/module_xsltfilter.ulf
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_XSLTFILTERSAMPLES]
-en-US = "XSLT Sample Filters"
-
-[STR_DESC_MODULE_OPTIONAL_XSLTFILTERSAMPLES]
-en-US = "XSLT Sample Filters"
-
-
-
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
deleted file mode 100644
index ee6d0adcb..000000000
--- a/scp2/util/makefile.mk
+++ /dev/null
@@ -1,422 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=scp2
-TARGET=setup
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- setup script -------------------------------------------------------
-# SCPFLAGS= -w
-
-# ------------------------------------------------------------------------
-# Office OSL
-
-SCP1LINK_PRODUCT_TYPE=osl
-SCP1TARGET = setup_osl
-SCP1FILES  = installation_ooo.par          \
-             scpaction_ooo.par             \
-             directory_ooo.par             \
-             file_ooo.par                  \
-             file_extra_ooo.par            \
-             file_font_ooo.par             \
-             file_library_ooo.par          \
-             file_resource_ooo.par         \
-             shortcut_ooo.par              \
-             module_ooo.par                \
-             module_hidden_ooo.par         \
-             module_langpack.par           \
-             module_lang_template.par      \
-             module_helppack.par           \
-             module_help_template.par      \
-             profile_ooo.par               \
-             profileitem_ooo.par           \
-             module_writer.par             \
-             file_writer.par               \
-             module_calc.par               \
-             file_calc.par                 \
-             module_draw.par               \
-             file_draw.par                 \
-             module_impress.par            \
-             file_impress.par              \
-             module_base.par               \
-             file_base.par                 \
-             canvascommons.par             \
-             module_math.par               \
-             file_math.par                 \
-             module_systemint.par          \
-             module_graphicfilter.par      \
-             file_graphicfilter.par        \
-             module_extensions.par         \
-             module_extensions_sun_templates.par         \
-             module_extensions_lightproof.par   \
-             directory_extensions.par                     \
-             file_extensions.par           \
-             module_testtool.par           \
-             file_testtool.par             \
-             module_xsltfilter.par         \
-             file_xsltfilter.par           \
-             module_python.par             \
-             module_python_mailmerge.par   \
-             file_python.par               \
-             profileitem_python.par        \
-             module_accessories.par
-.IF "$(WITH_EXTRA_GALLERY)" != ""
-SCP1FILES +=                               \
-             module_gallery_accessories.par   \
-             file_gallery_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_SAMPLE)" != ""
-SCP1FILES +=                               \
-             module_samples_accessories.par   \
-             file_samples_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_TEMPLATE)" != ""
-SCP1FILES +=                               \
-             module_templates_accessories.par \
-             file_templates_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_FONT)" != ""
-SCP1FILES +=                               \
-             module_font_accessories.par      \
-             file_font_accessories.par
-.ENDIF
-SCP1FILES +=                               \
-             ure_into_ooo.par              \
-             ure.par                       \
-             module_improvement.par        \
-             file_improvement.par          \
-             common_brand.par              \
-             common_brand_readme.par       \
-             ooo_brand.par
-
-.IF "$(OS)"=="MACOSX" 
-SCP1FILES +=                               \
-             directory_ooo_macosx.par
-.ENDIF
- 
-.IF "$(WITH_BINFILTER)" != "NO"
-SCP1FILES +=                               \
-             module_binfilter.par          \
-             registryitem_binfilter.par    \
-             file_binfilter.par
-.ENDIF
-
-.IF "$(ENABLE_OPENGL)" == "TRUE"
-SCP1FILES +=                               \
-             module_ogltrans.par
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!=""
-SCP1FILES +=                               \
-             module_javafilter.par         \
-             file_javafilter.par
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!="" 
-.IF "$(GUI)"=="WNT"
-SCP1FILES +=                               \
-             registryitem_javafilter.par
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-SCP1FILES +=                           \
-             registryitem_ooo.par      \
-             folder_ooo.par            \
-             folderitem_ooo.par        \
-             windowscustomaction_ooo.par \
-             vc_redist.par             \
-             registryitem_writer.par   \
-             folderitem_writer.par     \
-             registryitem_calc.par     \
-             folderitem_calc.par       \
-             registryitem_draw.par     \
-             folderitem_draw.par       \
-             registryitem_impress.par  \
-             folderitem_impress.par    \
-             registryitem_base.par     \
-             folderitem_base.par       \
-             registryitem_math.par     \
-             folderitem_math.par       \
-             module_quickstart.par     \
-             file_quickstart.par       \
-             registryitem_quickstart.par \
-             module_winexplorerext.par \
-             file_winexplorerext.par   \
-             registryitem_winexplorerext.par
-
-.IF "$(ENABLE_DIRECTX)"!=""
-SCP1FILES += directxcanvas.par
-.ENDIF
-
-.IF "$(DISABLE_ACTIVEX)"==""
-SCP1FILES +=                           \
-             module_activex.par        \
-             file_activex.par 
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-.IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!=""
-SCP1FILES += \
-             module_gnome.par   \
-             file_gnome.par
-.ENDIF
-
-.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE"
-SCP1FILES += \
-             module_kde.par     \
-             file_kde.par
-.ENDIF
-.ENDIF
-
-.IF "$(ENABLE_CRASHDUMP)" != ""
-SCP1FILES += \
-             file_crashrep.par
-.ENDIF
-
-SCP1FILES += \
-             vclcanvas.par \
-			 mtfrenderer.par
-
-.IF "$(GUI)"=="UNX"
-#X11 MacOSX has no cairo-canvas
-.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
-SCP1FILES += cairocanvas.par
-.ENDIF
-.ENDIF
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-SCP1FILES += layout.par
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-.IF "$(ENABLE_ONLINE_UPDATE)"!=""
-SCP1FILES += \
-             module_onlineupdate.par   \
-             file_onlineupdate.par
-.ENDIF
-
-# ------------------------------------------------------------------------
-# OpenOffice.org with JRE
-
-SCP2LINK_PRODUCT_TYPE=osl
-SCP2TARGET = setup_osljre
-SCP2FILES  = installation_ooo.par          \
-             scpaction_ooo.par             \
-             directory_ooo.par             \
-             file_ooo.par                  \
-             file_extra_ooo.par            \
-             file_font_ooo.par             \
-             file_library_ooo.par          \
-             file_resource_ooo.par         \
-             shortcut_ooo.par              \
-             module_ooo.par                \
-             module_hidden_ooo.par         \
-             module_langpack.par           \
-             module_lang_template.par      \
-             module_helppack.par           \
-             module_help_template.par      \
-             module_java.par               \
-             profile_ooo.par               \
-             profileitem_ooo.par           \
-             module_writer.par             \
-             file_writer.par               \
-             module_calc.par               \
-             file_calc.par                 \
-             module_draw.par               \
-             file_draw.par                 \
-             module_impress.par            \
-             file_impress.par              \
-             module_base.par               \
-             file_base.par                 \
-             canvascommons.par             \
-             module_math.par               \
-             file_math.par                 \
-             module_systemint.par          \
-             module_graphicfilter.par      \
-             file_graphicfilter.par        \
-             module_extensions.par         \
-             module_extensions_sun_templates.par         \
-             module_extensions_lightproof.par  \
-             directory_extensions.par                     \
-             file_extensions.par           \
-             module_testtool.par           \
-             file_testtool.par             \
-             module_xsltfilter.par         \
-             file_xsltfilter.par           \
-             module_python.par             \
-             module_python_mailmerge.par   \
-             file_python.par               \
-             profileitem_python.par        \
-             module_accessories.par
-.IF "$(WITH_EXTRA_GALLERY)" != ""
-SCP2FILES +=                               \
-             module_gallery_accessories.par   \
-             file_gallery_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_SAMPLE)" != ""
-SCP2FILES +=                               \
-             module_samples_accessories.par   \
-             file_samples_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_TEMPLATE)" != ""
-SCP2FILES +=                               \
-             module_templates_accessories.par \
-             file_templates_accessories.par
-.ENDIF
-.IF "$(WITH_EXTRA_FONT)" != ""
-SCP2FILES +=                               \
-             module_font_accessories.par      \
-             file_font_accessories.par
-.ENDIF
-SCP2FILES +=                           \
-             ure_into_ooo.par              \
-             ure.par                       \
-             module_improvement.par        \
-             file_improvement.par          \
-             common_brand.par              \
-             common_brand_readme.par       \
-             ooo_brand.par
-
-.IF "$(OS)"=="MACOSX" 
-SCP2FILES +=                               \
-             directory_ooo_macosx.par      
-.ENDIF
- 
-.IF "$(WITH_BINFILTER)" != "NO"
-SCP2FILES +=                               \
-             module_binfilter.par          \
-             registryitem_binfilter.par    \
-             file_binfilter.par
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!=""
-SCP2FILES +=                               \
-             module_javafilter.par         \
-             file_javafilter.par
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!="" 
-.IF "$(GUI)"=="WNT"
-SCP2FILES +=                               \
-             registryitem_javafilter.par
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-SCP2FILES +=                           \
-             file_jre_ooo.par          \
-             registryitem_ooo.par      \
-             folder_ooo.par            \
-             folderitem_ooo.par        \
-             windowscustomaction_ooo.par \
-             vc_redist.par             \
-             registryitem_writer.par   \
-             folderitem_writer.par     \
-             registryitem_calc.par     \
-             folderitem_calc.par       \
-             registryitem_draw.par     \
-             folderitem_draw.par       \
-             registryitem_impress.par  \
-             folderitem_impress.par    \
-             registryitem_base.par     \
-             folderitem_base.par       \
-             registryitem_math.par     \
-             folderitem_math.par       \
-             module_quickstart.par     \
-             file_quickstart.par       \
-             registryitem_quickstart.par \
-             module_winexplorerext.par \
-             file_winexplorerext.par   \
-             registryitem_winexplorerext.par
-
-.IF "$(ENABLE_DIRECTX)"!=""
-SCP2FILES += directxcanvas.par
-.ENDIF
-
-.IF "$(DISABLE_ACTIVEX)"==""
-SCP2FILES +=                           \
-             module_activex.par        \
-             file_activex.par
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-.IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!=""
-SCP2FILES += \
-             module_gnome.par   \
-             file_gnome.par
-.ENDIF
-
-.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE"
-SCP2FILES += \
-             module_kde.par     \
-             file_kde.par
-.ENDIF
-.ENDIF
-
-.IF "$(ENABLE_CRASHDUMP)" != ""
-SCP2FILES += \
-             file_crashrep.par
-.ENDIF
-
-SCP2FILES += \
-             vclcanvas.par
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-SCP2FILES += layout.par
-.ENDIF # ENABLE_LAYOUT == TRUE
-
-.IF "$(ENABLE_ONLINE_UPDATE)"!=""
-SCP2FILES += \
-             module_onlineupdate.par   \
-             file_onlineupdate.par
-.ENDIF
-
-# ------------------------------------------------------------------------
-# URE
-
-.IF "$(OS)" != "MACOSX"
-SCP3LINK_PRODUCT_TYPE = osl
-SCP3TARGET = ure
-SCP3FILES = ure_standalone.par  \
-            ure.par
-.ENDIF
-
-# ------------------------------------------------------------------------
-# SDK
-
-SCP4LINK_PRODUCT_TYPE = osl
-SCP4TARGET = sdkoo
-SCP4FILES = sdkoo.par
-
-# --- target -------------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/set_soenv.in b/set_soenv.in
deleted file mode 100755
index 729241c79..000000000
--- a/set_soenv.in
+++ /dev/null
@@ -1,2600 +0,0 @@
-#!@PERL@ -w  # -*- Mode: perl; tab-width: 4; indent-tabs-mode: nil; -*-
-#
-# Program:     set_soenv.in
-# Author:      Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland.
-#
-#---------------------------------------------------------------------------
-#---------------------------------------------------------------------------
-# Description:
-# set_soenv generates a file that contains all necessary
-# environment variables for the build proces of OpenOffice
-# on Linux, NetBSD, Solaris, Windows, Mac OS X and iOS.
-#
-# Program steps.
-#
-# I.    Checking the command-line arguments.
-# IIa.  Declaring variables for the system commands, etc.
-# IIb.  Declaring the environment variables.
-# III.  Initialising the variables for the system commands, etc.
-# IV.   Print out some important messages etc.
-# V.    Initialising the environment variables.
-# VI.   Open the output file.
-# VII.  Writing the data to the output file.
-# VIII. Closing output file.
-#
-#---------------------------------------------------------------------------
-#
-use strict;                        # pragma
-use File::Basename;
-
-
-#
-#--------------------------------------------------------
-# IIa. Declaring variables for the system commands, etc.
-#--------------------------------------------------------
-#
-my ( $oldoutfile, $outfile, $bootfile, $newline, $comment,
-     $compiler, $ds, $ps,
-     $wps, $cur_dir, $par_dir, $I, $L, $tmp, $MINGW,
-     $USE_MINGW, $platform,
-     $cygwinver, $empty, $no_ant, $no_gcc_include,
-     $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
-#
-#-------------------------------------------------
-# IIb. Declaring environment values (constants).
-#-------------------------------------------------
-#
-# Platform independent constant values.
-my ( $CALL_CDECL, $COMMON_OUTDIR,
-     $common_build, $NO_REC_RES, $SO3, $SOLAR_JAVA,
-     $SOLAR_PLUGIN, $UPDATER, $VCL,
-     $CC, $CXX,
-     $ENABLEUNICODE, $NO_BSYMBOLIC);
-#
-# Platform dependent constant values.
-my ( $COM, $ARCH, $CPU, $CPUNAME, $GLIBC, $GUI, $GUIBASE,
-      $GVER, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR,
-      $DYNAMIC_CRT, $use_shl_versions, $JRELIBDIR,
-      $JRETOOLKITDIR, $JRETHREADDIR,
-      $FLIPCMD );
-#
-#-------------------------------------------
-# IIc. Declaring the environment variables.
-#-------------------------------------------
-#
-# Help variables.
-my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, $DEFIMGS,
-     $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
-     $SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC,
-     $CYGWIN_PATH, $language, @languages, $ASM_PATH, $NSIS_PATH, $PERL_PATH, $CL_X64 );
-
-# Environment variables.
-my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
-     $L10N_MODULE, $WITH_POOR_HELP_LOCALIZATIONS,
-     $UPD, $WORK_STAMP, $gb_REPOS, $BUILD_TYPE,
-     $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV, $SOLARDEFIMG,
-     $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
-     $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $SHOWINCLUDES_PREFIX,
-     $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $JAVALIB,
-     $SOLARINC, $FRAMEWORKSHOME, $COMEX, $PERL,
-     $COMP_ENV, $ILIB, $JAVAHOME, $WINDOWS_SDK_HOME, $DIRECTXSDK_LIB, $DOTNET_FRAMEWORK_HOME,
-     $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
-     $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
-     $WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
-     $PROEXT, $TARFILE_LOCATION, $GNUMAKE,
-     $PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS,
-     $MACOSX_SDK_PATH);
-#
-#-------------------------------------------
-# IId. Declaring the aliases.
-#-------------------------------------------
-#
-my ( $dmake, $build, $build_client, $mkout, $deliver, $zipdep );
-#
-
-#-------------------------------------------------------------
-# IIIa. Initialising constants.
-#-------------------------------------------------------------
-#
-# $platform is needed for PathFormat()
-#
-$platform       = '@host@';
-
-$UPD            = '@UPD@';          # the project's UPD
-$newline        = "\n";             # Perl newline character
-$ds             = "/";              # directory separator
-$ps             = ":";              # path separator
-$wps            = ":";              # path separator, will be set to ';' for windows later.
-$cur_dir        = ".";              # current directory
-$par_dir        = "..";             # parrent directory
-$I              = " -I";            # include search path
-$L              = " -L";            # library search path
-$empty          = "";               # used as argument
-$warnfile       = "warn";           # logfile configure warnings.
-$Warning        = "";               # container for warning messages
-$SYSTEM_PYTHON	= '@SYSTEM_PYTHON@';
-if ($SYSTEM_PYTHON eq "NO") {
-    $PYTHON              = "python";
-}
-$SYSTEM_MOZILLA = '@SYSTEM_MOZILLA@';
-$JDK 		= '@JDK@';
-$JAVAFLAGS 		= '@JAVAFLAGS@';
-$MINGW          = '@WITH_MINGW@';    # use MinGW for Windows build
-$USE_MINGW      = '@USE_MINGW@';     # use MinGW in cygwin or pure-mingw
-$CC             = '@CC@';            # C compiler
-$CXX            = '@CXX@';           # C++ compiler
-$MOZILLA_VERSION	= '@MOZILLA_VERSION@'; # mozilla version to use to build mozilla
-$MOZILLA_TOOLKIT	= '@MOZILLA_TOOLKIT@'; # GUI toolkit to use to build mozilla
-$FLIPCMD        = "";               # Flip '/' to '\' wrapper (only for winnt)
-$GLIBC          = "";               # Whether the platform uses glibc
-$PROEXT         = "@PROEXT@";
-$EPM_FLAGS	= "";
-$CL_X64 = '@CL_X64@';
-$GNUMAKE        = "@GNUMAKE@";
-
-#
-#--------------------------------------------------------------------
-# IV. Initialise the warning container and print a note to the user.
-#--------------------------------------------------------------------
-#
-# Add the configure (pre-requisite) warnings to the warning container
-# , $Warning.
-AddWarning( "configure", "" );
-#
-print ("Setting up the environment for building LibreOffice $newline");
-#
-#--------------------------------------------------
-# V. Setting the environment variables/values.
-#--------------------------------------------------
-#
-# A. Checking the platform first.
-#
-# get perls idea for OS
-# needed to differentiate cygwin/native perl on windows
-$perl_os = $^O;
-
-#
-# B. Gathering information from the system.
-#
-# 1. Path
-$oldPATH = $ENV{"PATH"};
-chomp( $oldPATH );                  # cut off new line
-#
-# C. Setting the constant values.
-#
-# Setting platform independent constant values.
-# NB: Language options now set at 'ToFile' stage.
-$CALL_CDECL           = "TRUE";
-$COMMON_OUTDIR        = "";
-$common_build         = "";
-$NO_REC_RES           = "TRUE";
-$SO3                  = "TRUE";
-$SOLAR_JAVA           = "@SOLAR_JAVA@";
-$SOLAR_PLUGIN         = "TRUE";
-$UPDATER              = "YES";
-$VCL                  = "TRUE";
-$ENABLEUNICODE        = "TRUE";
-$NO_BSYMBOLIC         = "TRUE";
-$comment              = "#";           # UNIX script comment character
-$TARFILE_LOCATION = "@TARFILE_LOCATION@"; # where to find tarballs with external sources
-
-# Setting platform dependent constant values.
-if ( $platform =~ m/solaris/ )
-{     print "Setting Solaris specific values... ";
-   if ($platform =~ m/^i[3456]86/)
-   {
-      if ( $CC =~ "gcc") {
-         $oldoutfile     = "SolarisX86GccEnv.Set.sh";
-         $OUTPATH        = "unxsogi";
-      } else {
-         $oldoutfile     = "SolarisX86Env.Set.sh";
-         $OUTPATH        = "unxsoli4";
-      }
-      $CPU            = "I";
-      $CPUNAME        = "INTEL";
-	  $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-	  $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
-	  $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-
-   }
-   else
-   {
-      if ( $CC =~ "gcc") {
-         $oldoutfile     = "SolarisSparcGccEnv.Set.sh";
-         $OUTPATH        = "unxsogs";
-      } else {
-         $oldoutfile     = "SolarisSparcEnv.Set.sh";
-         $OUTPATH        = "unxsols4";
-      }
-      $CPU            = "S";
-      $CPUNAME        = "SPARC";
-	  $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
-	  $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt";
-	  $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
-   }
-
-   $COM            = "GCC";
-   $COMPATH        = '@COMPATH@';
-   $GUI            = "UNX";
-   $GUIBASE        = "unx";
-   $GVER           = "VCL";
-   $INPATH         = $OUTPATH.$PROEXT;
-   $OS             = "SOLARIS";
-   $PATH_SEPERATOR = $ps;
-}
-elsif ( $platform =~ m/netbsd/ )
-{
-#Set platform specific values:
-   if ($platform =~ m/^i[3456]86/)
-   {  print "Setting NetBSD x86 specific values... ";
-      $CPU            = "I";
-      $CPUNAME        = "INTEL";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-   }
-   elsif ($platform =~ m/^x86_64/)
-   {  print "Setting NetBSD x86-64 specific values... ";
-      $CPU            = "X";
-      $CPUNAME        = "X86_64";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."client";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
-   }
-   elsif ($platform =~ m/^sparc/)
-   {  print "Setting NetBSD Sparc specific values... ";
-      $CPU            = "S";
-      $CPUNAME        = "SPARC";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."client";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
-   }
-   elsif ($platform =~ m/powerpc/)
-   {  print "Setting NetBSD PPC specific values... ";
-      $CPU            = "P";
-      $CPUNAME        = "POWERPC";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
-   }
-   else
-   { print "Unsupported NetBSD architecture: $platform \n";
-     exit 1;
-   }
-   # General NetBSD settings:
-      $COM            = "GCC";
-      $COMPATH        = '@COMPATH@';
-      $GUI            = "UNX";
-      $GUIBASE        = "unx";
-      $GVER           = "VCL";
-      $OS             = "NETBSD";
-      $PATH_SEPERATOR = $ps;
-      $OUTPATH        = "unxnbsd";
-      $oldoutfile     = "NetBSDEnv.Set.sh";
-      $INPATH         = $OUTPATH.$PROEXT;
-}
-elsif ( $platform =~ m/kfreebsd/ )
-{
-# General GNU/kFreeBSD settings:
-      $COM            = "GCC";
-      $COMPATH        = '@COMPATH@';
-      $GLIBC          = "2REDHAT60";
-      $GUI            = "UNX";
-      $GUIBASE        = "unx";
-      $GVER           = "VCL";
-      $OS             = "LINUX";
-      $PATH_SEPERATOR = $ps;
-
-#Set platform specific values:
-   if ($platform =~ m/^i[3456]86/)
-   {  print "Setting GNU/kFreeBSD x86 specific values... ";
-      $oldoutfile     = "GNUkFreeBSDX86Env.Set.sh";
-      $CPU            = "I";
-      $CPUNAME        = "INTEL";
-      $OUTPATH        = "unxkfgi6";
-
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-
-   }
-   elsif ($platform =~ m/^x86_64/)
-   {  print "Setting GNU/kFreeBSD x86-64 specific values... ";
-      $oldoutfile     = "GNUkFreeBSDX86-64Env.Set.sh";
-      $CPU            = "X";
-      $CPUNAME        = "X86_64";
-      $OUTPATH        = "unxkfgx6";
-
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
-   }
-
-   $INPATH         = $OUTPATH.$PROEXT;
-}
-elsif ( $platform =~ m/freebsd/ )
-{     $COM            = "GCC";
-      $COMPATH        = '@COMPATH@';
-      $GUI            = "UNX";
-      $GUIBASE        = "unx";
-      $GVER           = "VCL";
-      $OS             = "FREEBSD";
-      $PATH_SEPERATOR = $ps;
-      $OSVERSION      = '@OSVERSION@';
-   if ($platform =~ m/^(amd64|x86_64)/)
-   {  my ( $JAVA_OS );
-      print "Setting FreeBSD AMD64 specific values... ";
-      $oldoutfile     = "FreeBSDAMDEnv.Set.sh";
-      $CPU            = "X";
-      $CPUNAME        = "X86_64";
-      $OUTPATH        = "unxfbsdx";
-      $JAVA_OS        = '@JAVA_HOME@';
-      $JAVA_OS        =~ s/.*\///;
-      if ($JAVA_OS =~ m/^linux/)
-      {  $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-      }
-      else
-      {  $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
-         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
-         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
-      }
-   }
-   elsif ($platform =~ m/^i386/)
-   {  print "Setting FreeBSD x86 specific values... ";
-      $oldoutfile     = "FreeBSDX86Env.Set.sh";
-      $CPU            = "I";
-      $CPUNAME        = "INTEL";
-      $OUTPATH        = "unxfbsdi";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-   }
-   else
-   {  print "Unsupported FreeBSD architecture: $platform \n";
-         exit 1;
-   }
-      $INPATH         = $OUTPATH.$PROEXT;
-}
-elsif ( $platform =~ m/openbsd/ )
-{     $COM            = "GCC";
-      $COMPATH        = '@COMPATH@';
-      $GUI            = "UNX";
-      $GUIBASE        = "unx";
-      $GVER           = "VCL";
-      $OS             = "OPENBSD";
-      $PATH_SEPERATOR = $ps;
-      $OSVERSION      = '@OSVERSION@';
-      $OUTPATH        = "unxobsd";
-      $oldoutfile     = "OpenBSDEnv.Set.sh";
-   if ($platform =~ m/^(amd64|x86_64)/)
-   {
-      print "Setting OpenBSD AMD64 specific values... ";
-      $CPU            = "X";
-      $CPUNAME        = "X86_64";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
-   }
-   elsif ($platform =~ m/^i386/)
-   {  print "Setting OpenBSD x86 specific values... ";
-      $CPU            = "I";
-      $CPUNAME        = "INTEL";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-   }
-   else
-   {  print "Unsupported OpenBSD architecture: $platform \n";
-         exit 1;
-   }
-      $INPATH         = $OUTPATH.$PROEXT;
-}
-elsif ( $platform =~ m/linux/ )
-{
-# General Linux settings:
-      $COM            = "GCC";
-      $COMPATH        = '@COMPATH@';
-      $GLIBC          = "2REDHAT60";
-      $GUI            = "UNX";
-      $GUIBASE        = "unx";
-      $GVER           = "VCL";
-      $OS             = "LINUX";
-      $PATH_SEPERATOR = $ps;
-
-#Set platform specific values:
-   if ($platform =~ m/^i[3456]86/)
-   {  print "Setting Linux x86 specific values... ";
-      $oldoutfile     = "LinuxX86Env.Set.sh";
-      $CPU            = "I";
-      $CPUNAME        = "INTEL";
-
-      if ($JDK =~ m/^[Ii][Bb][Mm]/)
-      { $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."bin";
-        $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
-        $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin"; }
-
-      elsif ($JDK =~ m/^[Bb][Ee][Aa]/)
-      { $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."jrockit";
-        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; }
-
-      else {
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-      # has both server and client
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-      }
-
-      $OUTPATH     = "unxlngi6";
-   }
-   elsif ($platform =~ m/^x86_64/)
-   {  print "Setting Linux x86-64 specific values... ";
-      $oldoutfile     = "LinuxX86-64Env.Set.sh";
-      $CPU            = "X";
-      $CPUNAME        = "X86_64";
-      $OUTPATH        = "unxlngx6";
-      # Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
-      # has both server and client
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
-   }
-   elsif ($platform =~ m/^ia64/)
-   {  print "Setting Linux ia64 specific values... ";
-      $oldoutfile     = "LinuxIA64Env.Set.sh";
-      $CPU            = "A";
-      $CPUNAME        = "IA64";
-      $OUTPATH        = "unxlnga";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ia64";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ia64".$ds."server";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ia64".$ds."native_threads";
-   }
-   elsif ($platform =~ m/^sparc/)
-
-   {  print "Setting Linux Sparc specific values... ";
-      $oldoutfile     = "LinuxSparcEnv.Set.sh";
-      $CPU            = "S";
-      $CPUNAME        = "SPARC";
-      $OUTPATH        = "unxlngs";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."server";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
-   }
-   elsif ($platform =~ m/^powerpc/)
-   {
-      if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
-         print "Setting Linux PPC64 specific values... ";
-         $oldoutfile = "LinuxPPC64Env.Set.sh";
-         $OUTPATH = "unxlngppc64";
-         $CPUNAME = "POWERPC64";
-
-         if ( $JDK eq "gcj" ) {
-            $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
-            $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
-            $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
-         }
-	 # OpenJDK
-	 elsif ($JDK =~ m/sun/) {
-	    $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
-	    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."server";
-	    $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
-	 }
-      }
-      else {
-         print "Setting Linux PPC specific values... ";
-         $oldoutfile = "LinuxPPCEnv.Set.sh";
-         $OUTPATH = "unxlngppc";
-         $CPUNAME = "POWERPC";
-
-         if ( $JDK eq "gcj" ) {
-            $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-            $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
-            $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
-         elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
-         {  $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-            $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
-            $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-         }
-	 # OpenJDK
-	 elsif ($JDK =~ m/sun/) {
-	    $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-	    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."server";
-	    $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
-	 }
-      }
-
-      $CPU            = "P";
-
-   }
-   elsif ($platform =~ m/^s390/)
-   {
-      if (($platform =~ m/^s390x/) && ('@SIZEOF_LONG@' eq '8')) {
-         print "Setting Linux zSeries specific values... ";
-         $oldoutfile     = "LinuxS390XEnv.Set.sh";
-         $CPUNAME        = "S390X";
-	 $ARCH           = "s390x";
-         $OUTPATH        = "unxlngs390x";
-      }
-      else {
-         print "Setting Linux S/390 specific values... ";
-         $oldoutfile     = "LinuxS390Env.Set.sh";
-         $CPUNAME        = "S390";
-	 $ARCH           = "s390";
-         $OUTPATH        = "unxlngs390";
-      }
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH;
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
-      $CPU            = "3";
-   }
-   elsif ($platform =~ m/^m68k/)
-   {  print "Setting Linux m68k specific values... ";
-      $oldoutfile     = "LinuxM68KEnv.Set.sh";
-      $CPU            = "6";
-      $CPUNAME        = "M68K";
-      $OUTPATH        = "unxlngm68k";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k".$ds."server";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k".$ds."native_threads";
-   }
-   elsif ($platform =~ m/^hppa/)
-   {  print "Setting Linux hppa specific values... ";
-      $oldoutfile     = "LinuxHPPAEnv.Set.sh";
-      $CPU            = "H";
-      $CPUNAME        = "HPPA";
-      $OUTPATH        = "unxlnghppa";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."hppa";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."hppa".$ds."server";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."hppa".$ds."native_threads";
-      $EPM_FLAGS      = "-a hppa";
-   }
-   elsif ($platform =~ m/^alpha/)
-   {  print "Setting Linux Alpha specific values... ";
-      $oldoutfile     = "LinuxAlphaEnv.Set.sh";
-      $CPU            = "L";
-      $CPUNAME        = "AXP";
-      $OUTPATH        = "unxlngaxp";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."server";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
-   }
-   elsif ($platform =~ m/^arm.*?l-/)
-   {  print "Setting Linux ARM specific values... ";
-      $oldoutfile     = "LinuxARMEnv.Set.sh";
-      $CPU            = "R";
-      $CPUNAME        = "ARM";
-      $OUTPATH        = "unxlngr";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."server";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
-      $EPM_FLAGS      = "-a arm";
-   }
-   elsif ($platform =~ m/^arm.*-androideabi/)
-   {  print "Setting Android ARM specific values... ";
-      $GUIBASE        = "android";
-      $OS             = "ANDROID";
-      $oldoutfile     = "AndroidARMEnv.Set.sh";
-      $CPU            = "R";
-      $CPUNAME        = "ARM";
-      $OUTPATH        = "unxandr";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."server";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
-      $EPM_FLAGS      = "-a arm";
-   }
-   elsif ($platform =~ m/^mips/)
-   {  print "Setting Linux MIPS specific values... ";
-      $oldoutfile     = "LinuxMIPSEnv.Set.sh";
-      $CPU            = "M";
-      $CPUNAME        = "GODSON";
-      $OUTPATH        = "unxlngmips";
-
-      if ('@SIZEOF_LONG@' eq '8') {
-        if ('@WORDS_BIGENDIAN@' ne 'yes') {
-          $EPM_FLAGS = "-a mips64el";
-          if ( $JDK eq "gcj" ) {
-	    $ARCH = "mips64el";
-          }
-        }
-        else {
-          $ARCH = "mips64";
-        }
-      }
-      else {
-        if ('@WORDS_BIGENDIAN@' ne 'yes') {
-          $EPM_FLAGS = "-a mipsel";
-	  if ( $JDK =~ m/sun/ && -d "@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" ) {
-	   $ARCH = "mips32"; # Lemote
-	  } else {
-	   $ARCH = "mipsel";
- 	  }
-        }
-        else {
-          $ARCH = "mips";
-        }
-      }
-
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
-      if ( $JDK =~ m/sun/ && -d "@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" ) {
-      	$JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client"; # Lemote
-      } else {
-      	$JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."server";
-      }
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
-   }
-
-
-   $INPATH         = $OUTPATH.$PROEXT;
-}
-elsif ( $platform =~ m/cygwin|mingw32/ )
-{
-      $MSPDB_PATH     = PathFormat('@MSPDB_PATH@');
-      $MIDL_PATH      = PathFormat('@MIDL_PATH@');
-      $CSC_PATH       = PathFormat('@CSC_PATH@');
-      $SHOWINCLUDES_PREFIX = '@SHOWINCLUDES_PREFIX@';
-      $WINDOWS_SDK_HOME      = PathFormat('@WINDOWS_SDK_HOME@');
-      $DIRECTXSDK_LIB = PathFormat('@DIRECTXSDK_LIB@');
-      $USE_DIRECTX5   = "";
-      $DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@');
-      $CPUNAME        = "INTEL";
-      $CPUNAME        = "X86_64" if $CL_X64;
-      $CPU            = "I";
-      $CPU            = "X" if $CL_X64;
-      $GUI            = "WNT";
-      $GUIBASE        = "WIN";
-      $GVER           = "NT351";
-      $OS             = "WNT";
-      $DYNAMIC_CRT    = "TRUE";
-      $use_shl_versions = "TRUE";
-      $wps = ';' if '@build_os@' eq 'cygwin'; # Windows style path seperator
-  if ( $MINGW eq "yes" )
-  {   print "Setting Windows (MinGW) specific values... ";
-      # At the moment this implies the use of tcsh
-      # WTF does that mean?
-
-      $FLIPCMD        = "slfl.pl" if '@build_os@' eq 'cygwin';
-
-      $PATH_SEPERATOR = ';';
-      $PATH_SEPERATOR = ':' if '@build_os@' ne 'cygwin';
-      $oldoutfile     = "WindowsMinGWEnv.Set.sh";
-      $COMPATH        = PathFormat('@COMPATH@/bin');
-      $COMPATH        =~ s/\/bin$//i;
-      $COM            = "GCC";
-      $OUTPATH        = "wntgcci";
-      $OUTPATH        = "wntgccx" if $platform =~ m/^x86_64/;
-      $INPATH         = $OUTPATH.$PROEXT;
-      $ATL_INCLUDE = '$SOLARVER'.$ds.'$INPATH'.$ds."inc".$ds."external".$ds."mingw".$ds."include".$ds."atl". " ".'$WINDOWS_SDK_HOME'.$ds."include".$ds."atl";
-  }
-  else # The MSVC section starts here
-  {   print "Setting Windows (MSVC) specific values... ";
-      $oldoutfile     = "WindowsMSVCEnv.Set.sh";
-      $COMPATH        = PathFormat('@COMPATH@');
-      $COM            = "MSC";
-      $OUTPATH        = "wntmsci@COMEX@";
-      $OUTPATH        = "wntmscx@COMEX@" if $CL_X64;
-      $INPATH         = $OUTPATH.$PROEXT;
-      $COMEX          = '@COMEX@';
-      if ( "@DISABLE_ACTIVEX@" ) {
-          $ATL_LIB     = $WINDOWS_SDK_HOME.$ds."lib"; # Doesn't exist for VSE
-          $ATL_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."atl";
-          $MFC_LIB     = $WINDOWS_SDK_HOME.$ds."lib"; # Doesn't exist for VSE
-          $MFC_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."mfc";
-      } else {
-          $ATL_LIB     = $COMPATH.$ds."atlmfc".$ds."lib";
-          $ATL_INCLUDE = $COMPATH.$ds."atlmfc".$ds."include";
-          $MFC_LIB     = $COMPATH.$ds."atlmfc".$ds."lib";
-          $MFC_INCLUDE = $WINDOWS_SDK_HOME.$ds."include".$ds."mfc";
-      }
-      if ($CL_X64) {
-          $ATL_LIB     .= $ds."amd64";
-          $MFC_LIB     .= $ds."amd64";
-      }
-      # No speacial treatment for CC an CXX anymore.
-      $FLIPCMD        = "slfl.pl";
-      $PATH_SEPERATOR = ';';
-  }
-}
-elsif ( $platform =~ m/darwin/ )
-{     $COM            = "GCC";
-      $COMPATH        = '@COMPATH@';
-      if ($platform =~ m/^arm/)
-      {
-          print "Setting values for iOS... ";
-          $oldoutfile     = "iOSEnv.Set.sh";
-          $CPU            = "R";
-          $CPUNAME        = "ARM";
-          $OUTPATH        = "unxiosr";
-          $GUI            = "UNX";
-          $OS             = "IOS";
-          $GUIBASE        = "cocoatouch";
-      }
-      elsif ($platform =~ m/^powerpc/)
-      {
-          print "Setting values for Mac OS X/Darwin on PowerPC... ";
-          $oldoutfile     = "MacOSXPPCEnv.Set.sh";
-          $CPU            = "P";
-          $CPUNAME        = "POWERPC";
-          $OUTPATH        = "unxmacxp";
-          $OS             = "MACOSX";
-          $GUI            = "UNX";
-      }
-      else
-      {
-          print "Setting values for Mac OS X/Darwin on default x86... ";
-          $oldoutfile     = "MacOSXX86Env.Set.sh";
-          $CPU            = "I";
-          $CPUNAME        = "INTEL";
-          $OUTPATH        = "unxmacxi";
-          $OS             = "MACOSX";
-          $GUI            = "UNX";
-      }
-      $GVER           = "VCL";
-      $INPATH         = $OUTPATH.$PROEXT;
-      $PATH_SEPERATOR = $ps;
-      # GUIBASE is set below for Mac OS X; may be "aqua" or "unx".
-}
-elsif ( $platform =~ m/dragonfly/ )
-{
-   if ($platform =~ m/^i386/)
-   {  print "Setting DragonFly i386 specific values... ";
-      $CPU            = "I";
-      $CPUNAME        = "INTEL";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-   }
-   elsif ($platform =~ m/^x86_64/)
-   {  print "Setting DragonFly x86-64 specific values... ";
-      $CPU            = "X";
-      $CPUNAME        = "X86_64";
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
-   }
-   else
-   { print "Unsupported DragonFly architecture: $platform \n";
-     exit 1;
-   }
-   # General DragonFly settings:
-      $COM            = "GCC";
-      $COMPATH        = '@COMPATH@';
-      $GUI            = "UNX";
-      $GUIBASE        = "unx";
-      $GVER           = "VCL";
-      $OS             = "DRAGONFLY";
-      $PATH_SEPERATOR = $ps;
-      $OUTPATH        = "unxdfly";
-      $oldoutfile     = "DragonFlyEnv.Set.sh";
-      $INPATH         = $OUTPATH.$PROEXT;
-}
-elsif ( $platform =~ m/aix/ )
-{
-   print "Setting AIX PPC specific values... ";
-   $oldoutfile     = "aixPPCEnv.Set.sh";
-   $CPU            = "P";
-   $CPUNAME        = "POWERPC";
-   $OUTPATH        = "unxaigppc";
-   $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-   $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
-   $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
-   $COM            = "GCC";
-   $COMPATH        = '@COMPATH@';
-   $GUI            = "UNX";
-   $GUIBASE        = "unx";
-   $GVER           = "VCL";
-   $INPATH         = $OUTPATH.$PROEXT;
-   $OS             = "AIX";
-   $PATH_SEPERATOR = $ps;
-}
-else {
-	print "\nset_soenv:  Cannot recognize the platform you are building for: $platform.\n";
-	exit 1;
-}
-print "done\n";
-
-#
-# D. Gathering directory information from the user.
-#
-# If the directory does not exist something is strange.
-# 1. LibreOffice build home directory.
-chomp($SRC_ROOT  = `pwd`);
-$SRC_ROOT = PathFormat($SRC_ROOT);
-CheckPathExist( $SRC_ROOT );
-
-
-# 2. Java home directory.
-# JAVA_HOME as argument from autoconf.
-$JAVA_HOME = PathFormat('@JAVA_HOME@') ;
-
-if ( $platform =~ m/cygwin/ ) {
-   $JAVA_HOME =~ s/[\s\/]+$//;	# remove trailing \n or \/ if there is any.
-}
-# 3. bash path.
-$OOO_SHELL = '@BASH@';
-
-# ml.exe assembler path for Windows users.
-if ($platform =~ m/cygwin/)
-{  $ASM_PATH = PathFormat('@ASM_HOME@');
-}
-
-# Check for prebuild mozab libraries if we don't build them # ourselves
-# and we're also not using the external system mozilla installation.
-#
-# FIXME! This check should be done in configure and not here, but
-# the $OS, $COM, $CPU variables are not yet present there.
-#
-if ( "@WITH_MOZILLA@" eq "YES" and "@BUILD_MOZAB@" ne "TRUE" and "@SYSTEM_MOZILLA@" ne "YES" )
-{  print("\nChecking for prebuilt Mozilla libraries ...");
-   my $mozbinfile = $SRC_ROOT."/moz/zipped/";
-   if ( $^O eq 'MSWin32' ) {
-       chomp( $mozbinfile = qx{cygpath -d "$mozbinfile"} );
-   }
-   $mozbinfile .= $OS.$COM.$CPU;
-   if ( -e $mozbinfile."inc.zip"
-        and -e $mozbinfile."lib.zip"
-        and -e $mozbinfile."runtime.zip" )
-   {   print " found.\n";
-       $PREBUILD_MOZAB = "YES";
-   }
-   else
-   {   print " not found!\n\n";
-       print "If you don\'t use the system mozilla and also not build the needed\n";
-       print "mozilla libraries yourself you have to provide the needed files\n";
-       print "$OS$COM$CPU\{inc,lib,runtime\}.zip in moz/zipped/ .\n";
-       print "These files can be found here:\n";
-       print "  <http://tools.openoffice.org/moz_prebuild/680/>.\n\n";
-       die;
-   }
-}
-else
-{
-   $PREBUILD_MOZAB = "";
-}
-
-#
-# E. Determining the envionment values based on the information
-#    that was gathered earlier on.
-
-$USR                  = $ds."usr";
-$ETC                  = $ds."etc";
-$BIN                  = $ds."bin";
-$LIB                  = $ds."lib";
-$LIB64                = $ds."lib";
-$LIB64               .= "64"
-if ($platform =~ m/x86_64-.*-linux/);
-$LIB64               .= "64"
-if (($platform =~ m/powerpc64-.*-linux/) && ('@SIZEOF_LONG@' eq '8'));
-$LIB64               .= "64"
-if (($platform =~ m/s390x-.*-linux/) && ('@SIZEOF_LONG@' eq '8'));
-$LIB64               .= $ds."x64"
-if ($platform =~ m/cygwin/);
-$INC                  = $ds."inc";
-$INCLUDE              = $ds."include";
-$DEV                  = $ds."dev";
-$OPT                  = $ds."opt";
-$LOCAL                = $ds."local";
-$SOLENV               = $ds."solenv";
-$SOLVER               = $ds."solver";
-$DEFIMGS              = $ds."default_images";
-$CONFIG               = $ds."config";
-$USR_BIN              = $USR.$BIN;
-$USR_LIB              = $USR.$LIB64;
-$USR_LOCAL            = $USR.$ds."local";
-$USR_CCS              = $USR.$ds."ccs";
-$USR_OPENWIN          = $USR.$ds."openwin";
-$USR_DT               = $USR.$ds."dt";
-$COMMON_BUILD_TOOLS   = '$SRC_ROOT'.$ds."external".$ds."common";
-
-# Windows NT only variables
-if ($platform =~ m/cygwin/)
-{
-   if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
-   {
-      $JAVA_LIB             = $JAVA_HOME.$LIB;
-   }
-   # Import SystemDrive enviroment variable
-   use Env qw(SYSTEMDRIVE);
-   # Change $SYSTEMDRIVE to lower case.
-   $SYSTEMDRIVE          = lc $SYSTEMDRIVE;
-   use Env qw(SYSTEMROOT);
-   $CYGWIN_PATH          = PathFormat('/usr/bin'); # Windows bash path
-   $WIN_GREP             = '$CYGWIN_PATH'.$ds."grep.exe";
-   $WIN_FIND             = '$CYGWIN_PATH'.$ds."find.exe";
-   $WIN_LS               = '$CYGWIN_PATH'.$ds."ls.exe";
-   $WIN_GNUCOPY          = '$CYGWIN_PATH'.$ds."cp.exe";
-   $WIN_TOUCH            = '$CYGWIN_PATH'.$ds."touch.exe";
-}
-
-if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
-{
-   $JAVA_BIN             = $JAVA_HOME.$BIN;
-   $JAVA_INCLUDE         = $JAVA_HOME.$INCLUDE;
-}
-
-
-$PERL                 = PathFormat('@PERL@'); # Perl program
-$PERL_PATH            = dirname('@PERL@'); # Perl Path
-$XLIB                 = PathFormat('@XLIB@'); # X11 libraries
-$XINC                 = PathFormat('@XINC@'); # X11 includes
-
-
-# Mac OS X/Darwin only variables.
-if ( $platform =~ m/darwin/ && $platform !~ m/^arm/)
-{
-    $MACOSX_SDK_PATH='@MACOSX_SDK_PATH@';
-    $FRAMEWORKSHOME       = $MACOSX_SDK_PATH."/System/Library/Frameworks";
-    if ( $XLIB eq "no_x_libraries" )
-    {
-        $GUIBASE  = "aqua";
-    }
-    else
-    {
-        $GUIBASE  = "unx";
-    }
-}
-
-# The project's workstamp.
-$WORK_STAMP            = "@SOURCEVERSION@";
-# Location of the source.
-$SOLARSRC             = '$SRC_ROOT';
-
-# default TARFILE_LOCATION
-if ('@TARFILE_LOCATION@' eq "DEFAULT")
-{	$TARFILE_LOCATION="$SRC_ROOT/src";
-}
-
-#
-$DEVROOT              = '$SRC_ROOT';
-$SOLARENV             = PathFormat($SRC_ROOT.$SOLENV);
-# Location of the solver tree.
-if ('@LOCAL_SOLVER@' eq "DEFAULT")
-{  $SOLARVER          = $SRC_ROOT.$SOLVER.$ds.$UPD;
-}
-else
-{  $SOLARVER          = PathFormat('@LOCAL_SOLVER@').$ds.$UPD;
-}
-#Location of Solar version.
-$SOLARVERSION         = '$SOLARVER';
-
-#Location of gnu make directories.
-$WORKDIR              = '$SRC_ROOT/workdir/$INPATH';
-$OUTDIR              = '$SOLARVER/$INPATH';
-#Some directories that are symlinks under rawbuild, have to use realpath on Cygwin
-$SOLARDEFIMG          = PathFormat($SRC_ROOT.$DEFIMGS);
-
-
-$SOLARENVINC          = '$SOLARENV'.$INC;
-# Location of dmake resource.
-$DMAKEROOT            = '$SOLARENVINC'.$ds."startup";
-# Location of JDK classes .zip file.
-# but in jdk 1.2 it is called rt.jar and it lives in jre/lib
-$CLASSPATH            = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
-# Location of the JDK supported standard classes.zip file.
-# see above for why the change
-$XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
-
-# Location of the translations module
-$L10N_MODULE = PathFormat($SRC_ROOT."/translations");
-
-# Check for poor help localizations, i.e. no help translation at all...
-@languages=();
-if (opendir(DIR,$L10N_MODULE . "/source"))
-{
-    @languages = readdir(DIR);
-    closedir(DIR);
-}
-$WITH_POOR_HELP_LOCALIZATIONS = "";
-
-foreach $language (@languages)
-{
-    if ( ($language ne ".") && ($language ne "..") && (! -d $L10N_MODULE . "/source/" . $language . "/helpcontent2") )
-    {
-        $WITH_POOR_HELP_LOCALIZATIONS = $WITH_POOR_HELP_LOCALIZATIONS . " " . $language;
-    }
-}
-
-# Location used by the linker to create libraries.
-if ($platform =~ m/solaris/)
-{  $SOLAREXTRALIB     = $L.$par_dir.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$ds."lib.solaris.2.6".
-                        $L.$LIB.
-                        $L.$USR.$LIB.
-                        $L.$USR.$LOCAL.$LIB.
-                        $L.$USR_DT.$LIB.
-                        $L.$USR_OPENWIN.$LIB;
-}
-elsif ($platform =~ m/linux|netbsd|freebsd|aix|openbsd|dragonfly/)
-{
-   $SOLAREXTRALIB     = $L.$par_dir.$LIB64;
-}
-elsif ($platform =~ m/darwin/ && $platform !~ m/^arm/)
-{
-  # Nothing should be needed
-}
-elsif ($platform !~ m/cygwin/ && $platform !~ m/mingw32/ && $platform !~ m/^arm-apple/)
-{  AddWarning( "set_soenv", "$platform not configured for linkage create libraries" );
-}
-
-# Windows NT only variables
-if ($platform =~ m/cygwin/)
-{  $COMP_ENV          = $OUTPATH;
-
-   $JAVAHOME          = '$JAVA_HOME';
-
-   $ILIB             = $cur_dir;
-
-   # Mingw is different
-   if ( $COM eq "MSC" )
-   {  $ILIB       .=    $wps.$SOLARVER.$ds.$INPATH.$LIB;
-      if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" ) {
-          $ILIB   .= $wps.$JAVA_HOME.$LIB;
-      }
-      if ( $CL_X64 ne "TRUE" ) {
-          $ILIB   .= $wps.$COMPATH.$LIB.
-		             $wps.$WINDOWS_SDK_HOME.$LIB;
-	  } else {
-	      $ILIB   .= $wps.$COMPATH.$LIB.$ds."amd64".
-		             $wps.$WINDOWS_SDK_HOME.$LIB64;
-	  }
-      $ILIB       .= $wps.$DOTNET_FRAMEWORK_HOME.$LIB;
-      if ( '@ENABLE_DIRECTX@' ne "" ) {
-          $ILIB   .= $wps.$DIRECTXSDK_LIB;
-      }
-      # ILIB needs to use '\' directory seperators;
-      $ILIB = WinPath( $ILIB, ";" );
-   }
-   elsif ( $COM eq "GCC" )
-   {  $ILIB       .=    $wps.$SOLARVER.$ds.$INPATH.$LIB.
-                        $wps.$SOLARVER.$ds.$INPATH.$BIN.
-                        $wps.$JAVA_HOME.$LIB;
-      if ( $USE_MINGW eq "cygwin" )
-      {  $ILIB    .= $wps.PathFormat($USR.$LIB.$ds."mingw").
-                     $wps.PathFormat($USR.$LIB.$ds."w32api");
-      }
-      else
-      {  $ILIB       .= $wps.$COMPATH.$LIB;
-      }
-      $ILIB       .= $wps.PathFormat("@MINGW_CLIB_DIR@").
-                     $wps.$WINDOWS_SDK_HOME.$LIB;
-      if ( '@ENABLE_DIRECTX@' )
-      {   $ILIB   .= $wps.PathFormat("@DIRECTXSDK_LIB@");
-      }
-   }
-
-   $JAVAHOME          = '$JAVA_HOME';
-
-}
-
-# The general environment path.
-if ($platform =~ m/linux|netbsd|freebsd|aix|solaris|openbsd|dragonfly/)
-{  $PATH              = $cur_dir.
-#                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
-                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-                        $ps.'$SOLARENV'.$BIN;
-
-   if ($platform =~ m/solaris/) {
-	$PATH .= $ps.$USR_CCS.$BIN;
-   }
-
-   $PATH             .= $ps.$oldPATH;
-
-   my @javaBits;
-   if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME"  &&  $JDK ne "gcj" ) {
-      @javaBits = ( '$JAVA_HOME'.$BIN, 'javac' );
-   } else {
-      @javaBits = ();
-   }
-   $PATH              = GetCorrectPath ($PATH,
-                                        $COMPATH, $CC,
-                                        $PERL_PATH, 'perl',
-                                        @javaBits);
-}
-
-elsif ($platform =~ m/cygwin/)
-{  # The PATH variable is completely created from scratch. Elements
-   # from oldPATH that are not yet included are appended to PATH at
-   # the end.
-
-   my ( $tmppath );
-
-   $PATH              = $cur_dir.
-#                        $ps.CygFormat($SOLARVER).$ds.$INPATH.$BIN.
-                        $ps.CygFormat($SOLARENV).$ds."bin".
-                        $ps.CygFormat($SOLARENV).$ds.$OUTPATH.$BIN;
-
-   if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
-   {
-      # hack either "hotspot" or "client" should be used, depending on the jdk version:
-      # 1.2.x   -   no such directory, unsupported
-      # 1.3.x   -   hotspot, client missing
-      # 1.4.x   -   client, hotspot missing
-
-      $PATH .= $ps.CygFormat($JAVA_HOME).$BIN;
-	  if ( -d $JAVA_HOME.$ds."jre".$ds."bin".$ds."hotspot" ) {
-		  $PATH .= $ps.CygFormat($JAVA_HOME).$ds."jre".$ds."bin".$ds."hotspot";
-	  }
-	  if ( -d $JAVA_HOME.$ds."jre".$ds."bin".$ds."client" ) {
-		  $PATH .= $ps.CygFormat($JAVA_HOME).$ds."jre".$ds."bin".$ds."client";
-	  }
-   }
-
-   # Add path to compiler
-   $tmppath = CygFormat($COMPATH).$BIN;
-   $tmppath .= $ds."amd64" if $CL_X64;
-   $tmppath =~ s/^\/\//\//;
-   $PATH .= $ps.$tmppath;
-
-   if ( $COM eq "MSC" ) {
-       $tmppath = CygFormat($MSPDB_PATH);
-       # for MSVC to find mspdb71.dll
-       if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
-           $PATH .= $ps.$tmppath;
-       }
-       # need midl.exe
-       $tmppath = CygFormat($MIDL_PATH);
-       if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
-           $PATH .= $ps.$tmppath;
-       }
-       # needs csc.exe
-       $tmppath = CygFormat($CSC_PATH);
-       if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
-           $PATH .= $ps.$tmppath;
-       }
-       # Installer needs some files if the Windows Installer SDK
-       $tmppath = CygFormat($WINDOWS_SDK_HOME);
-       if ( $PATH !~ /(?:[:]|\A)(?:$tmppath\/bin)(?:[:]|\Z)/i ) {
-           $PATH .= $ps.$tmppath.$BIN;
-       }
-   } else { # Mingw is different
-	   # Native installer needs some files if the Windows Installer SDK
-               $tmppath = CygFormat($WINDOWS_SDK_HOME);
-	   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath\/bin)(?:[:]|\Z)/i ) {
-		   $PATH .= $ps.$tmppath.$BIN;
-	   }
-   }
-
-   if ( $ASM_PATH ne "ASM_IN_PATH" )
-   {   $PATH          .= $ps.CygFormat($ASM_PATH);
-   }
-
-   # Possible cygwin paths must follow behind the OOo and MS paths
-
-   # Check if $PERL_PATH is already set in PATH
-   $tmppath = CygFormat($PERL_PATH);
-   if ( ! ( $PATH =~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) )
-   {
-      $PATH          .= $ps.$tmppath;
-   }
-   # Check if $CYGWIN_PATH is already set in PATH
-   $tmppath = CygFormat($CYGWIN_PATH);
-   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
-      $PATH           .= $ps.$tmppath;
-   }
-   # makensis directory
-   $NSIS_PATH = PathFormat('@NSIS_PATH@');
-   $tmppath = CygFormat($NSIS_PATH);
-   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
-       $PATH          .= $ps.$tmppath;
-   }
-   # path to sn.exe (signing) for Windows users.
-   my $sn_path = PathFormat('@DOTNET_FRAMEWORK_HOME@/bin');
-   $tmppath = CygFormat($sn_path);
-   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
-       $PATH          .= $ps.$tmppath;
-   }
-
-
-   # Add the rest of the original path if it is still missing.
-   if (($^O eq "cygwin")) { # Not for ActiveState perl
-       my $expandedPATH = $PATH;
-       $expandedPATH =~ s/(\$\w+)/$1/eeg;
-
-       # fix situations where PATH may look like /bin:"C:\blah\bleh":/ugh
-       my $fixedPATH = $oldPATH;
-       if ( $oldPATH =~ /"/ ) {
-	   $fixedPATH = "";
-	   foreach my $pathentry ( split( '"',$oldPATH ) ) {
-	       if ( ( $pathentry =~ /^$ps/ ) || ( $pathentry =~ /$ps$/ ) ) {
-		   $fixedPATH .= $pathentry;
-	       } else {
-		   chomp( $pathentry = qx{cygpath -d "$pathentry"} ) ;
-		   chomp( $pathentry = qx{cygpath -u "$pathentry"} ) ;
-		   $fixedPATH .= $pathentry;
-	       }
-	   }
-       }
-
-       foreach my $pathentry (split($ps,$fixedPATH)) {
-           if ( ! ( $expandedPATH =~ /(?:$ps|\A)(?:$pathentry)(?:$ps|\Z)/ ) ) {
-               $PATH .= $ps.$pathentry;
-               $expandedPATH .= $ps.$pathentry;
-           }
-       }
-   } else {
-       $PATH          .= $ps.$oldPATH;
-   }
-
-   # The path now is in cygwin posix format
-
-}
-elsif ($platform =~ m/mingw32/)
-{
-   my ( $tmppath );
-
-   $PATH              = $cur_dir.
-#                        $ps.CygFormat($SOLARVER).$ds.$INPATH.$BIN.
-                        $ps.CygFormat($SOLARENV).$ds."bin".
-                        $ps.CygFormat($SOLARENV).$ds.$OUTPATH.$BIN;
-
-   # makensis directory
-   $NSIS_PATH = PathFormat('@NSIS_PATH@');
-   $tmppath = CygFormat($NSIS_PATH);
-   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
-       $PATH          .= $ps.$tmppath;
-   }
-   $PATH              .= $ps.$oldPATH;
-}
-elsif ($platform =~ m/darwin/)
-{  $PATH              = $cur_dir.
-#                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
-                        $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-                        $ps.'$SOLARENV'.$BIN;
-
-  # Append old PATH
-  $PATH             .= $ps.$oldPATH;
-}
-else
-{  AddWarning( "set_soenv", "$platform not configured for general environment paths" );
-}
-
-# Linker library search directory paths.
-if ($platform =~ m/solaris/)
-{  $SOLARLIB          = $L.$par_dir.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB."solaris.2.6".
-                        $L.$LIB.
-                        $L.$USR_LIB;
-   if ( $CC =~ "gcc" ) {
-      $SOLARLIB      .= $L.$COMPATH.$LIB;
-   }
-   $SOLARLIB         .= $L.$USR_LOCAL.$LIB.
-                        $L.$USR_DT.$LIB.
-                        $L.$USR_OPENWIN.$LIB.
-                        $L.$XLIB;
-
-   $JAVALIB          =  $L.'$JAVA_HOME'.$LIB.
-                        $L.$JRELIBDIR.
-                        $L.$JRETOOLKITDIR.
-                        $L.$JRETHREADDIR;
-}
-elsif ($platform =~ m/linux|netbsd|aix|freebsd|openbsd|dragonfly/)
-{  $SOLARLIB          = $L.$par_dir.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
-   if ($platform =~ m/openbsd/) {
-      $SOLARLIB       .= $L.$USR_LOCAL.$LIB;
-   }
-   if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" ) {
-      $SOLARLIB       .= $L.$XLIB;
-   }
-   $JAVALIB           = $L.'$JAVA_HOME'.$LIB64.
-                        $L.$JRELIBDIR.
-                        $L.$JRETOOLKITDIR.
-                        $L.$JRETHREADDIR;
-}
-elsif ($platform =~ m/cygwin|mingw32/)
-{  $SOLARLIB          = $L.$par_dir.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$SOLARVER'.$ds.'$INPATH'.$LIB;
-}
-elsif ($platform =~ m/darwin/)
-{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB;
-    # [ed] 6/15/02 Add in X11 libraries onto the library path
-    if ($GUIBASE eq "unx") {
-       $SOLARLIB      .= $L.$XLIB;
-    }
-}
-
-if ($SYSTEM_MOZILLA eq "YES")
-{
-       $SOLARLIB .= $L."@MOZ_LIB@"
-}
-
-# Location of the compiler include search directory paths.
-$SOLARINC             = $I.$cur_dir.
-                        $I.'$SOLARVER'.$ds.'$INPATH'.$INC.$ds."stl".
-                        $I.'$SOLARVER'.$ds.'$INPATH'.$INC.$ds."external".
-                        $I.'$SOLARVER'.$ds.'$INPATH'.$INC.
-                        $I.'$SOLARENV'.$ds.'$OUTPATH'.$INC.
-                        $I.'$SOLARENV'.$INC.
-                        $I.'$SRC_ROOT'.$ds."res";
-
-if ($platform =~ m/solaris|linux|freebsd|netbsd|aix|openbsd|dragonfly/)
-{
-if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
-{
-$SOLARINC            .= '/SC5 ';
-}
-# Platform dependent include path at the top of this list of include paths
-if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
-{
-    $SOLARINC         .= $I.$COMPATH.$INCLUDE;
-}
-
-	$SOLARINC      .= $I.'$SOLARENV'.$INC.$ds."Xp31";
-
-	# pickup system jpeg over java jpeg on OpenBSD
-	if ($platform =~ m/openbsd/)
-	{   $SOLARINC  .= $I.$USR_LOCAL.$INCLUDE;
-	}
-    if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" )
-    {   $SOLARINC  .= $I.'$JAVA_HOME'.$INCLUDE;
-	}
-
-	#include system dependent Java include directory
-	if (!($JDK eq "gcj") && $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME")
-	{
-   		if ($platform =~ m/solaris/)
-   		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris";
-   		}
-   		elsif  ($platform =~ m/linux/)
-   		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-   		}
-   		elsif ($platform =~ m/freebsd/)
-   		{
-      		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-      		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
-      		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-   		}
-   		elsif ($platform =~ m/netbsd/)
-   		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
-   		}
-		elsif ( $platform =~ m/aix/ )
-		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."aix";
-		}
-		elsif ($platform =~ m/openbsd/)
-		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."openbsd";
-		}
-
-   		#java threads include path
-
-        $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$INCLUDE;
-	}
-    #The tail, if needed
-    if ($platform =~ m/linux|freebsd|netbsd|aix|openbsd|dragonfly/)
-    {  if ( $XINC ne "/usr/include" ) {
-            $SOLARINC  .= $I.$XINC;
-       }
-    }
-}
-elsif ($platform =~ m/cygwin/)
-{  if ($JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME")
-   {  $SOLARINC       .= $I.'$JAVA_HOME'.$INCLUDE.$ds."win32".
-                         $I.'$JAVA_HOME'.$INCLUDE;
-   }
-   # Mingw is different
-   if ( $COM eq "MSC" )
-   {  $SOLARINC       .= $I.'$WINDOWS_SDK_HOME'.$INCLUDE.
-                         $I.'$COMPATH'.$INCLUDE;
-      if ( '@ENABLE_DIRECTX@' ne "" ) {
-          $SOLARINC   .= $I.PathFormat('@DIRECTXSDK_HOME@').$INCLUDE;
-      }
-   }
-   elsif ( $COM eq "GCC" )
-   {  $SOLARINC       .= $I.'$SOLARVER'.$ds.'$INPATH'.$INC.$ds."external".$ds."mingw".$INCLUDE;
-     if ( $USE_MINGW eq "cygwin" )
-     {  $SOLARINC    .= $I.PathFormat($USR.$INCLUDE.$ds."mingw").
-                        $I.PathFormat($USR.$INCLUDE.$ds."w32api").
-                        $I.PathFormat($USR.$INCLUDE); }
-     else
-     {  $SOLARINC    .= $I.'$COMPATH'.$INCLUDE; }
-     @mingw_lib_include_paths = split( / /, "@MINGW_LIB_INCLUDE_PATH@" );
-     $SOLARINC .= $I.PathFormat("@MINGW_BACKWARD_INCLUDE_PATH@");
-     foreach $mingw_lib_include_path (@mingw_lib_include_paths)
-       {   chomp $mingw_lib_include_path;
-           if ( $mingw_lib_include_path ne $COMPATH.$INCLUDE && $mingw_lib_include_path ne "" )
-           {
-              $SOLARINC   .= $I.PathFormat($mingw_lib_include_path);
-           }
-       }
-     $SOLARINC .= $I.PathFormat("@GXX_INCLUDE_PATH@").$I.PathFormat("@GXX_INCLUDE_PATH@".$ds."mingw32").
-                  $I.'$WINDOWS_SDK_HOME'.$INCLUDE;
-   }
-   if ( $COM ne "MSC" && '@ENABLE_DIRECTX@' ne "" ) {
-       $SOLARINC   .= $I.PathFormat('@DIRECTXSDK_HOME@').$INCLUDE;
-   }
-}
-elsif ($platform =~ m/mingw32/)
-{  if ($JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME")
-   {  if (  '@build_os' eq 'cygwin' )
-      {  # Using MinGW from Cygwin. Use the normal Windows JDK
-         # headers
-         $SOLARINC       .= $I.'$JAVA_HOME'.$INCLUDE.$ds."win32".
-                            $I.'$JAVA_HOME'.$INCLUDE;
-      }
-      else
-      {  # Cross-compilation. Use our fake jni_md.h
-         # and othewise the build platform JDK headers
-         $SOLARINC       .= $I.$SOLARENVINC.$ds."win32".
-                            $I.'$JAVA_HOME'.$INCLUDE;
-      }
-   }
-}
-elsif ($platform =~ m/darwin/ && $platform !~ m/^arm/)
-{  $SOLARINC         .= $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Versions".$ds."Current".$ds."Headers".
-                        $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
-}
-elsif ($platform =~ m/^arm-apple/)
-{
-}
-else
-{  AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
-}
-
-$gb_REPOS = $SRC_ROOT;
-$BUILD_TYPE = "@BUILD_TYPE@";
-
-if ('@WITH_LANG@' ne "")
-{
-    $BUILD_TYPE = "@BUILD_TYPE@ TRANSLATIONS";
-}
-else
-{
-    $BUILD_TYPE = "@BUILD_TYPE@";
-}
-
-#
-# F. Setting the different aliases.
-#
-# 1. alias for a full product make.
-	$mkout           = '"perl $SOLARENV/bin/mkout.pl"';
-	$deliver         = '"perl $SOLARENV/bin/deliver.pl"';
-	$build           = '"perl $SOLARENV/bin/build.pl"';
-	$build_client    = '"perl $SOLARENV/bin/build_client.pl"';
-	$zipdep          = '"perl $SOLARENV/bin/zipdep.pl"';
-
-#
-#--------------------------
-# VI. Open the output file.
-#--------------------------
-#
-if (-f $SRC_ROOT.$ds.$oldoutfile) {
-    print "****\n";
-    print "**** Note: There is no $oldoutfile any more. Now it is just called Env.Host.sh\n";
-    print "****\n";
-    unlink($SRC_ROOT.$ds.$oldoutfile);
-}
-$outfile = 'Env.Host.sh';
-
-open( OUT, ">$SRC_ROOT/$outfile" ) ||
-   die "Cannot open $SRC_ROOT/$outfile: $!\n";
-
-#
-#------------------------------------------
-# VII. Writing the data to the output file.
-#------------------------------------------
-#
-# Write file header.
-CreateFileHeader( *OUT, $UPD, $platform, "sh/bash/ksh", "#" );
-
-ToFile( "SRC_ROOT",	     $SRC_ROOT,          "e" );
-ToFile( "OOO_SHELL",         $OOO_SHELL,         "e" );
-ToFile( "JAVA_HOME",         $JAVA_HOME,         "e" );
-ToFile( "L10N_MODULE",       $L10N_MODULE,       "e" );
-ToFile( "ANT_HOME",          PathFormat("@ANT_HOME@"), "e" );
-ToFile( "ANT_LIB",           PathFormat("@ANT_LIB@"), "e" );
-ToFile( "ANT",               PathFormat("@ANT@"), "e" );
-ToFile( "JDKLIB",            $JAVA_LIB,          "e" );
-ToFile( "ASM_PATH",          $ASM_PATH,          "e" );
-ToFile( "FRAMEWORKSHOME",    $FRAMEWORKSHOME,    "e" );
-ToFile( "Empty",             $empty,             "n" );
-
-#
-# Writing the platform independent constant values to file.
-# (c = comment, e = environment variable, a = alias )
-ToFile( "Platform independent constant values.", $empty, "c" );
-# Languages
-ToFile( "WITH_LANG",         "@WITH_LANG@",      "e" );
-ToFile( "WITH_LANG_LIST",    "@WITH_LANG_LIST@", "e" );
-ToFile( "INTRO_BITMAP",      "@INTRO_BITMAP@",   "e" );
-ToFile( "ABOUT_BITMAP",      "@ABOUT_BITMAP@",   "e" );
-ToFile( "OOO_VENDOR",        "@OOO_VENDOR@",     "e" );
-ToFile( "OOODMAKEMODE",      "YES",              "e" );
-ToFile( "PRODUCTVERSION",    "@PRODUCTVERSION@", "e" );
-ToFile( "WITH_POOR_HELP_LOCALIZATIONS", $WITH_POOR_HELP_LOCALIZATIONS, "e" );
-
-ToFile( "CALL_CDECL",        $CALL_CDECL,        "e" );
-ToFile( "COMMON_OUTDIR",     $COMMON_OUTDIR,     "e" );
-ToFile( "common_build",      $common_build,      "e" );
-ToFile( "NO_REC_RES",        $NO_REC_RES,        "e" );
-ToFile( "SO3",               $SO3,               "e" );
-ToFile( "SOLAR_PLUGIN",      $SOLAR_PLUGIN,      "e" );
-ToFile( "UPDATER",           $UPDATER,           "e" );
-ToFile( "VCL",               $VCL,               "e" );
-ToFile( "ENABLEUNICODE",     $ENABLEUNICODE,     "e" );
-ToFile( "NO_BSYMBOLIC",      $NO_BSYMBOLIC,      "e" );
-if ("@ENABLE_DEBUG@" eq "TRUE") {
-ToFile( "debug",             "true",             "e" );
-}
-if ("@ENABLE_WERROR@" eq "FALSE") {
-ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE",  "e" );
-}
-ToFile( "PRODUCT",           "@PRODUCT@",        "e" );
-ToFile( "PROFULLSWITCH",     "@PROFULLSWITCH@",  "e" );
-ToFile( "PROEXT",            $PROEXT,            "e" );
-ToFile( "VALGRIND_CFLAGS",   "@VALGRIND_CFLAGS@","e" );
-ToFile( "WITH_COMPAT_OOWRAPPERS", "@WITH_COMPAT_OOWRAPPERS@", "e" );
-ToFile( "UNIXWRAPPERNAME",   "@UNIXWRAPPERNAME@","e" );
-ToFile( "PRODUCTNAME",       "@PRODUCTNAME@",    "e" );
-ToFile( "INSTALLDIRNAME",    "@INSTALLDIRNAME@", "e" );
-ToFile( "PREFIXDIR",         "@PREFIXDIR@",      "e" );
-ToFile( "INSTALLDIR",        "@INSTALLDIR@",     "e" );
-ToFile( "LIBDIR",            "@LIBDIR@",         "e" );
-ToFile( "DATADIR",           "@DATADIR@",        "e" );
-ToFile( "MANDIR",            "@MANDIR@",         "e" );
-ToFile( "DOCDIR",            "@DOCDIR@",          "e" );
-ToFile( "BUILD_MOZAB",       "@BUILD_MOZAB@",    "e" );
-ToFile( "PREBUILD_MOZAB",    $PREBUILD_MOZAB,    "e" );
-ToFile( "MOZILLA_VERSION",   $MOZILLA_VERSION,   "e" );
-ToFile( "DEFAULT_MOZILLA_TOOLKIT", $MOZILLA_TOOLKIT, "e" );
-ToFile( "ENABLE_NSS_MODULE",  "@ENABLE_NSS_MODULE@", "e" );
-ToFile( "MOZILLABUILD",  "@MOZILLABUILD@", "e" );
-ToFile( "BUILD_VER_STRING",  "@BUILD_VER_STRING@", "e" );
-if ($platform =~ m/linux/ && $platform =~ m/powerpc/) {
-ToFile( "JITC_PROCESSOR_TYPE","6",                 "e" );
-}
-ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING",  "yes", "e" );
-ToFile( "ENABLE_GTK",        "@ENABLE_GTK@",       "e" );
-ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
-ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
-ToFile( "ENABLE_GTK3",       "@ENABLE_GTK3@",      "e" );
-ToFile( "GTK3_CFLAGS",       "@GTK3_CFLAGS@",      "e" );
-ToFile( "GTK3_LIBS",         "@GTK3_LIBS@",        "e" );
-ToFile( "GTHREAD_CFLAGS",    "@GTHREAD_CFLAGS@",   "e" );
-ToFile( "GTHREAD_LIBS",      "@GTHREAD_LIBS@",     "e" );
-ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
-ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
-ToFile( "SPLIT_APP_MODULES", "@SPLIT_APP_MODULES@","e" );
-ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" );
-ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@",     "e" );
-ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
-ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
-ToFile( "ENABLE_MINIMIZER",   "@ENABLE_MINIMIZER@","e" );
-ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
-ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
-ToFile( "ENABLE_SCRIPTING_BEANSHELL","@ENABLE_SCRIPTING_BEANSHELL@","e" );
-ToFile( "ENABLE_SCRIPTING_JAVASCRIPT","@ENABLE_SCRIPTING_JAVASCRIPT@","e" );
-ToFile( "ENABLE_SCRIPTING_PYTHON","@ENABLE_SCRIPTING_PYTHON@","e" );
-ToFile( "ENABLE_QUICKSTART_LIBPNG", "@ENABLE_QUICKSTART_LIBPNG@", "e" );
-ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
-ToFile( "WITH_THEMES",       "@WITH_THEMES@",      "e");
-ToFile( "WITH_HELPPACK_INTEGRATION",       "@WITH_HELPPACK_INTEGRATION@",      "e");
-ToFile( "WITH_EXTENSION_INTEGRATION",       "@WITH_EXTENSION_INTEGRATION@",      "e");
-ToFile( "OOO_JUNIT_JAR",     "@OOO_JUNIT_JAR@",    "e" );
-ToFile( "SAC_JAR",           "@SAC_JAR@",          "e" );
-ToFile( "LIBXML_JAR",        "@LIBXML_JAR@",       "e" );
-ToFile( "FLUTE_JAR",         "@FLUTE_JAR@",        "e" );
-ToFile( "JFREEREPORT_JAR",   "@JFREEREPORT_JAR@",  "e" );
-ToFile( "LIBLAYOUT_JAR",     "@LIBLAYOUT_JAR@",    "e" );
-ToFile( "LIBLOADER_JAR",     "@LIBLOADER_JAR@",    "e" );
-ToFile( "LIBFORMULA_JAR",    "@LIBFORMULA_JAR@",   "e" );
-ToFile( "LIBREPOSITORY_JAR", "@LIBREPOSITORY_JAR@","e" );
-ToFile( "LIBBASE_JAR",       "@LIBBASE_JAR@",      "e" );
-ToFile( "LIBFONTS_JAR",      "@LIBFONTS_JAR@",     "e" );
-ToFile( "LIBSERIALIZER_JAR", "@LIBSERIALIZER_JAR@","e" );
-ToFile( "ENABLE_MEDIAWIKI",  "@ENABLE_MEDIAWIKI@", "e" );
-ToFile( "SYSTEM_APACHE_COMMONS","@SYSTEM_APACHE_COMMONS@","e" );
-ToFile( "COMMONS_CODEC_JAR", "@COMMONS_CODEC_JAR@","e" );
-ToFile( "COMMONS_LANG_JAR",  "@COMMONS_LANG_JAR@", "e" );
-ToFile( "COMMONS_HTTPCLIENT_JAR","@COMMONS_HTTPCLIENT_JAR@","e" );
-ToFile( "COMMONS_LOGGING_JAR","@COMMONS_LOGGING_JAR@","e" );
-ToFile( "SYSTEM_SERVLETAPI", "@SYSTEM_SERVLETAPI@", "e" );
-ToFile( "SERVLETAPI_JAR",    "@SERVLETAPI_JAR@",   "e" );
-ToFile( "ENABLE_DBUS",       "@ENABLE_DBUS@",      "e" );
-ToFile( "ENABLE_GCONF",      "@ENABLE_GCONF@",     "e" );
-ToFile( "ENABLE_GNOMEVFS",   "@ENABLE_GNOMEVFS@",  "e" );
-ToFile( "ENABLE_GSTREAMER",  "@ENABLE_GSTREAMER@", "e" );
-ToFile( "ENABLE_GIO",        "@ENABLE_GIO@",       "e" );
-ToFile( "ENABLE_KDE",        "@ENABLE_KDE@",       "e" );
-ToFile( "KDE_CFLAGS",        "@KDE_CFLAGS@",       "e" );
-ToFile( "KDE_LIBS",          "@KDE_LIBS@",         "e" );
-ToFile( "MOC",               "@MOC@",              "e" );
-ToFile( "ENABLE_KDE4",       "@ENABLE_KDE4@",      "e" );
-ToFile( "KDE4_CFLAGS",       "@KDE4_CFLAGS@",      "e" );
-ToFile( "KDE4_LIBS",         "@KDE4_LIBS@",        "e" );
-ToFile( "MOC4",              "@MOC4@",             "e" );
-ToFile( "KDE_GLIB_CFLAGS",   "@KDE_GLIB_CFLAGS@",  "e" );
-ToFile( "KDE_GLIB_LIBS",     "@KDE_GLIB_LIBS@",    "e" );
-ToFile( "KDE_HAVE_GLIB",     "@KDE_HAVE_GLIB@",    "e" );
-ToFile( "ENABLE_KAB",        "@ENABLE_KAB@",       "e" );
-ToFile( "PSPRINT",           "TRUE",             "e" );
-ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );
-ToFile( "nodep",             "@nodep@",          "e" );
-ToFile( "TARFILE_LOCATION",  $TARFILE_LOCATION,  "e" );
-ToFile( "GIT_LINK_SRC", "@GIT_LINK_SRC@",  "e" );
-ToFile( "GIT_REPO_NAMES", "@GIT_REPO_NAMES@",  "e" );
-
-#
-# Writing the platform dependent constant values to file.
-# (c = comment, e = environment variable, a = alias )
-ToFile( "Platform dependent constant values.", $empty, "c" );
-ToFile( "SOLAR_JAVA",        $SOLAR_JAVA,        "e" );
-ToFile( "COM",               $COM,               "e" );
-ToFile( "COMPATH",           $COMPATH,           "e" );
-ToFile( "CPU",               $CPU,               "e" );
-ToFile( "CPUNAME",           $CPUNAME,           "e" );
-ToFile( "GUI",               $GUI,               "e" );
-ToFile( "GLIBC",             $GLIBC,             "e" );
-ToFile( "GUIBASE",           $GUIBASE,           "e" );
-ToFile( "GVER",              $GVER,              "e" );
-ToFile( "OS",                $OS,                "e" );
-ToFile( "OSVERSION",         $OSVERSION,         "e" );
-ToFile( "PTHREAD_CFLAGS",    "@PTHREAD_CFLAGS@", "e" );
-ToFile( "PTHREAD_LIBS",      "@PTHREAD_LIBS@",   "e" );
-ToFile( "OUTPATH",           $OUTPATH,           "e" );
-ToFile( "INPATH",            $INPATH,            "e" );
-ToFile( "PATH_SEPERATOR",    $PATH_SEPERATOR,    "e" );
-ToFile( "COMEX",             $COMEX,             "e" );
-ToFile( "DYNAMIC_CRT",       $DYNAMIC_CRT,       "e" );
-ToFile( "use_shl_versions",  $use_shl_versions,  "e" );
-ToFile( "FLIPCMD",           $FLIPCMD,           "e" );
-if ( $platform =~ m/darwin/ && $platform !~ m/^arm/)
-{
-# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
-# build can assume functions/libraries of that version to be available
-# unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk
-# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
-# http://developer.apple.com/technotes/tn2002/tn2064.html
-    ToFile( "MACOSX_DEPLOYMENT_TARGET",       "@MACOSX_DEPLOYMENT_TARGET@",       "e" );
-    ToFile( "MACOSX_SDK_PATH",                "@MACOSX_SDK_PATH@",                "e" );
-    ToFile( "MAC_OS_X_VERSION_MIN_REQUIRED",  "@MAC_OS_X_VERSION_MIN_REQUIRED@", "e" );
-    ToFile( "MAC_OS_X_VERSION_MAX_ALLOWED",   "@MAC_OS_X_VERSION_MAX_ALLOWED@",  "e" );
-}
-
-#
-# Writing the variables to file.
-# (c = comment, e = environment variable, a = alias, n = newline )
-ToFile( "Variable values.",  $empty,             "c" );
-if ( $platform =~ m/cygwin/ )
-{  ToFile( "CYGWIN_PATH",       $CYGWIN_PATH,       "e" );
-   ToFile( "WINDOWS_SDK_HOME",  $WINDOWS_SDK_HOME,  "e" );
-   ToFile( "DIRECTXSDK_LIB",    $DIRECTXSDK_LIB,    "e" );
-   ToFile( "USE_DIRECTX5",      $USE_DIRECTX5,      "e" );
-   ToFile( "ATL_LIB",           $ATL_LIB,           "e" );
-   if ( $MINGW ne "yes" )
-   {  ToFile( "ATL_INCLUDE",       $ATL_INCLUDE,       "e" );
-   }
-   ToFile( "MFC_LIB",           $MFC_LIB,         "e" );
-   ToFile( "MFC_INCLUDE",       $MFC_INCLUDE,       "e" );
-   ToFile( "NSIS_PATH",         $NSIS_PATH,         "e" );
-   ToFile( "DISABLE_ACTIVEX",   "@DISABLE_ACTIVEX@","e" );
-   ToFile( "DISABLE_ATL",   "@DISABLE_ATL@","e" );
-   # Variables used when building the parts that needs to be available
-   # also as 64-bit versions in a 32-bit LibreOffice build, like
-   # the Explorer extension. If the configure script hasn't
-   # found the 64-bit (cross-)compiler, then @BUILD_X64@ will be empty.
-   ToFile( "BUILD_X64",         "@BUILD_X64@",      "e" );
-   if ( "@BUILD_X64@" eq "TRUE" ) {
-       ToFile( "CC_X64_BINARY", "@CC_X64_BINARY@",  "e" );
-       ToFile( "CXX_X64_BINARY","@CXX_X64_BINARY@", "e" );
-       ToFile( "LINK_X64_BINARY","@LINK_X64_BINARY@","e" );
-       ToFile( "LIBMGR_X64_BINARY","@LIBMGR_X64_BINARY@","e" );
-   }
-
-   # Hack around dmake's mktmp not generating DOS paths.
-   my $tmpdir = qx{cygpath -m "/tmp"};
-   chomp($tmpdir);
-   ToFile( "TMPDIR",     $tmpdir,            "e" );
-   if ( !defined $ENV{"TMP"} || $ENV{"TMP"} eq "" ) {
-      ToFile( "TMP", $tmpdir, "e" );
-   } else {
-      ToFile( "TMP", "$ENV{'TMP'}", "e" );
-   }
-}
-elsif ( $platform =~ m/mingw32/ )
-{  ToFile( "NSIS_PATH",         $NSIS_PATH,         "e" );
-   ToFile( "DISABLE_ACTIVEX",   "@DISABLE_ACTIVEX@","e" );
-   ToFile( "DISABLE_ATL",       "@DISABLE_ATL@",    "e" );
-}
-
-if ("@WITH_VC_REDIST@" eq "TRUE") {
-ToFile( "WITH_VC_REDIST", "TRUE",  "e" );
-}
-ToFile( "PERL",              $PERL,              "e" );
-ToFile( "RPM",               "@RPM@",            "e" );
-ToFile( "DPKG",              "@DPKG@",           "e" );
-ToFile( "PKGMK",             "@PKGMK@",          "e" );
-ToFile( "GNUMAKE",           "@GNUMAKE@",        "e" );
-ToFile( "GNUTAR",            "@GNUTAR@",         "e" );
-ToFile( "UPD",               $UPD,               "e" );
-ToFile( "WORK_STAMP",        $WORK_STAMP,        "e" );
-ToFile( "SOLARVER",          $SOLARVER,          "e" );
-ToFile( "SOLARVERSION",      $SOLARVERSION,      "e" );
-ToFile( "WORKDIR",           $WORKDIR,           "e" );
-ToFile( "OUTDIR",            $OUTDIR,            "e" );
-ToFile( "SOLARENV",          $SOLARENV,          "e" );
-ToFile( "SOLARDEFIMG",       $SOLARDEFIMG,       "e" );
-ToFile( "SOLARENVINC",       $SOLARENVINC,       "e" );
-ToFile( "DMAKEROOT",         $DMAKEROOT,         "e" );
-if ( $JDK ne "gcj" ) {
-   ToFile( "CLASSPATH",         $CLASSPATH,         "e" );
-   ToFile( "XCLASSPATH",        $XCLASSPATH,        "e" );
-   ToFile( "JAVACISKAFFE",     '@JAVACISKAFFE@',    "e" );
-}
-else {
-   ToFile( "JAVACISGCJ",       '@JAVACISGCJ@',      "e" );
-}
-if ( $GUI eq "UNX" ) {
-   ToFile( "AWTLIB",           '@AWTLIB@',          "e" );
-}
-if ( '@JDK@' ne '' )
-{
-   ToFile( "JDK",             "@JDK@",           "e" );
-   ToFile( "JAVAFLAGS",             "@JAVAFLAGS@",           "e" );
-   ToFile( "JAVA_SOURCE_VER", "@JAVA_SOURCE_VER@","e" );
-   ToFile( "JAVA_TARGET_VER", "@JAVA_TARGET_VER@","e" );
-   ToFile( "JAVAINTERPRETER", PathFormat("@JAVAINTERPRETER@"), "e" );
-   ToFile( "JAVAIFLAGS",      "@JAVAIFLAGS@",    "e" );
-   ToFile( "JAVACOMPILER",    PathFormat("@JAVACOMPILER@"), "e" );
-   ToFile( "JAVADOC",         PathFormat("@JAVADOC@"), "e" );
-   ToFile( "JVM_ONE_PATH_CHECK", "@JVM_ONE_PATH_CHECK@", "e" );
-}
-ToFile( "SCPDEFS",           '@SCPDEFS@',        "e" );
-ToFile( "SOLAREXTRAINC",     $SOLAREXTRAINC,     "e" );
-ToFile( "SOLAREXTRALIB",     $SOLAREXTRALIB,     "e" );
-if ( '@CROSS_COMPILING@' eq 'YES' )
-{
-   # Obviously we shouldn't set PATH to contain host binaries
-   ToFile( "PATH",           "@PATH_FOR_BUILD@", "e" );
-}
-else
-{
-   ToFile( "PATH",           $PATH,              "e" );
-}
-ToFile( "SOLARLIB",          $SOLARLIB,          "e" );
-ToFile( "JAVALIB",           $JAVALIB,           "e" );
-ToFile( "SOLARINC",          $SOLARINC,          "e" );
-ToFile( "COMP_ENV",          $COMP_ENV,          "e" );
-ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
-ToFile( "CC",                $CC,                "e" );
-ToFile( "SYSBASE",           "$ENV{SYSBASE}",    "e" ) if defined $ENV{SYSBASE};
-ToFile( "CROSS_COMPILING",   "@CROSS_COMPILING@","e" );
-ToFile( "AR",                "@AR@",             "e" );
-ToFile( "DLLTOOL",           "@DLLTOOL@",        "e" );
-ToFile( "NM",                "@NM@",             "e" );
-ToFile( "OBJDUMP",           "@OBJDUMP@",        "e" );
-ToFile( "PKG_CONFIG",        "@PKG_CONFIG@",     "e" );
-ToFile( "RANLIB",            "@RANLIB@",         "e" );
-ToFile( "STRIP",             "@STRIP@",          "e" );
-ToFile( "WINDRES",           "@WINDRES@",        "e" );
-ToFile( "BUILD_PLATFORM",    "@build@",          "e" );
-ToFile( "HOST_PLATFORM",     "@host@",           "e" );
-if ( '@CROSS_COMPILING@' eq 'YES' )
-{
-   ToFile( "COM_FOR_BUILD",     "@COM_FOR_BUILD@",  "e" );
-   ToFile( "GUI_FOR_BUILD",     "@GUI_FOR_BUILD@",  "e" );
-   ToFile( "GUIBASE_FOR_BUILD", "@GUIBASE_FOR_BUILD@", "e" );
-   ToFile( "OS_FOR_BUILD",      "@OS_FOR_BUILD@",   "e" );
-   ToFile( "CPU_FOR_BUILD",     "@CPU_FOR_BUILD@",  "e" );
-   ToFile( "CPUNAME_FOR_BUILD", "@CPUNAME_FOR_BUILD@", "e" );
-   ToFile( "CC_FOR_BUILD",      "@CC_FOR_BUILD@",   "e" );
-   ToFile( "CXX_FOR_BUILD",     "@CXX_FOR_BUILD@",  "e" );
-   ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", "@GXX_INCLUDE_PATH_FOR_BUILD@", "e" );
-   ToFile( "INPATH_FOR_BUILD",  "@INPATH_FOR_BUILD@", "e" );
-   ToFile( "OUTPATH_FOR_BUILD", "@OUTPATH_FOR_BUILD@", "e" );
-   ToFile( "MACOSX_DEPLOYMENT_TARGET_FOR_BUILD", "@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@", "e" );
-   ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT_FOR_BUILD@", "e" );
-   ToFile( "OUTDIR_FOR_BUILD",  "@OUTDIR_FOR_BUILD@", "e");
-   ToFile( "SOLARINC_FOR_BUILD", "@SOLARINC_FOR_BUILD@", "e");
-   ToFile( "SOLARLIB_FOR_BUILD", "@SOLARLIB_FOR_BUILD@", "e");
-   ToFile( "WORKDIR_FOR_BUILD", "@WORKDIR_FOR_BUILD@", "e");
-}
-else
-{
-   ToFile( "COM_FOR_BUILD",     $COM,            "e" );
-   ToFile( "GUI_FOR_BUILD",     $GUI,            "e" );
-   ToFile( "GUIBASE_FOR_BUILD", $GUIBASE,        "e" );
-   ToFile( "OS_FOR_BUILD",      $OS,             "e" );
-   ToFile( "CPU_FOR_BUILD",     $CPU,            "e" );
-   ToFile( "CPUNAME_FOR_BUILD", $CPUNAME,        "e" );
-   ToFile( "CC_FOR_BUILD",      $CC,             "e" );
-   ToFile( "CXX_FOR_BUILD",     $CXX,            "e" );
-   ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", PathFormat("@GXX_INCLUDE_PATH@"), "e" );
-   ToFile( "INPATH_FOR_BUILD",  $INPATH,         "e" );
-   ToFile( "OUTPATH_FOR_BUILD", $OUTPATH,        "e" );
-   ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT@", "e" );
-   ToFile( "OUTDIR_FOR_BUILD",  $OUTDIR,         "e" );
-   ToFile( "PATH_FOR_BUILD",    $PATH,           "e" );
-   ToFile( "SOLARINC_FOR_BUILD", $SOLARINC,      "e" );
-   ToFile( "SOLARLIB_FOR_BUILD", $SOLARLIB,      "e" );
-   ToFile( "WORKDIR_FOR_BUILD", $WORKDIR,        "e" );
-}
-ToFile( "SIZEOF_SHORT",         "@SIZEOF_SHORT@", "e" );
-ToFile( "SIZEOF_INT",           "@SIZEOF_INT@",  "e" );
-ToFile( "SIZEOF_LONG",          "@SIZEOF_LONG@", "e" );
-ToFile( "SIZEOF_LONGLONG",      "@SIZEOF_LONGLONG@", "e" );
-ToFile( "SIZEOF_DOUBLE",        "@SIZEOF_DOUBLE@", "e" );
-ToFile( "SIZEOF_POINTER",       "@SIZEOF_POINTER@", "e" );
-ToFile( "ALIGNOF_SHORT",        "@ALIGNOF_SHORT@", "e" );
-ToFile( "ALIGNOF_INT",          "@ALIGNOF_INT@", "e" );
-ToFile( "ALIGNOF_LONG",         "@ALIGNOF_LONG@", "e" );
-ToFile( "ALIGNOF_DOUBLE",       "@ALIGNOF_DOUBLE@", "e" );
-ToFile( "HAVE_GCC_NO_LONG_DOUBLE", "@HAVE_GCC_NO_LONG_DOUBLE@", "e" );
-ToFile( "HAVE_GCC_AVX", "@HAVE_GCC_AVX@", "e" );
-ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
-		"@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
-ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
-        "@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
-ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
-ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
-ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
-		"@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
-ToFile( "HAVE_CXX0X",        "@HAVE_CXX0X@",     "e" );
-ToFile( "CXX",               $CXX,               "e" );
-ToFile( "USE_CCACHE",        "@USE_CCACHE@",     "e" );
-ToFile( "MINGWCXX",          "@MINGWCXX@",       "e" );
-ToFile( "MINGWSTRIP",        "@MINGWSTRIP@",     "e" );
-ToFile( "WITH_STLPORT",      "@WITH_STLPORT@", "e" );
-ToFile( "ALLOC",             "@ALLOC@",          "e" );
-ToFile( "ENABLE_SYMBOLS",    "@ENABLE_SYMBOLS@",    "e" );
-ToFile( "DISABLE_STRIP",     "@DISABLE_STRIP@",     "e" );
-ToFile( "LFS_CFLAGS",        "@LFS_CFLAGS@",     "e" );
-ToFile( "ENABLE_CRASHDUMP",  "@ENABLE_CRASHDUMP@",  "e" );
-ToFile( "ENABLE_CUPS",       "@ENABLE_CUPS@",       "e" );
-ToFile( "ENABLE_RANDR",      "@ENABLE_RANDR@",      "e" );
-ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
-ToFile( "FONTCONFIG_LIBS",   "@FONTCONFIG_LIBS@",   "e");
-ToFile( "FONTCONFIG_CFLAGS", "@FONTCONFIG_CFLAGS@", "e");
-ToFile( "ENABLE_DIRECTX",    "@ENABLE_DIRECTX@",    "e" );
-ToFile( "ENABLE_LAYOUT",     "@ENABLE_LAYOUT@",     "e" );
-ToFile( "ENABLE_PCH",        "@ENABLE_PCH@",       "e" );
-ToFile( "ENABLE_GRAPHITE",   "@ENABLE_GRAPHITE@",   "e");
-ToFile( "SYSTEM_GRAPHITE",   "@SYSTEM_GRAPHITE@",   "e");
-ToFile( "GRAPHITE_LIBS",     "@GRAPHITE_LIBS@",     "e");
-ToFile( "GRAPHITE_CFLAGS",   "@GRAPHITE_CFLAGS@",   "e");
-ToFile( "CL_X64",            "@CL_X64@",            "e");
-ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
-ToFile( "SYSTEM_DICTS",      "@SYSTEM_DICTS@",     "e");
-ToFile( "DICT_SYSTEM_DIR",   "@DICT_SYSTEM_DIR@",  "e");
-ToFile( "HYPH_SYSTEM_DIR",   "@HYPH_SYSTEM_DIR@",  "e");
-ToFile( "THES_SYSTEM_DIR",   "@THES_SYSTEM_DIR@",  "e");
-ToFile( "ENABLE_LOCKDOWN",   "@ENABLE_LOCKDOWN@",  "e" );
-ToFile( "WITH_LDAP",         "@WITH_LDAP@",        "e" );
-ToFile( "WITH_OPENLDAP",     "@WITH_OPENLDAP@",    "e" );
-ToFile( "WITH_MOZILLA",      "@WITH_MOZILLA@",     "e" );
-ToFile( "SYSTEM_MOZILLA",    "@SYSTEM_MOZILLA@",   "e" );
-ToFile( "MOZ_FLAVOUR",       "@MOZ_FLAVOUR@",      "e" );
-ToFile( "NSPR_LIB",          "@NSPR_LIB@",         "e" );
-ToFile( "NSS_LIB",           "@NSS_LIB@",          "e" );
-ToFile( "MOZ_INC",           "@MOZ_INC@",          "e" );
-ToFile( "MOZ_LIB",           "@MOZ_LIB@",          "e" );
-ToFile( "MOZ_LIB_XPCOM",     "@MOZ_LIB_XPCOM@",    "e" );
-ToFile( "MOZ_NSPR_CFLAGS",   "@MOZ_NSPR_CFLAGS@",  "e" );
-ToFile( "MOZ_NSS_CFLAGS",    "@MOZ_NSS_CFLAGS@",   "e" );
-ToFile( "MOZ_NSS_LIBS",      "@MOZ_NSS_LIBS@",     "e" );
-ToFile( "MOZ_LDAP_CFLAGS",   "@MOZ_LDAP_CFLAGS@",  "e" );
-ToFile( "OOOP_GALLERY_PACK", "@OOOP_GALLERY_PACK@","e" );
-ToFile( "OOOP_TEMPLATES_PACK", "@OOOP_TEMPLATES_PACK@","e" );
-ToFile( "OOOP_FONTS_PACK",   "@OOOP_FONTS_PACK@","e" );
-ToFile( "OOOP_SAMPLES_PACK", "@OOOP_SAMPLES_PACK@","e" );
-ToFile( "CT2N_EXTENSION_PACK", "@CT2N_EXTENSION_PACK@","e" );
-ToFile( "BARCODE_EXTENSION_PACK", "@BARCODE_EXTENSION_PACK@","e" );
-ToFile( "DIAGRAM_EXTENSION_PACK", "@DIAGRAM_EXTENSION_PACK@","e" );
-ToFile( "VALIDATOR_EXTENSION_PACK", "@VALIDATOR_EXTENSION_PACK@","e" );
-ToFile( "WATCH_WINDOW_EXTENSION_PACK", "@WATCH_WINDOW_EXTENSION_PACK@","e" );
-ToFile( "NUMBERTEXT_EXTENSION_PACK", "@NUMBERTEXT_EXTENSION_PACK@","e" );
-ToFile( "HUNART_EXTENSION_PACK", "@HUNART_EXTENSION_PACK@","e" );
-ToFile( "TYPO_EXTENSION_PACK", "@TYPO_EXTENSION_PACK@","e" );
-ToFile( "GOOGLE_DOCS_EXTENSION_PACK", "@GOOGLE_DOCS_EXTENSION_PACK@","e" );
-ToFile( "OOOBLOGGER_EXTENSION_PACK", "@OOOBLOGGER_EXTENSION_PACK@","e" );
-ToFile( "SUNTEMPLATES_LANG", "@SUNTEMPLATES_LANG@","e" );
-ToFile( "SUNTEMPLATES_DE_PACK", "@SUNTEMPLATES_DE_PACK@","e" );
-ToFile( "SUNTEMPLATES_EN_US_PACK", "@SUNTEMPLATES_EN_US_PACK@","e" );
-ToFile( "SUNTEMPLATES_ES_PACK", "@SUNTEMPLATES_ES_PACK@","e" );
-ToFile( "SUNTEMPLATES_FR_PACK", "@SUNTEMPLATES_FR_PACK@","e" );
-ToFile( "SUNTEMPLATES_HU_PACK", "@SUNTEMPLATES_HU_PACK@","e" );
-ToFile( "SUNTEMPLATES_IT_PACK", "@SUNTEMPLATES_IT_PACK@","e" );
-ToFile( "LIGHTPROOF_EN_US_PACK", "@LIGHTPROOF_EN_US_PACK@","e" );
-ToFile( "LIGHTPROOF_HU_PACK", "@LIGHTPROOF_HU_PACK@","e" );
-ToFile( "LIGHTPROOF_LANG",   "@LIGHTPROOF_LANG@",  "e" );
-ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );
-ToFile( "WITH_AGFA_MONOTYPE_FONTS",  "@WITH_AGFA_MONOTYPE_FONTS@", "e" );
-ToFile( "WITHOUT_AFMS",      "@WITHOUT_AFMS@",     "e" );
-ToFile( "WITHOUT_PPDS",      "@WITHOUT_PPDS@",     "e" );
-ToFile( "WITH_BINFILTER",    "@WITH_BINFILTER@",   "e" );
-ToFile( "BUILD_TYPE",        "$BUILD_TYPE",       "e" );
-ToFile( "VERBOSE",           "@VERBOSE@",          "e" );
-ToFile( "ENABLE_ZENITY",           "@ENABLE_ZENITY@",          "e" );
-ToFile( "ENABLE_EVOAB2",     "@ENABLE_EVOAB2@",    "e" );
-ToFile( "ENABLE_UGLY",       "@ENABLE_UGLY@",      "e" );
-ToFile( "ENABLE_RELEASE_BUILD", "@ENABLE_RELEASE_BUILD@", "e" );
-ToFile( "GOBJECT_CFLAGS",    "@GOBJECT_CFLAGS@",   "e" );
-ToFile( "GOBJECT_LIBS",      "@GOBJECT_LIBS@",     "e" );
-if ( '@ENABLE_RPATH@' eq "no" ) {
-  ToFile( "LINKFLAGSRUNPATH",'',                   "e" );
-}
-ToFile( "EPM",               "@EPM@",              "e" );
-ToFile( "EPM_FLAGS",         $EPM_FLAGS,           "e" );
-ToFile( "BUILD_EPM",         "@BUILD_EPM@",        "e" );
-ToFile( "GPERF",             "@GPERF@",            "e" );
-ToFile( "PKGFORMAT",         "@PKGFORMAT@",        "e" );
-ToFile( "SYSTEM_STDLIBS",    "@SYSTEM_STDLIBS@",   "e" );
-ToFile( "SYSTEM_ZLIB",       "@SYSTEM_ZLIB@",      "e" );
-ToFile( "SYSTEM_OPENSSL",    "@SYSTEM_OPENSSL@",   "e" );
-ToFile( "OPENSSL_CFLAGS",    "@OPENSSL_CFLAGS@",   "e" );
-ToFile( "OPENSSL_LIBS",      "@OPENSSL_LIBS@",     "e" );
-ToFile( "DISABLE_PYTHON",    "@DISABLE_PYTHON@",   "e" );
-ToFile( "SYSTEM_PYTHON",     "@SYSTEM_PYTHON@",    "e" );
-ToFile( "PYTHON",            "@PYTHON@",           "e" );
-ToFile( "PYTHON_CFLAGS",     "@PYTHON_CFLAGS@",    "e" );
-ToFile( "PYTHON_LIBS",       "@PYTHON_LIBS@",      "e" );
-ToFile( "SYSTEM_ICU",        "@SYSTEM_ICU@",       "e" );
-ToFile( "ICU_MAJOR",         "@ICU_MAJOR@",        "e" );
-ToFile( "ICU_MINOR",         "@ICU_MINOR@",        "e" );
-ToFile( "ICU_MICRO",         "@ICU_MICRO@",        "e" );
-ToFile( "SYSTEM_GENBRK",     "@SYSTEM_GENBRK@",    "e" );
-ToFile( "SYSTEM_GENCCODE",   "@SYSTEM_GENCCODE@",  "e" );
-ToFile( "SYSTEM_GENCMN",     "@SYSTEM_GENCMN@",    "e" );
-ToFile( "SYSTEM_JPEG",       "@SYSTEM_JPEG@",      "e" );
-ToFile( "FREETYPE_CFLAGS",   "@FREETYPE_CFLAGS@",  "e" );
-ToFile( "FREETYPE_LIBS",     "@FREETYPE_LIBS@",    "e" );
-ToFile( "SYSTEM_POPPLER",    "@SYSTEM_POPPLER@",   "e" );
-ToFile( "POPPLER_CFLAGS",    "@POPPLER_CFLAGS@",   "e" );
-ToFile( "POPPLER_LIBS",      "@POPPLER_LIBS@",     "e" );
-ToFile( "GSTREAMER_CFLAGS",  "@GSTREAMER_CFLAGS@", "e" );
-ToFile( "GSTREAMER_LIBS",    "@GSTREAMER_LIBS@",   "e" );
-ToFile( "SYSTEM_CAIRO",      "@SYSTEM_CAIRO@",     "e" );
-ToFile( "CAIRO_CFLAGS",      "@CAIRO_CFLAGS@",     "e" );
-ToFile( "CAIRO_LIBS",        "@CAIRO_LIBS@",       "e" );
-ToFile( "XRANDR_CFLAGS",     "@XRANDR_CFLAGS@",    "e" );
-ToFile( "XRANDR_LIBS",       "@XRANDR_LIBS@",      "e" );
-ToFile( "XRANDR_DLOPEN",     "@XRANDR_DLOPEN@",    "e" );
-ToFile( "LIBPNG_CFLAGS",     "@LIBPNG_CFLAGS@",    "e" );
-ToFile( "LIBPNG_LIBS",       "@LIBPNG_LIBS@",      "e" );
-ToFile( "SYSTEM_LIBWPD",     "@SYSTEM_LIBWPD@",    "e" );
-ToFile( "LIBWPD_CFLAGS",     "@LIBWPD_CFLAGS@",    "e" );
-ToFile( "LIBWPD_LIBS",       "@LIBWPD_LIBS@",      "e" );
-ToFile( "SYSTEM_LIBWPS",     "@SYSTEM_LIBWPS@",    "e" );
-ToFile( "LIBWPS_CFLAGS",     "@LIBWPS_CFLAGS@",    "e" );
-ToFile( "LIBWPS_LIBS",       "@LIBWPS_LIBS@",      "e" );
-ToFile( "SYSTEM_LIBWPG",     "@SYSTEM_LIBWPG@",    "e" );
-ToFile( "LIBWPG_CFLAGS",     "@LIBWPG_CFLAGS@",    "e" );
-ToFile( "LIBWPG_LIBS",       "@LIBWPG_LIBS@",      "e" );
-ToFile( "SYSTEM_LIBVISIO",   "@SYSTEM_LIBVISIO@",  "e" );
-ToFile( "LIBVISIO_CFLAGS",   "@LIBVISIO_CFLAGS@",  "e" );
-ToFile( "LIBVISIO_LIBS",     "@LIBVISIO_LIBS@",    "e" );
-ToFile( "SYSTEM_CPPUNIT",    "@SYSTEM_CPPUNIT@",   "e" );
-ToFile( "CPPUNIT_CFLAGS",    "@CPPUNIT_CFLAGS@",   "e" );
-ToFile( "CPPUNIT_LIBS",      "@CPPUNIT_LIBS@",     "e" );
-ToFile( "SYSTEM_LIBXML",     "@SYSTEM_LIBXML@",    "e" );
-ToFile( "USE_FT_EMBOLDEN",   "@USE_FT_EMBOLDEN@",  "e" );
-ToFile( "LIBXML_CFLAGS",     "@LIBXML_CFLAGS@",    "e" );
-ToFile( "LIBXML_LIBS",       "@LIBXML_LIBS@",      "e" );
-ToFile( "SYSTEM_EXPAT",      "@SYSTEM_EXPAT@",     "e" );
-ToFile( "WITH_EXTRA_GALLERY",       "@WITH_EXTRA_GALLERY@",      "e" );
-ToFile( "WITH_EXTRA_TEMPLATE",       "@WITH_EXTRA_TEMPLATE@",      "e" );
-ToFile( "WITH_EXTRA_SAMPLE",       "@WITH_EXTRA_SAMPLE@",      "e" );
-ToFile( "WITH_EXTRA_FONT",       "@WITH_EXTRA_FONT@",      "e" );
-ToFile( "SYSTEM_TRANSLATE_TOOLKIT", "@SYSTEM_TRANSLATE_TOOLKIT@",        "e" );
-ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
-ToFile( "SYSTEM_DB_CFLAGS",  "@SYSTEM_DB_CFLAGS@", "e" );
-ToFile( "DB_LIB",            "@DB_LIB@",           "e" );
-ToFile( "DB_CPPLIB",         "@DB_CPPLIB@",        "e" );
-ToFile( "ENABLE_MYSQLC",     "@ENABLE_MYSQLC@",    "e" );
-ToFile( "ENABLE_LOMENUBAR",  "@ENABLE_LOMENUBAR@", "e" );
-ToFile( "DBUSMENUGTK_CFLAGS",  "@DBUSMENUGTK_CFLAGS@", "e" );
-ToFile( "DBUSMENUGTK_LIBS",  "@DBUSMENUGTK_LIBS@", "e" );
-ToFile( "ENABLE_ONLINE_UPDATE","@ENABLE_ONLINE_UPDATE@", "e" );
-ToFile( "SYSTEM_MYSQL",      "@SYSTEM_MYSQL@",     "e" );
-ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
-ToFile( "MYSQL_INC",         "@MYSQL_INC@",        "e" );
-ToFile( "MYSQL_LIB",         "@MYSQL_LIB@",        "e" );
-ToFile( "MYSQL_DEFINES",     "@MYSQL_DEFINES@",    "e" );
-ToFile( "LIBMYSQL_PATH",     "@LIBMYSQL_PATH@",    "e" );
-ToFile( "SYSTEM_HSQLDB",     "@SYSTEM_HSQLDB@",    "e" );
-ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
-ToFile( "SYSTEM_LUCENE",     "@SYSTEM_LUCENE@",    "e" );
-ToFile( "LUCENE_CORE_JAR",   "@LUCENE_CORE_JAR@",  "e" );
-ToFile( "LUCENE_ANALYZERS_JAR",   "@LUCENE_ANALYZERS_JAR@",  "e" );
-ToFile( "SYSTEM_BSH",        "@SYSTEM_BSH@",       "e" );
-ToFile( "BSH_JAR",           "@BSH_JAR@",          "e" );
-ToFile( "SYSTEM_SAXON",      "@SYSTEM_SAXON@",     "e" );
-ToFile( "SAXON_JAR",         "@SAXON_JAR@",        "e" );
-ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
-ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
-ToFile( "LIBXSLT_CFLAGS",    "@LIBXSLT_CFLAGS@",   "e" );
-ToFile( "LIBXSLT_LIBS",      "@LIBXSLT_LIBS@",     "e" );
-ToFile( "XSLTPROC",          "@XSLTPROC@",         "e" );
-ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" );
-ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" );
-ToFile( "SYSTEM_MESA_HEADERS","@SYSTEM_MESA_HEADERS@","e" );
-ToFile( "SYSTEM_CURL",       "@SYSTEM_CURL@",      "e" );
-ToFile( "CURL_CFLAGS",       "@CURL_CFLAGS@",      "e" );
-ToFile( "CURL_LIBS",         "@CURL_LIBS@",        "e" );
-ToFile( "SYSTEM_BOOST",      "@SYSTEM_BOOST@",     "e" );
-ToFile( "MDDS_CPPFLAGS",     "@MDDS_CPPFLAGS@",     "e" );
-ToFile( "SYSTEM_MDDS",       "@SYSTEM_MDDS@",      "e" );
-ToFile( "SYSTEM_VIGRA",      "@SYSTEM_VIGRA@",     "e" );
-ToFile( "SYSTEM_NEON",       "@SYSTEM_NEON@",      "e" );
-ToFile( "ENABLE_LIBRSVG",    "@ENABLE_LIBRSVG@",   "e" );
-ToFile( "SYSTEM_LIBRSVG",    "@SYSTEM_LIBRSVG@",   "e" );
-ToFile( "SYSTEM_GDKPIXBUF",  "@SYSTEM_GDKPIXBUF@",   "e" );
-ToFile( "SYSTEM_GLIB",       "@SYSTEM_GLIB@",   "e" );
-ToFile( "SYSTEM_GETTEXT",    "@SYSTEM_GETTEXT@",   "e" );
-ToFile( "SYSTEM_LIBCROCO",   "@SYSTEM_LIBCROCO@",   "e" );
-ToFile( "SYSTEM_PANGO",      "@SYSTEM_PANGO@",   "e" );
-ToFile( "SYSTEM_LIBGSF",     "@SYSTEM_LIBGSF@",   "e" );
-ToFile( "SYSTEM_LIBPNG",     "@SYSTEM_LIBPNG@",   "e" );
-ToFile( "SYSTEM_LIBJPEG",    "@SYSTEM_LIBJPEG@",   "e" );
-ToFile( "NEON_VERSION",      "@NEON_VERSION@",     "e" );
-ToFile( "NEON_LIBS",         "@NEON_LIBS@",        "e" );
-ToFile( "NEON_CFLAGS",       "@NEON_CFLAGS@",      "e" );
-ToFile( "DISABLE_NEON",      "@DISABLE_NEON@",     "e" );
-ToFile( "BUILD_DMAKE",       "@BUILD_DMAKE@",      "e" );
-ToFile( "BUILD_STAX",        "@BUILD_STAX@",       "e" );
-ToFile( "BUILD_UNOWINREG",   "@BUILD_UNOWINREG@",  "e" );
-ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );
-ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
-ToFile( "SYSTEM_REDLAND",    "@SYSTEM_REDLAND@",   "e" );
-ToFile( "REDLAND_CFLAGS",    "@REDLAND_CFLAGS@",   "e" );
-ToFile( "REDLAND_LIBS",      "@REDLAND_LIBS@",     "e" );
-ToFile( "SYSTEM_HUNSPELL",   "@SYSTEM_HUNSPELL@",  "e" );
-ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );
-ToFile( "HUNSPELL_LIBS",     "@HUNSPELL_LIBS@",    "e" );
-ToFile( "SYSTEM_LPSOLVE",    "@SYSTEM_LPSOLVE@",   "e" );
-ToFile( "HAVE_GETOPT",       "@HAVE_GETOPT@",      "e" );
-ToFile( "HAVE_READDIR_R",    "@HAVE_READDIR_R@",   "e" );
-ToFile( "SYSTEM_LIBC",       "@SYSTEM_LIBC@",      "e" );
-ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
-ToFile( "HYPHEN_LIB",        "@HYPHEN_LIB@",       "e" );
-ToFile( "SYSTEM_MYTHES",     "@SYSTEM_MYTHES@",    "e" );
-ToFile( "MYTHES_CFLAGS",     "@MYTHES_CFLAGS@",    "e" );
-ToFile( "MYTHES_LIBS",       "@MYTHES_LIBS@",      "e" );
-ToFile( "SYSTEM_LIBTEXTCAT", "@SYSTEM_LIBTEXTCAT@","e" );
-ToFile( "SYSTEM_LIBTEXTCAT_DATA","@SYSTEM_LIBTEXTCAT_DATA@","e" );
-ToFile( "XAU_LIBS",          "@XAU_LIBS@",         "e" );
-ToFile( "GXX_INCLUDE_PATH",  PathFormat("@GXX_INCLUDE_PATH@"), "e" );
-ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS,  "e" );
-
-if ($platform !~ m/cygwin/) {
-   if ( !defined $ENV{"TMPDIR"} || $ENV{"TMPDIR"} eq "" ) {
-      ToFile( "TMPDIR",      "/tmp",               "e" );
-   } else {
-      ToFile( "TMPDIR",      "$ENV{'TMPDIR'}",     "e" );
-   }
-}
-ToFile( "SOLARSRC",           $SOLARSRC,           "e" );
-ToFile( "gb_REPOS",           $gb_REPOS,           "e" );
-
-if ( $platform =~ m/cygwin/ )
-{
-   ToFile( "ILIB",              $ILIB,              "e" );
-   if ( $MINGW eq "yes" )
-   {  ToFile( "ATL_INCLUDE",       $ATL_INCLUDE,       "e" );
-      ToFile( "EXCEPTIONS",        "@EXCEPTIONS@",        "e" );
-      ToFile( "DIRECTXSDK_HOME",    PathFormat("@DIRECTXSDK_HOME@"),    "e" );
-      ToFile( "USE_MINGW",         $USE_MINGW,              "e" );
-      ToFile( "MINGW_CLIB_DIR",         PathFormat("@MINGW_CLIB_DIR@"),              "e" );
-      ToFile( "MINGW_SHARED_GCCLIB",         "@MINGW_SHARED_GCCLIB@",              "e" );
-      ToFile( "MINGW_GCCLIB_EH",      "@MINGW_GCCLIB_EH@",              "e" );
-      ToFile( "MINGW_SHARED_GXXLIB",         "@MINGW_SHARED_GXXLIB@",              "e" );
-      ToFile( "MINGW_SHARED_LIBSTDCPP",         "@MINGW_SHARED_LIBSTDCPP@",              "e" );
-      ToFile( "MINGW_GCCDLL",         "@MINGW_GCCDLL@",              "e" );
-      ToFile( "MINGW_GXXDLL",         "@MINGW_GXXDLL@",              "e" );
-   }
-   ToFile( "GREP",              $WIN_GREP,          "e" );
-   ToFile( "FIND",              $WIN_FIND,          "e" );
-   ToFile( "LS",                $WIN_LS,            "e" );
-   ToFile( "GNUCOPY",           $WIN_GNUCOPY,       "e" );
-   ToFile( "TOUCH",             $WIN_TOUCH,         "e" );
-}
-
-ToFile( "DELIVER",       "deliver.pl",     "e" );
-ToFile( "MKOUT",         "mkout.pl",       "e" );
-ToFile( "ZIPDEP",        "zipdep.pl",      "e" );
-
-#
-# Writing the aliases to file.
-ToFile( "Aliases.",          $empty,             "c" );
-ToFile( "Don't set aliases when bootstrapping", $empty, "c" );
-
-ToFile( "alias mkout",       $mkout,             "a" );
-ToFile( "alias deliver",     $deliver,           "a" );
-ToFile( "alias build",       $build,             "a" );
-ToFile( "alias build_client",$build_client,      "a" );
-ToFile( "alias zipdep",      $zipdep,            "a" );
-
-# on Solaris, MacOSX and FreeBSD, set GNUCOPY and GNUPATCH
-if ($platform =~ m/solaris|darwin|freebsd/)
-{
-  ToFile( "GNUPATCH",   "@GNUPATCH@",	"e");
-}
-ToFile( "GNUCOPY",	"@GNUCP@",	"e");
-ToFile( "SAL_ENABLE_FILE_LOCKING",	"1",	"e");
-
-ToFile( "ENV_SCRIPT", "$outfile", "e" );
-#
-# Writing unset variables you might not need to file.
-#
-print OUT "export $exportvars$newline";
-print OUT "unset $unsetvars$newline";
-
-#
-#---------------------------
-# VIII. Closing output file.
-#---------------------------
-#
-close( OUT ) || print "Can't close $SRC_ROOT/$outfile: $!";
-
-#--------------------------------------------------------
-# XII. Message at the end.
-#--------------------------------------------------------
-#
-#
-print "$newline";
-print "*********************************************************".
-      "*******************$newline*$newline";
-print "* LibreOffice configuration finished. $newline*$newline";
-
-if ( $Warning ne "" )
-{  print "$Warning*$newline";
-}
-
-print "*********************************************************".
-      "******************* $newline";
-
-print "To build, issue:\n$GNUMAKE\n\n";
-print "To install when the build is finished, issue:\n$GNUMAKE install\n\n";
-print "If you want to develop LibreOffice, you might prefer:\n$GNUMAKE dev-install\n\n";
-print "If you want to run the smoketest, issue:\n$GNUMAKE check\n\n";
-
-$bootfile = "bootstrap";
-open( OUT, ">$bootfile" ) ||
-die "Cannot open $bootfile: $!\n";
-print OUT "#!/bin/sh\n";
-if ( $MINGW eq "yes" )
-{  print OUT 'PATH="/usr/bin:$PATH" : export PATH'."\n"; }
-close( OUT ) || print "Can't close $bootfile: $!";
-system(`cat bootstrap.1 >> bootstrap`);
-system(`chmod +x bootstrap`);
-#
-#--------------------------------------------------------
-# Moving the bootstrap file to the build home directory.
-#--------------------------------------------------------
-#
-$tmp = $SRC_ROOT.$ds.$bootfile;
-if (rename( $bootfile, $tmp ) ne 1)
-{  `mv -f $bootfile $tmp`;
-}
-
-if ( $Warning ne "" ) {
-	print "***** WARNINGS ISSUED *****\n";
-}
-
-#
-#-----------------
-# XII. Functions.
-#-----------------
-#
-#-------------------------------------------------------------
-# Function name: CheckPathName
-# Description:   chops off the '/' character if it's the last
-#                character in a pathname. also adds the '/'
-#                character if it's not the first character
-#                in a path.
-# Arguments:     1. Path (string)
-# Return value:  Path (string)
-#-------------------------------------------------------------
-sub CheckPathName
-{  my $retrn = $_[ 0 ];
-   if ($platform =~ m/cygwin/)
-   {  # Check if the first character is not a '/'.
-      if ( !( $_[ 0 ] =~ /^\// ) )
-      {  $retrn = $ds.$_[ 0 ];
-      }
-   }
-   # kill the last '/','\','\n' if they exists.
-   $retrn =~ s![\s/\\]+$!!;
-   # Done!
-   return( $retrn );
-}
-#-------------------------------------------------------------
-# Function name: CheckPathExist
-# Description:   Checks whether the directory that is given
-#                as an argument exists. If not abort.
-# Arguments:     1. Path (string)
-# Return value:  void
-#-------------------------------------------------------------
-sub CheckPathExist
-{  my $dir = $_[ 0 ];
-   if ( !( -d $dir ) and $^O ne 'MSWin32' )
-   {  print ( "The directory $_[ 0 ] does not exist. Please create first.\n" );
-      exit 1;
-   }
-   else
-   {  # Don't check under ActiveState Perl (Windows). The path is possibly
-      # posix and it cannot handle it.
-      return "true";
-   }
-}
-#------------------------------------------------------------
-# Function name: CreateFileHeader
-# Description:   Creates a header for the outfile.
-# Arguments:     1. File to write to
-#                2. UPD (string)
-#                3. Platform (string)
-#                4. name of shell for this file
-#                5. comment to use for this file
-# Return value:  void
-#------------------------------------------------------------
-sub CreateFileHeader
-{  my $timestamp = `date`;
-   chomp( $timestamp );
-   my $filehandle = $_[0];
-   my $comment = $_[4];
-   print { $filehandle } "$comment #################################################################";
-   print { $filehandle } $newline;
-   print { $filehandle } "$comment LibreOffice $_[ 1 ] build environment file for: $_[ 2 ]. $newline";
-   print { $filehandle } "$comment Generated on: $timestamp $newline";
-   print { $filehandle } "$comment Source this file to set up the build environment. $newline";
-   print { $filehandle } "$comment 1. exec $_[3] $newline";
-   print { $filehandle } "$comment 2. source $outfile $newline";
-   print { $filehandle } "$comment #################################################################";
-   print { $filehandle } $newline;
-}
-#---------------------------------------------------------
-# Function name: ToFile
-# Description:   Writes the environment variable in the
-#                output file.
-# Arguments:     1. Name of environment variable (string)
-#                2. Value of environment variable (string)
-#                3. e - env. var
-#                   a - alias
-#                   c - comment
-#                   n - newline
-#                   z - raw, write as is to OUT
-# Return value:  void
-#---------------------------------------------------------
-sub ToFile {
-   if ( $_[ 2 ] eq "e" ) {
-      # Write an environment variable to file.
-      if (defined $_[ 1 ] && $_[ 1 ] ne "" ) {
-         my $envvar = $_[ 1 ];
-
-         # Tcsh/bash needs backslashes quoted
-         $envvar =~ s/\\/\\\\/g;
-
-         printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $envvar) if ( '@VERBOSE@' eq 'TRUE' );
-         print OUT "$_[ 0 ]=\"$envvar\"$newline";      # to sh file
-         $exportvars .= " $_[ 0 ]";                        # add to export list for sh file
-
-      } else {
-         printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") if ( '@VERBOSE@' eq 'TRUE' );
-         $unsetvars .= " $_[ 0 ]";                             # for sh file
-      }
-   }
-   elsif ( $_[ 2 ] eq "a" )
-   {  # Write an alias to file.
-      print "The $_[ 0 ] is set to: $_[ 1 ]\n" if ( '@VERBOSE@' eq 'TRUE' );    # to stdout
-      print OUT "$_[ 0 ]=$_[ 1 ]$newline";      # to sh file
-   }
-   elsif ( $_[ 2 ] eq "c" )
-   {  # Write a comment to file.
-      if ( '@VERBOSE@' eq 'TRUE' )
-      {
-         print "$newline";
-         print "$comment$newline";
-         print "$comment $_[ 0 ]$newline";
-         print "$comment$newline";
-      }
-      print OUT "$newline";
-      print OUT "$comment$newline";
-      print OUT "$comment $_[ 0 ]$newline";
-      print OUT "$comment$newline";
-   }
-   elsif ( $_[ 2 ] eq "n" )
-   {  #Write a newline to a file
-      print OUT "$newline";
-   }
-   elsif ( $_[ 2 ] eq "z" )
-   {
-      #Write first argument as is, and nothing else
-      print OUT "$_[ 0 ]$newline";
-   }
-   else
-   {  print "Unknown type!$newline";
-   }
-}
-#----------------------------------------------------------
-# Function name: PathFormat
-# Description:   Reformat path to either POSIX or mixed mode style.
-# Arguments:     1. Variable (string)
-# Return value:  Reformatted String
-#----------------------------------------------------------
-sub PathFormat
-{  my ( $variable, $d1, $d2 );
-   $variable = $_[ 0 ];
-
-   if ( $platform =~ m/cygwin/ )
-   {   $variable =~ s/(\$\{?\w+\}?)/$1/eeg ; # expand the variables
-       $variable =~ s/(\$\{?\w+\}?)/$1/eeg ; # expand the variables twice!
-
-       # Complain if PosixPath is used on a PATH-like string
-       if ( $variable =~ m/;/ ) {
-           die( "Do not use on PATH lists (i.e., 'c:\\foo;d:\\bar')");
-       }
-
-       # Replace path with space with short dos path
-       if ( $variable =~ / / ) {
-           chomp( $variable = qx{cygpath -d "$variable"} ) ;
-       }
-
-       # Replace absolute paths or DOS paths with ...
-       if ( ( $variable =~ m/^\// ) or ( $variable =~ m/:/ ) ) {
-           # mixed mode paths
-           chomp( $variable = qx{realpath "$variable"} ) unless ($variable =~ m/:/);
-           chomp( $variable = qx{cygpath -m "$variable"} );
-       }
-   }
-   return $variable;
-}
-#----------------------------------------------------------
-# Function name: CygFormat
-# Description:   Format variables to cygwin posix style path
-#                unless .
-# Arguments:     1. Variable (string)
-# Return value:  Reformatted String
-#----------------------------------------------------------
-sub CygFormat
-{  my ( $variable, $d1, $d2 );
-   $variable = $_[ 0 ];
-   # ToDo: Do the replacement only if Windows and var contains "\" and ":"
-   if ( $platform =~ m/cygwin/ )
-   {
-       # Complain if PosixPath is used on a PATH-like string
-       if ( $variable =~ m/;/ ) {
-           die( "Do not use on PATH lists (i.e., 'c:\\foo;d:\\bar')");
-       }
-
-       # Replace DOS paths with posix paths
-       if ( ( $variable =~ m/\\/ ) or ( $variable =~ m/:/ ) ) {
-           chomp( $variable = qx{cygpath -u "$variable"} );
-       }
-   }
-   return $variable;
-}
-#----------------------------------------------------------
-# Function name: WinFormat
-# Description:   Format variables to Windows Format.
-# Arguments:     1. Variable (string)
-# Return value:  Reformatted String
-#----------------------------------------------------------
-sub WinFormat
-{  my ( $variable, $d1 );
-   $variable = $_[ 0 ];
-   $variable =~ s/^\s+//g ; #remove leading spaces
-   $variable =~ s/\s+$//g ; #remove trailing spaces
-   $variable =~ s/(\$\{?\w+\}?)/$1/eeg ;   # expand the variables
-   $variable =~ s/(\$\{?\w+\}?)/$1/eeg ;   # expand the variables twice!
-   $variable =~ s/:+/:/g ;                 # remove multiple ;
-
-   # Some variables are already in DOS path format, return early.
-   if ( $variable =~ /\\/ ) {
-       return $variable;
-   }
-   if ( $variable eq ";" ) {
-       # Ignore single ';'
-       return $variable;
-   }
-   if ( $variable =~ /;/ and $variable =~ /\// ) {
-       # Mixed mode path-style entry, separated with ;, like CLASSPATH
-       return $variable;
-   }
-
-   # Search for posix path entry and replace with cygpath -w entry
-   # ( -d if filename contains space )
-
-   # Normal paths
-
-   # One special case is if "perl " is prepended.
-   $variable =~ /^(perl\s+)?(.*)$/;
-   my $perlpre = $1;
-   if ( !defined($perlpre) ) {
-       $perlpre = "";
-   }
-   $variable = $2;
-
-   if ( $variable =~ /^\/[\w\.~ ]+/ ) {
-       if ( $variable =~ / / ) {
-           # Use DOS 8.3 style to avoid quoting
-           chomp( $variable = qx{cygpath -d "$variable"} );
-       } else {
-           # Use "normal" filenames
-           chomp( $variable = qx{cygpath -w "$variable"} );
-       }
-   } else {
-       # relative or absolute DOS paths here
-       $variable =~ s#/#\\#g;
-   }
-
-   $variable = $perlpre.$variable;
-   if ( ($perlpre ne "") && ($^O eq "cygwin")) {
-       # Cygwin's perl needs quoted backslashes
-       $variable =~ s#\\#\\\\#g;
-   }
-
-   return $variable;
-}
-
-#----------------------------------------------------------
-# Function name: WinPath
-# Description:   Reformat a $sep seperated path using DOS paths.
-# Arguments:     1. Variable (string)
-#                2. Separaror (string)
-# Return value:  Reformatted String
-#----------------------------------------------------------
-sub WinPath
-{
-    my ( $variable, $d1, $sep, @split_var );
-
-    if ( $platform =~ m/cygwin/ ) {
-        $variable = $_[ 0 ];
-        $sep = $_[ 1 ];
-        $variable =~ s/^\s+//g ; #remove leading spaces
-        $variable =~ s/\s+$//g ; #remove trailing spaces
-        $variable =~ s/(\$\{?\w+\}?)/$1/eeg ; # expand the variables
-        $variable =~ s/(\$\{?\w+\}?)/$1/eeg ; # expand the variables twice!
-
-        @split_var = split(/$sep/,$variable);
-        foreach $d1 ( @split_var ) {
-            if ( $d1 =~ /(?:^\/[\w\.~ ]+)+/ ) {
-                if ( $d1 =~ / / ) {
-                    # Use DOS 8.3 style to avoid quoting
-                    chomp( $d1 = qx{cygpath -d "$d1"} );
-                } else {
-                    # Use "normal" filenames
-                    chomp( $d1 = qx{cygpath -w "$d1"} );
-                }
-            }
-        }
-        $variable = join(';',@split_var);
-
-        $variable =~ s/\//\\/g; # Remaining \ come from e.g.: ../foo/baa
-    }
-
-    return $variable;
-}
-
-#--------------------------------------------------------
-# Function name: GetCorrectPath
-# Description:   Creates the build environment.
-# Arguments:     1.   existing / original path
-#                2... pairs of <path, executable>
-# Return value:  String - Correct Path
-#--------------------------------------------------------
-sub GetCorrectPath
-{
-	sub PathLookup
-	{
-	    my $cmd = shift;
-	    while (@_) {
-		my $elem = shift;
-
-		-x "$elem/$cmd" && return $elem;
-	    }
-	    return '';
-	}
-
-	sub SaneGrep
-	{
-	    # Perl grep is unbelievably strange.
-	    my $needle = shift;
-	    while (@_) {
-		my $haystack = shift;
-		if ($needle eq $haystack) {
-		    return 1;
-		}
-	    }
-	    return 0;
-	}
-
-	sub CleanupPath
-	{
-	    my @elements = @_;
-	    my @cleanName = ();
-
-	    while (@elements) {
-		my $elem = shift @elements;
-		if (!SaneGrep ($elem, @cleanName)) {
-			push @cleanName, $elem;
-		}
-	    }
-
-	    return @cleanName;
-	}
-
-	my $oldPath = shift;
-	my @originalPairs = @_;
-	my @pairs = @originalPairs;
-	my @Path = split /$ps/, $oldPath;
-
-	while (@pairs) {
-	    my $path = shift @pairs;
-	    my $cmd = shift @pairs;
-	    my $to_append = 1;
-	    my $elem;
-
-	    if (! -x "$path/$cmd") {
-		AddWarning ("Missing executable $path/$cmd\n");
-	    }
-
-	    for $elem (@Path) {
-		if ($elem eq $path) {
-#		    print "Hit duplicate path in path; break\n";
-		    $to_append = 0;
-		    last;
-		}
-		if (-f "$elem/$cmd") {
-#		    print "Element already in path ...\n";
-		    unshift @Path, $path;
-		    $to_append = 0;
-		    last;
-		} else {
-#		    print "No file $elem/$cmd\n";
-		}
-	    }
-	    if ($to_append) {
-		push @Path, $path;
-	    }
-	}
-
-	@pairs = @originalPairs;
-	while (@pairs) {
-	    my $path = shift @pairs;
-	    my $cmd = shift @pairs;
-	    my $realpath;
-
-	    $realpath = PathLookup ($cmd, @Path);
-	    if (!($realpath eq $path)) {
-		AddWarning ("Path conflict for executables " .
-                            "$path/$cmd against $realpath");
-	    }
-	}
-
-	return join $ps, CleanupPath (@Path);
-}
-
-#------------------------------------------------------------
-# Function name: AddWarning
-# Description:   Adds any kind of warning for the user.
-#                The warning will be shown at the end
-#                of this script.
-# Arguments:     1. Add the configure warnings or the set_soenv
-#                   warning (string).
-#                2. Warning (string).
-# Return value:  void
-#------------------------------------------------------------
-sub AddWarning
-{  if ( $_[ 0 ] eq "configure" )
-   {  open( IN, $warnfile );
-      while ( <IN> )
-      {  $Warning = $Warning."* - ".$_;
-      }
-      close( IN );
-      # Remove the temporary warning file.
-      # unlink ( $warnfile );
-   }
-   elsif ( $_[ 0 ] eq "set_soenv" )
-   {  my ( $arg1 );
-      $arg1 = $_[ 1 ];
-      chomp( $arg1 );                            # cut off new line
-      $Warning = $Warning."* - set_soenv: warning: $arg1 $newline";  # add the warning
-   }
-}
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab: #
diff --git a/solenv/bin/_mkout b/solenv/bin/_mkout
deleted file mode 100755
index b1ff7b0f5..000000000
--- a/solenv/bin/_mkout
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-if [ -z "$1" ]; then
-  exit 1;
-fi
-mkdir -p "$1"/bin
-mkdir -p "$1"/inc
-mkdir -p "$1"/lib
-mkdir -p "$1"/misc
-mkdir -p "$1"/obj
-mkdir -p "$1"/slb
-mkdir -p "$1"/slo
diff --git a/solenv/bin/add-modelines b/solenv/bin/add-modelines
deleted file mode 100755
index e7491c24a..000000000
--- a/solenv/bin/add-modelines
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/bin/bash
-
-# add-modelines, a simple script to add comments to
-# the beginning and end of source files for LibreOffice devs
-
-# Blame goes to Jesse Adelman (at least at first)
-# someone AT boldandbusted dotty-dot com
-# http://www.boldandbusted.com/
-# (c) 2010 Bold and Busted LLC
-# Licensed under the MPL/LGPLv3 or later
-# First edit 2010-10-08
-# Updated on 2010-10-09
-# Version 0.7
-
-# NOTE: At present, this script only works for files with C-like comments.
-# NOTE: If you don't specify -p, the script will act on the current working directory.
-# NOTE: If no arguments are specified, the defitions below are in effect.
-
-# TO DO
-#  - Deuglifiy?
-#  - Make source file type agnostic modelines?
-#  - Too many/too few comments?
-#  - Handle top level source directories with whitespace names? (Do they exist?)
-
-# Turn off globbing, helps with SourceFiles
-set -f
-
-# POSIX
-set -o posix
-
-# Change these to taste
-FirstLine='/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */'
-LastLine='/* vim:set shiftwidth=4 softtabstop=4 expandtab: */'
-SourceFiles='*.cxx *.cpp *.hxx *.hpp *.c *.h *.mm'
-
-# Set defaults (don't change these)
-ModelineReplace="false"
-
-# Functions
-
-function SetEnvironment()
-{
-     if [ -n "$(which tail)" -a -n "$(which head)" ]; then
-        {
-            headCMD=`which head`
-            tailCMD=`which tail`
-        }
-        else
-        {
-            echo "Missing head or tail, exiting..."
-            exit 1
-        }
-    fi
-    if [ -n "$(which find)" ]; then
-        findCMD=`which find`
-        else
-        {
-            echo "Missing find, exiting..."
-            exit 1
-        }
-    fi
-    if [ -n "$(which awk)" ]; then
-        awkCMD=`which awk`
-        else
-        {
-            echo "Missing awk, exiting..."
-            exit 1
-        }
-    fi
-}
-
-function EditFile()
-{
-    local FileToEdit
-    local currentFirstLine
-    local currentLastLine
-
-    FileToEdit="$1"
-
-    currentFirstLine=`$headCMD -1 "$FileToEdit"`
-    currentLastLine=`$tailCMD -1 "$FileToEdit"`
-
-    case "$ModelineReplace" in
-        "true" )
-            if [ "${currentFirstLIne:0:6}" = "${FirstLine:0:6}" ]; then
-            {
-                echo "$FirstLine" > "$FileToEdit".new
-                $tailCMD -n +2 "$FileToEdit" >> "$FileToEdit".new
-            }
-            fi
-            if [ -e "$FileToEdit.new" ]; then
-            {
-                echo "$LastLine" >> "$FileToEdit".new
-            }
-            fi
-            if [ "${currentLastLine:0:6}" = "${LastLine:0:6}" ]; then
-            {
-                $headCMD -n -1 "$FileToEdit" > "$FileToEdit".new
-                echo "$LastLine" >> "$FileToEdit".new
-            }
-            fi
-            mv "$FileToEdit".new "$FileToEdit"
-            echo "$FileToEdit updated" ;;
-        "false" )
-            if [ "${currentFirstLine:0:6}" != "${FirstLine:0:6}" ]; then
-                if [ "${currentLastLine:0:6}" != "${LastLine:0:6}" ]; then
-                {
-                    echo "$FirstLine" > "$FileToEdit".new
-                    cat "$FileToEdit" >> "$FileToEdit".new
-                    if [ "x${currentLastLine}" != "x" ] ; then
-                        echo "" >> "$FileToEdit".new
-                    fi
-                    echo "$LastLine" >> "$FileToEdit".new
-                    mv "$FileToEdit".new "$FileToEdit"
-                    echo "$FileToEdit updated"
-                }
-                fi
-            fi ;;
-    esac
-}
-
-function PrintUsage()
-{
-    echo "Usage: $0 [-z] [-s \"<sourcefile glob>\"] [-p <path to source>]"
-}
-
-# Main
-
-SetEnvironment
-
-# Get command line options
-
-while getopts "zs:p:" opt; do
-    case $opt in
-        z) ModelineReplace="true" ;;
-        s) SourceFiles="$OPTARG" ;;
-        p) findPath="$OPTARG" ;;
-        *) PrintUsage
-           exit 1 ;;
-    esac
-done
-
-if [ $OPTIND -gt 1 ]; then
-    shift $(($OPTIND - 1))
-fi
-
-if [ $# -gt 1 ]; then
-{
-    PrintUsage
-    echo "Remember to quote the source file globs after -s"
-    exit 1
-}
-fi
-
-# Create GNU find expressions that traverse the filesystem once and only once
-if [ -z "$findPath" ]; then
-    findArgs='.'
-    else
-        findArgs="$findPath"
-fi
-
-for FileType in ${SourceFiles}; do
-    findArgs="$findArgs"' ( -iname '"$FileType"' -print -o -true ) -a '
-done
-
-# This gets rid of the final " -a " in the find argument list
-findArgs="${findArgs:0:(${#findArgs}-3)}"
-
-for file in $($findCMD $findArgs); do
-    EditFile "$file"
-    echo "Completed: " "$file"
-done
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/bin/addsym-macosx.sh b/solenv/bin/addsym-macosx.sh
deleted file mode 100755
index b69f59fff..000000000
--- a/solenv/bin/addsym-macosx.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# This script is needed in the process of generating exported
-# symbols list out of map files on Mac OS X (see also #i69351#)
-# The magic generating the regular expression from the temporary
-# mapfile containing only star and question mark symbols
-#
-# The script has to be called as follows:
-# nm -gx <file>.o | addsym-macosx.sh <file-with-wildcard-symbols> <temporary-file-where-to-write-the-search-expression-to>
-# See tg_shl.mk for an example of how to use the script
-#
-# Replace every * with .* and every ? with . to get awk expression
-# Put ^ at the beginning of every expression
-# Put $ at the beginning of every expression
-# Connect them all on one line, separated by |
-# Remove | at the end of this regular expression because the last end
-# of line was also replaced by |
-
-cat $1 | sed 's#*#.*#g
-s#?#.#g
-s#^#^#
-s#$#$#' | tr '\n' '|' | sed "s#|\$##" >$2
-
-# Please note that the awk expression expects to get the output of 'nm -gx'!
-# On Panther we have to filter out symbols with a value "1f" otherwise external
-# symbols will erroneously be added to the generated export symbols list file.
-awk -v SYMBOLSREGEXP="`cat $2`" '
-match ($6,SYMBOLSREGEXP) > 0 &&  $6 !~ /_GLOBAL_/ { if (($2 != 1) && ( $2 != "1f" ) ) print $6 }'
-
diff --git a/solenv/bin/addsym-mingw.sh b/solenv/bin/addsym-mingw.sh
deleted file mode 100755
index 06d668252..000000000
--- a/solenv/bin/addsym-mingw.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# This script is needed in the process of generating exported
-# symbols list out of map files on MinGW
-# The magic generating the regular expression from the temporary
-# mapfile containing only star and question mark symbols
-#
-# The script has to be called as follows:
-# nm -gx <file>.o | addsym-mingw.sh <file-with-wildcard-symbols> <temporary-file-where-to-write-the-search-expression-to>
-# See tg_shl.mk for an example of how to use the script
-#
-# Replace every * with .* and every ? with . to get awk expression
-# Remove whitespaces and comments in expression
-# Put ^ at the beginning of every expression
-# Put $ at the beginning of every expression
-# Connect them all on one line, separated by |
-# Remove | at the end of this regular expression because the last end
-# of line was also replaced by |
-
-if [ -s $1 ]
-then 
-cat $1 | sed 's#*#.*#g
-s#?#.#g
-s#;.*##g
-s# ##g
-s#	##g
-s#^#^#
-s#$#$#' | tr '\n' '|' | sed "s#|\$##" >$2
-
-# Please note that the awk expression expects to get the output of 'nm -gP'!
-awk -v SYMBOLSREGEXP="`cat $2`" '
-match (substr ($1,2) ,SYMBOLSREGEXP) > 0 { print substr ($1,2) ";" }'
-fi
-
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
deleted file mode 100644
index de0b57934..000000000
--- a/solenv/bin/addsym.awk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Add certain symbol patterns to the first global section.
-#
-# The below code fails with 'perverted' mapfiles (using a strange line layout,
-# or containing version UDK_3_0_0 without a global section, ...).
-
-BEGIN { state = 0 }
-END {
-    if (state == 0) {
-        print "# Weak RTTI symbols for C++ exceptions:"
-        print "UDK_3_0_0 {"
-        print "global:"
-        print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-        print "};"
-    }
-}
-state == 2 {
-    print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-    state = 3
-}
-# #i66636# - ???
-/^[\t ]*UDK_3_0_0[\t ]*\{/ { state = 1 }
-/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
-{ print }
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
deleted file mode 100755
index eb3c0e9b7..000000000
--- a/solenv/bin/build.pl
+++ /dev/null
@@ -1,3510 +0,0 @@
-:
-    eval 'exec perl -S $0 ${1+"$@"}'
-        if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-#
-# build - build entire project
-#
-    use strict;
-    use Config;
-    use POSIX;
-    use Cwd qw (cwd);
-    use File::Path;
-    use File::Temp qw(tmpnam tempdir);
-    use File::Find;
-    use Socket;
-    use IO::Socket::INET;
-    use IO::Select;
-    use Fcntl;
-    use POSIX qw(:errno_h);
-    use Sys::Hostname;
-    use IPC::Open3;
-
-    use lib ("$ENV{SOLARENV}/bin/modules");
-    use SourceConfig;
-    use RepositoryHelper;
-    use Cwd 'chdir';
-
-    my $in_so_env = 0;
-    if (defined $ENV{COMMON_ENV_TOOLS}) {
-        unshift(@INC, "$ENV{COMMON_ENV_TOOLS}/modules");
-        $in_so_env++;
-    };
-    my $verbose_mode = 0;
-    if (defined $ENV{verbose} || defined $ENV{VERBOSE}) {
-        $verbose_mode = ($ENV{verbose} =~ /^t\S*$/i);
-    }
-    my $enable_multiprocessing = 1;
-
-    ### for XML file format
-    eval { require XMLBuildListParser; import XMLBuildListParser; };
-    my $enable_xml = 0;
-    my @modes_array = ();
-    if (!$@) {
-        $enable_xml = 1;
-        @modes_array = split('\s' , $ENV{BUILD_TYPE});
-    };
-#### script id #####
-
-#########################
-#                       #
-#   Global Variables    #
-#                       #
-#########################
-
-    my $modules_number++;
-    my $perl = 'perl';
-    my $remove_command = 'rm -rf';
-    my $nul = '> /dev/null';
-
-    my $processes_to_run = 0;
-# delete $pid when not needed
-    my %projects_deps_hash = ();   # hash of projects with no dependencies,
-                                # that could be built now
-    my %broken_build = ();         # hash of hashes of the modules,
-                                # where build was broken (error occurred)
-    my %folders_hashes = ();
-    my %running_children = ();
-    my $dependencies_hash = 0;
-    my $cmd_file = '';
-    my $build_all_parents = 0;
-    my $show = 0;
-    my $checkparents = 0;
-    my $deliver = 0;
-    my $pre_custom_job = '';
-    my $custom_job = '';
-    my $post_custom_job = '';
-    my %local_deps_hash = ();
-    my %path_hash = ();
-    my %platform_hash = ();
-    my %alive_dependencies = ();
-    my %global_deps_hash = (); # hash of dependencies of the all modules
-    my %global_deps_hash_backup = (); # backup hash of external dependencies of the all modules
-    my %module_deps_hash_backup = (); # backup hash of internal dependencies for aech module
-    my @broken_modules_names = ();   # array of modules, which cannot be built further
-    my @dmake_args = ();
-    my %dead_parents = ();
-    my $initial_module = '';
-    my $all_dependent = 1;  # a flag indicating if the hash has independent keys
-    my $build_from_with_branches = '';
-    my $build_all_cont = '';
-    my $build_since = '';
-    my $dlv_switch = '';
-    my $child = 0;
-    my %processes_hash = ();
-    my %module_announced = ();
-    my $prepare = ''; # prepare for following incompatible build
-    my $ignore = '';
-    my $html = '';
-    my @ignored_errors = ();
-    my %incompatibles = ();
-    my %skip_modules = ();
-    my %exclude_branches = ();
-    my $only_platform = ''; # the only platform to prepare
-    my $only_common = ''; # the only common output tree to delete when preparing
-    my %build_modes = ();
-    my $maximal_processes = 0; # the max number of the processes run
-    my %modules_types = (); # modules types ('mod', 'img', 'lnk') hash
-    my %platforms = (); # platforms available or being working with
-    my %platforms_to_copy = (); # copy output trees for the platforms when --prepare
-    my $tmp_dir = get_tmp_dir(); # temp directory for checkout and other actions
-    my @possible_build_lists = ('gbuild.lst', 'build.lst', 'build.xlist'); # build lists names
-    my %build_list_paths = (); # build lists names
-    my %build_lists_hash = (); # hash of arrays $build_lists_hash{$module} = \($path, $xml_list_object) 
-    my $pre_job = 'announce'; # job to add for not-single module build
-    my $post_job = '';        # -"-
-    my @warnings = (); # array of warnings to be shown at the end of the process
-    my @errors = (); # array of errors to be shown at the end of the process
-    my %html_info = (); # hash containing all necessary info for generating of html page
-    my %module_by_hash = (); # hash containing all modules names as values and correspondent hashes as keys
-    my %build_in_progress = (); # hash of modules currently being built 
-    my %build_is_finished = (); # hash of already built modules
-    my %modules_with_errors = (); # hash of modules with build errors
-    my %build_in_progress_shown = ();  # hash of modules being built, 
-                                    # and shown last time (to keep order)
-    my $build_time = time;
-    my %jobs_hash = ();
-    my $html_path = undef;
-    my $build_finished = 0;
-    my $html_file = '';
-    my %had_error = (); # hack for mysterious windows problems - try run dmake 2 times if first time there was an error
-    my $mkout = correct_path("$ENV{SOLARENV}/bin/mkout.pl");
-    my %weights_hash = (); # hash contains info about how many modules are dependent from one module
-    my $grab_output = 1;
-    my $stop_build_on_error = 0; # for multiprocessing mode: do not build further module if there is an error
-    my $interactive = 0; # for interactive mode... (for testing purpose enabled by default)
-    my $parent_process = 1;
-    my $server_mode = 0;
-    my $setenv_string = ''; # string for configuration of the client environment
-    my $ports_string = ''; # string with possible ports for server
-    my @server_ports = ();
-    my $html_port = 0;
-    my $server_socket_obj = undef; # socket object for server
-    my $html_socket_obj = undef; # socket object for server
-    my %clients_jobs = ();
-    my %clients_times = ();
-    my $client_timeout = 0; # time for client to build (in sec)...
-                            # The longest time period after that
-                            # the server considered as an error/client crash
-    my %lost_client_jobs = (); # hash containing lost jobs
-    my %job_jobdir = (); # hash containing job-dir pairs
-    my $reschedule_queue = 0;
-    my %module_build_queue = ();
-    my %reversed_dependencies = ();
-    my %module_paths = (); # hash with absolute module paths
-    my %active_modules = ();
-    my $generate_config = 0;
-    my %add_to_config = ();
-    my %remove_from_config = ();
-    my $clear_config = 0;
-    my $finished_children = 0;
-    my $debug = 0;
-    my %module_deps_hash_pids = ();
-    my @argv = @ARGV;
-    my $source_config_file;
-    my $zenity_pid = 0;
-    my $zenity_in = '';
-    my $zenity_out = '';
-    my $zenity_err = '';
-    my $allow_gbuild = 0;
-    my %is_gbuild = ();
-    my $verbose = 0;
-
-    my @modules_built = ();
-    my $deliver_command = $ENV{DELIVER};
-    my %prj_platform = ();
-    my $check_error_string = '';
-    my $dmake = '';
-    my $dmake_args = '';
-    my $echo = '';
-    my $new_line = "\n";
-    my $incompatible = 0;
-    my $local_host_ip = 'localhost';
-### main ###
-
-    get_options();
-
-    zenity_open();
-    zenity_tooltip("Starting build.");
-
-    get_build_modes();
-    my %deliver_env = ();
-    if ($prepare) {
-        get_platforms(\%platforms);
-
-        $deliver_env{'COMMON_OUTDIR'}++;
-        $deliver_env{'GUI'}++;
-        $deliver_env{'INPATH'}++;
-        $deliver_env{'OFFENV_PATH'}++;
-        $deliver_env{'OUTPATH'}++;
-        $deliver_env{'L10N_framework'}++;
-    };
-    my $workspace_path = get_workspace_path();   # This also sets $initial_module
-    my $build_error_log = Cwd::realpath(correct_path($workspace_path)) ."/build_error.log";
-    my $source_config = SourceConfig -> new($workspace_path);
-    check_partial_gnumake_build($initial_module);
-
-    system("rm -f $build_error_log");
-    if ($html) {
-        if (defined $html_path) {
-            $html_file = correct_path($html_path . '/' . $ENV{INPATH}. '.build.html');
-        } else {
-            my $log_directory = Cwd::realpath(correct_path($workspace_path . '/..')) . '/log';
-            if ((!-d $log_directory) && (!mkdir($log_directory))) {
-                print_error("Cannot create $log_directory for writing html file\n");
-            };
-            $html_file = $log_directory . '/' . $ENV{INPATH}. '.build.html';
-            print "\nPath to html status page: $html_file\n";
-        };
-    };
-
-    if ($generate_config && ($clear_config || (scalar keys %remove_from_config)||(scalar keys %add_to_config))) {
-        generate_config_file();
-        exit 0;
-    }
-    get_module_and_buildlist_paths();
-
-    $deliver_command .= ' -verbose' if ($html || $verbose);
-    $deliver_command .= ' '. $dlv_switch if ($dlv_switch);
-    $ENV{mk_tmp}++;
-
-    get_commands();
-    unlink ($cmd_file);
-    if ($cmd_file) {
-        if (open (CMD_FILE, ">>$cmd_file")) {
-            select CMD_FILE;
-            $echo = 'echo ';
-            if ($ENV{GUI_FOR_BUILD} ne 'UNX') {
-                $new_line = "echo.\n";
-                print "\@$echo off\npushd\n";
-            } else {
-                $new_line = $echo."\"\"\n";
-            };
-        } else {
-            print_error ("Cannot open file $cmd_file");
-        };
-    };
-
-    print $new_line;
-    get_server_ports();
-    start_interactive() if ($interactive);
-
-    if ($checkparents) {
-        get_parent_deps( $initial_module, \%global_deps_hash );
-    } else {
-        build_all();
-    }
-    if (scalar keys %broken_build) {
-        cancel_build();
-    };
-    print_warnings();
-    if (scalar keys %active_modules) {
-        foreach (keys %dead_parents) {
-            delete $dead_parents{$_} if (!defined $active_modules{$_});
-        };
-    };
-    if (scalar keys %dead_parents) {
-        print $new_line.$new_line;
-        print $echo."WARNING! Project(s):\n";
-        foreach (keys %dead_parents) {
-            print $echo."$_\n";
-        };
-        print $new_line;
-        print $echo."not found and couldn't be built. dependencies on that module(s) ignored. Maybe you should correct build lists.\n";
-        print $new_line;
-        do_exit(1) if ($checkparents);
-    };
-    if (($ENV{GUI_FOR_BUILD} ne 'UNX') && $cmd_file) {
-        print "popd\n";
-    };
-    $ENV{mk_tmp} = '';
-    if ($cmd_file) {
-        close CMD_FILE;
-        print STDOUT "Script $cmd_file generated\n";
-    };
-    if ($ignore && scalar @ignored_errors) {
-        print STDERR "\nERROR: next directories could not be built:\n";
-        foreach (@ignored_errors) {
-            print STDERR "\t$_\n";
-        };
-        print STDERR "\nERROR: please check these directories and build the corresponding module(s) anew!!\n\n";
-        do_exit(1);
-    };
-    do_exit(0);
-
-
-#########################
-#                       #
-#      Procedures       #
-#                       #
-#########################
-
-sub print_warnings {
-    if (scalar @warnings) {
-        print STDERR "\nWARNING(S):\n";
-        print STDERR $_ foreach (@warnings);
-    };
-};
-
-sub rename_file {
-    my ($old_file_name, $new_file_name, $throw_error) = @_;
-
-    if(-e $old_file_name) {
-        rename($old_file_name, $new_file_name) or system("mv", $old_file_name, $new_file_name);
-        if (-e $old_file_name) {
-            system("rm -rf $old_file_name") if (!unlink $old_file_name);
-        };
-    } elsif ($throw_error) {
-        print_error("No such file $old_file_name");
-    };
-};
-
-sub generate_config_file {
-    $source_config->add_active_modules([keys %add_to_config], 1) if (scalar %add_to_config);
-    $source_config->remove_activated_modules([keys %remove_from_config], 1) if (scalar %remove_from_config);
-    $source_config->remove_all_activated_modules() if ($clear_config);
-};
-
-
-sub start_interactive {
-    my $pid = open(HTML_PIPE, "-|");
-    print "Pipe is open\n";
-
-    if ($pid) {   # parent
-        # make file handle non-blocking
-        my $flags = '';
-        fcntl(HTML_PIPE, F_GETFL, $flags);
-        $flags |= O_NONBLOCK;
-        fcntl(HTML_PIPE, F_SETFL, $flags);
-    } else {      # child
-        $parent_process = 0;
-        start_html_listener();
-    };
-};
-
-sub start_html_listener {
-    $html_port = $server_ports[$#server_ports];
-    do {
-        $html_port++
-    } while (start_server_on_port($html_port, \$html_socket_obj));
-    print "html_port:$html_port html_socket_obj: $html_socket_obj\n";
-    my $new_socket_obj;
-    do {
-        $new_socket_obj = accept_html_connection();
-        if (defined $new_socket_obj) {
-            my $html_message;
-            $html_message = <$new_socket_obj>;
-            chomp $html_message;
-            print $html_message . "\n";
-            my $socket_message = '';
-            for my $action ('rebuild', 'delete') {
-                if ($html_message =~ /$action=(\S+)/) {
-                    print $new_socket_obj "Module $1 is scheduled for $action";
-                };
-            };
-            close($new_socket_obj);
-        } else {
-            sleep(10);
-        };
-    } while(1);
-};
-
-sub start_html_message_trigger {
-    my $child_id=fork(); ### VG: for windows there is a "simulation of the "fork"", no new procs... One can use Win32::Process::Create
-
-    if ($child_id) {
-        # parent
-    } else {
-        my $buffer_size = 1024;
-        my $buffer;
-        my $rv;
-        my $full_buffer = '';
-        my %modules_to_rebuild = ();
-        my $paddr;
-        while ($rv = sysread(HTML_PIPE, $buffer, $buffer_size)) {
-            $full_buffer .= $buffer;
-        };
-        if (length $full_buffer) {
-            print "**********Got message $full_buffer\n";
-            socket(SOCKET, PF_INET, SOCK_STREAM, getprotobyname('tcp')) or die "socket: $!";
-            if (connect(SOCKET, $paddr)) {
-                $full_buffer .= "\n";
-                syswrite SOCKET, $full_buffer, length $full_buffer;
-            } else {
-                die "Child connect: $!";
-            };
-        }
-        _exit(0);
-    };
-};
-
-sub get_html_orders {
-    return if (!$interactive);
-    my $buffer_size = 1024;
-    my $buffer;
-    my $rv;
-    my $full_buffer = '';
-    my %modules_to_rebuild = ();
-    my %modules_to_delete = ();
-    while ($rv = sysread(HTML_PIPE, $buffer, $buffer_size)) {
-        $full_buffer .= $buffer;
-    };
-    my @html_messages = split(/\n/, $full_buffer);
-    foreach (@html_messages) {
-        if (/^html_port:(\d+)/) {
-            $html_port = $1;
-            print "Html port is: $html_port\n";
-            next;
-        };# GET /rebuild=officenames HTTP/1.0
-        print "Message: $_\n";
-        chomp;
-        if (/GET\s+\/delete=(\S+)[:(\S+)]*\s*HTTP/) {
-            $modules_to_delete{$1} = $2;
-            print "$1 scheduled for removal from build for \n";
-        }
-        if (/GET\s+\/rebuild=(\S+)[:(\S+)]*\s*HTTP/) {
-            if (defined $global_deps_hash{$1}) {
-                print "!!! /tarModule $1 has not been built. Html order ignored\n";
-            } else {
-                $modules_to_rebuild{$1} = $2;
-                print "Scheduled $1 for rebuild\n";
-            }
-        }
-    };
-    if (scalar keys %modules_to_delete) {
-        $reschedule_queue++;
-        schedule_delete(\%modules_to_delete);
-        generate_html_file();
-    };
-    if (scalar keys %modules_to_rebuild) {
-        $reschedule_queue++;
-        schedule_rebuild(\%modules_to_rebuild);
-        generate_html_file();
-    };
-};
-
-sub schedule_delete {
-    my $modules_to_delete = shift;
-    foreach (keys %$modules_to_delete) {
-        print "Schedule module $_ for delete\n";
-        delete ($global_deps_hash{$_});
-        delete ($global_deps_hash_backup{$_});
-        if (scalar keys %{$module_deps_hash_pids{$projects_deps_hash{$_}}}) {
-            kill 9, keys %{$module_deps_hash_pids{$projects_deps_hash{$_}}};
-            handle_dead_children(0);
-        };
-        remove_from_dependencies($_, \%global_deps_hash);
-        remove_from_dependencies($_, \%global_deps_hash_backup);
-        delete $reversed_dependencies{$_};
-        delete $build_is_finished{$_} if defined $build_is_finished{$_};
-        delete $modules_with_errors{$_} if defined $modules_with_errors{$_};
-        delete $module_announced{$_} if defined $module_announced{$_};
-        delete $html_info{$_} if defined $html_info{$_};
-        delete $projects_deps_hash{$_} if defined $projects_deps_hash{$_};
-    };
-};
-
-sub schedule_rebuild {
-    my $modules_to_rebuild = shift;
-    foreach (keys %$modules_to_rebuild) {
-        if (defined $$modules_to_rebuild{$_}) {
-            print "Schedule directory for rebuild";
-        } else {
-            print "Schedule complete $_ module for rebuild\n";
-            if (scalar keys %{$module_deps_hash_pids{$projects_deps_hash{$_}}}) {
-                kill 9, keys %{$module_deps_hash_pids{$projects_deps_hash{$_}}};
-                handle_dead_children(0);
-            };
-            delete $build_is_finished{$_} if defined $build_is_finished{$_};
-            delete $modules_with_errors{$_} if defined $modules_with_errors{$_};
-            delete $module_announced{$_};
-            initialize_html_info($_);
-
-            foreach my $waiter (keys %{$reversed_dependencies{$_}}) {
-                # for rebuild_all_dependent - refacture "if" condition
-                ${$global_deps_hash{$waiter}}{$_}++ if (!defined $build_is_finished{$waiter});
-            };
-            delete $projects_deps_hash{$_} if defined $projects_deps_hash{$_};
-            my %single_module_dep_hash = ();
-            foreach my $module (keys %{$global_deps_hash_backup{$_}}) {
-                if (defined ${$global_deps_hash_backup{$_}}{$module} && (!defined $build_is_finished{$module})) {
-                    $single_module_dep_hash{$module}++;
-                };
-            };
-            $global_deps_hash{$_} = \%single_module_dep_hash;
-        };
-    };
-};
-
-#
-# procedure retrieves build list path
-# (all possibilities are taken into account)
-#
-sub get_build_list_path {
-    my $module = shift;
-    return $build_list_paths{$module} if (defined $build_list_paths{$module});
-    my @possible_dirs = ($module, $module. '.lnk', $module. '.link');
-    return $build_list_paths{$module} if (defined $build_list_paths{$module});
-    foreach (@possible_dirs) {
-        my $possible_dir_path = $module_paths{$_}.'/prj/';
-        if (-d $possible_dir_path) {
-            foreach my $build_list (@possible_build_lists) {
-                # if gbuild are allow we favor gbuild.lst as the build instruction
-                if($build_list ne "gbuild.lst" || $allow_gbuild) {
-                    my $possible_build_list_path = correct_path($possible_dir_path . $build_list);
-                    if (-f $possible_build_list_path) {
-                        $build_list_paths{$module} = $possible_build_list_path;
-                        if ($build_list eq "gbuild.lst") {
-#                           print  "Using gmake for module $module\n";
-                            $is_gbuild{$module} = 1;
-                        };
-                        return $possible_build_list_path;
-                    };
-                };
-            }
-            print_error("There's no build list for $module");
-        };
-    };
-    $dead_parents{$module}++;
-    $build_list_paths{$module} = correct_path(retrieve_build_list($module)) if (!defined $build_list_paths{$module});
-    return $build_list_paths{$module};
-};
-
-#
-# Get dependencies hash of the current and all parent projects
-#
-sub get_parent_deps {
-    my $prj_dir = shift;
-    my $deps_hash = shift;
-    my @unresolved_parents = ($prj_dir);
-    my %skipped_branches = ();
-    while (my $module = pop(@unresolved_parents)) {
-        next if (defined $$deps_hash{$module});
-        my %parents_deps_hash = ();
-        foreach (get_parents_array($module)) {
-            if (defined $exclude_branches{$_}) {
-                $skipped_branches{$_}++;
-                next;
-            };
-            $parents_deps_hash{$_}++;
-        }
-        $$deps_hash{$module} = \%parents_deps_hash;
-        foreach my $parent (keys %parents_deps_hash) {
-            if (!defined($$deps_hash{$parent}) && (!defined $exclude_branches{$module})) {
-                push (@unresolved_parents, $parent);
-            };
-        };
-    };
-    check_deps_hash($deps_hash);
-    foreach (keys %skipped_branches) {
-        print $echo . "Skipping module's $_ branch\n";
-        delete $exclude_branches{$_};
-    };
-    my @missing_branches = keys %exclude_branches;
-    if (scalar @missing_branches) {
-        print_error("For $prj_dir branche(s): \"@missing_branches\" not found\n");
-    };
-};
-
-sub store_weights {
-    my $deps_hash = shift;
-    foreach (keys %$deps_hash) {
-        foreach my $module_deps_hash ($$deps_hash{$_}) {
-            foreach my $dependency (keys %$module_deps_hash) {
-                $weights_hash{$dependency}++;
-            };
-        };
-    };
-};
-
-#
-# This procedure builds comlete dependency for each module, ie if the deps look like:
-# mod1 -> mod2 -> mod3 -> mod4,mod5,
-# than mod1 get mod3,mod4,mod5 as eplicit list of deps, not only mod2 as earlier
-#
-sub expand_dependencies {
-    my $deps_hash = shift;
-
-    foreach my $module1 (keys %$deps_hash) {
-        foreach my $module2 (keys %$deps_hash) {
-            next if ($module1 eq $module2);
-            if (defined ${$$deps_hash{$module2}}{$module1}) {
-                ${$$deps_hash{$module2}}{$_}++ foreach (keys %{$$deps_hash{$module1}})
-            };
-        };
-    };
-};
-
-#
-# This procedure fills the second hash with reversed dependencies,
-# ie, with info about modules "waiting" for the module
-#
-sub reverse_dependencies {
-    my ($deps_hash, $reversed) = @_;
-    foreach my $module (keys %$deps_hash) {
-        foreach (keys %{$$deps_hash{$module}}) {
-            if (defined $$reversed{$_}) {
-                ${$$reversed{$_}}{$module}++
-            } else {
-                my %single_module_dep_hash = ($module => 1);
-                $$reversed{$_} = \%single_module_dep_hash;
-            };
-        };
-    };
-};
-
-#
-# Build everything that should be built
-#
-sub build_all {
-    if ($build_all_parents) {
-        my ($prj, $prj_dir, $orig_prj);
-        get_parent_deps( $initial_module, \%global_deps_hash);
-        if (scalar keys %active_modules) {
-            $active_modules{$initial_module}++;
-            $modules_types{$initial_module} = 'mod';
-        };
-        modules_classify(keys %global_deps_hash);
-        expand_dependencies (\%global_deps_hash);
-        prepare_incompatible_build(\%global_deps_hash) if ($incompatible && (!$build_from_with_branches));
-        if ($build_from_with_branches) {
-            my %reversed_full_deps_hash = ();
-            reverse_dependencies(\%global_deps_hash, \%reversed_full_deps_hash);
-            prepare_build_from_with_branches(\%global_deps_hash, \%reversed_full_deps_hash);
-        }
-        if ($build_all_cont || $build_since) {
-            store_weights(\%global_deps_hash);
-            prepare_build_all_cont(\%global_deps_hash);
-            %weights_hash = ();
-        };
-        if ($generate_config) {
-            %add_to_config = %global_deps_hash;
-            generate_config_file();
-            exit 0;
-        } elsif ($incompatible) {
-            my @missing_modules = ();
-            foreach (sort keys %global_deps_hash) {
-                push(@missing_modules, $_) if (!defined $active_modules{$_});
-            };
-            if (scalar @missing_modules) {
-                push(@warnings, "The modules: \"@missing_modules\" should be have been built, but they are not activated and have been skipped. Be aware, that can cause compatibility problems. Maybe you should verify your $source_config_file.\n");
-            };
-        };
-        foreach my $module (keys %dead_parents, keys %skip_modules) {
-            remove_from_dependencies($module, \%global_deps_hash);
-            delete ($global_deps_hash{$module}) if (defined $global_deps_hash{$module});
-        };
-        store_weights(\%global_deps_hash);
-        backup_deps_hash(\%global_deps_hash, \%global_deps_hash_backup);
-        reverse_dependencies(\%global_deps_hash_backup, \%reversed_dependencies);
-        $modules_number = scalar keys %global_deps_hash;
-        initialize_html_info($_) foreach (keys %global_deps_hash);
-        if ($processes_to_run) {
-            build_multiprocessing();
-            return;
-        };
-        if ($server_mode) {
-            run_server();
-        };
-        while ($prj = pick_prj_to_build(\%global_deps_hash)) {
-            if (!defined $dead_parents{$prj}) {
-                if (scalar keys %broken_build) {
-                    print $echo . "Skipping project $prj because of error(s)\n";
-                    remove_from_dependencies($prj, \%global_deps_hash);
-                    $build_is_finished{$prj}++;
-                    next;
-                };
-
-                $prj_dir = $module_paths{$prj};
-                get_module_dep_hash($prj, \%local_deps_hash);
-                my $info_hash = $html_info{$prj};
-                $$info_hash{DIRS} = check_deps_hash(\%local_deps_hash, $prj);
-                $module_by_hash{\%local_deps_hash} = $prj;
-                build_dependent(\%local_deps_hash);
-                print $check_error_string;
-            };
-
-            remove_from_dependencies($prj, \%global_deps_hash);
-            $build_is_finished{$prj}++;
-        };
-    } else {
-        store_build_list_content($initial_module);
-        get_module_dep_hash($initial_module, \%local_deps_hash);
-        initialize_html_info($initial_module);
-        my $info_hash = $html_info{$initial_module};
-        $$info_hash{DIRS} = check_deps_hash(\%local_deps_hash, $initial_module);
-        $module_by_hash{\%local_deps_hash} = $initial_module;
-        if ($server_mode) {
-            run_server();
-        } else {
-            build_dependent(\%local_deps_hash);
-        };
-    };
-};
-
-sub backup_deps_hash {
-    my $source_hash = shift;
-    my $backup_hash = shift;
-    foreach my $key (keys %$source_hash) {
-        my %values_hash = %{$$source_hash{$key}};
-        $$backup_hash{$key} = \%values_hash;
-    };
-};
-
-sub initialize_html_info {
-    my $module = shift;
-    return if (defined $dead_parents{$module});
-    $html_info{$module} = { 'DIRS' => [],
-                            'ERRORFUL' => [],
-                            'SUCCESSFUL' => [],
-                            'BUILD_TIME' => 0};
-}
-
-#
-# Do job
-#
-sub dmake_dir {
-    my ($new_job_name, $error_code);
-    my $job_name = shift;
-    $jobs_hash{$job_name}->{START_TIME} = time();
-    $jobs_hash{$job_name}->{STATUS} = 'building';
-
-    if ($job_name =~ /(\s)/o && (!-d $job_name)) {
-        $error_code = do_custom_job($job_name, \%local_deps_hash);
-    } else {
-        html_store_job_info(\%local_deps_hash, $job_name);
-        print_error("$job_name not found!!\n") if (!-d $job_name);
-        if (!-d $job_name) {
-            $new_job_name = $job_name;
-            $new_job_name =~ s/_simple//g;
-            if ((-d $new_job_name)) {
-                print("\nTrying $new_job_name, $job_name not found!!\n");
-                $job_name = $new_job_name;
-            } else {
-                print_error("\n$job_name not found!!\n");
-            }
-        }
-        if ($cmd_file) {
-            print "cd $job_name\n";
-            print $check_error_string;
-            print $echo.$job_name."\n";
-            print "$dmake\n";
-            print $check_error_string;
-        } else {
-            print "Entering $job_name\n";
-        };
-        remove_from_dependencies($job_name, \%local_deps_hash) if (!$child);
-        return if ($cmd_file || $show);
-        $error_code = run_job($dmake, $job_name);
-
-        #if dmake fails, have a go at regenerating the dependencies
-        #and try again. dmakes normal failure is 255, while death on signal is 254
-        my $real_exit_code = $error_code >> 8;
-        if (($ENV{GUI_FOR_BUILD} eq 'WNT') && ($real_exit_code == 255) && ($ENV{nodep} eq '') && ($ENV{depend} eq '')) {
-            print "Retrying $job_name\n";
-            $error_code = run_job($dmake, $job_name);
-        }
-
-        html_store_job_info(\%local_deps_hash, $job_name, $error_code) if (!$child);
-    };
-
-    if ($error_code && $ignore) {
-        push(@ignored_errors, $job_name);
-        $error_code = 0;
-    };
-    if ($child) {
-        my $oldfh = select STDERR;
-        $| = 1;
-        select $oldfh;
-        $| =1;
-        if ($error_code) {
-            _exit($error_code >> 8);
-        } else {
-            _exit($? >> 8) if ($? && ($? != -1));
-        };
-        _exit(0);
-    } elsif ($error_code && ($error_code != -1)) {
-        $broken_build{$job_name} = $error_code;
-        return $error_code;
-    };
-};
-
-#
-# Procedure stores information about build list (and)
-# build list object in build_lists_hash
-#
-sub store_build_list_content {
-    my $module = shift;
-    my $build_list_path = get_build_list_path($module);
-    return undef if (!defined $build_list_path);
-    return if (!$build_list_path);
-    my $xml_list = undef;
-    if ($build_list_path =~ /\.xlist$/o) {
-        print_error("XMLBuildListParser.pm couldn\'t be found, so XML format for build lists is not enabled") if (!defined $enable_xml);
-        $xml_list = XMLBuildListParser->new();
-        if (!$xml_list->loadXMLFile($build_list_path)) {
-            print_error("Cannot use $build_list_path");
-        };
-        $build_lists_hash{$module} = $xml_list;
-    } else {
-        if (open (BUILD_LST, $build_list_path)) {
-            my @build_lst = <BUILD_LST>;
-            $build_lists_hash{$module} = \@build_lst;
-            close BUILD_LST;
-            return;
-        }
-        $dead_parents{$module}++;
-    };
-}
-#
-# Get string (list) of parent projects to build
-#
-sub get_parents_array {
-    my $module = shift;
-    store_build_list_content($module);
-    my $build_list_ref = $build_lists_hash{$module};
-
-    if (ref($build_list_ref) eq 'XMLBuildListParser') {
-        return $build_list_ref->getModuleDependencies(\@modes_array);
-    };
-    foreach (@$build_list_ref) {
-        if ($_ =~ /#/) {
-            if ($`) {
-                $_ = $`;
-            } else {
-                next;
-            };
-        };
-        s/\r\n//;
-        if ($_ =~ /\:+\s+/) {
-            return pick_for_build_type($');
-        };
-    };
-    return ();
-};
-
-#
-# get folders' platform infos
-#
-sub get_prj_platform {
-    my $build_list_ref = shift;
-    my ($prj_alias, $line);
-    foreach(@$build_list_ref) {
-        s/\r\n//;
-        $line++;
-        if ($_ =~ /\snmake\s/) {
-            if ($' =~ /\s*-\s+(\w+)[,\S+]*\s+(\S+)/ ) { #'
-                my $platform = $1;
-                my $alias = $2;
-                print_error ("There is no correct alias set in the line $line!") if ($alias eq 'NULL');
-                mark_platform($alias, $platform);
-            } else {
-                print_error("Misspelling in line: \n$_");
-            };
-        };
-    };
-};
-
-#
-# Procedure populate the dependencies hash with
-# information from XML build list object
-#
-sub get_deps_from_object {
-    my ($module, $build_list_object, $dependencies_hash) = @_;
-
-    foreach my $dir ($build_list_object->getJobDirectories("make", $ENV{GUI})) {
-        $path_hash{$dir} = $module_paths{$module};
-        $path_hash{$dir} .= $dir if ($dir ne '/');
-        my %deps_hash = ();
-
-        foreach my $dep ($build_list_object->getJobDependencies($dir, "make", $ENV{GUI})) {
-            $deps_hash{$dep}++;
-        };
-        $$dependencies_hash{$dir} = \%deps_hash;
-    };
-};
-
-#
-# this function wraps the get_module_dep_hash and backups the resultung hash
-#
-sub get_module_dep_hash {
-    my ($module, $module_dep_hash) = @_;
-    if (defined $module_deps_hash_backup{$module}) {
-        backup_deps_hash($module_deps_hash_backup{$module}, $module_dep_hash);
-    } else {
-        get_deps_hash($module, $module_dep_hash);
-        my %values_hash = ();
-        backup_deps_hash($module_dep_hash, \%values_hash);
-        $module_deps_hash_backup{$module} = \%values_hash;
-    }
-};
-
-#
-# Getting hashes of all internal dependencies and additional
-# information for given project
-#
-sub get_deps_hash {
-    my ($dummy, $module_to_build);
-    my %dead_dependencies = ();
-    $module_to_build = shift;
-    my $dependencies_hash = shift;
-    if ($custom_job) {
-        if ($modules_types{$module_to_build} ne 'lnk') {
-            add_prerequisite_job($dependencies_hash, $module_to_build, $pre_custom_job);
-            add_prerequisite_job($dependencies_hash, $module_to_build, $pre_job);
-            add_dependent_job($dependencies_hash, $module_to_build, $custom_job);
-            add_dependent_job($dependencies_hash, $module_to_build, $post_job);
-            add_dependent_job($dependencies_hash, $module_to_build, $post_custom_job);
-        };
-        return;
-    };
-    if ( defined $modules_types{$module_to_build} && $modules_types{$module_to_build} ne 'mod') {
-        add_prerequisite_job($dependencies_hash, $module_to_build, $pre_job);
-        return;
-    };
-
-    my  $build_list_ref = $build_lists_hash{$module_to_build};
-    if (ref($build_list_ref) eq 'XMLBuildListParser') {
-        get_deps_from_object($module_to_build, $build_list_ref, $dependencies_hash);
-    } else {
-        get_prj_platform($build_list_ref);
-        foreach (@$build_list_ref) {
-            if ($_ =~ /#/o) {
-                next if (!$`);
-                $_ = $`;
-            };
-            s/\r\n//;
-            if ($_ =~ /\s+nmake\s+/o) {
-                my ($platform, $dependencies, $dir, $dir_alias);
-                my %deps_hash = ();
-                $dependencies = $';
-                $dummy = $`;
-                $dummy =~ /(\S+)\s+(\S*)/o;
-                $dir = $2;
-                $dependencies =~ /(\w+)/o;
-                $platform = $1;
-                $dependencies = $';
-                while ($dependencies =~ /,(\w+)/o) {
-                    $dependencies = $'; #'
-                };
-                $dependencies =~ /\s+(\S+)\s+/o;
-                $dir_alias = $1;
-                if (!check_platform($platform)) {
-                    next if (defined $platform_hash{$dir_alias});
-                    $dead_dependencies{$dir_alias}++;
-                    next;
-                };
-                delete $dead_dependencies{$dir_alias} if (defined $dead_dependencies{$dir_alias});
-                print_error("Directory alias $dir_alias is defined at least twice!! Please, correct build.lst in module $module_to_build") if (defined $$dependencies_hash{$dir_alias});
-                $platform_hash{$dir_alias}++;
-                $dependencies = $'; #'
-                print_error("$module_to_build/prj/build.lst has wrongly written dependencies string:\n$_\n") if (!$dependencies);
-                $deps_hash{$_}++ foreach (get_dependency_array($dependencies));
-                $$dependencies_hash{$dir_alias} = \%deps_hash;
-                my $local_dir = '';
-                if ($dir =~ /(\\|\/)/o) {
-                    $local_dir = "/$'";
-                };
-                $path_hash{$dir_alias} = correct_path($module_paths{$module_to_build} . $local_dir);
-            } elsif ($_ !~ /^\s*$/ && $_ !~ /^\w*\s/o) {
-                chomp;
-                push(@errors, $_);
-            };
-        };
-        if (scalar @errors) {
-            my $message = "$module_to_build/prj/build.lst has wrongly written string(s):\n";
-            $message .= "$_\n" foreach(@errors);
-            if ($processes_to_run) {
-                $broken_build{$module_to_build} = $message;
-                $dependencies_hash = undef;
-                return;
-            } else {
-                print_error($message);
-            };
-        };
-        foreach my $alias (keys %dead_dependencies) {
-            next if defined $alive_dependencies{$alias};
-#            if (!IsHashNative($alias)) {
-                remove_from_dependencies($alias, $dependencies_hash);
-                delete $dead_dependencies{$alias};
-#            };
-        };
-    };
-    resolve_aliases($dependencies_hash, \%path_hash);
-    if (!$prepare) {
-        add_prerequisite_job($dependencies_hash, $module_to_build, $pre_custom_job);
-        add_prerequisite_job($dependencies_hash, $module_to_build, $pre_job);
-        add_dependent_job($dependencies_hash, $module_to_build, $custom_job);
-        add_dependent_job($dependencies_hash, $module_to_build, $post_job) if ($module_to_build ne $initial_module);
-        add_dependent_job($dependencies_hash, $module_to_build, $post_custom_job);
-    };
-    store_weights($dependencies_hash);
-};
-
-#
-# procedure adds which is independent from anothers, but anothers are dependent from it
-#
-sub add_prerequisite_job {
-    my ($dependencies_hash, $module, $job) = @_;
-    return if (!$job);
-    $job = "$module $job";
-    foreach (keys %$dependencies_hash) {
-        my $deps_hash = $$dependencies_hash{$_};
-        $$deps_hash{$job}++;
-    };
-    $$dependencies_hash{$job} = {};
-};
-
-#
-# procedure adds a job wich is dependent from all already registered jobs
-#
-sub add_dependent_job {
-    # $post_job is dependent from all jobs
-    my ($dependencies_hash, $module, $job) = @_;
-    return if (!$job);
-    my %deps_hash = ();
-    $deps_hash{$_}++ foreach (keys %$dependencies_hash);
-    $$dependencies_hash{"$module $job"} = \%deps_hash;
-};
-
-#
-# this procedure converts aliases to absolute paths
-#
-sub resolve_aliases {
-    my ($dependencies_hash, $path_hash) = @_;
-    foreach my $dir_alias (keys %$dependencies_hash) {
-        my $aliases_hash_ref = $$dependencies_hash{$dir_alias};
-        my %paths_hash = ();
-        foreach (keys %$aliases_hash_ref) {
-            $paths_hash{$$path_hash{$_}}++;
-        };
-        delete $$dependencies_hash{$dir_alias};
-        $$dependencies_hash{$$path_hash{$dir_alias}} = \%paths_hash;
-    };
-};
-
-#
-# mark platform in order to prove if alias has been used according to specs
-#
-sub mark_platform {
-    my $prj_alias = shift;
-    if (exists $prj_platform{$prj_alias}) {
-        $prj_platform{$prj_alias} = 'all';
-    } else {
-        $prj_platform{$prj_alias} = shift;
-    };
-};
-
-#
-# Convert path from abstract (with '\' and/or '/' delimiters)
-# to system-independent
-#
-sub correct_path {
-    $_ = shift;
-    s/\\/\//g;
-    return $_;
-};
-
-
-sub check_dmake {
-    if (open(DMAKEVERSION, "dmake -V |")) {
-        my @dmake_version = <DMAKEVERSION>;
-        close DMAKEVERSION;
-        return;
-    };
-    my $error_message = 'dmake: Command not found.';
-    $error_message .= ' Please rerun bootstrap' if (!defined $ENV{COMMON_ENV_TOOLS});
-    print_error($error_message);
-};
-
-#
-# Get platform-dependent commands
-#
-sub get_commands {
-    my $arg = '';
-    # Setting alias for dmake
-    $dmake = 'dmake';
-    check_dmake();
-
-    if ($cmd_file) {
-        if ($ENV{GUI_FOR_BUILD} eq 'UNX') {
-            $check_error_string = "if \"\$?\" != \"0\" exit\n";
-        } else {
-            $check_error_string = "if \"\%?\" != \"0\" quit\n";
-        };
-    };
-
-    $dmake_args = join(' ', 'dmake', @dmake_args);
-
-    while ($arg = pop(@dmake_args)) {
-        $dmake .= ' '.$arg;
-    };
-    $dmake .= ' verbose=true' if ($html || $verbose);
-};
-
-#
-# Procedure retrieves list of projects to be built from build.lst
-#
-sub get_workspace_path {
-    if (!defined $ENV{GUI}) {
-        $ENV{mk_tmp} = '';
-        die "No environment set\n";
-    };
-    my $repository_helper = RepositoryHelper->new();
-    my $workspace_path = $repository_helper->get_repository_root();
-    my $initial_dir = $repository_helper->get_initial_directory();
-    if ($workspace_path eq $initial_dir) {
-        print_error('Found no project to build');
-    };
-    $initial_module = substr($initial_dir, length($workspace_path) + 1);
-    if ($initial_module =~ /(\\|\/)/) {
-        $initial_module = $`;
-    };
-    $module_paths{$initial_module} = $workspace_path . "/$initial_module";
-    return $workspace_path;
-};
-
-#
-# Picks project which can be built now from hash and then deletes it from hash
-#
-sub pick_prj_to_build {
-    my $deps_hash = shift;
-    get_html_orders();
-    my $prj = find_indep_prj($deps_hash);
-    if ($prj) {
-        delete $$deps_hash{$prj};
-        generate_html_file();
-    };
-    return $prj;
-};
-
-#
-# Make a decision if the project should be built on this platform
-#
-sub check_platform {
-    my $platform = shift;
-    return 1 if ($platform eq 'all');
-    return 1 if (($ENV{GUI} eq 'WIN') && ($platform eq 'w'));
-    return 1 if (($ENV{GUI} eq 'UNX') && ($platform eq 'u'));
-    return 1 if (($ENV{GUI} eq 'WNT') &&
-                 (($platform eq 'w') || ($platform eq 'n')));
-    return 0;
-};
-
-#
-# Remove project to build ahead from dependencies and make an array
-# of all from given project dependent projects
-#
-sub remove_from_dependencies {
-    my ($exclude_prj, $i, $prj, $dependencies);
-    $exclude_prj = shift;
-    my $exclude_prj_orig = '';
-    $exclude_prj_orig = $` if (($exclude_prj =~ /\.lnk$/o) || ($exclude_prj =~ /\.link$/o));
-    $dependencies = shift;
-    foreach $prj (keys %$dependencies) {
-        my $prj_deps_hash = $$dependencies{$prj};
-        delete $$prj_deps_hash{$exclude_prj} if (defined $$prj_deps_hash{$exclude_prj});
-    };
-};
-
-
-#
-# Check the hash for consistency
-#
-sub check_deps_hash {
-    my ($deps_hash_ref, $module) = @_;
-    my @possible_order;
-    my $module_path = $module_paths{$module} if (defined $module);
-    return if (!scalar keys %$deps_hash_ref);
-    my %deps_hash = ();
-    my $consistent;
-    backup_deps_hash($deps_hash_ref, \%deps_hash);
-    my $string;
-    my $log_name;
-    my $build_number = 0;
-
-    do {
-        $consistent = '';
-        foreach my $key (sort keys %deps_hash) {
-            my $local_deps_ref = $deps_hash{$key};
-            if (!scalar keys %$local_deps_ref) {
-                if (defined $module) {
-                    $build_number++;
-                    $string = undef;
-                    if ($key =~ /(\s)/o) {
-                        $string = $key;
-                    } else {
-                        if (length($key) == length($module_path)) {
-                            $string = './';
-                        } else {
-                            $string = substr($key, length($module_path) + 1);
-                            $string =~ s/\\/\//go;
-                        };
-                    };
-                    $log_name = $string;
-                    if ($log_name eq "$module $custom_job") {
-                        $log_name = "custom_job";
-                    };
-                    if ($log_name eq "$module $pre_custom_job") {
-                        $log_name = "pre_custom_job";
-                    };
-                    if ($log_name eq "$module $post_custom_job") {
-                        $log_name = "post_custom_job";
-                    };
-                    $log_name =~ s/\\|\//\./g;
-                    $log_name =~ s/\s/_/g;
-                    $log_name = $module if ($log_name =~ /^\.+$/);
-                    $log_name .= '.txt';
-                    push(@possible_order, $key);
-                    $jobs_hash{$key} = {    SHORT_NAME => $string,
-                                            BUILD_NUMBER => $build_number,
-                                            STATUS => 'waiting',
-                                            LOG_PATH => '../' . $source_config->get_module_repository($module) . "/$module/$ENV{INPATH}/misc/logs/$log_name",
-                                            LONG_LOG_PATH => correct_path($module_paths{$module} . "/$ENV{INPATH}/misc/logs/$log_name"),
-                                            START_TIME => 0,
-                                            FINISH_TIME => 0,
-                                            CLIENT => '-'
-                    };
-                };
-                remove_from_dependencies($key, \%deps_hash);
-                delete $deps_hash{$key};
-                $consistent++;
-            };
-        };
-    } while ($consistent && (scalar keys %deps_hash));
-    return \@possible_order if ($consistent);
-    print STDERR "Fatal error:";
-    foreach (keys %deps_hash) {
-        print STDERR "\n\t$_ depends on: ";
-        foreach my $i (keys %{$deps_hash{$_}}) {
-            print STDERR (' ', $i);
-        };
-    };
-    if ($child) {
-        my $oldfh = select STDERR;
-        $| = 1;
-        _do_exit(1);
-    } else {
-        print_error("There are dead or circular dependencies\n");
-    };
-};
-
-#
-# Find project with no dependencies left.
-#
-sub find_indep_prj {
-    my ($dependencies, $i);
-    my @candidates = ();
-    $all_dependent = 1;
-    handle_dead_children(0) if ($processes_to_run);
-    my $children = children_number();
-    return '' if (!$server_mode && $children && ($children >= $processes_to_run));
-    $dependencies = shift;
-    if (scalar keys %$dependencies) {
-        foreach my $job (keys %$dependencies) {
-            if (!scalar keys %{$$dependencies{$job}}) {
-                push(@candidates, $job);
-                last if (!$processes_to_run);
-            };
-        };
-        if (scalar @candidates) {
-            $all_dependent = 0;
-            my $best_candidate = undef;
-            my $best_weight = 0;
-            if (scalar @candidates > 1) {
-                foreach my $candidate (@candidates) {
-                    my $candidate_weight = get_waiters_number($candidate);
-                    if ($candidate_weight > $best_weight) {
-                        $best_candidate = $candidate;
-                        $best_weight = $candidate_weight;
-                    };
-                };
-                if (defined $best_candidate) {
-                    return $best_candidate;
-                }
-            }
-            my @sorted_candidates = sort(@candidates);
-            return $sorted_candidates[0];
-        };
-    };
-    return '';
-};
-
-sub get_waiters_number {
-    my $module = shift;
-    if (defined $weights_hash{$module}) {
-        return $weights_hash{$module};
-    };
-    if (defined $reversed_dependencies{$module}) {
-        return scalar keys %{$reversed_dependencies{$module}};
-    };
-    return 0;
-};
-
-#
-# Check if given entry is HASH-native, that is not a user-defined data
-#
-#sub IsHashNative {
-#    my $prj = shift;
-#    return 1 if ($prj =~ /^HASH\(0x[\d | a | b | c | d | e | f]{6,}\)/);
-#    return 0;
-#};
-
-#
-# Getting array of dependencies from the string given
-#
-sub get_dependency_array {
-    my ($dep_string, @dependencies, $parent_prj, $prj, $string);
-    @dependencies = ();
-    $dep_string = shift;
-    $string = $dep_string;
-    $prj = shift;
-    while ($dep_string !~ /^NULL/o) {
-        print_error("Project $prj has wrongly written dependencies string:\n $string") if (!$dep_string);
-        $dep_string =~ /(\S+)\s*/o;
-        $parent_prj = $1;
-        $dep_string = $'; #'
-        if ($parent_prj =~ /\.(\w+)$/o) {
-            $parent_prj = $`;
-            if (($prj_platform{$parent_prj} ne $1) &&
-                ($prj_platform{$parent_prj} ne 'all')) {
-                print_error ("$parent_prj\.$1 is a wrongly dependency identifier!\nCheck if it is platform dependent");
-            };
-            $alive_dependencies{$parent_prj}++ if (check_platform($1));
-            push(@dependencies, $parent_prj);
-        } else {
-            if ((exists($prj_platform{$parent_prj})) &&
-                ($prj_platform{$parent_prj} ne 'all') ) {
-                print_error("$parent_prj is a wrongly used dependency identifier!\nCheck if it is platform dependent");
-            };
-            push(@dependencies, $parent_prj);
-        };
-    };
-    return @dependencies;
-};
-
-
-#
-# Getting current directory list
-#
-sub get_directory_list {
-    my $path = shift;
-    opendir(CurrentDirList, $path);
-    my @directory_list = readdir(CurrentDirList);
-    closedir(CurrentDirList);
-    return @directory_list;
-};
-
-sub print_error {
-    my $message = shift;
-    my $force = shift;
-    $modules_number -= scalar keys %global_deps_hash;
-    $modules_number -= 1;
-    print STDERR "\nERROR: $message\n";
-    $ENV{mk_tmp} = '';
-    if ($cmd_file) {
-        close CMD_FILE;
-        unlink ($cmd_file);
-    };
-    if (!$child) {
-        $ENV{mk_tmp} = '';
-        close CMD_FILE if ($cmd_file);
-        unlink ($cmd_file);
-        do_exit(1);
-    };
-    do_exit(1) if (defined $force);
-};
-
-sub usage {
-    print STDERR "\nbuild\n";
-    print STDERR "Syntax:    build    [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches prj_name1[:prj_name2] [--skip prj_name1[:prj_name2] [prj_name3 [...]] [prj_name3 [...]|-b]|[--prepare|-p][:platform] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add [module1,module2[,...,moduleN]]]] [--exclude_branch_from prj_name1[:prj_name2] [prj_name3 [...]]] [--interactive] [--verbose]\n";
-    print STDERR "Example1:    build --from sfx2\n";
-    print STDERR "                     - build all projects dependent from sfx2, starting with sfx2, finishing with the current module\n";
-    print STDERR "Example2:    build --all:sfx2\n";
-    print STDERR "                     - the same as --all, but skip all projects that have been already built when using \"--all\" switch before sfx2\n";
-    print STDERR "Example3:    build --all --server\n";
-    print STDERR "                     - build all projects in server mode, use first available port from default range 7890-7894 (running clients required!!)\n";
-    print STDERR "Example4(for unixes):\n";
-    print STDERR "             build --all --pre_job=echo\\ Starting\\ job\\ in\\ \\\$PWD --job=some_script.sh --post_job=echo\\ Job\\ in\\ \\\$PWD\\ is\\ made\n";
-    print STDERR "                     - go through all projects, echo \"Starting job in \$PWD\" in each module, execute script some_script.sh, and finally echo \"Job in \$PWD is made\"\n";
-    print STDERR "\nSwitches:\n";
-    print STDERR "        --all        - build all projects from very beginning till current one\n";
-    print STDERR "        --from       - build all projects dependent from the specified (including it) till current one\n";
-    print STDERR "        --exclude_branch_from    - exclude module(s) and its branch from the build\n";
-    print STDERR "        --mode OOo   - build only projects needed for OpenOffice.org\n";
-    print STDERR "        --prepare    - clear all projects for incompatible build from prj_name till current one [for platform] (cws version)\n";
-    print STDERR "        --with_branches- the same as \"--from\" but with build all projects in neighbour branches\n";
-    print STDERR "        --skip       - do not build certain module(s)\n";
-    print STDERR "        --since      - build all projects beginning from the specified till current one (the same as \"--all:prj_name\", but skipping prj_name)\n";
-    print STDERR "        --checkmodules      - check if all required parent projects are availlable\n";
-    print STDERR "        --show       - show what is going to be built\n";
-    print STDERR "        --file       - generate command file file_name\n";
-    print STDERR "        --deliver    - only deliver, no build (usable for \'-all\' and \'-from\' keys)\n";
-    print STDERR "        -P           - start multiprocessing build, with number of processes passed\n";
-    print STDERR "        --server     - start build in server mode (clients required)\n";
-    print STDERR "          --setenvstring  - string for configuration of the client environment\n";
-    print STDERR "          --port          - set server port, default is 7890. You may pass several ports, the server will be started on the first available\n";
-    print STDERR "                            otherwise the server will be started on first available port from the default range 7890-7894\n";
-    print STDERR "          --client_timeout  - time frame after which the client/job is considered to be lost. Default is 120 min\n";
-    print STDERR "        --dlv_switch - use deliver with the switch specified\n";
-    print STDERR "        --help       - print help info\n";
-    print STDERR "        --ignore     - force tool to ignore errors\n";
-    print STDERR "        --html       - generate html page with build status\n";
-    print STDERR "                       file named $ENV{INPATH}.build.html will be generated in $ENV{SOLARSRC}\n";
-    print STDERR "          --html_path      - set html page path\n";
-    print STDERR "          --dontgraboutput - do not grab console output when generating html page\n";
-    print STDERR "        --genconf    - generate/modify workspace configuration file\n";
-    print STDERR "          --add            - add active module(s) to configuration file\n";
-    print STDERR "          --remove         - removeactive  modules(s) from configuration file\n";
-    print STDERR "          --removeall|--clear          - remove all active modules(s) from configuration file\n";
-
-    print STDERR "        --stoponerror      - stop build when error occurs (for mp builds)\n";
-    print STDERR "        --interactive      - start interactive build process (process can be managed via html page)\n";
-    print STDERR "        --verbose          - generates a detailed output of the build process\n";
-    print STDERR "   Custom jobs:\n";
-    print STDERR "        --job=job_string        - execute custom job in (each) module. job_string is a shell script/command to be executed instead of regular dmake jobs\n";
-    print STDERR "        --pre_job=pre_job_string        - execute preliminary job in (each) module. pre_job_string is a shell script/command to be executed before regular job in the module\n";
-    print STDERR "        --post_job=job_string        - execute a postprocess job in (each) module. post_job_string is a shell script/command to be executed after regular job in the module\n";
-    print STDERR "Default:             - build current project\n";
-    print STDERR "Unknown switches passed to dmake\n";
-};
-
-#
-# Get all options passed
-#
-sub get_options {
-    my ($arg, $dont_grab_output);
-    while ($arg = shift @ARGV) {
-        $arg =~ /^-P$/            and $processes_to_run = shift @ARGV     and next;
-        $arg =~ /^-P(\d+)$/            and $processes_to_run = $1 and next;
-        $arg =~ /^--all$/        and $build_all_parents = 1             and next;
-        $arg =~ /^-a$/        and $build_all_parents = 1             and next;
-        $arg =~ /^--show$/        and $show = 1                         and next;
-        $arg =~ /^--checkmodules$/       and $checkparents = 1 and $ignore = 1 and next;
-        $arg =~ /^-s$/        and $show = 1                         and next;
-        $arg =~ /^--deliver$/    and $deliver = 1                     and next;
-        $arg =~ /^--gmake$/    and $allow_gbuild = 1 and print "ALLOW GBUILD" and next;
-        $arg =~ /^(--job=)/       and $custom_job = $' and next;
-        $arg =~ /^(--pre_job=)/       and $pre_custom_job = $' and next;
-        $arg =~ /^(--post_job=)/       and $post_custom_job = $' and next; #'
-        $arg =~ /^-d$/    and $deliver = 1                     and next;
-        $arg =~ /^--dlv_switch$/    and $dlv_switch = shift @ARGV    and next;
-        $arg =~ /^--file$/        and $cmd_file = shift @ARGV             and next;
-        $arg =~ /^-F$/        and $cmd_file = shift @ARGV             and next;
-        $arg =~ /^--skip$/    and get_modules_passed(\%skip_modules)      and next;
-
-        if ($arg =~ /^--with_branches$/ || $arg =~ /^-b$/) {
-                                    $build_from_with_branches = 1;
-                                    $build_all_parents = 1;
-                                    get_modules_passed(\%incompatibles);
-                                    next;
-        };
-        $arg =~ /^--all:(\S+)$/ and $build_all_parents = 1
-                                and $build_all_cont = $1            and next;
-        $arg =~ /^-a:(\S+)$/ and $build_all_parents = 1
-                                and $build_all_cont = $1            and next;
-        if ($arg =~ /^--from$/ || $arg =~ /^-f$/) {
-                                    $build_all_parents = 1;
-                                    get_modules_passed(\%incompatibles);
-                                    next;
-        };
-        if ($arg =~ /^--exclude_branch_from$/) {
-                                    get_modules_passed(\%exclude_branches);
-                                    next;
-        };
-        $arg =~ /^--prepare$/    and $prepare = 1 and next;
-        $arg =~ /^-p$/            and $prepare = 1 and next;
-        $arg =~ /^--prepare:/    and $prepare = 1 and $only_platform = $' and next;
-        $arg =~ /^-p:/            and $prepare = 1 and $only_platform = $' and next;
-        $arg =~ /^--since$/        and $build_all_parents = 1
-                                and $build_since = shift @ARGV         and next;
-        $arg =~ /^-c$/        and $build_all_parents = 1
-                                and $build_since = shift @ARGV         and next;
-        $arg =~ /^-s$/            and $build_all_parents = 1
-                                and $build_since = shift @ARGV         and next;
-        $arg =~ /^--help$/        and usage()                            and do_exit(0);
-        $arg =~ /^-h$/        and usage()                            and do_exit(0);
-        $arg =~ /^--ignore$/        and $ignore = 1                            and next;
-        $arg =~ /^--genconf$/        and $generate_config = 1                  and next;
-        if ($arg =~ /^--add$/)      {
-                                        get_list_of_modules(\%add_to_config);
-                                        next;
-        };
-        if ($arg =~ /^--remove$/)   {
-                                        get_list_of_modules(\%remove_from_config);
-                                        if (!scalar %remove_from_config) {
-                                            print_error('No module list supplied!!');
-                                        };
-                                        next;
-        };
-        ($arg =~ /^--clear$/ || $arg =~ /^--removeall$/)  and $clear_config = 1 and next;
-        $arg =~ /^--html$/        and $html = 1                            and next;
-        $arg =~ /^--dontgraboutput$/        and $dont_grab_output = 1      and next;
-        $arg =~ /^--html_path$/ and $html_path = shift @ARGV  and next;
-        $arg =~ /^-i$/        and $ignore = 1                            and next;
-        $arg =~ /^--server$/        and $server_mode = 1                      and next;
-        $arg =~ /^--client_timeout$/ and $client_timeout = (shift @ARGV)*60  and next;
-        $arg =~ /^--setenvstring$/            and $setenv_string =  shift @ARGV         and next;
-        $arg =~ /^--port$/            and $ports_string =  shift @ARGV         and next;
-        $arg =~ /^--version$/   and do_exit(0);
-        $arg =~ /^-V$/          and do_exit(0);
-        $arg =~ /^-m$/            and get_modes()         and next;
-        $arg =~ /^--mode$/        and get_modes()         and next;
-        $arg =~ /^--stoponerror$/        and $stop_build_on_error = 1         and next;
-        $arg =~ /^--interactive$/        and $interactive = 1         and next;
-        $arg =~ /^--verbose$/       and $verbose = 1         and next;
-        if ($arg =~ /^--$/) {
-            push (@dmake_args, get_dmake_args()) if (!$custom_job);
-            next;
-        };
-        push (@dmake_args, $arg);
-    };
-    if (!$html) {
-        print_error("\"--html_path\" switch is used only with \"--html\"") if ($html_path);
-        print_error("\"--dontgraboutput\" switch is used only with \"--html\"") if ($dont_grab_output);
-    };
-    if ((scalar keys %exclude_branches) && !$build_all_parents) {
-        print_error("\"--exclude_branch_from\" is not applicable for one module builds!!");
-    };
-    $grab_output = 0 if ($dont_grab_output);
-    print_error('Switches --with_branches and --all collision') if ($build_from_with_branches && $build_all_cont);
-    print_error('Switch --skip is for building multiple modules only!!') if ((scalar keys %skip_modules) && (!$build_all_parents));
-    print_error('Switches --with_branches and --since collision') if ($build_from_with_branches && $build_since);
-    if ($show) {
-        $processes_to_run = 0;
-        $cmd_file = '';
-    };
-    print_error('Switches --job and --deliver collision') if ($custom_job && $deliver);
-    $custom_job = 'deliver' if $deliver;
-    $post_job = 'deliver' if (!$custom_job);
-    $incompatible = scalar keys %incompatibles;
-    if ($prepare) {
-        print_error("--prepare is for use with --from switch only!\n") if (!$incompatible);
-    };
-    if ($processes_to_run) {
-        if ($ignore && !$html) {
-            print_error("Cannot ignore errors in multiprocessing build");
-        };
-        if (!$enable_multiprocessing) {
-            print_error("Cannot load Win32::Process module for multiprocessing build");
-        };
-        if ($server_mode) {
-            print_error("Switches -P and --server collision");
-        };
-    } elsif ($stop_build_on_error) {
-        print_error("Switch --stoponerror is only for multiprocessing builds");
-    };
-    if ($server_mode) {
-        $html++;
-        $client_timeout = 60 * 60 * 2 if (!$client_timeout);
-    } else {
-        print_error("--ports switch is for server mode only!!") if ($ports_string);
-        print_error("--setenvstring switch is for server mode only!!") if ($setenv_string);
-        print_error("--client_timeout switch is for server mode only!!") if ($client_timeout);
-    };
-
-    if (!$generate_config) {
-        my $error_message = ' switch(es) should be used only with "--genconf"';
-        print_error('"--removeall" ("--clear")' . $error_message) if ($clear_config);
-        if ((scalar %add_to_config) || (scalar %remove_from_config)) {
-            print_error('"--add" or/and "--remove"' . $error_message);
-        };
-    } elsif ((!scalar %add_to_config) && !$clear_config && (!scalar %remove_from_config) && !$build_all_parents){
-        print_error('Please supply necessary switch for "--genconf" (--add|--remove|--removeall). --add can be used with --from and such');
-    };
-
-    if ($only_platform) {
-        $only_common = 'common';
-        $only_common .= '.pro' if ($only_platform =~ /\.pro$/);
-    };
-    if ($interactive) {
-        $html++; # enable html page generation...
-        my $local_host_name = hostname();
-        $local_host_ip = inet_ntoa(scalar(gethostbyname($local_host_name)) || 'localhost');
-    }
-    # Default build modes(for OpenOffice.org)
-    $ENV{BUILD_TYPE} = 'OOo EXT' if (!defined $ENV{BUILD_TYPE});
-    @ARGV = @dmake_args;
-    foreach $arg (@dmake_args) {
-        $arg =~ /^verbose=(\S+)$/i and $verbose_mode = ($1 =~ /^t\S*$/i);
-    }
-};
-
-sub get_module_and_buildlist_paths {
-    if ($build_all_parents || $checkparents) {
-        $source_config_file = $source_config->get_config_file_path();
-        $active_modules{$_}++ foreach ($source_config->get_active_modules());
-        my %active_modules_copy = %active_modules;
-        foreach my $module ($source_config->get_all_modules()) {
-            delete $active_modules_copy{$module} if defined($active_modules_copy{$module});
-            next if ($module eq $initial_module);
-            $module_paths{$module} = $source_config->get_module_path($module);
-            $build_list_paths{$module} = $source_config->get_module_build_list($module);
-            $is_gbuild{$module} = $source_config->{GBUILD};
-        }
-        $dead_parents{$_}++ foreach (keys %active_modules_copy);
-    };
-};
-
-
-sub get_dmake_args {
-    my $arg;
-    my @job_args = ();
-    while ($arg = shift @ARGV) {
-        next if ($arg =~ /^--$/);
-        push (@job_args, $arg);
-    };
-    return @job_args;
-};
-
-#
-# get all options without '-'
-#
-sub get_switch_options {
-    my $string = '';
-    my $option = '';
-    while ($option = shift @ARGV) {
-        if (!($option =~ /^-+/)) {
-            $string .= '-' . $option;
-            $string .= ' ';
-        } else {
-            unshift(@ARGV, $option);
-            last;
-        };
-    };
-    $string =~ s/\s$//;
-    return $string;
-};
-
-#
-# cancel build when one of children has error exit code
-#
-sub cancel_build {
-    my $broken_modules_number = scalar @broken_modules_names;
-
-    print STDERR "\n";
-    print STDERR "-----------------------------------------------------------------------\n";
-    print STDERR "        Oh dear - something failed during the build - sorry !\n";
-    print STDERR "  For more help with debugging build errors, please see the section in:\n";
-    print STDERR "            http://wiki.documentfoundation.org/Development\n";
-    print STDERR "\n";
-
-    if (!$broken_modules_number || !$build_all_parents) {
-        while (children_number()) {
-            handle_dead_children(1);
-        }
-    }
-
-    if (keys %broken_build) {
-        print STDERR "  internal build errors:\n\n";
-        foreach (keys %broken_build) {
-            print STDERR "ERROR: error " . $broken_build{$_} . " occurred while making $_\n";
-        };
-        print STDERR "\n";
-    }
-
-    my $module = shift @broken_modules_names;
-    if ($broken_modules_number > 1) {
-        print STDERR " it seems you are using a threaded build, which means that the\n";
-        print STDERR " actual compile error is probably hidden far above, and could be\n";
-        print STDERR " inside any of these other modules:\n";
-        print STDERR "     @broken_modules_names\n";
-        print STDERR " please re-run build inside each one to isolate the problem.\n";
-    } else {
-        print STDERR " it seems that the error is inside '$module', please re-run build\n";
-        print STDERR " inside this module to isolate the error and/or test your fix:\n";
-    }
-    print STDERR "-----------------------------------------------------------------------\n";
-    print STDERR "\n";
-    print STDERR "rm -Rf " . $ENV{'SRC_ROOT'} . "/$module/" . $ENV{'INPATH'} . " # optional module 'clean'\n";
-    print STDERR "" . $ENV{'OOO_SHELL'} . "\n";
-    print STDERR "cd " . $ENV{'SRC_ROOT'} . "\n";
-    print STDERR "source ./" . $ENV{'ENV_SCRIPT'} . "\n";
-    print STDERR "cd $module\n";
-    if (is_gnumake_module($module))
-    {
-        print STDERR "$ENV{GNUMAKE} -r\n"
-    }
-    else
-    {
-        print STDERR "build\n";
-    }
-    print STDERR "\n";
-    print STDERR "when the problem is isolated and fixed exit and re-run 'make' from the top-level\n";
-    zenity_message("LibreOffice Build Failed!");
-    zenity_close();
-
-    do_exit(1);
-};
-
-#
-# Function for storing errors in multiprocessing AllParents build
-#
-sub store_error {
-    my ($pid, $error_code) = @_;
-    return 0 if (!$error_code);
-
-    #we don't care if zenity itself crashes, e.g. rhbz#670895
-    if (zenity_enabled()) {
-        return 0 if ($zenity_pid == $pid);
-    }
-
-    my $child_nick = $processes_hash{$pid};
-
-    if ($ENV{GUI_FOR_BUILD} eq 'WNT') {
-        if (!defined $had_error{$child_nick}) {
-            $had_error{$child_nick}++;
-            return 1;
-        };
-    };
-    $modules_with_errors{$folders_hashes{$child_nick}}++;
-    $broken_build{$child_nick} = $error_code;
-    if ($stop_build_on_error) {
-        clear_from_child($pid);
-        # Let all children finish their work
-        while (children_number()) {
-            handle_dead_children(1);
-        };
-        cancel_build();
-    };
-    return 0;
-};
-
-#
-# child handler (clears (or stores info about) the terminated child)
-#
-sub handle_dead_children {
-    my $running_children = children_number();
-    return if (!$running_children);
-    my $force_wait = shift;
-    my $try_once_more = 0;
-    do {
-        my $pid = 0;
-        if (children_number() >= $processes_to_run ||
-                ($force_wait && ($running_children == children_number()))) {
-            $pid = wait();
-        } else {
-            $pid = waitpid( -1, &WNOHANG);
-        };
-        if ($pid > 0) {
-            $try_once_more = store_error($pid, $?);
-            if ($try_once_more) {
-                give_second_chance($pid);
-            } else {
-                clear_from_child($pid);
-            };
-            $finished_children++;
-        };
-    } while(children_number() >= $processes_to_run);
-};
-
-sub give_second_chance {
-    my $pid = shift;
-    # A malicious hack for mysterious windows problems - try 2 times
-    # to run dmake in the same directory if errors occurs
-    my $child_nick = $processes_hash{$pid};
-    $running_children{$folders_hashes{$child_nick}}--;
-    delete $processes_hash{$pid};
-    start_child($child_nick, $folders_hashes{$child_nick});
-};
-
-sub clear_from_child {
-    my $pid = shift;
-    my $child_nick = $processes_hash{$pid};
-    my $error_code = 0;
-    if (defined $broken_build{$child_nick}) {
-        $error_code = $broken_build{$child_nick};
-    } else {
-        remove_from_dependencies($child_nick,
-                            $folders_hashes{$child_nick});
-    };
-    foreach (keys %module_deps_hash_pids) {
-        delete ${$module_deps_hash_pids{$_}}{$pid} if defined (${$module_deps_hash_pids{$_}}{$pid});
-    };
-    my $module = $module_by_hash{$folders_hashes{$child_nick}};
-    html_store_job_info($folders_hashes{$child_nick}, $child_nick, $error_code);
-    $running_children{$folders_hashes{$child_nick}}--;
-    delete $processes_hash{$pid};
-    $verbose_mode && print 'Running processes: ' . children_number() . "\n";
-};
-
-#
-# Build the entire project according to queue of dependencies
-#
-sub build_dependent {
-    $dependencies_hash = shift;
-    my $pid = 0;
-    my $child_nick = '';
-    $running_children{$dependencies_hash} = 0 if (!defined $running_children{$dependencies_hash});
-    while ($child_nick = pick_prj_to_build($dependencies_hash)) {
-        if ($processes_to_run) {
-            do {
-                if (defined $modules_with_errors{$dependencies_hash} && !$ignore) {
-                    return 0 if ($build_all_parents);
-                    last;
-                };
-                # start current child & all
-                # that could be started now
-                if ($child_nick) {
-                    start_child($child_nick, $dependencies_hash);
-                    return 1 if ($build_all_parents);
-                } else {
-                    return 0 if ($build_all_parents);
-                    if (scalar keys %$dependencies_hash) {
-                        handle_dead_children(1);
-                    };
-                };
-                $child_nick = pick_prj_to_build($dependencies_hash);
-            } while (scalar keys %$dependencies_hash || $child_nick);
-            while (children_number()) {
-                handle_dead_children(1);
-            };
-
-            if (defined $modules_with_errors{$dependencies_hash}) {
-                cancel_build();
-            }
-            mp_success_exit();
-        } else {
-            if (dmake_dir($child_nick)) {
-                push(@broken_modules_names, $module_by_hash{$dependencies_hash});
-                cancel_build();
-            };
-        };
-        $child_nick = '';
-    };
-};
-
-sub children_number {
-    return scalar keys %processes_hash;
-};
-
-sub start_child {
-    my ($job_dir, $dependencies_hash) = @_;
-    $jobs_hash{$job_dir}->{START_TIME} = time();
-    $jobs_hash{$job_dir}->{STATUS} = 'building';
-    if ($job_dir =~ /(\s)/o) {
-        my $error_code = undef;
-        if ($job_dir !~ /\sdeliver$/o) {
-            $error_code = do_custom_job($job_dir, $dependencies_hash);
-            return;
-        }
-    };
-    $build_in_progress{$module_by_hash{$dependencies_hash}}++;
-    html_store_job_info($dependencies_hash, $job_dir);
-    my $pid = undef;
-    my $children_running;
-    my $oldfh = select STDOUT;
-    $| = 1;
-    if ($pid = fork) { # parent
-        select $oldfh;
-        $processes_hash{$pid} = $job_dir;
-        $children_running = children_number();
-        $verbose_mode && print 'Running processes: ', $children_running, "\n";
-        $maximal_processes = $children_running if ($children_running > $maximal_processes);
-        $folders_hashes{$job_dir} = $dependencies_hash;
-        store_pid($dependencies_hash, $pid);
-        $running_children{$dependencies_hash}++;
-    } elsif (defined $pid) { # child
-        select $oldfh;
-        $child = 1;
-        dmake_dir($job_dir);
-        do_exit(1);
-    };
-};
-
-sub store_pid {
-    my ($deps_hash, $pid) = @_;
-    if (!defined $module_deps_hash_pids{$deps_hash}) {
-        my %module_hash_pids = ();
-        $module_deps_hash_pids{$deps_hash} = \%module_hash_pids;
-    };
-    ${$module_deps_hash_pids{$deps_hash}}{$pid}++;
-};
-
-#
-# Build everything that should be built multiprocessing version
-#
-sub build_multiprocessing {
-    my $prj;
-    do {
-        my $got_module = 0;
-        $finished_children = 0;
-        while ($prj = pick_prj_to_build(\%global_deps_hash)) {
-            if (!defined $projects_deps_hash{$prj}) {
-                $projects_deps_hash{$prj} = {};
-                get_module_dep_hash($prj, $projects_deps_hash{$prj});
-                my $info_hash = $html_info{$prj};
-                $$info_hash{DIRS} = check_deps_hash($projects_deps_hash{$prj}, $prj);
-                $module_by_hash{$projects_deps_hash{$prj}} = $prj;
-            }
-            $module_build_queue{$prj}++;
-            $got_module++;
-        };
-        if (!$got_module) {
-            cancel_build() if ((!scalar keys %module_build_queue) && !children_number());
-            if (!$finished_children) {
-                handle_dead_children(1);
-            };
-        };
-        build_actual_queue(\%module_build_queue);
-    } while (scalar keys %global_deps_hash);
-    # Let the last module be built till the end
-    while (scalar keys %module_build_queue) {
-        build_actual_queue(\%module_build_queue);
-        handle_dead_children(1);
-    };
-    # Let all children finish their work
-    while (children_number()) {
-        handle_dead_children(1);
-    };
-    cancel_build() if (scalar keys %broken_build);
-    mp_success_exit();
-};
-
-sub mp_success_exit {
-    print "\nMultiprocessing build is finished\n";
-    print "Maximal number of processes run: $maximal_processes\n";
-    zenity_message("LibreOffice Build Success!");
-    zenity_close();
-    do_exit(0);
-};
-
-#
-# Here the built queue is built as long as possible
-#
-sub build_actual_queue {
-    my $build_queue = shift;
-    my $finished_projects = 0;
-    do {
-        my @sorted_queue = sort {(scalar keys %{$projects_deps_hash{$a}}) <=> (scalar keys %{$projects_deps_hash{$b}})} keys %$build_queue;
-        my $started_children = 0;
-        foreach my $prj (keys %$build_queue) {
-            get_html_orders();
-            if ($reschedule_queue) {
-                $reschedule_queue = 0;
-                foreach (keys %$build_queue) {
-                    # Remove the module from the build queue if there is a dependency emerged
-                    if ((defined $global_deps_hash{$_}) && (scalar keys %{$global_deps_hash{$_}})) {
-                        delete $$build_queue{$_};
-                    };
-                    delete $$build_queue{$_} if (!defined $global_deps_hash_backup{$_})
-                };
-                return;
-            };
-            if (defined $modules_with_errors{$projects_deps_hash{$prj}} && !$ignore) {
-                push (@broken_modules_names, $prj);
-                delete $$build_queue{$prj};
-                next;
-            };
-            $started_children += build_dependent($projects_deps_hash{$prj});
-            if ((!scalar keys %{$projects_deps_hash{$prj}}) &&
-                !$running_children{$projects_deps_hash{$prj}}) {
-                if (!defined $modules_with_errors{$projects_deps_hash{$prj}} || $ignore)
-                {
-                    remove_from_dependencies($prj, \%global_deps_hash);
-                    $build_is_finished{$prj}++;
-                    delete $$build_queue{$prj};
-                    $finished_projects++;
-                };
-            };
-        };
-        # trigger wait
-        if (!$started_children) {
-            if ($finished_projects) {
-                return;
-            } else {
-                handle_dead_children(1);
-            };
-        };
-    } while (scalar keys %$build_queue);
-};
-
-sub run_job {
-    my ($job, $path, $registered_name) = @_;
-    my $job_to_do = $job;
-    my $error_code = 0;
-    print "$registered_name\n";
-    return 0 if ( $show );
-    $job_to_do = $deliver_command if ($job eq 'deliver');
-    $registered_name = $path if (!defined $registered_name);
-    chdir $path;
-    getcwd();
-
-    my $log_file = $jobs_hash{$registered_name}->{LONG_LOG_PATH};
-    my $log_dir = File::Basename::dirname($log_file);
-    if (!-d $log_dir) {
-        system("$perl $mkout");
-    };
-    open (MAKE, "$job_to_do 2>&1 |") or return 8;
-    open (LOGFILE, "> $log_file") or return 8;
-    while (<MAKE>) { print LOGFILE $_; print $_ }
-    close MAKE;
-    $error_code = $?;
-    close LOGFILE;
-    if ( $error_code != 0)
-    {
-        system("echo \"log for $path\" >> $build_error_log");
-        system("cat $log_file >> $build_error_log");
-    }
-
-    return $error_code;
-};
-
-sub do_custom_job {
-    my ($module_job, $dependencies_hash) = @_;
-    $module_job =~ /(\s)/o;
-    my $module = $`;
-    my $job = $'; #'
-    html_store_job_info($dependencies_hash, $module_job);
-    my $error_code = 0;
-    if ($job eq $pre_job) {
-        announce_module($module);
-        remove_from_dependencies($module_job, $dependencies_hash);
-    } else {
-        $error_code = run_job($job, $module_paths{$module}, $module_job);
-        if ($error_code) {
-            # give windows one more chance
-            if ($ENV{GUI_FOR_BUILD} eq 'WNT') {
-                $error_code = run_job($job, $module_paths{$module}, $module_job);
-            };
-        };
-        if ($error_code && $ignore) {
-            push(@ignored_errors, $module_job);
-            $error_code = 0;
-        };
-        if ($error_code) {
-            $modules_with_errors{$dependencies_hash}++;
-#            $broken_build{$module_job} = $error_code;
-        } else {
-            remove_from_dependencies($module_job, $dependencies_hash);
-        };
-    };
-    html_store_job_info($dependencies_hash, $module_job, $error_code);
-    return $error_code;
-};
-
-#
-# Print announcement for module just started
-#
-sub announce_module {
-    my $prj = shift;
-    $build_in_progress{$prj}++;
-    print_announce($prj);
-};
-
-sub print_announce {
-    my $prj = shift;
-    return if (defined $module_announced{$prj});
-    my $prj_type = '';
-    $prj_type = $modules_types{$prj} if (defined $modules_types{$prj});
-    my $text;
-    if ($prj_type eq 'lnk') {
-        if (!defined $active_modules{$prj}) {
-            $text = "Skipping module $prj\n";
-        } else {
-            $text = "Skipping link to $prj\n";
-        };
-        $build_is_finished{$prj}++;
-    } elsif ($prj_type eq 'img') {
-        $text = "Skipping incomplete $prj\n";
-        $build_is_finished{$prj}++;
-    } elsif ($custom_job) {
-        $text = "Running custom job \"$custom_job\" in module $prj\n";
-    } else {
-        $text = "Building module $prj\n";
-    };
-    my $announce_string = $new_line;
-    $announce_string .= $echo . "=============\n";
-    $announce_string .= $echo . $text;
-    $announce_string .= $echo . "=============\n";
-    print $announce_string;
-    my $total_modules = scalar(keys %build_lists_hash);
-    my $modules_started = scalar(keys %module_announced) + 1;
-    zenity_tooltip("($modules_started/$total_modules) $text");
-    $module_announced{$prj}++;
-};
-
-sub zenity_enabled {
-    return 0 if ($ENV{ENABLE_ZENITY} ne "TRUE");
-    return 0 if (!defined $ENV{DISPLAY});
-    return 1 if ($ENV{DISPLAY} =~ m/^:/); # local displays only
-    return 0;
-}
-
-sub zenity_open {
-    if (zenity_enabled()) {
-        $SIG{PIPE} = 'IGNORE';
-        $zenity_pid = open3($zenity_in, $zenity_out, $zenity_err,
-                               "zenity --notification --listen");
-    };
-};
-
-sub zenity_close {
-    if (zenity_enabled()) {
-        sleep(1); # Give Zenity a chance to show the message.
-        close($zenity_in);
-    };
-};
-
-sub zenity_icon {
-    if (zenity_enabled()) {
-        my $filename = shift;
-        print $zenity_in "icon: $filename\n";
-    };
-};
-
-sub zenity_tooltip {
-    if (zenity_enabled()) {
-        my $text = shift;
-        print $zenity_in "tooltip: LibreOffice Build: $text\n";
-    };
-};
-
-sub zenity_message {
-    if (zenity_enabled()) {
-        my $text = shift;
-        print $zenity_in "message: $text\n";
-    };
-};
-
-sub are_all_dependent {
-    my $build_queue = shift;
-    my $folder = '';
-    my $first_candidate = undef;
-    foreach my $prj (keys %$build_queue) {
-        $folder = find_indep_prj($projects_deps_hash{$prj});
-        $first_candidate = $folder if (!defined $first_candidate);
-    };
-    $folder = $first_candidate;
-    return '' if ($first_candidate);
-    return '1';
-};
-
-
-#
-# Procedure defines if the local directory is a
-# complete module, an image or a link
-# return values: lnk link
-#                img incomplete (image)
-#                mod complete (module)
-#
-sub modules_classify {
-    my @modules = @_;
-    foreach my $module (sort @modules) {
-        if (!defined $module_paths{$module}) {
-            $modules_types{$module} = 'img';
-            next;
-        };
-        if (( $module_paths{$module} =~ /\.lnk$/) || ($module_paths{$module} =~ /\.link$/)
-                || (!defined $active_modules{$module})) {
-            $modules_types{$module} = 'lnk';
-            next;
-        };
-        $modules_types{$module} = 'mod';
-    };
-};
-
-#
-# Procedure clears up module for incompatible build
-#
-sub ensure_clear_module {
-    my $module = shift;
-    if ($modules_types{$module} eq 'mod') {
-         clear_module($module);
-         return;
-    };
-    if ($modules_types{$module} eq 'lnk' && (File::Basename::basename($module_paths{$module}) ne $module)) {
-        if(rename($module_paths{$module}, File::Basename::dirname($module_paths{$module}) ."/$module")) {
-            $module_paths{$module} = File::Basename::dirname($module_paths{$module}) ."/$module";
-            clear_module($module);
-        } else {
-            print_error("Cannot rename link to $module. Please rename it manually");
-        };
-    };
-};
-
-#
-# Procedure removes output tree from the module (without common trees)
-#
-sub clear_module {
-    my $module = shift;
-    print "Removing module's $module output trees...\n";
-    print "\n" and return if ($show);
-    opendir DIRHANDLE, $module_paths{$module};
-    my @dir_content = readdir(DIRHANDLE);
-    closedir(DIRHANDLE);
-    foreach (@dir_content) {
-        next if (/^\.+$/);
-        my $dir = correct_path($module_paths{$module}.'/'.$_);
-        if ((!-d $dir.'/.svn') && is_output_tree($dir)) {
-            rmtree("$dir", 0, 1);
-            if (-d $dir) {
-                system("$remove_command $dir");
-                if (-d $dir) {
-                    push(@warnings, "Cannot delete $dir");
-                } else {
-                    print STDERR (">>> Removed $dir by force\n");
-                };
-            };
-        };
-    };
-};
-
-#
-# Figure out if the directory is an output tree
-#
-sub is_output_tree {
-    my $dir = shift;
-    $dir =~ /([\w\d\.]+)$/;
-    $_ = $1;
-    return '1' if (defined $platforms{$_});
-    if ($only_common) {
-        return '1' if ($_ eq $only_common);
-    } else {
-        if (scalar keys %platforms < scalar keys %platforms_to_copy) {
-            return '';
-        };
-        return '1' if (/^common$/);
-        return '1' if (/^common\.pro$/);
-    };
-    return '';
-};
-sub get_tmp_dir {
-    my $tmp_dir;
-    if( defined($ENV{TMPDIR}) ) {
-       $tmp_dir = $ENV{TMPDIR} . '/';
-    } elsif( defined($ENV{TMP}) ) {
-       $tmp_dir = $ENV{TMP} . '/';
-    } else {
-       $tmp_dir = '/tmp/';
-    }
-    $tmp_dir = tempdir ( DIR => $tmp_dir );
-    if (!-d $tmp_dir) {
-        print_error("Cannot create temporary directory for checkout in $tmp_dir") if ($@);
-    };
-    return $tmp_dir;
-};
-
-sub retrieve_build_list {
-    my $module = shift;
-    my $old_fh = select(STDOUT);
-
-    # Try to get global depencies from solver's build.lst if such exists
-    my $solver_inc_dir = "$ENV{SOLARVER}/$ENV{OUTPATH}";
-    $solver_inc_dir .= $ENV{PROEXT} if (defined $ENV{PROEXT});
-    $solver_inc_dir .= '/inc';
-    $solver_inc_dir .= "/$module";
-    $solver_inc_dir = correct_path($solver_inc_dir);
-    $dead_parents{$module}++;
-    print "Fetching dependencies for module $module from solver...";
-    foreach my $onelist (@possible_build_lists) {
-        my $build_list_candidate = "$solver_inc_dir/$onelist";
-        if (-e $build_list_candidate) {
-            print " ok\n";
-            select($old_fh);
-            return $build_list_candidate;
-        };
-    }
-    print(" failed\n");
-    print_error("incomplete dependencies!\n");
-    return undef;
-};
-
-sub fix_permissions {
-     my $file = $File::Find::name;
-     return unless -f $file;
-     chmod '0664', $file;
-};
-
-sub prepare_build_from_with_branches {
-    my ($full_deps_hash, $reversed_full_deps_hash) = @_;
-    foreach my $prerequisite (keys %$full_deps_hash) {
-        foreach my $dependent_module (keys %incompatibles) {
-            if (defined ${$$reversed_full_deps_hash{$prerequisite}}{$dependent_module}) {
-                remove_from_dependencies($prerequisite, $full_deps_hash);
-                delete $$full_deps_hash{$prerequisite};
-                last;
-            };
-        };
-    };
-};
-
-#
-# Removes projects which it is not necessary to build
-# in incompatible build
-#
-sub prepare_incompatible_build {
-    my ($prj, $deps_hash, @missing_modules);
-    $deps_hash = shift;
-    foreach my $module (keys %incompatibles) {
-        if (!defined $$deps_hash{$module}) {
-            print_error("The module $initial_module is independent from $module\n");
-        }
-        $incompatibles{$module} = $$deps_hash{$module};
-        delete $$deps_hash{$module};
-    }
-    while ($prj = pick_prj_to_build($deps_hash)) {
-        remove_from_dependencies($prj, $deps_hash);
-        remove_from_dependencies($prj, \%incompatibles);
-    };
-    foreach (keys %incompatibles) {
-        $$deps_hash{$_} = $incompatibles{$_};
-    };
-    if ($build_all_cont) {
-        prepare_build_all_cont($deps_hash);
-        delete $$deps_hash{$build_all_cont};
-    };
-    @modules_built = keys %$deps_hash;
-    %add_to_config = %$deps_hash;
-    if ($prepare) {
-        if (!(defined $ENV{UPDATER})) {
-            $source_config->add_active_modules([keys %add_to_config], 0);
-        }
-        clear_delivered();
-    }
-    my $old_output_tree = '';
-    foreach $prj (sort keys %$deps_hash) {
-        if ($prepare) {
-            ensure_clear_module($prj);
-        } else {
-            next if ($show);
-            if ($modules_types{$prj} ne 'mod') {
-                push(@missing_modules, $prj);
-            } elsif (-d $module_paths{$prj}. '/'. $ENV{INPATH}) {
-                $old_output_tree++;
-            };
-        };
-    };
-    if (scalar @missing_modules) {
-        my $warning_string = 'Following modules are inconsistent/missing: ' . "@missing_modules";
-        push(@warnings, $warning_string);
-    };
-    if ($build_all_cont) {
-        $$deps_hash{$build_all_cont} = ();
-        $build_all_cont = '';
-    };
-    if ($old_output_tree) {
-        push(@warnings, 'Some module(s) contain old output tree(s)!');
-    };
-    if (!$generate_config && scalar @warnings) {
-        print "WARNING(S):\n";
-        print STDERR "$_\n" foreach (@warnings);
-        print "\nATTENTION: If you are performing an incompatible build, please break the build with Ctrl+C and prepare the workspace with \"--prepare\" switch!\n\n" if (!$prepare);
-        sleep(5);
-    };
-    if ($prepare) {
-    print "\nPreparation finished";
-        if (scalar @warnings) {
-            print " with WARNINGS!!\n\n";
-        } else {print " successfully\n\n";}
-    }
-    do_exit(0) if ($prepare);
-};
-
-#
-# Removes projects which it is not necessary to build
-# with --all:prj_name or --since switch
-#
-sub prepare_build_all_cont {
-    my ($prj, $deps_hash, $border_prj);
-    $deps_hash = shift;
-    $border_prj = $build_all_cont if ($build_all_cont);
-    $border_prj = $build_since if ($build_since);
-    while ($prj = pick_prj_to_build($deps_hash)) {
-        my $orig_prj = '';
-        $orig_prj = $` if ($prj =~ /\.lnk$/o);
-        $orig_prj = $` if ($prj =~ /\.link$/o);
-        if (($border_prj ne $prj) &&
-            ($border_prj ne $orig_prj)) {
-            remove_from_dependencies($prj, $deps_hash);
-            next;
-        } else {
-            if ($build_all_cont) {
-                $$deps_hash{$prj} = ();
-            } else {
-                remove_from_dependencies($prj, $deps_hash);
-            };
-            return;
-        };
-    };
-};
-
-sub get_modes {
-    my $option = '';
-    while ($option = shift @ARGV) {
-        if ($option =~ /^-+/) {
-            unshift(@ARGV, $option);
-            return;
-        } else {
-            if ($option =~ /,/) {
-                $build_modes{$`}++;
-                unshift(@ARGV, $') if ($');
-            } else {$build_modes{$option}++;};
-        };
-    };
-    $build_modes{$option}++;
-};
-
-sub get_list_of_modules {
-    my $option = '';
-    my $hash_ref = shift;
-    while ($option = shift @ARGV) {
-        if ($option =~ /^-+/) {
-            unshift(@ARGV, $option);
-            return;
-        } else {
-            if ($option =~ /,/) {
-                foreach (split /,/, $option) {
-                    next if (!$_);
-                    $$hash_ref{$_}++;
-                };
-            } else {
-                $$hash_ref{$option}++;
-            };
-        };
-    };
-};
-
-sub get_modules_passed {
-    my $hash_ref = shift;
-    my $option = '';
-    while ($option = shift @ARGV) {
-        if ($option =~ /^-+/) {
-            unshift(@ARGV, $option);
-            return;
-        } else {
-            if ($option =~ /(:)/) {
-                $option = $`;
-                print_error("\'--from\' switch collision") if ($build_all_cont);
-                $build_all_cont = $'; #'
-            };
-            $$hash_ref{$option}++;
-        };
-    };
-};
-
-sub get_platforms {
-    my $platforms_ref = shift;
-    if ($only_platform) {
-        foreach (split(',', $only_platform)) {
-            $$platforms_ref{$_}++;
-        }
-        $platforms_ref = \%platforms_to_copy;
-    };
-
-    if (!scalar keys %platforms) {
-        # An Auses wish - fallback to INPATH for new platforms
-        if (defined $ENV{INPATH}) {
-            $$platforms_ref{$ENV{INPATH}}++;
-        } else {
-            print_error("There is no platform found!!") ;
-        };
-    };
-};
-
-#
-# This procedure clears solver from delivered
-# by the modules to be build
-#
-sub clear_delivered {
-    my $message = 'Clearing up delivered';
-    my %backup_vars;
-    my $deliver_delete_switches = '-delete';
-    if (scalar keys %platforms < scalar keys %platforms_to_copy) {
-        $message .= ' without common trees';
-        $deliver_delete_switches .= ' -dontdeletecommon';
-        $only_common = '';
-    };
-    print "$message\n";
-
-    foreach my $platform (keys %platforms) {
-        print "\nRemoving files delivered for $platform\n";
-        my %solar_vars = ();
-        read_ssolar_vars($platform, \%solar_vars);
-        if (scalar keys %solar_vars) {
-            foreach (keys %solar_vars) {
-                if (!defined $backup_vars{$_}) {
-                    $backup_vars{$_} = $ENV{$_};
-                };
-                $ENV{$_} = $solar_vars{$_};
-            };
-        };
-        my $undeliver = "$deliver_command $deliver_delete_switches $nul";
-        foreach my $module (sort @modules_built) {
-            if (chdir($module_paths{$module})) {
-                print "Removing delivered from module $module\n";
-                next if ($show);
-                if (system($undeliver)) {
-                    $ENV{$_} = $backup_vars{$_} foreach (keys %backup_vars);
-                    print_error("Cannot run: $undeliver");
-                }
-            } else {
-                push(@warnings, "Could not remove delivered files from the module $module. Your build can become inconsistent.\n");
-            };
-        };
-    };
-    $ENV{$_} = $backup_vars{$_} foreach (keys %backup_vars);
-};
-
-#
-# Run setsolar for given platform and
-# write all variables needed in %solar_vars hash
-#
-sub read_ssolar_vars {
-    my ($setsolar, $tmp_file);
-    $setsolar = $ENV{ENV_ROOT} . '/etools/setsolar.pl';
-    my ($platform, $solar_vars) = @_;
-    $setsolar = '/net/jumbo2.germany/buildenv/r/etools/setsolar.pl' if ! -e $setsolar;
-    $tmp_file = $ENV{HOME} . "/.solar.env.$$.tmp";
-    if (!-e $setsolar) {
-        print STDERR "There is no setsolar found. Falling back to current platform settings\n";
-        return;
-    }
-    my $pro = "";
-    if ($platform =~ /\.pro$/) {
-        $pro = "-pro";
-        $platform = $`;
-    };
-
-    my ($source_root, $cwsname);
-    $source_root = '-sourceroot' if (defined $ENV{SOURCE_ROOT_USED});
-
-    my $param = "-$ENV{WORK_STAMP} $source_root $pro $platform";
-    my $ss_command = "$perl $setsolar -file $tmp_file $param $nul";
-    if (system($ss_command)) {
-        unlink $tmp_file;
-        print_error("Cannot run command:\n$ss_command");
-    };
-    get_solar_vars($solar_vars, $tmp_file);
-};
-
-#
-# read variables to hash
-#
-sub get_solar_vars {
-    my ($solar_vars, $file) = @_;
-    my ($var, $value);
-    open SOLARTABLE, "<$file" or die "can't open solarfile $file";
-    while(<SOLARTABLE>) {
-        s/\r\n//o;
-        next if(!/^\w+\s+(\w+)/o);
-        next if (!defined $deliver_env{$1});
-        $var = $1;
-        /\'(\S+)\'$/o;
-        $value = $1;
-        $$solar_vars{$var} = $value;
-    };
-    close SOLARTABLE;
-    unlink $file;
-}
-
-#
-# Procedure renames <module>.lnk (.link) into <module>
-#
-sub get_current_module {
-    my $module_name = shift;
-    my $link_name = $module_name . '.lnk';
-    $link_name .= '.link' if (-e $workspace_path.$module_name . '.link');
-    chdir $workspace_path;
-    getcwd();
-    print "\nBreaking link to module $module_name";
-    my $result = rename $link_name, $module_name;
-    if ( ! $result ) {
-        print_error("Cannot rename $module_name: $!\n");
-    }
-    if ( $initial_module eq $link_name) {
-        $initial_module = $module_name;
-    }
-    chdir $module_name;
-    getcwd();
-};
-
-sub check_dir {
-    my $start_dir = getcwd();
-    my @dir_entries = split(/[\\\/]/, $ENV{PWD});
-    my $current_module = $dir_entries[$#dir_entries];
-    if (($current_module =~ /(\.lnk)$/) || ($current_module =~ /(\.link)$/)) {
-        $current_module = $`;
-        # we're dealing with a link => fallback to SOLARSRC under UNIX
-        $workspace_path = $ENV{SOLARSRC}.'/';
-        get_current_module($current_module);
-        return;
-    } else {
-        chdir $start_dir;
-        getcwd();
-    };
-};
-
-#
-# Store all available build modi in %build_modes
-#
-sub get_build_modes {
-    return if (scalar keys %build_modes);
-    if (defined $ENV{BUILD_TYPE}) {
-        if ($ENV{BUILD_TYPE} =~ /\s+/o) {
-            my @build_modes = split (/\s+/, $ENV{BUILD_TYPE});
-            $build_modes{$_}++ foreach (@build_modes);
-        } else {
-            $build_modes{$ENV{BUILD_TYPE}}++;
-        };
-        return;
-    };
-};
-
-#
-# pick only the modules, that should be built for
-# build types from %build_modes
-#
-sub pick_for_build_type {
-    my $modules = shift;
-    my @mod_array = split(/\s+/, $modules);
-    print_error("Wrongly written dependencies string:\n $modules\n") if ($mod_array[$#mod_array] ne 'NULL');
-    pop @mod_array;
-    my @modules_to_build;
-    foreach (@mod_array) {
-        if (/(\w+):(\S+)/o) {
-            push(@modules_to_build, $2) if (defined $build_modes{$1});
-            next;
-        };
-        push(@modules_to_build, $_);
-    };
-    return @modules_to_build;
-};
-
-sub do_exit {
-    my $exit_code = shift;
-    $build_finished++;
-    generate_html_file(1);
-    rmtree(correct_path($tmp_dir), 0, 0) if ($tmp_dir);
-    print STDERR "Cannot delete $tmp_dir. Please remove it manually\n" if (-d $tmp_dir);
-    exit($exit_code);
-};
-
-#
-# Procedure sorts module in user-frendly order
-#
-sub sort_modules_appearance {
-    foreach (keys %dead_parents) {
-        delete $build_is_finished{$_} if (defined $build_is_finished{$_});
-        delete $build_in_progress{$_} if (defined $build_in_progress{$_});
-    };
-    foreach (keys %build_is_finished) {
-        delete $build_in_progress{$_} if (defined $build_in_progress{$_});
-        delete $build_in_progress_shown{$_} if (defined $build_in_progress_shown{$_});
-    };
-    my @modules_order = sort keys %modules_with_errors;
-    foreach (keys %modules_with_errors) {
-        delete $build_in_progress{$_} if (defined $build_in_progress{$_});
-        delete $build_is_finished{$_} if (defined $build_is_finished{$_});
-        delete $build_in_progress_shown{$_} if (defined $build_in_progress_shown{$_});
-    };
-    $build_in_progress_shown{$_}++ foreach (keys %build_in_progress);
-    push(@modules_order, $_) foreach (sort { $build_in_progress_shown{$b} <=> $build_in_progress_shown{$a} }  keys %build_in_progress_shown);
-    push(@modules_order, $_) foreach (sort keys %build_is_finished);
-    foreach(sort keys %html_info) {
-        next if (defined $build_is_finished{$_} || defined $build_in_progress{$_} || defined $modules_with_errors{$_});
-        push(@modules_order, $_);
-    };
-    return @modules_order;
-};
-
-sub generate_html_file {
-    return if (!$html);
-    my $force_update = shift;
-    $force_update++ if ($debug);
-    my @modules_order = sort_modules_appearance();
-    my ($successes_percent, $errors_percent) = get_progress_percentage(scalar keys %html_info, scalar keys %build_is_finished, scalar keys %modules_with_errors);
-    my $build_duration = get_time_line(time - $build_time);
-    my $temp_html_file = File::Temp::tmpnam($tmp_dir);
-    my $title;
-    $title = $ENV{INPATH};
-    die("Cannot open $temp_html_file") if (!open(HTML, ">$temp_html_file"));
-    print HTML '<html><head>';
-    print HTML '<TITLE id=MainTitle>' . $title . '</TITLE>';
-    print HTML '<script type="text/javascript">' . "\n";
-    print HTML 'initFrames();' . "\n";
-    print HTML 'var IntervalID;' . "\n";
-    print HTML 'function loadFrame_0() {' . "\n";
-    print HTML '    document.write("<html>");' . "\n";
-    print HTML '    document.write("<head>");' . "\n";
-    print HTML '    document.write("</head>");' . "\n";
-    print HTML '    document.write("<body>");' . "\n";
-    if ($build_finished) {
-        print HTML 'document.write("<h3 align=center style=\"color:red\">Build process is finished</h3>");' . "\n";
-        print HTML '        top.frames[0].clearInterval(top.frames[0].IntervalID);' . "\n";
-    } elsif ($interactive) {
-        print HTML 'document.write("    <div id=divContext style=\"border: 1px solid; display: none; position: absolute\">");' . "\n";
-        print HTML 'document.write("        <ul style=\"margin: 0; padding: 0.3em; list-style-type: none; background-color: lightgrey;\" :li:hover {} :hr {border: 0; border-bottom: 1px solid grey; margin: 3px 0px 3px 0px; width: 10em;} :a {border: 0 !important;} >");' . "\n";
-        print HTML 'document.write("            <li><a onmouseover=\"this.style.color=\'red\'\" onmouseout=\"this.style.color=\'black\'\" id=aRebuild href=\"#\">Rebuild module</a></li>");' . "\n";
-        print HTML 'document.write("            <li><a onmouseover=\"this.style.color=\'red\'\" onmouseout=\"this.style.color=\'black\'\" id=aDelete href=\"#\" >Remove module</a></li>");' . "\n";
-        print HTML 'document.write("        </ul>");' . "\n";
-        print HTML 'document.write("    </div>");' . "\n";
-    };
-    if ($build_all_parents) {
-        print HTML 'document.write("<table valign=top cellpadding=0 hspace=0 vspace=0 cellspacing=0 border=0>");' . "\n";
-        print HTML 'document.write("    <tr>");' . "\n";
-        print HTML 'document.write("        <td><a id=ErroneousModules href=\"javascript:top.Error(\'\', \'';
-        print HTML join('<br>', sort keys %modules_with_errors);
-        print HTML '\', \'\')\"); title=\"';
-        print HTML scalar keys %modules_with_errors;
-        print HTML ' module(s) with errors\">Total Progress:</a></td>");' . "\n";
-        print HTML 'document.write("        <td>");' . "\n";
-        print HTML 'document.write("            <table width=100px valign=top cellpadding=0 hspace=0 vspace=0 cellspacing=0 border=0>");' . "\n";
-        print HTML 'document.write("                <tr>");' . "\n";
-        print HTML 'document.write("                    <td height=20px width=';
-        print HTML $successes_percent + $errors_percent;
-        if (scalar keys %modules_with_errors) {
-            print HTML '% bgcolor=red valign=top></td>");' . "\n";
-        } else {
-            print HTML '% bgcolor=#25A528 valign=top></td>");' . "\n";
-        };
-        print HTML 'document.write("                    <td width=';
-        print HTML 100 - ($successes_percent + $errors_percent);
-        print HTML '% bgcolor=lightgrey valign=top></td>");' . "\n";
-        print HTML 'document.write("                </tr>");' . "\n";
-        print HTML 'document.write("            </table>");' . "\n";
-        print HTML 'document.write("        </td>");' . "\n";
-        print HTML 'document.write("        <td align=right>&nbsp Build time: ' . $build_duration .'</td>");' . "\n";
-        print HTML 'document.write("    </tr>");' . "\n";
-        print HTML 'document.write("</table>");' . "\n";
-    };
-
-    print HTML 'document.write("<table width=100% bgcolor=white>");' . "\n";
-    print HTML 'document.write("    <tr>");' . "\n";
-    print HTML 'document.write("        <td width=30% align=\"center\"><strong style=\"color:blue\">Module</strong></td>");' . "\n";
-    print HTML 'document.write("        <td width=* align=\"center\"><strong style=\"color:blue\">Status</strong></td>");' . "\n";
-    print HTML 'document.write("        <td width=15% align=\"center\"><strong style=\"color:blue\">CPU Time</strong></td>");' . "\n";
-    print HTML 'document.write("    </tr>");' . "\n";
-
-    foreach (@modules_order) {
-        next if ($modules_types{$_} eq 'lnk');
-        next if (!defined $active_modules{$_});
-        my ($errors_info_line, $dirs_info_line, $errors_number, $successes_percent, $errors_percent, $time) = get_html_info($_);
-#<one module>
-        print HTML 'document.write("    <tr>");' . "\n";
-        print HTML 'document.write("        <td width=*>");' . "\n";
-
-        if (defined $dirs_info_line) {
-            print HTML 'document.write("            <a id=';
-            print HTML $_;
-            print HTML ' href=\"javascript:top.Error(\'';
-            print HTML $_ , '\', ' ;
-            print HTML $errors_info_line;
-            print HTML ',';
-            print HTML $dirs_info_line;
-            print HTML ')\"); title=\"';
-            print HTML $errors_number;
-            print HTML ' error(s)\">', $_, '</a>");' . "\n";
-        } else {
-            print HTML 'document.write("            <a target=\'infoframe\' id=';
-            print HTML $_;
-            print HTML ' href=\"javascript:void(0)\"; title=\"Remove module\">' . $_ . '</a>");' . "\n";
-        };
-
-
-        print HTML 'document.write("        </td>");' . "\n";
-        print HTML 'document.write("        <td>");' . "\n";
-        print HTML 'document.write("            <table width=100% valign=top cellpadding=0 hspace=0 vspace=0 cellspacing=0 border=0>");' . "\n";
-        print HTML 'document.write("                <tr>");' . "\n";
-        print HTML 'document.write("                    <td height=15* width=';
-
-        print HTML $successes_percent + $errors_percent;
-        if ($errors_number) {
-            print HTML '% bgcolor=red valign=top></td>");' . "\n";
-        } else {
-            print HTML '% bgcolor=#25A528 valign=top></td>");' . "\n";
-        };
-        print HTML 'document.write("                    <td width=';
-
-        print HTML 100 - ($successes_percent + $errors_percent);
-        print HTML '% bgcolor=lightgrey valign=top></td>");' . "\n";
-        print HTML 'document.write("                </tr>");' . "\n";
-        print HTML 'document.write("            </table>");' . "\n";
-        print HTML 'document.write("        </td>");' . "\n";
-        print HTML 'document.write("        <td align=\"center\">', $time, '</td>");' . "\n";
-        print HTML 'document.write("    </tr>");' . "\n";
-# </one module>
-    }
-    print HTML 'document.write("        </table>");' . "\n";
-    print HTML 'document.write("    </body>");' . "\n";
-    print HTML 'document.write("</html>");' . "\n";
-    print HTML 'document.close();' . "\n";
-    print HTML 'refreshInfoFrames();' . "\n";
-    print HTML '}' . "\n";
-
-
-    if (!$build_finished && $interactive ) {
-        print HTML 'var _replaceContext = false;' . "\n";
-        print HTML 'var _mouseOverContext = false;' . "\n";
-        print HTML 'var _noContext = false;' . "\n";
-        print HTML 'var _divContext = $(\'divContext\');' . "\n";
-        print HTML 'var activeElement = 0;' . "\n";
-        print HTML 'function $(id) {return document.getElementById(id);}' . "\n";
-        print HTML 'InitContext();' . "\n";
-        print HTML 'function InitContext()' . "\n";
-        print HTML '{' . "\n";
-        print HTML '    $(\'aRebuild\').target = \'infoframe\';' . "\n";
-        print HTML '    $(\'aDelete\').target = \'infoframe\';' . "\n";
-        print HTML '    $(\'aRebuild\').style.color = \'black\';' . "\n";
-        print HTML '    $(\'aDelete\').style.color = \'black\';' . "\n";
-        print HTML '    _divContext.onmouseover = function() { _mouseOverContext = true; };' . "\n";
-        print HTML '    _divContext.onmouseout = function() { _mouseOverContext = false; };' . "\n";
-        print HTML '    _divContext.onclick = function() { _divContext.style.display = \'none\'; };' . "\n";
-        print HTML '    document.body.onmousedown = ContextMouseDown;' . "\n";
-        print HTML '    document.body.oncontextmenu = ContextShow;' . "\n";
-        print HTML '}' . "\n";
-        print HTML 'function ContextMouseDown(event) {' . "\n";
-        print HTML '    if (_noContext || _mouseOverContext) return;' . "\n";
-        print HTML '    if (event == null) event = window.event;' . "\n";
-        print HTML '    var target = event.target != null ? event.target : event.srcElement;' . "\n";
-        print HTML '    if (event.button == 2 && target.tagName.toLowerCase() == \'a\')' . "\n";
-        print HTML '        _replaceContext = true;' . "\n";
-        print HTML '    else if (!_mouseOverContext)' . "\n";
-        print HTML '        _divContext.style.display = \'none\';' . "\n";
-        print HTML '}' . "\n";
-        print HTML 'function ContextShow(event) {' . "\n";
-        print HTML '    if (_noContext || _mouseOverContext) return;' . "\n";
-        print HTML '    if (event == null) event = window.event;' . "\n";
-        print HTML '    var target = event.target != null ? event.target : event.srcElement;' . "\n";
-        print HTML '    if (_replaceContext) {' . "\n";
-        print HTML '        $(\'aRebuild\').href = \'http://'. $local_host_ip .':' . $html_port . '/rebuild=\' + target.id;' . "\n";
-        print HTML '        $(\'aDelete\').href = \'http://'. $local_host_ip .':' . $html_port . '/delete=\' + target.id' . "\n";
-        print HTML '        var scrollTop = document.body.scrollTop ? document.body.scrollTop : ';
-        print HTML 'document.documentElement.scrollTop;' . "\n";
-        print HTML '        var scrollLeft = document.body.scrollLeft ? document.body.scrollLeft : ';
-        print HTML 'document.documentElement.scrollLeft;' . "\n";
-        print HTML '        _divContext.style.display = \'none\';' . "\n";
-        print HTML '        _divContext.style.left = event.clientX + scrollLeft + \'px\';' . "\n";
-        print HTML '        _divContext.style.top = event.clientY + scrollTop + \'px\';' . "\n";
-        print HTML '        _divContext.style.display = \'block\';' . "\n";
-        print HTML '        _replaceContext = false;' . "\n";
-        print HTML '        return false;' . "\n";
-        print HTML '    }' . "\n";
-        print HTML '}' . "\n";
-    };
-
-    print HTML 'function refreshInfoFrames() {        ' . "\n";
-    print HTML '    var ModuleNameObj = top.innerFrame.frames[2].document.getElementById("ModuleErrors");' . "\n";
-    print HTML '    if (ModuleNameObj != null) {' . "\n";
-    print HTML '        var ModuleName = ModuleNameObj.getAttribute(\'name\');' . "\n";
-    print HTML '        var ModuleHref = top.innerFrame.frames[0].document.getElementById(ModuleName).getAttribute(\'href\');' . "\n";
-    print HTML '         eval(ModuleHref);' . "\n";
-    print HTML '    } else if (top.innerFrame.frames[2].document.getElementById("ErroneousModules") != null) {' . "\n";
-    print HTML '        var ModuleHref = top.innerFrame.frames[0].document.getElementById("ErroneousModules").getAttribute(\'href\');' . "\n";
-    print HTML '        eval(ModuleHref);' . "\n";
-    print HTML '        if (top.innerFrame.frames[1].document.getElementById("ModuleJobs") != null) {' . "\n";
-    print HTML '            var ModuleName = top.innerFrame.frames[1].document.getElementById("ModuleJobs").getAttribute(\'name\');' . "\n";
-    print HTML '            ModuleHref = top.innerFrame.frames[0].document.getElementById(ModuleName).getAttribute(\'href\');' . "\n";
-    print HTML '            var HrefString = ModuleHref.toString();' . "\n";
-    print HTML '            var RefEntries = HrefString.split(",");' . "\n";
-    print HTML '            var RefreshParams = new Array();' . "\n";
-    print HTML '            for (i = 0; i < RefEntries.length; i++) {' . "\n";
-    print HTML '                RefreshParams[i] = RefEntries[i].substring(RefEntries[i].indexOf("\'") + 1, RefEntries[i].lastIndexOf("\'"));' . "\n";
-    print HTML '            };' . "\n";
-    print HTML '            FillFrame_1(RefreshParams[0], RefreshParams[1], RefreshParams[2]);' . "\n";
-    print HTML '        }' . "\n";
-    print HTML '    };' . "\n";
-    print HTML '}' . "\n";
-    print HTML 'function loadFrame_1() {' . "\n";
-    print HTML '    document.write("<h3 align=center>Jobs</h3>");' . "\n";
-    print HTML '    document.write("Click on the project of interest");' . "\n";
-    print HTML '    document.close();' . "\n";
-    print HTML '}' . "\n";
-    print HTML 'function loadFrame_2() {' . "\n";
-    print HTML '    document.write("<tr bgcolor=lightgrey<td><h3>Errors</h3></pre></td></tr>");' . "\n";
-    print HTML '    document.write("Click on the project of interest");' . "\n";
-    print HTML '    document.close();' . "\n";
-    print HTML '}    function getStatusInnerHTML(Status) {        var StatusInnerHtml;' . "\n";
-    print HTML '    if (Status == "success") {' . "\n";
-    print HTML '        StatusInnerHtml = "<em style=color:green>";' . "\n";
-    print HTML '    } else if (Status == "building") {' . "\n";
-    print HTML '        StatusInnerHtml = "<em style=color:blue>";' . "\n";
-    print HTML '    } else if (Status == "error") {' . "\n";
-    print HTML '        StatusInnerHtml = "<em style=color:red>";' . "\n";
-    print HTML '    } else {' . "\n";
-    print HTML '        StatusInnerHtml = "<em style=color:gray>";' . "\n";
-    print HTML '    };' . "\n";
-    print HTML '    StatusInnerHtml += Status + "</em>";' . "\n";
-    print HTML '    return StatusInnerHtml;' . "\n";
-    print HTML '}    ' . "\n";
-    print HTML 'function ShowLog(LogFilePath, ModuleJob) {' . "\n";
-    print HTML '    top.innerFrame.frames[2].document.write("<h3 id=ModuleErrors name=\"" + null + "\">Log for " + ModuleJob + "</h3>");' . "\n";
-    print HTML '    top.innerFrame.frames[2].document.write("<iframe id=LogFile name=Log src="';
-    if (defined $html_path) {
-        print HTML 'file://';
-    }
-    print HTML '+ LogFilePath + " width=100%></iframe>");' . "\n";
-    print HTML '    top.innerFrame.frames[2].document.close();' . "\n";
-    print HTML '};' . "\n";
-    print HTML 'function FillFrame_1(Module, Message1, Message2) {' . "\n";
-    print HTML '    var FullUpdate = 1;' . "\n";
-    print HTML '    if (top.innerFrame.frames[1].document.getElementById("ModuleJobs") != null) {' . "\n";
-    print HTML '        var ModuleName = top.innerFrame.frames[1].document.getElementById("ModuleJobs").getAttribute(\'name\');' . "\n";
-    print HTML '        if (Module == ModuleName) FullUpdate = 0;' . "\n";
-    print HTML '    }' . "\n";
-    print HTML '    if (FullUpdate) {' . "\n";
-    print HTML '        top.innerFrame.frames[1].document.write("<h3 align=center>Jobs in module " + Module + ":</h3>");' . "\n";
-    print HTML '        top.innerFrame.frames[1].document.write("<table id=ModuleJobs  name=" + Module + " width=100% bgcolor=white>");' . "\n";
-    print HTML '        top.innerFrame.frames[1].document.write("    <tr>");' . "\n";
-    print HTML '        top.innerFrame.frames[1].document.write("        <td width=* align=center><strong style=color:blue>Status</strong></td>");' . "\n";
-    print HTML '        top.innerFrame.frames[1].document.write("        <td width=* align=center><strong style=color:blue>Job</strong></td>");' . "\n";
-    print HTML '        top.innerFrame.frames[1].document.write("        <td width=* align=center><strong style=color:blue>Start Time</strong></td>");' . "\n";
-    print HTML '        top.innerFrame.frames[1].document.write("        <td width=* align=center><strong style=color:blue>Finish Time</strong></td>");' . "\n";
-    print HTML '        top.innerFrame.frames[1].document.write("        <td width=* align=center><strong style=color:blue>Client</strong></td>");' . "\n" if ($server_mode);
-    print HTML '        top.innerFrame.frames[1].document.write("    </tr>");' . "\n";
-    print HTML '        var dir_info_strings = Message2.split("<br><br>");' . "\n";
-    print HTML '        for (i = 0; i < dir_info_strings.length; i++) {' . "\n";
-    print HTML '            var dir_info_array = dir_info_strings[i].split("<br>");' . "\n";
-    print HTML '            top.innerFrame.frames[1].document.write("    <tr status=" + dir_info_array[0] + ">");' . "\n";
-    print HTML '            top.innerFrame.frames[1].document.write("        <td align=center>");' . "\n";
-    print HTML '            top.innerFrame.frames[1].document.write(               getStatusInnerHTML(dir_info_array[0]) + "&nbsp");' . "\n";
-    print HTML '            top.innerFrame.frames[1].document.write("        </td>");' . "\n";
-    print HTML '            if (dir_info_array[4] == "@") {' . "\n";
-    print HTML '                top.innerFrame.frames[1].document.write("        <td style=white-space:nowrap>" + dir_info_array[1] + "</td>");' . "\n";
-    print HTML '            } else {' . "\n";
-    print HTML '                top.innerFrame.frames[1].document.write("        <td><a href=\"javascript:top.ShowLog(\'" + dir_info_array[4] + "\', \'" + dir_info_array[1] + "\')\"); title=\"Show Log\">" + dir_info_array[1] + "</a></td>");' . "\n";
-    print HTML '            };' . "\n";
-    print HTML '            top.innerFrame.frames[1].document.write("        <td align=center>" + dir_info_array[2] + "</td>");' . "\n";
-    print HTML '            top.innerFrame.frames[1].document.write("        <td align=center>" + dir_info_array[3] + "</td>");' . "\n";
-    print HTML '            top.innerFrame.frames[1].document.write("        <td align=center>" + dir_info_array[5] + "</td>");' . "\n" if ($server_mode);
-    print HTML '            top.innerFrame.frames[1].document.write("    </tr>");' . "\n";
-    print HTML '        };' . "\n";
-    print HTML '        top.innerFrame.frames[1].document.write("</table>");' . "\n";
-    print HTML '    } else {' . "\n";
-    print HTML '        var dir_info_strings = Message2.split("<br><br>");' . "\n";
-    print HTML '        var ModuleRows = top.innerFrame.frames[1].document.getElementById("ModuleJobs").rows;' . "\n";
-    print HTML '        for (i = 0; i < dir_info_strings.length; i++) {' . "\n";
-    print HTML '            var dir_info_array = dir_info_strings[i].split("<br>");' . "\n";
-    print HTML '            var OldStatus = ModuleRows[i + 1].getAttribute(\'status\');' . "\n";
-    print HTML '            if(dir_info_array[0] != OldStatus) {' . "\n";
-    print HTML '                var DirectoryInfos = ModuleRows[i + 1].cells;' . "\n";
-    print HTML '                DirectoryInfos[0].innerHTML = getStatusInnerHTML(dir_info_array[0]) + "&nbsp";' . "\n";
-    print HTML '                if (dir_info_array[4] != "@") {' . "\n";
-    print HTML '                    DirectoryInfos[1].innerHTML = "<a href=\"javascript:top.ShowLog(\'" + dir_info_array[4] + "\', \'" + dir_info_array[1] + "\')\"); title=\"Show Log\">" + dir_info_array[1] + "</a>";' . "\n";
-    print HTML '                };' . "\n";
-    print HTML '                DirectoryInfos[2].innerHTML = dir_info_array[2];' . "\n";
-    print HTML '                DirectoryInfos[3].innerHTML = dir_info_array[3];' . "\n";
-    print HTML '                DirectoryInfos[4].innerHTML = dir_info_array[5];' . "\n" if ($server_mode);
-    print HTML '            };' . "\n";
-    print HTML '        };' . "\n";
-    print HTML '    };' . "\n";
-    print HTML '    top.innerFrame.frames[1].document.close();' . "\n";
-    print HTML '};' . "\n";
-    print HTML 'function Error(Module, Message1, Message2) {' . "\n";
-    print HTML '    if (Module == \'\') {' . "\n";
-    print HTML '        if (Message1 != \'\') {' . "\n";
-    print HTML '            var erroneous_modules = Message1.split("<br>");' . "\n";
-    print HTML '            var ErrorNumber = erroneous_modules.length;' . "\n";
-
-    print HTML '            top.innerFrame.frames[2].document.write("<h3 id=ErroneousModules errors=" + erroneous_modules.length + ">Modules with errors:</h3>");' . "\n";
-    print HTML '            for (i = 0; i < ErrorNumber; i++) {' . "\n";
-    print HTML '                var ModuleObj = top.innerFrame.frames[0].document.getElementById(erroneous_modules[i]);' . "\n";
-    print HTML '                top.innerFrame.frames[2].document.write("<a href=\"");' . "\n";
-    print HTML '                top.innerFrame.frames[2].document.write(ModuleObj.getAttribute(\'href\'));' . "\n";
-    print HTML '                top.innerFrame.frames[2].document.write("\"); title=\"");' . "\n";
-    print HTML '                top.innerFrame.frames[2].document.write("\">" + erroneous_modules[i] + "</a>&nbsp ");' . "\n";
-    print HTML '            };' . "\n";
-    print HTML '            top.innerFrame.frames[2].document.close();' . "\n";
-    print HTML '        };' . "\n";
-    print HTML '    } else {' . "\n";
-    print HTML '        var ModuleNameObj = top.innerFrame.frames[2].document.getElementById("ModuleErrors");' . "\n";
-    print HTML '        var OldErrors = null;' . "\n";
-    print HTML '        var ErrorNumber = Message1.split("<br>").length;' . "\n";
-    print HTML '        if ((ModuleNameObj != null) && (Module == ModuleNameObj.getAttribute(\'name\')) ) {' . "\n";
-    print HTML '            OldErrors = ModuleNameObj.getAttribute(\'errors\');' . "\n";
-    print HTML '        }' . "\n";
-    print HTML '        if ((OldErrors == null) || (OldErrors != ErrorNumber)) {' . "\n";
-    print HTML '            top.innerFrame.frames[2].document.write("<h3 id=ModuleErrors errors=" + ErrorNumber + " name=\"" + Module + "\">Errors in module " + Module + ":</h3>");' . "\n";
-    print HTML '            top.innerFrame.frames[2].document.write(Message1);' . "\n";
-    print HTML '            top.innerFrame.frames[2].document.close();' . "\n";
-    print HTML '        }' . "\n";
-    print HTML '        FillFrame_1(Module, Message1, Message2);' . "\n";
-    print HTML '    }' . "\n";
-    print HTML '}' . "\n";
-    print HTML 'function updateInnerFrame() {' . "\n";
-    print HTML '     top.innerFrame.frames[0].document.location.reload();' . "\n";
-    print HTML '     refreshInfoFrames();' . "\n";
-    print HTML '};' . "\n\n";
-
-    print HTML 'function setRefreshRate() {' . "\n";
-    print HTML '    RefreshRate = document.Formular.rate.value;' . "\n";
-    print HTML '    if (!isNaN(RefreshRate * 1)) {' . "\n";
-    print HTML '        top.frames[0].clearInterval(IntervalID);' . "\n";
-    print HTML '        IntervalID = top.frames[0].setInterval("updateInnerFrame()", RefreshRate * 1000);' . "\n";
-    print HTML '    };' . "\n";
-    print HTML '};' . "\n";
-
-    print HTML 'function initFrames() {' . "\n";
-    print HTML '    var urlquery = location.href.split("?");' . "\n";
-    print HTML '    if (urlquery.length == 1) {' . "\n";
-    print HTML '        document.write("<html><head><TITLE id=MainTitle>' . $ENV{INPATH} .'</TITLE>");' . "\n";
-    print HTML '        document.write("    <frameset rows=\"12%,88%\">");' . "\n";
-    print HTML '        document.write("        <frame name=\"topFrame\" src=\"" + urlquery + "?initTop\"/>");' . "\n";
-    print HTML '        document.write("        <frame name=\"innerFrame\" src=\"" + urlquery + "?initInnerPage\"/>");' . "\n";
-    print HTML '        document.write("    </frameset>");' . "\n";
-    print HTML '        document.write("</head></html>");' . "\n";
-    print HTML '    } else if (urlquery[1].substring(0,7) == "initTop") {' . "\n";
-    print HTML '        var urlquerycontent = urlquery[1].split("=");' . "\n";
-    print HTML '        var UpdateRate = 10' . "\n";
-    print HTML '        if (urlquerycontent.length > 2) {' . "\n";
-    print HTML '            if (isNaN(urlquerycontent[2] * 1)) {' . "\n";
-    print HTML '                alert(urlquerycontent[2] + " is not a number. Ignored.");' . "\n";
-    print HTML '            } else {' . "\n";
-    print HTML '                UpdateRate = urlquerycontent[2];' . "\n";
-    print HTML '            };' . "\n";
-    print HTML '        };' . "\n";
-    print HTML '        document.write("<html><body>");' . "\n";
-    print HTML '        document.write("<h3 align=center>Build process progress status</h3>");' . "\n";
-    print HTML '        document.write("<div align=\"right\">");' . "\n";
-    print HTML '        document.write("    <table border=\"0\"> <tr>");' . "\n";
-    print HTML '        document.write("<td>Refresh rate(sec):</td>");' . "\n";
-    print HTML '        document.write("<th>");' . "\n";
-    print HTML '        document.write("<FORM name=\"Formular\" onsubmit=\"setRefreshRate()\">");' . "\n";
-    print HTML '        document.write("<input type=\"hidden\" name=\"initTop\" value=\"\"/>");' . "\n";
-    print HTML '        document.write("<input type=\"text\" id=\"RateValue\" name=\"rate\" autocomplete=\"off\" value=\"" + UpdateRate + "\" size=\"1\"/>");' . "\n";
-    print HTML '        document.write("<input type=\"submit\" value=\"OK\">");' . "\n";
-    print HTML '        document.write("</FORM>");' . "\n";
-    print HTML '        document.write("</th></tr></table>");' . "\n";
-    print HTML '        document.write("</div>");' . "\n";
-    print HTML '        document.write("    </frameset>");' . "\n";
-    print HTML '        document.write("</body></html>");' . "\n";
-    print HTML '        top.frames[0].clearInterval(IntervalID);' . "\n";
-    print HTML '        IntervalID = top.frames[0].setInterval("updateInnerFrame()", UpdateRate * 1000);' . "\n";
-    print HTML '    } else if (urlquery[1] == "initInnerPage") {' . "\n";
-    print HTML '        document.write("<html><head>");' . "\n";
-    print HTML '        document.write(\'    <frameset rows="80%,20%\">\');' . "\n";
-    print HTML '        document.write(\'        <frameset cols="70%,30%">\');' . "\n";
-    print HTML '        document.write(\'            <frame src="\');' . "\n";
-    print HTML '        document.write(urlquery[0]);' . "\n";
-    print HTML '        document.write(\'?initFrame0"/>\');' . "\n";
-    print HTML '        document.write(\'            <frame src="\');' . "\n";
-    print HTML '        document.write(urlquery[0]);' . "\n";
-    print HTML '        document.write(\'?initFrame1"/>\');' . "\n";
-    print HTML '        document.write(\'        </frameset>\');' . "\n";
-    print HTML '        document.write(\'            <frame src="\');' . "\n";
-    print HTML '        document.write(urlquery[0]);' . "\n";
-    print HTML '        document.write(\'?initFrame2"  name="infoframe"/>\');' . "\n";
-    print HTML '        document.write(\'    </frameset>\');' . "\n";
-    print HTML '        document.write("</head></html>");' . "\n";
-    print HTML '    } else {' . "\n";
-    print HTML '        if (urlquery[1] == "initFrame0" ) {' . "\n";
-    print HTML '            loadFrame_0();' . "\n";
-    print HTML '        } else if (urlquery[1] == "initFrame1" ) {          ' . "\n";
-    print HTML '            loadFrame_1();' . "\n";
-    print HTML '        } else if (urlquery[1] == "initFrame2" ) {' . "\n";
-    print HTML '            loadFrame_2();' . "\n";
-    print HTML '        }' . "\n";
-    print HTML '    };' . "\n";
-    print HTML '};' . "\n";
-    print HTML '</script><noscript>Your browser doesn\'t support JavaScript!</noscript></head></html>' . "\n";
-    close HTML;
-    rename_file($temp_html_file, $html_file);
-};
-
-sub get_local_time_line {
-    my $epoch_time = shift;
-    my $local_time_line;
-    my @time_array;
-    if ($epoch_time) {
-        @time_array = localtime($epoch_time);
-        $local_time_line = sprintf("%02d:%02d:%02d", $time_array[2], $time_array[1], $time_array[0]);
-    } else {
-        $local_time_line = '-';
-    };
-    return $local_time_line;
-};
-
-sub get_dirs_info_line {
-    my $job = shift;
-    my $dirs_info_line = $jobs_hash{$job}->{STATUS} . '<br>';
-    my @time_array;
-    my $log_path_string;
-    $dirs_info_line .= $jobs_hash{$job}->{SHORT_NAME} . '<br>';
-    $dirs_info_line .= get_local_time_line($jobs_hash{$job}->{START_TIME}) . '<br>';
-    $dirs_info_line .= get_local_time_line($jobs_hash{$job}->{FINISH_TIME}) . '<br>';
-    if ($jobs_hash{$job}->{STATUS} eq 'waiting' || (!-f $jobs_hash{$job}->{LONG_LOG_PATH})) {
-        $dirs_info_line .= '@';
-    } else {
-        if (defined $html_path) {
-            $log_path_string = $jobs_hash{$job}->{LONG_LOG_PATH};
-        } else {
-            $log_path_string = $jobs_hash{$job}->{LOG_PATH};
-        };
-        $log_path_string =~ s/\\/\//g;
-        $dirs_info_line .= $log_path_string;
-    };
-    $dirs_info_line .= '<br>';
-    $dirs_info_line .= $jobs_hash{$job}->{CLIENT} . '<br>' if ($server_mode);
-    return $dirs_info_line;
-};
-
-sub get_html_info {
-    my $module = shift;
-    my $module_info_hash = $html_info{$module};
-    my $dirs = $$module_info_hash{DIRS};
-    my $dirs_number = scalar @$dirs;
-    my $dirs_info_line = '\'';
-    if ($dirs_number) {
-        my %dirs_sorted_by_order = ();
-        foreach (@$dirs) {
-            $dirs_sorted_by_order{$jobs_hash{$_}->{BUILD_NUMBER}} = $_;
-        }
-        foreach (sort {$a <=> $b} keys %dirs_sorted_by_order) {
-            $dirs_info_line .= get_dirs_info_line($dirs_sorted_by_order{$_}) . '<br>';
-        }
-    } else {
-        return(undef, undef, 0, 0, 0, '-');
-    };
-    $dirs_info_line =~ s/(<br>)*$//o;
-    $dirs_info_line .= '\'';
-    $dirs = $$module_info_hash{SUCCESSFUL};
-    my $successful_number = scalar @$dirs;
-    $dirs = $$module_info_hash{ERRORFUL};
-    my $errorful_number = scalar @$dirs;
-    my $errors_info_line = '\'';
-    if ($errorful_number) {
-        $errors_info_line .= $_ . '<br>' foreach (@$dirs);
-    } else {
-        $errors_info_line .= 'No errors';
-    };
-    $errors_info_line .= '\'';
-    my $time_line = get_time_line($$module_info_hash{BUILD_TIME});
-    my ($successes_percent, $errors_percent) = get_progress_percentage($dirs_number - 1, $successful_number - 1, $errorful_number);
-    return($errors_info_line, $dirs_info_line, $errorful_number, $successes_percent, $errors_percent, $time_line);
-};
-
-sub get_time_line {
-    use integer;
-    my $seconds = shift;
-    my $hours = $seconds/3600;
-    my $minits = ($seconds/60)%60;
-    $seconds -= ($hours*3600 + $minits*60);
-    return(sprintf("%02d\:%02d\:%02d" , $hours, $minits, $seconds));
-};
-
-sub get_progress_percentage {
-    use integer;
-    my ($dirs_number, $successful_number, $errorful_number) = @_;
-    return (0 ,0) if (!$dirs_number);
-    my $errors_percent = ($errorful_number * 100)/ $dirs_number;
-    my $successes_percent;
-    if ($dirs_number == ($successful_number + $errorful_number)) {
-        $successes_percent = 100 - $errors_percent;
-    } else {
-        $successes_percent = ($successful_number * 100)/ $dirs_number;
-    };
-    return ($successes_percent, $errors_percent);
-};
-
-#
-# This procedure stores the dmake result in %html_info
-#
-sub html_store_job_info {
-    return if (!$html);
-    my ($deps_hash, $build_dir, $error_code) = @_;
-    my $force_update = 0;
-    if ($build_dir =~ /(\s)/o && (defined $error_code)) {
-        $force_update++ if (!children_number());
-    }
-    my $module = $module_by_hash{$deps_hash};
-    my $module_info_hash = $html_info{$module};
-    my $dmake_array;
-    if (defined $error_code) {
-        $jobs_hash{$build_dir}->{FINISH_TIME} = time();
-        $$module_info_hash{BUILD_TIME} += $jobs_hash{$build_dir}->{FINISH_TIME} - $jobs_hash{$build_dir}->{START_TIME};
-        if ($error_code) {
-            $jobs_hash{$build_dir}->{STATUS} = 'error';
-            $dmake_array = $$module_info_hash{ERRORFUL};
-            $build_dir =~ s/\\/\//g;
-            $modules_with_errors{$module}++;
-        } else {
-            if ($build_dir =~ /(\s)announce/o) {
-                $jobs_hash{$build_dir}->{STATUS} = '-';
-            } else {
-                $jobs_hash{$build_dir}->{STATUS} = 'success';
-            };
-            $dmake_array = $$module_info_hash{SUCCESSFUL};
-        };
-        push (@$dmake_array, $build_dir);
-    };
-};
-
-sub start_server_on_port {
-    my $port = shift;
-    my $socket_obj = shift;
-    $client_timeout = 1 if (!$parent_process);
-    if ($ENV{GUI_FOR_BUILD} eq 'WNT') {
-        $$socket_obj = new IO::Socket::INET (#LocalAddr => hostname(),
-                                  LocalPort => $port,
-                                  Proto     => 'tcp',
-                                  Listen    => 100); # 100 clients can be on queue, I think it is enough
-    } else {
-        $$socket_obj = new IO::Socket::INET (#LocalAddr => hostname(),
-                                  LocalPort => $port,
-                                  Proto     => 'tcp',
-                                  ReuseAddr     => 1,
-                                  Listen    => 100); # 100 clients can be on queue, I think it is enough
-    };
-    return('Cannot create socket object') if (!defined $$socket_obj);
-    my $timeout = $$socket_obj->timeout($client_timeout);
-    $$socket_obj->autoflush(1);
-    if ($parent_process && $debug) {
-        print "SERVER started on port $port\n";
-    } else {
-        print "html_port:$html_port html_socket_obj: $html_socket_obj\n";
-    };
-    return 0;
-};
-
-sub accept_html_connection {
-    my $new_socket_obj = undef;
-    $new_socket_obj = $html_socket_obj->accept();
-    return $new_socket_obj;
-};
-
-sub accept_connection {
-    my $new_socket_obj = undef;
-    do {
-        $new_socket_obj = $server_socket_obj->accept();
-        if (!$new_socket_obj) {
-            print "Timeout on incoming connection\n";
-            check_client_jobs();
-        };
-    } while (!$new_socket_obj);
-    return $new_socket_obj;
-};
-
-sub check_client_jobs {
-    foreach (keys %clients_times) {
-        if (time - $clients_times{$_} > $client_timeout) {
-            print "Client's $_ Job: \"$clients_jobs{$_}\" apparently got lost...\n";
-            print "Scheduling for rebuild...\n";
-            print "You might need to check the $_\n";
-            $lost_client_jobs{$clients_jobs{$_}}++;
-            delete $processes_hash{$_};
-            delete $clients_jobs{$_};
-            delete $clients_times{$_};
-        };
-    };
-};
-
-sub get_server_ports {
-    # use port 7890 as default
-    my $default_port = 7890;
-    if ($ports_string) {
-        @server_ports = split( /:/, $ports_string);
-    } else {
-        @server_ports = ($default_port .. $default_port + 4);
-    };
-};
-
-sub run_server {
-    my @build_queue = ();        # array, containing queue of projects
-                                # to build
-    my $error = 0;
-    if (scalar @server_ports) {
-        foreach (@server_ports) {
-            $error = start_server_on_port($_, \$server_socket_obj);
-            if ($error) {
-                print STDERR "port $_: $error\n";
-            } else {
-                last;
-            };
-        };
-        print_error('Unable to start server on port(s): ' . "@server_ports\n") if ($error);
-    } else {
-        print_error('No ports for server to start');
-    };
-
-    my $client_addr;
-    my $job_string_base = get_job_string_base();
-    my $new_socket_obj;
-     while ($new_socket_obj = accept_connection()) {
-        check_client_jobs();
-        # find out who connected
-        my $client_ipnum = $new_socket_obj->peerhost();
-        my $client_host = gethostbyaddr(inet_aton($client_ipnum), AF_INET);
-        # print who is connected
-        # send them a message, close connection
-        my $client_message = <$new_socket_obj>;
-        chomp $client_message;
-        my @client_data = split(/ /, $client_message);
-        my %client_hash = ();
-        foreach (@client_data) {
-            /(=)/;
-            $client_hash{$`} = $'; #'
-        }
-        my $pid = $client_hash{pid} . '@' . $client_host;
-        if (defined $client_hash{platform}) {
-            if ($client_hash{platform} ne $ENV{OUTPATH} || (defined $client_hash{osname} && ($^O ne $client_hash{osname}))) {
-                print $new_socket_obj "Wrong platform";
-                close($new_socket_obj);
-                next;
-            };
-        } else {
-            if ($client_hash{result} eq "0") {
-            } else {
-                print "Error $client_hash{result}\n";
-                if (store_error($pid, $client_hash{result})) {
-                    print $new_socket_obj $job_string_base . $clients_jobs{$pid};
-                    close($new_socket_obj);
-                    $clients_times{$pid} = time;
-                    next;
-                };
-            };
-            delete $clients_times{$pid};
-            clear_from_child($pid);
-            delete $clients_jobs{$pid};
-            $verbose_mode && print 'Running processes: ', children_number(), "\n";
-            # Actually, next 3 strings are only for even distribution
-            # of clients if there are more than one build server running
-            print $new_socket_obj 'No job';
-            close($new_socket_obj);
-            next;
-        };
-        my $job_string;
-        my @lost_jobs = keys %lost_client_jobs;
-        if (scalar @lost_jobs) {
-            $job_string = $lost_jobs[0];
-            delete $lost_client_jobs{$lost_jobs[0]};
-        } else {
-            $job_string = get_job_string(\@build_queue);
-        };
-        if ($job_string) {
-            my $job_dir = $job_jobdir{$job_string};
-            $processes_hash{$pid} = $job_dir;
-            $jobs_hash{$job_dir}->{CLIENT} = $pid;
-            print "$pid got $job_dir\n";
-            print $new_socket_obj $job_string_base . $job_string;
-            $clients_jobs{$pid} = $job_string;
-            $clients_times{$pid} = time;
-            my $children_running = children_number();
-            $verbose_mode && print 'Running processes: ', $children_running, "\n";
-            $maximal_processes = $children_running if ($children_running > $maximal_processes);
-        } else {
-            print $new_socket_obj 'No job';
-        };
-        close($new_socket_obj);
-    };
-};
-
-#
-# Procedure returns the part of the job string that is similar for all clients
-#
-sub get_job_string_base {
-    if ($setenv_string) {
-        return "setenv_string=$setenv_string ";
-    };
-    my $job_string_base = "server_pid=$$ setsolar_cmd=$ENV{SETSOLAR_CMD} ";
-    $job_string_base .= "source_root=$ENV{SOURCE_ROOT} " if (defined $ENV{SOURCE_ROOT});
-    $job_string_base .= "updater=$ENV{UPDATER} " if (defined $ENV{UPDATER});
-    return $job_string_base;
-};
-
-sub get_job_string {
-    my $build_queue = shift;
-    my $job = $dmake;
-    my ($job_dir, $dependencies_hash);
-    if ($build_all_parents) {
-        fill_modules_queue($build_queue);
-        do {
-            ($job_dir, $dependencies_hash) = pick_jobdir($build_queue);
-            return '' if (!$job_dir);
-            $jobs_hash{$job_dir}->{START_TIME} = time();
-            $jobs_hash{$job_dir}->{STATUS} = 'building';
-            if ($job_dir =~ /(\s)$pre_job/o) {
-                do_custom_job($job_dir, $dependencies_hash);
-                $job_dir = '';
-            };
-        } while (!$job_dir);
-    } else {
-        $dependencies_hash = \%local_deps_hash;
-        do {
-            $job_dir = pick_prj_to_build(\%local_deps_hash);
-            if (!$job_dir && !children_number()) {
-                cancel_build() if (scalar keys %broken_build);
-                mp_success_exit();
-            };
-            return '' if (!$job_dir);
-            $jobs_hash{$job_dir}->{START_TIME} = time();
-            $jobs_hash{$job_dir}->{STATUS} = 'building';
-            if ($job_dir =~ /(\s)$pre_job/o) {
-                do_custom_job($job_dir, $dependencies_hash);
-                $job_dir = '';
-            };
-        } while (!$job_dir);
-    };
-    $running_children{$dependencies_hash}++;
-    $folders_hashes{$job_dir} = $dependencies_hash;
-    my $log_file = $jobs_hash{$job_dir}->{LONG_LOG_PATH};
-    my $full_job_dir = $job_dir;
-    if ($job_dir =~ /(\s)/o) {
-        $job = $'; #'
-        print $echo . "determine if we need to deliver $job_dir\n";
-        if ($job eq $post_job) {
-            if( $is_gbuild{$job_dir} ) {
-                print "Skip deliver for gmake-built module $job_dir\n";
-                return'';
-            };
-            $job = $deliver_command
-        };
-        $full_job_dir = $module_paths{$`};
-    }
-    my $log_dir = File::Basename::dirname($log_file);
-    if (!-d $log_dir) {
-        chdir $full_job_dir;
-        getcwd();
-        system("$perl $mkout");
-    };
-    my $job_string = "job_dir=$full_job_dir job=$job log=$log_file";
-    $job_jobdir{$job_string} = $job_dir;
-    return $job_string;
-};
-
-sub pick_jobdir {
-    my $build_queue = shift;
-    my $i = 0;
-    foreach (@$build_queue) {
-        my $prj = $$build_queue[$i];
-        my $prj_deps_hash = $projects_deps_hash{$prj};
-        if (defined $modules_with_errors{$prj_deps_hash} && !$ignore) {
-            push (@broken_modules_names, $prj);
-            splice (@$build_queue, $i, 1);
-            next;
-        };
-        $running_children{$prj_deps_hash} = 0 if (!defined $running_children{$prj_deps_hash});
-        my $child_nick = pick_prj_to_build($prj_deps_hash);
-        if ($child_nick) {
-            return ($child_nick, $prj_deps_hash);
-        }
-        if ((!scalar keys %$prj_deps_hash) && !$running_children{$prj_deps_hash}) {
-            if (!defined $modules_with_errors{$prj_deps_hash} || $ignore)
-            {
-                remove_from_dependencies($prj, \%global_deps_hash);
-                $build_is_finished{$prj}++;
-                splice (@$build_queue, $i, 1);
-                next;
-            };
-        };
-        $i++;
-    };
-};
-
-sub fill_modules_queue {
-    my $build_queue = shift;
-    my $prj;
-    while ($prj = pick_prj_to_build(\%global_deps_hash)) {
-        push @$build_queue, $prj;
-        $projects_deps_hash{$prj} = {};
-        get_module_dep_hash($prj, $projects_deps_hash{$prj});
-        my $info_hash = $html_info{$prj};
-        $$info_hash{DIRS} = check_deps_hash($projects_deps_hash{$prj}, $prj);
-        $module_by_hash{$projects_deps_hash{$prj}} = $prj;
-    };
-    if (!$prj && !children_number() && (!scalar @$build_queue)) {
-        cancel_build() if (scalar keys %broken_build);
-        mp_success_exit();
-    };
-};
-
-sub is_gnumake_module {
-    my $module = shift;
-    my $bridgemakefile = $source_config->get_module_path($module) . "/prj/makefile.mk";
-    return (-e $bridgemakefile);
-}
-
-sub check_partial_gnumake_build {
-    if(!$build_all_parents && is_gnumake_module(shift)) {
-        print "This module has been migrated to GNU make.\n";
-        print "You can only use build --all/--since here with build.pl.\n";
-        print "To do the equivalent of 'build && deliver' call:\n";
-        print "\t$ENV{GNUMAKE} -r\n";
-        print "in the module root.\n";
-        exit 1;
-    }
-}
diff --git a/solenv/bin/build_client.pl b/solenv/bin/build_client.pl
deleted file mode 100755
index cd97795d0..000000000
--- a/solenv/bin/build_client.pl
+++ /dev/null
@@ -1,436 +0,0 @@
-:
-eval 'exec perl -S $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-#
-# build_client - client for the build tool in server mode
-#
-
-use strict;
-use Socket;
-use Sys::Hostname;
-use File::Temp qw(tmpnam);
-use POSIX;
-use Cwd qw (cwd);
-
-$SIG{KILL} = \&handle_temp_files;
-$SIG{INT} = \&handle_temp_files;
-
-### main ###
-my $enable_multiprocessing = 1;
-my $server_list_file;
-my $server_list_time_stamp = 0;
-my %ENV_BACKUP;
-$ENV_BACKUP{$_} = $ENV{$_} foreach (keys %ENV);
-
-if ($^O eq 'MSWin32') {
-    eval { require Win32::Process; import Win32::Process; };
-    $enable_multiprocessing = 0 if ($@);
-} else {
-    use Cwd 'chdir';
-};
-my $processes_to_run = 1;
-
-my %hosts_ports = ();
-my $default_port = 7890;
-my @ARGV_COPY = @ARGV; # @ARGV BACKUP
-print "arguments: @ARGV\n";
-get_options();
-
-my $proto = getprotobyname('tcp');
-my $paddr;
-my $host = hostname();
-my $current_server = '';
-my $got_job = 0;
-my %job_temp_files = ();
-my %environments = (); # hash containing all environments
-my $env_alias;
-my %platform_rejects = (); # hash containing paddr of server, that replied "Wrong platform"
-
-my $child = 0;
-if ($processes_to_run > 1) {
-    my $started_processes = 1;
-    if ($^O eq 'MSWin32') {
-        my $process_obj = undef;
-        my $child_args = "perl $0";
-        foreach (@ARGV_COPY) {
-            /^-P(\d+)$/        and next;
-            /^-P$/     and shift @ARGV_COPY  and next;
-            $child_args .= " $_";
-        };
-        do {
-            my $rc = Win32::Process::Create($process_obj, $^X,
-                                            $child_args, 
-                                                0, 0, #NORMAL_PRIORITY_CLASS,
-                                            ".");
-            print_error("Cannot start child process") if (!$rc);
-            $started_processes++;
-        } while ($started_processes < $processes_to_run);
-    } else {
-        my $pid;
-        do {
-            if ($pid = fork) { # parent
-                $started_processes++;
-                print $started_processes . "\n";
-            } elsif (defined $pid) { # child
-                $child++;
-            };
-        } while (($started_processes < $processes_to_run) && !$child);
-    };
-};
-
-run_client();
-### end of main procedure ###
-
-#########################
-#                       #
-#      Procedures       #
-#                       #
-#########################
-sub handle_temp_files {
-    print STDERR "Got signal - clearing up...\n";
-    foreach (keys %job_temp_files) {
-        if ($job_temp_files{$_}) {
-            rename($_, $job_temp_files{$_}) or system("mv", $_, $job_temp_files{$_});
-            print STDERR "Could not rename $_ to $job_temp_files{$_}\n" if (-e $_); 
-        } else {
-            unlink $_ or system("rm -rf $_");
-            print STDERR "Could not remove $_\n" if (-e $_); 
-        };
-    };
-    exit($?);
-};
-
-sub run_client {
-# initialize host and port
-    if (!scalar keys %hosts_ports) {
-        $hosts_ports{localhost} = $default_port;
-    }
-    
-    print "Started client with PID $$, hostname $host\n";
-    
-    my $message = '';
-    my $current_port = '';
-    my %active_servers = ();
-    
-    do {
-        $got_job = 0;
-        foreach $current_server (keys %hosts_ports) {
-            foreach $current_port (keys %{$hosts_ports{$current_server}}) {
-
-                #before each "inactive" server/port connect - connect to each "active" server/port 
-                next if (defined ${$active_servers{$current_server}}{$current_port});
-                # "active" cycle
-                foreach my $active_server (keys %active_servers) {
-                    foreach my $active_port (keys %{$active_servers{$active_server}}) {
-                        my $iaddr = inet_aton($active_server);
-                        $paddr = sockaddr_in($active_port, $iaddr);
-                        do {
-                            my $server_is_active = 0; 
-                            $message = request_job($message, $active_server, $active_port);
-                            $server_is_active++ if ($message);
-                            if (!$server_is_active) {
-                                delete ${$active_servers{$active_server}}{$active_port};
-                                # throw away obsolete environments
-                                foreach (keys %environments) {
-                                    /^\d+@/;
-                                    if ($' eq "$active_server:$active_port") {
-                                        delete $environments{$_};
-                                    };
-                                };
-                            };
-                            $message = '' if ($message eq 'No job');
-                        } while ($message);
-                    };
-                };
-                
-                # "inactive" cycle
-                my $iaddr = inet_aton($current_server);
-                $paddr = sockaddr_in($current_port, $iaddr);
-                do {
-                    $message = request_job($message, $current_server, $current_port);
-                    if ($message) {
-                        if (!defined $active_servers{$current_server}) {
-                            my %ports;
-                            $active_servers{$current_server} = \%ports;
-                        };
-                        ${$active_servers{$current_server}}{$current_port}++;
-                    };
-                    $message = '' if ($message eq 'No job');
-                } while ($message);
-            };
-        };
-        sleep 5 if (!$got_job);
-        read_server_list();
-    } while(1);
-};
-
-sub usage {
-    my $error = shift;
-    print STDERR "\nbuild_client\n";
-    print STDERR "Syntax:    build_client [-PN] host1[:port1:...:portN] [host2[:port1:...:portN] ... hostN[:port1:...:portN]]|\@server_list_file\n";
-    print STDERR "        -P           - start multiprocessing build, with number of processes passed\n";
-    print STDERR "Example1:   build_client myserver1 myserver2:7891:7892\n";
-    print STDERR "            the client will be asking for jobs on myserver1's default ports (7890-7894)\n";
-    print STDERR "            and on myserver2's ports 7891 and 7892\n";
-    print STDERR "Example2:   build_client -P2 myserver1:7990 myserver2\n";
-    print STDERR "            start 2 clients which will be asking for jobs myserver1's port 7990\n";
-    print STDERR "            and myserver2's default ports (7890-7894)\n";
-    exit ($error);
-};
-
-sub get_options {
-    my $arg;
-    usage(1) if (!scalar @ARGV);
-    while ($arg = shift @ARGV) {
-        usage(0) if /^--help$/;
-        usage(0) if /^-h$/;
-        $arg =~ /^-P(\d+)$/        and $processes_to_run = $1 and next;
-        $arg =~ /^-P$/            and $processes_to_run = shift @ARGV     and next;
-        $arg =~ /^@(\S+)$/            and $server_list_file = $1    and next;
-        store_server($arg);
-    };
-    if (($processes_to_run > 1) && (!$enable_multiprocessing)) {
-        print_error("Cannot load Win32::Process module for multiple client start");
-    };
-    if ($server_list_file) {
-        print_error("$server_list_file is not a regular file!!") if (!-f $server_list_file);
-        read_server_list();
-    }
-    print_error("No server info") if (!scalar %hosts_ports);
-};
-
-sub store_server {
-    my $server_string = shift;
-    my @server_params = ();
-    @server_params = split (/:/, $server_string);
-    my $host = shift @server_params;
-    my @names = gethostbyname($host);
-    my $host_full_name = $names[0];
-    my %ports = ();
-    if (defined $hosts_ports{$host_full_name}) {
-        %ports = %{$hosts_ports{$host_full_name}};
-    };
-    # To do: implement keys in form server:port -> priority
-    if (defined $hosts_ports{$host_full_name}) {
-        if (!$server_list_time_stamp) {
-            print "The $host with ip address " . inet_ntoa(inet_aton($host)) . " is at least two times in the server list\n";
-        };
-    } else {
-        print "Added server $host as $host_full_name\n";
-    };
-    if (scalar @server_params) {
-         $ports{$_}++ foreach (@server_params);
-    } else {
-         $ports{$_}++ foreach ($default_port .. $default_port + 4);
-    };
-    $hosts_ports{$host_full_name} = \%ports;
-};
-
-sub read_server_list {
-    open(SERVER_LIST, "<$server_list_file") or return;
-    my $current_time_stamp = (stat($server_list_file))[9];
-    return if ($server_list_time_stamp >= $current_time_stamp);
-    my @server_array = ();
-    foreach my $file_string(<SERVER_LIST>) {
-        while ($file_string =~ /(\S+)/) {
-            $file_string = $';
-            store_server($1);
-        };
-    };
-    close SERVER_LIST;
-    $server_list_time_stamp = $current_time_stamp;
-};
-
-sub request_job {
-    my ($message, $current_server, $current_port) = @_;
-    $message = "platform=$ENV_BACKUP{OUTPATH} pid=$$ osname=$^O" if (!$message);
-    # create the socket, connect to the port
-    socket(SOCKET, PF_INET, SOCK_STREAM, $proto) or die "socket: $!";
-    connect(SOCKET, $paddr) or return '';
-    my $error_code = 1;
-    $message .= "\n";
-    syswrite SOCKET, $message, length $message;
-    while (my $line = <SOCKET>) {
-        chomp $line;
-        if ($line eq 'No job') {
-            close SOCKET or die "close: $!";
-            return $line;
-        };
-        if ($line eq "Wrong platform") {
-            if (!defined $platform_rejects{$paddr}) {
-                $platform_rejects{$paddr}++;
-                print STDERR $line . "\n";
-            }
-            close SOCKET or die "close: $!";
-            delete $hosts_ports{$current_server};
-            return '';
-        } elsif (defined $platform_rejects{$paddr}) {
-            delete $platform_rejects{$paddr};
-        };
-        $got_job++;
-        $error_code = do_job($line . " server=$current_server port=$current_port");
-    }
-    close SOCKET or die "close: $!";
-    return("result=$error_code pid=$$");
-}
-
-sub do_job {
-    my @job_parameters = split(/ /, shift);
-    my %job_hash = ();
-    my $last_param;
-    my $error_code;
-    print "Client $$@" . "$host\n";
-    foreach (@job_parameters) {
-        if (/(=)/) {
-            $job_hash{$`} = $';
-            $last_param = $`;
-        } else {
-           $job_hash{$last_param} .= " $_"; 
-        };
-    };
-    $env_alias = $job_hash{server_pid} . '@' . $job_hash{server} . ':' . $job_hash{port};
-    my $result = "1"; # default value
-    my $cmd_file = File::Temp::tmpnam($ENV_BACKUP{TMP});
-    my $tmp_log_file = File::Temp::tmpnam($ENV_BACKUP{TMP});
-    $job_temp_files{$tmp_log_file} = $job_hash{log};
-    my $setenv_string = '';
-    if (defined $job_hash{setenv_string}) {
-        # use configuration string from server
-        $setenv_string .= $job_hash{setenv_string};
-        print "Environment: $setenv_string\n";
-    
-        my $directory = $job_hash{job_dir};
-        open (COMMAND_FILE, ">$cmd_file");
-        print COMMAND_FILE "$setenv_string\n";
-        if (!defined $job_hash{job_dir}) {
-            close COMMAND_FILE;
-            print "No job_dir, cmd file: $cmd_file\n";
-            foreach (keys %job_hash) {
-                print "key: $_ $job_hash{$_}\n";
-            };
-            exit (1);
-        };
-    
-        print COMMAND_FILE "pushd $job_hash{job_dir} && ";
-        print COMMAND_FILE $job_hash{job} ." >& $tmp_log_file\n";
-        print COMMAND_FILE "exit \$?\n";
-        close COMMAND_FILE;
-        $job_temp_files{$cmd_file} = 0;
-        $job_temp_files{$tmp_log_file} = $job_hash{log};
-        $error_code = system($ENV{SHELL}, $cmd_file);
-        unlink $cmd_file or system("rm -rf $cmd_file");
-        delete $job_temp_files{$cmd_file};
-    } else {
-        # generate setsolar string
-        if (!defined $environments{$env_alias}) {
-            $error_code = get_setsolar_environment(\%job_hash);
-            return($error_code) if ($error_code);
-        };
-        my $solar_vars = $environments{$env_alias};
- 
-        delete $ENV{$_} foreach (keys %ENV);
-        $ENV{$_} = $$solar_vars{$_} foreach (keys %$solar_vars);
-        print 'Workspace: ';
-        print $ENV{SOLARSRC};
- 
-        print "\nplatform: $ENV{INPATH} $^O";
-        print "\ndir: $job_hash{job_dir}\n";
-        print "job: $job_hash{job}\n";
-        chdir $job_hash{job_dir};
-        getcwd();
-        my $job_string = $job_hash{job} . ' > ' . $tmp_log_file . ' 2>&1';
-        $error_code = system($job_string);
-    };
-    rename($tmp_log_file, $job_hash{log}) or system("mv", $tmp_log_file, $job_hash{log});
-    delete $job_temp_files{$tmp_log_file};
-
-    if ($error_code) {
-        print "Error code = $error_code\n\n";
-    } else {
-        print "Success!!\n\n";
-    };
-    return $error_code;
-};
-
-sub get_setsolar_environment {
-    my $job_hash = shift;
-    my $server_pid = $$job_hash{server_pid};
-    my $setsolar_string = $$job_hash{setsolar_cmd};
-    # Prepare the string for the client
-    $setsolar_string =~ s/\s-file\s\S+//g;
-    my $error_code = 0;
-    my $cmd_file = File::Temp::tmpnam($ENV_BACKUP{TMP});
-    my $tmp_log_file = File::Temp::tmpnam($ENV_BACKUP{TMP});
-    if (defined $$job_hash{updater}) {
-        $ENV{UPDATER} = $$job_hash{updater};
-    } else {
-        undef $ENV{UPDATER} if (defined $ENV{UPDATER});
-    };
-    if (defined $$job_hash{source_root}) {
-        $ENV{SOURCE_ROOT} = $$job_hash{source_root};
-    } else {
-        undef $ENV{SOURCE_ROOT} if (defined $ENV{SOURCE_ROOT});
-    };
-    $error_code = system("$setsolar_string -file $cmd_file");
-    store_env_hash($cmd_file);
-    return $error_code;
-};
-
-sub print_error {
-    my $message = shift;
-    print STDERR "\nERROR: $message\n";
-    exit(1);
-};
-sub store_env_hash {
-    my $ss_setenv_file = shift;
-    my %solar_vars = ();
-    my $cmd_file = File::Temp::tmpnam($ENV_BACKUP{TMP});
-    my $env_vars_file = File::Temp::tmpnam($ENV_BACKUP{TMP});
-    print "$cmd_file $env_vars_file\n";
-    #get all env variables in $env_vars_file
-    open (COMMAND_FILE, ">$cmd_file");
-    print COMMAND_FILE "source $ss_setenv_file\n";
-    print COMMAND_FILE "env > $env_vars_file\n";
-    close COMMAND_FILE;
-    system($ENV{SHELL}, $cmd_file);
-    print_error($?) if ($?);
-    unlink $cmd_file or system("rm -rf $cmd_file");
-    unlink $ss_setenv_file or system("rm -rf $ss_setenv_file");
-
-    open SOLARTABLE, "<$env_vars_file" or die "can´t open solarfile $env_vars_file";
-    while(<SOLARTABLE>) {
-        chomp;
-        s/\r\n//o;
-        /(=)/;
-        $solar_vars{$`} = $';
-    };
-    close SOLARTABLE;
-    unlink $env_vars_file or system("rm -rf $env_vars_file");
-    $environments{$env_alias} = \%solar_vars;
-};
diff --git a/solenv/bin/buildalyzer b/solenv/bin/buildalyzer
deleted file mode 100644
index 8b278e66b..000000000
--- a/solenv/bin/buildalyzer
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/env python
-import sys
-import os
-
-class CxxTarget:
-    def __init__(self, line):
-        self.directory = ''
-        self.outputfile = ''
-        self.includeflags = []
-        self.cxxflags = []
-        self.inputfiles = []
-        self.nolink = False
-        options = line[:-1].split(' ')
-        self.directory = options.pop(0)
-        parsing_outputfile = False
-        for option in options:
-            if parsing_outputfile:
-                self.outputfile = option
-                parsing_outputfile = False
-            elif option == '-o':
-                parsing_outputfile = True
-            elif option == '-c':
-                self.nolink = True
-            elif option.startswith('-I'):
-                self.includeflags.append(CxxFlag(option))
-            elif option.startswith('-'):
-                self.cxxflags.append(CxxFlag(option))
-            else:
-                self.inputfiles.append(option)
-        self.cxxflags.sort()
-        self.includeflags.sort()
-        cxxflags_tmp = dict()
-        for flag in self.cxxflags:
-            cxxflags_tmp[flag.name] = flag
-        self.cxxflags = cxxflags_tmp.values()
-        includeflags_tmp = dict()
-        for flag in self.includeflags:
-            includeflags_tmp[flag.name] = flag
-        self.includeflags = includeflags_tmp.values()
-        CxxTargets.by_name[self.getFullOutputname()] = self
-    def __str__(self):
-        return '%s' % (self.getFullOutputname())
-    def getFullOutputname(self):
-        return self.directory + '/' + self.outputfile
-    def __cmp__(self, other):
-        return cmp(self.getFullOutputname(), other.getFullOutputname())
-
-class CxxFlag:
-    def __init__(self, name):
-        self.name = name
-        CxxFlags.by_name[self.name] = self
-    def __str__(self):
-        return 'Flag %s' % (self.name)
-    def __cmp__(self, other):
-        return cmp(self.name, other.name)
-
-class CxxFlags:
-    by_name = dict()
-
-class CxxTargets:
-    by_name = dict()
-
-if __name__ == '__main__':
-    [CxxTarget(line) for line in sys.stdin.readlines()]
-    compile_targets = [target for target in CxxTargets.by_name.values() if target.nolink]
-    link_targets = [target for target in CxxTargets.by_name.values() if not target.nolink]
-    common_compile_flags = []
-    for flag in CxxFlags.by_name.values():
-        if sum((flag in target.cxxflags for target in compile_targets)) == len(compile_targets):
-            common_compile_flags.append(flag)
-    common_link_flags = []
-    for flag in CxxFlags.by_name.values():
-        if sum((flag in target.cxxflags for target in compile_targets)) == len(compile_targets):
-            common_link_flags.append(flag)
-
-    for target in compile_targets:
-        target.cxxflags = [flag for flag in target.cxxflags if flag not in common_compile_flags]
-        target.cxxflags.sort()
-    for target in link_targets:
-        target.cxxflags = [flag for flag in target.cxxflags if flag not in common_link_flags]
-        target.cxxflags.sort()
-
-    common_compile_flags.sort()
-    common_link_flags.sort()
-    print 'common compile flags: %s' % (' '.join(flag.name for flag in common_compile_flags))
-    print 'common link flags: %s' % (' '.join(flag.name for flag in common_link_flags))
-
-    by_flagset = dict()
-    for target in CxxTargets.by_name.values():
-        flagset = ' '.join((flag.name for flag in target.cxxflags))
-        if flagset not in by_flagset:
-            by_flagset[flagset] = list()
-        by_flagset[flagset].append(target)
-    for targetlist in by_flagset.values():
-        targetlist.sort()
-    flagsets = by_flagset.keys()
-    flagsets.sort()
-    print '%d compilerflag groups:' % (len(flagsets))
-    for flagset in flagsets:
-        print flagset
-        for target in by_flagset[flagset]:
-            print '%s' % (target)
-        print
-
-    by_flagset = dict()
-    for target in CxxTargets.by_name.values():
-        flagset = ' '.join((flag.name for flag in target.includeflags))
-        if flagset not in by_flagset:
-            by_flagset[flagset] = list()
-        by_flagset[flagset].append(target)
-    for targetlist in by_flagset.values():
-        targetlist.sort()
-    flagsets = by_flagset.keys()
-    flagsets.sort()
-    print '%d include flag groups:' % (len(flagsets))
-    for flagset in flagsets:
-        print flagset
-        for target in by_flagset[flagset]:
-            print '%s' % (target)
-        print
-
-    print 'sources:'
-    by_name = dict()
-    for target in CxxTargets.by_name.values():
-        by_name[os.path.basename(target.outputfile)] = target
-    names = by_name.keys()
-    names.sort()
-    for target in CxxTargets.by_name.values():
-        if len(target.inputfiles) > 1:
-            objects = [os.path.basename(object) for object in target.inputfiles]
-            sources = list()
-            for object in objects:
-                if object in by_name:
-                    sources.append(by_name[object].inputfiles[0])
-                else:
-                    sources.append('!!!!' + object)
-            sources.sort()
-            print '%s %s' % (target.getFullOutputname(), ' '.join(sources))
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
deleted file mode 100755
index 1cdf498c3..000000000
--- a/solenv/bin/checkdll.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/sh
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-# checkdll.sh - execute checkdll with all -L arguments to this script
-#               prepended to LD_LIBRARY_PATH
-
-set -- `getopt "L:" "$@"` ||  {
-    echo "Usage: `basename $0` [-L library_path] <shared_library>" 1>&2
-    exit 1
-}
-
-checkdll="$SOLARVERSION/$INPATH/bin/checkdll"
-
-if [ -x $checkdll ]; then
-    while :
-    do
-    case $1 in
-        -L) shift; option=$1;;
-        --) break;;
-    esac
-    case "${libpath:+X}" in
-        X) libpath=$libpath:$option;;
-        *) libpath=$option;;
-    esac
-    shift
-    done
-    shift  # remove the trailing ---
-
-    case `uname -s` in
-    Darwin) case "${DYLD_LIBRARY_PATH:+X}" in
-        X) DYLD_LIBRARY_PATH=$libpath:$DYLD_LIBRARY_PATH;;
-        *) DYLD_LIBRARY_PATH=$libpath;;
-        esac
-        export DYLD_LIBRARY_PATH;;
-    AIX) case "${LIBPATH:+X}" in
-        X) LIBPATH=$libpath:$LIBPATH;;
-        *) LIBPATH=$libpath;;
-        esac
-        export LIBPATH;;
-    *)  case "${LD_LIBRARY_PATH:+X}" in
-        X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;;
-        *) LD_LIBRARY_PATH=$libpath;;
-        esac
-        export LD_LIBRARY_PATH;;
-    esac
-
-    $checkdll "$@"
-    if [ $? -ne 0 ]; then exit 1 ; fi
-
-    for parameter in $*; do
-        library=$parameter;
-    done
-    realname=`echo $library | sed "s/check_//"`
-    if [ $library != $realname ]; then
-        LD_LIBRARY_PATH=
-        export LD_LIBRARY_PATH
-        mv $library $realname
-    fi
-else
-    echo "WARNING: checkdll not found!" 1>&2
-
-    for parameter in $*; do
-        library=$parameter;
-    done
-    realname=`echo $library | sed "s/check_//"`
-    if [ $library != $realname ]; then
-        mv $library $realname
-    fi
-fi
-
-exit 0
-
diff --git a/solenv/bin/chrel.sed b/solenv/bin/chrel.sed
deleted file mode 100644
index 19455b00c..000000000
--- a/solenv/bin/chrel.sed
+++ /dev/null
@@ -1,2 +0,0 @@
-s/\(\.\.\/\)\{2,4\}/..\//g
-s/\(\.\.\\\)\{2,4\}/..\\/g
diff --git a/solenv/bin/cleandiff.pl b/solenv/bin/cleandiff.pl
deleted file mode 100644
index 892ea1e65..000000000
--- a/solenv/bin/cleandiff.pl
+++ /dev/null
@@ -1,45 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-while (<>)
-{
-    next if /^Only in/ ;
-    next if /^diff -rc / ;
-    next if /^diff -ru / ;
-    next if /^Common sub/ ;
-
-    if ( /^---/ || /^\*\*\*/ || /^\+\+\+/ )
-    {
-        s/\\/\//g;
-    }
-
-    print ;
-}
-
diff --git a/solenv/bin/cleanzip.pl b/solenv/bin/cleanzip.pl
deleted file mode 100755
index 683edaec4..000000000
--- a/solenv/bin/cleanzip.pl
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/perl -w
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-sub usage
-{
-    print "Cleanup unwanted unix attributes in zip archives\n\n";
-    print "Usage:\n";
-    print "$0 archive\n\n";
-    exit(1);
-}
-
-usage() if ! defined $ARGV[0];
-
-my $filename = $ARGV[0];
-use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
-my $zip = Archive::Zip->new();
-
-unless ( $zip->read( $filename ) == AZ_OK ) {
-    die "$0: ERROR reading $filename\n";
-}
-my @members = $zip ->members();
-
-foreach my $member ( @members ) {
-    my $attribs = $member->unixFileAttributes();
-    if ( $member->isDirectory ) {
-        $attribs = $attribs & 0b101111111111;
-        $member->unixFileAttributes($attribs)
-    }
-}
-unless ( $zip->writeToFileNamed( ${filename}."_new" ) == AZ_OK ) {
-    die "$0: ERROR reading ${filename}_new\n";
-}
-rename($filename."_new", $filename);
-
diff --git a/solenv/bin/clipatchconfig.pl b/solenv/bin/clipatchconfig.pl
deleted file mode 100644
index a84565742..000000000
--- a/solenv/bin/clipatchconfig.pl
+++ /dev/null
@@ -1,131 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use warnings;
-use strict;
-
-sub trim;
-sub readRedirectionValues($);
-
-my $usage =
-   "Usage is: \n clipatchconfig.pl configTemplate redirections policyConfig
-
-   configTemplate: The config file which is used for the policy assembly. It
-   contains place holders for the binding redirection.
-
-   redirections: file containing the values for oldVersion and newVersion tags
-   which are used in the BindingRedirect element of the config files.
-
-   policyConfig: Name of the file in which we want to write the config file.
-";
-
-
-if (scalar @ARGV < 3) {
-   print $usage;
-   exit -1;
-}
-
-
-my %redirectionValue = readRedirectionValues($ARGV[1]);
-
-
-#Read config file in which we will replace the versions
-$/ = undef;
-open TEMPLATE, $ARGV[0] or die $!;
-my $templ = <TEMPLATE>;
-
-#Open the config file we are goint to write to
-open CONFIG, "> $ARGV[2]" or die "Cannot write to $ARGV[2] $!";
-
-#No substitute the place holders for oldVersion and new Version in the config template with
-#the values obtained from the redirections file
-for (keys %redirectionValue) {
-    $templ=~ s/\b$_\b/$redirectionValue{$_}/;
-}
-#Write the config file
-print CONFIG $templ;
-
-#Reads the key value pairs from the files, which name must be passed in
-#the parameter. The file contains lines of the form name=value, for example
-#CLI_URETYPES_OLD_VERSION=1.1.0.0-1.1.1.0
-sub readRedirectionValues($)
-{
-    #Read in the values for the version redirection
-    open REDIR, $_[0] or die $!;
-
-    my %redirectionValues;
-
-    while (<REDIR>)
-    {
-        chomp;
-    my $trimmed;
-        #Skip empty lines
-        if (length($trimmed = trim($_)) == 0) {
-            next;
-        }
-
-    #Skip comment symbol: #
-    if ($trimmed =~ /^#/) {
-        next;
-    }
-
-        my @lineParts = split /=/,$_;
-
-        #Check if we have valid name value pairs.
-        if (scalar @lineParts != 2) {
-            print "Error: Values in $ARGV[1] are not correct (Entries must have the form name=value). Invalid line: \n$_\n";
-            exit -1;
-        }
-
-        #Trim the strings and check if they still contain characters
-        my $name = trim($lineParts[0]);
-        my $value = trim($lineParts[1]);
-        if (length($name) == 0 || length($value) == 0) {
-            print "Error: Values in $ARGV[1] are not correct. Invalid line: \n$_\n";
-            exit -1;
-        }
-
-        #Check if we have duplicate key names
-        for (keys %redirectionValues) {
-            if ( $name eq $_) {
-                print "Error: Values in $ARGV[1] are not correct. The name $_ is not unique.\n";
-                exit -1;
-            }
-        }
-
-        $redirectionValues{$name} = $value;
-    }
-    return %redirectionValues;
-}
-
-sub trim($)
-{
-    my $string = shift;
-    $string =~ s/^\s+//;
-    $string =~ s/\s+$//;
-    return $string;
-}
\ No newline at end of file
diff --git a/solenv/bin/convertlinks.pl b/solenv/bin/convertlinks.pl
deleted file mode 100644
index 76b1a02c2..000000000
--- a/solenv/bin/convertlinks.pl
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# convertlinks - a perl script to make hrefs to 
-# http://api.openoffice.org/common/ref relativ.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-
-use File::Find;
-
-# for the convenience of &wanted calls, including -eval statements:
-use vars qw/*name *dir/;
-*name   = *File::Find::name;
-*dir    = *File::Find::dir;
-@files = ();
-
-if($#ARGV == 1)
-{
-    $pattern = "www";
-} else
-{
-    $pattern = $ARGV[2];
-}
-
-find(\&wanted, "$ARGV[0]");
-
-$return = 1;
-
-foreach $i (@files) 
-{
-    next if( $i->{directory} =~ /.*common((\/|\\)ref(.*))/ ||
-         $i->{directory} =~ /.*cpp((\/|\\)ref(.*))/ ||
-         $i->{directory} =~ /.*java((\/|\\)ref(.*))/ );
-
-    open ( FILEIN, $i->{filename} ) || die "could not open $i->{filename} for reading";
-
-    $relPath = ".";
-    $relToSource = ".";
-    if( $i->{directory} =~ /.*$pattern((\/|\\)(.*))/ )
-    {
-        $relPath = $3;
-        $relPath =~ s#\w+#\.\.#go;
-        if($pattern eq "examples")
-        {
-            $relPath = "\.\.\/$relPath";
-        }
-        if($pattern eq "www")
-        {
-            $relToSource = "\.\.\/$relPath";
-        } else
-        {
-            $relToSource = $relPath; 
-        }
-    } else
-    {
-        if($pattern eq "examples")
-        {
-            $relPath = "\.\.";
-        }
-        if($pattern eq "www")
-        {
-            $relToSource = "\.\.";
-        } else
-        {
-            $relToSource = $relPath; 
-        }		    
-    }
-
-    @lines = <FILEIN>;
-    close( FILEIN );
-    open( FILEOUT, ">$i->{filename}.tmp" ) || die "could not open $i->{filename} for writing";
-    foreach $_ (@lines)
-    {
-        # change the refenreces to the index in dependency of UDK or ODK
-        if("$ARGV[1]" eq "udk_" | "$ARGV[1]" eq "odk_")
-        {
-            s#((\")(index.html\"))#$2$ARGV[1]$3#go;
-            s#((\/|\")(faq.html\"))#$2$ARGV[1]$3#go;
-            s#((\/|\")(bylaws.html\"))#$2$ARGV[1]$3#go;
-        }
-
-        s#((http:\/\/api\.openoffice\.org\/)(common\/ref[^\"]+))#$relPath\/$3#go;
-        s#((http:\/\/api\.openoffice\.org\/unbranded-source\/)(.*)(examples\/examples.html))#$relToSource\/$4#go;
-
-        if($pattern eq "examples")
-        {
-            # change the links for the C++/Java examples in the ODK
-            s#((http:\/\/api\.openoffice\.org\/source\/browse\/api\/odk\/examples\/)(java\/*))#$3#go;
-            s#((http:\/\/api\.openoffice\.org\/source\/browse\/api\/odk\/examples\/)(cpp\/*))#$3#go;
-            s#((http:\/\/api\.openoffice\.org\/source\/browse\/api\/odk\/examples\/)(basic\/*))#$3#go;
-            s#((http:\/\/api\.openoffice\.org\/source\/browse\/api\/odk\/examples\/)(OLE\/*))#$3#go;
-
-            # change link api specific stuff
-            s#((http:\/\/api\.openoffice\.org\/)(design_guide.html))#$relPath\/www\/$3#go;
-            s#(http:\/\/api\.openoffice\.org\/index.html)#$relPath\/www\/odk_index.html#go;
-
-            # change the links for the C++ examples in the UDK			    
-            s#((http:\/\/udk\.openoffice\.org\/source\/browse\/udk\/product\/examples\/)(cpp\/*))#$3#go;
-            
-            # change the links to udk.openoffice.org to relativ links			    
-            s#(http:\/\/udk\.openoffice\.org\/index.html)#$relPath\/www\/udk_index.html#go;
-            s#((http:\/\/udk\.openoffice\.org)(\/*))#$relPath\/www$3#go;
-            
-            # change the link to tutorial
-            s#((http:\/\/api\.openoffice\.org\/)(basic\/man\/tutorial\/tutorial.pdf))#$relPath\/www\/$3#go;
-        }
-        print FILEOUT $_; 
-    }
-    close FILEOUT;
-    chmod 0666, $i->{filename};
-    rename "$i->{filename}.tmp", $i->{filename} || die "could not rename $i->{filename}.tmp to $i->{filename}";
-    $return = 0;
-}
-
-exit $return;
-
-sub wanted {
-    %file = (
-         directory => $dir,
-         filename  => $name
-         );
-    push @files, {%file} if /^.*\.html\z/s;
-}
diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids
deleted file mode 100755
index 7567e857f..000000000
--- a/solenv/bin/create-ids
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# create ID file for the whole LibO tree. run it in toplevel dir
-
-. ./Env.Host.sh
-
-dirs="*/$INPATH/inc */$INPATH/misc/build `ls -d */* | sed -e '/\(clone\/\|\/\(common\|unxlng\|unxsol\|unxmac\|wntmsc\|Jamfile\|cscope\.\|tags\|ID\)\)\|^solver\//d'`"
-mkid --lang-map=`dirname $0`/id-lang.map --include='C C++ asm perl make' --statistics $dirs
diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
deleted file mode 100755
index c93bcd9bf..000000000
--- a/solenv/bin/create-tags
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-
-. ./Env.Host.sh
-
-omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"
-ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \
-      --languages=-HTML,Java \
-      -R --exclude=`echo ${INPATH} | sed 's/\./\\\./g'` --exclude=binfilter --exclude=solver \
-      --exclude=clone --exclude=install --totals=yes --sort=foldcase *
diff --git a/solenv/bin/createcomponent.xslt b/solenv/bin/createcomponent.xslt
deleted file mode 100644
index 7f7695d53..000000000
--- a/solenv/bin/createcomponent.xslt
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org 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 version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:uc="http://openoffice.org/2010/uno-components">
-  <xsl:param name="uri"/>
-  <xsl:strip-space elements="*"/>
-  <xsl:template match="uc:component">
-    <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-      <xsl:attribute name="uri">
-        <xsl:value-of select="$uri"/>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </xsl:copy>
-  </xsl:template>
-  <xsl:template match="*">
-    <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates/>
-    </xsl:copy>
-  </xsl:template>
-  <xsl:template match="@*">
-    <xsl:copy/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/solenv/bin/createpdbrelocators b/solenv/bin/createpdbrelocators
deleted file mode 100755
index 40a44e8f2..000000000
--- a/solenv/bin/createpdbrelocators
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo createpdbrelocators: no environment found!
-    exit 1
-fi
-exec perl -w $SOLARENV/bin/createpdbrelocators.pl
-
diff --git a/solenv/bin/createpdbrelocators.btm b/solenv/bin/createpdbrelocators.btm
deleted file mode 100644
index fe68d5572..000000000
--- a/solenv/bin/createpdbrelocators.btm
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-iff "%SOLARENV%" == "" then
-    echo Please configure environment with setsolar
-endiff
-iff "%PERL%" == "" then
-	call perl5 -I%SOLARENV%\bin\modules %SOLARENV%\bin\createpdbrelocators.pl %1&
-else
-	call %PERL% -I%SOLARENV%\bin\modules %SOLARENV%\bin\createpdbrelocators.pl %1&
-endiff
diff --git a/solenv/bin/createpdbrelocators.pl b/solenv/bin/createpdbrelocators.pl
deleted file mode 100755
index 213de9053..000000000
--- a/solenv/bin/createpdbrelocators.pl
+++ /dev/null
@@ -1,73 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#*************************************************************************
-#
-# createpdbrelocators - create for pdb relocator files
-#                       PDB relocator files are used to find debug infos
-#                       for analysis of creash reports
-#
-# usage: createpdbrelocators;
-#
-#************************************************************************* 
-
-use strict;
-
-#### module lookup
-
-use lib ("$ENV{SOLARENV}/bin/modules");
-use CreatePDBRelocators;
-
-#### script id #####
-
-( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-
-my $script_rev;
-my $id_str = ' $Revision: 1.5 $ ';
-$id_str =~ /Revision:\s+(\S+)\s+\$/
-  ? ($script_rev = $1) : ($script_rev = "-");
-
-print "$script_name -- version: $script_rev\n";
-
-my $inpath    = $ENV{INPATH};
-
-if ( !$inpath ) {
-    print STDERR "$script_name: INAPTH not set!\n";
-    exit(1);
-}
-my $relocators = CreatePDBRelocators->new();
-my $rc = $relocators->create_pdb_relocators($inpath, "", "");
-
-if ( !$rc ) {
-    print STDERR "$script_name: creating PDB relocators failed!\n";
-    exit(2);
-}
-
-exit(0);
diff --git a/solenv/bin/dbgsv.ini b/solenv/bin/dbgsv.ini
deleted file mode 100644
index 006dadf98..000000000
--- a/solenv/bin/dbgsv.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-=*************************************************************************
-=
-= DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-=
-= Copyright 2000, 2010 Oracle and/or its affiliates.
-=
-= OpenOffice.org - a multi-platform office productivity suite
-=
-= This file is part of OpenOffice.org.
-=
-= OpenOffice.org is free software: you can redistribute it and/or modify
-= it under the terms of the GNU Lesser General Public License version 3
-= only, as published by the Free Software Foundation.
-=
-= OpenOffice.org 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 version 3 for more details
-= (a copy is included in the LICENSE file that accompanied this code).
-=
-= You should have received a copy of the GNU Lesser General Public License
-= version 3 along with OpenOffice.org.  If not, see
-= <http://www.openoffice.org/license.html>
-= for a copy of the LGPLv3 License.
-=
-=***********************************************************************/
-
-[output]
-error=shell
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
deleted file mode 100755
index d4080b6e0..000000000
--- a/solenv/bin/deliver.pl
+++ /dev/null
@@ -1,1457 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# deliver.pl - copy from module output tree to solver
-#
-
-use Cwd;
-use File::Basename;
-use File::Copy;
-use File::DosGlob 'glob';
-use File::Path;
-use File::Spec;
-
-#### script id #####
-
-( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; 
-
-#### globals ####
-
-### valid actions ###
-# if you add a action 'foo', than add 'foo' to this list and
-# implement 'do_foo()' in the implemented actions area
-@action_list        =   (           # valid actions
-                        'copy',
-                        'dos',
-                        'addincpath',
-                        'linklib',
-                        'mkdir',
-                        'symlink',
-                        'touch'
-                        );
-
-# copy filter: files matching these patterns won't be copied by
-# the copy action
-@copy_filter_patterns = (
-                        );
-
-$strip              = '';
-$is_debug           = 0;
-
-$error              = 0;
-$module             = 0;            # module name
-$repository         = 0;            # parent directory of this module 
-$base_dir           = 0;            # path to module base directory
-$dlst_file          = 0;            # path to d.lst
-$ilst_ext           = 'ilst';       # extension of image lists
-$umask              = 22;           # default file/directory creation mask 
-$dest               = 0;            # optional destination path
-$common_build       = 0;            # do we have common trees?
-$common_dest        = 0;            # common tree on solver
-
-@action_data        = ();           # LoL with all action data
-@macros             = ();           # d.lst macros
-@addincpath_list    = ();           # files which have to be filtered through addincpath
-@dirlist            = ();           # List of 'mkdir' targets
-@zip_list           = ();           # files which have to be zipped
-@common_zip_list    = ();           # common files which have to be zipped
-@log_list           = ();           # LoL for logging all copy and link actions
-@common_log_list    = ();           # LoL for logging all copy and link actions in common_dest
-$logfiledate        = 0;            # Make log file as old as newest delivered file
-$commonlogfiledate  = 0;            # Make log file as old as newest delivered file
-
-$files_copied       = 0;            # statistics
-$files_unchanged    = 0;            # statistics
-
-$opt_force          = 0;            # option force copy
-$opt_check          = 0;            # do actually execute any action
-$opt_zip            = 0;            # create an additional zip file
-$opt_silent         = 0;            # be silent, only report errors
-$opt_verbose        = 0;            # be verbose (former default behaviour)
-$opt_log            = 1;            # create an additional log file
-$opt_link           = 0;            # hard link files into the solver to save disk space
-$opt_deloutput      = 0;            # delete the output tree for the project once successfully delivered
-$opt_checkdlst      = 0;
-$delete_common      = 1;            # for "-delete": if defined delete files from common tree also
-
-if ($^O ne 'cygwin') {              # iz59477 - cygwin needes a dot "." at the end of filenames to disable
-    $maybedot     = '';             # some .exe transformation magic.
-} else {
-    my $cygvernum = `uname -r`;
-    my @cygvernum = split( /\./, $cygvernum);
-    $cygvernum = shift @cygvernum;
-    $cygvernum .= shift @cygvernum;
-    if ( $cygvernum < 17 ) {
-        $maybedot     = '.';
-    } else {
-        $maybedot     = '';               # no longer works with cygwin 1.7. other magic below.
-    }
-}
-
-($gui		= lc($ENV{GUI})) 		|| die "Can't determine 'GUI'. Please set environment.\n";
-$tempcounter        = 0;
-
-# zip is default for RE master builds
-$opt_zip = 1 if ( defined($ENV{DELIVER_TO_ZIP}) && uc($ENV{DELIVER_TO_ZIP}) eq 'TRUE');
-
-$has_symlinks       = 0;            # system supports symlinks
-
-for (@action_list) {
-    $action_hash{$_}++;
-}
-
-# trap normal signals (HUP, INT, PIPE, TERM)
-# for clean up on unexpected termination
-use sigtrap 'handler' => \&cleanup_and_die, 'normal-signals';
-
-#### main ####
-
-parse_options();
-
-if ( ! $opt_delete ) {
-    if ( $ENV{GUI} eq 'WNT' ) {
-        if ($ENV{COM} eq 'GCC') {
-            initialize_strip() ;
-        };
-    } else {
-        initialize_strip();
-    }
-}
-
-init_globals();
-push_default_actions();
-parse_dlst();
-check_dlst() if $opt_checkdlst;
-walk_action_data();
-walk_addincpath_list();
-write_log() if $opt_log;
-zip_files() if $opt_zip;
-cleanup() if $opt_delete;
-delete_output() if $opt_deloutput;
-print_stats();
-
-exit($error);
-
-#### implemented actions #####
-
-sub do_copy 
-{
-    # We need to copy two times:
-    # from the platform dependent output tree
-    # and from the common output tree
-    my ($dependent, $common, $from, $to, $file_list);
-    my $line = shift;
-    my $touch = 0;
-    
-    $dependent = expand_macros($line);
-    ($from, $to) = split(' ', $dependent);
-    print "copy dependent: from: $from, to: $to\n" if $is_debug;
-    glob_and_copy($from, $to, $touch);
-
-    if ($delete_common && $common_build && ( $line !~ /%COMMON_OUTDIR%/ ) ) {
-        $line =~ s/%__SRC%/%COMMON_OUTDIR%/ig;
-        if ( $line =~ /%COMMON_OUTDIR%/ ) {
-            $line =~ s/%_DEST%/%COMMON_DEST%/ig;
-            $common = expand_macros($line);
-            ($from, $to) = split(' ', $common);
-            print "copy common: from: $from, to: $to\n" if $is_debug;
-            glob_and_copy($from, $to, $touch);
-        }
-    }
-}
-
-sub do_dos 
-{
-    my $line = shift;
-
-    my $command = expand_macros($line);
-    if ( $opt_check ) {
-        print "DOS: $command\n";
-    }
-    else {
-        # HACK: remove MACOSX stuff which is wrongly labled with dos
-        # better: fix broken d.lst
-        return if ( $command =~ /MACOSX/ );
-        $command =~ s#/#\\#g if $^O eq 'MSWin32';
-        system($command);
-    }
-}
-
-sub do_addincpath 
-{
-    # just collect all addincpath files, actual filtering is done later
-    my $line = shift;
-    my ($from, $to);
-    my @globbed_files = ();
-
-    $line = expand_macros($line);
-    ($from, $to) = split(' ', $line);
-    
-    push( @addincpath_list, @{glob_line($from, $to)});
-}
-
-sub do_linklib 
-{
-    my ($lib_base, $lib_major,$from_dir, $to_dir);
-    my $lib = shift;
-    my @globbed_files = ();
-    my %globbed_hash = ();
-
-    print "linklib: $lib\n" if $is_debug;
-    print "has symlinks\n" if ( $has_symlinks && $is_debug );
-
-    return unless $has_symlinks;
-
-    $from_dir = expand_macros('../%__SRC%/lib');
-    $to_dir = expand_macros('%_DEST%/lib');
-
-    @globbed_files = glob("$from_dir/$lib");
-
-    if ( $#globbed_files == -1 ) {
-       return;
-    }
-
-    foreach $lib (@globbed_files) {
-        $lib = basename($lib);
-        if ( $lib =~ /^(lib\S+(\.so|\.dylib))\.(\d+)\.(\d+)(\.(\d+))?$/
-             || $lib =~ /^(lib\S+(\.so|\.dylib))\.(\d+)$/ )
-        {
-           push(@{$globbed_hash{$1}}, $lib);
-        }
-        else {
-            print_warning("invalid library name: $lib");
-        }
-    }
-        
-    foreach $lib_base ( sort keys %globbed_hash ) {
-        $lib = get_latest_patchlevel(@{$globbed_hash{$lib_base}});
-    
-        if ( $lib =~ /^(lib\S+(\.so|\.dylib))\.(\d+)\.(\d+)(\.(\d+))?$/ )
-        {
-            $lib_major = "$lib_base.$3";
-            $long = 1;
-        }
-        else
-        {
-            $long = 0;
-        }
-
-        if ( $opt_check ) {
-            if ( $opt_delete ) {
-                print "REMOVE: $to_dir/$lib_major\n" if $long;
-                print "REMOVE: $to_dir/$lib_base\n";
-            }
-            else {
-                print "LINKLIB: $to_dir/$lib -> $to_dir/$lib_major\n" if $long;
-                print "LINKLIB: $to_dir/$lib -> $to_dir/$lib_base\n";
-            }
-        }
-        else {
-            if ( $opt_delete ) {
-                print "REMOVE: $to_dir/$lib_major\n" if ($long && $opt_verbose);
-                print "REMOVE: $to_dir/$lib_base\n" if $opt_verbose;
-                unlink "$to_dir/$lib_major" if $long;
-                unlink "$to_dir/$lib_base";
-                if ( $opt_zip ) {
-                    push_on_ziplist("$to_dir/$lib_major") if $long;
-                    push_on_ziplist("$to_dir/$lib_base");
-                }
-                return;
-            }
-            my $symlib;
-            my @symlibs;
-            if ($long)
-            {
-                @symlibs = ("$to_dir/$lib_major", "$to_dir/$lib_base");
-            }
-            else
-            {
-                @symlibs = ("$to_dir/$lib_base");
-            }
-            # remove old symlinks
-            unlink(@symlibs);
-            foreach $symlib (@symlibs) {
-                print "LINKLIB: $lib -> $symlib\n" if $opt_verbose;
-                if ( !symlink("$lib", "$symlib") ) {
-                    print_error("can't symlink $lib -> $symlib: $!",0);
-                }
-                else {
-                    push_on_ziplist($symlib) if $opt_zip;
-                    push_on_loglist("LINK", "$lib", "$symlib") if $opt_log;
-                }
-            }
-        }
-    }
-}
-
-sub do_mkdir 
-{
-    my $path = expand_macros(shift);
-    # strip whitespaces from path name
-    $path =~ s/\s$//;
-    if (( ! $opt_delete ) && ( ! -d $path )) {
-        if ( $opt_check ) { 
-            print "MKDIR: $path\n";
-        } else {
-            mkpath($path, 0, 0777-$umask); 
-            if ( ! -d $path ) {
-                print_error("mkdir: could not create directory '$path'", 0);
-            }
-        }
-    }
-}
-
-sub do_symlink
-{
-    my $line = shift;
-
-    $line = expand_macros($line);
-    ($from, $to) = split(' ',$line);
-    my $fullfrom = $from;
-    if ( dirname($from) eq dirname($to) ) {
-        $from = basename($from);
-    }
-    elsif ( dirname($from) eq '.' ) {
-        # nothing to do
-    }
-    else {
-        print_error("symlink: link must be in the same directory as file",0);
-        return 0;
-    }
-
-    print "symlink: $from, to: $to\n" if $is_debug;
-
-    return unless $has_symlinks;
-    
-    if ( $opt_check ) {
-        if ( $opt_delete ) {
-            print "REMOVE: $to\n";
-        }
-        else {
-            print "SYMLINK $from -> $to\n";
-        }
-    }
-    else {
-        return unless -e $fullfrom;
-        print "REMOVE: $to\n" if $opt_verbose;
-        unlink $to;
-        if ( $opt_delete ) {
-            push_on_ziplist($to) if $opt_zip;
-            return;
-        }
-        print "SYMLIB: $from -> $to\n" if $opt_verbose;
-        if ( !symlink("$from", "$to") ) {
-            print_error("can't symlink $from -> $to: $!",0);
-        }
-        else {
-            push_on_ziplist($to) if $opt_zip;
-            push_on_loglist("LINK", "$from", "$to") if $opt_log;
-        }
-    }
-}
-
-sub do_touch 
-{
-    my ($from, $to);
-    my $line = shift;
-    my $touch = 1;
-    
-    $line = expand_macros($line);
-    ($from, $to) = split(' ', $line);
-    print "touch: $from, to: $to\n" if $is_debug;
-    glob_and_copy($from, $to, $touch);
-}
-
-#### subroutines #####
-
-sub parse_options 
-{
-    my $arg;
-    my $dontdeletecommon = 0;
-    $opt_silent = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE');
-    $opt_verbose = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'TRUE');
-    while ( $arg = shift @ARGV ) {
-        $arg =~ /^-force$/      and $opt_force  = 1  and next;
-        $arg =~ /^-check$/      and $opt_check  = 1  and $opt_verbose = 1 and next;
-        $arg =~ /^-quiet$/      and $opt_silent = 1  and next;
-        $arg =~ /^-verbose$/    and $opt_verbose = 1 and next;
-        $arg =~ /^-zip$/        and $opt_zip    = 1  and next;
-        $arg =~ /^-delete$/     and $opt_delete = 1  and next;
-        $arg =~ /^-dontdeletecommon$/ and $dontdeletecommon = 1 and next;
-        $arg =~ /^-help$/       and $opt_help   = 1  and $arg = '';
-        $arg =~ /^-link$/       and $ENV{GUI} ne 'WNT' and $opt_link = 1 and next;
-        $arg =~ /^-deloutput$/  and $opt_deloutput = 1 and next;
-        $arg =~ /^-debug$/      and $is_debug   = 1  and next;
-        $arg =~ /^-checkdlst$/  and $opt_checkdlst = 1 and next;
-        print_error("invalid option $arg") if ( $arg =~ /^-/ ); 
-        if ( $arg =~ /^-/ || $opt_help || $#ARGV > -1 ) {
-            usage(1); 
-        }
-        $dest = $arg;
-    }
-    # $dest and $opt_zip or $opt_delete are mutually exclusive
-    if ( $dest and ($opt_zip || $opt_delete) ) {
-        usage(1);
-    }
-    # $opt_silent and $opt_check or $opt_verbose are mutually exclusive
-    if ( ($opt_check or $opt_verbose) and $opt_silent ) {
-        print STDERR "Error on command line: options '-check' and '-quiet' are mutually exclusive.\n";
-        usage(1);
-    }
-    if ($dontdeletecommon) {
-        if (!$opt_delete) {
-            usage(1);
-        }
-        $delete_common = 0;
-    };
-    # $opt_delete implies $opt_force
-    $opt_force = 1 if $opt_delete;
-}
-
-sub init_globals 
-{
-    ($module, $repository, $base_dir, $dlst_file) =  get_base();
-
-    # for CWS: 
-    $module =~ s/\.lnk$//;
-
-    print "Module=$module, Base_Dir=$base_dir, d.lst=$dlst_file\n" if $is_debug;
-
-    $umask = umask();
-    if ( !defined($umask) ) {
-        $umask = 22;
-    }
-
-    my $common_outdir = $ENV{'COMMON_OUTDIR'};
-    my $inpath        = $ENV{'INPATH'};
-    my $solarversion  = $ENV{'SOLARVERSION'};
-    my $updater       = $ENV{'UPDATER'};
-    my $work_stamp    = $ENV{'WORK_STAMP'};
-
-    # do we have a valid environment?
-    if ( !defined($inpath) ) {
-            print_error("no environment", 0);
-            exit(3);
-    }
-
-    # Do we have common trees?
-    if ( defined($ENV{'common_build'}) && $ENV{'common_build'} eq 'TRUE' ) {
-        $common_build = 1;
-        if ((defined $common_outdir) && ($common_outdir ne "")) {
-            $common_outdir = $common_outdir . ".pro" if $inpath =~ /\.pro$/;
-            if ( $dest ) {
-                $common_dest = $dest;
-            } else {
-                $common_dest = "$solarversion/$common_outdir";
-                $dest = "$solarversion/$inpath";
-            }
-        } else {
-            print_error("common_build defined without common_outdir", 0);
-            exit(6);
-        }
-    } else {
-        $common_outdir = $inpath;
-        $dest = "$solarversion/$inpath" if ( !$dest );
-        $common_dest = $dest;
-    } 
-    $dest =~ s#\\#/#g;
-    $common_dest =~ s#\\#/#g;
-
-    # the following macros are obsolete, will be flagged as error
-    # %__WORKSTAMP%
-    # %GUIBASE%
-    # %SDK%
-    # %SOLARVER%
-    # %__OFFENV%
-    # %DLLSUFFIX%'
-    # %OUTPATH%
-    # %L10N_FRAMEWORK%
-    # %UPD%
-    
-    # valid macros
-    @macros = (
-                [ '%__PRJROOT%',        $base_dir       ],
-                [ '%__SRC%',            $inpath         ],
-                [ '%_DEST%',            $dest           ],
-                [ '%COMMON_OUTDIR%',    $common_outdir  ],
-                [ '%COMMON_DEST%',      $common_dest    ],
-                [ '%GUI%',              $gui            ]
-              );
-
-    # find out if the *HOST* system supports symlinks. They all do except Windows
-    $has_symlinks = $ENV{GUI} ne 'WNT';
-}
-
-sub get_base 
-{
-    # a module base dir contains a subdir 'prj'
-    # which in turn contains a file 'd.lst'
-    my (@field, $repo, $base, $dlst);
-    my $path = getcwd();
-
-    @field = split(/\//, $path);
-
-    while ( $#field != -1 ) {
-        $base = join('/', @field);
-        $dlst = $base . '/prj/d.lst';
-        last if -e $dlst;
-        pop @field;
-    }
-
-    if ( $#field == -1 ) {
-        print_error("can't find d.lst");
-        exit(2);
-    }
-    else {
-        if ( defined $field[-2] ) {
-            $repo = $field[-2];
-        } else {
-            print_error("Internal error: cannot determine module's parent directory");
-        }
-        return ($field[-1], $repo, $base, $dlst);
-    }
-}
-
-sub parse_dlst 
-{
-    my $line_cnt = 0;
-    open(DLST, "<$dlst_file") or die "can't open d.lst";
-    while(<DLST>) {
-        $line_cnt++;
-        tr/\r\n//d;
-        next if /^#/;
-        next if /^\s*$/;
-        if (!$delete_common && /%COMMON_DEST%/) {
-            # Just ignore all lines with %COMMON_DEST%
-            next;
-        }; 
-        if ( /^\s*(\w+?):\s+(.*)$/ ) {
-            if ( !exists $action_hash{$1} ) {
-                print_error("unknown action: \'$1\'", $line_cnt);
-                exit(4);
-            }
-            push(@action_data, [$1, $2]);
-        }
-        else {
-            if ( /^\s*%(COMMON)?_DEST%\\/ ) {
-                # only copy from source dir to solver, not from solver to solver
-                print_warning("illegal copy action, ignored: \'$_\'", $line_cnt);
-                next;
-            }
-            push(@action_data, ['copy', $_]);
-            # for each ressource file (.res) copy its image list (.ilst)
-            if ( /\.res\s/ ) {
-                my $imagelist = $_;
-                $imagelist =~ s/\.res/\.$ilst_ext/g;
-                $imagelist =~ s/DEST%\\bin\\/DEST%\\res\\img\\/;
-                push(@action_data, ['copy', $imagelist]);
-            }
-        }
-        # call expand_macros()just to find any undefined macros early
-        # real expansion is done later
-        expand_macros($_, $line_cnt);
-    }
-    close(DLST);
-}
-
-sub expand_macros 
-{
-    # expand all macros and change backslashes to slashes
-    my $line        = shift;
-    my $line_cnt    = shift;
-    my $i;
-    
-    for ($i=0; $i<=$#macros; $i++)  {
-        $line =~ s/$macros[$i][0]/$macros[$i][1]/gi
-    }
-    if ( $line =~ /(%\w+%)/ ) {
-        if ( $1 ne '%OS%' ) {   # %OS% looks like a macro but is not ...
-            print_error("unknown/obsolete macro: \'$1\'", $line_cnt);
-        }
-    }
-    $line =~ s#\\#/#g;
-    return $line;
-}
-
-sub walk_action_data 
-{
-    # all actions have to be excuted relative to the prj directory
-    chdir("$base_dir/prj");
-    # dispatch depending on action type
-    for (my $i=0; $i <= $#action_data; $i++) {
-            &{"do_".$action_data[$i][0]}($action_data[$i][1]);
-            if ( $action_data[$i][0] eq 'mkdir' ) {
-                # fill array with (possibly) created directories in
-                # revers order for removal in 'cleanup'
-                unshift @dirlist, $action_data[$i][1];
-            }
-    }
-}
-
-sub glob_line 
-{
-    my $from = shift;
-    my $to = shift;
-    my $to_dir = shift;
-    my $replace = 0;
-    my @globbed_files = ();
-    
-    if ( ! ( $from && $to ) ) {
-        print_warning("Error in d.lst? source: '$from' destination: '$to'");
-        return \@globbed_files;
-    }
-
-    if ( $to =~ /[\*\?\[\]]/ ) {
-        my $to_fname;
-        ($to_fname, $to_dir) = fileparse($to);
-        $replace = 1;
-    }
-        
-    if ( $from =~ /[\*\?\[\]]/ ) {
-        # globbing necessary, no renaming possible
-        my $file;
-        my @file_list = glob($from);
-        
-        foreach $file ( @file_list ) {
-            next if ( -d $file); # we only copy files, not directories
-            my ($fname, $dir) = fileparse($file);
-            my $copy = ($replace) ? $to_dir . $fname : $to . '/' . $fname;
-            push(@globbed_files, [$file, $copy]);
-        }
-    }
-    else {
-        # no globbing but renaming possible
-        # #i89066#
-        if (-d $to && -f $from) {
-            my $filename = File::Basename::basename($from);
-            $to .= '/' if ($to !~ /[\\|\/]$/);
-            $to .= $filename;
-        };
-        push(@globbed_files, [$from, $to]);
-    }
-    if ( $opt_checkdlst ) {
-        my $outtree = expand_macros("%__SRC%");
-        my $commonouttree = expand_macros("%COMMON_OUTDIR%");
-        if (( $from !~ /\Q$outtree\E/ ) && ( $from !~ /\Q$commonouttree\E/ )) {
-            print_warning("'$from' does not match any file") if ( $#globbed_files == -1 );
-        }
-    }
-    return \@globbed_files;
-}
-    
-
-sub glob_and_copy 
-{
-    my $from = shift;
-    my $to = shift;
-    my $touch = shift;
-
-    my @copy_files = @{glob_line($from, $to)};
-    
-    for (my $i = 0; $i <= $#copy_files; $i++) {
-        next if filter_out($copy_files[$i][0]); # apply copy filter
-        copy_if_newer($copy_files[$i][0], $copy_files[$i][1], $touch) 
-                    ? $files_copied++ : $files_unchanged++;
-    }
-}
-
-sub is_unstripped {
-    my $file_name = shift;
-    my $nm_output;
-
-    if (-f $file_name.$maybedot) {
-        my $file_type = `file $file_name`;
-        # OS X file command doesn't know if a file is stripped or not
-        if (($file_type =~ /not stripped/o) || ($file_type =~ /Mach-O/o) || 
-            (($file_type =~ /PE/o) && ($ENV{GUI} eq 'WNT') &&
-             ($nm_output = `nm $file_name 2>&1`) && $nm_output &&
-             !($nm_output =~ /no symbols/i) && !($nm_output =~ /not recognized/i))) {
-            return '1' if ($file_name =~ /\.bin$/o);
-            return '1' if ($file_name =~ /\.so\.*/o);
-            return '1' if ($file_name =~ /\.dylib\.*/o);
-            return '1' if ($file_name =~ /\.com\.*/o);
-            return '1' if ($file_name =~ /\.dll\.*/o);
-            return '1' if ($file_name =~ /\.exe\.*/o);
-            return '1' if (basename($file_name) !~ /\./o);
-        }
-    };
-    return '';
-}
-
-sub initialize_strip {
-    if ((!defined $ENV{DISABLE_STRIP}) || ($ENV{DISABLE_STRIP} eq "")) {
-        $strip .= 'guw ' if ($^O eq 'cygwin');
-        $strip .= 'strip';
-        $strip .= " -x" if ($ENV{OS} eq 'MACOSX');
-        $strip .= " -R '.comment' -s" if ($ENV{OS} eq 'LINUX');
-    };
-};
-
-sub is_jar {
-    my $file_name = shift;
-
-    if (-f $file_name && (( `file $file_name` ) =~ /Zip archive/o)) {
-        return '1' if ($file_name =~ /\.jar\.*/o);
-    };
-    return '';
-}
-
-sub execute_system {
-    my $command = shift;
-    if (system($command)) {
-        print_error("Failed to execute $command");
-        exit($?);
-    };
-};
-
-sub strip_target {
-    my $file = shift;
-    my $temp_file = shift;
-    $temp_file =~ s/\/{2,}/\//g;
-    my $rc = copy($file, $temp_file);
-    execute_system("$strip $temp_file");
-    return $rc;
-};
-
-sub copy_if_newer 
-{
-    # return 0 if file is unchanged ( for whatever reason )
-    # return 1 if file has been copied
-    my $from = shift;
-    my $to = shift;
-    my $touch = shift;
-    my $from_stat_ref;
-    my $rc = 0;
-    
-    print "testing $from, $to\n" if $is_debug;
-    push_on_ziplist($to) if $opt_zip;
-    push_on_loglist("COPY", "$from", "$to") if $opt_log;
-    return 0 unless ($from_stat_ref = is_newer($from, $to, $touch));
-
-    if ( $opt_delete ) {
-        print "REMOVE: $to\n" if $opt_verbose;
-        $rc = unlink($to) unless $opt_check;
-        return 1 if $opt_check;
-        return $rc;
-    }
-
-    if( !$opt_check && $opt_link ) {
-        # hard link if possible
-        if( link($from, $to) ){
-            print "LINK: $from -> $to\n" if $opt_verbose;
-            return 1;
-        }
-    }
-
-    if( $touch ) {
-       print "TOUCH: $from -> $to\n" if $opt_verbose;
-    }
-    else {
-       print "COPY: $from -> $to\n" if $opt_verbose;
-    }
-     
-    return 1 if( $opt_check );
-
-    #
-    # copy to temporary file first and rename later
-    # to minimize the possibility for race conditions
-    local $temp_file = sprintf('%s.%d-%d', $to, $$, time());
-    $rc = '';
-    if (($strip ne '') && (defined $ENV{PROEXT}) && (is_unstripped($from))) {
-        $rc = strip_target($from, $temp_file);
-    } else {
-        $rc = copy($from, $temp_file);
-    };
-    if ( $rc) {
-        if ( is_newer($temp_file, $from, 0) ) {
-            $rc = utime($$from_stat_ref[9], $$from_stat_ref[9], $temp_file);
-            if ( !$rc ) {
-                print_warning("can't update temporary file modification time '$temp_file': $!\n
-                               Check file permissions of '$from'.",0);
-            }   
-        }
-        fix_file_permissions($$from_stat_ref[2], $temp_file);
-        # Ugly hack: on windows file locking(?) sometimes prevents renaming.
-        # Until we've found and fixed the real reason try it repeatedly :-(
-        my $try = 0;
-        my $maxtries = 1;
-        $maxtries = 5 if ( $^O eq 'MSWin32' );
-        my $success = 0;
-        while ( $try < $maxtries && ! $success ) {
-            sleep $try;
-            $try ++;
-            $success = rename($temp_file, $to);
-            if ( $^O eq 'cygwin' && $to =~ /\.bin$/) {
-                # hack to survive automatically added .exe for executables renamed to
-                # *.bin - will break if there is intentionally a .bin _and_ .bin.exe file.
-                $success = rename( "$to.exe", $to ) if -f "$to.exe";
-            }
-        }
-        if ( $success ) {
-            # handle special packaging of *.dylib files for Mac OS X
-            if ( $^O eq 'darwin' )
-            {
-                system("macosx-create-bundle", "$to=$from.app") if ( -d "$from.app" );
-                system("ranlib", "$to" ) if ( $to =~ /\.a/ );
-            }
-            if ( $try > 1 ) {
-                print_warning("File '$to' temporarily locked. Dependency bug?");
-            }
-            return 1;
-        }
-        else {
-            print_error("can't rename temporary file to $to: $!",0);
-        }
-    }
-    else {
-        print_error("can't copy $from: $!",0);
-        my $destdir = dirname($to);
-        if ( ! -d $destdir ) {
-            print_error("directory '$destdir' does not exist", 0);
-        }
-    }
-    unlink($temp_file);
-    return 0;
-}
-
-sub is_newer 
-{
-        # returns whole stat buffer if newer
-        my $from = shift;
-        my $to = shift;
-        my $touch = shift;
-        my (@from_stat, @to_stat);
-
-        @from_stat = stat($from.$maybedot);
-        if ( $opt_checkdlst ) {
-            my $outtree = expand_macros("%__SRC%");
-            my $commonouttree = expand_macros("%COMMON_OUTDIR%");
-            if ( $from !~ /$outtree/ ) {
-                if ( $from !~ /$commonouttree/ ) {
-                    print_warning("'$from' does not exist") unless -e _;
-                }
-            }
-        }
-        return 0 unless -f _;
-
-        if ( $touch ) {
-            $from_stat[9] = time();
-        }
-        # adjust timestamps to even seconds
-        # this is necessary since NT platforms have a
-        # 2s modified time granularity while the timestamps 
-        # on Samba volumes have a 1s granularity
-
-        $from_stat[9]-- if $from_stat[9] % 2;
-
-        if ( $to =~ /^\Q$dest\E/ ) {
-            if ( $from_stat[9] > $logfiledate ) {
-                $logfiledate = $from_stat[9];
-            }
-        } elsif ( $common_build && ( $to =~ /^\Q$common_dest\E/ ) ) {
-            if ( $from_stat[9] > $commonlogfiledate ) {
-                $commonlogfiledate = $from_stat[9];
-            }
-        }
-
-        @to_stat = stat($to.$maybedot);
-        return \@from_stat unless -f _;
-
-        if ( $opt_force ) {
-            return \@from_stat;
-        }
-        else {
-            return ($from_stat[9] > $to_stat[9]) ? \@from_stat : 0;
-        }
-}
-
-sub filter_out
-{
-    my $file = shift;
-
-    foreach my $pattern ( @copy_filter_patterns ) {
-        if  ( $file =~ /$pattern/ ) {
-           print "filter out: $file\n" if $is_debug;
-           return 1;
-        }
-    }
-
-    return 0;
-}
-
-sub fix_file_permissions 
-{
-    my $mode = shift;
-    my $file = shift;
-    
-    if ( ($mode >> 6) % 2 == 1 ) {
-        $mode = 0777 & ~$umask;
-    }
-    else {
-        $mode = 0666 & ~$umask;
-    }
-    chmod($mode, $file);
-}
-
-sub get_latest_patchlevel 
-{
-    # note: feed only well formed library names to this function
-    # of the form libfoo.so.x.y.z with x,y,z numbers
-
-    my @sorted_files = sort by_rev @_;
-    return $sorted_files[-1];
-        
-    sub by_rev {
-    # comparison function for sorting
-        my (@field_a, @field_b, $i);
-
-        $a =~ /^(lib[\w-]+(\.so|\.dylib))\.(\d+)\.(\d+)\.(\d+)$/;
-        @field_a = ($3, $4, $5);
-        $b =~ /^(lib[\w-]+(\.so|\.dylib))\.(\d+)\.(\d+)\.(\d+)$/;
-        @field_b = ($3, $4, $5);
-
-        for ($i = 0; $i < 3; $i++)
-          {
-              if ( ($field_a[$i] < $field_b[$i]) ) {
-                  return -1;
-              }
-              if ( ($field_a[$i] > $field_b[$i]) ) {
-                  return 1;
-              }
-          }
-
-        # can't happen
-        return 0;
-    }
-
-}
-
-sub push_default_actions 
-{
-    # any default action (that is an action which must be done even without 
-    # a corresponding d.lst entry) should be pushed here on the 
-    # @action_data list.
-    my $subdir;
-    my @subdirs = (
-                    'bin',
-                    'doc',
-                    'inc',
-                    'lib',
-                    'par',
-                    'pck',
-                    'rdb',
-                    'res',
-                    'xml'
-                );
-    push(@subdirs, 'zip') if $opt_zip;
-    push(@subdirs, 'idl') if ! $common_build;
-    push(@subdirs, 'pus') if ! $common_build;
-    my @common_subdirs = (
-                    'bin',
-                    'idl',
-                    'inc',
-                    'pck',
-                    'pus',
-                    'res'
-                );
-    push(@common_subdirs, 'zip') if $opt_zip;
-
-    if ( ! $opt_delete ) {
-        # create all the subdirectories on solver
-        foreach $subdir (@subdirs) {
-            push(@action_data, ['mkdir', "%_DEST%/$subdir"]);
-        }
-        if ( $common_build ) {
-            foreach $subdir (@common_subdirs) {
-                push(@action_data, ['mkdir', "%COMMON_DEST%/$subdir"]);
-            }
-        }
-    }
-    push(@action_data, ['mkdir', "%_DEST%/inc/$module"]);
-    if ( $common_build ) {
-        push(@action_data, ['mkdir', "%COMMON_DEST%/inc/$module"]);
-        push(@action_data, ['mkdir', "%COMMON_DEST%/res/img"]);
-    } else {
-        push(@action_data, ['mkdir', "%_DEST%/res/img"]);
-    }
-
-    # deliver build.lst to $dest/inc/$module
-    push(@action_data, ['copy', "build.lst %_DEST%/inc/$module/build.lst"]);
-    if ( $common_build ) {
-        # ... and to $common_dest/inc/$module
-        push(@action_data, ['copy', "build.lst %COMMON_DEST%/inc/$module/build.lst"]);
-    }
-
-    # need to copy libstaticmxp.dylib for Mac OS X
-    if ( $^O eq 'darwin' )
-    {
-        push(@action_data, ['copy', "../%__SRC%/lib/lib*static*.dylib %_DEST%/lib/lib*static*.dylib"]);
-    }
-}
-
-sub walk_addincpath_list 
-{
-    my (@addincpath_headers);
-    return if $#addincpath_list == -1;
-
-    # create hash with all addincpath header names
-    for (my $i = 0; $i <= $#addincpath_list; $i++) {
-        my @field = split('/', $addincpath_list[$i][0]);
-        push (@addincpath_headers, $field[-1]);
-    }
-
-    # now stream all addincpath headers through addincpath filter
-    for (my $i = 0; $i <= $#addincpath_list; $i++) {
-        add_incpath_if_newer($addincpath_list[$i][0], $addincpath_list[$i][1], \@addincpath_headers) 
-                ? $files_copied++ : $files_unchanged++;
-    }
-}
-
-sub add_incpath_if_newer 
-{
-    my $from = shift;
-    my $to = shift;
-    my $modify_headers_ref = shift;
-    my ($from_stat_ref, $header);
-
-    push_on_ziplist($to) if $opt_zip;
-    push_on_loglist("ADDINCPATH", "$from", "$to") if $opt_log;
-
-    if ( $opt_delete ) {
-        print "REMOVE: $to\n" if $opt_verbose;
-        my $rc = unlink($to);
-        return 1 if $rc;
-        return 0;
-    }
-        
-    if ( $from_stat_ref = is_newer($from, $to) ) {
-        print "ADDINCPATH: $from -> $to\n" if $opt_verbose;
-        
-        return 1 if $opt_check;
-
-        my $save = $/;
-        undef $/;
-        open(FROM, "<$from");
-        # slurp whole file in one big string
-        my $content = <FROM>;
-        close(FROM);
-        $/ = $save;
-
-        foreach $header (@$modify_headers_ref) {
-            $content =~ s/#include [<"]$header[>"]/#include <$module\/$header>/g;
-        }
-
-        open(TO, ">$to");
-        print TO $content;
-        close(TO);
-
-        utime($$from_stat_ref[9], $$from_stat_ref[9], $to);
-        fix_file_permissions($$from_stat_ref[2], $to);
-        return 1;
-    }
-    return 0;
-}
-
-sub push_on_ziplist
-{
-    my $file = shift;
-    return if ( $opt_check );
-    # strip $dest from path since we don't want to record it in zip file
-    if ( $file =~ s#^\Q$dest\E/##o ) {
-        push(@zip_list, $file);
-    } elsif ( $file =~ s#^\Q$common_dest\E/##o ) {
-        push(@common_zip_list, $file);
-    }
-}
-
-sub push_on_loglist
-{
-    my @entry = @_;
-    return 0 if ( $opt_check );
-    return -1 if ( $#entry != 2 );
-    if (( $entry[0] eq "COPY" ) || ( $entry[0] eq "ADDINCPATH" )) {
-        return 0 if ( ! -e $entry[1].$maybedot );
-        # make 'from' relative to source root
-        $entry[1] = $repository ."/" . $module . "/prj/" . $entry[1];
-        $entry[1] =~ s/$module\/prj\/\.\./$module/;
-    }
-    # platform or common tree?
-    my $common;
-    if ( $entry[2] =~ /^\Q$dest\E/ ) {
-        $common = 0;
-    } elsif ( $common_build && ( $entry[2] =~ /^\Q$common_dest\E/ )) {
-        $common = 1;
-    } else {
-        warn "Neither common nor platform tree?";
-        return;
-    }
-    # make 'to' relative to SOLARVERSION
-    my $solarversion  = $ENV{'SOLARVERSION'};
-    $solarversion =~ s#\\#/#g;
-    $entry[2] =~ s/^\Q$solarversion\E\///;
-
-    if ( $common ) {
-        push @common_log_list, [@entry];
-    } else {
-        push @log_list, [@entry];
-    }
-    return 1;
-}
-
-sub zip_files
-{
-    my $zipexe = 'zip';
-    $zipexe .= ' -y' unless  $^O eq 'MSWin32';
-    
-    my ($platform_zip_file, $common_zip_file);
-    $platform_zip_file = "%_DEST%/zip/$module.zip";
-    $platform_zip_file = expand_macros($platform_zip_file);
-    my (%dest_dir, %list_ref);
-    $dest_dir{$platform_zip_file} = $dest;
-    $list_ref{$platform_zip_file} = \@zip_list;
-    if ( $common_build ) {
-        $common_zip_file = "%COMMON_DEST%/zip/$module.zip";
-        $common_zip_file = expand_macros($common_zip_file);
-        $dest_dir{$common_zip_file}   = $common_dest;
-        $list_ref{$common_zip_file}   = \@common_zip_list;
-    }
-
-    my @zipfiles;
-    $zipfiles[0] = $platform_zip_file;
-    if ( $common_build ) {
-        push @zipfiles, ($common_zip_file);
-    }
-    foreach my $zip_file ( @zipfiles ) {
-        print "ZIP: updating $zip_file\n" if $opt_verbose;
-        next if ( $opt_check );
-
-        if ( $opt_delete ) {
-            if ( -e $zip_file ) {
-                unlink $zip_file or die "Error: can't remove file '$zip_file': $!";
-            }
-            next;
-        }
-
-        local $work_file = "";
-        if ( $zip_file eq $common_zip_file) {
-            # Zip file in common tree: work on uniq copy to avoid collisions
-            $work_file = $zip_file;
-            $work_file =~ s/\.zip$//;
-            $work_file .= (sprintf('.%d-%d', $$, time())) . ".zip";
-            die "Error: temp file $work_file already exists" if ( -e $work_file);
-            if ( -e $zip_file ) {
-                if ( -z $zip_file) {
-                    # sometimes there are files of 0 byte size - remove them
-                    unlink $zip_file or print_error("can't remove empty file '$zip_file': $!",0);
-                } else {
-                    if ( ! copy($zip_file, $work_file)) {
-                        # give a warning, not an error:
-                        # we can zip from scratch instead of just updating the old zip file
-                        print_warning("can't copy'$zip_file' into '$work_file': $!", 0);
-                        unlink $work_file;
-                    }
-                }
-            }
-        } else {
-            # No pre processing necessary, working directly on solver.
-            $work_file = $zip_file;
-        }
-
-        # zip content has to be relative to $dest_dir
-        chdir($dest_dir{$zip_file}) or die "Error: cannot chdir into $dest_dir{$zip_file}";
-        my $this_ref = $list_ref{$zip_file};
-        open(ZIP, "| $zipexe -q -o -u -@ $work_file") or die "error opening zip file";
-        foreach $file ( @$this_ref ) {
-            print "ZIP: adding $file to $zip_file\n" if $is_debug;
-            print ZIP "$file\n";
-        }
-        close(ZIP);
-        fix_broken_cygwin_created_zips($work_file) if $^O eq "cygwin";
-
-        if ( $zip_file eq $common_zip_file) {
-            # rename work file back
-            if ( -e $work_file ) {
-                if ( -e $zip_file) {
-                    # do some tricks to be fast. otherwise we may disturb other platforms
-                    # by unlinking a file which just gets copied -> stale file handle.
-                    my $buffer_file=$work_file . '_rm';
-                    rename($zip_file, $buffer_file) or warn "Warning: can't rename old zip file '$zip_file': $!";
-                    if (! rename($work_file, $zip_file)) {
-                        print_error("can't rename temporary file to $zip_file: $!",0);
-                        unlink $work_file;
-                    }
-                    unlink $buffer_file;
-                } else {
-                    if (! rename($work_file, $zip_file)) {
-                        print_error("can't rename temporary file to $zip_file: $!",0);
-                        unlink $work_file;
-                    }
-                }
-            }
-        }
-    }
-}
-
-sub fix_broken_cygwin_created_zips
-# add given extension to or strip it from stored path
-{
-    require Archive::Zip; import Archive::Zip;
-    my $zip_file = shift;
-
-    $zip = Archive::Zip->new();
-    unless ( $zip->read($work_file) == AZ_OK ) {
-        die "Error: can't open zip file '$zip_file' to fix broken cygwin file permissions";
-    }
-    my $latest_member_mod_time = 0;
-    foreach $member ( $zip->members() ) {
-        my $attributes = $member->unixFileAttributes();
-        $attributes &= ~0xFE00;
-        print $member->fileName() . ": " . sprintf("%lo", $attributes) if $is_debug;
-        $attributes |= 0x10; # add group write permission
-        print "-> " . sprintf("%lo", $attributes) . "\n" if $is_debug;
-        $member->unixFileAttributes($attributes);
-        if ( $latest_member_mod_time < $member->lastModTime() ) {
-            $latest_member_mod_time = $member->lastModTime();
-        }
-    }
-    die "Error: can't overwrite zip file '$zip_file' for fixing permissions" unless $zip->overwrite() == AZ_OK;
-    utime($latest_member_mod_time, $latest_member_mod_time, $zip_file);
-}
-
-sub get_tempfilename
-{
-    my $temp_dir = shift;
-    $temp_dir = ( -d '/tmp' ? '/tmp' : $ENV{TMPDIR} || $ENV{TEMP} || '.' )
-            unless defined($temp_dir);
-     if ( ! -d $temp_dir ) {
-        die "no temp directory $temp_dir\n";
-    }
-    my $base_name = sprintf( "%d-%di-%d", $$, time(), $tempcounter++ );
-    return "$temp_dir/$base_name";
-}
-
-sub write_log
-{
-    my (%log_file, %file_date);
-    $log_file{\@log_list} = "%_DEST%/inc/$module/deliver.log";
-    $log_file{\@common_log_list} = "%COMMON_DEST%/inc/$module/deliver.log";
-    $file_date{\@log_list} = $logfiledate;
-    $file_date{\@common_log_list} = $commonlogfiledate;
-
-    my @logs = ( \@log_list );
-    push @logs, ( \@common_log_list ) if ( $common_build );
-    foreach my $log ( @logs ) {
-        $log_file{$log} = expand_macros( $log_file{$log} );
-        if ( $opt_delete ) {
-            print "LOG: removing $log_file{$log}\n" if $opt_verbose;
-            next if ( $opt_check );
-            unlink $log_file{$log};
-        } else {
-            print "LOG: writing $log_file{$log}\n" if $opt_verbose;
-            next if ( $opt_check );
-            open( LOGFILE, "> $log_file{$log}" ) or warn "Error: could not open log file.";
-            foreach my $item ( @$log ) {
-                print LOGFILE "@$item\n";
-            }
-            close( LOGFILE );
-            utime($file_date{$log}, $file_date{$log}, $log_file{$log});
-        }
-        push_on_ziplist( $log_file{$log} ) if $opt_zip;
-    }
-    return;
-}
-
-sub check_dlst 
-{
-    my %createddir;
-    my %destdir;
-    my %destfile;
-    # get all checkable actions to perform
-    foreach my $action ( @action_data ) {
-        my $path = expand_macros( $$action[1] );
-        if ( $$action[0] eq 'mkdir' ) {
-            $createddir{$path} ++;
-        } elsif (( $$action[0] eq 'copy' ) || ( $$action[0] eq 'addincpath' )) {
-            my ($from, $to) = split(' ', $path);
-            my ($to_fname, $to_dir);
-            my $withwildcard = 0;
-            if ( $from =~ /[\*\?\[\]]/ ) {
-                $withwildcard = 1;
-            }
-            ($to_fname, $to_dir) = fileparse($to);
-            if ( $withwildcard ) {
-                if ( $to !~ /[\*\?\[\]]/ ) {
-                    $to_dir = $to;
-                    $to_fname ='';
-                }
-            }
-            $to_dir =~ s/[\\\/\s]$//;
-            $destdir{$to_dir} ++;
-            # Check: copy into non existing directory?
-            if ( ! $createddir{$to_dir} ) {
-                # unfortunately it is not so easy: it's OK if a subdirectory of $to_dir
-                # gets created, because mkpath creates the whole tree
-                foreach my $directory ( keys %createddir ) {
-                    if ( $directory =~ /^\Q$to_dir\E[\\\/]/ ) {
-                        $createddir{$to_dir} ++;
-                        last;
-                    }
-                }
-                print_warning("Possibly copying into directory without creating in before: '$to_dir'") 
-                    unless $createddir{$to_dir};
-            }
-            # Check: overwrite file?
-            if ( ! $to ) {
-                if ( $destfile{$to} ) {
-                    print_warning("Multiple entries copying to '$to'");
-                }
-                $destfile{$to} ++;
-            }
-        }
-    }
-}
-
-sub cleanup 
-{
-    # remove empty directories
-    foreach my $path ( @dirlist ) {
-        $path = expand_macros($path);
-        if ( $opt_check ) { 
-            print "RMDIR: $path\n" if $opt_verbose;
-        } else {
-            rmdir $path; 
-        }
-    }
-}
-
-sub delete_output
-{
-    my $output_path = expand_macros("../%__SRC%");
-    if ( "$output_path" ne "../" ) {
-        if ( rmtree([$output_path], 0, 1) ) {
-            print "Deleted output tree.\n" if $opt_verbose;
-        }
-        else {
-            print_error("Error deleting output tree $output_path: $!",0);
-        }
-    }
-    else {
-        print_error("Output not deleted - INPATH is not set");
-    }
-}
-
-sub print_warning 
-{
-    my $message = shift;
-    my $line = shift;
-
-    print STDERR "$script_name: ";
-    if ( $dlst_file ) {
-        print STDERR "$dlst_file: ";
-    }
-    if ( $line ) {
-        print STDERR "line $line: ";
-    }
-    print STDERR "WARNING: $message\n";
-}
-
-sub print_error 
-{
-    my $message = shift;
-    my $line = shift;
-
-    print STDERR "$script_name: ";
-    if ( $dlst_file ) {
-        print STDERR "$dlst_file: ";
-    }
-    if ( $line ) {
-        print STDERR "line $line: ";
-    }
-    print STDERR "ERROR: $message\n";
-    $error ++;
-}
-
-sub print_stats 
-{
-    print "Module '$module' delivered "; 
-    if ( $error ) {
-        print "with errors\n";
-    } else {
-        print "successfully.";
-        if ( $opt_delete ) {
-            print " $files_copied files removed,";
-        }
-        else {
-            print " $files_copied files copied,";
-        }
-        print " $files_unchanged files unchanged\n";
-    }
-}
-
-sub cleanup_and_die
-{
-    # clean up on unexpected termination
-    my $sig = shift;
-    if ( defined($temp_file) && -e $temp_file ) {
-        unlink($temp_file);
-    }
-    if ( defined($work_file) && -e $work_file ) {
-        unlink($work_file);
-        print STDERR "$work_file removed\n";
-    }
-    
-    die "caught unexpected signal $sig, terminating ...";
-}
-
-sub usage 
-{
-    my $exit_code = shift;
-    print STDERR "Usage:\ndeliver [OPTIONS] [DESTINATION-PATH]\n";
-    print STDERR "Options:\n";
-    print STDERR "  -check       just print what would happen, no actual copying of files\n";
-    print STDERR "  -checkdlst   be verbose about (possible) d.lst bugs\n";
-    print STDERR "  -delete      delete files (undeliver), use with care\n";
-    print STDERR "  -deloutput   remove the output tree after copying\n";
-    print STDERR "  -dontdeletecommon do not delete common files (for -delete option)\n";
-    print STDERR "  -force       copy even if not newer\n";
-    print STDERR "  -help        print this message\n";
-    if ( !defined($ENV{GUI}) || $ENV{GUI} ne 'WNT' ) {
-        print STDERR "  -link        hard link files into the solver to save disk space\n";
-    }
-    print STDERR "  -quiet       be quiet, only report errors\n";
-    print STDERR "  -verbose     be verbose\n";
-    print STDERR "  -zip         additionally create zip files of delivered content\n";
-    print STDERR "Options '-zip' and a destination-path are mutually exclusive.\n";
-    print STDERR "Options '-check' and '-quiet' are mutually exclusive.\n";
-    exit($exit_code);
-}
-
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/diffmv.pl b/solenv/bin/diffmv.pl
deleted file mode 100755
index ba401d7aa..000000000
--- a/solenv/bin/diffmv.pl
+++ /dev/null
@@ -1,76 +0,0 @@
-:
-    eval 'exec perl -S $0 ${1+"$@"}'
-        if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-my ( $srcfile, $destfile ) = @ARGV;
-my ( @srclines, @destlines );
-my $dest_existing = 0;
-@destlines = ();
-
-usage() if ( ! defined $srcfile || ! defined $destfile);
-
-open(SRCFILE, "$srcfile") or die "ERROR: Can't open $srcfile\n";
-@srclines = <SRCFILE>;
-close SRCFILE;
-
-if ( -f $destfile ) {
-    open(DESTFILE, "$destfile") or die "ERROR: Can't open $destfile\n";
-    @destlines = <DESTFILE>;
-    close DESTFILE;
-    $dest_existing = 1;
-}
-
-if ( ! check_if_lists_equal(\@srclines,  \@destlines) ) {
-    print STDERR "Updating \"$destfile\".\n";
-    unlink "$destfile" or die "ERROR: Can't remove old $destfile\n" if ( $dest_existing );
-    rename "$srcfile", "$destfile" or die "ERROR: Can't rename $srcfile to $destfile\n";
-} else {
-    print STDERR "\"$destfile\" unchanged.\n";
-}
-
-sub check_if_lists_equal
-{
-    my  ( $srclist_ref, $destlist_ref ) = @_;
-    my @srclist  = @{ $srclist_ref };
-    my @destlist  = @{ $destlist_ref };
-    return  0 if ( $#srclist != $#destlist );
-    for ( my $i = 0; $i  < $#srclist; $i++ ) {
-        return 0 if  ( $srclist[$i] ne $destlist[$i]);
-    }
-    return  1;
-}
-
-sub usage
-{
-    print STDERR "Usage: diffmv sourcefile destfile\n";
-    print STDERR "Do move diffing file only\n";
-    exit 1;    
-}
-
diff --git a/solenv/bin/exectest.pl b/solenv/bin/exectest.pl
deleted file mode 100644
index dc6f0e66c..000000000
--- a/solenv/bin/exectest.pl
+++ /dev/null
@@ -1,98 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$#ARGV >= 1
-    or die "Usage: $0 <input file>|-SUCCESS|-FAILURE <command> <arguments...>";
-if ($ARGV[0] eq "-SUCCESS")
-{
-    $expect = "SUCCESS";
-    $input = 0;
-}
-elsif ($ARGV[0] eq "-FAILURE")
-{
-    $expect = "FAILURE";
-    $input = 0;
-}
-else
-{
-    open INPUT, $ARGV[0] or die "cannot open $ARGV[0]: $!";
-    $input = 1;
-}
-shift @ARGV;
-$failed = 0;
-$open = 0;
-while (1) {
-    $eof = $input ? eof INPUT : $open;
-    $in = <INPUT> if $input && !$eof;
-    if (!$input || $eof
-        || $in =~ /^EXPECT (SUCCESS|FAILURE|\d+)( "([^"]*)")?:\n$/)
-    {
-        if ($open)
-        {
-            close PIPE;
-            if ($? % 256 == 0)
-            {
-                $exit = $? / 256;
-                $ok = $expect eq "SUCCESS" ? $exit == 0
-                    : $expect eq "FAILURE" ? $exit != 0 : $exit == $expect;
-            }
-            else
-            {
-                $exit = "signal";
-                $ok = 0;
-            }
-            print "\"$title\", " if defined $title;
-            print "expected $expect, got $exit ($?): ";
-            if ($ok)
-            {
-                print "ok\n";
-            }
-            else
-            {
-                print "FAILED!\n";
-                $failed = 1;
-            }
-        }
-        last if $eof;
-        $expect = $1 if $input;
-        if (defined $3)
-        {
-            $title = $3;
-        }
-        else
-        {
-            undef $title;
-        }
-        open PIPE, "| @ARGV" or die "cannot start process: $!";
-        $open = 1;
-    }
-    elsif ($open && $input)
-    {
-        print PIPE $in or die "cannot write to pipe: $!";
-    }
-}
-exit $failed;
diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl
deleted file mode 100755
index 4d81021ed..000000000
--- a/solenv/bin/gccinstlib.pl
+++ /dev/null
@@ -1,78 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-   if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$ENV{'LC_MESSAGES'} = 'C';
-
-$Dest = pop(@ARGV) || die "No destination to copy to";
-
-$cc = $ENV{'CC'} || die "No CC environment set";
-
-if ($Dest =~ /--help/ || @ARGV < 1) {
-    print "Syntax:\n  gcc-instlib <library-in-libpath ...> <destination-dir>\n";
-    exit (0);
-}
-
-%SrcAndDest = ();
-
-foreach $File (@ARGV) {
-    my $string;
-
-    my $NormFile = $File;
-    $NormFile =~ s/\.so\.\d+/.so/;
-    @search = ($File, $NormFile);
-
-    foreach $entry (@search) {
-        open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$entry|") ||
-            next;
-        $string=<GCCOut>;
-        chomp ($string);
-        close (GCCOut);
-        if (-e $string) {
-            $SrcAndDest{$string} = "$Dest/$File";
-            last;
-        }
-    }
-}
-
-while (($Src, $FullDest) = each %SrcAndDest) {
-    printf "copy $Src to $FullDest\n";
-    system ("/bin/cp $Src $FullDest") && die "copy failed: $!";
-}
-
-
-foreach $File (@ARGV) {
-    #https://bugzilla.redhat.com/show_bug.cgi?id=149465
-    printf "unprelinking $Dest/$File\n";
-    #If it's already unprelinked .i.e. no .gnu.prelink_undo section, that's fine
-    #If prelink is not installed, it's massively unlikely that it's prelinked
-    system ("prelink -u $Dest/$File > /dev/null 2>&1");
-}
-
-exit (0);
diff --git a/solenv/bin/gdb_cxa-atexit_trace-stdout b/solenv/bin/gdb_cxa-atexit_trace-stdout
deleted file mode 100644
index 25cfe9897..000000000
--- a/solenv/bin/gdb_cxa-atexit_trace-stdout
+++ /dev/null
@@ -1,8 +0,0 @@
-set pagination off
-break __cxa_atexit
-commands
-    bt
-    cont
-end
-run
-quit
diff --git a/solenv/bin/gdbtrycatchtrace b/solenv/bin/gdbtrycatchtrace
deleted file mode 100644
index 636985a14..000000000
--- a/solenv/bin/gdbtrycatchtrace
+++ /dev/null
@@ -1,21 +0,0 @@
-set pagination off
-catch throw
-commands
-    bt
-    cont
-end
-catch catch
-commands
-    bt
-    cont
-end
-echo log will be saved as gdbtrace.log, this will take some time, patience...\n
-set logging redirect on
-set logging file gdbtrace.log
-set logging on
-set logging overwrite on
-run
-bt
-quit
-set logging off
-echo log is saved as gdbtrace.log\n
diff --git a/solenv/bin/gdbtrycatchtrace-stdout b/solenv/bin/gdbtrycatchtrace-stdout
deleted file mode 100644
index e606a4f12..000000000
--- a/solenv/bin/gdbtrycatchtrace-stdout
+++ /dev/null
@@ -1,14 +0,0 @@
-set pagination off
-catch throw
-commands
-    bt
-    cont
-end
-catch catch
-commands
-    bt
-    cont
-end
-run
-bt
-quit
diff --git a/solenv/bin/gen_update_info.pl b/solenv/bin/gen_update_info.pl
deleted file mode 100644
index 161e50a7a..000000000
--- a/solenv/bin/gen_update_info.pl
+++ /dev/null
@@ -1,176 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-        if 0;
-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#*********************************************************************
-#
-# main
-#
-
-my($product, $buildid, $id, $os, $arch, $lstfile, $languages, $productname, $productversion, $productedition);
-
-while ($_ = $ARGV[0], /^-/) {
-    shift;
-    last if /^--$/;
-    if (/^--product/) {
-        $product= $ARGV[0];
-        shift;
-    }
-    if (/^--buildid/) {
-        $buildid = $ARGV[0];
-        shift;
-    }
-    if (/^--os/) {
-        $os = $ARGV[0];
-        shift;
-    }
-    if (/^--arch/) {
-        $arch = $ARGV[0];
-        shift;
-    }
-    if (/^--lstfile/) {
-        $lstfile = $ARGV[0];
-        shift;
-    }    
-    if (/^--languages/) {
-        $languages = $ARGV[0];
-        shift;
-    }    
-}
-
-$sourcefile = $ARGV[0];
-
-if( $^O =~ /cygwin/i ) {
-    # We might get paths with backslashes, fix that.
-    $lstfile =~ s/\\/\//g;
-    $sourcefile =~ s/\\/\//g;
-}
-
-# read openoffice.lst
-# reading Globals section
-unless(open(LSTFILE, "sed -n \"/^Globals\$/,/^}\$/ p\" $lstfile |")) {
-    print STDERR "Can't open $lstfile file: $!\n";
-    return;   
-}
-
-while (<LSTFILE>) {
-    if( /\bPRODUCTNAME / ) {
-        chomp;
-        s/.*PRODUCTNAME //;
-        $productname = $_;
-    }
-    if( /\bPACKAGEVERSION / ) {
-        chomp;
-        s/.*PACKAGEVERSION //;
-        $productversion = $_;
-    }
-    if( /\bPRODUCTEDITION / ) {
-        chomp;
-        s/.*PRODUCTEDITION //;
-        $productedition = $_;
-    }
-}
-
-close(LSTFILE);
-
-### may be hierarchical ...
-if(open(LSTFILE, "sed -n \"/^$product:/,/^}\$/ p\" $lstfile |")) {
-    while (<LSTFILE>) {
-        if ( /^$product\s?:\s?(\w+)$/ ) {
-            $product = $1;
-        }
-        if( /\bPRODUCTEDITION / ) {
-            chomp;
-            s/.*PRODUCTEDITION //;
-            $productedition = $_;
-        }
-    }
-}
-close(LSTFILE);
-
-# Reading product specific settings
-
-unless(open(LSTFILE, "sed -n \"/^$product\$/,/^}\$/ p\" $lstfile |")) {
-    print STDERR "Can't open $lstfile file: $!\n";
-    return;   
-}
-
-while (<LSTFILE>) {
-    if( /\bPRODUCTNAME / ) {
-        chomp;
-        s/.*PRODUCTNAME //;
-        $productname = $_;
-    }
-    if( /\bPACKAGEVERSION / ) {
-        chomp;
-        s/.*PACKAGEVERSION //;
-        $productversion = $_;
-    }
-    if( /\bPRODUCTEDITION / ) {
-        chomp;
-        s/.*PRODUCTEDITION //;
-        $productedition = $_;
-    }
-}
-
-close(LSTFILE);
-
-# simulate the behavior of make_installer.pl when writing versionrc
-unless( "$os" eq "Windows" ) {
-  $languages =~ s/_.*//;
-}
-
-$id = $productversion;
-$id =~ s/\..*//;
-$id = $productname . "_" . $id . "_" . $languages;
-
-# open input file
-unless (open(SOURCE, $sourcefile)) {
-    print STDERR "Can't open $sourcefile file: $!\n";
-    return;
-}
-
-while (<SOURCE>) {
-   s/:id></:id>$id</;
-   s/buildid></buildid>$buildid</;
-   s/os></os>$os</;
-   s/arch></arch>$arch</;
-   if ( $productedition ) {
-       s/edition></edition>$productedition</;
-   } else {
-       next if ( /edition></ );
-   }
-   s/version></version>$productversion</;
-   s/name></name>$productname</;
-   print;
-}
-
-close(SOURCE);
diff --git a/solenv/bin/gen_userfeedback_VCL_names.pl b/solenv/bin/gen_userfeedback_VCL_names.pl
deleted file mode 100755
index 1ef396596..000000000
--- a/solenv/bin/gen_userfeedback_VCL_names.pl
+++ /dev/null
@@ -1,195 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-#
-# pushids - push HID.LST and *.win files for userexperience feedback
-#
-
-use lib ("$ENV{SOLARENV}/bin/modules", "$ENV{COMMON_ENV_TOOLS}/modules");
-
-use Carp;
-
-sub parse_info($$);
-
-if ( @ARGV != 3 )
-{
-  print "usage:   $ARGV[0] <path tp hid.lst> <path to *.win files> <output file>\n";
-  print "example: $ARGV[0] ./hid.lst global/win common/misc/UserFeedbackNames.csv\n\n";
-  die "invalid params";
-}
-
-my ($hid, $winpath, $outfile) = @ARGV;
-
-my @names;
-
-open HID, "<$hid" or die "can't open file $filename $! $^E";
-for (<HID>) {
-  chop;
-  my ($longname, $ID) = split " +";
-  next if ( ! $ID );
-  $upperlongname = $longname;
-  $upperlongname =~ tr/a-z/A-Z/;
-  $undeclared_hids{$upperlongname} = $longname;
-
-  if ( exists $hids{$upperlongname} && ( $hids{$upperlongname} != $ID ) )
-  {
-    print STDERR "warn: unclear definition of longname: $longname = $hids{$upperlongname} or $ID\n";
-  }
-  $hids{$upperlongname} = $ID;
-
-  if ( exists $revhids{ $ID } && ( $revhids{ $ID } ne $upperlongname ) )
-  {
-    print STDERR "warn: two longnames have the same ID: $longname and $revhids{$ID} share ID $ID\n";
-  }
-  $revhids{$ID} = $upperlongname;
-}
-
-close HID;
-
-undef @revhids;
-
-#Add Active
-$hids{"ACTIVE"} = 0;
-
-my %dialogs = ();
-
-foreach ( glob("$winpath/*win") ) {
-  $filename = $_;
-  open WIN, "< $filename" or die "can't open file $filename $! $^E";
-  my $parentinfo = "";
-  my @dialog = ();
-  my $parentshortname = "";
-
-  for ( <WIN> ) {
-    chop;
-
-    s/^ +//;
-    s/ +/ /g;
-
-    next if /^ *'/;
-    next if /^ *$/;
-
-    my $ID = "";
-    my $iteminfo;
-    my ($shortname, $longname) = split " +";
-    
-    $shortname = "" if ( !$shortname );
-    $longname = "" if ( !$longname );
-
-    # fake a correct entry if only *active is given and overwrite the attempt to declare it differently
-    if ( $shortname =~ /\*active/i )
-    {
-      $longname = "Active";
-    }
-
-
-# find UNO Names
-    if ( $longname =~ /^(.uno:|http|private:factory|service:|macro:|.HelpId:)/i || $longname =~ s/^sym://i )
-    {
-      $ID = $longname;
-      $longname = "";
-    }
-    else
-    {
-      my $upperlongname = $longname;
-      $upperlongname =~ tr/a-z/A-Z/;
-      if ( $shortname !~ /^[\+\*]/ && !exists $hids{$upperlongname} )
-      {
-        print STDERR "warn: Longname not in hid.lst: $filename $longname\n";
-      }
-      if ( exists $hids{$upperlongname} )
-      {
-          $ID = $hids{$upperlongname};
-      }
-      delete $undeclared_hids{$upperlongname};
-    }
-
-    $iteminfo = "$shortname $longname $ID";
-    $iteminfo =~ s/^\*//;
-    $iteminfo =~ s/^\+//;
-
-# find start of deklaration
-    if ( $shortname =~ s/^\+// )
-    {
-      # copy existing dialog
-      if ( exists $dialogs{ $longname } )
-      {
-        my @old = @{$dialogs{ $longname }};
-        my ($oldshort, $oldlong, $oldID ) = split ( " ", shift @old );
-        $iteminfo = "$shortname $oldlong $oldID";
-
-        $parentinfo = $iteminfo;
-        $parentshortname = $shortname;
-        $dialogs{ $parentshortname } = \@dialog;
-        @dialog = ();        # break the link
-        push ( @{$dialogs{ $parentshortname }}, $iteminfo );
-        push @names, "   $parentinfo";
-
-        for ( @old )
-        {
-          push @names, "$parentinfo $_";
-        }
-      }
-      else
-      {  # fake new dialog instead
-        $shortname = "*".$shortname;
-      }
-    }
-    if ( $shortname =~ s/^\*// )
-    {
-      $parentinfo = $iteminfo;
-      $parentshortname = $shortname;
-      $dialogs{ $parentshortname } = \@dialog;
-      @dialog = ();        # break the link
-      push ( @{$dialogs{ $parentshortname }}, $iteminfo );
-      push @names, "   $parentinfo";
-    }
-    else
-    {
-      push ( @{$dialogs{ $parentshortname }}, $iteminfo );
-      push @names, "$parentinfo $iteminfo";
-    }
-
-  }
-  close WIN;
-}
-
-for ( keys %undeclared_hids ) {
-  $iteminfo = "$undeclared_hids{$_} $undeclared_hids{$_} $hids{$_}";
-  push @names, "   $iteminfo";
-}
-
-#----------------------------------------------------------------------------
-# write to files
-
-open HIDS, ">$outfile" or die "can't open file $filename $! $^E";
-print HIDS join "\n", @names;
-print HIDS "\n";
-close HIDS;
-
diff --git a/solenv/bin/genmap b/solenv/bin/genmap
deleted file mode 100755
index 78d67bf6f..000000000
--- a/solenv/bin/genmap
+++ /dev/null
@@ -1 +0,0 @@
-less $2
diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk
deleted file mode 100644
index 124e915b7..000000000
--- a/solenv/bin/getcompver.awk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-BEGIN {
-    CCversion = 0
-    compiler_matched = 0
-}
-# Sun c++ compiler
-/Sun WorkShop/ || /Forte Developer/ || /Sun/{
-    compiler_matched = 1
-    # version number right after "C++" 
-    x = match( $0, /C\+\+ .*/ )
-    btwn = substr( $0, RSTART, RLENGTH)
-    # extract version, whitespaces get striped later
-    x = match( btwn, / .*\..*[ $\t]/)
-    CCversion = substr( btwn, RSTART, RLENGTH)
-}
-# Microsoft c++ compiler
-/Microsoft/ && /..\...\...../ {
-    compiler_matched = 1
-    # match on the format of the ms versions ( dd.dd.dddd )
-    x = match( $0, /..\...\...../ )
-    CCversion = substr( $0, RSTART, RLENGTH)
-}
-# Java
-/java version/ || /openjdk version/ {
-    compiler_matched = 1
-    # match on the format of the java versions ( d[d].d[d].d[d] )
-    x = match( $0, /[0-9]*\.[0-9]*\.[0-9]*/ )
-    CCversion = substr( $0, RSTART, RLENGTH)
-}
-/^[0-9]*[.][0-9]*\r*$/ {
-    if ( compiler_matched == 0 ) {
-# need to blow to x.xx.xx for comparing
-    	CCversion = $0 ".0"
-    }
-}
-/^[0-9]*[.][0-9]*[.][0-9]*\r*$/ {
-    if ( compiler_matched == 0 ) {
-        CCversion = $0
-    }
-}
-/^[0-9]*[.][0-9]*[.][0-9]*-[0-9a-z]*$/ {
-    if ( compiler_matched == 0 ) {
-        CCversion = substr($0, 0, index($0, "-") - 1)
-    }
-}
-END {
-    if ( num == "true" ) {
-        tokencount = split (CCversion,vertoken,".")
-        for ( i = 1 ; i <= tokencount ; i++ ) {
-            printf ("%04d",vertoken[i] )
-        }
-    } else
-        print CCversion
-}
diff --git a/solenv/bin/getcsym.awk b/solenv/bin/getcsym.awk
deleted file mode 100644
index 9490a06b3..000000000
--- a/solenv/bin/getcsym.awk
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-BEGIN { global_found = "false" }
-/[ \t]*#/ { sub( substr( $0, index($0, "#")),"" ) }
-/[ \t]*local:/ { global_found = "false" }
-/[ \t]*}/ { global_found = "false" }
-/^[ \t]*$/ { next }
-global_found == "true"  { print $0 }
-/[ \t]*global:/ { global_found = "true" }
diff --git a/solenv/bin/gsicheck b/solenv/bin/gsicheck
deleted file mode 100755
index 5a09880b9..000000000
--- a/solenv/bin/gsicheck
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'setsolar'
-exit 1
-fi
-
-if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
-else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
-fi
-
-exec $SOLARVERSION/$INPATH/bin/gsicheck "$@"
diff --git a/solenv/bin/guw.pl b/solenv/bin/guw.pl
deleted file mode 100755
index ce91ee8d5..000000000
--- a/solenv/bin/guw.pl
+++ /dev/null
@@ -1,339 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-# Description: ??
-
-#---------------------------------------------------------------------------
-# external modules
-use Text::ParseWords;
-
-# global vars
-@params = ();
-
-# set debug mode here:
-#$debug="true";
-#$debug_light="true";
-
-#---------------------------------------------------------------------------
-# Define known parameter exceptions
-%knownpara = ( 'echo', [ '/TEST', 'QQQ', 'CCC', 'uno:' ],
-               'cl', [ '-clr:', '-Z' ],
-               'csc', [ '-target:' ],
-               'lib', [ 'OUT:', 'EXTRACT:','out:', 'def:', 'machine:' ],
-               'link', [ 'BASE:', 'DEBUG', 'DLL', 'LIBPATH', 'MACHINE:',
-                         'MAP', 'NODEFAULTLIB', 'OPT', 'PDB', 'RELEASE',
-                         'SUBSYSTEM', 'STACK', 'out:', 'map:', 'ENTRY:',
-                         'implib:', 'delayload:', 'def', 'COMMENT:' ],
-               'regcomp', [ '-env:', 'vnd.sun.star.expand:' , 'vnd.openoffice.pymodule' ],
-               'regmerge', [ '/UCR' ],
-               'rc', [ '-D' ],
-               'rsc', [ '-DOOO_' ] );
-
-#---------------------------------------------------------------------------
-# procedures
-
-
-#----------------------------------------------------------
-# Function name: myCygpath
-# Description:   Transform POSIX path to DOS path
-# Arguments:     1. Variable (string) with one token
-#                2. optional - if set remove spaces and shorten to 8.3
-#                   representation.
-# Return value:  Reformatted String
-#----------------------------------------------------------
-sub myCygpath {
-    my $posixpath = shift;
-    my $shortenpath = shift || '';
-
-    my $dospath;
-
-    if ( $posixpath =~ / / and $shortenpath ) {
-        chomp( $dospath = qx{cygpath -d "$posixpath"} );
-        # "cygpath -d" returns "" if the file doesn't exist.
-        if ($dospath eq "") {
-            $dospath = ".";
-            print(STDERR "Error: guw.pl: Path: $posixpath:\nhas a problem! Probably nonexistent filename with space.\n");
-            if ( (defined $debug_light) or (defined $debug) ) {
-                die "exiting ...\n";
-            }
-        }
-    } else {
-        if ( $posixpath =~ /^\// ) {
-            chomp( $dospath = qx{cygpath -w "$posixpath"} );
-        } else {
-            $dospath = $posixpath;
-            $dospath =~ s/\//\\/g;
-        }
-    }
-    return $dospath;
-}
-
-#----------------------------------------------------------
-# Function name: WinFormat
-# Description:   Format variables to Windows Format.
-# Arguments:     1. Variable (string) with one token
-# Return value:  Reformatted String
-#----------------------------------------------------------
-sub WinFormat {
-  my $variable = shift @_;
-  my( $d1, $d1_prefix, $d2 );
-
-  $variable =~ s/(\$\w+)/$1/eeg ; # expand the variables
-  $variable =~ s/(\$\w+)/$1/eeg ; # expand the variables twice!
-
-  # Include paths or parameters with filenames
-  if ( $variable =~ /\A(-D[\w\.]*=)[\'\"]?((?:\/?[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
-      # This regex evaluates -D<something>=<path>, sometimes with quotes or "/" at the end
-      # option -> $1, filename without quotes -> $2
-      if ( defined $debug ) { print(STDERR "WinFormat:\ninclude (-D<something>=<path>) path:\n$variable\n"); }
-      $d1_prefix = $1;
-      $d1 = $2;
-      $d2 = myCygpath($2,1);
-      if ( $d2 ne "" ) {
-             $d2 =~ s/\\/\\\\/g ;
-      }
-  } elsif ( $variable =~ /\A(-?\w[\w\.]*=)[\'\"]?((?:\/?[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
-      # This regex evaluates [-]X<something>=<path>, sometimes with quotes or "/" at the end
-      # option -> $1, filename without quotes -> $2
-      if ( defined $debug ) { print(STDERR "WinFormat:\ninclude ([-]<something>=<path>) path:\n$variable\n"); }
-      $d1_prefix = $1;
-      $d1 = $2;
-      $d2 = myCygpath($2,1);
-  } elsif ( $variable =~ /\A(--\w[\w\.\-]*=)[\'\"]?((?:\/?[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
-      # This regex evaluates --<something>=<path>, sometimes with quotes or "/" at the end
-      # option -> $1, filename without quotes -> $2
-      if ( defined $debug ) { print(STDERR "WinFormat:\ninclude (--<something>=<path>) path:\n$variable\n"); }
-      $d1_prefix = $1;
-      $d1 = $2;
-      $d2 = myCygpath($2,1);
-  } elsif ( $variable =~ /\A(-\w[\w\.]*:)[\'\"]?((?:\/?[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
-      # This regex evaluates -X<something>:<path>, sometimes with quotes or "/" at the end
-      # option -> $1, filename without quotes -> $2
-      if ( defined $debug ) { print(STDERR "WinFormat:\nFound (-<something>:<path>):\n$variable\n"); }
-      $d1_prefix = $1;
-      $d1 = $2;
-      $d2 = myCygpath($2,1);
-  } elsif ( $variable =~ /\A(-\w+:)(.*)\Z/ ) {
-      # This regex evaluates -X<something>:<NO-path>, and prevents translating of these.
-      # option -> $1, rest -> $2
-      if ( defined $debug ) { print(STDERR "WinFormat:\nFound (-<something>:<no-path>):\n$variable\n"); }
-      $d1_prefix = $1;
-      $d1 = $2;
-      $d2 = myCygpath($2,1);
-  } elsif ( $variable =~ /\A(\w+:)[\'\"]?\/\/\/((?:\/?[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
-      # See iz35982 for the reason for the special treatment of this switch.
-      # This regex evaluates <something>:///<path>, sometimes with quotes or "/" at the end
-      # option -> $1, filename without quotes -> $2
-      if ( defined $debug ) { print(STDERR "WinFormat:\nFound (<something>:///<path>):\n$variable\n"); }
-      $d1_prefix = $1."///";
-      $d1 = $2;
-      $d2 = myCygpath($2,1);
-      $d2 =~ s/\\/\//g ;
-  } elsif ( $variable =~ /\A(-\w)[\'\"]?((?:\/[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
-      # This regex evaluates -X<path>, sometimes with quotes or "/" at the end
-      # option -> $1, filename without quotes -> $2
-      if ( defined $debug ) { print(STDERR "WinFormat:\ninclude (-X<absolute path>) path:\n$variable\n"); }
-      $d1_prefix = $1;
-      $d1 = $2;
-      $d2 = myCygpath($2,1);
-  } elsif ( $variable =~ /\A(-F[ARdemopr])[\'\"]?((?:\/[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) {
-      # This regex evaluates -FX<path> (MSVC switches for output naming), sometimes with quotes or "/" at the end
-      # option -> $1, filename without quotes -> $2
-      if ( defined $debug ) { print(STDERR "WinFormat:\ncompiler naming (-FX<absolute path>) path:\n$variable\n"); }
-      $d1_prefix = $1;
-      $d1 = $2;
-      $d2 = myCygpath($2,1);
-  } else {
-      $d2 = "";
-  }
-  if ( $d2 ne "" ) {
-      # Found a parameter
-      $d1 =~ s/\+/\\\+/ ;
-      $d1 =~ s/\./\\\./ ;
-      $variable =~ s/$d1/$d2/ ;
-  } else {
-    # Found no parameter, assume a path
-    $variable =~ s/:/;/g;
-    $variable =~ s/([;]|\A)(\w);/$1$2:/g; # get back the drives
-
-    # Search for posix path ;entry; (The regex accepts valid paths with at least one /)
-    # and replace with DOS path, accept quotes.
-    # iz28717 Accept ',' as path seperator.
-    while ( $variable =~ /(?:[;,]|\A)[\'\"]?([\w\.\-\+ ~]*(?:\/[\w\.\-\+ ~]+)+\/?)[\'\"]?(?:[;,]|\Z)/ ) {
-        # Normal paths
-        $d1 = $1;
-        $d2 = myCygpath($d1);
-        if ( defined $debug ) {
-            print(STDERR "WinFormat:\nFull path:\n$variable\nTranslated part:$d2\n");
-        }
-    $d1 =~ s/\+/\\\+/ ;
-        $variable =~ s/$d1/$d2/ ;
-    }
-  }
-
-  # Sanity check for -X<path>
-  if ( $variable =~ /-\w[\'\"]?(?:(?:\/[\w\.\-\+ ~]+)+)/ ) {
-      print(STDERR "Error: guw.pl: WinFormat: Not converted -X/... type switch in :$variable:.\n");
-      if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed -X/...\n"; }
-  }
-  # Sanity check for [-]X<something>(:|=)<path> case
-  if ( $variable =~ /\A-?\w[\w\.]*[=:][\'\"]?(?:\/[\w\.\-\+ ~]+)+/ ) {
-      print(STDERR "Error: guw.pl: WinFormat: Not converted [-]X<something>(=|:)/<path> type switch in :$variable:.\n");
-      if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed [-]X<something>(=|:)/...\n"; }
-  }
-
-  if ( defined $debug ) { print(STDERR "WinFormat:\nresult:$variable\n");};
-  return $variable;
-}
-
-#----------------------------------------------------------
-# Function name: replace_cyg
-# Description:   Process all arguments and change them to Windows Format.
-# Arguments:     Reference to array with arguments
-# Return value:  -
-#----------------------------------------------------------
-sub replace_cyg {
-    my $args = shift;
-    my( @cmd_file, @cmd_temp );
-    my $atchars;
-    foreach my $para ( @$args )
-      {
-        if ( $para =~ "^@" ) {
-          # it's a command file
-          if ( defined $debug ) { print(STDERR "----------------------------\n");};
-          # Workaround, iz28717, keep number of @'s.
-          $para =~ s/(^\@+)//;
-          $atchars = $1;
-          $filename = $para;
-          if ( defined $debug ) { print(STDERR "filename = $filename \n");};
-          # open this command file for reading
-          open(CMD, "$filename");
-          while ( <CMD> ) {
-            # Remove DOS lineendings. Bug in Cygwin / Perl?
-            $_ =~ s/\r//g;
-            # Remove lineendings and trailing spaces. ( Needed by &parse_line )
-            $_ =~ s/\n$//g;
-            $_ =~ s/\s+$//g;
-            # Fill all tokens into array
-            @cmd_temp = &parse_line('\s+', 1, $_ );
-            if ( $#cmd_temp > -1 ) {
-                push( @cmd_file, @cmd_temp);
-            }
-          }
-          close(CMD);
-          # reformat all tokens
-          replace_cyg(\@cmd_file);
-          if ( defined $debug ) { print(STDERR "Tokens processed:\n");};
-          foreach $i (@cmd_file) {
-            if ( defined $debug ) { print(STDERR "!".$i."!\n");};
-          }
-          # open this filename for writing (truncate) Textmode?
-          open(CMD, '>', $filename);
-          # write all tokens back into this file
-          print(CMD join(' ', @cmd_file));
-          close(CMD);
-          # convert '@filename' to dos style
-          $para = WinFormat( $para );
-          if ( defined $debug ) { print(STDERR "----------------------------\n");};
-          if ( (defined $debug_light) or (defined $debug) ) { print(STDERR "\nParameter in File:".join(' ', @cmd_file).":\n");}
-          $para = $atchars.$para;
-        } else {
-          # it's just a parameter
-          if ( defined $debug ) { print(STDERR "\nParameter:---${para}---\n");};
-          # If $tmp1 is empty then $para is a parameter.
-          my $is_no_para = 1;
-          # remove .exe and convert to lower case
-          $shortcommand = lc $command ;
-          $shortcommand =~ s/\.exe$//;
-          $shortcommand =~ /([^\/]+$)/;
-          $shortcommand = $1;
-          foreach $i (@{$knownpara{$shortcommand}}) {
-            if( $para =~ /$i/ ) {
-              $is_no_para = 0;
-              if ( defined $debug ) { print(STDERR "Is parameter exception for ${shortcommand}: ${para}:\n" );};
-              last;
-            }
-          }
-          if( $is_no_para ) {
-            $para = WinFormat($para);
-          }
-          if ( defined $debug ) { print(STDERR "Converted line:${para}:\n" );};
-        } # else
-      } # foreach loop
-}
-
-#----------------------------------------------------------
-# Function name: replace_cyg_env
-# Description:   Process selected environment variables and change
-#                them to Windows Format.
-# Arguments:     -
-# Return value:  -
-#----------------------------------------------------------
-sub replace_cyg_env {
-    @affected_vars = ( 
-        'SOLAR_VERSION',
-        'SOLARVERSION',
-        'SOLARVER',
-        'SRC_ROOT',
-        'SOLARENV',
-        'CLASSPATH',
-        'JAVA_HOME'
-    );
-    foreach my $one_var ( @affected_vars )
-    {
-        my $this_var = $ENV{ $one_var };
-        if ( defined $this_var )
-        {
-            if ( defined $debug ) { print(STDERR "ENV $one_var before: ".$ENV{ $one_var}."\n" );};
-            $ENV{ $one_var } = WinFormat( $this_var );
-            if ( defined $debug ) { print(STDERR "ENV $one_var after : ".$ENV{ $one_var}."\n" );};
-        }
-    }
-    
-}    
-#---------------------------------------------------------------------------
-# main
-@params = @ARGV;
-
-$command = shift(@params);
-while ( $command =~ /^-/ )
-{
-    if ( $command eq "-env" )
-    {
-        replace_cyg_env;
-    }
-    
-    $command = shift(@params);
-}
-if ( (defined $debug_light) or (defined $debug) ) { print( STDERR "Command: $command\n" ); }
-
-replace_cyg(\@params);
-if ( (defined $debug_light) or (defined $debug) ) { print(STDERR "\n---------------------\nExecute: $command @params\n----------------\n");};
-exec( "$command", @params) or die( "\nError: guw.pl: executing $command failed!\n" );
-
diff --git a/solenv/bin/id-lang.map b/solenv/bin/id-lang.map
deleted file mode 100644
index acc5afc0c..000000000
--- a/solenv/bin/id-lang.map
+++ /dev/null
@@ -1,105 +0,0 @@
-# Welcome to the mkid language mapper.
-#
-# The format of each line is:
-#
-#       <pattern> <language> [options]
-#
-# Filenames are matched top-to-bottom against the patterns, and the
-# first match is chosen.  The special language `IGNORE' means that
-# this file should be ignored by mkid.  The options are
-# language-specific command-line options to mkid.
-#
-# If a file name doesn't match any pattern, it is assigned the default
-# language.  The default language may be specified here with the
-# special pattern `**', or overridden from the mkid command-line with
-# the `--default-lang=LANG' option.
-#
-# The special pattern `***' means to include the named file that
-# immediately follows.  If no file is named, then the default system
-# language mapper file (i.e., this file) is included.
-
-# Default language
-**          IGNORE  # Although this is listed first,
-                # the default language pattern is
-                # logically matched last.
-
-# Backup files
-*~          IGNORE
-*.bak           IGNORE
-*.bk[0-9]       IGNORE
-
-# SCCS files
-[sp].*          IGNORE
-
-# C dependencies created by automake
-*/.deps/*       IGNORE
-
-*.h         C
-*.h.in          C
-*.H         C++
-*.hh            C++
-*.hpp           C++
-*.hxx           C++
-
-*.l         C
-*.lex           C
-*.y         C
-*.yacc          C
-
-*.c         C
-*.C         C++
-*.cc            C++
-*.cpp           C++
-*.cxx           C++
-
-*.java          Java
-
-ChangeLog*      Cdoc
-
-*.[sS]          asm --comment=;
-*.asm           asm --comment=;
-
-# [nt]roff
-*.[0-9]         roff
-*.ms            roff
-*.me            roff
-*.mm            roff
-
-*.tex           TeX
-*.ltx           TeX
-*.texi          texinfo
-*.texinfo       texinfo
-
-# portable object (i18n)
-*.po            po
-
-*.el            lisp
-*.elc           lisp
-*.lisp          lisp
-*.scm           lisp
-
-*.am            make
-Makefile        make
-Makefile.*      make
-
-*.doc           text
-*.txt           text
-
-*.m4            m4
-
-*.pl            perl
-*.pm            perl
-
-*.gz            FILTER gzip -d <%s
-*.Z         FILTER gzip -d <%s
-
-######### OOo-specific stuff #######################################
-
-# Treat OOo resource header files as C files
-*.hrc           C
-# Treat OOo header files generated from *.idl as C++ files
-*.hdl           C++
-# Treat OOo resource files as C files
-*.src           C
-# Treat OOo *.mk files as makefiles
-*.mk            make
diff --git a/solenv/bin/image-sort.pl b/solenv/bin/image-sort.pl
deleted file mode 100755
index caf699fbf..000000000
--- a/solenv/bin/image-sort.pl
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/usr/bin/perl -w
-
-my @global_list = ();
-my %global_hash = ();
-my $base_path;
-
-sub read_icons($)
-{
-    my $fname = shift;
-    my $fileh;
-    my @images;
-    open ($fileh, "$base_path/$fname") || die "Can't open $base_path/$fname: $!";
-    while (<$fileh>) {
-    m/xlink:href=\"\.uno:(\S+)\"\s+/ || next;
-    push @images, lc($1);
-    }
-    close ($fileh);
-
-    return @images;
-}
-
-# filter out already seen icons & do prefixing
-sub read_new_icons($$)
-{
-    my $fname = shift;
-    my $prefix = shift;
-    my @images = read_icons ($fname);
-    my @new_icons;
-    my %new_icons;
-    for my $icon (@images) {
-    my $iname = "cmd/" . $prefix . $icon . ".png";
-    if (!defined $global_hash{$iname} &&
-        !defined $new_icons{$iname}) {
-        push @new_icons, $iname;
-        $new_icons{$iname} = 1;
-    }
-    }
-    return @new_icons;
-}
-
-sub process_group($@)
-{
-    my $prefix = shift;
-    my @uiconfigs = @_;
-    my %group;
-    my $cur_max = 1.0;
-
-# a very noddy sorting algorithm
-    for my $uiconfig (@uiconfigs) {
-    my @images = read_new_icons ($uiconfig, $prefix);
-    my $prev = '';
-    for my $icon (@images) {
-        if (!defined $group{$icon}) {
-        if (!defined $group{$prev}) {
-            $group{$icon} = $cur_max;
-            $cur_max += 1.0;
-        } else {
-            $group{$icon} = $group{$prev} + (1.0 - 0.5 / $cur_max);
-        }
-        } # else a duplicate
-    }
-    }
-    for my $icon (sort { $group{$a} <=> $group{$b} } keys %group) {
-    push @global_list, $icon;
-    $global_hash{$icon} = 1;
-    }
-}
-
-sub process_file($$)
-{
-    my @images = read_new_icons (shift, shift);
-
-    for my $icon (@images) {
-    push @global_list, $icon;
-    $global_hash{$icon} = 1;
-    }
-}
-
-sub chew_controlfile($)
-{
-    my $fname = shift;
-    my $fileh;
-    my @list;
-    open ($fileh, $fname) || die "Can't open $fname: $!";
-    while (<$fileh>) {
-    /^\#/ && next;
-    s/[\r\n]*$//;
-    /^\s*$/ && next;
-
-    my $line = $_;
-    if ($line =~ s/^-- (\S+)\s*//) {
-        # control code
-        my $code = $1;
-        my $small = (lc ($line) eq 'small');
-        if (lc($code) eq 'group') {
-        if (!$small) { process_group ("lc_", @list); }
-        process_group ("sc_", @list);
-        } elsif (lc ($code) eq 'ordered') {
-        if (!$small) {
-            for my $file (@list) { process_file ($file, "lc_"); }
-        }
-        for my $file (@list) { process_file ($file, "sc_"); }
-        } elsif (lc ($code) eq 'literal') {
-        for my $file (@list) {
-            if (!defined $global_hash{$file}) {
-            push @global_list, $file;
-            $global_hash{$file} = 1;
-            }
-        }
-        } else {
-        die ("Unknown code '$code'");
-        }
-        @list = ();
-    } else { 
-        push @list, $line;
-    }
-    }
-    close ($fileh);
-}
-
-if (!@ARGV) {
-    print "image-sort <image-sort.lst> /path/to/OOOo/source/root\n";
-    exit 1;
-}
-
-# where the control file lives
-my $control = shift @ARGV;
-# where the uiconfigs live
-$base_path = shift @ARGV;
-# output
-if (@ARGV) {
-    my $outf = shift @ARGV;
-    open ($output, ">$outf") || die "Can't open $outf: $!";
-    $stdout_out = 0;
-} else {
-    $output = STDOUT;
-    $stdout_out = 1;
-}
-
-chew_controlfile ($control);
-
-for my $icon (@global_list) {
-    print $output $icon . "\n" if (!($icon =~ /^sc_/));
-}
-for my $icon (@global_list) {
-    print $output $icon . "\n" if ($icon =~ /^sc_/);
-}
-
-close $output if (!$stdout_out);
diff --git a/solenv/bin/install-sh b/solenv/bin/install-sh
deleted file mode 100755
index fb942ef71..000000000
--- a/solenv/bin/install-sh
+++ /dev/null
@@ -1,3 +0,0 @@
-;; This file is automatically created by diff_all_filter.pl
-;; Fri Mar 27 08:02:00 2009
-
diff --git a/solenv/bin/installoffice.oxt b/solenv/bin/installoffice.oxt
deleted file mode 100644
index feb1d8723..000000000
--- a/solenv/bin/installoffice.oxt
+++ /dev/null
diff --git a/solenv/bin/installoffice_impress.oxt b/solenv/bin/installoffice_impress.oxt
deleted file mode 100755
index 31c7bfa45..000000000
--- a/solenv/bin/installoffice_impress.oxt
+++ /dev/null
diff --git a/solenv/bin/langwrap b/solenv/bin/langwrap
deleted file mode 100755
index 97a50f176..000000000
--- a/solenv/bin/langwrap
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/usr/bin/perl -w
-#
-# langwrap - language wrapper for building resources
-#
-# $Id: langwrap,v 1.2 2008-08-18 13:10:41 vg Exp $
-
-use Getopt::Std;
-
-###### globals ######
-
-$is_debug = 0;
-$nfield   = 0;
-@LoL 	  = ();
-@command  = ();
-
-###### main ######
-
-# Version
-$idStr = ' $Revision: 1.2 $ ';
-$idStr =~ /Revision:\s+(\S+)\s+\$/
-    ? ($langwrapRev = $1) : ($langwrapRev = "-");
-
-print "langwrap -- Version: $langwrapRev\n";
-
-# Options
-&check_options();
-
-# parse command file
-&parse_commandfile($opt_c);
-
-# create list with command lines
-&create_commands();
-
-# finally execute commands
-foreach $cmd (@command) {
-    if ($is_debug) {
-	print $cmd . "\n";
-    } else {
-	system($cmd);
-	$res = $? >> 8;
-	if ($res) {
-	    print "langwrap: command execution failed with exitcode $res.\n";
-	    exit($res);
-	}
-    }
-}
-
-exit(0);
- 
-###### routines ######
-
-### parse_commandfile()
-sub parse_commandfile {
-    my($file) = shift;
-    my(@field);
-    
-    open(COMMAND, "<$file") or die "can´t open $file";
-
-    while (<COMMAND>) {
-	$line = $_;
-	chomp($line);
-	if ( ($line =~ //) || ($line =~ /^\r/) || ($line =~ /^#/) ) {
-	    next;
-	}
-						   
-	@field = split " ", $line;
-	push @LoL, [@field];
-	if (!$nfield) {
-	    $nfield = $#field + 1;
-	} else {
-	    if ( $nfield != ($#field + 1) ) {
-		print "langwrap: error in <cmdfile>: every row must ";
-		print "have the same # of columns.\n";
-		exit(3);
-	    }
-	}
-    }
-    
-    close(COMMAND);
-}
-
-### create_command()
-sub create_commands() {
-    my($cmd, $cmdline, $arg_string, $ntempl);
-
-    $cmd = shift @ARGV;
-    $arg_string = join(" ", @ARGV);
-    # just count the number of templates
-    $ntempl = ($arg_string =~ s/@\d+@/$&/eg);
-    if ( $ntempl >= $nfield ) {
-	print "lnagwrap: # of templates > # of fields in <cmdfile>.\n";
-	exit(4);
-    }
-
-    # create command lines
-    for $i (0..$#LoL) {
-	$cmdline = $arg_string;
-	$cmdline =~ s/@(\d+)@/$LoL[$i][$1]/eg;
-	push @command, $cmd . " " . $cmdline;
-    }
-}
-    
-### check_options()
-sub check_options {
-
-    if ( !getopts('c:') ) {
-	&usage();
-    }
-
-    if ( !$opt_c ) {
-	&usage();
-    }
-
-    if ( ! -r $opt_c ) {
-	print "langwrap: $opt_c is not a readable file.\n";
-	exit(2);
-    }
-
-    if ( $#ARGV < 1 ) {
-	print "langwrap: empty <template_string>.\n";
-	&usage();
-    }
-}
-
-### usage()
-sub usage {
-    print "Usage: langwrap -c cmdfile tool <template_string>\n";
-    print "<template_string> is of form: ...\@1\@ .... \@2\@...\n";
-    print "with \@<n>\@ template #n\n";
-    exit(1);
-}
diff --git a/solenv/bin/leconvert.pl b/solenv/bin/leconvert.pl
deleted file mode 100755
index 24da8f9cf..000000000
--- a/solenv/bin/leconvert.pl
+++ /dev/null
@@ -1,91 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-my $target_format = "";
-my @filelist;
-#my $debug=1;
-my $debug=0;
-
-parameter_parse(@ARGV);
-print "@filelist\n" if ( $debug );
-foreach my $onefile ( @filelist ) {
-    convert_file( $onefile );
-}
-
-
-sub convert_file
-{
-    my $filename = shift;
-    if ( $target_format eq "dos" ) {
-        $lineend = "\r\n";
-    } else {
-        $lineend = "\n";
-    }
-    open INFILE, "$filename"or die "ERROR: Couldn\'t open $filename for reading.\n";
-    my @lines = <INFILE>;
-    close INFILE;
-    
-    foreach my $oneline ( @lines ) {
-        $oneline =~ s/\r*\n*$/$lineend/;
-    }
-
-    open OUTFILE, ">$filename" or die "ERROR: Couldn\'t open $filename for writing.\n";
-    syswrite OUTFILE, join "", @lines;
-    close OUTFILE;
-    
-}
-
-sub parameter_parse
-{
-    if ( $target_format eq "" ) {
-        $target_format = shift ;
-        usage() if ( $target_format ne "unix" && $target_format ne "dos" );
-        usage() if ( $#_ == -1 );
-    }
-    foreach my $param ( @_ ) {
-        if ( $param =~ "^@" ) {
-            my $filename = $param;
-            $filename =~ s/^@//;
-            open CMDFILE, "$filename" or die "ERROR: Couldn\'t open $filename for reading.\n";
-            my @filelist = <CMDFILE>;
-            close CMDFILE;
-            parameter_parse( @filelist );
-        } else {
-            push @filelist, $param;
-        }
-    }
-}
-
-sub usage
-{
-    print "Convert text files to the desired lineend convention:\n";
-    print "$0 <unix|dos> <FILE|\@filelist> [more files/lists]\n";
-    exit 1;
-}
-
diff --git a/solenv/bin/licinserter.pl b/solenv/bin/licinserter.pl
deleted file mode 100644
index 2626d6afb..000000000
--- a/solenv/bin/licinserter.pl
+++ /dev/null
@@ -1,138 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# licinserter.pl - create license entries in extension description.xml
-#
-
-use File::Basename;
-
-my $langswitch;
-
-sub usage()
-{
-    print STDERR "\nCreate extension descriptions with license-text entries\n";
-    print STDERR "matching the language activated.\n";
-    print STDERR "\nUsage:\n";
-    print STDERR "\t$0 [--langsplit] infile \"naming pattern\" destination\n\n";
-    print STDERR "\nExample:\n\n";
-    print STDERR "$0 description.xml dir/license_xxx.txt outdir/description.xml\n\n";
-    print STDERR "Creates \"someoutdir/description.xml\" with the license file entries like\n\"dir/license_en.US.txt\" ";
-    print STDERR "for all languages found in the WITH_LANG environment\nvariable\n\n\n";
-    print STDERR "Example2:\n\n";
-    print STDERR "$0 --langsplit description.xml dir/license_xxx.txt someoutdir\n\n";
-    print STDERR "Creates \"someoutdir/<language>/description.xml\" with one license file entry\n\"somedir/license_<language>.txt\" ";
-    print STDERR "for all languages found in the WITH_LANG\nenvironment variable.\n\nNOTE: when using --langsplit \"destination\" needs to be a directory\n";
-}
-
-if ( $ARGV[0] =~ /^-/ ) {
-    $langswitch = shift @ARGV;
-    if ( $langswitch ne "--langsplit" ) {
-        usage();
-        exit 1;
-    }
-    if ( ! -d $ARGV[2] ) {
-        print STDERR "\nERROR - $ARGV[2] is not directory\n";
-        usage();
-        exit 2;
-    }
-}
-
-if ( $#ARGV != 2 ) {
-    print "zzz\n";
-    usage();
-    exit 1;
-}
-
-open INFILE,$ARGV[0] or die "oops - no such file $ARGV[0]!\n";
-
-my @inlines = <INFILE>;
-close INFILE;
-
-chomp @inlines;
-
-# Empty or unset WITH_LANG environment variable is set to default en-US.
-# When WITH_LANG is set but does not contain en-US then that is prepended.
-my $WithLang = $ENV{WITH_LANG};
-if ( ! defined $WithLang || $WithLang eq "")
-{
-    $WithLang = "en-US";
-}
-elsif ($WithLang !~ /\ben-US\b/)
-{
-    $WithLang = "en-US " . $WithLang;
-}
-
-
-if ( $langswitch eq "" ) {
-    my @outlines;
-    foreach my $i (@inlines) {
-        if ( $i =~ /license-text/ ) {
-            my $ii;
-            my $name;
-            foreach my $code ( split(/\s+/,$WithLang) ) {
-                $ii = $i;
-                $name = $ARGV[1];
-                $name =~ s/xxx/$code/;
-                $ii =~ s/isocode/$code/g;
-                $ii =~ s?licensefile?$name?g;
-                push @outlines, "$ii\n";
-            }
-        } else {
-            push @outlines, "$i\n";
-        }
-    }
-    open OUTFILE, ">$ARGV[2]" or die "ooops - can't open $ARGV[2] for writing\n";
-    print OUTFILE @outlines;
-    close OUTFILE or die "ooops - can't write to $ARGV[2]\n";
-} else {
-    my @outlines;
-    my $outname = basename($ARGV[0],());
-    foreach my $code ( split(/\s+/,$ENV{WITH_LANG}) ) {
-        @outlines=();
-        foreach my $i (@inlines) {
-            if ( $i =~ /license-text/ ) {
-                my $name;
-                my $ii = $i;
-                $name = $ARGV[1];
-                $name =~ s/xxx/$code/;
-                $ii =~ s/isocode/$code/g;
-                $ii =~ s?licensefile?$name?g;
-                push @outlines, "$ii\n";
-            } else {
-                push @outlines, "$i\n";
-            }
-        }
-        mkdir "$ARGV[2]/$code";
-        open OUTFILE, ">$ARGV[2]/$code/$outname" or die "ooops - can't open $ARGV[2]/$code/$outname for writing\n";
-        print OUTFILE @outlines;
-        close OUTFILE or die "ooops - can't write to $ARGV[2]/$code/$outname\n";
-    }
-}
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
deleted file mode 100755
index ae6a7f27f..000000000
--- a/solenv/bin/linkoo
+++ /dev/null
@@ -1,376 +0,0 @@
-:
-    eval 'exec perl -S $0 ${1+"$@"}'
-        if 0;
-
-use strict;
-
-#*************************************************************************
-#
-#    This app makes it easy to link a live build
-# set into an install set. Then your devel iteration
-# is: 'build', execute.
-#
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-# This file substantially, if not wholely written by volunteers, not Oracle
-#
-#*************************************************************************
-
-# ends up in program/ooenv
-( my $moz_lib = `pkg-config --variable=libdir mozilla-nss` ) =~ tr/\n/:/;
-my $env_script = '
-java_path=`$thisdir/../basis-link/ure-link/bin/javaldx 2>/dev/null`
-export LD_LIBRARY_PATH="$thisdir:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH"
-ulimit -c unlimited
-export PATH="$thisdir/:$thisdir/../basis-link/program:$thisdir/../basis-link/ure-link/bin:$PATH"
-export GNOME_DISABLE_CRASH_DIALOG=1
-export STAR_RESOURCEPATH=$thisdir/../basis-link/program/resource
-# debugging assistance
-export SAL_DISABLE_FLOATGRAB=1
-export G_SLICE=always-malloc
-export MALLOC_CHECK_=2
-export OOO_DISABLE_RECOVERY=1
-export SAL_ALLOW_LINKOO_SYMLINKS=1
-';
-
-my $dry_run = 0;
-my $usage = 0;
-my $LANG;
-my $TARGET;
-my $LIBVER;
-my $OOO_BUILD;
-my $OOO_INSTALL;
-
-my $program_dir = 'basis-link/program';
-my $brand_program_dir = 'program';
-my $ure_misc_dir = 'basis-link/ure-link/share/misc';
-my $ure_java_dir = 'basis-link/ure-link/share/java';
-my $ure_lib_dir = 'basis-link/ure-link/lib';
-
-$program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FIXME probably wrong
-
-my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
-
-my $dllre = '\.so$';
-$dllre = '\.dylib$' if ($ENV{OS} eq 'MACOSX');
-
-my %replaceable = (
-    $program_dir => "($dllre|\.rdb)",
-    $ure_lib_dir => "$dllre",
-    $program_dir . '/resource' => '\.res$',
-    $program_dir . '/classes' => '\.jar$',
-    'basis-link/share/config' => '\.zip$',
-    'ure/share/misc' => '\.rdb'
-#    'share/uno_packages' => '\.zip$'
-);
-
-my @search_dirs = ( 'lib', 'bin', 'class' );
-
-my @known_duplicates = ( 'db.jar', 'libi18n' );
-
-sub sniff_target($)
-{
-    my $build_dir = shift;
-    my ($dirhandle, $fname);
-    my ($target, $libver, $lang) = ( 'unxlngi6.pro', '680', 'en-US' ); # defaults
-
-    opendir ($dirhandle, $build_dir) || die "Can't open $build_dir";
-    while ($fname = readdir ($dirhandle)) {
-	$fname =~ /Host.sh$/ || next;
-
-	my $file;
-	open ($file, "$build_dir/$fname") || die "Can't open $build_dir/$fname";
-	while (<$file>) {
-	    /\s*(\S+)\s*=\s*\"(\S+)\"/ || next;
-	    if ($1 eq 'INPATH') {
-		$target = $2;
-	    }
-	    if ($1 eq 'UPD') {
-		$libver = $2;
-	    }
-	}
-	close ($file);
-    }
-
-    closedir ($dirhandle);
-
-    print "Sniffed target: $target, $libver\n";
-
-    return ($target, $libver, $lang);
-}
-
-sub build_installed_list($)
-{
-    my $path = shift;
-    my %files = ();
-
-    for my $suffix (keys %replaceable) {
-	my $dirname = "$path/$suffix";
-	my $dirhandle;
-	my $pattern = $replaceable{$suffix};
-	if (opendir ($dirhandle, $dirname)) {
-	    while (my $fname = readdir ($dirhandle)) {
-		$fname =~ m/$pattern/ || next;
-
-		my $skip = 0;
-		for $pattern (@exceptions) {
-		    $fname =~ /$pattern/ || next;
-		    $skip = 1;
-		}
-		$files{$fname} = $dirname if !$skip;
-	    }
-	    closedir ($dirhandle);
-	} else {
-	    print "Couldn't find '$dirname': skipping\n";
-	}
-    }
-    return \%files;
-}
-
-sub check_create_linked($)
-{
-    my $path = shift;
-    my $linked_dir = "$path/linked";
-    if (! -d $linked_dir) {
-	mkdir $linked_dir || die "Can't make $linked_dir: $!";
-    }
-}
-
-sub do_link($$$$@)
-{
-    my $src = shift;
-    my $dest = shift;
-    my $src_name = shift;
-    my $dest_name = shift;
-    my $dont_check_link = shift;
-
-    if (-l "$dest/$dest_name" ) {
-	my $link = readlink ("$dest/$dest_name");
-	if ($link =~ /^\//) { # Absolute path
-	    if (!$dry_run) {
-		# re-write the link
-		unlink ("$dest/$dest_name");
-		symlink ("$src/$src_name", "$dest/$dest_name") || die "Failed to symlink: $!";
-		print " [$dest_name]";
-	    } else {
-		print "re-make link $src/$src_name => $dest/$dest_name\n";
-	    }
-	} elsif ($dry_run) {
-	    print "skipping symbolic link $dest/$dest_name -> $link\n";
-	}
-    } else {
-	check_create_linked ($dest);
-	if (!$dry_run) {
-	    # move / write the link
-	    rename ("$dest/$dest_name", "$dest/linked/$dest_name") ||
-		defined $dont_check_link || die "Failed rename of $dest/$dest_name: $!";
-
-	    symlink ("$src/$src_name", "$dest/$dest_name") || die "Failed to symlink: $!";
-	    print " $dest_name";
-	} else {
-	    print "move / symlink $src/$src_name => $dest/$dest_name\n";
-	}
-    }
-}
-
-sub scan_one_dir($$$$)
-{
-    my ($installed_files, $build_files, $path, $solver) = @_;
-
-    for my $elem (@search_dirs) {
-	my $dirh_module;
-	my $module_path = "$path/$elem";
-	if (opendir ($dirh_module, $module_path)) {
-	    while (my $file = readdir ($dirh_module)) {
-		if (defined $installed_files->{$file}) {
-		    if (defined $build_files->{$file}) {
-			my $known = 0;
-			for my $regexp (@known_duplicates) {
-			    if ($file =~ m/$regexp/) {
-				$known = 1;
-			    }
-			}
-			if (!$known && !$solver) {
-			    print STDERR "\nlinkoo:: Unknown duplicate file '$file' in: '" . 
-				$build_files->{$file} . "' vs '" .
-				$module_path . "' in module $path\n";
-			    exit (1);
-			}
-		    } else {
-			$build_files->{$file} = $module_path;
-		    }
-		}
-	    }
-	}
-	closedir ($dirh_module);
-    }
-}
-
-sub scan_and_link_files($$$)
-{
-    my $build_path = shift;
-    my $installed_files = shift;
-    my $target = shift;
-
-    my @modules = ();
-    my $dirh_toplevel;
-    opendir ($dirh_toplevel, $build_path) || die "Can't open '$build_path': $!";
-    while (my $subdir = readdir ($dirh_toplevel)) {
-	$subdir =~ m/\./ && next; # eg. vcl.old,
-	my $test = "$build_path/$subdir/$target";
-	-d $test || next;
-	push @modules, $test;
-    }
-    closedir ($dirh_toplevel);
-
-    # Scan the old-style module/$target/lib directories ...
-    my %build_files;
-    for my $module (@modules) {
-	scan_one_dir ($installed_files, \%build_files, $module, 0);
-    }
-
-    # Now scan the solver
-    my $upd = 300;
-    $upd = $ENV{UPD} if (defined $ENV{UPD});
-    scan_one_dir ($installed_files, \%build_files, "$build_path/solver/$upd/$target", 1);
-
-    for my $file (keys %build_files) {
-	my $src = $build_files{$file};
-	my $dest = $installed_files->{$file};
-
-	do_link ($src, $dest, $file, $file);
-    }
-    print "\n";
-}
-
-sub evilness($)
-{
-    my $doit = shift;
-    my $name = 'librecentfile.so';
-    my $src  = "$OOO_BUILD/shell/$TARGET/lib/$name";
-    my $dest = "$OOO_BUILD/sfx2/$TARGET/lib/$name";
-
-    if ($doit eq 'undo') {
-	if (-l $dest) {
-	    print " unlink $name\n";
-	    unlink $dest;
-	}
-    } else {
-	$doit eq 'do' || die;
-        if (-f $src) {
-	    print " link $name\n";
-	    symlink $src, $dest;
-	}
-    }
-}
-
-sub link_iso_res()
-{
-    print "Special iso.res case: ";
-    my $ooo_res="$OOO_INSTALL/" . $brand_program_dir . "/resource/ooo".$LIBVER.$LANG.".res";
-    my $star_res="$OOO_INSTALL/" . $brand_program_dir . "/resource/iso".$LIBVER.$LANG.".res";
-    if (-l $ooo_res && -l $star_res) {
-	if ($dry_run) {
-	    print "link $ooo_res to $star_res";
-	} else {
-	    unlink ($star_res);
-	    symlink ($ooo_res, $star_res);
-	    print "clobbered";
-	}
-    }
-    print "\n";
-}
-
-sub link_pagein_files()
-{
-    print "pagein case:";
-    my $src  = "$OOO_BUILD/desktop/$TARGET/misc";
-    my $dest = "$OOO_INSTALL/" . $program_dir;
-    for my $c ('calc', 'draw', 'impress', 'writer', 'common') {
-	do_link ($src, $dest, "pagein-$c", "pagein-$c");
-    }
-    print "\n";
-}
-
-for my $a (@ARGV) {
-
-# options
-    if ($a =~ /--dry-run/) {
-        $dry_run = 1;
-    } elsif (($a eq '--help') || ($a eq '-h')) {
-	$usage = 1;
-
-# ordered arguments
-    } elsif (!defined $OOO_INSTALL) {
-	$OOO_INSTALL = $a;
-    } elsif (!defined $OOO_BUILD) {
-	$OOO_BUILD = $a;
-    } else {
-	print "Unknown argument '$a'\n";
-	$usage = 1;
-    }
-}
-
-if (!defined $OOO_BUILD && defined $ENV{SRC_ROOT}) {
-    $OOO_BUILD = $ENV{SRC_ROOT};
-}
-
-if ($usage || !defined $OOO_INSTALL || !defined $OOO_BUILD) {
-    printf "Usage: linkoo </path/to/ooo/install> [</path/to/ooo/build/tree>] [--dry-run]\n";
-    exit (1);
-}
-
-substr ($OOO_INSTALL, 0, 1) eq '/' || die "linkoo requires absolute paths ($OOO_INSTALL does not qualify)";
-substr ($OOO_BUILD, 0, 1)   eq '/' || die "linkoo requires absolute paths ($OOO_BUILD does not qualify)";
-
--d $OOO_INSTALL || die "No such directory $OOO_INSTALL";
--w $OOO_INSTALL || die "You need write access to $OOO_INSTALL";
--d $OOO_BUILD || die "No such directory $OOO_BUILD";
--d "$OOO_INSTALL/" . $program_dir . "/resource" || die "$OOO_INSTALL doesn't look like an OO install";
-
-($TARGET, $LIBVER, $LANG) = sniff_target ($OOO_BUILD);
-
-evilness ('undo');
-
-my $installed_files = build_installed_list ($OOO_INSTALL);
-
-scan_and_link_files ($OOO_BUILD, $installed_files, $TARGET);
-link_iso_res();
-link_pagein_files();
-
-if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {
-    my $ooenv;
-    print "Creating '$OOO_INSTALL/", $brand_program_dir, "/ooenv'\n";
-    open ($ooenv, ">$OOO_INSTALL/" . $brand_program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $brand_program_dir . "/ooenv: $!";
-    print $ooenv "thisdir=$OOO_INSTALL/" . $brand_program_dir . "/\n";
-    print $ooenv $env_script;
-    print $ooenv "# testtool\nexport SRC_ROOT=$OOO_BUILD\n";
-    close ($ooenv);
-}
-
-evilness ('do');
-
-print "\nlinkoo finished, please don't forget to source ooenv before ./soffice.\n";
diff --git a/solenv/bin/localize b/solenv/bin/localize
deleted file mode 100755
index 9504e8ee3..000000000
--- a/solenv/bin/localize
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'setsolar'
-exit 1
-fi
-
-# localize.pl calls localize_sl in solver bin directory which depends on dynamic
-# libraries in solver lib directory but has no correct RPATH (or equivalent):
-if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
-else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
-fi
-
-exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl
deleted file mode 100755
index d0db56084..000000000
--- a/solenv/bin/localize_sl
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'setsolar'
-exit 1
-fi
-
-if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
-else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
-fi
-
-exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
deleted file mode 100644
index 29bf64de2..000000000
--- a/solenv/bin/macosx-change-install-names.pl
+++ /dev/null
@@ -1,124 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use lib ("$ENV{SOLARENV}/bin/modules");
-use macosxotoolhelper;
-
-sub action($$$)
-{
-    my %action =
-        ('app/UREBIN/URELIB' => '@executable_path/../lib',
-         'app/OOO/URELIB' => '@executable_path/../ure-link/lib',
-         'app/OOO/OOO' => '@executable_path',
-         'app/SDK/URELIB' => '@executable_path/../../ure-link/lib',
-         'app/BRAND/URELIB' => '@executable_path/../basis-link/ure-link/lib',
-         'app/BRAND/OOO' => '@executable_path/../basis-link/program',
-         'app/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
-         'app/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
-         'app/NONE/NONE' => '@__VIA_LIBRARY_PATH__',
-         'shl/URELIB/URELIB' => '@loader_path',
-         'shl/OOO/URELIB' => '@loader_path/../ure-link/lib',
-         'shl/OOO/OOO' => '@loader_path',
-         'shl/LOADER/LOADER' => '@loader_path',
-         'shl/OXT/URELIB' => '@executable_path/urelibs',
-         'shl/BOXT/URELIB' => '@executable_path/urelibs',
-         'shl/BOXT/OOO' => '@loader_path/../../../basis-link/program',
-         'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
-         'shl/OOO/NONE' => '@__VIA_LIBRARY_PATH__',
-         'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
-         'shl/NONE/NONE' => '@__VIA_LIBRARY_PATH__');
-    my ($type, $loc1, $loc2) = @_;
-    my $act = $action{"$type/$loc1/$loc2"};
-    die "illegal combination $type/$loc1/$loc2" unless defined $act;
-    return $act;
-}
-
-@ARGV == 3 || @ARGV >= 2 && $ARGV[0] eq "extshl" or die
-  'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|BOXT|NONE|LOADER <filepath>*';
-$type = shift @ARGV;
-$loc = shift @ARGV;
-if ($type eq "SharedLibrary")
-{
-    $type = "shl";
-}
-if ($type eq "Executable")
-{
-    $type = "app"
-}
-if ($type eq "Library")
-{
-    $type = "shl"
-}
-if ($type eq "extshl")
-{
-    $type = "shl";
-    my $change = "";
-    my %inames;
-    foreach $file (@ARGV)
-    {
-        my $iname = otoolD($file);
-        (defined $iname ? $iname : $file . "\n") =~ m'^(.*?([^/]+))\n$' or
-            die "unexpected otool -D output";
-        $change .= " -change $1 " . action($type, $loc, $loc) . "/$2";
-        $inames{$file} = $2;
-    }
-    if( $loc eq "LOADER" )
-    {
-        foreach $file (@ARGV)
-        {
-            my $call = "install_name_tool$change -id \@loader_path/$inames{$file} $file";
-            system($call) == 0 or die "cannot $call";
-        }
-    }
-    else
-    {
-        foreach $file (@ARGV)
-        {
-            my $call = "install_name_tool$change -id \@__________________________________________________$loc/$inames{$file} $file";
-            system($call) == 0 or die "cannot $call";
-        }
-    }
-}
-foreach $file (@ARGV)
-{
-    my $call = "otool -L $file";
-    open(IN, "-|", $call) or die "cannot $call";
-    my $change = "";
-    while (<IN>)
-    {
-        $change .= " -change $1 " . action($type, $loc, $2) . "$3"
-            if m'^\s*(@_{50}([^/]+)(/.+)) \(compatibility version \d+\.\d+\.\d+, current version \d+\.\d+\.\d+\)\n$';
-        $change .= ' -change '.$1.' @loader_path/'.$2
-            if m'^\s*(/python-inst/(OOoPython.framework/Versions/[^/]+/OOoPython))';
-    }
-    close(IN);
-    if ($change ne "")
-    {
-        $call = "install_name_tool$change $file";
-        system($call) == 0 or die "cannot $call";
-    }
-}
diff --git a/solenv/bin/macosx-create-bundle b/solenv/bin/macosx-create-bundle
deleted file mode 100755
index 4b03e076f..000000000
--- a/solenv/bin/macosx-create-bundle
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Documentation
-# -------------
-#
-# The purpose of this script to take Mac OS X executables and shared libraries
-# and package them into the required Mac OS X bundle format.
-#
-# This script has the following usage:
-# 	macosx-create-bundle file1 [file2] ... [fileN]
-#
-# Note that file1 through fileN can in either of the following formats:
-# - A file name
-# - A file name and a directory to look for missing files. To use this option,
-#   use the following format:
-#     filename=directory
-#
-# The file argument is the file that you want to package into a Mac OS X
-# bundle. Currently, this script will only package executables and shared
-# libraries.
-#
-# The output for each executable will be a bundle named <file>.app and
-# the output for each shared library will be a symlink from libfoo.jnilib 
-# back to libfoo.dylib.
-# These output directories will be in the same directory as the executable or
-# shared library.
-
-# Code
-# ----
-
-# Parse command line arguments
-if [ $# = 0 ]; then
-	printf "macosx-create-bundle: error: incorrect number of arguments\n" >&2
-	printf "Usage: macosx-create-bundle file1 [file2] ... [fileN]\n" >&2
-	exit 1
-fi
-
-while [ $# != 0 ]; do
-	inputfile=`echo "$1" | awk -F= '{print $1}'`
-	sourcedir=`echo "$1" | awk -F= '{print $2}'`
-
-	shift
-
-	inputfilename=`basename "$inputfile"`
-	outputdir=`dirname "$inputfile"`
-
-	solverlibdir="$SOLARVERSION/$INPATH/lib"
-	locallibdir="../../../../lib"
-
-	solverbindir="$SOLARVERSION/$INPATH/bin"
-	localbindir="../../.."
-
-	# Determine file type
-	filetype=`file -L "$inputfile"`
-
-	# Create bundle based on file type
-	if printf "$filetype" | grep -q 'Mach-O executable'; then
-
-		# Do nothing as this step is obsolete
-        :
-
-	elif printf "$filetype" | grep -q 'Mach-O dynamically linked shared library'; then
-		# Screen out lib\w+static libraries as they are not used directly
-		if ! printf "$inputfilename" | grep -q -x -E 'lib\w+static.*\.dylib'; then
-			# Create jnilib link
-			inputjnilibname="`basename $inputfilename .dylib`.jnilib"
-			if [ ! -L "$outputdir/$inputjnilibname" ]; then
-				rm -Rf "$outputdir/$inputjnilibname"
-			fi
-			# Link jnilib
-			ln -sf "$inputfilename" "$outputdir/$inputjnilibname"
-
-			#printf "macosx-create-bundle: $outputdir/$inputjnilibname successfully created\n"
-		fi
-	else
-		printf "macosx-create-bundle: error: file is not an executable or shared library.\n" >&2
-		exit 1
-	fi
-done
diff --git a/solenv/bin/macosx-dylib-link-list.pl b/solenv/bin/macosx-dylib-link-list.pl
deleted file mode 100644
index bf1d4da40..000000000
--- a/solenv/bin/macosx-dylib-link-list.pl
+++ /dev/null
@@ -1,92 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use lib ("$ENV{SOLARENV}/bin/modules");
-use macosxotoolhelper;
-
-sub locate($)
-{
-    my ($lib) = @_;
-    my $dir;
-    foreach $dir (@dirs)
-    {
-        my $path = "$dir/$lib";
-        if (-e $path)
-        {
-            return $path;
-        }
-    }
-    return;
-}
-
-sub handle($$)
-{
-    my ($from, $to) = @_;
-    # wrap -dylib_file in -Wl so that hopefully any used tool whatsoever (e.g.,
-    # libtool generated from xmlsec1-1.2.6/configure included in
-    # libxmlsec/download/xmlsec1-1.2.6.tar.gz:1.3) passes it through to the
-    # linker:
-    !($from =~ /,/ || $to =~ /,/) or
-        die "$from:$to contains commas and cannot go into -Wl";
-    print " -Wl,-dylib_file,$from:$to";
-    $done{$from} = 1;
-    push(@todo, $to) if (grep {$_ eq $to} @todo) == 0;
-}
-
-foreach (@ARGV) { push(@dirs, $1) if /^-L(.*)$/; }
-foreach (@ARGV)
-{
-    if (/^-l(.*)$/)
-    {
-        my $loc = locate("lib$1.dylib");
-        handle($1, $loc) if defined $loc && otoolD($loc) =~ m'^(@.+/.+)\n$';
-    }
-}
-foreach $file (@todo)
-{
-    my $call = "otool -L $file";
-    open(IN, "-|", $call) or die "cannot $call";
-    while (<IN>)
-    {
-        if (m'^\s*(@.+/([^/]+)) \(compatibility version \d+\.\d+\.\d+, current version \d+\.\d+\.\d+\)\n$')
-        {
-            my $full = $1;
-            my $loc = locate($2);
-            $loc = locate($1) if $full =~ m'^\s*@loader_path/(OOoPython.framework/Versions/[^/]+/OOoPython)';
-            if (defined $loc)
-            {
-                handle($full, $loc) unless defined $done{$full};
-            }
-            else
-            {
-                die "unknown $full (from $file)";
-            }
-        }
-    }
-    close(IN);
-}
-print "\n";
diff --git a/solenv/bin/make_download.pl b/solenv/bin/make_download.pl
deleted file mode 100644
index 0aeb060ce..000000000
--- a/solenv/bin/make_download.pl
+++ /dev/null
@@ -1,126 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#################
-# use
-#################
-
-use lib ("$ENV{SOLARENV}/bin/modules");
-
-use Cwd;
-use File::Copy;
-use installer::download;
-use installer::downloadsigner;
-use installer::exiter;
-use installer::followme;
-use installer::globals;
-use installer::logger;
-use installer::windows::sign;
-
-#################################################
-# Main program
-#################################################
-
-installer::downloadsigner::getparameter();
-installer::downloadsigner::checkparameter();
-
-my $temppath = installer::downloadsigner::set_temp_path();
-my $infofilelist = installer::downloadsigner::createproductlist();
-installer::downloadsigner::publishproductlist($infofilelist);
-
-foreach my $infofilename ( @{$infofilelist} )
-{
-    installer::logger::starttime();
-
-    my $success = 1;
-    my $do_copy = 1;
-    my $followmeinfohash = installer::followme::read_followme_info($infofilename);
-    installer::downloadsigner::setlogfilename();	# Successful after reading followme file, resetting log file
-    if ( $installer::globals::writetotemp ) { installer::downloadsigner::set_output_pathes_to_temp($followmeinfohash, $temppath); } 
-    if ( $installer::globals::useminor ) { installer::downloadsigner::set_minor_into_pathes($followmeinfohash, $temppath); } 
-
-    if (( ! $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign ))
-    {
-        installer::logger::print_message( "... WARNING: Signing only for Windows platforms active ...\n" );
-    }
-
-    if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign ))
-    {
-        $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy, $temppath);
-
-        ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'},
-                                                                                                            $followmeinfohash->{'finalinstalldir'},
-                                                                                                            $followmeinfohash->{'installlogdir'},
-                                                                                                            "",
-                                                                                                            \$followmeinfohash->{'languagestring'},
-                                                                                                            $followmeinfohash->{'currentinstallnumber'});
-
-        if ( ! $success ) { installer::exiter::exit_program("ERROR: Signing installation set failed: $followmeinfohash->{'finalinstalldir'}", "Main"); }
-    }
-
-    if ( ! $installer::globals::nodownload )
-    {
-        $followmeinfohash->{'finalinstalldir'} = installer::download::create_download_sets($followmeinfohash->{'finalinstalldir'}, 
-                                                                                            $followmeinfohash->{'includepatharray'},
-                                                                                            $followmeinfohash->{'allvariableshash'},
-                                                                                            $followmeinfohash->{'downloadname'},
-                                                                                            \$followmeinfohash->{'languagestring'},
-                                                                                            $followmeinfohash->{'languagesarray'});
-
-        ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'},
-                                                                                                        $followmeinfohash->{'finalinstalldir'},
-                                                                                                        $followmeinfohash->{'installlogdir'},
-                                                                                                        "",
-                                                                                                        \$followmeinfohash->{'languagestring'},
-                                                                                                        $followmeinfohash->{'currentinstallnumber'});
-
-        if (( $success ) && ( $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign ))
-        {
-            $do_copy = 0;
-            $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy, $temppath);
-
-            ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'},
-                                                                                                            $followmeinfohash->{'finalinstalldir'},
-                                                                                                            $followmeinfohash->{'installlogdir'},
-                                                                                                            "",
-                                                                                                            \$followmeinfohash->{'languagestring'},
-                                                                                                            $followmeinfohash->{'currentinstallnumber'});
-        }
-    }
-    
-    if ( $success )
-    {
-        installer::worker::clean_output_tree();
-        if ( $installer::globals::followme_from_directory ) { installer::downloadsigner::rename_followme_infofile($infofilename); }
-    }
-
-    installer::logger::stoptime();
-}
-
-####################################
-# Main program end
-####################################
diff --git a/solenv/bin/make_ext_update_info.pl b/solenv/bin/make_ext_update_info.pl
deleted file mode 100755
index c3e3b50cf..000000000
--- a/solenv/bin/make_ext_update_info.pl
+++ /dev/null
@@ -1,613 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#here the definition for d would be written into dependencies. The reason is that when the event handler
-#for the element is called, we can only find out the namespace but not the prefix. So we cannot 
-#distinguish if the namespace is used because the element was prefixed or because it uses the default
-#namespace.
-use warnings;
-use strict;
-
-use XML::Parser;
-use Getopt::Long;
-use Carp;
-
-sub getUpdateInfoFileName($);
-sub writeUpdateInformationData($);
-sub findAttribute($$);
-sub getNotDefPrefs($$$);
-sub collectPrefixes($$$$);
-sub determineNsDefinitions($$$);
-sub determineNsDefinitionForItem($$$);
-
-my $inDescription = 0;
-my $inDependencies = 0;
-my $inIdentifier = 0;
-my $inVersion = 0;
-my $descNS = "http://openoffice.org/extensions/description/2006";
-                   my $indent;
-my $identifier;
-my $version;
-
-#contains prefixes and the corresponding namespaces which are used in the <dependencies>
-#element and all children of the description.xml
-my @usedNsInDependencies;
-
-#Maps  prefix to namespaces which are valid in <dependencies>. That is, they are 
-#either defined in <dependencies> or in the hirarchy above <dependencies>
-my %validPrefsInDep;
-#Contains the prefixes which are defined in <dependencies>
-my @newPrefsInDep;
-#Contains the prefixes/namespaces which need to be defined in <dependencies> but which are currently
-#not. For example a prefix is defined in the parent and is used in a child of <dependencies>
-my %notDefInDep;
-
-#prefix used in start and end element
-my $prefix;
-
-#The default namespace valid in <dependencies>
-my $defNsInDep;
-#The prefix which we use for the default namespace used in <dependencies>
-my $generatedPrefix;
-
-my $helptext = 
-"make_ext_update_info.pl produces an update information file for an extension. ".
-"It will use a dummy URL as URL for the extension update unless a URL has been ". 
-"provided with the --update_url option. The name of the update ".
-"information file, which must be provided with the --out switch, should be formed ".
-"according to this scheme: \n\n".
-"extension_identifier.update.xml\n\n".
-"extension_identifier should correspond to the extension identifier. In some cases ".
-"this may not be possible because the identifier may contain characters which are not ".
-"allowd in file names.\n\n".
-"usage:\n".
-"perl make_ext_update_info.pl [--help][--update_url url] --out update_information_file description.xml \n\n".
-"Options: \n".
-"--help - prints the help message and exits \n".
-"--out file - the update information file to be written including the path \n".
-"--update-url url - inserts the url under the <update-download> element. It may be necessary to enclose the urls in quotes in case they contain characters such as \"?\". ".
-"It can be used multiple times\n\n";
-
-#handling of arguments
-my $help = 0;
-my $out;
-my @update_urls;
-if (!GetOptions('help|?' => \$help,
-                'out=s' => \$out,
-                'update-url=s'=> \@update_urls))
-{
-    print $helptext;
-    exit -1;
-}
-my $cArgs = scalar @ARGV;
-die "You need to provide a description.xml\n\n$helptext" if $cArgs ==0;
-die "You need to provide the name of the update information file ".
-    "with the --out switch.\n" unless ($out);
-die "Too many arguments. \n\n$helptext" if $cArgs > 1;
-print $helptext if $help;
-
-
-#open the update information file for writing
-my $FH;
-open $FH, "> $out" or die $!;
-
-#write the xml header and root element
-print $FH '<?xml version="1.0" encoding="UTF-8"?>', "\n";
-print $FH '<description xmlns="http://openoffice.org/extensions/update/2006"', "\n";
-print $FH '    xmlns:xlink="http://www.w3.org/1999/xlink">', "\n";
-
-#obtain from description.xml the data for the update information
-writeUpdateInformationData($ARGV[0]);
-#We will die if there is no <version> or <identifier> in the description.xml
-die "Error: The description.xml does not contain a <identifier> element.\n" unless $identifier;
-die "Error: The description.xml does not contain a <version> element. \n" unless $version;
-
-#write the write the update-download element and the children.
-#the indention of <update-download> corresponds to that of <version>
-print $FH ' 'x$indent, '<update-download>', "\n";
-#check if update-urls have been provided through --update-url option
-if (scalar @update_urls)
-{
-    my $urlIndent = $indent > 8 ? 8 : 2 * $indent;
-    #use provided urls
-    for (@update_urls)
-    {
-        print $FH ' 'x$urlIndent, '<src xlink:href="'.$_.'" />', "\n";
-    }
-}
-else
-{
-    #use dummy update url
-    print $FH ' 'x8, '<src xlink:href="http://extensions.openoffice.org/testarea/dummy.oxt" />', "\n";
-}
-print $FH ' 'x$indent, '</update-download>', "\n";
-
-print $FH '</description>', "\n";
-close $FH;
-
-exit 0;
-
-
-
-sub start_handler
-{
-    my $parser = shift;
-    my $name = shift;
-
-    if ($name eq "description"
-        && $descNS eq $parser->namespace($name))
-    {
-        $inDescription = 1;
-    }
-    elsif ($inDescription
-           && $name eq "version"
-           && $descNS eq  $parser->namespace($name))
-    {
-        $inVersion = 1;
-        $version = 1;
-        $indent = $parser->current_column();
-        print $FH " "x$indent, $parser->original_string();
-    }
-    elsif ($inDescription
-           && $name eq "identifier"
-           && $descNS eq  $parser->namespace($name))
-    {
-        $inIdentifier = 1;
-        $identifier = 1;
-        print $FH " "x$parser->current_column(), $parser->original_string();
-    }
-    elsif ($inDescription
-           && $name eq "dependencies"
-           && $descNS eq  $parser->namespace($name))
-    {
-        $inDependencies = 1;
-        my $dep = $parser->original_string();
-        #add the additional namespace definitions, which we have discovered during the first
-        #parsing
-        #cut of the closing > or /> from the start element, so we can append the namespace definitions
-        $dep =~ /(\s*<.*) ((\s*\/>)|(\s*>))/x;
-        my $dep1 = $1;
-        $dep1.= " xmlns:".$_.'="'.$notDefInDep{$_}.'"' for (keys %notDefInDep);
-        $dep1.= $2;
-        print $FH " "x$parser->current_column(), $dep1;
-    }
-    elsif ($inDependencies)
-    {
-        #$prefix is global because we need to use it in the end element as well.
-        $prefix = "";
-        my $fullString;
-        my $orig = $parser->original_string();
-        #Split up the string so we can insert the prefix for the element.
-        # <OpenOffice.org-minimal-version>
-        # <d:OpenOffice.org-minimal-version>
-        $orig=~/(\s*<)(.*?)\s/x;
-        #in $2 is the element name, look for the prefix
-        if ($2 !~/(.*?):/ && $parser->namespace($name)) {
-            #no prefix, that is element uses default namespace.
-            #Now check if the default namespace in <dependencies> is the same as the one in this 
-            #element. If not, then the default ns was defined "after" <dependencies>. Because all 
-            #children of <dependencies> are copied into the update information, so will this default
-            #namespace definition. Hence this element will have the same default namespace in the 
-            #update information.
-            my $defNsDep = $validPrefsInDep{"#default"};
-            #we must have #default, see the if statement above
-            my $defNsCur = $parser->expand_ns_prefix("#default");
-            
-            if ($defNsDep eq $defNsCur) {
-                #Determine if there is in <dependency> a prefix defined (only valid there and need not 
-                #directly defined in this element). If there is no prefix defined then we will 
-                #add a new definition to <dependencies>.
-                for (keys %validPrefsInDep) {
-                    if (($validPrefsInDep{$_} eq $defNsDep) && $_ ne "#default") {
-                        $prefix = $_; last;
-                    }
-                }
-                if (! $prefix) {
-                    #If there was no prefix, we will add new prefix definition to <dependency> 
-                    #Which prefix this is has been determined during the first parsing.
-                    for (keys %notDefInDep) {
-                        if (($notDefInDep{$_} eq $defNsCur) && $_ ne "#default") {
-                            $prefix = $_; last;
-                        }
-                    }
-                }
-                #die if we have no prefix
-                confess "No prefix defined for default namespace " unless $prefix;
-                #get the full part after <
-                $orig=~/(\s*<)(.*)/x;
-                $fullString= $1.$prefix.":".$2;
-            }
-          
-        } 
-        $fullString = $orig unless $fullString;
-        
-        # We record anything within <dependencies> </dependencies>.
-        print $FH $fullString;
-    }     
-}
-
-sub end_handler
-{
-    my $parser = shift;
-    my $name = shift;
-
-    if ($name eq "description"
-        && $descNS eq  $parser->namespace($name))
-    {
-        $inDescription = 0;
-    }
-    elsif ($inDescription
-           && $name eq "version"
-           && $descNS eq  $parser->namespace($name))
-    {
-        $inVersion = 0;
-        print $FH  $parser->original_string(), "\n";
-    }
-    elsif ($inDescription
-           && $name eq "identifier"
-           && $descNS eq  $parser->namespace($name))
-    {
-        $inIdentifier = 0;
-        print $FH $parser->original_string(), "\n";
-    }
-    elsif($inDescription
-          && $name eq "dependencies"
-          && $descNS eq $parser->namespace($name))
-    {
-        $inDependencies = 0;
-        print $FH $parser->original_string(), "\n";
-    }
-    elsif ($inDependencies)
-    {
-        my $orig = $parser->original_string();
-        #$orig is empty if we have tags like this: <name />
-        if ($orig && $prefix) {
-            $orig=~/(\s*<\/)(.*)/x;
-            $orig= $1.$prefix.":".$2;
-        }
-        print $FH $orig;
-    }
-}
-
-#We write the complete content between start and end tags of 
-# <identifier>, <version>, <dependencies>
-sub default_handler
-{
-    my $parser = shift;
-    my $name = shift;
-    if ($inIdentifier || $inVersion) {
-        print $FH $parser->original_string();
-    } elsif ($inDependencies) {
-        print $FH  $parser->original_string();
-    }
-
-}  # End of default_handler
-
-#sax handler used for the first parsing to recognize the used prefixes in <dependencies > and its
-#children and to find out if we need to define a new prefix for the current default namespace.
-sub start_handler_infos
-{
-    my $parser = shift;
-    my $name = shift;
-    if ($name eq "description"
-        && $descNS eq $parser->namespace($name)) {
-        $inDescription = 1;
-    }
-    elsif ($inDescription
-           && $name eq "dependencies"
-           && $descNS eq  $parser->namespace($name)) {
-        $inDependencies = 1;
-        #build the map of prefix/namespace which are valid in <dependencies>
-        my @cur = $parser->current_ns_prefixes();
-        for (@cur) {
-            $validPrefsInDep{$_} = $parser->expand_ns_prefix($_);
-        }
-        #remember the prefixes defined in <dependencies>
-        @newPrefsInDep = $parser->new_ns_prefixes();
-
-        collectPrefixes($parser, $name, \@_, \@usedNsInDependencies);
-        return if  $generatedPrefix;
-
-        #determine if need to create a new prefix for the current element if it uses a default ns.
-        #Split up the string so we can see if there is a prefix used
-        # <OpenOffice.org-minimal-version>
-        # <d:OpenOffice.org-minimal-version>
-        my $orig = $parser->original_string();
-        $orig=~/(\s*<)(.*?)\s/x;
-        #in $2 is the element name, look for the prefix
-        if ($2 !~/(.*?):/ && $parser->namespace($name)) {
-            #no prefix, that is element uses default namespace.
-            #Now check if the default namespace in <dependencies> is the same as the one in this 
-            #element. If not, then the default ns was defined "after" <dependencies>. Because all 
-            #children of <dependencies> are copied into the update information, so will this default
-            #namespace definition. Hence this element will have the same default namespace in the 
-            #update information.
-            my $defNsDep = $validPrefsInDep{"#default"};
-            #we must have #default, see the if statement above
-            my $defNsCur = $parser->expand_ns_prefix("#default");
-            
-            if ($defNsDep eq $defNsCur) {
-                #Determine if there is in <dependency> a prefix defined (only valid there and need not 
-                #directly defined in this element). If there is no prefix defined then we will 
-                #add a new definition to <dependencies>.
-                for (keys %validPrefsInDep) {
-                    if (($validPrefsInDep{$_} eq $defNsDep) && $_ ne "#default") {
-                        $prefix = $_; last;
-                    }
-                }
-                
-                if (! $prefix) {
-
-                    #define a new prefix
-                    #actually there can be only onle prefix, which is the case when the element 
-                    #uses the same default namespace as <dependencies> otherwise, the default 
-                    #namespace was redefined by the children of <dependencies>. These are completely
-                    #copied and still valid in the update information file
-                    $generatedPrefix = "a";
-                    $defNsInDep = $defNsDep;
-                }
-            }
-        }
-
-    }
-    elsif ($inDependencies) {
-        determineNsDefinitions($parser, $name, \@_); 
-        collectPrefixes($parser, $name, \@_, \@usedNsInDependencies);
-    }
-}
-#sax handler used for the first parsing to recognize the used prefixes in <dependencies > and its
-#children
-sub end_handler_infos
-{
-    my $parser = shift;
-    my $name = shift;
-
-    if ($name eq "description"
-        && $descNS eq  $parser->namespace($name)) {
-        $inDescription = 0;
-    }
-    elsif($inDescription
-          && $name eq "dependencies"
-          && $descNS eq $parser->namespace($name)) {
-        $inDependencies = 0;
-    }
-}
-
-sub writeUpdateInformationData($)
-{
-    my $desc = shift;
-    {
-        #parse description xml to collect information about all used
-        #prefixes and names within <dependencies>
-    
-        my $parser = new XML::Parser(ErrorContext => 2,
-                                     Namespaces => 1);
-        $parser->setHandlers(Start => \&start_handler_infos,
-                             End => \&end_handler_infos);
-
-        $parser->parsefile($desc);
-
-        
-    }
-    #remove duplicates in the array containing the prefixes
-    if ($generatedPrefix) {
-        my %hashtmp;
-        @usedNsInDependencies = grep(!$hashtmp{$_}++, @usedNsInDependencies);
-        
-        #check that the prefix for the default namespace in <dependencies> does not clash
-        #with any other prefixes
-        my $clash;
-        do {
-            $clash = 0;
-            for (@usedNsInDependencies) {
-                if ($_ eq $generatedPrefix) {
-                    $generatedPrefix++;
-                    $clash = 1; last;
-                }
-            }
-        } while ($clash);
-        $notDefInDep{$generatedPrefix} = $defNsInDep;
-    }
-    #if $notDefInDep contains the prefix #default then we need to add the generated prefix as well
-    
-    #add the special prefix for the default namespace into the map of prefixes that will be 
-    #added to the <dependencies> element in the update information file
-    
-    
-    ($inDependencies, $inDescription) = (0,0);
-    {
-        my $parser = new XML::Parser(ErrorContext => 2,
-                                     Namespaces => 1);
-        $parser->setHandlers(
-                             Start => \&start_handler,
-                             End => \&end_handler,
-                             Default => \&default_handler);
-        $parser->parsefile($desc);
-    }
-}
-
-# param 1: name of the attribute we look for
-# param 2: array of name value pairs, the first subscript is the attribute and the second
-# is the value.
-sub findAttribute($$)
-{
-    my ($name, $args_r) = @_;
-    my @args = @{$args_r};
-    my $value;
-    while (my $attr = shift(@args))
-    {
-        if ($attr eq $name) {
-            $value = shift(@args);
-            die "href attribut has no valid URL" unless $value;
-            last;
-        } else { # shift away the following value for the attribute
-            shift(@args);
-        }
-    }
-    return $value;
-}
-
-#collect the prefixes used in an xml element
-#param 1: parser,
-#param 2: element name,
-#param 3: array of name and values of attributes       
-#param 4: out parameter, the array containing the prefixes
-sub collectPrefixes($$$$)
-{
-    my $parser = shift;
-    my $name = shift;
-    my $attr_r = shift;
-    my $out_r = shift;
-    #get the prefixes which are currently valid
-    my @cur = $parser->current_ns_prefixes();
-    my %map_ns;
-    #get the namespaces for the prefixes
-    for (@cur) {
-        if ($_ eq '#default') {
-            next;
-        }
-        my $ns = $parser->expand_ns_prefix($_);
-        $map_ns{$ns} = $_; 
-    }
-    #investigat ns of element
-    my $pref = $map_ns{$parser->namespace($name)};
-    push(@{$out_r}, $pref) if $pref;
-    #now go over the attributes
-
-    while (my $attr = shift(@{$attr_r})) {
-        my $ns = $parser->namespace($attr);
-        if (! $ns) {
-            shift(@{$attr_r});
-            next;
-        }
-        $pref = $map_ns{$ns};
-        push( @{$out_r}, $pref) if $pref;
-        shift(@{$attr_r});
-    }
-    #also add newly defined prefixes
-    my @newNs = $parser->new_ns_prefixes();
-    for (@newNs) {
-        if ($_ eq '#default') {
-            next;
-        }
-        push (@{$out_r}, $_);
-    }
-}
-
-#The function is called for each child element of dependencies. It finds out the prefixes
-#which are used by the children and which are defined by the parents of <dependencies>. These
-#would be lost when copying the children of <dependencies> into the update information file.
-#Therefore these definitions are collected so that they then can be written in the <dependencies>
-#element of the update information file.
-#param 1: parser
-#param 2: namsepace
-#param 3: the @_ received in the start handler
-sub determineNsDefinitions($$$)
-{
-    my ($parser, $name, $attr_r) = @_;
-    my @attr = @{$attr_r};
-
-    determineNsDefinitionForItem($parser, $name, 1);
-    
-    while (my $attr = shift(@attr)) {
-        determineNsDefinitionForItem($parser, $attr, 0);
-        shift @attr;
-    }
-}
-
-#do not call this function for the element that does not use a prefix
-#param 1: parser
-#param 2: name of the element or attribute
-#param 3: 1 if called for an elment name and 0 when called for attribue
-sub determineNsDefinitionForItem($$$)
-{
-    my ($parser, $name) = @_;
-    my $ns = $parser->namespace($name);
-    if (! $ns) {
-        return;
-    }
-    #If the namespace was not kwown in <dependencies> then it was defined in one of its children
-    #or in this element. Then we are done since this namespace definition is copied into the 
-    #update information.
-    my $bNsKnownInDep;
-    for ( keys %validPrefsInDep) {
-        if ( $validPrefsInDep{$_} eq $ns) {
-            $bNsKnownInDep = 1;
-            last;
-        }
-    }
-    #If the namespace of the current element is known in <dependencies> then check if the same 
-    #prefix is used. If not, then the prefix was defined in one of the children of <dependencies>
-    #and was assigned the same namespace. Because we copy of children into the update information,
-    #this definition is also copied.
-    if ($bNsKnownInDep) {
-        #create a map of currently valid prefix/namespace
-        my %curPrefToNs;
-        my @curNs = $parser->current_ns_prefixes();
-        for (@curNs) {
-            $curPrefToNs{$_} = $parser->expand_ns_prefix($_);
-        }
-        #find the prefix used in <dependencies> to define the namespace of the current element
-        my $validDepPref;
-        for (keys %validPrefsInDep) {
-            if ($validPrefsInDep{$_} eq $ns) {
-                #ignore #default
-                next if $_ eq "#default";
-                $validDepPref = $_;
-                last;
-            }
-        }
-        #find the prefix defined in the current element used for the namespace of the element
-        my $curPref;
-        for (keys %curPrefToNs) {
-            if ($curPrefToNs{$_} eq $ns) {
-                #ignore #default
-                next if $_ eq "#default";
-                $curPref = $_; 
-                last;
-            }
-        }
-        if ($curPref && $validDepPref && ($curPref eq $validDepPref)) {
-            #If the prefixes and ns are the same, then the prefix definition of <dependencies> or its
-            #parent can be used. However, we need to find out which prefixed are NOT defined in 
-            #<dependencies> so we can add them to it when we write the update information.
-            my $bDefined = 0;
-            for (@newPrefsInDep) {
-                if ($curPref eq $_) {
-                    $bDefined = 1;
-                    last;
-                }
-            }
-            if (! $bDefined) {
-                $notDefInDep{$curPref} = $ns;
-            }
-        }
-    } 
-}
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
deleted file mode 100644
index d895cc9d9..000000000
--- a/solenv/bin/make_installer.pl
+++ /dev/null
@@ -1,2386 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#################
-# use
-#################
-
-use lib ("$ENV{SOLARENV}/bin/modules");
-
-use Cwd;
-use File::Copy;
-use installer::archivefiles;
-use installer::control;
-use installer::converter;
-use installer::copyproject;
-use installer::download;
-use installer::environment;
-use installer::epmfile;
-use installer::exiter;
-use installer::files;
-use installer::followme;
-use installer::globals;
-use installer::helppack;
-use installer::languagepack;
-use installer::languages;
-use installer::logger;
-use installer::packagelist;
-use installer::packagepool;
-use installer::parameter;
-use installer::pathanalyzer;
-use installer::profiles;
-use installer::scppatchsoname;
-use installer::scpzipfiles;
-use installer::scriptitems;
-use installer::setupscript;
-use installer::simplepackage;
-use installer::sorter;
-use installer::strip;
-use installer::substfilenamefiles;
-use installer::upx;
-use installer::systemactions;
-use installer::windows::assembly;
-use installer::windows::binary;
-use installer::windows::component;
-use installer::windows::createfolder;
-use installer::windows::directory;
-use installer::windows::feature;
-use installer::windows::featurecomponent;
-use installer::windows::file;
-use installer::windows::font;
-use installer::windows::icon;
-use installer::windows::idtglobal;
-use installer::windows::inifile;
-use installer::windows::java;
-use installer::windows::media;
-use installer::windows::mergemodule;
-use installer::windows::msiglobal;
-use installer::windows::msp;
-use installer::windows::patch;
-use installer::windows::property;
-use installer::windows::removefile;
-use installer::windows::registry;
-use installer::windows::selfreg;
-use installer::windows::shortcut;
-use installer::windows::strip;
-use installer::windows::update;
-use installer::windows::upgrade;
-use installer::worker;
-use installer::xpdinstaller;
-use installer::ziplist;
-
-#################################################
-# Main program
-#################################################
-
-#################################################
-# Part 1: The platform independent part
-#################################################
-
-#################################################
-# Part 1a: The language independent part
-#################################################
-
-installer::logger::starttime();
-
-#########################################
-# Checking the environment and setting
-# most important variables
-#########################################
-
-installer::logger::print_message( "... checking environment variables ...\n" );
-my $environmentvariableshashref = installer::control::check_system_environment();
-
-installer::environment::set_global_environment_variables($environmentvariableshashref);
-
-#################################
-# Check and output of parameter
-#################################
-
-installer::parameter::saveparameter();
-installer::parameter::getparameter();
-
-# debugging can start after function "getparameter"
-if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 1: The platform independent part\n"); }
-if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 1a: The language independent part\n"); }
-
-installer::parameter::control_fundamental_parameter();
-installer::parameter::setglobalvariables();
-installer::parameter::control_required_parameter();
-
-if (!($installer::globals::languages_defined_in_productlist)) { installer::languages::analyze_languagelist(); }
-installer::parameter::outputparameter();
-
-installer::control::check_updatepack();
-
-$installer::globals::build = uc($installer::globals::build);	# using "SRC680" instead of "src680"
-
-######################################
-# Creating the log directory
-######################################
-
-my $loggingdir = installer::systemactions::create_directories("logging", "");
-$loggingdir = $loggingdir . $installer::globals::separator;
-$installer::globals::exitlog = $loggingdir;
-
-my $installdir = "";
-my $currentdir = cwd();
-my $shipinstalldir = "";
-my $current_install_number = "";
-
-######################################
-# Checking the system requirements
-######################################
-
-installer::logger::print_message( "... checking required files ...\n" );
-installer::control::check_system_path();
-
-my $pathvariableshashref = installer::environment::create_pathvariables($environmentvariableshashref);
-
-###############################################
-# Checking saved setting for Windows patches
-###############################################
-
-if (( $installer::globals::iswindowsbuild ) &&	( $installer::globals::prepare_winpatch )) { installer::windows::msiglobal::read_saved_mappings(); }
-
-###################################################
-# Analyzing the settings and variables in zip.lst
-###################################################
-
-installer::logger::globallog("zip list file: $installer::globals::ziplistname");
-
-my $ziplistref = installer::files::read_file($installer::globals::ziplistname);
-
-installer::logger::print_message( "... analyzing $installer::globals::ziplistname ... \n" );
-
-my ($productblockref, $parent) = installer::ziplist::getproductblock($ziplistref, $installer::globals::product, 1);		# product block from zip.lst
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "productblock.log" ,$productblockref); }
-
-my ($settingsblockref, undef) = installer::ziplist::getproductblock($productblockref, "Settings", 0);		# settings block from zip.lst
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "settingsblock1.log" ,$settingsblockref); }
-
-$settingsblockref = installer::ziplist::analyze_settings_block($settingsblockref);				# select data from settings block in zip.lst
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "settingsblock2.log" ,$settingsblockref); }
-
-my $allsettingsarrayref = installer::ziplist::get_settings_from_ziplist($settingsblockref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allsettings1.log" ,$allsettingsarrayref); }
-
-my $allvariablesarrayref = installer::ziplist::get_variables_from_ziplist($settingsblockref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allvariables1.log" ,$allvariablesarrayref); }
-
-my ($globalproductblockref, undef) = installer::ziplist::getproductblock($ziplistref, $installer::globals::globalblock, 0);		# global product block from zip.lst
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "globalproductblock.log" ,$globalproductblockref); }
-
-while (defined $parent)
-{
-    my $parentproductblockref;
-    ($parentproductblockref, $parent) = installer::ziplist::getproductblock(
-        $ziplistref, $parent, 1);
-    my ($parentsettingsblockref, undef) = installer::ziplist::getproductblock(
-        $parentproductblockref, "Settings", 0);
-    $parentsettingsblockref = installer::ziplist::analyze_settings_block(
-        $parentsettingsblockref);
-    my $allparentsettingsarrayref =
-        installer::ziplist::get_settings_from_ziplist($parentsettingsblockref);
-    my $allparentvariablesarrayref =
-        installer::ziplist::get_variables_from_ziplist($parentsettingsblockref);
-    $allsettingsarrayref =
-        installer::converter::combine_arrays_from_references_first_win(
-            $allsettingsarrayref, $allparentsettingsarrayref)
-        if $#{$allparentsettingsarrayref} > -1;
-    $allvariablesarrayref =
-        installer::converter::combine_arrays_from_references_first_win(
-            $allvariablesarrayref, $allparentvariablesarrayref)
-        if $#{$allparentvariablesarrayref} > -1;
-}
-
-if ( $#{$globalproductblockref} > -1 )
-{
-    my ($globalsettingsblockref, undef) = installer::ziplist::getproductblock($globalproductblockref, "Settings", 0);		# settings block from zip.lst
-    if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "globalsettingsblock1.log" ,$globalsettingsblockref); }
-
-    $globalsettingsblockref = installer::ziplist::analyze_settings_block($globalsettingsblockref);				# select data from settings block in zip.lst
-    if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "globalsettingsblock2.log" ,$globalsettingsblockref); }
-    
-    my $allglobalsettingsarrayref = installer::ziplist::get_settings_from_ziplist($globalsettingsblockref);
-    if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allglobalsettings1.log" ,$allglobalsettingsarrayref); }
-
-    my $allglobalvariablesarrayref = installer::ziplist::get_variables_from_ziplist($globalsettingsblockref);
-    if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allglobalvariables1.log" ,$allglobalvariablesarrayref); }
-
-    if ( $#{$allglobalsettingsarrayref} > -1 ) { $allsettingsarrayref = installer::converter::combine_arrays_from_references_first_win($allsettingsarrayref, $allglobalsettingsarrayref); }
-    if ( $#{$allglobalvariablesarrayref} > -1 ) { $allvariablesarrayref = installer::converter::combine_arrays_from_references_first_win($allvariablesarrayref, $allglobalvariablesarrayref); }
-}
-
-$allsettingsarrayref = installer::ziplist::remove_multiples_from_ziplist($allsettingsarrayref); # the settings from the zip.lst
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allsettings2.log" ,$allsettingsarrayref); }
-
-$allvariablesarrayref = installer::ziplist::remove_multiples_from_ziplist($allvariablesarrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allvariables2.log" ,$allvariablesarrayref); }
-
-installer::ziplist::replace_variables_in_ziplist_variables($allvariablesarrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allvariables2a.log" ,$allvariablesarrayref); }
-
-my $allvariableshashref = installer::converter::convert_array_to_hash($allvariablesarrayref);	# the variables from the zip.lst
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables3.log", $allvariableshashref); }
-
-installer::ziplist::set_default_productversion_if_required($allvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables3a.log", $allvariableshashref); }
-
-installer::ziplist::add_variables_to_allvariableshashref($allvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables3b.log", $allvariableshashref); }
-
-installer::ziplist::overwrite_ooovendor( $allvariableshashref );
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables3c.log", $allvariableshashref); }
-
-
-########################################################
-# Check if this is simple packaging mechanism
-########################################################
-
-installer::simplepackage::check_simple_packager_project($allvariableshashref);
-
-####################################################################
-# setting global variables
-####################################################################
-
-installer::control::set_addchildprojects($allvariableshashref);
-installer::control::set_addsystemintegration($allvariableshashref);
-
-########################################################
-# Re-define logging dir, after all variables are set
-########################################################
-
-my $oldloggingdir = $loggingdir;
-installer::systemactions::remove_empty_directory($oldloggingdir);
-$loggingdir = installer::systemactions::create_directories("logging", "");
-$loggingdir = $loggingdir . $installer::globals::separator;
-$installer::globals::exitlog = $loggingdir;
-
-# checking, whether this is an opensource product
-
-if (!($installer::globals::is_copy_only_project)) { installer::ziplist::set_manufacturer($allvariableshashref); }
-
-##############################################
-# Checking version of makecab.exe
-##############################################
-
-if ( $installer::globals::iswindowsbuild ) { installer::control::check_makecab_version(); }
-
-##########################################################
-# Getting the include path from the settings in zip list
-##########################################################
-
-my $includepathref = installer::ziplist::getinfofromziplist($allsettingsarrayref, "include");
-if ( $$includepathref eq "" )
-{
-    installer::exiter::exit_program("ERROR: Definition for \"include\" not found in $installer::globals::ziplistname", "Main");
-}
-
-my $includepatharrayref = installer::converter::convert_stringlist_into_array($includepathref, ",");
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray1.log" ,$includepatharrayref); }
-
-installer::ziplist::replace_all_variables_in_pathes($includepatharrayref, $pathvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray2.log" ,$includepatharrayref); }
-
-installer::ziplist::replace_minor_in_pathes($includepatharrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray3.log" ,$includepatharrayref); }
-
-installer::ziplist::replace_packagetype_in_pathes($includepatharrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray3a.log" ,$includepatharrayref); }
-
-installer::ziplist::resolve_relative_pathes($includepatharrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray3b.log" ,$includepatharrayref); }
-
-installer::ziplist::remove_ending_separator($includepatharrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray3c.log" ,$includepatharrayref); }
-
-##############################################
-# Collecting all files from all include
-# pathes in global hashes.
-##############################################
-
-installer::worker::collect_all_files_from_includepathes($includepatharrayref);
-
-##############################################
-# Analyzing languages in zip.lst if required
-# Probably no longer used.
-##############################################
-
-if ($installer::globals::languages_defined_in_productlist) { installer::languages::get_info_about_languages($allsettingsarrayref); }
-
-#####################################
-# Windows requires the encoding list
-#####################################
-
-if ( $installer::globals::iswindowsbuild ) { installer::control::read_encodinglist($includepatharrayref); }
-
-#####################################################################
-# Including additional inc files for variable settings, if defined
-#####################################################################
-
-if ( $allvariableshashref->{'ADD_INCLUDE_FILES'} ) { installer::worker::add_variables_from_inc_to_hashref($allvariableshashref, $includepatharrayref); }
-
-################################################
-# Disable xpd installer, if SOLAR_JAVA not set
-################################################
-
-installer::control::check_java_for_xpd($allvariableshashref);
-
-#####################################
-# Analyzing the setup script
-#####################################
-
-if ($installer::globals::setupscript_defined_in_productlist) { installer::setupscript::set_setupscript_name($allsettingsarrayref, $includepatharrayref); }
-
-installer::logger::globallog("setup script file: $installer::globals::setupscriptname");
-
-installer::logger::print_message( "... analyzing script: $installer::globals::setupscriptname ... \n" );
-
-my $setupscriptref = installer::files::read_file($installer::globals::setupscriptname); # Reading the setup script file
-
-# Resolving variables defined in the zip list file into setup script
-# All the variables are defined in $allvariablesarrayref
-
-installer::scpzipfiles::replace_all_ziplistvariables_in_file($setupscriptref, $allvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscript1.log" ,$setupscriptref); }
-
-# Resolving %variables defined in the installation object
-
-my $allscriptvariablesref = installer::setupscript::get_all_scriptvariables_from_installation_object($setupscriptref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscriptvariables1.log" ,$allscriptvariablesref); }
-
-installer::setupscript::add_lowercase_productname_setupscriptvariable($allscriptvariablesref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscriptvariables2.log" ,$allscriptvariablesref); }
-
-installer::setupscript::resolve_lowercase_productname_setupscriptvariable($allscriptvariablesref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscriptvariables3.log" ,$allscriptvariablesref); }
-
-$setupscriptref = installer::setupscript::replace_all_setupscriptvariables_in_script($setupscriptref, $allscriptvariablesref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscript2.log" ,$setupscriptref); }
-
-# Adding all variables defined in the installation object into the hash of all variables.
-# This is needed if variables are defined in the installation object, but not in the zip list file.
-# If there is a definition in the zip list file and in the installation object, the installation object is more important
-
-installer::setupscript::add_installationobject_to_variables($allvariableshashref, $allscriptvariablesref);
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables4.log", $allvariableshashref); }
-
-# Adding also all variables, that must be included into the $allvariableshashref.
-installer::setupscript::add_forced_properties($allvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables5.log", $allvariableshashref); }
-
-# Replacing preset properties, not using the default mechanisms (for example for UNIXPRODUCTNAME)
-installer::setupscript::replace_preset_properties($allvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables6.log", $allvariableshashref); }
-
-installer::scpzipfiles::replace_all_ziplistvariables_in_file($setupscriptref, $allvariableshashref);
-if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscript3.log" ,$setupscriptref); }
-
-
-installer::logger::log_hashref($allvariableshashref);
-
-installer::logger::print_message( "... analyzing directories ... \n" );
-
-# Collect all directories in the script to get the destination dirs
-
-my $dirsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Directory");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1.log", $dirsinproductarrayref); }
-
-if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_hostname($dirsinproductarrayref); }
-if ( $installer::globals::patch ) { installer::scriptitems::use_patch_hostname($dirsinproductarrayref); }
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1a.log", $dirsinproductarrayref); }
-
-if ( $allvariableshashref->{'SHIFT_BASIS_INTO_BRAND_LAYER'} ) { $dirsinproductarrayref = installer::scriptitems::shift_basis_directory_parents($dirsinproductarrayref); }
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1b.log", $dirsinproductarrayref); }
-if ( $allvariableshashref->{'OFFICEDIRECTORYNAME'} ) { installer::scriptitems::set_officedirectory_name($dirsinproductarrayref, $allvariableshashref->{'OFFICEDIRECTORYNAME'}); }
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1b.log", $dirsinproductarrayref); }
-
-
-installer::scriptitems::resolve_all_directory_names($dirsinproductarrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories2.log", $dirsinproductarrayref); }
-
-installer::logger::print_message( "... analyzing files ... \n" );
-
-my $filesinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "File");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles1.log", $filesinproductarrayref); }
-
-$filesinproductarrayref = installer::scriptitems::remove_delete_only_files_from_productlists($filesinproductarrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2.log", $filesinproductarrayref); }
-
-if (( ! $installer::globals::iswindowsbuild ) && 
-    ( ! $installer::globals::isrpmbuild ) &&
-    ( ! $installer::globals::isdebbuild ) &&
-    ( ! $installer::globals::issolarispkgbuild ) &&
-    ( $installer::globals::packageformat ne "installed" ) &&
-    ( $installer::globals::packageformat ne "dmg" ) &&
-    ( $installer::globals::packageformat ne "archive" ))
-    { installer::control::check_oxtfiles($filesinproductarrayref); }
-
-if ($installer::globals::product =~ /suite/i ) { $filesinproductarrayref = installer::scriptitems::remove_notinsuite_files_from_productlists($filesinproductarrayref); }
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2aa.log", $filesinproductarrayref); }
-
-if (! $installer::globals::languagepack)
-{
-    $filesinproductarrayref = installer::scriptitems::remove_Languagepacklibraries_from_Installset($filesinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2b.log", $filesinproductarrayref); }
-}
-
-if (! $installer::globals::helppack)
-{
-    $filesinproductarrayref = installer::scriptitems::remove_Helppacklibraries_from_Installset($filesinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2b2.log", $filesinproductarrayref); }
-}
-
-if (! $installer::globals::patch)
-{
-    $filesinproductarrayref = installer::scriptitems::remove_patchonlyfiles_from_Installset($filesinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2c.log", $filesinproductarrayref); }
-}
-
-if (! $installer::globals::tab)
-{
-    $filesinproductarrayref = installer::scriptitems::remove_tabonlyfiles_from_Installset($filesinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2c.log", $filesinproductarrayref); }
-}
-
-if (( $installer::globals::packageformat ne "installed" ) && ( $installer::globals::packageformat ne "archive" ))
-{
-    $filesinproductarrayref = installer::scriptitems::remove_installedproductonlyfiles_from_Installset($filesinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2cc.log", $filesinproductarrayref); }
-}
-
-installer::logger::print_message( "... analyzing scpactions ... \n" );
-
-my $scpactionsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "ScpAction");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1.log", $scpactionsinproductarrayref); }
-
-if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isxpdplatform ))
-{
-    $scpactionsinproductarrayref = installer::scriptitems::remove_Xpdonly_Items($scpactionsinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1a.log", $scpactionsinproductarrayref); }
-}
-
-if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
-if ( $installer::globals::helppack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
-if ( $installer::globals::patch ) { installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref); }
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1b.log", $scpactionsinproductarrayref); }
-
-# $scpactionsinproductarrayref = installer::scriptitems::remove_scpactions_without_name($scpactionsinproductarrayref);
-# if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions2.log", $scpactionsinproductarrayref); }
-
-installer::scriptitems::change_keys_of_scpactions($scpactionsinproductarrayref);
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions2.log", $scpactionsinproductarrayref); }
-
-installer::logger::print_message( "... analyzing shortcuts ... \n" );
-
-my $linksinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Shortcut");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks1.log", $linksinproductarrayref); }
-
-installer::logger::print_message( "... analyzing unix links ... \n" );
-
-my $unixlinksinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Unixlink");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks1.log", $unixlinksinproductarrayref); }
-
-installer::logger::print_message( "... analyzing profile ... \n" );
-
-my $profilesinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Profile");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profiles1.log", $profilesinproductarrayref); }
-
-installer::logger::print_message( "... analyzing profileitems ... \n" );
-
-my $profileitemsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "ProfileItem");
-if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profileitems1.log", $profileitemsinproductarrayref); }
-
-my $folderinproductarrayref;
-my $folderitemsinproductarrayref;
-my $registryitemsinproductarrayref;
-my $windowscustomactionsarrayref;
-my $mergemodulesarrayref;
-
-if ( $installer::globals::iswindowsbuild )	# Windows specific items: Folder, FolderItem, RegistryItem, WindowsCustomAction
-{
-    installer::logger::print_message( "... analyzing folders ... \n" );
-
-    $folderinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Folder");
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folder1.log", $folderinproductarrayref); }
-
-    installer::logger::print_message( "... analyzing folderitems ... \n" );
-
-    $folderitemsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "FolderItem");
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folderitems1.log", $folderitemsinproductarrayref); }
-
-    installer::setupscript::add_predefined_folder($folderitemsinproductarrayref, $folderinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folder1b.log", $folderinproductarrayref); }
-
-    installer::setupscript::prepare_non_advertised_files($folderitemsinproductarrayref, $filesinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2d.log", $filesinproductarrayref); }
-
-    installer::logger::print_message( "... analyzing registryitems ... \n" );
-
-    $registryitemsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "RegistryItem");
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems1.log", $registryitemsinproductarrayref); }
-
-    $registryitemsinproductarrayref = installer::scriptitems::remove_uninstall_regitems_from_script($registryitemsinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems1b.log", $registryitemsinproductarrayref); }
-
-    installer::logger::print_message( "... analyzing Windows custom actions ... \n" );
-
-    $windowscustomactionsarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "WindowsCustomAction");
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "windowscustomactions1.log", $windowscustomactionsarrayref); }
-
-    installer::logger::print_message( "... analyzing Windows merge modules ... \n" );
-
-    $mergemodulesarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "MergeModule");
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "mergemodules1.log", $mergemodulesarrayref); }
-}
-
-my $modulesinproductarrayref;
-
-if (!($installer::globals::is_copy_only_project)) 
-{
-    installer::logger::print_message( "... analyzing modules ... \n" );
-
-    $modulesinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Module");
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules1.log", $modulesinproductarrayref); }
-
-    if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isxpdplatform ))
-    {
-        $modulesinproductarrayref = installer::scriptitems::remove_Xpdonly_Items($modulesinproductarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules1a.log", $modulesinproductarrayref); }
-    }
-
-    installer::scriptitems::resolve_assigned_modules($modulesinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules1b.log", $modulesinproductarrayref); }
-
-    $modulesinproductarrayref = installer::scriptitems::remove_template_modules($modulesinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules1c.log", $modulesinproductarrayref); }
-
-    installer::scriptitems::set_children_flag($modulesinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules1d.log", $modulesinproductarrayref); }
-
-    installer::scriptitems::collect_all_languagemodules($modulesinproductarrayref);
-
-    # Assigning the modules to the items
-
-    installer::scriptitems::assigning_modules_to_items($modulesinproductarrayref, $filesinproductarrayref, "Files");
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles3.log", $filesinproductarrayref); }
-
-    installer::scriptitems::assigning_modules_to_items($modulesinproductarrayref, $unixlinksinproductarrayref, "Unixlinks");
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks2.log", $unixlinksinproductarrayref); }
-
-    installer::scriptitems::assigning_modules_to_items($modulesinproductarrayref, $dirsinproductarrayref, "Dirs");
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories2aa.log", $dirsinproductarrayref); }
-}
-
-if ( $installer::globals::debug ) { installer::logger::debuginfo("\nEnd of part 1a: The language independent part\n"); }
-
-# saving debug info, before staring part 1b
-if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
-
-#################################################
-# Part 1b: The language dependent part
-# (still platform independent)
-#################################################
-
-# Now starts the language dependent part, if more than one product is defined on the command line
-# Example -l en-US,de#es,fr,it defines two multilingual products
-
-###############################################################################
-# Beginning of language dependent part
-# The for iterates over all products, separated by an # in the language list
-###############################################################################
-
-if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 1b: The language dependent part\n"); }
-
-for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
-{
-    my $languagesarrayref = installer::languages::get_all_languages_for_one_product($installer::globals::languageproducts[$n], $allvariableshashref);
-    if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "languages.log" ,$languagesarrayref); }
-
-    $installer::globals::alllanguagesinproductarrayref = $languagesarrayref;
-    my $languagestringref = installer::languages::get_language_string($languagesarrayref);
-    installer::logger::print_message( "------------------------------------\n" );
-    installer::logger::print_message( "... languages $$languagestringref ... \n" );
-
-    if ( $installer::globals::patch )
-    {
-        $installer::globals::addlicensefile = 0;	# no license files for patches	
-        $installer::globals::makedownload = 0;
-        $installer::globals::makejds = 0;
-    }
-
-    if ( $installer::globals::languagepack )
-    {
-        $installer::globals::addchildprojects = 0;
-        $installer::globals::addsystemintegration = 0;
-        $installer::globals::makejds = 0;
-        $installer::globals::addlicensefile = 0;
-
-        if ( $allvariableshashref->{'OPENSOURCE'} ) { $installer::globals::makedownload = 1; }
-        else { $installer::globals::makedownload = 0; }
-    }
-
-    if ( $installer::globals::helppack )
-    {
-        $installer::globals::addchildprojects = 0;
-        $installer::globals::addsystemintegration = 0;
-        $installer::globals::makejds = 0;
-        $installer::globals::addlicensefile = 0;
-
-        if ( $allvariableshashref->{'OPENSOURCE'} ) { $installer::globals::makedownload = 1; }
-        else { $installer::globals::makedownload = 0; }
-    }
-
-    ############################################################
-    # Beginning of language specific logging mechanism
-    # Until now only global logging into default: logfile.txt
-    ############################################################
-
-    @installer::globals::logfileinfo = ();	# new logfile array and new logfile name
-    installer::logger::copy_globalinfo_into_logfile();
-    $installer::globals::globalinfo_copied = 1;
-
-    my $logminor = "";
-    if ( $installer::globals::updatepack ) { $logminor = $installer::globals::lastminor; }
-    else { $logminor = $installer::globals::minor; }
-
-    my $loglanguagestring = $$languagestringref;
-    my $loglanguagestring_orig = $loglanguagestring;
-    if (length($loglanguagestring) > $installer::globals::max_lang_length)
-    {
-        my $number_of_languages = installer::systemactions::get_number_of_langs($loglanguagestring);
-        chomp(my $shorter = `echo $loglanguagestring | md5sum | sed -e "s/ .*//g"`);
-        my $id = substr($shorter, 0, 8); # taking only the first 8 digits
-        $loglanguagestring = "lang_" . $number_of_languages . "_id_" . $id;				
-    }
-
-    $installer::globals::logfilename = "log_" . $installer::globals::build;
-    if ( $logminor ne "" ) { $installer::globals::logfilename .= "_" . $logminor; }
-    $installer::globals::logfilename .= "_" . $loglanguagestring;
-    $installer::globals::logfilename .= ".log";
-    $loggingdir = $loggingdir . $loglanguagestring . $installer::globals::separator;
-    installer::systemactions::create_directory($loggingdir);
-
-    if ($loglanguagestring ne $loglanguagestring_orig) {
-        (my $dir = $loggingdir) =~ s!/$!!;
-        open(my $F1, "> $dir.dir");
-        open(my $F2, "> " . $loggingdir . $installer::globals::logfilename . '.file');
-        my @s = map { "$_\n" } split('_', $loglanguagestring_orig);
-        print $F1 @s;
-        print $F2 @s;
-    }
-
-    $installer::globals::exitlog = $loggingdir;
-
-    ##############################################################
-    # Determining the ship location, if this is an update pack
-    ##############################################################
-
-    if ( $installer::globals::updatepack ) { $shipinstalldir = installer::control::determine_ship_directory($languagestringref); }
-
-    ###################################################################
-    # Reading an existing msi database, to prepare update and patch
-    ###################################################################
-
-    my $refdatabase = "";
-    my $uniquefilename = "";
-    my $revuniquefilename = "";
-    my $revshortfilename = "";
-    my $allupdatesequences = "";
-    my $allupdatecomponents = "";
-    my $allupdatefileorder = "";
-    my $allupdatecomponentorder = "";
-    my $shortdirname = "";
-    my $componentid = "";
-    my $componentidkeypath = "";
-    my $alloldproperties = "";
-    my $allupdatelastsequences = "";
-    my $allupdatediskids = "";
-
-    if ( $installer::globals::iswindowsbuild )
-    {
-        if ( $allvariableshashref->{'UPDATE_DATABASE'} )
-        {
-            installer::logger::print_message( "... analyzing update database ...\n" );
-            $refdatabase = installer::windows::update::readdatabase($allvariableshashref, $languagestringref, $includepatharrayref);
-
-            if ( $installer::globals::updatedatabase )
-            {
-                ($uniquefilename, $revuniquefilename, $revshortfilename, $allupdatesequences, $allupdatecomponents, $allupdatefileorder, $allupdatecomponentorder, $shortdirname, $componentid, $componentidkeypath, $alloldproperties, $allupdatelastsequences, $allupdatediskids) = installer::windows::update::create_database_hashes($refdatabase);
-                if ( $mergemodulesarrayref > -1 ) { installer::windows::update::readmergedatabase($mergemodulesarrayref, $languagestringref, $includepatharrayref); }
-            }
-        }
-    }
-
-    ##############################################
-    # Setting global code variables for Windows
-    ##############################################
-
-    if (!($installer::globals::is_copy_only_project)) 
-    {
-        if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::packageformat ne "archive" ) && ( $installer::globals::packageformat ne "installed" ))
-        {
-            installer::windows::msiglobal::set_global_code_variables($languagesarrayref, $languagestringref, $allvariableshashref, $alloldproperties);
-        }
-    }
-        
-    ################################################
-    # Resolving include paths (language dependent)
-    ################################################
-
-    $includepatharrayref_lang = installer::ziplist::replace_languages_in_pathes($includepatharrayref, $languagesarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray4.log" ,$includepatharrayref_lang); }
-
-    if ( $installer::globals::refresh_includepathes ) { installer::worker::collect_all_files_from_includepathes($includepatharrayref_lang); }
-
-    installer::ziplist::list_all_files_from_include_path($includepatharrayref_lang);
-
-    ##############################################
-    # Analyzing spellchecker languages
-    ##############################################
-    
-    if ( $allvariableshashref->{'SPELLCHECKERFILE'} ) { installer::worker::set_spellcheckerlanguages($languagesarrayref, $allvariableshashref); }
-
-    #####################################
-    # Language dependent directory part
-    #####################################
-
-    my $dirsinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($dirsinproductarrayref, $languagesarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories3.log", $dirsinproductlanguageresolvedarrayref); }
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories2a.log", $dirsinproductarrayref); }
-
-    # A new directory array is needed ($dirsinproductlanguageresolvedarrayref instead of $dirsinproductarrayref)
-    # because $dirsinproductarrayref is needed in get_Destination_Directory_For_Item_From_Directorylist
-
-    installer::scriptitems::changing_name_of_language_dependent_keys($dirsinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories4.log", $dirsinproductlanguageresolvedarrayref); }
-
-    installer::scriptitems::checking_directories_with_corrupt_hostname($dirsinproductlanguageresolvedarrayref, $languagesarrayref);
-
-    installer::scriptitems::set_global_directory_hostnames($dirsinproductlanguageresolvedarrayref, $allvariableshashref);
-
-    #####################################
-    # files part, language dependent
-    #####################################
-
-    installer::logger::print_message( "... analyzing files ...\n" );
-
-    my $filesinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($filesinproductarrayref, $languagesarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles4.log", $filesinproductlanguageresolvedarrayref); }
-
-    if ( ! $installer::globals::set_office_start_language )
-    {
-        $filesinproductlanguageresolvedarrayref = installer::scriptitems::remove_office_start_language_files($filesinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles4b.log", $filesinproductlanguageresolvedarrayref); }
-    }
-    
-    installer::scriptitems::changing_name_of_language_dependent_keys($filesinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles5.log", $filesinproductlanguageresolvedarrayref); }
-
-    if ( $installer::globals::iswin and $^O =~ /MSWin/i ) { installer::converter::convert_slash_to_backslash($filesinproductlanguageresolvedarrayref); }
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles6.log", $filesinproductlanguageresolvedarrayref); }
-
-    $filesinproductlanguageresolvedarrayref = installer::scriptitems::remove_non_existent_languages_in_productlists($filesinproductlanguageresolvedarrayref, $languagestringref, "Name", "file");
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles7.log", $filesinproductlanguageresolvedarrayref); }
-
-    installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($filesinproductlanguageresolvedarrayref, $dirsinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles8.log", $filesinproductlanguageresolvedarrayref); }
-
-    installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($filesinproductlanguageresolvedarrayref, $includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref, "Files");
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles9.log", $filesinproductlanguageresolvedarrayref); }
-
-    $filesinproductlanguageresolvedarrayref = installer::scriptitems::remove_Files_Without_Sourcedirectory($filesinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10.log", $filesinproductlanguageresolvedarrayref); }
-
-    if ($installer::globals::languagepack)
-    {
-        $filesinproductlanguageresolvedarrayref = installer::scriptitems::remove_Files_For_Languagepacks($filesinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10c.log", $filesinproductlanguageresolvedarrayref); }
-    }
-
-    if ( ! $allvariableshashref->{'NO_README_IN_ROOTDIR'} )
-    {
-        $filesinproductlanguageresolvedarrayref = installer::scriptitems::add_License_Files_into_Installdir($filesinproductlanguageresolvedarrayref, $dirsinproductlanguageresolvedarrayref, $languagesarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10b.log", $filesinproductlanguageresolvedarrayref); }
-    }
-
-    $filesinproductlanguageresolvedarrayref = installer::scriptitems::remove_onlyasialanguage_files_from_productlists($filesinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10d.log", $filesinproductlanguageresolvedarrayref); }
-
-    $filesinproductlanguageresolvedarrayref = installer::scriptitems::remove_onlywesternlanguage_files_from_productlists($filesinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10e.log", $filesinproductlanguageresolvedarrayref); }
-
-    installer::scriptitems::make_filename_language_specific($filesinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10f.log", $filesinproductlanguageresolvedarrayref); }
-    
-    # print "... calculating checksums ...\n";
-    # my $checksumfile = installer::worker::make_checksum_file($filesinproductlanguageresolvedarrayref, $includepatharrayref);
-    # if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . $installer::globals::checksumfilename, $checksumfile); }
-
-    ######################################################################################
-    # Unzipping files with flag ARCHIVE and putting all included files into the file list
-    ######################################################################################
-
-    installer::logger::print_message( "... analyzing files with flag ARCHIVE ...\n" );
-
-    my @additional_paths_from_zipfiles = ();
-
-    $filesinproductlanguageresolvedarrayref = installer::archivefiles::resolving_archive_flag($filesinproductlanguageresolvedarrayref, \@additional_paths_from_zipfiles, $languagestringref, $loggingdir);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles11.log", $filesinproductlanguageresolvedarrayref); }
-    if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "additional_paths.log" ,\@additional_paths_from_zipfiles); }
-
-    # packed files sometimes contain a "$" in their name: HighlightText$1.class. For epm the "$" has to be quoted by "$$" 
-
-    if (!( $installer::globals::iswindowsbuild || $installer::globals::simple ) )
-    {
-        installer::scriptitems::quoting_illegal_filenames($filesinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles12.log", $filesinproductlanguageresolvedarrayref); }
-    }
-
-    #####################################
-    # Files with flag SUBST_FILENAME
-    #####################################
-    
-    installer::logger::print_message( "... analyzing files with flag SUBST_FILENAME ...\n" );
-
-    installer::substfilenamefiles::resolving_subst_filename_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, $languagestringref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles12d.log", $filesinproductlanguageresolvedarrayref); }
-
-    #####################################
-    # Files with flag SCPZIP_REPLACE
-    #####################################
-    
-    installer::logger::print_message( "... analyzing files with flag SCPZIP_REPLACE ...\n" );
-
-    # Editing files with flag SCPZIP_REPLACE.
-
-    installer::scpzipfiles::resolving_scpzip_replace_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, "File", $languagestringref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles13.log", $filesinproductlanguageresolvedarrayref); }
-
-    #####################################
-    # Files with flag PATCH_SO_NAME
-    #####################################
-    
-    installer::logger::print_message( "... analyzing files with flag PATCH_SO_NAME ...\n" );
-
-    # Editing files with flag PATCH_SO_NAME.
-
-    installer::scppatchsoname::resolving_patchsoname_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, "File", $languagestringref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles13b.log", $filesinproductlanguageresolvedarrayref); }
-
-    #####################################
-    # Files with flag HIDDEN
-    #####################################
-    
-    installer::logger::print_message( "... analyzing files with flag HIDDEN ...\n" );
-
-    installer::worker::resolving_hidden_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, "File", $languagestringref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles13c.log", $filesinproductlanguageresolvedarrayref); }
-
-    ############################################
-    # Collecting directories for epm list file
-    ############################################
-
-    installer::logger::print_message( "... analyzing all directories for this product ...\n" );
-
-    # There are two ways for a directory to be included into the epm directory list:
-    # 1. Looking for all destination paths in the files array
-    # 2. Looking for directories with CREATE flag in the directory array
-    # Advantage: Many pathes are hidden in zip files, they are not defined in the setup script.
-    # It will be possible, that in the setup script only those directoies have to be defined,
-    # that have a CREATE flag. All other directories are created, if they contain at least one file.
-
-    my ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist1.log", $directoriesforepmarrayref); }
-    
-    ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref, $alldirectoryhash);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist2.log", $directoriesforepmarrayref); }
-
-    #########################################################
-    # language dependent scpactions part
-    #########################################################
-
-    my $scpactionsinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($scpactionsinproductarrayref, $languagesarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions3.log", $scpactionsinproductlanguageresolvedarrayref); }
-
-    installer::scriptitems::changing_name_of_language_dependent_keys($scpactionsinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions4.log", $scpactionsinproductlanguageresolvedarrayref); }
-
-    installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($scpactionsinproductlanguageresolvedarrayref, $includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref, "ScpActions");
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions5.log", $scpactionsinproductlanguageresolvedarrayref); }
-
-    # Editing scpactions with flag SCPZIP_REPLACE and PATCH_SO_NAME.
-
-    installer::scpzipfiles::resolving_scpzip_replace_flag($scpactionsinproductlanguageresolvedarrayref, $allvariableshashref, "ScpAction", $languagestringref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6.log", $scpactionsinproductlanguageresolvedarrayref); }
-
-    installer::scppatchsoname::resolving_patchsoname_flag($scpactionsinproductlanguageresolvedarrayref, $allvariableshashref, "ScpAction", $languagestringref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6a.log", $scpactionsinproductlanguageresolvedarrayref); }
-
-    #########################################################
-    # language dependent links part
-    #########################################################
-
-    installer::logger::print_message( "... analyzing links ...\n" );
-
-    my $linksinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($linksinproductarrayref, $languagesarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks2.log", $linksinproductlanguageresolvedarrayref); }
-
-    installer::scriptitems::changing_name_of_language_dependent_keys($linksinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks3.log", $linksinproductlanguageresolvedarrayref); }
-
-    installer::scriptitems::get_destination_file_path_for_links($linksinproductlanguageresolvedarrayref, $filesinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks4.log", $linksinproductlanguageresolvedarrayref); }
-
-    installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($linksinproductlanguageresolvedarrayref, $dirsinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks5.log", $linksinproductlanguageresolvedarrayref); }
-
-    # Now taking all links that have no FileID but a ShortcutID, linking to another link
-
-    installer::scriptitems::get_destination_link_path_for_links($linksinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks6.log", $linksinproductlanguageresolvedarrayref); }
-
-    $linksinproductlanguageresolvedarrayref = installer::scriptitems::remove_workstation_only_items($linksinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks7.log", $linksinproductlanguageresolvedarrayref); }
-
-    installer::scriptitems::resolve_links_with_flag_relative($linksinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks8.log", $linksinproductlanguageresolvedarrayref); }
-
-    #########################################################
-    # language dependent unix links part
-    #########################################################
-
-    installer::logger::print_message( "... analyzing unix links ...\n" );
-
-    my $unixlinksinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($unixlinksinproductarrayref, $languagesarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks3.log", $unixlinksinproductlanguageresolvedarrayref); }
-
-    installer::scriptitems::changing_name_of_language_dependent_keys($unixlinksinproductlanguageresolvedarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks4.log", $unixlinksinproductlanguageresolvedarrayref); }
-
-    installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($unixlinksinproductlanguageresolvedarrayref, $dirsinproductarrayref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks5.log", $unixlinksinproductlanguageresolvedarrayref); }
-
-    #########################################################
-    # language dependent part for profiles and profileitems
-    #########################################################
-
-    my $profilesinproductlanguageresolvedarrayref;
-    my $profileitemsinproductlanguageresolvedarrayref;
-
-    if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)) && (!($installer::globals::helppack)))
-    {
-        installer::logger::print_message( "... creating profiles ...\n" );
-
-        $profilesinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($profilesinproductarrayref, $languagesarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profiles2.log", $profilesinproductlanguageresolvedarrayref); }
-
-        $profileitemsinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($profileitemsinproductarrayref, $languagesarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profileitems2.log", $profilesinproductlanguageresolvedarrayref); }
-
-        installer::scriptitems::changing_name_of_language_dependent_keys($profilesinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profiles3.log", $profilesinproductlanguageresolvedarrayref); }
-
-        installer::scriptitems::changing_name_of_language_dependent_keys($profileitemsinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profileitems3.log", $profileitemsinproductlanguageresolvedarrayref); }
-
-        installer::scriptitems::replace_setup_variables($profileitemsinproductlanguageresolvedarrayref, $languagestringref, $allvariableshashref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profileitems4.log", $profileitemsinproductlanguageresolvedarrayref); }
-
-        if ( $installer::globals::patch_user_dir )
-        {
-            installer::scriptitems::replace_userdir_variable($profileitemsinproductlanguageresolvedarrayref);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profileitems4a.log", $profileitemsinproductlanguageresolvedarrayref); }		
-        }
-
-        installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($profilesinproductlanguageresolvedarrayref, $dirsinproductarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "profiles4.log", $profilesinproductlanguageresolvedarrayref); }
-
-        # Now the Profiles can be created
-
-        installer::profiles::create_profiles($profilesinproductlanguageresolvedarrayref, $profileitemsinproductlanguageresolvedarrayref, $filesinproductlanguageresolvedarrayref, $languagestringref, $allvariableshashref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles15.log", $filesinproductlanguageresolvedarrayref); }
-    }
-
-    my $registryitemsinproductlanguageresolvedarrayref; # cannot be defined in the following "if ( $installer::globals::iswindowsbuild )"
-    my $folderinproductlanguageresolvedarrayref;		# cannot be defined in the following "if ( $installer::globals::iswindowsbuild )"
-    my $folderitemsinproductlanguageresolvedarrayref;	# cannot be defined in the following "if ( $installer::globals::iswindowsbuild )"
-
-    if ( $installer::globals::iswindowsbuild )	# Windows specific items: Folder, FolderItem, RegistryItem
-    {
-        #########################################################
-        # language dependent part for folder
-        #########################################################
-
-        installer::logger::print_message( "... analyzing folder ...\n" );
-
-        $folderinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($folderinproductarrayref, $languagesarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folder2.log", $folderinproductlanguageresolvedarrayref); }
-
-        installer::scriptitems::changing_name_of_language_dependent_keys($folderinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folder3.log", $folderinproductlanguageresolvedarrayref); }
-
-        #########################################################
-        # language dependent part for folderitems
-        #########################################################
-
-        installer::logger::print_message( "... analyzing folderitems ...\n" );
-
-        $folderitemsinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($folderitemsinproductarrayref, $languagesarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folderitems2.log", $folderitemsinproductlanguageresolvedarrayref); }
-
-        installer::scriptitems::changing_name_of_language_dependent_keys($folderitemsinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folderitems3.log", $folderitemsinproductlanguageresolvedarrayref); }
-
-        #########################################################
-        # language dependent part for registryitems
-        #########################################################
-
-        installer::logger::print_message( "... analyzing registryitems ...\n" );
-
-        $registryitemsinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($registryitemsinproductarrayref, $languagesarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems2.log", $registryitemsinproductlanguageresolvedarrayref); }
-
-        installer::scriptitems::changing_name_of_language_dependent_keys($registryitemsinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems3.log", $registryitemsinproductlanguageresolvedarrayref); }	
-    }
-
-    #########################################################
-    # language dependent part for modules
-    #########################################################
-
-    my $modulesinproductlanguageresolvedarrayref;
-    
-    if (!($installer::globals::is_copy_only_project)) 
-    {
-        installer::logger::print_message( "... analyzing modules ...\n" );
-
-        $modulesinproductlanguageresolvedarrayref = installer::scriptitems::resolving_all_languages_in_productlists($modulesinproductarrayref, $languagesarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes_modules($loggingdir . "modules2.log", $modulesinproductlanguageresolvedarrayref); }
-
-        $modulesinproductlanguageresolvedarrayref = installer::scriptitems::remove_not_required_language_modules($modulesinproductlanguageresolvedarrayref, $languagesarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes_modules($loggingdir . "modules2a.log", $modulesinproductlanguageresolvedarrayref); }
-
-        if ( $installer::globals::analyze_spellcheckerlanguage )
-        {
-            $modulesinproductlanguageresolvedarrayref = installer::scriptitems::remove_not_required_spellcheckerlanguage_modules($modulesinproductlanguageresolvedarrayref);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes_modules($loggingdir . "modules3.log", $modulesinproductlanguageresolvedarrayref); }
-
-            $filesinproductlanguageresolvedarrayref = installer::scriptitems::remove_not_required_spellcheckerlanguage_files($filesinproductlanguageresolvedarrayref);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles15b.log", $filesinproductlanguageresolvedarrayref); }
-        }
-        
-        installer::scriptitems::changing_name_of_language_dependent_keys($modulesinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes_modules($loggingdir . "modules3a.log", $modulesinproductlanguageresolvedarrayref); }
-
-        installer::scriptitems::select_required_language_strings($modulesinproductlanguageresolvedarrayref);	# using english strings
-            
-    }
-        
-    # Copy-only projects can now start to copy all items File and ScpAction 
-    if ( $installer::globals::is_copy_only_project ) { installer::copyproject::copy_project($filesinproductlanguageresolvedarrayref, $scpactionsinproductlanguageresolvedarrayref, $loggingdir, $languagestringref, $shipinstalldir, $allsettingsarrayref); }
-
-    # Language pack projects can now start to select the required information 
-    if ( $installer::globals::languagepack )
-    {
-        $filesinproductlanguageresolvedarrayref = installer::languagepack::select_language_items($filesinproductlanguageresolvedarrayref, $languagesarrayref, "File");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16b.log", $filesinproductlanguageresolvedarrayref); }
-        $scpactionsinproductlanguageresolvedarrayref = installer::languagepack::select_language_items($scpactionsinproductlanguageresolvedarrayref, $languagesarrayref, "ScpAction");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6b.log", $scpactionsinproductlanguageresolvedarrayref); }
-        $linksinproductlanguageresolvedarrayref = installer::languagepack::select_language_items($linksinproductlanguageresolvedarrayref, $languagesarrayref, "Shortcut");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks8b.log", $linksinproductlanguageresolvedarrayref); }
-        $unixlinksinproductlanguageresolvedarrayref = installer::languagepack::select_language_items($unixlinksinproductlanguageresolvedarrayref, $languagesarrayref, "Unixlink");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks5.log", $unixlinksinproductlanguageresolvedarrayref); }
-        @{$folderitemsinproductlanguageresolvedarrayref} = (); # no folderitems in languagepacks
-
-        # Collecting the directories again, to include only the language specific directories
-        ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3alangpack.log", $directoriesforepmarrayref); }
-        ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref, $alldirectoryhash);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3blangpack.log", $directoriesforepmarrayref); }
-        installer::sorter::sorting_array_of_hashes($directoriesforepmarrayref, "HostName");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3clangpack.log", $directoriesforepmarrayref); }
-
-        if ( $installer::globals::iswindowsbuild )
-        {
-            $registryitemsinproductlanguageresolvedarrayref = installer::worker::select_langpack_items($registryitemsinproductlanguageresolvedarrayref, "RegistryItem");
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems3aa.log", $registryitemsinproductlanguageresolvedarrayref); }			
-        }
-
-    }
-
-    # Help pack projects can now start to select the required information
-    if ( $installer::globals::helppack )
-    {
-        $filesinproductlanguageresolvedarrayref = installer::helppack::select_help_items($filesinproductlanguageresolvedarrayref, $languagesarrayref, "File");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16b2.log", $filesinproductlanguageresolvedarrayref); }
-        $scpactionsinproductlanguageresolvedarrayref = installer::helppack::select_help_items($scpactionsinproductlanguageresolvedarrayref, $languagesarrayref, "ScpAction");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6b2.log", $scpactionsinproductlanguageresolvedarrayref); }
-        $linksinproductlanguageresolvedarrayref = installer::helppack::select_help_items($linksinproductlanguageresolvedarrayref, $languagesarrayref, "Shortcut");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks8b2.log", $linksinproductlanguageresolvedarrayref); }
-        $unixlinksinproductlanguageresolvedarrayref = installer::helppack::select_help_items($unixlinksinproductlanguageresolvedarrayref, $languagesarrayref, "Unixlink");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks5b2.log", $unixlinksinproductlanguageresolvedarrayref); }
-        @{$folderitemsinproductlanguageresolvedarrayref} = (); # no folderitems in helppacks
-
-        # Collecting the directories again, to include only the language specific directories
-        ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3ahelppack.log", $directoriesforepmarrayref); }
-        ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref, $alldirectoryhash);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3bhelppack.log", $directoriesforepmarrayref); }
-        installer::sorter::sorting_array_of_hashes($directoriesforepmarrayref, "HostName");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3chelppack.log", $directoriesforepmarrayref); }
-
-        if ( $installer::globals::iswindowsbuild )
-        {
-            $registryitemsinproductlanguageresolvedarrayref = installer::worker::select_helppack_items($registryitemsinproductlanguageresolvedarrayref, "RegistryItem");
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems3aa2.log", $registryitemsinproductlanguageresolvedarrayref); }
-        }
-
-    }
-
-    # Collecting all files without flag PATCH (for maintenance reasons)
-    if ( $installer::globals::patch ) { installer::worker::collect_all_files_without_patch_flag($filesinproductlanguageresolvedarrayref); }
-
-    # Patch projects can now start to select the required information 
-    if (( $installer::globals::patch ) && (( $installer::globals::issolarispkgbuild ) || ( $installer::globals::iswindowsbuild )))
-    {
-        $filesinproductlanguageresolvedarrayref = installer::worker::select_patch_items($filesinproductlanguageresolvedarrayref, "File");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16patch.log", $filesinproductlanguageresolvedarrayref); }
-        $scpactionsinproductlanguageresolvedarrayref = installer::worker::select_patch_items($scpactionsinproductlanguageresolvedarrayref, "ScpAction");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6patch.log", $scpactionsinproductlanguageresolvedarrayref); }
-        $linksinproductlanguageresolvedarrayref = installer::worker::select_patch_items($linksinproductlanguageresolvedarrayref, "Shortcut");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productlinks8patch.log", $linksinproductlanguageresolvedarrayref); }
-        $unixlinksinproductlanguageresolvedarrayref = installer::worker::select_patch_items($unixlinksinproductlanguageresolvedarrayref, "Unixlink");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks6patch.log", $unixlinksinproductlanguageresolvedarrayref); }
-        $folderitemsinproductlanguageresolvedarrayref = installer::worker::select_patch_items($folderitemsinproductlanguageresolvedarrayref, "FolderItem");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfolderitems1patch.log", $folderitemsinproductlanguageresolvedarrayref); }
-        # @{$folderitemsinproductlanguageresolvedarrayref} = (); # no folderitems in languagepacks
-        
-        if ( $installer::globals::iswindowsbuild )
-        {
-            $registryitemsinproductlanguageresolvedarrayref = installer::worker::select_patch_items_without_name($registryitemsinproductlanguageresolvedarrayref, "RegistryItem");
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems3a.log", $registryitemsinproductlanguageresolvedarrayref); }			
-
-            installer::worker::prepare_windows_patchfiles($filesinproductlanguageresolvedarrayref, $languagestringref, $allvariableshashref);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16bpatch.log", $filesinproductlanguageresolvedarrayref); }
-
-            # For Windows patches, the directories can now be collected again
-            ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist4_patch.log", $directoriesforepmarrayref); }
-        
-            installer::sorter::sorting_array_of_hashes($directoriesforepmarrayref, "HostName");
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist5_patch.log", $directoriesforepmarrayref); }
-        }
-    }
-
-    #########################################################
-    # Collecting all scp actions
-    #########################################################
-
-    installer::worker::collect_scpactions($scpactionsinproductlanguageresolvedarrayref);
-
-    #########################################################
-    # creating inf files for user system integration
-    #########################################################
-
-    if (( $installer::globals::iswindowsbuild ) && ( ! $installer::globals::patch ))	# Windows specific items: Folder, FolderItem, RegistryItem
-    {
-        installer::logger::print_message( "... creating inf files ...\n" );
-        installer::worker::create_inf_file($filesinproductlanguageresolvedarrayref, $registryitemsinproductlanguageresolvedarrayref, $folderinproductlanguageresolvedarrayref, $folderitemsinproductlanguageresolvedarrayref, $modulesinproductlanguageresolvedarrayref, $languagesarrayref, $languagestringref, $allvariableshashref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16c.log", $filesinproductlanguageresolvedarrayref); }
-    }
-
-    ###########################################
-    # Using upx, to decrease file size
-    # Currently only for Windows.
-    ###########################################
-
-    if ( $allvariableshashref->{'UPXPRODUCT'} )
-    {
-        installer::upx::upx_on_libraries($filesinproductlanguageresolvedarrayref, $languagestringref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16d.log", $filesinproductlanguageresolvedarrayref); }
-    }
-
-    ###########################################################
-    # Simple package projects can now start to create the
-    # installation structure by creating Directories, Files
-    # Links and ScpActions. This is the last platform
-    # independent part.
-    ###########################################################
-    
-    if ( $installer::globals::is_simple_packager_project )
-    {
-        installer::simplepackage::create_simple_package($filesinproductlanguageresolvedarrayref, $directoriesforepmarrayref, $scpactionsinproductlanguageresolvedarrayref, $linksinproductlanguageresolvedarrayref, $unixlinksinproductlanguageresolvedarrayref, $loggingdir, $languagestringref, $shipinstalldir, $allsettingsarrayref, $allvariableshashref, $includepatharrayref);
-        next; # ! leaving the current loop, because no further packaging required.
-    }
-
-    ###########################################################
-    # Analyzing the package structure
-    ###########################################################
-
-    installer::logger::print_message( "... analyzing package list ...\n" );
-    
-    my $packages = installer::packagelist::collectpackages($modulesinproductlanguageresolvedarrayref, $languagesarrayref);
-    installer::packagelist::check_packagelist($packages);
-
-    $packages = installer::packagelist::analyze_list($packages, $modulesinproductlanguageresolvedarrayref);
-    installer::packagelist::remove_multiple_modules_packages($packages);
-
-    # printing packages content:
-    installer::packagelist::log_packages_content($packages);
-    installer::packagelist::create_module_destination_hash($packages, $allvariableshashref);
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("\nEnd of part 1b: The language dependent part\n"); }
-
-    # saving debug info, before starting part 2
-    if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
-
-    #################################################
-    # Part 2: The platform dependent part
-    #################################################
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 2: The platform dependent part\n"); }
-
-    #################################################
-    # Part 2a: All non-Windows platforms
-    #################################################
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 2a: All non-Windows platforms\n"); }
-
-    #########################################################
-    # ... creating epm list file ...
-    # Only for non-Windows platforms
-    #########################################################
-
-    if (!( $installer::globals::iswindowsbuild ))
-    {
-        ####################################################
-        # Writing log file before packages are packed
-        ####################################################
-
-        installer::logger::print_message( "... creating log file " . $loggingdir . $installer::globals::logfilename . "\n" );
-        installer::files::save_file($loggingdir . $installer::globals::logfilename, \@installer::globals::logfileinfo);
-
-        ####################################################
-        # Creating directories
-        ####################################################
-
-        if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { installer::download::set_download_filename($languagestringref, $allvariableshashref); }
-        else { installer::download::resolve_variables_in_downloadname($allvariableshashref, "", $languagestringref); }
-
-        $installdir = installer::worker::create_installation_directory($shipinstalldir, $languagestringref, \$current_install_number);
-
-        my $listfiledir = installer::systemactions::create_directories("listfile", $languagestringref);
-        my $installlogdir = installer::systemactions::create_directory_next_to_directory($installdir, "log");
-
-        ####################################################
-        # Reading for Solaris all package descriptions
-        # from file defined in property PACKAGEMAP
-        ####################################################
-
-        if (  $installer::globals::issolarisbuild ) { installer::epmfile::read_packagemap($allvariableshashref, $includepatharrayref, $languagesarrayref); }
-
-        my $epmexecutable = "";
-        my $found_epm = 0;
-
-        # shuffle array to reduce parallel packaging process in pool
-        installer::worker::shuffle_array($packages);
-
-        # iterating over all packages
-        for ( my $k = 0; $k <= $#{$packages}; $k++ )
-        {
-            my $onepackage = ${$packages}[$k];
-            
-            # checking, if this is a language pack or a project pack.
-            # Creating language packs only, if $installer::globals::languagepack is set. Parameter: -languagepack
-            
-            if ( $installer::globals::languagepack ) { installer::languagepack::replace_languagestring_variable($onepackage, $languagestringref); }
-    
-            # checking, if this is a help pack
-            # Creating help packs only, if $installer::globals::helppack is set. Parameter: -helppack
-
-            if ( $installer::globals::helppack ) { installer::helppack::replace_languagestring_variable($onepackage, $languagestringref); }
-
-            my $onepackagename = $onepackage->{'module'};			# name of the top module (required)
-
-            my $shellscriptsfilename = "";
-            if ( $onepackage->{'script'} ) { $shellscriptsfilename = $onepackage->{'script'}; }
-            # no scripts for Solaris patches!
-            if (( $installer::globals::patch ) && ( $installer::globals::issolarispkgbuild )) { $shellscriptsfilename = ""; }
-
-            ###########################
-            # package name
-            ###########################
-
-            my $packagename = "";
-
-            if ( $installer::globals::issolarisbuild )	 # only for Solaris
-            {
-                if ( $onepackage->{'solarispackagename'} ) { $packagename = $onepackage->{'solarispackagename'}; }	
-            }
-            else # not Solaris
-            {
-                if ( $onepackage->{'packagename'} ) { $packagename = $onepackage->{'packagename'}; }
-            }
-                
-            if (!($packagename eq ""))
-            { 
-                installer::packagelist::resolve_packagevariables(\$packagename, $allvariableshashref, 0);
-            }
-
-            # Debian allows no underline in package name
-            if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; } 
-
-            # Debian allows no underline in package name
-            if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; } 
-
-            my $linkaddon = "";
-            my $linkpackage = 0;
-            $installer::globals::add_required_package = "";
-            $installer::globals::linuxlinkrpmprocess = 0;
-            
-            if ( $installer::globals::makelinuxlinkrpm )
-            {
-                my $oldpackagename = $packagename;
-                $installer::globals::add_required_package = $oldpackagename;	# the link rpm requires the non-linked version
-                if ( $installer::globals::languagepack ) { $packagename = $packagename . "_u"; }
-                elsif ( $installer::globals::helppack ) { $packagename = $packagename . "_v"; } # wtf...
-                else { $packagename = $packagename . "u"; }
-                my $savestring = $oldpackagename . "\t" . $packagename;
-                push(@installer::globals::linkrpms, $savestring);
-                $linkaddon = "_links";
-                $installer::globals::linuxlinkrpmprocess = 1;
-                $linkpackage = 1;
-            }
-
-            ####################################################
-            # Header for this package into log file
-            ####################################################
-
-            installer::logger::include_header_into_logfile("Creating package: $packagename ($k)");
-
-            ####################################################
-            # Pool check: If package is created at the moment
-            # try it again later.
-            ####################################################
-
-            if (( $installer::globals::patch ) || 
-                ( $installer::globals::languagepack ) ||
-                ( $installer::globals::helppack ) ||
-                ( $installer::globals::packageformat eq "native" ) ||
-                ( $installer::globals::packageformat eq "portable" ) || 
-                ( $installer::globals::packageformat eq "osx" )) { $allvariableshashref->{'POOLPRODUCT'} = 0; }
-
-            if ( $allvariableshashref->{'POOLPRODUCT'} )
-            {
-                if ( ! $installer::globals::sessionidset ) { installer::packagepool::set_sessionid(); }
-                if ( ! $installer::globals::poolpathset ) { installer::packagepool::set_pool_path(); }
-                if (( ! $installer::globals::getuidpathset ) && ( $installer::globals::issolarisbuild )) { installer::worker::set_getuid_path($includepatharrayref); }
-
-                my $package_is_creatable = installer::packagepool::check_package_availability($packagename);
-
-                if (( ! $package_is_creatable ) && ( ! exists($installer::globals::poolshiftedpackages{$packagename}) ))
-                {
-                    splice(@{$packages}, $k, 1);	# removing package ...
-                    push(@{$packages}, $onepackage);  # ... and adding it to the end
-                    $installer::globals::poolshiftedpackages{$packagename} = 1;	# only shifting each package once
-                    $k--;														# decreasing the counter
-                    my $localinfoline = "Pool: Package \"$packagename\" cannot be created at the moment. Trying again later (1).\n";
-                    installer::logger::print_message($localinfoline);
-                    push( @installer::globals::logfileinfo, $localinfoline);
-                    next;														# repeating this iteration with new package
-                }
-            }
-
-            ###########################################
-            # Root path, can be defined as parameter
-            ###########################################
-
-            my $packagerootpath = "";
-
-            if ($installer::globals::rootpath eq "")
-            {
-                $packagerootpath = $onepackage->{'destpath'};
-                installer::packagelist::resolve_packagevariables(\$packagerootpath, $allvariableshashref, 1);
-                # we put branding and common stuff into the same prefix on unixes => $packagerootpath must be the whole prefix, including the product name
-                if ($installer::globals::isunix) { $packagerootpath .= "/$allvariableshashref->{'UNIXBASISROOTNAME'}"; }
-                if ( $^O =~ /darwin/i ) { $packagerootpath =~ s/\/opt\//\/Applications\//; }
-            }
-            else
-            {
-                $packagerootpath = $installer::globals::rootpath;
-            }
-
-            #############################################
-            # copying the collectors for each package
-            #############################################
-
-            my $filesinpackage = installer::converter::copy_collector($filesinproductlanguageresolvedarrayref);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "files1_" . $packagename . ".log", $filesinpackage); }	
-            my $linksinpackage = installer::converter::copy_collector($linksinproductlanguageresolvedarrayref);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "links1_" . $packagename . ".log", $linksinpackage); }	
-            my $unixlinksinpackage = installer::converter::copy_collector($unixlinksinproductlanguageresolvedarrayref);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks1_" . $packagename . ".log", $unixlinksinpackage); }	
-            my $dirsinpackage = installer::converter::copy_collector($directoriesforepmarrayref);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "dirs1_" . $packagename . ".log", $dirsinpackage); }	
-
-            ###########################################
-            # setting the root path for the packages
-            ###########################################
-            
-            installer::scriptitems::add_rootpath_to_directories($dirsinpackage, $packagerootpath);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "dirs2_" . $packagename . ".log", $dirsinpackage); }	
-            installer::scriptitems::add_rootpath_to_files($filesinpackage, $packagerootpath);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "files2_" . $packagename . ".log", $filesinpackage); }	
-            installer::scriptitems::add_rootpath_to_links($linksinpackage, $packagerootpath);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "links2_" . $packagename . ".log", $linksinpackage); }	
-            installer::scriptitems::add_rootpath_to_files($unixlinksinpackage, $packagerootpath);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks2_" . $packagename . ".log", $unixlinksinpackage); }	
-
-            #################################
-            # collecting items for package
-            #################################
-
-            $filesinpackage = installer::packagelist::find_files_for_package($filesinpackage, $onepackage);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "files3_" . $packagename . ".log", $filesinpackage); }	
-            $unixlinksinpackage = installer::packagelist::find_files_for_package($unixlinksinpackage, $onepackage);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks3_" . $packagename . ".log", $unixlinksinpackage); }	
-            $linksinpackage = installer::packagelist::find_links_for_package($linksinpackage, $filesinpackage);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "links3_" . $packagename . ".log", $linksinpackage); }	
-            $dirsinpackage = installer::packagelist::find_dirs_for_package($dirsinpackage, $onepackage);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "dirs3_" . $packagename . ".log", $dirsinpackage); }	
-
-            ###############################################
-            # nothing to do, if $filesinpackage is empty
-            ###############################################
-
-            if ( ! ( $#{$filesinpackage} > -1 ))
-            {
-                push(@installer::globals::emptypackages, $packagename);
-                $infoline = "\n\nNo file in package: $packagename \-\> Skipping\n\n"; 
-                push(@installer::globals::logfileinfo, $infoline);
-                next;	# next package, end of loop !
-            }
-
-            #################################################################
-            # nothing to do for Linux patches, if no file has flag PATCH
-            #################################################################
-
-            # Linux Patch: The complete RPM has to be built, if one file in the RPM has the flag PATCH (also for DEBs)
-            if (( $installer::globals::patch ) && (( $installer::globals::isrpmbuild ) || ( $installer::globals::isdebbuild )))
-            {
-                my $patchfiles = installer::worker::collect_all_items_with_special_flag($filesinpackage ,"PATCH");
-                if ( ! ( $#{$patchfiles} > -1 ))
-                {
-                    $infoline = "\n\nLinux Patch: No patch file in package: $packagename \-\> Skipping\n\n"; 
-                    push(@installer::globals::logfileinfo, $infoline);
-                    next;
-                }
-            }
-
-            ###########################################
-            # Stripping libraries
-            ###########################################
-
-            # Building for non Windows platforms in cws requires, that all files are stripped before packaging:
-            # 1. copy all files that need to be stripped locally 
-            # 2. strip all these files
-
-            if ( $installer::globals::strip )
-            {
-                installer::strip::strip_libraries($filesinpackage, $languagestringref);
-                if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . $packagename ."_files.log", $filesinpackage); }
-            }
-            
-            ###############################################################
-            # Searching for files in $filesinpackage with flag LINUXLINK
-            ###############################################################
-
-            if (( $installer::globals::islinuxbuild ) && ( ! $installer::globals::simple ))	# for rpms and debian packages
-            {
-                # special handling for all RPMs in $installer::globals::linuxlinkrpms
-
-                if ( $installer::globals::linuxlinkrpms =~ /\b$onepackagename\b/ )
-                {
-                    my $run = 0;
-
-                    if (( $installer::globals::makelinuxlinkrpm ) && ( ! $run ))
-                    {
-                        $filesinpackage = \@installer::globals::linuxpatchfiles;
-                        $linksinpackage = \@installer::globals::linuxlinks;
-                        $installer::globals::makelinuxlinkrpm = 0;
-                        if ( $installer::globals::patch ) { $installer::globals::call_epm = 1; }	 # enabling packing again
-                        $run = 1;
-
-                        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "files3b_" . $packagename . ".log", $filesinpackage); }
-                        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "links3b_" . $packagename . ".log", $linksinpackage); }
-                        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "dirs3b_" . $packagename . ".log", $dirsinpackage); }
-                    }
-
-                    if (( ! $installer::globals::makelinuxlinkrpm ) && ( ! $run ))
-                    {
-                        $filesinpackage = installer::worker::prepare_linuxlinkfiles($filesinpackage);
-                        $linksinpackage = installer::worker::prepare_forced_linuxlinkfiles($linksinpackage);
-                        $installer::globals::makelinuxlinkrpm = 1;
-                        if ( $allvariableshashref->{'OPENSOURCE'} ) { $installer::globals::add_required_package = $packagename . "u"; }
-                        if ( $installer::globals::patch ) { $installer::globals::call_epm = 0; }	 # no packing of core module in patch
-                        $shellscriptsfilename = "";	# shell scripts only need to be included into the link rpm
-                        $run = 1;
-
-                        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "files3a_" . $packagename . ".log", $filesinpackage); }
-                        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "links3a_" . $packagename . ".log", $linksinpackage); }
-                        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "dirs3a_" . $packagename . ".log", $dirsinpackage); }
-                    }					
-                }							
-            }
-
-            ###########################################
-            # Simple installation mechanism
-            ###########################################
-
-            if ( $installer::globals::simple ) { installer::worker::install_simple($onepackagename, $$languagestringref, $dirsinpackage, $filesinpackage, $linksinpackage, $unixlinksinpackage); }
-
-            ###########################################
-            # Checking epm state
-            ###########################################
-
-            if (( $installer::globals::call_epm ) && ( ! $found_epm ))
-            {
-                $epmexecutable = installer::epmfile::find_epm_on_system($includepatharrayref);
-                installer::epmfile::set_patch_state($epmexecutable);	# setting $installer::globals::is_special_epm
-                $found_epm = 1;	# searching only once
-            }
-
-            ###########################################
-            # Creating epm list file
-            ###########################################
-            
-            if ( ! $installer::globals::simple )
-            {			
-                # epm list file format:
-                # type mode owner group destination source options
-                # Example for a file: f 755 root sys /usr/bin/foo foo
-                # Example for a directory: d 755 root sys /var/spool/foo - 
-                # Example for a link: l 000 root sys /usr/bin/linkname filename
-                # The source field specifies the file to link to
-
-                my $epmfilename = "epm_" . $onepackagename . $linkaddon . ".lst";
-
-                installer::logger::print_message( "... creating epm list file $epmfilename ... \n" );
-
-                my $completeepmfilename = $listfiledir . $installer::globals::separator . $epmfilename;
-
-                my @epmfile = ();
-
-                my $epmheaderref = installer::epmfile::create_epm_header($allvariableshashref, $filesinproductlanguageresolvedarrayref, $languagesarrayref, $onepackage);
-                installer::epmfile::adding_header_to_epm_file(\@epmfile, $epmheaderref);
-
-                if (( $installer::globals::patch ) && ( $installer::globals::issolarispkgbuild ))
-                {
-                    $filesinpackage = installer::worker::analyze_patch_files($filesinpackage);
-                    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "files4_" . $packagename . ".log", $filesinpackage); }	
-
-                    if ( ! ( $#{$filesinpackage} > -1 ))
-                    {
-                        push(@installer::globals::emptypackages, $packagename);
-                        $infoline = "\nNo file in package: $packagename \-\> Skipping\n"; 
-                        push(@installer::globals::logfileinfo, $infoline);
-                        next;	# next package, end of loop !
-                    }
-                }
-
-                # adding directories, files and links into epm file
-            
-                installer::epmfile::put_directories_into_epmfile($dirsinpackage, \@epmfile, $allvariableshashref, $packagerootpath);
-                installer::epmfile::put_files_into_epmfile($filesinpackage, \@epmfile );
-                installer::epmfile::put_links_into_epmfile($linksinpackage, \@epmfile );
-                installer::epmfile::put_unixlinks_into_epmfile($unixlinksinpackage, \@epmfile );
-
-                if ((!( $shellscriptsfilename eq "" )) && (!($installer::globals::iswindowsbuild))) { installer::epmfile::adding_shellscripts_to_epm_file(\@epmfile, $shellscriptsfilename, $packagerootpath, $allvariableshashref, $filesinpackage); }
-
-                installer::files::save_file($completeepmfilename ,\@epmfile);
-
-                # ... splitting the rootpath into a relocatable part and a static part, if possible
-
-                my $staticpath = "";
-                my $relocatablepath = "";
-                # relocatable path can be defined in package list
-                if ( $onepackage->{'relocatablepath'} ) { $relocatablepath = $onepackage->{'relocatablepath'}; }
-                # setting fix part and variable part of destination path
-                installer::epmfile::analyze_rootpath($packagerootpath, \$staticpath, \$relocatablepath, $allvariableshashref);
-                
-                # ... replacing the variable PRODUCTDIRECTORYNAME in the shellscriptfile by $staticpath
-
-                installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "PRODUCTDIRECTORYNAME", $staticpath);
-                installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "SOLSUREPACKAGEPREFIX", $allvariableshashref->{'SOLSUREPACKAGEPREFIX'});
-                installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "UREPACKAGEPREFIX", $allvariableshashref->{'UREPACKAGEPREFIX'});
-                installer::files::save_file($completeepmfilename ,\@epmfile);
-
-                #######################################################
-                # Now the complete content of the package is known,
-                # including variables and shell scripts.
-                # Create the package or using the package pool?
-                #######################################################
-
-                my $use_package_from_pool = 0;
-                if ( $allvariableshashref->{'POOLPRODUCT'} ) { $use_package_from_pool = installer::packagepool::package_is_up_to_date($allvariableshashref, $onepackage, $packagename, \@epmfile, $filesinpackage, $installdir, $installer::globals::epmoutpath, $languagestringref); }
-
-                if ( $use_package_from_pool == 3 ) # repeat this package later
-                {	
-                    my $package_is_creatable = installer::packagepool::check_package_availability($packagename);
-
-                    if (( ! $package_is_creatable ) && ( ! exists($installer::globals::poolshiftedpackages{$packagename}) ))
-                    {
-                        splice(@{$packages}, $k, 1);	# removing package ...
-                        push(@{$packages}, $onepackage);  # ... and adding it to the end
-                        $installer::globals::poolshiftedpackages{$packagename} = 1;	# only shifting each package once
-                        $k--;														# decreasing the counter
-                        my $localinfoline = "\nPool: Package \"$packagename\" cannot be created at the moment. Trying again later (2).\n";
-                        installer::logger::print_message($localinfoline);
-                        push( @installer::globals::logfileinfo, $localinfoline);
-                        next;														# repeating this iteration with new package
-                    }
-                }
-
-                if ( $use_package_from_pool == 4 ) # There was a problem with pooling. Repeat this package immediately.
-                {
-                        $k--;														# decreasing the counter
-                        my $localinfoline = "\nPool: Package \"$packagename\" had pooling problems. Repeating packaging immediately (3).\n";
-                        installer::logger::print_message($localinfoline);
-                        push( @installer::globals::logfileinfo, $localinfoline);
-                        next;														# repeating this iteration
-                }
-
-                if ( $use_package_from_pool == 0 )
-                {	
-                    # changing into the "install" directory to create installation sets
-    
-                    $currentdir = cwd();	# $currentdir is global in this file
-
-                    chdir($installdir);		# changing into install directory ($installdir is global in this file)
-
-                    ###########################################
-                    # Starting epm
-                    ###########################################
-
-                    # With a patched epm, it is now possible to set the relocatable directory, change 
-                    # the directory in which the packages are created, setting "requires" and "provides"
-                    # (Linux) or creating the "depend" file (Solaris) and finally to begin
-                    # the packaging process with standard tooling and standard parameter
-                    # Linux: Adding into the spec file: Prefix: /opt
-                    # Solaris: Adding into the pkginfo file: BASEDIR=/opt
-                    # Attention: Changing of the path can influence the shell scripts
-                
-                    if (( $installer::globals::is_special_epm ) && ( ($installer::globals::isrpmbuild) || ($installer::globals::issolarispkgbuild) ))	# special handling only for Linux RPMs and Solaris Packages
-                    {
-                        if ( $installer::globals::call_epm )	# only do something, if epm is really executed
-                        {
-                            # ... now epm can be started, to create the installation sets
-
-                            installer::logger::print_message( "... starting patched epm ... \n" );
-
-                            installer::epmfile::call_epm($epmexecutable, $completeepmfilename, $packagename, $includepatharrayref);
-
-                            my $newepmdir = installer::epmfile::prepare_packages($loggingdir, $packagename, $staticpath, $relocatablepath, $onepackage, $allvariableshashref, $filesinpackage, $languagestringref);	# adding the line for Prefix / Basedir, include rpmdir
-
-                            installer::epmfile::create_packages_without_epm($newepmdir, $packagename, $includepatharrayref, $allvariableshashref, $languagestringref);	# start to package
-
-                            # finally removing all temporary files
-
-                            installer::epmfile::remove_temporary_epm_files($newepmdir, $loggingdir, $packagename);
-
-                            # Installation:
-                            # Install: pkgadd -a myAdminfile -d ./SUNWso8m34.pkg
-                            # Install: rpm -i --prefix=/opt/special --nodeps so8m35.rpm
-
-                            installer::epmfile::create_new_directory_structure($newepmdir);
-                            $installer::globals::postprocess_specialepm = 1;
-
-                            # solaris patch not needed anymore						
-                        }		
-                    }
-                    else	# this is the standard epm (not relocatable) or ( nonlinux and nonsolaris )
-                    {			
-                        installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "\$\$PRODUCTINSTALLLOCATION", $relocatablepath);
-                        installer::files::save_file($completeepmfilename ,\@epmfile);	# Warning for pool, content of epm file is changed.
-
-                        if ( $installer::globals::call_epm )
-                        {
-                            # ... now epm can be started, to create the installation sets
-
-                            installer::logger::print_message( "... starting unpatched epm ... \n" );
-            
-                            if ( $installer::globals::call_epm ) { installer::epmfile::call_epm($epmexecutable, $completeepmfilename, $packagename, $includepatharrayref); }
-
-                            if (($installer::globals::isrpmbuild) || ($installer::globals::issolarispkgbuild) || ($installer::globals::debian))
-                            {
-                                $installer::globals::postprocess_standardepm = 1;
-                            }
-                        }
-                    }
-
-                    if ( $allvariableshashref->{'POOLPRODUCT'} ) { installer::packagepool::put_content_into_pool($packagename, $installdir, $installer::globals::epmoutpath, $filesinpackage, \@epmfile); }
-
-                    chdir($currentdir);	# changing back into start directory
-
-                } # end of "if ( ! $use_package_from_pool ) 
-
-            } # end of "if ( ! $installer::globals::simple ) 
-
-            ###########################################
-            # xpd installation mechanism
-            ###########################################
-
-            # Creating the xpd file for the package. This has to happen always, not determined by $use_package_from_pool
-
-            if ( $installer::globals::isxpdplatform )
-            {
-                if (( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $installer::globals::patch ))
-                {
-                    if (( $allvariableshashref->{'XPDINSTALLER'} ) && ( $installer::globals::call_epm != 0 ))
-                    {
-                        installer::xpdinstaller::create_xpd_file($onepackage, $packages, $languagestringref, $allvariableshashref, $modulesinproductarrayref, $installdir, $installer::globals::epmoutpath, $linkpackage, \%installer::globals::xpdpackageinfo);
-                        $installer::globals::xpd_files_prepared = 1;
-                        %installer::globals::xpdpackageinfo = ();
-                    }
-                }
-            }
-
-            if ( $installer::globals::makelinuxlinkrpm ) { $k--; }	# decreasing the counter to create the link rpm!
-
-        }	# end of "for ( my $k = 0; $k <= $#{$packages}; $k++ )"
-
-        installer::packagepool::log_pool_statistics();
-
-        ##############################################################
-        # Post epm functionality, after the last package is packed
-        ##############################################################
-
-        if ( $installer::globals::postprocess_specialepm )
-        {
-            installer::logger::include_header_into_logfile("Post EPM processes (Patched EPM):");
-
-            chdir($installdir);
-
-            # Copying the cde, kde and gnome packages into the installation set
-            if ( $installer::globals::addsystemintegration ) { installer::epmfile::put_systemintegration_into_installset($installer::globals::epmoutpath, $includepatharrayref, $allvariableshashref, $modulesinproductarrayref); }
-
-            # Adding license and readme into installation set
-            if ($installer::globals::addlicensefile) { installer::worker::put_scpactions_into_installset("."); }
-
-            # Adding child projects to installation dynamically
-            if ($installer::globals::addchildprojects) { installer::epmfile::put_childprojects_into_installset($installer::globals::epmoutpath, $allvariableshashref, $modulesinproductarrayref, $includepatharrayref); }
-
-            # Adding license file into setup
-            if ( $allvariableshashref->{'PUT_LICENSE_INTO_SETUP'} ) { installer::worker::put_license_into_setup(".", $includepatharrayref); }
-
-            # Creating installation set for Unix language packs, that are not part of multi lingual installation sets
-            if ( ( $installer::globals::languagepack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::languagepack::build_installer_for_languagepack($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
-
-            # Creating installation set for Unix help packs, that are not part of multi lingual installation sets
-            if ( ( $installer::globals::helppack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::helppack::build_installer_for_helppack($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
-
-            # Finalizing patch installation sets
-            if (( $installer::globals::patch ) && ( $installer::globals::issolarispkgbuild )) { installer::epmfile::finalize_patch($installer::globals::epmoutpath, $allvariableshashref); }
-            if (( $installer::globals::patch ) && ( $installer::globals::isrpmbuild )) { installer::epmfile::finalize_linux_patch($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref); }
-
-            # Copying the xpd installer into the installation set
-            if (( $allvariableshashref->{'XPDINSTALLER'} ) && ( $installer::globals::isxpdplatform ) && ( $installer::globals::xpd_files_prepared ))
-            {
-                installer::xpdinstaller::create_xpd_installer($installdir, $allvariableshashref, $languagestringref);
-            }
-
-            chdir($currentdir);	# changing back into start directory
-        }
-
-        if ( $installer::globals::postprocess_standardepm )
-        {
-            installer::logger::include_header_into_logfile("Post EPM processes (Standard EPM):");
-
-            chdir($installdir);
-            
-            # determine the destination directory
-            my $newepmdir = installer::epmfile::determine_installdir_ooo();
-
-            # Copying the cde, kde and gnome packages into the installation set
-            if ( $installer::globals::addsystemintegration ) { installer::epmfile::put_systemintegration_into_installset($newepmdir, $includepatharrayref, $allvariableshashref, $modulesinproductarrayref); }
-
-            # Adding license and readme into installation set
-            if ($installer::globals::addlicensefile) { installer::worker::put_scpactions_into_installset("."); }
-
-            # Adding license file into setup
-            if ( $allvariableshashref->{'PUT_LICENSE_INTO_SETUP'} ) { installer::worker::put_license_into_setup(".", $includepatharrayref); }
-
-            # Creating installation set for Unix language packs, that are not part of multi lingual installation sets
-            if ( ( $installer::globals::languagepack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::languagepack::build_installer_for_languagepack($newepmdir, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
-
-            # Creating installation set for Unix help packs, that are not part of multi lingual installation sets
-            if ( ( $installer::globals::helppack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::helppack::build_installer_for_helpepack($newepmdir, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
-
-            chdir($currentdir);	# changing back into start directory
-        }
-
-        if (( $installer::globals::issolarispkgbuild ) && ( $allvariableshashref->{'COLLECT_PKGMAP'} )) { installer::worker::collectpackagemaps($installdir, $languagestringref, $allvariableshashref); }
-        
-        #######################################################
-        # Analyzing the log file
-        #######################################################
-
-        my $is_success = 0;
-        my $finalinstalldir = "";
-
-        installer::worker::clean_output_tree();	# removing directories created in the output tree
-        ($is_success, $finalinstalldir) = installer::worker::analyze_and_save_logfile($loggingdir, $installdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number);
-        my $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "downloadname");
-        if ( $is_success ) { installer::followme::save_followme_info($finalinstalldir, $includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref, $current_install_number, $loggingdir, $installlogdir); }
-
-        #######################################################
-        # Creating download installation set
-        #######################################################
-
-        if ( $installer::globals::makedownload )
-        {
-            my $create_download = 0;
-            if ( $$downloadname ne "" ) { $create_download = 1; }
-            if (( $is_success ) && ( $create_download ) && ( $ENV{'ENABLE_DOWNLOADSETS'} ))
-            {
-                my $downloaddir = installer::download::create_download_sets($finalinstalldir, $includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref);
-                installer::worker::analyze_and_save_logfile($loggingdir, $downloaddir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number);
-            }
-        }
-
-        #######################################################
-        # Creating jds installation set
-        #######################################################
-
-        if ( $installer::globals::makejds )
-        {
-            my $create_jds = 0;
-
-            if ( $allvariableshashref->{'JDSBUILD'} ) { $create_jds = 1; }
-            if (! $installer::globals::issolarispkgbuild ) { $create_jds = 0; }
-
-            if (( $is_success ) && ( $create_jds ))
-            {
-                if ( ! $installer::globals::jds_language_controlled )
-                {
-                    my $correct_language = installer::worker::check_jds_language($allvariableshashref, $languagestringref);
-                    $installer::globals::correct_jds_language = $correct_language;
-                    $installer::globals::jds_language_controlled = 1;
-                }
-
-                if ( $installer::globals::correct_jds_language )
-                {
-                    my $jdsdir = installer::worker::create_jds_sets($finalinstalldir, $allvariableshashref, $languagestringref, $languagesarrayref, $includepatharrayref);
-                    installer::worker::clean_jds_temp_dirs();
-                    installer::worker::analyze_and_save_logfile($loggingdir, $jdsdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number);
-                }
-            }
-        }
-
-    }	# end of "if (!( $installer::globals::iswindowsbuild ))"
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("\nEnd of part 2a: All non-Windows platforms\n"); }
-
-    #################################################
-    # Part 2b: The Windows platform
-    #################################################
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 2b: The Windows platform\n"); }
-
-    #####################################################################
-    # ... creating idt files ...
-    # Only for Windows builds ($installer::globals::compiler is wntmsci)
-    #####################################################################
-    
-    if ( $installer::globals::iswindowsbuild )
-    {
-        ###########################################
-        # Stripping libraries
-        ###########################################
-
-        # Building for gcc build in cws requires, that all files are stripped before packaging:
-        # 1. copy all files that need to be stripped locally 
-        # 2. strip all these files
-
-        if ( $installer::globals::compiler =~ /wntgcci/ )
-        {
-            installer::windows::strip::strip_binaries($filesinproductlanguageresolvedarrayref, $languagestringref);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles16e.log", $filesinproductlanguageresolvedarrayref); }
-        }
-
-        $installdir = installer::worker::create_installation_directory($shipinstalldir, $languagestringref, \$current_install_number);
-
-         my $idtdirbase = installer::systemactions::create_directories("idt_files", $languagestringref);
-         $installer::globals::infodirectory = installer::systemactions::create_directories("info_files", $languagestringref);
-        my $installlogdir = installer::systemactions::create_directory_next_to_directory($installdir, "log");
-
-        #################################################################################
-        # Preparing cabinet files from package definitions
-        #################################################################################
-
-        installer::packagelist::prepare_cabinet_files($packages, $allvariableshashref);
-        # printing packages content:
-        installer::packagelist::log_cabinet_assignments();
-
-        #################################################################################
-        # Begin of functions that are used for the creation of idt files (Windows only)
-        #################################################################################
-        
-        installer::logger::print_message( "... creating idt files ...\n" );
-
-        installer::logger::include_header_into_logfile("Creating idt files:");
-
-        my $newidtdir = $idtdirbase . $installer::globals::separator . "00";	# new files into language independent directory "00"
-        installer::systemactions::create_directory($newidtdir);
-
-        my @allfilecomponents = ();
-        my @allregistrycomponents = ();
-
-        # Collecting all files with flag "BINARYTABLE"
-        my $binarytablefiles = installer::worker::collect_all_items_with_special_flag($filesinproductlanguageresolvedarrayref ,"BINARYTABLE");
-    
-        # Removing all files with flag "BINARYTABLE_ONLY"
-        @installer::globals::binarytableonlyfiles = ();
-        $filesinproductlanguageresolvedarrayref = installer::worker::remove_all_items_with_special_flag($filesinproductlanguageresolvedarrayref ,"BINARYTABLE_ONLY");
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17.log", $filesinproductlanguageresolvedarrayref); }
-
-        # Collecting all profileitems with flag "INIFILETABLE" for table "IniFile"
-        my $inifiletableentries = installer::worker::collect_all_items_with_special_flag($profileitemsinproductlanguageresolvedarrayref ,"INIFILETABLE");
-
-        # Creating the important dynamic idt files
-        installer::windows::msiglobal::set_msiproductversion($allvariableshashref);
-        installer::windows::msiglobal::put_msiproductversion_into_bootstrapfile($filesinproductlanguageresolvedarrayref);
-
-        # Add cabinet assignments to files
-        installer::windows::file::assign_cab_to_files($filesinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17a.log", $filesinproductlanguageresolvedarrayref); }
-        installer::windows::file::assign_sequencenumbers_to_files($filesinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17b.log", $filesinproductlanguageresolvedarrayref); }
-
-        # Collection all available directory trees
-        installer::windows::directory::collectdirectorytrees($directoriesforepmarrayref);
-
-        $filesinproductlanguageresolvedarrayref = installer::windows::file::create_files_table($filesinproductlanguageresolvedarrayref, \@allfilecomponents, $newidtdir, $allvariableshashref, $uniquefilename, $allupdatesequences, $allupdatecomponents, $allupdatefileorder);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17c.log", $filesinproductlanguageresolvedarrayref); }
-        if ( $installer::globals::updatedatabase ) { installer::windows::file::check_file_sequences($allupdatefileorder, $allupdatecomponentorder); }
-
-        # Attention: The table "Director.idt" contains language specific strings -> parameter: $languagesarrayref !
-        installer::windows::directory::create_directory_table($directoriesforepmarrayref, $languagesarrayref, $newidtdir, $allvariableshashref, $shortdirname, $loggingdir);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles18.log", $filesinproductlanguageresolvedarrayref); }
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt1.log", $directoriesforepmarrayref); }
-
-        # Attention: The table "Registry.idt" contains language specific strings -> parameter: $languagesarrayref !
-        installer::windows::registry::create_registry_table($registryitemsinproductlanguageresolvedarrayref, \@allregistrycomponents, $newidtdir, $languagesarrayref, $allvariableshashref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems4.log", $registryitemsinproductlanguageresolvedarrayref); }
-    
-        installer::windows::component::create_component_table($filesinproductlanguageresolvedarrayref, $registryitemsinproductlanguageresolvedarrayref, $directoriesforepmarrayref, \@allfilecomponents, \@allregistrycomponents, $newidtdir, $componentid, $componentidkeypath, $allvariableshashref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles19.log", $filesinproductlanguageresolvedarrayref); }
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems5.log", $registryitemsinproductlanguageresolvedarrayref); }
-
-        # Attention: The table "Feature.idt" contains language specific strings -> parameter: $languagesarrayref !
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules4.log", $modulesinproductlanguageresolvedarrayref); }
-        installer::windows::feature::add_uniquekey($modulesinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules4a.log", $modulesinproductlanguageresolvedarrayref); }
-        $modulesinproductlanguageresolvedarrayref = installer::windows::feature::sort_feature($modulesinproductlanguageresolvedarrayref);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "modules4b.log", $modulesinproductlanguageresolvedarrayref); }
-        installer::windows::feature::create_feature_table($modulesinproductlanguageresolvedarrayref, $newidtdir, $languagesarrayref, $allvariableshashref);
-
-        installer::windows::featurecomponent::create_featurecomponent_table($filesinproductlanguageresolvedarrayref, $registryitemsinproductlanguageresolvedarrayref, $newidtdir);
-
-        installer::windows::media::create_media_table($filesinproductlanguageresolvedarrayref, $newidtdir, $allvariableshashref, $allupdatelastsequences, $allupdatediskids);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles20.log", $filesinproductlanguageresolvedarrayref); }
-
-        installer::windows::font::create_font_table($filesinproductlanguageresolvedarrayref, $newidtdir);
-
-        # Attention: The table "Shortcut.idt" contains language specific strings -> parameter: $languagesarrayref !
-        # Attention: Shortcuts (Folderitems) have icon files, that have to be copied into the Icon directory (last parameter)
-        my @iconfilecollector = ();
-
-        installer::windows::shortcut::create_shortcut_table($filesinproductlanguageresolvedarrayref, $linksinproductlanguageresolvedarrayref, $folderinproductlanguageresolvedarrayref, $folderitemsinproductlanguageresolvedarrayref, $directoriesforepmarrayref, $newidtdir, $languagesarrayref, $includepatharrayref, \@iconfilecollector);
-        if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "folderitems4.log", $folderitemsinproductlanguageresolvedarrayref); }
-
-        installer::windows::inifile::create_inifile_table($inifiletableentries, $filesinproductlanguageresolvedarrayref, $newidtdir);
-
-        installer::windows::icon::create_icon_table(\@iconfilecollector, $newidtdir);	 # creating the icon table with all iconfiles used as shortcuts (FolderItems)
-
-        installer::windows::createfolder::create_createfolder_table($directoriesforepmarrayref, $filesinproductlanguageresolvedarrayref, $newidtdir, $allvariableshashref);
-
-        installer::windows::upgrade::create_upgrade_table($newidtdir, $allvariableshashref);
-
-        if (( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack )) # the following tables not for language packs or help packs
-        {
-            installer::windows::removefile::create_removefile_table($folderitemsinproductlanguageresolvedarrayref, $newidtdir);
-
-            installer::windows::selfreg::create_selfreg_table($filesinproductlanguageresolvedarrayref, $newidtdir);
-
-            # Adding Assemblies into the tables MsiAssembly and MsiAssemblyName dynamically
-            installer::windows::assembly::create_msiassembly_table($filesinproductlanguageresolvedarrayref, $newidtdir);
-            installer::windows::assembly::create_msiassemblyname_table($filesinproductlanguageresolvedarrayref, $newidtdir);
-            installer::windows::assembly::add_assembly_condition_into_component_table($filesinproductlanguageresolvedarrayref, $newidtdir);
-        }
-        
-        $infoline = "\n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-
-        # Localizing the language dependent idt files
-        # For every language there will be a localized msi database
-        # For multilingual installation sets, the differences of this
-        # databases have to be stored in transforms.
-        
-        for ( my $m = 0; $m <= $#{$languagesarrayref}; $m++ )
-        {
-            my $onelanguage = ${$languagesarrayref}[$m];
-
-            my $is_bidi = 0;
-            if ( installer::existence::exists_in_array($onelanguage, \@installer::globals::bidilanguages) ) { $is_bidi = 1; }
-
-            my $languageidtdir = $idtdirbase . $installer::globals::separator . $onelanguage;
-            if ( -d $languageidtdir ) { installer::systemactions::remove_complete_directory($languageidtdir, 1); }
-            installer::systemactions::create_directory($languageidtdir);
-
-            # Copy the template idt files and the new created idt files into this language directory
-
-            installer::logger::print_message( "... copying idt files ...\n" );
-
-            installer::logger::include_header_into_logfile("Copying idt files to $languageidtdir:");
-                        
-            installer::windows::idtglobal::prepare_language_idt_directory($languageidtdir, $newidtdir, $onelanguage, $filesinproductlanguageresolvedarrayref, \@iconfilecollector, $binarytablefiles, $allvariableshashref);
-
-            if ( ! $installer::globals::languagepack && ! $installer::globals::helppack )
-            {
-                # For multilingual installation sets, the dialog for the language selection can now be prepared, with 
-                # a checkbox for each available language. This has to happen before the following translation.
-                # The new controls have to be added into the Control.idt
-
-                my $controlidttablename = $languageidtdir . $installer::globals::separator . "Control.idt";
-                my $controlidttable = installer::files::read_file($controlidttablename);
-                installer::windows::idtglobal::add_language_checkboxes_to_database($controlidttable, $languagesarrayref);
-                installer::files::save_file($controlidttablename, $controlidttable);
-                $infoline = "Added checkboxes for language selection dialog into table $controlidttablename\n"; 
-                push(@installer::globals::logfileinfo, $infoline);
-            }
-
-            # Now all files are copied into a language specific directory
-            # The template idt files can be translated
-
-            installer::logger::print_message( "... localizing idt files (language: $onelanguage) ...\n" );
-
-            installer::logger::include_header_into_logfile("Localizing idt files (Language: $onelanguage):");
-
-            my @translationfiles = ();			# all idt files, that need a translation
-            push(@translationfiles, "ActionTe.idt");			
-            push(@translationfiles, "Control.idt");			
-            push(@translationfiles, "CustomAc.idt");			
-            push(@translationfiles, "Error.idt");			
-            push(@translationfiles, "LaunchCo.idt");			
-            push(@translationfiles, "RadioBut.idt");			
-            push(@translationfiles, "Property.idt");			
-            push(@translationfiles, "UIText.idt");			
-        
-            my $oneidtfilename;
-            my $oneidtfile;
-        
-            foreach $oneidtfilename (@translationfiles)
-            {	
-                my $languagefilename = installer::windows::idtglobal::get_languagefilename($oneidtfilename, $installer::globals::idtlanguagepath);
-                my $languagefile = installer::files::read_file($languagefilename);
-
-                $oneidtfilename = $languageidtdir . $installer::globals::separator . $oneidtfilename;
-                $oneidtfile = installer::files::read_file($oneidtfilename);
-
-                # Now the substitution can start
-                installer::windows::idtglobal::translate_idtfile($oneidtfile, $languagefile, $onelanguage);
-                 
-                installer::files::save_file($oneidtfilename, $oneidtfile);
-
-                $infoline = "Translated idt file: $oneidtfilename into language $onelanguage\n"; 
-                push(@installer::globals::logfileinfo, $infoline);
-                $infoline = "Used languagefile: $languagefilename\n"; 
-                push(@installer::globals::logfileinfo, $infoline);
-            }	
-            
-            # setting the encoding in every table (replacing WINDOWSENCODINGTEMPLATE)
-            
-            installer::windows::idtglobal::setencoding($languageidtdir, $onelanguage);
-
-            # setting bidi attributes, if required
-
-            if ( $is_bidi ) { installer::windows::idtglobal::setbidiattributes($languageidtdir, $onelanguage); }
-
-            # setting the encoding in every table (replacing WINDOWSENCODINGTEMPLATE)
-            installer::windows::idtglobal::set_multilanguageonly_condition($languageidtdir);
-            
-            # include the license text into the table Control.idt
-            
-            if ( ! $allvariableshashref->{'HIDELICENSEDIALOG'} )
-            {
-                my $licensefilesource = installer::windows::idtglobal::get_rtflicensefilesource($onelanguage, $includepatharrayref_lang);
-                my $licensefile = installer::files::read_file($licensefilesource);
-                installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile, $allvariablesarrayref, $onelanguage, $loggingdir);
-                my $controltablename = $languageidtdir . $installer::globals::separator . "Control.idt";
-                my $controltable = installer::files::read_file($controltablename);
-                installer::windows::idtglobal::add_licensefile_to_database($licensefile, $controltable);
-                installer::files::save_file($controltablename, $controltable);
-
-                $infoline = "Added licensefile $licensefilesource into database $controltablename\n"; 
-                push(@installer::globals::logfileinfo, $infoline);
-            }
-
-            # include a component into environment table if required
-            
-            installer::windows::component::set_component_in_environment_table($languageidtdir, $filesinproductlanguageresolvedarrayref);
-
-            # include the ProductCode and the UpgradeCode from codes-file into the Property.idt
-            
-            installer::windows::property::set_codes_in_property_table($languageidtdir);
-            
-            # the language specific properties can now be set in the Property.idt
-            
-            installer::windows::property::update_property_table($languageidtdir, $onelanguage, $allvariableshashref, $languagestringref);
-
-            # replacing variables in RegLocat.idt
-            
-            installer::windows::msiglobal::update_reglocat_table($languageidtdir, $allvariableshashref);
-
-            # replacing variables in RemoveRe.idt (RemoveRegistry.idt)
-            
-            installer::windows::msiglobal::update_removere_table($languageidtdir);
-            
-            # adding language specific properties for multilingual installation sets
-            
-            installer::windows::property::set_languages_in_property_table($languageidtdir, $languagesarrayref);
-            
-            # adding settings into CheckBox.idt
-            installer::windows::property::update_checkbox_table($languageidtdir, $allvariableshashref);
-
-            # adding the files from the binary directory into the binary table
-            installer::windows::binary::update_binary_table($languageidtdir, $filesinproductlanguageresolvedarrayref, $binarytablefiles);
-
-            # setting patch codes to detect installed products
-
-            if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $installer::globals::helppack ) || ( $allvariableshashref->{'PDFCONVERTER'} )) { installer::windows::patch::update_patch_tables($languageidtdir, $allvariableshashref); }
-
-            # Adding Windows Installer CustomActions
-
-            installer::windows::idtglobal::addcustomactions($languageidtdir, $windowscustomactionsarrayref, $filesinproductlanguageresolvedarrayref);
-
-            # Adding child projects if specified
-
-            if ($installer::globals::addchildprojects)
-            {
-                # Adding child projects to installation dynamically (also in feature table)
-                installer::windows::idtglobal::add_childprojects($languageidtdir, $filesinproductlanguageresolvedarrayref, $allvariableshashref);
-                # setting Java variables for Java products
-                if ( $allvariableshashref->{'JAVAPRODUCT'} ) { installer::windows::java::update_java_tables($languageidtdir, $allvariableshashref); }
-            }
-
-            # Then the language specific msi database can be created
-            
-            if ( $installer::globals::iswin )	# only possible on a Windows platform
-            {
-                my $msidatabasename = installer::windows::msiglobal::get_msidatabasename($allvariableshashref, $onelanguage);
-                my $msifilename = $languageidtdir . $installer::globals::separator . $msidatabasename;
-
-                installer::logger::print_message( "... creating msi database (language $onelanguage) ... \n" );
-
-                installer::windows::msiglobal::set_uuid_into_component_table($languageidtdir, $allvariableshashref);	# setting new GUID for the components using the tool uuidgen.exe
-                installer::windows::msiglobal::prepare_64bit_database($languageidtdir, $allvariableshashref);	# making last 64 bit changes
-                installer::windows::msiglobal::create_msi_database($languageidtdir ,$msifilename);		
-
-                # validating the database 	# ToDo	
-
-                my $languagefile = installer::files::read_file($installer::globals::idtlanguagepath . $installer::globals::separator . "SIS.mlf");
-
-                installer::windows::msiglobal::write_summary_into_msi_database($msifilename, $onelanguage, $languagefile, $allvariableshashref);
-                
-                # if there are Merge Modules, they have to be integrated now
-                $filesinproductlanguageresolvedarrayref = installer::windows::mergemodule::merge_mergemodules_into_msi_database($mergemodulesarrayref, $filesinproductlanguageresolvedarrayref, $msifilename, $languagestringref, $onelanguage, $languagefile, $allvariableshashref, $includepatharrayref, $allupdatesequences, $allupdatelastsequences, $allupdatediskids);
-                if (( $installer::globals::globallogging ) && ($installer::globals::globalloggingform21)) { installer::files::save_array_of_hashes($loggingdir . "productfiles21_" . $onelanguage . ".log", $filesinproductlanguageresolvedarrayref); }
-                $installer::globals::globalloggingform21 = 0;
-                if ( $installer::globals::use_packages_for_cabs ) { installer::windows::media::create_media_table($filesinproductlanguageresolvedarrayref, $newidtdir, $allvariableshashref, $allupdatelastsequences, $allupdatediskids); }
-            
-                # copy msi database into installation directory
-
-                my $msidestfilename = $installdir . $installer::globals::separator . $msidatabasename;
-                installer::systemactions::copy_one_file($msifilename, $msidestfilename);				 
-            }
-        }
-
-        # Creating transforms, if the installation set has more than one language
-        # renaming the msi database and generating the setup.ini file
-
-        my $defaultlanguage = installer::languages::get_default_language($languagesarrayref);
-
-        if ( $installer::globals::iswin )	# only possible on a Windows platform
-        {					
-            if  ( $#{$languagesarrayref} > 0 )
-            {
-                installer::windows::msiglobal::create_transforms($languagesarrayref, $defaultlanguage, $installdir, $allvariableshashref);
-            }
-
-            installer::windows::msiglobal::rename_msi_database_in_installset($defaultlanguage, $installdir, $allvariableshashref);
-
-            if ( $allvariableshashref->{'ADDLANGUAGEINDATABASENAME'} ) { installer::windows::msiglobal::add_language_to_msi_database($defaultlanguage, $installdir, $allvariableshashref); }
-
-            installer::logger::print_message( "... generating setup.ini ...\n" );
-            
-            if ( ! $allvariableshashref->{'NOLOADERREQUIRED'} ) { installer::windows::msiglobal::create_setup_ini($languagesarrayref, $defaultlanguage, $installdir, $allvariableshashref); }
-        }
-
-        # Analyzing the ScpActions and copying the files into the installation set
-        # At least the loader.exe
-
-        installer::logger::print_message( "... copying files into installation set ...\n" );
-
-        installer::worker::put_scpactions_into_installset($installdir);
-
-        # ... copying the setup.exe
-
-        installer::windows::msiglobal::copy_windows_installer_files_into_installset($installdir, $includepatharrayref, $allvariableshashref);
-
-        # ... copying MergeModules into installation set
-
-        if ( ! $installer::globals::fix_number_of_cab_files ) { installer::windows::msiglobal::copy_merge_modules_into_installset($installdir); }
-
-        # ... copying the child projects
-
-        if ($installer::globals::addchildprojects)
-        {
-            installer::windows::msiglobal::copy_child_projects_into_installset($installdir, $allvariableshashref);
-        }
-
-        installer::logger::print_message( "... creating ddf files ...\n" );
-
-        # Creating all needed ddf files and generating a list
-        # for the package process containing all system calls
-
-        my $ddfdir = installer::systemactions::create_directories("ddf", $languagestringref);
-
-        $installer::globals::packjobref = installer::windows::msiglobal::generate_cab_file_list($filesinproductlanguageresolvedarrayref, $installdir, $ddfdir, $allvariableshashref);
-
-        # Update and patch reasons the pack order needs to be saved
-        installer::windows::msiglobal::save_packorder();
-
-        $infoline = "\n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-
-        ####################################
-        # Writing log file
-        # before cab files are packed
-        ####################################
-
-        installer::logger::print_message( "... creating log file $installer::globals::logfilename \n" );
-
-        installer::files::save_file($loggingdir . $installer::globals::logfilename, \@installer::globals::logfileinfo);
-
-        #######################################################
-        # Finally really create the installation packages,
-        # Only for Windows and only on a windows platform.
-        #######################################################
-
-        if ( $installer::globals::iswin )	# only possible on a Windows platform
-        {
-            installer::logger::print_message( "... packaging installation set ... \n" );
-            installer::windows::msiglobal::execute_packaging($installer::globals::packjobref, $loggingdir, $allvariableshashref);
-            if ( $installer::globals::include_cab_in_msi ) { installer::windows::msiglobal::include_cabs_into_msi($installdir); }
-
-            ####################################
-            # Writing log file
-            # after cab files are packed
-            ####################################
-
-            installer::logger::print_message( "\n... creating log file $installer::globals::logfilename \n" );
-            installer::files::save_file($loggingdir . $installer::globals::logfilename, \@installer::globals::logfileinfo);
-        }
-
-        #######################################################
-        # Analyzing the log file
-        #######################################################
-
-        my $is_success = 0;
-        my $finalinstalldir = "";
-        installer::worker::clean_output_tree();	# removing directories created in the output tree
-        ($is_success, $finalinstalldir) = installer::worker::analyze_and_save_logfile($loggingdir, $installdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number);
-
-        #######################################################
-        # Creating Windows msp patches
-        #######################################################
-        
-        if (( $is_success ) && ( $installer::globals::updatedatabase ) && ( $allvariableshashref->{'CREATE_MSP_INSTALLSET'} ))
-        {
-            # Required:
-            # Temp path for administrative installations: $installer::globals::temppath
-            # Path of new installation set: $finalinstalldir
-            # Path of old installation set: $installer::globals::updatedatabasepath
-            my $mspdir = installer::windows::msp::create_msp_patch($finalinstalldir, $includepatharrayref, $allvariableshashref, $languagestringref, $languagesarrayref, $filesinproductlanguageresolvedarrayref);
-            ($is_success, $finalinstalldir) = installer::worker::analyze_and_save_logfile($loggingdir, $mspdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number);
-            installer::worker::clean_output_tree();	# removing directories created in the output tree
-        }
-        
-        #######################################################
-        # Creating download installation set
-        #######################################################
-
-        my $create_download = 0;
-        my $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "downloadname");
-        if ( $installer::globals::languagepack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "langpackdownloadname"); }
-        if ( $installer::globals::helppack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "helppackdownloadname"); }
-        if ( $installer::globals::patch ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "patchdownloadname"); }
-
-        if ( $is_success ) { installer::followme::save_followme_info($finalinstalldir, $includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref, $current_install_number, $loggingdir, $installlogdir); }
-
-        if ( $$downloadname ne "" ) { $create_download = 1; }
-        if (( $is_success ) && ( $create_download ) && ( $ENV{'ENABLE_DOWNLOADSETS'} ))
-        {
-            my $downloaddir = installer::download::create_download_sets($finalinstalldir, $includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref);
-            installer::worker::analyze_and_save_logfile($loggingdir, $downloaddir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number);
-        }
-        
-    }	 # end of "if ( $installer::globals::iswindowsbuild )"
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("\nEnd of part 2b: The Windows platform\n"); }
-
-    # saving file_info file for later analysis
-    my $speciallogfilename = "fileinfo_" . $installer::globals::product . "\.log";
-    installer::files::save_array_of_hashes($loggingdir . $speciallogfilename, $filesinproductlanguageresolvedarrayref);
-
-}	# end of iteration for one language group
-
-# saving debug info at end
-if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
-
-#######################################################
-# Stopping time
-#######################################################
-
-installer::logger::stoptime();
-
-####################################
-# Main program end
-####################################
diff --git a/solenv/bin/makedepn b/solenv/bin/makedepn
deleted file mode 100755
index c08ea38d0..000000000
--- a/solenv/bin/makedepn
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-if [ -z "$1" ]; then
-  exit 1;
-fi
-infile=`echo "$1" | sed 's/^@//'`
-for i in `cat "$infile"`; do
-  i=`echo "$i" | fgrep -- "-O:" | awk -F: '{print $2}'`
-  if [ ! -z "$i" ]; then
-    echo "#" > "$i"
-    exit 0;
-  fi;
-done
-exit 1
diff --git a/solenv/bin/makemani.pl b/solenv/bin/makemani.pl
deleted file mode 100644
index c98ba6535..000000000
--- a/solenv/bin/makemani.pl
+++ /dev/null
@@ -1,111 +0,0 @@
-#! /usr/bin/perl -w
-    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-        if 0; #$running_under_some_shell
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use strict;
-use File::Find ();
-use Cwd qw (cwd);
-
-my @findlist;
-
-# Set the variable $File::Find::dont_use_nlink if you're using AFS,
-# since AFS cheats.
-
-# for the convenience of &wanted calls, including -eval statements:
-use vars qw/*name *dir *prune/;
-*name   = *File::Find::name;
-*dir    = *File::Find::dir;
-*prune  = *File::Find::prune;
-
-sub wanted;
-
-
-
-sub wanted {
-    /^.*\.xc(s|u)\z/s
-    && ( push @findlist, $name );
-}
-
-sub usage
-{
-    print STDERR "\n$0 - append *.xcu file entries to .oxt manifest.xml\n\n";
-    print STDERR "usage: $0 <static_part> <start dir> <search dir> <destination dir>\n\n";
-    print STDERR "  static part - file containig all other content for mainfest.xml\n";
-    print STDERR "  start dir - directory to change to before starting search\n";
-    print STDERR "  out dir - destination directory to write manifes.xml to\n\n";
-    exit 1;
-}
-
-if ( $#ARGV != 3 ) { usage(); };
-
-my $manifest_head = $ARGV[0];
-my $start_dir = $ARGV[1];
-my $dynamic_dir = $ARGV[2];
-my $out_dir = $ARGV[3];
-
-print "################################################\n";
-print "#                                              #\n";
-print "# just a prototype - for testing purpose only! #\n";
-print "#                                              #\n";
-print "################################################\n\n";
-
-
-# Traverse desired filesystems
-my $work_dir = cwd();
-chdir $start_dir or die "$0: ERROR - cannot change directory to \"$start_dir\"\n";
-File::Find::find({wanted => \&wanted}, $dynamic_dir);
-chdir $work_dir or die "$0: ERROR - oops... cannot change dir to where i came from!\n";
-
-open (HEAD, "$manifest_head") or die "$0: ERROR - Cannot open $manifest_head\n";
-my @headlines = <HEAD>;
-close HEAD;
-chomp @headlines;
-chomp @findlist;
-
-my @bodylines;
-my @taillines = ("</manifest:manifest>");
-
-foreach my $i (@findlist) {
-    if ($i =~ m/^.*\.xcu\z/s) {
-        push @bodylines, " <manifest:file-entry manifest:media-type=\"application/vnd.sun.star.configuration-data\"";
-    } else {
-        push @bodylines, " <manifest:file-entry manifest:media-type=\"application/vnd.sun.star.configuration-schema\"";
-    }
-    push @bodylines, "              manifest:full-path=\"$i\"/>";
-}
-
-open (MANIOUT,">$out_dir/manifest.xml") or die "$0: ERROR - cannot open \"$out_dir/manifest.xml\" for writing.\n";
-binmode MANIOUT;
-
-foreach my $j (@headlines, @bodylines, @taillines) {
-    print MANIOUT "$j\n";
-}
-
-close MANIOUT;
-
diff --git a/solenv/bin/mapgen.pl b/solenv/bin/mapgen.pl
deleted file mode 100644
index 1d6ccf484..000000000
--- a/solenv/bin/mapgen.pl
+++ /dev/null
@@ -1,210 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# mapgen  - generate a map file for Unix libraries 
-#
-
-#use File::Path;
-#use File::Copy;
-
-#### script id #####
-
-( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; 
-
-$id_str = ' $Revision: 1.6 $ ';
-$id_str =~ /Revision:\s+(\S+)\s+\$/
-  ? ($script_rev = $1) : ($script_rev = "-");
-
-print "$script_name -- version: $script_rev\n";
-print "Multi Platform Enabled Edition\n";
-
-#########################
-#                       #
-#   Globale Variablen   #
-#                       #
-#########################
-
-$dump_file = '';
-$flt_file = '';
-$map_file = '';
-$first_string = '';
-$tab = '    ';
-
-#### main ####
-
-&get_options;
-if (!(open (DUMP_FILE, $dump_file))) {
-    &print_error("Unable open $dump_file");
-};
-if (!(open (FLT_FILE, $flt_file))) {
-    close DUMP_FILE;
-    &print_error("Unable open $flt_file");
-};
-unlink $map_file;
-if (!(open (MAP_FILE, ">>$map_file"))) {
-    close DUMP_FILE;
-    close FLT_FILE;
-    &print_error("Unable open $map_file");
-};
-
-if ($ENV{OS} eq 'SOLARIS') {
-    &gen_sol;
-} elsif ($ENV{OS} eq 'LINUX') {
-    &gen_lnx;
-} else {
-    &print_error ('Environment not set!!');
-};
-
-close DUMP_FILE;
-close FLT_FILE;
-close MAP_FILE;
-
-#### end of main procedure ####
-
-#########################
-#                       #
-#      Procedures       #
-#                       #
-#########################
-
-#
-# Generate a map file for solaris
-#
-sub gen_sol {
-    my %symbols = ();
-    foreach (<DUMP_FILE>) {
-        next if (!(/\s*(\S+)\s*\|\s*(\S+)\s*\|\s*(\S+)\s*\|\s*(\S+)\s*\|\s*(\S+)\s*\|\s*(\S+)\s*\|\s*(\S+)\s*\|\s*(\S+)\s*/));
-        next if (($7 =~ /UNDEF/) || ($7 =~ /ABS/));
-        next if ($5 eq 'LOCL');
-        $symbols{$8}++;
-    };
-    &filter_symbols(\%symbols);
-};
-
-#
-# Generate a map file for linux
-#
-sub gen_lnx {
-    my %symbols = ();
-    foreach (<DUMP_FILE>) {
-        next if (!(/^\S+ [A|B|C|D|G|I|N|R|S|T|U|V|W|-|\?|-] (\S+)/));
-        $symbols{$1}++;
-    };
-    &filter_symbols(\%symbols);
-}
-
-#
-# Filter symbols with filters from $flt_file
-#
-sub filter_symbols {
-    my $symbols = shift;
-    my $env_section = '';
-    my @filters = ();
-    my @filtered_symbols = ();
-    while (<FLT_FILE>) {
-        s/\r//;
-        s/\n//;
-        $env_section = '1' and next if ((/^# SOLARIS #$/) && ($ENV{OS} eq 'SOLARIS'));
-        $env_section = '1' and next if ((/^# LINUX #$/) && ($ENV{OS} eq 'LINUX'));
-        $env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD'));
-        $env_section = '1' and next if ((/^# NETBSD #$/) && ($ENV{OS} eq 'NETBSD'));
-        $env_section = '1' and next if ((/^# OPENBSD #$/) && ($ENV{OS} eq 'OPENBSD'));
-        $env_section = '1' and next if ((/^# DRAGONFLY #$/) && ($ENV{OS} eq 'DRAGONFLY'));
-        last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# LINUX #$/) || (/^# NETBSD #$/) || (/^# OPENBSD #$/) (/^# DRAGONFLY #$/)));
-        next if (!$_ || /^#/);
-        push(@filters, $_);
-    };
-    foreach my $symbol (keys %$symbols) {
-        my $export = '-';
-        foreach my $filter_str (@filters) {
-            my $add = substr ($filter_str, 0, 1);
-            my $filter = substr($filter_str, 1);
-            if ($symbol =~ /$filter/) {
-                $export = $add;
-            };
-        };
-        if ($export eq '+') {
-            push(@filtered_symbols, $symbol);
-        };
-    };
-    &write_mapfile(\@filtered_symbols);
-};
-
-#
-# Write a map file
-#
-sub write_mapfile {
-    my $symbols = shift;
-    print MAP_FILE $first_string . " {\n$tab" . "global:\n";
-    foreach (@$symbols) {
-        print MAP_FILE "$tab$tab$_\;\n";
-    };
-    print MAP_FILE "$tab" . "local:\n$tab\*\;\n}\;";
-};
-
-#
-# Get all options passed
-#
-sub get_options {
-
-$dump_file = '';
-$flt_file = '';
-$map_file = '';
-    my ($arg);
-    &usage() && exit(0) if ($#ARGV == -1);
-    while ($arg = shift @ARGV) {
-        $arg =~ /^-d$/			and $dump_file = shift @ARGV	and next;
-        $arg =~ /^-f$/			and $flt_file = shift @ARGV		and next;
-        $arg =~ /^-m$/			and $map_file = shift @ARGV		and next;
-        $arg =~ /^-h$/			and &usage						and exit(0);
-        $arg =~ /^--help$/		and &usage						and exit(0);
-        $arg =~ /^-s$/			and $first_string = shift @ARGV	and next;
-    };
-    if (!$dump_file ||
-        !$flt_file  ||
-        !$first_string  ||
-        !$map_file) {
-        &usage;
-        exit(1);
-    };
-};
-
-sub print_error {
-    my $message = shift;
-    print STDERR "\nERROR: $message\n";
-    exit(1)
-};
-
-sub usage {
-    print STDERR "\nmapgen:\n";
-    print STDERR "Syntax:    mapgen -d dump_file -s first_string -f filter_file -m map_file [-h|--help]\n";
-};
-
diff --git a/solenv/bin/mkdir.btm b/solenv/bin/mkdir.btm
deleted file mode 100644
index 5b610c829..000000000
--- a/solenv/bin/mkdir.btm
+++ /dev/null
@@ -1,6 +0,0 @@
-rem @echo off
-iff "%PERL%" == "" then
-	call perl5 %SOLARENV%\bin\mkdir.pl %1&
-else
-	call %PERL% %SOLARENV%\bin\mkdir.pl %1&
-endiff
diff --git a/solenv/bin/mkdir.pl b/solenv/bin/mkdir.pl
deleted file mode 100755
index a8fe6f2a0..000000000
--- a/solenv/bin/mkdir.pl
+++ /dev/null
@@ -1,65 +0,0 @@
-: # -*- perl -*-
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#
-# mkdir - a perl script to substitute mkdir -p
-# accepts "/", ":", and "\" as delimiters of subdirectories
-# options -p (for compatibility)
-#         -mode mode
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-
-use Cwd;
-
-$currdir = cwd;
-
-$MODE = 00777 ;
-
-while ( $#ARGV >= 0 ) {
-    if ( $ARGV[0] eq "-mode" ) {
-        $MODE = oct $ARGV[1] ;
-        shift @ARGV ;
-        shift @ARGV ;
-        }
-    elsif ( $ARGV[0] eq "-p" ) {
-        shift @ARGV ;
-        # -p does not do anything, it's supported just for compatibility
-        }
-    else {
-
-        $ARGV[0] =~ s?\\|:?/?g ;
-        @SUBDIRS = split "/", $ARGV[0] ;
-
-        # absolute path UNIX
-        if ( $SUBDIRS[0] eq "" ) {
-            chdir '/' ;
-            shift @SUBDIRS ;
-        }
-        # absolute path WINDOWS
-        if ( $#SUBDIRS > 1 ) {
-            if ( $SUBDIRS[1] eq "" ) {
-                if ( $SUBDIRS[0] =~ /\w/ ) {
-                    chdir "$SUBDIRS[0]:\\" ; 
-                    shift @SUBDIRS ;
-                    shift @SUBDIRS ;
-                } ;
-            } ;
-        }
-
-        while (@SUBDIRS) { 
-            if ( -e $SUBDIRS[0] ) {
-                if ( ! -d $SUBDIRS[0] ) {
-                    die "file exists\n" 
-                } 
-            }
-            else {
-                mkdir $SUBDIRS[0], $MODE or die "Can't create directory $SUBDIRS[0]"
-            } 
-            chdir $SUBDIRS[0] or die "Can't cd to $SUBDIRS[0]" ;
-            shift @SUBDIRS ;
-        } ;
-
-        shift @ARGV ;
-    } ;
-    chdir $currdir;
-}		
diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
deleted file mode 100755
index 3d6ba295c..000000000
--- a/solenv/bin/mkdocs.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/bash
-#
-# Doxygen Doc generation
-#
-
-# binaries that we need
-which doxygen > /dev/null 2>&1 || {
-    echo "You need doxygen for doc generation"
-    exit 1
-}
-which dot > /dev/null 2>&1 || {
-    echo "You need the graphviz tools to create the nice inheritance graphs"
-    exit 1
-}
-
-# otherwise, aliases are not expanded below
-shopt -s expand_aliases
-
-# Title of the documentation
-DOXYGEN_PROJECT_PREFIX="LibreOffice"
-
-# suck setup
-BINDIR=`dirname $0`
-. $BINDIR/setup
-
-. ./*.Set.sh
-
-# get list of modules in build order - bah, blows RAM & disk, static list below
-INPUT_PROJECTS="o3tl basegfx basebmp comphelper svl vcl canvas cppcanvas oox svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx cui chart2 dbaccess sd starmath sc sw"
-
-# output directory for generated documentation
-BASE_OUTPUT="$1"
-mkdir -p "$BASE_OUTPUT" || {
-    echo "Cannot create $BASE_OUTPUT"
-    exit 1
-}
-
-# paths for binary and configuration file
-BASE_PATH=`pwd`
-DOXYGEN_CFG="$2"
-if test ! -f "$DOXYGEN_CFG"; then
-    echo "doxygen.cfg not found"
-    exit 1
-fi
-
-# strip -I. and bin -I prefix; exlude system headers
-DOXYGEN_INCLUDE_PATH=`echo $SOLARINC | sed -e ' s/-I\.//'g | sed -e ' s/ -I/ /'g | sed -e ' s|/usr/[^ ]*| |g'`
-
-# setup version string
-DOXYGEN_VERSION="$GITTAG"
-
-
-###################################################
-#
-# Generate docs
-#
-###################################################
-
-# cleanup
-rm -rf $BASE_OUTPUT/*
-
-# make the stuff world-readable
-umask 022
-
-# generate docs
-DOXYGEN_REF_TAGFILES=""
-for PROJECT in $INPUT_PROJECTS;
-do
-  # avoid processing of full project subdirs, only add source and inc
-  DOXYGEN_INPUT=`printf "%s" "$PROJECT/source $PROJECT/inc "`
-
-  DOXYGEN_OUTPUT="$BASE_OUTPUT/$PROJECT"
-  DOXYGEN_OUR_TAGFILE="$DOXYGEN_OUTPUT/$PROJECT.tags"
-  DOXYGEN_PROJECTNAME="$DOXYGEN_PROJECT_PREFIX Module $PROJECT"
-
-  # export variables referenced in doxygen config file
-  export DOXYGEN_INPUT
-  export DOXYGEN_OUTPUT
-  export DOXYGEN_INCLUDE_PATH
-  export DOXYGEN_VERSION
-  export DOXYGEN_OUR_TAGFILE
-  export DOXYGEN_REF_TAGFILES
-  export DOXYGEN_PROJECTNAME
-
-  # debug
-  echo "Calling $DOXYGEN_PATH/doxygen $DOXYGEN_CFG with"
-  echo "Input:      $DOXYGEN_INPUT"
-  echo "Output:     $DOXYGEN_OUTPUT"
-  echo "Include:    $DOXYGEN_INCLUDE_PATH"
-  echo "Version:    $DOXYGEN_VERSION"
-  echo "Tagfile:    $DOXYGEN_OUR_TAGFILE"
-  echo "Ref-Tags:   $DOXYGEN_REF_TAGFILES"
-  echo "Title:      $DOXYGEN_PROJECTNAME"
-
-  nice -15 doxygen "$DOXYGEN_CFG"
-
-  # setup referenced tagfiles for next round
-  DOXYGEN_REF_TAGFILES="$DOXYGEN_REF_TAGFILES $DOXYGEN_OUR_TAGFILE=$BASE_URL/$PROJECT/html"
-done
-
-# generate entry page
-cat - > $BASE_OUTPUT/index.html <<EOF
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-    <head>
-        <title>LibreOffice Source Code Documentation (fragmentary)</title>
-    </head>
-    <body>
-        <h1>LibreOffice Source Code Documentation (fragmentary)</h1>
-        <ul>
-EOF
-
-for PROJECT in $INPUT_PROJECTS;
-do
-  echo "<li><a href=\"$PROJECT/html/classes.html\">$PROJECT</a></li>" >> $BASE_OUTPUT/index.html
-done
-
-cat - >> $BASE_OUTPUT/index.html <<EOF
-        </ul>
-        <p>Last updated:
-EOF
-LANG= date >> $BASE_OUTPUT/index.html
-
-cat - >> $BASE_OUTPUT/index.html <<EOF
-        </p>
-    </body>
-</html>
-EOF
-
-## done
diff --git a/solenv/bin/mkout.pl b/solenv/bin/mkout.pl
deleted file mode 100755
index 43d43fa7d..000000000
--- a/solenv/bin/mkout.pl
+++ /dev/null
@@ -1,156 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# mkout.pl - create output tree
-#
-
-use Cwd;
-use Getopt::Std;
-use File::Path;
-
-#### script id #####
-
-( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; 
-
-#### globals ####
-
-$is_debug   = 0;
-
-$base_dir   = 0;            # path to module base directory
-$dir_mode   = 0755;         # default directory creation mode
-
-$envpath    = 0;            # platform/product combination
-$opt_r      = 0;            # create 'remote' subdirs
-
-%sub_dirs   = (
-#               dirname    remote(yes/no)   
-                'bin'   => 1,
-                'class' => 0,
-                'inc'   => 0,
-                'lib'   => 1,
-                'misc/logs'  => 1,
-                'obj'   => 1,
-                'res'   => 1,
-                'slb'   => 1,
-                'slo'   => 1,
-                'srs'   => 1
-            );
-
-#### main ####
-
-parse_options();
-init_globals();
-create_dirs();
-
-exit(0);
-
-#### subroutines #####
-
-sub parse_options {
-    my $rc;
-
-    $rc = getopts('r');
-    
-    if ( !$rc || $#ARGV > 0 ) {
-        usage();
-        exit(1);
-    }
-    $envpath = $ARGV[0] if defined($ARGV[0]);
-}
-
-sub init_globals {
-    my $umask;
-    $base_dir =  get_base();
-    print "Base_Diri=$base_dir\n" if $is_debug;
-
-    $umask = umask();
-    if ( defined($umask) ) {
-        $dir_mode = 0777 - $umask;
-    }
-    $envpath = $ENV{INPATH} unless $envpath;
-
-    if ( !$envpath ) {
-        print_error("can't determine platform/environment");
-        exit(3);
-    }
-    print "Platform/Environment: $envpath\n" if $is_debug;
-}
-
-sub get_base {
-    # a module base dir contains a subdir 'prj'
-    # which in turn contains a file 'd.lst'
-    my (@field, $base, $dlst);
-    my $path = cwd();
-
-    @field = split(/\//, $path);
-
-    while ( $#field != -1 ) {
-        $base = join('/', @field);
-        $dlst = $base . '/prj/d.lst';
-        last if -e $dlst;
-        pop @field;
-    }
-
-    if ( $#field == -1 ) {
-        print_error("can't determine module");
-        exit(2);
-    }
-    else {
-        return $base;
-    }
-}
-
-sub create_dirs {
-    foreach $dir ( keys %sub_dirs ) {
-        $path = $base_dir . '/' . $envpath . '/' . $dir;
-        if ( $opt_r && $sub_dirs{$dir} ) {
-            $path .= "/remote";
-        }
-        eval { mkpath($path, 0, $dir_mode) };
-        if ( $@ ) {
-            print_error( "$@" );
-        }
-        print "Create path: $path\n" if $is_debug;
-    }
-}
-
-sub print_error {
-    my $message = shift;
-
-    print STDERR "$script_name: ERROR: $message\n";
-}
-
-sub usage {
-    print STDERR "Usage:\n$script_name [-r] [platform/environment]\n";
-    print STDERR "Options:\n  -r create 'remote' directories\n";
-}
-
-# vim: set ts=4 shiftwidth=4 expandtab syntax=perl:
diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm
deleted file mode 100644
index 2be4f7b15..000000000
--- a/solenv/bin/modules/CreatePDBRelocators.pm
+++ /dev/null
@@ -1,228 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#*************************************************************************
-#
-# createPDBRelocators - create for pdb relocator files
-#                       PDB relocator files are used to find debug infos
-#                       for analysis of creash reports
-#
-# usage: create_pdb_relocators($inpath, $milestoneext, $pre);
-#
-#************************************************************************* 
-
-package CreatePDBRelocators;
-
-use strict;
-use File::Basename;
-use SourceConfig;
-
-sub new
-{
-    my $Object = shift;
-    my $solarversion = shift;
-    my $workdir;
-    my $relworkdir;
-    my $self = {};
-    my @basedirs;
-    my @repos;
-
-    if (!defined ($solarversion)) {
-        $solarversion = $ENV{SOLARVERSION};
-    }
-    if ( !$solarversion ) {
-        print STDERR "can't determine SOLARVERSION.\n";
-        exit (1);
-    }
-    
-    $self->{SOLARVERSION} = $solarversion;
-
-    $workdir = $ENV{WORKDIR};
-    if ( !$workdir ) {
-        print STDERR "can't determine WORKDIR.\n";
-        exit (1);
-    }
-   
-    if ( $workdir =~ /^$solarversion/ ) {
-        $relworkdir = $workdir;
-        $relworkdir =~ s/^$solarversion\///;
-    } else {
-        print STDERR "ERROR: workdir outside $solarversion unsupported\n";
-        exit (2);
-    }
-    my $SourceConfigObj = SourceConfig->new();
-    @repos = $SourceConfigObj->get_repositories();
-    # basdirs is repositories (dmake) + workdir (gnu make)
-    push(@basedirs, $relworkdir);
-    if (!scalar @basedirs) {
-        print STDERR "no basedir and no working directory found.\n";
-        exit (2);
-    }
-    $self->{BASEDIRS} = \@basedirs;
-    bless($self, $Object);
-    return $self; 
-}
-
-sub create_pdb_relocators
-{
-    my $self = shift;
-    my $inpath   = shift;
-    my $milestoneext    = shift;
-    my $pre      = shift;
-    
-    my $solarversion = $self->{SOLARVERSION};
-    my $root_dir = "$solarversion/$inpath";
-    
-    # sanitize path
-    $root_dir =~ s/\\/\//g;
-    my $o =~ s/\\/\//g;
-    my $premilestoneext = $milestoneext;
-    if ( $pre ne "" ) {
-        $premilestoneext = ~ s/^\.//;
-        $premilestoneext = ".pre$premilestoneext";
-    }
-    my $pdb_dir = $root_dir . "/pdb$premilestoneext";
-    my $pdb_so_dir = $root_dir . "/pdb$premilestoneext/so";
-
-    # create pdb directories if necessary
-    if ( ! -d $pdb_dir ) {
-        if ( !mkdir($pdb_dir, 0775) ) {
-            print STDERR "can't create directory '$pdb_dir'\n";
-                return undef;
-        }
-    }
-    if ( ! -d $pdb_so_dir ) {
-        if ( !mkdir($pdb_so_dir, 0775) ) {
-            print STDERR "can't create directory '$pdb_so_dir'\n";
-                return undef;
-        }
-    }
-
-    # collect files
-    foreach my $basedir (@{$self->{BASEDIRS}}) {
-        my @pdb_files;
-        my $o = $self->{SOLARVERSION} . "/$basedir";
-        $basedir =~ s/(.*?)\.(.*)/$1/;
-        $self->collect_files( $o, $inpath, \@pdb_files);
-
-        foreach (@pdb_files) {
-            my $relocator = basename($_) . ".location";
-            /$o\/(.*)/i;
-            
-            my $src_location = $1;
-            
-            my $location = "";
-            my $target = "";
-            if ( $src_location =~ /\/so\// )
-            {
-                $location = "../../../$basedir$milestoneext/" . $src_location;
-                $target = "$pdb_dir/so/$relocator";
-            }
-            else
-            {
-                $location = "../../$basedir$milestoneext/" . $src_location;
-                $target = "$pdb_dir/$relocator";
-            }
-
-            if ( !open(RELOCATOR, ">$target") ) {
-                print STDERR "can't write file '$target'\n";
-                return undef;
-            }
-            print RELOCATOR "$location\n";
-            close(RELOCATOR);
-        }
-    }
-    return 1;
-}
-
-sub collect_files_from_all_basedirs
-{
-    my $self = shift;
-    my ($platform, $filesref) = @_;
-    my $basedir;
-    my $ret;
-    foreach $basedir (@{$self->{BASEDIRS}}) {
-        my $srcdir = $self->{SOLARVERSION} . "/$basedir";
-        $ret |= $self->collect_files ($srcdir, $platform, $filesref);
-    }
-    return $ret;
-}
-
-sub collect_files
-{
-    my $self = shift;
-    my ($srcdir, $platform, $filesref) = @_; 
-    my $template = "$srcdir/*/$platform";
-    my $template2 = "$srcdir/LinkTarget";
-    if ( $ENV{GUI} eq "WNT" ) {
-        # collect all pdb files on o:
-        # regular glob does not work with two wildcard on WNT
-        my @bin    = glob("$template/bin/*.pdb");
-        my @bin_so = glob("$template/bin/so/*.pdb");
-        my @workdir = glob("$template2/*/*.pdb");
-        # we are only interested in pdb files which are accompanied by
-        # .exe or .dll which the same name
-        foreach (@bin, @bin_so, @workdir) {
-            my $dir  = dirname($_);
-            my $base = basename($_, ".pdb");
-            my $exe = "$dir/$base.exe";
-            my $dll = "$dir/$base.dll";
-            if ( -e $exe || -e $dll ) {
-                push(@$filesref, $_);
-            }
-        }
-    }
-    else {
-        # collect all shared libraries on o:
-        my @lib = glob("$template/lib/*.so*");
-        my @workdir_lib = glob("$template2/Library/*.so*");
-        my @lib_so = glob("$template/lib/so/*.so*");
-        my @mac_lib = glob("$template/lib/*.dylib*");
-        my @mac_workdir_lib = glob("$template2/Library/*.dylib*");
-        my @mac_lib_so = glob("$template/lib/so/*.dylib*");
-        # collect all binary executables on o:
-        my @bin = $self->find_binary_execs("$template/bin");
-        my @workdir_bin = $self->find_binary_execs("$template2/Executable");
-        my @bin_so = $self->find_binary_execs("$template/bin/so");
-        push(@$filesref, (@lib, @lib_so, @workdir_lib, @mac_lib, @mac_workdir_lib, @mac_lib_so, @bin, @workdir_bin, @bin_so));
-    }
-    return 1;
-}
-
-sub find_binary_execs
-{
-    my $self = shift;
-    my $path = shift;
-    my @files = glob("$path/*");
-    my @execs = grep(-x $_, @files);
-    my @elf_files = grep(`file $_` =~ /ELF/, @execs);
-    my @MachO_files = grep(`file $_` =~ /Mach\-O/, @execs);
-    return ( @elf_files, @MachO_files );
-}
-
-1; # required
-
diff --git a/solenv/bin/modules/Eis.pm b/solenv/bin/modules/Eis.pm
deleted file mode 100755
index 897960cd0..000000000
--- a/solenv/bin/modules/Eis.pm
+++ /dev/null
@@ -1,220 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#
-# Eis.pm - package for accessing/manipulating the EIS database via SOAP
-#
-
-package Eis;
-use strict;
-
-use SOAP::Lite;
-use Class::Struct;
-use Carp;
-
-# Declaration of class Eis together with ctor and accessors.
-# See 'perldoc Class::Struct' for details
-
-struct Eis => [
-    # public members
-    uri           => '$',           # name of webservice
-    proxy_list    => '@',           # list of proxy URLs
-    current_proxy => '$',           # current proxy (index in proxy_list)
-    net_proxy     => '$',           # network proxy to pass through firewall
-    # private members
-    eis_connector => '$'            # SOAP connector to EIS database
-];
-
-#### public methods ####
-
-# Any not predeclared method call to this package is
-# interpreted as a SOAP method call. We use the AUTOLOAD
-# mechanism to intercept these calls and delgate them
-# to the eis_connector. 
-# See the 'Camel Book', 3rd edition, page 337 for an
-# explanation of the AUTOLOAD mechanism.
-sub AUTOLOAD
-{
-    my $self = shift;
-    my $callee = $Eis::AUTOLOAD; # $callee now holds the name of
-                                 # called subroutine
-                                 #
-    return if $callee =~ /::DESTROY$/;
-    $callee = substr($callee, 5);
-
-    my $sl = $self->eis_connector();
-    if ( !$sl ) {
-        $sl = $self->init_eis_connector();
-        $self->eis_connector($sl);
-    }
-     
-    my $response;
-    while ( 1 )  {
-        # Call callee() on web service.
-        eval { $response = $sl->$callee(@_) };
-        if ( $@ ) {
-            # Transport error (server not available, timeout, etc).
-            # Use backup server.
-            print STDERR ("Warning: web service unavailable. Trying backup server.\n");
-            if ( !$self->set_next_proxy() ) {
-                # All proxies tried, out of luck
-                carp("ERROR: Connection to EIS database failed.\n");
-                return undef;
-            }
-        }
-        else {
-            last;
-        }
-    }
-
-    if ( $response->fault() ) {
-        my $fault_msg = get_soap_fault_message($response);
-        die $fault_msg; # throw $fault_msg as exception  
-    }
-    else {
-        return $response->result();
-    }
-}
-
-#### public class methods ####
-
-# Turn scalar into SOAP string.
-sub to_string
-{
-    my $value = shift;
-
-    return SOAP::Data->type(string => $value);
-}
-
-#### non public instance methods ####
-
-# Initialize SOAP connection to EIS.
-sub init_eis_connector
-{
-    my $self = shift;
-
-    # Init current_proxy with first element of the proxy list.
-    my $current = $self->current_proxy(0);
-    
-    if ( !$self->uri() ) {
-        carp("ERROR: web service URI not set.");
-        return undef;
-    }
-
-    if ( !$self->proxy_list->[$current] ) {
-        carp("ERROR: proxy list not proper initialized.");
-        return undef;
-    }
-
-    # might be needed to get through a firewall
-    if ( defined($self->net_proxy()) ) {
-        $ENV{HTTPS_PROXY}=$self->net_proxy();
-    }
-
-    my $proxy = $self->proxy_list()->[$current];
-    if ( $proxy =~ /^\s*https\:\/\// ) {
-        # SOAP::Lite does not complain if Crypt::SSLeay is not available,
-        # but crypted connections will just not work. Force the detection of
-        # Crypt::SSLeay for https connections and fail with a meaningful
-        # message if it's not available.
-        require Crypt::SSLeay;
-    }
-    return create_eis_connector($self->uri(), $proxy);
-}
-
-# Advance one entry in proxy list.
-sub set_next_proxy
-{
-    my $self = shift;
-    
-    my @proxies = @{$self->proxy_list()};
-    my $current = $self->current_proxy();
-    
-    if ( $current == $#proxies ) {
-        return 0;
-    }
-    else {
-        $self->current_proxy(++$current);
-        my $next_proxy = $self->proxy_list()->[$current];
-        $self->eis_connector()->proxy($next_proxy);
-        return 1;
-    }
-}
-    
-#### misc ####
-
-# Create new SOAP EIS conector.
-sub create_eis_connector
-{
-    my $uri   = shift;
-    my $proxy = shift;
-
-    my $sl;
-
-    # With version 0.66 of SOAP::Lite the uri() method
-    # has been deprecated in favour of ns(). There
-    # seems to be no way to switch of the deprecation warning 
-    # (which may be a bug in this version of SOAP::Lite).
-    # Since older versions do not support the ns() method we
-    # either force everyone to upgrade now, or make the following
-    # dependent on the SOAP::Lite version.
-    my ($vmaj, $vmin) = (0, 0);
-    if( $SOAP::Lite::VERSION =~ m/([0-9]*)\.([0-9]*)/ ) {
-        $vmaj = $1;
-        $vmin = $2;
-        if ( $vmaj > 0 || ( $vmaj == 0 && $vmin >= 66 ) ) {
-            $sl = SOAP::Lite
-            -> ns($uri)
-            -> proxy($proxy);
-        }
-        else {
-            $sl = SOAP::Lite
-            -> uri($uri)
-            -> proxy($proxy);
-        }
-    }
-    else {
-        carp("ERROR: Can't determine SOAP::Lite version.");
-    }
-    
-    return $sl;
-}
-
-# Retrieve SOAP fault message.
-sub get_soap_fault_message
-{   
-    my $faulty_response = shift;
-    my $fault_msg = join(', ', $faulty_response->faultcode(),
-                               $faulty_response->faultstring(),
-                               $faulty_response->faultdetail());
-    return $fault_msg;
-}
-
-####
-
-1; # needed by "use" or "require"
diff --git a/solenv/bin/modules/GenInfoParser.pm b/solenv/bin/modules/GenInfoParser.pm
deleted file mode 100644
index 5db77bee4..000000000
--- a/solenv/bin/modules/GenInfoParser.pm
+++ /dev/null
@@ -1,293 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#*************************************************************************
-#
-# GenInfoParser - Perl extension for parsing general info databases
-#
-# usage: see below
-#
-#************************************************************************* 
-
-package GenInfoParser;
-
-use strict;
-
-use Carp;
-
-#####  profiling #####
-# use Benchmark;
-
-##### ctor #####
-
-sub new {
-    my $proto = shift;
-    my $class = ref($proto) || $proto;
-    my $self = {};
-    $self->{'LIST'} = undef;
-    $self->{'DATA'} = {};
-    bless ($self, $class);
-    return $self;
-}
-
-##### methods #####
-
-sub load_list 
-{   
-    # load list into memory
-    my $self        = shift;
-    my $list_file   = shift;
-
-    if ( $self->parse_list($list_file) ) {
-        return 1;
-    }
-    return 0;
-}
-
-sub get_keys 
-{
-    # return a sorted list of keys, the sorting is case insensitive
-    my $self        = shift;
-    my $access_path = shift;
-
-    my ($key, $value, $sub_data_ref) = $self->walk_accesspath($access_path);
-    
-    my @keys = ();
-    if ( $sub_data_ref ) {
-        my @normalized_keys = keys %$sub_data_ref;
-        foreach my $normalized_key (sort keys %$sub_data_ref) {
-            push(@keys, $$sub_data_ref{$normalized_key}[0]);
-        }
-    } elsif ( $value ) {
-        chomp $value;
-        push @keys, ($value);
-    }
-    return @keys;
-}
-    
-sub get_key 
-{
-    # returns the key corresponding to the access_path
-    my $self        = shift;
-    my $access_path = shift;
-
-    my ($key, $value, $sub_data_ref) = $self->walk_accesspath($access_path);
-    return undef if !$key;
-    return $key;
-}
-
-sub get_value 
-{
-    # returns the value corresponding to the access_path
-    my $self        = shift;
-    my $access_path = shift;
-
-    my ($key, $value, $sub_data_ref) = $self->walk_accesspath($access_path);
-    return undef if !$key;
-    $value = "" if !defined($value);
-    # trim line ends
-    $value =~ tr/\r\n//d;
-    # trim trailing whitespace
-    $value =~ s/\s+$//;
-    return $value;
-}
-
-##### private methods #####
-
-sub parse_list 
-{   
-    # parse complete list
-    my $self        = shift;
-    my $list_file   = shift;
-    my @list_data;
-
-    return 0 if ! -r $list_file;
-
-    open(FILE, "<$list_file") or croak("can't open $list_file: $!");
-    $self->parse_block(\*FILE, $self->{'DATA'});
-    close(FILE);
-}
-
-sub parse_block 
-{
-    # parse each sub block and place it in a hash
-    # used data structure:
-    # $hash{$normalized_key} = [ $key, $value, 0 | $sub_hash_ref ]
-    my $self        = shift;
-    my $glob_ref    = shift;
-    my $data_ref    = shift;
-
-    my $current_key = 0;
-    my $line;
-    while( $line = <$glob_ref> ) {
-        # this is the inner loop, any additional pattern matching will 
-        # have a notable affect on runtime behavior
-        # clean up of $value is done in get_value()
-        my ($key, $value) = split(' ', $line, 2);
-        next if !$key;                  # skip empty lines
-        my $chr = substr($key, 0, 1);
-        next if $chr eq '#';            # skip comment lines
-        last if $chr eq '}';            # return from block;
-        if ( $chr eq '{' ) {
-            if ( !$current_key ) {
-                croak("unexpected block start");
-            }
-            else {
-                # create empty hash and start sub block parse
-                $$data_ref{$current_key}[2] = {};
-                $self->parse_block($glob_ref, $$data_ref{$current_key}[2]);
-                next;
-            }
-        }
-        # sanity check
-        croak("key $key is not well formed") if $key =~ /\//;
-        # normalize key for hash lookup
-        $current_key = lc($key);
-        # but we have to keep the original - not normalized - key, too
-        $$data_ref{($current_key)} = [$key, $value, 0];
-    }
-}
-
-sub walk_accesspath 
-{
-    # returns the key, value and sub_data_ref which 
-    # corresponds to the access_path
-    
-    my $self        = shift;
-    my $access_path = shift;
-
-    my $sub_data_ref = $self->{'DATA'};
-
-    if ( $access_path ) {
-        my $lookup_ref = 0;
-        # normalize key
-        $access_path = lc($access_path);
-        my @key_sequence = split(/\//, $access_path);
-        foreach my $key_element (@key_sequence) {
-            # at least one more key element, but no sub_hash, accesspath invalid
-            return () if !$sub_data_ref;
-            $lookup_ref = $$sub_data_ref{$key_element};
-            # lookup failed, accesspath invalid
-            return () if !defined($lookup_ref);
-            # we've got a valid key
-            $sub_data_ref = $$lookup_ref[2];
-        }
-        return ($$lookup_ref[0], $$lookup_ref[1], $sub_data_ref);
-    }
-    else {
-        # empty access path is only vlaid for getting top level key list
-        return ( undef, undef, $sub_data_ref );
-    }
-}
-
-##### finish #####
-
-1; # needed by use or require
-
-__END__
-
-=head1 NAME
-
-GenInfoParser - Perl extension for parsing general info databases
-
-=head1 SYNOPSIS
-
-    # example that will load a general info database called 'stand.lst'
-
-    use GenInfoParser;
-
-    # Create a new instance of the parser:
-    $a = GenInfoParser->new();
-
-    # Load the database into the parser:
-    $a->load_list('ssrc633.ini');
-
-    # get top level keys from database
-    @top_level_keys = $a->get_keys();
-
-    # get sub list keys
-    @sub_list_keys = $a->get_keys('src633/Drives/o:/Projects');
-
-    # get key/value pair
-    $key = $a->get_key('src633/Comment/build');
-    $value = $a->get_value('src633/Comment/build');
-  
-=head1 DESCRIPTION
-
-GenInfoParser is a perl extension to load and parse General Info Databses.
-It uses a simple object oriented interface to retrieve the information stored
-in the database.
-
-Methods:
-
-GenInfoParser::new()
-
-Creates a new instance of the parser. Can't fail.
-
-
-GenInfoParser::load_list($database)
-
-Loads and parses $database. Returns 1 on success and 0 on failure
-
-
-GenInfoParser::get_keys($path)
-
-Returns a sorted list of keys from the path $path. Returns an emtpy list if $path
-has no sublist. If there is no $path spcified, the method will return the
-primary key list. $path can be specified case insensitive. Sorting is done case
-insensitive.
-
-GenInfoParser::get_key($path)
-
-Returns the key to $path or 'undef' if an invalid path is given.
-Example: $path = 'src633/comment/build' will return 'Build' as key. 
-Note: $path can be specified case insensitive, but the returned key will
-have the exact case as in the database. 
-
-GenInfoParser::get_value($path)
-
-Returns the value to $path or 'undef' is invalid path is given.
-
-
-=head2 EXPORT
-
-GenInfoParser::new()
-GenInfoParser::load_list($database)
-GenInfoParser::get_keys($path)
-GenInfoParser::get_key($path)
-GenInfoParser::get_value($path)
-
-
-=head1 AUTHOR
-
-Jens-Heiner Rechtien, rechtien@sun.com
-
-=head1 SEE ALSO
-
-perl(1).
-
-=cut
diff --git a/solenv/bin/modules/RepositoryHelper.pm b/solenv/bin/modules/RepositoryHelper.pm
deleted file mode 100644
index 8aa45f29e..000000000
--- a/solenv/bin/modules/RepositoryHelper.pm
+++ /dev/null
@@ -1,209 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#*************************************************************************
-#
-# RepositoryHelper - Perl for working with repositories and underlying SCM 
-#
-# usage: see below
-#
-#************************************************************************* 
-
-package RepositoryHelper;
-
-use strict;
-
-
-use Carp;
-use Cwd qw (cwd);
-use File::Basename;
-#use File::Temp qw(tmpnam);
-
-my $debug = 0;
-
-#####  profiling #####
-
-##### ctor #####
-
-sub new {
-    my $proto = shift;
-    my $class = ref($proto) || $proto;
-    my $initial_directory = shift;
-    if ($initial_directory) {
-        $initial_directory = Cwd::realpath($initial_directory);
-    } else {
-        if ( defined $ENV{PWD} ) {
-            $initial_directory = $ENV{PWD};
-        } elsif (defined $ENV{_cwd}) {
-            $initial_directory = $ENV{_cwd};
-        } else {
-            $initial_directory = cwd();
-        };
-    };
-    my $self = {};
-    $self->{INITIAL_DIRECTORY} = $initial_directory;
-    $self->{REPOSITORY_ROOT} = undef;
-    $self->{REPOSITORY_NAME} = undef;
-    $self->{SCM_NAME} = undef;
-    detect_repository($self);
-    bless($self, $class);
-    return $self;
-}
-
-##### methods #####
-sub get_repository_root 
-{   
-    my $self        = shift;
-    return $self->{REPOSITORY_ROOT};
-}
-
-sub get_initial_directory 
-{
-    my $self        = shift;
-    return $self->{INITIAL_DIRECTORY};
-}
-
-sub get_scm_name
-{
-    my $self        = shift;
-    return$self->{SCM_NAME};
-}
-
-##### private methods #####
-sub search_for_hg {
-    my $self        = shift;
-    my $hg_root;
-    my $scm_name = 'hg';
-    if (open(COMMAND, "$scm_name root 2>&1 |")) {
-        foreach (<COMMAND>) {
-            next if (/^Not trusting file/);
-            chomp;
-            $hg_root = $_;
-            last;
-        };
-        close COMMAND;
-        chomp $hg_root;
-        if ($hg_root !~ /There is no Mercurial repository here/) {
-            $self->{REPOSITORY_ROOT} = $hg_root;
-            $self->{SCM_NAME} = $scm_name;
-            return 1;
-        };
-    };
-    return 0;
-};
-
-sub search_via_build_lst {
-    my $self = shift;
-    my @possible_build_lists = ('gbuild.lst', 'build.lst'); # build lists names
-    my $previous_dir = '';
-    my $rep_root_candidate = $self->{INITIAL_DIRECTORY};
-    do {
-        foreach (@possible_build_lists) {
-            my $test_file;
-            if ($rep_root_candidate eq '/') {
-                $test_file = '/prj/' . $_;
-            } else {
-                $test_file = $rep_root_candidate . '/prj/' . $_;
-            };
-            if (-e $test_file) {
-                $self->{REPOSITORY_ROOT} = File::Basename::dirname($rep_root_candidate);
-                return 1;
-            };
-        };
-        $previous_dir = $rep_root_candidate;
-        $rep_root_candidate = File::Basename::dirname($rep_root_candidate);
-        return 0 if ((!$rep_root_candidate) || ($rep_root_candidate eq $previous_dir));
-    }
-    while (chdir "$rep_root_candidate");
-};
-
-sub detect_repository {
-    my $self        = shift;
-    return if (search_via_build_lst($self));
-    chdir $self->{INITIAL_DIRECTORY};
-    return if (search_for_hg($self));
-    croak('Cannot determine source directory/repository for ' . $self->{INITIAL_DIRECTORY});
-};
-
-##### finish #####
-
-1; # needed by use or require
-
-__END__
-
-=head1 NAME
-
-RepositoryHelper - Perl module for working with repositories and underlying SCM
-
-=head1 SYNOPSIS
-
-    # example that will analyze sources and return the source root directory
-
-    use RepositoryHelper;
-
-    # Create a new instance:
-    $a = RepositoryHelper->new();
-
-    # Get repositories for the actual workspace:
-    $a->get_repository_root();
-
-
-=head1 DESCRIPTION
-
-RepositoryHelper is a perlPerl module for working with repositories and underlying SCM 
-in the database.
-
-Methods:
-
-RepositoryHelper::new()
-
-Creates a new instance of RepositoryHelper. Can be initialized by: some path which likely to belong to a repository, default - empty, the current dir will be taken.
-
-RepositoryHelper::get_repository_root()
-
-Returns the repository root, retrieved by SCM methods or on educated guess...
-
-RepositoryHelper::get_initial_directory()
-
-Returns full path to the initialistion directory.
-
-=head2 EXPORT
-
-RepositoryHelper::new()
-RepositoryHelper::get_repository_root()
-RepositoryHelper::get_scm_name()
-RepositoryHelper::get_initial_directory()
-
-=head1 AUTHOR
-
-Vladimir Glazunov, vg@openoffice.org
-
-=head1 SEE ALSO
-
-perl(1).
-
-=cut
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
deleted file mode 100644
index 83ab02da3..000000000
--- a/solenv/bin/modules/SourceConfig.pm
+++ /dev/null
@@ -1,675 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#*************************************************************************
-#
-# SourceConfig - Perl extension for parsing general info databases
-#
-# usage: see below
-#
-#************************************************************************* 
-
-package SourceConfig;
-
-use strict;
-
-use constant SOURCE_CONFIG_FILE_NAME => 'source_config'; 
-use constant SOURCE_CONFIG_VERSION => 3; 
-
-use Carp;
-use Cwd;
-use RepositoryHelper;
-use File::Basename;
-use File::Temp qw(tmpnam);
-
-my $debug = 0;
-
-#####  profiling #####
-
-##### ctor #####
-
-sub new {
-    my $proto = shift;
-    my $class = ref($proto) || $proto;
-    my $source_root = shift;
-    my $self = {};
-    $self->{USER_SOURCE_ROOT} = undef;
-    $self->{SOURCE_CONFIG_FILE} = undef;
-    if (defined $source_root) {
-        $source_root = Cwd::realpath($source_root);
-        $source_root =~ s/\\|\/$//;
-        if (-f $source_root) {
-            # We have path to source_config 
-            if (File::Basename::basename($source_root) eq 'source_config') {
-                # We have path to source_config 
-                $self->{SOURCE_CONFIG_FILE} = $source_root;
-                $source_root = File::Basename::dirname($source_root);
-            } else {
-                croak("$source_root is not a source_config file");
-            };
-        } else {
-            $self->{USER_SOURCE_ROOT} = $source_root;
-            $source_root .= '/..';
-        }
-    } else {
-        $source_root = $ENV{SRC_ROOT};
-    };
-    if ( defined $ENV{USE_GBUILD} and "$ENV{USE_GBUILD}" ne "" )
-    {
-        $self->{POSSIBLE_BUILD_LIST} = ('gbuild.lst', 'build.lst', 'build.xlist'); # build lists names
-    }
-    else
-    {
-        $self->{POSSIBLE_BUILD_LIST} = ('build.lst', 'build.xlist'); # build lists names
-    }
-    $source_root = Cwd::realpath($source_root);
-    $self->{SOURCE_ROOT} = $source_root;
-    $self->{DEBUG} = 0;
-    $self->{VERBOSE} = 0;
-    $self->{REPOSITORIES} = {};
-    $self->{ACTIVATED_REPOSITORIES} = {};
-    $self->{MODULE_PATHS} = {};
-    $self->{MODULE_BUILD_LIST_PATHS} = {};
-    $self->{ACTIVATED_MODULES} = {};
-    $self->{MODULE_REPOSITORY} = {};
-    $self->{REAL_MODULES} = {};
-    $self->{NEW_MODULES} = [];
-    $self->{REMOVE_MODULES} = {};
-    $self->{REMOVE_REPOSITORIES} = {};
-    $self->{NEW_REPOSITORIES} = [];
-    $self->{WARNINGS} = [];
-    $self->{GBUILD} = 0;
-    $self->{REPORT_MESSAGES} = [];
-    $self->{CONFIG_FILE_CONTENT} = [];
-    if (defined $self->{USER_SOURCE_ROOT}) {
-        ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
-    };
-    $self->{SOURCE_CONFIG_FILE} = get_config_file($self->{SOURCE_ROOT}) if (!defined $self->{SOURCE_CONFIG_FILE});
-    $self->{SOURCE_CONFIG_DEFAULT} = $self->{SOURCE_ROOT} .'/'.SOURCE_CONFIG_FILE_NAME;
-    if (defined $self->{USER_SOURCE_ROOT}) {
-        ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
-    };
-    read_config_file($self);
-       get_module_paths($self);
-    bless($self, $class);
-    return $self;
-}
-
-##### methods #####
-
-sub get_version {
-    return SOURCE_CONFIG_VERSION;
-};
-
-sub get_repositories 
-{   
-    my $self        = shift;
-    return sort keys %{$self->{REPOSITORIES}};
-}
-
-sub add_repository 
-{   
-    my $self        = shift;
-    my $new_rep_path = shift;
-    $new_rep_path = Cwd::realpath($new_rep_path);
-    my $new_rep_name = File::Basename::basename($new_rep_path);
-    if (defined ${$self->{REPOSITORIES}}{$new_rep_name}) {
-        croak("Repository $new_rep_name is already defined!!");
-    };
-    ${$self->{REPOSITORIES}}{$new_rep_name} = $new_rep_path;
-    $self -> get_repository_module_paths($new_rep_name);
-}
-
-sub get_config_file_default_path {
-    my $self        = shift;
-    return $self->{SOURCE_CONFIG_DEFAULT};
-}
-
-sub get_config_file_path {
-    my $self = shift;
-    return $self->{SOURCE_CONFIG_FILE};
-}
-
-sub get_module_repository {
-    my $self = shift;
-    my $module = shift;
-    if (defined ${$self->{MODULE_REPOSITORY}}{$module}) {
-        return ${$self->{MODULE_REPOSITORY}}{$module};
-    } else {
-        Carp::cluck("No such module $module in active repositories!!\n");
-        return undef;
-    };
-}
-
-sub get_module_path {
-    my $self = shift;
-    my $module = shift;
-    if (defined ${$self->{MODULE_PATHS}}{$module}) {
-        return ${$self->{MODULE_PATHS}}{$module};
-    } else {
-        Carp::cluck("No path for module $module in active repositories!!\n") if ($debug);
-        return undef;
-    };
-}
-
-sub get_module_build_list {
-    my $self = shift;
-    my $module = shift;
-    if (defined ${$self->{MODULE_BUILD_LIST_PATHS}}{$module}) {
-        return ${$self->{MODULE_BUILD_LIST_PATHS}}{$module};
-    } else {
-        my @possible_build_lists = $self->{POSSIBLE_BUILD_LIST}; # build lists names
-        foreach my $build_list (@possible_build_lists) {
-            my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$build_list";
-            if (-e $possible_path) {
-                ${$self->{MODULE_BUILD_LIST_PATHS}}{$module} = $possible_path;
-                if ( $build_list eq "gbuild.lst" ) {
-                    $self->{GBUILD} = 1;
-                };
-                return $possible_path;
-            };
-        };
-        Carp::cluck("No build list in module $module found!!\n") if ($self->{DEBUG});
-        return undef;
-    };
-}
-
-sub get_all_modules 
-{   
-    my $self = shift;
-    my $module = shift;
-    return sort keys %{$self->{MODULE_PATHS}};
-};
-
-sub get_active_modules 
-{
-    my $self        = shift;
-    if (scalar keys %{$self->{ACTIVATED_MODULES}}) {
-        return sort keys %{$self->{ACTIVATED_MODULES}};
-    }
-       return sort keys %{$self->{REAL_MODULES}};
-}
-
-sub is_active
-{
-    my $self        = shift;
-    my $module		= shift;
-    if (scalar keys %{$self->{ACTIVATED_MODULES}}) {
-        return exists ($self->{ACTIVATED_MODULES}{$module});
-    }
-    return exists ($self->{REAL_MODULES}{$module});
-}
-
-##### private methods #####
-
-sub get_repository_module_paths {
-    my $self        = shift;
-    my $repository        = shift;
-    my $repository_path = ${$self->{REPOSITORIES}}{$repository};
-    if (opendir DIRHANDLE, $repository_path) {
-        foreach my $module (readdir(DIRHANDLE)) {
-            next if (($module =~ /^\.+/) || (!-d "$repository_path/$module"));
-            my $module_entry = $module;
-            if (($module !~ s/\.lnk$//) && ($module !~ s/\.link$//)) {
-                $self->{REAL_MODULES}{$module}++;
-            }
-            my $possible_path = "$repository_path/$module_entry";
-            if (-d $possible_path) {
-                if (defined ${$self->{MODULE_PATHS}}{$module}) {
-                    close DIRHANDLE;
-                    croak("Ambiguous paths for module $module: $possible_path and " . ${$self->{MODULE_PATHS}}{$module});
-                };
-                ${$self->{MODULE_PATHS}}{$module} = $possible_path;
-                ${$self->{MODULE_REPOSITORY}}{$module} = $repository;
-            }
-        };
-        close DIRHANDLE;
-    } else {
-        croak("Cannot read $repository_path repository content");
-    };
-};
-
-sub get_module_paths {
-    my $self        = shift;
-    foreach my $repository (keys %{$self->{REPOSITORIES}}) {
-        get_repository_module_paths($self, $repository);
-    };
-    my @false_actives = ();
-    foreach (keys %{$self->{ACTIVATED_MODULES}}) {
-        push(@false_actives, $_) if (!defined  ${$self->{MODULE_PATHS}}{$_});
-    };
-    croak("Error!! Activated module(s): @false_actives\nnot found in the active repositories!! Please check your " . $self->{SOURCE_CONFIG_FILE} . "\n") if (scalar @false_actives);
-    croak("No modules found!") if (!scalar keys %{$self->{MODULE_PATHS}});
-};
-
-sub get_config_file {
-    my $source_root = shift;
-    my $possible_path = $source_root . '/' . SOURCE_CONFIG_FILE_NAME;
-    return $possible_path if (-f $possible_path);
-    return '';
-};
-
-#
-# Fallback - fallback repository is based on RepositoryHelper educated guess
-#
-sub get_fallback_repository {
-    my $self = shift;
-    my $repository_root = RepositoryHelper->new()->get_repository_root();
-    ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root;
-};
-
-sub read_config_file {
-    my $self = shift;
-    if (!$self->{SOURCE_CONFIG_FILE}) {
-        if (!defined $self->{USER_SOURCE_ROOT}) {
-            get_fallback_repository($self);
-        };
-        return;
-    };
-    my $repository_section = 0;
-    my $module_section = 0;
-    my $line = 0;
-    my @file_content = ();
-
-    if (open(SOURCE_CONFIG_FILE, $self->{SOURCE_CONFIG_FILE})) {
-        foreach (<SOURCE_CONFIG_FILE>) {
-            push (@{$self->{CONFIG_FILE_CONTENT}}, $_);
-            $line++;
-            chomp;
-            next if (!/^\S+/);
-            next if (/^\s*#+/);
-            s/\r\n//;
-            if (/^\[repositories\]\s*(\s+#)*/) {
-                $module_section = 0;
-                $repository_section = 1;
-                next;
-            };
-            if (/^\[modules\]\s*(\s+#)*/) {
-                $module_section = 1;
-                $repository_section = 0;
-                next;
-            };
-            next if (!$repository_section && !$module_section);
-            if (/\s*(\S+)=active\s*(\s+#)*/) {
-                if ($repository_section) {
-                    my $repository_source_path = $self->{SOURCE_ROOT} . "/$1";
-                    ${$self->{REPOSITORIES}}{$1} = $repository_source_path;
-                    ${$self->{ACTIVATED_REPOSITORIES}}{$1}++;
-                    next;
-                }
-                if ($module_section) {
-                    ${$self->{ACTIVATED_MODULES}}{$1}++;
-                    next;
-                };
-            };
-            croak("Line $line in " . $self->{SOURCE_CONFIG_FILE} . ' violates format. Please make your checks!');
-        };
-        close SOURCE_CONFIG_FILE;
-        if (!scalar keys %{$self->{REPOSITORIES}}) {
-            get_fallback_repository($self);
-        };
-    } else {
-        croak('Cannot open ' . $self->{SOURCE_CONFIG_FILE} . ' for reading');
-    };
-};
-
-sub remove_all_activated_repositories {
-    my $self = shift;
-    $self->remove_activated_repositories([keys %{$self->{ACTIVATED_REPOSITORIES}}]);
-};
-
-sub remove_activated_repositories {
-    my $self = shift;
-    my $new_repositories_ref = shift;
-    push(@{$self->{WARNINGS}}, "\nWARNING: Empty repository list passed for removing from source_config\n") if (!scalar @$new_repositories_ref);
-    $self->{VERBOSE} = shift;
-    $self->{REMOVE_REPOSITORIES} = {};
-    foreach (@$new_repositories_ref) {
-        if (!defined ${$self->{ACTIVATED_REPOSITORIES}}{$_}) {
-            push (@{$self->{WARNINGS}}, "\nWARNING: repository $_ is not activated in ". $self->get_config_file_default_path()."\n");
-        } else {
-            ${$self->{REMOVE_REPOSITORIES}}{$_}++;
-            delete ${$self->{ACTIVATED_REPOSITORIES}}{$_};
-        };
-    };
-    generate_config_file($self);
-};
-
-sub remove_all_activated_modules {
-    my $self = shift;
-    $self->remove_activated_modules([keys %{$self->{ACTIVATED_MODULES}}]);
-};
-
-sub remove_activated_modules {
-    my $self = shift;
-    my $new_modules_ref = shift;
-    push(@{$self->{WARNINGS}}, "\nWARNING: Empty module list passed for removing from source_config\n") if (!scalar @$new_modules_ref);
-    $self->{VERBOSE} = shift;
-    $self->{REMOVE_MODULES} = {};
-    foreach (@$new_modules_ref) {
-        if (!defined ${$self->{ACTIVATED_MODULES}}{$_}) {
-            push (@{$self->{WARNINGS}}, "\nWARNING: module $_ is not activated in ". $self->get_config_file_default_path()."\n");
-        } else {
-            ${$self->{REMOVE_MODULES}}{$_}++;
-            delete ${$self->{ACTIVATED_MODULES}}{$_};
-        };
-    };
-    generate_config_file($self);
-};
-
-sub add_active_repositories {
-    my $self = shift;
-    $self->{NEW_REPOSITORIES} = shift;
-    croak('Empty repository list passed for addition to source_config') if (!scalar @{$self->{NEW_REPOSITORIES}});
-    $self->{VERBOSE} = shift;
-    foreach (@{$self->{NEW_REPOSITORIES}}) {
-        $self->add_repository($_);
-    };
-    generate_config_file($self);
-};
-
-sub add_active_modules {
-    my $self = shift;
-    my $module_list_ref = shift;
-    my $ignored_modules_string = '';
-    my @real_modules = ();
-    foreach my $module (sort @$module_list_ref) {
-        if ($self->get_module_path($module)) {
-            push(@real_modules, $module);
-        } else {
-            $ignored_modules_string .= " $module";
-        };
-    };
-    push (@{$self->{WARNINGS}}, "\nWARNING: following modules are not found in active repositories, and have not been added to the " . $self->get_config_file_default_path() . ":$ignored_modules_string\n") if ($ignored_modules_string);
-    $self->{NEW_MODULES} = \@real_modules;
-    croak('Empty module list passed for addition to source_config') if (!scalar @{$self->{NEW_MODULES}});
-    $self->{VERBOSE} = shift;
-    generate_config_file($self);
-};
-
-sub add_content {
-    my $self = shift;
-    my $content = shift;
-    my $entries_to_add = shift;
-    return if (!scalar @$entries_to_add);
-    my $message;
-    my $message_part1;
-    my $warning_message;
-    my $activated_entries;
-    
-    if ($entries_to_add == $self->{NEW_MODULES}) {
-        $self->{NEW_MODULES} = [];
-        $message_part1 = "Module(s):\n";
-        $activated_entries = $self->{ACTIVATED_MODULES};
-    } elsif ($entries_to_add == $self->{NEW_REPOSITORIES}) {
-        $self->{NEW_REPOSITORIES} = [];
-        $message_part1 = "Repositories:\n";
-        $activated_entries = $self->{ACTIVATED_REPOSITORIES};
-    };
-    foreach my $entry (@$entries_to_add) {
-        if (defined $$activated_entries{$entry}) {
-            $warning_message .= "$entry "
-        } else {
-            push(@$content, "$entry=active\n");
-            ${$activated_entries}{$entry}++;
-            $message .= "$entry "
-        };
-    };
-    
-    push(@{$self->{REPORT_MESSAGES}}, "\n$message_part1 $message\nhave been added to the ". $self->get_config_file_default_path()."\n") if ($message);
-    push (@{$self->{WARNINGS}}, "\nWARNING: $message_part1 $warning_message\nare already added to the ". $self->get_config_file_default_path()."\n") if ($warning_message);
-};
-
-sub generate_config_file {
-    my $self = shift;
-    my @config_content_new = ();
-    my ($module_section, $repository_section);
-    my %removed_modules = ();
-    my %removed_repositories = ();
-    foreach (@{$self->{CONFIG_FILE_CONTENT}}) {
-        if (/^\[repositories\]\s*(\s+#)*/) {
-            if ($module_section) {
-                $self->add_content(\@config_content_new, $self->{NEW_MODULES});
-            };
-            $module_section = 0;
-            $repository_section = 1;
-        };
-        if (/^\[modules\]\s*(\s+#)*/) {
-            if ($repository_section) {
-                $self->add_content(\@config_content_new, $self->{NEW_REPOSITORIES});
-            };
-            $module_section = 1;
-            $repository_section = 0;
-        };
-        if ($module_section && /\s*(\S+)=active\s*(\s+#)*/) {
-            if (defined ${$self->{REMOVE_MODULES}}{$1}) {
-                $removed_modules{$1}++;
-                next;
-            };
-        }
-        if ($repository_section && /\s*(\S+)=active\s*(\s+#)*/) {
-            if (defined ${$self->{REMOVE_REPOSITORIES}}{$1}) {
-                $removed_repositories{$1}++;
-                next;
-            };
-        }
-        push(@config_content_new, $_);
-    };
-    if (scalar @{$self->{NEW_MODULES}}) {
-        push(@config_content_new, "[modules]\n") if (!$module_section);
-        $self->add_content(\@config_content_new, $self->{NEW_MODULES});
-    };
-    if (scalar @{$self->{NEW_REPOSITORIES}}) {
-        push(@config_content_new, "[repositories]\n") if (!$repository_section);
-        $self->add_content(\@config_content_new, $self->{NEW_REPOSITORIES});
-    };
-    if (scalar keys %removed_modules) {
-        my @deleted_modules = keys %removed_modules;
-        push(@{$self->{REPORT_MESSAGES}}, "\nModules: @deleted_modules\nhave been removed from the ". $self->get_config_file_default_path()."\n");
-    
-    };
-    if (scalar keys %removed_repositories) {
-        my @deleted_repositories = keys %removed_repositories;
-        push(@{$self->{REPORT_MESSAGES}}, "\nRepositories: @deleted_repositories\nhave been removed from the ". $self->get_config_file_default_path()."\n");
-    
-    };
-
-    # Writing file, printing warnings and reports
-    
-    #check if we need to write a new file
-    my $write_needed = 0;
-    if ((scalar @{$self->{CONFIG_FILE_CONTENT}}) != (scalar @config_content_new)) {
-        $write_needed++;
-    } else {
-        foreach my $i (0 .. $#{$self->{CONFIG_FILE_CONTENT}}) {
-            if (${$self->{CONFIG_FILE_CONTENT}}[$i] ne $config_content_new[$i]) {
-                $write_needed++;
-                last;
-            };
-        };
-    };
-    if ($write_needed) {
-        my $temp_config_file = File::Temp::tmpnam($ENV{TMP});
-        die("Cannot open $temp_config_file") if (!open(NEW_CONFIG, ">$temp_config_file"));
-        print NEW_CONFIG $_ foreach (@config_content_new);
-        close NEW_CONFIG;
-        rename($temp_config_file, $self->get_config_file_default_path()) or  system("mv", $temp_config_file, $self->get_config_file_default_path());
-        if (-e $temp_config_file) {
-            system("rm -rf $temp_config_file") if (!unlink $temp_config_file);
-        };
-        $self->{CONFIG_FILE_CONTENT} = \@config_content_new;
-    };
-    if ($self->{VERBOSE}) {
-        print $_ foreach (@{$self->{WARNINGS}});
-        $self->{VERBOSE} = 0;
-    };
-    $self->{WARNINGS} = [];
-    print $_ foreach (@{$self->{REPORT_MESSAGES}});
-    $self->{REPORT_MESSAGES} = [];
-};
-
-##### finish #####
-
-1; # needed by use or require
-
-__END__
-
-=head1 NAME
-
-SourceConfig - Perl extension for parsing general info databases
-
-=head1 SYNOPSIS
-
-    # example that will read source_config file and return the active repositories
-
-    use SourceConfig;
-
-    # Create a new instance of the parser:
-    $a = SourceConfig->new();
-
-    # Get repositories for the actual workspace:
-    $a->get_repositories();
-
-    # Add a repository new_repository for the actual workspace (via full path):
-    $a->add_repository(/DEV300/new_repository);
-  
-=head1 DESCRIPTION
-
-SourceConfig is a perl extension to load and parse General Info Databses.
-It uses a simple object oriented interface to retrieve the information stored
-in the database.
-
-Methods:
-
-SourceConfig::new()
-
-Creates a new instance of SourceConfig. Can be initialized by: path to the default repository, path to the source_config, default - empty, the source_config will be taken from the environment
-
-
-SourceConfig::get_version()
-
-Returns version number of the module. Can't fail.
-
-
-SourceConfig::get_repositories()
-
-Returns sorted list of active repositories for the actual workspace
-
-
-SourceConfig::add_repository(REPOSITORY_PATH)
-
-Adds a repository to the list of active repositories
-
-
-SourceConfig::get_active_modules()
-
-Returns a sorted list of active modules
-
-SourceConfig::get_all_modules()
-
-Returns sorted list of all modules in active repositories.
-
-SourceConfig::get_module_path($module)
-
-Returns absolute module path
-
-SourceConfig::get_module_build_list($module)
-
-Returns absolute module build list path
-
-SourceConfig::get_module_repository($module)
-
-Returns the module's repository
-
-SourceConfig::get_config_file_path()
-
-Returns absolute module to the source configuration file
-
-SourceConfig::get_config_file_default_path()
-
-Returns default path for source configuration file
-
-SourceConfig::is_active()
-
-Returns 1 (TRUE) if a module is active
-Returns 0 (FALSE) if a module is not active
-
-SourceConfig::add_active_modules($module_array_ref)
-
-Adds modules from the @$module_array_ref as active to the source_config file
-
-SourceConfig::add_active_repositories($repository_array_ref)
-
-Adds repositories from the @$repository_array_ref as active to the source_config file
-
-SourceConfig::remove_activated_modules($module_array_ref)
-
-Removes modules from the @$module_array_ref from the source_config file
-
-SourceConfig::remove_all_activated_modules()
-
-Removes all activated modules from the source_config file
-
-SourceConfig::remove_activated_repositories($repository_array_ref)
-
-Removes repositories from the @$repository_array_ref from the source_config file
-
-SourceConfig::remove_all_activated_repositories()
-
-Removes all activated repositories from the source_config file
-
-
-=head2 EXPORT
-
-SourceConfig::new()
-SourceConfig::get_version()
-SourceConfig::get_repositories()
-SourceConfig::add_repository()
-SourceConfig::get_active_modules()
-SourceConfig::get_all_modules()
-SourceConfig::get_module_path($module)
-SourceConfig::get_module_build_list($module)
-SourceConfig::get_module_repository($module)
-SourceConfig::get_config_file_path()
-SourceConfig::get_config_file_default_path()
-SourceConfig::is_active($module)
-SourceConfig::add_active_modules($module_array_ref)
-SourceConfig::add_active_repositories($repository_array_ref)
-SourceConfig::remove_activated_modules($module_array_ref)
-SourceConfig::remove_all_activated_modules()
-SourceConfig::remove_activated_repositories($repository_array_ref)
-SourceConfig::remove_all_activated_repositories()
-
-=head1 AUTHOR
-
-Vladimir Glazunov, vg@openoffice.org
-
-=head1 SEE ALSO
-
-perl(1).
-
-=cut
diff --git a/solenv/bin/modules/SourceConfigHelper.pm b/solenv/bin/modules/SourceConfigHelper.pm
deleted file mode 100644
index d6f8a547c..000000000
--- a/solenv/bin/modules/SourceConfigHelper.pm
+++ /dev/null
@@ -1,422 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#*************************************************************************
-#
-# SourceConfigHelper - Perl extension for parsing general info databases
-#
-# usage: see below
-#
-#************************************************************************* 
-
-package SourceConfigHelper;
-
-use strict;
-
-use RepositoryHelper;
-use SourceConfig;
-use Cwd qw (cwd);
-use Carp;
-
-my $debug = 0;
-my @source_config_list; # array of sourceconfig objects
-
-#-----------------------------------------------------------------------
-#	Constants
-#-----------------------------------------------------------------------
-
-use constant SOURCE_CONFIG_NONE => 0;
-use constant SOURCE_CONFIG_CURRENT_FIRST => 1;
-use constant SOURCE_CONFIG_ENVIRONMENT_FIRST => 2;
-use constant SOURCE_CONFIG_CURRENT_ONLY => 3;
-use constant SOURCE_CONFIG_ENVIRONMENT_ONLY => 4;
-
-use constant SOURCE_CONFIG_DEFAULT => SOURCE_CONFIG_CURRENT_FIRST;
-
-#####  profiling #####
-
-##### ctor #####
-
-sub new {
-    my $proto = shift;
-    my $class = ref($proto) || $proto;
-    my $init_action = shift;
-    my $self = {};
-    my $SourceConfigCurrent;
-    my $SourceConfigEnvironment;
-    
-    $init_action = SOURCE_CONFIG_DEFAULT if (!defined ($init_action));
-    if (!eval ($init_action) or ($init_action < SOURCE_CONFIG_NONE) or ($init_action > SOURCE_CONFIG_ENVIRONMENT_ONLY)) {
-        croak("wrong initial parameter: $init_action\n"); 
-    }
-    
-    if ($init_action != SOURCE_CONFIG_NONE) {
-        my $repositoryHash_ref = {};
-        if ($init_action != SOURCE_CONFIG_ENVIRONMENT_ONLY) {
-            my $initial_directory = cwd();
-            my $result = is_repository($initial_directory, $repositoryHash_ref);
-            if ($result) {
-                $SourceConfigCurrent = SourceConfig->new($repositoryHash_ref->{REPOSITORY_ROOT});
-            }
-        }
-        if ($init_action != SOURCE_CONFIG_CURRENT_ONLY) {
-            my $source_config = $ENV{SOURCE_ROOT_DIR} . '/' . SourceConfig::SOURCE_CONFIG_FILE_NAME;
-            if (-f $source_config) {
-                $SourceConfigEnvironment = SourceConfig->new($source_config);
-            }
-        }
-        
-        # fill array
-        
-        if (($init_action == SOURCE_CONFIG_CURRENT_FIRST) or ($init_action == SOURCE_CONFIG_CURRENT_ONLY)) {
-            if (defined ($SourceConfigCurrent)) {
-                push (@source_config_list, $SourceConfigCurrent);
-            }
-            if ($init_action == SOURCE_CONFIG_CURRENT_FIRST) {
-                if (defined ($SourceConfigEnvironment)) {
-                    push (@source_config_list, $SourceConfigEnvironment);
-                }
-            }
-        }
-        elsif (($init_action == SOURCE_CONFIG_ENVIRONMENT_FIRST) or ($init_action == SOURCE_CONFIG_ENVIRONMENT_ONLY)) {
-            if (defined ($SourceConfigEnvironment)) {
-                push (@source_config_list, $SourceConfigEnvironment);
-            }
-            if ($init_action == SOURCE_CONFIG_ENVIRONMENT_FIRST) {
-                if (defined ($SourceConfigCurrent)) {
-                    push (@source_config_list, $SourceConfigCurrent);
-                }
-            }
-        }
-    }
-    
-    $self->{SOURCE_CONFIG_LIST} = \@source_config_list;
-
-    bless($self, $class);
-    return $self;
-}
-
-##### methods #####
-
-############################################################################################
-
-sub add_SourceConfig {
-    my $self = shift;
-    my $source_config = shift;
-    push (@{$self->{SOURCE_CONFIG_LIST}}, $source_config);
-}
-
-############################################################################################
-
-sub get_SourceConfigList {
-    my $self = shift;
-    return @{$self->{SOURCE_CONFIG_LIST}};
-}
-
-############################################################################################
-
-sub has_SourceConfig {
-    my $self = shift;
-    my $result = 0;
-    my $count = @{$self->{SOURCE_CONFIG_LIST}};
-    $result = 1 if ($count > 0);
-    return $result;
-}
-
-############################################################################################
-
-sub get_module_path {
-    my $self = shift;
-    my $module = shift;
-    my $function = \&SourceConfig::get_module_path;
-    my $result; 
-    $result = $self->get_StringResult ($function, $module);
-    return $result;
-}
-
-############################################################################################
-
-sub get_active_modules {
-    my $self = shift;
-    my $parameter; # empty
-    my $function = \&SourceConfig::get_active_modules;
-    my $array_ref;
-    $array_ref = $self->get_ArrayResult ($function, $parameter);
-    return @$array_ref;
-}
-
-############################################################################################
-
-sub get_repositories {
-    my $self = shift;
-    my $parameter; # empty
-    my $function = \&SourceConfig::get_repositories;
-    my $array_ref;
-    $array_ref = $self->get_ArrayResult ($function, $parameter);
-    return @$array_ref;
-}
-
-############################################################################################
-
-sub get_module_repository {
-    my $self = shift;
-    my $module = shift;
-    my $function = \&SourceConfig::get_module_repository;
-    my $result; 
-    $result = $self->get_StringResult ($function, $module);
-    return $result;
-}
-
-############################################################################################
-
-sub is_active {
-    my $self = shift;
-    my $module = shift;
-    my $function = \&SourceConfig::is_active;
-    my $result_ref; 
-    my $is_active = 0;
-    $result_ref = $self->get_ResultOfList ($function, $module);
-    my $count = @$result_ref;
-    if ($count>0) {
-        foreach my $active (@$result_ref) {
-            if ($active) {
-                $is_active = $active;
-            }
-        }
-    }
-    return $is_active;
-}
-
-##### private methods #####
-
-############################################################################################
-#
-# is_repository () : check if the directory is a valid repository
-#
-# input: - directory
-#        - hash reference, where the output will be stored
-#
-# output: 0 = FALSE, the directory is no valid repository
-#         1 = TRUE, the repository root can be found in $repositoryHash_ref->{REPOSITORY_ROOT}
-#
-############################################################################################
-
-sub is_repository {
-    my $directory = shift;
-    my $repositoryHash_ref = shift;
-    $repositoryHash_ref->{INITIAL_DIRECTORY} = $directory;
-    $repositoryHash_ref->{REPOSITORY_ROOT} = undef;
-    $repositoryHash_ref->{REPOSITORY_NAME} = undef;
-    my $result = RepositoryHelper::search_via_build_lst($repositoryHash_ref);
-    chdir $repositoryHash_ref->{INITIAL_DIRECTORY};
-    if (!$result) {
-        $result = RepositoryHelper::search_for_hg($repositoryHash_ref);
-    }
-    return $result;
-}
-
-############################################################################################
-#
-# get_ResultOfList(): give back an array reference from all SourceConfig Objects results
-#
-# input: - function : reference to the called function of each SourceConfig Object
-#        - parameter : parameter for the called function
-#
-# output: result : array of all results
-#
-############################################################################################
-
-sub get_ResultOfList {
-    my $self = shift;
-    my $function = shift;
-    my $parameter = shift;
-    my @result;
-    foreach my $source_config (@{$self->{SOURCE_CONFIG_LIST}}) {
-        push (@result, &$function ($source_config, $parameter));
-    }
-    return \@result;
-}
-
-############################################################################################
-#
-# get_StringResult(): give back the first defined result from all SourceConfig Objects
-#
-# input: - function : reference to the called function of each SourceConfig Object
-#        - parameter : parameter for the called function
-#
-# output: result : scalar variable (string), undef if no result
-#
-############################################################################################
-
-sub get_StringResult {
-    my $self = shift;
-    my $function = shift;
-    my $parameter = shift;
-    my $result_ref; 
-    $result_ref = $self->get_ResultOfList ($function, $parameter);
-    my $count = @$result_ref;
-    if ($count>0) {
-        my $value;
-        my $i = 0;
-        while (($i < $count) and !defined ($value)) { # search the first defined result
-            $value = $$result_ref[$i];
-            $i++;
-        }
-        return $value;
-    }
-    return undef;
-}
-
-############################################################################################
-#
-# get_StringResult(): give back a sorted and uniqe array reference of the results
-#                     from all SourceConfig Objects
-#
-# input: - function : reference to the called function of each SourceConfig Object
-#        - parameter : parameter for the called function
-#
-# output: result : sorted and uniqe array reference
-#
-############################################################################################
-
-sub get_ArrayResult {
-    my $self = shift;
-    my $function = shift;
-    my $parameter = shift;
-    my $result_ref; 
-    my @modules;
-    $result_ref = $self->get_ResultOfList ($function, $parameter);
-    my $count = @$result_ref;
-    if ($count>0) {
-        my %moduleHash;
-        foreach my $module (@$result_ref) {
-            $moduleHash{$module}++;
-        }
-        @modules = sort keys %moduleHash;
-    }
-    return \@modules;
-}
- 
- ##### finish #####
-
-1; # needed by use or require
-
-__END__
-
-=head1 NAME
-
-SourceConfigHelper - Perl extension for handling with SourceConfigObjetcs
-
-=head1 SYNOPSIS
-
-    # example that will read source_config file and return the active repositories
-
-    use SourceConfigHelper;
-
-    # Create a new instance:
-    $a = SourceConfigHelper->new();
-
-    # Get repositories for the actual workspace:
-    $a->get_repositories();
-
-=head1 DESCRIPTION
-
-SourceConfigHelper is a perl extension to handle more than one objects of SourceConfig
-to set up a search order for modules.
-
-Methods:
-
-SourceConfigHelper::new()
-
-Creates a new instance of SourceConfigHelper. Can be initialized by: default - empty or with a constant of search order. default: the source_config will be taken first from the current repository and second from the environment
-Possible parameters are:
-SourceConfigHelper::SOURCE_CONFIG_NONE - no SourceConfig Object will be created
-SourceConfigHelper::SOURCE_CONFIG_CURRENT_FIRST - use the current repository first
-SourceConfigHelper::SOURCE_CONFIG_ENVIRONMENT_FIRST - use the repository of the environment first
-SourceConfigHelper::SOURCE_CONFIG_CURRENT_ONLY - use only the current repository
-SourceConfigHelper::SOURCE_CONFIG_ENVIRONMENT_ONLY - use only the repository of the environment
-
-SourceConfigHelper::get_repositories()
-
-Returns sorted list of active repositories for the actual workspace
-
-SourceConfigHelper::get_active_modules()
-
-Returns a sorted list of active modules
-
-SourceConfigHelper::get_all_modules()
-
-Returns sorted list of all modules in active repositories.
-
-SourceConfigHelper::get_module_path($module)
-
-Returns absolute module path. If the module is not active or don't exists, "undef" will be returned.
-
-SourceConfigHelper::get_module_repository($module)
-
-Returns the module's repository. If the module is not active or don't exists, "undef" will be returned.
-
-SourceConfigHelper::is_active()
-
-Returns 1 (TRUE) if a module is active
-Returns 0 (FALSE) if a module is not active
-
-SourceConfigHelper::add_SourceConfig($SourceConfigObject)
-
-Add the SourceConfigObject to the end of the list
-
-SourceConfigHelper::get_SourceConfigList()
-
-Return an array of SourceConfigObjects
-
-SourceConfigHelper::has_SourceConfig()
-
-Returns 1 (TRUE) if one or more SourceConfig Objects is in the list
-Returns 0 (FALSE) if no SourceConfig Object is in the list (can happen if there is no valid repository)
-
-=head2 EXPORT
-
-SourceConfigHelper::new()
-SourceConfigHelper::get_repositories()
-SourceConfigHelper::get_active_modules()
-SourceConfigHelper::get_all_modules()
-SourceConfigHelper::get_module_path($module)
-SourceConfigHelper::get_module_repository($module)
-SourceConfigHelper::is_active($module)
-SourceConfigHelper::add_SourceConfig($SourceConfigObject)
-SourceConfigHelper::get_SourceConfigList()
-SourceConfigHelper::has_SourceConfig()
-
-=head1 AUTHOR
-
-Kurt Zenker, kz@openoffice.org
-
-=head1 SEE ALSO
-
-perl(1).
-
-=cut 
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
deleted file mode 100644
index 34fff6c6c..000000000
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ /dev/null
@@ -1,565 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::archivefiles;
-
-use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
-use installer::converter;
-use installer::existence;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::systemactions;
-use Cwd;
-
-#################################################################
-# Changing the name for files with flag RENAME_TO_LANGUAGE
-#################################################################
-
-sub put_language_into_name
-{
-    my ( $oldname, $onelanguage ) = @_;
-    
-    my $newname = "";
-    
-    my $filename = "";
-    my $extension = "";
-    
-    if ( $oldname =~ /en-US/ )	# files, that contain the language in the file name
-    {
-        $newname = $oldname;
-        $newname =~ s/en-US/$onelanguage/;
-    }
-    else	# files, that do not contain the language in the file name
-    {
-        if ( $oldname =~ /^\s*(.*)(\..*?)\s*$/ )	# files with extension
-        {
-            $filename = $1;
-            $extension = $2;	
-        }
-        else
-        {
-            $filename = $oldname;
-            $extension = "";	
-        }
-    
-        $newname = $1 . "_" . $onelanguage . $2;
-    }
-    
-    return $newname;
-}
-
-#################################################################
-# Converting patchfiles string into array
-#################################################################
-
-sub get_patch_file_list
-{
-    my ( $patchfilestring ) = @_;
-    
-    $patchfilestring =~ s/^\s*\(?//;
-    $patchfilestring =~ s/\)?\s*$//;
-    $patchfilestring =~ s/^\s*\///;
-    $patchfilestring =~ s/^\s*\\//;
-    
-    my $patchfilesarray = installer::converter::convert_stringlist_into_array_without_newline(\$patchfilestring, ",");
-
-    return $patchfilesarray;
-}
-
-#################################################################
-# Reading all executables in the "manifest.xml"
-#################################################################
-
-sub get_all_executables_from_manifest
-{
-    my ($unzipdir, $manifestfile, $executable_files_in_extensions) = @_;
-    
-    my $is_executable = 0;
-    
-    for ( my $i = 0; $i <= $#{$manifestfile}; $i++ )
-    {
-        my $line = ${$manifestfile}[$i];
-        
-        if ( $line =~ /\"application\/vnd\.sun\.star\.executable\"/ ) { $is_executable = 1; }
-
-        if (( $line =~ /manifest\:full\-path=\"(.*?)\"/ ) && ( $is_executable ))
-        {
-            my $filename = $unzipdir . $installer::globals::separator . $1;
-            # making only slashes for comparison reasons
-            $filename =~ s/\\/\//g;
-            $executable_files_in_extensions->{$filename} = 1;
-        }
-
-        if ( $line =~ /\/\>/ ) { $is_executable = 0; }
-    }
-}
-
-#################################################################
-# Reading the "manifest.xml" in extensions and determine, if
-# there are executable files
-#################################################################
-
-sub collect_all_executable_files_in_extensions
-{
-    my ($unzipdir, $executable_files_in_extensions) = @_;
-    
-    $unzipdir =~ s/\Q$installer::globals::separator\E\s*$//;
-        
-    my $manifestfilename = $unzipdir . $installer::globals::separator . "META-INF" . $installer::globals::separator . "manifest.xml";
-
-    if ( -f $manifestfilename )
-    {
-        my $manifestfile = installer::files::read_file($manifestfilename);
-        get_all_executables_from_manifest($unzipdir, $manifestfile, $executable_files_in_extensions);		
-    }
-}
-
-#################################################################
-# Analyzing files with flag ARCHIVE
-#################################################################
-
-sub resolving_archive_flag
-{
-    my ($filesarrayref, $additionalpathsref, $languagestringref, $loggingdir) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::archivefiles::resolving_archive_flag : $#{$filesarrayref} : $#{$additionalpathsref} : $$languagestringref : $loggingdir"); }
-    
-    my @newallfilesarray = ();
-
-    my ($systemcall, $returnvalue, $infoline);
-        
-    my $unziplistfile = $loggingdir . "unziplist_" . $installer::globals::build . "_" . $installer::globals::compiler . "_" . $$languagestringref . ".txt";
-
-    my $platformunzipdirbase = installer::systemactions::create_directories("zip", $languagestringref);
-    push(@installer::globals::removedirs, $platformunzipdirbase);
-
-    installer::logger::include_header_into_logfile("Files with flag ARCHIVE:");
-
-    my $repeat_unzip = 0;
-    my $maxcounter = 0;
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        if ( $repeat_unzip ) { $i--; }	# decreasing the counter
-
-        my $onefile = ${$filesarrayref}[$i];
-        my $styles = "";
-        
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-    
-        if ( $styles =~ /\bARCHIVE\b/ )		# copying, unzipping and changing the file list
-        {
-            my $iscommonfile = 0;			
-            my $sourcepath = $onefile->{'sourcepath'};			
-
-            if ( $sourcepath =~ /\Q$installer::globals::separator\E\bcommon$installer::globals::productextension\Q$installer::globals::separator\E/ )	# /common/ or /common.pro/
-            {
-                $iscommonfile = 1;
-            }
-
-            my $use_internal_rights = 0;
-            if ( $styles =~ /\bUSE_INTERNAL_RIGHTS\b/ ) { $use_internal_rights = 1; }	# using the rights used inside the zip file
-
-            my $rename_to_language = 0;			
-            if ( $styles =~ /\bRENAME_TO_LANGUAGE\b/ ) { $rename_to_language = 1; }	# special handling for renamed files (scriptitems.pm)
-
-            my %executable_files_in_extensions = ();
-            my $set_executable_privileges = 0;  # setting privileges for exectables is required for oxt files
-            if ( $onefile->{'Name'} =~ /\.oxt\s*$/ ) { $set_executable_privileges = 1; }					
-
-            # mechanism to select files from an archive files
-            my $select_files = 0;
-            my $selectlistfiles = "";
-            my @keptfiles = ();
-            if ( $onefile->{'Selectfiles'} )
-            {
-                $select_files = 1;
-                $selectlistfiles = get_patch_file_list( $onefile->{'Selectfiles'} );
-                $infoline = "Selected file list defined at file: $onefile->{'Name'} :\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                for ( my $k = 0; $k <= $#{$selectlistfiles}; $k++ )
-                {
-                    $infoline = "\"${$selectlistfiles}[$k]\"\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-            }
-            
-            if ( $onefile->{'Selectfiles'} ) { $onefile->{'Selectfiles'} = ""; } # Selected files list no longer required
-
-            # mechanism to define patch files inside an archive files
-            my $select_patch_files = 0;
-            my $patchlistfiles = "";
-            my @keptpatchflags = ();
-            if (( $styles =~ /\bPATCH\b/ ) && ( $onefile->{'Patchfiles'} ) && ( $installer::globals::patch ))
-            {
-                $select_patch_files = 1; # special handling if a Patchlist is defined
-                $patchlistfiles = get_patch_file_list( $onefile->{'Patchfiles'} );
-                $infoline = "Patch file list defined at file: $onefile->{'Name'} :\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                for ( my $k = 0; $k <= $#{$patchlistfiles}; $k++ )
-                {
-                    $infoline = "\"${$patchlistfiles}[$k]\"\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-            }
-
-            if ( $onefile->{'Patchfiles'} ) { $onefile->{'Patchfiles'} = ""; } # Patch file list no longer required
-            
-            # creating directories
-
-            my $onelanguage = $onefile->{'specificlanguage'};
-            
-            # files without language into directory "00"
-            
-            if ($onelanguage eq "") { $onelanguage = "00"; }
-
-            my $unzipdir;
-
-            $unzipdir = $platformunzipdirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator;
-            
-            installer::systemactions::create_directory($unzipdir);	# creating language specific subdirectories
-
-            my $onefilename = $onefile->{'Name'};
-            $onefilename =~ s/\./\_/g;		# creating new directory name
-            $onefilename =~ s/\//\_/g;		# only because of /letter/fontunxpsprint.zip, the only zip file with path
-            $unzipdir = $unzipdir . $onefilename . $installer::globals::separator; 
-
-            if ( $installer::globals::dounzip ) { installer::systemactions::create_directory($unzipdir); }	# creating subdirectories with the names of the zipfiles
-
-            my $zip = Archive::Zip->new();
-            if ( $zip->read($sourcepath) != AZ_OK )
-            {
-                $infoline = "ERROR: Could not unzip $sourcepath\n";
-                push( @installer::globals::logfileinfo, $infoline);				
-            }
-
-            my $counter = 0;
-            my $contains_dll = 0;
-            my @dllList = ();
-            my @dirs = ();
-            foreach my $member ( $zip->memberNames() )
-            {
-                $counter++;
-                if ( $member =~ /.dll\s*$/i ) { $contains_dll = 1; push(@dllList, $member); }
-                if ( $member =~ m/\/$/ ) { push(@dirs, $member); }
-            }
-
-            if (! ( $counter > 0 ))	# the zipfile is empty
-            {
-                $infoline = "ERROR: Could not unzip $sourcepath\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                
-            }
-            else
-            {
-                if ( $installer::globals::dounzip )			# really unpacking the files 
-                {					
-                    if ( $zip->extractTree("", $unzipdir) != AZ_OK ) { installer::exiter::exit_program("ERROR: $infoline", "resolving_archive_flag"); }
-
-                    if (( $^O =~ /cygwin/i ) && ( $contains_dll ))
-                    {
-                        my $dir = getcwd();
-                        chdir($unzipdir);
-                        my $changed = chmod(0775, @dllList);
-                        $infoline = "Changed mode of $changed files (of ".scalar(@dllList).")\n";
-                        push( @installer::globals::logfileinfo, $infoline);
-                        chdir($dir);
-        
-                        if ($changed != scalar(@dllList))
-                        {
-                            $infoline = "ERROR: Could not chmod all files!\n";
-                            push( @installer::globals::logfileinfo, $infoline);
-                        }
-                    }
-
-                    if ( ! $installer::globals::iswindowsbuild && scalar(@dirs) > 0 )
-                    {
-                        my $dir = getcwd();
-                        chdir($unzipdir);
-                        # Setting unix rights to "775" for all created directories inside the package
-                        my $changed = chmod(0775, @dirs);
-                        $infoline = "Changed mode of : $changed; should be: ".scalar(@dirs)."\n";
-                        chdir($dir);
-        
-                        push( @installer::globals::logfileinfo, $infoline);
-        
-                        if ($changed != scalar(@dirs))
-                        {
-                            $infoline = "ERROR: Could not chmod all files!\n";
-                            push( @installer::globals::logfileinfo, $infoline);
-                        }
-                    }
-                    
-                    # Selecting names of executable files in extensions
-                    if ( $set_executable_privileges )
-                    {
-                        collect_all_executable_files_in_extensions($unzipdir, \%executable_files_in_extensions);
-                    }
-                }
-    
-                my $zipfileref = \@zipfile;
-                my $unziperror = 0;
-                
-                foreach my $zipname ( $zip->memberNames() )
-                {
-                    # Format from Archive:::Zip : 
-                    # dir1/
-                    # dir1/so7drawing.desktop
-
-                    # some directories and files (from the help) start with "./simpress.idx"
-                        
-                    $zipname =~ s/^\s*\.\///;
-                        
-                    if ($installer::globals::iswin and $^O =~ /MSWin/i) { $zipname =~ s/\//\\/g; }
-
-                    if ( $zipname =~ /\Q$installer::globals::separator\E\s*$/ )	# slash or backslash at the end characterizes a directory
-                    {
-                        $zipname = $zipname . "\n";
-                        push(@{$additionalpathsref}, $zipname);
-                                
-                        # Also needed here:
-                        # Name
-                        # Language
-                        # ismultilingual
-                        # Basedirectory
-                            
-                        # This is not needed, because the list of all directories for the 
-                        # epm list file is generated from the destination directories of the
-                        # files included in the product!	
-                    }
-                    else
-                    {
-                        my %newfile = ();
-                        %newfile = %{$onefile};
-                        $newfile{'Name'} = $zipname;
-                        my $destination = $onefile->{'destination'};
-                        installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
-                        $newfile{'destination'} = $destination . $zipname;
-                        $newfile{'sourcepath'} = $unzipdir . $zipname;
-                        $newfile{'zipfilename'} = $onefile->{'Name'};
-                        $newfile{'zipfilesource'} = $onefile->{'sourcepath'};
-                        $newfile{'zipfiledestination'} = $onefile->{'destination'};
-
-                        if (( $use_internal_rights ) && ( ! $installer::globals::iswin ))
-                        {
-                            my $value = sprintf("%o", (stat($newfile{'sourcepath'}))[2]);
-                            $newfile{'UnixRights'} = substr($value, 3);
-                            $infoline = "Setting unix rights for \"$newfile{'sourcepath'}\" to \"$newfile{'UnixRights'}\"\n";
-                            push( @installer::globals::logfileinfo, $infoline);		
-                        }
-                        
-                        if ( $set_executable_privileges )
-                        {
-                            # All pathes to executables are saved in the hash %executable_files_in_extensions
-                            my $compare_path = $newfile{'sourcepath'};
-                            $compare_path =~ s/\\/\//g;  # contains only slashes for comparison reasons
-                            if ( exists($executable_files_in_extensions{$compare_path}) )
-                            {
-                                $newfile{'UnixRights'} = "775";
-                                $infoline = "Executable in Extension: Setting unix rights for \"$newfile{'sourcepath'}\" to \"$newfile{'UnixRights'}\"\n";
-                                push( @installer::globals::logfileinfo, $infoline);
-                            }
-                        }
-                        
-                        if ( $select_files )
-                        {
-                            if ( ! installer::existence::exists_in_array($zipname,$selectlistfiles) )
-                            {
-                                $infoline = "Removing from ARCHIVE file $onefilename: $zipname\n";
-                                push( @installer::globals::logfileinfo, $infoline);		
-                                next; # ignoring files, that are not included in $selectlistfiles
-                            }
-                            else
-                            {
-                                $infoline = "Keeping from ARCHIVE file $onefilename: $zipname\n";
-                                push( @installer::globals::logfileinfo, $infoline);		
-                                push( @keptfiles, $zipname); # collecting all kept files
-                            }			
-                        }
-                        
-                        if ( $select_patch_files )
-                        {
-                            # Is this file listed in the Patchfile list?
-                            # $zipname (filename including path in zip file has to be listed in patchfile list
-                            
-                            if ( ! installer::existence::exists_in_array($zipname,$patchlistfiles) )
-                            {
-                                $newfile{'Styles'} =~ s/\bPATCH\b//;	# removing the flag PATCH
-                                $newfile{'Styles'} =~ s/\,\s*\,/\,/;
-                                $newfile{'Styles'} =~ s/\(\s*\,/\(/;
-                                $newfile{'Styles'} =~ s/\,\s*\)/\)/;
-                            }
-                            else
-                            {
-                                push( @keptpatchflags, $zipname); # collecting all PATCH flags 
-                            }
-                        }
-                            
-                        if ( $rename_to_language )
-                        {
-                            my $newzipname = put_language_into_name($zipname, $onelanguage);
-                            my $oldfilename = $unzipdir . $zipname;
-                            my $newfilename = $unzipdir . $newzipname;
-
-                            installer::systemactions::copy_one_file($oldfilename, $newfilename);
-
-                            $newfile{'Name'} = $newzipname;
-                            $newfile{'destination'} = $destination . $newzipname;
-                            $newfile{'sourcepath'} = $unzipdir . $newzipname;
-
-                            $infoline = "RENAME_TO_LANGUAGE: Using $newzipname instead of $zipname!\n";
-                            push( @installer::globals::logfileinfo, $infoline);
-                        }
-                            
-                        my $sourcefiletest = $unzipdir . $zipname;							
-                        if ( ! -f $sourcefiletest )
-                        {
-                            $infoline = "ATTENTION: Unzip failed for $sourcefiletest!\n";
-                            push( @installer::globals::logfileinfo, $infoline);
-                            $unziperror = 1;
-                        }
-
-                        # only adding the new line into the files array, if not in repeat modus
-
-                        if ( ! $repeat_unzip ) { push(@newallfilesarray, \%newfile); }			
-                    }		
-                }
-
-                # Comparing the content of @keptfiles and $selectlistfiles
-                # Do all files from the list of selected files are stored in @keptfiles ?
-                # @keptfiles contains only files included in $selectlistfiles. But are all
-                # files from $selectlistfiles included in @keptfiles?
-                
-                if ( $select_files )
-                {
-                    my $number = $#{$selectlistfiles} + 1;
-                    $infoline = "SELECTLIST: Number of files in file selection list: $number\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    $number = $#keptfiles + 1;
-                    $infoline = "SELECTLIST: Number of kept files: $number\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-
-                    for ( my $k = 0; $k <= $#keptfiles; $k++ )
-                    {
-                        $infoline = "KEPT FILES: $keptfiles[$k]\n";
-                        push( @installer::globals::logfileinfo, $infoline);
-                    }
-
-                    my @warningfiles = ();
-
-                    for ( my $k = 0; $k <= $#{$selectlistfiles}; $k++ )
-                    {
-                        if ( ! installer::existence::exists_in_array(${$selectlistfiles}[$k],\@keptfiles) )
-                        {
-                            push(@warningfiles, ${$selectlistfiles}[$k]);
-                        }
-                    }
-
-                    for ( my $k = 0; $k <= $#warningfiles; $k++ )
-                    {
-                        $infoline = "WARNING: $warningfiles[$k] not included in install set (does not exist in zip file)!\n";
-                        push( @installer::globals::logfileinfo, $infoline);
-                    }		
-                    
-                }
-
-                # Comparing the content of @keptpatchflags and $patchlistfiles
-                # Do all files from the patch list have a PATCH flag ?
-                # @keptpatchflags contains only files included in $patchlistfiles. But are all
-                # files from $patchlistfiles included in @keptpatchflags?
-
-                if ( $select_patch_files )
-                {
-                    my $number = $#{$patchlistfiles} + 1;
-                    $infoline = "PATCHLIST: Number of files in patch list: $number\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    $number = $#keptpatchflags + 1;
-                    $infoline = "PATCHLIST: Number of kept PATCH flags: $number\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-
-                    for ( my $k = 0; $k <= $#keptpatchflags; $k++ )
-                    {
-                        $infoline = "KEPT PATCH FLAGS: $keptpatchflags[$k]\n";
-                        push( @installer::globals::logfileinfo, $infoline);
-                    }
-
-                    my @warningfiles = ();
-
-                    for ( my $k = 0; $k <= $#{$patchlistfiles}; $k++ )
-                    {
-                        if ( ! installer::existence::exists_in_array(${$patchlistfiles}[$k],\@keptpatchflags) )
-                        {
-                            push(@warningfiles, ${$patchlistfiles}[$k]);
-                        }
-                    }
-
-                    for ( my $k = 0; $k <= $#warningfiles; $k++ )
-                    {
-                        $infoline = "WARNING: $warningfiles[$k] did not keep PATCH flag (does not exist in zip file)!\n";
-                        push( @installer::globals::logfileinfo, $infoline);
-                    }		
-                }
-
-                if ( $unziperror )
-                { 
-                    installer::logger::print_warning( "Repeating to unpack $sourcepath! \n" );
-                    $infoline = "ATTENTION: Repeating to unpack $sourcepath !\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    $repeat_unzip = 1;
-                    $maxcounter++;
-                    
-                    if ( $maxcounter == 5 )	# exiting the program
-                    {
-                        installer::exiter::exit_program("ERROR: Failed to unzip $sourcepath !", "resolving_archive_flag");					
-                    }				
-                }
-                else
-                {
-                    $infoline = "Info: $sourcepath unpacked without problems !\n";
-                    push( @installer::globals::logfileinfo, $infoline);					
-                    $repeat_unzip = 0;
-                    $maxcounter = 0;
-                }				
-            }
-        }
-        else		# nothing to do here, no zipped file (no ARCHIVE flag)
-        {
-            push(@newallfilesarray, $onefile);
-        }	
-    }	
-
-    $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    return \@newallfilesarray;
-}
-
-
-1;
diff --git a/solenv/bin/modules/installer/configuration.pm b/solenv/bin/modules/installer/configuration.pm
deleted file mode 100644
index 7212b795e..000000000
--- a/solenv/bin/modules/installer/configuration.pm
+++ /dev/null
@@ -1,896 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::configuration;
-
-use Cwd;
-use installer::converter;
-use installer::existence;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::remover;
-use installer::systemactions;
-
-################################################################################
-# Getting package from configurationitem (for instance: org.openoffice.Office)
-# Getting name from configurationitem (for instance: Common)
-################################################################################
-
-sub analyze_path_of_configurationitem
-{
-    my ($configurationitemsref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::configuration::analyze_path_of_configurationitem : $#{$configurationitemsref}"); }
-
-    my ($startpath, $nodes, $name, $packagename, $onenode, $first, $second, $third, $bracketnode);
-
-    for ( my $i = 0; $i <= $#{$configurationitemsref}; $i++ )
-    {
-        my $oneconfig = ${$configurationitemsref}[$i];
-        my $path = $oneconfig->{'Path'};
-
-        installer::remover::remove_leading_and_ending_slashes(\$path);	# in scp are some path beginning with "/"
-            
-        if ( $path =~ /^\s*(.*?)\/(.*)\s*$/ )
-        {
-            $startpath = $1;
-            $nodes = $2;
-        }
-        else
-        {
-            installer::exiter::exit_program("ERROR: Unknown format of ConfigurationItem path: $path", "analyze_path_of_configurationitem");
-        }
-    
-        # Startpath is now: org.openoffice.Setup
-        # Nodes is now: Office/Factories/com.sun.star.chart.ChartDocument
-    
-        # Dividing the startpath into package (org.openoffic) and name (Setup).
-
-        $oneconfig->{'startpath'} = $startpath;	# saving the startpath into the hash
-
-        if ( $startpath =~ /^\s*(\S*)\.(\S*?)\s*$/ )
-        {
-            $packagename = $1;
-            $name = $2;
-            $oneconfig->{'name'} = $name;
-            $oneconfig->{'packagename'} = $packagename;
-        }
-        else
-        {
-            installer::exiter::exit_program("ERROR: Unknown format of ConfigurationItem startpath: $startpath", "analyze_path_of_configurationitem");
-        }
-
-        # Collecting all nodes
-
-        installer::remover::remove_leading_and_ending_slashes(\$nodes);
-
-        my $counter = 1;
-
-        # Attention: Do not trust the slash
-        # Filters/Filter['StarWriter 5.0 Vorlage/Template']
-        # Menus/New/*['m10']/Title
-        
-        if ( $nodes =~ /^(.*\[\')(.*\/.*)(\'\].*)$/ )
-        {
-            $first = $1;	
-            $second = $2;	
-            $third = $3;
-            
-            $second =~ s/\//SUBSTITUTEDSLASH/g;	# substituting "/" to "SUBSTITUTEDSLASH"
-            $nodes = $first . $second . $third;
-        }
-
-        while ( $nodes =~ /\// )
-        {
-            if ($nodes =~ /^\s*(.*?)\/(.*)\s*$/ )
-            {
-                $onenode = $1;
-                $nodes = $2;
-                $nodename = "node". $counter;
-
-                # Special handling for filters. Difference between: 
-                # Filter['StarWriter 5.0 Vorlage/Template']	without oor:op="replace"
-                # *['m10'] with oor:op="replace"
-
-                if ( $onenode =~ /^\s*Filter\[\'(.*)\'\].*$/ ) { $oneconfig->{'isfilter'} = 1; }
-                                
-                # Changing the nodes with brackets:
-                # Filter['StarWriter 5.0 Vorlage/Template']
-                # *['m10']
-                
-                if ( $onenode =~ /^.*\[\'(.*)\'\].*$/ )
-                {
-                    $onenode = $1;
-                    $bracketnode = "bracket_" . $nodename;
-                    $oneconfig->{$bracketnode} = 1;
-                }
-                
-                $onenode =~ s/SUBSTITUTEDSLASH/\//g;	# substituting "SUBSTITUTEDSLASH" to "/"
-                $oneconfig->{$nodename} = $onenode;
-                
-                # special handling for nodes "Factories"
-
-                if ( $onenode eq "Factories" ) { $oneconfig->{'factoriesnode'} = $counter; }
-                else { $oneconfig->{'factoriesnode'} = -99; }
-            }
-
-            $counter++
-        }
-        
-        # and the final node
-
-        if ( $nodes =~ /^\s*Filter\[\'(.*)\'\].*$/ ) { $oneconfig->{'isfilter'} = 1; }
-
-        $nodename = "node". $counter;
-
-        if ( $nodes =~ /^.*\[\'(.*)\'\].*$/ )
-        {
-            $nodes = $1;
-            $bracketnode = "bracket_" . $nodename;
-            $oneconfig->{$bracketnode} = 1;
-        }
-
-        $nodes =~ s/SUBSTITUTEDSLASH/\//g;	# substituting "SUBSTITUTEDSLASH" to "/"
-
-        if (($nodes eq "Name") || ($nodes eq "Title"))	# isocodes below "Name" or "Title"
-        {
-            # if the last node $nodes is "Name" or "Title", it is a Property, not a name! See Common.xcu
-
-            $oneconfig->{'isisocode'} = 1;
-
-            if ( $nodes eq "Name" ) { $oneconfig->{'isname'} = 1; }
-            if ( $nodes eq "Title" ) { $oneconfig->{'istitle'} = 1;	}
-            $counter--;		# decreasing the counter, because "Name" and "Title" are no nodes
-        }
-        else
-        {
-            $oneconfig->{$nodename} = $nodes;
-            $oneconfig->{'isisocode'} = 0;
-        }
-
-        # special handling for nodes "Factories"
-
-        if ( $onenode eq "Factories" ) { $oneconfig->{'factoriesnode'} = $counter; }
-        else { $oneconfig->{'factoriesnode'} = -99; }
-        
-        # saving the number of nodes
-        
-        $oneconfig->{'nodenumber'} = $counter;		
-    }
-}
-
-####################################################################
-# Inserting the start block into a configuration file
-####################################################################
-
-sub insert_start_block_into_configfile
-{
-    my ($configfileref, $oneconfig) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::configuration::insert_start_block_into_configfile : $#{$configfileref} : $oneconfig->{'name'}"); }
-
-    my $line = '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
-    push( @{$configfileref}, $line);
-
-    $line = '<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:install="http://openoffice.org/2004/installation" oor:name="FILENAME" oor:package="PACKAGENAME">' . "\n"; 
-    my $packagename = $oneconfig->{'packagename'};
-    my $name = $oneconfig->{'name'};
-    $line =~ s/PACKAGENAME/$packagename/g;
-    $line =~ s/FILENAME/$name/g;
-    push( @{$configfileref}, $line);
-
-    $line = "\n";		
-    push( @{$configfileref}, $line);
-}
-
-####################################################################
-# Inserting the end block into a configuration file
-####################################################################
-
-sub insert_end_block_into_configfile
-{
-    my ($configfileref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::configuration::insert_end_block_into_configfile : $#{$configfileref}"); }
-
-    my $line = "\n" . '</oor:component-data>' . "\n";
-    push( @{$configfileref}, $line);
-}
-
-##############################################################
-# Getting the content of a node
-##############################################################
-
-sub get_node_content
-{
-    my ($nodeline) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::configuration::get_node_content : $nodeline"); }
-
-    my $content = "";
-    
-    if ( $nodeline =~ /name\=\"(.*?)\"/ )
-    {
-        $content = $1;	
-    }	
-    else
-    {
-        installer::exiter::exit_program("ERROR: Impossible error in function get_node_content!", "get_node_content");
-    }
-    
-    return \$content;
-}
-
-##############################################################
-# Getting the line number of an existing node
-# Return "-1" if node does not exist
-##############################################################
-
-sub get_node_line_number
-{
-    my ($nodecount, $oneconfig, $oneconfigfileref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::configuration::get_node_line_number : $nodecount : $oneconfig->{'name'} : $#{$oneconfigfileref}"); }
-
-    my $linenumber = -1;	# the node does not exists, if returnvalue is "-1"
-
-    # Attention: Take care of the two title nodes:
-    # Path=org.openoffice.Office.Common/Menus/Wizard/*['m14']/Title
-    # Path=org.openoffice.Office.Common/Menus/Wizard/*['m15']/Title
-    # -> every subnode has to be identical	
-
-    # creating the allnodes string from $oneconfig
-
-    my $allnodes = "";
-
-    for ( my $i = 1; $i <= $nodecount; $i++ )
-    {
-        my $nodename = "node" . $i;
-        $allnodes .= $oneconfig->{$nodename} . "/";
-    }
-
-    installer::remover::remove_leading_and_ending_slashes(\$allnodes);	# exactly this string has to be found  in the following iteration
-
-    # Iterating over the already built configuration file
-
-    my @allnodes = ();
-
-    for ( my $i = 0; $i <= $#{$oneconfigfileref}; $i++ )
-    {
-        my $line = ${$oneconfigfileref}[$i];
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        my $nodechanged = 0;
-
-        if ( $line =~ /^\s*\<node/ )	# opening node
-        {
-            $nodechanged = 1;
-            my $nodecontentref = get_node_content($line);
-            push(@allnodes, $$nodecontentref);	# collecting all nodes in an array
-        }
-
-        if ( $line =~ /^\s*\<\/node/ )	# ending node
-        {
-            $nodechanged = 1;
-            pop(@allnodes);		# removing the last node from the array
-        }
-
-        if (( $nodechanged ) && ($#allnodes > -1))	# a node was found and the node array is not empty
-        {
-            # creating the string to compare with the string $allnodes 
-
-            my $nodestring = "";
-
-            for ( my $j = 0; $j <= $#allnodes; $j++ )
-            {
-                $nodestring .= $allnodes[$j] . "/";
-            }
-
-            installer::remover::remove_leading_and_ending_slashes(\$nodestring);
-
-            if ( $nodestring eq $allnodes )
-            {
-                # that is exactly the same node
-    
-                $linenumber = $i;
-                $linenumber++;	# increasing the linenumber
-                last;
-
-            }
-        }
-    }
-
-    return $linenumber;
-}
-
-##############################################################
-# Inserting one configurationitem into the configurationfile
-##############################################################
-
-sub insert_into_config_file
-{
-    my ($oneconfig, $oneconfigfileref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::configuration::insert_into_config_file : $oneconfig->{'nodenumber'} : $#{$oneconfigfileref}"); }
-    
-    my ($nodename, $nodecontent, $newnodeline, $bracketkey, $line, $insertline);
-
-    # interpreting the nodes, keys and values
-    
-    my $nodeline = '<node oor:name="NODECONTENT" REPLACEPART >' . "\n";
-    my $propline = '<prop oor:name="KEYCONTENT" REPLACEPART TYPEPART>' . "\n";
-    my $valueline = '<value SEPARATORPART>VALUECONTENT</value>' . "\n";
-    my $langvalueline = '<value xml:lang="SAVEDLANGUAGE">VALUECONTENT</value>' . "\n";
-    my $propendline = '</prop>' . "\n";
-    my $nodeendline = '</node>' . "\n";
-    
-    my $replacepart = 'oor:op="replace"';
-    my $typepart = 'oor:type="xs:VALUETYPE"';	# VALUETYPE can be "string", "boolean", ...
-    
-    my $nodecount = $oneconfig->{'nodenumber'};
-    my $styles = $oneconfig->{'Styles'};
-
-    for ( my $i = 1; $i <= $nodecount; $i++ )
-    {		
-        $insertline = get_node_line_number($i, $oneconfig, $oneconfigfileref);
-
-        if ( $insertline == -1)	# if true, the node does not exist
-        {
-            $nodename = "node" . $i;
-            $nodecontent = $oneconfig->{$nodename};
-            $newnodeline = $nodeline;
-            
-            $newnodeline =~ s/NODECONTENT/$nodecontent/g;
-
-            # Case1:	
-            # Nodes with brackets, need the replacepart 'oor:op="replace"'
-            # Bracket node is set for each node with: bracket_node1=1, bracket_node2=1, ...
-            # Case a: <node oor:name="m0" oor:op="replace">		(Common.xcu needs oor:op="replace")
-            # Case b: <node oor:name="Ami Pro 1.x-3.1 (W4W)">	(TypeDetection.xcu does not need oor:op="replace")
-            # For case b introducting a special case for Filters
-
-            $bracketkey = "bracket_" . $nodename;
-            
-            my $localbracketkey = 0;
-            
-            if ( $oneconfig->{$bracketkey} ) { $localbracketkey = $oneconfig->{$bracketkey}; }
-            
-            if ( $localbracketkey == 1 )	# 'oor:op="replace"' is needed 
-            {
-                my $isfilter = 0;
-                if ( $oneconfig->{'isfilter'} ) { $isfilter = $oneconfig->{'isfilter'}; }
-                
-                if ( $isfilter == 1 )	# this is a filter
-                {
-                    $newnodeline =~ s/REPLACEPART//;
-                }
-                else
-                {
-                    $newnodeline =~ s/REPLACEPART/$replacepart/;
-                }
-                
-                $newnodeline =~ s/\s*\>/\>/;	# removing resulting whitespaces
-            }
-
-            # Case2:	
-            # Nodes below a Node "Factories", also need the replacepart 'oor:op="replace"'
-            # This is saved in $oneconfig->{'factoriesnode'}. If not set, the value is "-99"
-
-            if ( $i == $oneconfig->{'factoriesnode'} )
-            {
-                $newnodeline =~ s/REPLACEPART/$replacepart/;
-                $newnodeline =~ s/\s*\>/\>/;	# removing resulting whitespaces
-            }
-
-            # Case3:	
-            # In all other cases, REPLACEPART in nodes can be removed
-
-            $newnodeline =~ s/REPLACEPART//;
-            $newnodeline =~ s/\s*\>/\>/;	# removing resulting whitespaces
-
-            # Finding the correct place for inserting the node
-            
-            if ( $i == 1 )	# this is a toplevel node
-            {
-                push(@{$oneconfigfileref}, $newnodeline);
-                push(@{$oneconfigfileref}, $nodeendline);
-            }
-            else
-            {
-                # searching for the parent node
-                
-                my $parentnumber = $i-1;
-                $insertline = get_node_line_number($parentnumber, $oneconfig, $oneconfigfileref);
-                splice(@{$oneconfigfileref}, $insertline, 0, ($newnodeline, $nodeendline));
-            }
-        }
-    }	
-
-    # Setting variables $isbracketnode and $isfactorynode for the properties 
-
-
-    my $isbracketnode = 0;
-    my $isfactorynode = 0;	
-
-    for ( my $i = 1; $i <= $nodecount; $i++ )
-    {		
-        $nodename = "node" . $i;
-        $bracketkey = "bracket_" . $nodename;
-
-        my $localbracketkey = 0;
-        if ( $oneconfig->{$bracketkey} ) { $localbracketkey = $oneconfig->{$bracketkey}; }
-
-        if ( $localbracketkey == 1 ) { $isbracketnode = 1;	}
-        if ( $i == $oneconfig->{'factoriesnode'} ) { $isfactorynode = 1; }	
-    }
-
-    # now all nodes exist, and the key and value can be inserted into the configfile
-    # the next line contains the key, for instance: <prop oor:name="UseDefaultMailer" oor:type="xs:boolean">
-    # my $propline = '<prop oor:name="KEYCONTENT" REPLACEPART TYPEPART>' . "\n";
-    # The type is only needed, if a replace is set.
-
-    my $newpropline = $propline;
-
-    # Replacement of KEYCONTENT, REPLACEPART and TYPEPART
-
-    # Case 1:
-    # Properties with oor:name="Name" (Common.xcu) are simply <prop oor:name="Name">
-    # The information about such a property is stored in $oneconfig->{'isisocode'}
-
-    if ( $oneconfig->{'isisocode'} )
-    {
-        if ( $oneconfig->{'isname'} ) { $newpropline =~ s/KEYCONTENT/Name/; }		# The property name is always "Name"
-        if ( $oneconfig->{'istitle'} ) { $newpropline =~ s/KEYCONTENT/Title/; }		# The property name is always "Title"
-        $newpropline =~ s/REPLACEPART//;
-        $newpropline =~ s/TYPEPART//;
-        $newpropline =~ s/\s*\>/\>/;	# removing resulting whitespaces
-    }
-
-    # Begin of all other cases
-
-    my $key = $oneconfig->{'Key'};
-    $newpropline =~ s/KEYCONTENT/$key/;
-    
-    my $valuetype;
-
-    if ( $styles =~ /CFG_STRING\b/ ) { $valuetype = "string"; }
-    elsif ( $styles =~ /CFG_NUMERIC/ ) { $valuetype = "int"; }
-    elsif ( $styles =~ /CFG_BOOLEAN/ ) { $valuetype = "boolean"; }
-    elsif ( $styles =~ /CFG_STRINGLIST/ ) { $valuetype = "string-list"; }
-    else 
-    {
-        installer::exiter::exit_program("ERROR: Unknown configuration value type: $styles", "insert_into_config_file");
-    }
-
-    # Case 2:
-    # Properties below a node "Factories" do not need a 'oor:op="replace"' and a 'oor:type="xs:VALUETYPE"'
-
-    if ( $isfactorynode )
-    {
-        $newpropline =~ s/REPLACEPART//;
-        $newpropline =~ s/TYPEPART//;
-        $newpropline =~ s/\s*\>/\>/;	# removing resulting whitespaces
-    }	
-
-    # Case 3:
-    # Properties below a "bracket" node do not need a 'oor:op="replace"', except they are iso-codes
-    # Assumption here: They are multilingual
-
-    if ( $isbracketnode )
-    {
-        my $localtypepart = $typepart;
-        $localtypepart =~ s/VALUETYPE/$valuetype/;
-        $newpropline =~ s/TYPEPART/$localtypepart/;
-
-        if ( $oneconfig->{'ismultilingual'} )	# This is solved by "Name" and "Title"
-        {
-            $newpropline =~ s/REPLACEPART/$replacepart/;
-        }
-        else
-        {
-            $newpropline =~ s/REPLACEPART//;
-        }
-
-        $newpropline =~ s/\s*\>/\>/;	# removing resulting whitespaces
-    }	
-
-    # Case 4:
-    # if the flag CREATE is set, the properties get 'oor:op="replace"' and 'oor:type="xs:VALUETYPE"'
-
-    if (( $styles =~ /\bCREATE\b/ ) && (!($isbracketnode)))
-    {
-        # $typepart is 'oor:type="xs:VALUETYPE"';
-        # VALUETYPE can be "string", "boolean", ...
-        my $localtypepart = $typepart;
-        $localtypepart =~ s/VALUETYPE/$valuetype/;
-
-        $newpropline =~ s/TYPEPART/$localtypepart/;
-        $newpropline =~ s/REPLACEPART/$replacepart/;
-        $newpropline =~ s/\s*\>/\>/;	# removing resulting whitespaces
-    }
-
-    # Case 5:
-    # all other ConfigurationItems do not need 'oor:op="replace"' and 'oor:type="xs:VALUETYPE"'
-
-    $newpropline =~ s/REPLACEPART//;
-    $newpropline =~ s/TYPEPART//;
-    $newpropline =~ s/\s*\>/\>/;	# removing resulting whitespaces
-
-    # finally the value can be set
-
-    my $value = $oneconfig->{'Value'};
-    
-    # Some values in setup script are written during installation process by the setup. These
-    # have values like "<title>". This will lead to an error, because of the brackets. Therefore the 
-    # brackets have to be removed.
-
-    # ToDo: Substituting the setup replace variables
-
-    $value =~ s/^\s*\<//;
-    $value =~ s/\>\s*$//;
-
-    # Deal with list separators
-    my $separatorpart = '';
-    if ( ($valuetype eq "string-list") && ($value =~ /\|/) ) 
-    { 
-        $separatorpart = 'oor:separator="|"';
-    }
-
-    # Fake: substituting german umlauts
-
-    $value =~ s/\ä/ae/;
-    $value =~ s/\ö/oe/;
-    $value =~ s/\ü/ue/;
-    $value =~ s/\Ä/AE/;
-    $value =~ s/\Ö/OE/;
-    $value =~ s/\Ü/UE/;
-
-    my $newvalueline;
-
-    if (!($oneconfig->{'isisocode'} ))	# this is the simpe case 
-    {
-        $newvalueline = $valueline;  
-        $newvalueline =~ s/VALUECONTENT/$value/g;
-        $newvalueline =~ s/SEPARATORPART/$separatorpart/;
-    }
-    else
-    {
-        $newvalueline = $langvalueline;  
-        $newvalueline =~ s/VALUECONTENT/$value/;
-        my $savedlanguage = $oneconfig->{'Key'};
-        $newvalueline =~ s/SAVEDLANGUAGE/$savedlanguage/;
-    }
-
-    # For language dependent values, it is possible, that the property already exist.
-    # In this case the prop must not be created again and only the value has to be included:
-    # <prop oor:name="Name">
-    #  <value xml:lang="de">OpenOffice.org 2.0 Diagramm</value>
-    #  <value xml:lang="en-US">OpenOffice.org 2.0 Chart</value>
-    # </prop>
-
-    # The key has to be written after the line, containing the complete node
-
-    $insertline = get_node_line_number($nodecount, $oneconfig, $oneconfigfileref); 
-
-    if ( $oneconfig->{'ismultilingual'} )
-    {
-        if ( $newpropline eq ${$oneconfigfileref}[$insertline] )
-        {
-            if (!($newvalueline eq ${$oneconfigfileref}[$insertline+1]))	# only include, if the value not already exists (example: value="FALSE" for many languages) 
-            {			
-                splice(@{$oneconfigfileref}, $insertline+1, 0, ($newvalueline));	# only the value needs to be added
-            }
-        }
-        else
-        {
-            splice(@{$oneconfigfileref}, $insertline, 0, ($newpropline, $newvalueline, $propendline));
-        }
-    }
-    else
-    {
-        splice(@{$oneconfigfileref}, $insertline, 0, ($newpropline, $newvalueline, $propendline));
-    }	
-    
-    return $oneconfigfileref;
-}	
-
-##########################################################
-# Inserting tabs for better view into configuration file
-##########################################################
-
-sub insert_tabs_into_configfile
-{
-    my ($configfileref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::configuration::insert_tabs_into_configfile : $#{$configfileref}"); }
-
-    my $counter = 0;
-
-    for ( my $i = 0; $i <= $#{$configfileref}; $i++ )
-    {
-        my $line = ${$configfileref}[$i];
-        my $linebefore = ${$configfileref}[$i-1];
-
-        if (( $line =~ /^\s*\<node/ ) || ( $line =~ /^\s*\<prop/ ))
-        {
-            if ((!( $linebefore =~ /^\s*\<\/node/ )) && (!( $linebefore =~ /^\s*\<\/prop/ )))		# do not increase after "</node" and after "</prop"
-            {
-                $counter++;
-            }
-        }
-
-        if ( $line =~ /^\s*\<value/ )
-        {
-            if (!($linebefore =~ /^\s*\<value/ ))		# do not increase counter with "<value>" after "<value>" (multilingual configitems)
-            {
-                $counter++;
-            }
-        }
-
-        if (( $line =~ /^\s*\<\/node\>/ ) || ( $line =~ /^\s*\<\/prop\>/ ))
-        {
-            if ((!( $linebefore =~ /^\s*\<node/ )) && (!( $linebefore =~ /^\s*\<prop/ )))		# do not decrease after "<node" and after "<prop"
-            {
-                $counter--;
-            }
-        }
-    
-        if ($counter > 0)
-        {
-            for ( my $j = 0; $j < $counter; $j++ )
-            {
-                $line = "\t" . $line;
-            }
-        }
-        
-        ${$configfileref}[$i] = $line;
-    }
-}
-
-######################################################################
-# Collecting all different configuration items (Files and Modules)
-######################################################################
-
-sub collect_all_configuration_items
-{
-    my ($configurationitemsref, $item) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::configuration::collect_all_configuration_items : $#{$configurationitemsref} : $item"); }
-
-    my @allitems = ();
-
-    for ( my $i = 0; $i <= $#{$configurationitemsref}; $i++ )
-    {
-        my $oneconfig = ${$configurationitemsref}[$i];
-        
-        if (! installer::existence::exists_in_array($oneconfig->{$item}, \@allitems))
-        {
-            push(@allitems, $oneconfig->{$item});
-        }
-    }
-    
-    return \@allitems;
-}
-
-######################################################################
-# Collecting all module specific configuration items
-######################################################################
-
-sub get_all_configitems_at_module
-{
-    my ($moduleid, $configurationitemsref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::configuration::get_all_configitems_at_module : $moduleid : $#{$configurationitemsref}"); }
-    
-    my @moduleconfigurationitems = ();
-    
-    for ( my $i = 0; $i <= $#{$configurationitemsref}; $i++ )
-    {
-        my $oneconfig = ${$configurationitemsref}[$i];
-        
-        if ( $oneconfig->{'ModuleID'} eq $moduleid )
-        {		
-            push(@moduleconfigurationitems, $oneconfig);
-        }
-    }
-    
-    return \@moduleconfigurationitems;
-}
-
-#######################################################
-# Saving and zipping the created configurationfile
-#######################################################
-
-sub save_and_zip_configfile
-{
-    my ($oneconfigfileref, $onefile, $onemodule, $configdir) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::configuration::save_and_zip_configfile : $#{$oneconfigfileref} : $onefile : $onemodule : $configdir"); }
-
-    my $savefilename = $onefile;
-    $savefilename =~ s/\./\_/g;
-    $savefilename = $savefilename . "_" . $onemodule;
-    $savefilename = $savefilename . ".xcu";
-    my $shortsavefilename = $savefilename;
-
-    $savefilename = $configdir . $installer::globals::separator . $savefilename;
-
-    installer::files::save_file($savefilename, $oneconfigfileref);
-
-    # zipping the configfile
-
-    my $returnvalue = 1;
-        
-    my $zipfilename = $shortsavefilename;
-    $zipfilename =~ s/\.xcu/\.zip/;
-        
-    my $currentdir = cwd();
-    if ( $installer::globals::iswin ) { $currentdir =~ s/\//\\/g; }
-
-    chdir($configdir);
-    
-     my $systemcall = "$installer::globals::zippath -q -m $zipfilename $shortsavefilename";
-    $returnvalue = system($systemcall);
-
-    chdir($currentdir);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not zip $savefilename to $zipfilename\n";
-    }
-    else
-    {
-        $infoline = "SUCCESS: Zipped file $savefilename to $zipfilename\n";
-    }
-    push( @installer::globals::logfileinfo, $infoline);
-    
-    return $zipfilename;
-}
-
-#####################################################################
-# Adding the newly created configuration file into the file list
-#####################################################################
-
-sub add_zipfile_into_filelist
-{
-    my ($zipfilename, $configdir, $filesarrayref, $onemodule) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::configuration::add_zipfile_into_filelist: $zipfilename : $configdir : $#{$filesarrayref} : $onemodule"); }
-    
-    my $longzipfilename = $configdir . $installer::globals::separator . $zipfilename;
-    my $gid = "gid_" . $zipfilename;
-    $gid =~ s/\./\_/g;
-
-    my %configfile = ();
-
-    # Taking the base data from the "gid_File_Lib_Vcl"
-
-    my $vclgid = "gid_File_Lib_Vcl";
-    my $vclfile = installer::existence::get_specified_file($filesarrayref, $vclgid);
-
-    # copying all base data	
-    installer::converter::copy_item_object($vclfile, \%configfile);			
-
-    # and overriding all new data
-    $configfile{'ismultilingual'} = 0;
-    $configfile{'sourcepath'} = $longzipfilename;
-    $configfile{'Name'} = $zipfilename;
-    $configfile{'UnixRights'} = "644";
-    $configfile{'gid'} = $gid;
-    $configfile{'Dir'} = "gid_Dir_Share_Uno_Packages";
-    $configfile{'destination'} = "share" . $installer::globals::separator . "uno_packages" . $installer::globals::separator . $zipfilename;
-    $configfile{'modules'} = $onemodule;	# assigning the file to the correct module!
-
-    push(@{$filesarrayref}, \%configfile);	
-}
-
-#######################################################
-# Creating configuration files from configurationitems
-#######################################################
-
-sub create_configuration_files
-{
-    my ($configurationitemsref, $filesarrayref, $languagestringref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::configuration::create_configuration_files: $#{$configurationitemsref} : $#{$filesarrayref} : $$languagestringref"); }
-
-    installer::logger::include_header_into_logfile("Creating configuration files:");
-
-    # creating the directory
-
-    my $configdir = installer::systemactions::create_directories("configfiles", $languagestringref);
-
-    $configdir = installer::converter::make_path_conform($configdir);
-
-    # collecting an array of all modules
-    my $allmodules = collect_all_configuration_items($configurationitemsref, "ModuleID");
-
-    # iterating over all modules
-
-    for ( my $i = 0; $i <= $#{$allmodules}; $i++ )
-    {
-        my $onemodule = ${$allmodules}[$i];
-
-        my $moduleconfigitems = get_all_configitems_at_module($onemodule, $configurationitemsref);
-
-        # collecting an array of all "startpath". This are all different files (org.openoffice.Office.Common).
-        my $allfiles = collect_all_configuration_items($moduleconfigitems, "startpath");
-
-        # iteration over all files
-
-        for ( my $j = 0; $j <= $#{$allfiles}; $j++ )
-        {
-            my $onefile = ${$allfiles}[$j];
-
-            my @oneconfigfile = ();
-            my $oneconfigfileref = \@oneconfigfile;
-        
-            my $startblockwritten = 0;
-    
-            for ( my $k = 0; $k <= $#{$moduleconfigitems}; $k++ )
-            {
-                my $oneconfig = ${$moduleconfigitems}[$k];
-
-                my $startpath = $oneconfig->{'startpath'};
-            
-                if ($startpath eq $onefile)
-                {
-                    if (!($startblockwritten))	# writing some global lines into the xcu file
-                    {
-                        insert_start_block_into_configfile($oneconfigfileref, $oneconfig);
-                        $startblockwritten = 1;
-                    }
-                
-                    $oneconfigfileref = insert_into_config_file($oneconfig, $oneconfigfileref);	
-                }
-            }
-
-            insert_end_block_into_configfile($oneconfigfileref);
-        
-            # inserting tabs for nice appearance
-            insert_tabs_into_configfile($oneconfigfileref);
-        
-            # saving the configfile
-            my $zipfilename = save_and_zip_configfile($oneconfigfileref, $onefile, $onemodule, $configdir);
-
-            # adding the zipped configfile to the list of installed files
-            # Some data are set now, others are taken from the file "soffice.exe" ("soffice.bin")
-
-            add_zipfile_into_filelist($zipfilename, $configdir, $filesarrayref, $onemodule);
-        }
-    }
-
-    my $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    
-}
-
-1;
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
deleted file mode 100644
index cda8512fc..000000000
--- a/solenv/bin/modules/installer/control.pm
+++ /dev/null
@@ -1,719 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::control;
-
-use Cwd;
-use installer::converter;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::pathanalyzer;
-use installer::scriptitems;
-use installer::systemactions;
-
-#########################################################
-# Function that can be used for additional controls.
-# Search happens in $installer::globals::patharray.
-#########################################################
-
-sub check_needed_files_in_path
-{
-    my ( $filesref ) = @_;
-    
-    foreach $onefile ( @{$filesref} )
-    {
-        installer::logger::print_message( "...... searching $onefile ..." );
-
-        my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$onefile, $installer::globals::patharray , 0);
-
-        if ( $$fileref eq "" )
-        {
-            $error = 1;
-            installer::logger::print_error( "$onefile not found\n" );
-        }
-        else
-        {
-            installer::logger::print_message( "\tFound: $$fileref\n" );
-        }		
-    }
-
-    if ( $error )
-    {
-        installer::exiter::exit_program("ERROR: Could not find all needed files in path!", "check_needed_files_in_path");
-    }
-}
-
-#########################################################
-# Checking the local system
-# Checking existence of needed files in include path
-#########################################################
-
-sub check_system_path
-{
-    # The following files have to be found in the environment variable PATH
-    # All platforms: zip
-    # Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging
-
-    my $onefile;	
-    my $error = 0;
-    my $pathvariable = $ENV{'PATH'};
-    my $local_pathseparator = $installer::globals::pathseparator;
-    
-    if( $^O =~ /cygwin/i )
-    {	# When using cygwin's perl the PATH variable is POSIX style and ...
-        my $temparrayref = installer::converter::convert_stringlist_into_array_without_newline(\$pathvariable, $local_pathseparator);
-        foreach $i (0..$#$temparrayref) {
-            $$temparrayref[$i] = qx{cygpath -m "$$temparrayref[$i]"};
-            chomp($$temparrayref[$i]);
-        }
-        # has to be converted to DOS style for further use.
-        $local_pathseparator = ';';
-        $pathvariable = join($local_pathseparator, @$temparrayref);
-    }
-    my $patharrayref = installer::converter::convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
-    
-    $installer::globals::patharray = $patharrayref;
-
-    my @needed_files_in_path = ();
-
-    if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
-    {
-        @needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe");
-    }
-    elsif ($installer::globals::iswin)
-    {	
-        @needed_files_in_path = ("zip.exe");
-    }
-    else
-    {
-        @needed_files_in_path = ("zip");
-    }
-
-    foreach $onefile ( @needed_files_in_path )
-    {
-        installer::logger::print_message( "...... searching $onefile ..." );
-
-        my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$onefile, $patharrayref , 0);
-
-        if ( $$fileref eq "" )
-        {
-            $error = 1;
-            installer::logger::print_error( "$onefile not found\n" );
-        }
-        else
-        {
-            installer::logger::print_message( "\tFound: $$fileref\n" );
-            # Saving the absolut path for msitran.exe. This is required for the determination of the checksum.
-            if ( $onefile eq "msitran.exe" ) { $installer::globals::msitranpath = $$fileref; }
-        }		
-    }
-
-    if ( $error )
-    {
-        installer::exiter::exit_program("ERROR: Could not find all needed files in path!", "check_system_path");
-    }
-
-    # checking for epm, which has to be in the path or in the solver
-
-    if (( $installer::globals::call_epm ) && (!($installer::globals::iswindowsbuild)))
-    {
-        my $onefile = "epm";
-        my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$onefile, $patharrayref , 0);
-        if (!( $$fileref eq "" ))
-        {
-            $installer::globals::epm_in_path = 1;
-
-            if ( $$fileref =~ /^\s*\.\/epm\s*$/ )
-            {
-                my $currentdir = cwd();
-                $$fileref =~ s/\./$currentdir/;
-            }
-
-            $installer::globals::epm_path = $$fileref;
-        }
-    }
-    
-    # checking, if upx can be found in path
-
-    if ( $installer::globals::iswindowsbuild ) { $installer::globals::upxfile = "upx.exe"; }
-    else { $installer::globals::upxfile = "upx"; }
-
-    my $upxfilename = $installer::globals::upxfile;
-    my $upxfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$upxfilename, $patharrayref , 0);
-
-    if (!( $$upxfileref eq "" ))
-    {
-        $installer::globals::upx_in_path = 1;
-        $installer::globals::upxfile = $$upxfileref;
-        installer::logger::print_message( "\tFound: $$upxfileref\n" );
-    }
-
-}
-
-######################################################################
-# Determining the version of file makecab.exe
-######################################################################
-
-sub get_makecab_version
-{
-    my $makecabversion = -1;
-    
-    my $systemcall = "makecab.exe |";
-    my @makecaboutput = ();
-
-    open (CAB, $systemcall);
-    while (<CAB>) { push(@makecaboutput, $_); }
-    close (CAB);
-
-    my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::globallogfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::globallogfileinfo, $infoline);
-        
-        my $versionline = "";
-
-        for ( my $i = 0; $i <= $#makecaboutput; $i++ )
-        {
-            if ( $makecaboutput[$i] =~ /\bVersion\b/i )
-            {
-                $versionline = $makecaboutput[$i];
-                last;
-            }
-        }
-        
-        $infoline = $versionline;
-        push( @installer::globals::globallogfileinfo, $infoline);
-        
-        if ( $versionline =~ /\bVersion\b\s+(\d+[\d\.]+\d+)\s+/ )
-        {
-            $makecabversion = $1;
-        }
-        
-        # Only using the first number
-        
-        if ( $makecabversion =~ /^\s*(\d+?)\D*/ )
-        {
-            $makecabversion = $1;
-        }
-        
-        $infoline = "Using version: " . $makecabversion . "\n";
-        push( @installer::globals::globallogfileinfo, $infoline);
-    }
-    
-    return $makecabversion;
-}
-
-######################################################################
-# Checking the version of file makecab.exe
-######################################################################
-
-sub check_makecab_version
-{
-    # checking version of makecab.exe
-    # Now it is guaranteed, that makecab.exe is in the path
-    
-    my $do_check = 1;
-    
-    my $makecabversion = get_makecab_version();
-
-    my $infoline = "Tested version: " . $installer::globals::controlledmakecabversion . "\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-    
-    if ( $makecabversion < 0 ) { $do_check = 0; } # version could not be determined
-    
-    if ( $do_check )
-    {
-        if ( $makecabversion < $installer::globals::controlledmakecabversion )
-        {
-            # warning for OOo, error for inhouse products
-            if ( $installer::globals::isopensourceproduct ) 
-            {
-                installer::logger::print_warning("Old version of makecab.exe. Found version: \"$makecabversion\", tested version: \"$installer::globals::controlledmakecabversion\"!\n");
-            }
-            else
-            {
-                installer::exiter::exit_program("makecab.exe too old. Found version: \"$makecabversion\", required version: \"$installer::globals::controlledmakecabversion\"!", "check_makecab_version");
-            }
-        }
-    }
-    else
-    {
-        $infoline = "Warning: No version check of makecab.exe\n";
-        push( @installer::globals::globallogfileinfo, $infoline);
-    }
-}
-
-######################################################################
-# Reading the environment variables for the pathes in ziplist.
-# solarpath, solarenvpath, solarcommonpath, os, osdef, pmiscpath
-######################################################################
-
-sub check_system_environment
-{
-    my %variables = ();
-    my $key;
-    my $error = 0;
-
-    foreach $key ( @installer::globals::environmentvariables )
-    {
-        my $value = "";
-        if ( $ENV{$key} ) { $value = $ENV{$key}; }
-        $variables{$key} = $value;
-        
-        if ( $value eq "" )
-        {
-            installer::logger::print_error( "$key not set in environment\n" );
-            $error = 1;
-        }
-    }
-    
-    if ( $error )
-    {
-        installer::exiter::exit_program("ERROR: Environment variable not set!", "check_system_environment");
-    }
-    
-    return \%variables;
-}
-
-#############################################################
-# Controlling the log file at the end of the
-# packaging process
-#############################################################
-
-sub check_logfile
-{
-    my ($logfile) = @_;
-
-    my @errors = ();
-    my @output = ();
-    my $contains_error = 0;
-    
-    my $ignore_error = 0;
-    my $make_error_to_warning = 0;
-    
-    if (( ! $installer::globals::pro ) && ( $installer::globals::ignore_error_in_logfile )) { $ignore_error = 1; }
-
-    for ( my $i = 0; $i <= $#{$logfile}; $i++ )
-    {
-        my $line = ${$logfile}[$i];
-        
-        # Errors are all errors, but not the Windows installer table "Error.idt"
-
-        my $compareline = $line;
-        $compareline =~ s/Error\.idt//g;	# removing all occurrences of "Error.idt"
-        $compareline =~ s/Error\.mlf//g;	# removing all occurrences of "Error.mlf"
-        $compareline =~ s/Error\.ulf//g;	# removing all occurrences of "Error.ulf"
-        $compareline =~ s/Error\.idl//g;	# removing all occurrences of "Error.idl"
-        $compareline =~ s/Error\.html//g;	# removing all occurrences of "Error.html"
-        
-        if ( $compareline =~ /\bError\b/i )
-        {
-            $contains_error = 1;
-            push(@errors, $line);
-            
-            if ( $ignore_error )
-            {
-                $contains_error = 0;
-                $make_error_to_warning = 1;
-            }
-        }
-    }
-
-    if ($contains_error)
-    {
-        my $line = "\n*********************************************************************\n";
-        push(@output, $line);
-        $line = "ERROR: The following errors occurred in packaging process:\n\n";
-        push(@output, $line);
-
-        for ( my $i = 0; $i <= $#errors; $i++ )
-        {
-            $line = "$errors[$i]";
-            push(@output, $line);
-        }
-        
-        $line = "*********************************************************************\n";
-        push(@output, $line);
-    }
-    else
-    {
-        my $line = "";
-        
-        if ( $make_error_to_warning )
-        {
-            $line = "\n*********************************************************************\n";
-            push(@output, $line);
-            $line = "The following errors in the log file were ignored:\n\n";
-            push(@output, $line);
-
-            for ( my $i = 0; $i <= $#errors; $i++ )
-            {
-                $line = "$errors[$i]";
-                push(@output, $line);
-            }
-        
-            $line = "*********************************************************************\n";
-            push(@output, $line);		
-        }
-        
-        $line = "\n***********************************************************\n";
-        push(@output, $line);
-        $line = "Successful packaging process!\n";
-        push(@output, $line);
-        $line = "***********************************************************\n";
-        push(@output, $line);
-    }
-
-    # printing the output file and adding it to the logfile
-    
-    installer::logger::include_header_into_logfile("Summary:");
-    
-    my $force = 1; # print this message even in 'quiet' mode
-    for ( my $i = 0; $i <= $#output; $i++ )
-    {
-        my $line = "$output[$i]";
-        installer::logger::print_message( "$line", $force );
-        push( @installer::globals::logfileinfo, $line);
-        push( @installer::globals::errorlogfileinfo, $line);
-    }
-    
-    return $contains_error;
-}
-
-#############################################################
-# Determining the ship installation directory
-#############################################################
-
-sub determine_ship_directory
-{
-    my ($languagesref) = @_;
-
-    if (!( $ENV{'SHIPDRIVE'} )) { installer::exiter::exit_program("ERROR: SHIPDRIVE must be set for updater!", "determine_ship_directory"); } 
-
-    my $shipdrive = $ENV{'SHIPDRIVE'};
-
-    my $languagestring = $$languagesref;
-
-    if (length($languagestring) > $installer::globals::max_lang_length )
-    {
-        my $number_of_languages = installer::systemactions::get_number_of_langs($languagestring);
-        chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
-        my $id = substr($shorter, 0, 8); # taking only the first 8 digits
-        $languagestring = "lang_" . $number_of_languages . "_id_" . $id;				
-    }
-
-    my $productstring = $installer::globals::product;
-    my $productsubdir = "";
-
-    if ( $productstring =~ /^\s*(.+?)\_\_(.+?)\s*$/ )
-    {
-        $productstring = $1;
-        $productsubdir = $2;
-    }
-
-    if ( $installer::globals::languagepack ) { $productstring = $productstring . "_languagepack"; }
-    if ( $installer::globals::helppack ) { $productstring = $productstring . "_helppack"; }
-    if ( $installer::globals::patch ) { $productstring = $productstring . "_patch"; }
-    
-    my $destdir = $shipdrive . $installer::globals::separator . $installer::globals::compiler . 
-                $installer::globals::productextension . $installer::globals::separator . 
-                $productstring . $installer::globals::separator;
-    
-    if ( $productsubdir ) { $destdir = $destdir . $productsubdir . $installer::globals::separator; }
-         
-    $destdir = $destdir . $installer::globals::installertypedir . $installer::globals::separator . 
-                $installer::globals::build . "_" . $installer::globals::lastminor . "_" .
-                "native_inprogress-number_" . $languagestring . "\." . $installer::globals::buildid;
-
-    my $infoline = "\nSetting ship directory: $destdir\n";
-    push(@installer::globals::globallogfileinfo, $infoline);
-    
-    return $destdir;
-}
-
-#############################################################
-# Controlling if this is an official RE pack process
-#############################################################
-
-sub check_updatepack
-{
-    my $shipdrive = "";
-    my $filename = "";
-    my $infoline = "";
-    
-    if ( $ENV{'UPDATER'} )	# the environment variable UPDATER has to be set
-    {
-        $infoline = "\nEnvironment variable UPDATER set\n";
-        push(@installer::globals::globallogfileinfo, $infoline);
-
-        # There are no CWSes any more, no environment variable CWS_WORK_STAMP
-        {
-            if ( $ENV{'SHIPDRIVE'} )	# the environment variable SHIPDRIVE must be set 
-            {
-                $shipdrive = $ENV{'SHIPDRIVE'};
-                $infoline = "Ship drive defined: $shipdrive\n";
-                push(@installer::globals::globallogfileinfo, $infoline);
-
-                if ( -d $shipdrive )    # SHIPDRIVE must be a directory
-                {
-                    $infoline = "Ship drive exists\n";
-                    push(@installer::globals::globallogfileinfo, $infoline);
-
-                    # try to write into $shipdrive
-
-                    $directory = $installer::globals::product . "_" . $installer::globals::compiler . "_" . $installer::globals::buildid . "_" . $installer::globals::languageproducts[0] . "_test_$$";
-                    $directory =~ s/\,/\_/g;	# for the list of languages
-                    $directory =~ s/\-/\_/g;	# for en-US, pt-BR, ...
-                    $directory = $shipdrive . $installer::globals::separator . $directory;
-
-                    $infoline = "Try to create directory: $directory\n";
-                    push(@installer::globals::globallogfileinfo, $infoline);
-                    
-                    # saving this directory for later removal
-                    $installer::globals::shiptestdirectory = $directory;
-
-                    if ( installer::systemactions::try_to_create_directory($directory))
-                    {
-                        $infoline = "Write access on Ship drive\n";
-                        push(@installer::globals::globallogfileinfo, $infoline);
-                        $infoline = "Ship test directory $installer::globals::shiptestdirectory was successfully created\n";
-                        push(@installer::globals::globallogfileinfo, $infoline);
-                        my $systemcall = "rmdir $directory";
-                        my $returnvalue = system($systemcall);
-                        
-                        # 5th condition: No local build environment. 
-                        # In this case the content of SOLARENV starts with the content of SOL_TMP
-                        
-                        my $solarenv = "";
-                        my $sol_tmp;
-                        if ( $ENV{'SOLARENV'} ) { $solarenv = $ENV{'SOLARENV'}; }
-
-                        $infoline = "Environment variable SOLARENV: $solarenv\n";
-                        push(@installer::globals::globallogfileinfo, $infoline);
-
-                        if ( $ENV{'SOL_TMP'} ) 
-                        { 
-                            $sol_tmp = $ENV{'SOL_TMP'};
-                            $infoline = "Environment variable SOL_TMP: $sol_tmp\n";
-                        } else {
-                            $infoline = "Environment variable SOL_TMP not set\n";
-                        }
-                        push(@installer::globals::globallogfileinfo, $infoline);
-                        
-                        if ( defined $sol_tmp && ( $solarenv =~ /^\s*\Q$sol_tmp\E/ ))
-                        {
-                            $infoline = "Content of SOLARENV starts with the content of SOL_TMP\: Local environment -\> No Updatepack\n";
-                            push(@installer::globals::globallogfileinfo, $infoline);						
-                        }										
-                        else
-                        {
-                            $infoline = "Content of SOLARENV does not start with the content of SOL_TMP: No local environment\n";
-                            push(@installer::globals::globallogfileinfo, $infoline);
-
-                            $installer::globals::updatepack = 1;	# That's it
-                        }
-
-                        # Additional logging information for the temporary ship directory
-    
-                        if ( -d $installer::globals::shiptestdirectory )
-                        {
-                            $infoline = "Ship test directory $installer::globals::shiptestdirectory still exists. Trying removal later again.\n";
-                            push(@installer::globals::globallogfileinfo, $infoline);
-                        }
-                        else
-                        {
-                            $infoline = "Ship test directory $installer::globals::shiptestdirectory was successfully removed.\n";
-                            push(@installer::globals::globallogfileinfo, $infoline);	
-                        }	
-                    }
-                    else
-                    {
-                        $infoline = "No write access on Ship drive\n";
-                        push(@installer::globals::globallogfileinfo, $infoline);
-                        $infoline = "Failed to create directory $directory\n";
-                        push(@installer::globals::globallogfileinfo, $infoline);
-                        if ( defined $ENV{'BSCLIENT'} && ( uc $ENV{'BSCLIENT'} eq 'TRUE' ) ) {
-                            installer::exiter::exit_program("ERROR: No write access to SHIPDRIVE allthough BSCLIENT is set.", "check_updatepack");
-                        }
-                    }
-                }
-                else
-                {
-                    $infoline = "Ship drive not found: No updatepack\n";
-                    push(@installer::globals::globallogfileinfo, $infoline);					
-                }
-            }
-            else
-            {
-                $infoline = "Environment variable SHIPDRIVE not set: No updatepack\n";
-                push(@installer::globals::globallogfileinfo, $infoline);				
-            }
-        }
-    }	
-                
-    if ( $installer::globals::updatepack ) { $infoline = "Setting updatepack true\n\n"; }
-    else { $infoline = "\nNo updatepack\n"; }
-    push(@installer::globals::globallogfileinfo, $infoline);
-    
-}
-
-#############################################################
-# Reading the Windows list file for language encodings
-#############################################################
-
-sub read_encodinglist
-{
-    my ($patharrayref) = @_;
-    
-    my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$installer::globals::encodinglistname, $patharrayref , 0);
-
-    if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Did not find Windows encoding list $installer::globals::encodinglistname!", "read_encodinglist"); }
-
-    my $infoline = "Found encoding file: $$fileref\n";
-    push(@installer::globals::globallogfileinfo, $infoline);
-        
-    my $encodinglist = installer::files::read_file($$fileref);
-
-    my %msiencoding = ();
-    my %msilanguage = ();
-    
-    # Controlling the encoding list
-    
-    for ( my $i = 0; $i <= $#{$encodinglist}; $i++ )
-    {
-        my $line = ${$encodinglist}[$i];
-
-        if ( $line =~ /^\s*\#/ ) { next; }	# this is a comment line
-
-        if ( $line =~ /^(.*?)(\#.*)$/ ) { $line = $1; }	# removing comments after "#"
-
-        if ( $line =~ /^\s*([\w-]+)\s*(\d+)\s*(\d+)\s*$/ ) 
-        {
-            my $onelanguage = $1;
-            my $codepage = $2;
-            my $windowslanguage = $3;
-            
-            $msiencoding{$onelanguage} = $codepage;
-            $msilanguage{$onelanguage} = $windowslanguage;
-        }
-        else
-        {
-            installer::exiter::exit_program("ERROR: Wrong syntax in Windows encoding list $installer::globals::encodinglistname : en-US 1252 1033 !", "read_encodinglist");
-        }
-    }
-    
-    $installer::globals::msiencoding = \%msiencoding;
-    $installer::globals::msilanguage = \%msilanguage;
-}
-
-#############################################################
-# Only for Windows and Linux (RPM)there is currently
-# a reliable mechanism to register extensions during
-# installation process. Therefore it is for all other
-# platforms forbidden to install oxt files into that
-# directory, in which they are searched for registration.
-#############################################################
-
-sub check_oxtfiles
-{
-    my ( $filesarray ) = @_;
-
-    for ( my $i = 0; $i <= $#{$filesarray}; $i++ )
-    {
-        my $onefile = ${$filesarray}[$i];
-        
-        if (( $onefile->{'Name'} ) && ( $onefile->{'Dir'} ))
-        {		
-            if (( $onefile->{'Name'} =~ /\.oxt\s*$/ ) && ( $onefile->{'Dir'} eq $installer::globals::extensioninstalldir ))
-            {
-                installer::exiter::exit_program("There is currently only for Linux (RPM) and Windows a reliable mechanism to register extensions during installation.\nPlease remove file \"$onefile->{'gid'}\" from your installation set!\nYou can use \"\#ifdef WNT\" and \"\#ifdef LINUX\" in scp.", "check_oxtfiles");
-            }
-        }
-    }
-}
-
-#############################################################
-# Check if Java is available to create xpd installer
-#############################################################
-
-sub check_java_for_xpd
-{
-    my ( $allvariables ) = @_;
-    
-    if ( ! $installer::globals::solarjavaset ) { $allvariables->{'XPDINSTALLER'} = 0; }
-}
-
-####################################################################
-# Setting global variable "$installer::globals::addchildprojects"
-####################################################################
-
-sub set_addchildprojects
-{
-    my ($allvariables) = @_;
-
-    if (( $allvariables->{'JAVAPRODUCT'} ) || 
-        ( $allvariables->{'ADAPRODUCT'} ) || 
-        ( $allvariables->{'UREPRODUCT'} ) || 
-        ( $allvariables->{'ADDREQUIREDPACKAGES'} )) { $installer::globals::addchildprojects = 1; }
-        
-    if ( $installer::globals::patch )
-    {
-        $installer::globals::addchildprojects = 0;	# no child projects for patches
-    }	
-
-    my $infoline = "Value of \$installer::globals::addchildprojects: $installer::globals::addchildprojects\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-}
-
-#######################################################################
-# Setting global variable "$installer::globals::addsystemintegration"
-#######################################################################
-
-sub set_addsystemintegration
-{
-    my ($allvariables) = @_;
-
-    if ( $allvariables->{'ADDSYSTEMINTEGRATION'} ) { $installer::globals::addsystemintegration = 1; }
-    
-    if ( $installer::globals::patch ) {	$installer::globals::addsystemintegration = 0; }
-    if ( $installer::globals::languagepack ) { $installer::globals::addsystemintegration = 0; }
-    if ( $installer::globals::helppack ) { $installer::globals::addsystemintegration = 0; }
-    if (( $installer::globals::packageformat eq "native" ) || ( $installer::globals::packageformat eq "portable" )) { $installer::globals::addsystemintegration = 0; }
-
-    my $infoline = "Value of \$installer::globals::addsystemintegration: $installer::globals::addsystemintegration\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/converter.pm b/solenv/bin/modules/installer/converter.pm
deleted file mode 100644
index ea95fb856..000000000
--- a/solenv/bin/modules/installer/converter.pm
+++ /dev/null
@@ -1,265 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::converter;
-
-use installer::globals;
-
-#############################
-# Converter
-#############################
-
-sub convert_array_to_hash
-{
-    my ($arrayref) = @_;
-
-    my %newhash = ();
-
-    for (@{$arrayref})
-    {
-        next unless /^\s*([\w-]+?)\s+(.*?)\s*$/;
-        $newhash{$1} = $2;
-    }
-
-    return \%newhash;
-}
-
-sub convert_hash_into_array
-{
-    my ($hashref) = @_;
-    
-    return [map { "$_ = $hashref->{$_}\n" } keys %{$hashref}];
-}
-
-#############################################################################
-# Converting a string list with separator $listseparator 
-# into an array
-#############################################################################
-
-sub convert_stringlist_into_array
-{
-    my ( $includestringref, $listseparator ) = @_;
-    
-    return [map "$_\n", split /\Q$listseparator\E\s*/, ${$includestringref}];
-}
-
-#############################################################################
-# Converting a string list with separator $listseparator 
-# into an array
-#############################################################################
-
-sub convert_stringlist_into_array_without_newline
-{
-    my ( $includestringref, $listseparator ) = @_;
-    
-    return [split /\Q$listseparator\E\s*/, ${$includestringref}];
-}
-
-#############################################################################
-# Converting a string list with separator $listseparator 
-# into a hash with values 1.
-#############################################################################
-
-sub convert_stringlist_into_hash
-{
-    my ( $includestringref, $listseparator ) = @_;
-    
-    return {map {$_, 1} split /\Q$listseparator\E\s*/, ${$includestringref}};
-}
-
-#############################################################################
-# Converting a string list with separator $listseparator 
-# into an array
-#############################################################################
-
-sub convert_whitespace_stringlist_into_array
-{
-    my ( $includestringref ) = @_;
-    
-    my $tmp = ${$includestringref};
-    $tmp = s/^\s+//;
-    $tmp = s/\s+$//;
-
-    return [map "$_\n", split /\s+/, $tmp];
-}
-
-#############################################################################
-# Converting an array into a comma separated string 
-#############################################################################
-
-sub convert_array_to_comma_separated_string
-{
-    my ( $arrayref ) = @_;
-
-    my $newstring;
-    for (@{$arrayref}) {
-        my $tmp = $_;
-        $tmp =~ s/\s+$//;
-        $newstring .= "$tmp,";
-    }
-    $newstring =~ s/\,$//;
-
-    return $newstring;
-}
-
-#############################################################################
-# Converting an array into a space separated string 
-#############################################################################
-
-sub convert_array_to_space_separated_string
-{
-    my ( $arrayref ) = @_;
-
-    my $newstring;
-    for (@{$arrayref}) {
-        my $tmp = $_;
-        $tmp =~ s/\s+$//;
-        $newstring .= "$tmp ";
-    }
-    $newstring =~ s/ $//;
-
-    return $newstring;
-}
-
-#############################################################################
-# The file name contains for some files "/". If this programs runs on 
-# a windows platform, this has to be converted to "\".
-#############################################################################
-
-sub convert_slash_to_backslash
-{
-    my ($filesarrayref) = @_;
-
-    for my $onefile (@{$filesarrayref})
-    {
-        if ( $onefile->{'Name'} ) { $onefile->{'Name'} =~ s/\//\\/g; }
-    }
-}
-
-############################################################################
-# Creating a copy of an existing file object
-# No converter
-############################################################################
-
-sub copy_item_object
-{
-    my ($olditemhashref, $newitemhashref) = @_;
-
-    $newitemhashref = {%{$olditemhashref}};
-}
-
-#################################################################
-# Windows pathes must not contain the following structure:
-# c:\dirA\dirB\..\dirC
-# This has to be exchanged to 
-# c:\dirA\dirC
-#################################################################
-
-sub make_path_conform
-{
-    my ( $path ) = @_;
-    my $s = $installer::globals::separator;
-
-    while ($path =~ s/[^\.\Q$s\E]+?\Q$s\E\.\.(?:\Q$s\E|$)//g) {}
-
-    return $path;	
-}
-
-#################################################################
-# Copying an item collector
-# A reference to an array consisting of references to hashes.
-#################################################################
-
-sub copy_collector
-{
-    return [map { {%{$_}} } @{$_[0]}];
-}
-
-#################################################################
-# Combining two arrays, first wins
-#################################################################
-
-sub combine_arrays_from_references_first_win
-{
-    my ( $arrayref1, $arrayref2 ) = @_;
-
-    my $hashref1 = convert_array_to_hash($arrayref1);
-    my $hashref2 = convert_array_to_hash($arrayref2);
-
-    # add key-value pairs from hash1 to hash2 (overwrites existing keys)
-    @{$hashref2}{keys %{$hashref1}} = values %{$hashref1};
-
-    return [map { "$_ $hashref2->{$_}\n" } keys %{$hashref2}];
-}
-
-#################################################################
-# Returning the current ending number of a directory
-#################################################################
-
-sub get_number_from_directory
-{
-    my ( $directory ) = @_;
-    
-    my $number = 0;
-    
-    if ( $directory =~ /\_(\d+)\s*$/ )
-    {
-        $number = $1;
-    }
-
-    return $number;
-}
-
-#################################################################
-# Replacing separators, that are included into quotes
-#################################################################
-
-sub replace_masked_separator
-{
-    my ($string, $separator, $replacementstring) = @_;
-    
-    $string =~ s/\\\Q$separator\E/$replacementstring/g;
-    
-    return $string;
-}
-
-#################################################################
-# Resolving separators, that were replaced
-# in function mask_separator_in_quotes
-#################################################################
-
-sub resolve_masked_separator
-{
-    my ($arrayref, $separator, $replacementstring) = @_;
-    
-    for (@{$arrayref})
-    {
-        s/$replacementstring/$separator/g;
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/copyproject.pm b/solenv/bin/modules/installer/copyproject.pm
deleted file mode 100644
index 0a310096c..000000000
--- a/solenv/bin/modules/installer/copyproject.pm
+++ /dev/null
@@ -1,111 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::copyproject;
-
-use installer::control;
-use installer::converter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::systemactions;
-use installer::worker;
-
-####################################################
-# Including header files into the logfile
-####################################################
-
-sub copy_project
-{
-    my ( $filesref, $scpactionsref, $loggingdir, $languagestringref, $shipinstalldir, $allsettingsarrayref ) = @_;
-
-    # Creating directories
-
-    installer::logger::include_header_into_logfile("Creating installation directory");
-
-    my $current_install_number = "";
-
-    my $installdir = installer::worker::create_installation_directory($shipinstalldir, $languagestringref, \$current_install_number);
-
-    my $installlogdir = installer::systemactions::create_directory_next_to_directory($installdir, "log");
-
-    # Copy files and ScpActions
-
-    installer::logger::include_header_into_logfile("Copying files:");
-    
-    # copy Files
-    
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-
-        my $source = $onefile->{'sourcepath'};
-        my $destination = $installdir . $installer::globals::separator . $onefile->{'Name'};
-        
-        installer::systemactions::copy_one_file($source, $destination);
-
-        if ( $onefile->{'UnixRights'} )
-        {
-            chmod oct($onefile->{'UnixRights'}), $destination;
-        }
-        elsif ( $destination =~ /install\s*$/ )
-        {
-            chmod 0775, $destination;
-        }
-    }
-        
-    # copy ScpActions	
-
-    for ( my $i = 0; $i <= $#{$scpactionsref}; $i++ )
-    {
-        my $onefile = ${$scpactionsref}[$i];
-
-        my $source = $onefile->{'sourcepath'};
-        my $destination = $installdir . $installer::globals::separator . $onefile->{'DestinationName'};
-        
-        installer::systemactions::copy_one_file($source, $destination);
-        
-        if ( $onefile->{'UnixRights'} )
-        {
-            chmod oct($onefile->{'UnixRights'}), $destination;
-        }
-        elsif ( $destination =~ /install\s*$/ )
-        {
-            chmod 0775, $destination;
-        }
-    }
-
-    # Analyzing the log file
-
-    installer::worker::analyze_and_save_logfile($loggingdir, $installdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number);
-
-    # That's all
-    
-    exit(0);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
deleted file mode 100644
index 11eb869a9..000000000
--- a/solenv/bin/modules/installer/download.pm
+++ /dev/null
@@ -1,2067 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::download;
-
-use File::Spec;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::remover;
-use installer::systemactions;
-
-BEGIN { # This is needed so that cygwin's perl evaluates ACLs
-    # (needed for correctly evaluating the -x test.)
-    if( $^O =~ /cygwin/i ) {
-        require filetest; import filetest "access";
-    }
-}
-
-##################################################################
-# Including the lowercase product name into the script template 
-##################################################################
-
-sub put_productname_into_script
-{
-    my ($scriptfile, $variableshashref) = @_;
-    
-    my $productname = $variableshashref->{'PRODUCTNAME'};
-    $productname = lc($productname);
-    $productname =~ s/\.//g;	# openoffice.org -> openofficeorg
-    $productname =~ s/\s*//g;
-    
-    my $infoline = "Adding productname $productname into download shell script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/PRODUCTNAMEPLACEHOLDER/$productname/;
-    }
-}
-
-#########################################################
-# Including the linenumber into the script template 
-#########################################################
-
-sub put_linenumber_into_script
-{
-    my ( $scriptfile ) = @_;
-    
-    my $linenumber =  $#{$scriptfile} + 2;
-
-    my $infoline = "Adding linenumber $linenumber into download shell script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/LINENUMBERPLACEHOLDER/$linenumber/;
-    }	
-}
-
-#########################################################
-# Determining the name of the new scriptfile 
-#########################################################
-
-sub determine_scriptfile_name
-{
-    my ( $filename ) = @_;
-
-    $installer::globals::downloadfileextension = ".sh";
-    $filename = $filename . $installer::globals::downloadfileextension;
-    $installer::globals::downloadfilename = $filename;
-
-    my $infoline = "Setting download shell script file name to $filename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    return $filename;
-}
-
-#########################################################
-# Saving the script file in the installation directory 
-#########################################################
-
-sub save_script_file
-{
-    my ($directory, $newscriptfilename, $scriptfile) = @_;
-    
-    $newscriptfilename = $directory . $installer::globals::separator . $newscriptfilename;
-    installer::files::save_file($newscriptfilename, $scriptfile);
-    
-    my $infoline = "Saving script file $newscriptfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ( ! $installer::globals::iswindowsbuild )
-    {
-        chmod 0775, $newscriptfilename;
-    }
-    
-    return $newscriptfilename;
-}
-
-#########################################################
-# Including checksum and size into script file 
-#########################################################
-
-sub put_checksum_and_size_into_script
-{
-    my ($scriptfile, $sumout) = @_;
-
-    my $checksum = "";
-    my $size = "";
-    
-    if  ( $sumout =~ /^\s*(\d+)\s+(\d+)\s*$/ )
-    {
-        $checksum = $1;
-        $size = $2;		
-    }
-    else
-    {
-        installer::exiter::exit_program("ERROR: Incorrect return value from /usr/bin/sum: $sumout", "put_checksum_and_size_into_script");
-    }
-
-    my $infoline = "Adding checksum $checksum and size $size into download shell script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/CHECKSUMPLACEHOLDER/$checksum/;
-        ${$scriptfile}[$i] =~ s/DISCSPACEPLACEHOLDER/$size/;
-    }
-    
-}
-
-#########################################################
-# Calling md5sum 
-#########################################################
-
-sub call_md5sum
-{
-    my ($filename) = @_;
-
-    $md5sumfile = "/usr/bin/md5sum";
-    
-    if ( ! -f $md5sumfile ) { installer::exiter::exit_program("ERROR: No file /usr/bin/md5sum", "call_md5sum"); }
-    
-    my $systemcall = "$md5sumfile $filename |";
-    
-    my $md5sumoutput = "";
-
-    open (SUM, "$systemcall");
-    $md5sumoutput = <SUM>;
-    close (SUM);
-
-    my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    return $md5sumoutput;		
-}
-
-#########################################################
-# Calling md5sum 
-#########################################################
-
-sub get_md5sum
-{
-    ($md5sumoutput) = @_;
-    
-    my $md5sum;
-    
-    if  ( $md5sumoutput =~ /^\s*(\w+?)\s+/ )
-    {
-        $md5sum = $1;
-    }
-    else
-    {
-        installer::exiter::exit_program("ERROR: Incorrect return value from /usr/bin/md5sum: $md5sumoutput", "get_md5sum");
-    }
-
-    my $infoline = "Setting md5sum: $md5sum\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    return $md5sum;
-}
-
-#########################################################
-# Determining checksum and size of tar file 
-#########################################################
-
-sub call_sum
-{
-    my ($filename, $getuidlibrary) = @_;
-
-    my $systemcall = "/usr/bin/sum $filename |";
-    
-    my $sumoutput = "";
-
-    open (SUM, "$systemcall");
-    $sumoutput = <SUM>;
-    close (SUM);
-
-    my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    $sumoutput =~ s/\s+$filename\s$//;
-    return $sumoutput;	
-}
-
-#########################################################
-# Searching for the getuid.so in the solver 
-#########################################################
-
-sub get_path_for_library
-{
-    my ($includepatharrayref) = @_;
-    
-    my $getuidlibraryname = "getuid.so";
-
-    my $getuidlibraryref = "";
-
-    if ( $installer::globals::include_pathes_read )
-    {
-        $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0);
-    }
-    else
-    {
-        $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$getuidlibraryname, $includepatharrayref, 0);
-    }
-
-    if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_path_for_library"); }
-    
-    return $$getuidlibraryref;
-}
-
-#########################################################
-# Include the tar file into the script 
-#########################################################
-
-sub include_tar_into_script
-{
-    my ($scriptfile, $temporary_tarfile) = @_;
-
-    my $systemcall = "cat $temporary_tarfile >> $scriptfile && rm $temporary_tarfile";
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    return $returnvalue;
-}
-
-#########################################################
-# Create a tar file from the binary package 
-#########################################################
-
-sub tar_package
-{
-    my ( $installdir, $tarfilename, $getuidlibrary) = @_;
-
-    my $ldpreloadstring = "";
-    if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
-
-    my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - * > $tarfilename";
-    
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    chmod 0775, $tarfilename;
-
-    return ( -s $tarfilename );
-}
-
-#########################################################
-# Creating a tar.gz file
-#########################################################
-
-sub create_tar_gz_file_from_package
-{
-    my ($installdir, $getuidlibrary) = @_;
-
-    my $infoline = "";
-    my $alldirs = installer::systemactions::get_all_directories($installdir);
-    my $onedir = ${$alldirs}[0];
-    $installdir = $onedir;
-
-    my $allfiles = installer::systemactions::get_all_files_from_one_directory($installdir);
-
-    for ( my $i = 0; $i <= $#{$allfiles}; $i++ )
-    {
-        my $onefile = ${$allfiles}[$i];
-        my $systemcall = "cd $installdir; rm $onefile";
-        my $returnvalue = system($systemcall);
-
-        $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        
-        if ($returnvalue)
-        {
-            $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        else
-        {
-            $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-
-    $alldirs = installer::systemactions::get_all_directories($installdir);
-    $packagename = ${$alldirs}[0]; # only taking the first Solaris package			
-    if ( $packagename eq "" ) { installer::exiter::exit_program("ERROR: Could not find package in directory $installdir!", "determine_packagename"); } 
-
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$packagename);
-    
-    $installer::globals::downloadfileextension = ".tar.gz";
-    my $targzname = $packagename . $installer::globals::downloadfileextension;
-    $installer::globals::downloadfilename = $targzname;
-    my $ldpreloadstring = "";
-    if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
-
-    $systemcall = "cd $installdir; $ldpreloadstring tar -cf - $packagename | gzip > $targzname";
-    print "... $systemcall ...\n";
-
-    my $returnvalue = system($systemcall);
-
-    $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-#########################################################
-# Setting type of installation
-#########################################################
-
-sub get_installation_type
-{
-    my $type = "";
-    
-    if ( $installer::globals::languagepack ) { $type = "langpack"; }
-    elsif ( $installer::globals::helppack ) { $type = "helppack"; }
-    else { $type = "install"; }
-    
-    return $type;
-}
-
-#########################################################
-# Setting installation languages
-#########################################################
-
-sub get_downloadname_language
-{
-    my ($languagestringref) = @_;
-
-    my $languages = $$languagestringref;
-
-    if ( $installer::globals::added_english )
-    {
-        $languages =~ s/en-US_//;
-        $languages =~ s/_en-US//;
-    }
-
-    if ( length ($languages) > $installer::globals::max_lang_length )
-    {
-        $languages = 'multi';
-    }
-
-    return $languages;
-}
-
-#########################################################
-# Setting download name
-#########################################################
-
-sub get_downloadname_productname
-{
-    my ($allvariables) = @_;
-
-    my $start = "LibO";
-
-    if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibO"; }
-    
-    if ( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) { $start = "LibO-Dev"; }
-
-    if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-SDK"; }
-
-    if (( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; }
-    
-    if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; }
-
-    if ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP"; }
-
-
-
-    return $start;
-}
-
-#########################################################
-# Setting download version
-#########################################################
-
-sub get_download_version
-{
-    my ($allvariables) = @_;
-    
-    my $version = "";
-    
-    my $devproduct = 0;
-    if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; }
-
-    if ( $devproduct )  # use "DEV300m75"
-    {
-        my $source = uc($installer::globals::build); # DEV300
-        my $localminor = "";
-        if ( $installer::globals::minor ne "" ) { $localminor = $installer::globals::minor; }
-        else { $localminor = $installer::globals::lastminor; }
-        $version = $source . $localminor; 
-    }
-    else  # use 3.2.0rc1
-    {
-        $version = $allvariables->{'PRODUCTVERSION'};
-        if (( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ) && ( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ne "" )) { $version = $allvariables->{'ABOUTBOXPRODUCTVERSION'}; }
-        if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $version = $version . $allvariables->{'SHORT_PRODUCTEXTENSION'}; }	
-    }
-    
-    return $version;
-}
-
-###############################################################
-# Set date string, format: yymmdd
-###############################################################
-
-sub set_date_string
-{
-    my ($allvariables) = @_;
-
-    my $datestring = "";
-
-    my $devproduct = 0;
-    if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; }
-
-    my $releasebuild = 1;
-    if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $releasebuild = 0; }	
-
-    if (( ! $devproduct ) && ( ! $releasebuild ))
-    {
-        my @timearray = localtime(time);
-
-        my $day = $timearray[3];
-        my $month = $timearray[4] + 1;
-        my $year = $timearray[5] + 1900;
-    
-        if ( $month < 10 ) { $month = "0" . $month; } 
-        if ( $day < 10 ) { $day = "0" . $day; } 
-
-        $datestring = $year . $month . $day;
-    }
-
-    return $datestring;
-}
-
-#################################################################
-# Setting the platform name for download
-#################################################################
-
-sub get_download_platformname
-{
-    my $platformname = "";
-    
-    if ( $installer::globals::islinuxbuild )
-    {
-        $platformname = "Linux";
-    }
-    elsif ( $installer::globals::issolarisbuild )
-    {
-        $platformname = "Solaris";
-    }
-    elsif ( $installer::globals::iswindowsbuild )
-    {
-        $platformname = "Win";
-    }
-    elsif ( $installer::globals::isfreebsdbuild )
-    {
-        $platformname = "FreeBSD";		
-    }
-    elsif ( $installer::globals::ismacbuild )
-    {
-        $platformname = "MacOS";
-    }
-    else
-    {
-        $platformname = $installer::globals::compiler;		
-    }
-    
-    return $platformname;
-}
-
-#########################################################
-# Setting the architecture for the download name
-#########################################################
-
-sub get_download_architecture
-{
-    my $arch = "";
-    
-    if ( $installer::globals::compiler =~ /unxlngi/ )
-    {
-        $arch = "x86";
-    }
-    elsif ( $installer::globals::compiler =~ /unxlngppc/ )
-    { 
-        $arch = "PPC";
-    }
-    elsif ( $installer::globals::compiler =~ /unxlngx/ )
-    {
-        $arch = "x86-64";
-    }
-    elsif ( $installer::globals::issolarissparcbuild )
-    {
-        $arch = "Sparc";
-    }
-    elsif ( $installer::globals::issolarisx86build )
-    {
-        $arch = "x86";	
-    }
-    elsif ( $installer::globals::iswindowsbuild )
-    {
-        $arch = "x86";
-    }
-    elsif ( $installer::globals::compiler =~ /^unxmacxi/ )
-    {
-        $arch = "x86";
-    }
-    elsif ( $installer::globals::compiler =~ /^unxmacxp/ )
-    {
-        $arch = "PPC";
-    }
-    
-    return $arch;	
-}
-
-#########################################################
-# Setting the installation type for the download name
-#########################################################
-
-sub get_install_type
-{
-    my ($allvariables) = @_;
-    
-    my $type = "";
-    
-    if ( $installer::globals::languagepack )
-    {
-        $type = "langpack";
-
-        if ( $installer::globals::isrpmbuild )
-        {
-            $type = $type . "-rpm";
-        }
-
-        if ( $installer::globals::isdebbuild )
-        {
-            $type = $type . "-deb";
-        }
-
-        if ( $installer::globals::packageformat eq "archive" )
-        {
-            $type = $type . "-arc";
-        }
-    }
-    elsif ( $installer::globals::helppack )
-    {
-        $type = "helppack";
-
-        if ( $installer::globals::isrpmbuild )
-        {
-            $type = $type . "-rpm";
-        }
-        
-        if ( $installer::globals::isdebbuild )
-        {
-            $type = $type . "-deb";
-        }
-        
-        if ( $installer::globals::packageformat eq "archive" )
-        {
-            $type = $type . "-arc";			
-        }
-    }
-    else
-    {
-        $type = "install";
-
-        if ( $installer::globals::isrpmbuild )
-        {
-            $type = $type . "-rpm";
-        }
-        
-        if ( $installer::globals::isdebbuild )
-        {
-            $type = $type . "-deb";
-        }
-        
-        if ( $installer::globals::packageformat eq "archive" )
-        {
-            $type = $type . "-arc";			
-        }
-
-        if (( $allvariables->{'WITHJREPRODUCT'} ) && ( $allvariables->{'WITHJREPRODUCT'} == 1 ))
-        {
-            $type = $type . "-wJRE";
-        }
-
-    }
-    
-    return $type;
-}
-
-#########################################################
-# Setting installation addons
-#########################################################
-
-sub get_downloadname_addon
-{
-    my $addon = "";
-
-    if ( $installer::globals::isdebbuild ) { $addon = $addon . "_deb"; }
-    
-    if ( $installer::globals::product =~ /_wJRE\s*$/ ) { $addon = "_wJRE"; }
-    
-    return $addon;
-}
-
-#########################################################
-# Looking for versionstring in version.info
-# This has to be the only content of this file.
-#########################################################
-
-sub get_versionstring
-{
-    my ( $versionfile ) = @_;
-    
-    my $versionstring = "";
-
-    for ( my $i = 0; $i <= $#{$versionfile}; $i++ )
-    {
-        my $oneline = ${$versionfile}[$i];
-        
-        if ( $oneline =~ /^\s*\#/ ) { next; } # comment line
-        if ( $oneline =~ /^\s*\"\s*(.*?)\s*\"\s*$/ )
-        {
-            $versionstring = $1;
-            last;
-        }
-    }
-    
-    return $versionstring;
-}
-
-#########################################################
-# Returning the current product version
-# This has to be defined in file "version.info"
-# in directory $installer::globals::ooouploaddir
-#########################################################
-
-sub get_current_version
-{
-    my $infoline = "";
-    my $versionstring = "";
-    my $filename = "version.info";
-    
-    if ( -f $filename )
-    {
-        $infoline = "File $filename exists. Trying to find current version.\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        my $versionfile = installer::files::read_file($filename);
-        $versionstring = get_versionstring($versionfile);
-        $infoline = "Setting version string: $versionstring\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "File $filename does not exist. No version setting in download file name.\n";
-        push( @installer::globals::logfileinfo, $infoline);	
-    }
-
-    $installer::globals::oooversionstring = $versionstring;
-    
-    return $versionstring;
-}
-
-###############################################################################################
-# Setting the download file name
-# Syntax:
-# (PRODUCTNAME)_(VERSION)_(OS)_(ARCH)_(INSTALLTYPE)_(LANGUAGE).(FILEEXTENSION)
-###############################################################################################
-
-sub set_download_filename
-{
-    my ($languagestringref, $allvariables) = @_;
-    
-    my $start = get_downloadname_productname($allvariables);
-    my $versionstring = get_download_version($allvariables);
-    my $platform = get_download_platformname();
-    my $architecture = get_download_architecture();
-    my $type = get_install_type($allvariables);
-    my $language = get_downloadname_language($languagestringref);
-    
-    # Setting the extension happens automatically
-
-    my $filename = $start . "_" . $versionstring . "_" . "_" . $platform . "_" . $architecture . "_" . $type . "_" . $language;
-    
-    $filename =~ s/\_\_/\_/g;	# necessary, if $versionstring or $platform or $language are empty
-    $filename =~ s/\_\s*$//;	# necessary, if $language and $addon are empty
-    
-    $installer::globals::ooodownloadfilename = $filename;
-    
-    return $filename;
-}
-
-#########################################################
-# Creating a tar.gz file
-#########################################################
-
-sub create_tar_gz_file_from_directory
-{
-    my ($installdir, $getuidlibrary, $downloaddir, $downloadfilename) = @_;
-
-    my $infoline = "";
-
-    my $packdir = $installdir;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$packdir);
-    my $changedir = $installdir;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$changedir);
-
-    my $ldpreloadstring = "";
-    if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
-
-    $installer::globals::downloadfileextension = ".tar.gz";
-    $installer::globals::downloadfilename = $downloadfilename . $installer::globals::downloadfileextension;
-    my $targzname = $downloaddir . $installer::globals::separator . $installer::globals::downloadfilename;
-
-    $systemcall = "cd $changedir; $ldpreloadstring tar -cf - $packdir | gzip > $targzname";
-    
-    my $returnvalue = system($systemcall);
-
-    $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    return $targzname;
-}
-
-#########################################################
-# Setting the variables in the download name
-#########################################################
-
-sub resolve_variables_in_downloadname
-{
-    my ($allvariables, $downloadname, $languagestringref) = @_;
-
-    # Typical name: soa-{productversion}-{extension}-bin-{os}-{languages}
-
-    my $productversion = "";
-    if ( $allvariables->{'PRODUCTVERSION'} ) { $productversion = $allvariables->{'PRODUCTVERSION'}; }
-    $downloadname =~ s/\{productversion\}/$productversion/;
-
-    my $ppackageversion = "";
-    if ( $allvariables->{'PACKAGEVERSION'} ) { $packageversion = $allvariables->{'PACKAGEVERSION'}; }
-    $downloadname =~ s/\{packageversion\}/$packageversion/;
-
-    my $extension = "";
-    if ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) { $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'}; }
-    $extension = lc($extension);
-    $downloadname =~ s/\{extension\}/$extension/;
-
-    my $os = "";
-    if ( $installer::globals::iswindowsbuild ) { $os = "windows"; }
-    elsif ( $installer::globals::issolarissparcbuild ) { $os = "solsparc"; }
-    elsif ( $installer::globals::issolarisx86build ) { $os = "solia"; }
-    elsif ( $installer::globals::islinuxbuild ) { $os = "linux"; }
-    elsif ( $installer::globals::compiler =~ /unxmacxi/ ) { $os = "macosxi"; }
-    elsif ( $installer::globals::compiler =~ /unxmacxp/ ) { $os = "macosxp"; }
-    else { $os = ""; }	
-    $downloadname =~ s/\{os\}/$os/;
-
-    my $languages = $$languagestringref;
-    $downloadname =~ s/\{languages\}/$languages/;
-    
-    $downloadname =~ s/\-\-\-/\-/g;
-    $downloadname =~ s/\-\-/\-/g;
-    $downloadname =~ s/\-\s*$//;
-
-    return $downloadname;
-}
-
-##################################################################
-# Windows: Replacing one placeholder with the specified value 
-##################################################################
-
-sub replace_one_variable
-{
-    my ($templatefile, $placeholder, $value) = @_;
-
-    my $infoline = "Replacing $placeholder by $value in nsi file\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$templatefile}; $i++ )
-    {
-        ${$templatefile}[$i] =~ s/$placeholder/$value/g;
-    }
-
-}
-
-########################################################################################
-# Converting a string to a unicode string
-########################################################################################
-
-sub convert_to_unicode
-{
-    my ($string) = @_;
-    
-    my $unicodestring = "";
-    
-    my $stringlength = length($string);
-    
-    for ( my $i = 0; $i < $stringlength; $i++ )
-    {
-        $unicodestring = $unicodestring . substr($string, $i, 1);
-        $unicodestring = $unicodestring . chr(0);
-    }	
-
-    return $unicodestring;
-}
-
-##################################################################
-# Windows: Setting nsis version is necessary because of small
-# changes in nsis from version 2.0.4 to 2.3.1 
-##################################################################
-
-sub set_nsis_version
-{
-    my ($nshfile) = @_;
-
-    my $searchstring = "\$\{LangFileString\}"; # occurs only in nsis 2.3.1 or similar
-    
-    for ( my $i = 0; $i <= $#{$nshfile}; $i++ )
-    {
-        if ( ${$nshfile}[$i] =~ /\Q$searchstring\E/ )
-        {
-            # this is nsis 2.3.1 or similar
-            $installer::globals::nsis231 = 1;
-            $installer::globals::unicodensis = 0;
-            last;	
-        }
-    }
-    
-    # checking unicode version
-    $searchstring = convert_to_unicode($searchstring);
-
-    for ( my $i = 0; $i <= $#{$nshfile}; $i++ )
-    {
-        if ( ${$nshfile}[$i] =~ /\Q$searchstring\E/ )
-        {
-            # this is nsis 2.3.1 or similar
-            $installer::globals::nsis231 = 1;
-            $installer::globals::unicodensis = 1;
-            last;	
-        }
-    }
-    
-    if ( ! $installer::globals::nsis231 ) { $installer::globals::nsis204 = 1; }
-}
-
-##################################################################
-# Windows: Including the product name into nsi template 
-##################################################################
-
-sub put_windows_productname_into_template
-{
-    my ($templatefile, $variableshashref) = @_;
-    
-    my $productname = $variableshashref->{'PRODUCTNAME'};
-    $productname =~ s/\.//g;	# OpenOffice.org -> OpenOfficeorg
-
-    replace_one_variable($templatefile, "PRODUCTNAMEPLACEHOLDER", $productname);
-}
-
-##################################################################
-# Windows: Substituting the path to a file into the nsi template
-##################################################################
-
-sub substitute_path_into_template
-{
-    my ($templatefile, $includepatharrayref, $allvariables, $var, $subst) = @_;
-
-    if ( ! $allvariables->{$var} ) { $var =~ s/_.*$//; } # _BR suffix ?
-    if ( ! $allvariables->{$var} ) { installer::exiter::exit_program("ERROR: $var not defined in product definition!", "substitute_path_into_template"); }
-    my $filename = $allvariables->{$var};
-
-    my $completefilenameref = "";
-
-    if ( $installer::globals::include_pathes_read )
-    {
-        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 0);
-    }
-    else
-    {
-        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, $includepatharrayref, 0);
-    }
-
-    if ($$completefilenameref eq "") { installer::exiter::exit_program("ERROR: Could not find download file $filename!", "substitute_path_into_template"); }
-
-    if ( $^O =~ /cygwin/i ) { $$completefilenameref =~ s/\//\\/g; }
-
-    replace_one_variable($templatefile, $subst, $$completefilenameref);
-}
-
-##################################################################
-# Windows: substitute a variable into the nsi template
-##################################################################
-sub substitute_variable_into_template($$$$)
-{
-    my ($templatefile, $variableshashref, $varname, $subst) = @_;
-
-    my $var = "";
-    if ( $variableshashref->{$varname} ) { $var = $variableshashref->{$varname}; }
-
-    replace_one_variable($templatefile, $subst, $var);
-}
-
-##################################################################
-# Windows: Including the product version into nsi template 
-##################################################################
-
-sub put_windows_productpath_into_template
-{
-    my ($templatefile, $variableshashref, $languagestringref, $localnsisdir) = @_;
-    
-    my $productpath = $variableshashref->{'PROPERTYTABLEPRODUCTNAME'};
-    
-    if (length($locallangs) > $installer::globals::max_lang_length) { $locallangs = "multi lingual"; }
-
-    if ( ! $installer::globals::languagepack || ! $installer::globals::helppack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
-    
-    replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
-}
-
-##################################################################
-# Windows: Including download file name into nsi template 
-##################################################################
-
-sub put_outputfilename_into_template
-{
-    my ($templatefile, $downloadname) = @_;
-    
-    $installer::globals::downloadfileextension = ".exe";
-    $downloadname = $downloadname . $installer::globals::downloadfileextension;
-    $installer::globals::downloadfilename = $downloadname;
-
-    replace_one_variable($templatefile, "DOWNLOADNAMEPLACEHOLDER", $downloadname);
-}
-
-##################################################################
-# Windows: Generating the file list in nsi file format 
-##################################################################
-
-sub get_file_list
-{
-    my ( $basedir ) = @_;
-
-    my @filelist = ();
-
-    my $alldirs = installer::systemactions::get_all_directories($basedir);
-    unshift(@{$alldirs}, $basedir);	# $basedir is the first directory in $alldirs
-    
-    for ( my $i = 0; $i <= $#{$alldirs}; $i++ )
-    {
-        my $onedir = ${$alldirs}[$i];
-        
-        # Syntax:
-        # SetOutPath "$INSTDIR"
-
-        my $relativedir = $onedir;
-        $relativedir =~ s/\Q$basedir\E//;
-
-        my $oneline = " " . "SetOutPath" . " " . "\"\$INSTDIR" . $relativedir . "\"" . "\n";
-                
-        if ( $^O =~ /cygwin/i ) {
-            $oneline =~ s/\//\\/g;
-        }
-        push(@filelist, $oneline);
-        
-        # Collecting all files in the specific directory
-        
-        my $files = installer::systemactions::get_all_files_from_one_directory($onedir);
-        
-        for ( my $j = 0; $j <= $#{$files}; $j++ )
-        {
-            my $onefile = ${$files}[$j];
-        
-            my $fileline = "  " . "File" . " " . "\"" . $onefile . "\"" . "\n";
-
-            if ( $^O =~ /cygwin/i ) {
-                $fileline =~ s/\//\\/g;
-            }
-            push(@filelist, $fileline);
-        }
-    }
-
-    return \@filelist;
-}
-
-##################################################################
-# Windows: Including list of all files into nsi template 
-##################################################################
-
-sub put_filelist_into_template
-{
-    my ($templatefile, $installationdir) = @_;
-    
-    my $filelist = get_file_list($installationdir);
-
-    my $filestring = "";
-
-    for ( my $i = 0; $i <= $#{$filelist}; $i++ )
-    {
-        $filestring = $filestring . ${$filelist}[$i];
-    }
-    
-    $filestring =~ s/\s*$//;
-    
-    replace_one_variable($templatefile, "ALLFILESPLACEHOLDER", $filestring);
-}
-
-##################################################################
-# Windows: NSIS uses specific language names 
-##################################################################
-
-sub nsis_language_converter
-{
-    my ($language) = @_;
-    
-    my $nsislanguage = "";
-
-    # Assign language used by NSIS. 
-    # The files "$nsislanguage.nsh" and "$nsislanguage.nlf"
-    # are needed in the NSIS environment.
-    # Directory: <NSIS-Dir>/Contrib/Language files
-    if ( $language eq "en-US" ) { $nsislanguage = "English"; }
-    elsif ( $language eq "sq" ) { $nsislanguage = "Albanian"; }
-    elsif ( $language eq "ar" ) { $nsislanguage = "Arabic"; }
-    elsif ( $language eq "bg" ) { $nsislanguage = "Bulgarian"; }
-    elsif ( $language eq "ca" ) { $nsislanguage = "Catalan"; }
-    elsif ( $language eq "hr" ) { $nsislanguage = "Croatian"; }
-    elsif ( $language eq "cs" ) { $nsislanguage = "Czech"; }
-    elsif ( $language eq "da" ) { $nsislanguage = "Danish"; }
-    elsif ( $language eq "nl" ) { $nsislanguage = "Dutch"; }
-    elsif ( $language eq "de" ) { $nsislanguage = "German"; }
-    elsif ( $language eq "de-LU" ) { $nsislanguage = "Luxembourgish"; }
-    elsif ( $language eq "et" ) { $nsislanguage = "Estonian"; }
-    elsif ( $language eq "fa" ) { $nsislanguage = "Farsi"; }
-    elsif ( $language eq "el" ) { $nsislanguage = "Greek"; }
-    elsif ( $language eq "fi" ) { $nsislanguage = "Finnish"; }
-    elsif ( $language eq "fr" ) { $nsislanguage = "French"; }
-    elsif ( $language eq "hu" ) { $nsislanguage = "Hungarian"; }
-    elsif ( $language eq "he" ) { $nsislanguage = "Hebrew"; }
-    elsif ( $language eq "is" ) { $nsislanguage = "Icelandic"; }
-    elsif ( $language eq "id" ) { $nsislanguage = "Indonesian"; }
-    elsif ( $language eq "it" ) { $nsislanguage = "Italian"; }
-    elsif ( $language eq "lv" ) { $nsislanguage = "Latvian"; }
-    elsif ( $language eq "lt" ) { $nsislanguage = "Lithuanian"; }
-    elsif ( $language eq "mk" ) { $nsislanguage = "Macedonian"; }
-    elsif ( $language eq "mn" ) { $nsislanguage = "Mongolian"; }
-    elsif ( $language eq "no" ) { $nsislanguage = "Norwegian"; }
-    elsif ( $language eq "no-NO" ) { $nsislanguage = "Norwegian"; }
-    elsif ( $language eq "es" ) { $nsislanguage = "Spanish"; }
-    elsif ( $language eq "sl" ) { $nsislanguage = "Slovenian"; }
-    elsif ( $language eq "sv" ) { $nsislanguage = "Swedish"; }
-    elsif ( $language eq "sk" ) { $nsislanguage = "Slovak"; }
-    elsif ( $language eq "pl" ) { $nsislanguage = "Polish"; }
-    elsif ( $language eq "pt-BR" ) { $nsislanguage = "PortugueseBR"; }
-    elsif ( $language eq "pt" ) { $nsislanguage = "Portuguese"; }
-    elsif ( $language eq "ro" ) { $nsislanguage = "Romanian"; }
-    elsif ( $language eq "ru" ) { $nsislanguage = "Russian"; }
-    elsif ( $language eq "sh" ) { $nsislanguage = "SerbianLatin"; }
-    elsif ( $language eq "sr" ) { $nsislanguage = "Serbian"; }
-    elsif ( $language eq "sr-SP" ) { $nsislanguage = "Serbian"; }
-    elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; }
-    elsif ( $language eq "tr" ) { $nsislanguage = "Turkish"; }
-    elsif ( $language eq "ja" ) { $nsislanguage = "Japanese"; }
-    elsif ( $language eq "ko" ) { $nsislanguage = "Korean"; }
-    elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
-    elsif ( $language eq "zh-CN" ) { $nsislanguage = "SimpChinese"; }
-    elsif ( $language eq "zh-TW" ) { $nsislanguage = "TradChinese"; }
-    else {
-        my $infoline = "NSIS language_converter : Could not find nsis language for $language!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $nsislanguage = "English";
-    }
-
-    return $nsislanguage;
-}
-
-##################################################################
-# Windows: Including list of all languages into nsi template 
-##################################################################
-
-sub put_language_list_into_template
-{
-    my ($templatefile, $languagesarrayref) = @_;
-
-    my $alllangstring = "";
-    my %nsislangs;
- 
-    for ( my $i = 0; $i <= $#{$languagesarrayref}; $i++ )
-    {
-        my $onelanguage = ${$languagesarrayref}[$i];
-        my $nsislanguage = nsis_language_converter($onelanguage);
-        $nsislangs{$nsislanguage}++;
-    }
-
-    foreach my $nsislanguage ( keys(%nsislangs) )
-    {
-        # Syntax: !insertmacro MUI_LANGUAGE "English"
-        my $langstring = "\!insertmacro MUI_LANGUAGE_PACK " . $nsislanguage . "\n";
-        if ( $nsislanguage eq "English" )
-        {
-            $alllangstring = $langstring . $alllangstring;
-        }
-        else
-        {
-            $alllangstring = $alllangstring . $langstring;			
-        }
-    }
-
-    $alllangstring =~ s/\s*$//;
-    
-    replace_one_variable($templatefile, "ALLLANGUAGESPLACEHOLDER", $alllangstring);
-}
-
-##################################################################
-# Windows: Collecting all identifier from mlf file 
-##################################################################
-
-sub get_identifier
-{
-    my ( $mlffile ) = @_;
-    
-    my @identifier = ();
-    
-    for ( my $i = 0; $i <= $#{$mlffile}; $i++ )
-    {
-        my $oneline = ${$mlffile}[$i];
-
-        if ( $oneline =~ /^\s*\[(.+)\]\s*$/ )
-        {
-            my $identifier = $1;
-            push(@identifier, $identifier);
-        }
-    }
-
-    return \@identifier;
-}
-
-##############################################################
-# Returning the complete block in all languages
-# for a specified string
-##############################################################
-
-sub get_language_block_from_language_file
-{
-    my ($searchstring, $languagefile) = @_;
-
-    my @language_block = ();
-
-    for ( my $i = 0; $i <= $#{$languagefile}; $i++ )
-    {		
-        if ( ${$languagefile}[$i] =~ /^\s*\[\s*$searchstring\s*\]\s*$/ )
-        {
-            my $counter = $i;
-
-            push(@language_block, ${$languagefile}[$counter]);
-            $counter++;
-            
-            while (( $counter <= $#{$languagefile} ) && (!( ${$languagefile}[$counter] =~ /^\s*\[/ )))
-            {
-                push(@language_block, ${$languagefile}[$counter]);
-                $counter++;
-            }
-            
-            last;
-        }
-    }	
-    
-    return \@language_block;
-}
-
-##############################################################
-# Returning a specific language string from the block
-# of all translations
-##############################################################
-
-sub get_language_string_from_language_block
-{
-    my ($language_block, $language) = @_;
-    
-    my $newstring = "";
-
-    for ( my $i = 0; $i <= $#{$language_block}; $i++ )
-    {
-        if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ )
-        {
-            $newstring = $1;
-            last;
-        }	
-    }	
-    
-    if ( $newstring eq "" )
-    {
-        $language = "en-US"; 	# defaulting to english	
-
-        for ( my $i = 0; $i <= $#{$language_block}; $i++ )
-        {		
-            if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ )
-            {
-                $newstring = $1;
-                last;
-            }
-        }
-    }
-    
-    return $newstring;
-}
-
-##################################################################
-# Windows: Replacing strings in NSIS nsh file 
-# nsh file syntax:
-# !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis ausw�hlen"
-##################################################################
-
-sub replace_identifier_in_nshfile
-{
-    my ( $nshfile, $identifier, $newstring, $nshfilename, $onelanguage ) = @_;
-    
-    if ( $installer::globals::nsis231 )
-    {
-        $newstring =~ s/\\r/\$\\r/g;	# \r -> $\r  in modern nsis versions
-        $newstring =~ s/\\n/\$\\n/g;	# \n -> $\n  in modern nsis versions
-    }
-
-    for ( my $i = 0; $i <= $#{$nshfile}; $i++ )
-    {
-        if ( ${$nshfile}[$i] =~ /\s+\Q$identifier\E\s+\"(.+)\"\s*$/ )
-        {
-            my $oldstring = $1;
-            ${$nshfile}[$i] =~ s/\Q$oldstring\E/$newstring/;
-            my $infoline = "NSIS replacement in $nshfilename ($onelanguage): $oldstring \-\> $newstring\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-}
-
-##################################################################
-# Windows: Replacing strings in NSIS nlf file 
-# nlf file syntax (2 lines):
-# # ^DirSubText
-# Zielverzeichnis 
-##################################################################
-
-sub replace_identifier_in_nlffile
-{
-    my ( $nlffile, $identifier, $newstring, $nlffilename, $onelanguage ) = @_;
-
-    for ( my $i = 0; $i <= $#{$nlffile}; $i++ )
-    {
-        if ( ${$nlffile}[$i] =~ /^\s*\#\s+\^\s*\Q$identifier\E\s*$/ )
-        {
-            my $next = $i+1;
-            my $oldstring = ${$nlffile}[$next];
-            ${$nlffile}[$next] = $newstring . "\n";
-            $oldstring =~ s/\s*$//;
-            my $infoline = "NSIS replacement in $nlffilename ($onelanguage): $oldstring \-\> $newstring\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }	
-}
-
-##################################################################
-# Windows: Translating the NSIS nsh and nlf file 
-##################################################################
-
-sub translate_nsh_nlf_file
-{
-    my ($nshfile, $nlffile, $mlffile, $onelanguage, $nshfilename, $nlffilename, $nsislanguage) = @_;
-
-    # Analyzing the mlf file, collecting all Identifier
-    my $allidentifier = get_identifier($mlffile);
-    
-    $onelanguage = "en-US" if ( $nsislanguage eq "English" && $onelanguage ne "en-US");
-    for ( my $i = 0; $i <= $#{$allidentifier}; $i++ )
-    {
-        my $identifier = ${$allidentifier}[$i];
-        my $language_block = get_language_block_from_language_file($identifier, $mlffile);
-        my $newstring = get_language_string_from_language_block($language_block, $onelanguage);
-        
-        # removing mask
-        $newstring =~ s/\\\'/\'/g;
-        
-        replace_identifier_in_nshfile($nshfile, $identifier, $newstring, $nshfilename, $onelanguage);
-        replace_identifier_in_nlffile($nlffile, $identifier, $newstring, $nlffilename, $onelanguage);		
-    }
-}
-
-##################################################################
-# Converting utf 16 file to utf 8 
-##################################################################
-
-sub convert_utf16_to_utf8
-{
-    my ( $filename ) = @_;
-
-    my @localfile = ();
-
-    my $savfilename = $filename . "_before.utf16";
-    installer::systemactions::copy_one_file($filename, $savfilename);
-
-    open( IN, "<:encoding(UTF16-LE)", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf16_to_utf8");
-    while ( $line = <IN> ) {
-        push @localfile, $line;
-    }
-    close( IN );
-
-    if ( open( OUT, ">:utf8", $filename ) )
-    {
-        print OUT @localfile;
-        close(OUT);	
-    }
-
-    $savfilename = $filename . "_before.utf8";
-    installer::systemactions::copy_one_file($filename, $savfilename);
-}
-
-##################################################################
-# Converting utf 8 file to utf 16 
-##################################################################
-
-sub convert_utf8_to_utf16
-{
-    my ( $filename ) = @_; 
-
-    my @localfile = ();
-
-    my $savfilename = $filename . "_after.utf8";
-    installer::systemactions::copy_one_file($filename, $savfilename);
-
-    open( IN, "<:utf8", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf8_to_utf16");
-    while ( $line = <IN> ) {
-        push @localfile, $line;
-    }
-    close( IN );
-
-    if ( open( OUT, ">:raw:encoding(UTF16-LE):crlf:utf8", $filename ) )
-    {
-        print OUT @localfile;
-        close(OUT);	
-    }
-
-    $savfilename = $filename . "_after.utf16";
-    installer::systemactions::copy_one_file($filename, $savfilename);
-}
-
-##################################################################
-# Converting text string to utf 16 
-##################################################################
-
-sub convert_textstring_to_utf16
-{
-    my ( $textstring, $localnsisdir, $shortfilename ) = @_; 
-
-    my $filename = $localnsisdir . $installer::globals::separator . $shortfilename;
-    my @filecontent = ();
-    push(@filecontent, $textstring);
-    installer::files::save_file($filename, \@filecontent);
-    convert_utf8_to_utf16($filename);
-    my $newfile = installer::files::read_file($filename);
-    my $utf16string = "";
-    if ( ${$newfile}[0] ne "" ) { $utf16string = ${$newfile}[0]; }
-
-    return $utf16string;
-}
-
-##################################################################
-# Windows: Copying NSIS language files to local nsis directory 
-##################################################################
-
-sub copy_and_translate_nsis_language_files
-{
-    my ($nsispath, $localnsisdir, $languagesarrayref, $allvariables) = @_;
-    
-    my $nlffilepath = $nsispath . $installer::globals::separator . "Contrib" . $installer::globals::separator . "Language\ files" . $installer::globals::separator;
-    my $nshfilepath = $nsispath . $installer::globals::separator . "Contrib" . $installer::globals::separator . "Modern\ UI" . $installer::globals::separator . "Language files" . $installer::globals::separator;
-
-    my $infoline = "";
-
-    for ( my $i = 0; $i <= $#{$languagesarrayref}; $i++ )
-    {
-        my $onelanguage = ${$languagesarrayref}[$i];
-        my $nsislanguage = nsis_language_converter($onelanguage);
-
-        # Copying the nlf file
-        my $sourcepath = $nlffilepath . $nsislanguage . "\.nlf";
-        if ( ! -f $sourcepath ) { installer::exiter::exit_program("ERROR: Could not find nsis file: $sourcepath!", "copy_and_translate_nsis_language_files"); }
-        my $nlffilename = $localnsisdir . $installer::globals::separator . $nsislanguage . "_pack.nlf";
-        if ( $^O =~ /cygwin/i ) { $nlffilename =~ s/\//\\/g; }
-        installer::systemactions::copy_one_file($sourcepath, $nlffilename);
-        
-        # Copying the nsh file
-        # In newer nsis versions, the nsh file is located next to the nlf file
-        $sourcepath = $nshfilepath . $nsislanguage . "\.nsh";
-        if ( ! -f $sourcepath )
-        {
-            # trying to find the nsh file next to the nlf file
-            $sourcepath = $nlffilepath . $nsislanguage . "\.nsh";
-            if ( ! -f $sourcepath )
-            {
-                installer::exiter::exit_program("ERROR: Could not find nsis file: $sourcepath!", "copy_and_translate_nsis_language_files");
-            }
-        }
-        my $nshfilename = $localnsisdir . $installer::globals::separator . $nsislanguage . "_pack.nsh";
-        if ( $^O =~ /cygwin/i ) { $nshfilename =~ s/\//\\/g; }
-        installer::systemactions::copy_one_file($sourcepath, $nshfilename);		
-
-        # Changing the macro name in nsh file: MUI_LANGUAGEFILE_BEGIN -> MUI_LANGUAGEFILE_PACK_BEGIN
-        my $nshfile = installer::files::read_file($nshfilename);
-        set_nsis_version($nshfile);
-        
-        if ( $installer::globals::unicodensis )
-        {
-            $infoline = "This is Unicode NSIS!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            convert_utf16_to_utf8($nshfilename);
-            convert_utf16_to_utf8($nlffilename);
-            $nshfile = installer::files::read_file($nshfilename);	# read nsh file again
-        }
-
-        replace_one_variable($nshfile, "MUI_LANGUAGEFILE_BEGIN", "MUI_LANGUAGEFILE_PACK_BEGIN");
-
-        # find the ulf file for translation
-        my $mlffile = get_translation_file($allvariables);
-        
-        # Translate the files
-        my $nlffile = installer::files::read_file($nlffilename);
-        translate_nsh_nlf_file($nshfile, $nlffile, $mlffile, $onelanguage, $nshfilename, $nlffilename, $nsislanguage);
-        
-        installer::files::save_file($nshfilename, $nshfile);
-        installer::files::save_file($nlffilename, $nlffile);
-
-        if ( $installer::globals::unicodensis )
-        {
-            convert_utf8_to_utf16($nshfilename);
-            convert_utf8_to_utf16($nlffilename);
-        }
-    }
-
-}
-
-##################################################################
-# Windows: Including the nsis path into the nsi template 
-##################################################################
-
-sub put_nsis_path_into_template
-{
-    my ($templatefile, $nsisdir) = @_;
-
-    replace_one_variable($templatefile, "NSISPATHPLACEHOLDER", $nsisdir);
-}
-
-##################################################################
-# Windows: Including the output path into the nsi template 
-##################################################################
-
-sub put_output_path_into_template
-{
-    my ($templatefile, $downloaddir) = @_;
-
-    if ( $^O =~ /cygwin/i ) { $downloaddir =~ s/\//\\/g; }
-
-    replace_one_variable($templatefile, "OUTPUTDIRPLACEHOLDER", $downloaddir);
-}
-
-##################################################################
-# Windows: Only allow specific code for nsis 2.0.4 or nsis 2.3.1 
-##################################################################
-
-sub put_version_specific_code_into_template
-{
-    my ($templatefile) = @_;
-    
-    my $subst204 = "";
-    my $subst231 = "";
-    
-    if ( $installer::globals::nsis204 )
-    {
-        $subst231 = ";";
-    }
-    else
-    {
-        $subst204 = ";";		
-    }
-
-    replace_one_variable($templatefile, "\#204\#", $subst204);
-    replace_one_variable($templatefile, "\#231\#", $subst231);	
-}
-
-##################################################################
-# Windows: Finding the path to the nsis SDK 
-##################################################################
-
-sub get_path_to_nsis_sdk
-{
-    my $vol;
-    my $dir;
-    my $file;
-    my $nsispath = "";
-
-    if ( $ENV{'NSIS_PATH'} ) {
-        $nsispath = $ENV{'NSIS_PATH'};
-    } elsif ( $ENV{'SOLARROOT'} ) {
-        $nsispath = $ENV{'SOLARROOT'} . $installer::globals::separator . "NSIS";
-    } else {
-        # do we have nsis already in path ?
-        @paths = split(/:/, $ENV{'PATH'});
-        foreach $paths (@paths) {
-            $paths =~ s/[\/\\]+$//; # remove trailing slashes;
-            $nsispath = $paths . "/nsis";
-
-            if ( -x $nsispath ) {
-                $nsispath = $paths;
-                last;
-            }
-            else {
-                $nsispath = "";
-            }
-        }
-    }
-    if ( $ENV{'NSISSDK_SOURCE'} ) {
-        installer::logger::print_warning( "NSISSDK_SOURCE is deprecated. use NSIS_PATH instead.\n" );
-        $nsispath = $ENV{'NSISSDK_SOURCE'};	# overriding the NSIS SDK with NSISSDK_SOURCE
-    }
-
-    if ( $nsispath eq "" )
-    {
-        installer::logger::print_message( "... no Environment variable \"SOLARROOT\", \"NSIS_PATH\" or \"NSISSDK_SOURCE\" found and NSIS not found in path!", "get_path_to_nsis_sdk");
-    } elsif ( ! -d $nsispath )
-    {
-        installer::exiter::exit_program("ERROR: NSIS path $nsispath does not exist!", "get_path_to_nsis_sdk");
-    }
-    
-    return $nsispath;
-}
-
-##################################################################
-# Windows: Executing NSIS to create the installation set 
-##################################################################
-
-sub call_nsis
-{
-    my ( $nsispath, $nsifile ) = @_;
-    
-    my $makensisexe = $nsispath . $installer::globals::separator . "makensis.exe";
-
-    installer::logger::print_message( "... starting $makensisexe ... \n" );
-
-    if( $^O =~ /cygwin/i ) { $nsifile =~ s/\\/\//g;	}
-
-    my $systemcall = "$makensisexe /V4 /DMUI_VERBOSE=4 $nsifile |";
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my @nsisoutput = ();
-
-    open (NSI, "$systemcall");
-    while (<NSI>) {push(@nsisoutput, $_); }
-    close (NSI);
-
-    my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: $systemcall !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }		
-
-    for ( my $i = 0; $i <= $#nsisoutput; $i++ ) { push( @installer::globals::logfileinfo, "$nsisoutput[$i]"); }
-
-}
-
-#################################################################################
-# Replacing one variable in one files
-#################################################################################
-
-sub replace_one_variable_in_translationfile
-{
-    my ($translationfile, $variable, $searchstring) = @_;
-    
-    for ( my $i = 0; $i <= $#{$translationfile}; $i++ )
-    {
-        ${$translationfile}[$i] =~ s/\%$searchstring/$variable/g;
-    }	
-}
-
-#################################################################################
-# Replacing the variables in the translation file
-#################################################################################
-
-sub replace_variables
-{
-    my ($translationfile, $variableshashref) = @_;
-
-    # we want to substitute FOO_BR before FOO to avoid floating _BR suffixes
-    foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref})
-    {
-        my $value = $variableshashref->{$key};
-
-        # special handling for PRODUCTVERSION, if $allvariables->{'POSTVERSIONEXTENSION'}
-        if (( $key eq "PRODUCTVERSION" ) && ( $variableshashref->{'POSTVERSIONEXTENSION'} )) { $value = $value . " " . $variableshashref->{'POSTVERSIONEXTENSION'}; }
-
-        replace_one_variable_in_translationfile($translationfile, $value, $key);
-    }
-}
-
-#########################################################
-# Getting the translation file for the nsis installer
-#########################################################
-
-sub get_translation_file
-{
-    my ($allvariableshashref) = @_;
-    my $translationfilename = $installer::globals::idtlanguagepath . $installer::globals::separator . $installer::globals::nsisfilename;
-    if ( $installer::globals::unicodensis ) { $translationfilename = $translationfilename . ".uulf"; }
-    else { $translationfilename = $translationfilename . ".mlf"; }
-    if ( ! -f $translationfilename ) { installer::exiter::exit_program("ERROR: Could not find language file $translationfilename!", "get_translation_file"); }
-    my $translationfile = installer::files::read_file($translationfilename);
-    replace_variables($translationfile, $allvariableshashref);
-
-    my $infoline = "Reading translation file: $translationfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    
-    return $translationfile;
-}
-
-####################################################
-# Removing english, if it was added before
-####################################################
-
-sub remove_english_for_nsis_installer
-{
-    my ($languagestringref, $languagesarrayref) = @_;
-
-    @{$languagesarrayref} = ("en-US");	# only english for NSIS installer!
-}
-
-####################################################
-# Creating link tree for upload
-####################################################
-
-sub create_link_tree
-{
-    my ($sourcedownloadfile, $destfilename, $versionstring) = @_;
-    
-    if ( ! $installer::globals::ooouploaddir ) { installer::exiter::exit_program("ERROR: Directory for LO upload not defined!", "create_link_tree"); }
-    my $versiondir = $installer::globals::ooouploaddir . $installer::globals::separator . $versionstring;
-    my $infoline = "Directory for the link: $versiondir\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    if ( ! -d $versiondir ) { installer::systemactions::create_directory_structure($versiondir); }
-    
-    # inside directory $versiondir all links have to be created	
-    my $linkdestination = $versiondir . $installer::globals::separator . $destfilename;
-
-    # If there is an older version of this file (link), it has to be removed
-    if ( -f $linkdestination ) { unlink($linkdestination); }
-
-    $infoline = "Creating hard link from $sourcedownloadfile to $linkdestination\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    installer::systemactions::hardlink_one_file($sourcedownloadfile, $linkdestination);	
-}
-
-#######################################################
-# Setting supported platform for LibreOffice
-# builds
-#######################################################
-
-sub is_supported_platform
-{
-    my $is_supported = 0;
-    
-    if (( $installer::globals::isrpmbuild ) ||
-        ( $installer::globals::issolarissparcbuild ) ||
-        ( $installer::globals::issolarisx86build ) ||
-        ( $installer::globals::iswindowsbuild ))
-    {
-        $is_supported = 1;
-    }
-
-    return $is_supported;
-}
-
-####################################################
-# Creating download installation sets
-####################################################
-
-sub create_download_sets
-{
-    my ($installationdir, $includepatharrayref, $allvariableshashref, $downloadname, $languagestringref, $languagesarrayref) = @_;
-    
-    my $infoline = "";
-    
-    my $force = 1; # print this message even in 'quiet' mode
-    installer::logger::print_message( "\n******************************************\n" );
-    installer::logger::print_message( "... creating download installation set ...\n", $force );
-    installer::logger::print_message( "******************************************\n" );
-
-    installer::logger::include_header_into_logfile("Creating download installation sets:");
-
-    # special handling for installation sets, to which english was added automatically
-    if ( $installer::globals::added_english ) { remove_english_for_nsis_installer($languagestringref, $languagesarrayref); }
-
-    my $firstdir = $installationdir;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$firstdir);
-    
-    my $lastdir = $installationdir;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$lastdir);
-
-    if ( $installer::globals::iswindowsbuild && $lastdir =~ /\./ ) { $lastdir =~ s/\./_download_inprogress\./ }
-    else { $lastdir = $lastdir . "_download_inprogress"; }
-
-    # removing existing directory "_native_packed_inprogress" and "_native_packed_witherror" and "_native_packed"
-
-    my $downloaddir = $firstdir . $lastdir;
-    
-    if ( -d $downloaddir ) { installer::systemactions::remove_complete_directory($downloaddir); }
-    
-    my $olddir = $downloaddir;
-    $olddir =~ s/_inprogress/_witherror/;
-    if ( -d $olddir ) { installer::systemactions::remove_complete_directory($olddir); }
-
-    $olddir = $downloaddir;
-    $olddir =~ s/_inprogress//;
-    if ( -d $olddir ) { installer::systemactions::remove_complete_directory($olddir); }
-
-    # creating the new directory
-    
-    installer::systemactions::create_directory($downloaddir);
-
-    $installer::globals::saveinstalldir = $downloaddir;
-
-    # evaluating the name of the download file
-
-    if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { $downloadname = set_download_filename($languagestringref, $allvariableshashref); }
-    else { $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref); }
-
-    if ( ! $installer::globals::iswindowsbuild )	# Unix specific part
-    {
-
-        # getting the path of the getuid.so (only required for Solaris and Linux)
-        my $getuidlibrary = "";
-        if (( $installer::globals::issolarisbuild ) || ( $installer::globals::islinuxbuild )) {	$getuidlibrary = get_path_for_library($includepatharrayref); }
-
-        if ( $allvariableshashref->{'OOODOWNLOADNAME'} )
-        {
-            my $downloadfile = create_tar_gz_file_from_directory($installationdir, $getuidlibrary, $downloaddir, $downloadname);
-        }
-        else
-        {
-            # find and read setup script template
-            my $scriptfilename = "downloadscript.sh";
-
-            my $scriptref = "";
-
-            if ( $installer::globals::include_pathes_read )
-            {
-                $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfilename, $includepatharrayref, 0);
-            }
-            else
-            {
-                $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$scriptfilename, $includepatharrayref, 0);
-            }
-
-            if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find script file $scriptfilename!", "create_download_sets"); }
-            my $scriptfile = installer::files::read_file($$scriptref);
-
-            $infoline = "Found  script file $scriptfilename: $$scriptref \n";
-            push( @installer::globals::logfileinfo, $infoline);
-    
-            # add product name into script template
-            put_productname_into_script($scriptfile, $allvariableshashref);
-
-            # replace linenumber in script template
-            put_linenumber_into_script($scriptfile);
-
-            # create tar file
-            my $temporary_tarfile_name = $downloaddir . $installer::globals::separator . 'installset.tar';
-            my $size = tar_package($installationdir, $temporary_tarfile_name, $getuidlibrary); 
-            installer::exiter::exit_program("ERROR: Could not create tar file $temporary_tarfile_name!", "create_download_sets") unless $size; 
-
-            # calling sum to determine checksum and size of the tar file
-            my $sumout = call_sum($temporary_tarfile_name);
-    
-            # writing checksum and size into scriptfile
-            put_checksum_and_size_into_script($scriptfile, $sumout);
-    
-            # saving the script file
-            my $newscriptfilename = determine_scriptfile_name($downloadname);
-            $newscriptfilename = save_script_file($downloaddir, $newscriptfilename, $scriptfile);
-
-            installer::logger::print_message( "... including installation set into $newscriptfilename ... \n" );
-            # Append tar file to script
-            include_tar_into_script($newscriptfilename, $temporary_tarfile_name); 
-        }
-    }
-    else	# Windows specific part
-    {
-        my $localnsisdir = installer::systemactions::create_directories("nsis", $languagestringref);
-        # push(@installer::globals::removedirs, $localnsisdir);
-
-        # find nsis in the system
-        my $nsispath = get_path_to_nsis_sdk();
-
-        if ( $nsispath eq "" ) {
-            # If nsis is not found just skip the rest of this function
-            # and do not create the NSIS file.
-            $infoline = "\nNo NSIS SDK found. Skipping the generation of NSIS file.\n";
-            push(@installer::globals::logfileinfo, $infoline);
-            installer::logger::print_message( "... no NSIS SDK found. Skipping the generation of NSIS file ... \n" );
-            return $downloaddir;
-        }
-
-        # copy language files into nsis directory and translate them
-        copy_and_translate_nsis_language_files($nsispath, $localnsisdir, $languagesarrayref, $allvariableshashref);
-        
-        # find and read the nsi file template
-        my $templatefilename = "downloadtemplate.nsi";
-
-        my $templateref = "";
-
-        if ( $installer::globals::include_pathes_read )
-        {
-            $templateref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$templatefilename, $includepatharrayref, 0);
-        }
-        else
-        {
-            $templateref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$templatefilename, $includepatharrayref, 0);
-        }
-
-        if ($$templateref eq "") { installer::exiter::exit_program("ERROR: Could not find nsi template file $templatefilename!", "create_download_sets"); }
-        my $templatefile = installer::files::read_file($$templateref);
-
-        # add product name into script template
-        put_windows_productname_into_template($templatefile, $allvariableshashref);
-        @path_substs = (
-            'DOWNLOADBANNER' => 'BANNERBMPPLACEHOLDER',
-            'DOWNLOADBITMAP' => 'WELCOMEBMPPLACEHOLDER',
-            'DOWNLOADSETUPICO' => 'SETUPICOPLACEHOLDER'
-        );
-        while (@path_substs) {
-            my $var= shift @path_substs;
-            my $val = shift @path_substs;
-            substitute_path_into_template($templatefile, $includepatharrayref,
-                                          $allvariableshashref, $var, $val);
-        }
-        %var_substs = (
-            'OOOVENDOR' => 'PUBLISHERPLACEHOLDER',
-            'STARTCENTER_INFO_URL' => 'WEBSITEPLACEHOLDER',
-            'WINDOWSJAVAFILENAME' => 'WINDOWSJAVAFILENAMEPLACEHOLDER',
-            'PRODUCTVERSION' => 'PRODUCTVERSIONPLACEHOLDER'
-        );
-        for $var (keys %var_substs) {
-            substitute_variable_into_template($templatefile, $allvariableshashref,
-                                              $var, $var_substs{$var});
-        }
-        put_windows_productpath_into_template($templatefile, $allvariableshashref, $languagestringref, $localnsisdir);
-        put_outputfilename_into_template($templatefile, $downloadname);
-        put_filelist_into_template($templatefile, $installationdir);
-        put_language_list_into_template($templatefile, $languagesarrayref);
-        put_nsis_path_into_template($templatefile, $localnsisdir);
-        put_output_path_into_template($templatefile, $downloaddir);
-        put_version_specific_code_into_template($templatefile);
-    
-        my $nsifilename = save_script_file($localnsisdir, $templatefilename, $templatefile);
-        
-        installer::logger::print_message( "... created NSIS file $nsifilename ... \n" );
-        
-        # starting the NSIS SDK to create the download file
-        call_nsis($nsispath, $nsifilename);		
-    }
-    
-    return $downloaddir;
-}
-
-####################################################
-# Creating LO upload tree
-####################################################
-
-sub create_download_link_tree
-{
-    my ($downloaddir, $languagestringref, $allvariableshashref) = @_;
-
-    my $infoline;
-
-    installer::logger::print_message( "\n******************************************\n" );
-    installer::logger::print_message( "... creating download hard link ...\n" );
-    installer::logger::print_message( "******************************************\n" );
-
-    installer::logger::include_header_into_logfile("Creating download hard link:");
-    installer::logger::include_timestamp_into_logfile("\nPerformance Info: Creating hard link, start");
-
-    if ( is_supported_platform() )
-    {
-        my $versionstring = "";
-        # Already defined $installer::globals::oooversionstring and $installer::globals::ooodownloadfilename ?
-        
-        if ( ! $installer::globals::oooversionstring ) { $versionstring = get_current_version(); }
-        else { $versionstring = $installer::globals::oooversionstring; } 
-        
-        # Is $versionstring empty? If yes, there is nothing to do now. 
-
-        $infoline = "Version string is set to: $versionstring\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        
-        if ( $versionstring )
-        {
-            # Now the downloadfilename has to be set (if not already done)
-            my $destdownloadfilename = "";
-            if ( ! $installer::globals::ooodownloadfilename ) { $destdownloadfilename = set_download_filename($languagestringref, $versionstring, $allvariableshashref); }
-            else { $destdownloadfilename = $installer::globals::ooodownloadfilename; }
-
-            if ( $destdownloadfilename )
-            {
-                $destdownloadfilename = $destdownloadfilename . $installer::globals::downloadfileextension;
-                
-                $infoline = "Setting destination download file name: $destdownloadfilename\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                my $sourcedownloadfile = $downloaddir . $installer::globals::separator . $installer::globals::downloadfilename;
-
-                $infoline = "Setting source download file name: $sourcedownloadfile\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                create_link_tree($sourcedownloadfile, $destdownloadfilename, $versionstring);
-            }
-        }
-        else
-        {
-            $infoline = "Version string is empty. Nothing to do!\n";
-            push( @installer::globals::logfileinfo, $infoline);		
-        }
-    }	
-    else
-    {
-        $infoline = "Platform not used for hard linking. Nothing to do!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: Creating hard link, stop");
-}
-
-1;
diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm
deleted file mode 100644
index ab82ef269..000000000
--- a/solenv/bin/modules/installer/downloadsigner.pm
+++ /dev/null
@@ -1,587 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::downloadsigner;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-
-############################################
-# Parameter Operations
-############################################
-
-sub usage
-{
-    print <<Ende;
---------------------------------------------------------------------------------
-make_download V1.0
-The following parameter are needed:
--d: Full path to the file containing the follow-me info or to a directory
-    containing the follow-me info files. In the latter case, all follow-me
-    info files are evaluated. If a directory is used, the successfully used 
-    follow-me info files are renamed using a string "success". Files with
-    this string are ignored in repeated processes using "-d" with a 
-    directory.
-
-The following parameter are optional:
--nodownload: Only signing, no creation of download sets (Windows only)
--useminor: Important for installation sets, created without minor set
--writetotemp: Necessary, if you do not want to write into solver
-              This can be caused by missing privileges (Windows only)
--internalcabinet: Not only the cabinet files are signed, but also all
-                  files included in the cabinet files (Windows only).
-
--sign: Uses signing mechanism to sign installation sets
-If \"-sign\" is set, the following two parameter are required:
--pfx: Full path to the pfx file
--pw: Full path to the file, containing the pfx password.
-
-Examples:
-
-Specifying an installation set (with "-d"):
-
-perl make_download.pl -d <followmeinfofilename>
-
-perl make_download.pl -d <followmeinfofilename>
-                         -sign
-                         -pfx <pfxfilename>
-                         -pw <passwordfilename> 
-                               
-or without specifying an installation set:
-
-perl make_download.pl -d <followmedirectory>
-                      -sign
-                      -pfx <pfxfilename>
-                      -pw <passwordfilename> 
---------------------------------------------------------------------------------
-Ende
-    exit(-1);
-}
-
-#####################################
-# Reading parameter
-#####################################
-
-sub getparameter
-{
-    while ( $#ARGV >= 0 )
-    {
-        my $param = shift(@ARGV);
-        
-        if ($param eq "-d") { $installer::globals::followmeinfofilename = shift(@ARGV); }
-        elsif ($param eq "-pw") { $installer::globals::pwfile = shift(@ARGV); }
-        elsif ($param eq "-pfx") { $installer::globals::pfxfile = shift(@ARGV); }
-        elsif ($param eq "-sign") { $installer::globals::dosign = 1; }
-        elsif ($param eq "-nodownload") { $installer::globals::nodownload = 1; }
-        elsif ($param eq "-writetotemp") { $installer::globals::writetotemp = 1; }
-        elsif ($param eq "-useminor") { $installer::globals::useminor = 1; }
-        elsif ($param eq "-internalcabinet") { $installer::globals::internal_cabinet_signing = 1; }
-        else
-        {
-            installer::logger::print_error( "unknown parameter: $param" );
-            usage();
-            exit(-1);
-        }
-    }
-}
-
-#####################################
-# Controlling required parameter
-#####################################
-
-sub checkparameter
-{
-    if ( $installer::globals::followmeinfofilename eq "" )
-    {
-        installer::logger::print_error( "Error: Required parameter is missing: -d\n" );
-        usage();
-        exit(-1);		
-    }
-    
-    if ( $installer::globals::dosign )
-    {
-        # -pfx and -pw have to be set	
-        if ( $installer::globals::pfxfile eq "" )
-        {
-            installer::logger::print_error( "Error: If \"-sign\" is set, a pfx file has to be specified: -pfx\n" );
-            usage();
-            exit(-1);
-        }
-
-        # -pfx and -pw have to be set	
-        if ( $installer::globals::pwfile eq "" )
-        {
-            installer::logger::print_error( "Error: If \"-sign\" is set, a password file has to be specified: -pw\n" );
-            usage();
-            exit(-1);
-        }
-        
-        # and both files have to exist
-        if ( ! -f $installer::globals::pfxfile )
-        {
-            installer::logger::print_error( "Error: pfx file \"$installer::globals::pfxfile\" does not exist.\n" );
-            usage();
-            exit(-1);			
-        }
-
-        if ( ! -f $installer::globals::pwfile )
-        {
-            installer::logger::print_error( "Error: Password file \"$installer::globals::pwfile\" does not exist (-pw).\n" );
-            usage();
-            exit(-1);			
-        }
-    }
-}
-
-#############################################
-# Setting the temporary path for the download 
-# and signing process
-#############################################
-
-sub set_temp_path
-{
-    my $temppath = "";
-    my $pid = $$;			# process id
-    my $time = time();		# time
-    my $helperdir = "unpackdir_" . $pid . $time;
-    
-    if (( $ENV{'TMP'} ) || ( $ENV{'TEMP'} ))
-    {
-        if ( $ENV{'TMP'} ) { $temppath = $ENV{'TMP'}; }
-        elsif ( $ENV{'TEMP'} )  { $temppath = $ENV{'TEMP'}; }
-        $temppath =~ s/\Q$installer::globals::separator\E\s*$//;	# removing ending slashes and backslashes
-        $temppath = $temppath . $installer::globals::separator . $helperdir;
-
-        if( $^O =~ /cygwin/i )
-        {
-            $temppath = qx{cygpath -w "$temppath"};
-            $temppath =~ s/\\/\//g;
-            $temppath =~ s/\s*$//g;
-        }
-
-        installer::systemactions::create_directory_structure($temppath);
-    }
-    else
-    {
-        installer::logger::print_error( "Error: TMP and TEMP not defined. This is required for this process.\n" );
-        usage();
-        exit(-1);
-    }
-    
-    installer::logger::print_message( "\n... using output path: $temppath ...\n" );
-    
-    push(@installer::globals::removedirs, $temppath);
-    
-    return $temppath;
-}
-
-#############################################
-# Setting output pathes to temp directory
-# This are the:
-# unpackpath and the loggingdir
-#############################################
-
-sub set_output_pathes_to_temp
-{
-    my ($followmeinfohash, $temppath) = @_;
-    
-    $followmeinfohash->{'loggingdir'} = $temppath . $installer::globals::separator;
-    $installer::globals::unpackpath = $temppath;
-}
-
-#############################################
-# Setting the minor into the pathes. This is
-# required, if the original installation set
-# was created without minor
-# Value is always saved in 
-# $installer::globals::lastminor
-# which is saved in the follow_me file
-#############################################
-
-sub set_minor_into_pathes
-{
-    my ($followmeinfohash, $temppath) = @_;
-    
-    installer::logger::print_message( "\n... forcing into minor: $installer::globals::lastminor ...\n" );
-    
-    my @pathnames = ("bin", "doc", "inc", "lib", "pck", "res", "xml");
-    my $sourcename = "src";
-    my $srcpath = $installer::globals::separator . $sourcename . $installer::globals::separator;
-    
-    if ( $installer::globals::minor ne "" )
-    {
-        installer::logger::print_message( "\n... already defined minor: $installer::globals::minor -> ignoring parameter \"-useminor\" ...\n" );
-        return;
-    }
-
-    # Affected pathes:
-    # $contenthash{'installlogdir'}
-    # $contenthash{'includepatharray'}
-    # $installer::globals::unpackpath
-    # $installer::globals::idttemplatepath
-    # $installer::globals::idtlanguagepath
-
-    installer::logger::include_header_into_logfile("Changing saved pathes to add the minor");
-    my $infoline = "Old pathes:\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$followmeinfohash->{'installlogdir'}: $followmeinfohash->{'installlogdir'}\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$installer::globals::unpackpath: $installer::globals::unpackpath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$installer::globals::idttemplatepath: $installer::globals::idttemplatepath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$installer::globals::idtlanguagepath: $installer::globals::idtlanguagepath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "Include pathes:\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { push( @installer::globals::logfileinfo, $path); }
-    
-    foreach $onepath ( @pathnames )
-    {
-        my $oldvalue = $installer::globals::separator . $onepath . $installer::globals::separator;
-        my $newvalue = $installer::globals::separator . $onepath . "\." . $installer::globals::lastminor . $installer::globals::separator;
-    
-        if (( $followmeinfohash->{'installlogdir'} =~ /\Q$oldvalue\E/ ) && ( ! ( $followmeinfohash->{'installlogdir'} =~ /\Q$srcpath\E/ ))) { $followmeinfohash->{'installlogdir'} =~ s/\Q$oldvalue\E/$newvalue/; }
-        if (( $installer::globals::unpackpath =~ /\Q$oldvalue\E/ ) && ( ! ( $installer::globals::unpackpath =~ /\Q$srcpath\E/ ))) { $installer::globals::unpackpath =~ s/\Q$oldvalue\E/$newvalue/; }
-        if (( $installer::globals::idttemplatepath =~ /\Q$oldvalue\E/ ) && ( ! ( $installer::globals::idttemplatepath =~ /\Q$srcpath\E/ ))) { $installer::globals::idttemplatepath =~ s/\Q$oldvalue\E/$newvalue/; }
-        if (( $installer::globals::idtlanguagepath =~ /\Q$oldvalue\E/ ) && ( ! ( $installer::globals::idtlanguagepath =~ /\Q$srcpath\E/ ))) { $installer::globals::idtlanguagepath =~ s/\Q$oldvalue\E/$newvalue/; }
-        foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { if (( $path =~ /\Q$oldvalue\E/ ) && ( ! ( $path =~ /\Q$srcpath\E/ ))) { $path =~ s/\Q$oldvalue\E/$newvalue/; } }
-
-        # Checking for the end of the path
-        $oldvalue = $installer::globals::separator . $onepath;
-        $newvalue = $installer::globals::separator . $onepath . "\." . $installer::globals::lastminor;
-
-        if (( $followmeinfohash->{'installlogdir'} =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $followmeinfohash->{'installlogdir'} =~ /\Q$srcpath\E/ ))) { $followmeinfohash->{'installlogdir'} =~ s/\Q$oldvalue\E\s*$/$newvalue/; }
-        if (( $installer::globals::unpackpath =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $installer::globals::unpackpath =~ /\Q$srcpath\E/ ))) { $installer::globals::unpackpath =~ s/\Q$oldvalue\E\s*$/$newvalue/; }
-        if (( $installer::globals::idttemplatepath =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $installer::globals::idttemplatepath =~ /\Q$srcpath\E/ ))) { $installer::globals::idttemplatepath =~ s/\Q$oldvalue\E\s*$/$newvalue/; }
-        if (( $installer::globals::idtlanguagepath =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $installer::globals::idtlanguagepath =~ /\Q$srcpath\E/ ))) { $installer::globals::idtlanguagepath =~ s/\Q$oldvalue\E\s*$/$newvalue/; }
-        foreach my $path ( @{$followmeinfohash->{'includepatharray'}} )
-        {
-            if (( $path =~ /\Q$oldvalue\E\s*$/ ) && ( ! ( $path =~ /\Q$srcpath\E/ )))
-            {
-                $path =~ s/\Q$oldvalue\E\s*$/$newvalue/;
-                $path = $path . "\n";
-            }
-        }
-    }
-
-    # And now can follow the replacement for the source path "src". Subdirs like "bin" in the source tree
-    # must not get the minor. This is instead "src.m9/instsetoo_native/common.pro/bin/..."
-    # Directory "src" can never be the end of the path
-
-    my $newsrcpath = $installer::globals::separator . $sourcename . "\." . $installer::globals::lastminor . $installer::globals::separator;
-    
-    if ( $followmeinfohash->{'installlogdir'} =~ /\Q$srcpath\E/ ) { $followmeinfohash->{'installlogdir'} =~ s/\Q$srcpath\E/$newsrcpath/; }
-    if ( $installer::globals::unpackpath =~ /\Q$srcpath\E/ ) { $installer::globals::unpackpath =~ s/\Q$srcpath\E/$newsrcpath/; }
-    if ( $installer::globals::idttemplatepath =~ /\Q$srcpath\E/ ) { $installer::globals::idttemplatepath =~ s/\Q$srcpath\E/$newsrcpath/; }
-    if ( $installer::globals::idtlanguagepath =~ /\Q$srcpath\E/ ) { $installer::globals::idtlanguagepath =~ s/\Q$srcpath\E/$newsrcpath/; }
-    foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { if ( $path =~ /\Q$srcpath\E/ ) { $path =~ s/\Q$srcpath\E/$newsrcpath/; } }
-
-    $infoline = "\nNew pathes:\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$followmeinfohash->{'installlogdir'}: $followmeinfohash->{'installlogdir'}\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$installer::globals::unpackpath: $installer::globals::unpackpath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$installer::globals::idttemplatepath: $installer::globals::idttemplatepath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "\$installer::globals::idtlanguagepath: $installer::globals::idtlanguagepath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "Include pathes:\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { push( @installer::globals::logfileinfo, $path); }
-}
-
-#############################################
-# Setting the name of the log file
-#############################################
-
-sub setlogfilename
-{
-    if ( $installer::globals::dosign ) { $installer::globals::logfilename = "sign_and_download_" . $installer::globals::logfilename; }
-    else { $installer::globals::logfilename = "download_" . $installer::globals::logfilename; }
-    # reset the log file
-    @installer::globals::logfileinfo = ();
-}
-
-#########################################################
-# Checking, if this is a task in a cws or
-# on the master. Simple check of naming schema:
-# CWS: follow_me_DEV300_m40_de.log
-# Master: follow_me_4_DEV300_m40_en-US.log
-#########################################################
-
-sub check_cws_build
-{
-    my ( $filename ) = @_;
-    
-    my $iscws = 1;
-    
-    if ( $filename =~ /follow_me_\d+_/ ) { $iscws = 0; }
-    
-    return $iscws;
-}
-
-#########################################################
-# Reading a specific key from a follow-me file
-#########################################################
-
-sub get_property_from_file
-{
-    my ($followmefile, $key) = @_;
-    
-    my $value = "";
-    
-    my $filecontent = installer::files::read_file($followmefile);
-    
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( ${$filecontent}[$i] =~ /^\s*\Q$key\E\s*\:\s*(.*?)\s*$/ )
-        {
-            $value = $1;
-            last;
-        }
-    }
-    
-    return $value;
-}
-
-#########################################################
-# Publishing the content of the product list
-#########################################################
-
-sub publishproductlist
-{
-    my ($infofilelist) = @_;
-
-    installer::logger::print_message( "\n... found products: ...\n" );
-
-    for ( my $i = 0; $i <= $#{$infofilelist}; $i++ )
-    {
-        my $onefile = ${$infofilelist}[$i];
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$onefile);
-        installer::logger::print_message( "...... $onefile ...\n" );	
-    }
-
-    installer::logger::print_message( "\n" );
-}
-
-#########################################################
-# Filtering all files, that have correct minor
-# and work stamp.
-# Master: follow_me_4_DEV300_m40_en-US.log
-#########################################################
-
-sub filter_all_files_with_correct_settings
-{
-    my ($allfollowmefiles) = @_;
-
-    my @allfiles = ();
-    my @allfiles2 = ();
-    my $maxhash = ();
-    
-    my $minor = "";
-    my $workstamp = "";
-
-    if ( $ENV{'WORK_STAMP'} ) { $workstamp = $ENV{'WORK_STAMP'}; }
-
-    # This is broken, we don't want to support any UPDMINOR
-    # complexities in LibreOffice. (Or do we?) This needs updating if
-    # we want to actually use this file for signing.
-
-    if ( $ENV{'UPDMINOR'} ) { $minor = $ENV{'UPDMINOR'}; }
-
-    if ( $minor eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"UPDMINOR\" not set!", "filter_all_files_with_correct_settings"); }
-    if ( $workstamp eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"WORK_STAMP\" not set!", "filter_all_files_with_correct_settings"); }
-
-    foreach my $onefile ( @{$allfollowmefiles} )
-    {
-        if (( $onefile =~ /_\Q$minor\E_/i ) && ( $onefile =~ /_\Q$workstamp\E_/i ))
-        {
-            push(@allfiles, $onefile);
-            
-            # also collecting maximum hash
-            
-            if ( $onefile =~ /follow_me_(\d+)_\Q$workstamp\E_\Q$minor\E_([-\w]+)\.log\s*$/i )
-            {
-                my $sequence = $1;
-                my $lang = $2;
-                
-                if (( ! exists($maxhash{$lang})) || ( $maxhash{$lang} < $sequence )) { $maxhash{$lang} = $sequence; }
-            }
-        }
-    }
-
-    # second run, because of sequence numbers
-    
-    foreach my $onefile ( @allfiles )
-    {
-        if ( $onefile =~ /follow_me_(\d+)_\Q$workstamp\E_\Q$minor\E_([-\w]+)\.log\s*$/i )
-        {
-            my $sequence = $1;
-            my $lang = $2;
-            
-            if ( $sequence == $maxhash{$lang} ) { push(@allfiles2, $onefile); }			
-        }
-    }
-    
-    return ( \@allfiles2 );
-}
-
-#########################################################
-# Creating a list of products, that need to be signed
-# or for which download sets need to be created.
-#########################################################
-
-sub createproductlist
-{
-    # If "-d" specifies an installation set, there is only one product
-    
-    my @infofilelist = ();
-    my @infofilelist2 = ();
-    
-    if ( -f $installer::globals::followmeinfofilename )
-    {
-        push(@infofilelist, $installer::globals::followmeinfofilename);
-        # Saving info, that this is a file
-        $installer::globals::followme_from_directory = 0;
-    }
-    elsif ( -d $installer::globals::followmeinfofilename )
-    {
-        installer::logger::print_message( "\n... reading directory: $installer::globals::followmeinfofilename ...\n" );
-        $installer::globals::followmeinfofilename =~ s/$installer::globals::separator\s*$//;
-        my $allfollowmefiles = installer::systemactions::find_file_with_file_extension("log", $installer::globals::followmeinfofilename);
-
-        if ( ! ( $#{$allfollowmefiles} > -1 ))
-        {
-            installer::logger::print_error( "Error: Nothing to do! No follow-me file in directory \"$installer::globals::followmeinfofilename\"!.\n" );
-            usage();
-            exit(-1);				
-        }
-
-        # Saving info, that this is a directory
-        $installer::globals::followme_from_directory = 1;
-
-        # Collect all possible installation sets
-        # CWS: All installation sets
-        # Master: All installation sets with same major, minor and buildid. Additionally using the highest number.
-
-        my $iscws = check_cws_build(${$allfollowmefiles}[0]);
-
-        if ( $iscws )
-        {
-            # Simply read all follow-me files and check existence of installation sets
-            foreach my $onefile ( @{$allfollowmefiles} )
-            {
-                my $fullfilename = $installer::globals::followmeinfofilename . $installer::globals::separator . $onefile;
-                my $installdir = get_property_from_file($fullfilename, "finalinstalldir");
-                if (( $installdir ne "" ) && ( -d $installdir )) { push(@infofilelist2, $fullfilename); }
-            }
-        }
-        else
-        {
-            $allfollowmefiles = filter_all_files_with_correct_settings($allfollowmefiles);
-
-            foreach my $onefile ( @{$allfollowmefiles} )
-            {
-                my $fullfilename = $installer::globals::followmeinfofilename . $installer::globals::separator . $onefile;
-                # Check, if installation set still exists
-                my $installdir = get_property_from_file($fullfilename, "finalinstalldir");
-                if (( $installdir ne "" ) && ( -d $installdir )) { push(@infofilelist2, $fullfilename); }
-            }
-        }	
-        
-        # Removing all files, starting with "follow_me_success_" in their names. This have already been used successfully.
-        
-        foreach my $onefile ( @infofilelist2 )
-        {
-            if ( $onefile =~ /follow_me_success_/ ) { next; }	
-            push(@infofilelist, $onefile);
-        }		
-
-        # Checking, if there is content in the list
-        if ( ! ( $#infofilelist > -1 ))
-        {
-            installer::logger::print_error( "Error: Nothing to do! No installation set found for follow-me files in directory \"$installer::globals::followmeinfofilename\"!.\n" );
-            usage();
-            exit(-1);				
-        }
-    }
-    else
-    {
-        installer::logger::print_error( "Error: Nothing to do! \"$installer::globals::followmeinfofilename\" is no file and no directory (-d).\n" );
-        usage();
-        exit(-1);				
-    }
-    
-    return \@infofilelist;
-}
-
-#############################################
-# Logging the content of the download hash
-#############################################
-
-sub logfollowmeinfohash
-{
-    my ( $followmehash ) = @_;
-
-    print "\n*****************************************\n";
-    print "Content of follow-me info file:\n";
-    print "finalinstalldir: $followmehash->{'finalinstalldir'}\n";
-    print "downloadname: $followmehash->{'downloadname'}\n";
-    print "languagestring: $followmehash->{'languagestring'}\n";
-    foreach my $lang ( @{$followmehash->{'languagesarray'}} ) { print "languagesarray: $lang\n"; }
-    foreach my $path ( @{$followmehash->{'includepatharray'}} ) { print "includepatharray: $path"; }
-    foreach my $key ( sort keys %{$followmehash->{'allvariableshash'}} ) { print "allvariableshash: $key : $followmehash->{'allvariableshash'}->{$key}\n"; }
-}
-
-########################################################################
-# Renaming the follow me info file, if it was successfully used.
-# This can only be done, if the parameter "-d" was used with a 
-# directory, not a name. In this case the repeated use of parameter
-# "-d" with this directory has to ignore this already successfully 
-# used file. 
-########################################################################
-
-sub rename_followme_infofile
-{
-    my ( $filename ) = @_;
-    
-    my $newfilename = $filename;
-    $newfilename =~ s/follow_me_/follow_me_success_/;	# including "_success" after "follow_me"
-    
-    if ( $filename ne $newfilename )
-    {
-        my $returnvalue = rename($filename, $newfilename);
-        if ( $returnvalue ) { installer::logger::print_message( "\n... renamed file \"$filename\" to \"$newfilename\" ...\n" ); }
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
deleted file mode 100644
index d9ddc51a4..000000000
--- a/solenv/bin/modules/installer/environment.pm
+++ /dev/null
@@ -1,136 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::environment;
-
-use installer::exiter;
-use installer::globals;
-
-######################################################
-# Create path variables from environment variables
-######################################################
-
-sub create_pathvariables
-{
-    my ($environment) = @_;
-
-    my %variables = ();
-
-    # The following variables are needed in the path file list
-    # solarpath, solarenvpath, solarcommonpath, os, osdef, pmiscpath
-
-    my $solarpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . $installer::globals::compiler . $installer::globals::productextension;
-    $variables{'solarpath'} = $solarpath;
-
-    my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . "common" . $installer::globals::productextension;
-    $variables{'solarcommonpath'} = $solarcommonpath;	
-
-    my $osdef = lc($environment->{'GUI'});
-    $variables{'osdef'} = $osdef;	
-
-    $variables{'os'} = $installer::globals::compiler;
-
-    my $solarenvpath = "";
-
-    if ( $ENV{'SO_PACK'} ) { $solarenvpath  = $ENV{'SO_PACK'}; }
-    # overriding with STAR_INSTPATH, if set	
-    if ( $ENV{'STAR_INSTPATH'} ) { $solarenvpath = $ENV{'STAR_INSTPATH'}; }
-
-    $variables{'solarenvpath'} = $solarenvpath;	
-
-    my $localpath  = $environment->{'LOCAL_OUT'};
-    $variables{'localpath'} = $localpath;	
-
-    my $localcommonpath  = $environment->{'LOCAL_COMMON_OUT'};
-    $variables{'localcommonpath'} = $localcommonpath;	
-
-    my $platformname  = $environment->{'OUTPATH'};
-    $variables{'platformname'} = $platformname;	
-
-    return \%variables;
-}
-
-##################################################
-# Replacing tilde in pathes, because of
-# problem with deep recursion (task 104830)
-##################################################
-
-sub check_tilde_in_directory
-{
-    if ( $ENV{'HOME'} )
-    {
-        my $home = $ENV{'HOME'};
-        $home =~ s/\Q$installer::globals::separator\E\s*$//;
-        $installer::globals::localinstalldir =~ s/~/$home/;
-        my $infoline = "Info: Changing LOCALINSTALLDIR to $installer::globals::localinstalldir\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        # exit, because "~" is not allowed, if HOME is not set			
-        my $infoline = "ERROR: If \"~\" is used in \"LOCALINSTALLDIR\", environment variable \"HOME\" needs to be defined!\n";
-        push(@installer::globals::logfileinfo, $infoline);
-        installer::exiter::exit_program("ERROR: If \"~\" is used in \"LOCALINSTALLDIR\", environment variable \"HOME\" needs to be defined!", "check_tilde_in_directory");
-    }	
-}
-
-##################################################
-# Setting some fundamental global variables.
-# All these variables can be overwritten 
-# by parameters.
-##################################################
-
-sub set_global_environment_variables
-{
-    my ( $environment ) = @_;
-    
-    $installer::globals::build = $environment->{'WORK_STAMP'};
-    $installer::globals::compiler = $environment->{'OUTPATH'};
-
-    if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; }
-
-    if ( $ENV{'PROEXT'} ) { $installer::globals::pro = 1; }
-
-    if ( $ENV{'VERBOSE'} && ( (lc $ENV{'VERBOSE'}) eq "false" ) ) { $installer::globals::quiet = 1; }
-    if ( $ENV{'PREPARE_WINPATCH'} ) { $installer::globals::prepare_winpatch = 1; }
-    if ( $ENV{'PREVIOUS_IDT_DIR'} ) { $installer::globals::previous_idt_dir = $ENV{'PREVIOUS_IDT_DIR'}; }
-    if ( $ENV{'LOCALINSTALLDIR'} ) { $installer::globals::localinstalldir = $ENV{'LOCALINSTALLDIR'}; }
-    if ( $ENV{'LOCALUNPACKDIR'} ) { $installer::globals::localunpackdir = $ENV{'LOCALUNPACKDIR'}; }
-    if ( $ENV{'MAX_LANG_LENGTH'} ) { $installer::globals::max_lang_length = $ENV{'MAX_LANG_LENGTH'}; }
-
-    if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjavaset = 1; }
-    if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; }
-    if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; }
-    if ( $ENV{'IGNORE_ERROR_IN_LOGFILE'} ) { $installer::globals::ignore_error_in_logfile = 1; }
-    if (( $ENV{'DISABLE_STRIP'} ) && ( $ENV{'DISABLE_STRIP'} ne '' )) { $installer::globals::strip = 0; }
-    
-    if ( $installer::globals::localinstalldir ) { $installer::globals::localinstalldirset = 1; }
-    # Special handling, if LOCALINSTALLDIR contains "~" in the path
-    if ( $installer::globals::localinstalldir =~ /^\s*\~/ ) { check_tilde_in_directory(); }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
deleted file mode 100644
index 3aeb4d8db..000000000
--- a/solenv/bin/modules/installer/epmfile.pm
+++ /dev/null
@@ -1,3359 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::epmfile;
-
-use Cwd;
-use installer::converter;
-use installer::existence;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::packagelist;
-use installer::pathanalyzer;
-use installer::remover;
-use installer::scriptitems;
-use installer::systemactions;
-use installer::worker;
-use POSIX;
-
-############################################################################
-# Reading the package map to find Solaris package names for 
-# the corresponding abbreviations
-############################################################################
-
-sub read_packagemap
-{
-    my ($allvariables, $includepatharrayref, $languagesarrayref) = @_;
-    
-    my $packagemapname = "";
-    if ( $allvariables->{'PACKAGEMAP'} ) { $packagemapname = $allvariables->{'PACKAGEMAP'}; }
-    if ( $packagemapname eq "" ) { installer::exiter::exit_program("ERROR: Property PACKAGEMAP must be defined!", "read_packagemap"); }
-    
-    my $infoline = "\n\nCollected abbreviations and package names:\n";
-    push(@installer::globals::logfileinfo, $infoline);
-
-    # Can be a comma separated list. All files have to be found in include pathes
-    my $allpackagemapnames = installer::converter::convert_stringlist_into_hash(\$packagemapname, ",");
-    foreach my $onepackagemapname ( keys %{$allpackagemapnames} )
-    {
-        my $packagemapref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$onepackagemapname, $includepatharrayref, 0);
-
-        if ( $$packagemapref eq "" ) { installer::exiter::exit_program("ERROR: Could not find package map file \"$onepackagemapname\" (propery PACKAGEMAP)!", "read_packagemap"); }
-
-        my $packagemapcontent = installer::files::read_file($$packagemapref);
-
-        for ( my $i = 0; $i <= $#{$packagemapcontent}; $i++ )
-        {
-            my $line = ${$packagemapcontent}[$i];
-            
-            if ( $line =~ /^\s*\#/ ) { next; }  # comment line
-            if ( $line =~ /^\s*$/ ) { next; }  # empty line
-        
-            if ( $line =~ /^\s*(.*?)\t(.*?)\s*$/ )
-            {
-                my $abbreviation = $1;
-                my $packagename = $2;
-                installer::packagelist::resolve_packagevariables(\$abbreviation, $allvariables, 0);
-                installer::packagelist::resolve_packagevariables(\$packagename, $allvariables, 0);
-                
-                # Special handling for language strings %LANGUAGESTRING
-
-                if (( $abbreviation =~ /\%LANGUAGESTRING/ ) || ( $packagename =~ /\%LANGUAGESTRING/ ))
-                {
-                    foreach my $onelang ( @{$languagesarrayref} )
-                    {
-                        my $local_abbreviation = $abbreviation;
-                        my $local_packagename = $packagename;
-                        $local_abbreviation =~ s/\%LANGUAGESTRING/$onelang/g;
-                        $local_packagename =~ s/\%LANGUAGESTRING/$onelang/g;
-
-                        # Logging all abbreviations and packagenames
-                        $infoline = "$onelang : $local_abbreviation : $local_packagename\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-
-                        if ( exists($installer::globals::dependfilenames{$local_abbreviation}) )
-                        {
-                            installer::exiter::exit_program("ERROR: Packagename for  Solaris package $local_abbreviation already defined ($installer::globals::dependfilenames{$local_abbreviation})!", "read_packagemap");
-                        }
-                        else
-                        {
-                            $installer::globals::dependfilenames{$local_abbreviation} = $local_packagename;
-                        }
-                    }
-                }
-                else
-                {
-                    # Logging all abbreviations and packagenames
-                    $infoline = "$abbreviation : $packagename\n";
-                    push(@installer::globals::logfileinfo, $infoline);
-
-                    if ( exists($installer::globals::dependfilenames{$abbreviation}) )
-                    {
-                        installer::exiter::exit_program("ERROR: Packagename for  Solaris package $abbreviation already defined ($installer::globals::dependfilenames{$abbreviation})!", "read_packagemap");
-                    }
-                    else
-                    {
-                        $installer::globals::dependfilenames{$abbreviation} = $packagename;
-                    }
-                }
-            }
-            else
-            {
-                my $errorline = $i + 1;
-                installer::exiter::exit_program("ERROR: Wrong syntax in file \"$onepackagemapname\" (line $errorline)!", "read_packagemap");
-            }
-        }
-    }
-    
-    $infoline = "\n\n";
-    push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-############################################################################
-# The header file contains the strings for the epm header in all languages
-############################################################################
-
-sub get_string_from_headerfile
-{
-    my ($searchstring, $language, $fileref) = @_;
-    
-    my $returnstring  = "";
-    my $onestring  = "";
-    my $englishstring  = "";
-    my $foundblock = 0;
-    my $foundstring = 0;
-    my $foundenglishstring = 0;
-    my $englishidentifier = "01";
-    
-    $searchstring = "[" . $searchstring . "]";
-    
-    for ( my $i = 0; $i <= $#{$fileref}; $i++ )
-    {
-        my $line = ${$fileref}[$i];
-        
-        if ( $line =~ /^\s*\Q$searchstring\E\s*$/ )
-        {
-            $foundblock = 1;
-            my $counter = $i + 1;
-            
-            $line = ${$fileref}[$counter];
-
-            # Beginning of the next block oder Dateiende
-
-            while ((!($line =~ /^\s*\[\s*\w+\s*\]\s*$/ )) && ( $counter <= $#{$fileref} ))
-            {
-                if ( $line =~ /^\s*\Q$language\E\s+\=\s*\"(.*)\"\s*$/ )
-                {
-                    $onestring = $1;
-                    $foundstring = 1;
-                    last;					
-                }
-
-                if ( $line =~ /^\s*\Q$englishidentifier\E\s+\=\s*\"(.*)\"\s*$/ )
-                {
-                    $englishstring = $1;
-                    $foundenglishstring = 1;					
-                }
-                
-                $counter++;
-                $line = ${$fileref}[$counter];
-            }
-        }
-    }	
-    
-    if ( $foundstring )
-    {
-        $returnstring = $onestring;
-    }
-    else
-    {
-        if ( $foundenglishstring )
-        {
-            $returnstring = $englishstring;
-        }
-        else
-        {
-            installer::exiter::exit_program("ERROR: No string found for $searchstring in epm header file (-h)", "get_string_from_headerfile");
-        }
-    }
-    
-    return \$returnstring;
-}
-
-##########################################################
-# Filling the epm file with directories, files and links
-##########################################################
-
-sub put_directories_into_epmfile
-{
-    my ($directoriesarrayref, $epmfileref, $allvariables, $packagerootpath) = @_;
-    my $group = "bin";
-    
-    if ( $installer::globals::islinuxbuild )
-    {
-        $group = "root";
-    }
-    
-    for ( my $i = 0; $i <= $#{$directoriesarrayref}; $i++ )
-    {
-        my $onedir = ${$directoriesarrayref}[$i];
-        my $dir = "";
-
-        if ( $onedir->{'Dir'} ) { $dir = $onedir->{'Dir'}; }
-        
-        if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ ))
-        {
-            my $hostname = $onedir->{'HostName'};
-            
-            my $line = "d 755 root $group $hostname -\n";
-            
-            push(@{$epmfileref}, $line)  
-        } 
-    }
-}
-
-sub put_files_into_epmfile
-{
-    my ($filesinproductarrayref, $epmfileref) = @_;
-
-    for ( my $i = 0; $i <= $#{$filesinproductarrayref}; $i++ )
-    {
-        my $onefile = ${$filesinproductarrayref}[$i];
-        
-        my $unixrights = $onefile->{'UnixRights'};
-        my $destination = $onefile->{'destination'};
-        my $sourcepath = $onefile->{'sourcepath'};
-
-        my $filetype = "f";
-        my $styles = "";
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-        if ( $styles =~ /\bCONFIGFILE\b/ ) { $filetype = "c"; }
-
-        my $group = "bin";
-        if ( $installer::globals::islinuxbuild ) { $group = "root"; }
-        if (( $installer::globals::issolarisbuild ) && ( $onefile->{'SolarisGroup'} )) { $group = $onefile->{'SolarisGroup'}; }
-
-        my $line = "$filetype $unixrights root $group $destination $sourcepath\n";
-            
-        push(@{$epmfileref}, $line);
-    }
-}
-
-sub put_links_into_epmfile
-{
-    my ($linksinproductarrayref, $epmfileref) = @_;
-    my $group = "bin";
-    
-    if ( $installer::globals::islinuxbuild )
-    {
-        $group = "root";
-    }
-    
-    
-    for ( my $i = 0; $i <= $#{$linksinproductarrayref}; $i++ )
-    {
-        my $onelink = ${$linksinproductarrayref}[$i];
-        my $destination = $onelink->{'destination'};
-        my $destinationfile = $onelink->{'destinationfile'};
-                        
-        my $line = "l 000 root $group $destination $destinationfile\n";
-            
-        push(@{$epmfileref}, $line)  
-    }
-}
-
-sub put_unixlinks_into_epmfile
-{
-    my ($unixlinksinproductarrayref, $epmfileref) = @_;
-    my $group = "bin";
-    
-    if ( $installer::globals::islinuxbuild ) { $group = "root";	}
-
-    for ( my $i = 0; $i <= $#{$unixlinksinproductarrayref}; $i++ )
-    {
-        my $onelink = ${$unixlinksinproductarrayref}[$i];
-        my $destination = $onelink->{'destination'};
-        my $target = $onelink->{'Target'};
-                        
-        my $line = "l 000 root $group $destination $target\n";
-            
-        push(@{$epmfileref}, $line)  
-    }
-}
-
-###############################################
-# Creating epm header file
-###############################################
-
-sub create_epm_header
-{
-    my ($variableshashref, $filesinproduct, $languagesref, $onepackage) = @_;  
-
-    my @epmheader = ();
-    
-    my ($licensefilename, $readmefilename, $readmefilenameen);
-    
-    my $foundlicensefile = 0;
-    my $foundreadmefile = 0;
-
-    my $line = "";
-    my $infoline = "";
-        
-    # %product LibreOffice Software
-    # %version 2.0
-    # %description A really great software
-    # %copyright 1999-2003 by OOo
-    # %vendor LibreOffice
-    # %license /test/replace/01/LICENSE01
-    # %readme /test/replace/01/README01
-    # %requires foo
-    # %provides bar
-
-    # The first language in the languages array determines the language of license and readme file
-    
-    my $searchlanguage = ${$languagesref}[0];
-
-    # using the description for the %product line in the epm list file
-    
-    my $productnamestring = $onepackage->{'description'};
-    installer::packagelist::resolve_packagevariables(\$productnamestring, $variableshashref, 0);
-    if ( $variableshashref->{'PRODUCTEXTENSION'} ) { $productnamestring = $productnamestring . " " . $variableshashref->{'PRODUCTEXTENSION'}; }
-    
-    $line = "%product" . " " . $productnamestring . "\n";
-    push(@epmheader, $line);
-
-    # Determining the release version 
-    # This release version has to be listed in the line %version : %version versionnumber releasenumber
-    
-    if ( ! $onepackage->{'packageversion'} ) { installer::exiter::exit_program("ERROR: No packageversion defined for package: $onepackage->{'module'}!", "create_epm_header"); }
-    $installer::globals::packageversion = $onepackage->{'packageversion'};
-    installer::packagelist::resolve_packagevariables(\$installer::globals::packageversion, $variableshashref, 0);
-    if ( $variableshashref->{'PACKAGEREVISION'} ) { $installer::globals::packagerevision = $variableshashref->{'PACKAGEREVISION'}; }
-
-    $line = "%version" . " " . $installer::globals::packageversion . "\n";
-    push(@epmheader, $line);
-
-    $line = "%release" . " " . $installer::globals::packagerevision . "\n";
-    if ( $installer::globals::isrpmbuild ) { $line = "%release" . " " . $installer::globals::buildid . "\n"; }
-    push(@epmheader, $line);
-    
-    # Description, Copyright and Vendor are multilingual and are defined in
-    # the string file for the header file ($headerfileref)
-
-    my $descriptionstring = $onepackage->{'description'};
-    installer::packagelist::resolve_packagevariables(\$descriptionstring, $variableshashref, 0);
-    $line = "%description" . " " . $descriptionstring . "\n";
-    push(@epmheader, $line);
-
-    my $copyrightstring = $onepackage->{'copyright'};
-    installer::packagelist::resolve_packagevariables(\$copyrightstring, $variableshashref, 0);
-    $line = "%copyright" . " " . $copyrightstring . "\n";
-    push(@epmheader, $line);
-
-    my $vendorstring = $onepackage->{'vendor'};
-    installer::packagelist::resolve_packagevariables(\$vendorstring, $variableshashref, 0);
-    $line = "%vendor" . " " . $vendorstring . "\n";
-    push(@epmheader, $line);
-
-    # License and Readme file can be included automatically from the file list
-    
-    if ( $installer::globals::iswindowsbuild )
-    {
-        $licensefilename = "license.txt";
-        $readmefilename = "readme.txt";
-        $readmefilenameen = "readme_en-US.txt";
-    }
-    else
-    {
-        $licensefilename = "LICENSE";	
-        $readmefilename = "README";
-        $readmefilenameen = "README_en-US";
-    }
-    
-    if (( $installer::globals::languagepack )	# in language packs and help packs the files LICENSE and README are removed, because they are not language specific
-        || ( $installer::globals::helppack )
-        || ( $variableshashref->{'NO_README_IN_ROOTDIR'} ))
-    {
-        if ( $installer::globals::iswindowsbuild )
-        {
-            $licensefilename = "license.txt"; # _$searchlanguage.txt";
-            $readmefilename = "readme_$searchlanguage.txt";
-        }
-        else
-        {
-            $licensefilename = "LICENSE"; # _$searchlanguage";
-            $readmefilename = "README_$searchlanguage";
-        }
-    }
-
-    my $license_in_package_defined = 0;
-    
-    if ( $installer::globals::issolarisbuild )
-    {
-        if ( $onepackage->{'solariscopyright'} )
-        {
-            $licensefilename = $onepackage->{'solariscopyright'};
-            $license_in_package_defined = 1;
-        }
-    }
-    
-    # Process for Linux packages, in which only a very basic license file is
-    # included into the package.
-
-    if ( $installer::globals::islinuxbuild )
-    {
-        if ( $variableshashref->{'COPYRIGHT_INTO_LINUXPACKAGE'} )
-        {
-            $licensefilename = "linuxcopyrightfile";
-            $license_in_package_defined = 1;
-        }
-    }	
-
-    # searching for and readme file;
-    # URE uses special README; others use README_en-US
-    # it does not matter which one is passed for epm if both are packaged
-    foreach my $possiblereadmefilename ($readmefilenameen, $readmefilename)
-    {
-        last if ($foundreadmefile);
-        for ( my $i = 0; $i <= $#{$filesinproduct}; $i++ )
-        {
-            my $onefile = ${$filesinproduct}[$i];
-            my $filename = $onefile->{'Name'};
-            if ( $filename eq $possiblereadmefilename )
-            {
-                $foundreadmefile = 1;
-                $line = "%readme" . " " . $onefile->{'sourcepath'} . "\n";
-                push(@epmheader, $line);
-                last;
-            }
-        }
-    }
-
-    # the readme file need not be packaged more times in the help content
-    # it needs to be installed in parallel with the main package anyway
-    # try to find the README file between all available files (not only between the packaged)
-    if (!($foundreadmefile) && $installer::globals::helppack)
-    {
-        my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$readmefilenameen, "" , 0);
-        if($$fileref ne "" )
-        {
-            $infoline = "Fallback to readme file: \"$$fileref\"!\n";
-            push(@installer::globals::logfileinfo, $infoline);
-
-            $foundreadmefile = 1;
-            $line = "%readme" . " " . $$fileref . "\n";
-            push(@epmheader, $line);
-        }
-    }
-
-    # searching for and license file
-
-    if ( $license_in_package_defined )
-    {
-        my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, "" , 0);
-
-        if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find license file $licensefilename (A)!", "create_epm_header"); }
-
-        # Special handling to add the content of the file "license_en-US" to the solaris copyrightfile. But not for all products
-        
-        if (( $installer::globals::issolarispkgbuild ) && ( ! $variableshashref->{'NO_LICENSE_INTO_COPYRIGHT'} ))
-        {
-            if ( ! $installer::globals::englishlicenseset ) { installer::worker::set_english_license() }
-
-            # The location for the new file
-            my $languagestring = "";
-            for ( my $i = 0; $i <= $#{$languagesref}; $i++ ) { $languagestring = $languagestring . "_" . ${$languagesref}[$i]; }
-            $languagestring =~ s/^\s*_//;
-            
-            my $copyrightdir = installer::systemactions::create_directories("copyright", \$languagestring);
-            
-            my $copyrightfile = installer::files::read_file($$fileref);
-
-            # Adding license content to copyright file
-            push(@{$copyrightfile}, "\n");
-            for ( my $i = 0; $i <= $#{$installer::globals::englishlicense}; $i++ ) { push(@{$copyrightfile}, ${$installer::globals::englishlicense}[$i]); }
-
-            # New destination for $$fileref
-            $$fileref = $copyrightdir . $installer::globals::separator . "solariscopyrightfile_" . $onepackage->{'module'};
-            if ( -f $$fileref ) { unlink $$fileref; }
-            installer::files::save_file($$fileref, $copyrightfile);
-        }
-
-        $infoline = "Using license file: \"$$fileref\"!\n";
-        push(@installer::globals::logfileinfo, $infoline);
-
-        $foundlicensefile = 1;
-        $line = "%license" . " " . $$fileref . "\n";
-        push(@epmheader, $line);
-    }
-    else
-    {
-        for ( my $i = 0; $i <= $#{$filesinproduct}; $i++ )
-        {
-            my $onefile = ${$filesinproduct}[$i];
-            my $filename = $onefile->{'Name'};
-        
-            if ( $filename eq $licensefilename )
-            {
-                $foundlicensefile = 1;
-                $line = "%license" . " " . $onefile->{'sourcepath'} . "\n";
-                push(@epmheader, $line);
-                last;
-            }
-        }
-
-        # the license file need not be packaged more times in the langpacks
-        # they need to be installed in parallel with the main package anyway
-        # try to find the LICENSE file between all available files (not only between the packaged)
-        if (!($foundlicensefile) && ($installer::globals::languagepack || $installer::globals::helppack))
-        {
-            my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, "" , 0);
-            if($$fileref ne "" )
-            {
-                $infoline = "Fallback to license file: \"$$fileref\"!\n";
-                push(@installer::globals::logfileinfo, $infoline);
-
-                $foundlicensefile = 1;
-                $line = "%license" . " " . $$fileref . "\n";
-                push(@epmheader, $line);
-            }
-        }
-    }
-
-    if (!($foundlicensefile))
-    {
-        installer::exiter::exit_program("ERROR: Could not find license file $licensefilename (B)", "create_epm_header");
-    }
-
-    if (!($foundreadmefile))
-    {
-        installer::exiter::exit_program("ERROR: Could not find readme file $readmefilename (C)", "create_epm_header");
-    }
-
-    # including %replaces
-
-    my $replaces = "";
-
-    if (( $installer::globals::issolarispkgbuild ) && ( ! $installer::globals::patch ))
-    {
-        $replaces = "solarisreplaces";	 # the name in the packagelist	
-    }
-    elsif (( $installer::globals::islinuxbuild ) && ( ! $installer::globals::patch ))
-    {
-        $replaces = "linuxreplaces";	# the name in the packagelist	
-    }
-    
-    if (( $replaces ) && ( ! $installer::globals::patch ))
-    {
-        if ( $onepackage->{$replaces} )
-        {
-            my $replacesstring = $onepackage->{$replaces};
-
-            my $allreplaces = installer::converter::convert_stringlist_into_array(\$replacesstring, ",");
-
-            for ( my $i = 0; $i <= $#{$allreplaces}; $i++ )
-            {
-                my $onereplaces = ${$allreplaces}[$i];
-                $onereplaces =~ s/\s*$//;
-                installer::packagelist::resolve_packagevariables(\$onereplaces, $variableshashref, 1);
-                if ( $installer::globals::linuxlinkrpmprocess ) { $onereplaces = $onereplaces . "u"; }
-                $line = "%replaces" . " " . $onereplaces . "\n";
-                push(@epmheader, $line);
-
-                # Force the openofficeorg packages to get removed,
-                # see http://www.debian.org/doc/debian-policy/ch-relationships.html
-                # 7.5.2 Replacing whole packages, forcing their removal
-
-                if ( $installer::globals::debian )
-                {
-                    $line = "%incompat" . " " . $onereplaces . "\n";
-                    push(@epmheader, $line);
-                }
-            }
-
-            if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'libreoffice' )
-            {
-                $line = "%provides" . " libreoffice-unbundled\n";
-                push(@epmheader, $line);
-                $line = "%incompat" . " libreoffice-bundled\n";
-                push(@epmheader, $line);
-            }
-        }
-    }
-    
-    # including the directives for %requires and %provides
-    
-    my $provides = "";
-    my $requires = "";
-
-    if ( $installer::globals::issolarispkgbuild )
-    {
-        $provides = "solarisprovides";	 # the name in the packagelist	
-        $requires = "solarisrequires";	 # the name in the packagelist	
-    }
-    elsif ( $installer::globals::isfreebsdpkgbuild )
-    {
-        $provides = "freebsdprovides";	 # the name in the packagelist	
-        $requires = "freebsdrequires";	 # the name in the packagelist	
-    }
-    elsif (( $installer::globals::isrpmbuild ) &&
-            ( $installer::globals::patch ) &&
-            ( exists($onepackage->{'linuxpatchrequires'}) )) 
-    {
-        $provides = "provides";	 # the name in the packagelist	
-        $requires = "linuxpatchrequires";	 # the name in the packagelist	
-    }
-    else
-    {
-        $provides = "provides";	 		# the name in the packagelist	
-        $requires = "requires";	 		# the name in the packagelist	
-    }
-
-        my $isdict = 0;
-        if ( $onepackage->{'packagename'} =~ /-dict-/ ) { $isdict = 1;  }
-
-    if ( $onepackage->{$provides} )
-    {
-        my $providesstring = $onepackage->{$provides};
-
-        my $allprovides = installer::converter::convert_stringlist_into_array(\$providesstring, ",");
-
-        for ( my $i = 0; $i <= $#{$allprovides}; $i++ )
-        {
-            my $oneprovides = ${$allprovides}[$i];
-            $oneprovides =~ s/\s*$//;
-            installer::packagelist::resolve_packagevariables(\$oneprovides, $variableshashref, 1);
-            if ( $installer::globals::linuxlinkrpmprocess ) { $oneprovides = $oneprovides . "u"; }
-            $line = "%provides" . " " . $oneprovides . "\n";
-            push(@epmheader, $line);
-        }
-    }
-
-    if ( $onepackage->{$requires} )
-    {
-        my $requiresstring = $onepackage->{$requires};
-
-        if ( $installer::globals::add_required_package ) { $requiresstring = $requiresstring . "," . $installer::globals::add_required_package; }
-        
-        # The requires string can contain the separator "," in the names (descriptions) of the packages
-        # (that are required for Solaris depend files). Therefore "," inside such a description has to
-        # masked with a backslash.
-        # This masked separator need to be found and replaced, before the stringlist is converted into an array.
-        # This replacement has to be turned back after the array is created.
-        
-        my $replacementstring = "COMMAREPLACEMENT";
-        $requiresstring = installer::converter::replace_masked_separator($requiresstring, ",", "$replacementstring");
-        
-        my $allrequires = installer::converter::convert_stringlist_into_array(\$requiresstring, ",");
-
-        installer::converter::resolve_masked_separator($allrequires, ",", $replacementstring);
-        
-        for ( my $i = 0; $i <= $#{$allrequires}; $i++ )
-        {
-            my $onerequires = ${$allrequires}[$i];
-            $onerequires =~ s/\s*$//;
-            installer::packagelist::resolve_packagevariables2(\$onerequires, $variableshashref, 0, $isdict);
-            
-            $line = "%requires" . " " . $onerequires . "\n";
-            push(@epmheader, $line);
-        }
-    }
-    else
-    {
-        if ( $installer::globals::add_required_package )
-        {
-            my $requiresstring = $installer::globals::add_required_package;
-
-            my $replacementstring = "COMMAREPLACEMENT";
-            $requiresstring = installer::converter::replace_masked_separator($requiresstring, ",", "$replacementstring");
-            my $allrequires = installer::converter::convert_stringlist_into_array(\$requiresstring, ",");
-            installer::converter::resolve_masked_separator($allrequires, ",", $replacementstring);
-        
-            for ( my $i = 0; $i <= $#{$allrequires}; $i++ )
-            {
-                my $onerequires = ${$allrequires}[$i];
-                $onerequires =~ s/\s*$//;
-                installer::packagelist::resolve_packagevariables(\$onerequires, $variableshashref, 0);
-
-                $line = "%requires" . " " . $onerequires . "\n";
-                push(@epmheader, $line);
-            }
-        }
-    }
-
-    return \@epmheader;
-}
-
-#######################################
-# Adding header to epm file
-#######################################
-
-sub adding_header_to_epm_file
-{
-    my ($epmfileref, $epmheaderref) = @_;
-    
-    for ( my $i = 0; $i <= $#{$epmheaderref}; $i++ )
-    {
-        push( @{$epmfileref}, ${$epmheaderref}[$i] );	
-    }
-
-    push( @{$epmfileref}, "\n\n" );	
-}
-
-#####################################################
-# Replace one in shell scripts ( ${VARIABLENAME} )
-#####################################################
-
-sub replace_variable_in_shellscripts
-{
-    my ($scriptref, $variable, $searchstring) = @_;
-    
-    for ( my $i = 0; $i <= $#{$scriptref}; $i++ )
-    {
-        ${$scriptref}[$i] =~ s/\$\{$searchstring\}/$variable/g;
-    }
-}
-
-###################################################
-# Replace one in shell scripts ( %VARIABLENAME )
-###################################################
-
-sub replace_percent_variable_in_shellscripts
-{
-    my ($scriptref, $variable, $searchstring) = @_;
-    
-    for ( my $i = 0; $i <= $#{$scriptref}; $i++ )
-    {
-        ${$scriptref}[$i] =~ s/\%$searchstring/$variable/g;
-    }
-}
-
-################################################
-# Replacing many variables in shell scripts
-################################################
-
-sub replace_many_variables_in_shellscripts
-{
-    my ($scriptref, $variableshashref) = @_;
-
-    my $key;
-
-    foreach $key (keys %{$variableshashref})
-    {
-        my $value = $variableshashref->{$key};
-        replace_variable_in_shellscripts($scriptref, $value, $key);
-    }
-}
-
-#######################################
-# Adding shell scripts to epm file
-#######################################
-
-sub adding_shellscripts_to_epm_file
-{
-    my ($epmfileref, $shellscriptsfilename, $localrootpath, $allvariableshashref, $filesinpackage) = @_;
-
-    push( @{$epmfileref}, "\n\n" );	
-
-    my $shellscriptsfileref = installer::files::read_file($shellscriptsfilename);
-    
-    replace_variable_in_shellscripts($shellscriptsfileref, $localrootpath, "rootpath");
-
-    replace_many_variables_in_shellscripts($shellscriptsfileref, $allvariableshashref);
-
-    for ( my $i = 0; $i <= $#{$shellscriptsfileref}; $i++ )
-    {
-        push( @{$epmfileref}, ${$shellscriptsfileref}[$i] );	
-    }
-
-    push( @{$epmfileref}, "\n" );	
-}
-
-#################################################
-# Determining the epm on the system
-#################################################
-
-sub find_epm_on_system
-{
-    my ($includepatharrayref) = @_;
-
-    installer::logger::include_header_into_logfile("Check epm on system");
-
-    my $epmname = "epm";
-
-    # epm should be defined through the configure script but we need to
-    # check for it to be defined because of the Sun environment.
-    # Check the environment variable first and if it is not defined,
-    # or if it is but the location is not executable, search further.
-    # It has to be found in the solver or it has to be in the path 
-    # (saved in $installer::globals::epm_in_path) or we get the specified 
-    # one through the environment (i.e. when --with-epm=... is specified)
-
-    if ($ENV{'EPM'})
-    {
-        if (($ENV{'EPM'} ne "") && (-x "$ENV{'EPM'}"))
-        {
-            $epmname = $ENV{'EPM'};
-        }
-        elsif ( ($ENV{'EPM'} eq "no") || ($ENV{'EPM'} eq "internal") )
-        {
-            $epmname = "epm";		
-            my $epmref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$epmname, $includepatharrayref, 0);
-            if ($$epmref eq "") { installer::exiter::exit_program("ERROR: Could not find program $epmname (EPM set to \"internal\" or \"no\")!", "find_epm_on_system"); }
-            $epmname = $$epmref;
-        }
-        else
-        {
-            installer::exiter::exit_program("Environment variable EPM set (\"$ENV{'EPM'}\"), but file does not exist or is not executable!", "find_epm_on_system");
-        }
-    }
-    else
-    {
-        my $epmfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$epmname, $includepatharrayref, 0);
-
-        if (($$epmfileref eq "") && (!($installer::globals::epm_in_path))) { installer::exiter::exit_program("ERROR: Could not find program $epmname!", "find_epm_on_system"); }
-        if (($$epmfileref eq "") && ($installer::globals::epm_in_path)) { $epmname = $installer::globals::epm_path; }
-        if (!($$epmfileref eq "")) { $epmname = $$epmfileref; }
-    }
-
-    my $infoline = "Using epmfile: $epmname\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    
-    return $epmname;	
-}
-
-#################################################
-# Determining the epm patch state
-# saved in $installer::globals::is_special_epm
-#################################################
-
-sub set_patch_state
-{
-    my ($epmexecutable) = @_;
-
-    my $infoline = "";
-    
-    my $systemcall = "$epmexecutable |";
-    open (EPMPATCH, "$systemcall");
-    
-    while (<EPMPATCH>)
-    {
-        chop;
-        if ( $_ =~ /Patched for OpenOffice.org/ ) { $installer::globals::is_special_epm = 1; }
-    }
-            
-    close (EPMPATCH);
-
-    if ( $installer::globals::is_special_epm )
-    {
-        $infoline = "\nPatch state: This is a patched version of epm!\n\n";
-        push( @installer::globals::logfileinfo, $infoline);		
-    }
-    else	
-    {
-        $infoline = "\nPatch state: This is an unpatched version of epm!\n\n";
-        push( @installer::globals::logfileinfo, $infoline);		
-    }
-
-    if ( ( $installer::globals::is_special_epm ) && (($installer::globals::isrpmbuild) || ($installer::globals::issolarispkgbuild)) )
-    {
-        # Special postprocess handling only for Linux RPM and Solaris packages
-        $installer::globals::postprocess_specialepm = 1;
-        $installer::globals::postprocess_standardepm = 0;		
-    }
-    else
-    {
-        $installer::globals::postprocess_specialepm = 0;
-        $installer::globals::postprocess_standardepm = 1;
-    }
-}
-
-#################################################
-# LD_PRELOAD string for Debian packages
-#################################################
-
-sub get_ld_preload_string
-{
-    my ($includepatharrayref) = @_;
-
-    my $getuidlibraryname = "getuid.so";
-
-    my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0);
-    if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "get_ld_preload_string"); }
-
-    my $ldpreloadstring = "LD_PRELOAD=" . $$getuidlibraryref;
-    
-    return $ldpreloadstring;
-}
-
-#################################################
-# Calling epm to create the installation sets
-#################################################
-
-sub call_epm
-{
-    my ($epmname, $epmlistfilename, $packagename, $includepatharrayref) = @_;
-    
-    installer::logger::include_header_into_logfile("epm call for $packagename");
-
-    my $packageformat = $installer::globals::packageformat;
-    
-    my $localpackagename = $packagename;
-    # Debian allows only lowercase letters in package name
-    if ( $installer::globals::debian ) { $localpackagename = lc($localpackagename); } 
-    
-    my $outdirstring = "";
-    if ( $installer::globals::epmoutpath ne "" ) { $outdirstring = " --output-dir $installer::globals::epmoutpath"; }
-    
-    # Debian package build needs a LD_PRELOAD for correct rights
-    
-    my $ldpreloadstring = "";
-    
-    if ( $installer::globals::debian ) { $ldpreloadstring = get_ld_preload_string($includepatharrayref) . " "; }
-
-    my $extraflags = "";
-        if ($ENV{'EPM_FLAGS'}) { $extraflags = $ENV{'EPM_FLAGS'}; }
-    
-    my $systemcall = $ldpreloadstring . $epmname . " -f " . $packageformat . " " . $extraflags . " " . $localpackagename . " " . $epmlistfilename . $outdirstring . " -v " . " 2\>\&1 |";
-
-    installer::logger::print_message( "... $systemcall ...\n" );
-
-    my $maxepmcalls = 3;
-
-    for ( my $i = 1; $i <= $maxepmcalls; $i++ )
-    {
-        my @epmoutput = ();
-
-        open (EPM, "$systemcall");
-        while (<EPM>) {push(@epmoutput, $_); }
-        close (EPM);
-
-        my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-        my $infoline = "Systemcall  (Try $i): $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        for ( my $j = 0; $j <= $#epmoutput; $j++ )
-        {
-            if ( $i < $maxepmcalls ) { $epmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig; }
-            push( @installer::globals::logfileinfo, "$epmoutput[$j]");
-        }
-    
-        if ($returnvalue)
-        {
-            $infoline = "Try $i : Could not execute \"$systemcall\"!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            if ( $i == $maxepmcalls ) { installer::exiter::exit_program("ERROR: \"$systemcall\"!", "call_epm"); }
-        }
-        else
-        {
-            installer::logger::print_message( "Success (Try $i): \"$systemcall\"\n" );
-            $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            last;
-        }	
-    }
-}
-
-#####################################################################
-# Adding the new line for relocatables into pkginfo file (Solaris)
-# or spec file (Linux) created by epm
-#####################################################################
-
-sub add_one_line_into_file
-{
-    my ($file, $insertline, $filename) = @_;
-    
-    if ( $installer::globals::issolarispkgbuild )
-    {
-        push(@{$file}, $insertline);		# simply adding at the end of pkginfo file
-    }	
-
-    if ( $installer::globals::isrpmbuild )
-    {
-        # Adding behind the line beginning with: Group:
-        
-        my $inserted_line = 0;
-        
-        for ( my $i = 0; $i <= $#{$file}; $i++ )
-        {
-            if ( ${$file}[$i] =~ /^\s*Group\:\s*/ )
-            {
-                splice(@{$file},$i+1,0,$insertline);
-                $inserted_line = 1;
-                last;
-            }	
-        }
-        
-        if (! $inserted_line) { installer::exiter::exit_program("ERROR: Did not find string \"Group:\" in file: $filename", "add_one_line_into_file"); }
-    }
-
-    $insertline =~ s/\s*$//;	# removing line end for correct logging
-    my $infoline = "Success: Added line $insertline into file $filename!\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-#####################################################################
-# Setting the revision VERSION=1.9,REV=66  .
-# Also adding the new line: "AutoReqProv: no"
-#####################################################################
-
-sub set_revision_in_pkginfo
-{
-    my ($file, $filename, $variables, $packagename) = @_;
-
-    my $revisionstring = "\,REV\=" . $installer::globals::packagerevision;
-    
-    # Adding also a time string to the revision. Syntax: VERSION=8.0.0,REV=66.2005.01.24
-    
-    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-
-    $mday = $mday;
-    $mon = $mon + 1;
-    $year = $year + 1900;
-
-    if ( $mday < 10 ) { $mday = "0" . $mday; } 
-    if ( $mon < 10 ) { $mon = "0" . $mon; } 
-    $datestring = $year . "." . $mon . "." . $mday;
-    $revisionstring = $revisionstring . "." . $datestring;
-    
-    for ( my $i = 0; $i <= $#{$file}; $i++ )
-    {
-        if ( ${$file}[$i] =~ /^\s*(VERSION\=.*?)\s*$/ )
-        {
-            my $oldstring = $1;
-            my $newstring = $oldstring . $revisionstring;	# also adding the date string
-            ${$file}[$i] =~ s/$oldstring/$newstring/;
-            my $infoline = "Info: Changed in $filename file: \"$oldstring\" to \"$newstring\"!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            last;
-        }	
-    }
-
-    # For Update and Patch reasons, this string can also be kept constant
-    
-    my $pkgversion = "SOLSPARCPKGVERSION";
-    if ( $installer::globals::issolarisx86build ) { $pkgversion = "SOLIAPKGVERSION"; }
-    
-    if (( $variables->{$pkgversion} ) && ( $variables->{$pkgversion} ne "" ))
-    {
-        if ( $variables->{$pkgversion} ne "FINALVERSION" )
-        {
-            # In OOo 3.x timeframe, this string is no longer unique for all packages, because of the three layer.
-            # In the string: "3.0.0,REV=9.2008.09.30" only the part "REV=9.2008.09.30" can be unique for all packages
-            # and therefore be set as $pkgversion.
-            # The first part "3.0.0" has to be derived from the 
-            
-            my $version = $installer::globals::packageversion;
-            if ( $version =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ )
-            {
-                my $major = $1;
-                my $minor = $2;
-                my $micro = $3;
-                
-                my $finalmajor = $major;
-                my $finalminor = $minor;
-                my $finalmicro = 0;
-                
-                $version = "$finalmajor.$finalminor.$finalmicro"; 
-            }
-            
-            my $datestring = $variables->{$pkgversion};
-            
-            # Allowing some packages to have another date of creation.
-            # They can be defined in product definition using a key like "SOLSPARCPKGVERSION_$packagename"
-            
-            my $additionalkey = $pkgversion . "_" . $packagename;
-            if (( $variables->{$additionalkey} ) && ( $variables->{$additionalkey} ne "" )) { $datestring = $variables->{$additionalkey}; }
-            
-            my $versionstring = "$version,$datestring";
-
-            for ( my $i = 0; $i <= $#{$file}; $i++ )
-            {
-                if ( ${$file}[$i] =~ /^\s*(VERSION\=).*?\s*$/ )
-                {
-                    my $start = $1;
-                    my $newstring = $start . $versionstring . "\n";	# setting the complete new string	
-                    my $oldstring = ${$file}[$i];
-                    ${$file}[$i] = $newstring;
-                    $oldstring =~ s/\s*$//;
-                    $newstring =~ s/\s*$//;
-                    my $infoline = "Info: Changed in $filename file: \"$oldstring\" to \"$newstring\"!\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    last;
-                }
-            }	
-        }
-    }
-}
-
-########################################################
-# Setting Patch information for Respin versions
-# into pkginfo file. This prevents Respin versions
-# from patching.
-########################################################
-
-sub set_patchlist_in_pkginfo_for_respin
-{
-    my ($changefile, $filename, $allvariables, $packagename) = @_;
-    
-    my $patchlistname = "SOLSPARCPATCHLISTFORRESPIN";
-    if ( $installer::globals::issolarisx86build ) { $patchlistname = "SOLIAPATCHLISTFORRESPIN"; }	
-    
-    if ( $allvariables->{$patchlistname} )
-    {
-        # patchlist separator is a blank
-        my $allpatchesstring = $allvariables->{$patchlistname};
-        my @usedpatches = ();
-
-        # Analyzing the patchlist
-        # Syntax: 120186-10 126411-01(+core-01) -> use 126411-01 only for core-01
-        # Syntax: 120186-10 126411-01(-core-01) -> use 126411-01 for all packages except for core-01
-        my $allpatches = installer::converter::convert_whitespace_stringlist_into_array(\$allpatchesstring);
-
-        for ( my $i = 0; $i <= $#{$allpatches}; $i++ )
-        {
-            my $patchdefinition = ${$allpatches}[$i];
-
-            my $patchid = "";
-            my $symbol = "";
-            my $constraint = "";
-            my $isusedpatch = 0;
-            
-            if ( $patchdefinition =~ /^\s*(.+)\(([+-])(.+)\)\s*$/ )
-            {
-                $patchid = $1;
-                $symbol = $2;
-                $constraint = $3;
-            }
-            elsif (( $patchdefinition =~ /\(/ ) || ( $patchdefinition =~ /\)/ ))	# small syntax check
-            {
-                # if there is a bracket in the $patchdefinition, but it does not 
-                # match the if-condition, this is an erroneous definition.
-                installer::exiter::exit_program("ERROR: Unknown patch string: $patchdefinition", "set_patchlist_in_pkginfo_for_respin");
-            }
-            else
-            {
-                $patchid = $patchdefinition;
-                $isusedpatch = 1; # patches without constraint are always included
-            }
-            
-            if ( $symbol ne "" )
-            {
-                if ( $symbol eq "+" )
-                {
-                    if ( $packagename =~ /^.*\Q$constraint\E\s*$/ ) { $isusedpatch = 1; }
-                }
-                
-                if ( $symbol eq "-" )
-                {
-                    if ( ! ( $packagename =~ /^.*\Q$constraint\E\s*$/ )) { $isusedpatch = 1; }					
-                }
-            }
-
-            if ( $isusedpatch ) { push(@usedpatches, $patchid); }
-        }
-
-        if ( $#usedpatches > -1 )
-        {
-            my $patchstring = installer::converter::convert_array_to_space_separated_string(\@usedpatches);
-
-            my $newline = "PATCHLIST=" . $patchstring . "\n";
-            add_one_line_into_file($changefile, $newline, $filename);
-
-            # Adding patch info for each used patch in the patchlist
-
-            for ( my $i = 0; $i <= $#usedpatches; $i++ )
-            {				
-                my $patchid = $usedpatches[$i];
-                my $key = "PATCH_INFO_" . $patchid;
-                $key =~ s/\s*$//;
-
-                if ( ! $allvariables->{$key} ) { installer::exiter::exit_program("ERROR: No Patch info available in zip list file for $key", "set_patchlist_in_pkginfo"); }
-                my $value = set_timestamp_in_patchinfo($allvariables->{$key});
-                $newline = $key . "=" . $value . "\n";		
-
-                add_one_line_into_file($changefile, $newline, $filename);
-            }
-        }
-    }
-}
-
-########################################################
-# Solaris requires, that the time of patch installation
-# must not be empty.
-# Format: Mon Mar 24 11:20:56 PDT 2008
-# Log file: Tue Apr 29 23:26:19 2008 (04:31 min.)
-# Replace string: ${TIMESTAMP}
-########################################################
-
-sub set_timestamp_in_patchinfo
-{
-    my ($value) = @_;
-    
-    my $currenttime = localtime();
-    
-    if ( $currenttime =~ /^\s*(.+?)(\d\d\d\d)\s*$/ )
-    {
-        my $start = $1;
-        my $year = $2;
-        $currenttime = $start . "CET " . $year;
-    }
-    
-    $value =~ s/\$\{TIMESTAMP\}/$currenttime/;
-
-    return $value;
-}
-
-########################################################
-# Setting MAXINST=1000 into the pkginfo file.
-########################################################
-
-sub set_maxinst_in_pkginfo
-{
-    my ($changefile, $filename) = @_;
-    
-    my $newline = "MAXINST\=1000\n";
-
-    add_one_line_into_file($changefile, $newline, $filename);
-}
-
-#############################################################
-# Setting several Solaris variables into the pkginfo file.
-#############################################################
-
-sub set_solaris_parameter_in_pkginfo
-{
-    my ($changefile, $filename, $allvariables) = @_;
-
-    my $newline = "";
-
-    # SUNW_PRODNAME
-    # SUNW_PRODVERS
-    # SUNW_PKGVERS
-    # Not: SUNW_PKGTYPE
-    # HOTLINE
-    # EMAIL
-    
-    my $productname = $allvariables->{'PRODUCTNAME'};
-    $newline = "SUNW_PRODNAME=$productname\n";
-    add_one_line_into_file($changefile, $newline, $filename);
-
-    my $productversion = "";
-    if ( $allvariables->{'PRODUCTVERSION'} )
-    {
-        $productversion = $allvariables->{'PRODUCTVERSION'};
-        if ( $allvariables->{'PRODUCTEXTENSION'} ) { $productversion = $productversion . "/" . $allvariables->{'PRODUCTEXTENSION'}; }
-    }
-    $newline = "SUNW_PRODVERS=$productversion\n";
-    add_one_line_into_file($changefile, $newline, $filename);
-
-    $newline = "SUNW_PKGVERS=1\.0\n";
-    add_one_line_into_file($changefile, $newline, $filename);
-
-    if ( $allvariables->{'SUNW_PKGTYPE'} )
-    {
-        $newline = "SUNW_PKGTYPE=$allvariables->{'SUNW_PKGTYPE'}\n";
-        add_one_line_into_file($changefile, $newline, $filename);		
-    }
-    else
-    {
-        $newline = "SUNW_PKGTYPE=\n";
-        add_one_line_into_file($changefile, $newline, $filename);
-    }
-
-    $newline = "HOTLINE=Please contact your local service provider\n";
-    add_one_line_into_file($changefile, $newline, $filename);
-
-    $newline = "EMAIL=\n";
-    add_one_line_into_file($changefile, $newline, $filename);
-    
-}
-
-#####################################################################
-# epm uses as archtecture for Solaris x86 "i86pc". This has to be
-# changed to "i386".
-#####################################################################
-
-sub fix_architecture_setting
-{
-    my ($changefile) = @_;
-    
-    for ( my $i = 0; $i <= $#{$changefile}; $i++ )
-    {
-        if ( ${$changefile}[$i] =~ /^\s*ARCH=i86pc\s*$/ )
-        {
-            ${$changefile}[$i] =~ s/i86pc/i386/;
-            last;
-        }
-
-    }
-}
-
-#####################################################################
-# Adding a new line for topdir into specfile, removing old
-# topdir if set.
-#####################################################################
-
-sub set_topdir_in_specfile
-{
-    my ($changefile, $filename, $newepmdir) = @_;
-
-    $newepmdir = cwd() . $installer::globals::separator . $newepmdir; # only absolute path allowed
-
-    # removing "%define _topdir", if existing
-    
-    for ( my $i = 0; $i <= $#{$changefile}; $i++ )
-    {
-        if ( ${$changefile}[$i] =~ /^\s*\%define _topdir\s+/ )
-        {
-            my $removeline = ${$changefile}[$i];
-            $removeline =~ s/\s*$//;
-            splice(@{$changefile},$i,1);
-            my $infoline = "Info: Removed line \"$removeline\" from file $filename!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            last;
-        }	
-    }
-
-    # Adding "topdir" behind the line beginning with: Group:
-        
-    my $inserted_line = 0;
-
-    my $topdirline = "\%define _topdir $newepmdir\n";
-        
-    for ( my $i = 0; $i <= $#{$changefile}; $i++ )
-    {
-        if ( ${$changefile}[$i] =~ /^\s*Group\:\s*/ )
-        {
-            splice(@{$changefile},$i+1,0,$topdirline);
-            $inserted_line = 1;
-            $topdirline =~ s/\s*$//;
-            my $infoline = "Success: Added line $topdirline into file $filename!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }	
-    }
-        
-    if (! $inserted_line) { installer::exiter::exit_program("ERROR: Did not find string \"Group:\" in file: $filename", "set_topdir_in_specfile"); }
-
-}
-
-#####################################################################
-# Setting the packager in the spec file
-# Syntax: Packager: abc@def
-#####################################################################
-
-sub set_packager_in_specfile
-{
-    my ($changefile) = @_;
-
-    my $packager = $installer::globals::longmanufacturer; 
-
-    for ( my $i = 0; $i <= $#{$changefile}; $i++ )
-    {
-        if ( ${$changefile}[$i] =~ /^\s*Packager\s*:\s*(.+?)\s*$/ )
-        {
-            my $oldstring = $1;
-            ${$changefile}[$i] =~ s/\Q$oldstring\E/$packager/;
-            my $infoline = "Info: Changed Packager in spec file from $oldstring to $packager!\n";
-            push( @installer::globals::logfileinfo, $infoline);			
-            last;			
-        }	
-    }
-}
-
-#####################################################################
-# Setting the requirements in the spec file (i81494)
-# Syntax: PreReq: "requirements" (only for shared extensions)
-#####################################################################
-
-sub set_prereq_in_specfile
-{
-    my ($changefile) = @_;
-
-    my $prereq = "PreReq:"; 
-
-    for ( my $i = 0; $i <= $#{$changefile}; $i++ )
-    {
-        if ( ${$changefile}[$i] =~ /^\s*Requires:\s*(.+?)\s*$/ )
-        {
-            my $oldstring = ${$changefile}[$i];
-            ${$changefile}[$i] =~ s/Requires:/$prereq/;
-            my $infoline = "Info: Changed requirements in spec file from $oldstring to ${$changefile}[$i]!\n";
-            push( @installer::globals::logfileinfo, $infoline);			
-        }	
-    }
-}
-
-#####################################################################
-# Setting the Auto[Req]Prov line and __find_requires
-#####################################################################
-
-sub set_autoprovreq_in_specfile
-{
-    my ($changefile, $findrequires, $bindir) = @_;
-    
-    my $autoreqprovline;
-    
-    if ( $findrequires )
-    {
-        $autoreqprovline = "AutoProv\: no\n%define __find_requires $bindir/$findrequires\n";
-    }
-    else
-    {
-        $autoreqprovline = "AutoReqProv\: no\n";
-    }
-
-    $autoreqprovline .= "%define _binary_filedigest_algorithm 1\n%define _binary_payload w9.gzdio\n";
-
-    for ( my $i = 0; $i <= $#{$changefile}; $i++ )
-    {
-        # Adding "autoreqprov" behind the line beginning with: Group:
-        if ( ${$changefile}[$i] =~ /^\s*Group\:\s*/ )
-        {
-            splice(@{$changefile},$i+1,0,$autoreqprovline);
-            $autoreqprovline =~ s/\s*$//;
-            $infoline = "Success: Added line $autoreqprovline into spec file!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            
-            last;
-        }
-    }
-}
-
-#####################################################################
-# Replacing Copyright with License in the spec file
-# Syntax: License: LGPL, SISSL
-#####################################################################
-
-sub set_license_in_specfile
-{
-    my ($changefile, $variableshashref) = @_;
-
-    my $license = $variableshashref->{'LICENSENAME'};
-
-    for ( my $i = 0; $i <= $#{$changefile}; $i++ )
-    {
-        if ( ${$changefile}[$i] =~ /^\s*Copyright\s*:\s*(.+?)\s*$/ )
-        {
-            ${$changefile}[$i] = "License: $license\n";
-            my $infoline = "Info: Replaced Copyright with License: $license !\n";
-            push( @installer::globals::logfileinfo, $infoline);			
-            last;			
-        }	
-    }
-}
-
-#########################################################
-# Building relocatable Solaris packages means:
-# 1. Add "BASEDIR=/opt" into pkginfo
-# 2. Remove "/opt/" from all objects in prototype file
-# For step2 this function exists
-# Sample: d none /opt/openofficeorg20/help 0755 root other
-# -> d none openofficeorg20/help 0755 root other
-#########################################################
-
-sub make_prototypefile_relocatable
-{
-    my ($prototypefile, $relocatablepath) = @_;
-            
-    for ( my $i = 0; $i <= $#{$prototypefile}; $i++ )
-    {
-        if ( ${$prototypefile}[$i] =~ /^\s*\w\s+\w+\s+\/\w+/ )	# this is an object line
-        {
-            ${$prototypefile}[$i] =~ s/$relocatablepath//;	# Important: $relocatablepath has a "/" at the end. Example "/opt/"
-        }
-    }
-    
-    # If the $relocatablepath is "/opt/openoffice20/" the line "d none /opt/openoffice20" was not changed.
-    # This line has to be removed now
-    
-    if ( $relocatablepath ne "/" ) { $relocatablepath =~ s/\/\s*$//; }		# removing the ending slash
-    
-    for ( my $i = 0; $i <= $#{$prototypefile}; $i++ )
-    {
-        if ( ${$prototypefile}[$i] =~ /^\s*d\s+\w+\s+\Q$relocatablepath\E/ )
-        {
-            my $line = ${$prototypefile}[$i];
-            splice(@{$prototypefile},$i,1);	# removing the line
-            $line =~ s/\s*$//;
-            my $infoline = "Info: Removed line \"$line\" from prototype file!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            last;
-        }
-    }
-    
-    # Making "\$" to "$" in prototype file. "\$" was created by epm.
-
-    for ( my $i = 0; $i <= $#{$prototypefile}; $i++ )
-    {
-        if ( ${$prototypefile}[$i] =~ /\\\$/ )
-        {
-            ${$prototypefile}[$i] =~ s/\\\$/\$/g;
-            my $infoline2 = "Info: Changed line in prototype file: ${$prototypefile}[$i] !\n";
-            push( @installer::globals::logfileinfo, $infoline2);		
-        }
-    }
-}
-
-
-#########################################################################
-# In scp the flag VOLATEFILE can be used. This shall lead to style "v"
-# in Solaris prototype file. This is not supported by epm and has
-# therefore to be included in prototypefile, not in epm list file.
-#########################################################################
-
-sub set_volatilefile_into_prototypefile
-{
-    my ($prototypefile, $filesref) = @_;
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-
-        my $styles = "";
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-        
-        if ( $styles =~ /\bVOLATILEFILE\b/ )
-        {
-            my $sourcepath = $onefile->{'sourcepath'};
-                
-            for ( my $j = 0; $j <= $#{$prototypefile}; $j++ )
-            {
-                if (( ${$prototypefile}[$j] =~ /^\s*f\s+none\s+/ ) && ( ${$prototypefile}[$j] =~ /\=\Q$sourcepath\E\s+/ ))
-                {
-                    my $oldline = ${$prototypefile}[$j];
-                    ${$prototypefile}[$j] =~ s/^\s*f/v/;
-                    my $newline = ${$prototypefile}[$j];
-                    $oldline =~ s/\s*$//;
-                    $newline =~ s/\s*$//;
-                    my $infoline = "Volatile file: Changing content from \"$oldline\" to \"$newline\" .\n";
-                    push(@installer::globals::logfileinfo, $infoline);
-                    last;
-                }
-            }
-        }
-    }
-}
-
-#########################################################################
-# Replacing the variables in the Solaris patch shell scripts.
-# Taking care, that multiple slashes are not always removed.
-#########################################################################
-
-sub replace_variables_in_shellscripts_for_patch
-{
-    my ($scriptfile, $scriptfilename, $oldstring, $newstring) = @_;
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        if ( ${$scriptfile}[$i] =~ /\Q$oldstring\E/ )
-        {
-            my $oldline = ${$scriptfile}[$i];
-            if (( $oldstring eq "PRODUCTDIRECTORYNAME" ) && ( $newstring eq "" )) { $oldstring = $oldstring . "/"; }
-            ${$scriptfile}[$i] =~ s/\Q$oldstring\E/$newstring/g;
-            my $infoline = "Info: Substituting in $scriptfilename $oldstring by $newstring\n";
-            push(@installer::globals::logfileinfo, $infoline);
-        }
-    }	
-}
-
-#########################################################################
-# Replacing the variables in the shell scripts or in the epm list file
-# Linux: spec file
-# Solaris: preinstall, postinstall, preremove, postremove
-# If epm is used in the original version (not relocatable)
-# the variables have to be exchanged in the list file, 
-# created for epm.
-#########################################################################
-
-sub replace_variables_in_shellscripts
-{
-    my ($scriptfile, $scriptfilename, $oldstring, $newstring) = @_;
-
-    my $debug = 0;
-    if ( $oldstring eq "PRODUCTDIRECTORYNAME" ) { $debug = 1; }
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        if ( ${$scriptfile}[$i] =~ /\Q$oldstring\E/ )
-        {
-            my $oldline = ${$scriptfile}[$i];
-            ${$scriptfile}[$i] =~ s/\Q$oldstring\E/$newstring/g;
-            ${$scriptfile}[$i] =~ s/\/\//\//g;	# replacing "//" by "/" , if path $newstring is empty!			
-            my $infoline = "Info: Substituting in $scriptfilename $oldstring by $newstring\n";
-            push(@installer::globals::logfileinfo, $infoline);
-            if ( $debug )
-            {
-                $infoline = "Old Line: $oldline";
-                push(@installer::globals::logfileinfo, $infoline);			
-                $infoline = "New Line: ${$scriptfile}[$i]";
-                push(@installer::globals::logfileinfo, $infoline);			
-            }
-        }
-    }
-}
-
-############################################################
-# Determinig the directory created by epm, in which the
-# RPMS or Solaris packages are created.
-############################################################
-
-sub determine_installdir_ooo
-{
-    # A simple "ls" command returns the directory name 
-
-    my $dirname = "";
-    
-    my $systemcall = "ls |";
-    open (LS, "$systemcall");
-    $dirname = <LS>;
-    close (LS);
-
-    $dirname =~ s/\s*$//;
-
-    my $infoline = "Info: Directory created by epm: $dirname\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    return $dirname;
-}
-
-############################################################
-# Setting the tab content into the file container
-############################################################
-
-sub set_tab_into_datafile
-{
-    my ($changefile, $filesref) = @_;
-
-    my @newclasses = ();
-    my $newclassesstring = "";
-
-    if ( $installer::globals::issolarispkgbuild )
-    {
-        for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-        {
-            my $onefile = ${$filesref}[$i];
-
-            if ( $onefile->{'SolarisClass'} )
-            {
-                my $sourcepath = $onefile->{'sourcepath'};
-                
-                for ( my $j = 0; $j <= $#{$changefile}; $j++ )
-                {
-                    if (( ${$changefile}[$j] =~ /^\s*f\s+none\s+/ ) && ( ${$changefile}[$j] =~ /\=\Q$sourcepath\E\s+/ ))
-                    {
-                        my $oldline = ${$changefile}[$j];
-                        ${$changefile}[$j] =~ s/f\s+none/e $onefile->{'SolarisClass'}/;
-                        my $newline = ${$changefile}[$j];
-                        $oldline =~ s/\s*$//;
-                        $newline =~ s/\s*$//;
-
-                        my $infoline = "TAB: Changing content from \"$oldline\" to \"$newline\" .\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-
-                        # collecting all new classes
-                        if (! installer::existence::exists_in_array($onefile->{'SolarisClass'}, \@newclasses))
-                        {
-                            push(@newclasses, $onefile->{'SolarisClass'});
-                        }
-                        
-                        last;
-                    }
-                }
-            }
-        }
-
-        $newclassesstring = installer::converter::convert_array_to_space_separated_string(\@newclasses);
-    }
-
-    if ( $installer::globals::isrpmbuild )
-    {
-        for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-        {
-            my $onefile = ${$filesref}[$i];
-
-            if ( $onefile->{'SpecFileContent'} )
-            {
-                my $destination = $onefile->{'destination'};
-                
-                for ( my $j = 0; $j <= $#{$changefile}; $j++ )
-                {
-                    if ( ${$changefile}[$j] =~ /^\s*(\%attr\(.*\))\s+(\".*?\Q$destination\E\"\s*)$/ )
-                    {
-                        my $begin = $1;
-                        my $end = $2;
-                    
-                        my $oldline = ${$changefile}[$j];
-                        ${$changefile}[$j] = $begin . " " . $onefile->{'SpecFileContent'} . " " . $end;
-                        my $newline = ${$changefile}[$j];
-                        
-                        $oldline =~ s/\s*$//;
-                        $newline =~ s/\s*$//;
-
-                        my $infoline = "TAB: Changing content from \"$oldline\" to \"$newline\" .\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-
-                        last;
-                    }				
-                }			
-            }
-        }
-    }	
-
-    return $newclassesstring;
-}
-
-############################################################
-# Including additional classes into the pkginfo file
-############################################################
-
-sub include_classes_into_pkginfo
-{
-    my ($changefile, $classesstring) = @_;
-
-    for ( my $i = 0; $i <= $#{$changefile}; $i++ )
-    {
-        if ( ${$changefile}[$i] =~ /^\s*CLASSES\=none/ )
-        {
-            ${$changefile}[$i] =~ s/\s*$//;
-            my $oldline = ${$changefile}[$i];
-            ${$changefile}[$i] = ${$changefile}[$i] . " " . $classesstring . "\n";
-            my $newline = ${$changefile}[$i];
-            $newline =~ s/\s*$//;
-
-            my $infoline = "pkginfo file: Changing content from \"$oldline\" to \"$newline\" .\n";
-            push(@installer::globals::logfileinfo, $infoline);
-        }
-    }
-}
-
-##########################################################################################
-# Checking, if an extension is included into the package (Linux).
-# All extension files have to be installed into directory
-# share/extension/install
-# %attr(0444,root,root) "/opt/staroffice8/share/extension/install/SunSearchToolbar.oxt"
-##########################################################################################
-
-sub is_extension_package
-{
-    my ($specfile) = @_;
-    
-    my $is_extension_package = 0;
-
-    for ( my $i = 0; $i <= $#{$specfile}; $i++ )
-    {
-        my $line = ${$specfile}[$i];
-        if ( $line =~ /share\/extension\/install\/.*?\.oxt\"\s*$/ )
-        {
-            $is_extension_package = 1;
-            last;
-        }
-    }
-
-    return $is_extension_package;
-}
-
-######################################################################
-# Checking, if an extension is included into the package (Solaris).
-# All extension files have to be installed into directory
-# share/extension/install
-######################################################################
-
-sub contains_extension_dir
-{
-    my ($prototypefile) = @_;
-    
-    my $contains_extension_dir = 0;
-
-    # d none opt/openoffice.org3/share/extensions/
-
-    for ( my $i = 0; $i <= $#{$prototypefile}; $i++ )
-    {
-        my $line = ${$prototypefile}[$i];
-        if ( $line =~ /^\s*d\s+none\s.*\/share\/extensions\// )
-        {
-            $contains_extension_dir = 1;
-            last;
-        }
-    }
-    
-    return $contains_extension_dir;
-}
-
-############################################################
-# A Solaris patch contains 7 specific scripts
-############################################################
-
-sub add_scripts_into_prototypefile
-{
-    my ($prototypefile, $prototypefilename, $languagestringref, $staticpath) = @_;
-    
-    # The files are stored in the directory $installer::globals::patchincludepath
-    # The file names are available via @installer::globals::solarispatchscripts
-    
-    my $path = $installer::globals::patchincludepath;
-    $path =~ s/\/\s*$//;
-    $path = $path . $installer::globals::separator;
-
-    my @newlines = ();
-    my $is_extension_package = contains_extension_dir($prototypefile);
-
-    if ( $is_extension_package )
-    {	
-        for ( my $i = 0; $i <= $#installer::globals::solarispatchscriptsforextensions; $i++ )
-        {
-            my $sourcefilename = $path . $installer::globals::solarispatchscriptsforextensions[$i];
-            my $destfile = $installer::globals::solarispatchscriptsforextensions[$i];
-
-            # If the sourcepath has "_extension" in its name, this has to be removed
-            $destfile =~ s/_extensions\s*$//;  # hard coded renaming of script name
-
-            # Creating unique directory name with $prototypefilename
-            my $extensiondir = installer::systemactions::create_directories("extensionscripts", $languagestringref);
-
-            if ( $prototypefilename =~ /\/(\S*?)\s*$/ ) { $prototypefilename = $1; }
-            $prototypefilename =~ s/\./_/g;
-            my $destdir = $extensiondir . $installer::globals::separator . $prototypefilename;
-            if ( ! -d $destdir ) { installer::systemactions::create_directory($destdir); }
-            my $destpath = $destdir . $installer::globals::separator . $destfile;
-            if ( -f $destpath ) { unlink($destpath); }
-            
-            # Reading file
-            my $scriptfile = installer::files::read_file($sourcefilename);
-
-            # Replacing variables
-            my $oldstring = "PRODUCTDIRECTORYNAME";
-            replace_variables_in_shellscripts_for_patch($scriptfile, $destpath, $oldstring, $staticpath);
-            
-            # Saving file
-            installer::files::save_file($destpath, $scriptfile);
-            
-            # Writing file destination into prototype file
-            my $line = "i $destfile=" . $destpath . "\n";
-            push(@newlines, $line);
-        }		
-    }
-    else
-    {
-        for ( my $i = 0; $i <= $#installer::globals::solarispatchscripts; $i++ )
-        {
-            my $line = "i $installer::globals::solarispatchscripts[$i]=" . $path . $installer::globals::solarispatchscripts[$i] . "\n";
-            push(@newlines, $line);
-        }
-    }	
-    
-    # Including the new lines after the last line starting with "i"
-
-    for ( my $i = 0; $i <= $#{$prototypefile}; $i++ )
-    {
-        if ( ${$prototypefile}[$i] =~ /^\s*i\s+copyright/ )
-        {
-            splice(@{$prototypefile}, $i, 1);	# ignoring old copyright text, using patch standard
-            next;
-        }
-        if ( ${$prototypefile}[$i] =~ /^\s*i\s+/ ) { next; }
-        splice(@{$prototypefile}, $i, 0, @newlines);
-        last;
-    }
-}
-
-############################################################
-# Adding patch infos in pkginfo file
-############################################################
-
-sub include_patchinfos_into_pkginfo
-{
-    my ( $changefile, $filename, $variableshashref ) = @_;
-    
-    # SUNW_PATCHID=101998-10
-    # SUNW_OBSOLETES=114999-01 113999-01
-    # SUNW_PKGTYPE=usr
-    # SUNW_PKGVERS=1.0
-    # SUNW_REQUIRES=126411-01
-
-    my $patchidname = "SOLSPARCPATCHID";
-    if ( $installer::globals::issolarisx86build ) { $patchidname = "SOLIAPATCHID"; }
-
-    if ( ! $variableshashref->{$patchidname} ) { installer::exiter::exit_program("ERROR: Variable $patchidname not defined in zip list file!", "include_patchinfos_into_pkginfo"); }
-
-    my $newline = "SUNW_PATCHID=" . $variableshashref->{$patchidname} . "\n";
-    add_one_line_into_file($changefile, $newline, $filename);
-
-    my $patchobsoletesname = "SOLSPARCPATCHOBSOLETES";
-    if ( $installer::globals::issolarisx86build ) { $patchobsoletesname = "SOLIAPATCHOBSOLETES"; }
-
-    my $obsoletes = "";
-    if ( $variableshashref->{$patchobsoletesname} ) { $obsoletes = $variableshashref->{$patchobsoletesname}; }	
-    $newline = "SUNW_OBSOLETES=" . $obsoletes . "\n";
-    add_one_line_into_file($changefile, $newline, $filename);
-
-    my $patchrequiresname = "SOLSPARCPATCHREQUIRES";
-    if ( $installer::globals::issolarisx86build ) { $patchrequiresname = "SOLIAPATCHREQUIRES"; }
-
-    if ( $variableshashref->{$patchrequiresname} )
-    {
-        my $requires = $variableshashref->{$patchrequiresname};
-        $newline = "SUNW_REQUIRES=" . $requires . "\n";
-        add_one_line_into_file($changefile, $newline, $filename);
-    }
-    $newline = "SUNW_PATCH_PROPERTIES=\n"; 
-    add_one_line_into_file($changefile, $newline, $filename);
-}
-
-############################################################
-# Setting the correct Solaris locales
-############################################################
-
-sub get_solaris_language_for_langpack
-{
-    my ( $onelanguage ) = @_;
-    
-    my $sollanguage = $onelanguage;
-    $sollanguage =~ s/\-/\_/;
-    
-    if ( $sollanguage eq "de" ) { $sollanguage = "de"; }
-    elsif ( $sollanguage eq "en_US" ) { $sollanguage = "en_AU,en_CA,en_GB,en_IE,en_MT,en_NZ,en_US,en_US.UTF-8"; }
-    elsif ( $sollanguage eq "es" ) { $sollanguage = "es"; }
-    elsif ( $sollanguage eq "fr" ) { $sollanguage = "fr"; }
-    elsif ( $sollanguage eq "hu" ) { $sollanguage = "hu_HU"; }
-    elsif ( $sollanguage eq "it" ) { $sollanguage = "it"; }
-    elsif ( $sollanguage eq "nl" ) { $sollanguage = "nl_BE,nl_NL"; }
-    elsif ( $sollanguage eq "pl" ) { $sollanguage = "pl_PL"; }
-    elsif ( $sollanguage eq "sv" ) { $sollanguage = "sv"; }
-    elsif ( $sollanguage eq "pt" ) { $sollanguage = "pt_PT"; }
-    elsif ( $sollanguage eq "pt_BR" ) { $sollanguage = "pt_BR"; }
-    elsif ( $sollanguage eq "ru" ) { $sollanguage = "ru_RU"; }
-    elsif ( $sollanguage eq "ja" ) { $sollanguage = "ja,ja_JP,ja_JP.PCK,ja_JP.UTF-8"; }
-    elsif ( $sollanguage eq "ko" ) { $sollanguage = "ko,ko.UTF-8"; }
-    elsif ( $sollanguage eq "zh_CN" ) { $sollanguage = "zh,zh.GBK,zh_CN.GB18030,zh.UTF-8"; }
-    elsif ( $sollanguage eq "zh_TW" ) { $sollanguage = "zh_TW,zh_TW.BIG5,zh_TW.UTF-8,zh_HK.BIG5HK,zh_HK.UTF-8"; }
-    
-    return $sollanguage;
-}
-
-############################################################
-# Adding language infos in pkginfo file
-############################################################
-
-sub include_languageinfos_into_pkginfo
-{
-    my ( $changefile, $filename, $languagestringref, $onepackage, $variableshashref ) = @_;
-    
-    # SUNWPKG_LIST=core01
-    # SUNW_LOC=de
-
-    my $locallang = $onepackage->{'language'};
-    my $solarislanguage = get_solaris_language_for_langpack($locallang);
-
-    my $newline = "SUNW_LOC=" . $solarislanguage . "\n";
-    add_one_line_into_file($changefile, $newline, $filename);
-
-    # SUNW_PKGLIST is required, if SUNW_LOC is defined.
-    if ( $onepackage->{'pkg_list_entry'} )
-    {
-        my $packagelistentry = $onepackage->{'pkg_list_entry'};
-        installer::packagelist::resolve_packagevariables(\$packagelistentry, $variableshashref, 1);
-        $newline = "SUNW_PKGLIST=" . $packagelistentry . "\n";
-        add_one_line_into_file($changefile, $newline, $filename);
-    }
-    else
-    {
-        # Using default package ooobasis30-core01.
-        my $packagelistentry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01";
-        installer::packagelist::resolve_packagevariables(\$packagelistentry, $variableshashref, 1);
-        $newline = "SUNW_PKGLIST=" . $packagelistentry . "\n";
-        add_one_line_into_file($changefile, $newline, $filename);	
-    }
-}
-
-############################################################
-# Collecting all files included in patch in 
-# @installer::globals::patchfilecollector
-############################################################
-
-sub collect_patch_files
-{
-    my ($file, $packagename, $prefix) = @_;
-    
-    # $file is the spec file or the prototypefile
-    
-    $prefix = $prefix . "/";
-    my $packagenamestring = "Package " . $packagename . " \:\n";
-    push(@installer::globals::patchfilecollector, $packagenamestring);
-
-    for ( my $i = 0; $i <= $#{$file}; $i++ )
-    {
-        my $line = ${$file}[$i];
-    
-        if ( $installer::globals::isrpmbuild )
-        {
-            # %attr(0444,root,root) "/opt/openofficeorg20/program/about.bmp"
-
-            if ( $line =~ /^\s*\%attr\(.*\)\s*\"(.*?)\"\s*$/ )
-            {
-                my $filename = $1 . "\n";
-                $filename =~ s/^\s*\Q$prefix\E//;
-                push(@installer::globals::patchfilecollector, $filename);
-            }		
-        }
-
-        if ( $installer::globals::issolarispkgbuild )
-        {
-            # f none program/msomrl.rdb=/ab/SRC680/unxsols4.pro/bin/msomrl.rdb 0444 root bin
-
-            if ( $line =~ /^\s*f\s+\w+\s+(.*?)\=/ )
-            {
-                my $filename = $1 . "\n";
-                push(@installer::globals::patchfilecollector, $filename);
-            }		
-        }
-    }
-
-    push(@installer::globals::patchfilecollector, "\n");
-
-}
-
-############################################################
-# Including package names into the depend files.
-# The package names have to be included into
-# packagelist. They are already saved in 
-# %installer::globals::dependfilenames.
-############################################################
-
-sub put_packagenames_into_dependfile
-{
-    my ( $file ) = @_;
-
-    for ( my $i = 0; $i <= $#{$file}; $i++ )
-    {
-        my $line = ${$file}[$i];
-        if ( $line =~ /^\s*\w\s+(.*?)\s*$/ )
-        {
-            my $abbreviation = $1;
-
-            if ( $abbreviation =~ /\%/ ) { installer::exiter::exit_program("ERROR: Could not resolve all properties in Solaris package abbreviation \"$abbreviation\"!", "read_packagemap"); }
-
-            if ( exists($installer::globals::dependfilenames{$abbreviation}) )
-            {
-                my $packagename = $installer::globals::dependfilenames{$abbreviation};
-                if ( $packagename =~ /\%/ ) { installer::exiter::exit_program("ERROR: Could not resolve all properties in Solaris package name \"$packagename\"!", "read_packagemap"); }
-
-                $line =~ s/\s*$//;
-                ${$file}[$i] = $line . "\t" . $packagename . "\n";
-            }
-            else
-            {
-                installer::exiter::exit_program("ERROR: Missing packagename for Solaris package \"$abbreviation\"!", "put_packagenames_into_dependfile");
-            }
-        }
-    }
-}
-
-############################################################
-# Including the relocatable directory into
-# spec file and pkginfo file
-# Linux: set topdir in specfile
-# Solaris: remove $relocatablepath (/opt/)
-# for all objects in prototype file
-# and changing "topdir" for Linux
-############################################################
-
-sub prepare_packages
-{
-    my ($loggingdir, $packagename, $staticpath, $relocatablepath, $onepackage, $variableshashref, $filesref, $languagestringref) = @_;
-    
-    my $filename = "";
-    my $newline = "";
-    my $newepmdir = $installer::globals::epmoutpath . $installer::globals::separator;
-    
-    my $localrelocatablepath = $relocatablepath;
-    if ( $localrelocatablepath ne "/" ) { $localrelocatablepath =~ s/\/\s*$//; }
-        
-    if ( $installer::globals::issolarispkgbuild )
-    {
-        $filename = $packagename . ".pkginfo";
-        $newline = "BASEDIR\=" . $localrelocatablepath . "\n";
-    }
-
-    if ( $installer::globals::isrpmbuild )
-    {
-        $filename =  $packagename . ".spec";
-        $newline = "Prefix\:\ " . $localrelocatablepath . "\n";			
-    }	
-
-    my $completefilename = $newepmdir . $filename;
-
-    if ( ! -f $completefilename) { installer::exiter::exit_program("ERROR: Did not find file: $completefilename", "prepare_packages"); }
-    my $changefile = installer::files::read_file($completefilename);
-    if ( $newline ne "" )
-    {
-        add_one_line_into_file($changefile, $newline, $filename);
-        installer::files::save_file($completefilename, $changefile);
-    }
-    
-    # adding new "topdir" and removing old "topdir" in specfile
-
-    if ( $installer::globals::isrpmbuild )
-    {
-        set_topdir_in_specfile($changefile, $filename, $newepmdir);
-        set_autoprovreq_in_specfile($changefile, $onepackage->{'findrequires'}, "$installer::globals::unpackpath" . "/bin");
-        set_packager_in_specfile($changefile);
-        if ( is_extension_package($changefile) ) { set_prereq_in_specfile($changefile); }
-        set_license_in_specfile($changefile, $variableshashref);
-        set_tab_into_datafile($changefile, $filesref);
-        installer::files::save_file($completefilename, $changefile);		
-        if ( $installer::globals::patch ) { collect_patch_files($changefile, $packagename, $localrelocatablepath); }
-    }	
-
-    # removing the relocatable path in prototype file
-
-    if ( $installer::globals::issolarispkgbuild )
-    {
-        set_revision_in_pkginfo($changefile, $filename, $variableshashref, $packagename);
-        set_maxinst_in_pkginfo($changefile, $filename);
-        set_solaris_parameter_in_pkginfo($changefile, $filename, $variableshashref);
-        if ( $installer::globals::issolarisx86build ) { fix_architecture_setting($changefile); }
-        if ( ! $installer::globals::patch ) { set_patchlist_in_pkginfo_for_respin($changefile, $filename, $variableshashref, $packagename); }
-        if ( $installer::globals::patch ) { include_patchinfos_into_pkginfo($changefile, $filename, $variableshashref); }
-        if (( $onepackage->{'language'} ) && ( $onepackage->{'language'} ne "" ) && ( $onepackage->{'language'} ne "en-US" )) { include_languageinfos_into_pkginfo($changefile, $filename, $languagestringref, $onepackage, $variableshashref); }
-        installer::files::save_file($completefilename, $changefile);
-    
-        my $prototypefilename = $packagename . ".prototype";
-        $prototypefilename = $newepmdir . $prototypefilename;
-        if (! -f $prototypefilename) { installer::exiter::exit_program("ERROR: Did not find prototype file: $prototypefilename", "prepare_packages"); }
-
-        my $prototypefile = installer::files::read_file($prototypefilename);
-        make_prototypefile_relocatable($prototypefile, $relocatablepath);
-        set_volatilefile_into_prototypefile($prototypefile, $filesref);
-        my $classesstring = set_tab_into_datafile($prototypefile, $filesref);
-        if ($classesstring)
-        { 
-            include_classes_into_pkginfo($changefile, $classesstring);
-            installer::files::save_file($completefilename, $changefile);
-        }
-
-        if ( $installer::globals::patch ) { add_scripts_into_prototypefile($prototypefile, $prototypefilename, $languagestringref, $staticpath); }
-        
-        installer::files::save_file($prototypefilename, $prototypefile);
-        if ( $installer::globals::patch ) { collect_patch_files($prototypefile, $packagename, ""); }
-
-        # Adding package names into depend files for Solaris (not supported by epm)
-        my $dependfilename = $packagename . ".depend";
-        $dependfilename = $newepmdir . $dependfilename;
-        if ( -f $dependfilename)
-        {
-            my $dependfile = installer::files::read_file($dependfilename);
-            put_packagenames_into_dependfile($dependfile);		
-            installer::files::save_file($dependfilename, $dependfile);
-        }
-    }
-
-    return $newepmdir;
-}
-
-############################################################
-# Linux requirement for perl is changed by epm from
-# /usr/bin/perl to perl .
-# Requires: perl 
-############################################################
-
-sub check_requirements_in_specfile
-{
-    my ( $specfile ) = @_;
-    
-    for ( my $i = 0; $i <= $#{$specfile}; $i++ )
-    {
-        if (( ${$specfile}[$i] =~ /^\s*Requires/ ) && ( ${$specfile}[$i] =~ /\bperl\b/ ) && ( ! (  ${$specfile}[$i] =~ /\/usr\/bin\/perl\b/ )))
-        {
-            my $oldline = ${$specfile}[$i];
-            ${$specfile}[$i] =~ s/perl/\/usr\/bin\/perl/;
-            my $newline = ${$specfile}[$i];
-
-            $oldline =~ s/\s*$//;
-            $newline =~ s/\s*$//;
-            my $infoline = "Spec File: Changing content from \"$oldline\" to \"$newline\".\n";
-            push(@installer::globals::logfileinfo, $infoline);	
-        }
-    }
-}
-
-###############################################################################
-# Replacement of PRODUCTINSTALLLOCATION and PRODUCTDIRECTORYNAME in the 
-# epm list file.
-# The complete rootpath is stored in $installer::globals::rootpath
-# or for each package in $onepackage->{'destpath'}
-# The static rootpath is stored in $staticpath
-# The relocatable path is stored in $relocatablepath
-# PRODUCTINSTALLLOCATION is the relocatable part ("/opt") and
-# PRODUCTDIRECTORYNAME the static path ("openofficeorg20").
-# In standard epm process:
-# No usage of package specific variables like $BASEDIR, because
-# 1. These variables would be replaced in epm process
-# 2. epm version 3.7 does not support relocatable packages
-###############################################################################
-
-sub resolve_path_in_epm_list_before_packaging
-{
-    my ($listfile, $listfilename, $variable, $path) = @_;
-
-    installer::logger::include_header_into_logfile("Replacing variables in epm list file:");
-
-    $path =~ s/\/\s*$//;
-    replace_variables_in_shellscripts($listfile, $listfilename, $variable, $path);
-
-}
-
-#################################################################
-# Determining the rpm version. Beginning with rpm version 4.0
-# the tool to create RPMs is "rpmbuild" and no longer "rpm"
-#################################################################
-
-sub determine_rpm_version
-{
-    my $rpmversion = 0;
-    my $rpmout = "";
-    my $systemcall = "";
-    
-    # "rpm --version" has problems since LD_LIBRARY_PATH was removed. Therefore the content of $RPM has to be called.
-    # "rpm --version" and "rpmbuild --version" have the same output. Therefore $RPM can be used. Its value 
-    # is saved in $installer::globals::rpm
-    
-    if ( $installer::globals::rpm ne "" )
-    {
-        $systemcall = "$installer::globals::rpm --version |";
-    }
-    else
-    {
-        $systemcall = "rpm --version |";		
-    }
-    
-    open (RPM, "$systemcall");
-    $rpmout = <RPM>;
-    close (RPM);
-    
-    if ( $rpmout ne "" )
-    {
-        $rpmout =~ s/\s*$//g;
-
-        my $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        if ( $rpmout eq "" ) { $infoline = "ERROR: Could not find file \"rpm\" !\n"; }
-        else { $infoline = "Success: rpm version: $rpmout\n"; }
-
-        push( @installer::globals::logfileinfo, $infoline);
-    
-        if ( $rpmout =~ /(\d+)\.(\d+)\.(\d+)/ ) { $rpmversion = $1; }
-        elsif ( $rpmout =~ /(\d+)\.(\d+)/ ) { $rpmversion = $1; }
-        elsif ( $rpmout =~ /(\d+)/ ) { $rpmversion = $1; }
-        else { installer::exiter::exit_program("ERROR: Unknown format: $rpmout ! Expected: \"a.b.c\", or \"a.b\", or \"a\"", "determine_rpm_version"); }
-    }
-    
-    return $rpmversion;
-}
-
-####################################################
-# Writing some info about rpm into the log file
-####################################################
-
-sub log_rpm_info
-{
-    my $systemcall = "";
-    my $infoline = "";
-
-    $infoline = "\nLogging rpmrc content using --showrc\n\n";
-    push( @installer::globals::logfileinfo, $infoline);		
-
-    if ( $installer::globals::rpm ne "" )
-    {
-        $systemcall = "$installer::globals::rpm --showrc |";
-    }
-    else
-    {
-        $systemcall = "rpm --showrc |";		
-    }
-
-    my @fullrpmout = ();
-    
-    open (RPM, "$systemcall");
-    while (<RPM>) {push(@fullrpmout, $_); }
-    close (RPM);
-    
-    if ( $#fullrpmout > -1 )
-    {
-        for ( my $i = 0; $i <= $#fullrpmout; $i++ )
-        {
-            my $rpmout = $fullrpmout[$i];
-            $rpmout =~ s/\s*$//g;
-
-            $infoline = "$rpmout\n";
-            $infoline =~ s/error/e_r_r_o_r/gi;  # avoiding log problems
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-    else
-    {
-        $infoline = "Problem in systemcall: $systemcall : No return value\n";
-        push( @installer::globals::logfileinfo, $infoline);		
-    }	
-    
-    $infoline = "End of logging rpmrc\n\n";
-    push( @installer::globals::logfileinfo, $infoline);		
-}
-
-#################################################
-# Systemcall to start the packaging process
-#################################################
-
-sub create_packages_without_epm
-{
-    my ($epmdir, $packagename, $includepatharrayref, $allvariables, $languagestringref) = @_;
-    
-    # Solaris: pkgmk -o -f solaris-2.8-sparc/SUNWso8m34.prototype -d solaris-2.8-sparc
-    # Solaris: pkgtrans solaris-2.8-sparc SUNWso8m34.pkg SUNWso8m34
-    # Solaris: tar -cf - SUNWso8m34 | gzip > SUNWso8m34.tar.gz
-
-    if ( $installer::globals::issolarispkgbuild )
-    {
-        my $prototypefile = $epmdir . $packagename . ".prototype";
-        if (! -f $prototypefile) { installer::exiter::exit_program("ERROR: Did not find file: $prototypefile", "create_packages_without_epm"); }
-
-        my $destinationdir = $prototypefile;
-        installer::pathanalyzer::get_path_from_fullqualifiedname(\$destinationdir);
-        $destinationdir =~ s/\/\s*$//;	# removing ending slashes
-        
-        my $systemcall = "pkgmk -l 1073741824 -o -f $prototypefile -d $destinationdir 2\>\&1 |";
-        installer::logger::print_message( "... $systemcall ...\n" );
-
-        my $maxpkgmkcalls = 3;
-
-        for ( my $i = 1; $i <= $maxpkgmkcalls; $i++ )
-        {
-            my @pkgmkoutput = ();
-
-            open (PKGMK, "$systemcall");
-            while (<PKGMK>) {push(@pkgmkoutput, $_); }
-            close (PKGMK);
-
-            my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-            my $infoline = "Systemcall (Try $i): $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            for ( my $j = 0; $j <= $#pkgmkoutput; $j++ )
-            {
-                if ( $i < $maxpkgmkcalls ) { $pkgmkoutput[$j] =~ s/\bERROR\b/PROBLEM/ig; }
-                push( @installer::globals::logfileinfo, "$pkgmkoutput[$j]");
-            }
-        
-            if ($returnvalue)
-            {
-                $infoline = "Try $i : Could not execute \"$systemcall\"!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                if ( $i == $maxpkgmkcalls ) { installer::exiter::exit_program("ERROR: \"$systemcall\"!", "create_packages_without_epm"); }
-            }
-            else
-            {
-                installer::logger::print_message( "Success (Try $i): \"$systemcall\"\n" );
-                $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                last;
-            }
-        }
-
-        # It might be necessary to save uncompressed Solaris packages
-
-        if ( $allvariables->{'JDSBUILD'} )
-        {
-            if ( ! $installer::globals::jds_language_controlled )
-            {
-                my $correct_language = installer::worker::check_jds_language($allvariables, $languagestringref);
-                $installer::globals::correct_jds_language = $correct_language;
-                $installer::globals::jds_language_controlled = 1;
-            }
-
-            if ( $installer::globals::correct_jds_language )
-            {				
-                if ( $installer::globals::saved_packages_path eq "" )
-                {
-                    $packagestempdir = installer::systemactions::create_directories("jds", $languagestringref);
-                    $installer::globals::saved_packages_path = $packagestempdir;
-                    push(@installer::globals::jdsremovedirs, $packagestempdir);
-                }
-
-                $systemcall = "cd $destinationdir; cp -p -R $packagename $installer::globals::saved_packages_path;";
-                 make_systemcall($systemcall);
-                installer::logger::print_message( "... $systemcall ...\n" );
-
-                # Setting unix rights to "775" for all created directories inside the package,
-                # that is saved in temp directory		
-
-                $systemcall = "cd $packagestempdir; find $packagename -type d | xargs -i chmod 775 \{\} \;";
-                installer::logger::print_message( "... $systemcall ...\n" );
-
-                $returnvalue = system($systemcall);
-
-                $infoline = "Systemcall: $systemcall\n";
-                push( @installer::globals::logfileinfo, $infoline);
-        
-                if ($returnvalue)
-                {
-                    $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-                else
-                {
-                    $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-            }
-        }
-
-        # compressing packages
-        
-        if ( ! $installer::globals::solarisdontcompress )
-        {
-            my $faspac = "faspac-so.sh";
-        
-            my $compressorref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$faspac, $includepatharrayref, 0);
-            if ($$compressorref ne "")
-            {
-                # Saving original pkginfo, to set time stamp later
-                my $pkginfoorig = "$destinationdir/$packagename/pkginfo";
-                my $pkginfotmp = "$destinationdir/$packagename" . ".pkginfo.tmp";
-                $systemcall = "cp -p $pkginfoorig $pkginfotmp";
-                 make_systemcall($systemcall);
-            
-                $faspac = $$compressorref;
-                $infoline = "Found compressor: $faspac\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                installer::logger::print_message( "... $faspac ...\n" );
-                installer::logger::include_timestamp_into_logfile("Starting $faspac");
-
-                 $systemcall = "/bin/sh $faspac -a -q -d $destinationdir $packagename";	 # $faspac has to be the absolute path!
-                 make_systemcall($systemcall);
-             
-                 # Setting time stamp for pkginfo, because faspac-so.sh changed the pkginfo file, 
-                 # updated the size and checksum, but not the time stamp.
-                 $systemcall = "touch -r $pkginfotmp $pkginfoorig";
-                 make_systemcall($systemcall);
-                if ( -f $pkginfotmp ) { unlink($pkginfotmp); }
-            
-                installer::logger::include_timestamp_into_logfile("End of $faspac");
-            }
-            else
-            {
-                $infoline = "Not found: $faspac\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
-        }
-
-        # Setting unix rights to "775" for all created directories inside the package
-        
-        $systemcall = "cd $destinationdir; find $packagename -type d | xargs -i chmod 775 \{\} \;";
-        installer::logger::print_message( "... $systemcall ...\n" );
-
-        $returnvalue = system($systemcall);
-
-        $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        
-        if ($returnvalue)
-        {
-            $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        else
-        {
-            $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-
-
-        ######################
-        # making pkg files
-        ######################
-
-        # my $streamname = $packagename . ".pkg";
-        # $systemcall = "pkgtrans $destinationdir $streamname $packagename";
-        # print "... $systemcall ...\n";
-
-        # $returnvalue = system($systemcall);
-
-        # $infoline = "Systemcall: $systemcall\n";
-        # push( @installer::globals::logfileinfo, $infoline);
-
-        # if ($returnvalue)
-        # {
-        # $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        # push( @installer::globals::logfileinfo, $infoline);
-        # }
-        # else
-        # {
-        # $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        # push( @installer::globals::logfileinfo, $infoline);
-        # }
-
-        #########################
-        # making tar.gz files
-        #########################
-
-        # my $targzname = $packagename . ".tar.gz";
-        # $systemcall = "cd $destinationdir; tar -cf - $packagename | gzip > $targzname";
-        # print "... $systemcall ...\n";
-
-        # $returnvalue = system($systemcall);
-
-        # $infoline = "Systemcall: $systemcall\n";
-        # push( @installer::globals::logfileinfo, $infoline);
-
-        # if ($returnvalue)
-        # {
-        # $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        # push( @installer::globals::logfileinfo, $infoline);
-        # }
-        # else
-        # {
-        # $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        # push( @installer::globals::logfileinfo, $infoline);
-        # }
-
-    }
-
-    # Linux: rpm -bb so8m35.spec	( -> dependency check abklemmen? )
-
-    if ( $installer::globals::isrpmbuild )
-    {
-        my $specfilename = $epmdir . $packagename . ".spec";
-        if (! -f $specfilename) { installer::exiter::exit_program("ERROR: Did not find file: $specfilename", "create_packages_without_epm"); }
-
-        my $rpmcommand = $installer::globals::rpm;
-        my $rpmversion = determine_rpm_version();
-        
-        # saving globally for later usage
-        $installer::globals::rpmcommand = $rpmcommand;
-        $installer::globals::rpmquerycommand = "rpm";
-
-        my $target = "";
-        if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
-        elsif ( $installer::globals::compiler =~ /unxaigppc/) { $target = "ppc"; }
-        elsif ( $installer::globals::compiler =~ /unxlng/) {$target = (POSIX::uname())[4]; }
-        
-        # rpm 4.6 ignores buildroot tag in spec file
-
-        my $buildrootstring = "";
-
-        if ( $rpmversion >= 4 )
-        {
-            my $dir = getcwd;
-            my $buildroot = $dir . "/" . $epmdir . "buildroot/";
-            $buildrootstring = "--buildroot=$buildroot";
-            mkdir($buildroot = $dir . "/" . $epmdir . "BUILD/");
-        } 
-
-        if ( ! $installer::globals::rpminfologged )
-        {
-            log_rpm_info();
-            $installer::globals::rpminfologged = 1;
-        }
-
-        my $systemcall = "$rpmcommand -bb --define \"_unpackaged_files_terminate_build  0\" $specfilename --target $target $buildrootstring 2\>\&1 |";
-
-        installer::logger::print_message( "... $systemcall ...\n" );
-
-        my $maxrpmcalls = 3;
-        my $rpm_failed = 0;
-
-        for ( my $i = 1; $i <= $maxrpmcalls; $i++ )
-        {
-            my @rpmoutput = ();
-
-            open (RPM, "$systemcall");
-            while (<RPM>) {push(@rpmoutput, $_); }
-            close (RPM);
-
-            my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-            my $infoline = "Systemcall (Try $i): $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            for ( my $j = 0; $j <= $#rpmoutput; $j++ )
-            {
-                $rpmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig;
-                push( @installer::globals::logfileinfo, "$rpmoutput[$j]");
-            }
-            
-            if ($returnvalue)
-            {
-                $infoline = "Try $i : Could not execute \"$systemcall\"!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                $rpm_failed = 1;
-            }
-            else
-            {
-                installer::logger::print_message( "Success (Try $i): \"$systemcall\"\n" );
-                $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                $rpm_failed = 0;
-                last;
-            }
-        }
-        
-        if ( $rpm_failed )
-        {
-            # Because of the problems with LD_LIBARY_PATH, a direct call of local "rpm" or "rpmbuild" might be successful
-            my $rpmprog = "";
-            if ( -f "/usr/bin/rpmbuild" ) { $rpmprog = "/usr/bin/rpmbuild"; }
-            elsif ( -f "/usr/bin/rpm" ) { $rpmprog = "/usr/bin/rpm"; }
-            
-            if ( $rpmprog ne "" )
-            {
-                installer::logger::print_message( "... $rpmprog ...\n" );
-
-                my $helpersystemcall = "$rpmprog -bb $specfilename --target $target $buildrootstring 2\>\&1 |";
-
-                my @helperrpmoutput = ();
-
-                open (RPM, "$helpersystemcall");
-                while (<RPM>) {push(@helperrpmoutput, $_); }
-                close (RPM);
-
-                my $helperreturnvalue = $?;	# $? contains the return value of the systemcall
-
-                $infoline = "\nLast try: Using $rpmprog directly (problem with LD_LIBARY_PATH)\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                $infoline = "\nSystemcall: $helpersystemcall\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                for ( my $j = 0; $j <= $#helperrpmoutput; $j++ ) { push( @installer::globals::logfileinfo, "$helperrpmoutput[$j]"); }
-            
-                if ($helperreturnvalue)
-                {
-                    $infoline = "Could not execute \"$helpersystemcall\"!\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-                else
-                {
-                    installer::logger::print_message( "Success: \"$helpersystemcall\"\n" );
-                    $infoline = "Success: Executed \"$helpersystemcall\" successfully!\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    $rpm_failed = 0;
-                }
-            }
-            
-            # Now it is really time to exit this packaging process, if the error still occurs
-            if ( $rpm_failed ) { installer::exiter::exit_program("ERROR: \"$systemcall\"!", "create_packages_without_epm"); }
-        }
-    }
-}
-
-#################################################
-# Removing all temporary files created by epm
-#################################################
-
-sub remove_temporary_epm_files
-{
-    my ($epmdir, $loggingdir, $packagename) = @_;
-
-    # saving the files into the loggingdir
-
-    if ( $installer::globals::issolarispkgbuild )
-    {
-        my @extensions = ();
-        push(@extensions, ".pkginfo");
-        push(@extensions, ".prototype");
-        push(@extensions, ".postinstall");
-        push(@extensions, ".postremove");
-        push(@extensions, ".preinstall");
-        push(@extensions, ".preremove");
-        push(@extensions, ".depend");
-        
-        for ( my $i = 0; $i <= $#extensions; $i++ )
-        {
-            my $removefile = $epmdir . $packagename . $extensions[$i];
-            my $destfile = $loggingdir . $packagename . $extensions[$i] . ".log";
-
-            if (! -f $removefile) { next; }
-
-            my $systemcall = "mv -f $removefile $destfile";
-            system($systemcall);	 # ignoring the return value
-            $infoline = "Systemcall: $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-
-    if ( $installer::globals::isrpmbuild )
-    {
-        my $removefile = $epmdir . $packagename . ".spec";
-        my $destfile = $loggingdir . $packagename . ".spec.log";
-
-        my $systemcall = "mv -f $removefile $destfile";
-        system($systemcall);	 # ignoring the return value
-        $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        # removing the directory "buildroot"
-    
-        my $removedir = $epmdir . "buildroot";
-    
-        $systemcall = "rm -rf $removedir";
-        
-        installer::logger::print_message( "... $systemcall ...\n" );
-
-        my $returnvalue = system($systemcall);
-
-        $removedir = $epmdir . "BUILD";
-    
-        $systemcall = "rm -rf $removedir";
-        
-        installer::logger::print_message( "... $systemcall ...\n" );
-
-        $returnvalue = system($systemcall);
-
-
-        my $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        
-        if ($returnvalue)
-        {
-            $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        else
-        {
-            $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }	
-}
-
-######################################################
-# Making the systemcall
-######################################################
-
-sub make_systemcall
-{
-    my ($systemcall) = @_;
-
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}	
-
-###########################################################
-# Creating a better directory structure in the solver.
-###########################################################
-
-sub create_new_directory_structure
-{
-    my ($newepmdir) = @_;
-    
-    my $newdir = $installer::globals::epmoutpath;
-    
-    if ( $installer::globals::isrpmbuild )
-    {
-        my $rpmdir;
-                my $machine = "";
-        if ( $installer::globals::compiler =~ /unxlngi/) { 
-                    $rpmdir = "$installer::globals::epmoutpath/RPMS/i586";
-                }
-        elsif ( $installer::globals::compiler =~ /unxaigppc/) {
-                    $machine = "ppc";
-                    $rpmdir = "$installer::globals::epmoutpath/RPMS/$machine";
-                }
-        elsif ( $installer::globals::compiler =~ /unxlng/) { 
-                    $machine = (POSIX::uname())[4]; 
-                    $rpmdir = "$installer::globals::epmoutpath/RPMS/$machine"; 
-                }
-                else { installer::exiter::exit_program("ERROR: rpmdir undefined !", "create_new_directory_structure"); }
-
-        my $systemcall = "mv $rpmdir/* $newdir";	# moving the rpms into the directory "RPMS"
-
-        my $returnvalue = system($systemcall);
-
-        my $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        
-        if ($returnvalue)
-        {
-            $infoline = "ERROR: Could not move content of \"$rpmdir\" to \"$newdir\"!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        else
-        {
-            $infoline = "Success: Moved content of \"$rpmdir\" to \"$newdir\"!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-
-        # and removing the empty directory
-
-        if ( $machine ne "" )
-        {
-            installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/$machine");
-        }
-        installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/powerpc");
-        installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/x86_64");
-        installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i586");
-        installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i386");
-        installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS");
-
-    }
-        
-    # Setting unix rights to "775" for $newdir ("RPMS" or "packages")
-    chmod 0775, $newdir;
-}
-
-######################################################
-# Collect modules with product specific styles.
-######################################################
-
-sub collect_modules_with_style
-{
-    my ($style, $modulesarrayref) = @_;
-
-    my @allmodules = ();
-
-    for ( my $i = 0; $i <= $#{$modulesarrayref}; $i++ )
-    {				
-        my $onemodule = ${$modulesarrayref}[$i];
-        my $styles = "";
-        if ( $onemodule->{'Styles'} ) { $styles = $onemodule->{'Styles'}; }
-        if ( $styles =~ /\b\Q$style\E\b/ )
-        {
-            push(@allmodules, $onemodule);
-        }
-    }
-    
-    return \@allmodules;
-}
-
-######################################################
-# Remove modules without packagecontent.
-######################################################
-
-sub remove_modules_without_package
-{
-    my ($allmodules) = @_;
-    
-    my @allmodules = ();
-
-    for ( my $i = 0; $i <= $#{$allmodules}; $i++ )
-    {				
-        my $onemodule = ${$allmodules}[$i];
-        my $packagename = "";
-        if ( $onemodule->{'PackageName'} ) { $packagename = $onemodule->{'PackageName'}; }
-        if ( $packagename ne "" )
-        {
-            push(@allmodules, $onemodule);
-        }
-    }
-    
-    return \@allmodules;
-}
-
-######################################################
-# Unpacking tar.gz file and setting new packagename.
-######################################################
-
-sub unpack_tar_gz_file
-{
-    my ($packagename, $destdir) = @_;
-
-    my $newpackagename = "";
-
-    if ( $packagename =~ /\.tar\.gz\s*$/ )
-    {
-        # Collecting all packages in directory "packages"
-        my $oldcontent = installer::systemactions::read_directory($destdir);
-
-        # unpacking gunzip
-        my $systemcall = "cd $destdir; cat $packagename | gunzip | tar -xf -";
-        make_systemcall($systemcall);
-                        
-        # deleting the tar.gz files
-        $systemcall = "cd $destdir; rm -f $packagename";
-        make_systemcall($systemcall);
-        
-        # Finding new content -> that is the package name
-        my ($newcontent, $allcontent ) = installer::systemactions::find_new_content_in_directory($destdir, $oldcontent);
-        $newpackagename = ${$newcontent}[0];
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$newpackagename);
-    }
-    
-    if ( $newpackagename ne "" ) { $packagename = $newpackagename; }
-    
-    return $packagename;
-}
-
-######################################################
-# Copying files of child projects.
-######################################################
-
-sub copy_childproject_files
-{
-    my ($allmodules, $sopackpath, $destdir, $modulesarrayref, $allvariables, $subdir, $includepatharrayref, $use_sopackpath) = @_;
-    
-    for ( my $i = 0; $i <= $#{$allmodules}; $i++ )
-    {
-        my $localdestdir = $destdir;				
-        my $onemodule = ${$allmodules}[$i];
-        my $packagename = $onemodule->{'PackageName'};
-        my $sourcefile = "";
-        if ( $use_sopackpath )
-        {
-            $sourcefile = $sopackpath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::separator . $subdir . $installer::globals::separator . $packagename;
-        }
-        else
-        {
-            my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$packagename, $includepatharrayref, 1);
-            $sourcefile = $$sourcepathref;
-        }
-
-        if ( ! -f $sourcefile ) { installer::exiter::exit_program("ERROR: File not found: $sourcefile ($packagename) !", "copy_childproject_files"); }
-        if ( $onemodule->{'Subdir'} )
-        {
-            $localdestdir = $localdestdir . $installer::globals::separator . $onemodule->{'Subdir'};
-            if ( ! -d $localdestdir ) { installer::systemactions::create_directory($localdestdir); }
-        }
-        installer::systemactions::copy_one_file($sourcefile, $localdestdir);
-        # Solaris: unpacking tar.gz files and setting new packagename
-        if ( $installer::globals::issolarispkgbuild ) { $packagename = unpack_tar_gz_file($packagename, $localdestdir); }
-
-        if (( $installer::globals::isxpdplatform ) && ( $allvariables->{'XPDINSTALLER'} ))
-        {
-            installer::xpdinstaller::create_xpd_file_for_childproject($onemodule, $localdestdir, $packagename, $allvariableshashref, $modulesarrayref);
-        }
-    }				
-
-}
-
-######################################################
-# Copying files for system integration.
-######################################################
-
-sub copy_and_unpack_tar_gz_files
-{
-    my ($sourcefile, $destdir) = @_;
-
-    my $systemcall = "cd $destdir; cat $sourcefile | gunzip | tar -xf -";
-    make_systemcall($systemcall);		
-}
-
-######################################################
-# Including child packages into the
-# installation set.
-######################################################
-
-sub put_childprojects_into_installset
-{
-    my ($newdir, $allvariables, $modulesarrayref, $includepatharrayref) = @_;
-
-    my $infoline = "";
-
-    my $sopackpath = "";
-    if ( $ENV{'SO_PACK'} ) { $sopackpath  = $ENV{'SO_PACK'}; }
-    else { installer::exiter::exit_program("ERROR: Environment variable SO_PACK not set!", "put_childprojects_into_installset"); }
-
-    my $destdir = "$newdir";
-
-    # adding Java
-
-    my $sourcefile = "";
-
-    # Finding the modules defined in scp (with flag JAVAMODULE, ADAMODULE, ...)
-    # Getting name of package from scp-Module
-    # Copy file into installation set
-    # Create xpd file and put it into xpd directory
-    # xpd file has to be created completely from module and package itself (-> no packagelist!)
-
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {
-        # Collect all modules with flag "JAVAMODULE"
-        my $allmodules = collect_modules_with_style("JAVAMODULE", $modulesarrayref);
-        $allmodules = remove_modules_without_package($allmodules);
-        copy_childproject_files($allmodules, $sopackpath, $destdir, $modulesarrayref, $allvariables, "jre", $includepatharrayref, 1);
-    }
-
-    # Adding additional required packages (freetype).
-    # This package names are stored in global array @installer::globals::requiredpackages
-    
-    if ( $allvariables->{'ADDREQUIREDPACKAGES'} )
-    {
-        # Collect all modules with flag "REQUIREDPACKAGEMODULE"
-        my $allmodules = collect_modules_with_style("REQUIREDPACKAGEMODULE", $modulesarrayref);
-        $allmodules = remove_modules_without_package($allmodules);
-        copy_childproject_files($allmodules, $sopackpath, $destdir, $modulesarrayref, $allvariables, "requiredpackages", $includepatharrayref, 1);
-    }
-
-    # Collect all modules with flag "USERLANDMODULE"
-    my $alluserlandmodules = collect_modules_with_style("USERLANDMODULE", $modulesarrayref);
-    $alluserlandmodules = remove_modules_without_package($alluserlandmodules);
-    copy_childproject_files($alluserlandmodules, $sopackpath, $destdir, $modulesarrayref, $allvariables, "", $includepatharrayref, 0);
-
-}
-
-######################################################
-# Checking whether the new content is a directory and 
-# not a package. If it is a directory, the complete 
-# content of the directory has to be added to the
-# array newcontent.
-######################################################
-
-sub control_subdirectories
-{
-    my ($content, $subdir) = @_;
-    
-    my @newcontent = ();
-
-    for ( my $i = 0; $i <= $#{$content}; $i++ )
-    {				
-        if ( -d ${$content}[$i] )
-        {
-            $subdir = ${$content}[$i];
-            installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$subdir);
-            my $allpackages = installer::systemactions::read_directory(${$content}[$i]);
-            for ( my $j = 0; $j <= $#{$allpackages}; $j++ )
-            {
-                # Currently only Linux rpm is supported, debian packages cannot be installed via xpd installer
-                if (( $installer::globals::islinuxbuild ) && ( ! ( ${$allpackages}[$j] =~ /\.rpm\s*$/ ))) { next; }
-                push(@newcontent, ${$allpackages}[$j]);
-            }
-        }
-        else
-        {
-            push(@newcontent, ${$content}[$i]);
-        }
-    }
-
-    return (\@newcontent, $subdir);
-}
-
-######################################################
-# Including the system integration files into the
-# installation sets.
-######################################################
-
-sub put_systemintegration_into_installset
-{
-    my ($newdir, $includepatharrayref, $allvariables, $modulesarrayref) = @_;
-
-    my $destdir = $newdir;
-
-    # adding System integration files
-
-    my $sourcefile = "";
-
-    # Finding the modules defined in scp (with flag SYSTEMMODULE)
-    # Getting name of package from scp-Module
-    # Search package in list off all include files
-    # Copy file into installation set and unpack it (always tar.gz)	
-    # Create xpd file and put it into xpd directory
-    # tar.gz can contain a different number of packages -> automatically create hidden sub modules
-    # xpd file has to be created completely from module and package itself (-> no packagelist!)
-
-    # Collect all modules with flag "SYSTEMMODULE"
-    my $allmodules = collect_modules_with_style("SYSTEMMODULE", $modulesarrayref);
-    $allmodules = remove_modules_without_package($allmodules);
-
-    for ( my $i = 0; $i <= $#{$allmodules}; $i++ )
-    {	
-        my $onemodule = ${$allmodules}[$i];
-        my $packagetarfilename = $onemodule->{'PackageName'};
-
-        my $infoline = "Including into installation set: $packagetarfilename\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$packagetarfilename, $includepatharrayref, 1);
-        if ( $$sourcepathref eq "" ) { installer::exiter::exit_program("ERROR: Source path not found for $packagetarfilename!", "copy_systemintegration_files"); }
-
-        # Collecting all packages in directory "packages" or "RPMS"
-        my $oldcontent = installer::systemactions::read_directory($destdir);
-
-        copy_and_unpack_tar_gz_files($$sourcepathref, $destdir);
-        
-        # Finding new content -> that is the package name
-        my ($newcontent, $allcontent ) = installer::systemactions::find_new_content_in_directory($destdir, $oldcontent);
-
-        # special handling, if new content is a directory
-        my $subdir = "";
-        if ( ! $installer::globals::issolarispkgbuild ) { ($newcontent, $subdir) = control_subdirectories($newcontent); }
-        
-        # Adding license content into Solaris packages
-        if (( $installer::globals::issolarispkgbuild ) && ( $installer::globals::englishlicenseset ) && ( ! $variableshashref->{'NO_LICENSE_INTO_COPYRIGHT'} )) { installer::worker::add_license_into_systemintegrationpackages($destdir, $newcontent); }
-
-        if (( $installer::globals::isxpdplatform ) && ( $allvariables->{'XPDINSTALLER'} ))
-        {
-            installer::xpdinstaller::create_xpd_file_for_systemintegration($onemodule, $newcontent, $modulesarrayref, $subdir);
-        }
-    }
-}
-
-######################################################
-# Analyzing the Unix installation path.
-# From the installation path /opt/openofficeorg20
-# is the part /opt relocatable and the part
-# openofficeorg20 static.
-######################################################
-
-sub analyze_rootpath
-{
-    my ($rootpath, $staticpathref, $relocatablepathref, $allvariables) = @_;
-    
-    $rootpath =~ s/\/\s*$//;	# removing ending slash
-
-    ##############################################################
-    # Version 3: "/" is variable and "/opt/openofficeorg20" fixed
-    ##############################################################
-
-    $$relocatablepathref = "/";
-    # Static path has to contain the office directory name. This is replaced in shellscripts.
-    $$staticpathref = $rootpath . $installer::globals::separator . $installer::globals::officedirhostname;
-    # For RPM version 3.x it is required, that Prefix is not "/" in spec file. In this case --relocate will not work,
-    # because RPM 3.x says, that the package is not relocatable. Therefore we have to use Prefix=/opt and for 
-    # all usages of --relocate this path has to be on both sides of the "=": --relocate /opt=<myselectdir>/opt .
-    if ( $installer::globals::isrpmbuild )
-    { 
-        $$relocatablepathref = $rootpath . "\/"; # relocatable path must end with "/", will be "/opt/"
-        $$staticpathref = $installer::globals::officedirhostname; # to be used as replacement in shell scripts
-    }
-
-    if ( $installer::globals::isdebbuild )
-    {
-        $$relocatablepathref = "";
-        # $$staticpathref is already "/opt/openoffice.org3", no additional $rootpath required.
-    }
-        
-}
-
-######################################################
-# Including license and readme into
-# Unix installation sets.
-######################################################
-
-sub put_installsetfiles_into_installset
-{
-    my ($destdir) = @_;
-    
-    # All files for the installation set are saved in the global
-    # array @installer::globals::installsetfiles
-    
-    for ( my $i = 0; $i <= $#installer::globals::installsetfiles; $i++ )
-    {
-        my $onefile = $installer::globals::installsetfiles[$i];
-        my $sourcefile = $onefile->{'sourcepath'};
-        my $destfile = "";
-        $destfile = $destdir . $installer::globals::separator . $onefile->{'Name'};
-        installer::systemactions::copy_one_file($sourcefile, $destfile);
-        
-        my $infoline = "Adding to installation set \"$destfile\" from source \"$sourcefile\".\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-######################################################
-# Replacing one variable in patchinfo file 
-######################################################
-
-sub replace_one_variable_in_file
-{
-    my ( $file, $placeholder, $value ) = @_;
-
-    for ( my $i = 0; $i <= $#{$file}; $i++ )
-    {
-        ${$file}[$i] =~ s/$placeholder/$value/g;
-    }
-}
-
-######################################################
-# Setting variables in the patchinfo file 
-######################################################
-
-sub set_patchinfo
-{
-    my ( $patchinfofile, $patchid, $allvariables ) = @_;
-
-    # Setting: PATCHIDPLACEHOLDER and ARCHITECTUREPLACEHOLDER and PATCHCORRECTSPLACEHOLDER
-    
-    replace_one_variable_in_file($patchinfofile, "PATCHIDPLACEHOLDER", $patchid);
-    
-    my $architecture = "";
-    if ( $installer::globals::issolarissparcbuild ) { $architecture = "sparc"; } 
-    if ( $installer::globals::issolarisx86build ) { $architecture = "i386"; }
-    
-    replace_one_variable_in_file($patchinfofile, "ARCHITECTUREPLACEHOLDER", $architecture);
-    
-    if ( ! $allvariables->{'SOLARISPATCHCORRECTS'} ) { installer::exiter::exit_program("ERROR: No setting for PATCH_CORRECTS in zip list file!", "set_patchinfo"); }
-    my $patchcorrects = $allvariables->{'SOLARISPATCHCORRECTS'};
-
-    replace_one_variable_in_file($patchinfofile, "PATCHCORRECTSPLACEHOLDER", $patchcorrects);
-    
-    # Setting also PATCH_REQUIRES in patch info file, if entry in zip list file exists
-    my $requiresstring = "";
-    if ( $installer::globals::issolarissparcbuild ) { $requiresstring = "SOLSPARCPATCHREQUIRES"; } 
-    if ( $installer::globals::issolarisx86build ) { $requiresstring = "SOLIAPATCHREQUIRES"; }
-
-    if ( $allvariables->{$requiresstring} )
-    {
-        my $newline = "PATCH_REQUIRES=\"" . $allvariables->{$requiresstring} . "\"" . "\n";
-        push(@{$patchinfofile}, $newline);
-    }
-}
-
-######################################################
-# Finalizing patch: Renaming directory and 
-# including additional patch files.
-######################################################
-
-sub finalize_patch
-{
-    my ( $newepmdir, $allvariables ) = @_;
-
-    my $patchidname = "SOLSPARCPATCHID";
-    if ( $installer::globals::issolarisx86build ) { $patchidname = "SOLIAPATCHID"; }
-
-    if ( ! $allvariables->{$patchidname} ) { installer::exiter::exit_program("ERROR: Variable $patchidname not defined in zip list file!", "finalize_patch"); }
-    my $patchid = $allvariables->{$patchidname};
-    installer::systemactions::rename_directory($newepmdir, $patchid);
-    
-    # Copying all typical patch files into the patch directory
-    # All patch file names are stored in @installer::globals::solarispatchfiles
-    # Location of the file is $installer::globals::patchincludepath
-    
-    my $sourcepath = $installer::globals::patchincludepath;
-    $sourcepath =~ s/\/\s*$//;
-    
-    for ( my $i = 0; $i <= $#installer::globals::solarispatchfiles; $i++ )
-    {
-        my $sourcefile = $sourcepath . $installer::globals::separator . $installer::globals::solarispatchfiles[$i];
-        my $destfile = $patchid . $installer::globals::separator . $installer::globals::solarispatchfiles[$i];
-        installer::systemactions::copy_one_file($sourcefile, $destfile);
-    }	
-
-    # And editing the patchinfo file
-    
-    my $patchinfofilename = $patchid . $installer::globals::separator . "patchinfo";
-    my $patchinfofile = installer::files::read_file($patchinfofilename);
-    set_patchinfo($patchinfofile, $patchid, $allvariables);
-    installer::files::save_file($patchinfofilename, $patchinfofile);	
-}
-
-######################################################
-# Finalizing Linux patch: Renaming directory and 
-# including additional patch files.
-######################################################
-
-sub finalize_linux_patch
-{
-    my ( $newepmdir, $allvariables, $includepatharrayref ) = @_;
-    
-    # Copying the setup into the patch directory
-    # and including the list of RPMs into it	
-
-    print "... creating patch setup ...\n";
-
-    installer::logger::include_header_into_logfile("Creating Linux patch setup:");
-
-    # find and read setup script template
-    
-    my $scriptfilename = "linuxpatchscript.sh";
-    my $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfilename, $includepatharrayref, 0);
-    if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find patch script template $scriptfilename!", "finalize_linux_patch"); }
-    my $scriptfile = installer::files::read_file($$scriptref);
-
-    my $infoline = "Found  script file $scriptfilename: $$scriptref \n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # Collecting all RPMs in the patch directory
-
-    my $fileextension = "rpm";
-    my $rpmfiles = installer::systemactions::find_file_with_file_extension($fileextension, $newepmdir);
-    if ( ! ( $#{$rpmfiles} > -1 )) { installer::exiter::exit_program("ERROR: Could not find rpm in directory $newepmdir!", "finalize_linux_patch"); } 
-    for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ ) { installer::pathanalyzer::make_absolute_filename_to_relative_filename(\${$rpmfiles}[$i]); }
-
-    # Searching packagename containing -core01
-    my $found_package = 0;
-    my $searchpackagename = "";
-    for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ )
-    {
-        if ( ${$rpmfiles}[$i] =~ /-core01-/ )
-        {
-            $searchpackagename = ${$rpmfiles}[$i];
-            $found_package = 1;
-            if ( $searchpackagename =~ /^\s*(.*?-core01)-.*/ ) { $searchpackagename = $1; }
-            last;	
-        }
-    }
-    
-    if ( ! $found_package ) { installer::exiter::exit_program("ERROR: No package containing \"-core01\" found in directory \"$newepmdir\"", "finalize_linux_patch"); }
-
-    # Replacing the searchpackagename
-    for ( my $j = 0; $j <= $#{$scriptfile}; $j++ ) { ${$scriptfile}[$j] =~ s/SEARCHPACKAGENAMEPLACEHOLDER/$searchpackagename/; }
-
-    # Setting the PRODUCTDIRECTORYNAME to $installer::globals::officedirhostname
-    for ( my $j = 0; $j <= $#{$scriptfile}; $j++ ) { ${$scriptfile}[$j] =~ s/PRODUCTDIRECTORYNAME/$installer::globals::officedirhostname/; }
-
-    # Replacing the productname
-    my $productname = $allvariables->{'PRODUCTNAME'};
-    $productname = lc($productname);
-    $productname =~ s/ /_/g;	# abc office -> abc_office
-
-    $infoline = "Adding productname $productname into Linux patch script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $j = 0; $j <= $#{$scriptfile}; $j++ ) { ${$scriptfile}[$j] =~ s/PRODUCTNAMEPLACEHOLDER/$productname/; }
-
-    # Saving the file
-
-    my $newscriptfilename = "setup";
-    installer::files::save_file($newscriptfilename, $scriptfile);	
-
-    $infoline = "Saved Linux patch setup $newscriptfilename \n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # Setting unix rights 755
-    chmod 0755, $newscriptfilename;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/existence.pm b/solenv/bin/modules/installer/existence.pm
deleted file mode 100644
index 509afe94c..000000000
--- a/solenv/bin/modules/installer/existence.pm
+++ /dev/null
@@ -1,190 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::existence;
-
-#############################
-# Test of existence
-#############################
-
-sub exists_in_array
-{
-    my ($searchstring, $arrayref) = @_;
-
-    my $alreadyexists = 0;
-    
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        if ( ${$arrayref}[$i] eq $searchstring)
-        {
-            $alreadyexists = 1;
-            last;
-        }
-    }
-    
-    return $alreadyexists;
-}
-
-sub exists_in_array_of_hashes
-{
-    my ($searchkey, $searchvalue, $arrayref) = @_;
-
-    my $valueexists = 0;
-
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        my $hashref = ${$arrayref}[$i];
-        
-        if ( $hashref->{$searchkey} eq $searchvalue )
-        {
-            $valueexists = 1;
-            last;
-        }
-    }
-    
-    return $valueexists;
-}
-
-#####################################################################
-# Returning a specified file as base for the new
-# configuration file, defined by its "gid"
-#####################################################################
-
-sub get_specified_file
-{
-    my ($filesarrayref, $searchgid) = @_;
-
-    my $foundfile = 0;
-    my $onefile;
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        $onefile = ${$filesarrayref}[$i];
-        my $filegid = $onefile->{'gid'};
-
-        if ( $filegid eq $searchgid )
-        {
-            $foundfile = 1;
-            last;	
-        }
-    }
-
-    my $errorline = "ERROR: Could not find file $searchgid in list of files!";
-
-    if ( $installer::globals::patch) { $errorline = "ERROR: Could not find file $searchgid in list of files! intro.bmp must be part of every patch. Please assign the flag PATCH in scp2 project."; }
-
-    if (!($foundfile))
-    {
-        installer::exiter::exit_program($errorline, "get_specified_file");
-    }
-        
-    return $onefile;
-}
-
-#####################################################################
-# Returning a specified file as base for a new file,
-# defined by its "Name"
-#####################################################################
-
-sub get_specified_file_by_name
-{
-    my ($filesarrayref, $searchname) = @_;
-
-    my $foundfile = 0;
-    my $onefile;
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        $onefile = ${$filesarrayref}[$i];
-        my $filename = $onefile->{'Name'};
-
-        if ( $filename eq $searchname )
-        {
-            $foundfile = 1;
-            last;	
-        }
-    }
-
-    if (!($foundfile))
-    {
-        installer::exiter::exit_program("ERROR: Could not find file $searchname in list of files!", "get_specified_file_by_name");
-    }
-        
-    return $onefile;
-}
-
-#####################################################################
-# Checking existence of a specific file, defined by its "Name"
-#####################################################################
-
-sub filename_exists_in_filesarray
-{
-    my ($filesarrayref, $searchname) = @_;
-
-    my $foundfile = 0;
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $filename = $onefile->{'Name'};
-
-        if ( $filename eq $searchname )
-        {
-            $foundfile = 1;
-            last;	
-        }
-    }
-        
-    return $foundfile;
-}
-
-#####################################################################
-# Checking existence of a specific file, defined by its "gid"
-#####################################################################
-
-sub filegid_exists_in_filesarray
-{
-    my ($filesarrayref, $searchgid) = @_;
-
-    my $foundfile = 0;
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $filegid = $onefile->{'gid'};
-
-        if ( $filegid eq $searchgid )
-        {
-            $foundfile = 1;
-            last;	
-        }
-    }
-        
-    return $foundfile;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm
deleted file mode 100644
index 0eba05761..000000000
--- a/solenv/bin/modules/installer/exiter.pm
+++ /dev/null
@@ -1,113 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::exiter;
-
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::systemactions;
-use installer::worker;
-
-############################################
-# Exiting the program with an error
-# This function is used instead of "die"
-############################################
-
-sub exit_program
-{
-    my ($message, $function) = @_;
-
-    # If an installation set is currently created, the directory name is saved in $installer::globals::saveinstalldir
-    # If this directory name matches with "_inprogress", it has to be renamed into "_witherror"
-    
-    if ( $installer::globals::saveinstalldir =~ /_inprogress/ ) { installer::systemactions::rename_string_in_directory($installer::globals::saveinstalldir, "_inprogress", "_witherror");	}
-
-    # Cleaning files from pool tooling
-    if ( $installer::globals::processhaspoolcheckfile ) { unlink $installer::globals::poolcheckfilename; }
-    if ( $installer::globals::processhaspoollockfile ) { unlink $installer::globals::poollockfilename; }
-
-    installer::worker::clean_output_tree();	# removing directories created in the output tree
-
-    # If @installer::globals::logfileinfo is not empty, it can be used.
-    # Otherwise the content of @installer::globals::globallogfileinfo has to be used.
-
-    my $infoline;
-
-    $installer::globals::logfilename = $installer::globals::exitlog . $installer::globals::logfilename;
-
-    if ( ! $installer::globals::globalinfo_copied ) { installer::logger::copy_globalinfo_into_logfile(); }
-
-    if ( $#installer::globals::logfileinfo > -1 )
-    {
-        $infoline = "\n***************************************************************\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    
-        $infoline = "$message\n";
-        push(@installer::globals::logfileinfo, $infoline);
-
-        $infoline = "in function: $function\n";
-        push(@installer::globals::logfileinfo, $infoline);
-
-        $infoline = "***************************************************************\n";
-        push(@installer::globals::logfileinfo, $infoline);
-
-        installer::files::save_file($installer::globals::logfilename ,\@installer::globals::logfileinfo);	
-    }
-    else
-    {
-        $infoline = "\n***************************************************************\n";
-        push(@installer::globals::globallogfileinfo, $infoline);
-    
-        $infoline = "$message\n";
-        push(@installer::globals::globallogfileinfo, $infoline);
-
-        $infoline = "in function: $function\n";
-        push(@installer::globals::globallogfileinfo, $infoline);
-
-        $infoline = "***************************************************************\n";
-        push(@installer::globals::globallogfileinfo, $infoline);		
-
-        installer::files::save_file($installer::globals::logfilename ,\@installer::globals::globallogfileinfo);
-    }
-    installer::logger::print_error("$message\nin function: $function");
-    installer::logger::print_error("Saved logfile: $installer::globals::logfilename\n");
-
-    # Saving the debug info
-
-    if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog);	}
-
-    installer::logger::stoptime();
-
-    if (defined($installer::globals::exithandler)) {
-        &$installer::globals::exithandler;
-    }
-    
-    exit(-1);	
-}
-
-1;
diff --git a/solenv/bin/modules/installer/files.pm b/solenv/bin/modules/installer/files.pm
deleted file mode 100644
index 6d3801799..000000000
--- a/solenv/bin/modules/installer/files.pm
+++ /dev/null
@@ -1,219 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::files;
-
-use installer::exiter;
-use installer::logger;
-
-############################################
-# File Operations
-############################################
-
-sub check_file
-{
-    my ($arg) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::check_file : $arg"); }
-
-    if(!( -f $arg ))
-    {
-        installer::exiter::exit_program("ERROR: Cannot find file $arg", "check_file");
-    }
-}
-
-sub read_file
-{
-    my ($localfile) = @_;
-    my @localfile = ();
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::read_file : $localfile"); }
-
-    open( IN, "<$localfile" ) || installer::exiter::exit_program("ERROR: Cannot open file $localfile for reading", "read_file");
-
-#	Don't use "my @localfile = <IN>" here, because
-#	perl has a problem with the internal "large_and_huge_malloc" function
-#	when calling perl using MacOS 10.5 with a perl built with MacOS 10.4
-    while ( $line = <IN> ) {
-        push @localfile, $line;
-    }
-
-    close( IN );
-
-    return \@localfile;
-}
-
-###########################################
-# Saving files, arrays and hashes
-###########################################
-
-sub save_file
-{
-    my ($savefile, $savecontent) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::save_file : $savefile : $#{$savecontent}"); }
-
-    if ( open( OUT, ">$savefile" ) )
-    {
-        print OUT @{$savecontent};
-        close( OUT);	
-    }
-    else
-    {
-        # it is useless to save a log file, if there is no write access
-        
-        if ( $savefile =~ /\.log/ )
-        {
-            print "\n*************************************************\n";
-            print "ERROR: Cannot write log file: $savefile"; 
-            print "\n*************************************************\n";
-            exit(-1);	# exiting the program to avoid endless loops
-        }
-        
-        installer::exiter::exit_program("ERROR: Cannot open file $savefile for writing", "save_file");	
-    }
-}
-
-sub save_hash
-{
-    my ($savefile, $hashref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::save_hash : $savefile"); }
-
-    my @printcontent = ();
-    
-    my $itemkey;
-        
-    foreach $itemkey ( keys %{$hashref} )
-    {
-        my $line = "";
-        my $itemvalue = $hashref->{$itemkey};
-        $line = $itemkey . "=" . $itemvalue . "\n";
-        push(@printcontent, $line);
-    }
-
-    open( OUT, ">$savefile" ) || installer::exiter::exit_program("ERROR: Cannot open file $savefile for writing", "save_hash");
-    print OUT @printcontent;
-    close( OUT);
-}
-
-sub save_array_of_hashes
-{
-    my ($savefile, $arrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::save_array_of_hashes : $savefile : $#{$arrayref}"); }
-
-    my @printcontent = ();
-            
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {		
-        my $line = "";
-        my $hashref = ${$arrayref}[$i];
-        my $itemkey;
-            
-        foreach $itemkey ( keys %{$hashref} )
-        {
-            my $itemvalue = $hashref->{$itemkey};
-            $line = $line . $itemkey . "=" . $itemvalue . "\t";
-        }
-
-        $line = $line . "\n";
-        
-        push(@printcontent, $line);
-    }
-
-    open( OUT, ">$savefile" ) || installer::exiter::exit_program("ERROR: Cannot open file $savefile for writing", "save_array_of_hashes");
-    print OUT @printcontent;
-    close( OUT);
-}
-
-sub save_array_of_hashes_modules
-{
-    my ($savefile, $arrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::save_array_of_hashes : $savefile : $#{$arrayref}"); }
-
-    my @printcontent = ();
-            
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {		
-        my $line = "***************************************************\n";
-        my $hashref = ${$arrayref}[$i];
-        my $itemkey;
-            
-        foreach $itemkey ( keys %{$hashref} )
-        {
-            my $itemvalue = $hashref->{$itemkey};
-            $line = $line . $itemkey . "=" . $itemvalue . "\n";
-        }
-
-        $line = $line . "\n";
-        
-        push(@printcontent, $line);
-    }
-
-    open( OUT, ">$savefile" ) || installer::exiter::exit_program("ERROR: Cannot open file $savefile for writing", "save_array_of_hashes");
-    print OUT @printcontent;
-    close( OUT);
-}
-
-###########################################
-# Binary file operations
-###########################################
-
-sub read_binary_file
-{
-    my ($filename) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::read_binary_file : $filename"); }
-
-    my $file;
-
-    open( IN, "<$filename" ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "read_binary_file");
-    binmode IN;
-    seek IN, 0, 2;
-    my $length = tell IN;
-    seek IN, 0, 0;
-    read IN, $file, $length;
-    close IN;
-
-    return $file;
-}
-
-sub save_binary_file
-{
-    my ($file, $filename) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::save_binary_file : $filename"); }
-
-    open( OUT, ">$filename" ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for writing", "save_binary_file");
-    binmode OUT;
-    print OUT $file;
-    close OUT;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm
deleted file mode 100644
index c3f921486..000000000
--- a/solenv/bin/modules/installer/followme.pm
+++ /dev/null
@@ -1,217 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::followme;
-
-use File::Spec;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::systemactions;
-
-####################################################
-# Creating a file, that contains all information
-# to create a follow up process.
-####################################################
-
-sub save_followme_info
-{
-    my ($finalinstalldir, $includepatharrayref, $allvariableshashref, $downloadname, $languagestringref, $languagesarrayref, $current_install_number, $loggingdir, $installlogdir) = @_;
-
-    my $downloadinfofilename = $installer::globals::logfilename;
-    if ( $installer::globals::updatepack ) { $downloadinfofilename =~ s/log_/log_$current_install_number\_/; }
-    $downloadinfofilename =~ s/log_/follow_me_/;
-    
-    # Creating directory 
-    my $downloadinfodir = installer::systemactions::create_directory_next_to_directory($finalinstalldir, "follow_me");
-    
-    my @filecontent = ();
-
-    push(@filecontent, "finalinstalldir: $finalinstalldir\n");
-    push(@filecontent, "downloadname: $downloadname\n");
-    push(@filecontent, "currentinstallnumber: $current_install_number\n");
-    push(@filecontent, "loggingdir: $loggingdir\n");
-    push(@filecontent, "installlogdir: $installlogdir\n");
-    push(@filecontent, "languagestring: $$languagestringref\n");
-    foreach my $element ( @{$languagesarrayref} ) { push(@filecontent, "languagesarray: $element\n"); }
-    foreach my $path ( @{$includepatharrayref} ) { push(@filecontent, "includepatharray: $path"); }
-    foreach my $key ( sort keys %{$allvariableshashref} ) { push(@filecontent, "allvariableshash: $key : $allvariableshashref->{$key}\n"); }
-    push(@filecontent, "globals:updatepack: $installer::globals::updatepack\n");
-    push(@filecontent, "globals:added_english: $installer::globals::added_english\n");
-    push(@filecontent, "globals:iswindowsbuild: $installer::globals::iswindowsbuild\n");
-    push(@filecontent, "globals:issolarisbuild: $installer::globals::issolarisbuild\n");
-    push(@filecontent, "globals:issolarispkgbuild: $installer::globals::issolarispkgbuild\n");
-    push(@filecontent, "globals:issolarissparcbuild: $installer::globals::issolarissparcbuild\n");
-    push(@filecontent, "globals:issolarisx86build: $installer::globals::issolarisx86build\n");
-    push(@filecontent, "globals:isfreebsdpkgbuild: $installer::globals::isfreebsdpkgbuild\n");
-    push(@filecontent, "globals:islinuxbuild: $installer::globals::islinuxbuild\n");
-    push(@filecontent, "globals:isrpmbuild: $installer::globals::isrpmbuild\n");
-    push(@filecontent, "globals:islinuxintelrpmbuild: $installer::globals::islinuxintelrpmbuild\n");
-    push(@filecontent, "globals:islinuxppcrpmbuild: $installer::globals::islinuxppcrpmbuild\n");
-    push(@filecontent, "globals:islinuxx86_64rpmbuild: $installer::globals::islinuxx86_64rpmbuild\n");
-    push(@filecontent, "globals:isdebbuild: $installer::globals::isdebbuild\n");
-    push(@filecontent, "globals:islinuxinteldebbuild: $installer::globals::islinuxinteldebbuild\n");
-    push(@filecontent, "globals:islinuxppcdebbuild: $installer::globals::islinuxppcdebbuild\n");
-    push(@filecontent, "globals:islinuxx86_64debbuild: $installer::globals::islinuxx86_64debbuild\n");
-    push(@filecontent, "globals:issolaris: $installer::globals::issolaris\n");
-    push(@filecontent, "globals:islinux: $installer::globals::islinux\n");
-    push(@filecontent, "globals:unpackpath: $installer::globals::unpackpath\n");
-    push(@filecontent, "globals:idttemplatepath: $installer::globals::idttemplatepath\n");
-    push(@filecontent, "globals:idtlanguagepath: $installer::globals::idtlanguagepath\n");
-    push(@filecontent, "globals:logfilename: $installer::globals::logfilename\n");
-    push(@filecontent, "globals:product: $installer::globals::product\n");
-    push(@filecontent, "globals:patch: $installer::globals::patch\n");
-    push(@filecontent, "globals:languagepack: $installer::globals::languagepack\n");
-    push(@filecontent, "globals:helppack: $installer::globals::helppack\n");
-    push(@filecontent, "globals:installertypedir: $installer::globals::installertypedir\n");
-    push(@filecontent, "globals:max_lang_length: $installer::globals::max_lang_length\n");
-    push(@filecontent, "globals:compiler: $installer::globals::compiler\n");
-    push(@filecontent, "globals:product: $installer::globals::product\n");
-    push(@filecontent, "globals:minor: $installer::globals::minor\n");
-    push(@filecontent, "globals:lastminor: $installer::globals::lastminor\n");
-    push(@filecontent, "globals:nsisfilename: $installer::globals::nsisfilename\n");
-
-    # Saving file
-    installer::files::save_file($downloadinfodir . $installer::globals::separator . $downloadinfofilename, \@filecontent);
-    installer::logger::print_message( "... creating \"follow me\" info file $downloadinfofilename.\n" );
-}
-
-####################################################
-# Reading the file, that contains all information
-# to create a follow up process.
-####################################################
-
-sub read_followme_info
-{
-    my ( $filename ) = @_;
-
-    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file: $filename", "read_download_info"); }
-
-    installer::logger::print_message( "\n... reading \"follow me\" info file $filename\n" );
-
-    my %contenthash = ();
-    
-    my $finalinstalldir = "";
-    my $downloadname = "";
-    my $currentinstallnumber = "";
-    my $loggingdir = "";
-    my $installlogdir = "";
-    my $languagestring = "";
-    my @includepatharray = ();
-    my @languagesarray = ();
-    my %allvariableshash = ();
-
-    # Global variables can be set directly
-
-    my $filecontent = installer::files::read_file($filename);
-
-    # First line has to contain the string "finalinstalldir:".
-    # Otherwise this is not a correct file.
-    
-    
-    if ( ! ( ${$filecontent}[0] =~ /s*finalinstalldir:\s*(.*?)\s*$/ )) { installer::exiter::exit_program("ERROR: Not a correct download info file: $filename", "read_download_info"); } 
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        my $line = ${$filecontent}[$i];
-
-        if ( $line =~ /^\s*finalinstalldir:\s*(.*?)\s*$/ ) { $finalinstalldir = $1; }
-        if( $^O =~ /cygwin/i ) { $finalinstalldir =~ s/\\/\//; }
-        if ( $line =~ /^\s*downloadname:\s*(.*?)\s*$/ ) { $downloadname = $1; }
-        if ( $line =~ /^\s*currentinstallnumber:\s*(.*?)\s*$/ ) { $currentinstallnumber = $1; }
-        if ( $line =~ /^\s*loggingdir:\s*(.*?)\s*$/ ) { $loggingdir = $1; }
-        if( $^O =~ /cygwin/i ) { $loggingdir =~ s/\\/\//; }
-        if ( $line =~ /^\s*installlogdir:\s*(.*?)\s*$/ ) { $installlogdir = $1; }
-        if( $^O =~ /cygwin/i ) { $installlogdir =~ s/\\/\//; }
-        if ( $line =~ /^\s*languagestring:\s*(.*?)\s*$/ ) { $languagestring = $1; }
-        if ( $line =~ /^\s*languagesarray:\s*(.*?)\s*$/ ) { push(@languagesarray, $1); }
-        if ( $line =~ /^\s*includepatharray:\s*(.*?)\s*$/ )
-        {
-            my $path = $1;
-            if( $^O =~ /cygwin/i ) { $path  =~ s/\\/\//; }
-            push(@includepatharray, $path . "\n");
-        }
-        if ( $line =~ /^\s*allvariableshash:\s*(.*?)\s*:\s*(.*?)\s*$/ ) { $allvariableshash{$1} = $2; }
-        if ( $line =~ /^\s*globals:(.*?)\s*:\s*(.*?)\s*$/ )
-        {
-            my $name = $1;
-            my $value = $2;
-            if ( $name eq "updatepack" ) { $installer::globals::updatepack = $value; }
-            if ( $name eq "added_english" ) { $installer::globals::added_english = $value; }
-            if ( $name eq "iswindowsbuild" ) { $installer::globals::iswindowsbuild = $value; }
-            if ( $name eq "issolarisbuild" ) { $installer::globals::issolarisbuild = $value; }
-            if ( $name eq "issolarispkgbuild" ) { $installer::globals::issolarispkgbuild = $value; }
-            if ( $name eq "issolarissparcbuild" ) { $installer::globals::issolarissparcbuild = $value; }
-            if ( $name eq "issolarisx86build" ) { $installer::globals::issolarisx86build = $value; }
-            if ( $name eq "isfreebsdpkgbuild" ) { $installer::globals::isfreebsdpkgbuild = $value; }
-            if ( $name eq "islinuxbuild" ) { $installer::globals::islinuxbuild = $value; }
-            if ( $name eq "isrpmbuild" ) { $installer::globals::isrpmbuild = $value; }
-            if ( $name eq "islinuxintelrpmbuild" ) { $installer::globals::islinuxintelrpmbuild = $value; }
-            if ( $name eq "islinuxppcrpmbuild" ) { $installer::globals::islinuxppcrpmbuild = $value; }
-            if ( $name eq "islinuxx86_64rpmbuild" ) { $installer::globals::islinuxx86_64rpmbuild = $value; }
-            if ( $name eq "isdebbuild" ) { $installer::globals::isdebbuild = $value; }
-            if ( $name eq "islinuxinteldebbuild" ) { $installer::globals::islinuxinteldebbuild = $value; }
-            if ( $name eq "islinuxppcdebbuild" ) { $installer::globals::islinuxppcdebbuild = $value; }
-            if ( $name eq "islinuxx86_64debbuild" ) { $installer::globals::islinuxx86_64debbuild = $value; }
-            if ( $name eq "issolaris" ) { $installer::globals::issolaris = $value; }
-            if ( $name eq "islinux" ) { $installer::globals::islinux = $value; }
-            if ( $name eq "unpackpath" ) { $installer::globals::unpackpath = $value; }
-            if( $^O =~ /cygwin/i ) { $installer::globals::unpackpath =~ s/\\/\//; }
-            if ( $name eq "idttemplatepath" ) { $installer::globals::idttemplatepath = $value; }
-            if( $^O =~ /cygwin/i ) { $installer::globals::idttemplatepath =~ s/\\/\//; }
-            if ( $name eq "idtlanguagepath" ) { $installer::globals::idtlanguagepath = $value; }
-            if( $^O =~ /cygwin/i ) { $installer::globals::idtlanguagepath =~ s/\\/\//; }
-            if ( $name eq "logfilename" ) { $installer::globals::logfilename = $value; }
-            if ( $name eq "product" ) { $installer::globals::product = $value; }
-            if ( $name eq "patch" ) { $installer::globals::patch = $value; }
-            if ( $name eq "languagepack" ) { $installer::globals::languagepack = $value; }
-            if ( $name eq "helppack" ) { $installer::globals::helppack = $value; }
-            if ( $name eq "installertypedir" ) { $installer::globals::installertypedir = $value; }
-            if ( $name eq "max_lang_length" ) { $installer::globals::max_lang_length = $value; }
-            if ( $name eq "compiler" ) { $installer::globals::compiler = $value; }
-            if ( $name eq "product" ) { $installer::globals::product = $value; }
-            if ( $name eq "minor" ) { $installer::globals::minor = $value; }
-            if ( $name eq "lastminor" ) { $installer::globals::lastminor = $value; }
-            if ( $name eq "nsisfilename" ) { $installer::globals::nsisfilename = $value; }
-        }
-    }
-    
-    $contenthash{'finalinstalldir'} = $finalinstalldir;
-    $contenthash{'downloadname'} = $downloadname;
-    $contenthash{'currentinstallnumber'} = $currentinstallnumber;
-    $contenthash{'loggingdir'} = $loggingdir;
-    $contenthash{'installlogdir'} = $installlogdir;
-    $contenthash{'languagestring'} = $languagestring;
-    $contenthash{'languagesarray'} = \@languagesarray;
-    $contenthash{'includepatharray'} = \@includepatharray;
-    $contenthash{'allvariableshash'} = \%allvariableshash;
-    
-    return \%contenthash;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
deleted file mode 100644
index c35cad690..000000000
--- a/solenv/bin/modules/installer/globals.pm
+++ /dev/null
@@ -1,550 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::globals;
-
-############################################
-# Global settings
-############################################
-
-BEGIN
-{	
-    $prog="make_installer.pl";
-
-    @noMSLocaleLangs = (
-        "br",
-        "bs",
-        "dz",
-        "gu",
-        "km",
-        "nr",
-        "ns",
-        "nso",
-        "rw",
-        "ss",
-        "st",
-        "tg",
-        "ts",
-        "tn",
-        "ve",
-        "xh",
-        "zu",
-        "ne",
-        "bn",
-        "bn-BD",
-        "bn-IN",
-        "lo",
-        "cy",
-        "ku",
-        "as-IN",
-        "te-IN",
-        "ml-IN",
-        "mr-IN",
-        "ur-IN",
-        "ta-IN",
-        "or-IN",
-        "ti-ER",
-        "eo",
-        "ka",
-        "ga",
-        "uk",
-        "gd",
-        "my",
-        "mai",
-        "brx",
-        "dgo",
-        "kok",
-        "mni",
-        "ca-XV",
-        "sat",
-        "ug",
-        "om",
-        "si",
-        "or",
-        "oc",
-        "ml",
-        "as",
-        "ast",
-        "ht",
-        "jbo",
-        "fur",
-        "ny",
-        "so",
-        "kab",
-        "tk"
-    );
-    @items_at_modules = ("Files", "Dirs", "Unixlinks");
-    @asianlanguages = ("ja", "ko", "zh-CN", "zh-TW");
-    @bidilanguages = ("ar", "he");
-    
-    $ziplistname = "";
-    $pathfilename = "";
-    $setupscriptname = "";
-    $headerfilename = "";
-    $shellscriptsfilename = "";
-    $product = "";
-    $languagelist = "";
-    $added_english = 0;
-    $set_office_start_language = 0;
-    $solarjavaset = 0;
-
-    $destdir = "";
-    $rootpath = "";
-    
-    $required_dotnet_version = "2.0.0.0";
-    $productextension = "";
-    @languageproducts = ();
-    $build = "";
-    $minor = "";
-    $lastminor = "";
-    $compiler = "";
-    $pro = 0;
-    $dounzip = 1;
-    $languages_defined_in_productlist = 0;
-    $setupscript_defined_in_productlist = 0;
-    $islinux = 0;	
-    $issolaris = 0;
-    $ismacosx = 0;
-    $iswindowsbuild = 0;
-    $islinuxbuild = 0;
-    $isrpmbuild = 0;
-    $isdebbuild = 0;
-    $islinuxintelrpmbuild = 0;
-    $islinuxppcrpmbuild = 0;
-    $islinuxinteldebbuild = 0;
-    $islinuxppcdebbuild = 0;
-    $islinuxx86_64rpmbuild = 0;
-    $islinuxx86_64debbuild = 0;
-    $issolarisbuild = 0;
-    $issolarispkgbuild = 0;
-    $issolarissparcbuild = 0;
-    $issolarisx86build = 0;
-    $isfreebsdbuild = 0;
-    $isfreebsdpkgbuild = 0;
-    $ismacbuild = 0;
-    $ismacdmgbuild = 0;
-    $unpackpath = "";
-    $idttemplatepath = "";
-    $idtlanguagepath = "";
-    $packjobref = "";
-    $buildid = "Not set";
-    $guidcounter = 1000; # for uniqueness of guids
-    $fontsfolder = "FontsFolder";
-    $fontsfoldername = "Fonts";
-    $fontsdirparent = "";
-    $fontsdirname = "";
-    $fontsdirhostname = "truetype";
-    $officefolder = "OfficeFolder";
-    $officemenufolder = "OfficeMenuFolder";
-    $startupfolder = "StartupFolder";
-    $startmenufolder = "StartMenuFolder";
-    $desktopfolder = "DesktopFolder";
-    $programfilesfolder = "ProgramFilesFolder";
-    $commonfilesfolder = "CommonFilesFolder";
-    $commonappdatafolder = "CommonAppDataFolder";
-    $localappdatafolder = "LocalAppDataFolder";
-    $templatefolder = "TemplateFolder";
-    $templatefoldername = "Templates";
-    $programmenufolder = "ProgramMenuFolder";
-    $systemfolder = "SystemFolder";
-    $encodinglistname = "msi-encodinglist.txt";
-    $msiencoding = "";	# hash reference for msi encodings
-    $msilanguage = "";	# hash reference for msi languages LCID
-    $sofficeiconadded = 0;
-    $temppath = "";
-    $globaltempdirname = "ooopackaging";
-    $cyg_temppath = "";
-    $temppathdefined = 0;
-    $jdstemppathdefined = 0;
-    $packageversion = 1;
-    $packagerevision = 1;
-    $rpm = "";
-    $rpmcommand = "";
-    $rpmquerycommand = "";
-    $rpminfologged = 0;
-    $debian = "";
-    $installertypedir = "";
-    $controlledmakecabversion = "5";
-    $saved_packages_path = "";
-    $max_lang_length = 50;
-    $globalblock = "Globals";
-    $rootmodulegid = "";
-    %alllangmodules = ();
-    $englishlicenseset = 0;
-    $englishlicense = "";
-    $englishsolarislicensename = "LICENSE"; # _en-US";
-    $solarisdontcompress = 0;
-    $patharray = "";
-    
-    $is_special_epm = 0;
-    $epm_in_path = 0;
-    $epm_path = "";
-    $epmoutpath = "";
-    $upx_in_path = 0;
-    $upxfile = "";
-    $simple = 0;
-    $simpledefaultuserdir = "\$ORIGIN/..";
-    $call_epm = 1;
-    $packageformat = "";
-    $packagename = "";
-    $packagelist = "";
-    $addpackagelist = "";
-    $is_unix_multi = 0;
-    $unixmultipath = "";
-    $unixmultipath_orig = "";
-    $alllanguagesinproductarrayref = "";
-    $shiptestdirectory = "";
-    $makelinuxlinkrpm = 0;
-    $linuxlinkrpmprocess = 0;
-    $add_required_package = "";
-    $linuxrespin = 0;
-    @linuxpatchfiles = ();
-    $linuxlibrarybaselevel = "1";
-    $linuxlibrarypatchlevel = "1.1";
-    @linuxlinks = ();
-    @linkrpms = ();
-    $archiveformat = "";
-    $minorupgradekey = "";
-    $updatelastsequence = 0;
-    $updatesequencecounter = 0;
-    $updatedatabase = 0;
-    $updatedatabasepath = "";
-    $pfffileexists = 0;
-    $pffcabfilename = "ooobasis3.0_pff.cab";
-    $mergemodulenumber = 0;
-    %allmergemodulefilesequences = ();
-    %newupdatefiles = ();
-    %allusedupdatesequences = ();
-    %mergemodulefiles = ();
-    $mergefiles_added_into_collector = 0;
-    $creating_windows_installer_patch = 0;
-    
-    $strip = 1;
-    
-    $globallogging = 0;
-    $globalloggingform21 = 1;
-    $logfilename = "logfile.log";	# the default logfile name for global errors
-    @logfileinfo = ();
-    @errorlogfileinfo = ();
-    @globallogfileinfo = ();
-    $ignore_error_in_logfile = 0;
-    $exitlog = "";
-    $globalinfo_copied = 0;
-    $quiet = 0;
-    $nodownload = 0;
-    $writetotemp = 0;
-    $useminor = 0;
-    $followme_from_directory = 0;
-    $internal_cabinet_signing = 0;
-
-    $debug = 0;
-    $debugfilename = "debug.txt";
-    $checksumfilename = "checksum.txt";
-    @functioncalls = ();
-
-    $ismultilingual = 0;
-    @multilanguagemodules = ();
-    $languagemodulesbase = "gid_Module_Root_";
-    %alluniquefilenames = ();
-    %alllcuniquefilenames = ();
-    %uniquefilenamesequence = ();
-    %dependfilenames = ();
-    $isopensourceproduct = 1;
-    $manufacturer = "";
-    $longmanufacturer = "";
-    $sundirname = "Oracle";
-    $codefilename = "codes.txt";
-    $componentfilename = "components.txt";	
-    $productcode = "";
-    $upgradecode = "";
-    $msiproductversion = "";
-    $msimajorproductversion = "";
-    $created_new_component_guid = 0;
-    @allddffiles = ();
-    $infodirectory = "";
-    @currentcontent = ();
-    @installsetcontent = ();
-    %xpdpackageinfo = ();
-    $signfiles_checked = 0;
-    $dosign = 0;
-    $pwfile = "";
-    $pwfile = "";
-    $pfxfile = "";
-
-    %mergemodules = ();
-    %merge_media_line = ();
-    %merge_allfeature_hash = ();
-    %merge_alldirectory_hash = ();
-    %copy_msm_files = ();
-    $mergefeaturecollected = 0;
-    $mergedirectoriescollected = 0;
-    $lastsequence_before_merge = 0;
-    $lastcabfilename = "";
-    
-    $createdxpddefaultlang = 0;
-    $xpddir = "";
-    $productxpdfile = "setup.xpd";
-    $xpd_files_prepared = 0;
-    $defaultlanguage = "";
-    @createdxpdfiles = ();
-    @allxpdfiles = ();
-    $isxpdplatform = 0;
-    $javalanguagepath = "";
-    $javasettozero = 0;
-    $addlicensefile = 1;
-    $addsystemintegration = 0;
-    $added_directories = 0;	
-    $makedownload = 1;
-    $makejds = 1;
-    $jdsexcludefilename = "";
-    $jds_language_controlled = 0;
-    $correct_jds_language = 0;
-    @installsetfiles = ();
-    @binarytableonlyfiles = ();
-    @allscpactions = ();
-    $languagepackaddon = "LanguagePack";
-    $helppackaddon = "HelpPack";
-    $patchaddon = "Patch";
-    $ooodownloadfilename = "";
-    $downloadfilename = "";
-    $downloadfileextension = "";
-    $followmeinfofilename = "";
-    $oooversionstring = "";
-    $shellnewfilesadded = 0;
-    %multilingual_only_modules = ();
-    %application_modules = ();
-    $defaultinstallorder = 1000;
-    $defaultsystemintinstallorder = 1200;
-
-    $is_copy_only_project = 0;
-    $is_simple_packager_project = 0;
-    $patch_user_dir = 0;
-    $addchildprojects = 0;
-    $languagepack = 0;
-    $helppack = 0;
-    $tab = 0;
-    $patch = 0;
-    $patchincludepath = "";
-    $refresh_includepathes = 0;
-    $include_pathes_read = 0;
-    $patchfilelistname = "patchfilelist.txt";
-    @patchfilecollector = ();
-    $nopatchfilecollector = "";
-    @userregistrycollector = ();
-    $addeduserregitrykeys = 0;
-    $poolpathset = 0;
-    $poolpath = 0;
-    $poollockfilename = "";
-    $poolcheckfilename = "";
-    %poolshiftedpackages = ();
-    %poolpackages = ();
-    %createpackages = ();
-    $processhaspoolcheckfile = 0;
-    $processhaspoollockfile = 0;
-    $newpcfcontentcalculated = 0;
-    $sessionid = 0;
-    $sessionidset = 0;
-    $savelockfilecontent = "";
-    $savelockfilename = "";
-    $getuidpath = "";
-    $getuidpathset = 0;
-    $newpcfcontent = "";
-    %pcfdifflist = ();
-    @pcfdiffcomment = ();
-    @epmdifflist = ();
-    $desktoplinkexists = 0;
-    $sundirexists = 0;
-    $analyze_spellcheckerlanguage = 0;
-    %spellcheckerlanguagehash = ();
-    %spellcheckerfilehash = ();
-    $registryrootcomponent = "";
-    %allcomponents = ();
-    %allcomponents_in_this_database = ();
-    %allshortcomponents = ();
-    %alluniquedirectorynames = ();
-    %allregistrycomponents_ = ();
-    %allregistrycomponents_in_this_database_ = ();
-    %allshortregistrycomponents = ();
-    %allregistryidentifier = ();
-    
-    $installlocationdirectory = "";
-    $installlocationdirectoryset = 0;
-    $vendordirectory = "";
-    $vendordirectoryset = 0;
-    $officeinstalldirectory = "";
-    $officeinstalldirectoryset = 0;
-    $basisinstalldirectory = "";
-    $basisinstalldirectoryset = 0;
-    $ureinstalldirectory = "";
-    $ureinstalldirectoryset = 0;
-    $rootbrandpackage = "";
-    $rootbrandpackageset = 0;
-    $officedirhostname = "";
-    $basisdirhostname = "";
-    $uredirhostname = "";
-    $sundirhostname = "";
-    $officedirgid = "";
-    $basisdirgid = "";
-    $uredirgid = "";
-    $sundirgid = "";
-    
-    %sign_extensions = ("dll" => "1", "exe" => "1", "cab" => "1");
-    %treestyles = ();
-    %installlocations = ("INSTALLLOCATION" => "1");
-    %treelayername = ();
-    %hostnametreestyles = ();
-    %treeconditions = ();
-    %usedtreeconditions = ();
-    %moduledestination = ();
-    
-    $one_cab_file = 0;
-    $fix_number_of_cab_files = 1;
-    $cab_file_per_component = 0;
-    $cabfilecompressionlevel = 21; # Using LZX compression, possible values are: 15 | 16 | ... | 21 (best compression)
-    $number_of_cabfiles = 1;	# only for $fix_number_of_cab_files = 1 
-    $include_cab_in_msi = 0;
-    $use_packages_for_cabs = 0;
-    $msidatabasename = "";
-    $prepare_winpatch = 0;
-    $previous_idt_dir = "";	
-    $updatepack = 0;
-    $msitranpath = "";
-    $insert_file_at_end = 0;
-    $newfilesexist = 0;
-    $usesharepointpath = 0;
-    %newfilescollector = ();
-
-    $saveinstalldir = "";
-    $csp_installdir = "";       # global installdir of createsimplepackage() in simplepackage.pm
-    $csp_installlogdir = "";    # global installlogdir of createsimplepackage() in simplepackage.pm
-    $csp_languagestring = "";   # global languagestring of createsimplepackage() in simplepackage.pm
-    $localunpackdir = "";
-    $localinstalldirset = 0;
-    $localinstalldir = "";
-
-    $javafilename = "";
-    $javafilename2 = "";
-    $javafilename3 = "";
-    $javafile = "";
-    $urefile = "";
-
-    $postprocess_specialepm = 0;
-    $postprocess_standardepm = 0;
-    $mergemodules_analyzed = 0;
-    
-    $starttime = "";
-
-    @solarispatchscripts = ("checkinstall", "copyright", "patch_checkinstall", "patch_postinstall", "postinstall", "preinstall", "i.none");
-    @solarispatchscriptsforextensions = ("checkinstall", "copyright", "patch_checkinstall", "patch_postinstall_extensions", "postinstall_extensions", "preinstall", "i.none");
-    @solarispatchfiles = (".diPatch", "patchinfo");
-    @environmentvariables = ( "SOLARVERSION", "GUI", "WORK_STAMP", "OUTPATH", "LOCAL_OUT", "LOCAL_COMMON_OUT" );
-    @packagelistitems = ("module", "solarispackagename", "packagename", "copyright", "vendor", "description" );
-    @languagepackfeature =();
-    @helppackfeature =();
-    @featurecollector =();
-    $msiassemblyfiles = "";
-    $nsisfilename = "Nsis";
-    $macinstallfilename = "macinstall.ulf";
-    $nsis204 = 0;
-    $nsis231 = 0;
-    $unicodensis = 0;
-    $linuxlinkrpms = "";
-    $extensioninstalldir = "gid_Dir_Share_Extension_Install";
-    @languagenames = ();
-    @requiredpackages = ();
-    %componentcondition = ();
-    %componentid = ();
-    %comparecomponentname = ();
-    %languageproperties = ();
-    %allcabinets = ();
-    %allcabinetassigns = ();
-    %cabfilecounter = ();
-    %lastsequence = ();
-    %dontdeletecomponents = ();
-    %allcalculated_guids = ();
-    %calculated_component_guids = ();
-    %base_independent_components = ();
-    %all_english_languagestrings = ();
-    %all_required_english_languagestrings = ();
-
-    @forced_properties = ("SERVICETAG_PRODUCTNAME", "SERVICETAG_PRODUCTVERSION", "SERVICETAG_PARENTNAME", "SERVICETAG_SOURCE", "SERVICETAG_URN");
-    
-    @removedirs = ();
-    @jdsremovedirs = ();
-    @emptypackages = ();
-    %fontpackageexists = ();
-
-    $exithandler = undef;
-
-    $plat = $^O;
-
-    if ( $plat =~ /cygwin/i )
-    {
-        $zippath = "zip";					# Has to be in the path: /usr/bin/zip
-        $checksumfile = "so_checksum";
-        $unopkgfile = "unopkg.exe";
-        $separator = "/";
-        $pathseparator = "\:";
-        $libextension = "\.dll";
-        $isunix = 0;
-        $iswin = 1;
-                $archiveformat = ".zip";
-        %savedmapping = ();
-        %savedrevmapping = ();
-        %savedrev83mapping = ();
-        %saved83dirmapping = ();
-    }
-    else
-    { 
-        $zippath = "zip";					# Has to be in the path: /usr/bin/zip
-        $checksumfile = "so_checksum";
-        $unopkgfile = "unopkg";
-        $separator = "/";
-        $pathseparator = "\:";
-        if ( $plat =~ /darwin/i )
-        {
-            $libextension = "\.dylib";
-        }
-        else
-        {
-            $libextension = "\.so";  
-        }
-        $archiveformat = ".tar.gz";
-        $isunix = 1;
-        $iswin = 0;
-    }
-
-    if ( $plat =~ /linux/i ) { $islinux = 1; } 
-    if ( $plat =~ /kfreebsd/i ) { $islinux = 1; } 
-    if ( $plat =~ /solaris/i ) { $issolaris = 1; } 
-    if ( $plat =~ /darwin/i ) { $ismacosx = 1; }
-
-    # ToDo: Needs to be expanded for additional platforms
-
-}
-
-1;
diff --git a/solenv/bin/modules/installer/helppack.pm b/solenv/bin/modules/installer/helppack.pm
deleted file mode 100644
index e5b674c93..000000000
--- a/solenv/bin/modules/installer/helppack.pm
+++ /dev/null
@@ -1,537 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::helppack;
-
-use installer::converter;
-use installer::existence;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::scpzipfiles;
-use installer::scriptitems;
-use installer::systemactions;
-use installer::worker;
-
-sub select_help_items
-{
-    my ( $itemsref, $languagesarrayref, $itemname ) = @_;
-
-    installer::logger::include_header_into_logfile("Selecting items for help pack. Item: $itemname");
-
-    my @itemsarray = ();
-
-    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
-    {
-        my $oneitem = ${$itemsref}[$i];
-
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-
-        if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
-        {
-            # Files with style "HELPPACK" and "FORCEHELPPACK" also have to be included into the help pack.
-            # Files with style "HELPPACK" are only included into help packs.
-            # Files with style "FORCEHELPPACK" are included into help packs and non help packs. They are
-            # forced, because otherwise they not not be included into helppacks.
-
-            my $ismultilingual = $oneitem->{'ismultilingual'};
-
-            if ($ismultilingual)
-            {
-                my $specificlanguage = "";
-                if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; }
-
-            for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ )   # iterating over all languages
-                {
-                    my $onelanguage = ${$languagesarrayref}[$j];
-                    my $locallang = $onelanguage;
-                    $locallang =~ s/-/_/;
-
-                    if ( $specificlanguage eq $onelanguage )
-                    {
-                    push(@itemsarray, $oneitem);
-                    }
-                }
-            }
-            else
-            {
-                push(@itemsarray, $oneitem);
-            }
-        }
-    }
-
-    return \@itemsarray;
-}
-
-sub replace_languagestring_variable
-{
-    my ($onepackageref, $languagestringref) = @_;
-
-    my $key;
-
-    foreach $key (keys %{$onepackageref})
-    {
-        my $value = $onepackageref->{$key};
-        $value =~ s/\%LANGUAGESTRING/$$languagestringref/g;
-        $onepackageref->{$key} = $value;
-    }
-}
-
-#########################################################
-# Including the license text into the script template
-#########################################################
-
-sub put_license_file_into_script
-{
-    my ($scriptfile, $licensefile) = @_;
-
-    my $infoline = "Adding licensefile into help pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $includestring = "";
-
-    for ( my $i = 0; $i <= $#{$licensefile}; $i++ )
-    {
-        $includestring = $includestring . ${$licensefile}[$i];
-    }
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/LICENSEFILEPLACEHOLDER/$includestring/;
-    }
-}
-
-#########################################################
-# Creating a tar.gz file from a Solaris package
-#########################################################
-
-sub create_tar_gz_file
-{
-    my ($installdir, $packagename, $packagestring) = @_;
-
-    $packagename =~ s/\.rpm\s*$//;
-    my $targzname = $packagename . ".tar.gz";
-    $systemcall = "cd $installdir; tar -cf - $packagestring | gzip > $targzname";
-    installer::logger::print_message( "... $systemcall ...\n" );
-
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    return $targzname;
-}
-
-#########################################################
-# Determining the name of the package file
-#########################################################
-
-sub get_packagename_from_packagelist
-{
-    my ( $alldirs, $allvariables, $languagestringref ) = @_;
-
-    # my $packagename = "";
-
-    # for ( my $i = 0; $i <= $#{$alldirs}; $i++ )
-    # {
-    #   if ( ${$alldirs}[$i] =~ /-fonts/ ) { next; }
-    #   if ( ${$alldirs}[$i] =~ /-help/ ) { next; }
-    #   if ( ${$alldirs}[$i] =~ /-res/ ) { next; }
-    #
-    #   $packagename = ${$alldirs}[$i];
-    #   last;
-    # }
-
-    # if ( $packagename eq "" ) { installer::exiter::exit_program("ERROR: Could not find base package in directory $installdir!", "get_packagename_from_packagelist"); }
-
-    my $localproductname = $allvariables->{'PRODUCTNAME'};
-    $localproductname = lc($localproductname);
-    $localproductname =~ s/ //g;
-    $localproductname =~ s/-/_/g;
-
-    my $packagename = $localproductname . "_" . $$languagestringref;
-
-    return $packagename;
-}
-
-#########################################################
-# Determining the name of the package file or the rpm
-# in the installation directory. For help packs
-# there is only one file in this directory
-#########################################################
-
-sub determine_packagename
-{
-    my ( $installdir, $allvariables, $languagestringref ) = @_;
-
-    my $packagename = "";
-    my $allnames = "";
-
-    if ( $installer::globals::isrpmbuild )
-    {
-        # determining the rpm file in directory $installdir
-
-        my $fileextension = "rpm";
-        my $rpmfiles = installer::systemactions::find_file_with_file_extension($fileextension, $installdir);
-        if ( ! ( $#{$rpmfiles} > -1 )) { installer::exiter::exit_program("ERROR: Could not find package in directory $installdir!", "determine_packagename"); }
-        my $rpmsav = [@{$rpmfiles}];
-        for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ ) { installer::pathanalyzer::make_absolute_filename_to_relative_filename(\${$rpmfiles}[$i]); }
-
-        $packagename = get_packagename_from_packagelist($rpmfiles, $allvariables, $languagestringref);
-
-        my $packagestring = installer::converter::convert_array_to_space_separated_string($rpmfiles);
-        $packagename = create_tar_gz_file($installdir, $packagename, $packagestring);   # only one file
-        for ( my $i = 0; $i <= $#{$rpmsav}; $i++ )
-        {
-            my $onefile = $installdir . $installer::globals::separator . ${$rpmsav}[$i];
-            unlink($onefile);
-        }
-
-        $allnames = $rpmfiles;
-    }
-
-    if ( $installer::globals::issolarisbuild )
-    {
-        # determining the Solaris package file in directory $installdir
-        my $alldirs = installer::systemactions::get_all_directories($installdir);
-
-        if ( ! ( $#{$alldirs} > -1 )) { installer::exiter::exit_program("ERROR: Could not find package in directory $installdir!", "determine_packagename"); }
-        my $alldirssav = [@{$alldirs}];
-        for ( my $i = 0; $i <= $#{$alldirs}; $i++ ) { installer::pathanalyzer::make_absolute_filename_to_relative_filename(\${$alldirs}[$i]); }
-
-        $packagename = get_packagename_from_packagelist($alldirs, $allvariables, $languagestringref);
-        my $packagestring = installer::converter::convert_array_to_space_separated_string($alldirs);
-        $packagename = create_tar_gz_file($installdir, $packagename, $packagestring);   # only a file (not a directory) can be included into the shell script
-        for ( my $i = 0; $i <= $#{$alldirssav}; $i++ ) { installer::systemactions::remove_complete_directory(${$alldirssav}[$i], 1); }
-        $allnames = $alldirs;
-    }
-
-    my $infoline = "Found package in installation directory $installdir : $packagename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    return ( $packagename, $allnames);
-}
-
-#########################################################
-# Including the name of the package file or the rpm
-# into the script template
-#########################################################
-
-sub put_packagename_into_script
-{
-    my ($scriptfile, $packagename, $allnames) = @_;
-
-    my $localpackagename = $packagename;
-    $localpackagename =~ s/\.tar\.gz//; # making "OOOopenoffice-it-ea.tar.gz" to "OOOopenoffice-it-ea"
-    my $infoline = "Adding packagename $localpackagename into help pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $installline = "";
-
-    if ( $installer::globals::issolarisbuild ) { $installline = "  /usr/sbin/pkgadd -d \$outdir -a \$adminfile"; }
-
-    if ( $installer::globals::isrpmbuild ) { $installline = "  rpm --prefix \$PRODUCTINSTALLLOCATION --replacepkgs -i"; }
-
-    for ( my $i = 0; $i <= $#{$allnames}; $i++ )
-    {
-        if ( $installer::globals::issolarisbuild ) { $installline = $installline . " ${$allnames}[$i]"; }
-
-        if ( $installer::globals::isrpmbuild ) { $installline = $installline . " \$outdir/${$allnames}[$i]"; }
-    }
-
-    for ( my $j = 0; $j <= $#{$scriptfile}; $j++ )
-    {
-        ${$scriptfile}[$j] =~ s/INSTALLLINES/$installline/;
-    }
-}
-
-##################################################################
-# Including the lowercase product name into the script template
-##################################################################
-
-sub put_productname_into_script
-{
-    my ($scriptfile, $variableshashref) = @_;
-
-    my $productname = $variableshashref->{'PRODUCTNAME'};
-    $productname = lc($productname);
-    $productname =~ s/\.//g;    # openoffice.org -> openofficeorg
-
-    my $infoline = "Adding productname $productname into help pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/PRODUCTNAMEPLACEHOLDER/$productname/;
-    }
-}
-
-##################################################################
-# Including the full product name into the script template
-# (name and version)
-##################################################################
-
-sub put_fullproductname_into_script
-{
-    my ($scriptfile, $variableshashref) = @_;
-
-    my $productname = $variableshashref->{'PRODUCTNAME'};
-    my $productversion = "";
-    if ( $variableshashref->{'PRODUCTVERSION'} ) { $productversion = $variableshashref->{'PRODUCTVERSION'}; };
-    my $fullproductname = $productname . " " . $productversion;
-
-    my $infoline = "Adding full productname \"$fullproductname\" into help pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/FULLPRODUCTNAMELONGPLACEHOLDER/$fullproductname/;
-    }
-}
-
-##################################################################
-# Including the name of the search package (-core01)
-# into the script template
-##################################################################
-
-sub put_searchpackage_into_script
-{
-    my ($scriptfile, $variableshashref) = @_;
-
-    my $basispackageprefix = $variableshashref->{'BASISPACKAGEPREFIX'};
-    my $basispackageversion = $variableshashref->{'OOOBASEVERSION'};
-
-    if ( $installer::globals::issolarisbuild ) { $basispackageversion =~ s/\.//g; } # "3.0" -> "30"
-
-    my $infoline = "Adding basis package prefix $basispackageprefix into help pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    $infoline = "Adding basis package version $basispackageversion into help pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/BASISPACKAGEPREFIXPLACEHOLDER/$basispackageprefix/;
-        ${$scriptfile}[$i] =~ s/OOOBASEVERSIONPLACEHOLDER/$basispackageversion/;
-    }
-
-}
-
-#########################################################
-# Including the linenumber into the script template
-#########################################################
-
-sub put_linenumber_into_script
-{
-    my ( $scriptfile, $licensefile, $allnames ) = @_;
-
-    my $linenumber =  $#{$scriptfile} + $#{$licensefile} + 3;   # also adding the content of the license file!
-
-    my $infoline = "Adding linenumber $linenumber into help pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/LINENUMBERPLACEHOLDER/$linenumber/;
-    }
-}
-
-#########################################################
-# Determining the name of the new scriptfile
-#########################################################
-
-sub determine_scriptfile_name
-{
-    my ( $packagename ) = @_;
-
-    my $scriptfilename = $packagename;
-
-#   if ( $installer::globals::isrpmbuild ) { $scriptfilename =~ s/\.rpm\s*$/\.sh/; }
-#   if ( $installer::globals::issolarisbuild ) { $scriptfilename =~ s/\.tar\.gz\s*$/\.sh/; }
-
-    $scriptfilename =~ s/\.tar\.gz\s*$/\.sh/;
-
-    my $infoline = "Setting help pack script file name to $scriptfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    return $scriptfilename;
-}
-
-#########################################################
-# Saving the script file in the installation directory
-#########################################################
-
-sub save_script_file
-{
-    my ($installdir, $newscriptfilename, $scriptfile) = @_;
-
-    $newscriptfilename = $installdir . $installer::globals::separator . $newscriptfilename;
-    installer::files::save_file($newscriptfilename, $scriptfile);
-
-    my $infoline = "Saving script file $newscriptfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    return $newscriptfilename;
-}
-
-#########################################################
-# Including the binary package into the script
-#########################################################
-
-sub include_package_into_script
-{
-    my ( $scriptfilename, $installdir, $packagename ) = @_;
-
-    my $longpackagename = $installdir . $installer::globals::separator . $packagename;
-    my $systemcall = "cat $longpackagename >>$scriptfilename";
-
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    my $localcall = "chmod 775 $scriptfilename \>\/dev\/null 2\>\&1";
-    system($localcall);
-
-}
-
-#########################################################
-# Removing the binary package
-#########################################################
-
-sub remove_package
-{
-    my ( $installdir, $packagename ) = @_;
-
-    my $remove_package = 1;
-
-    if ( $ENV{'DONT_REMOVE_PACKAGE'} ) { $remove_package = 0; }
-
-    if ( $remove_package )
-    {
-        my $longpackagename = $installdir . $installer::globals::separator . $packagename;
-        unlink $longpackagename;
-
-        my $infoline = "Removing package: $longpackagename \n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-####################################################
-# Unix help packs, that are not part of
-# multilingual installation sets, need a
-# shell script installer
-####################################################
-
-sub build_installer_for_helppack
-{
-    my ($installdir, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref) = @_;
-
-    installer::logger::print_message( "... creating shell script installer ...\n" );
-
-    installer::logger::include_header_into_logfile("Creating shell script installer:");
-
-    # find and read setup script template
-
-    my $scriptfilename = "langpackscript.sh";
-    my $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfilename, $includepatharrayref, 0);
-    if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find script file $scriptfilename!", "build_installer_for_helppack"); }
-    my $scriptfile = installer::files::read_file($$scriptref);
-
-    my $infoline = "Found  script file $scriptfilename: $$scriptref \n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # find and read english license file
-    my $licenselanguage = "en-US";                  # always english !
-    my $licensefilename = "LICENSE"; # _" . $licenselanguage;
-    my $licenseincludepatharrayref = installer::worker::get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
-
-    my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);
-    if ($$licenseref eq "") { installer::exiter::exit_program("ERROR: Could not find License file $licensefilename!", "build_installer_for_helppack"); }
-    my $licensefile = installer::files::read_file($$licenseref);
-
-    $infoline = "Found licensefile $licensefilename: $$licenseref \n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # including variables into license file
-    installer::scpzipfiles::replace_all_ziplistvariables_in_file($licensefile, $allvariableshashref);
-
-    # add license text into script template
-    put_license_file_into_script($scriptfile, $licensefile);
-
-    # add rpm or package file name into script template
-    my ( $packagename, $allnames) = determine_packagename($installdir, $allvariableshashref, $languagestringref);
-    put_packagename_into_script($scriptfile, $packagename, $allnames);
-
-    # add product name into script template
-    put_productname_into_script($scriptfile, $allvariableshashref);
-
-    # add product name into script template
-    put_fullproductname_into_script($scriptfile, $allvariableshashref);
-
-    # add product name into script template
-    put_searchpackage_into_script($scriptfile, $allvariableshashref);
-
-    # replace linenumber in script template
-    put_linenumber_into_script($scriptfile, $licensefile, $allnames);
-
-    # saving the script file
-    my $newscriptfilename = determine_scriptfile_name($packagename);
-    $newscriptfilename = save_script_file($installdir, $newscriptfilename, $scriptfile);
-
-    # include rpm or package into script
-    include_package_into_script($newscriptfilename, $installdir, $packagename);
-
-    # remove rpm or package
-    remove_package($installdir, $packagename);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm
deleted file mode 100644
index b7af3bb45..000000000
--- a/solenv/bin/modules/installer/languagepack.pm
+++ /dev/null
@@ -1,520 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::languagepack;
-
-use installer::converter;
-use installer::existence;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::scpzipfiles;
-use installer::scriptitems;
-use installer::systemactions;
-use installer::worker;
-
-####################################################
-# Selecting all files with the correct language
-####################################################
-
-sub select_language_items
-{
-    my ( $itemsref, $languagesarrayref, $itemname ) = @_;
-
-    installer::logger::include_header_into_logfile("Selecting languages for language pack. Item: $itemname");
-
-    my @itemsarray = ();
-
-    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
-    {
-        my $oneitem = ${$itemsref}[$i];
-
-        my $ismultilingual = $oneitem->{'ismultilingual'};
-        
-        if (!($ismultilingual))
-        {
-            # Files with style "LANGUAGEPACK" and "FORCELANGUAGEPACK" also have to be included into the language pack.
-            # Files with style "LANGUAGEPACK" are only included into language packs.
-            # Files with style "FORCELANGUAGEPACK" are included into language packs and non language packs. They are
-            # forced, because otherwise they not not be included into languagepacks.
-            
-            my $styles = "";
-            if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-            
-            if (( $styles =~ /\bLANGUAGEPACK\b/ ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ )) { push(@itemsarray, $oneitem); }
-                    
-            next; 	# single language files are not included into language pack
-        }
-
-        my $specificlanguage = "";
-        if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; }
-        
-        for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ )	# iterating over all languages
-        {
-            my $onelanguage = ${$languagesarrayref}[$j];
-            my $locallang = $onelanguage;
-            $locallang =~ s/-/_/;
-            
-            if ( $specificlanguage eq $onelanguage )
-            {
-                push(@itemsarray, $oneitem); 	
-            }
-        }
-    }
-
-    return \@itemsarray;
-}
-
-sub replace_languagestring_variable
-{
-    my ($onepackageref, $languagestringref) = @_;
-
-    my $key;
-
-    foreach $key (keys %{$onepackageref})
-    {
-        my $value = $onepackageref->{$key};
-        $value =~ s/\%LANGUAGESTRING/$$languagestringref/g;
-        $onepackageref->{$key} = $value;			
-    }
-}
-
-#########################################################
-# Including the license text into the script template 
-#########################################################
-
-sub put_license_file_into_script
-{
-    my ($scriptfile, $licensefile) = @_;
-
-    my $infoline = "Adding licensefile into language pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $includestring = "";
-
-    for ( my $i = 0; $i <= $#{$licensefile}; $i++ )
-    {
-        $includestring = $includestring . ${$licensefile}[$i];
-    }
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/LICENSEFILEPLACEHOLDER/$includestring/;
-    }
-}
-
-#########################################################
-# Creating a tar.gz file from a Solaris package
-#########################################################
-
-sub create_tar_gz_file
-{
-    my ($installdir, $packagename, $packagestring) = @_;
-    
-    $packagename =~ s/\.rpm\s*$//;
-    my $targzname = $packagename . ".tar.gz";
-    $systemcall = "cd $installdir; tar -cf - $packagestring | gzip > $targzname";
-    installer::logger::print_message( "... $systemcall ...\n" );
-
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    return $targzname;
-}
-
-#########################################################
-# Determining the name of the package file 
-#########################################################
-
-sub get_packagename_from_packagelist
-{
-    my ( $alldirs, $allvariables, $languagestringref ) = @_;
-    
-    my $localproductname = $allvariables->{'PRODUCTNAME'};
-    $localproductname = lc($localproductname);
-    $localproductname =~ s/ //g;
-    $localproductname =~ s/-/_/g;
-
-    my $packagename = $localproductname . "_" . $$languagestringref;
-
-    return $packagename;
-}
-
-#########################################################
-# Determining the name of the package file or the rpm
-# in the installation directory. For language packs
-# there is only one file in this directory 
-#########################################################
-
-sub determine_packagename
-{
-    my ( $installdir, $allvariables, $languagestringref ) = @_;
-    
-    my $packagename = "";
-    my $allnames = "";
-    
-    if ( $installer::globals::isrpmbuild )
-    {
-        # determining the rpm file in directory $installdir
-            
-        my $fileextension = "rpm";
-        my $rpmfiles = installer::systemactions::find_file_with_file_extension($fileextension, $installdir);
-        if ( ! ( $#{$rpmfiles} > -1 )) { installer::exiter::exit_program("ERROR: Could not find package in directory $installdir!", "determine_packagename"); } 
-        my $rpmsav = [@{$rpmfiles}];
-        for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ ) { installer::pathanalyzer::make_absolute_filename_to_relative_filename(\${$rpmfiles}[$i]); }
-
-        $packagename = get_packagename_from_packagelist($rpmfiles, $allvariables, $languagestringref);
-
-        my $packagestring = installer::converter::convert_array_to_space_separated_string($rpmfiles);
-        $packagename = create_tar_gz_file($installdir, $packagename, $packagestring);	# only one file
-        for ( my $i = 0; $i <= $#{$rpmsav}; $i++ )
-        {
-            my $onefile = $installdir . $installer::globals::separator . ${$rpmsav}[$i];
-            unlink($onefile);
-        }
-        
-        $allnames = $rpmfiles;
-    }
-
-    if ( $installer::globals::issolarisbuild )
-    {
-        # determining the Solaris package file in directory $installdir
-        my $alldirs = installer::systemactions::get_all_directories($installdir);
-
-        if ( ! ( $#{$alldirs} > -1 )) { installer::exiter::exit_program("ERROR: Could not find package in directory $installdir!", "determine_packagename"); } 
-        my $alldirssav = [@{$alldirs}];
-        for ( my $i = 0; $i <= $#{$alldirs}; $i++ ) { installer::pathanalyzer::make_absolute_filename_to_relative_filename(\${$alldirs}[$i]); }
-
-        $packagename = get_packagename_from_packagelist($alldirs, $allvariables, $languagestringref);
-        my $packagestring = installer::converter::convert_array_to_space_separated_string($alldirs);
-        $packagename = create_tar_gz_file($installdir, $packagename, $packagestring);	# only a file (not a directory) can be included into the shell script
-        for ( my $i = 0; $i <= $#{$alldirssav}; $i++ ) { installer::systemactions::remove_complete_directory(${$alldirssav}[$i], 1); }
-        $allnames = $alldirs;
-    }
-    
-    my $infoline = "Found package in installation directory $installdir : $packagename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    return ( $packagename, $allnames);
-}
-
-#########################################################
-# Including the name of the package file or the rpm
-# into the script template 
-#########################################################
-
-sub put_packagename_into_script
-{
-    my ($scriptfile, $packagename, $allnames) = @_;
-
-    my $localpackagename = $packagename;
-    $localpackagename =~ s/\.tar\.gz//;	# making "OOOopenoffice-it-ea.tar.gz" to "OOOopenoffice-it-ea"
-    my $infoline = "Adding packagename $localpackagename into language pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $installline = "";
-
-    if ( $installer::globals::issolarisbuild ) { $installline = "  /usr/sbin/pkgadd -d \$outdir -a \$adminfile"; }
-
-    if ( $installer::globals::isrpmbuild ) { $installline = "  rpm --prefix \$PRODUCTINSTALLLOCATION --replacepkgs -i"; }
-
-    for ( my $i = 0; $i <= $#{$allnames}; $i++ )
-    {
-        if ( $installer::globals::issolarisbuild ) { $installline = $installline . " ${$allnames}[$i]"; }
-
-        if ( $installer::globals::isrpmbuild ) { $installline = $installline . " \$outdir/${$allnames}[$i]"; }
-    }	
-
-    for ( my $j = 0; $j <= $#{$scriptfile}; $j++ )
-    {
-        ${$scriptfile}[$j] =~ s/INSTALLLINES/$installline/;
-    }
-}
-
-##################################################################
-# Including the lowercase product name into the script template 
-##################################################################
-
-sub put_productname_into_script
-{
-    my ($scriptfile, $variableshashref) = @_;
-    
-    my $productname = $variableshashref->{'PRODUCTNAME'};
-    $productname = lc($productname);
-    $productname =~ s/\.//g;	# openoffice.org -> openofficeorg
-    
-    my $infoline = "Adding productname $productname into language pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/PRODUCTNAMEPLACEHOLDER/$productname/;
-    }
-}
-
-##################################################################
-# Including the full product name into the script template
-# (name and version) 
-##################################################################
-
-sub put_fullproductname_into_script
-{
-    my ($scriptfile, $variableshashref) = @_;
-
-    my $productname = $variableshashref->{'PRODUCTNAME'};
-    my $productversion = "";
-    if ( $variableshashref->{'PRODUCTVERSION'} ) { $productversion = $variableshashref->{'PRODUCTVERSION'}; };
-    my $fullproductname = $productname . " " . $productversion;
-
-    my $infoline = "Adding full productname \"$fullproductname\" into language pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/FULLPRODUCTNAMELONGPLACEHOLDER/$fullproductname/;
-    }
-}
-
-##################################################################
-# Including the name of the search package (-core01)
-# into the script template 
-##################################################################
-
-sub put_searchpackage_into_script
-{
-    my ($scriptfile, $variableshashref) = @_;
-    
-    my $basispackageprefix = $variableshashref->{'BASISPACKAGEPREFIX'};
-    my $basispackageversion = $variableshashref->{'OOOBASEVERSION'};
-
-    if ( $installer::globals::issolarisbuild ) { $basispackageversion =~ s/\.//g; }	# "3.0" -> "30"
-
-    my $infoline = "Adding basis package prefix $basispackageprefix into language pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    $infoline = "Adding basis package version $basispackageversion into language pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/BASISPACKAGEPREFIXPLACEHOLDER/$basispackageprefix/;
-        ${$scriptfile}[$i] =~ s/OOOBASEVERSIONPLACEHOLDER/$basispackageversion/;
-    }
-    
-}
-
-#########################################################
-# Including the linenumber into the script template 
-#########################################################
-
-sub put_linenumber_into_script
-{
-    my ( $scriptfile, $licensefile, $allnames ) = @_;
-    
-    my $linenumber =  $#{$scriptfile} + $#{$licensefile} + 3;	# also adding the content of the license file!
-
-    my $infoline = "Adding linenumber $linenumber into language pack script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/LINENUMBERPLACEHOLDER/$linenumber/;
-    }	
-}
-
-#########################################################
-# Determining the name of the new scriptfile 
-#########################################################
-
-sub determine_scriptfile_name
-{
-    my ( $packagename ) = @_;
-    
-    my $scriptfilename = $packagename;
-    
-    $scriptfilename =~ s/\.tar\.gz\s*$/\.sh/;
-
-    my $infoline = "Setting language pack script file name to $scriptfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    return $scriptfilename;
-}
-
-#########################################################
-# Saving the script file in the installation directory 
-#########################################################
-
-sub save_script_file
-{
-    my ($installdir, $newscriptfilename, $scriptfile) = @_;
-    
-    $newscriptfilename = $installdir . $installer::globals::separator . $newscriptfilename;
-    installer::files::save_file($newscriptfilename, $scriptfile);
-    
-    my $infoline = "Saving script file $newscriptfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    
-    return $newscriptfilename;
-}
-
-#########################################################
-# Including the binary package into the script 
-#########################################################
-
-sub include_package_into_script
-{
-    my ( $scriptfilename, $installdir, $packagename ) = @_;
-    
-    my $longpackagename = $installdir . $installer::globals::separator . $packagename;
-    my $systemcall = "cat $longpackagename >>$scriptfilename";
-
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    chmod 0775, $scriptfilename;
-
-}
-
-#########################################################
-# Removing the binary package 
-#########################################################
-
-sub remove_package
-{
-    my ( $installdir, $packagename ) = @_;
-
-    my $remove_package = 1;
-
-    if ( $ENV{'DONT_REMOVE_PACKAGE'} ) { $remove_package = 0; }
-
-    if ( $remove_package )
-    {
-        my $longpackagename = $installdir . $installer::globals::separator . $packagename;
-        unlink $longpackagename;
-
-        my $infoline = "Removing package: $longpackagename \n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-####################################################
-# Unix language packs, that are not part of 
-# multilingual installation sets, need a
-# shell script installer
-####################################################
-
-sub build_installer_for_languagepack
-{
-    my ($installdir, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref) = @_;
-
-    installer::logger::print_message( "... creating shell script installer ...\n" );
-
-    installer::logger::include_header_into_logfile("Creating shell script installer:");
-
-    # find and read setup script template
-    
-    my $scriptfilename = "langpackscript.sh";
-    my $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfilename, $includepatharrayref, 0);
-    if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find script file $scriptfilename!", "build_installer_for_languagepack"); }
-    my $scriptfile = installer::files::read_file($$scriptref);
-
-    my $infoline = "Found  script file $scriptfilename: $$scriptref \n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # find and read english license file
-    my $licenselanguage = "en-US";					# always english !
-    my $licensefilename = "LICENSE"; # _" . $licenselanguage;
-    my $licenseincludepatharrayref = installer::worker::get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
-
-    my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);
-    if ($$licenseref eq "") { installer::exiter::exit_program("ERROR: Could not find License file $licensefilename!", "build_installer_for_languagepack"); }
-    my $licensefile = installer::files::read_file($$licenseref);
-
-    $infoline = "Found licensefile $licensefilename: $$licenseref \n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # including variables into license file
-    installer::scpzipfiles::replace_all_ziplistvariables_in_file($licensefile, $allvariableshashref);
-
-    # add license text into script template
-    put_license_file_into_script($scriptfile, $licensefile);
-
-    # add rpm or package file name into script template
-    my ( $packagename, $allnames) = determine_packagename($installdir, $allvariableshashref, $languagestringref);
-    put_packagename_into_script($scriptfile, $packagename, $allnames);
-
-    # add product name into script template
-    put_productname_into_script($scriptfile, $allvariableshashref);
-
-    # add product name into script template
-    put_fullproductname_into_script($scriptfile, $allvariableshashref);
-
-    # add product name into script template
-    put_searchpackage_into_script($scriptfile, $allvariableshashref);
-
-    # replace linenumber in script template
-    put_linenumber_into_script($scriptfile, $licensefile, $allnames);
-    
-    # saving the script file
-    my $newscriptfilename = determine_scriptfile_name($packagename);
-    $newscriptfilename = save_script_file($installdir, $newscriptfilename, $scriptfile);
-
-    # include rpm or package into script
-    include_package_into_script($newscriptfilename, $installdir, $packagename);
-    
-    # remove rpm or package
-    remove_package($installdir, $packagename);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/languages.pm b/solenv/bin/modules/installer/languages.pm
deleted file mode 100644
index 591b6b28d..000000000
--- a/solenv/bin/modules/installer/languages.pm
+++ /dev/null
@@ -1,340 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::languages;
-
-use installer::converter;
-use installer::existence;
-use installer::exiter;
-use installer::globals;
-use installer::remover;
-use installer::ziplist;
-
-#############################################################################
-# Analyzing the laguage list parameter and language list from zip list file
-#############################################################################
-
-sub analyze_languagelist
-{	
-    my $first = $installer::globals::languagelist;
-    
-    $first =~ s/\_/\,/g;	# substituting "_" by ",", in case of dmake definition 01_49
-
-    # Products are separated by a "#", if defined in zip-list by a "|". But "get_info_about_languages" 
-    # substitutes already "|" to "#". This procedure only knows "#" as product separator.
-    # Different languages for one product are separated by ",". But on the command line the "_" is used.
-    # Therefore "_" is replaced by "," at the beginning of this procedure.
-    
-    while ($first =~ /^(\S+)\#(\S+?)$/)	# Minimal matching, to keep the order of languages
-    {
-        $first = $1;
-        my $last = $2;	
-        unshift(@installer::globals::languageproducts, $last);
-    }	
-
-    unshift(@installer::globals::languageproducts, $first);
-}
-
-####################################################
-# Reading languages from zip list file
-####################################################
-
-sub get_info_about_languages 
-{
-    my ( $allsettingsarrayref ) = @_;
-
-    my $languagelistref;
-
-    $languagelistref = installer::ziplist::getinfofromziplist($allsettingsarrayref, "languages");
-    $installer::globals::languagelist = $$languagelistref;
-
-    if ( $installer::globals::languagelist eq "" )	# not defined on command line and not in product list
-    {
-        installer::exiter::exit_program("ERROR: Languages not defined on command line (-l) and not in product list!", "get_info_about_languages");
-    }
-        
-    # Adapting the separator format from zip list.
-    # | means new product, , (comma) means more than one language in one product
-    # On the command line, | is difficult to use. Therefore this script uses hashes
-        
-    $installer::globals::languagelist =~ s/\|/\#/g;
-
-    analyze_languagelist();
-}
-
-#############################################################################
-# Checking whether all elements of an array A are also member of array B
-#############################################################################
-
-sub all_elements_of_array1_in_array2
-{
-    my ($array1, $array2) = @_;
-
-    my $array2_contains_all_elements_of_array1 = 1;
-
-    for ( my $i = 0; $i <= $#{$array1}; $i++ )
-    {
-        if (! installer::existence::exists_in_array(${$array1}[$i], $array2))		
-        {
-            $array2_contains_all_elements_of_array1 = 0;
-            last;
-        }	
-    }
-
-    return $array2_contains_all_elements_of_array1;
-}
-
-#############################################
-# All languages defined for one product
-#############################################
- 
-sub get_all_languages_for_one_product
-{
-    my ( $languagestring, $allvariables ) = @_;
-    
-    my @languagearray = ();
-
-    my $last = $languagestring;
-    
-    $installer::globals::ismultilingual = 0;		# setting the global variable $ismultilingual !
-    if ( $languagestring =~ /\,/ ) { $installer::globals::ismultilingual = 1; }
-    
-    while ( $last =~ /^\s*(.+?)\,(.+)\s*$/)	# "$" for minimal matching, comma separated list
-    {
-        my $first = $1;
-        $last = $2;
-        installer::remover::remove_leading_and_ending_whitespaces(\$first);
-        push(@languagearray, "$first");
-    }	
-
-    installer::remover::remove_leading_and_ending_whitespaces(\$last);
-    push(@languagearray, "$last");	
-
-    if ( $installer::globals::iswindowsbuild )
-    {
-        my $furthercheck = 1;
-        
-        # For some languages (that are not supported by Windows, english needs to be added to the installation set
-        # Languages saved in "@installer::globals::noMSLocaleLangs"
-
-        if ( all_elements_of_array1_in_array2(\@languagearray, \@installer::globals::noMSLocaleLangs) )
-        {
-            my $officestartlanguage = $languagearray[0];
-            unshift(@languagearray, "en-US");	# am Anfang einfügen!
-            $installer::globals::ismultilingual = 1;
-            $installer::globals::added_english  = 1;
-            $installer::globals::set_office_start_language  = 1;
-            # setting the variable PRODUCTLANGUAGE, needed for Linguistic-ForceDefaultLanguage.xcu
-            $allvariables->{'PRODUCTLANGUAGE'} = $officestartlanguage;
-            $furthercheck = 0;
-        }
-        
-        # In bilingual installation sets, in which english is the first language,
-        # the Office start language shall be the second language.
-
-        if ( $furthercheck )
-        {
-            if (( $#languagearray == 1 ) && ( $languagearray[0] eq "en-US" ))
-            {
-                my $officestartlanguage = $languagearray[1];
-                $installer::globals::set_office_start_language  = 1;
-                # setting the variable PRODUCTLANGUAGE, needed for Linguistic-ForceDefaultLanguage.xcu
-                $allvariables->{'PRODUCTLANGUAGE'} = $officestartlanguage;				
-            }
-        }		
-    }
-
-    return \@languagearray;
-}
-
-####################################################################################
-# FAKE: The languages string may contain only "de", "en-US", instead of "01", ...
-# But this has to be removed as soon as possible.
-# In the future the languages are determined with "en-US" instead "01"
-# already on the command line and in the zip list file.
-####################################################################################
-
-sub fake_languagesstring
-{
-    my ($stringref) = @_;
-    
-    # ATTENTION: This function has to be removed as soon as possible!
-    
-    $$stringref =~ s/01/en-US/;
-    $$stringref =~ s/03/pt/;
-    $$stringref =~ s/07/ru/;
-    $$stringref =~ s/30/el/;
-    $$stringref =~ s/31/nl/;
-    $$stringref =~ s/33/fr/;
-    $$stringref =~ s/34/es/;
-    $$stringref =~ s/35/fi/;
-    $$stringref =~ s/36/hu/;
-    $$stringref =~ s/37/ca/;
-    $$stringref =~ s/39/it/;
-    $$stringref =~ s/42/cs/;
-    $$stringref =~ s/43/sk/;
-    $$stringref =~ s/44/en-GB/;
-    $$stringref =~ s/45/da/;
-    $$stringref =~ s/46/sv/;
-    $$stringref =~ s/47/no/;
-    $$stringref =~ s/48/pl/;
-    $$stringref =~ s/49/de/;
-    $$stringref =~ s/55/pt-BR/;
-    $$stringref =~ s/66/th/;
-    $$stringref =~ s/77/et/;
-    $$stringref =~ s/81/ja/;
-    $$stringref =~ s/82/ko/;
-    $$stringref =~ s/86/zh-CN/;
-    $$stringref =~ s/88/zh-TW/;
-    $$stringref =~ s/90/tr/;
-    $$stringref =~ s/91/hi-IN/;
-    $$stringref =~ s/96/ar/;
-    $$stringref =~ s/97/he/;
-}
-
-##########################################################
-# Converting the language array into a string for output
-##########################################################
-
-sub get_language_string
-{
-    my ($languagesref) = @_;
-
-    my $newstring = "";
-
-    for ( my $i = 0; $i <= $#{$languagesref}; $i++ )
-    {
-        $newstring = $newstring . ${$languagesref}[$i] . "_";
-    }
-
-    # remove ending underline
-
-    $newstring =~ s/\_\s*$//;
-
-    return \$newstring;
-}
-
-##########################################################
-# Analyzing the languages in the languages array and 
-# returning the most important language
-##########################################################
-
-sub get_default_language
-{
-    my ($languagesref) = @_;
-    
-    return ${$languagesref}[0];		# ToDo, only returning the first language
-}
-
-#############################################################
-# Contains the installation set one of the asian languages?
-#############################################################
-
-sub detect_asian_language
-{
-    my ($languagesref) = @_;
-
-    my $containsasia = 0;
-
-    for ( my $i = 0; $i <= $#{$languagesref}; $i++ )
-    {
-        my $onelang = ${$languagesref}[$i];
-        $onelang =~ s/\s*$//;
-
-        for ( my $j = 0; $j <= $#installer::globals::asianlanguages; $j++ )
-        {
-            my $asialang = $installer::globals::asianlanguages[$j];
-            $asialang =~ s/\s*$//;
-            
-            if ( $onelang eq $asialang )
-            {
-                $containsasia = 1;
-                last;
-            }
-        }
-        
-        if ( $containsasia ) { last; }
-    }
-
-    return $containsasia;
-}
-
-#############################################################
-# Contains the installation set only asian languages?
-#############################################################
-
-sub contains_only_asian_languages
-{
-    my ($languagesref) = @_;
-
-    my $onlyasian = 1;
-
-    for ( my $i = 0; $i <= $#{$languagesref}; $i++ )
-    {
-        my $onelang = ${$languagesref}[$i];
-        $onelang =~ s/\s*$//;
-
-        if (! installer::existence::exists_in_array($onelang, \@installer::globals::asianlanguages))		
-        {
-            $onlyasian = 0;
-            last;
-        }
-    }
-
-    return $onlyasian;
-}
-
-################################################################
-# Contains the installation set one of the western languages
-################################################################
-
-sub detect_western_language
-{
-    my ($languagesref) = @_;
-
-    my $containswestern = 1;
-    
-    if ( contains_only_asian_languages($languagesref) ) { $containswestern = 0; }
-
-    return $containswestern;
-}
-
-################################################################
-# Determining the language used by the Java installer
-################################################################
-
-sub get_java_language
-{
-    my ( $language ) = @_;
-    
-    $javalanguage = $language;
-    $javalanguage =~ s/\-/\_/;	
-
-    return $javalanguage;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/logger.pm b/solenv/bin/modules/installer/logger.pm
deleted file mode 100644
index 0f1959123..000000000
--- a/solenv/bin/modules/installer/logger.pm
+++ /dev/null
@@ -1,339 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::logger;
-
-use installer::files;
-use installer::globals;
-
-####################################################
-# Including header files into the logfile
-####################################################
-
-sub include_header_into_logfile
-{
-    my ($message) = @_;
-    
-    my $infoline;
-    
-    $infoline = "\n" . get_time_string();
-    push( @installer::globals::logfileinfo, $infoline);
-
-    $infoline = "######################################################\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    $infoline = "$message\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    
-
-    $infoline = "######################################################\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-####################################################
-# Including header files into the logfile
-####################################################
-
-sub include_header_into_globallogfile
-{
-    my ($message) = @_;
-    
-    my $infoline;
-    
-    $infoline = "\n" . get_time_string();
-    push( @installer::globals::globallogfileinfo, $infoline);
-
-    $infoline = "######################################################\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-
-    $infoline = "$message\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-    
-
-    $infoline = "######################################################\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-}
-
-####################################################
-# Write timestamp into log file
-####################################################
-
-sub include_timestamp_into_logfile
-{
-    my ($message) = @_;
-    
-    my $infoline;
-    my $timestring = get_time_string();
-    $infoline = "$message\t$timestring";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-####################################################
-# Writing all variables content into the log file
-####################################################
-
-sub log_hashref
-{
-    my ($hashref) = @_;
-
-    my $infoline = "\nLogging variable settings:\n";
-    push(@installer::globals::globallogfileinfo, $infoline);
-
-    my $itemkey;
-        
-    foreach $itemkey ( keys %{$hashref} )
-    {
-        my $line = "";
-        my $itemvalue = "";
-        if ( $hashref->{$itemkey} ) { $itemvalue = $hashref->{$itemkey}; }
-        $line = $itemkey . "=" . $itemvalue . "\n";
-        push(@installer::globals::globallogfileinfo, $line);
-    }
-
-    $infoline = "\n";
-    push(@installer::globals::globallogfileinfo, $infoline);	
-}
-
-#########################################################
-# Including global logging info into global log array
-#########################################################
-
-sub globallog
-{
-    my ($message) = @_;
-
-    my $infoline;
-
-    $infoline = "\n" . get_time_string();
-    push( @installer::globals::globallogfileinfo, $infoline);
-
-    $infoline = "################################################################\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-
-    $infoline = "$message\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-
-    $infoline = "################################################################\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-    
-}
-
-###############################################################
-# For each product (new language) a new log file is created.
-# Therefore the global logging has to be saved in this file.
-###############################################################
-
-sub copy_globalinfo_into_logfile
-{
-    for ( my $i = 0; $i <= $#installer::globals::globallogfileinfo; $i++ )
-    {
-        push(@installer::globals::logfileinfo, $installer::globals::globallogfileinfo[$i]);
-    }
-}
-
-###############################################################
-# For each product (new language) a new log file is created.
-# Therefore the global logging has to be saved in this file.
-###############################################################
-
-sub debuginfo
-{
-    my  ( $message ) = @_;
-    
-    $message = $message . "\n";
-    push(@installer::globals::functioncalls, $message);
-}
-
-###############################################################
-# Saving the debug information.
-###############################################################
-
-sub savedebug
-{
-    my ( $outputdir ) = @_;
-    
-    installer::files::save_file($outputdir . $installer::globals::debugfilename, \@installer::globals::functioncalls);	
-    print_message( "... writing debug file " . $outputdir . $installer::globals::debugfilename . "\n" );
-}
-
-###############################################################
-# Starting the time
-###############################################################
-
-sub starttime
-{	
-    $installer::globals::starttime = time();
-}
-
-###############################################################
-# Convert time string
-###############################################################
-
-sub convert_timestring
-{
-    my ($secondstring) = @_;
-
-    my $timestring = "";
-    
-    if ( $secondstring < 60 )	 # less than a minute
-    {
-        if ( $secondstring < 10 ) { $secondstring = "0" . $secondstring; }
-        $timestring = "00\:$secondstring min\.";	
-    }
-    elsif ( $secondstring < 3600 )
-    {
-        my $minutes = $secondstring / 60;
-        my $seconds = $secondstring % 60;
-        if ( $minutes =~ /(\d*)\.\d*/ ) { $minutes = $1; }
-        if ( $minutes < 10 ) { $minutes = "0" . $minutes; }
-        if ( $seconds < 10 ) { $seconds = "0" . $seconds; }
-        $timestring = "$minutes\:$seconds min\.";
-    }
-    else	# more than one hour
-    {
-        my $hours = $secondstring / 3600;
-        my $secondstring = $secondstring % 3600;
-        my $minutes = $secondstring / 60;
-        my $seconds = $secondstring % 60;
-        if ( $hours =~ /(\d*)\.\d*/ ) { $hours = $1; }
-        if ( $minutes =~ /(\d*)\.\d*/ ) { $minutes = $1; }
-        if ( $hours < 10 ) { $hours = "0" . $hours; }
-        if ( $minutes < 10 ) { $minutes = "0" . $minutes; }
-        if ( $seconds < 10 ) { $seconds = "0" . $seconds; }
-        $timestring = "$hours\:$minutes\:$seconds hours";		
-    }
-    
-    return $timestring;
-}
-
-###############################################################
-# Returning time string for logging
-###############################################################
-
-sub get_time_string
-{
-    my $currenttime = time();
-    $currenttime = $currenttime - $installer::globals::starttime;
-    $currenttime = convert_timestring($currenttime);
-    $currenttime = localtime() . " \(" . $currenttime . "\)\n";
-    return $currenttime;
-}
-
-###############################################################
-# Returning the age of a file (in seconds)
-###############################################################
-
-sub get_file_age
-{
-    my ( $filename ) = @_;
-    
-    my $filetime = (stat($filename))[9];
-    my $timediff = time() - $filetime;
-    return $timediff;
-}
-
-###############################################################
-# Stopping the time
-###############################################################
-
-sub stoptime
-{
-    my $infoline = get_time_string();
-    print_message( "$infoline" );
-}
-
-###############################################################
-# Set date string, format: yymmdd
-###############################################################
-
-sub set_installation_date
-{
-    my $datestring = "";
-
-    my @timearray = localtime(time);
-
-    my $day = $timearray[3];
-    my $month = $timearray[4] + 1;
-    my $year = $timearray[5] - 100;
-    
-    if ( $year < 10 ) { $year = "0" . $year; } 
-    if ( $month < 10 ) { $month = "0" . $month; } 
-    if ( $day < 10 ) { $day = "0" . $day; } 
-
-    $datestring = $year . $month . $day;
-
-    return $datestring;
-}
-
-###############################################################
-# Console output: messages
-###############################################################
-
-sub print_message
-{
-    my $message = shift;
-    chomp $message;
-    my $force = shift || 0;
-    print "$message\n" if ( $force || ! $installer::globals::quiet );
-    return;
-}
-
-sub print_message_without_newline
-{
-    my $message = shift;
-    chomp $message;
-    print "$message" if ( ! $installer::globals::quiet );
-    return;
-}
-
-###############################################################
-# Console output: warnings
-###############################################################
-
-sub print_warning
-{
-    my $message = shift;
-    chomp $message;
-    print STDERR "WARNING: $message";
-    return;
-}
-
-###############################################################
-# Console output: errors
-###############################################################
-
-sub print_error
-{
-    my $message = shift;
-    chomp $message;
-    print STDERR "\n**************************************************\n";
-    print STDERR "ERROR: $message";
-    print STDERR "\n**************************************************\n";
-    return;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm
deleted file mode 100644
index 0079b6f10..000000000
--- a/solenv/bin/modules/installer/packagelist.pm
+++ /dev/null
@@ -1,856 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::packagelist;
-
-use installer::converter;
-use installer::exiter;
-use installer::globals;
-use installer::remover;
-use installer::scriptitems;
-
-########################################
-# Check existence of module
-########################################
-
-sub check_module_existence
-{
-    my ($onegid, $moduleslist) = @_;
-
-    my $foundgid = 0;
-
-    for ( my $i = 0; $i <= $#{$moduleslist}; $i++ )
-    {
-        my $gid = ${$moduleslist}[$i]->{'gid'};
-        
-        if ( $gid eq $onegid )
-        {
-            $foundgid = 1;
-            last;
-        }
-    }
-    
-    return $foundgid;
-}
-
-###################################################
-# Analyzing the gids, defined in the packagelist
-###################################################
-
-sub analyze_list
-{
-    my ($packagelist, $moduleslist) = @_;
-    
-    @allpackages = ();
-    
-    my $moduleshash = get_module_hash($moduleslist);
-    
-    for ( my $i = 0; $i <= $#{$packagelist}; $i++ )
-    {
-        my $onepackage = ${$packagelist}[$i];
-        
-        my $onegid = $onepackage->{'module'};
-        
-        installer::remover::remove_leading_and_ending_whitespaces(\$onegid);
-
-        my $moduleexists = check_module_existence($onegid, $moduleslist);
-
-        if ( ! $moduleexists ) { next; }
-
-        my @allmodules = ();
-
-        push(@allmodules, $onegid);
-        
-        get_children_with_hash($moduleshash, $onegid, \@allmodules);
-        
-        $onepackage->{'allmodules'} = \@allmodules;
-
-        push(@allpackages, $onepackage);
-    }
-
-    return \@allpackages;
-}
-
-###################################################
-# Creating a hash, that contains the module gids
-# as keys and the parentids as values
-###################################################
-
-sub get_module_hash
-{
-    my ($moduleslist) = @_;
-    
-    my %modulehash = ();
-    
-    for ( my $i = 0; $i <= $#{$moduleslist}; $i++ )
-    {
-        my $gid = ${$moduleslist}[$i]->{'gid'};
-        # Containing only modules with parent. Root modules can be ignored.
-        if ( ${$moduleslist}[$i]->{'ParentID'} ) { $modulehash{$gid} = ${$moduleslist}[$i]->{'ParentID'}; }
-    }
-    
-    return \%modulehash;
-}
-
-########################################################
-# Recursively defined procedure to order 
-# modules and directories
-########################################################
-
-sub get_children_with_hash
-{
-    my ($modulehash, $parentgid, $newitemorder) = @_;
-
-    foreach my $gid ( keys %{$modulehash} )
-    {
-        my $parent = $modulehash->{$gid};
-
-        if ( $parent eq $parentgid )
-        {
-            push(@{$newitemorder}, $gid);
-            my $parent = $gid;
-            get_children_with_hash($modulehash, $parent, $newitemorder);	# recursive!
-        }		
-    }
-}
-
-########################################################
-# Recursively defined procedure to order 
-# modules and directories
-########################################################
-
-sub get_children
-{
-    my ($allitems, $startparent, $newitemorder) = @_;
-
-    for ( my $i = 0; $i <= $#{$allitems}; $i++ )
-    {
-        my $gid = ${$allitems}[$i]->{'gid'};
-        my $parent = "";
-        if ( ${$allitems}[$i]->{'ParentID'} ) { $parent = ${$allitems}[$i]->{'ParentID'}; }
-
-        if ( $parent eq $startparent )
-        {
-            push(@{$newitemorder}, $gid);
-            my $parent = $gid;
-            get_children($allitems, $parent, $newitemorder);	# recursive!
-        }
-    }
-}
-
-#####################################################################
-# All modules below a defined gid_Module_A are collected now for
-# each modules defined in the packagelist. Now the modules have
-# to be removed, that are part of more than one package.
-#####################################################################
-
-sub remove_multiple_modules_packages
-{
-    my ($allpackagemodules) = @_;
-
-    # iterating over all packages
-
-    for ( my $i = 0; $i <= $#{$allpackagemodules}; $i++ )
-    {
-        my $onepackage = ${$allpackagemodules}[$i];
-        my $allmodules = $onepackage->{'allmodules'};
-
-        # Comparing each package, with all following packages. If a 
-        # gid for the module is part of more than one package, it is 
-        # removed if the number of modules in the package is greater
-        # in the current package than in the compare package.
-        
-        # Taking all modules from package $i
-        
-        my $packagecount = $#{$allmodules};
-        
-        my @optimizedpackage = ();
-        
-        # iterating over all modules of this package
-
-        for ( my $j = 0; $j <= $#{$allmodules}; $j++ )
-        {
-            my $onemodule = ${$allmodules}[$j];	# this is the module, that shall be removed or not
-        
-            my $put_module_into_new_package = 1;
-        
-            # iterating over all other packages	
-
-            for ( my $k = 0; $k <= $#{$allpackagemodules}; $k++ )
-            {
-                if ( $k == $i ) { next; }	# not comparing equal module
-                
-                if (! $put_module_into_new_package) { next; } # do not compare, if already found
-
-                my $comparepackage = ${$allpackagemodules}[$k];
-                my $allcomparemodules = $comparepackage->{'allmodules'};
-
-                my $comparepackagecount = $#{$allcomparemodules};
-
-                # modules will only be removed from packages, that have more modules
-                # than the compare package
-
-                if ( $packagecount <= $comparepackagecount ) { next; }	# nothing to do, take next package
-
-                # iterating over all modules of this package	
-
-                for ( my $m = 0; $m <= $#{$allcomparemodules}; $m++ )
-                {
-                    my $onecomparemodule = ${$allcomparemodules}[$m];
-                    
-                    if ( $onemodule eq $onecomparemodule )	# this $onemodule has to be removed
-                    {
-                        $put_module_into_new_package = 0;
-                    }
-                }
-            }
-        
-            if ( $put_module_into_new_package )
-            {
-                push(@optimizedpackage, $onemodule)
-            }	
-        }
-
-        $onepackage->{'allmodules'} = \@optimizedpackage;	
-    }
-}
-
-#####################################################################
-# Analyzing all files if they belong to a special package.
-# A package is described by a list of modules.
-#####################################################################
-
-sub find_files_for_package
-{
-    my ($filelist, $onepackage) = @_;
-
-    my @newfilelist = ();
-
-    for ( my $i = 0; $i <= $#{$filelist}; $i++ )
-    {
-        my $onefile = ${$filelist}[$i];
-        my $modulesstring = $onefile->{'modules'};	 # comma separated modules list
-        my $moduleslist = installer::converter::convert_stringlist_into_array(\$modulesstring, ",");
-
-        my $includefile = 0;
-
-        # iterating over all modules of this file
-
-        for ( my $j = 0; $j <= $#{$moduleslist}; $j++ )
-        {
-            if ( $includefile ) { next; }
-            my $filemodule = ${$moduleslist}[$j];
-            installer::remover::remove_leading_and_ending_whitespaces(\$filemodule);
-            
-            # iterating over all modules of the package
-            
-            my $packagemodules = $onepackage->{'allmodules'};
-
-            for ( my $k = 0; $k <= $#{$packagemodules}; $k++ )
-            {
-                if ( $includefile ) { next; }
-                my $packagemodule = ${$packagemodules}[$k];
-                
-                if ( $filemodule eq $packagemodule )
-                {
-                    $includefile = 1;
-                    last;
-                }
-            }
-        }
-    
-        if ( $includefile )
-        {
-            push(@newfilelist, $onefile);	
-        }
-    }
-    
-    return \@newfilelist;
-}
-
-#####################################################################
-# Analyzing all links if they belong to a special package.
-# A package is described by a list of modules.
-# A link is inserted into the package, if the corresponding
-# file is also inserted.
-#####################################################################
-
-sub find_links_for_package
-{
-    my ($linklist, $filelist) = @_;
-    
-    # First looking for all links with a FileID.
-    # Then looking for all links with a ShortcutID.
-
-    my @newlinklist = ();
-
-    for ( my $i = 0; $i <= $#{$linklist}; $i++ )
-    {
-        my $includelink = 0;
-
-        my $onelink = ${$linklist}[$i];
-    
-        my $fileid = "";
-        if ( $onelink->{'FileID'} ) { $fileid = $onelink->{'FileID'}; }
-        
-        if ( $fileid eq "" ) { next; }	 # A link with a ShortcutID
-        
-        for ( my $j = 0; $j <= $#{$filelist}; $j++ )	 # iterating over file list
-        {
-            my $onefile = ${$filelist}[$j];
-            my $gid = $onefile->{'gid'};
-        
-            if ( $gid eq $fileid )
-            {
-                $includelink = 1;
-                last;
-            }
-        }
-        
-        if ( $includelink )
-        {
-            push(@newlinklist, $onelink);	
-        }
-    }
-    
-    # iterating over the new list, because of all links with a ShortcutID
-
-    for ( my $i = 0; $i <= $#{$linklist}; $i++ )
-    {
-        my $includelink = 0;
-
-        my $onelink = ${$linklist}[$i];
-
-        my $shortcutid = "";
-        if ( $onelink->{'ShortcutID'} ) { $shortcutid = $onelink->{'ShortcutID'}; }
-        
-        if ( $shortcutid eq "" ) { next; }	 # A link with a ShortcutID
-
-        for ( my $j = 0; $j <= $#newlinklist; $j++ )	 # iterating over newly created link list
-        {
-            my $onefilelink = $newlinklist[$j];
-            my $gid = $onefilelink->{'gid'};
-        
-            if ( $gid eq $shortcutid )
-            {
-                $includelink = 1;
-                last;
-            }
-        }
-        
-        if ( $includelink )
-        {
-            push(@newlinklist, $onelink);	
-        }
-    }
-
-    return \@newlinklist;
-}
-
-#####################################################################
-# Analyzing all directories if they belong to a special package.
-# A package is described by a list of modules.
-# Directories are included into the package, if they are needed
-# by a file or a link included into the package. 
-# Attention: A directory with the flag CREATE, is only included
-# into the root module:
-# ($packagename eq $installer::globals::rootmodulegid)
-#####################################################################
-
-sub find_dirs_for_package
-{
-    my ($dirlist, $onepackage) = @_;
-
-    my @newdirlist = ();
-
-    for ( my $i = 0; $i <= $#{$dirlist}; $i++ )
-    {
-        my $onedir = ${$dirlist}[$i];
-        my $modulesstring = $onedir->{'modules'};	 # comma separated modules list
-        my $moduleslist = installer::converter::convert_stringlist_into_array(\$modulesstring, ",");
-
-        my $includedir = 0;
-
-        # iterating over all modules of this dir
-
-        for ( my $j = 0; $j <= $#{$moduleslist}; $j++ )
-        {
-            if ( $includedir ) { last; }
-            my $dirmodule = ${$moduleslist}[$j];
-            installer::remover::remove_leading_and_ending_whitespaces(\$dirmodule);
-            
-            # iterating over all modules of the package
-            
-            my $packagemodules = $onepackage->{'allmodules'};
-
-            for ( my $k = 0; $k <= $#{$packagemodules}; $k++ )
-            {
-                my $packagemodule = ${$packagemodules}[$k];
-                
-                if ( $dirmodule eq $packagemodule )
-                {
-                    $includedir = 1;
-                    last;
-                }
-            }
-        }
-    
-        if ( $includedir )
-        {
-            push(@newdirlist, $onedir);	
-        }
-    }
-    
-    return \@newdirlist;
-}
-
-#####################################################################
-# Resolving all variables in the packagename.
-#####################################################################
-
-sub resolve_packagevariables
-{
-    my ($packagenameref, $variableshashref, $make_lowercase) = @_;
-
-    my $key;
-    
-    # Special handling for dictionaries
-    if ( $$packagenameref =~ /-dict-/ )
-    {
-        if (exists($variableshashref->{'DICTIONARYUNIXPRODUCTNAME'}) ) { $$packagenameref =~ s/\%UNIXPRODUCTNAME/$variableshashref->{'DICTIONARYUNIXPRODUCTNAME'}/g; }
-        if (exists($variableshashref->{'DICTIONARYBRANDPACKAGEVERSION'}) ) { $$packagenameref =~ s/\%BRANDPACKAGEVERSION/$variableshashref->{'DICTIONARYBRANDPACKAGEVERSION'}/g; }
-    }
-    
-    foreach $key (keys %{$variableshashref})
-    {								
-        my $value = $variableshashref->{$key};
-        if ( $make_lowercase ) { $value = lc($value); }
-        $$packagenameref =~ s/\%$key/$value/g;
-    }
-}
-
-#####################################################################
-# Resolving all variables in the packagename.
-#####################################################################
-
-sub resolve_packagevariables2
-{
-    my ($packagenameref, $variableshashref, $make_lowercase, $isdict ) = @_;
-
-    my $key;
-    
-    # Special handling for dictionaries
-    if ( $isdict )
-    {
-        if (exists($variableshashref->{'DICTIONARYUNIXPRODUCTNAME'}) ) { $$packagenameref =~ s/\%UNIXPRODUCTNAME/$variableshashref->{'DICTIONARYUNIXPRODUCTNAME'}/g; }
-        if (exists($variableshashref->{'DICTIONARYBRANDPACKAGEVERSION'}) ) { $$packagenameref =~ s/\%BRANDPACKAGEVERSION/$variableshashref->{'DICTIONARYBRANDPACKAGEVERSION'}/g; }
-    }
-    
-    foreach $key (keys %{$variableshashref})
-    {								
-        my $value = $variableshashref->{$key};
-        if ( $make_lowercase ) { $value = lc($value); }
-        $$packagenameref =~ s/\%$key/$value/g;
-    }
-}
-
-#####################################################################
-# New packages system.
-#####################################################################
-
-##################################################################
-# Controlling the content of the packagelist
-# 1. Items in @installer::globals::packagelistitems must exist
-# 2. If a shellscript file is defined, it must exist
-##################################################################
-
-sub check_packagelist
-{
-    my ($packages) = @_;
-    
-    if ( ! ( $#{$packages} > -1 )) { installer::exiter::exit_program("ERROR: No packages defined!", "check_packagelist"); }
-
-    for ( my $i = 0; $i <= $#{$packages}; $i++ )
-    {
-        my $onepackage = ${$packages}[$i];
-        
-        my $element;
-
-        # checking all items that must be defined
-        
-        foreach $element (@installer::globals::packagelistitems)
-        {	
-            if ( ! exists($onepackage->{$element}) )
-            {
-                installer::exiter::exit_program("ERROR in package list: No value for $element !", "check_packagelist");
-            }			
-        }
-
-        # checking the existence of the script file, if defined
-
-        if ( $onepackage->{'script'} )
-        {
-            my $scriptfile = $onepackage->{'script'};
-            my $gid =  $onepackage->{'module'};
-            my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfile, "" , 0);
-
-            if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find script file $scriptfile for module $gid!", "check_packagelist"); }
-
-            my $infoline = "$gid: Using script file: \"$$fileref\"!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            $onepackage->{'script'} = $$fileref;
-        }
-    }
-}
-
-#####################################################################
-# Reading pack info for one module from packinfo file.
-#####################################################################
-
-sub get_packinfo
-{
-    my ($gid, $filename, $packages, $onelanguage, $islanguagemodule) = @_;
-
-    my $packagelist	= installer::files::read_file($filename);
-    
-    my @allpackages = ();
-    
-    for ( my $i = 0; $i <= $#{$packagelist}; $i++ )
-    {
-        my $line = ${$packagelist}[$i];
-
-        if ( $line =~ /^\s*\#/ ) { next; }	# this is a comment line
-
-        if ( $line =~ /^\s*Start\s*$/i ) 	# a new package definition
-        {
-            my %onepackage = ();
-
-            my $counter = $i + 1;
-
-            while (!( ${$packagelist}[$counter] =~ /^\s*End\s*$/i ))
-            {
-                if ( ${$packagelist}[$counter] =~ /^\s*(\S+)\s*\=\s*\"(.*)\"/ )
-                {
-                    my $key = $1;
-                    my $value = $2;
-                    $onepackage{$key} = $value;							
-                }
-                
-                $counter++;	
-            }
-
-            $onepackage{'islanguagemodule'} = $islanguagemodule;
-            if ( $islanguagemodule )
-            {
-                $saveonelanguage = $onelanguage;
-                $saveonelanguage =~ s/_/-/g;
-                $onepackage{'language'} = $saveonelanguage;
-            }
-                    
-            push(@allpackages, \%onepackage);	
-        }
-    }
-    
-    # looking for the packinfo with the correct gid
-    
-    my $foundgid = 0;
-    my $onepackage;
-    foreach $onepackage (@allpackages)
-    {
-        # Adding the language to the module gid for LanguagePacks !
-        # Making the module gid language specific: gid_Module_Root -> gir_Module_Root_pt_BR (as defined in scp2)
-        if ( $onelanguage ne "" ) { $onepackage->{'module'} = $onepackage->{'module'} . "_$onelanguage"; }
-
-        if ( $onepackage->{'module'} eq $gid )
-        {
-            # Resolving the language identifier
-            my $onekey;
-            foreach $onekey ( keys %{$onepackage} )
-            {
-                # Some keys require "-" instead of "_" for example in "en-US". All package names do not use underlines.
-                my $locallang = $onelanguage;
-                if (( $onekey eq "solarispackagename" ) ||
-                   ( $onekey eq "solarisrequires" ) ||
-                   ( $onekey eq "packagename" ) ||
-                   ( $onekey eq "requires" )) { $locallang =~ s/_/-/g; } # avoiding illegal package abbreviation
-                $onepackage->{$onekey} =~ s/\%LANGUAGESTRING/$locallang/g;
-            }
-            
-            # Saving the language for the package
-            my $lang = $onelanguage;
-            $lang =~ s/_/-/g;
-            $onepackage->{'specificlanguage'} = $lang;
-            
-            push(@{$packages}, $onepackage);
-            $foundgid = 1;
-            last;
-        }
-    }
-    
-    if ( ! $foundgid )
-    {
-        installer::exiter::exit_program("ERROR: Could not find package info for module $gid in file \"$filename\"!", "get_packinfo");
-    }	
-}
-
-#####################################################################
-# Collecting all packages from scp project.
-#####################################################################
-
-sub collectpackages
-{
-    my ( $allmodules, $languagesarrayref ) = @_;
-
-    installer::logger::include_header_into_logfile("Collecting packages:");
-    
-    my @packages = ();
-    my %gid_analyzed = ();
-
-    my $onemodule;
-    foreach $onemodule ( @{$allmodules} )
-    {
-        my $packageinfo = "PackageInfo";
-        if (( $installer::globals::tab ) && ( $onemodule->{"TabPackageInfo"} )) { $packageinfo = "TabPackageInfo" }
-    
-        if ( $onemodule->{$packageinfo} )	# this is a package module!
-        {
-            my $modulegid = $onemodule->{'gid'};
-            
-            my $styles = "";
-            if ( $onemodule->{'Styles'} ) { $styles = $onemodule->{'Styles'}; }
-
-            # checking modules with style LANGUAGEMODULE
-            my $islanguagemodule = 0;
-            my $onelanguage = "";
-            if ( $styles =~ /\bLANGUAGEMODULE\b/ )
-            {
-                $islanguagemodule = 1;
-                $onelanguage = $onemodule->{'Language'}; # already checked, that it is set.
-                $onelanguage =~ s/-/_/g; # pt-BR -> pt_BR in scp		
-            }
-
-            # Modules in different languages are listed more than once in multilingual installation sets
-            if ( exists($gid_analyzed{$modulegid}) ) { next; }
-            $gid_analyzed{$modulegid} = 1;
-
-            my $packinfofile = $onemodule->{$packageinfo};
-            
-            # The file with package information has to be found in path list
-            my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$packinfofile, "" , 0);
-
-            if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $packinfofile for module $modulegid!", "collectpackages"); }
-
-            my $infoline = "$modulegid: Using packinfo: \"$$fileref\"!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            get_packinfo($modulegid, $$fileref, \@packages, $onelanguage, $islanguagemodule);
-        }
-    }
-    
-    return \@packages;
-}
-
-#####################################################################
-# Printing packages content for debugging purposes
-#####################################################################
-
-sub log_packages_content
-{
-    my ($packages) = @_;
-    
-    if ( ! ( $#{$packages} > -1 )) { installer::exiter::exit_program("ERROR: No packages defined!", "print_content"); }
-
-    installer::logger::include_header_into_logfile("Logging packages content:");
-
-    my $infoline = "";
-
-    for ( my $i = 0; $i <= $#{$packages}; $i++ )
-    {
-        my $onepackage = ${$packages}[$i];
-
-        # checking all items that must be defined
-
-        $infoline = "Package $onepackage->{'module'}\n";
-        push(@installer::globals::logfileinfo, $infoline);
-
-        my $key;
-        foreach $key (sort keys %{$onepackage})
-        {
-            if ( $key =~ /^\s*\;/ ) { next; }
-            
-            if ( $key eq "allmodules" )
-            {
-                $infoline = "\t$key:\n";
-                push(@installer::globals::logfileinfo, $infoline);
-                my $onemodule;
-                foreach $onemodule ( @{$onepackage->{$key}} )
-                {
-                    $infoline = "\t\t$onemodule\n";
-                    push(@installer::globals::logfileinfo, $infoline);
-                }
-            }
-            else
-            {
-                $infoline = "\t$key: $onepackage->{$key}\n";
-                push(@installer::globals::logfileinfo, $infoline);
-            }
-        }
-
-        $infoline = "\n";
-        push(@installer::globals::logfileinfo, $infoline);
-
-    }
-}
-
-#####################################################################
-# Creating assignments from modules to destination pathes.
-# This is required for logging in fileinfo file. Otherwise
-# the complete destination file would not be known in file list.
-# Saved in %installer::globals::moduledestination
-#####################################################################
-
-sub create_module_destination_hash
-{
-    my ($packages, $allvariables) = @_;
-
-    for ( my $i = 0; $i <= $#{$packages}; $i++ )
-    {
-        my $onepackage = ${$packages}[$i];
-        
-        my $defaultdestination = $onepackage->{'destpath'};
-        resolve_packagevariables(\$defaultdestination, $allvariables, 1);
-        if ( $^O =~ /darwin/i ) { $defaultdestination =~ s/\/opt\//\/Applications\//; }
-
-        foreach my $onemodule ( @{$onepackage->{'allmodules'}} )
-        {
-            $installer::globals::moduledestination{$onemodule} = $defaultdestination;
-        }
-    }
-}
-
-#####################################################################
-# Adding the default pathes into the files collector for Unixes.
-# This is necessary to know the complete destination path in
-# fileinfo log file.
-#####################################################################
-
-sub add_defaultpathes_into_filescollector
-{
-    my ($allfiles) = @_;
-    
-    for ( my $i = 0; $i <= $#{$allfiles}; $i++ )
-    {
-        my $onefile = ${$allfiles}[$i];
-        
-        if ( ! $onefile->{'destination'} ) { installer::exiter::exit_program("ERROR: No destination found at file $onefile->{'gid'}!", "add_defaultpathes_into_filescollector"); }
-        my $destination = $onefile->{'destination'};
-
-        if ( ! $onefile->{'modules'} ) { installer::exiter::exit_program("ERROR: No modules found at file $onefile->{'gid'}!", "add_defaultpathes_into_filescollector"); }
-        my $module = $onefile->{'modules'};
-        # If modules contains a list of modules, only taking the first one.
-        if ( $module =~ /^\s*(.*?)\,/ ) { $module = $1; }
-        
-        if ( ! exists($installer::globals::moduledestination{$module}) ) { installer::exiter::exit_program("ERROR: No default destination path found for module $module!", "add_defaultpathes_into_filescollector"); }
-        my $defaultpath = $installer::globals::moduledestination{$module};
-        $defaultpath =~ s/\/\s*$//; # removing ending slashes
-        my $fulldestpath = $defaultpath . $installer::globals::separator . $destination;
-    
-        $onefile->{'fulldestpath'} = $fulldestpath;	
-    }
-}
-
-#####################################################################
-# Creating list of cabinet files from packages
-#####################################################################
-
-sub prepare_cabinet_files
-{
-    my ($packages, $allvariables) = @_;
-    
-    if ( ! ( $#{$packages} > -1 )) { installer::exiter::exit_program("ERROR: No packages defined!", "print_content"); }
-
-    installer::logger::include_header_into_logfile("Preparing cabinet files:");
-
-    my $infoline = "";
-
-    for ( my $i = 0; $i <= $#{$packages}; $i++ )
-    {
-        my $onepackage = ${$packages}[$i];
-        
-        my $cabinetfile = "$onepackage->{'packagename'}\.cab";
-        
-        resolve_packagevariables(\$cabinetfile, $allvariables, 0);
-            
-        $installer::globals::allcabinets{$cabinetfile} = 1;
-
-        # checking all items that must be defined
-
-        $infoline = "Package $onepackage->{'module'}\n";
-        push(@installer::globals::logfileinfo, $infoline);
-
-        # Assigning the cab file to the module and also to all corresponding sub modules
-
-        my $onemodule;
-        foreach $onemodule ( @{$onepackage->{'allmodules'}} )
-        {
-            if ( ! exists($installer::globals::allcabinetassigns{$onemodule}) )
-            {
-                $installer::globals::allcabinetassigns{$onemodule} = $cabinetfile;
-            }
-            else
-            {
-                my $infoline = "Warning: Already existing assignment: $onemodule : $installer::globals::allcabinetassigns{$onemodule}\n";
-                push(@installer::globals::logfileinfo, $infoline);				
-                $infoline = "Ignoring further assignment: $onemodule : $cabinetfile\n";
-                push(@installer::globals::logfileinfo, $infoline);				
-            }
-        }
-    }
-}
-
-#####################################################################
-# Logging assignments of cabinet files
-#####################################################################
-
-sub log_cabinet_assignments
-{
-    installer::logger::include_header_into_logfile("Logging cabinet files:");
-
-    my $infoline = "List of cabinet files:\n";
-    push(@installer::globals::logfileinfo, $infoline);				
-
-    my $key;
-    foreach $key ( sort keys %installer::globals::allcabinets ) { push(@installer::globals::logfileinfo, "\t$key\n"); }
-    
-    $infoline = "\nList of assignments from modules to cabinet files:\n";
-    push(@installer::globals::logfileinfo, $infoline);				
-    
-    foreach $key ( sort keys %installer::globals::allcabinetassigns ) { push(@installer::globals::logfileinfo, "\t$key : $installer::globals::allcabinetassigns{$key}\n"); }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/packagepool.pm b/solenv/bin/modules/installer/packagepool.pm
deleted file mode 100644
index 6c1874328..000000000
--- a/solenv/bin/modules/installer/packagepool.pm
+++ /dev/null
@@ -1,1048 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::packagepool;
-
-use Digest::MD5;
-use installer::exiter;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::worker;
-
-######################################################
-# Checking the md5sum of a file
-######################################################
-
-sub get_md5sum
-{
-    my ($filename) = @_;
-
-    open(FILE, "<$filename") or die "ERROR: Can't open $filename for creating file hash";
-    binmode(FILE);
-    my $digest = Digest::MD5->new->addfile(*FILE)->hexdigest;			
-    close(FILE);
-    
-    return $digest;	
-}
-
-####################################################
-# Setting a unique sessionid to identify this
-# packaging process.
-####################################################
-
-sub set_sessionid
-{
-    my $pid = $$;		# process id
-    my $timer = time();	# time
-    $installer::globals::sessionid = $pid . $timer;
-    $installer::globals::sessionidset = 1;
-    my $infoline = "\nPool: Setting session id: $installer::globals::sessionid.\n";
-    push( @installer::globals::logfileinfo, $infoline);		
-}
-
-####################################################
-# Setting and creating pool path.
-####################################################
-
-sub set_pool_path
-{
-    $installer::globals::unpackpath =~ s/\Q$installer::globals::separator\E\s*$//;	# removing ending slashes and backslashes
-    $installer::globals::poolpath = $installer::globals::unpackpath . $installer::globals::separator . "pool_" . $installer::globals::packageformat;
-    installer::systemactions::create_directory($installer::globals::poolpath);
-    $installer::globals::poolpathset = 1;
-}
-
-####################################################
-# Comparing the content of two epm files.
-####################################################
-
-sub compare_epm_content
-{
-    my ($oldcontent, $newcontent) = @_;
-    
-    my $identical = 1;
-    my $diffinfo = "";
-
-    # Removing empty lines and files from $newcontent
-    
-    my @newlocalcontent = ();
-    for ( my $i = 0; $i <= $#{$newcontent}; $i++ )
-    {
-        if ( ${$newcontent}[$i] =~ /^\s*$/ ) { next; } # Removing empty lines from $newcontent. Empty lines are also not included into pcf file, from where $oldcontent was read.
-        if ( ${$newcontent}[$i] =~ /^\s*f\s+/ ) { next; } # Ignoring files, they can contain temporary pathes
-        if (( ${$newcontent}[$i] =~ /^\s*%readme\s+/ ) || ( ${$newcontent}[$i] =~ /^\s*%license\s+/ )) { next; } # ignoring license and readme (language specific!)
-        my $oneline = ${$newcontent}[$i];
-        $oneline =~ s/\s*$//; # Removing line ends. Also not included in old epm file, that is read from pcf file.
-        push(@newlocalcontent, $oneline);
-    }
-
-    my $oldmember = $#{$oldcontent} + 1;
-    my $newmember = $#newlocalcontent + 1;
-
-    # comparing the count
-    if ( $oldmember != $newmember )
-    {
-        $identical = 0;
-        installer::logger::print_message("\n...... changed length of EPM file\n");
-        $diffinfo = "Pool: EPM, different line count: old epm file: $oldmember, new epm file: $newmember\n";
-        push(@installer::globals::epmdifflist, $diffinfo);
-    }
-
-    # comparing the content line for line, so the order must not change
-
-    if ( $identical )
-    {
-        for ( my $i = 0; $i <= $#{$oldcontent}; $i++ )
-        {
-            if ( ${$oldcontent}[$i] ne $newlocalcontent[$i] )
-            {
-                $identical = 0;
-                my $line = $i + 1;
-                installer::logger::print_message("\n...... different content in EPM file\n");
-                $diffinfo = "Pool: EPM, line $line changed from \"${$oldcontent}[$i]\" to \"$newlocalcontent[$i]\".\n";
-                push(@installer::globals::epmdifflist, $diffinfo);
-                last;
-            }
-        }
-    }	
-
-    return $identical;	
-}
-
-####################################################
-# Comparing the content of two pcf files.
-####################################################
-
-sub compare_package_content
-{
-    my ($oldcontent, $newcontent) = @_;
-    
-    my $identical = 1;
-    my $infoline = "";
-    
-    my $oldmember = scalar keys %{$oldcontent};
-    my $newmember = scalar keys %{$newcontent};
-
-    # comparing the count
-    
-    if ( $oldmember != $newmember )
-    {
-        # Logging the difference
-        $identical = 0;
-        installer::logger::print_message("\n...... different number of files in packages. New number: $newmember, old number: $oldmember\n");
-        $infoline = "Different number of files in packages. New number: $newmember, old number: $oldmember\n";
-        push(@installer::globals::pcfdiffcomment, $infoline);
-    }
-        
-    # comparing the keys
-        
-    if ( $identical )
-    {
-        my $first = 1;
-        my $start = "\n";
-        foreach my $dest ( keys %{$newcontent} )
-        {
-            if ( ! exists($oldcontent->{$dest}) )
-            {
-                $identical = 0;
-                installer::logger::print_message("$start...... file only in one package (A): $dest\n");
-                $infoline = "File only in existing pool package: $dest\n";
-                push(@installer::globals::pcfdiffcomment, $infoline);
-                if ( $first ) { $start = ""; }	
-                $first = 0;
-            }
-        }
-
-        # collecting all differences		
-        if ( ! $identical )
-        {
-            foreach my $dest ( keys %{$oldcontent} )
-            {
-                if ( ! exists($newcontent->{$dest}) )
-                {
-                    $identical = 0;
-                    installer::logger::print_message("$start...... file only in one package (B): $dest\n");
-                    $infoline = "File only in new package: $dest\n";
-                    push(@installer::globals::pcfdiffcomment, $infoline);	
-                    if ( $first ) { $start = ""; }	
-                    $first = 0;
-                }
-            }			
-        }
-    }
-    
-    # comparing the checksum
-    
-    if ( $identical )
-    {
-        my $first = 1;
-        
-        foreach my $dest ( keys %{$newcontent} )
-        {
-            if ( $newcontent->{$dest}->{'md5sum'} ne $oldcontent->{$dest}->{'md5sum'} )
-            {
-                $identical = 0;
-                if ( $first == 1 )
-                {
-                    installer::logger::print_message("\n");
-                    $first = 0;
-                }
-                $installer::globals::pcfdifflist{$dest} = 1;
-                installer::logger::print_message("...... different file: $dest\n");
-                # last;				
-            }
-            
-            if ( $installer::globals::iswindowsbuild )
-            {
-                if ( $newcontent->{$dest}->{'uniquename'} ne $oldcontent->{$dest}->{'uniquename'} )
-                {
-                    $identical = 0;
-                    $installer::globals::pcfdifflist{$dest} = 1;
-                    installer::logger::print_message("\n...... different file: $dest");
-                    # last;				
-                }
-            }
-        }
-    }
-
-    return $identical;
-}
-
-####################################################
-# Calculating content of pcf file.
-####################################################
-
-sub calculate_current_content
-{
-    my ($filesarray, $packagename) = @_;
-
-    installer::logger::include_timestamp_into_logfile("\nCalculating content for package content file ($packagename), start");
-    
-    my %globalcontent = ();
-    
-    for ( my $i = 0; $i <= $#{$filesarray}; $i++ )
-    {
-        my %onefilehash = ();
-        
-        my $onefile = ${$filesarray}[$i];
-        if ( ! $onefile->{'sourcepath'} ) { installer::exiter::exit_program("ERROR: No sourcepath found for file $onefile->{'gid'}", "calculate_current_content");  }
-        my $source = $onefile->{'sourcepath'};
-        if ( $onefile->{'zipfilesource'} ) { $source = $onefile->{'zipfilesource'}; }
-        if ( ! -f $source ) { installer::exiter::exit_program("ERROR: Sourcefile not found: $source ($onefile->{'gid'})", "calculate_current_content"); }
-
-        # For Windows the unique name inside the cabinet file also has to be saved
-        my $uniquename = "";
-        if ( $installer::globals::iswindowsbuild ) { $uniquename = $onefile->{'uniquename'};}
-
-        my $destination = $onefile->{'destination'};
-        my $checksum = get_md5sum($source);
-
-        $onefilehash{'md5sum'} = $checksum;
-        $onefilehash{'uniquename'} = $uniquename;
-
-        if ( exists($globalcontent{$destination}) ) { installer::exiter::exit_program("ERROR: Destination not unique: $destination ($onefile->{'gid'})", "calculate_current_content"); }
-        $globalcontent{$destination} = \%onefilehash;
-    }
-
-    installer::logger::include_timestamp_into_logfile("\nCalculating content for package content file ($packagename), start");
-
-    return \%globalcontent;	
-}
-
-####################################################
-# Writing pcf file.
-####################################################
-
-sub create_pcfcontent_file
-{
-    my ($realpackagename, $md5sum, $filesize, $fullpackagename, $pkgversion, $epmfilecontent, $pcffilename) = @_;
-
-    my @content = ();
-    my $oneline = "PackageName: $realpackagename\n";
-    push(@content, $oneline);		
-
-    $oneline = "md5sum: $md5sum\n";
-    push(@content, $oneline);		
-
-    $oneline = "FileSize: $filesize\n";
-    push(@content, $oneline);		
-
-    $oneline = "FullPackageName: $fullpackagename\n";
-    push(@content, $oneline);		
-
-    $oneline = "PkgVersion: $pkgversion\n";
-    push(@content, $oneline);		
-
-    foreach my $dest (keys %{$installer::globals::newpcfcontent} )
-    {
-        $oneline = "Files:\t$dest\t$installer::globals::newpcfcontent->{$dest}->{'md5sum'}\t$installer::globals::newpcfcontent->{$dest}->{'uniquename'}\n";
-        push(@content, $oneline);
-    }
-
-    for ( my $i = 0; $i <= $#{$epmfilecontent}; $i++ )
-    {
-        if ( ${$epmfilecontent}[$i] =~ /^\s*$/ ) { next; } # avoiding empty lines
-        if ( ${$epmfilecontent}[$i] =~ /^\s*f\s+/ ) { next; } # ignoring files, because they can contain temporary pathes
-        if (( ${$epmfilecontent}[$i] =~ /^\s*%readme\s+/ ) || ( ${$epmfilecontent}[$i] =~ /^\s*%license\s+/ )) { next; } # ignoring license and readme (language specific!)
-        $oneline = "EPM:\t${$epmfilecontent}[$i]";
-        push(@content, $oneline);
-    }
-
-    installer::files::save_file($pcffilename, \@content);
-}
-
-#######################################################
-# Reading the content of the package content file.
-#######################################################
-
-sub read_pcf_content
-{
-    my ($pcffilename) = @_;
-    
-    my %allcontent = ();
-    my @epmfile = ();
-    my $realpackagename = "";
-
-    my $content = installer::files::read_file($pcffilename);
-    
-    for ( my $i = 0; $i <= $#{$content}; $i++ )
-    {
-        my $line = ${$content}[$i];
-
-        if ( $line =~ /^\s*PackageName\:\s*(.*?)\s*$/ )
-        {
-            $realpackagename = $1;
-            $installer::globals::xpdpackageinfo{'RealPackageName'} = $realpackagename;
-            next;
-        }
-
-        if ( $line =~ /^\s*FullPackageName\:\s*(.*?)\s*$/ )
-        {
-            $installer::globals::xpdpackageinfo{'FullPackageName'} = $1;
-            next;
-        }
-        
-        if ( $line =~ /^\s*FileSize\:\s*(.*?)\s*$/ )
-        {
-            $installer::globals::xpdpackageinfo{'FileSize'} = $1;
-            next;
-        }
-
-        if ( $line =~ /^\s*PkgVersion\:\s*(.*?)\s*$/ )
-        {
-            $installer::globals::xpdpackageinfo{'PkgVersion'} = $1;
-            next;
-        }
-
-        if ( $line =~ /^\s*md5sum\:\s*(.*?)\s*$/ )
-        {
-            $installer::globals::xpdpackageinfo{'md5sum'} = $1;
-            next;
-        }
-        
-        if ( $line =~ /^\s*Files:\t(.+?)\t(.+?)\t(.*?)\s*$/ )
-        {
-            my $destination = $1;
-            my $checksum = $2;
-            my $uniquename = $3;
-            
-            my %onefilehash = ();
-            $onefilehash{'md5sum'} = $checksum;
-            $onefilehash{'uniquename'} = $uniquename;
-            
-            $allcontent{$destination} = \%onefilehash;
-            next;
-        }
-
-        if ( $line =~ /^\s*EPM:\t(.*?)\s*$/ )	 # A line can be empty in epm file
-        {
-            my $epmcontent = $1;
-            push(@epmfile, $epmcontent);
-            next;
-        }
-    }
-    
-    if ( $realpackagename eq "" ) { installer::exiter::exit_program("ERROR: Real package name not found in pcf file: \"$pcffilename\"", "read_pcf_content"); }
-    
-    return ($realpackagename, \%allcontent, \@epmfile);
-}
-
-####################################################
-# Checking, if a specific package can be 
-# created at the moment.
-####################################################
-
-sub check_package_availability
-{
-    my ($packagename) = @_;
-    
-    my $package_is_available = 1;
-    
-    my $checkfilename = $installer::globals::poolpath . $installer::globals::separator . $packagename . ".pcf.check";
-    my $lockfilename = $installer::globals::poolpath . $installer::globals::separator . $packagename . ".pcf.lock";
-
-    if (( -f $checkfilename ) || ( -f $lockfilename )) { $package_is_available = 0; }
-    
-    return $package_is_available;
-}
-
-####################################################
-# Check, if the existence of the check or lock
-# file requires an exit of packaging process.
-####################################################
-
-sub check_pool_exit
-{
-    my ( $lockfilename, $timecounter ) = @_;
-    
-    # How old is this lock file?
-    my $timeage = installer::logger::get_file_age($lockfilename);
-
-    # if ( $timeage > 1800 ) # file is older than half an hour 
-    if ( $timeage > 3600 ) # file is older than an hour 
-    {
-        my $timestring = installer::logger::convert_timestring($timeage);
-        my $infoline = "\nPool: Attention: \"$lockfilename\" is too old ($timestring). Removing file!\n";
-        installer::logger::print_message( "... $infoline" );
-        push( @installer::globals::logfileinfo, $infoline);
-        unlink $lockfilename;
-        # installer::exiter::exit_program("ERROR: Waiting too long for removal of lock file \"$lockfilename\"", "check_pool_exit (packagepool)");
-    }
-    else
-    {
-        my $filecontent = installer::files::read_file($lockfilename);
-        my $waittime = $timecounter * 10;
-        $waittime = installer::logger::convert_timestring($waittime);
-        my $infoline = "\nPool: Warning: \"$lockfilename\" blocks this process for $waittime. Lock content: \"${$filecontent}[0]\"\n";
-        installer::logger::print_message( "... $infoline" );
-        push( @installer::globals::logfileinfo, $infoline);		
-    }
-}
-
-############################################################################
-# This function logs some information, that can be used to find
-# pool problems.
-############################################################################
-
-sub log_pool_info
-{
-    my ( $file_exists ) = @_;
-
-    my $infoline = "";
-
-    # Content saved in
-    # $installer::globals::savelockfilecontent = installer::files::read_file($filename);
-    # $installer::globals::savelockfilename = $filename;
-
-    if ( $file_exists )
-    {
-        $infoline = "\nPool Problem: Lock file \"$installer::globals::savelockfilename\" belongs to another process. This process has session id: $installer::globals::sessionid .\n";
-        push( @installer::globals::logfileinfo, $infoline);		
-        $infoline = "Content of Lock file:\n";
-        push( @installer::globals::logfileinfo, $infoline);	
-        foreach my $line ( @{$installer::globals::savelockfilecontent} ) { push( @installer::globals::logfileinfo, $line); }
-    }
-    else
-    {
-        $infoline = "\nPool Problem: Lock file \"$installer::globals::savelockfilename\" does not exist anymore (this process has session id: $installer::globals::sessionid) .\n";
-        push( @installer::globals::logfileinfo, $infoline);				
-    }
-}
-
-############################################################################
-# Checking, if this process is the owner of the lock file in the pool.
-# This can be determined by the Process ID, that is written at the
-# beginning of the first line into the lock file.
-############################################################################
-
-sub process_is_owner
-{
-    my ( $filename ) = @_;
-    
-    my $process_is_owner = 0;
-
-    $installer::globals::savelockfilecontent = installer::files::read_file($filename);
-    $installer::globals::savelockfilename = $filename;
-    
-    if ( ${$installer::globals::savelockfilecontent}[0] =~ /^\s*\Q$installer::globals::sessionid\E\s+/ ) { $process_is_owner = 1; }
-    
-    return $process_is_owner;
-}
-
-####################################################
-# Removing a package from installation set, if 
-# there were pooling problems.
-####################################################
-
-sub remove_package_from_installset
-{
-    my ($newpackagepath) = @_;
-
-    my $infoline = "Pool problem: Removing package \"$newpackagepath\" from installation set!\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    if ( -f $newpackagepath ) { unlink $newpackagepath; }
-    if ( -d $newpackagepath ) { installer::systemactions::remove_complete_directory($newpackagepath, 1); }
-
-    # Keeping the content of @installer::globals::installsetcontent up to date. Removing the last package.
-    pop(@installer::globals::installsetcontent);
-}
-
-####################################################
-# Check, if the package is in the pool and if
-# there are no changes in the package.
-####################################################
-
-sub package_is_up_to_date
-{
-    my ($allvariables, $onepackage, $packagename, $newepmcontent, $filesinpackage, $installdir, $subdir, $languagestringref) = @_;
-
-    installer::logger::print_message_without_newline( "... checking pool package $packagename ..." );
-
-    installer::logger::include_header_into_logfile("Checking package in pool: $packagename");
-
-    if ( ! $installer::globals::poolpathset ) { installer::packagepool::set_pool_path(); }
-    if ( ! $installer::globals::sessionidset ) { installer::packagepool::set_sessionid(); }
-    
-    my $infoline = "";
-    # Resetting some variables for this package
-    my $package_is_up_to_date = 0;
-    my $realpackagename = "";
-    my $oldepmcontent = "";
-    my $waited_for_check = 0;
-    my $waited_for_lock = 0;
-    $installer::globals::newpcfcontentcalculated = 0;
-    %installer::globals::pcfdifflist = ();
-    @installer::globals::pcfdiffcomment = ();
-    @installer::globals::epmdifflist = ();
-    
-    # Reading the package content file, if this file exists (extension *.pcf)
-    my $filename = $installer::globals::poolpath . $installer::globals::separator . $packagename . ".pcf";
-    my $checkfilename = $installer::globals::poolpath . $installer::globals::separator . $packagename . ".pcf.check";
-    my $lockfilename = $installer::globals::poolpath . $installer::globals::separator . $packagename . ".pcf.lock";
-    # Saving name in global variable, so that this file can be removed somewhere else (at the end of "put_content_into_pool").
-    $installer::globals::poolcheckfilename = $checkfilename;
-    $installer::globals::poollockfilename = $lockfilename;
-
-    my @checkfilecontent = ("$installer::globals::sessionid $installer::globals::product $$languagestringref $checkfilename");	# $$ is the process id
-    my @lockfilecontent = ("$installer::globals::sessionid $installer::globals::product $$languagestringref $lockfilename");	# $$ is the process id
-
-    # Waiting, step 1
-    # Checking, if another process checks this package at the moment
-    my $timecounter = 0;
-    while ( -f $checkfilename )
-    {
-        $timecounter++;
-
-        # including an exit to enable creation of other packages
-        if (( $timecounter == 1 ) && ( ! exists($installer::globals::poolshiftedpackages{$packagename}) ))
-        {
-            $package_is_up_to_date = 3;	# repeat this package later
-            return $package_is_up_to_date;
-        }
-
-        $infoline = "Pool: $checkfilename exists. WAITING 10 seconds ($timecounter).\n";
-        if ( $timecounter == 1 ) { installer::logger::print_message( "\n" ); }
-        installer::logger::print_message( "... $infoline" );
-        push( @installer::globals::logfileinfo, $infoline);
-        # if ( $timecounter % 50 == 0 ) { check_pool_exit($checkfilename, $timecounter); }
-        if ( $timecounter % 100 == 0 ) { check_pool_exit($checkfilename, $timecounter); }
-        sleep 10; # process sleeps 10 seconds
-        $waited_for_check = 1;
-    }
-
-    # Creating file, showing that this package is checked at the moment by this process. No other process can reach this.
-    installer::files::save_file($checkfilename, \@checkfilecontent);	# Creating the Lock, to check this package. This blocks all other processes.
-    $installer::globals::processhaspoolcheckfile = 1;
-
-    # Check, if the Lock file creation was really successful
-    if ( ! -f $checkfilename )
-    {
-        $infoline = "Pool problem: Pool lock file \"$checkfilename\" could not be created successfully or was removed by another process (A)!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        log_pool_info(0);
-        $package_is_up_to_date = 4;	# repeat this package
-        return $package_is_up_to_date;
-    } 
-
-    if ( ! process_is_owner($checkfilename) )
-    {
-        $infoline = "Pool problem: Pool lock file \"$checkfilename\" belongs to another process (A)!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        log_pool_info(1);
-        $package_is_up_to_date = 4;	# repeat this package
-        return $package_is_up_to_date;
-    }
-
-    $infoline = "Pool: Created file: $checkfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    if ( $waited_for_check ) { installer::logger::print_message( "... $infoline" ); }
-
-    # Waiting, step 2
-    # Checking, if another process creates this package at the moment
-    $timecounter = 0;
-    while ( -f $lockfilename )
-    {
-        $timecounter++;
-        $infoline = "Pool: $lockfilename exists. WAITING 10 seconds ($timecounter).\n";
-        if ( $timecounter == 1 ) { installer::logger::print_message( "\n" ); }
-        installer::logger::print_message( "... $infoline" );
-        push( @installer::globals::logfileinfo, $infoline);
-        # if ( $timecounter % 50 == 0 ) { check_pool_exit($lockfilename, $timecounter); }
-        if ( $timecounter % 100 == 0 ) { check_pool_exit($lockfilename, $timecounter); }
-        sleep 10; # process sleeps 10 seconds
-        $waited_for_lock = 1;
-    }
-
-    # No lock file exists, therefore no process creates this package at the moment. Check can be done now.
-    if ( $waited_for_lock ) { installer::logger::print_message( "... Pool: Proceeding, $lockfilename was removed.\n" ); }
-
-    my $package_already_exists = 0;
-
-    if ( -f $filename )
-    {
-        # Calculating content for pcf file
-        $installer::globals::newpcfcontent = calculate_current_content($filesinpackage, $packagename);
-        $installer::globals::newpcfcontentcalculated = 1;
-
-        # reading the existing pcf file
-        ($realpackagename, $oldpcfcontent, $oldepmcontent) = read_pcf_content($filename);
-
-        # First check: Package has to exist in pool (directories on Solaris)
-        my $fullpackage = $installer::globals::poolpath . $installer::globals::separator . $realpackagename;
-        if ( $installer::globals::issolarisbuild ) { $fullpackage = $fullpackage . ".tar"; }
-        if ( -f $fullpackage )
-        {
-            $package_already_exists = 1;
-            # Second check: Only files
-            my $content_is_identical = compare_package_content($oldpcfcontent, $installer::globals::newpcfcontent);
-
-            # Third check for Unix: Changes in the epm file?
-            if (( $content_is_identical ) && ( ! $installer::globals::iswindowsbuild ))
-            {
-                $content_is_identical = compare_epm_content($oldepmcontent, $newepmcontent);
-            }
-    
-            if ( $content_is_identical ) { $package_is_up_to_date = 1; }
-        }
-    }
-
-    if ( $package_is_up_to_date )
-    {
-        $infoline = "Pool: $packagename: No new content, using existing package\n";
-        push( @installer::globals::logfileinfo, $infoline);	
-        installer::logger::print_message( "... using package from pool\n" );
-    }
-    else
-    {
-        if ( $package_already_exists )
-        {
-            $infoline = "Pool: $packagename: Contains new content, creating new package. Differences:\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            foreach my $dest ( sort keys %installer::globals::pcfdifflist ) { push( @installer::globals::logfileinfo, "$dest\n"); }
-            foreach my $dest ( @installer::globals::pcfdiffcomment ) { push( @installer::globals::logfileinfo, "$dest"); }
-            foreach my $dest ( @installer::globals::epmdifflist ) { push( @installer::globals::logfileinfo, "$dest"); }
-        }
-        else
-        {
-            $infoline = "Pool: $packagename: Does not exist in pool.\n";
-            push( @installer::globals::logfileinfo, $infoline);			
-        }
-
-        installer::logger::print_message( "... packaging required\n" );
-        %installer::globals::xpdpackageinfo = (); # reset the filled hash, because the package cannot be used.
-        
-        # Creating lock mechanism, so that other processes do not create this package, too.
-        installer::files::save_file($lockfilename, \@lockfilecontent);		# Creating the Lock, to create this package (Lock for check still exists).
-        $installer::globals::processhaspoollockfile = 1;
-
-        # Check if creation of Lock file was really successful
-        
-        if ( ! -f $lockfilename )
-        {
-            $infoline = "Pool problem: Pool lock file \"$lockfilename\" could not be created successfully or was removed by another process (D)!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            log_pool_info(0);
-            $package_is_up_to_date = 4;	# repeat this package
-            return $package_is_up_to_date;
-        } 
-
-        if ( ! process_is_owner($lockfilename) )
-        {
-            $infoline = "Pool problem: Pool lock file \"$lockfilename\" belongs to another process (D)!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            log_pool_info(1);
-            $package_is_up_to_date = 4;	# repeat this package
-            return $package_is_up_to_date;
-        }
-
-        $infoline = "Pool: Created file: $lockfilename\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    my $newpackagepath = "";
-
-    if ( $package_is_up_to_date )
-    {
-        # Before the package is copied into the installation set, it has to be checked, if this process is really the owner of this lock file..
-        # Check, if lock file still exists and if this process is the owner.
-
-        if ( ! -f $checkfilename )
-        {
-            $infoline = "Pool problem: Pool lock file \"$checkfilename\" was removed by another process (B)!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            log_pool_info(0);
-            $package_is_up_to_date = 4;	# repeat this package
-            return $package_is_up_to_date;
-        } 
-
-        if ( ! process_is_owner($checkfilename) )
-        {
-            $infoline = "Pool problem: Pool lock file \"$checkfilename\" belongs to another process (B)!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            log_pool_info(1);
-            $package_is_up_to_date = 4;	# repeat this package
-            return $package_is_up_to_date;
-        } 
-    
-        # Copying the package from the pool into the installation set
-        $newpackagepath = copy_package_from_pool($installdir, $subdir, $realpackagename);
-    }
-
-    # Before the lock file in the pool can be removed, it has to be checked, if this process is still the owner of this lock file.
-    # Check, if lock file still exists and if this process is the owner.
-    if ( ! -f $checkfilename )
-    {		
-        $infoline = "Pool problem: Pool lock file \"$checkfilename\" was removed by another process (C)!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        log_pool_info(0);
-        
-        # removing new package from installation set
-        if ( $newpackagepath ne "" ) { remove_package_from_installset($newpackagepath); } 	# A file was copied and a problem occurred with pooling
-        
-        $package_is_up_to_date = 4;	# repeat this package
-        return $package_is_up_to_date;
-    } 
-
-    if ( ! process_is_owner($checkfilename) )
-    {
-        $infoline = "Pool problem: Pool lock file \"$checkfilename\" belongs to another process (C)!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        log_pool_info(1);
-
-        # removing new package from installation set
-        if ( $newpackagepath ne "" ) { remove_package_from_installset($newpackagepath); } 	# A file was copied and a problem occurred with pooling
-
-        $package_is_up_to_date = 4;	# repeat this package
-        return $package_is_up_to_date;
-    } 
-
-    # Removing the check file, releasing this package for the next process. 
-    # The Lock to create this package still exists, if required.
-    unlink $checkfilename;
-    $installer::globals::processhaspoolcheckfile = 0;
-    $infoline = "Pool: Removing file: $checkfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # Last chance before packaging starts, to check, if this process is really still owner
-    # of the packaging lock file. If not, this packaging process can be repeated.
-    if ( $installer::globals::processhaspoollockfile )
-    {
-        if ( ! -f $lockfilename )
-        {
-            $infoline = "Pool problem: Pool lock file \"$lockfilename\" was removed by another process (E)!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            log_pool_info(0);
-            $package_is_up_to_date = 4;	# repeat this package
-            return $package_is_up_to_date;
-        } 
-
-        if ( ! process_is_owner($lockfilename) )
-        {
-            $infoline = "Pool problem: Pool lock file \"$lockfilename\" belongs to another process (E)!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            log_pool_info(1);
-            $package_is_up_to_date = 4;	# repeat this package
-            return $package_is_up_to_date;
-        }		
-    }
-
-    # Collecting log information
-    if ( $package_is_up_to_date == 1 ) { $installer::globals::poolpackages{$packagename} = 1; }
-    if ( $package_is_up_to_date == 0 )
-    {
-        my @packreasons = ();
-        if ( $package_already_exists )
-        {
-            $infoline = "\t\tPool: $packagename: Contains new content, creating new package. Differences:\n";
-            push( @packreasons, $infoline);
-            foreach my $dest ( sort keys %installer::globals::pcfdifflist ) { push( @packreasons, "\t\t$dest\n"); }
-            foreach my $dest ( @installer::globals::pcfdiffcomment ) { push( @packreasons, "\t\t$dest"); }
-            foreach my $dest ( @installer::globals::epmdifflist ) { push( @packreasons, "\t\t$dest"); }
-        }
-        else
-        {
-            $infoline = "\t\tPool: $packagename: Does not exist in pool.\n";
-            push( @packreasons, $infoline);			
-        }
-
-        $installer::globals::createpackages{$packagename} = \@packreasons;		
-    }
-
-    return $package_is_up_to_date;
-}
-
-###################################################
-# Determine, which package was created newly 
-###################################################
-
-sub determine_new_packagename
-{
-    my ( $dir ) = @_;
-
-    my ($newcontent, $allcontent) = installer::systemactions::find_new_content_in_directory($dir, \@installer::globals::installsetcontent);
-    @installer::globals::installsetcontent = ();
-    foreach my $element ( @{$allcontent} ) { push(@installer::globals::installsetcontent, $element); }
-
-    my $newentriesnumber = $#{$newcontent} + 1;
-    if ( $newentriesnumber > 1 )
-    {
-        my $newpackages = "";
-        foreach my $onepackage ( @{$newcontent} ) { $newpackages = $newpackages . " " . $onepackage; }
-        installer::exiter::exit_program("ERROR: More than one new package in directory $dir ($newpackages)", "determine_new_packagename (packagepool)");
-    }
-    elsif ( $newentriesnumber < 1 )
-    {
-        installer::exiter::exit_program("ERROR: No new package in directory $dir", "determine_new_packagename (packagepool)");
-    }
-    my $newpackage = ${$newcontent}[0];
-    
-    return $newpackage;
-}
-
-####################################################
-# Including content into the package pool
-####################################################
-
-sub put_content_into_pool
-{
-    my ($packagename, $installdir, $subdir, $filesinpackage, $epmfilecontent) = @_;
-
-    my $infoline = "";
-
-    my $fullinstalldir = $installdir . $installer::globals::separator . $subdir;
-    my $fullrealpackagename = determine_new_packagename($fullinstalldir);
-    my $realpackagename = $fullrealpackagename;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$realpackagename);
-
-    installer::logger::include_header_into_logfile("Adding content into the package pool: $realpackagename (PackageName: $packagename)");
-
-    # Calculating content for pcf file, if not already done in "package_is_up_to_date"
-    if ( ! $installer::globals::newpcfcontentcalculated )
-    {
-        $installer::globals::newpcfcontent = calculate_current_content($filesinpackage, $packagename);
-        $installer::globals::newpcfcontentcalculated = 1;
-    }
-    
-    # Determining md5sum and FileSize for the new package and saving in pcf file
-    my $md5sum = installer::xpdinstaller::get_md5_value($fullrealpackagename);
-    my $filesize = installer::xpdinstaller::get_size_value($fullrealpackagename);
-    my $fullpackagename = installer::xpdinstaller::get_fullpkgname_value($fullrealpackagename);
-    my $pkgversion = installer::xpdinstaller::get_pkgversion_value($fullrealpackagename);
-
-    # Put package content file (pcf) into pool
-    my $pcffilename = $installer::globals::poolpath . $installer::globals::separator . $packagename . ".pcf";
-    create_pcfcontent_file($realpackagename, $md5sum, $filesize, $fullpackagename, $pkgversion, $epmfilecontent, $pcffilename);
-
-    # Creating xpd info
-    $installer::globals::xpdpackageinfo{'FileSize'} = $filesize;
-    $installer::globals::xpdpackageinfo{'FullPackageName'} = $fullpackagename;
-    $installer::globals::xpdpackageinfo{'md5sum'} = $md5sum;
-    $installer::globals::xpdpackageinfo{'RealPackageName'} = $realpackagename;
-    $installer::globals::xpdpackageinfo{'PkgVersion'} = $pkgversion;
-
-    # Put package into pool
-    $infoline = "Pool: Adding package \"$packagename\" into pool.\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    
-    # Copying with unique name, containing PID. Only renaming if everything was fine.
-    my $realdestination = "";
-    my $uniquedestination = "";
-    if ( -f $fullrealpackagename )
-    {
-        $realdestination = $installer::globals::poolpath . $installer::globals::separator . $realpackagename;
-        $uniquedestination = $realdestination . "." . $installer::globals::sessionid;
-        installer::systemactions::copy_one_file($fullrealpackagename, $uniquedestination);
-    }
-
-    # Copying Solaris packages (as tar files)
-    if ( -d $fullrealpackagename )
-    {
-        my $tarfilename = $packagename . ".tar";
-        my $fulltarfilename = $fullinstalldir . $installer::globals::separator . $tarfilename;
-        my $size = installer::worker::tar_package($fullinstalldir, $packagename, $tarfilename, $installer::globals::getuidpath);
-        if (( ! -f $fulltarfilename ) || ( ! ( $size > 0 ))) { installer::exiter::exit_program("ERROR: Missing file: $fulltarfilename", "put_content_into_pool"); } 
-        $realdestination = $installer::globals::poolpath . $installer::globals::separator . $tarfilename;
-        $uniquedestination = $realdestination . "." . $installer::globals::sessionid;
-        installer::systemactions::copy_one_file($fulltarfilename, $uniquedestination);
-        unlink $fulltarfilename;
-    }
-    
-    # Before the new package is renamed in the pool, it has to be checked, if this process still has the lock for this package.
-    # Check, if lock file still exists and if this process is the owner. Otherwise a pool error occurred.
-    if ( ! -f $installer::globals::poollockfilename )
-    {
-        unlink $uniquedestination;  # removing file from pool
-        log_pool_info(0);
-        installer::exiter::exit_program("ERROR: Pool lock file \"$installer::globals::poollockfilename\" was removed by another process (F)!", "put_content_into_pool");
-    } 
-
-    if ( ! process_is_owner($installer::globals::poollockfilename) )
-    {
-        unlink $uniquedestination;  # removing file from pool
-        log_pool_info(1);
-        installer::exiter::exit_program("ERROR: Pool lock file \"$installer::globals::poollockfilename\" belongs to another process (F)!", "put_content_into_pool");
-    } 
-    
-    # Renaming the file in the pool (atomic step)
-    rename($uniquedestination, $realdestination);
-
-    $infoline = "Pool: Renamed file: \"$uniquedestination\" to \"$realdestination\".\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # Before the lock file in the pool can be removed, it has to be checked, if this process is still the owner of this lock file.
-    # Check, if lock file still exists and if this process is the owner. Otherwise a pool error occurred.
-    if ( ! -f $installer::globals::poollockfilename )
-    {
-        log_pool_info(0);
-        installer::exiter::exit_program("ERROR: Pool lock file \"$installer::globals::poollockfilename\" was removed by another process (G)!", "put_content_into_pool");
-    } 
-
-    if ( ! process_is_owner($installer::globals::poollockfilename) )
-    {
-        log_pool_info(1);
-        installer::exiter::exit_program("ERROR: Pool lock file \"$installer::globals::poollockfilename\" belongs to another process (G)!", "put_content_into_pool");
-    } 
-    
-    # Removing lock file, so that other processes can use this package now
-    unlink $installer::globals::poollockfilename;
-    $installer::globals::processhaspoollockfile = 0;
-    $infoline = "Pool: Removing file: $installer::globals::poollockfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-###################################################################
-# Copying a package from the pool into the installation set
-###################################################################
-
-sub copy_package_from_pool
-{
-    my ($installdir, $subdir, $packagename) = @_;
-
-    my $infoline = "Pool: Using package \"$packagename\" from pool.\n";
-    push( @installer::globals::logfileinfo, $infoline);	
-    my $sourcefile = $installer::globals::poolpath . $installer::globals::separator . $packagename;
-    if ( $installer::globals::issolarisbuild ) { $sourcefile = $sourcefile . ".tar"; }
-    if ( ! -f $sourcefile ) { installer::exiter::exit_program("ERROR: Missing package in package pool: \"$sourcefile\"", "copy_package_from_pool"); }
-    my $destination = $installdir . $installer::globals::separator . $subdir;
-    if ( ! -d $destination ) { installer::systemactions::create_directory($destination); }
-    my $destinationfile = $destination . $installer::globals::separator . $packagename;
-    if ( $installer::globals::issolarisbuild ) { $destinationfile = $destinationfile . ".tar"; }
-    if ( -f $sourcefile ) { installer::systemactions::copy_one_file($sourcefile, $destinationfile); }
-    # Unpacking for Solaris
-    if ( $installer::globals::issolarisbuild )
-    {
-        my $tarfilename = $packagename . ".tar";
-        installer::worker::untar_package($destination, $tarfilename, $installer::globals::getuidpath);
-        unlink $destinationfile;
-        $destinationfile =~ s/.tar\s*$//;
-    }
-    
-    # Keeping the content of @installer::globals::installsetcontent up to date (with full pathes):
-    push(@installer::globals::installsetcontent, $destinationfile);
-    
-    return $destinationfile;
-}
-
-###################################################################
-# Counting keys in hash
-###################################################################
-
-sub get_count
-{
-    my ( $hashref ) = @_;
-    
-    my $counter = 0;
-    foreach my $onekey ( keys %{$hashref} ) { $counter++; }
-    return $counter;
-}
-
-###################################################################
-# Logging some pool information
-###################################################################
-
-sub log_pool_statistics
-{
-    my $infoline = "";
-
-    installer::logger::include_header_into_logfile("Pool statistics:");
-
-    # Info collected in global hashes
-    # %installer::globals::createpackages
-    # %installer::globals::poolpackages
-
-    my $pool_packages = get_count(\%installer::globals::poolpackages);
-    my $created_packages = get_count(\%installer::globals::createpackages);
-
-    $infoline = "Number of packages from pool: $pool_packages\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    foreach my $packagename ( sort keys(%installer::globals::poolpackages) )
-    {
-        $infoline = "\t$packagename\n";
-        push( @installer::globals::logfileinfo, $infoline);	
-    }
-
-    $infoline = "\nNumber of packages that were created: $created_packages\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    foreach my $packagename ( sort keys(%installer::globals::createpackages) )
-    {
-        $infoline = "\t$packagename\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        my $reason = $installer::globals::createpackages{$packagename};
-
-        for ( my $i = 0; $i <= $#{$reason}; $i++ )
-        {
-            $infoline = "${$reason}[$i]";
-            push( @installer::globals::logfileinfo, $infoline);		
-        }
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
deleted file mode 100644
index 2a9698630..000000000
--- a/solenv/bin/modules/installer/parameter.pm
+++ /dev/null
@@ -1,668 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::parameter;
-
-use Cwd;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::remover;
-use installer::systemactions;
-
-############################################
-# Parameter Operations
-############################################
-
-sub usage
-{
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::usage"); }
-    
-    print <<Ende;
---------------------------------------------------------------------------------
-$installer::globals::prog
-The following parameter are needed:
--f: Path to the product list (required)
--s: Path to the setup script (optional, if defined in product list)
--i: Install path of the product (/opt/openofficeorg20) (optional)
--p: Product from product list to be created (required)
--l: Language of the product (comma and hash) (optional, defined in productlist)
--b: Build, e.g. srx645 (optional)
--m: Minor, e.g. m10 (optional)
--simple: Path to do a simple install to
--c: Compiler, e.g. wntmsci8, unxlngi5, unxsols4, ... (optional) 
--u: Path, in which zipfiles are unpacked (optional)
--msitemplate: Source of the msi file templates (Windows compiler only)
--msilanguage: Source of the msi file templates (Windows compiler only)
--javalanguage: Source of the Java language files (opt., non-Windows only)
--buildid: Current BuildID (optional)
--pro: Product version
--format: Package format
--debian: Create Debian packages for Linux
--dontunzip: do not unzip all files with flag ARCHIVE
--dontcallepm : do not call epm to create install sets (opt., non-Windows only)
--ispatchedepm : Usage of a patched (non-standard) epm (opt., non-Windows only)
--copyproject : is set for projects that are only used for copying (optional)
--languagepack : do create a languagepack, no product pack (optional)
--helppack : do create a helppack, no product pack (optional)
--patch : do create a patch (optional)
--patchinc: Source for the patch include files (Solaris only)
--dontstrip: No file stripping (Unix only)
--log : Logging all available information (optional)
--debug : Collecting debug information
-  
-Examples for Windows:
-
-perl make_epmlist.pl -f zip.lst -p OfficeFAT -l en-US
-                     -u /export/unpack -buildid 8712 
-                     -msitemplate /export/msi_files
-                     -msilanguage /export/msi_languages
-
-Examples for Non-Windows:
-
-perl make_epmlist.pl -f zip.lst -p OfficeFAT -l en-US -format rpm
-                     -u /export/unpack -buildid 8712 -ispatchedepm
---------------------------------------------------------------------------------
-Ende
-    exit(-1);
-}
-
-#########################################
-# Writing all parameter into logfile
-#########################################
-
-sub saveparameter
-{
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::saveparameter"); }
-
-    my $include = "";
-    
-    installer::logger::globallog("Command line arguments:");
-
-    for ( my $i = 0; $i <= $#ARGV; $i++ )
-    {
-        $include = $ARGV[$i] . "\n";
-        push(@installer::globals::globallogfileinfo, $include);
-    }
-    
-    # also saving global settings:
-    
-    $include = "Separator: $installer::globals::separator\n";
-    push(@installer::globals::globallogfileinfo, $include);
-    
-}
-
-#####################################
-# Reading parameter
-#####################################
-
-sub getparameter
-{
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::getparameter"); }
-
-    while ( $#ARGV >= 0 )
-    {
-        my $param = shift(@ARGV);
-        
-        if ($param eq "-f") { $installer::globals::ziplistname = shift(@ARGV); }
-        elsif ($param eq "-s") { $installer::globals::setupscriptname = shift(@ARGV); }
-        elsif ($param eq "-p") { $installer::globals::product = shift(@ARGV); }
-        elsif ($param eq "-l") { $installer::globals::languagelist = shift(@ARGV); }
-        elsif ($param eq "-b") { $installer::globals::build = shift(@ARGV); }
-        elsif ($param eq "-m") { $installer::globals::minor = shift(@ARGV); }
-        elsif ($param eq "-dontunzip") { $installer::globals::dounzip = 0; }
-        elsif ($param eq "-c") { $installer::globals::compiler = shift(@ARGV); }
-        elsif ($param eq "-pro") { $installer::globals::pro = 1; }
-        elsif ($param eq "-format") { $installer::globals::packageformat = shift(@ARGV); }
-        elsif ($param eq "-log") { $installer::globals::globallogging = 1; }
-        elsif ($param eq "-quiet") { $installer::globals::quiet = 1; }
-        elsif ($param eq "-verbose") { $installer::globals::quiet = 0; }
-        elsif ($param eq "-debug") { $installer::globals::debug = 1; }
-        elsif ($param eq "-tab") { $installer::globals::tab = 1; }
-        elsif ($param eq "-u") { $installer::globals::unpackpath = shift(@ARGV); }
-        elsif ($param eq "-i") { $installer::globals::rootpath = shift(@ARGV); }
-        elsif ($param eq "-dontcallepm") { $installer::globals::call_epm = 0; }
-        elsif ($param eq "-msitemplate") { $installer::globals::idttemplatepath = shift(@ARGV); }
-        elsif ($param eq "-msilanguage") { $installer::globals::idtlanguagepath = shift(@ARGV); }
-        elsif ($param eq "-patchinc") { $installer::globals::patchincludepath = shift(@ARGV); }
-        elsif ($param eq "-javalanguage") { $installer::globals::javalanguagepath = shift(@ARGV); }
-        elsif ($param eq "-buildid") { $installer::globals::buildid = shift(@ARGV); }
-        elsif ($param eq "-copyproject") { $installer::globals::is_copy_only_project = 1; }
-        elsif ($param eq "-languagepack") { $installer::globals::languagepack = 1; }
-        elsif ($param eq "-helppack") { $installer::globals::helppack = 1;}
-        elsif ($param eq "-patch") { $installer::globals::patch = 1; }
-        elsif ($param eq "-debian") { $installer::globals::debian = 1; }
-        elsif ($param eq "-dontstrip") { $installer::globals::strip = 0; }
-        elsif ($param eq "-destdir")	# new parameter for simple installer
-        {
-            $installer::globals::rootpath ne "" && die "must set destdir before -i or -simple";
-            $installer::globals::destdir = Cwd::realpath( shift @ARGV );
-        }
-        elsif ($param eq "-simple")		# new parameter for simple installer
-        {
-            $installer::globals::simple = 1;
-            $installer::globals::call_epm = 0;
-            $installer::globals::makedownload = 0;
-            $installer::globals::makejds = 0;
-            $installer::globals::strip = 0;
-            my $path = shift(@ARGV);
-            $path =~ s/^\Q$installer::globals::destdir\E//;
-            $installer::globals::rootpath = $path;
-        }
-        else
-        {
-            installer::logger::print_error( "unknown parameter: $param" );
-            usage();
-            exit(-1);
-        }
-    }
-    
-    # Usage of simple installer (not for Windows):
-    # $PERL -w $SOLARENV/bin/make_installer.pl \
-    # -f openoffice.lst -l en-US -p OpenOffice \
-    # -buildid $BUILD -rpm \
-    # -destdir /tmp/nurk -simple $INSTALL_PATH
-}
-
-############################################
-# Controlling  the fundamental parameter
-# (required for every process)
-############################################
-
-sub control_fundamental_parameter
-{
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::control_fundamental_parameter"); }
-
-    if ($installer::globals::product eq "")
-    {
-        installer::logger::print_error( "Product name not set!" );
-        usage();
-        exit(-1);
-    }
-}
-
-##########################################################
-# The path parameters can be relative or absolute.
-# This function creates absolute pathes.
-##########################################################
-
-sub make_path_absolute
-{
-    my ($pathref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::make_path_absolute : $$pathref"); }
-
-    if ( $installer::globals::isunix )
-    {
-        if (!($$pathref =~ /^\s*\//))	# this is a relative unix path
-        {
-            $$pathref = cwd() . $installer::globals::separator . $$pathref;
-        }
-    }
-
-    if ( $installer::globals::iswin )
-    {
-        if ( $^O =~ /cygwin/i )
-        {
-            if ( $$pathref !~ /^\s*\// && $$pathref !~ /^\s*\w\:/ )	# not an absolute POSIX or DOS path
-            {
-                $$pathref = cwd() . $installer::globals::separator . $$pathref;
-            }	
-            my $p = $$pathref;
-            chomp( $p );
-            my $q = '';
-            # Avoid the $(LANG) problem.
-            if ($p =~ /(\A.*)(\$\(.*\Z)/) {
-                $p = $1;
-                $q = $2;
-            }
-            $p =~ s/\\/\\\\/g;
-            chomp( $p = qx{cygpath -w "$p"} );
-            $$pathref = $p.$q;
-            # Use windows paths, but with '/'s.			
-            $$pathref =~ s/\\/\//g;
-        }
-        else
-        {
-            if (!($$pathref =~ /^\s*\w\:/))	# this is a relative windows path (no dos drive)
-            {
-                $$pathref = cwd() . $installer::globals::separator . $$pathref;
-
-                $$pathref =~ s/\//\\/g;
-            }
-        }
-    }
-    $$pathref =~ s/[\/\\]\s*$//;	# removing ending slashes
-}
-
-##################################################
-# Setting some global parameters
-# This has to be expanded with furher platforms
-##################################################
-
-sub setglobalvariables
-{	
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::setglobalvariables"); }
-
-    # Setting the installertype directory corresponding to the environment variable PKGFORMAT
-    # The global variable $installer::globals::packageformat can only contain one package format.
-    # If PKGFORMAT cotains more than one format (for example "rpm deb") this is splitted in the
-    # makefile calling the perl program.
-    $installer::globals::installertypedir = $installer::globals::packageformat;
-
-    if ( $installer::globals::compiler =~ /wnt(msc|gcc)i/ )
-    {
-        $installer::globals::iswindowsbuild = 1;
-    }
-
-    if ( $installer::globals::compiler =~ /unxso[lg][siux]/ )
-    {
-        $installer::globals::issolarisbuild = 1;
-        if ( $installer::globals::packageformat eq "pkg" )
-        {
-            $installer::globals::issolarispkgbuild = 1;
-            $installer::globals::epmoutpath = "packages";
-            $installer::globals::isxpdplatform = 1;
-        }
-    }
-
-    if (( $installer::globals::compiler =~ /unxmacxi/ ) || ( $installer::globals::compiler =~ /unxmacxp/ ))
-    {
-        $installer::globals::ismacbuild = 1;
-
-        if ( $installer::globals::packageformat eq "dmg" )
-        {
-            $installer::globals::ismacdmgbuild = 1;
-        }
-    }
-
-    if ( $installer::globals::compiler =~ /unxobsd/ )
-    {
-            $installer::globals::epmoutpath = "openbsd";
-    }
-
-    if ( $installer::globals::compiler =~ /unxfbsd/ )
-    {
-        $installer::globals::isfreebsdbuild = 1;
-
-        if ( $installer::globals::packageformat eq "bsd" )
-        {
-            $installer::globals::epmoutpath = "freebsd";
-            $installer::globals::isfreebsdpkgbuild = 1;
-        }
-    }
-
-    if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; }
-    
-    if ( $installer::globals::compiler =~ /unxso[lg]i/ ) { $installer::globals::issolarisx86build = 1; }
-
-    if ($ENV{OS} eq 'AIX')
-    {
-        if ( $installer::globals::packageformat eq "rpm" )
-        {
-            $installer::globals::isrpmbuild = 1;
-            $installer::globals::isxpdplatform = 1;
-            $installer::globals::epmoutpath = "RPMS";
-        }
-        if ( $installer::globals::rpm eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"\$RPM\" has to be defined!", "setglobalvariables"); }
-    }
-
-    if ($ENV{OS} eq 'LINUX')
-    {
-        $installer::globals::islinuxbuild = 1;
-        if ( $installer::globals::packageformat eq "rpm" )
-        {
-            $installer::globals::isrpmbuild = 1;
-            $installer::globals::isxpdplatform = 1;
-            $installer::globals::epmoutpath = "RPMS";
-            if ( $installer::globals::compiler =~ /unxlngi/ )
-            {
-                $installer::globals::islinuxintelrpmbuild = 1;
-            }
-            if ( $installer::globals::compiler =~ /unxlngppc/ )
-            {
-                $installer::globals::islinuxppcrpmbuild = 1;
-            }
-            if ( $installer::globals::compiler =~ /unxlngx/ )
-            {
-                $installer::globals::islinuxx86_64rpmbuild = 1;
-            }
-
-            if ( $installer::globals::rpm eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"\$RPM\" has to be defined!", "setglobalvariables"); }
-        }
-
-        # Creating Debian packages ?	
-        if (( $installer::globals::packageformat eq "deb" ) || ( $installer::globals::debian ))
-        {
-            $installer::globals::debian = 1;
-            $installer::globals::packageformat = "deb";
-            my $message = "Creating Debian packages";
-            installer::logger::print_message( $message );
-            push(@installer::globals::globallogfileinfo, $message);
-            $installer::globals::isrpmbuild = 0;
-            $installer::globals::isdebbuild = 1;
-            $installer::globals::epmoutpath = "DEBS";
-            if ( $installer::globals::compiler =~ /unxlngi/ )
-            {
-                $installer::globals::islinuxinteldebbuild = 1;
-            }
-            if ( $installer::globals::compiler =~ /unxlngppc/ )
-            {
-                $installer::globals::islinuxppcdebbuild = 1;
-            }
-            if ( $installer::globals::compiler =~ /unxlngx/ )
-            {
-                $installer::globals::islinuxx86_64debbuild = 1;
-            }
-        }	
-    }
-
-    # Defaulting to native package format for epm
-    
-    if ( ! $installer::globals::packageformat ) { $installer::globals::packageformat = "native"; }
-
-    # extension, if $installer::globals::pro is set
-    if ($installer::globals::pro) { $installer::globals::productextension = ".pro"; }
-    
-    # no languages defined as parameter
-    if ($installer::globals::languagelist eq "") { $installer::globals::languages_defined_in_productlist = 1; }
-
-    # setting and creating the unpackpath
-    
-    if ($installer::globals::unpackpath eq "")	# unpackpath not set
-    {	
-        $installer::globals::unpackpath = cwd();
-    }
-
-    if ( $installer::globals::localunpackdir ne "" ) { $installer::globals::unpackpath = $installer::globals::localunpackdir; }
-
-    if (!($installer::globals::unpackpath eq ""))
-    {
-        make_path_absolute(\$installer::globals::unpackpath);
-    }
-
-    $installer::globals::unpackpath =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    if (! -d $installer::globals::unpackpath )	# create unpackpath
-    {
-        installer::systemactions::create_directory($installer::globals::unpackpath);
-    }
-
-    # setting jds exclude file list
-
-    if ( $installer::globals::isrpmbuild )
-    {
-        $installer::globals::jdsexcludefilename = "jds_excludefiles_linux.txt";
-    }
-    if ( $installer::globals::issolarissparcbuild )
-    {
-        $installer::globals::jdsexcludefilename = "jds_excludefiles_solaris_sparc.txt";
-    }
-    if ( $installer::globals::issolarisx86build )
-    {
-        $installer::globals::jdsexcludefilename = "jds_excludefiles_solaris_intel.txt";
-    }
-
-    # setting and creating the temppath
-    
-    if (( $ENV{'TMP'} ) || ( $ENV{'TEMP'} ) || ( $ENV{'TMPDIR'} ))
-    {
-        if ( $ENV{'TMP'} ) { $installer::globals::temppath = $ENV{'TMP'}; }
-        elsif ( $ENV{'TEMP'} )  { $installer::globals::temppath = $ENV{'TEMP'}; }
-        elsif ( $ENV{'TMPDIR'} )  { $installer::globals::temppath = $ENV{'TMPDIR'}; }
-        $installer::globals::temppath =~ s/\Q$installer::globals::separator\E\s*$//;	# removing ending slashes and backslashes
-        $installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . $installer::globals::globaltempdirname;
-        installer::systemactions::create_directory_with_privileges($installer::globals::temppath, "777");
-        my $dirsave = $installer::globals::temppath;
-
-        if ( $installer::globals::compiler =~ /^unxmac/ )
-        {
-            chmod 0777, $installer::globals::temppath;
-        }
-
-        $installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . "i";
-        $installer::globals::temppath = installer::systemactions::create_pid_directory($installer::globals::temppath);
-        push(@installer::globals::removedirs, $installer::globals::temppath);
-
-        if ( ! -d $installer::globals::temppath ) { installer::exiter::exit_program("ERROR: Failed to create directory $installer::globals::temppath ! Possible reason: Wrong privileges in directory $dirsave .", "setglobalvariables"); }
-
-        $installer::globals::jdstemppath = $installer::globals::temppath;
-        $installer::globals::jdstemppath =~ s/i_/j_/;
-        push(@installer::globals::jdsremovedirs, $installer::globals::jdstemppath);			
-        $installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::productextension;
-        installer::systemactions::create_directory($installer::globals::temppath);		
-        if ( $^O =~ /cygwin/i )
-        {
-            $installer::globals::cyg_temppath = $installer::globals::temppath;
-            $installer::globals::cyg_temppath =~ s/\\/\\\\/g;
-            chomp( $installer::globals::cyg_temppath = qx{cygpath -w "$installer::globals::cyg_temppath"} ); 
-        }
-        $installer::globals::temppathdefined = 1;
-        $installer::globals::jdstemppathdefined = 1;
-    }
-    else
-    {
-        $installer::globals::temppathdefined = 0;
-        $installer::globals::jdstemppathdefined = 0;
-    }
-    
-    # only one cab file, if Windows msp patches shall be prepared
-    if ( $installer::globals::prepare_winpatch ) { $installer::globals::number_of_cabfiles = 1; }
-
-}
-
-############################################
-# Controlling  the parameter that are
-# required for special processes
-############################################
-
-sub control_required_parameter
-{
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::control_required_parameter"); }
-
-    if (!($installer::globals::is_copy_only_project))
-    {
-        ##############################################################################################
-        # idt template path. Only required for Windows build ($installer::globals::compiler =~ /wntmsci/)
-        # for the creation of the msi database.
-        ##############################################################################################
-    
-        if (($installer::globals::idttemplatepath eq "") && ($installer::globals::iswindowsbuild))
-        {
-            installer::logger::print_error( "idt template path not set (-msitemplate)!" );
-            usage();
-            exit(-1);
-        }
-
-        ##############################################################################################
-        # idt language path. Only required for Windows build ($installer::globals::compiler =~ /wntmsci/)
-        # for the creation of the msi database.
-        ##############################################################################################
-    
-        if (($installer::globals::idtlanguagepath eq "") && ($installer::globals::iswindowsbuild))
-        {
-            installer::logger::print_error( "idt language path not set (-msilanguage)!" );
-            usage();
-            exit(-1);
-        }
-    
-        # Analyzing the idt template path
-    
-        if (!($installer::globals::idttemplatepath eq ""))	# idttemplatepath set, relative or absolute?
-        {
-            make_path_absolute(\$installer::globals::idttemplatepath);
-        }
-    
-        installer::remover::remove_ending_pathseparator(\$installer::globals::idttemplatepath);
-
-        # Analyzing the idt language path
-    
-        if (!($installer::globals::idtlanguagepath eq ""))	# idtlanguagepath set, relative or absolute?
-        {
-            make_path_absolute(\$installer::globals::idtlanguagepath);
-        }
-
-        installer::remover::remove_ending_pathseparator(\$installer::globals::idtlanguagepath);
-
-        # In the msi template directory a files "codes.txt" has to exist, in which the ProductCode
-        # and the UpgradeCode for the product are defined.
-        # The name "codes.txt" can be overwritten in Product definition with CODEFILENAME (msiglobal.pm)
-
-        if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::packageformat ne "archive" ) && ( $installer::globals::packageformat ne "installed" ))
-        {	
-            $installer::globals::codefilename = $installer::globals::idttemplatepath  . $installer::globals::separator . $installer::globals::codefilename;
-            installer::files::check_file($installer::globals::codefilename);
-            $installer::globals::componentfilename = $installer::globals::idttemplatepath  . $installer::globals::separator . $installer::globals::componentfilename;
-            installer::files::check_file($installer::globals::componentfilename);
-        }
-
-    }
-
-    #######################################
-    # Patch currently only available
-    # for Solaris packages and Linux
-    #######################################
-
-    if (( $installer::globals::patch ) && ( ! $installer::globals::issolarispkgbuild ) && ( ! $installer::globals::isrpmbuild ) && ( ! $installer::globals::isdebbuild ) && ( ! $installer::globals::iswindowsbuild ) && ( ! $installer::globals::ismacdmgbuild ))
-    {
-        installer::logger::print_error( "Sorry, Patch flag currently only available for Solaris pkg, Linux RPM and Windows builds!" );
-        usage();
-        exit(-1);
-    }
-
-    if (( $installer::globals::patch ) && ( $installer::globals::issolarispkgbuild ) && ( ! $installer::globals::patchincludepath ))
-    {
-        installer::logger::print_error( "Solaris patch requires parameter -patchinc !" );
-        usage();
-        exit(-1);
-    }
-
-    if (( $installer::globals::patch ) && ( $installer::globals::issolarispkgbuild ) && ( $installer::globals::patchincludepath ))
-    {
-        make_path_absolute(\$installer::globals::patchincludepath);
-        $installer::globals::patchincludepath = installer::converter::make_path_conform($installer::globals::patchincludepath);
-    }
-
-    #######################################
-    # Testing existence of files
-    # also for copy-only projects
-    #######################################
-
-    if ($installer::globals::ziplistname eq "")
-    {
-        installer::logger::print_error( "ERROR: Zip list file has to be defined (Parameter -f) !" );
-        usage();
-        exit(-1);
-    }
-    else
-    {
-        installer::files::check_file($installer::globals::ziplistname);
-    }
-
-    if ($installer::globals::setupscriptname eq "")	{ $installer::globals::setupscript_defined_in_productlist = 1; }
-    else { installer::files::check_file($installer::globals::setupscriptname); } # if the setupscript file is defined, it has to exist
-
-}
-
-################################################
-# Writing parameter to shell and into logfile
-################################################
-
-sub outputparameter
-{
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::outputparameter"); }
-
-    my $element;
-    
-    my @output = ();
-    
-    push(@output, "\n########################################################\n");
-    push(@output, "$installer::globals::prog, version 1.0\n");
-    push(@output, "Product list file: $installer::globals::ziplistname\n");
-    if (!($installer::globals::setupscript_defined_in_productlist))
-    {
-        push(@output, "Setup script: $installer::globals::setupscriptname\n");
-    }
-    else
-    {
-        push(@output, "Taking setup script from solver\n");
-    }
-    push(@output, "Unpackpath: $installer::globals::unpackpath\n");
-    push(@output, "Compiler: $installer::globals::compiler\n");
-    push(@output, "Product: $installer::globals::product\n");
-    push(@output, "BuildID: $installer::globals::buildid\n");
-    push(@output, "Build: $installer::globals::build\n");
-    if ( $installer::globals::minor ) { push(@output, "Minor: $installer::globals::minor\n"); }
-    else  { push(@output, "No minor set\n"); }
-    if ( $installer::globals::pro ) { push(@output, "Product version\n"); }
-    else  { push(@output, "Non-Product version\n"); }
-    if ( $installer::globals::rootpath eq "" ) { push(@output, "Using default installpath\n"); }
-    else { push(@output, "Installpath: $installer::globals::rootpath\n"); }
-    push(@output, "Package format: $installer::globals::packageformat\n");
-    if (!($installer::globals::idttemplatepath eq ""))	{ push(@output, "msi templatepath: $installer::globals::idttemplatepath\n"); }
-    if ((!($installer::globals::idttemplatepath eq "")) && (!($installer::globals::iswindowsbuild))) { push(@output, "msi template path will be ignored for non Windows builds!\n"); }
-    if (!($installer::globals::idtlanguagepath eq ""))	{ push(@output, "msi languagepath: $installer::globals::idtlanguagepath\n"); }
-    if ((!($installer::globals::idtlanguagepath eq "")) && (!($installer::globals::iswindowsbuild))) { push(@output, "msi language path will be ignored for non Windows builds!\n"); }
-    if ((!($installer::globals::iswindowsbuild)) && ( $installer::globals::call_epm )) { push(@output, "Calling epm\n"); }
-    if ((!($installer::globals::iswindowsbuild)) && (!($installer::globals::call_epm))) { push(@output, "Not calling epm\n"); }
-    if (!($installer::globals::javalanguagepath eq "")) { push(@output, "Java language path: $installer::globals::javalanguagepath\n"); }
-    if ((!($installer::globals::javalanguagepath eq "")) && ($installer::globals::iswindowsbuild)) { push(@output, "Java language path will be ignored for Windows builds!\n"); }
-    if ( $installer::globals::patchincludepath ) { push(@output, "Patch include path: $installer::globals::patchincludepath\n"); }
-    if ( $installer::globals::globallogging ) { push(@output, "Complete logging activated\n"); }
-    if ( $installer::globals::debug ) { push(@output, "Debug is activated\n"); }
-    if ( $installer::globals::tab ) { push(@output, "TAB version\n"); }
-    if ( $installer::globals::strip ) { push(@output, "Stripping files\n"); }
-    else { push(@output, "No file stripping\n"); }
-    if ( $installer::globals::debian ) { push(@output, "Linux: Creating Debian packages\n"); }
-    if ( $installer::globals::dounzip ) { push(@output, "Unzip ARCHIVE files\n"); }
-    else  { push(@output, "Not unzipping ARCHIVE files\n"); }
-    if (!($installer::globals::languages_defined_in_productlist))
-    {
-        push(@output, "Languages:\n");
-        foreach $element (@installer::globals::languageproducts) { push(@output, "\t$element\n"); }
-    }
-    else
-    {
-        push(@output, "Languages defined in $installer::globals::ziplistname\n");
-    }
-    if ( $installer::globals::is_copy_only_project ) { push(@output, "This is a copy only project!\n"); }
-    if ( $installer::globals::languagepack ) { push(@output, "Creating language pack!\n"); }
-    if ( $installer::globals::helppack ) { push(@output, "Creating help pack!\n"); }
-    if ( $installer::globals::patch ) { push(@output, "Creating patch!\n"); }
-    push(@output, "########################################################\n");
-    
-    # output into shell and into logfile
-    
-    for ( my $i = 0; $i <= $#output; $i++ )
-    {
-        installer::logger::print_message( $output[$i] );
-        push(@installer::globals::globallogfileinfo, $output[$i]);
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/pathanalyzer.pm b/solenv/bin/modules/installer/pathanalyzer.pm
deleted file mode 100644
index aab3e8654..000000000
--- a/solenv/bin/modules/installer/pathanalyzer.pm
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::pathanalyzer;
-
-use installer::globals;
-
-###########################################
-# Path analyzer
-###########################################
-
-sub get_path_from_fullqualifiedname
-{
-    my ($longfilenameref) = @_;
-
-    if ( $$longfilenameref =~ /\Q$installer::globals::separator\E/ )	# Is there a separator in the path? Otherwise the path is empty.
-    {	
-        if ( $$longfilenameref =~ /^\s*(.*\Q$installer::globals::separator\E)(.+)/ )
-        {
-            $$longfilenameref = $1;
-        }
-    }
-    else
-    {
-        $$longfilenameref = "";	# there is no path
-    }	
-}
-
-sub make_absolute_filename_to_relative_filename
-{
-    my ($longfilenameref) = @_;
-    
-    if ( $installer::globals::isunix )
-    {
-        if ( $$longfilenameref =~ /^.*\/(\S.+\S?)/ )
-        {
-            $$longfilenameref = $1;
-        }
-    }
-
-    if ( $installer::globals::iswin )
-    {
-        # Either '/' or '\'. It would be possible to use $installer::globals::separator.
-        if ( $$longfilenameref =~ /^.*[\/\\](\S.+\S?)/ )
-        {
-            $$longfilenameref = $1;
-        }
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/profiles.pm b/solenv/bin/modules/installer/profiles.pm
deleted file mode 100644
index 50fd96ae7..000000000
--- a/solenv/bin/modules/installer/profiles.pm
+++ /dev/null
@@ -1,231 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::profiles;
-
-use installer::converter;
-use installer::existence;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::remover;
-use installer::systemactions;
-
-#############################
-# Profiles
-#############################
-
-#######################################################
-# Sorting the content of a profile
-#######################################################
-
-sub sorting_profile
-{
-    my ($profilesref) = @_;
-
-    my @profile = ();
-    my @definedsections = ();
-
-    for ( my $i = 0; $i <= $#{$profilesref}; $i++ )
-    {
-        my $line = ${$profilesref}[$i];
-        
-        if ( $line =~ /^\s*(\[.*\])\s*$/ )	# this is a section (every second line)
-        {
-            my $section = $1;
-
-            if (!(installer::existence::exists_in_array($section, \@definedsections)))
-            {
-                my $sectionline = $section . "\n";
-                push(@definedsections, $section);
-                push(@profile, $sectionline);
-                
-                for ( my $j = 0; $j <= $#{$profilesref}; $j++ )
-                {
-                    my $oneline = ${$profilesref}[$j];
-                    installer::remover::remove_leading_and_ending_whitespaces(\$oneline);
-
-                    if ( $oneline eq $section )
-                    {
-                        my $nextline = ${$profilesref}[$j+1];
-                        push(@profile, $nextline);
-                    }
-                } 
-            } 			
-        }
-    }
-
-    return \@profile;
-}
-
-#####################################################################
-# Adding the newly created profile into the file list
-#####################################################################
-
-sub add_profile_into_filelist
-{
-    my ($filesarrayref, $oneprofile, $completeprofilename, $allvariables) = @_;
-
-    my %profile = ();
-
-    # Taking the base data from the "gid_File_Lib_Vcl"
-
-    my $vclgid = "gid_File_Lib_Vcl";
-    if ( $allvariables->{'GLOBALFILEGID'} ) { $vclgid = $allvariables->{'GLOBALFILEGID'}; }
-    my $vclfile = installer::existence::get_specified_file($filesarrayref, $vclgid);
-
-    # copying all base data	
-    installer::converter::copy_item_object($vclfile, \%profile);			
-
-    # and overriding all new values
-    
-    $profile{'ismultilingual'} = 0;
-    $profile{'sourcepath'} = $completeprofilename;
-    $profile{'Name'} = $oneprofile->{'Name'};
-    $profile{'UnixRights'} = "444";
-    $profile{'gid'} = $oneprofile->{'gid'};
-    $profile{'Dir'} = $oneprofile->{'Dir'};
-    $profile{'destination'} = $oneprofile->{'destination'};
-    $profile{'Styles'} = "";
-    if ( $oneprofile->{'Styles'} ) { $profile{'Styles'} = $oneprofile->{'Styles'}; }
-    $profile{'modules'} = $oneprofile->{'ModuleID'};	# Profiles can only be added completely to a module
-
-    push(@{$filesarrayref}, \%profile);
-}
-
-###################################################
-# Including Windows line ends in ini files
-# Profiles on Windows shall have \r\n line ends
-###################################################
-
-sub include_windows_lineends
-{
-    my ($onefile) = @_;
-
-    for ( my $i = 0; $i <= $#{$onefile}; $i++ )
-    {
-        ${$onefile}[$i] =~ s/\r?\n$/\r\n/;
-    }
-}
-
-####################################
-# Create profiles
-####################################
-
-sub create_profiles
-{
-    my ($profilesref, $profileitemsref, $filesarrayref, $languagestringref, $allvariables) = @_;
-
-    my $infoline;
-
-    my $profilesdir = installer::systemactions::create_directories("profiles", $languagestringref);
-
-    installer::logger::include_header_into_logfile("Creating profiles:");
-
-    # Attention: The module dependencies from ProfileItems have to be ignored, because
-    # the Profile has to be installed completely with all of its content and the correct name.
-    # Only complete profiles can belong to a specified module, but not ProfileItems!
-
-    # iterating over all files	
-
-    for ( my $i = 0; $i <= $#{$profilesref}; $i++ )
-    {
-        my $oneprofile = ${$profilesref}[$i];
-        my $dir = $oneprofile->{'Dir'};
-        if ( $dir eq "PREDEFINED_CONFIGDIR" ) { next; } 	# ignoring the profile sversion file
-    
-        my $profilegid = $oneprofile->{'gid'};
-        my $profilename = $oneprofile->{'Name'};
-        
-        my $localprofilesdir = $profilesdir . $installer::globals::separator . $profilegid; # uniqueness guaranteed by gid
-        if ( ! -d $localprofilesdir ) { installer::systemactions::create_directory($localprofilesdir); }
-    
-        my @onefile = ();
-        my $profileempty = 1;
-        
-        for ( my $j = 0; $j <= $#{$profileitemsref}; $j++ )
-        {
-            my $oneprofileitem = ${$profileitemsref}[$j];
-            
-            my $styles = "";
-            if ( $oneprofileitem->{'Styles'} ) { $styles = $oneprofileitem->{'Styles'}; }
-            if ( $styles =~ /\bINIFILETABLE\b/ ) { next; }	# these values are written during installation, not during packing
-            
-            my $profileid = $oneprofileitem->{'ProfileID'};
-
-            if ( $profileid eq $profilegid )
-            {
-                my $section = $oneprofileitem->{'Section'};
-                my $key = $oneprofileitem->{'Key'};
-                my $value = $oneprofileitem->{'Value'};
-                for (my $pk = 1; $pk <= 50; $pk++)
-                {
-                    my $key = "ValueList" . $pk;
-                    if ( $oneprofileitem->{$key} ) 
-                        { $value = $value . " " . $oneprofileitem->{$key} }
-                }
-                my $order = $oneprofileitem->{'Order'};	# ignoring order at the moment
-
-                my $line = "[" . $section . "]" . "\n";
-                push(@onefile, $line);
-                $line = $key . "=" . $value . "\n";
-                push(@onefile, $line);
-                
-                $profileempty = 0;			
-            }
-        }	
-
-        if ( $profileempty ) { next; } 	# ignoring empty profiles
-
-        # Sorting the array @onefile
-        my $onefileref = sorting_profile(\@onefile);
-
-        if ( $installer::globals::iswin && $installer::globals::plat =~ /cygwin/i)		# Windows line ends only for Cygwin
-        {
-            include_windows_lineends($onefileref);
-        }
-        
-        # Saving the profile as a file
-        $completeprofilename = $localprofilesdir . $installer::globals::separator . $profilename;
-        
-        installer::files::save_file($completeprofilename, $onefileref);
-        
-        # Adding the file to the filearray
-        # Some data are set now, others are taken from the file "soffice.exe" ("soffice.bin")
-        add_profile_into_filelist($filesarrayref, $oneprofile, $completeprofilename, $allvariables);
-
-        $infoline = "Created Profile: $completeprofilename\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-
-1;
diff --git a/solenv/bin/modules/installer/remover.pm b/solenv/bin/modules/installer/remover.pm
deleted file mode 100644
index 2c039ec6f..000000000
--- a/solenv/bin/modules/installer/remover.pm
+++ /dev/null
@@ -1,82 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::remover;
-
-use installer::globals;
-
-############################################
-# Remover
-############################################
-
-sub remove_leading_and_ending_whitespaces
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/^\s+//;
-    $$stringref =~ s/\s+$//;
-}
-
-sub remove_leading_and_ending_quotationmarks
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/^\s*\"//;
-    $$stringref =~ s/\"\s*$//;	
-}
-
-sub remove_leading_and_ending_slashes
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/^\s*\///g;
-    $$stringref =~ s/\/\s*$//g;	
-}
-
-sub remove_ending_slashes
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/\/\s*$//g;	
-}
-
-sub remove_leading_and_ending_pathseparators
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/^\s*\Q$installer::globals::separator\E//;
-    $$stringref =~ s/\Q$installer::globals::separator\E\s*$//;	
-}
-
-sub remove_ending_pathseparator
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/\Q$installer::globals::separator\E\s*$//;	
-}
-
-1;
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm
deleted file mode 100644
index 888cfeb59..000000000
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ /dev/null
@@ -1,213 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::scppatchsoname;
-
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::setupscript;
-use installer::systemactions;
-
-########################################################################################
-# The length of the new string must be identical with the length of the old string
-########################################################################################
-
-sub change_length_of_string
-{
-    my ($newstringref, $oldstring) = @_;
-    
-    while ( length($$newstringref) < length($oldstring) )
-    {
-        $$newstringref = $$newstringref . chr(0);
-    }
-}
-
-########################################################################################
-# The length of the new string must be identical with the length of the old string
-########################################################################################
-
-sub change_length_of_string_with_letter
-{
-    my ($newstringref, $oldstring, $onestring) = @_;
-    
-    while ( length($$newstringref) < length($oldstring) )
-    {
-        $$newstringref = $$newstringref . $onestring;
-    }
-}
-
-########################################################################################
-# Converting a string to a unicode string
-########################################################################################
-
-sub convert_to_unicode
-{
-    my ($string) = @_;
-    
-    my $unicodestring = "";
-    
-    my $stringlength = length($string);
-    
-    for ( my $i = 0; $i < $stringlength; $i++ )
-    {
-        $unicodestring = $unicodestring . substr($string, $i, 1);
-        $unicodestring = $unicodestring . chr(0);
-    }	
-
-    return $unicodestring;
-}
-
-########################################################################################
-# Replacing the so name in all files with flag PATCH_SO_NAME
-########################################################################################
-
-sub replace_productname_in_file
-{
-    my ($sourcepath, $destpath, $variableshashref, $onefilehash, $styles) = @_;
-
-    my $onefile = installer::files::read_binary_file($sourcepath);
-
-    # searching for "x" 
-
-    my $onestring = "x" . chr(0);
-    my $replacestring = "";
-    for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; }
-
-    my $productname = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'};
-    if ( exists($onefilehash->{'FileDescription'}) ) { $productname = $onefilehash->{'FileDescription'}; }
-    my $unicode_productname = convert_to_unicode($productname);
-
-    change_length_of_string(\$unicode_productname, $replacestring);
-
-    my $found1 = $onefile =~ s/$replacestring/$unicode_productname/sg;
-
-    my $found2 = 0;
-
-    if ( $styles =~ /\bPATCH_SO_NAME_Z\b/ )
-    {
-        # searching for "z" 
-
-        $onestring = "z" . chr(0);
-        $replacestring = "";
-        for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; }
-
-        my $productname2 = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'};
-        if ( exists($onefilehash->{'FileDescriptionZ'}) ) { $productname2 = $onefilehash->{'FileDescriptionZ'}; }
-        my $unicode_productname2 = convert_to_unicode($productname2);
-
-        change_length_of_string_with_letter(\$unicode_productname2, $replacestring, $onestring);
-
-        $found2 = $onefile =~ s/$replacestring/$unicode_productname2/sg;
-    }
-
-    installer::files::save_binary_file($onefile, $destpath);
-
-    my $found = $found1 + $found2;
-    
-    return $found;
-}
-
-#########################################################
-# Analyzing files with flag PATCH_SO_NAME
-#########################################################
-
-sub resolving_patchsoname_flag
-{
-    my ($filesarrayref, $variableshashref, $item, $languagestringref) = @_;
-
-    my $diritem = lc($item);
-
-    my $replacedirbase = installer::systemactions::create_directories("patchsoname_$diritem", $languagestringref);
-
-    installer::logger::include_header_into_logfile("$item with flag PATCH_SO_NAME:");
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $styles = "";
-        
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-    
-        if ( $styles =~ /\bPATCH_SO_NAME\b/ )
-        {
-            # Language specific subdirectory
-
-            my $onelanguage = $onefile->{'specificlanguage'};
-            my $filedescription = "";
-            
-            if ($onelanguage eq "")
-            {
-                $onelanguage = "00";	# files without language into directory "00"
-            }
-            
-            my $replacedir = $replacedirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; 
-            installer::systemactions::create_directory($replacedir);	# creating language specific directories
-
-            # copy files and edit them with the variables defined in the zip.lst
-                
-            my $onefilename = $onefile->{'Name'};
-            my $sourcepath = $onefile->{'sourcepath'};
-            my $destinationpath = $replacedir . $onefilename;  
-            my $movepath = $destinationpath . ".orig";
-
-            my $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath);
-    
-            if ( $copysuccess )
-            {
-                # Now the file can be patch (binary!)
-                my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref, $onefile, $styles);
-                    
-                if ($found == 0)
-                {
-                    my $infoline = "Did not patch the file $destinationpath\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-                else
-                {
-                    my $infoline = "Successfully patched $destinationpath, Count: $found\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-            }
-
-            # Saving the original source, where the file was found
-            $onefile->{'originalsourcepath'} = $onefile->{'sourcepath'};
-    
-            # Saving the original source, where the file was found
-            $onefile->{'originalsourcepath'} = $onefile->{'sourcepath'};
-
-            # Writing the new sourcepath into the hashref, even if it was no copied
-                
-            $onefile->{'sourcepath'} = $destinationpath;
-        }
-    }
-
-    my $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/scpzipfiles.pm b/solenv/bin/modules/installer/scpzipfiles.pm
deleted file mode 100644
index 8854b3d7e..000000000
--- a/solenv/bin/modules/installer/scpzipfiles.pm
+++ /dev/null
@@ -1,183 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::scpzipfiles;
-
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::systemactions;
-
-########################################################################################
-# Replacing all zip list variables in setup script and files with flag scpzip_replace
-########################################################################################
-
-sub replace_all_ziplistvariables_in_file
-{
-    my ( $fileref, $variableshashref ) = @_;
-
-    for ( my $i = 0; $i <= $#{$fileref}; $i++ )
-    {
-        my $line = ${$fileref}[$i];
-
-        if ( $line =~ /^.*\$\{\w+\}.*$/ )	# only occurrence of ${abc}
-        {			
-            my $key;
-
-            foreach $key (keys %{$variableshashref})
-            {
-                my $value = $variableshashref->{$key};
-                $key = '${' . $key . '}';
-                $line =~ s/\Q$key\E/$value/g;			
-                ${$fileref}[$i] = $line;
-            }
-        }
-    }
-}
-
-########################################################################################
-# Replacing all zip list variables in rtf files. In rtf files
-# the brackets are masked.
-########################################################################################
-
-sub replace_all_ziplistvariables_in_rtffile
-{
-    my ( $fileref, $variablesref, $onelanguage, $loggingdir ) = @_;
-
-    for ( my $i = 0; $i <= $#{$fileref}; $i++ )
-    {
-        my $line = ${$fileref}[$i];
-
-        if ( $line =~ /^.*\$\\\{\w+\\\}.*$/ )	# only occurrence of $\{abc\}
-        {			
-            for ( my $j = 0; $j <= $#{$variablesref}; $j++ )
-            {
-                my $variableline = ${$variablesref}[$j];
-                
-                my ($key, $value);
-                
-                if ( $variableline =~ /^\s*([\w-]+?)\s+(.*?)\s*$/ )
-                {
-                    $key = $1;
-                    $value = $2;
-                    $key = '$\{' . $key . '\}';
-                }
-                
-                $line =~ s/\Q$key\E/$value/g;
-
-                ${$fileref}[$i] = $line;
-            }
-        }
-    }
-}
-
-#########################################################
-# Analyzing files with flag SCPZIP_REPLACE
-# $item can be "File" or "ScpAction"
-#########################################################
-
-sub resolving_scpzip_replace_flag
-{
-    my ($filesarrayref, $variableshashref, $item, $languagestringref) = @_;
-    
-    my $diritem = lc($item);
-
-    my $replacedirbase = installer::systemactions::create_directories("replace_$diritem", $languagestringref);
-
-    installer::logger::include_header_into_logfile("$item with flag SCPZIP:");
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $styles = "";
-
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-    
-        if ( $styles =~ /\bSCPZIP_REPLACE\b/ )
-        {
-            # Language specific subdirectory
-
-            my $onelanguage = $onefile->{'specificlanguage'};
-            
-            if ($onelanguage eq "")
-            {
-                $onelanguage = "00";	# files without language into directory "00"
-            }
-            
-            my $replacedir = $replacedirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; 
-            installer::systemactions::create_directory($replacedir);	# creating language specific directories
-
-            # copy files and edit them with the variables defined in the zip.lst
-            
-            my $longfilename = 0;
-            
-            my $onefilename = $onefile->{'Name'};
-            my $sourcepath = $onefile->{'sourcepath'};
-            
-            if ( $onefilename =~ /^\s*\Q$installer::globals::separator\E/ )	# filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
-            {
-                $onefilename =~ s/^\s*\Q$installer::globals::separator\E//;
-                $longfilename = 1;
-            }
-            
-            my $destinationpath = $replacedir . $onefilename;  
-            my $movepath = $destinationpath . ".orig";
-
-            if ( $longfilename )	# the destination directory has to be created before copying
-            {
-                my $destdir = $movepath;
-                installer::pathanalyzer::get_path_from_fullqualifiedname(\$destdir);
-                installer::systemactions::create_directory_structure($destdir);
-            }
-
-            my $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath);
-
-            if ( $copysuccess )
-            {
-                # Now the file can be edited
-                # ToDo: How about binary patching?
-
-                my $onefileref = installer::files::read_file($movepath);
-                replace_all_ziplistvariables_in_file($onefileref, $variableshashref);
-                installer::files::save_file($destinationpath ,$onefileref);
-            }
-
-            # Saving the original source, where the file was found
-            $onefile->{'originalsourcepath'} = $onefile->{'sourcepath'};
-    
-            # Writing the new sourcepath into the hashref, even if it was no copied
-                
-            $onefile->{'sourcepath'} = $destinationpath;
-        }
-    }
-
-    my $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
deleted file mode 100644
index d627622cc..000000000
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ /dev/null
@@ -1,2960 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::scriptitems;
-
-use installer::converter;
-use installer::existence;
-use installer::exiter;
-use installer::globals;
-use installer::languages;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::remover;
-use installer::systemactions;
-
-################################################################
-# Resolving the GID for the directories defined in setup script
-################################################################
-
-sub resolve_all_directory_names
-{
-    my ($directoryarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::resolve_all_directory_names : $#{$directoryarrayref}"); }
-
-    # After this procedure the hash shall contain the complete language 
-    # dependent path, not only the language dependent HostName.
-
-    my ($key, $value, $parentvalue, $parentgid, $parentdirectoryhashref);
-    
-    for ( my $i = 0; $i <= $#{$directoryarrayref}; $i++ )
-    {
-        my $directoryhashref = ${$directoryarrayref}[$i];
-        my $gid = $directoryhashref-> {'gid'};
-        my $parentid = $directoryhashref-> {'ParentID'};
-        
-        if ( $parentid ne "PREDEFINED_PROGDIR" )
-        {
-            # find the array of the parentid, which has to be defined before in setup script
-            # and is therefore listed before in this array
-            
-            for ( my $j = 0; $j <= $i; $j++ )
-            {				
-                $parentdirectoryhashref = ${$directoryarrayref}[$j];
-                $parentgid = $parentdirectoryhashref->{'gid'};
-
-                if ( $parentid eq $parentgid)
-                {
-                    last;
-                }
-            }
-
-            # and now we can put the path together
-            # But take care of the languages!
-
-            my $dirismultilingual = $directoryhashref->{'ismultilingual'};
-            my $parentismultilingual = $parentdirectoryhashref->{'ismultilingual'};
-
-            # First: Both directories are language independent or both directories are language dependent
-
-            if ((( ! $dirismultilingual ) && ( ! $parentismultilingual )) ||
-                (( $dirismultilingual ) && ( $parentismultilingual )))
-            {
-                foreach $key (keys %{$directoryhashref})
-                {								
-                    # the key ("HostName (en-US)") must be usable for both hashes
-
-                    if ( $key =~ /\bHostName\b/ )
-                    {
-                        $parentvalue = "";
-                        $value = $directoryhashref->{$key};
-                        if ( $parentdirectoryhashref->{$key} ) { $parentvalue = $parentdirectoryhashref->{$key}; }
-                        
-                        # It is possible, that in scp project, a directory is defined in more languages than
-                        # the directory parent (happened after automatic generation of macros.inc).
-                        # Therefore this is checked now and written with a warning into the logfile.
-                        # This is no error, because (in most cases) the concerned language is not build. 
-                        
-                        if ($parentvalue eq "")
-                        {
-                            $directoryhashref->{$key} = "FAILURE";
-                            my $infoline = "WARNING: No hostname for $parentid with \"$key\". Needed by child directory $gid !\n";
-                            push( @installer::globals::globallogfileinfo, $infoline);
-                        }
-                        else
-                        {
-                            $directoryhashref->{$key} = $parentvalue . $installer::globals::separator . $value;
-                        }						
-                    }				
-                }
-            }
-
-            # Second: The directory is language dependent, the parent not
-
-            if (( $dirismultilingual ) && ( ! $parentismultilingual ))
-            {
-                $parentvalue = $parentdirectoryhashref->{'HostName'};		# there is only one
-
-                foreach $key (keys %{$directoryhashref})		# the current directory
-                {
-                    if ( $key =~ /\bHostName\b/ )				
-                    {								
-                        $value = $directoryhashref->{$key};
-                        $directoryhashref->{$key} = $parentvalue . $installer::globals::separator . $value;
-                    }
-                }
-            }
-
-            # Third: The directory is not language dependent, the parent is language dependent
-
-            if (( ! $dirismultilingual ) && ( $parentismultilingual ))
-            {
-                $value = $directoryhashref->{'HostName'};		# there is only one
-                delete($directoryhashref->{'HostName'});
-
-                foreach $key (keys %{$parentdirectoryhashref})		# the parent directory
-                {								
-                    if ( $key =~ /\bHostName\b/ )				
-                    {								
-                        $parentvalue = $parentdirectoryhashref->{$key};		# there is only one
-                        $directoryhashref->{$key} = $parentvalue . $installer::globals::separator . $value;
-                    }
-                }
-                
-                $directoryhashref->{'ismultilingual'} = 1;	# now this directory is also language dependent				
-            }
-        }
-    }
-}
-
-#############################################################################
-# Files with flag DELETE_ONLY do not need to be packed into installation set
-#############################################################################
-
-sub remove_delete_only_files_from_productlists
-{
-    my ($productarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_delete_only_files_from_productlists : $#{$productarrayref}"); }
-
-    my @newitems = ();
-
-    for ( my $i = 0; $i <= $#{$productarrayref}; $i++ )
-    {
-        my $oneitem = ${$productarrayref}[$i];
-        my $styles = "";
-        
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-        
-        if (!($styles =~ /\bDELETE_ONLY\b/))
-        {
-            push(@newitems, $oneitem);	
-        }
-    }		
-
-    return \@newitems;	
-}
-
-#############################################################################
-# Files with flag NOT_IN_SUITE do not need to be packed into
-# Suite installation sets
-#############################################################################
-
-sub remove_notinsuite_files_from_productlists
-{
-    my ($productarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists : $#{$productarrayref}"); }
-
-    my @newitems = ();
-
-    for ( my $i = 0; $i <= $#{$productarrayref}; $i++ )
-    {
-        my $oneitem = ${$productarrayref}[$i];
-        my $styles = "";
-        
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-        
-        if (!($styles =~ /\bNOT_IN_SUITE\b/))
-        {
-            push(@newitems, $oneitem);	
-        }
-        else
-        {
-            my $infoline = "INFO: Flag NOT_IN_SUITE \-\> Removing $oneitem->{'gid'} from file list.\n";
-            push( @installer::globals::globallogfileinfo, $infoline);		
-        }
-    }		
-
-    return \@newitems;	
-}
-
-#############################################################################
-# Files with flag NOT_IN_SUITE do not need to be packed into
-# Suite installation sets
-#############################################################################
-
-sub remove_office_start_language_files
-{
-    my ($productarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists : $#{$productarrayref}"); }
-
-    my @newitems = ();
-
-    for ( my $i = 0; $i <= $#{$productarrayref}; $i++ )
-    {
-        my $oneitem = ${$productarrayref}[$i];
-        my $styles = "";
-        
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-        
-        if (!($styles =~ /\bSET_OFFICE_LANGUAGE\b/))
-        {
-            push(@newitems, $oneitem);	
-        }
-        else
-        {
-            my $infoline = "INFO: Flag SET_OFFICE_LANGUAGE \-\> Removing $oneitem->{'gid'} from file list.\n";
-            push( @installer::globals::logfileinfo, $infoline);		
-        }
-    }		
-
-    return \@newitems;	
-}
-
-#############################################################################
-# Registryitems for Uninstall have to be removed
-#############################################################################
-
-sub remove_uninstall_regitems_from_script
-{
-    my ($registryarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_uninstall_regitems_from_script : $#{$registryarrayref}"); }
-
-    my @newitems = ();
-
-    for ( my $i = 0; $i <= $#{$registryarrayref}; $i++ )
-    {
-        my $oneitem = ${$registryarrayref}[$i];
-        my $subkey = "";
-
-        if ( $oneitem->{'Subkey'} ) { $subkey = $oneitem->{'Subkey'}; }
-
-        if ( $subkey =~ /Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall/ ) { next; }
-
-        push(@newitems, $oneitem);
-    }		
-
-    return \@newitems;	
-}
-
-##############################################################################
-# Searching the language module for a specified language
-##############################################################################
-
-sub get_languagespecific_module
-{
-    my ( $lang, $modulestring ) = @_;
-    
-    my $langmodulestring = "";
-    
-    my $module;
-    foreach	$module ( keys %installer::globals::alllangmodules )
-    {
-        if (( $installer::globals::alllangmodules{$module} eq $lang ) && ( $modulestring =~ /\b$module\b/ ))
-        {
-            $langmodulestring = "$langmodulestring,$module";
-        } 
-    }
-    
-    $langmodulestring =~ s/^\s*,//;
-    
-    if ( $langmodulestring eq "" ) { installer::exiter::exit_program("ERROR: No language pack module found for language $lang in string \"$modulestring\"!", "get_languagespecific_module");  }
-    
-    return $langmodulestring;
-}
-
-##############################################################################
-# Removing all items in product lists which do not have the correct languages
-##############################################################################
-
-sub resolving_all_languages_in_productlists
-{
-    my ($productarrayref, $languagesarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::resolving_all_languages_in_productlists : $#{$productarrayref} : $#{$languagesarrayref}"); }
-
-    my @itemsinalllanguages = ();
-
-    my ($key, $value);
-    
-    for ( my $i = 0; $i <= $#{$productarrayref}; $i++ )
-    {
-        my $oneitem = ${$productarrayref}[$i];
-
-        my $ismultilingual = $oneitem->{'ismultilingual'};
-        
-        if (!($ismultilingual))	# nothing to do with single language items
-        {
-            $oneitem->{'specificlanguage'} = "";
-            push(@itemsinalllanguages, $oneitem);
-        }
-        else	#all language dependent files
-        {
-            for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ )	# iterating over all languages
-            {
-                my $onelanguage = ${$languagesarrayref}[$j];
-                
-                my %oneitemhash = ();
-            
-                foreach $key (keys %{$oneitem})
-                {								
-                    if ( $key =~ /\(\S+\)/ )	# this are the language dependent keys			
-                    {								
-                        if ( $key =~ /\(\Q$onelanguage\E\)/ )
-                        {
-                            $value = $oneitem->{$key};
-                            $oneitemhash{$key} = $value;
-                        }
-                    }
-                    else
-                    {
-                        $value = $oneitem->{$key};
-                        $oneitemhash{$key} = $value;
-                    }
-                }
-                
-                $oneitemhash{'specificlanguage'} = $onelanguage;
-
-                if ( $oneitemhash{'haslanguagemodule'} )
-                {
-                    my $langmodulestring = get_languagespecific_module($onelanguage, $oneitemhash{'modules'});
-                    $oneitemhash{'modules'} = $langmodulestring;
-                }
-
-                push(@itemsinalllanguages, \%oneitemhash);
-            }
-        }
-    }
-
-    return \@itemsinalllanguages;
-}
-
-################################################################################
-# Removing all modules, that have the flag LANGUAGEMODULE, but do not
-# have the correct language
-################################################################################
-
-sub remove_not_required_language_modules
-{
-    my ($modulesarrayref, $languagesarrayref) = @_;
-
-    my @allmodules = ();
-
-    for ( my $i = 0; $i <= $#{$modulesarrayref}; $i++ )
-    {
-        my $module = ${$modulesarrayref}[$i];
-        my $styles = "";
-        if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
-        
-        if ( $styles =~ /\bLANGUAGEMODULE\b/ )
-        {
-            if ( ! exists($module->{'Language'}) ) { installer::exiter::exit_program("ERROR: \"$module->{'gid'}\" has flag LANGUAGEMODULE, but does not know its language!", "remove_not_required_language_modules"); }
-            my $modulelanguage = $module->{'Language'}; 
-            # checking, if language is required
-            my $doinclude = 0;
-            for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ )
-            {
-                my $onelanguage = ${$languagesarrayref}[$j];
-                if ( $onelanguage eq $modulelanguage )
-                {
-                    $doinclude = 1;
-                    last;
-                }
-            }
-            
-            if ( $doinclude ) { push(@allmodules, $module); }
-        }
-        else
-        {
-            push(@allmodules, $module);
-        }
-    }
-
-    return \@allmodules;
-}
-
-################################################################################
-# Removing all modules, that have a spellchecker language that is not
-# required for this product (spellchecker selection).
-# All required spellchecker languages are stored in
-# %installer::globals::spellcheckerlanguagehash
-################################################################################
-
-sub remove_not_required_spellcheckerlanguage_modules
-{
-    my ($modulesarrayref) = @_;
-
-    my $infoline = "";
-    my @allmodules = ();
-
-    for ( my $i = 0; $i <= $#{$modulesarrayref}; $i++ )
-    {
-        my $module = ${$modulesarrayref}[$i];
-        if ( $module->{'Spellcheckerlanguage'} )	# selecting modules with Spellcheckerlanguage
-        {
-            if ( exists($installer::globals::spellcheckerlanguagehash{$module->{'Spellcheckerlanguage'}}) )
-            {
-                push(@allmodules, $module);
-            }
-            else
-            {
-                $infoline = "Spellchecker selection: Removing module $module->{'gid'}\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                # Collecting all files at modules that are removed
-                
-                if ( $module->{'Files'} )
-                {
-                    if ( $module->{'Files'} =~ /^\s*\((.*?)\)\s*$/ )
-                    {
-                        my $filelist = $1;
-
-                        my $filelisthash = installer::converter::convert_stringlist_into_hash(\$filelist, ",");
-                        foreach my $onefile ( keys %{$filelisthash} ) { $installer::globals::spellcheckerfilehash{$onefile} = 1; }
-                    }
-                }
-            }
-        }
-        else
-        {
-            push(@allmodules, $module);
-        }
-    }
-
-    return \@allmodules;
-}
-
-################################################################################
-# Removing all modules, that belong to a module that was removed
-# in "remove_not_required_spellcheckerlanguage_modules" because of the 
-# spellchecker language. The files belonging to the modules are collected
-# in %installer::globals::spellcheckerfilehash.
-################################################################################
-
-sub remove_not_required_spellcheckerlanguage_files
-{
-    my ($filesarrayref) = @_;
-
-    my @filesarray = ();
-    my $infoline = "";
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        if ( exists($installer::globals::spellcheckerfilehash{$onefile->{'gid'}}) )
-        {
-            $infoline = "Spellchecker selection: Removing file $onefile->{'gid'}\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            next;
-        }
-        push(@filesarray, $onefile);
-    }
-    
-    return \@filesarray;
-}
-
-################################################################################
-# Looking for directories without correct HostName
-################################################################################
-
-sub checking_directories_with_corrupt_hostname
-{
-    my ($dirsref, $languagesarrayref) = @_;
-
-    for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
-    {
-        my $onedir = ${$dirsref}[$i];
-        
-        my $hostname = "";
-        
-        if ( $onedir->{'HostName'} ) { $hostname = $onedir->{'HostName'}; }
-
-        if ( $hostname eq "" )
-        {
-            my $langstring = "";
-            for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ ) { $langstring .= ${$languagesarrayref}[$j] . " "; }
-            installer::exiter::exit_program("ERROR: HostName not defined for $onedir->{'gid'} for specified language. Probably you wanted to create an installation set, in a language not defined in scp2 project. You selected the following language(s): $langstring", "checking_directories_with_corrupt_hostname");
-        }
-        
-        if ( $hostname eq "FAILURE" )
-        {
-            installer::exiter::exit_program("ERROR: Could not create HostName for $onedir->{'gid'} (missing language at parent). See logfile warning for more info!", "checking_directories_with_corrupt_hostname");
-        }
-    }
-}
-
-################################################################################
-# Setting global properties
-################################################################################
-
-sub set_global_directory_hostnames
-{
-    my ($dirsref, $allvariables) = @_;
-
-    for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
-    {
-        my $onedir = ${$dirsref}[$i];
-        my $styles = "";
-        if ( $onedir->{'Styles'} ) { $styles = $onedir->{'Styles'}; }
-        
-        if ( $styles =~ /\bOFFICEDIRECTORY\b/ )
-        {
-            $installer::globals::officedirhostname = $onedir->{'HostName'};
-            $installer::globals::officedirgid = $onedir->{'gid'};
-            $allvariables->{'OFFICEDIRECTORYHOSTNAME'} = $installer::globals::officedirhostname;
-        }
-        if ( $styles =~ /\bSUNDIRECTORY\b/ )
-        {
-            $installer::globals::sundirhostname = $onedir->{'HostName'};
-            $installer::globals::sundirgid = $onedir->{'gid'};
-            $allvariables->{'SUNDIRECTORYHOSTNAME'} = $installer::globals::sundirhostname;
-        }
-    }	
-}
-
-########################################################
-# Recursively defined procedure to order 
-# modules and directories
-########################################################
-
-sub get_children
-{
-    my ($allitems, $startparent, $newitemorder) = @_;
-
-    for ( my $i = 0; $i <= $#{$allitems}; $i++ )
-    {
-        my $gid = ${$allitems}[$i]->{'gid'};
-        my $parent = "";
-        if ( ${$allitems}[$i]->{'ParentID'} ) { $parent = ${$allitems}[$i]->{'ParentID'}; }
-
-        if ( $parent eq $startparent )
-        {
-            push(@{$newitemorder}, ${$allitems}[$i]);
-            my $parent = $gid;
-            get_children($allitems, $parent, $newitemorder);	# recursive!
-        }
-    }
-}
-
-################################################################################
-# Using different HostName for language packs
-################################################################################
-
-sub use_langpack_hostname
-{
-    my ($dirsref) = @_;
-
-    for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
-    {
-        my $onedir = ${$dirsref}[$i];
-        if (( $onedir->{'LangPackHostName'} ) && ( $onedir->{'LangPackHostName'} ne "" )) { $onedir->{'HostName'} = $onedir->{'LangPackHostName'}; }
-    }	
-}
-
-################################################################################
-# Using different HostName for language packs
-################################################################################
-
-sub use_patch_hostname
-{
-    my ($dirsref) = @_;
-
-    for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
-    {
-        my $onedir = ${$dirsref}[$i];
-        if (( $onedir->{'PatchHostName'} ) && ( $onedir->{'PatchHostName'} ne "" )) { $onedir->{'HostName'} = $onedir->{'PatchHostName'}; }
-    }	
-}
-
-################################################################################
-# Using different HostName for language packs
-################################################################################
-
-sub use_langpack_copy_scpaction
-{
-    my ($scpactionsref) = @_;
-
-    for ( my $i = 0; $i <= $#{$scpactionsref}; $i++ )
-    {
-        my $onescpaction = ${$scpactionsref}[$i];
-        if (( $onescpaction->{'LangPackCopy'} ) && ( $onescpaction->{'LangPackCopy'} ne "" )) { $onescpaction->{'Copy'} = $onescpaction->{'LangPackCopy'}; }
-    }	
-}
-
-################################################################################
-# Using different HostName for language packs
-################################################################################
-
-sub use_patch_copy_scpaction
-{
-    my ($scpactionsref) = @_;
-
-    for ( my $i = 0; $i <= $#{$scpactionsref}; $i++ )
-    {
-        my $onescpaction = ${$scpactionsref}[$i];
-        if (( $onescpaction->{'PatchCopy'} ) && ( $onescpaction->{'PatchCopy'} ne "" )) { $onescpaction->{'Copy'} = $onescpaction->{'PatchCopy'}; }
-    }	
-}
-
-################################################################################
-# Shifting parent directories of URE and Basis layer, so that
-# these directories are located below the Brand layer.
-# Style: SHIFT_BASIS_INTO_BRAND_LAYER
-################################################################################
-
-sub shift_basis_directory_parents
-{
-    my ($dirsref) = @_;
-
-    my @alldirs = ();
-    my @savedirs = ();
-    my @shifteddirs = ();
-
-    my $officedirgid = "";
-    
-    for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
-    {
-        my $onedir = ${$dirsref}[$i];
-        my $styles = "";
-        if ( $onedir->{'Styles'} ) { $styles = $onedir->{'Styles'}; }
-            
-        if ( $styles =~ /\bOFFICEDIRECTORY\b/ ) { $officedirgid = $onedir->{'gid'}; }
-    }
-    
-    if ( $officedirgid ne "" )
-    {
-        for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
-        {
-            my $onedir = ${$dirsref}[$i];
-            my $styles = "";
-            if ( $onedir->{'Styles'} ) { $styles = $onedir->{'Styles'}; }
-            
-            if (( $styles =~ /\bBASISDIRECTORY\b/ ) || ( $styles =~ /\bUREDIRECTORY\b/ ))
-            {
-                $onedir->{'ParentID'} = $officedirgid;
-            }
-        }
-
-        # Sorting directories
-        my $startgid = "PREDEFINED_PROGDIR";
-        get_children($dirsref, $startgid, \@alldirs);
-    }	
-    
-    return \@alldirs;
-}
-
-################################################################################
-# Setting the name of the directory with style OFFICEDIRECTORY.
-# The name can be defined in property OFFICEDIRECTORYNAME.
-################################################################################
-
-sub set_officedirectory_name
-{
-    my ($dirsref, $officedirname) = @_;
-    
-    for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
-    {
-        my $onedir = ${$dirsref}[$i];
-        my $styles = "";
-        if ( $onedir->{'Styles'} ) { $styles = $onedir->{'Styles'}; }
-        if ( $styles =~ /\bOFFICEDIRECTORY\b/ )
-        {
-            $onedir->{'HostName'} = $officedirname;
-            last;
-        }
-    }
-}
-
-################################################################################
-# Simplifying the name for language dependent items from "Name (xy)" to "Name"
-################################################################################
-
-sub changing_name_of_language_dependent_keys
-{
-    my ($itemsarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::changing_name_of_language_dependent_keys : $#{$itemsarrayref}"); }
-
-    # Changing key for multilingual items from "Name ( )" to "Name" or "HostName ( )" to "HostName"
-
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];
-        my $onelanguage = $oneitem->{'specificlanguage'};
-
-        if (!($onelanguage eq "" )) 				# language dependent item
-        {
-            my $itemkey;
-        
-            foreach $itemkey (keys %{$oneitem})
-            {
-                if ( $itemkey =~ /^\s*(\S+?)\s+\(\S+\)\s*$/ )
-                {
-                    my $newitemkey = $1;
-                    my $itemvalue = $oneitem->{$itemkey};
-                    $oneitem->{$newitemkey} = $itemvalue;
-                    delete($oneitem->{$itemkey});					
-                }
-            }
-        }
-    }
-}
-
-################################################################################
-# Collecting language specific names for language packs
-################################################################################
-
-sub collect_language_specific_names
-{
-    my ($itemsarrayref) = @_;
-
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-        
-        if ( $styles =~ /\bUSELANGUAGENAME\b/ )
-        {
-            my $language = "";
-            if ( $oneitem->{'Language'} ) { $language = $oneitem->{'Language'}; }
-            my $specificlanguage = "";
-            if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; }
-
-            if (( $language ne "" ) && ( $language eq $specificlanguage ))
-            {
-                if (! installer::existence::exists_in_array($oneitem->{'Name'}, \@installer::globals::languagenames ))
-                {
-                    push(@installer::globals::languagenames, $oneitem->{'Name'});
-                }
-            }
-        }
-    }
-}
-
-################################################################################
-# Replacement of setup variables in ConfigurationItems and ProfileItems
-# <productkey>, <buildid>, <sequence_languages>, <productcode>, <upgradecode>, <productupdate>
-################################################################################
-
-sub replace_setup_variables
-{
-    my ($itemsarrayref, $languagestringref, $hashref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::replace_setup_variables : $#{$itemsarrayref} : $$languagestringref : $hashref->{'PRODUCTNAME'}"); }
-
-    my $languagesstring = $$languagestringref;
-    $languagesstring =~ s/\_/ /g;	# replacing underscore with whitespace
-    # $languagesstring is "01 49" instead of "en-US de"
-    installer::languages::fake_languagesstring(\$languagesstring);
-
-    my $productname = $hashref->{'PRODUCTNAME'};
-    my $productversion = $hashref->{'PRODUCTVERSION'};
-    my $userdirproductversion = "";
-    if ( $hashref->{'USERDIRPRODUCTVERSION'} ) { $userdirproductversion = $hashref->{'USERDIRPRODUCTVERSION'}; }
-    my $productkey = $productname . " " . $productversion;
-
-    # string $buildid, which is used to replace the setup variable <buildid>
-    
-    my $localminor = "flat";
-    if ( $installer::globals::minor ne "" ) { $localminor = $installer::globals::minor; }
-    else { $localminor = $installer::globals::lastminor; }
-    
-    my $localbuild = $installer::globals::build;
-    
-    if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; }	# using "680" instead of "src680"
-    
-    my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h-`;
-    if (!$buildidstring) {
-        $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")";
-    }
-    else {
-        $buildidstring = substr($buildidstring, 0, -1);
-    }
-
-    if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; }
-
-    my $updateid = $productname . "_" . $userdirproductversion . "_" . $$languagestringref;
-    $updateid =~ s/ /_/g;
-
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];		
-        my $value = $oneitem->{'Value'};
-        
-        $value =~ s/\<buildid\>/$buildidstring/;
-        $value =~ s/\<sequence_languages\>/$languagesstring/;
-        $value =~ s/\<productkey\>/$productkey/;
-        $value =~ s/\<productcode\>/$installer::globals::productcode/;
-        $value =~ s/\<upgradecode\>/$installer::globals::upgradecode/;
-        $value =~ s/\<alllanguages\>/$languagesstring/;
-        $value =~ s/\<productmajor\>/$localbuild/;
-        $value =~ s/\<productminor\>/$localminor/;
-        $value =~ s/\<productbuildid\>/$installer::globals::buildid/;
-        $value =~ s/\<sourceid\>/$installer::globals::build/;
-        $value =~ s/\<updateid\>/$updateid/;
-        $value =~ s/\<pkgformat\>/$installer::globals::packageformat/;
-        $value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;
-        $value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/;
-
-        $oneitem->{'Value'} = $value;
-    }
-}
-
-################################################################################
-# By defining variable LOCALUSERDIR in *.lst it is possible to change
-# the standard destination of user directory defined in scp2 ($SYSUSERCONFIG).
-################################################################################
-
-sub replace_userdir_variable
-{
-    my ($itemsarrayref) = @_;
-    
-    my $userdir = "";
-    if ( $allvariableshashref->{'LOCALUSERDIR'} ) { $userdir = $allvariableshashref->{'LOCALUSERDIR'}; }
-    else { $userdir = $installer::globals::simpledefaultuserdir; } 
-    
-    if ( $userdir ne "" )
-    {
-        for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-        {
-            my $oneitem = ${$itemsarrayref}[$i];		
-            $oneitem->{'Value'} =~ s/\$SYSUSERCONFIG/$userdir/;
-        }
-    }
-}
-
-#####################################################################################
-# Files and ConfigurationItems are not included for all languages.
-# For instance asian fonts. These can be removed, if no "Name" is found.
-# ConfigurationItems are not always defined in the linguistic configuration file.
-# The "Key" cannot be found for them.
-#####################################################################################
-
-sub remove_non_existent_languages_in_productlists
-{
-    my ($itemsarrayref, $languagestringref, $searchkey, $itemtype) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_non_existent_languages_in_productlists : $#{$itemsarrayref} : $$languagestringref : $searchkey : $itemtype"); }
-
-    # Removing of all non existent files, for instance asian fonts
-
-    installer::logger::include_header_into_logfile("Removing for this language $$languagestringref:");
-
-    my @allexistentitems = ();
-    
-    my $infoline;
-
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];		
-        my $oneitemname = "";		# $searchkey is "Name" for files and "Key" for ConfigurationItems
-
-        if ( $oneitem->{$searchkey} ) { $oneitemname = $oneitem->{$searchkey} }
-
-        my $itemtoberemoved = 0;
-
-        if ($oneitemname eq "") 					# for instance asian font in english installation set
-        {
-            $itemtoberemoved = 1;
-        }
-
-        if ($itemtoberemoved)
-        {
-            $infoline = "WARNING: Language $$languagestringref: No $itemtype packed for $oneitem->{'gid'}!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        else
-        {
-            push(@allexistentitems, $oneitem);
-        }		
-    }
-
-    $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    return \@allexistentitems;
-}
-
-########################################################################
-# Input is the directory gid, output the "HostName" of the directory
-########################################################################
-
-sub get_Directoryname_From_Directorygid
-{
-    my ($dirsarrayref ,$searchgid, $onelanguage, $oneitemgid) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_Directoryname_From_Directorygid : $#{$dirsarrayref} : $searchgid : $onelanguage"); }
-
-    my $directoryname = "";
-    my $onedirectory;
-    my $foundgid = 0;
-    
-    for ( my $i = 0; $i <= $#{$dirsarrayref}; $i++ )
-    {
-        $onedirectory = ${$dirsarrayref}[$i];
-        my $directorygid = $onedirectory->{'gid'};
-        
-        if ($directorygid eq $searchgid) 
-        {
-            $foundgid = 1;
-            last;
-        }		
-    }
-    
-    if (!($foundgid))
-    {
-        installer::exiter::exit_program("ERROR: Gid $searchgid not defined in $installer::globals::setupscriptname", "get_Directoryname_From_Directorygid");
-    }
-    
-    if ( ! ( $onedirectory->{'ismultilingual'} ))	# the directory is not language dependent
-    {
-         $directoryname = $onedirectory->{'HostName'};
-    }
-    else
-    {
-        $directoryname = $onedirectory->{"HostName ($onelanguage)"};
-    }
-
-    # gid_Dir_Template_Wizard_Letter is defined as language dependent directory, but the file gid_Dir_Template_Wizard_Letter
-    # is not language dependent. Therefore $onelanguage is not defined. But which language is the correct language for the 
-    # directory?
-    # Perhaps better solution: In scp it must be forbidden to have a language independent file in a language dependent directory.
-    
-    if (( ! $directoryname ) && ( $onelanguage eq "" ))
-    {
-        installer::exiter::exit_program("ERROR (in scp): Directory $searchgid is language dependent, but not $oneitemgid inside this directory", "get_Directoryname_From_Directorygid");
-    }
-    
-    return \$directoryname;
-}
-
-##################################################################
-# Getting destination direcotory for links, files and profiles
-##################################################################
-
-sub get_Destination_Directory_For_Item_From_Directorylist		# this is used for Files, Profiles and Links
-{
-    my ($itemarrayref, $dirsarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist : $#{$itemarrayref} : $#{$dirsarrayref}"); }
-
-    for ( my $i = 0; $i <= $#{$itemarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemarrayref}[$i];
-        my $oneitemgid = $oneitem->{'gid'};
-        my $directorygid = $oneitem->{'Dir'};		# for instance gid_Dir_Program
-        my $netdirectorygid = "";
-        my $onelanguage = $oneitem->{'specificlanguage'};
-        my $ispredefinedprogdir = 0;
-        my $ispredefinedconfigdir = 0;
-        
-        my $oneitemname = $oneitem->{'Name'};		
-        
-        if ( $oneitem->{'NetDir'} ) { $netdirectorygid = $oneitem->{'NetDir'}; }
-        
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$oneitemname);	# making /registry/schema/org/openoffice/VCL.xcs to VCL.xcs 
-
-        my $searchdirgid;
-                
-        if ( $netdirectorygid eq "" )	# if NetDir is defined, it is privileged
-        {
-            $searchdirgid = $directorygid 
-        }
-        else
-        {
-            $searchdirgid = $netdirectorygid 
-        }
-        
-        if ($searchdirgid =~ /PREDEFINED_PROGDIR/)	# the root directory is not defined in setup script
-        {
-            $ispredefinedprogdir = 1;
-        }
-
-        if ($searchdirgid =~ /PREDEFINED_CONFIGDIR/)	# the root directory is not defined in setup script
-        {
-            $ispredefinedconfigdir = 1;
-        }
-    
-        my $destfilename;
-        
-        if ((!( $ispredefinedprogdir )) && (!( $ispredefinedconfigdir ))) 
-        {		
-            my $directorynameref = get_Directoryname_From_Directorygid($dirsarrayref, $searchdirgid, $onelanguage, $oneitemgid);
-            $destfilename = $$directorynameref . $installer::globals::separator . $oneitemname;
-        }
-        else
-        {
-            $destfilename = $oneitemname;
-        }
-
-        $oneitem->{'destination'} = $destfilename;
-    }
-}
-
-##########################################################################
-# Searching a file in a list of pathes
-##########################################################################
-
-sub get_sourcepath_from_filename_and_includepath_classic
-{
-    my ($searchfilenameref, $includepatharrayref, $write_logfile) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic : $$searchfilenameref : $#{$includepatharrayref} : $write_logfile"); }
-
-    my ($onefile, $includepath, $infoline);
-
-    my $foundsourcefile = 0;
-        
-    for ( my $j = 0; $j <= $#{$includepatharrayref}; $j++ )
-    {
-        $includepath = ${$includepatharrayref}[$j];
-        installer::remover::remove_leading_and_ending_whitespaces(\$includepath);
-
-        $onefile = $includepath . $installer::globals::separator . $$searchfilenameref;
-
-        if ( -f $onefile )
-        {
-            $foundsourcefile = 1;
-            last;
-        }
-    }
-
-    if (!($foundsourcefile))
-    {
-        $onefile = "";	# the sourcepath has to be empty
-        if ( $write_logfile)
-        {
-            if ( $ENV{'DEFAULT_TO_ENGLISH_FOR_PACKING'} )
-            {		
-                $infoline = "WARNING: Source for $$searchfilenameref not found!\n";	 # Important message in log file
-            }
-            else
-            {
-                $infoline = "ERROR: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
-            }
-
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-    else
-    {
-        if ( $write_logfile)
-        {
-            $infoline = "SUCCESS: Source for $$searchfilenameref: $onefile\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-    
-    return \$onefile;
-}
-
-##########################################################################
-# Input is one file name, output the complete absolute path of this file
-##########################################################################
-
-sub get_sourcepath_from_filename_and_includepath
-{
-    my ($searchfilenameref, $unused, $write_logfile) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_sourcepath_from_filename_and_includepath : $$searchfilenameref : $#{$includepatharrayref} : $write_logfile"); }
-
-    my ($onefile, $includepath, $infoline);
-
-    my $foundsourcefile = 0;
-    my $foundnewname = 0;
-
-    for ( my $j = 0; $j <= $#installer::globals::allincludepathes; $j++ )
-    {		
-        my $allfiles = $installer::globals::allincludepathes[$j];
-        
-        if ( exists( $allfiles->{$$searchfilenameref} ))
-        {
-            $onefile = $allfiles->{'includepath'} . $installer::globals::separator . $$searchfilenameref;
-            $foundsourcefile = 1;
-            last;
-        }
-    }
-
-    if (!($foundsourcefile))	# testing with lowercase filename 
-    {
-        # Attention: README01.html is copied for Windows to readme01.html, not case sensitive
-            
-        for ( my $j = 0; $j <= $#installer::globals::allincludepathes; $j++ )
-        {
-            my $allfiles = $installer::globals::allincludepathes[$j];
-
-            my $newfilename = $$searchfilenameref;
-            $newfilename =~ s/readme/README/;		# special handling for readme files
-            $newfilename =~ s/license/LICENSE/;		# special handling for license files
-        
-            if ( exists( $allfiles->{$newfilename} ))
-            {
-                $onefile = $allfiles->{'includepath'} . $installer::globals::separator . $newfilename;
-                $foundsourcefile = 1;
-                $foundnewname = 1;
-                last;
-            }
-        }
-    }
-
-    if (!($foundsourcefile))
-    {
-        $onefile = "";	# the sourcepath has to be empty
-        if ( $write_logfile)
-        {
-            if ( $ENV{'DEFAULT_TO_ENGLISH_FOR_PACKING'} )
-            {		
-                $infoline = "WARNING: Source for $$searchfilenameref not found!\n";	 # Important message in log file
-            }
-            else
-            {
-                $infoline = "ERROR: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
-            }
-
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-    else
-    {
-        if ( $write_logfile)
-        {
-            if (!($foundnewname))
-            {
-                $infoline = "SUCCESS: Source for $$searchfilenameref: $onefile\n";
-            }
-            else
-            {
-                $infoline = "SUCCESS/WARNING: Special handling for $$searchfilenameref: $onefile\n";
-            }
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-    
-    return \$onefile;
-}
-
-##############################################################
-# Determining, whether a specified directory is language
-# dependent
-##############################################################
-
-sub determine_directory_language_dependency
-{
-    my($directorygid, $dirsref) = @_;
-
-    my $is_multilingual = 0;
-
-    for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
-    {
-        my $onedir = ${$dirsref}[$i];
-        my $gid = $onedir->{'gid'};
-        
-        if ( $gid eq $directorygid )
-        {
-            $is_multilingual = $onedir->{'ismultilingual'};
-            last;
-        }
-    }
-    
-    return $is_multilingual;
-}
-
-##############################################################
-# Getting all source pathes for all files to be packed
-# $item can be "Files" or "ScpActions"
-##############################################################
-
-sub get_Source_Directory_For_Files_From_Includepathlist
-{
-    my ($filesarrayref, $includepatharrayref, $dirsref, $item) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist : $#{$filesarrayref} : $#{$includepatharrayref} : $item"); }
-
-    installer::logger::include_header_into_logfile("$item:");
-
-    my $infoline = "";
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $onelanguage = $onefile->{'specificlanguage'};
-
-        if ( ! $onefile->{'Name'} ) { installer::exiter::exit_program("ERROR: $item without name ! GID: $onefile->{'gid'} ! Language: $onelanguage", "get_Source_Directory_For_Files_From_Includepathlist"); }
-
-        my $onefilename = $onefile->{'Name'};
-        if ( $item eq "ScpActions" ) { $onefilename =~ s/\//$installer::globals::separator/g; }
-        $onefilename =~ s/^\s*\Q$installer::globals::separator\E//;		# filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
-        
-        my $styles = "";
-        my $file_can_miss = 0;
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-        if ( $styles =~ /\bFILE_CAN_MISS\b/ ) { $file_can_miss = 1; }
-
-        if (( $installer::globals::languagepack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))) { $file_can_miss = 1; }
-        if (( $installer::globals::helppack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCEHELPPACK\b/ ))) { $file_can_miss = 1; }
-        
-        my $sourcepathref = "";
-
-        if ( $file_can_miss ) { $sourcepathref = get_sourcepath_from_filename_and_includepath(\$onefilename, $includepatharrayref, 0); }
-        else { $sourcepathref = get_sourcepath_from_filename_and_includepath(\$onefilename, $includepatharrayref, 1); }
-
-        $onefile->{'sourcepath'} = $$sourcepathref;	# This $$sourcepathref is empty, if no source was found 
-
-        # defaulting to english for multilingual files if DEFAULT_TO_ENGLISH_FOR_PACKING is set
-        
-        if ( $ENV{'DEFAULT_TO_ENGLISH_FOR_PACKING'} )
-        {		
-            if (( ! $onefile->{'sourcepath'} ) && ( $onefile->{'ismultilingual'} ))
-            {			
-                my $oldname = $onefile->{'Name'};
-                my $oldlanguage = $onefile->{'specificlanguage'};
-                my $newlanguage = "en-US";
-                $onefilename = $onefile->{'Name'};
-                $onefilename =~ s/$oldlanguage\./$newlanguage\./;	# Example: tplwizfax_it.zip -> tplwizfax_en-US.zip
-                $onefilename =~ s/^\s*\Q$installer::globals::separator\E//;		# filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
-                $sourcepathref = get_sourcepath_from_filename_and_includepath(\$onefilename, $includepatharrayref, 1);
-                $onefile->{'sourcepath'} = $$sourcepathref;						# This $$sourcepathref is empty, if no source was found
-                
-                if ($onefile->{'sourcepath'})	# defaulting to english was successful
-                {
-                    $infoline = "WARNING: Using $onefilename instead of $oldname\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    print "    $infoline";
-
-                    # If the directory, in which the new file is installed, is not language dependent,
-                    # the filename has to be changed to avoid installation conflicts
-                    # No mechanism for resource files!
-                    # -> implementing for the content of ARCHIVE files
-
-                    if ( $onefile->{'Styles'} =~ /\bARCHIVE\b/ )
-                    {
-                        my $directorygid = $onefile->{'Dir'};
-                        my $islanguagedependent = determine_directory_language_dependency($directorygid, $dirsref);
-                    
-                        if ( ! $islanguagedependent )
-                        {
-                            $onefile->{'Styles'} =~ s/\bARCHIVE\b/ARCHIVE, RENAME_TO_LANGUAGE/;	# Setting new flag RENAME_TO_LANGUAGE
-                            $infoline = "Setting flag RENAME_TO_LANGUAGE: File $onefile->{'Name'} in directory: $directorygid\n";
-                            push( @installer::globals::logfileinfo, $infoline);
-                        }
-                    }				
-                }
-                else
-                {
-                    $infoline = "WARNING: Using $onefile->{'Name'} instead of $oldname was not successful\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    $onefile->{'Name'} = $oldname;	# Switching back to old file name				
-                }
-            }
-        }
-    }
-
-    $infoline = "\n";	# empty line after listing of all files
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-#################################################################################
-# Removing files, that shall not be included into languagepacks
-# (because of rpm conflicts)
-#################################################################################
-
-sub remove_Files_For_Languagepacks
-{
-    my ($itemsarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Files_For_Languagepacks : $#{$filesarrayref}"); }
-
-    my $infoline;
-    
-    my @newitemsarray = ();
-        
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];
-        my $gid = $oneitem->{'gid'};
-
-        # scp Todo: Remove asap after removal of old setup
-
-        if (( $gid eq "gid_File_Extra_Fontunxpsprint" ) ||
-            ( $gid eq "gid_File_Extra_Migration_Lang" ))
-        {
-            $infoline = "ATTENTION: Removing item $oneitem->{'gid'} from the installation set.\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            
-            next;
-        }
-
-        push(@newitemsarray, $oneitem);
-    }
-
-    return \@newitemsarray;	
-}
-
-#################################################################################
-# Files, whose source directory is not found, are removed now (this is an ERROR)
-#################################################################################
-
-sub remove_Files_Without_Sourcedirectory
-{
-    my ($filesarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Files_Without_Sourcedirectory : $#{$filesarrayref}"); }
-
-    my $infoline;
-    
-    my $error_occurred = 0;
-    my @missingfiles = ();
-    push(@missingfiles, "ERROR: The following files could not be found: \n");
-    
-    my @newfilesarray = ();
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $sourcepath = $onefile->{'sourcepath'};
-
-        if ($sourcepath eq "")
-        {
-            my $styles = $onefile->{'Styles'};
-            my $filename = $onefile->{'Name'};
-
-            if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
-            {
-                $infoline = "ERROR: Removing file $filename from file list.\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                push(@missingfiles, "ERROR: File not found: $filename\n");	
-                $error_occurred = 1;
-
-                next;	# removing this file from list, if sourcepath is empty
-            }
-            elsif ( $installer::globals::languagepack ) # special case for language packs
-            {
-                if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
-                {
-                    $infoline = "ERROR: Removing file $filename from file list.\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-
-                    push(@missingfiles, "ERROR: File not found: $filename\n");	
-                    $error_occurred = 1;
-
-                    next;	# removing this file from list, if sourcepath is empty		
-                }
-                else
-                {
-                    $infoline = "INFO: Removing file $filename from file list. It is not language dependent.\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    $infoline = "INFO: It is not language dependent and can be ignored in language packs.\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-
-                    next;	# removing this file from list, if sourcepath is empty					
-                }
-            }
-            else # special case for help packs
-            {
-                if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
-                {
-                    $infoline = "ERROR: Removing file $filename from file list.\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-
-                    push(@missingfiles, "ERROR: File not found: $filename\n");
-                    $error_occured = 1;
-
-                    next;	# removing this file from list, if sourcepath is empty
-                }
-                else
-                {
-                    $infoline = "INFO: Removing file $filename from file list. It is not language dependent.\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    $infoline = "INFO: It is not language dependent and can be ignored in help packs.\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-
-                    next;	# removing this file from list, if sourcepath is empty
-                }
-           }
-        }
-
-        push(@newfilesarray, $onefile);
-    }
-
-    $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ( $error_occurred )
-    {
-        for ( my $i = 0; $i <= $#missingfiles; $i++ ) { print "$missingfiles[$i]"; }
-        installer::exiter::exit_program("ERROR: Missing files", "remove_Files_Without_Sourcedirectory");
-    }
-
-    return \@newfilesarray;
-}
-
-############################################################################
-# License and Readme files in the default language have to be installed
-# in the directory with flag OFFICEDIRECTORY. If this is not defined
-# they have to be installed in the installation root.
-############################################################################
-
-sub get_office_directory_gid_and_hostname
-{
-    my ($dirsarrayref) = @_;
-
-    my $foundofficedir = 0;
-    my $gid = "";
-    my $hostname = "";
-
-    for ( my $i = 0; $i <= $#{$dirsarrayref}; $i++ )
-    {
-        my $onedir = ${$dirsarrayref}[$i];
-        if ( $onedir->{'Styles'} )
-        {
-            my $styles = $onedir->{'Styles'};
-            
-            if ( $styles =~ /\bOFFICEDIRECTORY\b/ )
-            {
-                $foundofficedir = 1;
-                $gid = $onedir->{'gid'};
-                $hostname = $onedir->{'HostName'};
-                last;
-            }
-        }
-    }
-
-    return ($foundofficedir, $gid, $hostname);
-}
-
-############################################################################
-# License and Readme files in the default language have to be installed
-# in the installation root (next to the program dir). This is in scp
-# project done by a post install basic script
-############################################################################
-
-sub add_License_Files_into_Installdir
-{
-    my ($filesarrayref, $dirsarrayref, $languagesarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::add_License_Files_into_Installdir : $#{$filesarrayref} : $#{$languagesarrayref}"); }
-
-    my $infoline;
-    
-    my @newfilesarray = ();
-
-    my $defaultlanguage = installer::languages::get_default_language($languagesarrayref);
-    
-    my ($foundofficedir, $officedirectorygid, $officedirectoryhostname) = get_office_directory_gid_and_hostname($dirsarrayref);
-
-    # copy all files from directory share/readme, that contain the default language in their name
-    # without default language into the installation root. This makes the settings of the correct
-    # file names superfluous. On the other hand this requires a dependency to the directory
-    # share/readme
-    
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $destination = $onefile->{'destination'};
-        my $styles = "";
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-
-        if ( ( $destination =~ /share\Q$installer::globals::separator\Ereadme\Q$installer::globals::separator\E(\w+?)_?$defaultlanguage\.?(\w*)\s*/ )
-            || (( $styles =~ /\bROOTLICENSEFILE\b/ ) && ( $destination =~ /\Q$installer::globals::separator\E?(\w+?)_?$defaultlanguage\.?(\w*?)\s*$/ )) )
-        {
-            my $filename = $1;
-            my $extension = $2;
-            
-            my $newfilename;
-            
-            if ( $extension eq "" ) { $newfilename = $filename; }
-            else { $newfilename = $filename . "\." . $extension; }
-
-            my %newfile = ();
-            my $newfile = \%newfile;
-
-            installer::converter::copy_item_object($onefile, $newfile);			
-
-            $newfile->{'gid'} = $onefile->{'gid'} . "_Copy";
-            $newfile->{'Name'} = $newfilename;
-            $newfile->{'ismultilingual'} = "0";
-            $newfile->{'specificlanguage'} = "";
-            $newfile->{'haslanguagemodule'} = "0";
-            
-            if ( defined $newfile->{'InstallName'} )
-            {
-                if ( $newfile->{'InstallName'} =~ /^\s*(.*?)_$defaultlanguage\.?(\w*?)\s*$/ )
-                {
-                    my $localfilename = $1;
-                    my $localextension = $2;
-
-                    if ( $localextension eq "" ) { $newfile->{'InstallName'} = $localfilename; }
-                    else { $newfile->{'InstallName'} = $localfilename . "\." . $localextension; }				
-                }
-            }
-            
-            $newfile->{'removelangfromfile'} = "1"; # Important for files with an InstallName, because language also has to be removed there. 
-            
-            if ( $foundofficedir )
-            {
-                $newfile->{'Dir'} = $officedirectorygid;
-                $newfile->{'destination'} = $officedirectoryhostname . $installer::globals::separator . $newfilename;
-            }
-            else
-            {
-                $newfile->{'Dir'} = "PREDEFINED_PROGDIR";
-                $newfile->{'destination'} = $newfilename;
-            }
-            
-            # Also setting "modules=gid_Module_Root_Brand" (module with style: ROOT_BRAND_PACKAGE)
-            if ( $installer::globals::rootbrandpackageset )
-            {
-                $newfile->{'modules'} = $installer::globals::rootbrandpackage;
-            }
-            
-            push(@newfilesarray, $newfile);
-
-            $infoline = "New files: Adding file $newfilename for the installation root to the file list. Language: $defaultlanguage\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            if ( defined $newfile->{'InstallName'} )
-            {
-                $infoline = "New files: Using installation name: $newfile->{'InstallName'}\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
-                    
-            # Collecting license and readme file for the installation set
-        
-            push(@installer::globals::installsetfiles, $newfile);
-            $infoline = "New files: Adding file $newfilename to the file collector for the installation set. Language: $defaultlanguage\n";
-            push( @installer::globals::logfileinfo, $infoline);		
-        }
-
-        push(@newfilesarray, $onefile);
-    }
-
-    return \@newfilesarray;	
-}
-
-############################################################################
-# Removing files with flag ONLY_ASIA_LANGUAGE, only if no asian
-# language is part of the product.
-# This special files are connected to the root module and are not
-# included into a language pack (would lead to conflicts!).
-# But this files shall only be included into the product, if the
-# product contains at least one asian language.
-############################################################################
-
-sub remove_onlyasialanguage_files_from_productlists
-{
-    my ($filesarrayref) = @_;
-
-    my $infoline;
-    
-    my @newfilesarray = ();
-    my $returnfilesarrayref;
-
-    my $containsasianlanguage = installer::languages::detect_asian_language($installer::globals::alllanguagesinproductarrayref);
-    
-    my $alllangstring = installer::converter::convert_array_to_comma_separated_string($installer::globals::alllanguagesinproductarrayref);
-    $infoline = "\nLanguages in complete product: $alllangstring\n";
-    push( @installer::globals::logfileinfo, $infoline);			
-    
-    if ( ! $containsasianlanguage )
-    {
-        $infoline = "Product does not contain asian language -> removing files\n";
-        push( @installer::globals::logfileinfo, $infoline);		
-
-        for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-        {
-            my $onefile = ${$filesarrayref}[$i];
-            my $styles = "";
-            if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-            if ( $styles =~ /\bONLY_ASIA_LANGUAGE\b/ )
-            {
-                $infoline = "Flag ONLY_ASIA_LANGUAGE: Removing file $onefile->{'Name'} from files collector!\n";
-                push( @installer::globals::logfileinfo, $infoline);			
-                next;
-            }
-            
-            push(@newfilesarray, $onefile);
-        }
-
-        $returnfilesarrayref = \@newfilesarray;
-    }
-    else
-    {
-        $returnfilesarrayref = $filesarrayref;
-
-        $infoline = "Product contains asian language -> Nothing to do\n";
-        push( @installer::globals::logfileinfo, $infoline);		
-
-    }
-
-    return $returnfilesarrayref;
-}
-
-############################################################################
-# Removing files with flag ONLY_WESTERN_LANGUAGE, only if no western
-# language is part of the product.
-# This special files are connected to the root module and are not
-# included into a language pack (would lead to conflicts!).
-# But this files shall only be included into the product, if the
-# product contains at least one western language.
-############################################################################
-
-sub remove_onlywesternlanguage_files_from_productlists
-{
-    my ($filesarrayref) = @_;
-
-    my $infoline;
-    
-    my @newfilesarray = ();
-    my $returnfilesarrayref;
-
-    my $containswesternlanguage = installer::languages::detect_western_language($installer::globals::alllanguagesinproductarrayref);
-    
-    my $alllangstring = installer::converter::convert_array_to_comma_separated_string($installer::globals::alllanguagesinproductarrayref);
-    $infoline = "\nLanguages in complete product: $alllangstring\n";
-    push( @installer::globals::logfileinfo, $infoline);			
-    
-    if ( ! $containswesternlanguage )
-    {
-        $infoline = "Product does not contain western language -> removing files\n";
-        push( @installer::globals::logfileinfo, $infoline);		
-
-        for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-        {
-            my $onefile = ${$filesarrayref}[$i];
-            my $styles = "";
-            if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-            if ( $styles =~ /\bONLY_WESTERN_LANGUAGE\b/ )
-            {
-                $infoline = "Flag ONLY_WESTERN_LANGUAGE: Removing file $onefile->{'Name'} from files collector!\n";
-                push( @installer::globals::logfileinfo, $infoline);			
-                next;
-            }
-            
-            push(@newfilesarray, $onefile);
-        }
-
-        $returnfilesarrayref = \@newfilesarray;
-    }
-    else
-    {
-        $returnfilesarrayref = $filesarrayref;
-
-        $infoline = "Product contains western language -> Nothing to do\n";
-        push( @installer::globals::logfileinfo, $infoline);		
-
-    }
-
-    return $returnfilesarrayref;
-}
-
-############################################################################
-# Some files are included for more than one language and have the same
-# name and the same destination directory for all languages. This would
-# lead to conflicts, if the filenames are not changed.
-# In scp project this files must have the flag MAKE_LANG_SPECIFIC
-# For this files, the language is included into the filename.
-############################################################################
-
-sub make_filename_language_specific
-{
-    my ($filesarrayref) = @_;
-
-    my $infoline = "";
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-
-        if ( $onefile->{'ismultilingual'} )
-        {
-            my $styles = "";
-            if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-            if ( $styles =~ /\bMAKE_LANG_SPECIFIC\b/ )
-            {
-                my $language = $onefile->{'specificlanguage'};
-                my $olddestination = $onefile->{'destination'};
-                my $oldname = $onefile->{'Name'};
-                
-                # Including the language into the file name.
-                # But be sure, to include the language before the file extension.
-
-                my $fileextension = "";
-
-                if ( $onefile->{'Name'} =~ /(\.\w+?)\s*$/ ) { $fileextension = $1; }
-                if ( $fileextension ne "" )
-                {
-                    $onefile->{'Name'} =~ s/\Q$fileextension\E\s*$/_$language$fileextension/;
-                    $onefile->{'destination'} =~ s/\Q$fileextension\E\s*$/_$language$fileextension/;
-                }
-                
-                $infoline = "Flag MAKE_LANG_SPECIFIC:\n";
-                push( @installer::globals::logfileinfo, $infoline);			
-                $infoline = "Changing name from $oldname to $onefile->{'Name'} !\n";
-                push( @installer::globals::logfileinfo, $infoline);			
-                $infoline = "Changing destination from $olddestination to $onefile->{'destination'} !\n";
-                push( @installer::globals::logfileinfo, $infoline);			
-            }
-        }
-    }
-}
-
-############################################################################
-# Removing all scpactions, that have no name.
-# See: FlatLoaderZip
-############################################################################
-
-sub remove_scpactions_without_name
-{
-    my ($itemsarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_scpactions_without_name : $#{$itemsarrayref}"); }
-
-    my $infoline;
-    
-    my @newitemsarray = ();
-        
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];
-        my $name = "";
-        
-        if ( $oneitem->{'Name'} ) { $name = $oneitem->{'Name'}; }
-
-        if  ( $name eq "" )
-        {
-            $infoline = "ATTENTION: Removing scpaction $oneitem->{'gid'} from the installation set.\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            next;
-        }
-
-        push(@newitemsarray, $oneitem);
-    }
-
-    return \@newitemsarray;	
-}
-
-############################################################################
-# Because of the item "File" the source name must be "Name". Therefore
-# "Copy" is changed to "Name" and "Name" is changed to "DestinationName".
-############################################################################
-
-sub change_keys_of_scpactions
-{
-    my ($itemsarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::change_keys_of_scpactions : $#{$itemsarrayref}"); }
-
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];
-
-        my $key;
-
-        # First Name to DestinationName, then deleting Name
-        foreach $key (keys %{$oneitem})
-        {								
-            if ( $key =~ /\bName\b/ )
-            {					
-                my $value = $oneitem->{$key};
-                my $oldkey = $key;
-                $key =~ s/Name/DestinationName/;
-                $oneitem->{$key} = $value;
-                delete($oneitem->{$oldkey});
-            }
-        }				
-
-        # Second Copy to Name, then deleting Copy
-        foreach $key (keys %{$oneitem})
-        {								
-            if ( $key =~ /\bCopy\b/ )
-            {					
-                my $value = $oneitem->{$key};
-                my $oldkey = $key;
-                $key =~ s/Copy/Name/;
-                $oneitem->{$key} = $value;
-                delete($oneitem->{$oldkey});
-            }				
-        }
-    }	
-}
-
-############################################################################
-# Removing all xpd only items from installation set (scpactions with
-# the style XPD_ONLY), except an xpd installation set is created
-############################################################################
-
-sub remove_Xpdonly_Items
-{
-    my ($itemsarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Xpdonly_Items : $#{$itemsarrayref}"); }
-
-    my $infoline;
-    
-    my @newitemsarray = ();
-        
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-
-        if ( $styles =~ /\bXPD_ONLY\b/ )
-        {
-            $infoline = "Removing \"xpd only\" item $oneitem->{'gid'} from the installation set.\n";
-            push( @installer::globals::globallogfileinfo, $infoline);
-
-            next;
-        }
-
-        push(@newitemsarray, $oneitem);
-    }
-
-    $infoline = "\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-
-    return \@newitemsarray;	
-}
-
-############################################################################
-# Removing all language pack files from installation set (files with
-# the style LANGUAGEPACK), except this is a language pack.
-############################################################################
-
-sub remove_Languagepacklibraries_from_Installset
-{
-    my ($itemsarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Languagepacklibraries_from_Installset : $#{$itemsarrayref}"); }
-
-    my $infoline;
-    
-    my @newitemsarray = ();
-        
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-
-        if ( $styles =~ /\bLANGUAGEPACK\b/ )
-        {
-            $infoline = "Removing language pack file $oneitem->{'gid'} from the installation set.\n";
-            push( @installer::globals::globallogfileinfo, $infoline);
-
-            next;
-        }
-
-        push(@newitemsarray, $oneitem);
-    }
-
-    $infoline = "\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-
-    return \@newitemsarray;	
-}
-
-############################################################################
-# Removing all help pack files from installation set (files with
-# the style HELPPACK), except this is a help pack.
-############################################################################
-
-sub remove_Helppacklibraries_from_Installset
-{
-    my ($itemsarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Helppacklibraries_from_Installset : $#{$itemsarrayref}"); }
-
-    my $infoline;
-
-    my @newitemsarray = ();
-
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-
-        if ( $styles =~ /\bHELPPACK\b/ )
-        {
-            $infoline = "Removing help pack file $oneitem->{'gid'} from the installation set.\n";
-            push( @installer::globals::globallogfileinfo, $infoline);
-
-            next;
-        }
-
-        push(@newitemsarray, $oneitem);
-    }
-
-    $infoline = "\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-
-    return \@newitemsarray;
-}
-
-############################################################################
-# Removing all files with flag PATCH_ONLY from installation set.
-# This function is not called during patch creation.
-############################################################################
-
-sub remove_patchonlyfiles_from_Installset
-{
-    my ($itemsarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_patchonlyfiles_from_Installset : $#{$itemsarrayref}"); }
-
-    my $infoline;
-    
-    my @newitemsarray = ();
-        
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-
-        if ( $styles =~ /\bPATCH_ONLY\b/ )
-        {
-            $infoline = "Removing file with flag PATCH_ONLY $oneitem->{'gid'} from the installation set.\n";
-            push( @installer::globals::globallogfileinfo, $infoline);
-
-            next;
-        }
-
-        push(@newitemsarray, $oneitem);
-    }
-
-    $infoline = "\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-
-    return \@newitemsarray;	
-}
-
-############################################################################
-# Removing all files with flag TAB_ONLY from installation set.
-# This function is not called during tab creation.
-############################################################################
-
-sub remove_tabonlyfiles_from_Installset
-{
-    my ($itemsarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_tabonlyfiles_from_Installset : $#{$itemsarrayref}"); }
-
-    my $infoline;
-    
-    my @newitemsarray = ();
-        
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-
-        if ( $styles =~ /\bTAB_ONLY\b/ )
-        {
-            $infoline = "Removing tab only file $oneitem->{'gid'} from the installation set.\n";
-            push( @installer::globals::globallogfileinfo, $infoline);
-
-            next;
-        }
-
-        push(@newitemsarray, $oneitem);
-    }
-
-    $infoline = "\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-
-    return \@newitemsarray;	
-}
-
-###############################################################################
-# Removing all files with flag ONLY_INSTALLED_PRODUCT from installation set.
-# This function is not called for PKGFORMAT installed and archive.
-###############################################################################
-
-sub remove_installedproductonlyfiles_from_Installset
-{
-    my ($itemsarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_installedproductonlyfiles_from_Installset : $#{$itemsarrayref}"); }
-
-    my $infoline;
-    
-    my @newitemsarray = ();
-        
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-
-        if ( $styles =~ /\bONLY_INSTALLED_PRODUCT\b/ )
-        {
-            $infoline = "Removing file $oneitem->{'gid'} from the installation set. This file is only required for PKGFORMAT archive or installed).\n";
-            push( @installer::globals::globallogfileinfo, $infoline);
-            next;
-        }
-
-        push(@newitemsarray, $oneitem);
-    }
-
-    $infoline = "\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-
-    return \@newitemsarray;	
-}
-
-############################################################################
-# Some files cotain a $ in their name. epm conflicts with such files.
-# Solution: Renaming this files, converting "$" to "$$"
-############################################################################
-
-sub quoting_illegal_filenames
-{
-    my ($filesarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::rename_illegal_filenames : $#{$filesarrayref}"); }
-    
-    # This function has to be removed as soon as possible!
-    
-    installer::logger::include_header_into_logfile("Renaming illegal filenames:");
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $filename = $onefile->{'Name'}; 
-    
-        if ( $filename =~ /\$/ )
-        {
-            my $sourcepath = $onefile->{'sourcepath'};
-            my $destpath = $onefile->{'destination'};
-
-            # sourcepath and destination have to be quoted for epm list file
-
-            $destpath =~ s/\$/\$\$/g;
-            $sourcepath =~ s/\$/\$\$/g;
-
-            my $infoline = "ATTENTION: Files: Quoting sourcepath $onefile->{'sourcepath'} to $sourcepath\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            $infoline = "ATTENTION: Files: Quoting destination path $onefile->{'destination'} to $destpath\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            $onefile->{'sourcepath'} = $sourcepath;
-            $onefile->{'destination'} = $destpath;
-        }
-    }
-}
-
-############################################################################
-# Removing multiple occurrences of same module.
-############################################################################
-
-sub optimize_list
-{
-    my ( $longlist ) = @_;
-    my %tmpHash;
-
-    $longlist =~ s/^\s+//;
-    $longlist =~ s/\s+$//;
-    $longlist =~ s/\s*,\s*/,/g;
-
-    @tmpHash{split /,/, $longlist} = ();
-    return join(",", sort keys %tmpHash);
-}
-
-#######################################################################
-# Collecting all directories needed for the epm list
-# 1. Looking for all destination paths in the files array
-# 2. Looking for directories with CREATE flag in the directory array
-#######################################################################
-
-##################################
-# Collecting directories: Part 1
-##################################
-
-sub collect_directories_from_filesarray
-{
-    my ($filesarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::collect_directories_from_filesarray : $#{$filesarrayref}"); }
-
-    my @alldirectories = ();
-    my %alldirectoryhash = ();
-
-    my $predefinedprogdir_added = 0;
-    
-    # Preparing this already as hash, although the only needed value at the moment is the HostName
-    # But also adding: "specificlanguage" and "Dir" (for instance gid_Dir_Program)
-    
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $destinationpath = $onefile->{'destination'};
-        installer::pathanalyzer::get_path_from_fullqualifiedname(\$destinationpath);
-        $destinationpath =~ s/\Q$installer::globals::separator\E\s*$//;		# removing ending slashes or backslashes
-
-        do
-        {
-            if (!exists($alldirectoryhash{$destinationpath}))
-            {
-                my %directoryhash = ();
-                $directoryhash{'HostName'} = $destinationpath;
-                $directoryhash{'specificlanguage'} = $onefile->{'specificlanguage'};
-                $directoryhash{'Dir'} = $onefile->{'Dir'};
-                $directoryhash{'modules'} = $onefile->{'modules'}; # NEW, saving modules
-            
-                $predefinedprogdir_added ||= $onefile->{'Dir'} eq "PREDEFINED_PROGDIR";
-
-                $alldirectoryhash{$destinationpath} = \%directoryhash;
-            }
-            else
-            {
-                # Adding the modules to the module list!
-                $alldirectoryhash{$destinationpath}->{'modules'} .= "," . $onefile->{'modules'};
-            }
-        } while ($destinationpath =~ s/(^.*\S)\Q$installer::globals::separator\E(\S.*?)\s*$/$1/);  # as long as the path contains slashes
-    }
-    
-    # if there is no file in the root directory PREDEFINED_PROGDIR, it has to be included into the directory array now
-    # HostName=	specificlanguage=	Dir=PREDEFINED_PROGDIR	
-
-    if (! $predefinedprogdir_added )
-    {
-        my %directoryhash = ();
-        $directoryhash{'HostName'} = "";
-        $directoryhash{'specificlanguage'} = "";
-        $directoryhash{'modules'} = "";	# ToDo?
-        $directoryhash{'Dir'} = "PREDEFINED_PROGDIR";
-
-        push(@alldirectories, \%directoryhash);
-    }
-
-    # Creating directory array
-    foreach my $destdir ( sort keys %alldirectoryhash )
-    {
-        $alldirectoryhash{$destdir}->{'modules'} = optimize_list($alldirectoryhash{$destdir}->{'modules'});
-        push(@alldirectories, $alldirectoryhash{$destdir});
-    }
-
-    return (\@alldirectories, \%alldirectoryhash);
-}
-
-##################################
-# Collecting directories: Part 2
-##################################
-
-sub collect_directories_with_create_flag_from_directoryarray
-{
-    my ($directoryarrayref, $alldirectoryhash) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::collect_directories_with_create_flag_from_directoryarray : $#{$directoryarrayref}"); }
-
-    my $alreadyincluded = 0;
-    my @alldirectories = ();
-
-    for ( my $i = 0; $i <= $#{$directoryarrayref}; $i++ )
-    {
-        my $onedir = ${$directoryarrayref}[$i];
-        my $styles = "";
-        $newdirincluded = 0;
-        
-        if ( $onedir->{'Styles'} ) { $styles = $onedir->{'Styles'}; }
-    
-        if ( $styles =~ /\bCREATE\b/ )
-        {	
-            my $directoryname = "";			
-
-            if ( $onedir->{'HostName'} ) { $directoryname = $onedir->{'HostName'}; }
-            else { installer::exiter::exit_program("ERROR: No directory name (HostName) set for specified language in gid $onedir->{'gid'}", "collect_directories_with_create_flag_from_directoryarray"); }
-
-            $alreadyincluded = 0;
-            if ( exists($alldirectoryhash->{$directoryname}) ) { $alreadyincluded = 1; }
-
-            if (!($alreadyincluded))
-            {
-                my %directoryhash = ();
-                $directoryhash{'HostName'} = $directoryname;
-                $directoryhash{'specificlanguage'} = $onedir->{'specificlanguage'};
-                $directoryhash{'Dir'} = $onedir->{'gid'};
-                $directoryhash{'Styles'} = $onedir->{'Styles'};
-                
-                # saving also the modules
-                if ( ! $onedir->{'modules'} ) { installer::exiter::exit_program("ERROR: No assigned modules found for directory $onedir->{'gid'}", "collect_directories_with_create_flag_from_directoryarray"); }
-                $directoryhash{'modules'} = $onedir->{'modules'};
-                
-                $alldirectoryhash->{$directoryname} = \%directoryhash;
-                $newdirincluded = 1;
-
-                # Problem: The $destinationpath can be share/registry/schema/org/openoffice
-                # but not all directories contain files and will be added to this list.
-                # Therefore the path has to be analyzed.
-        
-                while ( $directoryname =~ /(^.*\S)\Q$installer::globals::separator\E(\S.*?)\s*$/ )	# as long as the path contains slashes
-                {	
-                    $directoryname = $1;
-
-                    $alreadyincluded = 0;
-                    if ( exists($alldirectoryhash->{$directoryname}) ) { $alreadyincluded = 1; }
-    
-                    if (!($alreadyincluded))
-                    {
-                        my %directoryhash = ();
-
-                        $directoryhash{'HostName'} = $directoryname;
-                        $directoryhash{'specificlanguage'} = $onedir->{'specificlanguage'};
-                        $directoryhash{'Dir'} = $onedir->{'gid'};
-                        if ( ! $installer::globals::iswindowsbuild ) { $directoryhash{'Styles'} = "(CREATE)"; } # Exeception for Windows?
-
-                        # saving also the modules
-                        $directoryhash{'modules'} = $onedir->{'modules'};
-                
-                        $alldirectoryhash->{$directoryname} = \%directoryhash;
-                        $newdirincluded = 1;		
-                    }
-                    else
-                    {
-                        # Adding the modules to the module list!	
-                        $alldirectoryhash->{$directoryname}->{'modules'} = $alldirectoryhash->{$directoryname}->{'modules'} . "," . $onedir->{'modules'};
-                    }
-                }
-            }
-            else
-            {
-                # Adding the modules to the module list!	
-                $alldirectoryhash->{$directoryname}->{'modules'} = $alldirectoryhash->{$directoryname}->{'modules'} . "," . $onedir->{'modules'};				
-
-                while ( $directoryname =~ /(^.*\S)\Q$installer::globals::separator\E(\S.*?)\s*$/ )	# as long as the path contains slashes
-                {	
-                    $directoryname = $1;
-                    # Adding the modules to the module list!	
-                    $alldirectoryhash->{$directoryname}->{'modules'} = $alldirectoryhash->{$directoryname}->{'modules'} . "," . $onedir->{'modules'};
-                }
-            }			
-        }
-
-        # Saving the styles for already added directories in function collect_directories_from_filesarray
-
-        if (( ! $newdirincluded ) && ( $styles ne "" ))
-        {
-            $styles =~ s/\bWORKSTATION\b//;
-            $styles =~ s/\bCREATE\b//;
-
-            if (( ! ( $styles =~ /^\s*\(\s*\)\s*$/ )) && ( ! ( $styles =~ /^\s*\(\s*\,\s*\)\s*$/ )) && ( ! ( $styles =~ /^\s*$/ ))) # checking, if there are styles left
-            {
-                my $directoryname = "";			
-                if ( $onedir->{'HostName'} ) { $directoryname = $onedir->{'HostName'}; }
-                else { installer::exiter::exit_program("ERROR: No directory name (HostName) set for specified language in gid $onedir->{'gid'}", "collect_directories_with_create_flag_from_directoryarray"); }
-
-                if ( exists($alldirectoryhash->{$directoryname}) )
-                {
-                    $alldirectoryhash->{$directoryname}->{'Styles'} = $styles;
-                }
-            }
-        }
-    }
-
-    # Creating directory array
-    foreach my $destdir ( sort keys %{$alldirectoryhash} )
-    {
-        $alldirectoryhash->{$destdir}->{'modules'} = optimize_list($alldirectoryhash->{$destdir}->{'modules'});
-        push(@alldirectories, $alldirectoryhash->{$destdir});
-    }
-
-    return (\@alldirectories, \%alldirectoryhash);	
-}
-
-#################################################
-# Determining the destination file of a link
-#################################################
-
-sub get_destination_file_path_for_links
-{
-    my ($linksarrayref, $filesarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_destination_file_path_for_links : $#{$linksarrayref} : $#{$filesarrayref}"); }
-
-    my $infoline;
-
-    for ( my $i = 0; $i <= $#{$linksarrayref}; $i++ )
-    {
-        my $fileid = "";
-        my $onelink = ${$linksarrayref}[$i];
-        if ( $onelink->{'FileID'} ) { $fileid = $onelink->{'FileID'}; }
-
-        if (!( $fileid eq "" ))
-        {
-            my $foundfile = 0;
-
-            for ( my $j = 0; $j <= $#{$filesarrayref}; $j++ )
-            {
-                my $onefile = ${$filesarrayref}[$j];
-                my $filegid = $onefile->{'gid'};
-                
-                if ( $filegid eq $fileid )
-                {
-                    $foundfile = 1;
-                    $onelink->{'destinationfile'} = $onefile->{'destination'};
-                    last;
-                }				
-            }
-            
-            if (!($foundfile))
-            {
-                $infoline = "Warning: FileID $fileid for Link $onelink->{'gid'} not found!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }				
-        }
-    }
-
-    $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-#################################################
-# Determining the destination link of a link
-#################################################
-
-sub get_destination_link_path_for_links
-{
-    my ($linksarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_destination_link_path_for_links : $#{$linksarrayref}"); }
-
-    my $infoline;
-
-    for ( my $i = 0; $i <= $#{$linksarrayref}; $i++ )
-    {
-        my $shortcutid = "";
-        my $onelink = ${$linksarrayref}[$i];
-        if ( $onelink->{'ShortcutID'} ) { $shortcutid = $onelink->{'ShortcutID'}; }
-
-        if (!( $shortcutid eq "" ))
-        {
-            my $foundlink = 0;
-
-            for ( my $j = 0; $j <= $#{$linksarrayref}; $j++ )
-            {
-                my $destlink = ${$linksarrayref}[$j];
-                $shortcutgid = $destlink->{'gid'};
-                
-                if ( $shortcutgid eq $shortcutid )
-                {
-                    $foundlink = 1;
-                    $onelink->{'destinationfile'} = $destlink->{'destination'};		# making key 'destinationfile'
-                    last;
-                }				
-            }
-            
-            if (!($foundlink))
-            {
-                $infoline = "Warning: ShortcutID $shortcutid for Link $onelink->{'gid'} not found!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }				
-        }
-    }
-
-    $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-###################################################################################
-# Items with flag WORKSTATION are not needed (here: links and configurationitems)
-###################################################################################
-
-sub remove_workstation_only_items
-{
-    my ($itemarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_workstation_only_items : $#{$itemarrayref}"); }
-    
-    my @newitemarray = ();
-    
-    for ( my $i = 0; $i <= $#{$itemarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemarrayref}[$i];
-        my $styles = $oneitem->{'Styles'};
-        
-        if (( $styles =~ /\bWORKSTATION\b/ ) &&
-            (!( $styles =~ /\bNETWORK\b/ )) &&
-            (!( $styles =~ /\bSTANDALONE\b/ )))
-        {
-            next;	# removing this link, it is only needed for a workstation installation
-        }
-        
-        push(@newitemarray, $oneitem);
-    }
-    
-    return \@newitemarray;
-}
-
-################################################
-# Resolving relative path in links
-################################################
-
-sub resolve_links_with_flag_relative
-{
-    my ($linksarrayref) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::resolve_links_with_flag_relative : $#{$linksarrayref}"); }
-
-    # Before this step is:
-    # destination=program/libsalhelperC52.so.3, this will be the name of the link
-    # destinationfile=program/libsalhelperC52.so.3, this will be the linked file or name
-    # If the flag RELATIVE is set, the pathes have to be analyzed. If the flag is not set
-    # (this will not occur in the future?) destinationfile has to be an absolute path name
-
-    for ( my $i = 0; $i <= $#{$linksarrayref}; $i++ )
-    {
-        my $onelink = ${$linksarrayref}[$i];
-        my $styles = $onelink->{'Styles'};
-        
-        if ( $styles =~ /\bRELATIVE\b/ )
-        {
-            # ToDo: This is only a simple not sufficient mechanism
-            
-            my $destination = $onelink->{'destination'};
-            my $destinationfile = $onelink->{'destinationfile'};
-            
-            my $destinationpath = $destination;
-
-            installer::pathanalyzer::get_path_from_fullqualifiedname(\$destinationpath);
-            
-            my $destinationfilepath = $destinationfile;
-
-            # it is possible, that the destinationfile is no longer part of the files collector
-            if ($destinationfilepath) { installer::pathanalyzer::get_path_from_fullqualifiedname(\$destinationfilepath); }
-            else { $destinationfilepath = ""; }
-    
-            if ( $destinationpath eq $destinationfilepath ) 
-            {
-                # link and file are in the same directory
-                # Therefore the path of the file can be removed
-                
-                my $newdestinationfile = $destinationfile;
-                installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$newdestinationfile);
-                
-                $onelink->{'destinationfile'} = $newdestinationfile;
-            }	
-        }
-    }
-}
-
-########################################################################
-# This function is a helper of function "assigning_modules_to_items"
-########################################################################
- 
-sub insert_for_item ($$$)
-{
-    my ($hash, $item, $id) = @_;
-
-    if (!defined $hash->{$item})
-    {
-        my @gids = ();
-        $hash->{$item} = \@gids;
-    }
-    my $gid_list = $hash->{$item};
-    push @{$gid_list}, $id;
-    $hash->{$item} = $gid_list;
-}
-
-sub build_modulegids_table
-{
-    my ($modulesref, $itemname) = @_;
-
-    my %module_lookup_table = ();
-
-    # build map of item names to list of respective module gids
-    # containing these items
-    for my $onemodule (@{$modulesref})
-    {
-        next if ( ! defined $onemodule->{$itemname} );
-        # these are the items contained in this module
-        # eg. Files = (gid_a_b_c,gid_d_e_f)
-        my $module_gids = $onemodule->{$itemname};
-
-        # prune outer brackets
-        $module_gids =~ s|^\s*\(||g;
-        $module_gids =~ s|\)\s*$||g;
-        for my $id (split (/,/, $module_gids))
-        {
-            chomp $id;
-            insert_for_item(\%module_lookup_table, lc ($id), $onemodule->{'gid'});
-        }
-    }
-
-    return \%module_lookup_table;
-}
-
-########################################################################
-# Items like files do not know their modules
-# This function is a helper of function "assigning_modules_to_items"
-########################################################################
-
-sub get_string_of_modulegids_for_itemgid
-{
-    my ($module_lookup_table, $modulesref, $itemgid, $itemname) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_string_of_modulegids_for_itemgid : $#{$modulesref} : $itemgid : $itemname"); }
-
-    my $allmodules = "";
-    my $haslanguagemodule = 0;
-    my %foundmodules = ();
-
-    my $gid_list = $module_lookup_table->{lc($itemgid)};
-
-    for my $gid (@{$gid_list})
-    {
-        $foundmodules{$gid} = 1;
-        $allmodules = $allmodules . "," . $gid;
-        # Is this module a language module? This info should be stored at the file.
-        if ( exists($installer::globals::alllangmodules{$gid}) ) { $haslanguagemodule = 1; }
-     }
-    
-    $allmodules =~ s/^\s*\,//;	# removing leading comma
-
-    # Check: All modules or no module must have flag LANGUAGEMODULE
-    if ( $haslanguagemodule )
-    {
-        my $isreallylanguagemodule = installer::worker::key_in_a_is_also_key_in_b(\%foundmodules, \%installer::globals::alllangmodules);
-        if ( ! $isreallylanguagemodule ) { installer::exiter::exit_program("ERROR: \"$itemgid\" is assigned to modules with flag \"LANGUAGEMODULE\" and also to modules without this flag! Modules: $allmodules", "get_string_of_modulegids_for_itemgid");  }
-    }
-
-    return ($allmodules, $haslanguagemodule);
-}
-
-########################################################
-# Items like files do not know their modules
-# This function add the {'modules'} to these items
-########################################################
-
-sub assigning_modules_to_items
-{
-    my ($modulesref, $itemsref, $itemname) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::assigning_modules_to_items : $#{$modulesref} : $#{$itemsref} : $itemname"); }
-    
-    my $infoline = "";
-    my $languageassignmenterror = 0;
-    my @languageassignmenterrors = ();
-
-    my $module_lookup_table = build_modulegids_table($modulesref, $itemname);
-    
-    for my $oneitem (@{$itemsref})
-    {
-        my $itemgid = $oneitem->{'gid'};
-
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-        if (( $itemname eq "Dirs" ) && ( ! ( $styles =~ /\bCREATE\b/ ))) { next; }
-        
-        if ( $itemgid eq "" ) 
-        {
-            installer::exiter::exit_program("ERROR in item collection: No gid for item $oneitem->{'Name'}", "assigning_modules_to_items");
-        }
-
-        # every item can belong to many modules
-                
-        my ($modulegids, $haslanguagemodule) = get_string_of_modulegids_for_itemgid($module_lookup_table, $modulesref, $itemgid, $itemname);
-
-        if ($modulegids eq "")
-        {
-            installer::exiter::exit_program("ERROR in file collection: No module found for $itemname $itemgid", "assigning_modules_to_items");
-        }
-
-        $oneitem->{'modules'} = $modulegids;
-        $oneitem->{'haslanguagemodule'} = $haslanguagemodule;
-        
-        # Important check: "ismultilingual" and "haslanguagemodule" must have the same value !
-        if (( $oneitem->{'ismultilingual'} ) && ( ! $oneitem->{'haslanguagemodule'} ))
-        {
-            $infoline = "Error: \"$oneitem->{'gid'}\" is multi lingual, but not in language pack (Assigned module: $modulegids)!\n";
-            push( @installer::globals::globallogfileinfo, $infoline);
-            push( @languageassignmenterrors, $infoline );
-            $languageassignmenterror = 1;
-        }
-        if (( $oneitem->{'haslanguagemodule'} ) && ( ! $oneitem->{'ismultilingual'} ))
-        {
-            $infoline = "Error: \"$oneitem->{'gid'}\" is in language pack, but not multi lingual (Assigned module: $modulegids)!\n";
-            push( @installer::globals::globallogfileinfo, $infoline);
-            push( @languageassignmenterrors, $infoline );
-            $languageassignmenterror = 1;
-        }
-    }
-    
-    if ($languageassignmenterror)
-    {
-        for ( my $i = 0; $i <= $#languageassignmenterrors; $i++ ) { print "$languageassignmenterrors[$i]"; }
-        installer::exiter::exit_program("ERROR: Incorrect assignments for language packs.", "assigning_modules_to_items");
-    }
-    
-}
-
-#################################################################################################
-# Root path (for instance /opt/openofficeorg20) needs to be added to directories, files and links
-#################################################################################################
-
-sub add_rootpath_to_directories
-{
-    my ($dirsref, $rootpath) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_directories : $#{$dirsref} : $rootpath"); }
-
-    for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
-    {
-        my $onedir = ${$dirsref}[$i];
-        my $dir = "";
-
-        if ( $onedir->{'Dir'} ) { $dir = $onedir->{'Dir'}; }
-    
-        if (!($dir =~ /\bPREDEFINED_/ ))
-        {
-            my $hostname = $onedir->{'HostName'};
-            $hostname = $rootpath . $installer::globals::separator . $hostname;
-            $onedir->{'HostName'} = $hostname;
-        }
-        
-        # added
-        
-        if ( $dir =~ /\bPREDEFINED_PROGDIR\b/ )
-        {
-            my $hostname = $onedir->{'HostName'};
-            if ( $hostname eq "" ) { $onedir->{'HostName'} = $rootpath; }
-            else { $onedir->{'HostName'} = $rootpath . $installer::globals::separator . $hostname; }
-        }	
-    }
-}
-
-sub add_rootpath_to_files
-{
-    my ($filesref, $rootpath) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_files : $#{$filesref} : $rootpath"); }
-    
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-        my $destination = $onefile->{'destination'};
-        $destination = $rootpath . $installer::globals::separator . $destination;
-        $onefile->{'destination'} = $destination;
-    }
-}
-
-sub add_rootpath_to_links
-{
-    my ($linksref, $rootpath) = @_;
-
-    if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_links : $#{$linksref} : $rootpath"); }
-    
-    for ( my $i = 0; $i <= $#{$linksref}; $i++ )
-    {
-        my $onelink = ${$linksref}[$i];
-        my $styles = $onelink->{'Styles'};
-
-        my $destination = $onelink->{'destination'};
-        $destination = $rootpath . $installer::globals::separator . $destination;
-        $onelink->{'destination'} = $destination;
-
-        if (!($styles =~ /\bRELATIVE\b/ )) # for absolute links
-        {		
-            my $destinationfile = $onelink->{'destinationfile'};
-            $destinationfile = $rootpath . $installer::globals::separator . $destinationfile;
-            $onelink->{'destinationfile'} = $destinationfile;
-        }
-    }
-}
-
-#################################################################################
-# Collecting all parent gids
-#################################################################################
-
-sub collect_all_parent_feature
-{
-    my ($modulesref) = @_;
-
-    my @allparents = ();
-    
-    my $found_root_module = 0;
-    
-    for ( my $i = 0; $i <= $#{$modulesref}; $i++ )
-    {
-        my $onefeature = ${$modulesref}[$i];
-
-        my $parentgid = "";
-        if ( $onefeature->{'ParentID'} )
-        {
-            $parentgid = $onefeature->{'ParentID'}; 
-        }
-
-        if ( $parentgid ne "" )
-        {
-            if (! installer::existence::exists_in_array($parentgid, \@allparents))
-            {
-                push(@allparents, $parentgid);		
-            }
-        }
-        
-        # Setting the global root module
-        
-        if ( $parentgid eq "" )
-        {
-            if ( $found_root_module ) { installer::exiter::exit_program("ERROR: Only one module without ParentID or with empty ParentID allowed ($installer::globals::rootmodulegid, $onefeature->{'gid'}).", "collect_all_parent_feature"); }
-            $installer::globals::rootmodulegid = $onefeature->{'gid'};
-            $found_root_module = 1;
-            $infoline = "Setting Root Module: $installer::globals::rootmodulegid\n";
-            push( @installer::globals::globallogfileinfo, $infoline);			
-        }
-        
-        if ( ! $found_root_module ) { installer::exiter::exit_program("ERROR: Could not define root module. No module without ParentID or with empty ParentID exists.", "collect_all_parent_feature"); }
-
-    }
-    
-    return \@allparents;
-}
-
-#################################################################################
-# Checking for every feature, whether it has children
-#################################################################################
-
-sub set_children_flag
-{
-    my ($modulesref) = @_;
-
-    my $allparents = collect_all_parent_feature($modulesref);
-
-    for ( my $i = 0; $i <= $#{$modulesref}; $i++ )
-    {
-        my $onefeature = ${$modulesref}[$i];
-        my $gid = $onefeature->{'gid'};
-        
-        # is this gid a parent?
-    
-        if ( installer::existence::exists_in_array($gid, $allparents) )
-        {
-            $onefeature->{'has_children'} = 1;
-        }
-        else
-        {
-            $onefeature->{'has_children'} = 0;		
-        }
-    }
-}
-
-#################################################################################
-# All modules, that use a template module, do now get the assignments of
-# the template module.
-#################################################################################
-
-sub resolve_assigned_modules
-{
-    my ($modulesref) = @_;
-    
-    # collecting all template modules
-    
-    my %directaccess = ();
-
-    for ( my $i = 0; $i <= $#{$modulesref}; $i++ )
-    {
-        my $onefeature = ${$modulesref}[$i];
-        my $styles = "";
-        if ( $onefeature->{'Styles'} ) { $styles = $onefeature->{'Styles'}; }		
-        if ( $styles =~ /\bTEMPLATEMODULE\b/ ) { $directaccess{$onefeature->{'gid'}} = $onefeature; }
-        
-        # also looking for module with flag ROOT_BRAND_PACKAGE, to save is for further usage
-        if ( $styles =~ /\bROOT_BRAND_PACKAGE\b/ )
-        {
-            $installer::globals::rootbrandpackage = $onefeature->{'gid'};
-            $installer::globals::rootbrandpackageset = 1;
-        }
-    }
-    
-    # looking, where template modules are assigned
-    
-    for ( my $i = 0; $i <= $#{$modulesref}; $i++ )
-    {
-        my $onefeature = ${$modulesref}[$i];
-        if ( $onefeature->{'Assigns'} )
-        {
-            my $templategid = $onefeature->{'Assigns'};
-            
-            if ( ! exists($directaccess{$templategid}) )
-            {
-                installer::exiter::exit_program("ERROR: Did not find definition of assigned template module \"$templategid\"", "resolve_assigned_modules");	
-            }
-            
-            # Currently no merging of Files, Dirs, ...
-            # This has to be included here, if it is required
-            my $item;
-            foreach $item (@installer::globals::items_at_modules)
-            {
-                if ( exists($directaccess{$templategid}->{$item}) ) { $onefeature->{$item} = $directaccess{$templategid}->{$item}; } 
-            }		
-        }
-    }
-}
-
-#################################################################################
-# Removing the template modules from the list, after all
-# assignments are transferred to the "real" modules.
-#################################################################################
-
-sub remove_template_modules
-{
-    my ($modulesref) = @_;
-    
-    my @modules = ();
-
-    for ( my $i = 0; $i <= $#{$modulesref}; $i++ )
-    {
-        my $onefeature = ${$modulesref}[$i];
-        my $styles = "";
-        if ( $onefeature->{'Styles'} ) { $styles = $onefeature->{'Styles'}; }		
-        if ( $styles =~ /\bTEMPLATEMODULE\b/ ) { next; }
-        
-        push(@modules, $onefeature);		
-    }
-    
-    return \@modules;
-}
-
-#################################################################################
-# Collecting all modules with flag LANGUAGEMODULE in a global
-# collector.
-#################################################################################
-
-sub collect_all_languagemodules
-{
-    my ($modulesref) = @_;
-
-    for ( my $i = 0; $i <= $#{$modulesref}; $i++ )
-    {
-        my $onefeature = ${$modulesref}[$i];
-        my $styles = "";
-        if ( $onefeature->{'Styles'} ) { $styles = $onefeature->{'Styles'}; }		
-        if ( $styles =~ /\bLANGUAGEMODULE\b/ )
-        {
-            if ( ! exists($onefeature->{'Language'}) ) { installer::exiter::exit_program("ERROR: \"$onefeature->{'gid'}\" has flag LANGUAGEMODULE, but does not know its language!", "collect_all_languagemodules"); }
-            $installer::globals::alllangmodules{$onefeature->{'gid'}} = $onefeature->{'Language'};
-            # Collecting also the english names, that are used for nsis unpack directory for language packs
-            my $lang = $onefeature->{'Language'};
-            my $name = "";
-            foreach my $localkey ( keys %{$onefeature} )
-            {
-                if ( $localkey =~ /^\s*Name\s*\(\s*en-US\s*\)\s*$/ )
-                {
-                    $installer::globals::all_english_languagestrings{$lang} = $onefeature->{$localkey};
-                }
-            }
-        }
-    }
-}
-
-#################################################################################
-# Selecting from all collected english language strings those, that are really
-# required in this installation set.
-#################################################################################
-
-sub select_required_language_strings
-{
-    my ($modulesref) = @_;
-
-    for ( my $i = 0; $i <= $#{$modulesref}; $i++ )
-    {
-        my $onefeature = ${$modulesref}[$i];
-        my $styles = "";
-        if ( $onefeature->{'Styles'} ) { $styles = $onefeature->{'Styles'}; }		
-        if ( $styles =~ /\bLANGUAGEMODULE\b/ )
-        {
-            if ( ! exists($onefeature->{'Language'}) ) { installer::exiter::exit_program("ERROR: \"$onefeature->{'gid'}\" has flag LANGUAGEMODULE, but does not know its language!", "select_required_language_strings"); }
-            my $lang = $onefeature->{'Language'};
-            
-            if (( exists($installer::globals::all_english_languagestrings{$lang}) ) && ( ! exists($installer::globals::all_required_english_languagestrings{$lang}) ))
-            {
-                $installer::globals::all_required_english_languagestrings{$lang} = $installer::globals::all_english_languagestrings{$lang};
-            }
-        }
-    }	
-}
-
-#####################################################################################
-# Unixlinks are not always required. For Linux RPMs and Solaris Packages they are
-# created dynamically. Exception: For package formats "installed" or "archive".
-# In scp2 this unixlinks have the flag LAYERLINK.
-#####################################################################################
-
-sub filter_layerlinks_from_unixlinks
-{
-    my ( $unixlinksref ) = @_;
-    
-    my @alllinks = ();
-    
-    for ( my $i = 0; $i <= $#{$unixlinksref}; $i++ )
-    {
-        my $isrequired = 1;
-        
-        my $onelink = ${$unixlinksref}[$i];
-        my $styles = "";
-        if ( $onelink->{'Styles'} ) { $styles = $onelink->{'Styles'}; }		
-
-        if ( $styles =~ /\bLAYERLINK\b/ )
-        {
-            # Platforms, that do not need the layer links
-            if (( $installer::globals::isrpmbuild ) || ( $installer::globals::issolarispkgbuild ))
-            {
-                $isrequired = 0;
-            }
-            
-            # Package formats, that need the layer link (platform independent)
-            if (( $installer::globals::packageformat eq "installed" ) || ( $installer::globals::packageformat eq "archive" ))
-            {
-                $isrequired = 1;
-            }
-        }
-        
-        if ( $isrequired ) { push(@alllinks, $onelink); }
-    }
-    
-    return \@alllinks;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm
deleted file mode 100644
index 4e2fbf662..000000000
--- a/solenv/bin/modules/installer/setupscript.pm
+++ /dev/null
@@ -1,510 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::setupscript;
-
-use installer::existence;
-use installer::exiter;
-use installer::globals;
-use installer::logger;
-use installer::remover;
-use installer::scriptitems;
-use installer::ziplist;
-
-#######################################################
-# Set setup script name, if not defined as parameter
-#######################################################
-
-sub set_setupscript_name
-{
-    my ( $allsettingsarrayref, $includepatharrayref ) = @_;
-        
-    my $scriptnameref = installer::ziplist::getinfofromziplist($allsettingsarrayref, "script");
-
-    my $scriptname = $$scriptnameref;
-
-    if ( $scriptname eq "" )	# not defined on command line and not in product list
-    {
-        installer::exiter::exit_program("ERROR: Setup script not defined on command line (-l) and not in product list!", "set_setupscript_name");
-    }
-    
-    if ( $installer::globals::compiler =~ /wnt/ )
-    {
-        $scriptname .= ".inf";
-    }
-    else
-    {
-        $scriptname .= ".ins";
-    }
-    
-    # and now the complete path for the setup script is needed
-    # The log file cannot be used, because this is the language independent section
-    
-    $scriptnameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptname, $includepatharrayref, 1);
-
-    $installer::globals::setupscriptname = $$scriptnameref;
-
-    if ( $installer::globals::setupscriptname eq "" )
-    {
-        installer::exiter::exit_program("ERROR: Script $scriptname not found!", "set_setupscript_name");
-    }
-}
-
-#####################################################################
-# Reading script variables from installation object of script file
-#####################################################################
-
-sub get_all_scriptvariables_from_installation_object
-{
-    my ($scriptref) = @_;
-    
-    my @installobjectvariables;
-
-    for ( my $i = 0; $i <= $#{$scriptref}; $i++ )
-    {
-        my $line = ${$scriptref}[$i];
-
-        if ( $line =~ /^\s*Installation\s+\w+\s*$/ )	# should be the first line
-        {
-            my $counter = $i+1;
-            my $installline = ${$scriptref}[$counter];	
-            
-            while (!($installline =~ /^\s*End\s*$/ ))
-            {
-                if ( $installline =~ /^\s*(\w+)\s+\=\s*(.*?)\s*\;\s*$/ )
-                {
-                    my $key = $1;
-                    my $value = $2;
-                    
-                    # removing leading and ending " in $value
-                    
-                    if ( $value =~ /^\s*\"(.*)\"\s*$/ )
-                    {
-                        $value = $1;	
-                    }
-                    
-                    $key = "\%" . uc($key);  # $key is %PRODUCTNAME
-                    
-                    my $input = $key . " " . $value . "\n";	  # $key can only be the first word
-                    
-                    push(@installobjectvariables ,$input);
-                }
-
-                $counter++;			
-                $installline = ${$scriptref}[$counter];	
-            }
-        }
-
-        last;	# not interesting after installation object
-    }
-
-    return \@installobjectvariables;
-}
-
-######################################################################
-# Including LCPRODUCTNAME into the array
-######################################################################
-
-sub add_lowercase_productname_setupscriptvariable
-{
-    my ( $variablesref ) = @_;
-
-    for ( my $j = 0; $j <= $#{$variablesref}; $j++ )
-    {
-        my $variableline = ${$variablesref}[$j];
-
-        my ($key, $value);
-                
-        if ( $variableline =~ /^\s*\%(\w+?)\s+(.*?)\s*$/ )
-        {
-            $key = $1;
-            $value = $2;
-            
-            if ( $key eq "PRODUCTNAME" )
-            {
-                my $newline = "\%LCPRODUCTNAME " . lc($value) . "\n";
-                push(@{$variablesref} ,$newline);
-                my $original = $value;
-                $value =~ s/\s*//g; 
-                $newline = "\%ONEWORDPRODUCTNAME " . $value . "\n";
-                push(@{$variablesref} ,$newline);
-                $newline = "\%LCONEWORDPRODUCTNAME " . lc($value) . "\n";
-                push(@{$variablesref} ,$newline);
-                $value = $original;
-                $value =~ s/\s*$//g;
-                $value =~ s/^\s*//g;
-                $value =~ s/ /\%20/g;
-                $newline = "\%MASKEDPRODUCTNAME " . $value . "\n";
-                push(@{$variablesref} ,$newline);				
-                $value = $original;
-                $value =~ s/\s/\_/g; 
-                $newline = "\%UNIXPRODUCTNAME " . lc($value) . "\n";
-                push(@{$variablesref} ,$newline);
-                $newline = "\%SYSTEMINTUNIXPACKAGENAME " . lc($value) . "\n";
-                push(@{$variablesref} ,$newline);
-                $newline = "\%UNIXPACKAGENAME " . lc($value) . "\n";
-                push(@{$variablesref} ,$newline);
-                $value = $original;
-                $value =~ s/\s/\_/g; 
-                $value =~ s/\.//g; 
-                $newline = "\%WITHOUTDOTUNIXPRODUCTNAME " . lc($value) . "\n";
-                push(@{$variablesref} ,$newline);
-                $newline = "\%WITHOUTDOTUNIXPACKAGENAME " . lc($value) . "\n";
-                push(@{$variablesref} ,$newline);
-                $newline = "\%SOLARISBRANDPACKAGENAME " . lc($value) . "\n";
-                push(@{$variablesref} ,$newline);
-                $value = $original;
-            }
-            elsif  ( $key eq "PRODUCTEXTENSION" )
-            {
-                my $newline = "\%LCPRODUCTEXTENSION " . lc($value) . "\n";
-                push(@{$variablesref} ,$newline);			
-            }
-            elsif  ( $key eq "PRODUCTVERSION" )
-            {
-                $value =~ s/\.//g; 
-                my $newline = "\%WITHOUTDOTPRODUCTVERSION " . $value . "\n";
-                push(@{$variablesref} ,$newline);			
-            }
-            elsif  ( $key eq "OOOBASEVERSION" )
-            {
-                $value =~ s/\.//g; 
-                my $newline = "\%WITHOUTDOTOOOBASEVERSION " . $value . "\n";
-                push(@{$variablesref} ,$newline);			
-            }
-            
-        }
-    }
-}
-
-######################################################################
-# Resolving the new introduced lowercase script variables
-######################################################################
-
-sub resolve_lowercase_productname_setupscriptvariable
-{
-    my ( $variablesref ) = @_;
-
-    my %variables = ();
-
-    # First step: Collecting variables
-
-    for ( my $j = 0; $j <= $#{$variablesref}; $j++ )
-    {
-        my $variableline = ${$variablesref}[$j];
-
-        my ($key, $value);
-                
-        if ( $variableline =~ /^\s*\%(\w+?)\s+(.*?)\s*$/ )
-        {
-            $key = $1;
-            $value = $2;
-            $variables{$key} = $value;
-        }
-    }
-    
-    # Second step: Resolving variables
-    
-    for ( my $j = 0; $j <= $#{$variablesref}; $j++ )
-    {				
-        if ( ${$variablesref}[$j] =~ /\$\{(.*?)\}/ )
-        {
-            my $key = $1;
-            ${$variablesref}[$j] =~ s/\$\{\Q$key\E\}/$variables{$key}/g;			
-        }
-    }
-
-}
-
-######################################################################
-# Replacing all setup script variables inside the setup script file
-######################################################################
-
-sub replace_all_setupscriptvariables_in_script
-{
-    my ( $scriptref, $variablesref ) = @_;
-
-    installer::logger::include_header_into_globallogfile("Replacing variables in setup script (start)");
-
-    # make hash of variables to be substituted if they appear in the script
-    my %subs;
-    for ( my $j = 0; $j <= $#{$variablesref}; $j++ )
-    {
-        my $variableline = ${$variablesref}[$j];
-
-        if ( $variableline =~ /^\s*(\%\w+?)\s+(.*?)\s*$/ )
-        {
-            $subs{$1}= $2;
-        }
-    }
-
-    # This is far faster than running a regexp for each line
-    my $bigstring = '';
-    for my $line (@{$scriptref}) { $bigstring = $bigstring . $line; }
-
-    foreach my $key (sort { length ($b) <=> length ($a) } keys %subs)
-    {
-        # Attention: It must be possible to substitute "%PRODUCTNAMEn", "%PRODUCTNAME%PRODUCTVERSIONabc"
-        my $value = $subs{$key};
-        $bigstring =~ s/$key/$value/g;
-    }
-
-    my @newlines = split /\n/, $bigstring;
-    $scriptref = \@newlines;
-
-    # now check for any mis-named '%' variables that we have left
-    my $num = 0;
-    for my $check (@newlines)
-    {
-        $num++;
-        if ( $check =~ /^.*\%\w+.*$/ )
-        {
-            if (( $check =~ /%1/ ) || ( $check =~ /%2/ ) || ( $check =~ /%verify/ )) { next; }
-            my $infoline = "WARNING: mis-named or un-known '%' variable in setup script at line $num:\n$check\n";
-            push( @installer::globals::globallogfileinfo, $infoline);
-        }
-    }
-
-    installer::logger::include_header_into_globallogfile("Replacing variables in setup script (end)");
-
-    return $scriptref;
-}
-
-#######################################################################
-# Collecting all items of the type "searchitem" from the setup script
-#######################################################################
-
-sub get_all_items_from_script
-{
-    my ($scriptref, $searchitem) = @_;
-
-    my @allitemarray = ();
-
-    my ($itemkey, $itemvalue);
-
-    for ( my $i = 0; $i <= $#{$scriptref}; $i++ )
-    {
-        my $line = ${$scriptref}[$i];
-
-        next unless ($line =~ /^\s*\Q$searchitem\E\s+(\S+)\s*$/);
-        my $gid = $1;
-
-        my %oneitemhash = ();
-        my $ismultilang = 0;
-
-        $oneitemhash{'gid'} = $gid;
-
-        while (!( $line =~ /^\s*End\s*$/ ))
-        {
-            if ( $i >= $#{$scriptref} ) {
-                installer::exiter::exit_program("Invalid setup script file. End of file reached before 'End' line of '$searchitem' section.", "get_all_items_from_script");
-            }
-            $line = ${$scriptref}[++$i];
-
-            if ( $line =~ /^\s*(.+?)\=\s*(.+?)\;\s*$/ ) # only oneliner!
-            {
-                $itemkey = $1;
-                $itemvalue = $2;
-
-                $itemkey =~ s/\s+$//;
-                $itemvalue =~ s/\s+$//;
-
-                installer::remover::remove_leading_and_ending_quotationmarks(\$itemvalue);
-
-                $oneitemhash{$itemkey} = $itemvalue;
-
-                $ismultilang ||= $itemkey =~ /^\S+\s+\(\S+\)$/;
-            }
-            elsif (($searchitem eq "Module") &&
-                   ($line =~ /^\s*.+?\s*\=\s*\(/) &&
-                   (!($line =~ /\)\;\s*$/)))	# more than one line, for instance files at modules!
-            {
-                $line =~ /^\s*(.+?)\s*\=\s*(.+?)\s*$/; 	# the first line
-                $itemkey = $1;
-                $itemvalue = $2;
-
-                # collecting the complete itemvalue
-                do
-                {
-                    if ( $i >= $#{$scriptref} ) {
-                        installer::exiter::exit_program("Invalid setup script file. Premature end of file.", "get_all_items_from_script");
-                    }
-                    $line = ${$scriptref}[++$i];
-                    installer::remover::remove_leading_and_ending_whitespaces(\$line);
-                    $itemvalue .= $line;
-                } while (!($line =~ /\)\;\s*$/));
-
-                # removing ending ";"
-                $itemvalue =~ s/\;\s*$//;
-
-                $oneitemhash{$itemkey} = $itemvalue;
-
-                $ismultilang ||= $itemkey =~ /^\S+\s+\(\S+\)$/;
-            }
-        }
-
-        $oneitemhash{'ismultilingual'} = $ismultilang+0;
-
-        push(@allitemarray, \%oneitemhash);
-    }
-
-    return \@allitemarray;
-}
-
-######################################################################
-# Collecting all folder at folderitems, that are predefined values
-# For example: PREDEFINED_AUTOSTART
-######################################################################
-
-sub add_predefined_folder
-{
-    my ( $folderitemref, $folderref ) = @_;
-
-    for ( my $i = 0; $i <= $#{$folderitemref}; $i++ )
-    {
-        my $folderitem = ${$folderitemref}[$i];
-        my $folderid = $folderitem->{'FolderID'};
-        
-        if ( $folderid =~ /PREDEFINED_/ )
-        {
-            if (! installer::existence::exists_in_array_of_hashes("gid", $folderid, $folderref))
-            {
-                my %folder = ();
-                $folder{'ismultilingual'} = "0";
-                $folder{'Name'} = "";
-                $folder{'gid'} = $folderid;
-                
-                push(@{$folderref}, \%folder);
-            }			
-        }
-    }
-}
-
-#####################################################################################
-# If folderitems are non-advertised, the component needs to have a registry key
-# below HKCU as key path. Therefore it is required, to mark the file belonging
-# to a non-advertised shortcut, that a special userreg_xxx registry key can be
-# created during packing process.
-#####################################################################################
-
-sub prepare_non_advertised_files
-{
-    my ( $folderitemref, $filesref ) = @_;
-
-    for ( my $i = 0; $i <= $#{$folderitemref}; $i++ )
-    {
-        my $folderitem = ${$folderitemref}[$i];
-        my $styles = "";
-        if ( $folderitem->{'Styles'} ) { $styles = $folderitem->{'Styles'}; }
-        
-        if ( $styles =~ /\bNON_ADVERTISED\b/ )
-        {
-            my $fileid = $folderitem->{'FileID'};
-            if ( $folderitem->{'ComponentIDFile'} ) { $fileid = $folderitem->{'ComponentIDFile'}; }
-            my $onefile = installer::worker::find_file_by_id($filesref, $fileid);
-            
-            # Attention: If $onefile with "FileID" is not found, this is not always an error.
-            # FileID can also contain an executable file, for example msiexec.exe.
-            if ( $onefile ne "" ) { $onefile->{'needs_user_registry_key'} = 1; }
-        }
-    }	
-}
-
-#####################################################################################
-# Adding all variables defined in the installation object into the hash
-# of all variables from the zip list file.
-# This is needed if variables are defined in the installation object, 
-# but not in the zip list file.
-# If there is a definition in the zip list file and in the installation 
-# object, the installation object is more important
-#####################################################################################
-
-sub add_installationobject_to_variables
-{
-    my ($allvariables, $allscriptvariablesref) = @_;
-
-    for ( my $i = 0; $i <= $#{$allscriptvariablesref}; $i++ )
-    {
-        my $line = ${$allscriptvariablesref}[$i];
-    
-        if ( $line =~ /^\s*\%(\w+)\s+(.*?)\s*$/ )
-        {
-            my $key = $1;
-            my $value = $2;
-
-            $allvariables->{$key} = $value;	# overwrite existing values from zip.lst
-        }
-    }
-}
-
-#####################################################################################
-# Adding all variables, that must be defined, but are not defined until now.
-# List of this varibles: @installer::globals::forced_properties
-#####################################################################################
-
-sub add_forced_properties
-{
-    my ($allvariables) = @_;
-
-    my $property;
-    foreach $property ( @installer::globals::forced_properties )
-    {
-        if ( ! exists($allvariables->{$property}) ) { $allvariables->{$property} = ""; }	
-    }
-}
-
-#####################################################################################
-# Some properties are created automatically. It should be possible to
-# overwrite them, with PRESET properties. For example UNIXPRODUCTNAME
-# with PRESETUNIXPRODUCTNAME, if this is defined and the automatic process
-# does not deliver the desired results.
-#####################################################################################
-
-sub replace_preset_properties
-{
-    my ($allvariables) = @_;
-
-    # SOLARISBRANDPACKAGENAME
-    # needs to be replaced by
-    # PRESETSOLARISBRANDPACKAGENAME
-    
-    my @presetproperties = ();
-    push(@presetproperties, "SOLARISBRANDPACKAGENAME");
-    push(@presetproperties, "SYSTEMINTUNIXPACKAGENAME");
-    
-
-    foreach $property ( @presetproperties )
-    {
-        my $presetproperty = "PRESET" . $property;
-        if (( exists($allvariables->{$presetproperty}) ) && ( $allvariables->{$presetproperty} ne "" ))
-        {
-            $allvariables->{$property} = $allvariables->{$presetproperty};
-        }
-    }	
-}
-
-1;
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
deleted file mode 100755
index ad0658ff8..000000000
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ /dev/null
@@ -1,817 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::simplepackage;
-
-use Cwd;
-use File::Copy;
-use installer::download;
-use installer::exiter;
-use installer::globals;
-use installer::logger;
-use installer::strip;
-use installer::systemactions;
-use installer::worker;
-
-####################################################
-# Checking if the simple packager is required.
-# This can be achieved by setting the global 
-# variable SIMPLE_PACKAGE in *.lst file or by 
-# setting the environment variable SIMPLE_PACKAGE.
-####################################################
-
-sub check_simple_packager_project
-{
-    my ( $allvariables ) = @_;
-
-    if (( $installer::globals::packageformat eq "installed" ) ||
-        ( $installer::globals::packageformat eq "archive" ))
-    {
-        $installer::globals::is_simple_packager_project = 1;
-        $installer::globals::patch_user_dir = 1;
-    }
-    elsif( $installer::globals::packageformat eq "dmg" )
-    {
-        $installer::globals::is_simple_packager_project = 1;
-    }
-}
-
-####################################################
-# Detecting the directory with extensions
-####################################################
-
-sub get_extensions_dir
-{
-    my ( $subfolderdir ) = @_;
-    
-    my $extensiondir = $subfolderdir . $installer::globals::separator;
-    if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; }
-    my $extensionsdir = $extensiondir . "share" . $installer::globals::separator . "extensions";
-    my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg" . $installer::globals::separator . "bundled";
-    
-    return ( $extensionsdir, $preregdir );	
-}
-
-####################################################
-# Registering extensions
-####################################################
-
-sub register_extensions
-{
-    my ($officedir, $languagestringref, $preregdir) = @_;
-
-    my $infoline = "";
-
-    if ( $preregdir eq "" )
-    {
-        $infoline = "ERROR: Failed to determine directory \"prereg\" for extension registration! Please check your installation set.\n";
-        push( @installer::globals::logfileinfo, $infoline);	
-        installer::exiter::exit_program($infoline, "register_extensions");
-    }
-
-    my $programdir = $officedir . $installer::globals::separator;
-    if ( $installer::globals::officedirhostname ne "" ) { $programdir = $programdir . $installer::globals::officedirhostname . $installer::globals::separator; }
-    $programdir = $programdir . "program";
-    
-    my $from = cwd();
-    chdir($programdir);		
-
-    my $unopkgfile = $installer::globals::unopkgfile;
-    
-    my $unopkgexists = 1;
-    if (( $installer::globals::languagepack ) && ( ! -f $unopkgfile ))
-    {
-        $unopkgexists = 0;	
-        $infoline = "Language packs do not contain unopkg!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    if (( $installer::globals::helppack ) && ( ! -f $unopkgfile ))
-    {
-        $unopkgexists = 0;
-        $infoline = "Help packs do not contain unopkg!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    if ( ! -f $unopkgfile )
-    {
-        $unopkgexists = 0;	
-        $infoline = "Info: File $unopkgfile does not exist! Extensions cannot be registered.\n";
-        push( @installer::globals::logfileinfo, $infoline);		
-    }
-
-    if ( $unopkgexists )
-    {
-        my $currentdir = cwd();
-        print "... current dir: $currentdir ...\n";
-        $infoline = "Current dir: $currentdir\n";
-        push( @installer::globals::logfileinfo, $infoline);
-            
-        if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); }
-
-        my $systemcall = "JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 " . $unopkgfile . " sync --verbose" . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |";
-
-        print "... $systemcall ...\n";
-
-        $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        my @unopkgoutput = ();
-
-        open (UNOPKG, $systemcall);
-        while (<UNOPKG>)
-        {
-            my $lastline = $_;
-            push(@unopkgoutput, $lastline);
-        }
-        close (UNOPKG);
-
-        my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-        if ($returnvalue)
-        {
-            # Writing content of @unopkgoutput only in the error case into the log file. Sometimes it
-            # contains strings like "Error" even in the case of success. This causes a packaging error
-            # when the log file is analyzed at the end, even if there is no real error.
-            for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); }
-
-            $infoline = "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n";
-            push( @installer::globals::logfileinfo, $infoline);	
-            installer::exiter::exit_program("ERROR: $systemcall failed!", "register_extensions");
-        }
-        else
-        {
-            $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-
-    chdir($from);
-}
-
-########################################################################
-# Getting the translation file for the Mac Language Pack installer
-########################################################################
-
-sub get_mac_translation_file
-{
-    my $translationfilename = $installer::globals::maclangpackfilename;
-    if ( ! -f $translationfilename ) { installer::exiter::exit_program("ERROR: Could not find language file $translationfilename!", "get_mac_translation_file"); }
-    my $translationfile = installer::files::read_file($translationfilename);
-
-    my $infoline = "Reading translation file: $translationfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    
-    return $translationfile;
-}
-
-##################################################################
-# Collecting all identifier from ulf file 
-##################################################################
-
-sub get_identifier
-{
-    my ( $translationfile ) = @_;
-    
-    my @identifier = ();
-    
-    for ( my $i = 0; $i <= $#{$translationfile}; $i++ )
-    {
-        my $oneline = ${$translationfile}[$i];
-
-        if ( $oneline =~ /^\s*\[(.+)\]\s*$/ )
-        {
-            my $identifier = $1;
-            push(@identifier, $identifier);
-        }
-    }
-
-    return \@identifier;
-}
-
-##############################################################
-# Returning the complete block in all languages
-# for a specified string
-##############################################################
-
-sub get_language_block_from_language_file
-{
-    my ($searchstring, $languagefile) = @_;
-
-    my @language_block = ();
-
-    for ( my $i = 0; $i <= $#{$languagefile}; $i++ )
-    {		
-        if ( ${$languagefile}[$i] =~ /^\s*\[\s*$searchstring\s*\]\s*$/ )
-        {
-            my $counter = $i;
-
-            push(@language_block, ${$languagefile}[$counter]);
-            $counter++;
-            
-            while (( $counter <= $#{$languagefile} ) && (!( ${$languagefile}[$counter] =~ /^\s*\[/ )))
-            {
-                push(@language_block, ${$languagefile}[$counter]);
-                $counter++;
-            }
-            
-            last;
-        }
-    }	
-    
-    return \@language_block;
-}
-
-##############################################################
-# Returning a specific language string from the block
-# of all translations
-##############################################################
-
-sub get_language_string_from_language_block
-{
-    my ($language_block, $language) = @_;
-    
-    my $newstring = "";
-
-    for ( my $i = 0; $i <= $#{$language_block}; $i++ )
-    {
-        if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ )
-        {
-            $newstring = $1;
-            last;
-        }	
-    }	
-    
-    if ( $newstring eq "" )
-    {
-        $language = "en-US"; 	# defaulting to english	
-
-        for ( my $i = 0; $i <= $#{$language_block}; $i++ )
-        {		
-            if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ )
-            {
-                $newstring = $1;
-                last;
-            }
-        }
-    }
-    
-    return $newstring;
-}
-
-########################################################################
-# Localizing the script for the Mac Language Pack installer
-########################################################################
-
-sub localize_scriptfile
-{
-    my ($scriptfile, $translationfile, $languagestringref) = @_;
-    
-    my $onelanguage = $$languagestringref;
-    if ( $onelanguage =~ /^\s*(.*?)_/ ) { $onelanguage = $1; } 
-    
-    # Analyzing the ulf file, collecting all Identifier
-    my $allidentifier = get_identifier($translationfile);
-
-    for ( my $i = 0; $i <= $#{$allidentifier}; $i++ )
-    {
-        my $identifier = ${$allidentifier}[$i];
-        my $language_block = get_language_block_from_language_file($identifier, $translationfile);
-        my $newstring = get_language_string_from_language_block($language_block, $onelanguage);
-        
-        # removing mask
-        $newstring =~ s/\\\'/\'/g;
-        
-        replace_one_variable_in_shellscript($scriptfile, $newstring, $identifier);
-    }
-}
-
-#################################################################################
-# Replacing one variable in Mac shell script
-#################################################################################
-
-sub replace_one_variable_in_shellscript
-{
-    my ($scriptfile, $variable, $searchstring) = @_;
-    
-    for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
-    {
-        ${$scriptfile}[$i] =~ s/\[$searchstring\]/$variable/g;
-    }	
-}
-
-#############################################
-# Replacing variables in Mac shell script
-#############################################
-
-sub replace_variables_in_scriptfile
-{
-    my ($scriptfile, $volume_name, $volume_name_app, $allvariables) = @_;
-    
-    replace_one_variable_in_shellscript($scriptfile, $volume_name, "FULLPRODUCTNAME" );
-    replace_one_variable_in_shellscript($scriptfile, $volume_name_app, "FULLAPPPRODUCTNAME" );
-    replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTNAME'}, "PRODUCTNAME" );
-    replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" );
-    
-    my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script";
-    if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $scriptname = "org.libreoffice.script"; }
-
-    replace_one_variable_in_shellscript($scriptfile, $scriptname, "SEARCHSCRIPTNAME" );
-}
-
-#############################################
-# Creating the "simple" package.
-# "zip" for Windows
-# "tar.gz" for all other platforms
-# additionally "dmg" on Mac OS X
-#############################################
-
-sub create_package
-{
-    my ( $installdir, $archivedir, $packagename, $allvariables, $includepatharrayref, $languagestringref, $format ) = @_;
-
-    installer::logger::print_message( "... creating $installer::globals::packageformat file ...\n" );
-    installer::logger::include_header_into_logfile("Creating $installer::globals::packageformat file:");
-    
-    # moving dir into temporary directory
-    my $pid = $$; # process id
-    my $tempdir = $installdir . "_temp" . "." . $pid;
-    my $systemcall = "";
-    my $from = "";
-    my $makesystemcall = 1;
-    my $return_to_start = 0;
-    installer::systemactions::rename_directory($installdir, $tempdir);
-
-    # creating new directory with original name
-    installer::systemactions::create_directory($archivedir);
-    
-    my $archive = $archivedir . $installer::globals::separator . $packagename . $format;
-
-    if ( $archive =~ /zip$/ ) 
-    {
-        $from = cwd();
-        $return_to_start = 1;
-        chdir($tempdir);
-        $systemcall = "$installer::globals::zippath -qr $archive .";
-        
-        # Using Archive::Zip fails because of very long path names below "share/uno_packages/cache"
-        # my $packzip = Archive::Zip->new();
-        # $packzip->addTree(".");	# after changing into $tempdir
-        # $packzip->writeToFileNamed($archive);
-        # $makesystemcall = 0;
-    }
-     elsif ( $archive =~ /dmg$/ )
-    {
-        my $folder = (( -l "$tempdir/$packagename/Applications" ) or ( -l "$tempdir/$packagename/opt" )) ? $packagename : "\.";
-        
-        if ( $allvariables->{'PACK_INSTALLED'} ) {
-            $folder = $packagename;
-        }		
-
-        # my $volume_name = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'}; # Adding PRODUCTVERSION makes this difficult to maintain!
-        my $volume_name = $allvariables->{'PRODUCTNAME'};
-        my $volume_name_classic = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'};
-        my $volume_name_classic_app = $volume_name;  # "app" should not contain version number
-        # $volume_name = $volume_name . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'}; # Adding PRODUCTEXTENSION makes this difficult to maintain!
-        $volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'};
-        $volume_name_classic_app = $volume_name_classic_app . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'};
-        if ( $allvariables->{'DMG_VOLUMEEXTENSION'} ) {
-            $volume_name = $volume_name . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};
-            $volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};
-            $volume_name_classic_app = $volume_name_classic_app . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};
-        }
-
-        my $sla = 'sla.r';
-        my $ref = "";
-        
-        if ( ! $allvariables->{'HIDELICENSEDIALOG'} )
-        {
-            installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$sla, $includepatharrayref, 0);
-        }
-        
-        my $localtempdir = $tempdir;
-        
-        if (( $installer::globals::languagepack ) || ( $installer::globals::helppack ) || ( $installer::globals::patch ))
-        {
-            $localtempdir = "$tempdir/$packagename";
-            if ( $installer::globals::helppack ) { $volume_name = "$volume_name Help Pack"; }
-            if ( $installer::globals::languagepack )
-            {
-                $volume_name = "$volume_name Language Pack";
-                $volume_name_classic = "$volume_name_classic Language Pack";
-                $volume_name_classic_app = "$volume_name_classic_app Language Pack";
-            }
-            if ( $installer::globals::patch )
-            {
-                $volume_name = "$volume_name Patch";
-                $volume_name_classic = "$volume_name_classic Patch";
-                $volume_name_classic_app = "$volume_name_classic_app Patch";
-            }
-            
-            # Create tar ball named tarball.tar.bz2
-            # my $appfolder = $localtempdir . "/" . $volume_name . "\.app";
-            my $appfolder = $localtempdir . "/" . $volume_name_classic_app . "\.app";
-            my $contentsfolder = $appfolder . "/Contents";
-            my $tarballname = "tarball.tar.bz2";
-            
-            my $localfrom = cwd();
-            chdir $appfolder;
-
-            $systemcall = "tar -cjf $tarballname Contents/";
-
-            print "... $systemcall ...\n";
-            my $localreturnvalue = system($systemcall);
-            $infoline = "Systemcall: $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        
-            if ($localreturnvalue)
-            {
-                $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-                push( @installer::globals::logfileinfo, $infoline);	
-            }
-            else
-            {
-                $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
-            
-            my $sourcefile = $appfolder . "/" . $tarballname;
-            my $destfile = $contentsfolder . "/" . $tarballname;
-            
-            installer::systemactions::remove_complete_directory($contentsfolder);
-            installer::systemactions::create_directory($contentsfolder);
-
-            installer::systemactions::copy_one_file($sourcefile, $destfile);
-            unlink($sourcefile);
-            
-            # Copy two files into installation set next to the tar ball
-            # 1. "osx_install.applescript"
-            # 2 "OpenOffice.org Languagepack"
-            
-            my $scriptrealfilename = "osx_install.applescript";
-            my $scriptfilename = "";
-            if ( $installer::globals::languagepack ) { $scriptfilename = "osx_install_languagepack.applescript"; }
-            if ( $installer::globals::helppack ) { $scriptfilename = "osx_install_helppack.applescript"; }
-            if ( $installer::globals::patch ) { $scriptfilename = "osx_install_patch.applescript"; }
-            my $scripthelpersolverfilename = "mac_install.script";
-            # my $scripthelperrealfilename = $volume_name;
-            my $scripthelperrealfilename = $volume_name_classic_app;
-            my $translationfilename = $installer::globals::macinstallfilename;
-
-            # Finding both files in solver
-            
-            my $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$scriptfilename, $includepatharrayref, 0);
-            if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script $scriptfilename!", "create_package"); }
-            my $scripthelperref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$scripthelpersolverfilename, $includepatharrayref, 0);
-            if ($$scripthelperref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script $scripthelpersolverfilename!", "create_package"); }
-            my $translationfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$translationfilename, $includepatharrayref, 0);
-            if ($$translationfileref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script translation file $translationfilename!", "create_package"); }
-                        
-            $scriptfilename = $contentsfolder . "/" . $scriptrealfilename;
-            $scripthelperrealfilename = $contentsfolder . "/" . $scripthelperrealfilename;
-
-            installer::systemactions::copy_one_file($$scriptref, $scriptfilename);
-            installer::systemactions::copy_one_file($$scripthelperref, $scripthelperrealfilename);
-
-            # Replacing variables in script $scriptfilename
-            # Localizing script $scriptfilename
-            my $scriptfilecontent = installer::files::read_file($scriptfilename);
-            my $translationfilecontent = installer::files::read_file($$translationfileref);
-            localize_scriptfile($scriptfilecontent, $translationfilecontent, $languagestringref);
-            # replace_variables_in_scriptfile($scriptfilecontent, $volume_name, $allvariables);
-            replace_variables_in_scriptfile($scriptfilecontent, $volume_name_classic, $volume_name_classic_app, $allvariables);
-            installer::files::save_file($scriptfilename, $scriptfilecontent);
-
-            chmod 0775, $scriptfilename;
-            chmod 0775, $scripthelperrealfilename;
-
-            # Copy also Info.plist and icon file
-            # Finding both files in solver
-            my $iconfile = "ooo3_installer.icns";
-            my $iconfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$iconfile, $includepatharrayref, 0);
-            if ($$iconfileref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script icon file $iconfile!", "create_package"); }
-            my $subdir = $contentsfolder . "/" . "Resources";
-            if ( ! -d $subdir ) { installer::systemactions::create_directory($subdir); }
-            $destfile = $subdir . "/" . $iconfile;
-            installer::systemactions::copy_one_file($$iconfileref, $destfile);
-             
-            my $infoplistfile = "Info.plist.langpack";
-            my $installname = "Info.plist";
-            my $infoplistfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$infoplistfile, $includepatharrayref, 0);
-            if ($$infoplistfileref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script Info.plist: $infoplistfile!", "create_package"); }
-            $destfile = $contentsfolder . "/" . $installname;
-            installer::systemactions::copy_one_file($$infoplistfileref, $destfile);
-            
-            # Replacing variables in Info.plist
-            $scriptfilecontent = installer::files::read_file($destfile);
-            # replace_one_variable_in_shellscript($scriptfilecontent, $volume_name, "FULLPRODUCTNAME" );
-            replace_one_variable_in_shellscript($scriptfilecontent, $volume_name_classic_app, "FULLAPPPRODUCTNAME" ); # OpenOffice.org Language Pack
-            installer::files::save_file($destfile, $scriptfilecontent);
-            
-            chdir $localfrom;
-        }
-
-        $systemcall = "cd $localtempdir && hdiutil makehybrid -hfs -hfs-openfolder $folder $folder -hfs-volume-name \"$volume_name\" -ov -o $installdir/tmp && hdiutil convert -ov -format UDZO $installdir/tmp.dmg -o $archive && ";
-        if (( $ref ne "" ) && ( $$ref ne "" )) {
-            $systemcall .= "hdiutil unflatten $archive && Rez -a $$ref -o $archive && hdiutil flatten $archive &&";
-        }
-        $systemcall .= "rm -f $installdir/tmp.dmg";
-    }
-    else
-    {
-        # getting the path of the getuid.so (only required for Solaris and Linux)
-        my $getuidlibrary = "";
-        my $ldpreloadstring = "";
-        if (( $installer::globals::issolarisbuild ) || ( $installer::globals::islinuxbuild ))
-        {
-            $getuidlibrary = installer::download::get_path_for_library($includepatharrayref);
-            if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
-        }
-
-        $systemcall = "cd $tempdir; $ldpreloadstring tar -cf - . | gzip > $archive";
-    }
-
-    if ( $makesystemcall )
-    {
-        print "... $systemcall ...\n";
-        my $returnvalue = system($systemcall);
-        my $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        
-        if ($returnvalue)
-        {
-            $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-            push( @installer::globals::logfileinfo, $infoline);	
-        }
-        else
-        {
-            $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-
-    if ( $return_to_start ) { chdir($from); }		
-
-    print "... removing $tempdir ...\n";
-    installer::systemactions::remove_complete_directory($tempdir);
-}
-
-####################################################
-# Main method for creating the simple package
-# installation sets
-####################################################
-
-sub create_simple_package
-{
-    my ( $filesref, $dirsref, $scpactionsref, $linksref, $unixlinksref, $loggingdir, $languagestringref, $shipinstalldir, $allsettingsarrayref, $allvariables, $includepatharrayref ) = @_;
-
-    # Creating directories
-
-    my $current_install_number = "";
-    my $infoline = "";
-
-    installer::logger::print_message( "... creating installation directory ...\n" );
-    installer::logger::include_header_into_logfile("Creating installation directory");
-
-    $installer::globals::csp_installdir = installer::worker::create_installation_directory($shipinstalldir, $languagestringref, \$current_install_number);
-    $installer::globals::csp_installlogdir = installer::systemactions::create_directory_next_to_directory($installer::globals::csp_installdir, "log");
-
-    my $installdir = $installer::globals::csp_installdir;
-    my $installlogdir = $installer::globals::csp_installlogdir;
-
-    # Setting package name (similar to the download name)
-    my $packagename = "";
-
-    if ( $installer::globals::packageformat eq "archive"  ||
-        $installer::globals::packageformat eq "dmg" )
-    {
-        $installer::globals::csp_languagestring = $$languagestringref;
-
-        my $locallanguage = $installer::globals::csp_languagestring;
-
-        if ( $allvariables->{'OOODOWNLOADNAME'} )
-        {
-            $packagename = installer::download::set_download_filename(\$locallanguage, $allvariables);
-        }
-        else
-        {
-            $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "downloadname");
-            if ( $installer::globals::languagepack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "langpackdownloadname"); }
-            if ( $installer::globals::helppack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "helppackdownloadname"); }
-            if ( $installer::globals::patch ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "patchdownloadname"); }
-            $packagename = installer::download::resolve_variables_in_downloadname($allvariables, $$downloadname, \$locallanguage);
-        }		
-    }
-
-    # Work around Windows problems with long pathnames (see issue 50885) by
-    # putting the to-be-archived installation tree into the temp directory
-    # instead of the module output tree (unless LOCALINSTALLDIR dictates
-    # otherwise, anyway); can be removed once issue 50885 is fixed:
-    my $tempinstalldir = $installdir;
-    if ( $installer::globals::iswindowsbuild &&
-         $installer::globals::packageformat eq "archive" &&
-         !$installer::globals::localinstalldirset )
-    {
-        $tempinstalldir = File::Temp::tempdir;
-    }
-
-    # Creating subfolder in installdir, which shall become the root of package or zip file
-    my $subfolderdir = "";
-    if ( $packagename ne "" ) { $subfolderdir = $tempinstalldir . $installer::globals::separator . $packagename; }
-    else { $subfolderdir = $tempinstalldir; }
-    
-    if ( ! -d $subfolderdir ) { installer::systemactions::create_directory($subfolderdir); }
-
-    # Create directories, copy files and ScpActions
-
-    installer::logger::print_message( "... creating directories ...\n" );
-    installer::logger::include_header_into_logfile("Creating directories:");
-
-    for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
-    {
-        my $onedir = ${$dirsref}[$i];
-        
-        if ( $onedir->{'HostName'} )
-        {
-            my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'};
-            
-            if ( ! -d $destdir )
-            {
-                if ( $^O =~ /cygwin/i ) # Cygwin performance check
-                {
-                    $infoline = "Try to create directory $destdir\n";
-                    push(@installer::globals::logfileinfo, $infoline);
-                    # Directories in $dirsref are sorted and all parents were added -> "mkdir" works without parent creation!
-                    if ( ! ( -d $destdir )) { mkdir($destdir, 0775); }
-                }
-                else
-                {
-                    installer::systemactions::create_directory_structure($destdir);
-                }
-            }
-        }
-    }
-
-    # stripping files ?!
-    if (( $installer::globals::strip ) && ( ! $installer::globals::iswindowsbuild )) { installer::strip::strip_libraries($filesref, $languagestringref); }
-    
-    # copy Files
-    installer::logger::print_message( "... copying files ...\n" );
-    installer::logger::include_header_into_logfile("Copying files:");
-    
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-
-        if (( $onefile->{'Styles'} ) && ( $onefile->{'Styles'} =~ /\bBINARYTABLE_ONLY\b/ )) { next; }
-        if (( $installer::globals::patch ) && ( $onefile->{'Styles'} ) && ( ! ( $onefile->{'Styles'} =~ /\bPATCH\b/ ))) { next; }
-        if (( $installer::globals::patch ) && ( $installer::globals::packageformat eq "dmg" )) { push(@installer::globals::patchfilecollector, "$onefile->{'destination'}\n"); }
-
-        my $source = $onefile->{'sourcepath'};
-        my $destination = $onefile->{'destination'};
-        $destination = $subfolderdir . $installer::globals::separator . $destination;
-
-        # Replacing $$ by $ is necessary to install files with $ in its name (back-masquerading)
-        # Otherwise, the following shell command does not work and the file list is not correct
-        $source =~ s/\$\$/\$/;
-        $destination =~ s/\$\$/\$/;
-
-        if ( $^O =~ /cygwin/i )	# Cygwin performance, do not use copy_one_file. "chmod -R" at the end
-        {
-            my $copyreturn = copy($source, $destination);
-        
-            if ($copyreturn)
-            {
-                $infoline = "Copy: $source to $destination\n";
-                $returnvalue = 1;
-            }
-            else
-            {
-                $infoline = "ERROR: Could not copy $source to $destination $!\n";
-                $returnvalue = 0;
-            }
-
-            push(@installer::globals::logfileinfo, $infoline);
-        }
-        else
-        {
-            installer::systemactions::copy_one_file($source, $destination);	
-
-            if ( ! $installer::globals::iswindowsbuild )
-            {
-                # see issue 102274 
-                if ( $onefile->{'UnixRights'} )
-                {
-                    chmod oct($onefile->{'UnixRights'}), $destination;
-                }
-            }
-        }
-    }
-
-    # creating Links
-
-    installer::logger::print_message( "... creating links ...\n" );
-    installer::logger::include_header_into_logfile("Creating links:");
-
-    for ( my $i = 0; $i <= $#{$linksref}; $i++ )
-    {
-        my $onelink = ${$linksref}[$i];
-
-        if (( $installer::globals::patch ) && ( $onelink->{'Styles'} ) && ( ! ( $onelink->{'Styles'} =~ /\bPATCH\b/ ))) { next; }
-
-        my $destination = $onelink->{'destination'};
-        $destination = $subfolderdir . $installer::globals::separator . $destination;
-        my $destinationfile = $onelink->{'destinationfile'};
-    
-        my $localcall = "ln -sf \'$destinationfile\' \'$destination\' \>\/dev\/null 2\>\&1";
-        system($localcall);
-
-        $infoline = "Creating link: \"ln -sf $destinationfile $destination\"\n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
-    for ( my $i = 0; $i <= $#{$unixlinksref}; $i++ )
-    {
-        my $onelink = ${$unixlinksref}[$i];
-
-        if (( $installer::globals::patch ) && ( $onelink->{'Styles'} ) && ( ! ( $onelink->{'Styles'} =~ /\bPATCH\b/ ))) { next; }
-
-        my $target = $onelink->{'Target'};
-        my $destination = $subfolderdir . $installer::globals::separator . $onelink->{'destination'};
-    
-        my $localcall = "ln -sf \'$target\' \'$destination\' \>\/dev\/null 2\>\&1";
-        system($localcall);
-
-        $infoline = "Creating Unix link: \"ln -sf $target $destination\"\n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
-    # Setting privileges for cygwin globally
-
-    if ( $^O =~ /cygwin/i )
-    {
-        installer::logger::print_message( "... changing privileges in $subfolderdir ...\n" );
-        installer::logger::include_header_into_logfile("Changing privileges in $subfolderdir:");
-    
-        my $localcall = "chmod -R 755 " . "\"" . $subfolderdir . "\"";
-        system($localcall);
-    }
-
-    installer::logger::print_message( "... removing superfluous directories ...\n" );
-    installer::logger::include_header_into_logfile("Removing superfluous directories:");
-
-    my ( $extensionfolder, $preregdir ) = get_extensions_dir($subfolderdir);	
-    installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
-        
-    # Registering the extensions
-
-    installer::logger::print_message( "... registering extensions ...\n" );
-    installer::logger::include_header_into_logfile("Registering extensions:");
-    register_extensions($subfolderdir, $languagestringref, $preregdir);
-    
-    if ( $installer::globals::compiler =~ /^unxmacx/ )
-    {
-        installer::worker::put_scpactions_into_installset("$installdir/$packagename");
-    }
-
-    # Creating archive file
-    if ( $installer::globals::packageformat eq "archive" )
-    {
-        create_package($tempinstalldir, $installdir, $packagename, $allvariables, $includepatharrayref, $languagestringref, $installer::globals::archiveformat);
-    }
-    elsif ( $installer::globals::packageformat eq "dmg" )
-    {
-        create_package($installdir, $installdir, $packagename, $allvariables, $includepatharrayref, $languagestringref, ".dmg");
-    }
-
-    # Analyzing the log file
-
-    installer::worker::clean_output_tree();	# removing directories created in the output tree
-    installer::worker::analyze_and_save_logfile($loggingdir, $installdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/sorter.pm b/solenv/bin/modules/installer/sorter.pm
deleted file mode 100644
index 1b24f8954..000000000
--- a/solenv/bin/modules/installer/sorter.pm
+++ /dev/null
@@ -1,116 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::sorter;
-
-#########################################
-# Sorting an array of hashes
-#########################################
-
-sub sorting_array_of_hashes
-{
-    my ($arrayref, $sortkey) = @_;
-    
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        my $onehashunder = ${$arrayref}[$i];
-        my $sortvalueunder = $onehashunder->{$sortkey};
-
-        for ( my $j = $i + 1; $j <= $#{$arrayref}; $j++ )
-        {
-            my $onehashover = ${$arrayref}[$j];
-            my $sortvalueover = $onehashover->{$sortkey};
-
-            if ( $sortvalueunder gt $sortvalueover)
-            {				
-                ${$arrayref}[$i] = $onehashover;
-                ${$arrayref}[$j] = $onehashunder;
-                
-                $onehashunder = $onehashover;
-                $sortvalueunder = $sortvalueover;
-            }
-        }
-    }	
-}
-
-######################################################
-# Sorting an array of hashes with a numerical value
-######################################################
-
-sub sort_array_of_hashes_numerically
-{
-    my ($arrayref, $sortkey) = @_;
-    
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        my $onehashunder = ${$arrayref}[$i];
-        my $sortvalueunder = $onehashunder->{$sortkey};
-
-        for ( my $j = $i + 1; $j <= $#{$arrayref}; $j++ )
-        {
-            my $onehashover = ${$arrayref}[$j];
-            my $sortvalueover = $onehashover->{$sortkey};
-
-            if ( $sortvalueunder > $sortvalueover)
-            {				
-                ${$arrayref}[$i] = $onehashover;
-                ${$arrayref}[$j] = $onehashunder;
-                
-                $onehashunder = $onehashover;
-                $sortvalueunder = $sortvalueover;
-            }
-        }
-    }	
-}
-
-#########################################
-# Sorting an array of of strings
-#########################################
-
-sub sorting_array_of_strings
-{
-    my ($arrayref) = @_;
-
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        my $onestringunder = ${$arrayref}[$i];
-
-        for ( my $j = $i + 1; $j <= $#{$arrayref}; $j++ )
-        {
-            my $onestringover = ${$arrayref}[$j];
-
-            if ( $onestringunder gt $onestringover)
-            {				
-                ${$arrayref}[$i] = $onestringover;
-                ${$arrayref}[$j] = $onestringunder;
-                $onestringunder = $onestringover;
-            }
-        }
-    }	
-}
-
-1;
diff --git a/solenv/bin/modules/installer/strip.pm b/solenv/bin/modules/installer/strip.pm
deleted file mode 100644
index a447427ea..000000000
--- a/solenv/bin/modules/installer/strip.pm
+++ /dev/null
@@ -1,139 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::strip;
-
-use installer::converter;
-use installer::existence;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::systemactions;
-
-#####################################################################
-# Checking whether a file has to be stripped
-#####################################################################
-
-sub need_to_strip
-{
-    my ( $filename ) = @_;
-    
-    my $strip = 0;
-    
-    # Check using the "file" command
-
-    open (FILE, "file $filename |");
-    my $fileoutput = <FILE>;
-    close (FILE);
-
-    if (( $fileoutput =~ /not stripped/i ) && ( $fileoutput =~ /\bELF\b/ )) { $strip = 1; }
-
-    return $strip		
-}
-
-#####################################################################
-# Checking whether a file has to be stripped
-#####################################################################
-
-sub do_strip
-{
-    my ( $filename ) = @_;
-    
-    my $systemcall = "strip" . " " . $filename;
-    
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not strip $filename!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "SUCCESS: Stripped library $filename!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-#####################################################################
-# Resolving all variables in the packagename.
-#####################################################################
-
-sub strip_libraries
-{
-    my ( $filelist, $languagestringref ) = @_;
-
-    installer::logger::include_header_into_logfile("Stripping files:");
-
-    my $strippeddirbase = installer::systemactions::create_directories("stripped", $languagestringref);
-
-    if (! installer::existence::exists_in_array($strippeddirbase, \@installer::globals::removedirs))
-    {
-        push(@installer::globals::removedirs, $strippeddirbase);		
-    }
-
-    for ( my $i = 0; $i <= $#{$filelist}; $i++ )
-    {
-        my $sourcefilename = ${$filelist}[$i]->{'sourcepath'};
-
-        if ( need_to_strip($sourcefilename) )
-        {
-            my $shortfilename = $sourcefilename;
-            installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortfilename);
-            
-            $infoline = "Strip: $shortfilename\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            # copy file into directory for stripped libraries
-
-            my $onelanguage = ${$filelist}[$i]->{'specificlanguage'};
-    
-            # files without language into directory "00"
-            
-            if ($onelanguage eq "") { $onelanguage = "00"; }
-            
-            my $strippeddir = $strippeddirbase . $installer::globals::separator . $onelanguage;
-            installer::systemactions::create_directory($strippeddir);	# creating language specific subdirectories
-
-            my $destfilename = $strippeddir . $installer::globals::separator . $shortfilename;
-            installer::systemactions::copy_one_file($sourcefilename, $destfilename);
-
-            # change sourcepath in files collector
-
-            ${$filelist}[$i]->{'sourcepath'} = $destfilename;
-
-            # strip file
-            
-            do_strip($destfilename);
-        }
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/substfilenamefiles.pm b/solenv/bin/modules/installer/substfilenamefiles.pm
deleted file mode 100644
index 8a5736cc7..000000000
--- a/solenv/bin/modules/installer/substfilenamefiles.pm
+++ /dev/null
@@ -1,165 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::substfilenamefiles;
-
-use installer::exiter;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::systemactions;
-
-#########################################################
-# Analyzing files with flag SUBST_FILENAME
-#########################################################
-
-sub resolving_subst_filename_flag
-{
-    my ($filesarrayref, $variableshashref, $languagestringref) = @_;
-
-    my $replacedirbase = installer::systemactions::create_directories("change_filename", $languagestringref);
-
-    installer::logger::include_header_into_logfile("Files with flag SUBST_FILENAME:");
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $styles = "";
-
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-    
-        if ( $styles =~ /\bSUBST_FILENAME\b/ )
-        {
-            # Files with flag SUBST_FILENAME must have a "Substitute" key
-            if (( ! $onefile->{'Substitute'} ) && ( ! $onefile->{'InstallName'} ))
-            {
-                installer::exiter::exit_program("ERROR: SUBST_FILENAME is set, but no Substitute and no InstallName defined at file $onefile->{'gid'}!", "resolving_subst_filename_flag");
-            }
-            
-            # Language specific subdirectory
-            my $onelanguage = $onefile->{'specificlanguage'};
-            
-            if ($onelanguage eq "")
-            {
-                $onelanguage = "00";	# files without language into directory "00"
-            }
-            
-            my $replacedir = $replacedirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; 
-            installer::systemactions::create_directory($replacedir);	# creating language specific directories
-
-            # copy files and edit them with the variables defined in the zip.lst
-                
-            my $longfilename = 0;
-                
-            my $onefilename = $onefile->{'Name'};
-
-            my $sourcepath = $onefile->{'sourcepath'};
-                
-            if ( $onefilename =~ /\Q$installer::globals::separator\E/ )	# filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
-            {
-                $onefilename =~ s/^\s*\Q$installer::globals::separator\E//;
-                $longfilename = 1;
-            }
-    
-            my $destinationpath = $replacedir . $onefilename;  
-            my $movepath = $destinationpath . ".orig";
-            my $destdir = $replacedir;
-
-            if ( $longfilename )	# the destination directory has to be created before copying
-            {
-                $destdir = $movepath;
-                installer::pathanalyzer::get_path_from_fullqualifiedname(\$destdir);
-                installer::systemactions::create_directory_structure($destdir);
-            }
-
-            my $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath);
-
-            if ( $copysuccess )
-            {
-                if ( $onefile->{'Substitute'} )
-                {
-                    my $substitute = $onefile->{'Substitute'};
-
-                    my $newfilename = $destinationpath;
-                    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$newfilename);
-                    eval '$newfilename =~ ' . "$substitute";
-        
-                    my $longnewfilename = $destdir . $newfilename;
-
-                    $copysuccess = installer::systemactions::copy_one_file($movepath, $longnewfilename);				
-
-                    # Saving the new file name
-                    $onefile->{'Name'} = $newfilename;
-                
-                    # Saving the new destination
-                    my $newdest = $onefile->{'destination'};
-                    installer::pathanalyzer::get_path_from_fullqualifiedname(\$newdest);
-                    $onefile->{'destination'} = $newdest . $newfilename;
-
-                    # Saving the original source, where the file was found
-                    $onefile->{'originalsourcepath'} = $onefile->{'sourcepath'};
-
-                    # Writing the new sourcepath into the hashref, even if it was not copied
-                    $onefile->{'sourcepath'} = $longnewfilename;
-                }
-                else
-                {
-                    if ( $onefile->{'InstallName'} )
-                    {
-                        my $installname = $onefile->{'InstallName'};
-
-                        my $newfilename = $destinationpath;
-                        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$newfilename);
-        
-                        my $longnewfilename = $destdir . $installname;
-
-                        $copysuccess = installer::systemactions::copy_one_file($movepath, $longnewfilename);				
-
-                        # Saving the new file name
-                        $onefile->{'Name'} = $installname;
-
-                        # Saving the new destination
-                        my $newdest = $onefile->{'destination'};
-                        installer::pathanalyzer::get_path_from_fullqualifiedname(\$newdest);
-                        $onefile->{'destination'} = $newdest . $installname;
-
-                        # Saving the original source, where the file was found
-                        $onefile->{'originalsourcepath'} = $onefile->{'sourcepath'};
-
-                        # Writing the new sourcepath into the hashref, even if it was not copied
-                        $onefile->{'sourcepath'} = $longnewfilename;		
-                    }
-                }
-            }
-        }
-    }
-
-    my $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
deleted file mode 100644
index a83283aef..000000000
--- a/solenv/bin/modules/installer/systemactions.pm
+++ /dev/null
@@ -1,1636 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::systemactions;
-
-use Cwd;
-use File::Copy;
-use installer::converter;
-use installer::exiter;
-use installer::globals;
-use installer::pathanalyzer;
-use installer::remover;
-
-######################################################
-# Creating a new direcotory
-######################################################
-
-sub create_directory
-{
-    my ($directory) = @_;
-
-    create_directory_with_privileges( $directory, "755" );
-}
-
-######################################################
-# Creating a new direcotory with defined privileges
-######################################################
-
-sub create_directory_with_privileges
-{
-    my ($directory, $privileges) = @_;
-        
-    my $returnvalue = 1;
-    my $infoline = "";
-    my $localprivileges = oct("0".$privileges); # changes "777" to 0777
-
-    if (!(-d $directory))
-    {
-        $returnvalue = mkdir($directory, $localprivileges);
-
-        if ($returnvalue)
-        {
-            $infoline = "\nCreated directory: $directory\n";
-            push(@installer::globals::logfileinfo, $infoline);
-    
-            chmod $localprivileges, $directory;
-        }
-        else
-        {
-            # New solution in parallel packing: It is possible, that the directory now exists, although it
-            # was not created in this process. There is only an important error, if the directory does not
-            # exist now. 
-
-            $infoline = "\nDid not succeed in creating directory: \"$directory\". Further attempts will follow.\n";
-            push(@installer::globals::logfileinfo, $infoline);
-            
-            if (!(-d $directory))
-            {
-                # Problem with parallel packaging? -> Try a little harder, before exiting.
-                # Did someone else remove the parent directory in the meantime?
-                my $parentdir = $directory;
-                installer::pathanalyzer::get_path_from_fullqualifiedname(\$parentdir);
-                if (!(-d $parentdir))
-                {
-                    $returnvalue = mkdir($directory, $localprivileges);
-
-                    if ($returnvalue)
-                    {
-                        $infoline = "\nAttention: Successfully created parent directory (should already be created before): $parentdir\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-    
-                        chmod $localprivileges, $parentdir;
-                    }
-                    else
-                    {
-                        $infoline = "\Error: \"$directory\" could not be created. Even the parent directory \"$parentdir\" does not exist and could not be created.\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-                        if ( -d $parentdir )
-                        {
-                            $infoline = "\nAttention: Finally the parent directory \"$parentdir\" exists, but I could not create it.\n";
-                            push(@installer::globals::logfileinfo, $infoline);
-                        }
-                        else
-                        {
-                            # Now it is time to exit, even the parent could not be created.
-                            installer::exiter::exit_program("ERROR: Could not create parent directory \"$parentdir\"", "create_directory_with_privileges");
-                        }
-                    }		
-                }
-            
-                # At this point we have to assume, that the parent directory exist.
-                # Trying once more to create the desired directory
-
-                $returnvalue = mkdir($directory, $localprivileges);
-
-                if ($returnvalue)
-                {
-                    $infoline = "\nAttention: Created directory \"$directory\" in the second try.\n";
-                    push(@installer::globals::logfileinfo, $infoline);
-    
-                    chmod $localprivileges, $directory;
-                }
-                else
-                {
-                    if ( -d $directory )
-                    {
-                        $infoline = "\nAttention: Finally the directory \"$directory\" exists, but I could not create it.\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-                    }
-                    else
-                    {
-                        # It is time to exit, even the second try failed.
-                        installer::exiter::exit_program("ERROR: Failed to create the directory: $directory", "create_directory_with_privileges");
-                    }	
-                }				
-            }
-            else
-            {
-                $infoline = "\nAnother process created this directory in exactly this moment :-) : $directory\n";
-                push(@installer::globals::logfileinfo, $infoline);
-            }
-        }
-    }
-    else
-    {
-        $infoline = "\nAlready existing directory, did not create: $directory\n";
-        push(@installer::globals::logfileinfo, $infoline);
-
-        chmod $localprivileges, $directory;
-    }
-}
-
-######################################################
-# Removing a new direcotory
-######################################################
-
-sub remove_empty_directory
-{
-    my ($directory) = @_;
-
-    my $returnvalue = 1;
-
-    if (-d $directory)
-    {		
-        my $systemcall = "rmdir $directory";
-    
-        $returnvalue = system($systemcall);
-
-        my $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        
-        if ($returnvalue)
-        {
-            $infoline = "ERROR: Could not remove \"$directory\"!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        else
-        {
-            $infoline = "Success: Removed \"$directory\"!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-}
-
-#######################################################################
-# Calculating the number of languages in the string
-#######################################################################
-
-sub get_number_of_langs
-{
-    my ($languagestring) = @_;
-
-    my $number = 1;
-    
-    my $workstring = $languagestring;
-    
-    while ( $workstring =~ /^\s*(.*)_(.*?)\s*$/ )
-    {
-        $workstring = $1;
-        $number++;
-    }
-
-    return $number;
-}
-
-#######################################################################
-# Creating the directories, in which files are generated or unzipped
-#######################################################################
-
-sub create_directories
-{
-    my ($newdirectory, $languagesref) =@_;
-    
-    $installer::globals::unpackpath =~ s/\Q$installer::globals::separator\E\s*$//;	# removing ending slashes and backslashes
-
-    my $path = "";
-
-    if (( $newdirectory eq "uno" ) || ( $newdirectory eq "zip" ) || ( $newdirectory eq "cab" ) || ( $newdirectory =~ /rdb\s*$/i )) # special handling for zip files, cab files and services file because of performance reasons
-    {
-        if ( $installer::globals::temppathdefined ) { $path = $installer::globals::temppath; }
-        else { $path = $installer::globals::unpackpath; }
-        $path =~ s/\Q$installer::globals::separator\E\s*$//;	# removing ending slashes and backslashes
-        $path = $path . $installer::globals::separator;
-    }
-    elsif ( ( $newdirectory eq "jds" ) )
-    {
-        if ( $installer::globals::jdstemppathdefined ) { $path = $installer::globals::jdstemppath; }
-        else { $path = $installer::globals::unpackpath; }
-        $path =~ s/\Q$installer::globals::separator\E\s*$//;	# removing ending slashes and backslashes
-        $path = $path . $installer::globals::separator;
-        installer::systemactions::create_directory($path);
-    }
-    else
-    {
-        $path = $installer::globals::unpackpath . $installer::globals::separator;
-        
-        # special handling, if LOCALINSTALLDIR is set
-        if (( $installer::globals::localinstalldirset ) && ( $newdirectory eq "install" ))
-        {
-            $installer::globals::localinstalldir =~ s/\Q$installer::globals::separator\E\s*$//;
-            $path = $installer::globals::localinstalldir . $installer::globals::separator;
-        }
-    }
-
-    $infoline = "create_directories: Using $path for $newdirectory !\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($newdirectory eq "unzip" )	# special handling for common directory
-    {
-        $path = $path  . ".." . $installer::globals::separator . "common" . $installer::globals::productextension . $installer::globals::separator;
-        create_directory($path);
-
-        $path = $path . $newdirectory . $installer::globals::separator;
-        create_directory($path);
-    }
-    else
-    {
-        my $localproductname = $installer::globals::product;
-        my $localproductsubdir = "";
-
-        if ( $installer::globals::product =~ /^\s*(.+?)\_\_(.+?)\s*$/ )
-        {
-            $localproductname = $1;
-            $localproductsubdir = $2;
-        }
-
-        if ( $installer::globals::languagepack ) { $path = $path . $localproductname . "_languagepack" . $installer::globals::separator; }
-        elsif ( $installer::globals::helppack ) { $path = $path . $localproductname . "_helppack" . $installer::globals::separator; }
-        elsif ( $installer::globals::patch ) { $path = $path . $localproductname . "_patch" . $installer::globals::separator; }
-        else { $path = $path . $localproductname . $installer::globals::separator; }
-
-        create_directory($path);
-
-        if ( $localproductsubdir )
-        {
-            $path = $path . $localproductsubdir . $installer::globals::separator;
-            create_directory($path);
-        }
-
-        $path = $path . $installer::globals::installertypedir . $installer::globals::separator;
-        create_directory($path);
-
-        $path = $path . $newdirectory . $installer::globals::separator;
-        create_directory($path);
-
-        my $locallanguagesref = "";
-
-        if ( $$languagesref ) { $locallanguagesref = $$languagesref; }
-
-        if ($newdirectory eq "install" && $installer::globals::ooodownloadfilename ne "" )
-        {
-            # put packages into versioned path; needed only on linux (fdo#30837)
-            $path = $path . "$installer::globals::ooodownloadfilename" . $installer::globals::separator;
-            create_directory($path);
-        }
-        else
-        {
-            if ($locallanguagesref ne "")	# this will be a path like "01_49", for Profiles and ConfigurationFiles, idt-Files
-            {
-
-                my $languagestring = $$languagesref;
-
-                if (length($languagestring) > $installer::globals::max_lang_length )
-                {
-                    my $number_of_languages = get_number_of_langs($languagestring);
-                    chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
-                    my $id = substr($shorter, 0, 8); # taking only the first 8 digits
-                    $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
-                }
-
-                $path = $path . $languagestring . $installer::globals::separator;
-                create_directory($path);
-            }
-        }
-    }
-
-    installer::remover::remove_ending_pathseparator(\$path);
-
-    $path = installer::converter::make_path_conform($path);
-    
-    return $path;
-}
-
-########################
-# Copying one file
-########################
-
-sub copy_one_file
-{
-    my ($source, $dest) = @_;
-
-    my ($returnvalue, $infoline);
-    
-    my $copyreturn = copy($source, $dest);
-        
-    if ($copyreturn)
-    {
-        $infoline = "Copy: $source to $dest\n";
-        $returnvalue = 1;
-    }
-    else
-    {
-        $infoline = "ERROR: Could not copy $source to $dest $!\n";
-        $returnvalue = 0;
-    }
-
-    push(@installer::globals::logfileinfo, $infoline);
-
-    if ( !$returnvalue ) {
-        return $returnvalue;
-    }
-    
-    # taking care of file attributes
-    if ($installer::globals::iswin && -f $dest) {
-        my $mode = -x $source ? 0775 : 0664;
-        my $mode_str = sprintf("%o", $mode);
-        my $chmodreturn = chmod($mode, $dest);
-        if ($chmodreturn)
-        {
-            $infoline = "chmod $mode_str, $dest\n";
-            $returnvalue = 1;
-        }
-        else
-        {
-            $infoline = "WARNING: Could not chmod $dest: $!\n";
-            $returnvalue = 0;
-        }
-    
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    
-    return $returnvalue;
-}
-
-##########################
-# Hard linking one file
-##########################
-
-sub hardlink_one_file
-{
-    my ($source, $dest) = @_;
-
-    my ($returnvalue, $infoline);
-    
-    my $copyreturn = link($source, $dest);
-        
-    if ($copyreturn)
-    {
-        $infoline = "Link: $source to $dest\n";
-        $returnvalue = 1;
-    }
-    else
-    {
-        $infoline = "ERROR: Could not link $source to $dest\n";
-        $returnvalue = 0;
-    }
-
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    return $returnvalue;
-}
-
-##########################
-# Soft linking one file
-##########################
-
-sub softlink_one_file
-{
-    my ($source, $dest) = @_;
-
-    my ($returnvalue, $infoline);
-    
-    my $linkreturn = symlink($source, $dest);
-        
-    if ($linkreturn)
-    {
-        $infoline = "Symlink: $source to $dest\n";
-        $returnvalue = 1;
-    }
-    else
-    {
-        $infoline = "ERROR: Could not symlink $source to $dest\n";
-        $returnvalue = 0;
-    }
-
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    return $returnvalue;
-}
-
-########################
-# Renaming one file
-########################
-
-sub rename_one_file
-{
-    my ($source, $dest) = @_;
-
-    my ($returnvalue, $infoline);
-
-    my $renamereturn = rename($source, $dest);
-        
-    if ($renamereturn)
-    {
-        $infoline = "Rename: $source to $dest\n";
-        $returnvalue = 1;
-    }
-    else
-    {
-        $infoline = "ERROR: Could not rename $source to $dest\n";
-        $returnvalue = 0;
-    }
-    
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    return $returnvalue;
-}
-
-##########################################
-# Copying all files from one directory
-# to another directory
-##########################################
-
-sub copy_directory
-{
-    my ($sourcedir, $destdir) = @_;
-    
-    my @sourcefiles = ();
-    
-    $sourcedir =~ s/\Q$installer::globals::separator\E\s*$//;
-    $destdir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    my $infoline = "\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Copying files from directory $sourcedir to directory $destdir\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    opendir(DIR, $sourcedir);
-    @sourcefiles = readdir(DIR);
-    closedir(DIR);
-
-    my $onefile;
-    
-    foreach $onefile (@sourcefiles)
-    {
-        if ((!($onefile eq ".")) && (!($onefile eq "..")))
-        {
-            my $sourcefile = $sourcedir . $installer::globals::separator . $onefile;
-            my $destfile = $destdir . $installer::globals::separator . $onefile;
-            if ( -f $sourcefile ) 	# only files, no directories
-            {
-                copy_one_file($sourcefile, $destfile);
-            }
-        }
-    }
-}
-
-##########################################
-# Copying all files from one directory
-# to another directory
-##########################################
-
-sub is_empty_dir
-{
-    my ($dir) = @_;
-    
-    my $directory_is_empty = 1;
-    my @sourcefiles = ();
-    
-    opendir(DIR, $dir);
-    @sourcefiles = readdir(DIR);
-    closedir(DIR);
-
-    my $onefile;
-    my @realcontent = ();
-    
-    foreach $onefile (@sourcefiles)
-    {
-        if ((!($onefile eq ".")) && (!($onefile eq "..")))
-        {
-            push(@realcontent, $onefile);
-        }
-    }
-    
-    if ( $#realcontent > -1 ) { $directory_is_empty = 0; }
-    
-    return $directory_is_empty;
-}
-
-#####################################################################
-# Creating hard links to a complete directory with sub directories.
-#####################################################################
-
-sub hardlink_complete_directory
-{
-    my ($sourcedir, $destdir) = @_;
-    
-    my @sourcefiles = ();
-    
-    $sourcedir =~ s/\Q$installer::globals::separator\E\s*$//;
-    $destdir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    if ( ! -d $destdir ) { create_directory($destdir); }
-
-    my $infoline = "\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Creating hard links for all files from directory $sourcedir to directory $destdir\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    opendir(DIR, $sourcedir);
-    @sourcefiles = readdir(DIR);
-    closedir(DIR);
-
-    my $onefile;
-    
-    foreach $onefile (@sourcefiles)
-    {
-        if ((!($onefile eq ".")) && (!($onefile eq "..")))
-        {
-            my $source = $sourcedir . $installer::globals::separator . $onefile;
-            my $dest = $destdir . $installer::globals::separator . $onefile;
-            if ( -f $source ) 	# only files, no directories
-            {
-                hardlink_one_file($source, $dest);
-            }
-            if ( -d $source ) 	# recursive
-            {
-                hardlink_complete_directory($source, $dest);
-            }
-        }
-    }	
-}
-
-#####################################################################
-# Creating hard links to a complete directory with sub directories.
-#####################################################################
-
-sub softlink_complete_directory
-{
-    my ($sourcedir, $destdir, $depth) = @_;
-    
-    my @sourcefiles = ();
-    
-    $sourcedir =~ s/\Q$installer::globals::separator\E\s*$//;
-    $destdir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    if ( ! -d $destdir ) { create_directory($destdir); }
-
-    my $infoline = "\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Creating soft links for all files from directory $sourcedir to directory $destdir\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    opendir(DIR, $sourcedir);
-    @sourcefiles = readdir(DIR);
-    closedir(DIR);
-
-    my $onefile;
-    
-    foreach $onefile (@sourcefiles)
-    {
-        if ((!($onefile eq ".")) && (!($onefile eq "..")))
-        {
-            my $source = $sourcedir . $installer::globals::separator . $onefile;
-            my $dest = $destdir . $installer::globals::separator . $onefile;
-            if ( -f $source ) 	# only files, no directories
-            {
-                my $localsource = $source;
-                if ( $depth > 0 ) { for ( my $i = 1; $i <= $depth; $i++ ) { $localsource = "../" . $localsource; } }
-                softlink_one_file($localsource, $dest);
-            }
-            if ( -d $source ) 	# recursive
-            {
-                my $newdepth = $depth + 1;
-                softlink_complete_directory($source, $dest, $newdepth);
-            }
-        }
-    }	
-}
-
-#####################################################
-# Copying a complete directory with sub directories.
-#####################################################
-
-sub copy_complete_directory
-{
-    my ($sourcedir, $destdir) = @_;
-    
-    my @sourcefiles = ();
-    
-    $sourcedir =~ s/\Q$installer::globals::separator\E\s*$//;
-    $destdir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    if ( ! -d $destdir ) { create_directory($destdir); }
-
-    my $infoline = "\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Copying files from directory $sourcedir to directory $destdir\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    opendir(DIR, $sourcedir);
-    @sourcefiles = readdir(DIR);
-    closedir(DIR);
-
-    my $onefile;
-    
-    foreach $onefile (@sourcefiles)
-    {
-        if ((!($onefile eq ".")) && (!($onefile eq "..")))
-        {
-            my $source = $sourcedir . $installer::globals::separator . $onefile;
-            my $dest = $destdir . $installer::globals::separator . $onefile;
-            if ( -f $source ) 	# only files, no directories
-            {
-                copy_one_file($source, $dest);
-            }
-            if ( -d $source ) 	# recursive
-            {
-                if ((!( $source =~ /packages\/SUNW/ )) && (!( $source =~ /packages\/OOO/ )))	# do not copy complete Solaris packages!
-                {
-                    copy_complete_directory($source, $dest);
-                }
-            }
-        }
-    }	
-}
-
-#####################################################################################
-# Copying a complete directory with sub directories, but not the CVS directories.
-#####################################################################################
-
-sub copy_complete_directory_without_cvs
-{
-    my ($sourcedir, $destdir) = @_;
-    
-    my @sourcefiles = ();
-    
-    $sourcedir =~ s/\Q$installer::globals::separator\E\s*$//;
-    $destdir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    if ( ! -d $destdir ) { create_directory($destdir); }
-
-    my $infoline = "\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Copying files from directory $sourcedir to directory $destdir (without CVS)\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    opendir(DIR, $sourcedir);
-    @sourcefiles = readdir(DIR);
-    closedir(DIR);
-
-    my $onefile;
-    
-    foreach $onefile (@sourcefiles)
-    {
-        if ((!($onefile eq ".")) && (!($onefile eq "..")) && (!($onefile eq "CVS")))
-        {
-            my $source = $sourcedir . $installer::globals::separator . $onefile;
-            my $dest = $destdir . $installer::globals::separator . $onefile;
-            if ( -f $source ) 	# only files, no directories
-            {
-                copy_one_file($source, $dest);
-            }
-            if ( -d $source ) 	# recursive
-            {
-                copy_complete_directory_without_cvs($source, $dest);
-            }
-        }
-    }	
-}
-
-#####################################################
-# Copying all files with a specified file extension
-# from one directory to another directory.
-#####################################################
-
-sub copy_directory_with_fileextension
-{
-    my ($sourcedir, $destdir, $extension) = @_;
-    
-    my @sourcefiles = ();
-    
-    $sourcedir =~ s/\Q$installer::globals::separator\E\s*$//;
-    $destdir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    $infoline = "\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Copying files with extension $extension from directory $sourcedir to directory $destdir\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    opendir(DIR, $sourcedir);
-    @sourcefiles = readdir(DIR);
-    closedir(DIR);
-
-    my $onefile;
-    
-    foreach $onefile (@sourcefiles)
-    {
-        if ((!($onefile eq ".")) && (!($onefile eq "..")))
-        {
-            if ( $onefile =~ /\.$extension\s*$/ )	# only copying specified files
-            {
-                my $sourcefile = $sourcedir . $installer::globals::separator . $onefile;
-                my $destfile = $destdir . $installer::globals::separator . $onefile;
-                if ( -f $sourcefile ) 	# only files, no directories
-                {
-                    copy_one_file($sourcefile, $destfile);
-                }
-            }
-        }
-    }	
-}
-
-#########################################################
-# Copying all files without a specified file extension
-# from one directory to another directory.
-#########################################################
-
-sub copy_directory_except_fileextension
-{
-    my ($sourcedir, $destdir, $extension) = @_;
-    
-    my @sourcefiles = ();
-    
-    $sourcedir =~ s/\Q$installer::globals::separator\E\s*$//;
-    $destdir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    $infoline = "\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Copying files without extension $extension from directory $sourcedir to directory $destdir\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    opendir(DIR, $sourcedir);
-    @sourcefiles = readdir(DIR);
-    closedir(DIR);
-
-    my $onefile;
-    
-    foreach $onefile (@sourcefiles)
-    {
-        if ((!($onefile eq ".")) && (!($onefile eq "..")))
-        {
-            if ( ! ( $onefile =~ /\.$extension\s*$/ ))	# only copying not having the specified extension
-            {
-                my $sourcefile = $sourcedir . $installer::globals::separator . $onefile;
-                my $destfile = $destdir . $installer::globals::separator . $onefile;
-                if ( -f $sourcefile ) 	# only files, no directories
-                {
-                    copy_one_file($sourcefile, $destfile);
-                }
-            }
-        }
-    }	
-}
-
-########################################################
-# Renaming all files with a specified file extension
-# in a specified directory.
-# Example: "Feature.idt.01" -> "Feature.idt"
-########################################################
-
-sub rename_files_with_fileextension
-{
-    my ($dir, $extension) = @_;
-    
-    my @sourcefiles = ();
-    
-    $dir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    my $infoline = "\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Renaming files with extension \"$extension\" in the directory $dir\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    opendir(DIR, $dir);
-    @sourcefiles = readdir(DIR);
-    closedir(DIR);
-
-    my $onefile;
-    
-    foreach $onefile (@sourcefiles)
-    {
-        if ((!($onefile eq ".")) && (!($onefile eq "..")))
-        {
-            if ( $onefile =~ /^\s*(\S.*?)\.$extension\s*$/ )	# only renaming specified files
-            {
-                my $destfile = $1;
-                my $sourcefile = $dir . $installer::globals::separator . $onefile;
-                $destfile = $dir . $installer::globals::separator . $destfile;
-                if ( -f $sourcefile ) 	# only files, no directories
-                {
-                    rename_one_file($sourcefile, $destfile);
-                }
-            }
-        }
-    }	
-}
-
-########################################################
-# Finding all files with a specified file extension
-# in a specified directory.
-########################################################
-
-sub find_file_with_file_extension
-{
-    my ($extension, $dir) = @_;
-    
-    my @allfiles = ();
-
-    $dir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    my $infoline = "\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Searching files with extension \"$extension\" in the directory $dir\n";
-    push(@installer::globals::logfileinfo, $infoline);
-    
-    opendir(DIR, $dir);
-    @sourcefiles = sort readdir(DIR);
-    closedir(DIR);
-
-    my $onefile;
-    
-    foreach $onefile (@sourcefiles)
-    {
-        if ((!($onefile eq ".")) && (!($onefile eq "..")))
-        {
-            if ( $onefile =~ /^\s*(\S.*?)\.$extension\s*$/ )
-            {
-                push(@allfiles, $onefile)
-            }
-        }
-    }
-    
-    return \@allfiles;
-}
-
-##############################################################
-# Creating a unique directory, for example "01_inprogress_7"
-# in the install directory.
-##############################################################
-
-sub make_numbered_dir
-{
-    my ($newstring, $olddir) = @_;
-    
-    my $basedir = $olddir;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$basedir);
-
-    my $alldirs = get_all_directories($basedir);
-    
-    # searching for the highest number extension
-
-    my $maxnumber = 0;
-    
-    for ( my $i = 0; $i <= $#{$alldirs}; $i++ )
-    {
-        if ( ${$alldirs}[$i] =~ /\_(\d+)\s*$/ )
-        {
-            my $number = $1;
-            if ( $number > $maxnumber ) { $maxnumber = $number; }
-        }
-    }
-
-    my $newnumber = $maxnumber + 1;
-        
-    my $newdir = $olddir . "_" . $newstring . "_" . $newnumber;
-    
-    my $returndir = "";
-
-    if ( move($olddir, $newdir) )
-    {
-        $infoline = "\nMoved directory from $olddir to $newdir\n";
-        push(@installer::globals::logfileinfo, $infoline);
-        $returndir = $newdir;
-    }
-    else
-    {
-        $infoline = "\nATTENTION: Could not move directory from $olddir to $newdir, \"make_numbered_dir\"\n";
-        push(@installer::globals::logfileinfo, $infoline);
-        $returndir = $olddir;
-    }
-    
-    return $returndir;
-}
-
-##############################################################
-# Determining the highest number in the install directory.
-##############################################################
-
-sub determine_maximum_number
-{
-    my ($dir, $languagestringref) = @_;
-    
-    my $basedir = $dir;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$basedir);
-
-    my $alldirs = get_all_directories($basedir);
-
-    my $maxnumber = 1;
-
-    # In control.pm the installation directory is determined as:
-    # $installer::globals::build . "_" . $installer::globals::lastminor . "_" .
-    # "native_inprogress-number_" . $$languagesref . "\." . $installer::globals::buildid;
-    
-    # searching for the highest number extension after the first "-", which belongs to
-    # $installer::globals::build, $installer::globals::lastminor and $installer::globals::buildid
-    # In this step not looking for the language!
-
-    my @correctbuildiddirs = ();
-    
-    for ( my $i = 0; $i <= $#{$alldirs}; $i++ )
-    {
-        my $onedir = ${$alldirs}[$i];
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$onedir);
-        
-        if ( $onedir =~ /^\s*\Q$installer::globals::build\E\_\Q$installer::globals::lastminor\E\_(.*?)\-(\d+)\_(.*?)\.\Q$installer::globals::buildid\E\s*$/ )
-        {
-            my $number = $2;
-            if ( $number > $maxnumber ) { $maxnumber = $number; }
-            push(@correctbuildiddirs, $onedir);
-        }
-    }
-
-    # From all directories with correct $installer::globals::build, $installer::globals::lastminor
-    # and $installer::globals::buildid, those directories, which already have the maximum number
-    # have to be selected
-
-    my @maximumnumberdirs = ();
-
-    for ( my $i = 0; $i <= $#correctbuildiddirs; $i++ )
-    {
-        my $onedir = $correctbuildiddirs[$i];
-
-        if ( $onedir =~ /^\s*(.*?)\-(\d+)\_(.*?)\.(.*?)\s*$/ )
-        {
-            my $number = $2;
-            
-            if ( $number == $maxnumber )
-            {
-                push(@maximumnumberdirs, $onedir);
-            }
-        }
-    }
-
-    # @maximumnumberdirs contains only those directories with correct $installer::globals::build,
-    # $installer::globals::lastminor and $installer::globals::buildid, which already have the maximum number.
-    # If the current language is part of this directory, the number has to be increased.
-
-    my $increase_counter = 0;
-
-    for ( my $i = 0; $i <= $#maximumnumberdirs; $i++ )
-    {
-        my $onedir = $maximumnumberdirs[$i];
-
-        if ( $onedir =~ /^\s*(.*?)\-(\d+)\_(.*?)\.(.*?)\s*$/ )
-        {
-            my $number = $2;
-            my $languagestring = $3;
-            
-            if ( $languagestring eq $$languagestringref )
-            {
-                $increase_counter = 1;
-            }
-        }
-    }
-
-    if ( $increase_counter )
-    {
-        $maxnumber = $maxnumber + 1;
-    }
-        
-    return $maxnumber;
-}
-
-#####################################################################################
-# Renaming a directory by exchanging a string, for example from "01_inprogress_7"
-# to "01_witherror_7".
-#####################################################################################
-
-sub rename_string_in_directory
-{
-    my ($olddir, $oldstring, $newstring) = @_;
-    
-    my $newdir = $olddir;
-    my $infoline = "";
-        
-    $newdir =~ s/$oldstring/$newstring/g;
-    
-    if (( -d $newdir ) && ( $olddir ne $newdir )) { remove_complete_directory($newdir, 1); }
-    
-    if ( move($olddir, $newdir) )
-    {
-        $infoline = "\nMoved directory from $olddir to $newdir\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "\nATTENTION: Could not move directory from $olddir to $newdir, \"rename_string_in_directory\"\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    
-    return $newdir;
-}
-
-######################################################
-# Returning the complete directory name,
-# input is the first part of the directory name.
-######################################################
-
-sub get_directoryname
-{
-    my ($searchdir, $startstring) = @_;
-    
-    my $dirname = "";
-    my $founddir = 0;
-    my $direntry;
-    
-    opendir(DIR, $searchdir);
-    
-    foreach $direntry (readdir (DIR))
-    {
-        next if $direntry eq ".";
-        next if $direntry eq "..";
-        
-        if (( -d $direntry ) && ( $direntry =~ /^\s*\Q$startstring\E/ ))
-        {
-            $dirname = $direntry;
-            $founddir = 1;
-            last;
-        }
-    }
-
-    closedir(DIR);
-
-    if ( ! $founddir ) { installer::exiter::exit_program("ERROR: Did not find directory beginning with $startstring in directory $searchdir", "get_directoryname"); }
-    
-    return $dirname;
-}
-
-
-###################################
-# Renaming a directory
-###################################
-
-sub rename_directory
-{
-    my ($olddir, $newdir) = @_;
-    
-    my $infoline = "";
-    
-    if ( move($olddir, $newdir) )
-    {
-        $infoline = "\nMoved directory from $olddir to $newdir\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        installer::exiter::exit_program("ERROR: Could not move directory from $olddir to $newdir $!", "rename_directory");
-    }
-    
-    return $newdir;
-}
-
-##############################################################
-# Creating a directory next to an existing directory
-##############################################################
-
-sub create_directory_next_to_directory
-{
-    my ($topdir, $dirname) = @_;
-
-    my $basedir = $topdir;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$basedir);
-
-    $basedir =~ s/\Q$installer::globals::separator\E\s*$//;
-    
-    my $newdir = $basedir . $installer::globals::separator . $dirname;
-    
-    create_directory($newdir);
-    
-    return $newdir;
-}
-
-##############################################################
-# Collecting all directories inside a directory
-##############################################################
-
-sub get_all_directories
-{
-    my ($basedir) = @_;
-    
-    my @alldirs = ();
-    my $direntry;
-    
-    $basedir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    opendir(DIR, $basedir);
-    
-    foreach $direntry (readdir (DIR))
-    {
-        next if $direntry eq ".";
-        next if $direntry eq "..";
-        
-        my $completeentry = $basedir . $installer::globals::separator . $direntry;
-
-        if ( -d $completeentry ) { push(@alldirs, $completeentry); }
-    }
-
-    closedir(DIR);
-    
-    return \@alldirs;
-}
-
-##############################################################
-# Collecting all directories inside a directory
-# Returning without path
-##############################################################
-
-sub get_all_directories_without_path
-{
-    my ($basedir) = @_;
-    
-    my @alldirs = ();
-    my $direntry;
-    
-    $basedir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    opendir(DIR, $basedir);
-    
-    foreach $direntry (readdir (DIR))
-    {
-        next if $direntry eq ".";
-        next if $direntry eq "..";
-        
-        my $completeentry = $basedir . $installer::globals::separator . $direntry;
-
-        if ( -d $completeentry ) { push(@alldirs, $direntry); }
-    }
-
-    closedir(DIR);
-    
-    return \@alldirs;
-}
-
-##############################################################
-# Collecting all files inside one directory
-##############################################################
-
-sub get_all_files_from_one_directory
-{
-    my ($basedir) = @_;
-    
-    my @allfiles = ();
-    my $direntry;
-    
-    $basedir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    opendir(DIR, $basedir);
-    
-    foreach $direntry (readdir (DIR))
-    {
-        next if $direntry eq ".";
-        next if $direntry eq "..";
-        
-        my $completeentry = $basedir . $installer::globals::separator . $direntry;
-
-        if ( -f $completeentry ) { push(@allfiles, $completeentry); }
-    }
-
-    closedir(DIR);
-    
-    return \@allfiles;
-}
-
-##############################################################
-# Collecting all files inside one directory
-##############################################################
-
-sub get_all_files_from_one_directory_without_path
-{
-    my ($basedir) = @_;
-    
-    my @allfiles = ();
-    my $direntry;
-    
-    $basedir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    opendir(DIR, $basedir);
-    
-    foreach $direntry (readdir (DIR))
-    {
-        next if $direntry eq ".";
-        next if $direntry eq "..";
-
-        my $completeentry = $basedir . $installer::globals::separator . $direntry;
-
-        if ( -f $completeentry ) { push(@allfiles, $direntry); }
-    }
-
-    closedir(DIR);
-    
-    return \@allfiles;
-}
-
-##############################################################
-# Collecting all files and directories inside one directory
-##############################################################
-
-sub read_directory
-{
-    my ($basedir) = @_;
-    
-    my @allcontent = ();
-    my $direntry;
-    
-    $basedir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    opendir(DIR, $basedir);
-    
-    foreach $direntry (readdir (DIR))
-    {
-        next if $direntry eq ".";
-        next if $direntry eq "..";
-        
-        my $completeentry = $basedir . $installer::globals::separator . $direntry;
-
-        if (( -f $completeentry ) || ( -d $completeentry )) { push(@allcontent, $completeentry); }
-    }
-
-    closedir(DIR);
-    
-    return \@allcontent;
-}
-
-##############################################################
-# Finding the new content in a directory
-##############################################################
-
-sub find_new_content_in_directory
-{
-    my ( $basedir, $oldcontent ) = @_;
-    
-    my @newcontent = ();
-    my @allcontent = ();
-    
-    my $direntry;
-    
-    $basedir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    opendir(DIR, $basedir);
-    
-    foreach $direntry (readdir (DIR))
-    {
-        next if $direntry eq ".";
-        next if $direntry eq "..";
-        
-        my $completeentry = $basedir . $installer::globals::separator . $direntry;
-
-        if (( -f $completeentry ) || ( -d $completeentry ))
-        {
-            push(@allcontent, $completeentry);
-            if (! installer::existence::exists_in_array($completeentry, $oldcontent))
-            {
-                push(@newcontent, $completeentry);
-            } 
-        }
-    }
-
-    closedir(DIR);
-    
-    return (\@newcontent, \@allcontent);
-}
-
-##############################################################
-# Trying to create a directory, no error if this fails
-##############################################################
-
-sub try_to_create_directory
-{
-    my ($directory) = @_;
-    
-    my $returnvalue = 1;
-    my $created_directory = 0;
-
-    if (!(-d $directory))
-    {
-        $returnvalue = mkdir($directory, 0775);
-
-        if ($returnvalue)
-        {
-            $created_directory = 1;
-            $infoline = "\nCreated directory: $directory\n";
-            push(@installer::globals::logfileinfo, $infoline);
-    
-            chmod 0775, $directory;
-        }
-        else
-        {
-            $created_directory = 0;
-        }
-    }
-    else
-    {
-        $created_directory = 1;
-    }
-
-    return $created_directory;
-}
-
-##############################################################
-# Creating a complete directory structure
-##############################################################
-
-sub create_directory_structure
-{
-    my ($directory) = @_;
-
-    if ( ! try_to_create_directory($directory) )
-    {
-        my $parentdir = $directory;
-        installer::pathanalyzer::get_path_from_fullqualifiedname(\$parentdir);
-
-        my $infoline = "INFO: Did not create directory $directory\n";
-        push(@installer::globals::logfileinfo, $infoline);
-        $infoline = "Now trying to create parent directory $parentdir\n";
-        push(@installer::globals::logfileinfo, $infoline);
-
-        create_directory_structure($parentdir);									# recursive
-    }
-    
-    create_directory($directory);	# now it has to succeed
-}
-
-######################################################
-# Removing a complete directory with subdirectories
-######################################################
-
-sub remove_complete_directory
-{
-    my ($directory, $start) = @_;
-
-    my @content = ();
-    my $infoline = "";
-    
-    $directory =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    if ( -d $directory )
-    {
-        if ( $start )
-        {
-            $infoline = "\n";
-            push(@installer::globals::logfileinfo, $infoline);
-            $infoline = "Removing directory $directory\n";
-            push(@installer::globals::logfileinfo, $infoline);
-        }
-    
-        opendir(DIR, $directory);
-        @content = readdir(DIR);
-        closedir(DIR);
-
-        my $oneitem;
-    
-        foreach $oneitem (@content)
-        {
-            if ((!($oneitem eq ".")) && (!($oneitem eq "..")))
-            {
-                my $item = $directory . $installer::globals::separator . $oneitem;
-
-                if ( -f $item || -l $item ) 	# deleting files or links
-                {
-                    unlink($item);
-                }
-
-                if ( -d $item ) 	# recursive
-                {
-                    remove_complete_directory($item, 0);
-                }
-            }
-        }
-        
-        # try to remove empty directory
-                
-        my $returnvalue = rmdir $directory;
-
-        if ( ! $returnvalue )
-        {
-            $infoline = "Warning: Problem with removing empty dir $directory\n";
-            push(@installer::globals::logfileinfo, $infoline);
-        }
-        
-        # try a little bit harder (sometimes there is a performance problem)
-        if ( -d $directory )
-        {
-            for ( my $j = 1; $j <= 3; $j++ )
-            {
-                if ( -d $directory )
-                {
-                    $infoline = "\n";
-                    push(@installer::globals::logfileinfo, $infoline);
-                    $infoline = "Warning (Try $j): Problems with removing directory $directory\n";
-                    push(@installer::globals::logfileinfo, $infoline);
-
-                    $returnvalue = rmdir $directory;
-
-                    if ( $returnvalue )
-                    {
-                        $infoline = "Successfully removed empty dir $directory\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-                    } else {
-                        $infoline = "Warning: rmdir $directory failed.\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-                    }
-                }
-            }
-        }
-    }	
-}
-
-######################################################
-# Creating a unique directory with number extension	
-######################################################
-
-sub create_unique_directory
-{
-    my ($directory) = @_;
-    
-    $directory =~ s/\Q$installer::globals::separator\E\s*$//;
-    $directory = $directory . "_INCREASINGNUMBER";
-    
-    my $counter = 1;
-    my $created = 0;
-    my $localdirectory = "";
-
-    do
-    {
-        $localdirectory = $directory;
-        $localdirectory =~ s/INCREASINGNUMBER/$counter/;
-        $counter++;
-        
-        if ( ! -d $localdirectory )
-        {
-            create_directory($localdirectory);
-            $created = 1;
-        }		
-    }
-    while ( ! $created );
-    
-    return $localdirectory;
-}
-
-######################################################
-# Creating a unique directory with pid extension	
-######################################################
-
-sub create_pid_directory
-{
-    my ($directory) = @_;
-    
-    $directory =~ s/\Q$installer::globals::separator\E\s*$//;
-    my $pid = $$;			# process id
-    my $time = time();		# time
-    
-    $directory = $directory . "_" . $pid . $time;
-
-    if ( ! -d $directory ) { create_directory($directory); }		
-    else { installer::exiter::exit_program("ERROR: Directory $directory already exists!", "create_pid_directory"); }
-    
-    return $directory;
-}
-
-##############################################################
-# Reading all files from a directory and its subdirectories	
-##############################################################
-
-sub read_complete_directory
-{
-    my ($directory, $pathstring, $filecollector) = @_;
-    
-    my @content = ();
-    opendir(DIR, $directory);
-    @content = readdir(DIR);
-    closedir(DIR);
-
-    my $onefile;
-    
-    foreach $onefile (@content)
-    {
-        if ((!($onefile eq ".")) && (!($onefile eq "..")))
-        {
-            my $completefilename = $directory . $installer::globals::separator . $onefile;
-            my $sep = "";
-            if ( $pathstring ne "" ) { $sep = $installer::globals::separator; }
-
-            if ( ! -d $completefilename ) 	# only files, no directories
-            {
-                my $content = $pathstring . $sep . $onefile;
-                push(@{$filecollector}, $content);
-            }
-            else  # recursive for directories
-            {
-                my $newpathstring = $pathstring . $sep . $onefile;
-                read_complete_directory($completefilename, $newpathstring, $filecollector);
-            }
-        }
-    }
-}
-
-##############################################################
-# Reading all files from a directory and its subdirectories
-# Version 2	
-##############################################################
-
-sub read_full_directory {
-    my ( $currentdir, $pathstring, $collector ) = @_;
-    my $item;
-    my $fullname;
-    local *DH;
-
-    unless (opendir(DH, $currentdir))
-    {
-        return;
-    }
-    while (defined ($item = readdir(DH)))
-    {
-        next if($item eq "." or $item eq "..");
-        $fullname = $currentdir . $installer::globals::separator . $item;
-        my $sep = "";
-        if ( $pathstring ne "" ) { $sep = $installer::globals::separator; }
-
-        if( -d $fullname)
-        {
-            my $newpathstring = $pathstring . $sep . $item;
-            read_full_directory($fullname, $newpathstring, $collector) if(-d $fullname);
-        }
-        else
-        {
-            my $content = $pathstring . $sep . $item;
-            push(@{$collector}, $content);
-        }
-    }
-    closedir(DH);
-    return 
-}
-
-##############################################################
-# Removing all empty directories below a specified directory
-##############################################################
-
-sub remove_empty_dirs_in_folder
-{
-    my ( $dir ) = @_;
-
-    my @content = ();
-    my $infoline = "";
-    
-    $dir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    if ( -d $dir )
-    {
-        opendir(DIR, $dir);
-        @content = readdir(DIR);
-        closedir(DIR);
-
-        my $oneitem;
-    
-        foreach $oneitem (@content)
-        {
-            if ((!($oneitem eq ".")) && (!($oneitem eq "..")))
-            {
-                my $item = $dir . $installer::globals::separator . $oneitem;
-
-                if ( -d $item ) # recursive
-                {
-                    remove_empty_dirs_in_folder($item);
-                }
-            }
-        }
-        
-        # try to remove empty directory		
-        my $returnvalue = rmdir $dir;
-
-        if ( $returnvalue )
-        {
-            $infoline = "Successfully removed empty dir $dir\n";
-            push(@installer::globals::logfileinfo, $infoline);
-        }
-        
-    }
-    
-}
-
-1;
diff --git a/solenv/bin/modules/installer/upx.pm b/solenv/bin/modules/installer/upx.pm
deleted file mode 100644
index 155564bba..000000000
--- a/solenv/bin/modules/installer/upx.pm
+++ /dev/null
@@ -1,156 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::upx;
-
-use installer::converter;
-use installer::existence;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::scriptitems;
-use installer::systemactions;
-
-#####################################################################
-# Checking whether a file has to be stripped
-#####################################################################
-
-sub is_upx_candidate
-{
-    my ( $filename, $onefile ) = @_;
-    
-    my $useupx = 0;
-    
-    if (( $filename =~ /\.so\s*$/ ) ||
-        ( $filename =~ /\.dll\s*$/ ) ||
-        ( $filename =~ /\.exe\s*$/ ) ||
-        ( $filename =~ /\.bin\s*$/ ))
-    {
-        my $styles = "";
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-        if ( ! ( $styles =~ /\bDONT_UPX\b/ )) { $useupx = 1; }
-    }
-    
-    return $useupx;		
-}
-
-#####################################################################
-# Checking whether a file has to be stripped
-#####################################################################
-
-sub do_upx
-{
-    my ( $filename ) = @_;
-    
-    my $compression = "9";
-    my $systemcall = $installer::globals::upxfile . " -" . $compression . " " . $filename;
-    
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "WARNING: Could not successfully upx $filename! Using original file.\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "SUCCESS: upx $filename!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    return $returnvalue;
-}
-
-#####################################################################
-# Using upx to decrease file size
-#####################################################################
-
-sub upx_on_libraries
-{
-    my ( $filelist, $languagestringref) = @_;
-
-    installer::logger::include_header_into_logfile("UPX'ing files:");
-    my $infoline = "";
-    
-    if ( ! $installer::globals::upx_in_path )
-    {
-        $infoline = "\n\nWarning: This is an UPX product, but upx was not found in PATH!\n\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Using upx: $installer::globals::upxfile\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        my $upxdirbase = installer::systemactions::create_directories("upx", $languagestringref);
-
-        if (! installer::existence::exists_in_array($upxdirbase, \@installer::globals::removedirs))
-        {
-            push(@installer::globals::removedirs, $upxdirbase);
-        }
-
-        for ( my $i = 0; $i <= $#{$filelist}; $i++ )
-        {
-            my $sourcefilename = ${$filelist}[$i]->{'sourcepath'};
-
-            if ( is_upx_candidate($sourcefilename, ${$filelist}[$i]) )
-            {
-                my $shortfilename = $sourcefilename;
-                installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortfilename);
-            
-                $infoline = "\nUpx: $shortfilename";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                # copy file into directory for stripped libraries
-                my $onelanguage = ${$filelist}[$i]->{'specificlanguage'};
-    
-                # files without language into directory "00"
-                if ($onelanguage eq "") { $onelanguage = "00"; }
-            
-                my $upxdir = $upxdirbase . $installer::globals::separator . $onelanguage;
-                installer::systemactions::create_directory($upxdir);	# creating language specific subdirectories
-
-                my $destfilename = $upxdir . $installer::globals::separator . $shortfilename;
-                installer::systemactions::copy_one_file($sourcefilename, $destfilename);
-
-                # change sourcepath in files collector
-                ${$filelist}[$i]->{'sourcepath'} = $destfilename;
-
-                # do upx on file	
-                my $return = do_upx($destfilename);
-            
-                # Using original file, if upx was not successful (no reason for error)
-                if ( $return ) { ${$filelist}[$i]->{'sourcepath'} = $sourcefilename; } 
-            }
-        }
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
deleted file mode 100644
index c071c21cc..000000000
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ /dev/null
@@ -1,899 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::admin;
-
-use File::Copy;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::pathanalyzer;
-use installer::systemactions;
-use installer::worker;
-use installer::windows::idtglobal;
-
-#################################################################################
-# Unpacking cabinet files with expand
-#################################################################################
-
-sub unpack_cabinet_file
-{
-    my ($cabfilename, $unpackdir) = @_;
-    
-    my $infoline = "Unpacking cabinet file: $cabfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $expandfile = "expand.exe";	# Has to be in the path
-
-    # expand.exe has to be located in the system directory.
-    # Cygwin has another tool expand.exe, that converts tabs to spaces. This cannot be used of course. 
-    # But this wrong expand.exe is typically in the PATH before this expand.exe, to unpack 
-    # cabinet files.
-
-    if ( $^O =~ /cygwin/i )
-    {
-        $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe);
-        chomp $expandfile;
-    }
-
-    my $expandlogfile = $unpackdir . $installer::globals::separator . "expand.log";
-
-    # exclude cabinet file
-
-    my $systemcall = "";
-    if ( $^O =~ /cygwin/i ) {
-        my $localunpackdir = qx{cygpath -w "$unpackdir"};
-        chomp ($localunpackdir);
-        $localunpackdir =~ s/\\/\\\\/g;
-        $cabfilename =~ s/\\/\\\\/g;
-        $cabfilename =~ s/\s*$//g;
-        $systemcall = $expandfile . " " . $cabfilename . " -F:\* " . $localunpackdir . " \> " . $expandlogfile;
-    }
-    else
-    {
-        $systemcall = $expandfile . " " . $cabfilename . " -F:\* " . $unpackdir . " \> " . $expandlogfile;
-    }
-
-    my $returnvalue = system($systemcall);
-    $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute $systemcall !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        installer::exiter::exit_program("ERROR: Could not extract cabinet file: $mergemodulehash->{'cabinetfile'} !", "change_file_table");
-    }
-    else
-    {
-        $infoline = "Success: Executed $systemcall successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-#################################################################################
-# Include tables into a msi database
-#################################################################################
-
-sub include_tables_into_pcpfile
-{
-    my ($fullmsidatabasepath, $workdir, $tables) = @_;
-
-    my $msidb = "msidb.exe";	# Has to be in the path
-    my $infoline = "";
-    my $systemcall = "";
-    my $returnvalue = "";
-
-    # Make all table 8+3 conform
-    my $alltables = installer::converter::convert_stringlist_into_array(\$tables, " ");
-    
-    for ( my $i = 0; $i <= $#{$alltables}; $i++ )
-    {
-        my $tablename = ${$alltables}[$i];
-        $tablename =~ s/\s*$//;
-        my $namelength = length($tablename);
-        if ( $namelength > 8 )
-        {
-            my $newtablename = substr($tablename, 0, 8);	# name, offset, length
-            my $oldfile = $workdir . $installer::globals::separator . $tablename . ".idt";
-            my $newfile = $workdir . $installer::globals::separator . $newtablename . ".idt";
-            if ( -f $newfile ) { unlink $newfile; }
-            installer::systemactions::copy_one_file($oldfile, $newfile);
-            my $savfile = $oldfile . ".orig";
-            installer::systemactions::copy_one_file($oldfile, $savfile);
-        }
-    }
-
-    # Import of tables
-
-    $systemcall = $msidb . " -d " . $fullmsidatabasepath . " -f " . $workdir . " -i " . $tables;
-                            
-    $returnvalue = system($systemcall);
-
-    $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute $systemcall !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        installer::exiter::exit_program("ERROR: Could not include tables into msi database: $fullmsidatabasepath !", "include_tables_into_pcpfile");
-    }
-    else
-    {
-        $infoline = "Success: Executed $systemcall successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-#################################################################################
-# Extracting tables from msi database
-#################################################################################
-
-sub extract_tables_from_pcpfile
-{
-    my ($fullmsidatabasepath, $workdir, $tablelist) = @_;
-
-    my $msidb = "msidb.exe";	# Has to be in the path
-    my $infoline = "";
-    my $systemcall = "";
-    my $returnvalue = "";
-    
-    my $localfullmsidatabasepath = $fullmsidatabasepath;
-
-    # Export of all tables by using "*"
-
-    if ( $^O =~ /cygwin/i ) {
-        # Copying the msi database locally guarantees the format of the directory. 
-        # Otherwise it is defined in the file of UPDATE_DATABASE_LISTNAME 
-
-        my $msifilename = $localfullmsidatabasepath;
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$msifilename);
-        my $destdatabasename = $workdir . $installer::globals::separator . $msifilename;
-        installer::systemactions::copy_one_file($localfullmsidatabasepath, $destdatabasename);
-        $localfullmsidatabasepath = $destdatabasename;
-        
-        chomp( $localfullmsidatabasepath = qx{cygpath -w "$localfullmsidatabasepath"} ); 
-        chomp( $workdir = qx{cygpath -w "$workdir"} ); 
-
-        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-        $localfullmsidatabasepath =~ s/\\/\\\\/g;
-        $workdir =~ s/\\/\\\\/g;
-
-        # and if there are still slashes, they also need to be double backslash
-        $localfullmsidatabasepath =~ s/\//\\\\/g;
-        $workdir =~ s/\//\\\\/g;
-    }
-                            
-    $systemcall = $msidb . " -d " . $localfullmsidatabasepath . " -f " . $workdir . " -e $tablelist";
-    $returnvalue = system($systemcall);
-
-    $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute $systemcall !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        installer::exiter::exit_program("ERROR: Could not exclude tables from pcp file: $localfullmsidatabasepath !", "extract_tables_from_pcpfile");
-    }
-    else
-    {
-        $infoline = "Success: Executed $systemcall successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-################################################################################
-# Analyzing the content of Directory.idt
-#################################################################################
-
-sub analyze_directory_file
-{
-    my ($filecontent) = @_;
-    
-    my %table = ();
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if (( $i == 0 ) || ( $i == 1 ) || ( $i == 2 )) { next; }
-
-        if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my $dir = $1;
-            my $parent = $2;
-            my $name = $3;
-            
-            if ( $name =~ /^\s*(.*?)\s*\:\s*(.*?)\s*$/ ) { $name = $2; }
-            if ( $name =~ /^\s*(.*?)\s*\|\s*(.*?)\s*$/ ) { $name = $2; }
-            
-            my %helphash = ();
-            $helphash{'Directory_Parent'} = $parent;
-            $helphash{'DefaultDir'} = $name;
-            $table{$dir} = \%helphash;
-        }
-    }
-    
-    return \%table;	
-}
-
-#################################################################################
-# Analyzing the content of Component.idt
-#################################################################################
-
-sub analyze_component_file
-{
-    my ($filecontent) = @_;
-    
-    my %table = ();
-    
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if (( $i == 0 ) || ( $i == 1 ) || ( $i == 2 )) { next; }
-
-        if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my $component = $1;
-            my $dir = $3;
-            
-            $table{$component} = $dir;
-        }
-    }
-
-    return \%table;	
-}
-
-#################################################################################
-# Analyzing the full content of Component.idt
-#################################################################################
-
-sub analyze_keypath_component_file
-{
-    my ($filecontent) = @_;
-
-    my %keypathtable = ();
-    
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if (( $i == 0 ) || ( $i == 1 ) || ( $i == 2 )) { next; }
-
-        if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my $component = $1;
-            my $keypath = $6;
-
-            $keypathtable{$keypath} = $component;
-        }
-    }
-
-    return (\%keypathtable);
-
-}
-
-#################################################################################
-# Analyzing the content of Registry.idt
-#################################################################################
-
-sub analyze_registry_file
-{
-    my ($filecontent) = @_;
-    
-    my %table = ();
-    
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if (( $i == 0 ) || ( $i == 1 ) || ( $i == 2 )) { next; }
-
-        if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my $registry = $1;
-            my $root = $2;
-            my $key = $3;
-            my $name = $4;
-            my $value = $5;
-            my $component = $6;
-            
-            my %helphash = ();
-            $helphash{'Root'} = $root;
-            $helphash{'Key'} = $key;
-            $helphash{'Name'} = $name;
-            $helphash{'Value'} = $value;
-            $helphash{'Component'} = $component;
-
-            $table{$registry} = \%helphash;
-        }
-    }
-
-    return \%table;		
-}
-
-#################################################################################
-# Analyzing the content of File.idt
-#################################################################################
-
-sub analyze_file_file
-{
-    my ($filecontent) = @_;
-    
-    my %table = ();
-    my %fileorder = ();
-    my $maxsequence = 0;
-    
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if (( $i == 0 ) || ( $i == 1 ) || ( $i == 2 )) { next; }
-
-        if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my $file = $1;
-            my $comp = $2;
-            my $filename = $3;
-            my $sequence = $8;
-
-            if ( $filename =~ /^\s*(.*?)\s*\|\s*(.*?)\s*$/ ) { $filename = $2; }
-            
-            my %helphash = ();
-            $helphash{'Component'} = $comp;
-            $helphash{'FileName'} = $filename;
-            $helphash{'Sequence'} = $sequence;
-
-            $table{$file} = \%helphash;
-            
-            $fileorder{$sequence} = $file;
-            
-            if ( $sequence > $maxsequence ) { $maxsequence = $sequence; }
-        }
-    }
-
-    return (\%table, \%fileorder, $maxsequence);
-}
-
-####################################################################################
-# Recursively creating the directory tree
-####################################################################################
-
-sub create_directory_tree
-{
-    my ($parent, $pathcollector, $fulldir, $dirhash) = @_;	
-
-    foreach my $dir ( keys %{$dirhash} )
-    {
-        if (( $dirhash->{$dir}->{'Directory_Parent'} eq $parent ) && ( $dirhash->{$dir}->{'DefaultDir'} ne "." ))
-        {
-            my $dirname = $dirhash->{$dir}->{'DefaultDir'};
-            # Create the directory
-            my $newdir = $fulldir . $installer::globals::separator . $dirname;
-            if ( ! -f $newdir ) { mkdir $newdir; }
-            # Saving in collector
-            $pathcollector->{$dir} = $newdir;
-            # Iteration
-            create_directory_tree($dir, $pathcollector, $newdir, $dirhash);
-        }
-    }
-}
-
-####################################################################################
-# Creating the directory tree
-####################################################################################
-
-sub create_directory_structure
-{
-    my ($dirhash, $targetdir) = @_;
-    
-    my %fullpathhash = ();
-    
-    my @startparents = ("TARGETDIR", "INSTALLLOCATION");
-    
-    foreach $dir (@startparents) { create_directory_tree($dir, \%fullpathhash, $targetdir, $dirhash); }
-
-    # Also adding the pathes of the startparents
-    foreach $dir (@startparents)
-    {
-        if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} = $targetdir; }
-    }
-    
-    return \%fullpathhash;
-}
-
-####################################################################################
-# Copying files into installation set
-####################################################################################
-
-sub copy_files_into_directory_structure
-{
-    my ($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash) = @_;
-
-    my $unopkgfile = "";
-
-    for ( my $i = 1; $i <= $maxsequence; $i++ )
-    {
-        if ( exists($fileorder->{$i}) )
-        {
-            my $file = $fileorder->{$i};
-            if ( ! exists($filehash->{$file}->{'Component'}) ) { installer::exiter::exit_program("ERROR: Did not find component for file: \"$file\".", "copy_files_into_directory_structure"); }
-            my $component = $filehash->{$file}->{'Component'};
-            if ( ! exists($componenthash->{$component}) ) { installer::exiter::exit_program("ERROR: Did not find directory for component: \"$component\".", "copy_files_into_directory_structure"); }
-            my $dirname = $componenthash->{$component};
-            if ( ! exists($fullpathhash->{$dirname}) ) { installer::exiter::exit_program("ERROR: Did not find full directory path for dir: \"$dirname\".", "copy_files_into_directory_structure"); }
-            my $destdir = $fullpathhash->{$dirname};
-            if ( ! exists($filehash->{$file}->{'FileName'}) ) { installer::exiter::exit_program("ERROR: Did not find \"FileName\" for file: \"$file\".", "copy_files_into_directory_structure"); }
-            my $destfile = $filehash->{$file}->{'FileName'};
-
-            $destfile = $destdir . $installer::globals::separator . $destfile;
-            my $sourcefile = $unpackdir . $installer::globals::separator . $file;
-            
-            if ( ! -f $sourcefile )
-            {
-                # It is possible, that this was an unpacked file
-                # Looking in the dirhash, to find the subdirectory in the installation set (the id is $dirname)
-                # subdir is not recursively analyzed, only one directory.
-                
-                my $oldsourcefile = $sourcefile;			
-                my $subdir = "";
-                if ( exists($dirhash->{$dirname}->{'DefaultDir'}) ) { $subdir = $dirhash->{$dirname}->{'DefaultDir'} . $installer::globals::separator; }
-                my $realfilename = $filehash->{$file}->{'FileName'};
-                my $localinstalldir = $installdir;
-                
-                $localinstalldir =~ s/\\\s*$//;
-                $localinstalldir =~ s/\/\s*$//;
-                
-                $sourcefile = $localinstalldir . $installer::globals::separator . $subdir . $realfilename;
-                
-                if ( ! -f $sourcefile )
-                {
-                    installer::exiter::exit_program("ERROR: File not found: \"$oldsourcefile\" (or \"$sourcefile\").", "copy_files_into_directory_structure");
-                }
-            }
-
-            my $copyreturn = copy($sourcefile, $destfile);
-
-            if ( ! $copyreturn)	# only logging problems
-            {
-                my $infoline = "ERROR: Could not copy $sourcefile to $destfile (insufficient disc space for $destfile ?)\n";
-                $returnvalue = 0;
-                push(@installer::globals::logfileinfo, $infoline);
-                installer::exiter::exit_program($infoline, "copy_files_into_directory_structure");
-            }
-
-            if ( $destfile =~ /unopkg\.exe\s*$/ ) { $unopkgfile = $destfile; }
-        }
-    }
-    
-    return $unopkgfile;
-}
-
-
-###############################################################
-# Setting the time string for the 
-# Summary Information stream in the 
-# msi database of the admin installations.
-###############################################################
-
-sub get_sis_time_string
-{	
-    # Syntax: <yyyy/mm/dd hh:mm:ss>
-    my $second = (localtime())[0];
-    my $minute = (localtime())[1];
-    my $hour = (localtime())[2];
-    my $day = (localtime())[3];
-    my $month = (localtime())[4];
-    my $year = 1900 + (localtime())[5];
-
-    $month++; # zero based month
-
-    if ( $second < 10 ) { $second = "0" . $second; }
-    if ( $minute < 10 ) { $minute = "0" . $minute; }
-    if ( $hour < 10 ) { $hour = "0" . $hour; }
-    if ( $day < 10 ) { $day = "0" . $day; }
-    if ( $month < 10 ) { $month = "0" . $month; }
-    
-    my $timestring = $year . "/" . $month . "/" . $day . " " . $hour . ":" . $minute . ":" . $second;
-        
-    return $timestring;
-}
-
-###############################################################
-# Windows registry entries containing properties are not set
-# correctly during msp patch process. The properties are 
-# empty or do get their default values. This destroys the 
-# values of many entries in Windows registry.
-# This can be fixed by removing all entries in Registry table,
-# containing a property before starting msimsp.exe.
-###############################################################
-
-sub remove_properties_from_registry_table
-{
-    my ($registryhash, $componentkeypathhash, $registryfilecontent) = @_;
-
-    installer::logger::include_timestamp_into_logfile("\nPerformance Info: Start remove_properties_from_registry_table");
-    
-    my @registrytable = ();
-    
-    # Registry hash
-    # Collecting all RegistryItems with values containing a property: [...]
-    # To which component do they belong
-    # Is this after removal an empty component? Create a replacement, so that
-    # no Component has to be removed.
-    # Is this RegistryItem a KeyPath of a component. Then it cannot be removed.
-    
-    my %problemitems = ();
-    my %problemcomponents = ();
-    my %securecomponents = ();
-    my $changevalue = "";
-    my $changeroot = "";
-    my $infoline = "";
-
-    my $newitemcounter = 0;
-    my $olditemcounter = 0;
-    
-    foreach my $regitem ( keys %{$registryhash} )
-    {
-        my $value = "";
-        if ( exists($registryhash->{$regitem}->{'Value'}) ) { $value = $registryhash->{$regitem}->{'Value'}; }
-
-        if ( $value =~ /^.*(\[.*?\]).*$/ )
-        {
-            my $property = $1;
-            
-            # Collecting registry item
-            $problemitems{$regitem} = 1;	# "1" -> can be removed
-            if ( exists($componentkeypathhash->{$regitem}) ) { $problemitems{$regitem} = 2; } 	# "2" -> cannot be removed, KeyPath
-            
-            # Collecting component (and number of problematic registry items
-            # my $component = $registryhash->{$regitem}->{'Component'};
-            # if ( exists($problemcomponents{$regitem}) ) { $problemcomponents{$regitem} = $problemcomponents{$regitem} + 1; }
-            # else { $problemcomponents{$regitem} = 1; }
-        }
-        else
-        {
-            # Collecting all components with secure regisry items
-            my $component = "";
-            if ( exists($registryhash->{$regitem}->{'Component'}) ) { $component = $registryhash->{$regitem}->{'Component'}; }
-            if ( $component eq "" ) { installer::exiter::exit_program("ERROR: Did not find component for registry item \"$regitem\".", "remove_properties_from_registry_table"); }
-            $securecomponents{$component} = 1;
-        }
-        
-        # Searching for change value
-        my $localkey = "";
-        if ( exists($registryhash->{$regitem}->{'Key'}) ) { $localkey = $registryhash->{$regitem}->{'Key'}; }
-        if (( $localkey =~ /^\s*(Software\\.*\\)StartMenu\s*$/ ) && ( $changevalue eq "" ))
-        {
-            $changevalue = $1;
-            $changeroot = $registryhash->{$regitem}->{'Root'};
-        }	
-        
-        $olditemcounter++;	
-    }
-    
-    my $removecounter = 0;
-    my $renamecounter = 0;
-    
-    foreach my $regitem ( keys %{$registryhash} )
-    {
-        my $value = "";
-        if ( exists($registryhash->{$regitem}->{'Value'}) ) { $value = $registryhash->{$regitem}->{'Value'}; }
-
-        if ( $value =~ /^.*(\[.*?\]).*$/ )
-        {
-            # Removing registry items, that are no KeyPath and that belong to components,
-            # that have other secure registry items.
-
-            my $component = "";
-            if ( exists($registryhash->{$regitem}->{'Component'}) ) { $component = $registryhash->{$regitem}->{'Component'}; }
-            if ( $component eq "" ) { installer::exiter::exit_program("ERROR: Did not find component for registry item (2) \"$regitem\".", "remove_properties_from_registry_table"); }
-
-            if (( $problemitems{$regitem} == 1 ) && ( exists($securecomponents{$component}) ))
-            {
-                # remove complete registry item
-                delete($registryhash->{$regitem});
-                $removecounter++;
-                $infoline = "Removing registry item: $regitem : $value\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
-            else
-            {
-                # Changing values of registry items, that are KeyPath or that contain to
-                # components with only unsecure registry items.
-    
-                if (( $problemitems{$regitem} == 2 ) || ( ! exists($securecomponents{$component}) ))
-                {
-                    # change value of registry item
-                    if ( $changevalue eq "" ) { installer::exiter::exit_program("ERROR: Did not find good change value for registry items", "remove_properties_from_registry_table"); }
-
-                    my $oldkey = "";
-                    if ( exists($registryhash->{$regitem}->{'Key'}) ) { $oldkey = $registryhash->{$regitem}->{'Key'}; };
-                    my $oldname = ""; 
-                    if ( exists($registryhash->{$regitem}->{'Name'}) ) { $oldname = $registryhash->{$regitem}->{'Name'}; }
-                    my $oldvalue = "";
-                    if ( exists($registryhash->{$regitem}->{'Value'}) ) { $oldvalue = $registryhash->{$regitem}->{'Value'}; }
-                    
-                    $registryhash->{$regitem}->{'Key'} = $changevalue . "RegistryItem";
-                    $registryhash->{$regitem}->{'Root'} = $changeroot;
-                    $registryhash->{$regitem}->{'Name'} = $regitem;
-                    $registryhash->{$regitem}->{'Value'} = 1;
-                    $renamecounter++;
-
-                    $infoline = "Changing registry item: $regitem\n";
-                    $infoline = "Old: $oldkey : $oldname : $oldvalue\n";
-                    $infoline = "New: $registryhash->{$regitem}->{'Key'} : $registryhash->{$regitem}->{'Name'} : $registryhash->{$regitem}->{'Value'}\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-            }
-        }
-    }
-
-    $infoline = "Number of removed registry items: $removecounter\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "Number of changed registry items: $renamecounter\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    
-    # Creating the new content of Registry table
-    # First three lines from $registryfilecontent
-    # All further files from changed $registryhash
-    
-    for ( my $i = 0; $i <= 2; $i++ ) { push(@registrytable, ${$registryfilecontent}[$i]); }
-
-    foreach my $regitem ( keys %{$registryhash} )
-    {
-        my $root = "";
-        if ( exists($registryhash->{$regitem}->{'Root'}) ) { $root = $registryhash->{$regitem}->{'Root'}; }
-        else { installer::exiter::exit_program("ERROR: Did not find root in registry table for item: \"$regitem\".", "remove_properties_from_registry_table"); }
-        my $localkey = "";
-        if ( exists($registryhash->{$regitem}->{'Key'}) ) { $localkey = $registryhash->{$regitem}->{'Key'}; }
-        my $name = "";
-        if ( exists($registryhash->{$regitem}->{'Name'}) ) { $name = $registryhash->{$regitem}->{'Name'}; }
-        my $value = "";
-        if ( exists($registryhash->{$regitem}->{'Value'}) ) { $value = $registryhash->{$regitem}->{'Value'}; }
-        my $comp = "";
-        if ( exists($registryhash->{$regitem}->{'Component'}) ) { $comp = $registryhash->{$regitem}->{'Component'}; }
-        
-        my $oneline = $regitem . "\t" . $root . "\t" . $localkey . "\t" . $name . "\t" . $value . "\t" . $comp . "\n";
-        push(@registrytable, $oneline);
-
-        $newitemcounter++;
-    }
-
-    $infoline = "Number of registry items: $newitemcounter. Old value: $olditemcounter.\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    installer::logger::include_timestamp_into_logfile("\nPerformance Info: End remove_properties_from_registry_table");
-    
-    return (\@registrytable);
-}
-
-###############################################################
-# Writing content of administrative installations into 
-# Summary Information Stream of msi database. 
-# This is required for example for following
-# patch processes using Windows Installer service.
-###############################################################
-
-sub write_sis_info
-{
-    my ($msidatabase) = @_ ;
-    
-    if ( ! -f $msidatabase ) { installer::exiter::exit_program("ERROR: Cannot find file $msidatabase", "write_sis_info"); }
-
-    my $msiinfo = "msiinfo.exe";	# Has to be in the path
-    my $infoline = "";
-    my $systemcall = "";
-    my $returnvalue = "";
-
-    # Required setting for administrative installations:
-    # -w 4   (source files are unpacked),  wordcount
-    # -s <date of admin installation>, LastPrinted, Syntax: <yyyy/mm/dd hh:mm:ss>
-    # -l <person_making_admin_installation>, LastSavedBy
-    
-    my $wordcount = 4;  # Unpacked files
-    my $lastprinted = get_sis_time_string();
-    my $lastsavedby = "Installer";
-
-    my $localmsidatabase = $msidatabase;
-    
-    if( $^O =~ /cygwin/i )
-    {
-        $localmsidatabase = qx{cygpath -w "$localmsidatabase"};
-        $localmsidatabase =~ s/\\/\\\\/g;
-        $localmsidatabase =~ s/\s*$//g;
-    }
-                            
-    $systemcall = $msiinfo . " " . "\"" . $localmsidatabase . "\"" . " -w " . $wordcount . " -s " . "\"" . $lastprinted . "\"" . " -l $lastsavedby";
-    push(@installer::globals::logfileinfo, $systemcall);
-    $returnvalue = system($systemcall);
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute $systemcall !\n";
-        push(@installer::globals::logfileinfo, $infoline);
-        installer::exiter::exit_program($infoline, "write_sis_info");
-    }	
-}
-
-####################################################
-# Detecting the directory with extensions
-####################################################
-
-sub get_extensions_dir
-{
-    my ( $unopkgfile ) = @_;
-    
-    my $localbranddir = $unopkgfile;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$localbranddir); # "program" dir in brand layer
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$localbranddir); # root dir in brand layer
-    $localbranddir =~ s/\Q$installer::globals::separator\E\s*$//;
-    my $extensiondir = $localbranddir . $installer::globals::separator . "share" . $installer::globals::separator . "extensions";
-    
-    return $extensiondir;	
-}
-
-##############################################################
-# Removing all empty directories below a specified directory
-##############################################################
-
-sub remove_empty_dirs_in_folder
-{
-    my ( $dir, $firstrun ) = @_;
-
-    if ( $firstrun )
-    {
-        print "Removing superfluous directories\n";
-    }
-
-    my @content = ();
-    
-    $dir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    if ( -d $dir )
-    {
-        opendir(DIR, $dir);
-        @content = readdir(DIR);
-        closedir(DIR);
-
-        my $oneitem;
-    
-        foreach $oneitem (@content)
-        {
-            if ((!($oneitem eq ".")) && (!($oneitem eq "..")))
-            {
-                my $item = $dir . $installer::globals::separator . $oneitem;
-
-                if ( -d $item ) # recursive
-                {
-                    remove_empty_dirs_in_folder($item, 0);
-                }
-            }
-        }
-        
-        # try to remove empty directory	
-        my $returnvalue = rmdir $dir;
-    }
-}
-
-####################################################################################
-# Simulating an administrative installation
-####################################################################################
-
-sub make_admin_install
-{
-    my ($databasepath, $targetdir) = @_;
-
-    # Create helper directory
-
-    installer::logger::print_message( "... installing $databasepath in directory $targetdir ...\n" );
-
-    my $helperdir = $targetdir . $installer::globals::separator . "installhelper";
-    installer::systemactions::create_directory($helperdir);
-    
-    # Get File.idt, Component.idt and Directory.idt from database
-    
-    my $tablelist = "File Directory Component Registry";
-    extract_tables_from_pcpfile($databasepath, $helperdir, $tablelist);
-    
-    # Unpack all cab files into $helperdir, cab files must be located next to msi database
-    my $installdir = $databasepath;
-
-    if ( $^O =~ /cygwin/i ) { $installdir =~ s/\\/\//g; } # backslash to slash
-    
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$installdir);
-
-    if ( $^O =~ /cygwin/i ) { $installdir =~ s/\//\\/g; } # slash to backslash
-
-    my $databasefilename = $databasepath;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$databasefilename);
-
-    my $cabfiles = installer::systemactions::find_file_with_file_extension("cab", $installdir);
-    
-    if ( $#{$cabfiles} < 0 ) { installer::exiter::exit_program("ERROR: Did not find any cab file in directory $installdir", "make_admin_install"); }
-
-    # Set unpackdir
-    my $unpackdir = $helperdir . $installer::globals::separator . "unpack";
-    installer::systemactions::create_directory($unpackdir);
-
-    for ( my $i = 0; $i <= $#{$cabfiles}; $i++ )
-    {
-        my $cabfile = "";
-        if ( $^O =~ /cygwin/i )
-        {
-            $cabfile = $installdir . ${$cabfiles}[$i];
-        }
-        else
-        {
-            $cabfile = $installdir . $installer::globals::separator . ${$cabfiles}[$i];
-        }
-        unpack_cabinet_file($cabfile, $unpackdir);
-    }
-    
-    # Reading tables
-    my $filename = $helperdir . $installer::globals::separator . "Directory.idt";
-    my $filecontent = installer::files::read_file($filename);
-    my $dirhash = analyze_directory_file($filecontent);
-    
-    $filename = $helperdir . $installer::globals::separator . "Component.idt";
-    my $componentfilecontent = installer::files::read_file($filename);
-    my $componenthash = analyze_component_file($componentfilecontent);
-    
-    $filename = $helperdir . $installer::globals::separator . "File.idt";
-    $filecontent = installer::files::read_file($filename);
-    my ( $filehash, $fileorder, $maxsequence ) = analyze_file_file($filecontent);
-
-    # Creating the directory structure
-    my $fullpathhash = create_directory_structure($dirhash, $targetdir);
-
-    # Copying files
-    my $unopkgfile = copy_files_into_directory_structure($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash);
-    
-    my $msidatabase = $targetdir . $installer::globals::separator . $databasefilename;
-    installer::systemactions::copy_one_file($databasepath, $msidatabase);
-    
-    if ( $unopkgfile ne "" )
-    {
-        # Removing empty dirs in extension folder
-        my $extensionfolder = get_extensions_dir($unopkgfile);
-        if ( -d $extensionfolder ) { remove_empty_dirs_in_folder($extensionfolder, 1); }
-    }
-    
-    # Editing registry table because of wrong Property value
-    #	my $registryfilename = $helperdir . $installer::globals::separator . "Registry.idt";
-    #	my $componentfilename = $helperdir . $installer::globals::separator . "Component.idt";
-    #	my $componentkeypathhash = analyze_keypath_component_file($componentfilecontent);
-
-    #	my $registryfilecontent = installer::files::read_file($registryfilename);
-    #	my $registryhash = analyze_registry_file($registryfilecontent);
-
-    #	$registryfilecontent = remove_properties_from_registry_table($registryhash, $componentkeypathhash, $registryfilecontent);
-
-    #	installer::files::save_file($registryfilename, $registryfilecontent);
-    #	$tablelist = "Registry";
-    #	include_tables_into_pcpfile($msidatabase, $helperdir, $tablelist);
-    
-    # Saving info in Summary Information Stream of msi database (required for following patches)
-    write_sis_info($msidatabase);
-
-    return $msidatabase;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/assembly.pm b/solenv/bin/modules/installer/windows/assembly.pm
deleted file mode 100644
index 1a2869075..000000000
--- a/solenv/bin/modules/installer/windows/assembly.pm
+++ /dev/null
@@ -1,365 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::assembly;
-
-use installer::files;
-use installer::globals;
-use installer::worker;
-use installer::windows::idtglobal;
-
-##############################################################
-# Returning the first module of a file from the
-# comma separated list of modules.
-##############################################################
-
-sub get_msiassembly_feature
-{
-    my ( $onefile ) = @_;
-    
-    my $module = "";
-    
-    if ( $onefile->{'modules'} ) { $module = $onefile->{'modules'}; }
-    
-    # If modules contains a list of modules, only taking the first one.
-    
-    if ( $module =~ /^\s*(.*?)\,/ ) { $module = $1; }
-    
-    # Attention: Maximum feature length is 38!
-    installer::windows::idtglobal::shorten_feature_gid(\$module);
-
-    return $module;
-}
-
-##############################################################
-# Returning the component of a file.
-##############################################################
-
-sub get_msiassembly_component
-{
-    my ( $onefile ) = @_;
-    
-    my $component = "";
-    
-    $component = $onefile->{'componentname'};
-    
-    return $component;
-}
-
-##############################################################
-# Returning the file name as manifest file
-##############################################################
-
-sub get_msiassembly_filemanifest
-{
-    my ( $onefile ) = @_;
-    
-    my $filemanifest = "";
-
-    $filemanifest = $onefile->{'uniquename'};
-    
-    return $filemanifest;
-}
-
-
-##############################################################
-# Returning the file application
-##############################################################
-
-sub get_msiassembly_fileapplication
-{
-    my ( $onefile ) = @_;
-
-    my $fileapplication = "";	
-    
-    return $fileapplication;
-}
-
-##############################################################
-# Returning the file attributes
-##############################################################
-
-sub get_msiassembly_attributes
-{
-    my ( $onefile ) = @_;
-
-    my $fileattributes = "";
-    
-    if ( $onefile->{'Attributes'} ne "" ) { $fileattributes = $onefile->{'Attributes'}; }
-    
-    return $fileattributes;
-}
-
-##############################################################
-# Returning the file object for the msiassembly table.
-##############################################################
-
-sub get_msiassembly_file
-{
-    my ( $filesref, $filename ) = @_;
-
-    my $foundfile = 0;
-    my $onefile;
-    
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        $onefile = ${$filesref}[$i];
-        my $name = $onefile->{'Name'};
-        
-        if ( $name eq $filename )
-        {
-            $foundfile = 1;
-            last;	
-        }		
-    }
-
-    # It does not need to exist. For example products that do not contain the libraries.
-    if (! $foundfile ) { $onefile  = ""; }
-
-    return $onefile;
-}
-
-##############################################################
-# Returning the file object for the msiassembly table.
-##############################################################
-
-sub get_msiassembly_file_by_gid
-{
-    my ( $filesref, $gid ) = @_;
-
-    my $foundfile = 0;
-    my $onefile;
-    
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        $onefile = ${$filesref}[$i];
-        my $filegid = $onefile->{'gid'};
-        
-        if ( $filegid eq $gid )
-        {
-            $foundfile = 1;
-            last;	
-        }		
-    }
-
-    # It does not need to exist. For example products that do not contain the libraries.
-    if (! $foundfile ) { $onefile  = ""; }
-
-    return $onefile;
-}
-
-####################################################################################
-# Creating the file MsiAssembly.idt dynamically
-# Content: 
-# Component_	Feature_	File_Manifest	File_Application	Attributes
-# s72	s38	S72	S72	I2
-# MsiAssembly	Component_
-####################################################################################
-
-sub create_msiassembly_table
-{
-    my ($filesref, $basedir) = @_;
-
-    $installer::globals::msiassemblyfiles = installer::worker::collect_all_items_with_special_flag($filesref, "ASSEMBLY");
-
-    my @msiassemblytable = ();
-    
-    installer::windows::idtglobal::write_idt_header(\@msiassemblytable, "msiassembly");
-
-    # Registering all libraries listed in $installer::globals::msiassemblyfiles
-
-    for ( my $i = 0; $i <= $#{$installer::globals::msiassemblyfiles}; $i++ )
-    {
-        my $onefile = ${$installer::globals::msiassemblyfiles}[$i];
-        
-        my %msiassembly = ();
-        
-        $msiassembly{'Component_'} = get_msiassembly_component($onefile);
-        $msiassembly{'Feature_'} = get_msiassembly_feature($onefile);
-        $msiassembly{'File_Manifest'} = get_msiassembly_filemanifest($onefile);
-        $msiassembly{'File_Application'} = get_msiassembly_fileapplication($onefile);
-        $msiassembly{'Attributes'} = get_msiassembly_attributes($onefile);
-
-        my $oneline = $msiassembly{'Component_'} . "\t" . $msiassembly{'Feature_'} . "\t" . 
-                        $msiassembly{'File_Manifest'} . "\t" . $msiassembly{'File_Application'} . "\t" .
-                        $msiassembly{'Attributes'} . "\n";  
-
-        push(@msiassemblytable, $oneline);
-    }
-        
-    # Saving the file
-    
-    my $msiassemblytablename = $basedir . $installer::globals::separator . "MsiAssem.idt";
-    installer::files::save_file($msiassemblytablename ,\@msiassemblytable);
-    my $infoline = "Created idt file: $msiassemblytablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-}
-
-####################################################################################
-# Returning the name for the table MsiAssemblyName
-####################################################################################
-
-sub get_msiassemblyname_name
-{
-    ( $number ) = @_;
-    
-    my $name = "";
-    
-    if ( $number == 1 ) { $name = "name"; }
-    elsif ( $number == 2 ) { $name = "publicKeyToken"; }
-    elsif ( $number == 3 ) { $name = "version"; }
-    elsif ( $number == 4 ) { $name = "culture"; }
-    
-    return $name;
-}
-
-####################################################################################
-# Creating the file MsiAssemblyName.idt dynamically
-# Content: 
-# Component_	Name	Value
-# s72	s255	s255
-# MsiAssemblyName	Component_	Name
-####################################################################################
-
-sub create_msiassemblyname_table
-{
-    my ($filesref, $basedir) = @_;
-
-    my @msiassemblynametable = ();
-    
-    installer::windows::idtglobal::write_idt_header(\@msiassemblynametable, "msiassemblyname");
-
-    for ( my $i = 0; $i <= $#{$installer::globals::msiassemblyfiles}; $i++ )
-    {	
-        my $onefile = ${$installer::globals::msiassemblyfiles}[$i];
-
-        my $component = get_msiassembly_component($onefile);
-        my $oneline = "";
-
-        # Order: (Assembly)name, publicKeyToken, version, culture.
-
-        if ( $onefile->{'Assemblyname'} )
-        {
-            $oneline = $component . "\t" . "name" . "\t" . $onefile->{'Assemblyname'} . "\n";
-            push(@msiassemblynametable, $oneline);		
-        }
-
-        if ( $onefile->{'PublicKeyToken'} )
-        {
-            $oneline = $component . "\t" . "publicKeyToken" . "\t" . $onefile->{'PublicKeyToken'} . "\n";
-            push(@msiassemblynametable, $oneline);		
-        }
-
-        if ( $onefile->{'Version'} )
-        {
-            $oneline = $component . "\t" . "version" . "\t" . $onefile->{'Version'} . "\n";
-            push(@msiassemblynametable, $oneline);		
-        }
-
-        if ( $onefile->{'Culture'} )
-        {
-            $oneline = $component . "\t" . "culture" . "\t" . $onefile->{'Culture'} . "\n";
-            push(@msiassemblynametable, $oneline);		
-        }
-
-        if ( $onefile->{'ProcessorArchitecture'} )
-        {
-            $oneline = $component . "\t" . "processorArchitecture" . "\t" . $onefile->{'ProcessorArchitecture'} . "\n";
-            push(@msiassemblynametable, $oneline);		
-        }
-    }
-
-    # Saving the file
-    
-    my $msiassemblynametablename = $basedir . $installer::globals::separator . "MsiAsseN.idt";
-    installer::files::save_file($msiassemblynametablename ,\@msiassemblynametable);
-    my $infoline = "Created idt file: $msiassemblynametablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-    
-}
-
-####################################################################################
-# setting an installation condition for the assembly libraries saved in 
-# @installer::globals::msiassemblynamecontent
-####################################################################################
-
-sub add_assembly_condition_into_component_table
-{
-    my ($filesref, $basedir) = @_;
-
-    my $componenttablename = $basedir . $installer::globals::separator . "Componen.idt";
-    my $componenttable = installer::files::read_file($componenttablename);
-    my $changed = 0;
-    my $infoline = "";
-
-    for ( my $i = 0; $i <= $#{$installer::globals::msiassemblyfiles}; $i++ )
-    {
-        my $onefile = ${$installer::globals::msiassemblyfiles}[$i];
-        
-        my $filecomponent = get_msiassembly_component($onefile);
-    
-        for ( my $j = 0; $j <= $#{$componenttable}; $j++ )
-        {
-            my $oneline = ${$componenttable}[$j];
-
-            if ( $oneline =~ /(.*)\t(.*)\t(.*)\t(.*)\t(.*)\t(.*)/ )
-            {
-                my $component = $1;
-                my $componentid = $2;
-                my $directory = $3;
-                my $attributes = $4;
-                my $condition = $5;
-                my $keypath = $6;
-                
-                if ( $component eq $filecomponent )
-                {
-                    # setting the condition
-                    
-                    $condition = "DOTNET_SUFFICIENT=1";
-                    $oneline = $component . "\t" . $componentid . "\t" . $directory . "\t" . $attributes . "\t" . $condition . "\t" . $keypath . "\n";
-                    ${$componenttable}[$j] = $oneline;
-                    $changed = 1;
-                    $infoline = "Changing $componenttablename :\n"; 
-                    push(@installer::globals::logfileinfo, $infoline);
-                    $infoline = $oneline; 
-                    push(@installer::globals::logfileinfo, $infoline);
-                    last;			
-                }		
-            }
-        }
-    }
-
-    if ( $changed )
-    {
-        # Saving the file
-        installer::files::save_file($componenttablename ,$componenttable);
-        $infoline = "Saved idt file: $componenttablename\n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/binary.pm b/solenv/bin/modules/installer/windows/binary.pm
deleted file mode 100644
index b1bff4130..000000000
--- a/solenv/bin/modules/installer/windows/binary.pm
+++ /dev/null
@@ -1,77 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::binary;
-
-use installer::existence;
-use installer::files;
-use installer::globals;
-
-###########################################################################################################
-# Updating the table Binary dynamically with all files from $binarytablefiles
-# Content: 
-# Name	Data
-# s72	v0
-# Binary	Name
-###########################################################################################################
-
-sub update_binary_table
-{
-    my ($languageidtdir, $filesref, $binarytablefiles) = @_;
-
-    my $binaryidttablename = $languageidtdir . $installer::globals::separator . "Binary.idt";
-    my $binaryidttable = installer::files::read_file($binaryidttablename);
-
-    # Only the iconfiles, that are used in the shortcut table for the 
-    # FolderItems (entries in Windows startmenu) are added into the icon table.
-
-    for ( my $i = 0; $i <= $#{$binarytablefiles}; $i++ )
-    {
-        my $binaryfile = ${$binarytablefiles}[$i];
-        my $binaryfilename = $binaryfile->{'Name'};
-        my $binaryfiledata = $binaryfilename;
-        
-        $binaryfilename =~ s/\.//g;	 # removing "." in filename: "abc.dll" to "abcdll" in name column
-        
-        my %binary = ();
-
-        $binary{'Name'} = $binaryfilename;
-        $binary{'Data'} = $binaryfiledata;
-
-        my $oneline = $binary{'Name'} . "\t" . $binary{'Data'} . "\n";
-
-        push(@{$binaryidttable}, $oneline);		
-    }
-
-    # Saving the file
-    
-    installer::files::save_file($binaryidttablename ,$binaryidttable);
-    my $infoline = "Updated idt file: $binaryidttablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm
deleted file mode 100644
index c023aa6c5..000000000
--- a/solenv/bin/modules/installer/windows/component.pm
+++ /dev/null
@@ -1,532 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::component;
-
-use installer::converter;
-use installer::existence;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-use installer::windows::language;
-
-##############################################################
-# Returning a globally unique ID (GUID) for a component
-# If the component is new, a unique guid has to be created.
-# If the component already exists, the guid has to be 
-# taken from a list component <-> guid
-# Sample for a guid: {B68FD953-3CEF-4489-8269-8726848056E8}
-##############################################################
-
-sub get_component_guid
-{	
-    my ( $componentname, $componentidhashref ) = @_;
-    
-    # At this time only a template
-    my $returnvalue = "\{COMPONENTGUID\}";
-    
-    if (( $installer::globals::updatedatabase ) && ( exists($componentidhashref->{$componentname}) ))
-    {
-        $returnvalue = $componentidhashref->{$componentname};
-    }
-    
-    # Returning a ComponentID, that is assigned in scp project
-    if ( exists($installer::globals::componentid{$componentname}) )
-    {
-        $returnvalue = "\{" . $installer::globals::componentid{$componentname} . "\}";
-    }
-    
-    return $returnvalue;	
-}
-
-##############################################################
-# Returning the directory for a file component.
-##############################################################
-
-sub get_file_component_directory
-{
-    my ($componentname, $filesref, $dirref) = @_; 
-
-    my ($onefile, $component, $onedir, $hostname, $uniquedir);
-    my $found = 0;
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        $onefile = 	${$filesref}[$i];
-        $component = $onefile->{'componentname'};
-        
-        if ( $component eq $componentname )
-        {
-            $found = 1;
-            last;
-        }	
-    }
-    
-    if (!($found))
-    {
-        # This component can be ignored, if it exists in a version with extension "_pff" (this was renamed in file::get_sequence_for_file() )
-        my $ignore_this_component = 0;
-        my $origcomponentname = $componentname;
-        my $componentname = $componentname . "_pff";
-        
-        for ( my $j = 0; $j <= $#{$filesref}; $j++ )
-        {
-            $onefile = 	${$filesref}[$j];
-            $component = $onefile->{'componentname'};
-        
-            if ( $component eq $componentname )
-            {
-                $ignore_this_component = 1;
-                last;
-            }	
-        }
-        
-        if ( $ignore_this_component ) { return "IGNORE_COMP"; }
-        else { installer::exiter::exit_program("ERROR: Did not find component \"$origcomponentname\" in file collection", "get_file_component_directory"); }
-    }
-
-    my $localstyles = "";
-    
-    if ( $onefile->{'Styles'} ) { $localstyles = $onefile->{'Styles'}; }
-
-    if ( $localstyles =~ /\bFONT\b/ )	# special handling for font files
-    {
-        return $installer::globals::fontsfolder;
-    }
-    
-    my $destdir = "";
-    
-    if ( $onefile->{'Dir'} ) { $destdir = $onefile->{'Dir'}; }
-
-    if ( $destdir =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ )	# special handling for shellnew files
-    {
-        return $installer::globals::templatefolder;
-    }
-
-    if ( $destdir =~ /\bPREDEFINED_OSWINSHELLNEWDIR\b/ )
-    {
-        return "WindowsShellNewFolder";
-    }
-
-    my $destination = $onefile->{'destination'};
-    
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
-
-    $destination =~ s/\Q$installer::globals::separator\E\s*$//;
-    
-    # This path has to be defined in the directory collection at "HostName" 
-    
-    if ($destination eq "")		# files in the installation root
-    {
-        $uniquedir = "INSTALLLOCATION";
-    }		
-    else
-    {
-        $found = 0;
-    
-        for ( my $i = 0; $i <= $#{$dirref}; $i++ )
-        {
-            $onedir = 	${$dirref}[$i];
-            $hostname = $onedir->{'HostName'};
-        
-            if ( $hostname eq $destination )
-            {
-                $found = 1;
-                last;
-            }	
-        }
-
-        if (!($found))
-        {
-            installer::exiter::exit_program("ERROR: Did not find destination $destination in directory collection", "get_file_component_directory");
-        }
-    
-        $uniquedir = $onedir->{'uniquename'};
-        
-        if ( $uniquedir eq $installer::globals::officeinstalldirectory )
-        {
-            $uniquedir = "INSTALLLOCATION";		
-        }
-    }
-        
-    $onefile->{'uniquedirname'} = $uniquedir;		# saving it in the file collection
-    
-    return $uniquedir	
-}
-
-##############################################################
-# Returning the directory for a registry component.
-# This cannot be a useful value
-##############################################################
-
-sub get_registry_component_directory
-{
-    my $componentdir = "INSTALLLOCATION";
-    
-    return $componentdir;
-}
-
-##############################################################
-# Returning the attributes for a file component.
-# Always 8 in this first try?
-##############################################################
-
-sub get_file_component_attributes
-{
-    my ($componentname, $filesref, $allvariables) = @_;
-    
-    my $attributes;
-    
-    $attributes = 2;
-
-    # special handling for font files
-
-    my $onefile;
-    my $found = 0;
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        $onefile = 	${$filesref}[$i];
-        my $component = $onefile->{'componentname'};
-        
-        if ( $component eq $componentname )
-        {
-            $found = 1;
-            last;
-        }	
-    }
-
-    if (!($found))
-    {
-        installer::exiter::exit_program("ERROR: Did not find component in file collection", "get_file_component_attributes");
-    }
-
-    my $localstyles = "";
-    
-    if ( $onefile->{'Styles'} ) { $localstyles = $onefile->{'Styles'}; }
-
-    if ( $localstyles =~ /\bFONT\b/ )
-    {
-        $attributes = 16;	# font files will not be deinstalled
-    }
-
-    if ( $localstyles =~ /\bASSEMBLY\b/ )
-    {
-        $attributes = 0;	# Assembly files cannot run from source
-    }
-        
-    if (( $onefile->{'Dir'} =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ ) || ( $onefile->{'needs_user_registry_key'} ))
-    {
-        $attributes = 4;	# Files in shellnew dir and in non advertised startmenu entries must have user registry key as KeyPath
-    }
-    
-    # Adding 256, if this is a 64 bit installation set.
-    if (( $allvariables->{'64BITPRODUCT'} ) && ( $allvariables->{'64BITPRODUCT'} == 1 )) { $attributes = $attributes + 256; }
-
-    return $attributes	
-}
-
-##############################################################
-# Returning the attributes for a registry component.
-# Always 4, indicating, the keypath is a defined in 
-# table registry
-##############################################################
-
-sub get_registry_component_attributes
-{
-    my ($componentname, $allvariables) = @_;
-
-    my $attributes;
-    
-    $attributes = 4;
-
-    # Adding 256, if this is a 64 bit installation set.
-    if (( $allvariables->{'64BITPRODUCT'} ) && ( $allvariables->{'64BITPRODUCT'} == 1 )) { $attributes = $attributes + 256; }
-    
-    if ( exists($installer::globals::dontdeletecomponents{$componentname}) ) { $attributes = $attributes + 16; } 
-    
-    return $attributes	
-}
-
-##############################################################
-# Returning the conditions for a component.
-# This is important for language dependent components
-# in multilingual installation sets.
-##############################################################
-
-sub get_file_component_condition
-{
-    my ($componentname, $filesref) = @_;
-    
-    my $condition = "";
-
-    if (exists($installer::globals::componentcondition{$componentname}))
-    {
-        $condition = $installer::globals::componentcondition{$componentname};
-    }
-
-    # there can be also tree conditions for multilayer products
-    if (exists($installer::globals::treeconditions{$componentname}))
-    {
-        if ( $condition eq "" )
-        {
-            $condition = $installer::globals::treeconditions{$componentname};	
-        }
-        else
-        {
-            $condition = "($condition) And ($installer::globals::treeconditions{$componentname})";
-        }
-    }
-    
-    return $condition	
-}
-
-##############################################################
-# Returning the conditions for a registry component.
-##############################################################
-
-sub get_component_condition
-{
-    my ($componentname) = @_;
-    
-    my $condition;
-    
-    $condition = "";	# Always ?
-    
-    if (exists($installer::globals::componentcondition{$componentname}))
-    {
-        $condition = $installer::globals::componentcondition{$componentname};
-    }
-    
-    return $condition	
-}
-
-####################################################################
-# Returning the keypath for a component.
-# This will be the name of the first file/registry, found in the
-# collection $itemsref
-# Attention: This has to be the unique (file)name, not the 
-# real filename!
-####################################################################
-
-sub get_component_keypath
-{
-    my ($componentname, $itemsref, $componentidkeypathhashref) = @_;
-
-    my $oneitem;
-    my $found = 0;
-    my $infoline = "";
-
-    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
-    {
-        $oneitem = 	${$itemsref}[$i];
-        my $component = $oneitem->{'componentname'};
-        
-        if ( $component eq $componentname )
-        {
-            $found = 1;
-            last;
-        }
-    }
-    
-    if (!($found))
-    {
-        installer::exiter::exit_program("ERROR: Did not find component in file/registry collection, function get_component_keypath", "get_component_keypath");
-    }
-
-    my $keypath = $oneitem->{'uniquename'};	# "uniquename", not "Name" 
-    
-    # Special handling for updates from existing databases, because KeyPath must not change
-    if (( $installer::globals::updatedatabase ) && ( exists($componentidkeypathhashref->{$componentname}) ))
-    {
-        $keypath = $componentidkeypathhashref->{$componentname};
-        # -> check, if this is a valid key path?!
-        if ( $keypath ne $oneitem->{'uniquename'} )
-        {
-            # Warning: This keypath was changed because of info from old database
-            $infoline = "WARNING: The KeyPath for component \"$componentname\" was changed from \"$oneitem->{'uniquename'}\" to \"$keypath\" because of information from update database";
-            push(@installer::globals::logfileinfo, $infoline);
-        }
-    }
-    
-    # Special handling for components in PREDEFINED_OSSHELLNEWDIR. These components
-    # need as KeyPath a RegistryItem in HKCU
-    if ( $oneitem->{'userregkeypath'} ) { $keypath = $oneitem->{'userregkeypath'}; }
-
-    # saving it in the file and registry collection
-    $oneitem->{'keypath'} = $keypath;
-    
-    return $keypath
-}
-
-###################################################################
-# Creating the file Componen.idt dynamically
-# Content: 
-# Component ComponentId Directory_ Attributes Condition KeyPath
-###################################################################
-
-sub	create_component_table
-{
-    my ($filesref, $registryref, $dirref, $allfilecomponentsref, $allregistrycomponents, $basedir, $componentidhashref, $componentidkeypathhashref, $allvariables) = @_;
-
-    my @componenttable = ();
-
-    my ($oneline, $infoline);
-
-    installer::windows::idtglobal::write_idt_header(\@componenttable, "component");
-
-    # File components
-
-    for ( my $i = 0; $i <= $#{$allfilecomponentsref}; $i++ )
-    {
-        my %onecomponent = ();
-        
-        $onecomponent{'name'} = ${$allfilecomponentsref}[$i]; 
-        $onecomponent{'guid'} = get_component_guid($onecomponent{'name'}, $componentidhashref); 
-        $onecomponent{'directory'} = get_file_component_directory($onecomponent{'name'}, $filesref, $dirref);
-        if ( $onecomponent{'directory'} eq "IGNORE_COMP" ) { next; }
-        $onecomponent{'attributes'} = get_file_component_attributes($onecomponent{'name'}, $filesref, $allvariables); 
-        $onecomponent{'condition'} = get_file_component_condition($onecomponent{'name'}, $filesref); 
-        $onecomponent{'keypath'} = get_component_keypath($onecomponent{'name'}, $filesref, $componentidkeypathhashref); 
-
-        $oneline = $onecomponent{'name'} . "\t" . $onecomponent{'guid'} . "\t" . $onecomponent{'directory'} . "\t"  
-                . $onecomponent{'attributes'} . "\t" . $onecomponent{'condition'} . "\t" . $onecomponent{'keypath'} . "\n";
-
-        push(@componenttable, $oneline);
-    }	
-
-    # Registry components
-
-    for ( my $i = 0; $i <= $#{$allregistrycomponents}; $i++ )
-    {
-        my %onecomponent = ();
-        
-        $onecomponent{'name'} = ${$allregistrycomponents}[$i]; 
-        $onecomponent{'guid'} = get_component_guid($onecomponent{'name'}, $componentidhashref); 
-        $onecomponent{'directory'} = get_registry_component_directory();
-        $onecomponent{'attributes'} = get_registry_component_attributes($onecomponent{'name'}, $allvariables); 
-        $onecomponent{'condition'} = get_component_condition($onecomponent{'name'}); 
-        $onecomponent{'keypath'} = get_component_keypath($onecomponent{'name'}, $registryref, $componentidkeypathhashref); 
-
-        $oneline = $onecomponent{'name'} . "\t" . $onecomponent{'guid'} . "\t" . $onecomponent{'directory'} . "\t"  
-                . $onecomponent{'attributes'} . "\t" . $onecomponent{'condition'} . "\t" . $onecomponent{'keypath'} . "\n";
-
-        push(@componenttable, $oneline);
-    }
-
-    # Saving the file
-
-    my $componenttablename = $basedir . $installer::globals::separator . "Componen.idt";
-    installer::files::save_file($componenttablename ,\@componenttable);
-    $infoline = "Created idt file: $componenttablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-}
-
-####################################################################################
-# Returning a component for a scp module gid.
-# Pairs are saved in the files collector. 
-####################################################################################
-
-sub get_component_name_from_modulegid
-{
-    my ($modulegid, $filesref) = @_;
-
-    my $componentname = "";
-    
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {			
-        my $onefile = ${$filesref}[$i];
-
-        if ( $onefile->{'modules'} )
-        {
-            my $filemodules = $onefile->{'modules'};
-            my $filemodulesarrayref = installer::converter::convert_stringlist_into_array_without_newline(\$filemodules, ",");
-
-            if (installer::existence::exists_in_array($modulegid, $filemodulesarrayref))
-            {
-                $componentname = $onefile->{'componentname'};
-                last;
-            }
-        }
-    }
-    
-    return $componentname;
-}
-
-####################################################################################
-# Updating the file Environm.idt dynamically
-# Content: 
-# Environment Name Value Component_
-####################################################################################
-
-sub set_component_in_environment_table
-{
-    my ($basedir, $filesref) = @_;
-
-    my $infoline = "";
-
-    my $environmentfilename = $basedir . $installer::globals::separator . "Environm.idt";
-    
-    if ( -f $environmentfilename )	# only do something, if file exists
-    {
-        my $environmentfile = installer::files::read_file($environmentfilename);
-
-        for ( my $i = 3; $i <= $#{$environmentfile}; $i++ )	# starting in line 4 of Environm.idt
-        {
-            if ( ${$environmentfile}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-            {
-                my $modulegid = $4; # in Environment table a scp module gid can be used as component replacement
-
-                my $componentname = get_component_name_from_modulegid($modulegid, $filesref);
-
-                if ( $componentname )	# only do something if a component could be found
-                {
-                    $infoline = "Updated Environment table:\n"; 
-                    push(@installer::globals::logfileinfo, $infoline);
-                    $infoline = "Old line: ${$environmentfile}[$i]\n"; 
-                    push(@installer::globals::logfileinfo, $infoline);
-
-                    ${$environmentfile}[$i] =~ s/$modulegid/$componentname/;
-
-                    $infoline = "New line: ${$environmentfile}[$i]\n"; 
-                    push(@installer::globals::logfileinfo, $infoline);
-
-                }
-            }
-        }
-
-        # Saving the file
-    
-        installer::files::save_file($environmentfilename ,$environmentfile);
-        $infoline = "Updated idt file: $environmentfilename\n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm
deleted file mode 100644
index c677b9085..000000000
--- a/solenv/bin/modules/installer/windows/createfolder.pm
+++ /dev/null
@@ -1,154 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::createfolder;
-
-use installer::existence;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-##############################################################
-# Returning directory for createfolder table.
-##############################################################
-
-sub get_createfolder_directory
-{
-    my ($onedir) = @_;
-
-    my $uniquename = $onedir->{'uniquename'};
-    
-    return $uniquename;
-}
-
-##############################################################
-# Searching the correct file for language pack directories.
-##############################################################
-
-sub get_languagepack_file
-{
-    my ($filesref, $onedir) = @_;
-
-    my $language = $onedir->{'specificlanguage'};
-    my $foundfile = 0;
-    my $onefile = "";
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        $onefile = ${$filesref}[$i];
-    
-        if ( $onefile->{'specificlanguage'} eq $onedir->{'specificlanguage'} )
-        {
-            $foundfile = 1;
-            last;
-        }
-    }
-    
-    if ( ! $foundfile ) { installer::exiter::exit_program("ERROR: No file with correct language found (language pack build)!", "get_languagepack_file"); }
-    
-    return $onefile;
-}
-
-##############################################################
-# Returning component for createfolder table.
-##############################################################
-
-sub get_createfolder_component
-{
-    my ($onedir, $filesref, $allvariableshashref) = @_;
-
-    # Directories do not belong to a module.
-    # Therefore they can only belong to the root module and
-    # will be added to a component at the root module.
-    # All directories will be added to the component 
-    # containing the file $allvariableshashref->{'GLOBALFILEGID'}
-
-    if ( ! $allvariableshashref->{'GLOBALFILEGID'} ) { installer::exiter::exit_program("ERROR: GLOBALFILEGID must be defined in list file!", "get_createfolder_component"); }
-    if (( $installer::globals::patch ) && ( ! $allvariableshashref->{'GLOBALFILEGID'} )) { installer::exiter::exit_program("ERROR: GLOBALPATCHFILEGID must be defined in list file!", "get_createfolder_component"); }
-
-    my $globalfilegid = $allvariableshashref->{'GLOBALFILEGID'};
-    if ( $installer::globals::patch ) { $globalfilegid = $allvariableshashref->{'GLOBALPATCHFILEGID'}; }
-
-    my $onefile = "";
-    if ( $installer::globals::languagepack ) { $onefile = get_languagepack_file($filesref, $onedir); }
-    elsif ( $installer::globals::helppack ) { $onefile = installer::existence::get_specified_file($filesref, 'gid_File_Help_Common_Zip'); }
-    else { $onefile = installer::existence::get_specified_file($filesref, $globalfilegid); }
-
-    return $onefile->{'componentname'};
-}
-
-####################################################################################
-# Creating the file CreateFo.idt dynamically for creation of empty directories
-# Content: 
-# Directory_ Component_
-####################################################################################
-
-sub create_createfolder_table
-{
-    my ($dirref, $filesref, $basedir, $allvariableshashref) = @_;
-
-    my @createfoldertable = ();
-
-    my $infoline;
-    
-    installer::windows::idtglobal::write_idt_header(\@createfoldertable, "createfolder");
-
-    for ( my $i = 0; $i <= $#{$dirref}; $i++ )
-    {
-        my $onedir = ${$dirref}[$i];
-
-        # language packs and help packs get only language dependent directories
-        if (( $installer::globals::languagepack ) ||  ( $installer::globals::languagepack ) && ( $onedir->{'specificlanguage'} eq "" )) { next };
-
-        my $styles = "";
-        
-        if ( $onedir->{'Styles'} ) { $styles = $onedir->{'Styles'}; }
-
-        if ( $styles =~ /\bCREATE\b/ )
-        {
-            my %directory = ();
-
-            $directory{'Directory_'} = get_createfolder_directory($onedir); 		
-            $directory{'Component_'} = get_createfolder_component($onedir, $filesref, $allvariableshashref); 		
-
-            my $oneline = $directory{'Directory_'} . "\t" . $directory{'Component_'} . "\n";
-
-            push(@createfoldertable, $oneline);
-        }
-    }
-
-    # Saving the file
-    
-    my $createfoldertablename = $basedir . $installer::globals::separator . "CreateFo.idt";
-    installer::files::save_file($createfoldertablename ,\@createfoldertable);
-    $infoline = "Created idt file: $createfoldertablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
deleted file mode 100644
index 107ec018c..000000000
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ /dev/null
@@ -1,566 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::directory;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::pathanalyzer;
-use installer::windows::idtglobal;
-
-##############################################################
-# Collecting all directory trees in global hash
-##############################################################
-
-sub collectdirectorytrees
-{
-    my ( $directoryref ) = @_;
-
-    for ( my $i = 0; $i <= $#{$directoryref}; $i++ )
-    {
-        my $onedir = ${$directoryref}[$i];
-        my $styles = "";
-        if ( $onedir->{'Styles'} ) { $styles = $onedir->{'Styles'}; }
-
-        if ( $styles ne "" )
-        {
-            foreach my $treestyle ( keys %installer::globals::treestyles )
-            {
-                if ( $styles =~ /\b$treestyle\b/ )
-                {
-                    my $hostname = $onedir->{'HostName'};
-                    # -> hostname is the key, the style the value!
-                    $installer::globals::hostnametreestyles{$hostname} = $treestyle;
-                }
-            }
-        }
-    }
-}
-
-##############################################################
-# Overwriting global programfilesfolder, if required
-##############################################################
-
-sub overwrite_programfilesfolder
-{
-    my ( $allvariables ) = @_;
-    
-    if ( $allvariables->{'PROGRAMFILESFOLDERNAME'} )
-    {
-        $installer::globals::programfilesfolder = $allvariables->{'PROGRAMFILESFOLDERNAME'};
-    }
-}
-
-##############################################################
-# Maximum length of directory name is 72.
-# Taking care of underlines, which are the separator.
-##############################################################
-
-sub make_short_dir_version
-{
-    my ($longstring, $length, $displayname) = @_;
-    
-    my $shortstring = "";
-    my $infoline = "";
-    my $savestring = $longstring;
-    
-    # Splitting the string at each "underline" and allowing only $length characters per directory name.
-    # Checking also uniqueness and length.
-    
-    my $stringarray = installer::converter::convert_stringlist_into_array_without_newline(\$longstring, "_");
-    
-    foreach my $onestring ( @{$stringarray} )
-    {
-        my $partstring = "";
-        
-        if ( $onestring =~ /\-/ )
-        {
-            my $localstringarray = installer::converter::convert_stringlist_into_array_without_newline(\$onestring, "-");
-            foreach my $onelocalstring ( @{$localstringarray} )
-            {
-                if ( length($onelocalstring) > $length ) { $onelocalstring = substr($onelocalstring, 0, $length); }
-                $partstring = $partstring . "-" . $onelocalstring;
-            }
-            $partstring =~ s/^\s*\-//;
-        }
-        else
-        {
-            if ( length($onestring) > $length ) { $partstring = substr($onestring, 0, $length); }
-            else { $partstring = $onestring; }
-        }
-
-        $shortstring = $shortstring . "_" . $partstring;
-    }
-
-    $shortstring =~ s/^\s*\_//;
-
-    if ( length($shortstring) > 72 )
-    {
-        my $shortlength = length($shortstring);
-        $infoline = "WARNING: Failed to create unique directory name with less than 72 characters: \"$displayname\" ($shortstring ($shortlength)).\n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
-    return $shortstring;
-}
-
-##############################################################
-# Adding unique directory names to the directory collection
-##############################################################
-
-my $already_checked_the_frigging_directories_for_uniqueness = 0;
-
-sub create_unique_directorynames
-{
-    my ($directoryref, $allvariables) = @_;
-
-    $installer::globals::officeinstalldirectoryset = 0;
-    
-    my %conversionhash = ();
-    my $infoline = "";
-    my $errorcount = 0;
-
-    for ( my $i = 0; $i <= $#{$directoryref}; $i++ )
-    {
-        my $onedir = ${$directoryref}[$i];
-        my $hostname = $onedir->{'HostName'};
-
-        my $uniquename = $hostname;
-        my $styles = "";
-        if ( $onedir->{'Styles'} ) { $styles = $onedir->{'Styles'}; }
-        # get_path_from_fullqualifiedname(\$uniqueparentname);
-        # making /registry/schema/org/openoffice/VCL.xcs to VCL.xcs 
-
-        $uniquename =~ s/^\s*//g;               # removing beginning white spaces
-        $uniquename =~ s/\s*$//g;               # removing ending white spaces
-        $uniquename =~ s/\s//g;                 # removing white spaces
-        $uniquename =~ s/\_//g;                 # removing existing underlines
-        $uniquename =~ s/\.//g;                 # removing dots in directoryname
-        $uniquename =~ s/\Q$installer::globals::separator\E/\_/g;   # replacing slash and backslash with underline
-        $uniquename =~ s/OpenOffice/OO/g;
-        $uniquename =~ s/LibreOffice/LO/g;
-        $uniquename =~ s/_registry/_rgy/g;
-        $uniquename =~ s/_registration/_rgn/g;
-        $uniquename =~ s/_extension/_ext/g;
-        $uniquename =~ s/_frame/_frm/g;
-        $uniquename =~ s/_table/_tbl/g;
-        $uniquename =~ s/_chart/_crt/g;
-
-        my $startlength = 5;
-        
-        if ( ! $allvariables->{'NOSHORTDIRECTORYNAMES'} )
-        {
-            # This process does not work for SDK, because of its long and similar pathes
-            $uniquename = make_short_dir_version($uniquename, $startlength, $hostname); # taking care of underlines!
-        }
-
-        if ( !$already_checked_the_frigging_directories_for_uniqueness &&
-         exists($installer::globals::alluniquedirectorynames{$uniquename}) )
-        {
-            # This is an error, that must stop the packaging process
-            $errorcount++;
-
-            $infoline = "$errorcount: Already existing unique directory: $uniquename\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            $infoline = "$errorcount: First full directory: $conversionhash{$uniquename}\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            $infoline = "$errorcount: Current full directory: $hostname\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    
-        $conversionhash{$uniquename} = $hostname;
-
-        $installer::globals::alluniquedirectorynames{$uniquename} = 1;
-
-        # Important: The unique parent is generated from the string $uniquename. Therefore counters
-        # like adding "_1" is not allowed to achive uniqueness, because this depends from other directories
-        # and does not deliver always the same result.
-
-        my $uniqueparentname = $uniquename;
-
-        if ( $uniqueparentname =~ /^\s*(.*)\_(.*?)\s*$/ )   # the underline is now the separator
-        {
-            $uniqueparentname = $1;
-        }
-        else
-        {
-            $uniqueparentname = $installer::globals::programfilesfolder;
-        }
-
-        if ( $styles =~ /\bPROGRAMFILESFOLDER\b/ ) { $uniqueparentname = $installer::globals::programfilesfolder; }
-        if ( $styles =~ /\bCOMMONFILESFOLDER\b/ ) { $uniqueparentname = $installer::globals::commonfilesfolder; }
-        if ( $styles =~ /\bCOMMONAPPDATAFOLDER\b/ ) { $uniqueparentname = $installer::globals::commonappdatafolder; }
-        if ( $styles =~ /\bLOCALAPPDATAFOLDER\b/ ) { $uniqueparentname = $installer::globals::localappdatafolder; }
-
-        if ( $styles =~ /\bSHAREPOINTPATH\b/ )
-        {
-            $uniqueparentname = "SHAREPOINTPATH";
-            $installer::globals::usesharepointpath = 1;
-        }
-
-        $uniquename =~ s/\-/\_/g;           # making "-" to "_"
-        $uniqueparentname =~ s/\-/\_/g;     # making "-" to "_"
-        
-        $onedir->{'uniquename'} = $uniquename;
-        $onedir->{'uniqueparentname'} = $uniqueparentname;
-
-        # setting the installlocation directory
-        if ( $styles =~ /\bISINSTALLLOCATION\b/ )
-        {
-            if ( $installer::globals::installlocationdirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag ISINSTALLLOCATION alread set: \"$installer::globals::installlocationdirectory\".", "create_unique_directorynames"); }
-            $installer::globals::installlocationdirectory = $uniquename;
-            $installer::globals::installlocationdirectoryset = 1;
-            if ( $installer::globals::installlocationdirectory =~ /oracle_/i ) { $installer::globals::sundirexists = 1; }
-        }
-        
-        # setting the sundirectory
-        if ( $styles =~ /\bSUNDIRECTORY\b/ )
-        {
-            if ( $installer::globals::vendordirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag SUNDIRECTORY alread set: \"$installer::globals::vendordirectory\".", "create_unique_directorynames"); }
-            $installer::globals::vendordirectory = $uniquename;
-            $installer::globals::vendordirectoryset = 1;
-        }
-    }
-    
-    if ( $errorcount > 0 )
-    {
-        installer::exiter::exit_program("ERROR: Failed to create unique directory names.", "create_unique_directorynames");
-    }
-}
-
-#####################################################
-# Adding ":." to selected default directory names
-#####################################################
-
-sub check_sourcedir_addon
-{
-    my ( $onedir, $allvariableshashref ) = @_;
-    
-    if (($installer::globals::addchildprojects) ||
-        ($installer::globals::patch) ||
-        ($installer::globals::languagepack) || 
-        ($installer::globals::helppack) ||
-        ($allvariableshashref->{'CHANGETARGETDIR'}))
-    {
-        my $sourcediraddon = "\:\.";
-        $onedir->{'defaultdir'} = $onedir->{'defaultdir'} . $sourcediraddon;
-    }
-    
-}
-
-#####################################################
-# The directory with the style ISINSTALLLOCATION
-# will be replaced by INSTALLLOCATION
-#####################################################
-
-sub set_installlocation_directory
-{
-    my ( $directoryref, $allvariableshashref ) = @_;
-    
-    if ( ! $installer::globals::installlocationdirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag ISINSTALLLOCATION not set!", "set_installlocation_directory"); }
-    
-    for ( my $i = 0; $i <= $#{$directoryref}; $i++ )
-    {
-        my $onedir = ${$directoryref}[$i];
-
-        if ( $onedir->{'uniquename'} eq $installer::globals::installlocationdirectory )
-        {
-            $onedir->{'uniquename'} = "INSTALLLOCATION";
-            check_sourcedir_addon($onedir, $allvariableshashref);
-        }
-        
-        if ( $onedir->{'uniquename'} eq $installer::globals::vendordirectory )
-        {
-            check_sourcedir_addon($onedir, $allvariableshashref);
-        }
-        
-        if ( $onedir->{'uniqueparentname'} eq $installer::globals::installlocationdirectory )
-        {
-            $onedir->{'uniqueparentname'} = "INSTALLLOCATION";
-        }
-    }
-}
-
-#####################################################
-# Getting the name of the top level directory. This
-# can have only one letter
-#####################################################
-
-sub get_last_directory_name
-{
-    my ($completepathref) = @_;
-
-    if ( $$completepathref =~ /^.*[\/\\](.+?)\s*$/ )
-    {
-        $$completepathref = $1;
-    }
-}
-
-#####################################################
-# Creating the defaultdir for the file Director.idt
-#####################################################
-
-sub create_defaultdir_directorynames
-{
-    my ($directoryref, $shortdirnamehashref) = @_;
-
-    my @shortnames = ();
-    if ( $installer::globals::updatedatabase ) { @shortnames = values(%{$shortdirnamehashref}); }
-    elsif ( $installer::globals::prepare_winpatch ) { @shortnames = values(%installer::globals::saved83dirmapping); }
-
-    for ( my $i = 0; $i <= $#{$directoryref}; $i++ )
-    {
-        my $onedir = ${$directoryref}[$i];
-        my $hostname = $onedir->{'HostName'};
-
-        $hostname =~ s/\Q$installer::globals::separator\E\s*$//;
-        get_last_directory_name(\$hostname);
-        my $uniquename = $onedir->{'uniquename'};
-        my $shortstring;
-        if (( $installer::globals::updatedatabase ) && ( exists($shortdirnamehashref->{$uniquename}) ))
-        {
-            $shortstring = $shortdirnamehashref->{$uniquename};
-        }
-        elsif (( $installer::globals::prepare_winpatch ) && ( exists($installer::globals::saved83dirmapping{$uniquename}) ))
-        {
-            $shortstring = $installer::globals::saved83dirmapping{$uniquename};
-        }
-        else
-        {
-            $shortstring = installer::windows::idtglobal::make_eight_three_conform($hostname, "dir", \@shortnames);
-        }
-
-        my $defaultdir;
-
-        if ( $shortstring eq $hostname )
-        {
-            $defaultdir = $hostname;
-        }
-        else
-        {
-            $defaultdir = $shortstring . "|" . $hostname;
-        }
-
-        $onedir->{'defaultdir'} = $defaultdir;
-
-        my $fontdir = "";
-        if ( $onedir->{'Dir'} ) { $fontdir = $onedir->{'Dir'}; }
-
-        my $fontdefaultdir = "";
-        if ( $onedir->{'defaultdir'} ) { $fontdefaultdir = $onedir->{'defaultdir'}; }
-
-        if (( $fontdir eq "PREDEFINED_OSSYSTEMFONTDIR" ) && ( $fontdefaultdir eq $installer::globals::fontsdirhostname ))
-        {
-            $installer::globals::fontsdirname = $onedir->{'defaultdir'};
-            $installer::globals::fontsdirparent = $onedir->{'uniqueparentname'};
-        }
-    }
-}
-
-###############################################
-# Fill content into the directory table
-###############################################
-
-sub create_directorytable_from_collection
-{
-    my ($directorytableref, $directoryref) = @_;
-    
-    for ( my $i = 0; $i <= $#{$directoryref}; $i++ )
-    {
-        my $onedir = ${$directoryref}[$i];
-        my $hostname = $onedir->{'HostName'};
-        my $dir = "";
-        
-        if ( $onedir->{'Dir'} ) { $dir = $onedir->{'Dir'}; }
-        
-        if (( $dir eq "PREDEFINED_PROGDIR" ) && ( $hostname eq "" )) { next; }  # removing files from root directory
-        
-        my $oneline = $onedir->{'uniquename'} . "\t" . $onedir->{'uniqueparentname'} . "\t" . $onedir->{'defaultdir'} . "\n";
-
-        push(@{$directorytableref}, $oneline);
-    }
-}
-
-###############################################
-# Defining the root installation structure
-###############################################
-
-sub add_root_directories
-{
-    my ($directorytableref, $allvariableshashref, $onelanguage) = @_;
-    
-    my $oneline = "";
-
-    if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
-    {
-        my $productname;
-
-    $productname = $allvariableshashref->{'PRODUCTNAME'};
-        my $productversion = $allvariableshashref->{'PRODUCTVERSION'};
-        my $baseproductversion = $productversion;
-
-        if (( $installer::globals::prepare_winpatch ) && ( $allvariableshashref->{'BASEPRODUCTVERSION'} ))
-        {
-            $baseproductversion = $allvariableshashref->{'BASEPRODUCTVERSION'};  # for example "2.0" for OOo
-        }
-        
-        my $realproductkey = $productname . " " . $productversion;
-        my $productkey = $productname . " " . $baseproductversion;
-        
-        if (( $allvariableshashref->{'POSTVERSIONEXTENSION'} ) && ( ! $allvariableshashref->{'DONTUSEEXTENSIONINDEFAULTDIR'} )) 
-        {
-            $productkey = $productkey . " " . $allvariableshashref->{'POSTVERSIONEXTENSION'}; 
-            $realproductkey = $realproductkey . " " . $allvariableshashref->{'POSTVERSIONEXTENSION'}; 
-        }
-        if ( $allvariableshashref->{'NOVERSIONINDIRNAME'} ) 
-        { 
-            $productkey = $productname; 
-            $realproductkey = $realproductname; 
-        }
-        if ( $allvariableshashref->{'NOSPACEINDIRECTORYNAME'} ) 
-        {
-            $productkey =~ s/\ /\_/g; 
-            $realproductkey =~ s/\ /\_/g; 
-        }
-        
-        my $shortproductkey = installer::windows::idtglobal::make_eight_three_conform($productkey, "dir");      # third parameter not used
-        $shortproductkey =~ s/\s/\_/g;                                  # changing empty space to underline
-            
-        $oneline = "$installer::globals::officemenufolder\t$installer::globals::programmenufolder\t$shortproductkey|$realproductkey\n";
-        push(@{$directorytableref}, $oneline);
-    }
-
-    $oneline = "TARGETDIR\t\tSourceDir\n";
-    push(@{$directorytableref}, $oneline);
-
-    $oneline = "WindowsFolder\tTARGETDIR\tWindows\n";
-    push(@{$directorytableref}, $oneline);
-
-    $oneline = "WindowsShellNewFolder\tWindowsFolder\tShellNew\n";
-    push(@{$directorytableref}, $oneline);
-
-    $oneline = "$installer::globals::programfilesfolder\tTARGETDIR\t.\n";
-    push(@{$directorytableref}, $oneline);
-
-    $oneline = "$installer::globals::programmenufolder\tTARGETDIR\t.\n";
-    push(@{$directorytableref}, $oneline);
-
-    $oneline = "$installer::globals::startupfolder\tTARGETDIR\t.\n";
-    push(@{$directorytableref}, $oneline);
-
-    $oneline = "$installer::globals::desktopfolder\tTARGETDIR\t.\n";
-    push(@{$directorytableref}, $oneline);
-
-    $oneline = "$installer::globals::startmenufolder\tTARGETDIR\t.\n";
-    push(@{$directorytableref}, $oneline);
-
-    $oneline = "$installer::globals::commonfilesfolder\tTARGETDIR\t.\n";
-    push(@{$directorytableref}, $oneline);
-
-    $oneline = "$installer::globals::commonappdatafolder\tTARGETDIR\t.\n";
-    push(@{$directorytableref}, $oneline);
-
-    $oneline = "$installer::globals::localappdatafolder\tTARGETDIR\t.\n";
-    push(@{$directorytableref}, $oneline);
-        
-    if ( $installer::globals::usesharepointpath )
-    {
-        $oneline = "SHAREPOINTPATH\tTARGETDIR\t.\n";
-        push(@{$directorytableref}, $oneline);
-    }
-
-    $oneline = "$installer::globals::systemfolder\tTARGETDIR\t.\n";
-    push(@{$directorytableref}, $oneline);
-
-    my $localtemplatefoldername = $installer::globals::templatefoldername;
-    my $directorytableentry = $localtemplatefoldername;
-    my $shorttemplatefoldername = installer::windows::idtglobal::make_eight_three_conform($localtemplatefoldername, "dir");
-    if ( $shorttemplatefoldername ne $localtemplatefoldername ) { $directorytableentry = "$shorttemplatefoldername|$localtemplatefoldername"; }
-    $oneline = "$installer::globals::templatefolder\tTARGETDIR\t$directorytableentry\n";
-    push(@{$directorytableref}, $oneline);
-
-    if ( $installer::globals::fontsdirname )
-    {
-        $oneline = "$installer::globals::fontsfolder\t$installer::globals::fontsdirparent\t$installer::globals::fontsfoldername\:$installer::globals::fontsdirname\n";
-    }
-    else
-    {
-        $oneline = "$installer::globals::fontsfolder\tTARGETDIR\t$installer::globals::fontsfoldername\n";
-    }
-
-    push(@{$directorytableref}, $oneline);
-
-}
-
-###############################################
-# Creating the file Director.idt dynamically
-###############################################
-
-sub create_directory_table
-{
-    my ($directoryref, $languagesarrayref, $basedir, $allvariableshashref, $shortdirnamehashref, $loggingdir) = @_;
-
-    # Structure of the directory table:
-    # Directory Directory_Parent DefaultDir
-    # Directory is a unique identifier
-    # Directory_Parent is the unique identifier of the parent
-    # DefaultDir is .:APPLIC~1|Application Data with
-    # Before ":" : [sourcedir]:[destdir] (not programmed yet)
-    # After ":" : 8+3 and not 8+3 the destination directory name
-
-    for ( my $m = 0; $m <= $#{$languagesarrayref}; $m++ )
-    {
-        my $onelanguage = ${$languagesarrayref}[$m];
-        $installer::globals::installlocationdirectoryset = 0;
-
-    my @directorytable = ();
-    my $infoline;
-    
-    overwrite_programfilesfolder($allvariableshashref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_1.log", $directoryref); }
-    create_unique_directorynames($directoryref, $allvariableshashref);
-    $already_checked_the_frigging_directories_for_uniqueness++;
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_1a.log", $directoryref); }
-    create_defaultdir_directorynames($directoryref, $shortdirnamehashref);  # only destdir!
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_2.log", $directoryref); }
-    set_installlocation_directory($directoryref, $allvariableshashref);
-    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_3.log", $directoryref); }
-    installer::windows::idtglobal::write_idt_header(\@directorytable, "directory");
-    add_root_directories(\@directorytable, $allvariableshashref, $onelanguage);
-    create_directorytable_from_collection(\@directorytable, $directoryref);
-
-    # Saving the file
-
-    my $directorytablename = $basedir . $installer::globals::separator . "Director.idt" . "." . $onelanguage;
-    installer::files::save_file($directorytablename ,\@directorytable);
-    $infoline = "Created idt file: $directorytablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
deleted file mode 100644
index c2657beec..000000000
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ /dev/null
@@ -1,484 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::feature;
-
-use installer::existence;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::sorter;
-use installer::worker;
-use installer::windows::idtglobal;
-use installer::windows::language;
-
-##############################################################
-# Returning the gid for a feature.
-# Attention: Maximum length
-##############################################################
-
-sub get_feature_gid
-{
-    my ($onefeature) = @_;
-    
-    my $gid = "";
-    
-    if ( $onefeature->{'gid'} ) { $gid = $onefeature->{'gid'}; }
-
-    # Attention: Maximum feature length is 38!
-    installer::windows::idtglobal::shorten_feature_gid(\$gid);
-        
-    return $gid	
-}
-
-##############################################################
-# Returning the gid of the parent.
-# Attention: Maximum length
-##############################################################
-
-sub get_feature_parent
-{
-    my ($onefeature) = @_;
-    
-    my $parentgid = "";
-    
-    if ( $onefeature->{'ParentID'} ) { $parentgid = $onefeature->{'ParentID'}; }
-
-    # The modules, hanging directly below the root, have to be root modules. 
-    # Only then it is possible to make the "real" root module invisible by 
-    # setting the display to "0". 
-    
-    if ( $parentgid eq $installer::globals::rootmodulegid ) { $parentgid = ""; }
-
-    # Attention: Maximum feature length is 38!
-    installer::windows::idtglobal::shorten_feature_gid(\$parentgid);
-        
-    return $parentgid	
-}
-
-##############################################################
-# Returning the display for a feature.
-# 0: Feature is not shown
-# odd: subfeatures are shown
-# even:  subfeatures are not shown
-##############################################################
-
-sub get_feature_display
-{
-    my ($onefeature) = @_;
-    
-    my $display;
-    my $parentid = "";
-    
-    if ( $onefeature->{'ParentID'} ) { $parentid = $onefeature->{'ParentID'}; }
-    
-    if ( $parentid eq "" )
-    {
-        $display = "0";									# root module is not visible
-    }
-    elsif ( $onefeature->{'gid'} eq "gid_Module_Prg")	# program module shows subfeatures
-    {
-        $display = "1";									# root module shows subfeatures
-    }
-    else
-    {
-        $display = "2";									# all other modules do not show subfeatures
-    }
-
-    # special case: Feature has flag "HIDDEN_ROOT" -> $display is 0
-    my $styles = "";
-    if ( $onefeature->{'Styles'} ) { $styles = $onefeature->{'Styles'}; }
-    if ( $styles =~ /\bHIDDEN_ROOT\b/ ) { $display = "0"; }
-
-    # Special handling for language modules. Only visible in multilingual installation set
-    if (( $styles =~ /\bSHOW_MULTILINGUAL_ONLY\b/ ) && ( ! $installer::globals::ismultilingual )) { $display = "0"; }
-
-    # Special handling for c05office. No program module visible.	
-    if (( $onefeature->{'gid'} eq "gid_Module_Prg" ) && ( $installer::globals::product =~ /c05office/i )) { $display = "0";	}
-
-    # making all feature invisible in Language packs and in Help packs!
-    if ( $installer::globals::languagepack || $installer::globals::helppack ) { $display = "0"; }
-    
-    return $display	
-}
-
-##############################################################
-# Returning the level for a feature.
-##############################################################
-
-sub get_feature_level
-{
-    my ($onefeature) = @_;
-    
-    my $level = "20";	# the default
-    
-    my $localdefault = "";
-        
-    if ( $onefeature->{'Default'} ) { $localdefault = $onefeature->{'Default'}; } 
-        
-    if ( $localdefault eq "NO" )	# explicitely set Default = "NO"
-    {
-        $level = "200";				# deselected in default installation, base is 100
-        if ( $installer::globals::patch ) { $level = "20"; }
-    }
-
-    # special handling for Java and Ada
-    if ( $onefeature->{'Name'} )
-    {
-        if ( $onefeature->{'Name'} =~ /java/i ) { $level = $level + 40; }
-    }
-
-    # if FeatureLevel is defined in scp, this will be used
-    
-    if ( $onefeature->{'FeatureLevel'} ) { $level = $onefeature->{'FeatureLevel'}; }
-
-    return $level	
-}
-
-##############################################################
-# Returning the directory for a feature.
-##############################################################
-
-sub get_feature_directory
-{
-    my ($onefeature) = @_;
-    
-    my $directory;
-    
-    $directory = "INSTALLLOCATION";
-    
-    return $directory	
-}
-
-##############################################################
-# Returning the directory for a feature.
-##############################################################
-
-sub get_feature_attributes
-{
-    my ($onefeature) = @_;
-    
-    my $attributes;
-    
-    # No advertising of features and no leaving on network.
-    # Feature without parent must not have the "2"
-    
-    my $parentgid = "";
-    if ( $onefeature->{'ParentID'} ) { $parentgid = $onefeature->{'ParentID'}; }
-
-    if (( $parentgid eq "" ) || ( $parentgid eq $installer::globals::rootmodulegid )) { $attributes = "8"; }
-    else { $attributes = "10"; }
-    
-    return $attributes	
-}
-
-#################################################################################
-# Replacing one variable in one files
-#################################################################################
-
-sub replace_one_variable
-{
-    my ($translationfile, $variable, $searchstring) = @_;
-    
-    for ( my $i = 0; $i <= $#{$translationfile}; $i++ )
-    {
-        ${$translationfile}[$i] =~ s/\%$searchstring/$variable/g;
-    }	
-}
-
-#################################################################################
-# Replacing the variables in the feature names and descriptions
-#################################################################################
-
-sub replace_variables
-{
-    my ($translationfile, $variableshashref) = @_;
-
-    # we want to substitute FOO_BR before FOO to avoid floating _BR suffixes
-    foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref})
-    {
-        my $value = $variableshashref->{$key};
-        replace_one_variable($translationfile, $value, $key);
-    }
-}
-
-#################################################################################
-# Collecting the feature recursively.
-#################################################################################
-
-sub collect_modules_recursive
-{
-    my ($modulesref, $parentid, $feature, $directaccess, $directgid, $directparent, $directsortkey, $sorted) = @_;
-
-    my @allchildren = ();
-    my $childrenexist = 0;
-
-    # Collecting children from Module $parentid
-    
-    my $modulegid;
-    foreach $modulegid ( keys %{$directparent})
-    {		
-        if ( $directparent->{$modulegid} eq $parentid )
-        {
-            my %childhash = ( "gid" => "$modulegid", "Sortkey" => "$directsortkey->{$modulegid}");
-            push(@allchildren, \%childhash);
-            $childrenexist = 1;
-        }
-    }
-
-    # Sorting children
-    
-    if ( $childrenexist )
-    {	
-        # Sort children
-        installer::sorter::sort_array_of_hashes_numerically(\@allchildren, "Sortkey");
-
-        # Adding children to new array
-        my $childhashref;
-        foreach $childhashref ( @allchildren )
-        {
-            my $gid = $childhashref->{'gid'};
-
-            # Saving all lines, that have this 'gid'
-            
-            my $unique;
-            foreach $unique ( keys %{$directgid} )
-            {
-                if ( $directgid->{$unique} eq $gid )
-                {
-                    push(@{$feature}, ${$modulesref}[$directaccess->{$unique}]);
-                    if ( $sorted->{$unique} == 1 ) { installer::exiter::exit_program("ERROR: Sorting feature failed! \"$unique\" already sorted.", "sort_feature"); }
-                    $sorted->{$unique} = 1;
-                }
-            }
-
-            collect_modules_recursive($modulesref, $gid, $feature, $directaccess, $directgid, $directparent, $directsortkey, $sorted);
-        }
-    }
-}
-
-#################################################################################
-# Sorting the feature in specified order. Evaluated is the key "Sortkey", that
-# is set in scp2 projects.
-# The display order of modules in Windows Installer is dependent from the order
-# in the idt file. Therefore the order of the modules array has to be adapted 
-# to the Sortkey order, before the idt file is created.
-#################################################################################
-
-sub sort_feature
-{
-    my ($modulesref) = @_;
-    
-    my @feature = ();
-    
-    my %directaccess = ();
-    my %directparent = ();
-    my %directgid = ();
-    my %directsortkey = ();
-    my %sorted = ();
-
-    for ( my $i = 0; $i <= $#{$modulesref}; $i++ )
-    {
-        my $onefeature = ${$modulesref}[$i];
-
-        my $uniquekey = $onefeature->{'uniquekey'};
-        my $modulegid = $onefeature->{'gid'};
-        
-        $directaccess{$uniquekey} = $i;
-        
-        $directgid{$uniquekey} = $onefeature->{'gid'};
-        
-        # ParentID and Sortkey are not saved for the 'uniquekey', but only for the 'gid'
-
-        if ( $onefeature->{'ParentID'} ) { $directparent{$modulegid} = $onefeature->{'ParentID'}; }
-        else { $directparent{$modulegid} = ""; }
-
-        if ( $onefeature->{'Sortkey'} ) { $directsortkey{$modulegid} = $onefeature->{'Sortkey'}; }
-        else { $directsortkey{$modulegid} = "9999"; }
-        
-        # Bookkeeping:
-        $sorted{$uniquekey} = 0;
-    }
-
-    # Searching all feature recursively, beginning with ParentID = ""
-    my $parentid = "";
-    collect_modules_recursive($modulesref, $parentid, \@feature, \%directaccess, \%directgid, \%directparent, \%directsortkey, \%sorted);
-
-    # Bookkeeping
-    my $modulekey;
-    foreach $modulekey ( keys %sorted )
-    {
-        if ( $sorted{$modulekey} == 0 )
-        {
-            my $infoline = "Warning: Module \"$modulekey\" could not be sorted. Added to the end of the module array.\n";
-            push(@installer::globals::logfileinfo, $infoline);
-            push(@feature, ${$modulesref}[$directaccess{$modulekey}]);
-        }
-    }
-
-    return \@feature;
-}
-
-#################################################################################
-# Adding a unique key to the modules array. The gid is not unique for 
-# multilingual modules. Only the combination from gid and specific language
-# is unique. Uniqueness is required for sorting mechanism.
-#################################################################################
-
-sub add_uniquekey
-{
-    my ( $modulesref ) = @_;
-
-    for ( my $i = 0; $i <= $#{$modulesref}; $i++ )
-    {
-        my $uniquekey = ${$modulesref}[$i]->{'gid'};
-        if ( ${$modulesref}[$i]->{'specificlanguage'} ) { $uniquekey = $uniquekey . "_" . ${$modulesref}[$i]->{'specificlanguage'}; }
-        ${$modulesref}[$i]->{'uniquekey'} = $uniquekey;
-    }
-}
-
-#################################################################################
-# Creating the file Feature.idt dynamically
-# Content: 
-# Feature Feature_Parent Title Description Display Level Directory_ Attributes
-#################################################################################
-
-sub create_feature_table
-{
-    my ($modulesref, $basedir, $languagesarrayref, $allvariableshashref) = @_;
-
-    for ( my $m = 0; $m <= $#{$languagesarrayref}; $m++ )
-    {
-        my $onelanguage = ${$languagesarrayref}[$m];
-    
-        my $infoline;
-
-        my @featuretable = ();
-
-        installer::windows::idtglobal::write_idt_header(\@featuretable, "feature");
-
-        for ( my $i = 0; $i <= $#{$modulesref}; $i++ )
-        {
-            my $onefeature = ${$modulesref}[$i];
-
-            # Java and Ada only, if the correct settings are set
-            my $styles = "";
-            if ( $onefeature->{'Styles'} ) { $styles = $onefeature->{'Styles'}; }
-            if (( $styles =~ /\bJAVAMODULE\b/ ) && ( ! ($allvariableshashref->{'JAVAPRODUCT'} ))) { next; }
-            if (( $styles =~ /\bADAMODULE\b/ ) && ( ! ($allvariableshashref->{'ADAPRODUCT'} ))) { next; }
-
-            # Controlling the language!
-            # Only language independent feature or feature with the correct language will be included into the table
-            
-            if (! (!(( $onefeature->{'ismultilingual'} )) || ( $onefeature->{'specificlanguage'} eq $onelanguage )) )  { next; }
-
-            my %feature = ();
-        
-            $feature{'feature'} = get_feature_gid($onefeature);
-            $feature{'feature_parent'} = get_feature_parent($onefeature);
-            $feature{'Title'} = $onefeature->{'Name'};
-            $feature{'Description'} = $onefeature->{'Description'};
-            $feature{'Display'} = get_feature_display($onefeature);
-            $feature{'Level'} = get_feature_level($onefeature);
-            $feature{'Directory_'} = get_feature_directory($onefeature);
-            $feature{'Attributes'} = get_feature_attributes($onefeature);
-
-            my $oneline = $feature{'feature'} . "\t" . $feature{'feature_parent'} . "\t" . $feature{'Title'} . "\t"  
-                    . $feature{'Description'} . "\t" . $feature{'Display'} . "\t" . $feature{'Level'} . "\t"
-                    . $feature{'Directory_'} . "\t" . $feature{'Attributes'} . "\n";
-
-            push(@featuretable, $oneline);
-
-            # collecting all feature in global feature collector (so that properties can be set in property table)
-            if ( ! installer::existence::exists_in_array($feature{'feature'}, \@installer::globals::featurecollector) )
-            {
-                push(@installer::globals::featurecollector, $feature{'feature'});
-            }
-            
-            # collecting all language feature in feature collector for check of language selection
-            if (( $styles =~ /\bSHOW_MULTILINGUAL_ONLY\b/ ) && ( $onefeature->{'ParentID'} ne $installer::globals::rootmodulegid ))
-            {
-                $installer::globals::multilingual_only_modules{$feature{'feature'}} = 1;
-            }
-
-            # collecting all application feature in global feature collector for check of application selection
-            if ( $styles =~ /\bAPPLICATIONMODULE\b/ )
-            {
-                $installer::globals::application_modules{$feature{'feature'}} = 1;
-            }
-        }
-
-        # Sorting names of language packs and dictionaries
-        my @tempfeaturetable;
-        my @langlist;
-        my @langpack;
-        my @dictlist;
-        my @sorteddictlist;
-        my @sortedlanglist;
-
-        foreach (@featuretable) {
-            if (/^gm_r_Extension_Dictionary_/) {
-                push (@dictlist, $_);
-            }
-            elsif (/^gm_Langpack_r_/) {
-                push (@langlist, $_);
-            }
-            elsif (/\tgm_Langpack_r_/) {
-                push (@langpack, $_);
-            }
-            else {
-                push (@tempfeaturetable, $_);
-            }
-        }
-
-        @sorteddictlist = sort { (split(/\t/, $a))[2] cmp (split(/\t/, $b))[2] } @dictlist;
-        @sortedlanglist = sort { (split(/\t/, $a))[2] cmp (split(/\t/, $b))[2] } @langlist;
-
-        @featuretable = (@tempfeaturetable, @sorteddictlist);
-
-        foreach (@sortedlanglist) {
-            my $sortedlanglistline = $_;
-            push (@featuretable, $sortedlanglistline);
-            foreach (@langpack) {
-                my $langpackline = $_;
-                if ( (split(/\t/, $langpackline))[1] eq (split(/\t/, $sortedlanglistline))[0] ) {
-                    push (@featuretable, $langpackline);
-                }
-            }
-        }
-
-        # Saving the file
-        
-        my $featuretablename = $basedir . $installer::globals::separator . "Feature.idt" . "." . $onelanguage;
-        installer::files::save_file($featuretablename ,\@featuretable);
-        $infoline = "Created idt file: $featuretablename\n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/featurecomponent.pm b/solenv/bin/modules/installer/windows/featurecomponent.pm
deleted file mode 100644
index f52032ddb..000000000
--- a/solenv/bin/modules/installer/windows/featurecomponent.pm
+++ /dev/null
@@ -1,175 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::featurecomponent;
-
-use installer::converter;
-use installer::existence;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-#################################################################################
-# Collecting all pairs of features and components from the files collector
-#################################################################################
-
-sub create_featurecomponent_table_from_files_collector
-{
-    my ($featurecomponenttableref, $filesref) = @_;
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-        
-        my $filecomponent = $onefile->{'componentname'};
-        my $filemodules = $onefile->{'modules'};
-
-        if ( $filecomponent eq "" ) 
-        {
-            installer::exiter::exit_program("ERROR: No component defined for file $onefile->{'Name'}", "create_featurecomponent_table_from_files_collector");
-        }
-        if ( $filemodules eq "" ) 
-        {
-            installer::exiter::exit_program("ERROR: No modules found for file $onefile->{'Name'}", "create_featurecomponent_table_from_files_collector");
-        }
-
-        my $filemodulesarrayref = installer::converter::convert_stringlist_into_array(\$filemodules, ",");
-
-        for ( my $j = 0; $j <= $#{$filemodulesarrayref}; $j++ )
-        {
-            my %featurecomponent = ();
-            
-            my $onemodule = ${$filemodulesarrayref}[$j];
-            $onemodule =~ s/\s*$//;
-            $featurecomponent{'Feature'} = $onemodule;
-            $featurecomponent{'Component'} = $filecomponent;
-            
-            # Attention: Features are renamed, because the maximum length is 38.
-            # But in the files collector ($filesref), the original names are saved.
-
-            installer::windows::idtglobal::shorten_feature_gid(\$featurecomponent{'Feature'});
-            
-            $oneline = "$featurecomponent{'Feature'}\t$featurecomponent{'Component'}\n";
-            
-            # control of uniqueness
-            
-            if (! installer::existence::exists_in_array($oneline, $featurecomponenttableref))
-            {		
-                push(@{$featurecomponenttableref}, $oneline);
-            }			
-        }
-    }			
-}
-
-#################################################################################
-# Collecting all pairs of features and components from the registry collector
-#################################################################################
-
-sub create_featurecomponent_table_from_registry_collector
-{
-    my ($featurecomponenttableref, $registryref) = @_;
-
-    for ( my $i = 0; $i <= $#{$registryref}; $i++ )
-    {
-        my $oneregistry = ${$registryref}[$i];
-        
-        my $registrycomponent = $oneregistry->{'componentname'};
-        my $registrymodule = $oneregistry->{'ModuleID'};
-
-        if ( $registrycomponent eq "" ) 
-        {
-            installer::exiter::exit_program("ERROR: No component defined for registry $oneregistry->{'gid'}", "create_featurecomponent_table_from_registry_collector");
-        }
-        if ( $registrymodule eq "" ) 
-        {
-            installer::exiter::exit_program("ERROR: No modules found for registry $oneregistry->{'gid'}", "create_featurecomponent_table_from_registry_collector");
-        }
-
-        my %featurecomponent = ();
-            
-        $featurecomponent{'Feature'} = $registrymodule;
-        $featurecomponent{'Component'} = $registrycomponent;
-        
-        # Attention: Features are renamed, because the maximum length is 38.
-        # But in the files collector ($filesref), the original names are saved.
-
-        installer::windows::idtglobal::shorten_feature_gid(\$featurecomponent{'Feature'});
-            
-        $oneline = "$featurecomponent{'Feature'}\t$featurecomponent{'Component'}\n";
-            
-        # control of uniqueness
-            
-        if (! installer::existence::exists_in_array($oneline, $featurecomponenttableref))
-        {		
-            push(@{$featurecomponenttableref}, $oneline);
-        }			
-    }				
-}
-
-#################################################################################
-# Creating the file FeatureC.idt dynamically
-# Content: 
-# Feature Component 
-#################################################################################
-
-sub create_featurecomponent_table
-{
-    my ($filesref, $registryref, $basedir) = @_;
-    
-    my @featurecomponenttable = ();
-    my $infoline;
-    
-    installer::windows::idtglobal::write_idt_header(\@featurecomponenttable, "featurecomponent");
-
-    # This is the first time, that features and componentes are related
-    # Problem: How about created profiles, configurationfiles, services.rdb
-    # -> simple solution: putting them all to the root module
-    # Otherwise profiles and configurationfiles cannot be created the way, they are now created
-    # -> especially a problem for the configurationfiles! # ToDo
-    # Very good: All ProfileItems belong to the root
-    # services.rdb belongs to the root anyway.
-
-    # At the moment only the files are related to components (and the files know their modules).
-    # The component for each file is written into the files collector $filesinproductlanguageresolvedarrayref
-            
-    create_featurecomponent_table_from_files_collector(\@featurecomponenttable, $filesref);
-
-    create_featurecomponent_table_from_registry_collector(\@featurecomponenttable, $registryref);
-
-    # Additional components have to be added here
-
-    # Saving the file
-    
-    my $featurecomponenttablename = $basedir . $installer::globals::separator . "FeatureC.idt";
-    installer::files::save_file($featurecomponenttablename ,\@featurecomponenttable);
-    $infoline = "Created idt file: $featurecomponenttablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
deleted file mode 100644
index 0a12d59f4..000000000
--- a/solenv/bin/modules/installer/windows/file.pm
+++ /dev/null
@@ -1,1072 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::file;
-
-use Digest::MD5; 
-use installer::existence;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::worker;
-use installer::windows::font;
-use installer::windows::idtglobal;
-use installer::windows::language;
-
-##########################################################################
-# Assigning one cabinet file to each file. This is requrired,
-# if cabinet files shall be equivalent to packages.
-##########################################################################
-
-sub assign_cab_to_files
-{
-    my ( $filesref ) = @_;
-    
-    my $infoline = "";
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        if ( ! exists(${$filesref}[$i]->{'modules'}) ) { installer::exiter::exit_program("ERROR: No module assignment found for ${$filesref}[$i]->{'gid'} !", "assign_cab_to_files"); }
-        my $module = ${$filesref}[$i]->{'modules'};
-        # If modules contains a list of modules, only taking the first one.
-        if ( $module =~ /^\s*(.*?)\,/ ) { $module = $1; }
-
-        if ( ! exists($installer::globals::allcabinetassigns{$module}) ) { installer::exiter::exit_program("ERROR: No cabinet file assigned to module \"$module\" (${$filesref}[$i]->{'gid'}) !", "assign_cab_to_files"); }
-        ${$filesref}[$i]->{'assignedcabinetfile'} = $installer::globals::allcabinetassigns{$module};
-
-        # Counting the files in each cabinet file
-        if ( ! exists($installer::globals::cabfilecounter{${$filesref}[$i]->{'assignedcabinetfile'}}) )
-        {
-            $installer::globals::cabfilecounter{${$filesref}[$i]->{'assignedcabinetfile'}} = 1;
-        }
-        else
-        {
-            $installer::globals::cabfilecounter{${$filesref}[$i]->{'assignedcabinetfile'}}++;
-        }
-    }
-
-    # logging the number of files in each cabinet file
-
-    $infoline = "\nCabinet file content:\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-    my $cabfile;
-    foreach $cabfile ( sort keys %installer::globals::cabfilecounter )
-    {
-        $infoline = "$cabfile : $installer::globals::cabfilecounter{$cabfile} files\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    
-    # assigning startsequencenumbers for each cab file
-    
-    my $offset = 1;
-    foreach $cabfile ( sort keys %installer::globals::cabfilecounter )
-    {
-        my $filecount = $installer::globals::cabfilecounter{$cabfile};
-        $installer::globals::cabfilecounter{$cabfile} = $offset;
-        $offset = $offset + $filecount;
-        
-        $installer::globals::lastsequence{$cabfile} = $offset - 1;
-    }
-    
-    # logging the start sequence numbers
-
-    $infoline = "\nCabinet file start sequences:\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-    foreach $cabfile ( sort keys %installer::globals::cabfilecounter )
-    {
-        $infoline = "$cabfile : $installer::globals::cabfilecounter{$cabfile}\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
-    # logging the last sequence numbers
-
-    $infoline = "\nCabinet file last sequences:\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-    foreach $cabfile ( sort keys %installer::globals::lastsequence )
-    {
-        $infoline = "$cabfile : $installer::globals::lastsequence{$cabfile}\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-}
-
-##########################################################################
-# Assigning sequencenumbers to files. This is requrired,
-# if cabinet files shall be equivalent to packages.
-##########################################################################
-
-sub assign_sequencenumbers_to_files
-{
-    my ( $filesref ) = @_;
-    
-    my %directaccess = ();
-    my %allassigns = ();
-    
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-        
-        # Keeping order in cabinet files
-        # -> collecting all files in one cabinet file
-        # -> sorting files and assigning numbers
-
-        # Saving counter $i for direct access into files array
-        # "destination" of the file is a unique identifier ('Name' is not unique!)
-        if ( exists($directaccess{$onefile->{'destination'}}) ) { installer::exiter::exit_program("ERROR: 'destination' at file not unique: $onefile->{'destination'}", "assign_sequencenumbers_to_files"); }
-        $directaccess{$onefile->{'destination'}} = $i;
-
-        my $cabfilename = $onefile->{'assignedcabinetfile'};
-        # collecting files in cabinet files
-        if ( ! exists($allassigns{$cabfilename}) )
-        {
-            my %onecabfile = ();
-            $onecabfile{$onefile->{'destination'}} = 1;			
-            $allassigns{$cabfilename} = \%onecabfile;
-        }
-        else
-        {
-            $allassigns{$cabfilename}->{$onefile->{'destination'}} = 1;
-        }
-    }
-    
-    # Sorting each hash and assigning numbers
-    # The destination of the file determines the sort order, not the filename! 
-    my $cabfile;
-    foreach $cabfile ( sort keys %allassigns )
-    {
-        my $counter = $installer::globals::cabfilecounter{$cabfile};
-        my $dest;
-        foreach $dest ( sort keys %{$allassigns{$cabfile}} ) # <- sorting the destination!
-        {
-            my $directaccessnumber = $directaccess{$dest};
-            ${$filesref}[$directaccessnumber]->{'assignedsequencenumber'} = $counter;			
-            $counter++;
-        }
-    }
-}
-
-#########################################################
-# Create a shorter version of a long component name,
-# because maximum length in msi database is 72.
-# Attention: In multi msi installation sets, the short
-# names have to be unique over all packages, because
-# this string is used to create the globally unique id
-# -> no resetting of
-# %installer::globals::allshortcomponents
-# after a package was created.
-#########################################################
-
-sub generate_new_short_componentname
-{
-    my ($componentname) = @_;
-    
-    my $shortcomponentname = "";
-    my $counter = 1;
-    
-    my $startversion = substr($componentname, 0, 60); # taking only the first 60 characters
-    $startversion = $startversion . "_";
-    
-    $shortcomponentname = $startversion . $counter;
-
-    while ( exists($installer::globals::allshortcomponents{$shortcomponentname}) )
-    {
-        $counter++;
-        $shortcomponentname = $startversion . $counter;
-    }
-    
-    $installer::globals::allshortcomponents{$shortcomponentname} = 1;
-    
-    return $shortcomponentname;
-}
-
-###############################################
-# Generating the component name from a file
-###############################################
-
-sub get_file_component_name
-{
-    my ($fileref, $filesref) = @_;
-
-    my $componentname = "";
-    
-    # Special handling for files with ASSIGNCOMPOMENT
-    
-    my $styles = "";
-    if ( $fileref->{'Styles'} ) { $styles = $fileref->{'Styles'}; }
-    if ( $styles =~ /\bASSIGNCOMPOMENT\b/ )
-    {
-        $componentname = get_component_from_assigned_file($fileref->{'AssignComponent'}, $filesref);
-    }
-    else
-    {
-        # In this function exists the rule to create components from files
-        # Rule:
-        # Two files get the same componentid, if:
-        # both have the same destination directory.
-        # both have the same "gid" -> both were packed in the same zip file
-        # All other files are included into different components!
-    
-        # my $componentname = $fileref->{'gid'} . "_" . $fileref->{'Dir'};
-
-        # $fileref->{'Dir'} is not sufficient! All files in a zip file have the same $fileref->{'Dir'},
-        # but can be in different subdirectories.
-        # Solution: destination=share\Scripts\beanshell\Capitalise\capitalise.bsh
-        # in which the filename (capitalise.bsh) has to be removed and all backslashes (slashes) are 
-        # converted into underline.
-    
-        my $destination = $fileref->{'destination'};
-        installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
-        $destination =~ s/\s//g;
-        $destination =~ s/\\/\_/g;
-        $destination =~ s/\//\_/g;
-        $destination =~ s/\_\s*$//g;	# removing ending underline
-    
-        $componentname = $fileref->{'gid'} . "__" . $destination;
-
-        # Files with different languages, need to be packed into different components.
-        # Then the installation of the language specific component is determined by a language condition.
-
-        if ( $fileref->{'ismultilingual'} )
-        {
-            my $officelanguage = $fileref->{'specificlanguage'};
-            $componentname = $componentname . "_" . $officelanguage;	
-        }
-
-        $componentname = lc($componentname);	# componentnames always lowercase
-
-        $componentname =~ s/\-/\_/g;			# converting "-" to "_"
-        $componentname =~ s/\./\_/g;			# converting "-" to "_"
-
-        # Attention: Maximum length for the componentname is 72
-        # %installer::globals::allcomponents_in_this_database : resetted for each database	
-        # %installer::globals::allcomponents : not resetted for each database
-        # Component strings must be unique for the complete product, because they are used for
-        # the creation of the globally unique identifier.	
-
-        my $fullname = $componentname;  # This can be longer than 72
-        
-        if (( exists($installer::globals::allcomponents{$fullname}) ) && ( ! exists($installer::globals::allcomponents_in_this_database{$fullname}) ))
-        {
-            # This is not allowed: One component cannot be installed with different packages.
-            installer::exiter::exit_program("ERROR: Component \"$fullname\" is already included into another package. This is not allowed.", "get_file_component_name");
-        }
-        
-        if ( exists($installer::globals::allcomponents{$fullname}) )
-        {
-            $componentname = $installer::globals::allcomponents{$fullname};
-        }
-        else
-        {
-            if ( length($componentname) > 60 )
-            {
-                # Using md5sum needs much time
-                # chomp(my $shorter = `echo $componentname | md5sum | sed -e "s/ .*//g"`);
-                # $componentname = "comp_$shorter";
-                $componentname = generate_new_short_componentname($componentname); # This has to be unique for the complete product, not only one package
-            }
-
-            $installer::globals::allcomponents{$fullname} = $componentname;
-            $installer::globals::allcomponents_in_this_database{$fullname} = 1;
-        }
-
-        # $componentname =~ s/gid_file_/g_f_/g;
-        # $componentname =~ s/_extra_/_e_/g;
-        # $componentname =~ s/_config_/_c_/g;
-        # $componentname =~ s/_org_openoffice_/_o_o_/g;
-        # $componentname =~ s/_program_/_p_/g;
-        # $componentname =~ s/_typedetection_/_td_/g;
-        # $componentname =~ s/_linguistic_/_l_/g;
-        # $componentname =~ s/_module_/_m_/g;
-        # $componentname =~ s/_optional_/_opt_/g;
-        # $componentname =~ s/_packages/_pack/g;
-        # $componentname =~ s/_menubar/_mb/g;
-        # $componentname =~ s/_common_/_cm_/g;
-        # $componentname =~ s/_export_/_exp_/g;
-        # $componentname =~ s/_table_/_tb_/g;
-        # $componentname =~ s/_sofficecfg_/_sc_/g;
-        # $componentname =~ s/_soffice_cfg_/_sc_/g;
-        # $componentname =~ s/_startmodulecommands_/_smc_/g;
-        # $componentname =~ s/_drawimpresscommands_/_dic_/g;
-        # $componentname =~ s/_basiccommands_/_bac_/g;
-        # $componentname =~ s/_basicidecommands_/_baic_/g;
-        # $componentname =~ s/_genericcommands_/_genc_/g;
-        # $componentname =~ s/_bibliographycommands_/_bibc_/g;
-        # $componentname =~ s/_gentiumbookbasicbolditalic_/_gbbbi_/g;
-        # $componentname =~ s/_share_/_s_/g;
-        # $componentname =~ s/_extension_/_ext_/g;
-        # $componentname =~ s/_extensions_/_exs_/g;
-        # $componentname =~ s/_modules_/_ms_/g;
-        # $componentname =~ s/_uiconfig_zip_/_ucz_/g;
-        # $componentname =~ s/_productivity_/_pr_/g;
-        # $componentname =~ s/_wizard_/_wz_/g;
-        # $componentname =~ s/_import_/_im_/g;
-        # $componentname =~ s/_javascript_/_js_/g;
-        # $componentname =~ s/_template_/_tpl_/g;
-        # $componentname =~ s/_tplwizletter_/_twl_/g;
-        # $componentname =~ s/_beanshell_/_bs_/g;
-        # $componentname =~ s/_presentation_/_bs_/g;
-        # $componentname =~ s/_columns_/_cls_/g;
-        # $componentname =~ s/_python_/_py_/g;
-
-        # $componentname =~ s/_tools/_ts/g;
-        # $componentname =~ s/_transitions/_trs/g;
-        # $componentname =~ s/_scriptbinding/_scrb/g;
-        # $componentname =~ s/_spreadsheet/_ssh/g;
-        # $componentname =~ s/_publisher/_pub/g;
-        # $componentname =~ s/_presenter/_pre/g;
-        # $componentname =~ s/_registry/_reg/g;
-
-        # $componentname =~ s/screen/sc/g;
-        # $componentname =~ s/wordml/wm/g;
-        # $componentname =~ s/openoffice/oo/g;
-    }
-
-    return $componentname;	
-}
-
-####################################################################
-# Returning the component name for a defined file gid.
-# This is necessary for files with flag ASSIGNCOMPOMENT
-####################################################################
-
-sub get_component_from_assigned_file
-{
-    my ($gid, $filesref) = @_;
-
-    my $onefile = installer::existence::get_specified_file($filesref, $gid);
-    my $componentname = "";
-    if ( $onefile->{'componentname'} ) { $componentname = $onefile->{'componentname'}; }
-    else { installer::exiter::exit_program("ERROR: No component defined for file: $gid", "get_component_from_assigned_file"); }
-    
-    return $componentname;
-}
-
-####################################################################
-# Generating the special filename for the database file File.idt
-# Sample: CONTEXTS, CONTEXTS1
-# This name has to be unique.
-# In most cases this is simply the filename.
-####################################################################
-
-sub generate_unique_filename_for_filetable
-{
-    my ($fileref, $component, $uniquefilenamehashref) = @_;
-
-    # This new filename has to be saved into $fileref, because this is needed to find the source.
-    # The filename sbasic.idx/OFFSETS is changed to OFFSETS, but OFFSETS is not unique.
-    # In this procedure names like OFFSETS5 are produced. And exactly this string has to be added to
-    # the array of all files.
-
-    my $uniquefilename = "";
-    my $counter = 0;
-
-    if ( $fileref->{'Name'} ) { $uniquefilename = $fileref->{'Name'}; }
-
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$uniquefilename);	# making /registry/schema/org/openoffice/VCL.xcs to VCL.xcs 
-
-    # Reading unique filename with help of "Component_" in File table from old database	
-    if (( $installer::globals::updatedatabase ) && ( exists($uniquefilenamehashref->{"$component/$uniquefilename"}) ))
-    {
-        $uniquefilename = $uniquefilenamehashref->{"$component/$uniquefilename"};  # syntax of $value: ($uniquename;$shortname)
-        if ( $uniquefilename =~ /^\s*(.*?)\;\s*(.*?)\s*$/ ) { $uniquefilename = $1; }
-         $lcuniquefilename = lc($uniquefilename);
-        $installer::globals::alluniquefilenames{$uniquefilename} = 1;
-        $installer::globals::alllcuniquefilenames{$lcuniquefilename} = 1;
-        return $uniquefilename;
-    }
-    elsif (( $installer::globals::prepare_winpatch ) && ( exists($installer::globals::savedmapping{"$component/$uniquefilename"}) ))
-    {
-        # If we have a FTK mapping for this component/file, use it.
-        $installer::globals::savedmapping{"$component/$uniquefilename"} =~ m/^(.*);/;
-        $uniquefilename = $1;
-         $lcuniquefilename = lc($uniquefilename);
-        $installer::globals::alluniquefilenames{$uniquefilename} = 1;
-        $installer::globals::alllcuniquefilenames{$lcuniquefilename} = 1;
-        return $uniquefilename;
-    }
-
-    $uniquefilename =~ s/\-/\_/g;		# no "-" allowed
-    $uniquefilename =~ s/\@/\_/g;		# no "@" allowed
-    $uniquefilename =~ s/\$/\_/g;		# no "$" allowed
-    $uniquefilename =~ s/^\s*\./\_/g;		# no "." at the beginning allowed allowed
-    $uniquefilename =~ s/^\s*\d/\_d/g;		# no number at the beginning allowed allowed (even file "0.gif", replacing to "_d.gif")
-    $uniquefilename =~ s/org_openoffice_/ooo_/g;	# shorten the unique file name
-
-    my $lcuniquefilename = lc($uniquefilename);	# only lowercase names
-
-    my $newname = 0;
-
-    if ( ! exists($installer::globals::alllcuniquefilenames{$lcuniquefilename}) &&
-         ! exists($installer::globals::savedrevmapping{$lcuniquefilename}) )
-    {
-        $installer::globals::alluniquefilenames{$uniquefilename} = 1;
-        $installer::globals::alllcuniquefilenames{$lcuniquefilename} = 1;
-        $newname = 1;
-    }
-
-    if ( ! $newname )
-    {
-        # adding a number until the name is really unique: OFFSETS, OFFSETS1, OFFSETS2, ...
-        # But attention: Making "abc.xcu" to "abc1.xcu"
-        
-        my $uniquefilenamebase = $uniquefilename;
-        
-        do
-        {
-            $counter++;
-
-            if ( $uniquefilenamebase =~ /\./ )
-            {
-                $uniquefilename = $uniquefilenamebase;
-                $uniquefilename =~ s/\./$counter\./;
-            }
-            else
-            {
-                $uniquefilename = $uniquefilenamebase . $counter;
-            }
-
-            $newname = 0;
-            $lcuniquefilename = lc($uniquefilename);	# only lowercase names
-
-            if ( ! exists($installer::globals::alllcuniquefilenames{$lcuniquefilename}) &&
-                 ! exists($installer::globals::savedrevmapping{$lcuniquefilename}) )
-            {
-                $installer::globals::alluniquefilenames{$uniquefilename} = 1;
-                $installer::globals::alllcuniquefilenames{$lcuniquefilename} = 1;
-                $newname = 1;
-            }
-        }
-        until ( $newname ) 
-    }
-
-    return $uniquefilename;	
-}
-
-####################################################################
-# Generating the special file column for the database file File.idt
-# Sample: NAMETR~1.TAB|.nametranslation.table
-# The first part has to be 8.3 conform.
-####################################################################
-
-sub generate_filename_for_filetable
-{
-    my ($fileref, $shortnamesref, $uniquefilenamehashref) = @_;
-
-    my $returnstring = "";
-
-    my $filename = $fileref->{'Name'};	
-    
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$filename);	# making /registry/schema/org/openoffice/VCL.xcs to VCL.xcs 
-    
-    my $shortstring;
-    
-    # Reading short string with help of "FileName" in File table from old database	
-    if (( $installer::globals::updatedatabase ) && ( exists($uniquefilenamehashref->{"$fileref->{'componentname'}/$filename"}) ))
-    {
-        my $value = $uniquefilenamehashref->{"$fileref->{'componentname'}/$filename"};  # syntax of $value: ($uniquename;$shortname)
-        if ( $value =~ /^\s*(.*?)\;\s*(.*?)\s*$/ ) { $shortstring = $2; } # already collected in function "collect_shortnames_from_old_database"
-        else { $shortstring = $filename; }
-    }
-    elsif (( $installer::globals::prepare_winpatch ) && ( exists($installer::globals::savedmapping{"$fileref->{'componentname'}/$filename"}) ))
-    {
-        $installer::globals::savedmapping{"$fileref->{'componentname'}/$filename"} =~ m/.*;(.*)/;
-        if ($1 ne '')
-        {
-            $shortstring = $1;
-        }
-        else
-        {
-            $shortstring = installer::windows::idtglobal::make_eight_three_conform_with_hash($filename, "file", $shortnamesref);
-        }
-    }
-    else
-    {
-        $shortstring = installer::windows::idtglobal::make_eight_three_conform_with_hash($filename, "file", $shortnamesref);
-    }
-    
-    if ( $shortstring eq $filename ) { $returnstring = $filename; }	# nothing changed
-    else {$returnstring = $shortstring . "\|" . $filename; }
-    
-    return $returnstring;
-}
-
-#########################################
-# Returning the filesize of a file
-#########################################
-
-sub get_filesize
-{
-    my ($fileref) = @_;
-
-    my $file = $fileref->{'sourcepath'};
-
-    my $filesize;
-    
-    if ( -f $file )	# test of existence. For instance services.rdb does not always exist
-    {
-        $filesize = ( -s $file );	# file size can be "0"
-    }
-    else
-    {
-        $filesize = -1;
-    }
-        
-    return $filesize;
-}
-
-#############################################
-# Returning the file version, if required
-# Sample: "8.0.1.8976";
-#############################################
-
-sub get_fileversion
-{
-    my ($onefile, $allvariables, $styles) = @_;
-
-    my $fileversion = "";
-
-    if ( $allvariables->{'USE_FILEVERSION'} )
-    {
-        if ( ! $allvariables->{'LIBRARYVERSION'} ) { installer::exiter::exit_program("ERROR: USE_FILEVERSION is set, but not LIBRARYVERSION", "get_fileversion"); } 
-        my $libraryversion = $allvariables->{'LIBRARYVERSION'};
-        if ( $libraryversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ )
-        {
-            my $major = $1;
-            my $minor = $2;
-            my $micro = $3;
-            my $concat = 100 * $minor + $micro;
-            $libraryversion = $major . "\." . $concat;
-        }
-        my $vendornumber = 0;
-        if ( $allvariables->{'VENDORPATCHVERSION'} ) { $vendornumber = $allvariables->{'VENDORPATCHVERSION'}; }
-        $fileversion = $libraryversion . "\." . $installer::globals::buildid . "\." . $vendornumber;
-        if ( $onefile->{'FileVersion'} ) { $fileversion = $onefile->{'FileVersion'}; } # overriding FileVersion in scp
-
-        # if ( $styles =~ /\bFONT\b/ )
-        # {
-        #	my $newfileversion = installer::windows::font::get_font_version($onefile->{'sourcepath'});
-        #	if ( $newfileversion != 0 ) { $fileversion = $newfileversion; }
-        # }
-    }
-    
-    if ( $installer::globals::prepare_winpatch ) { $fileversion = ""; } # Windows patches do not allow this version # -> who says so?
-        
-    return $fileversion;
-}
-
-#############################################
-# Returning the sequence for a file
-#############################################
-
-sub get_sequence_for_file
-{
-    my ($number, $onefile, $fileentry, $allupdatesequenceshashref, $allupdatecomponentshashref, $allupdatefileorderhashref, $allfilecomponents) = @_;
-
-    my $sequence = "";
-    my $infoline = "";
-    my $pffcomponentname = $onefile->{'componentname'} . "_pff";
-    
-    if ( $installer::globals::updatedatabase )
-    {
-        if (( exists($allupdatesequenceshashref->{$onefile->{'uniquename'}}) ) &&
-            (( $onefile->{'componentname'} eq $allupdatecomponentshashref->{$onefile->{'uniquename'}} ) ||
-             ( $pffcomponentname eq $allupdatecomponentshashref->{$onefile->{'uniquename'}} )))
-        {
-            # The second condition is necessary to find shifted files, that have same "uniquename", but are now
-            # located in another directory. This can be seen at the component name.
-            $sequence = $allupdatesequenceshashref->{$onefile->{'uniquename'}};
-            $onefile->{'assignedsequencenumber'} = $sequence;
-            # Collecting all used sequences, to guarantee, that no number is unused
-            $installer::globals::allusedupdatesequences{$sequence} = 1;
-            # Special help for files, that already have a "pff" component name (for example after ServicePack 1)
-            if ( $pffcomponentname eq $allupdatecomponentshashref->{$onefile->{'uniquename'}} )
-            {
-                $infoline = "Warning: Special handling for component \"$pffcomponentname\". This file was added after the final, but before this ServicePack.\n";
-                push(@installer::globals::logfileinfo, $infoline);
-                $onefile->{'componentname'} = $pffcomponentname; # pff for "post final file"				
-                $fileentry->{'Component_'} = $onefile->{'componentname'};
-                if ( ! exists($allfilecomponents->{$fileentry->{'Component_'}}) ) { $allfilecomponents->{$fileentry->{'Component_'}} = 1; }
-            }
-        }
-        else
-        {
-            $installer::globals::updatesequencecounter++;
-            $sequence = $installer::globals::updatesequencecounter;
-            $onefile->{'assignedsequencenumber'} = $sequence;
-            # $onefile->{'assignedcabinetfile'} = $installer::globals::pffcabfilename; # assigning to cabinet file for "post final files"
-            # Collecting all new files
-            $installer::globals::newupdatefiles{$sequence} = $onefile;
-            # Saving in sequence hash
-            $allupdatefileorderhashref->{$sequence} = $onefile->{'uniquename'};
-            
-            # If the new file is part of an existing component, this must be changed now. All files
-            # of one component have to be included in one cabinet file. But because the order must 
-            # not change, all new files have to be added to new components.
-            # $onefile->{'componentname'} = $file{'Component_'};
-
-            $onefile->{'componentname'} = $onefile->{'componentname'} . "_pff"; # pff for "post final file"
-            $fileentry->{'Component_'} = $onefile->{'componentname'};
-            if ( ! exists($allfilecomponents->{$fileentry->{'Component_'}}) ) { $allfilecomponents->{$fileentry->{'Component_'}} = 1; }
-            $onefile->{'PostFinalFile'} = 1;
-            # $installer::globals::pfffileexists = 1;
-            # The sequence for this file has changed. It has to be inserted at the end of the files collector.
-            $installer::globals::insert_file_at_end = 1;
-            $installer::globals::newfilescollector{$sequence} = $onefile; # Adding new files to the end of the filescollector
-            $installer::globals::newfilesexist = 1;
-        }
-    }
-    elsif (( $onefile->{'assignedsequencenumber'} ) && ( $installer::globals::use_packages_for_cabs ))
-    {
-        $sequence = $onefile->{'assignedsequencenumber'};		
-    }
-    else
-    {
-        $sequence = $number;
-        # my $sequence = $number + 1;
-
-        # Idea: Each component is packed into a cab file.
-        # This requires that all files in one cab file have sequences directly follwing each other, 
-        # for instance from 1456 to 1466. Then in the media table the LastSequence for this cab file
-        # is 1466.
-        # Because all files belonging to one component are directly behind each other in the file 
-        # collector, it is possible to use simply an increasing number as sequence value. 
-        # If files belonging to one component are not directly behind each other in the files collector
-        # this mechanism will no longer work.
-    }
-    
-    return $sequence;	
-}
-
-#############################################
-# Returning the Windows language of a file
-#############################################
-
-sub get_language_for_file
-{
-    my ($fileref) = @_;
-    
-    my $language = "";
-    
-    if ( $fileref->{'specificlanguage'} ) { $language = $fileref->{'specificlanguage'}; }
-    
-    if ( $language eq "" )
-    {
-        $language = 0;  # language independent
-        # If this is not a font, the return value should be "0" (Check ICE 60)
-        my $styles = "";
-        if ( $fileref->{'Styles'} ) { $styles = $fileref->{'Styles'}; }
-        if ( $styles =~ /\bFONT\b/ ) { $language = ""; }
-    }
-    else
-    {
-        $language = installer::windows::language::get_windows_language($language);
-    }
-    
-    return $language;	
-}
-
-####################################################################
-# Creating a new KeyPath for components in TemplatesFolder.
-####################################################################
-
-sub generate_registry_keypath
-{
-    my ($onefile) = @_;
-
-    my $keypath = $onefile->{'Name'};
-    $keypath =~ s/\.//g;
-    $keypath = lc($keypath);
-    $keypath = "userreg_" . $keypath;
-
-    return $keypath;	
-}
-
-####################################################################
-# Check, if in an update process files are missing. No removal
-# of files allowed for Windows Patch creation.
-# Also logging all new files, that have to be included in extra
-# components and cab files.
-####################################################################
-
-sub check_file_sequences
-{
-    my ($allupdatefileorderhashref, $allupdatecomponentorderhashref) = @_;
-    
-    # All used sequences stored in %installer::globals::allusedupdatesequences
-    # Maximum sequence number of old database stored in $installer::globals::updatelastsequence
-    # All new files stored in %installer::globals::newupdatefiles
-    
-    my $infoline = "";
-    
-    my @missing_sequences = ();
-    my @really_missing_sequences = ();
-    
-    for ( my $i = 1; $i <= $installer::globals::updatelastsequence; $i++ )
-    {
-        if ( ! exists($installer::globals::allusedupdatesequences{$i}) ) { push(@missing_sequences, $i); }
-    }
-    
-    if ( $#missing_sequences > -1 )
-    {
-        # Missing sequences can also be caused by files included in merge modules. This files are added later into the file table.
-        # Therefore now it is time to check the content of the merge modules.
-
-        for ( my $j = 0; $j <= $#missing_sequences; $j++ )
-        {
-            my $filename = $allupdatefileorderhashref->{$missing_sequences[$j]};
-            
-            # Is this a file from a merge module? Then this is no error.
-            if ( ! exists($installer::globals::mergemodulefiles{$filename}) )
-            {
-                push(@really_missing_sequences, $missing_sequences[$j]);
-            }
-        }
-    }
-
-    if ( $#really_missing_sequences > -1 )
-    {
-        my $errorstring = "";
-        for ( my $j = 0; $j <= $#really_missing_sequences; $j++ )
-        {
-            my $filename = $allupdatefileorderhashref->{$really_missing_sequences[$j]};
-            my $comp = $allupdatecomponentorderhashref->{$really_missing_sequences[$j]};
-            $errorstring = "$errorstring$filename (Sequence: $really_missing_sequences[$j], Component: \"$comp\")\n";
-        }
-
-        $infoline = "ERROR: Files are removed compared with update database.\nThe following files are missing:\n$errorstring";
-        push(@installer::globals::logfileinfo, $infoline);
-        installer::exiter::exit_program($infoline, "check_file_sequences");		
-    }
-
-    # Searching for new files
-
-    my $counter = 0;
-    
-    foreach my $key ( keys %installer::globals::newupdatefiles )
-    {
-        my $onefile = $installer::globals::newupdatefiles{$key};
-        $counter++;
-        if ( $counter == 1 )
-        {
-            $infoline = "\nNew files compared to the update database:\n";
-            push(@installer::globals::logfileinfo, $infoline);			
-        }
-        
-        $infoline = "$onefile->{'Name'} ($onefile->{'gid'}) Sequence: $onefile->{'assignedsequencenumber'}\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    
-    if ( $counter == 0 )
-    {
-        $infoline = "Info: No new file compared with update database!\n";
-        push(@installer::globals::logfileinfo, $infoline);		
-    }
-
-}
-
-###################################################################
-# Collecting further conditions for the component table.
-# This is used by multilayer products, to enable installation 
-# of separate layers.
-###################################################################
-
-sub get_tree_condition_for_component
-{
-    my ($onefile, $componentname) = @_;
-    
-    if ( $onefile->{'destination'} )
-    {
-        my $dest = $onefile->{'destination'};
-        
-        # Comparing the destination path with
-        # $installer::globals::hostnametreestyles{$hostname} = $treestyle;
-        # (-> hostname is the key, the style the value!)
-
-        foreach my $hostname ( keys %installer::globals::hostnametreestyles )
-        {
-            if (( $dest eq $hostname ) || ( $dest =~ /^\s*\Q$hostname\E\\/ ))
-            {
-                # the value is the style
-                my $style = $installer::globals::hostnametreestyles{$hostname};
-                # the condition is saved in %installer::globals::treestyles
-                my $condition = $installer::globals::treestyles{$style};
-                # Saving condition to be added in table Property
-                $installer::globals::usedtreeconditions{$condition} = 1;
-                $condition = $condition . "=1";
-                # saving this condition
-                $installer::globals::treeconditions{$componentname} = $condition;
-            
-                # saving also at the file, for usage in fileinfo
-                $onefile->{'layer'} = $installer::globals::treelayername{$style};
-            }
-        }
-    }
-}
-
-############################################
-# Collecting all short names, that are
-# already used by the old database
-############################################
-
-sub collect_shortnames_from_old_database
-{
-    my ($uniquefilenamehashref, $shortnameshashref) = @_;
-
-    foreach my $key ( keys %{$uniquefilenamehashref} )
-    {
-        my $value = $uniquefilenamehashref->{$key};  # syntax of $value: ($uniquename;$shortname)
-
-        if ( $value =~ /^\s*(.*?)\;\s*(.*?)\s*$/ )
-        {
-            my $shortstring = $2;
-            $shortnameshashref->{$shortstring} = 1;	# adding the shortname to the array of all shortnames
-        }
-    }
-}
-
-############################################
-# Creating the file File.idt dynamically
-############################################
-
-sub create_files_table
-{
-    my ($filesref, $allfilecomponentsref, $basedir, $allvariables, $uniquefilenamehashref, $allupdatesequenceshashref, $allupdatecomponentshashref, $allupdatefileorderhashref) = @_;
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: File Table start");
-
-    # Structure of the files table:
-    # File Component_ FileName FileSize Version Language Attributes Sequence
-    # In this function, all components are created.
-    #
-    # $allfilecomponentsref is empty at the beginning
-
-    my $infoline;
-
-    my @allfiles = ();
-    my @filetable = ();
-    my @filehashtable = ();
-    my %allfilecomponents = ();
-    my $counter = 0;
-
-    if ( $^O =~ /cygwin/i ) { installer::worker::generate_cygwin_pathes($filesref); }
-    
-    # The filenames must be collected because of uniqueness
-    # 01-44-~1.DAT, 01-44-~2.DAT, ...
-    my %shortnames = ();
-    
-    if ( $installer::globals::updatedatabase ) { collect_shortnames_from_old_database($uniquefilenamehashref, \%shortnames); }
-
-    installer::windows::idtglobal::write_idt_header(\@filetable, "file");
-    installer::windows::idtglobal::write_idt_header(\@filehashtable, "filehash");
-    
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my %file = ();
-
-        my $onefile = ${$filesref}[$i];	
-
-        my $styles = "";
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-        if (( $styles =~ /\bJAVAFILE\b/ ) && ( ! ($allvariables->{'JAVAPRODUCT'} ))) { next; }
-
-        $file{'Component_'} = get_file_component_name($onefile, $filesref);
-        $file{'File'} = generate_unique_filename_for_filetable($onefile, $file{'Component_'}, $uniquefilenamehashref);
-    
-        $onefile->{'uniquename'} = $file{'File'};
-        $onefile->{'componentname'} = $file{'Component_'};
-
-        # Collecting all components
-
-        if ( ! exists($allfilecomponents{$file{'Component_'}}) ) { $allfilecomponents{$file{'Component_'}} = 1; }
-
-        $file{'FileName'} = generate_filename_for_filetable($onefile, \%shortnames, $uniquefilenamehashref);
-
-        $file{'FileSize'} = get_filesize($onefile);
-
-        $file{'Version'} = get_fileversion($onefile, $allvariables, $styles);
-
-        $file{'Language'} = get_language_for_file($onefile);
-        
-        if ( $styles =~ /\bDONT_PACK\b/ ) { $file{'Attributes'} = "8192"; }
-        else { $file{'Attributes'} = "16384"; }
-
-        # $file{'Attributes'} = "16384"; 	# Sourcefile is packed
-        # $file{'Attributes'} = "8192"; 	# Sourcefile is unpacked
-
-        $installer::globals::insert_file_at_end = 0;
-        $counter++;
-        $file{'Sequence'} = get_sequence_for_file($counter, $onefile, \%file, $allupdatesequenceshashref, $allupdatecomponentshashref, $allupdatefileorderhashref, \%allfilecomponents);
-
-        $onefile->{'sequencenumber'} = $file{'Sequence'};
-
-        my $oneline = $file{'File'} . "\t" . $file{'Component_'} . "\t" . $file{'FileName'} . "\t" 
-                . $file{'FileSize'} . "\t" . $file{'Version'} . "\t" . $file{'Language'} . "\t"
-                . $file{'Attributes'} . "\t" . $file{'Sequence'} . "\n";
-    
-        push(@filetable, $oneline);
-
-        if ( ! $installer::globals::insert_file_at_end ) { push(@allfiles, $onefile); }
-
-        # Collecting all component conditions
-        if ( $onefile->{'ComponentCondition'} )
-        {			
-            if ( ! exists($installer::globals::componentcondition{$file{'Component_'}}))
-            {
-                $installer::globals::componentcondition{$file{'Component_'}} = $onefile->{'ComponentCondition'};
-            }
-        }
-        
-        # Collecting also all tree conditions for multilayer products
-        get_tree_condition_for_component($onefile, $file{'Component_'});
-
-        # Collecting all component names, that have flag VERSION_INDEPENDENT_COMP_ID
-        # This should be all components with constant API, for example URE
-        if ( $styles =~ /\bVERSION_INDEPENDENT_COMP_ID\b/ )
-        {
-            $installer::globals::base_independent_components{$onefile->{'componentname'}} = 1;
-        }
-
-        # Collecting all component ids, that are defined at files in scp project (should not be used anymore)
-        if ( $onefile->{'CompID'} )
-        {			
-            if ( ! exists($installer::globals::componentid{$onefile->{'componentname'}}))
-            {
-                $installer::globals::componentid{$onefile->{'componentname'}} = $onefile->{'CompID'};
-            }
-            else
-            {
-                if ( $installer::globals::componentid{$onefile->{'componentname'}} ne $onefile->{'CompID'} )
-                {
-                    installer::exiter::exit_program("ERROR: There is already a ComponentID for component \"$onefile->{'componentname'}\" : \"$installer::globals::componentid{$onefile->{'componentname'}}\" . File \"$onefile->{'gid'}\" uses \"$onefile->{'CompID'}\" !", "create_files_table");
-                }
-            }
-
-            # Also checking vice versa. Is this ComponentID already used? If yes, is the componentname the same?
-    
-            if ( ! exists($installer::globals::comparecomponentname{$onefile->{'CompID'}}))
-            {
-                $installer::globals::comparecomponentname{$onefile->{'CompID'}} = $onefile->{'componentname'};
-            }
-            else
-            {
-                if ( $installer::globals::comparecomponentname{$onefile->{'CompID'}} ne $onefile->{'componentname'} )
-                {
-                    installer::exiter::exit_program("ERROR: There is already a component for ComponentID \"$onefile->{'CompID'}\" : \"$installer::globals::comparecomponentname{$onefile->{'CompID'}}\" . File \"$onefile->{'gid'}\" has same component id but is included in component \"$onefile->{'componentname'}\" !", "create_files_table");
-                }				
-            }
-        }
-
-        # Collecting all language specific conditions
-        if ( $onefile->{'ismultilingual'} )
-        {
-            if ( $onefile->{'ComponentCondition'} ) { installer::exiter::exit_program("ERROR: Cannot set language condition. There is already another component condition for file $onefile->{'gid'}: \"$onefile->{'ComponentCondition'}\" !", "create_files_table"); }
-
-            if ( $onefile->{'specificlanguage'} eq "" ) { installer::exiter::exit_program("ERROR: There is no specific language for file at language module: $onefile->{'gid'} !", "create_files_table"); }
-            my $locallanguage = $onefile->{'specificlanguage'};
-            my $property = "IS" . $file{'Language'};
-            my $value = 1;
-            my $condition = $property . "=" . $value;
-            
-            $onefile->{'ComponentCondition'} = $condition;
-
-            if ( exists($installer::globals::componentcondition{$file{'Component_'}}))
-            {
-                if ( $installer::globals::componentcondition{$file{'Component_'}} ne $condition ) { installer::exiter::exit_program("ERROR: There is already another component condition for file $onefile->{'gid'}: \"$installer::globals::componentcondition{$file{'Component_'}}\" and \"$condition\" !", "create_files_table"); }
-            }
-            else
-            {
-                $installer::globals::componentcondition{$file{'Component_'}} = $condition;
-            }		
-
-            # collecting all properties for table Property
-            if ( ! exists($installer::globals::languageproperties{$property}) ) { $installer::globals::languageproperties{$property} = $value; }
-        }
-
-        if ( $installer::globals::prepare_winpatch )
-        {
-            my $path = $onefile->{'sourcepath'};
-            if ( $^O =~ /cygwin/i ) { $path = $onefile->{'cyg_sourcepath'}; }
-
-            open(FILE, $path) or die "ERROR: Can't open $path for creating file hash";
-            binmode(FILE);
-            my $hashinfo = pack("l", 20);
-            $hashinfo .= Digest::MD5->new->addfile(*FILE)->digest;
-
-            my @i = unpack ('x[l]l4', $hashinfo);
-            $oneline = $file{'File'} . "\t" .
-                "0" . "\t" .
-                $i[0] . "\t" .
-                $i[1] . "\t" .
-                $i[2] . "\t" .
-                $i[3] . "\n";
-            push (@filehashtable, $oneline);
-        }
-
-        # Saving the sequence number in a hash with uniquefilename as key.
-        # This is used for better performance in "save_packorder"
-        $installer::globals::uniquefilenamesequence{$onefile->{'uniquename'}} = $onefile->{'sequencenumber'};
-        
-        # Special handling for files in PREDEFINED_OSSHELLNEWDIR. These components
-        # need as KeyPath a RegistryItem in HKCU
-        my $destdir = "";
-        if ( $onefile->{'Dir'} ) { $destdir = $onefile->{'Dir'}; }
-
-        if (( $destdir =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ ) || ( $onefile->{'needs_user_registry_key'} ))
-        {
-            my $keypath = generate_registry_keypath($onefile);
-            $onefile->{'userregkeypath'} = $keypath;
-            push(@installer::globals::userregistrycollector, $onefile);
-            $installer::globals::addeduserregitrykeys = 1;
-        }	
-    }
-
-    # putting content from %allfilecomponents to $allfilecomponentsref for later usage
-    foreach $localkey (keys %allfilecomponents ) { push( @{$allfilecomponentsref}, $localkey); }
-
-    my $filetablename = $basedir . $installer::globals::separator . "File.idt";
-    installer::files::save_file($filetablename ,\@filetable);
-    $infoline = "\nCreated idt file: $filetablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: File Table end");
-    
-    my $filehashtablename = $basedir . $installer::globals::separator . "MsiFileHash.idt";
-    installer::files::save_file($filehashtablename ,\@filehashtable);
-    $infoline = "\nCreated idt file: $filehashtablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-    # Now the new files can be added to the files collector (only in update packaging processes)
-    if ( $installer::globals::newfilesexist )
-    {
-        foreach my $seq (sort keys %installer::globals::newfilescollector) { push(@allfiles, $installer::globals::newfilescollector{$seq}) }
-    }
-
-    return \@allfiles;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/font.pm b/solenv/bin/modules/installer/windows/font.pm
deleted file mode 100644
index 64dbc39f6..000000000
--- a/solenv/bin/modules/installer/windows/font.pm
+++ /dev/null
@@ -1,109 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::font;
-
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-
-#################################################################################
-# Creating the file Font.idt dynamically
-# Content: 
-# File_ FontTitle
-#################################################################################
-
-sub create_font_table
-{
-    my ($filesref, $basedir) = @_;
-
-    my @fonttable = ();
-    
-    installer::windows::idtglobal::write_idt_header(\@fonttable, "font");
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-        my $styles = "";
-        
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-        
-        if ( $styles =~ /\bFONT\b/ )
-        {
-            my %font = ();
-        
-            $font{'File_'} = $onefile->{'uniquename'};
-            $font{'FontTitle'} = "";
-
-            my $oneline = $font{'File_'} . "\t" . $font{'FontTitle'} . "\n";
-
-            push(@fonttable, $oneline);	
-        }
-    }
-
-    # Saving the file
-    
-    my $fonttablename = $basedir . $installer::globals::separator . "Font.idt";
-    installer::files::save_file($fonttablename ,\@fonttable);
-    my $infoline = "Created idt file: $fonttablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-#################################################################################
-# Reading the Font version from the ttf file, to avoid installation
-# of older files over newer files.
-#################################################################################
-
-sub get_font_version
-{
-    my ( $fontfile ) = @_;
-
-    if ( ! -f $fontfile ) { installer::exiter::exit_program("ERROR: Font file does not exist: \"$fontfile\"", "get_font_version"); } 
-    
-    my $fontversion = 0;
-    my $infoline = ""; 
-    
-    my $onefile = installer::files::read_binary_file($fontfile);
-    
-    if ( $onefile =~ /Version\s+(\d+\.\d+\.*\d*)/ )
-    {
-        $fontversion = $1;
-        $infoline = "FONT: Font \"$fontfile\" version: $fontversion\n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "FONT: Could not determine font version: \"$fontfile\"\n"; 
-        push(@installer::globals::logfileinfo, $infoline);		
-    }
-
-    return $fontversion;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/icon.pm b/solenv/bin/modules/installer/windows/icon.pm
deleted file mode 100644
index 74f6f5662..000000000
--- a/solenv/bin/modules/installer/windows/icon.pm
+++ /dev/null
@@ -1,77 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::icon;
-
-use installer::files;
-use installer::globals;
-use installer::pathanalyzer;
-use installer::windows::idtglobal;
-
-###########################################################################################################
-# Creating the file Icon.idt dynamically
-# Content: 
-# Name Data
-###########################################################################################################
-
-sub create_icon_table
-{
-    my ($iconfilecollector, $basedir) = @_;
-
-    my @icontable = ();
-    
-    installer::windows::idtglobal::write_idt_header(\@icontable, "icon");
-
-    # Only the iconfiles, that are used in the shortcut table for the 
-    # FolderItems (entries in Windows startmenu) are added into the icon table.
-
-    for ( my $i = 0; $i <= $#{$iconfilecollector}; $i++ )
-    {
-        my $iconfile = ${$iconfilecollector}[$i];
-        
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$iconfile);
-        
-        my %icon = ();
-
-        $icon{'Name'} = $iconfile;	# simply soffice.exe
-        $icon{'Data'} = $iconfile;	# simply soffice.exe
-
-        my $oneline = $icon{'Name'} . "\t" . $icon{'Data'} . "\n";
-
-        push(@icontable, $oneline);		
-    }
-
-    # Saving the file
-    
-    my $icontablename = $basedir . $installer::globals::separator . "Icon.idt";
-    installer::files::save_file($icontablename ,\@icontable);
-    my $infoline = "Created idt file: $icontablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
deleted file mode 100644
index 8ef7f14ea..000000000
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ /dev/null
@@ -1,2411 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::idtglobal;
-
-use Cwd;
-use installer::converter;
-use installer::existence;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::pathanalyzer;
-use installer::remover;
-use installer::scriptitems;
-use installer::systemactions;
-use installer::windows::language;
-
-##############################################################
-# Shorten the gid for a feature.
-# Attention: Maximum length is 38
-##############################################################
-
-sub shorten_feature_gid
-{
-    my ($stringref) = @_;
-    
-    $$stringref =~ s/gid_Module_/gm_/;
-    $$stringref =~ s/_Extension_/_ex_/;
-    $$stringref =~ s/_Root_/_r_/;
-    $$stringref =~ s/_Prg_/_p_/;
-    $$stringref =~ s/_Optional_/_o_/;
-    $$stringref =~ s/_Tools_/_tl_/;
-    $$stringref =~ s/_Wrt_Flt_/_w_f_/;
-    $$stringref =~ s/_Javafilter_/_jf_/;
-    $$stringref =~ s/_Productivity_/_pr_/;
-}
-
-############################################
-# Getting the next free number, that
-# can be added.
-# Sample: 01-44-~1.DAT, 01-44-~2.DAT, ...
-############################################
-
-sub get_next_free_number
-{
-    my ($name, $shortnamesref) = @_;
-
-    my $counter = 0;
-    my $dontsave = 0;
-    my $alreadyexists;
-    my ($newname, $shortname);
-    
-    do
-    {
-        $alreadyexists = 0;
-        $counter++;
-        $newname = $name . $counter;
-
-        for ( my $i = 0; $i <= $#{$shortnamesref}; $i++ )
-        {
-            $shortname = ${$shortnamesref}[$i];
-            
-            if ( uc($shortname) eq uc($newname) )	# case insensitive
-            {
-                $alreadyexists = 1;
-                last;
-            }
-        }	
-    } 
-    until (!($alreadyexists));
-    
-    if (( $counter > 9 ) && ( length($name) > 6 )) { $dontsave = 1; }
-    if (( $counter > 99 ) && ( length($name) > 5 )) { $dontsave = 1; }
-    
-    if (!($dontsave))
-    {
-        push(@{$shortnamesref}, $newname);	# adding the new shortname to the array of shortnames
-    }
-        
-    return $counter
-}
-
-############################################
-# Getting the next free number, that
-# can be added.
-# Sample: 01-44-~1.DAT, 01-44-~2.DAT, ...
-############################################
-
-sub get_next_free_number_with_hash
-{
-    my ($name, $shortnamesref, $ext) = @_;
-
-    my $counter = 0;
-    my $dontsave = 0;
-    my $saved = 0;
-    my $alreadyexists;
-    my ($newname, $shortname);
-    
-    do
-    {
-        $alreadyexists = 0;
-        $counter++;
-        $newname = $name . $counter;
-        $newname = uc($newname);	# case insensitive, always upper case
-        if ( exists($shortnamesref->{$newname}) ||
-             exists($installer::globals::savedrev83mapping{$newname.$ext}) )
-        {
-            $alreadyexists = 1;
-        }
-    } 
-    until (!($alreadyexists));
-    
-    if (( $counter > 9 ) && ( length($name) > 6 )) { $dontsave = 1; }
-    if (( $counter > 99 ) && ( length($name) > 5 )) { $dontsave = 1; }
-    
-    if (!($dontsave))
-    {
-        $shortnamesref->{$newname} = 1;	# adding the new shortname to the array of shortnames, always uppercase
-        $saved = 1;
-    }
-        
-    return ( $counter, $saved )
-}
-
-#########################################
-# 8.3 for filenames and directories
-#########################################
-
-sub make_eight_three_conform
-{
-    my ($inputstring, $pattern, $shortnamesref) = @_;
-    
-    # all shortnames are collected in $shortnamesref, because of uniqueness
-
-    my ($name, $namelength, $number);
-    my $conformstring = "";
-    my $changed = 0;
-    
-    if (( $inputstring =~ /^\s*(.*?)\.(.*?)\s*$/ ) && ( $pattern eq "file" ))	# files with a dot
-    {
-        $name = $1;
-        my $extension = $2;
-        
-        $namelength = length($name);
-        my $extensionlength = length($extension);
-
-        if ( $extensionlength > 3 )
-        {
-            # simply taking the first three letters
-            $extension = substr($extension, 0, 3);	# name, offset, length
-        }
-
-        # Attention: readme.html -> README~1.HTM
-
-        if (( $namelength > 8 ) || ( $extensionlength > 3 ))
-        {
-            # taking the first six letters	
-            $name = substr($name, 0, 6);	# name, offset, length
-            $name =~ s/\s*$//; # removing ending whitespaces
-            $name = $name . "\~";
-            $number = get_next_free_number($name, $shortnamesref);
-            
-            # if $number>9 the new name would be "abcdef~10.xyz", which is 9+3, and therefore not allowed
-
-            if ( $number > 9 )
-            {
-                $name = substr($name, 0, 5);	# name, offset, length
-                $name =~ s/\s*$//; # removing ending whitespaces
-                $name = $name . "\~";
-                $number = get_next_free_number($name, $shortnamesref);			
-
-                if ( $number > 99 )
-                {
-                    $name = substr($name, 0, 4);	# name, offset, length
-                    $name =~ s/\s*$//; # removing ending whitespaces
-                    $name = $name . "\~";
-                    $number = get_next_free_number($name, $shortnamesref);			
-                }
-            }		
-
-            $name = $name . "$number";
-            
-            $changed = 1;
-        }
-        
-        $conformstring = $name . "\." . $extension;
-
-        if ( $changed ) { $conformstring= uc($conformstring); }
-    }
-    else 		# no dot in filename or directory (also used for shortcuts)
-    {
-        $name = $inputstring;
-        $namelength = length($name);
-        
-        if ( $namelength > 8 )
-        {
-            # taking the first six letters	
-            $name = substr($name, 0, 6);	# name, offset, length
-            $name =~ s/\s*$//; # removing ending whitespaces
-            $name = $name . "\~";
-            $number = get_next_free_number($name, $shortnamesref);
-
-            # if $number>9 the new name would be "abcdef~10.xyz", which is 9+3, and therefore not allowed
-
-            if ( $number > 9 )
-            {
-                $name = substr($name, 0, 5);	# name, offset, length
-                $name =~ s/\s*$//; # removing ending whitespaces
-                $name = $name . "\~";
-                $number = get_next_free_number($name, $shortnamesref);			
-
-                if ( $number > 99 )
-                {
-                    $name = substr($name, 0, 4);	# name, offset, length
-                    $name =~ s/\s*$//; # removing ending whitespaces
-                    $name = $name . "\~";
-                    $number = get_next_free_number($name, $shortnamesref);
-                }
-            }
-
-            $name = $name . "$number";
-            $changed = 1;
-            if ( $pattern eq "dir" ) { $name =~ s/\./\_/g; }	# in directories replacing "." with "_"
-        }
-
-        $conformstring = $name;
-        
-        if ( $changed ) { $conformstring = uc($name); }
-    }
-        
-    return $conformstring;
-}
-
-#########################################
-# 8.3 for filenames and directories
-# $shortnamesref is a hash in this case
-# -> performance reasons
-#########################################
-
-sub make_eight_three_conform_with_hash
-{
-    my ($inputstring, $pattern, $shortnamesref) = @_;
-    
-    # all shortnames are collected in $shortnamesref, because of uniqueness (a hash!)
-
-    my ($name, $namelength, $number);
-    my $conformstring = "";
-    my $changed = 0;
-    my $saved;
-    
-    if (( $inputstring =~ /^\s*(.*)\.(.*?)\s*$/ ) && ( $pattern eq "file" ))	# files with a dot
-    {
-        # extension has to be non-greedy, but name is. This is important to find the last dot in the filename
-        $name = $1;
-        my $extension = $2;
-        
-        if ( $name =~ /^\s*(.*?)\s*$/ ) { $name = $1; } # now the name is also non-greedy
-        $name =~ s/\.//g; # no dots in 8+3 conform filename
-        
-        $namelength = length($name);
-        my $extensionlength = length($extension);
-
-        if ( $extensionlength > 3 )
-        {
-            # simply taking the first three letters
-            $extension = substr($extension, 0, 3);	# name, offset, length
-            $changed = 1;
-        }
-
-        # Attention: readme.html -> README~1.HTM
-
-        if (( $namelength > 8 ) || ( $extensionlength > 3 ))
-        {
-            # taking the first six letters, if filename is longer than 6 characters
-            if ( $namelength > 6 )
-            {
-                $name = substr($name, 0, 6);	# name, offset, length
-                $name =~ s/\s*$//; # removing ending whitespaces
-                $name = $name . "\~";
-                ($number, $saved) = get_next_free_number_with_hash($name, $shortnamesref, '.'.uc($extension));
-            
-                # if $number>9 the new name would be "abcdef~10.xyz", which is 9+3, and therefore not allowed
-
-                if ( ! $saved )
-                {
-                    $name = substr($name, 0, 5);	# name, offset, length
-                    $name =~ s/\s*$//; # removing ending whitespaces
-                    $name = $name . "\~";
-                    ($number, $saved) = get_next_free_number_with_hash($name, $shortnamesref, '.'.uc($extension));
-
-                    # if $number>99 the new name would be "abcde~100.xyz", which is 9+3, and therefore not allowed
-
-                    if ( ! $saved )
-                    {
-                        $name = substr($name, 0, 4);	# name, offset, length
-                        $name =~ s/\s*$//; # removing ending whitespaces
-                        $name = $name . "\~";
-                        ($number, $saved) = get_next_free_number_with_hash($name, $shortnamesref, '.'.uc($extension));
-
-                        if ( ! $saved )
-                        {
-                            installer::exiter::exit_program("ERROR: Could not set 8+3 conform name for $inputstring !", "make_eight_three_conform_with_hash");
-                        }
-                    }
-                }		
-
-                $name = $name . "$number";
-                $changed = 1;
-            }
-        }
-        
-        $conformstring = $name . "\." . $extension;
-
-        if ( $changed ) { $conformstring= uc($conformstring); }
-    }
-    else 		# no dot in filename or directory (also used for shortcuts)
-    {
-        $name = $inputstring;
-        $namelength = length($name);
-        
-        if ( $namelength > 8 )
-        {
-            # taking the first six letters	
-            $name = substr($name, 0, 6);	# name, offset, length
-            $name =~ s/\s*$//; # removing ending whitespaces
-            $name = $name . "\~";
-            ( $number, $saved ) = get_next_free_number_with_hash($name, $shortnamesref, '');
-
-            # if $number>9 the new name would be "abcdef~10", which is 9+0, and therefore not allowed
-
-            if ( ! $saved )
-            {
-                $name = substr($name, 0, 5);	# name, offset, length
-                $name =~ s/\s*$//; # removing ending whitespaces
-                $name = $name . "\~";
-                ( $number, $saved ) = get_next_free_number_with_hash($name, $shortnamesref, '');			
-
-                # if $number>99 the new name would be "abcde~100", which is 9+0, and therefore not allowed
-
-                if ( ! $saved )
-                {
-                    $name = substr($name, 0, 4);	# name, offset, length
-                    $name =~ s/\s*$//; # removing ending whitespaces
-                    $name = $name . "\~";
-                    ( $number, $saved ) = get_next_free_number_with_hash($name, $shortnamesref, '');
-
-                    if ( ! $saved ) { installer::exiter::exit_program("ERROR: Could not set 8+3 conform name for $inputstring !", "make_eight_three_conform_with_hash"); }
-                }
-            }		
-
-            $name = $name . "$number";
-            $changed = 1;
-            if ( $pattern eq "dir" ) { $name =~ s/\./\_/g; }	# in directories replacing "." with "_"
-        }
-
-        $conformstring = $name;
-        
-        if ( $changed ) { $conformstring = uc($name); }
-    }
-        
-    return $conformstring;
-}
-
-#########################################
-# Writing the header for idt files
-#########################################
-
-sub write_idt_header
-{
-    my ($idtref, $definestring) = @_;
-    
-    my $oneline;
-    
-    if ( $definestring eq "file" )
-    {
-        $oneline = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti4\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "File\tFile\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "filehash" )
-    {
-        $oneline = "File_\tOptions\tHashPart1\tHashPart2\tHashPart3\tHashPart4\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\ti2\ti4\ti4\ti4\ti4\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "MsiFileHash\tFile_\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "directory" )
-    {
-        $oneline = "Directory\tDirectory_Parent\tDefaultDir\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\tS72\tl255\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "Directory\tDirectory\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "component" )
-    {
-        $oneline = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\tS38\ts72\ti2\tS255\tS72\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "Component\tComponent\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "feature" )
-    {
-        $oneline = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "WINDOWSENCODINGTEMPLATE\tFeature\tFeature\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "featurecomponent" )
-    {
-        $oneline = "Feature_\tComponent_\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s38\ts72\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "FeatureComponents\tFeature_\tComponent_\n";
-        push(@{$idtref}, $oneline);
-    }
-    
-    if ( $definestring eq "media" )
-    {
-        $oneline = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "i2\ti4\tL64\tS255\tS32\tS72\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "Media\tDiskId\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "font" )
-    {
-        $oneline = "File_\tFontTitle\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\tS128\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "Font\tFile_\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "shortcut" )
-    {
-        $oneline = "Shortcut\tDirectory_\tName\tComponent_\tTarget\tArguments\tDescription\tHotkey\tIcon_\tIconIndex\tShowCmd\tWkDir\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\ts72\tl128\ts72\ts72\tS255\tL255\tI2\tS72\tI2\tI2\tS72\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "WINDOWSENCODINGTEMPLATE\tShortcut\tShortcut\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "registry" )
-    {
-        $oneline = "Registry\tRoot\tKey\tName\tValue\tComponent_\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\ti2\tl255\tL255\tL0\ts72\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "Registry\tRegistry\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "reg64" )
-    {
-        $oneline = "Registry\tRoot\tKey\tName\tValue\tComponent_\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\ti2\tl255\tL255\tL0\ts72\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "Reg64\tRegistry\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "createfolder" )
-    {
-        $oneline = "Directory_\tComponent_\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\ts72\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "CreateFolder\tDirectory_\tComponent_\n";
-        push(@{$idtref}, $oneline);
-    }
-    
-    if ( $definestring eq "removefile" )
-    {
-        $oneline = "FileKey\tComponent_\tFileName\tDirProperty\tInstallMode\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\ts72\tL255\ts72\ti2\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "RemoveFile\tFileKey\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "upgrade" )
-    {
-        $oneline = "UpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\tRemove\tActionProperty\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s38\tS20\tS20\tS255\ti4\tS255\ts72\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "Upgrade\tUpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\n";
-        push(@{$idtref}, $oneline);
-    }	
-
-    if ( $definestring eq "icon" )
-    {
-        $oneline = "Name\tData\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\tv0\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "Icon\tName\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "inifile" )
-    {	
-        $oneline = "IniFile\tFileName\tDirProperty\tSection\tKey\tValue\tAction\tComponent_\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\tl255\tS72\tl96\tl128\tl255\ti2\ts72\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "IniFile\tIniFile\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "selfreg" )
-    {
-        $oneline = "File_\tCost\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\tI2\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "SelfReg\tFile_\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "msiassembly" )
-    {
-        $oneline = "Component_\tFeature_\tFile_Manifest\tFile_Application\tAttributes\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\ts38\tS72\tS72\tI2\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "MsiAssembly\tComponent_\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "msiassemblyname" )
-    {
-        $oneline = "Component_\tName\tValue\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\ts255\ts255\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "MsiAssemblyName\tComponent_\tName\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "appsearch" )
-    {
-        $oneline = "Property\tSignature_\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\ts72\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "AppSearch\tProperty\tSignature_\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "reglocat" )
-    {
-        $oneline = "Signature_\tRoot\tKey\tName\tType\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\ti2\ts255\tS255\tI2\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "RegLocator\tSignature_\n";
-        push(@{$idtref}, $oneline);
-    }
-
-    if ( $definestring eq "signatur" )
-    {
-        $oneline = "Signature\tFileName\tMinVersion\tMaxVersion\tMinSize\tMaxSize\tMinDate\tMaxDate\tLanguages\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "s72\ts255\tS20\tS20\tI4\tI4\tI4\tI4\tS255\n";
-        push(@{$idtref}, $oneline);
-        $oneline = "Signature\tSignature\n";
-        push(@{$idtref}, $oneline);
-    }
-
-}
-
-##############################################################
-# Returning the name of the rranslation file for a
-# given language.
-# Sample: "01" oder "en-US" -> "1033.txt"
-##############################################################
-
-sub get_languagefilename
-{
-    my ($idtfilename, $basedir) = @_;
-
-    $idtfilename =~ s/\.idt/\.mlf/;
-
-    my $languagefilename = $basedir . $installer::globals::separator . $idtfilename;
-
-    return $languagefilename;
-}
-
-##############################################################
-# Returning the complete block in all languages
-# for a specified string
-##############################################################
-
-sub get_language_block_from_language_file
-{
-    my ($searchstring, $languagefile) = @_;
-
-    my @language_block = ();
-
-    for ( my $i = 0; $i <= $#{$languagefile}; $i++ )
-    {		
-        if ( ${$languagefile}[$i] =~ /^\s*\[\s*$searchstring\s*\]\s*$/ )
-        {
-            my $counter = $i;
-
-            push(@language_block, ${$languagefile}[$counter]);
-            $counter++;
-            
-            while (( $counter <= $#{$languagefile} ) && (!( ${$languagefile}[$counter] =~ /^\s*\[/ )))
-            {
-                push(@language_block, ${$languagefile}[$counter]);
-                $counter++;
-            }
-            
-            last;
-        }
-    }	
-    
-    return \@language_block;
-}
-
-##############################################################
-# Returning a specific language string from the block
-# of all translations
-##############################################################
-
-sub get_language_string_from_language_block
-{
-    my ($language_block, $language, $oldstring) = @_;
-    
-    my $newstring = "";
-
-    for ( my $i = 0; $i <= $#{$language_block}; $i++ )
-    {
-        if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ )
-        {
-            $newstring = $1;
-            last;
-        }	
-    }	
-    
-    if ( $newstring eq "" )
-    {
-        $language = "en-US"; 	# defaulting to english	
-
-        for ( my $i = 0; $i <= $#{$language_block}; $i++ )
-        {		
-            if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ )
-            {
-                $newstring = $1;
-                last;
-            }			
-        }
-    }
-    
-    return $newstring;
-}
-
-##############################################################
-# Returning a specific code from the block
-# of all codes. No defaulting to english!
-##############################################################
-
-sub get_code_from_code_block
-{
-    my ($codeblock, $language) = @_;
-    
-    my $newstring = "";
-
-    for ( my $i = 0; $i <= $#{$codeblock}; $i++ )
-    {
-        if ( ${$codeblock}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ )
-        {
-            $newstring = $1;
-            last;
-        }	
-    }	
-    
-    return $newstring;
-}
-
-##############################################################
-# Translating an idt file
-##############################################################
-
-sub translate_idtfile
-{
-    my ($idtfile, $languagefile, $onelanguage) = @_;
-
-    for ( my $i = 0; $i <= $#{$idtfile}; $i++ )
-    {		
-        my @allstrings = ();
-        
-        my $oneline = ${$idtfile}[$i];
-        
-        while ( $oneline =~ /\b(OOO_\w+)\b/ )
-        {
-            my $replacestring = $1;
-            push(@allstrings, $replacestring);
-            $oneline =~ s/$replacestring//;
-        } 
-        
-        my $oldstring;
-        
-        foreach $oldstring (@allstrings)
-        {			
-            my $language_block = get_language_block_from_language_file($oldstring, $languagefile);
-            my $newstring = get_language_string_from_language_block($language_block, $onelanguage, $oldstring);
-
-            ${$idtfile}[$i] =~ s/$oldstring/$newstring/;	# always substitute, even if $newstring eq "" (there are empty strings for control.idt)
-        }
-    }
-}
-
-##############################################################
-# Copying all needed files to create a msi database
-# into one language specific directory
-##############################################################
-
-sub prepare_language_idt_directory
-{
-    my ($destinationdir, $newidtdir, $onelanguage, $filesref, $iconfilecollector, $binarytablefiles, $allvariables) = @_;
-    
-    # Copying all idt-files from the source $installer::globals::idttemplatepath to the destination $destinationdir
-    # Copying all files in the subdirectory "Binary"
-    # Copying all files in the subdirectory "Icon"
-
-    my $infoline = "";
-
-    installer::systemactions::copy_directory($installer::globals::idttemplatepath, $destinationdir);
-
-    if ( -d $installer::globals::idttemplatepath . $installer::globals::separator . "Binary")
-    {
-        installer::systemactions::create_directory($destinationdir . $installer::globals::separator . "Binary");
-        installer::systemactions::copy_directory($installer::globals::idttemplatepath . $installer::globals::separator . "Binary", $destinationdir . $installer::globals::separator . "Binary");
-
-        if ((( $installer::globals::patch ) && ( $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} )) || ( $allvariables->{'WINDOWSBITMAPDIRECTORY'} ))
-        {
-            my $bitmapdir = "";
-            if ( $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} ) { $bitmapdir = $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'}; }
-            if ( $allvariables->{'WINDOWSBITMAPDIRECTORY'} ) { $bitmapdir = $allvariables->{'WINDOWSBITMAPDIRECTORY'}; }
-            
-            my $newsourcedir = $installer::globals::unpackpath . $installer::globals::separator . $bitmapdir; # path setting in list file dependent from unpackpath !?
-            $infoline = "\nOverwriting files in directory \"" . $destinationdir . $installer::globals::separator . "Binary" . "\" with files from directory \"" . $newsourcedir . "\".\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            if ( ! -d $newsourcedir )
-            {
-                my $currentdir = cwd();
-                installer::exiter::exit_program("ERROR: Directory $newsourcedir does not exist! Current directory is: $currentdir", "prepare_language_idt_directory");
-            }
-            installer::systemactions::copy_directory($newsourcedir, $destinationdir . $installer::globals::separator . "Binary");
-        }
-    }
-
-    installer::systemactions::create_directory($destinationdir . $installer::globals::separator . "Icon");
-
-    if ( -d $installer::globals::idttemplatepath . $installer::globals::separator . "Icon")
-    {
-        installer::systemactions::copy_directory($installer::globals::idttemplatepath . $installer::globals::separator . "Icon", $destinationdir . $installer::globals::separator . "Icon");
-    }
-    
-    # Copying all files in $iconfilecollector, that describe icons of folderitems
-
-    for ( my $i = 0; $i <= $#{$iconfilecollector}; $i++ )
-    {
-        my $iconfilename = ${$iconfilecollector}[$i];
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$iconfilename);
-        installer::systemactions::copy_one_file(${$iconfilecollector}[$i], $destinationdir . $installer::globals::separator . "Icon" . $installer::globals::separator . $iconfilename);
-    }
-
-    # Copying all files in $binarytablefiles in the binary directory
-
-    for ( my $i = 0; $i <= $#{$binarytablefiles}; $i++ )
-    {
-        my $binaryfile = ${$binarytablefiles}[$i];
-        my $binaryfilepath = $binaryfile->{'sourcepath'};
-        my $binaryfilename = $binaryfilepath;
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$binaryfilename);
-        installer::systemactions::copy_one_file($binaryfilepath, $destinationdir . $installer::globals::separator . "Binary" . $installer::globals::separator . $binaryfilename);
-    }
-
-    # Copying all new created and language independent idt-files to the destination $destinationdir.
-    # Example: "File.idt"
-
-    installer::systemactions::copy_directory_with_fileextension($newidtdir, $destinationdir, "idt");
-
-    # Copying all new created and language dependent idt-files to the destination $destinationdir.
-    # Example: "Feature.idt.01"
-
-    installer::systemactions::copy_directory_with_fileextension($newidtdir, $destinationdir, $onelanguage);
-    installer::systemactions::rename_files_with_fileextension($destinationdir, $onelanguage);
-
-}
-
-##############################################################
-# Returning the source path of the rtf licensefile for
-# a specified language
-##############################################################
-
-sub get_rtflicensefilesource
-{
-    my ($language, $includepatharrayref) = @_;
-
-    my $licensefilename = "license_" . $language . ".rtf";
-
-    my $sourcefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $includepatharrayref, 1);
-
-    if ($$sourcefileref eq "") { installer::exiter::exit_program("ERROR: Could not find $licensefilename!", "get_rtflicensefilesource"); }
-
-    my $infoline = "Using licensefile: $$sourcefileref\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    return $$sourcefileref;
-}
-
-##############################################################
-# Returning the source path of the licensefile for
-# a specified language
-##############################################################
-
-sub get_licensefilesource
-{
-    my ($language, $filesref) = @_;
-
-    my $licensefilename = "license_" . $language . ".txt";
-    my $sourcepath = "";
-    my $foundlicensefile = 0;
-    
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {		
-        my $onefile = ${$filesref}[$i];
-        my $filename = $onefile->{'Name'};
-        
-        if ($filename eq $licensefilename)
-        {
-            $sourcepath = $onefile->{'sourcepath'};
-            $foundlicensefile = 1;
-            last;	
-        }	
-    }
-    
-    if ( ! $foundlicensefile ) { installer::exiter::exit_program("ERROR: Did not find file $licensefilename in file collector!", "get_licensefilesource"); }
-
-    return $sourcepath;
-}
-
-##############################################################
-# A simple converter to create the license text
-# in rtf format
-##############################################################
-
-sub get_rtf_licensetext
-{
-    my ($licensefile) = @_;
-
-    # A very simple rtf converter
-
-    # The static header
-    
-    my $rtf_licensetext = '{\rtf1\ansi\deff0';
-    $rtf_licensetext = $rtf_licensetext . '{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}}';
-    $rtf_licensetext = $rtf_licensetext . '{\colortbl\red0\green0\blue0;\red255\green255\blue255;\red128\green128\blue128;}';
-    $rtf_licensetext = $rtf_licensetext . '{\stylesheet{\s1\snext1 Standard;}}';
-    $rtf_licensetext = $rtf_licensetext . '{\info{\comment StarWriter}{\vern5690}}\deftab709';
-    $rtf_licensetext = $rtf_licensetext . '{\*\pgdsctbl';
-    $rtf_licensetext = $rtf_licensetext . '{\pgdsc0\pgdscuse195\pgwsxn11905\pghsxn16837\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0 Standard;}}';
-    $rtf_licensetext = $rtf_licensetext . '\paperh16837\paperw11905\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\pgwsxn11905\pghsxn16837\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc';
-    $rtf_licensetext = $rtf_licensetext . '\pard\plain \s1';
-
-    for ( my $i = 0; $i <= $#{$licensefile}; $i++ )
-    {
-        my $oneline = ${$licensefile}[$i];
-
-        if ( $i == 0 ) { $oneline =~ s/^\W*//; }
-
-        $oneline =~ s/\t/    /g;		# no tabs allowed, converting to four spaces
-        $oneline =~ s/\n$//g;			# no newline at line end
-
-        # german replacements
-
-        $oneline =~ s/\Ã\„/\\\'c4/g;		# converting "Ä"
-        $oneline =~ s/\Ã\–/\\\'d6/g;		# converting "Ö"
-        $oneline =~ s/\Ã\œ/\\\'dc/g;		# converting "Ü"
-        $oneline =~ s/\Ã\¤/\\\'e4/g;		# converting "ä"
-        $oneline =~ s/\Ã\¶/\\\'f6/g;		# converting "ö"
-        $oneline =~ s/\Ã\¼/\\\'fc/g;		# converting "ü"
-        $oneline =~ s/\Ã\Ÿ/\\\'df/g;		# converting "ß"
-
-        # french replacements
-
-        $oneline =~ s/\Ã\‰/\\\'c9/g;
-        $oneline =~ s/\Ã\€/\\\'c0/g;
-        $oneline =~ s/\Â\«/\\\'ab/g;
-        $oneline =~ s/\Â\»/\\\'bb/g;
-        $oneline =~ s/\Ã\©/\\\'e9/g;
-        $oneline =~ s/\Ã\¨/\\\'e8/g;
-        $oneline =~ s/\Ã\ /\\\'e0/g;
-        $oneline =~ s/\Ã\´/\\\'f4/g;
-        $oneline =~ s/\Ã\§/\\\'e7/g;
-        $oneline =~ s/\Ã\ª/\\\'ea/g;
-        $oneline =~ s/\Ã\Š/\\\'ca/g;
-        $oneline =~ s/\Ã\»/\\\'fb/g;
-        $oneline =~ s/\Ã\¹/\\\'f9/g;
-        $oneline =~ s/\Ã\®/\\\'ee/g;
-    
-        # quotation marks
-
-        $oneline =~ s/\â\€\ž/\\\'84/g;
-        $oneline =~ s/\â\€\œ/\\ldblquote/g;
-        $oneline =~ s/\â\€\™/\\rquote/g;
-
-
-        $oneline =~ s/\Â\ /\\\~/g;
-
-        $oneline = '\par ' . $oneline;
-        
-        $rtf_licensetext = $rtf_licensetext .  $oneline;
-    }
-
-    # and the end
-
-    $rtf_licensetext = $rtf_licensetext . '\par \par }';
-
-    return $rtf_licensetext;
-}
-
-##############################################################
-# A simple converter to create a license txt string from
-# the rtf format
-##############################################################
-
-sub make_string_licensetext
-{
-    my ($licensefile) = @_;
-
-    my $rtf_licensetext = "";
-
-    for ( my $i = 0; $i <= $#{$licensefile}; $i++ )
-    {
-        my $oneline = ${$licensefile}[$i];
-        $oneline =~ s/\s*$//g;		# no whitespace at line end
-            
-        $rtf_licensetext = $rtf_licensetext .  $oneline . " ";
-    }
-
-    return $rtf_licensetext;	
-}
-
-##############################################################
-# Setting the path, where the soffice.exe is installed, into 
-# the CustomAction table
-##############################################################
-
-sub add_officedir_to_database
-{
-    my ($basedir, $allvariables) = @_;
-
-    my $customactionfilename = $basedir . $installer::globals::separator . "CustomAc.idt";
-    
-    my $customacfile = installer::files::read_file($customactionfilename);
-
-    my $found = 0;
-
-    # Updating the values
-
-    if ( $installer::globals::officeinstalldirectoryset )
-    {
-        $found = 0;
-        
-        for ( my $i = 0; $i <= $#{$customacfile}; $i++ )
-        {
-            if ( ${$customacfile}[$i] =~ /\bOFFICEDIRECTORYGID\b/ )
-            {
-                ${$customacfile}[$i] =~ s/\bOFFICEDIRECTORYGID\b/$installer::globals::officeinstalldirectory/;
-                $found = 1;
-            }
-        }
-        
-        if (( ! $found ) && ( ! $allvariables->{'IGNOREDIRECTORYLAYER'} ))
-        {
-            installer::exiter::exit_program("ERROR: \"OFFICEDIRECTORYGID\" not found in \"$customactionfilename\" !", "add_officedir_to_database");
-        }		
-    }
-    
-    # Saving the file
-    
-    installer::files::save_file($customactionfilename ,$customacfile);
-    my $infoline = "Updated idt file: $customactionfilename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-##############################################################
-# Including the license text into the table control.idt
-##############################################################
-
-sub add_licensefile_to_database
-{
-    my ($licensefile, $controltable) = @_;
-    
-    # Nine tabs before the license text and two tabs after it
-    # The license text has to be included into the dialog
-    # LicenseAgreement into the control Memo.
-    
-    my $foundlicenseline = 0;
-    my ($number, $line);
-    
-    for ( my $i = 0; $i <= $#{$controltable}; $i++ )
-    {		
-        $line = ${$controltable}[$i];
-        
-        if ( $line =~ /^\s*\bLicenseAgreement\b\t\bMemo\t/ )
-        {
-            $foundlicenseline = 1;
-            $number = $i;
-            last;
-        }
-    }
-    
-    if (!($foundlicenseline))
-    {
-        installer::exiter::exit_program("ERROR: Line for license file in Control.idt not found!", "add_licensefile_to_database");
-    }
-    else
-    {
-        my %control = ();
-        
-        if ( $line =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            $control{'Dialog_'} = $1;		
-            $control{'Control'} = $2;		
-            $control{'Type'} = $3;		
-            $control{'X'} = $4;		
-            $control{'Y'} = $5;		
-            $control{'Width'} = $6;		
-            $control{'Height'} = $7;		
-            $control{'Attributes'} = $8;		
-            $control{'Property'} = $9;		
-            $control{'Text'} = $10;		
-            $control{'Control_Next'} = $11;		
-            $control{'Help'} = $12;		
-        }
-        else
-        {
-            installer::exiter::exit_program("ERROR: Could not split line correctly!", "add_licensefile_to_database");		
-        }
-
-        # my $licensetext = get_rtf_licensetext($licensefile);
-        my $licensetext = make_string_licensetext($licensefile);		
-    
-        $control{'Text'} = $licensetext;
-        
-        my $newline = $control{'Dialog_'} . "\t" . $control{'Control'} . "\t" . $control{'Type'} . "\t" .
-                        $control{'X'} . "\t" . $control{'Y'} . "\t" . $control{'Width'} . "\t" .
-                        $control{'Height'} . "\t" . $control{'Attributes'} . "\t" . $control{'Property'} . "\t" .
-                        $control{'Text'} . "\t" . $control{'Control_Next'} . "\t" . $control{'Help'} . "\n";
-        
-        ${$controltable}[$number] = $newline
-    }	
-}
-
-################################################################################################
-# Including the checkboxes for the language selection dialog
-# into the table control.idt . This is only relevant for
-# multilingual installation sets.
-#
-# old:
-# LanguageSelection	CheckBox1	CheckBox	22	60	15	24	3	IS1033		CheckBox2	
-# LanguageSelection	Text1	Text	40	60	70	15	65539		OOO_CONTROL_LANG_1033		
-# LanguageSelection	CheckBox2	CheckBox	22	90	15	24	3	IS1031		Next	
-# LanguageSelection	Text2	Text	40	90	70	15	65539		OOO_CONTROL_LANG_1031		
-# new:
-# LanguageSelection	CheckBox1	CheckBox	22	60	15	24	3	IS1033	Text	CheckBox2	
-# LanguageSelection	CheckBox2	CheckBox	22	90	15	24	3	IS1031	Text	Next	
-################################################################################################
-
-sub add_language_checkboxes_to_database
-{
-    my ($controltable, $languagesarrayref) = @_;
-    
-    # for each language, two lines have to be inserted
-
-    for ( my $i = 0; $i <= $#{$languagesarrayref}; $i++ )
-    {
-        my $last = 0;
-        if ( $i == $#{$languagesarrayref} ) { $last = 1; }		# special handling for the last
-
-        my $onelanguage = ${$languagesarrayref}[$i];
-        my $windowslanguage = installer::windows::language::get_windows_language($onelanguage);
-
-        my $checkboxattribute = "3";
-
-        my $count = $i + 1;
-        my $nextcount = $i + 2;		
-        my $checkboxcount = "CheckBox" . $count;
-
-        my $multiplier = 20;
-        my $offset = 60;
-        if ( $#{$languagesarrayref} > 7 )
-        {
-            $multiplier = 15;	# smaller differences for more than 7 languages
-            $offset = 50;		# smaller offset for more than 7 languages
-        }
-
-        my $yvalue = $offset + $i * $multiplier;
-
-        my $property = "IS" . $windowslanguage;
-
-        my $controlnext = "";
-        if ( $last ) { $controlnext = "Next"; }
-        else { $controlnext = "CheckBox" . $nextcount; }
-
-        my $stringname = "OOO_CONTROL_LANG_" . $windowslanguage;
-        
-        my $line1 = "LanguageSelection" . "\t" . $checkboxcount . "\t" . "CheckBox" . "\t" .
-                    "22" . "\t" . $yvalue . "\t" . "200" . "\t" . "15" . "\t" . $checkboxattribute . "\t" .
-                    $property . "\t" . $stringname . "\t" . $controlnext . "\t" . "\n";
-
-        push(@{$controltable}, $line1);
-
-    #	my $textcount = "Text" . $count;
-    #	my $stringname = "OOO_CONTROL_LANG_" . $windowslanguage;
-    #	
-    #	$yvalue = $yvalue + 2;		# text 2 pixel lower than checkbox
-    #
-    #	my $line2 = "LanguageSelection" . "\t" . $textcount . "\t" . "Text" . "\t" . 
-    #				"40" . "\t" . $yvalue . "\t" . "70" . "\t" . "15" . "\t" . "65539" . "\t" .
-    #				"\t" . $stringname . "\t" . "\t" . "\n";
-    #
-    #	push(@{$controltable}, $line2);
-    }
-}
-
-###################################################################
-# Determining the last position in a sequencetable
-# into the tables CustomAc.idt and InstallE.idt.
-###################################################################
-
-sub get_last_position_in_sequencetable
-{
-    my ($sequencetable) = @_;
-    
-    my $position = 0;
-    
-    for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
-    {
-        my $line = ${$sequencetable}[$i];
-    
-        if ( $line =~ /^\s*\w+\t.*\t\s*(\d+)\s$/ )
-        {
-            my $newposition = $1;
-            if ( $newposition > $position ) { $position = $newposition; }
-        }
-    }
-    
-    return $position;
-}
-
-#########################################################################
-# Determining the position of a specified Action in the sequencetable
-#########################################################################
-
-sub get_position_in_sequencetable
-{
-    my ($action, $sequencetable) = @_;
-    
-    my $position = 0;
-
-    $action =~ s/^\s*behind_//;
-    
-    for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
-    {
-        my $line = ${$sequencetable}[$i];
-    
-        if ( $line =~ /^\s*(\w+)\t.*\t\s*(\d+)\s$/ )
-        {
-            my $compareaction = $1;
-            $position = $2;
-            if ( $compareaction eq $action ) { last; }
-        }
-    }
-    
-    return $position;
-}
-
-################################################################################################
-# Including the CustomAction for the configuration
-# into the tables CustomAc.idt and InstallE.idt.
-#
-# CustomAc.idt: ExecutePkgchk 82 pkgchk.exe -s
-# InstallE.idt: ExecutePkgchk Not REMOVE="ALL" 3175
-#
-# CustomAc.idt: ExecuteQuickstart 82 install_quickstart.exe
-# InstallE.idt: ExecuteQuickstart &gm_o_Quickstart=3 3200
-#
-# CustomAc.idt: ExecuteInstallRegsvrex 82 regsvrex.exe shlxthdl.dll
-# InstallE.idt: ExecuteInstallRegsvrex Not REMOVE="ALL" 3225
-#
-# CustomAc.idt: ExecuteUninstallRegsvrex 82 regsvrex.exe /u shlxthdl.dll
-# InstallE.idt: ExecuteUninstallRegsvrex REMOVE="ALL" 690
-#
-# CustomAc.idt: Regmsdocmsidll1 1 reg4msdocmsidll Reg4MsDocEntry
-# InstallU.idt: Regmsdocmsidll1 Not REMOVE="ALL" 610
-#
-# CustomAc.idt: Regmsdocmsidll2 1 reg4msdocmsidll Reg4MsDocEntry
-# InstallE.idt: Regmsdocmsidll2 Not REMOVE="ALL" 3160
-################################################################################################
-
-sub set_custom_action
-{
-    my ($customactionidttable, $actionname, $actionflags, $exefilename, $actionparameter, $inbinarytable, $filesref, $customactionidttablename, $styles) = @_;
-    
-    my $included_customaction = 0;
-    my $infoline = "";
-    my $customaction_exefilename = $exefilename;
-    my $uniquename = "";
-
-    # when the style NO_FILE is set, no searching for the file is needed, no filtering is done, we can add that custom action
-    if ( $styles =~ /\bNO_FILE\b/ )
-    {
-        my $line = $actionname . "\t" . $actionflags . "\t" . $customaction_exefilename . "\t" . $actionparameter . "\n";
-        push(@{$customactionidttable}, $line);
-
-        $infoline = "Added $actionname CustomAction into table $customactionidttablename (NO_FILE has been set)\n";
-        push(@installer::globals::logfileinfo, $infoline);
-
-        $included_customaction = 1;
-        return $included_customaction;
-    }
-    
-    # is the $exefilename a library that is included into the binary table
-    
-    if ( $inbinarytable ) { $customaction_exefilename =~ s/\.//; }	# this is the entry in the binary table ("abc.dll" -> "abcdll")
-
-    # is the $exefilename included into the product?
-    
-    my $contains_file = 0;
-
-    # All files are located in $filesref and in @installer::globals::binarytableonlyfiles.
-    # Both must be added together
-    my $localfilesref = [@installer::globals::binarytableonlyfiles, @{$filesref}];
-
-    for ( my $i = 0; $i <= $#{$localfilesref}; $i++ )
-    {
-        my $onefile = ${$localfilesref}[$i];
-        my $filename = "";
-        if ( exists($onefile->{'Name'}) )
-        {
-            $filename = $onefile->{'Name'};
-
-            if ( $filename eq $exefilename )
-            {
-                $contains_file = 1;
-                $uniquename = ${$localfilesref}[$i]->{'uniquename'};
-                last;
-            }
-        }
-        else
-        {
-            installer::exiter::exit_program("ERROR: Did not find \"Name\" for file \"$onefile->{'uniquename'}\" ($onefile->{'gid'})!", "set_custom_action");
-        }	
-    }
-
-    if ( $contains_file )
-    {
-        # Now the CustomAction can be included into the CustomAc.idt
-
-        if ( ! $inbinarytable ) { $customaction_exefilename = $uniquename; }	# the unique file name has to be added to the custom action table
-        
-        my $line = $actionname . "\t" . $actionflags . "\t" . $customaction_exefilename . "\t" . $actionparameter . "\n";
-        push(@{$customactionidttable}, $line);
-        
-        $included_customaction = 1;
-    }
-    
-    if ( $included_customaction ) { $infoline = "Added $actionname CustomAction into table $customactionidttablename\n"; }
-    else { $infoline = "Did not add $actionname CustomAction into table $customactionidttablename\n"; }
-    push(@installer::globals::logfileinfo, $infoline);
-
-    return $included_customaction;
-}
-
-####################################################################
-# Adding a Custom Action to InstallExecuteTable or InstallUITable
-####################################################################
-
-sub add_custom_action_to_install_table
-{
-    my ($installtable, $exefilename, $actionname, $actioncondition, $position, $filesref, $installtablename, $styles) = @_;
-    
-    my $included_customaction = 0;
-    my $feature = "";
-    my $infoline = "";
-    
-    # when the style NO_FILE is set, no searching for the file is needed, no filtering is done, we can add that custom action
-    if ( $styles =~ /\bNO_FILE\b/ )
-    {
-        # then the InstallE.idt.idt or InstallU.idt.idt
-        $actioncondition =~ s/FEATURETEMPLATE/$feature/g;	# only execute Custom Action, if feature of the file is installed
-
-        my $actionposition = 0;
-        
-        if ( $position eq "end" ) { $actionposition = get_last_position_in_sequencetable($installtable) + 25; }
-        elsif ( $position =~ /^\s*behind_/ ) { $actionposition = get_position_in_sequencetable($position, $installtable) + 2; }
-        else { $actionposition = get_position_in_sequencetable($position, $installtable) - 2; }
-        
-        my $line = $actionname . "\t" . $actioncondition . "\t" . $actionposition . "\n";
-        push(@{$installtable}, $line);
-
-        $infoline = "Added $actionname CustomAction into table $installtablename (NO_FILE has been set)\n";
-        push(@installer::globals::logfileinfo, $infoline);
-        return;
-    }
-    
-    my $contains_file = 0;
-
-    # All files are located in $filesref and in @installer::globals::binarytableonlyfiles.
-    # Both must be added together
-    my $localfilesref = [@installer::globals::binarytableonlyfiles, @{$filesref}];
-
-    for ( my $i = 0; $i <= $#{$localfilesref}; $i++ )
-    {
-        my $filename = ${$localfilesref}[$i]->{'Name'};
-    
-        if ( $filename eq $exefilename )
-        {
-            $contains_file = 1;
-
-            # Determining the feature of the file
-            
-            if ( ${$localfilesref}[$i] ) { $feature = ${$localfilesref}[$i]->{'modules'}; }
-    
-            # If modules contains a list of modules, only taking the first one.
-            if ( $feature =~ /^\s*(.*?)\,/ ) { $feature = $1; }
-            # Attention: Maximum feature length is 38!
-            shorten_feature_gid(\$feature);
-            
-            last;
-        }
-    }
-    
-    if ( $contains_file )
-    {
-        # then the InstallE.idt.idt or InstallU.idt.idt
-        
-        $actioncondition =~ s/FEATURETEMPLATE/$feature/g;	# only execute Custom Action, if feature of the file is installed
-
-#		my $actionposition = 0;
-#		if ( $position eq "end" ) { $actionposition = get_last_position_in_sequencetable($installtable) + 25; }
-#		elsif ( $position =~ /^\s*behind_/ ) { $actionposition = get_position_in_sequencetable($position, $installtable) + 2; }
-#		else { $actionposition = get_position_in_sequencetable($position, $installtable) - 2; }
-#		my $line = $actionname . "\t" . $actioncondition . "\t" . $actionposition . "\n";
-
-        my $positiontemplate = "";
-        if ( $position =~ /^\s*\d+\s*$/ ) { $positiontemplate = $position; }	# setting the position directly, number defined in scp2
-        else { $positiontemplate = "POSITIONTEMPLATE_" . $position; }
-
-        my $line = $actionname . "\t" . $actioncondition . "\t" . $positiontemplate . "\n";
-        push(@{$installtable}, $line);
-
-        $included_customaction = 1;
-    }
-
-    if ( $included_customaction ) { $infoline = "Added $actionname CustomAction into table $installtablename\n"; }
-    else { $infoline = "Did not add $actionname CustomAction into table $installtablename\n"; }
-    push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-##################################################################
-# A line in the table ControlEvent connects a Control 
-# with a Custom Action
-#################################################################
-
-sub connect_custom_action_to_control
-{
-    my ( $table, $tablename, $dialog, $control, $event, $argument, $condition, $ordering) = @_;
-    
-    my $line = $dialog . "\t" . $control. "\t" . $event. "\t" . $argument. "\t" . $condition. "\t" . $ordering . "\n";
-
-    push(@{$table}, $line);
-
-    $line =~ s/\s*$//g;
-        
-    $infoline = "Added line \"$line\" into table $tablename\n";
-    push(@installer::globals::logfileinfo, $infoline);	
-}
-
-##################################################################
-# A line in the table ControlCondition connects a Control state
-# with a condition
-##################################################################
-
-sub connect_condition_to_control
-{
-    my ( $table, $tablename, $dialog, $control, $event, $condition) = @_;
-    
-    my $line = $dialog . "\t" . $control. "\t" . $event. "\t" . $condition. "\n";
-
-    push(@{$table}, $line);
-
-    $line =~ s/\s*$//g;
-        
-    $infoline = "Added line \"$line\" into table $tablename\n";
-    push(@installer::globals::logfileinfo, $infoline);	
-}
-
-##################################################################
-# Searching for a sequencenumber in InstallUISequence table
-# "ExecuteAction" must be the last action
-##################################################################
-
-sub get_free_number_in_uisequence_table
-{
-    my ( $installuitable ) = @_;
-
-    # determining the sequence of "ExecuteAction"
-
-    my $executeactionnumber = 0;
-
-    for ( my $i = 0; $i <= $#{$installuitable}; $i++ )
-    {
-        if ( ${$installuitable}[$i] =~ /^\s*(\w+)\t\w*\t(\d+)\s*$/ )
-        {
-            my $actionname = $1;
-            my $actionnumber = $2;
-            
-            if ( $actionname eq "ExecuteAction" )
-            {
-                $executeactionnumber = $actionnumber;
-                last;
-            }
-        }
-    }
-    
-    if ( $executeactionnumber == 0 ) { installer::exiter::exit_program("ERROR: Did not find \"ExecuteAction\" in InstallUISequence table!", "get_free_number_in_uisequence_table"); }
-
-    # determining the sequence of the action before "ExecuteAction"
-
-    my $lastactionnumber = 0;
-
-    for ( my $i = 0; $i <= $#{$installuitable}; $i++ )
-    {
-        if ( ${$installuitable}[$i] =~ /^\s*\w+\t\w*\t(\d+)\s*$/ )
-        {
-            my $actionnumber = $1;
-            
-            if (( $actionnumber > $lastactionnumber ) && ( $actionnumber != $executeactionnumber ))
-            {
-                $lastactionnumber = $actionnumber;
-            }
-        }
-    }
-
-    # the new number can now be calculated 
-
-    my $newnumber = 0;
-
-    if ((( $lastactionnumber + $executeactionnumber ) % 2 ) == 0 ) { $newnumber = ( $lastactionnumber + $executeactionnumber ) / 2; }
-    else { $newnumber = ( $lastactionnumber + $executeactionnumber -1 ) / 2; } 
-
-    return $newnumber;
-}
-
-##################################################################
-# Searching for a specified string in the feature table
-##################################################################
-
-sub get_feature_name
-{
-    my ( $string, $featuretable ) = @_;
-
-    my $featurename = "";
-    
-    for ( my $i = 0; $i <= $#{$featuretable}; $i++ )
-    {
-        if ( ${$featuretable}[$i] =~ /^\s*(\w+$string)\t/ )
-        {
-            $featurename = $1;
-            last;
-        }
-    }
-
-    return $featurename;	
-}
-
-######################################################################
-# Returning the toplevel directory name of one specific file
-######################################################################
-
-sub get_directory_name_from_file
-{
-    my ($onefile) = @_;
-
-    my $destination = $onefile->{'destination'};
-    my $name = $onefile->{'Name'};
-
-    $destination =~ s/\Q$name\E\s*$//;
-    $destination =~ s/\Q$installer::globals::separator\E\s*$//;	
-
-    my $path = "";
-    
-    if ( $destination =~ /\Q$installer::globals::separator\E/ )
-    {	
-        if ( $destination =~ /^\s*(\S.*\S\Q$installer::globals::separator\E)(\S.+\S?)/ )
-        {
-            $path = $2;
-        }
-    }
-    else
-    {
-        $path = $destination;
-    }	
-
-    return $path;
-}
-
-#############################################################
-# Including the new subdir into the directory table
-#############################################################
-
-sub include_subdirname_into_directory_table
-{
-    my ($dirname, $directorytable, $directorytablename, $onefile) = @_;
-
-    my $subdir = "";
-    if ( $onefile->{'Subdir'} ) { $subdir = $onefile->{'Subdir'}; }
-    if ( $subdir eq "" ) { installer::exiter::exit_program("ERROR: No \"Subdir\" defined for $onefile->{'Name'}", "include_subdirname_into_directory_table"); }
-
-    # program INSTALLLOCATION program -> subjava INSTALLLOCATION program:java
-
-    my $uniquename = "";
-    my $parent = "";
-    my $name = "";
-
-    my $includedline = 0;
-    
-    my $newdir = "";
-
-    for ( my $i = 0; $i <= $#{$directorytable}; $i++ )
-    {
-
-        if ( ${$directorytable}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            $uniquename = $1;
-            $parent = $2;
-            $name = $3;
-            
-            if ( $dirname eq $name )
-            {
-                my $newuniquename = "sub" . $subdir;
-                $newdir = $newuniquename;
-                my $newparent = "INSTALLLOCATION";
-                my $newname = $name . "\:" . $subdir;
-                my $newline = 
-                $line = "$newuniquename\t$newparent\t$newname\n";
-                push(@{$directorytable}, $line);
-                installer::remover::remove_leading_and_ending_whitespaces(\$line);
-                $infoline = "Added $line into directory table $directorytablename\n";
-                push(@installer::globals::logfileinfo, $infoline);	
-
-                $includedline = 1;
-                last;
-            }
-        }
-    }
-    
-    if ( ! $includedline ) { installer::exiter::exit_program("ERROR: Could not include new subdirectory into directory table for file $onefile->{'Name'}!", "include_subdirname_into_directory_table"); }
-
-    return $newdir;
-}
-
-##################################################################
-# Including the new sub directory into the component table
-##################################################################
-
-sub include_subdir_into_componenttable
-{
-    my ($subdir, $onefile, $componenttable) = @_;
-
-    my $componentname = $onefile->{'componentname'};	
-
-    my $changeddirectory = 0;
-
-    for ( my $i = 0; $i <= $#{$componenttable}; $i++ )
-    {
-        if ( ${$componenttable}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my $localcomponentname = $1;
-            my $directory = $3;
-            
-            if ( $componentname eq $localcomponentname )
-            {
-                my $oldvalue = ${$componenttable}[$i];
-                ${$componenttable}[$i] =~ s/\b\Q$directory\E\b/$subdir/;
-                my $newvalue = ${$componenttable}[$i];
-
-                installer::remover::remove_leading_and_ending_whitespaces(\$oldvalue);
-                installer::remover::remove_leading_and_ending_whitespaces(\$newvalue);
-                $infoline = "Change in Component table: From \"$oldvalue\" to \"$newvalue\"\n";
-                push(@installer::globals::logfileinfo, $infoline);	
-
-                $changeddirectory = 1;
-                last;
-            }
-        }
-    }
-
-    if ( ! $changeddirectory ) { installer::exiter::exit_program("ERROR: Could not change directory for component: $onefile->{'Name'}!", "include_subdir_into_componenttable"); }
-
-}
-
-################################################################################################
-# Including the content for the child installations
-# into the tables:
-# CustomAc.idt, InstallU.idt, Feature.idt
-################################################################################################
-
-sub add_childprojects
-{
-    my ($languageidtdir, $filesref, $allvariables) = @_;
-
-    my $customactiontablename = $languageidtdir . $installer::globals::separator . "CustomAc.idt";
-    my $customactiontable = installer::files::read_file($customactiontablename);
-    my $installuitablename = $languageidtdir . $installer::globals::separator . "InstallU.idt";
-    my $installuitable = installer::files::read_file($installuitablename);
-    my $featuretablename = $languageidtdir . $installer::globals::separator . "Feature.idt";
-    my $featuretable = installer::files::read_file($featuretablename);
-    my $directorytablename = $languageidtdir . $installer::globals::separator . "Director.idt";
-    my $directorytable = installer::files::read_file($directorytablename);
-    my $componenttablename = $languageidtdir . $installer::globals::separator . "Componen.idt";
-    my $componenttable = installer::files::read_file($componenttablename);
-
-    my $infoline = "";
-    my $line = "";
-    
-    $installer::globals::javafile = installer::worker::return_first_item_with_special_flag($filesref ,"JAVAFILE");
-    $installer::globals::urefile = installer::worker::return_first_item_with_special_flag($filesref ,"UREFILE");
-
-    if (( $installer::globals::javafile eq "" ) && ( $allvariables->{'JAVAPRODUCT'} )) { installer::exiter::exit_program("ERROR: No JAVAFILE found in files collector!", "add_childprojects"); }
-    if (( $installer::globals::urefile eq "" ) && ( $allvariables->{'UREPRODUCT'} )) { installer::exiter::exit_program("ERROR: No UREFILE found in files collector!", "add_childprojects"); }
-
-    # Content for Directory table	
-    # SystemFolder TARGETDIR .
-
-    my $contains_systemfolder = 0;
-
-    for ( my $i = 0; $i <= $#{$directorytable}; $i++ )
-    {
-        if ( ${$directorytable}[$i] =~ /^\s*SystemFolder\t/ )
-        {
-            $contains_systemfolder = 1;
-            last;
-        }
-    }
-
-    if ( ! $contains_systemfolder )
-    {
-        $line = "SystemFolder\tTARGETDIR\t\.\n";
-        push(@{$directorytable}, $line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $directorytablename\n";
-    }
-    else
-    {
-        $infoline = "SystemFolder already exists in table $directorytablename\n";
-    }
-
-    push(@installer::globals::logfileinfo, $infoline);
-
-    # Additional content for the directory table
-    # subjava 	INSTALLLOCATION program:java
-    # subure 	INSTALLLOCATION program:ure
-
-    my $dirname = "";
-    my $subjavadir = "";
-    my $suburedir = "";
-    
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {
-        $dirname = get_directory_name_from_file($installer::globals::javafile);
-        $subjavadir = include_subdirname_into_directory_table($dirname, $directorytable, $directorytablename, $installer::globals::javafile);
-    }
-
-    if ( $allvariables->{'UREPRODUCT'} )
-    {
-        $dirname = get_directory_name_from_file($installer::globals::urefile);
-        $suburedir = include_subdirname_into_directory_table($dirname, $directorytable, $directorytablename, $installer::globals::urefile);
-    }
-    
-    # Content for the Component table
-    # The Java and Ada components have new directories
-    
-    if ( $allvariables->{'JAVAPRODUCT'} ) { include_subdir_into_componenttable($subjavadir, $installer::globals::javafile, $componenttable); }
-    if ( $allvariables->{'UREPRODUCT'} ) { include_subdir_into_componenttable($suburedir, $installer::globals::urefile, $componenttable); }
-
-    # Content for CustomAction table
-
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {
-        $line = "InstallJava\t98\tSystemFolder\t[SourceDir]$installer::globals::javafile->{'Subdir'}\\$installer::globals::javafile->{'Name'} \/qb REBOOT=Suppress SPONSORS=0 DISABLEAD=1\n";
-        push(@{$customactiontable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $customactiontablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
-    if ( $allvariables->{'UREPRODUCT'} )
-    {	
-        $line = "InstallUre\t98\tSystemFolder\t$installer::globals::urefile->{'Subdir'}\\$installer::globals::urefile->{'Name'} /S\n";
-        push(@{$customactiontable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $customactiontablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {
-        $line = "MaintenanceJava\t82\t$installer::globals::javafile->{'uniquename'}\t\/qb REBOOT=Suppress SPONSORS=0 DISABLEAD=1\n";
-        push(@{$customactiontable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $customactiontablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
-    if ( $allvariables->{'UREPRODUCT'} )
-    {	
-        $line = "MaintenanceUre\t82\t$installer::globals::urefile->{'uniquename'}\t\/S\n";
-        push(@{$customactiontable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $customactiontablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    
-    # Content for InstallUISequence table
-    # InstallAdabas &gm_o_Adabas=3 825
-    # InstallJava &gm_o_Java=3 827
-
-    my $number = "";
-    my $featurename = "";
-
-    if ( $allvariables->{'ADAPRODUCT'} )
-    {
-        $number = get_free_number_in_uisequence_table($installuitable);
-        $featurename = get_feature_name("_Adabas", $featuretable);
-        $line = "InstallAdabas\t\&$featurename\=3 And Not Installed And Not PATCH\t$number\n";
-        push(@{$installuitable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $installuitablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {	
-        $number = get_free_number_in_uisequence_table($installuitable) + 2;
-        $featurename = get_feature_name("_Java", $featuretable);
-        if ( $featurename ) { $line = "InstallJava\t\&$featurename\=3 And Not Installed And JAVAPATH\=\"\" And Not PATCH\t$number\n"; }
-        else { $line = "InstallJava\tNot Installed And JAVAPATH\=\"\" And Not PATCH\t$number\n"; } # feature belongs to root
-        push(@{$installuitable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $installuitablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    
-    if ( $allvariables->{'ADAPRODUCT'} )
-    {
-        $number = get_free_number_in_uisequence_table($installuitable) + 4;
-        $featurename = get_feature_name("_Adabas", $featuretable);
-        $line = "MaintenanceAdabas\t\&$featurename\=3 And Installed And Not PATCH\t$number\n";
-        push(@{$installuitable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $installuitablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {
-        $number = get_free_number_in_uisequence_table($installuitable) + 6;
-        $featurename = get_feature_name("_Java", $featuretable);
-        if ( $featurename ) { $line = "MaintenanceJava\t\&$featurename\=3 And Installed And JAVAPATH\=\"\" And Not PATCH\t$number\n"; }
-        else { $line = "MaintenanceJava\tInstalled And JAVAPATH\=\"\" And Not PATCH\t$number\n"; } # feature belongs to root
-        push(@{$installuitable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $installuitablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
-    if ( $allvariables->{'UREPRODUCT'} )
-    {	
-        $number = get_free_number_in_uisequence_table($installuitable) + 8;
-        $featurename = get_feature_name("_Ure", $featuretable);
-        if ( $featurename ) { $line = "InstallUre\t\&$featurename\=3 And Not Installed\t$number\n"; }
-        else { $line = "InstallUre\tNot Installed\t$number\n"; } # feature belongs to root
-        push(@{$installuitable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $installuitablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
-    if ( $allvariables->{'UREPRODUCT'} )
-    {
-        $number = get_free_number_in_uisequence_table($installuitable) + 10;
-        $featurename = get_feature_name("_Ure", $featuretable);
-        if ( $featurename ) { $line = "MaintenanceUre\t\&$featurename\=3 And Installed\t$number\n"; }
-        else { $line = "MaintenanceUre\tInstalled\t$number\n"; } # feature belongs to root
-        push(@{$installuitable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $installuitablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    
-    # Content for Feature table, better from scp (translation)	
-    # gm_o_java gm_optional Java 1.4.2 Description 2 200
-
-    installer::files::save_file($customactiontablename, $customactiontable);
-    installer::files::save_file($installuitablename, $installuitable);
-    installer::files::save_file($featuretablename, $featuretable);
-    installer::files::save_file($directorytablename, $directorytable);
-    installer::files::save_file($componenttablename, $componenttable);
-}
-
-##################################################################
-# Setting the encoding in all idt files. Replacing the
-# variable WINDOWSENCODINGTEMPLATE
-##################################################################
-
-sub setencoding
-{
-    my ( $languageidtdir, $onelanguage ) = @_;
-    
-    my $encoding = installer::windows::language::get_windows_encoding($onelanguage);
-    
-    # collecting all idt files in the directory $languageidtdir and substituting the string
-    
-    my $idtfiles = installer::systemactions::find_file_with_file_extension("idt", $languageidtdir);
-
-    for ( my $i = 0; $i <= $#{$idtfiles}; $i++ )
-    {
-        my $onefilename = $languageidtdir . $installer::globals::separator . ${$idtfiles}[$i];
-        my $onefile = installer::files::read_file($onefilename);
-
-        for ( my $j = 0; $j <= $#{$onefile}; $j++ )
-        {
-            ${$onefile}[$j] =~ s/WINDOWSENCODINGTEMPLATE/$encoding/g;
-        }
-
-        installer::files::save_file($onefilename, $onefile);
-    }
-}
-
-##################################################################
-# Setting the condition, that at least one module is selected.
-# All modules with flag SHOW_MULTILINGUAL_ONLY were already 
-# collected. In table ControlE.idt, the string
-# LANGUAGECONDITIONINSTALL needs to be replaced.
-# Also for APPLICATIONCONDITIONINSTALL for the applications 
-# with flag APPLICATIONMODULE.
-##################################################################
-
-sub set_multilanguageonly_condition
-{
-    my ( $languageidtdir ) = @_;
-
-    my $onefilename = $languageidtdir . $installer::globals::separator . "ControlE.idt";
-    my $onefile = installer::files::read_file($onefilename);
-    
-    # Language modules
-    
-    my $condition = "";
-    
-    foreach my $module ( sort keys %installer::globals::multilingual_only_modules )
-    {
-        $condition = $condition . " &$module=3 Or";	
-    }
-    
-    $condition =~ s/^\s*//;
-    $condition =~ s/\s*Or\s*$//;	# removing the ending "Or"
-
-    if ( $condition eq "" ) { $condition = "1"; }
-
-    for ( my $j = 0; $j <= $#{$onefile}; $j++ )
-    {
-        ${$onefile}[$j] =~ s/LANGUAGECONDITIONINSTALL/$condition/;
-    }
-    
-    # Application modules
-    
-    $condition = "";
-    
-    foreach my $module ( sort keys %installer::globals::application_modules )
-    {
-        $condition = $condition . " &$module=3 Or";	
-    }
-    
-    $condition =~ s/^\s*//;
-    $condition =~ s/\s*Or\s*$//;	# removing the ending "Or"
-
-    if ( $condition eq "" ) { $condition = "1"; }
-    
-    for ( my $j = 0; $j <= $#{$onefile}; $j++ )
-    {
-        ${$onefile}[$j] =~ s/APPLICATIONCONDITIONINSTALL/$condition/;
-    }
-
-    installer::files::save_file($onefilename, $onefile);
-}
-
-#############################################
-# Putting array values into hash
-#############################################
-
-sub fill_assignment_hash
-{
-    my ($gid, $name, $key, $assignmenthashref, $parameter, $tablename, $assignmentarray) = @_;
-    
-    my $max = $parameter - 1;
-
-    if ( $max != $#{$assignmentarray} )
-    {
-        my $definedparameter = $#{$assignmentarray} + 1;
-        installer::exiter::exit_program("ERROR: gid: $gid, key: $key ! Wrong parameter in scp. For table $tablename $parameter parameter are required ! You defined: $definedparameter", "fill_assignment_hash");
-    }
-
-    for ( my $i = 0; $i <= $#{$assignmentarray}; $i++ )
-    {
-        my $counter = $i + 1;
-        my $key = "parameter". $counter;
-
-        my $localvalue = ${$assignmentarray}[$i];
-        installer::remover::remove_leading_and_ending_quotationmarks(\$localvalue);
-        $localvalue =~ s/\\\"/\"/g;
-        $localvalue =~ s/\\\!/\!/g;
-        $localvalue =~ s/\\\&/\&/g;
-        $localvalue =~ s/\\\</\</g;
-        $localvalue =~ s/\\\>/\>/g;
-        $assignmenthashref->{$key} = $localvalue;
-    }
-}
-
-##########################################################################
-# Checking the assignment of a Windows CustomAction and putting it
-# into a hash
-##########################################################################
-
-sub create_customaction_assignment_hash
-{
-    my ($gid, $name, $key, $assignmentarray) = @_;
-
-    my %assignment = ();	
-    my $assignmenthashref = \%assignment;
-
-    my $tablename = ${$assignmentarray}[0];
-    installer::remover::remove_leading_and_ending_quotationmarks(\$tablename);
-    
-    my $tablename_defined = 0;
-    my $parameter = 0;
-    
-    if ( $tablename eq "InstallUISequence" )
-    {
-        $tablename_defined = 1;
-        $parameter = 3;
-        fill_assignment_hash($gid, $name, $key, $assignmenthashref, $parameter, $tablename, $assignmentarray);
-    }
-
-    if ( $tablename eq "InstallExecuteSequence" )
-    {
-        $tablename_defined = 1;
-        $parameter = 3;
-        fill_assignment_hash($gid, $name, $key, $assignmenthashref, $parameter, $tablename, $assignmentarray);
-    }
-
-    if ( $tablename eq "AdminExecuteSequence" )
-    {
-        $tablename_defined = 1;
-        $parameter = 3;
-        fill_assignment_hash($gid, $name, $key, $assignmenthashref, $parameter, $tablename, $assignmentarray);
-    }
-    
-    if ( $tablename eq "ControlEvent" )
-    {
-        $tablename_defined = 1;
-        $parameter = 7;
-        fill_assignment_hash($gid, $name, $key, $assignmenthashref, $parameter, $tablename, $assignmentarray);
-    }
-
-    if ( $tablename eq "ControlCondition" )
-    {
-        $tablename_defined = 1;
-        $parameter = 5;
-        fill_assignment_hash($gid, $name, $key, $assignmenthashref, $parameter, $tablename, $assignmentarray);
-    }
-    
-    if ( ! $tablename_defined )
-    {
-        installer::exiter::exit_program("ERROR: gid: $gid, key: $key ! Unknown Windows CustomAction table: $tablename ! Currently supported: InstallUISequence, InstallExecuteSequence, ControlEvent, ControlCondition", "create_customaction_assignment_hash");
-    }
-    
-    return $assignmenthashref;
-}
-
-##########################################################################
-# Finding the position of a specified CustomAction.
-# If the CustomAction is not found, the return value is "-1".
-# If the CustomAction position is not defined yet, 
-# the return value is also "-1".
-##########################################################################
-
-sub get_customaction_position
-{
-    my ($action, $sequencetable) = @_;
-
-    my $position = -1;
-    
-    for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
-    {
-        my $line = ${$sequencetable}[$i];
-    
-        if ( $line =~ /^\s*([\w\.]+)\t.*\t\s*(\d+)\s$/ )	# matching only, if position is a number!
-        {
-            my $compareaction = $1;
-            my $localposition = $2;
-
-            if ( $compareaction eq $action )
-            {
-                $position = $localposition;
-                last;
-            }
-        }
-    }
-    
-    return $position;	
-}
-
-##########################################################################
-# Setting the position of CustomActions in sequence tables.
-# Replacing all occurrences of "POSITIONTEMPLATE_"
-##########################################################################
-
-sub set_positions_in_table
-{
-    my ( $sequencetable, $tablename ) = @_;
-
-    my $infoline = "\nSetting positions in table \"$tablename\".\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-    # Step 1: Resolving all occurrences of "POSITIONTEMPLATE_end"
-
-    my $lastposition = get_last_position_in_sequencetable($sequencetable);
-
-    for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
-    {
-        if ( ${$sequencetable}[$i] =~ /^\s*([\w\.]+)\t.*\t\s*POSITIONTEMPLATE_end\s*$/ )
-        {
-            my $customaction = $1;
-            $lastposition = $lastposition + 25;
-            ${$sequencetable}[$i] =~ s/POSITIONTEMPLATE_end/$lastposition/;
-            $infoline = "Setting position \"$lastposition\" for custom action \"$customaction\".\n"; 
-            push(@installer::globals::logfileinfo, $infoline);
-        }
-    }
-    
-    # Step 2: Resolving all occurrences of "POSITIONTEMPLATE_abc" or "POSITIONTEMPLATE_behind_abc"
-    # where abc is the name of the reference Custom Action.
-    # This has to be done, until there is no more occurrence of POSITIONTEMPLATE (success)
-    # or there is no replacement in one circle (failure).
-    
-    my $template_exists = 0;
-    my $template_replaced = 0;
-    my $counter = 0;
-    
-    do
-    {
-        $template_exists = 0;
-        $template_replaced = 0;
-        $counter++;
-        
-        for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
-        {
-            if ( ${$sequencetable}[$i] =~ /^\s*([\w\.]+)\t.*\t\s*(POSITIONTEMPLATE_.*?)\s*$/ )
-            {
-                my $onename = $1;
-                my $templatename = $2;
-                my $positionname = $templatename;
-                my $customaction = $templatename;
-                $customaction =~ s/POSITIONTEMPLATE_//;
-                $template_exists = 1;
-                
-                # Trying to find the correct number.
-                # This can fail, if the custom action has no number
-                
-                my $setbehind = 0;
-                if ( $customaction =~ /^\s*behind_(.*?)\s*$/ )
-                {
-                    $customaction = $1;
-                    $setbehind = 1;
-                }
-                
-                my $position = get_customaction_position($customaction, $sequencetable);
-
-                if ( $position >= 0 )	# Found CustomAction and is has a position. Otherwise return value is "-1".
-                {
-                    my $newposition = 0;
-                    if ( $setbehind ) { $newposition = $position + 2; }
-                    else { $newposition = $position - 2; }
-                    ${$sequencetable}[$i] =~ s/$templatename/$newposition/;
-                    $template_replaced = 1;
-                    $infoline = "Setting position \"$newposition\" for custom action \"$onename\" (scp: \"$positionname\" at position $position).\n"; 
-                    push(@installer::globals::logfileinfo, $infoline);
-                }
-                else
-                {
-                    $infoline = "Could not assign position for custom action \"$onename\" yet (scp: \"$positionname\").\n"; 
-                    push(@installer::globals::logfileinfo, $infoline);					
-                }
-            }
-        }
-    } while (( $template_exists ) && ( $template_replaced ));
-
-    # An error occurred, because templates still exist, but could not be replaced.
-    # Reason:
-    # 1. Wrong name of CustomAction in scp2 (typo?)
-    # 2. Circular dependencies of CustomActions (A after B and B after A)
-
-    # Problem: It is allowed, that a CustomAction is defined in scp2 in a library that is
-    # part of product ABC, but this CustomAction is not used in this product
-    # and the reference CustomAction is not part of this product.
-    # Therefore this cannot be an error, but only produce a warning. The assigned number 
-    # must be the last sequence number.
-
-    if (( $template_exists ) && ( ! $template_replaced ))
-    {
-        for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
-        {
-            if ( ${$sequencetable}[$i] =~ /^\s*([\w\.]+)\t.*\t\s*(POSITIONTEMPLATE_.*?)\s*$/ )
-            {
-                my $customactionname = $1;
-                my $fulltemplate = $2;
-                my $template = $fulltemplate;
-                $template =~ s/POSITIONTEMPLATE_//;
-                $lastposition = $lastposition + 25;
-                ${$sequencetable}[$i] =~ s/$fulltemplate/$lastposition/;
-                $infoline = "WARNING: Setting position \"$lastposition\" for custom action \"$customactionname\". Could not find CustomAction \"$template\".\n"; 
-                push(@installer::globals::logfileinfo, $infoline);			
-            }
-        }
-    }
-}
-
-##########################################################################
-# Setting the Windows custom actions into different tables
-# CustomAc.idt, InstallE.idt, InstallU.idt, ControlE.idt, ControlC.idt
-##########################################################################
-
-sub addcustomactions
-{
-    my ($languageidtdir, $customactions, $filesarray) = @_;
-
-    installer::logger::include_timestamp_into_logfile("\nPerformance Info: addcustomactions start\n");
-
-    my $customactionidttablename = $languageidtdir . $installer::globals::separator . "CustomAc.idt";
-    my $customactionidttable = installer::files::read_file($customactionidttablename);
-    my $installexecutetablename = $languageidtdir . $installer::globals::separator . "InstallE.idt";
-    my $installexecutetable = installer::files::read_file($installexecutetablename);
-    my $adminexecutetablename = $languageidtdir . $installer::globals::separator . "AdminExe.idt";
-    my $adminexecutetable = installer::files::read_file($adminexecutetablename);
-    my $installuitablename = $languageidtdir . $installer::globals::separator . "InstallU.idt";
-    my $installuitable = installer::files::read_file($installuitablename);
-    my $controleventtablename = $languageidtdir . $installer::globals::separator . "ControlE.idt";
-    my $controleventtable = installer::files::read_file($controleventtablename);
-    my $controlconditiontablename = $languageidtdir . $installer::globals::separator . "ControlC.idt";
-    my $controlconditiontable = installer::files::read_file($controlconditiontablename);
-
-    # Iterating over all Windows custom actions
-
-    for ( my $i = 0; $i <= $#{$customactions}; $i++ )
-    {
-        my $customaction = ${$customactions}[$i];
-        my $name = $customaction->{'Name'};
-        my $typ = $customaction->{'Typ'};
-        my $source = $customaction->{'Source'};
-        my $target = $customaction->{'Target'};
-        my $inbinarytable = $customaction->{'Inbinarytable'};
-        my $gid = $customaction->{'gid'};
-
-        my $styles = "";
-        if ( $customaction->{'Styles'} ) { $styles = $customaction->{'Styles'}; }
-        
-        my $added_customaction = set_custom_action($customactionidttable, $name, $typ, $source, $target, $inbinarytable, $filesarray, $customactionidttablename, $styles);
-
-        if ( $added_customaction )
-        {
-            # If the CustomAction was added into the CustomAc.idt, it can be connected to the installation.
-            # There are currently two different ways for doing this:
-            # 1. Using "add_custom_action_to_install_table", which adds the CustomAction to the install sequences,
-            #    which are saved in InstallE.idt and InstallU.idt
-            # 2. Using "connect_custom_action_to_control" and "connect_custom_action_to_control". The first method
-            #    connects a CustomAction to a control in ControlE.idt. The second method sets a condition for a control,
-            #    which might be influenced by the CustomAction. This happens in ControlC.idt.
-
-            # Any Windows CustomAction can have a lot of different assignments.
-
-            for ( my $j = 1; $j <= 50; $j++ )
-            {
-                my $key = "Assignment" . $j;
-                my $value = "";
-                if ( $customaction->{$key} )
-                {
-                    $value = $customaction->{$key};
-
-                    # in a patch the Assignment can be overwritten by a PatchAssignment					
-                    if ( $installer::globals::patch )
-                    {
-                        $patchkey = "PatchAssignment" . $j;
-                        if ( $customaction->{$patchkey} )
-                        {
-                            $value = $customaction->{$patchkey};
-                            $key = $patchkey;
-                        }
-                    }		
-                    
-                }
-                else { last; }
-                
-                # $value is now a comma separated list
-                if ( $value =~ /^\s*\(\s*(.*)\s*\);?\s*$/ ) { $value = $1; }
-                my $assignmentarray = installer::converter::convert_stringlist_into_array(\$value, ",");
-                my $assignment = create_customaction_assignment_hash($gid, $name, $key, $assignmentarray);
-                
-                if ( $assignment->{'parameter1'} eq "InstallExecuteSequence" )
-                {
-                    add_custom_action_to_install_table($installexecutetable, $source, $name, $assignment->{'parameter2'}, $assignment->{'parameter3'}, $filesarray, $installexecutetablename, $styles);
-                }
-                elsif ( $assignment->{'parameter1'} eq "AdminExecuteSequence" )
-                {
-                    add_custom_action_to_install_table($adminexecutetable, $source, $name, $assignment->{'parameter2'}, $assignment->{'parameter3'}, $filesarray, $adminexecutetablename, $styles);
-                }
-                elsif ( $assignment->{'parameter1'} eq "InstallUISequence" )
-                {
-                    add_custom_action_to_install_table($installuitable, $source, $name, $assignment->{'parameter2'}, $assignment->{'parameter3'}, $filesarray, $installuitablename, $styles);				
-                }
-                elsif ( $assignment->{'parameter1'} eq "ControlEvent" )
-                {
-                    connect_custom_action_to_control($controleventtable, $controleventtablename, $assignment->{'parameter2'}, $assignment->{'parameter3'}, $assignment->{'parameter4'}, $assignment->{'parameter5'}, $assignment->{'parameter6'}, $assignment->{'parameter7'});
-                }
-                elsif ( $assignment->{'parameter1'} eq "ControlCondition" )
-                {
-                    connect_condition_to_control($controlconditiontable, $controlconditiontablename, $assignment->{'parameter2'}, $assignment->{'parameter3'}, $assignment->{'parameter4'}, $assignment->{'parameter5'});
-                }
-                else
-                {
-                    installer::exiter::exit_program("ERROR: gid: $gid, key: $key ! Unknown Windows CustomAction table: $assignmenthashref->{'parameter1'} ! Currently supported: InstallUISequence, InstallESequence, ControlEvent, ControlCondition", "addcustomactions");		
-                }
-            }
-        }
-    }
-
-    # Setting the positions in the tables
-
-    set_positions_in_table($installexecutetable, $installexecutetablename);
-    set_positions_in_table($installuitable, $installuitablename);
-    set_positions_in_table($adminexecutetable, $adminexecutetablename);
-
-    # Saving the files
-
-    installer::files::save_file($customactionidttablename, $customactionidttable);
-    installer::files::save_file($installexecutetablename, $installexecutetable);
-    installer::files::save_file($adminexecutetablename, $adminexecutetable);
-    installer::files::save_file($installuitablename, $installuitable);
-    installer::files::save_file($controleventtablename, $controleventtable);
-    installer::files::save_file($controlconditiontablename, $controlconditiontable);
-    
-    my $infoline = "Updated idt file: $customactionidttablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Updated idt file: $installexecutetablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Updated idt file: $adminexecutetablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Updated idt file: $installuitablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Updated idt file: $controleventtablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-    $infoline = "Updated idt file: $controlconditiontablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-    installer::logger::include_timestamp_into_logfile("\nPerformance Info: addcustomactions end\n");
-}
-
-##########################################################################
-# Setting bidi attributes in idt tables
-##########################################################################
-
-sub setbidiattributes
-{
-    my ($languageidtdir, $onelanguage) = @_;
-
-    # Editing the files Dialog.idt and Control.idt
-
-    my $dialogfilename = $languageidtdir . $installer::globals::separator . "Dialog.idt";
-    my $controlfilename = $languageidtdir . $installer::globals::separator . "Control.idt";
-
-    my $dialogfile = installer::files::read_file($dialogfilename);
-    my $controlfile = installer::files::read_file($controlfilename);
-
-    # Searching attributes in Dialog.idt and adding "896".
-    # Attributes are in column 6 (from 10).
-
-    my $bidiattribute = 896;
-    for ( my $i = 0; $i <= $#{$dialogfile}; $i++ )
-    {
-        if ( $i < 3 ) { next; }
-        if ( ${$dialogfile}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my $one = $1;
-            my $two = $2;
-            my $three = $3;
-            my $four = $4;
-            my $five = $5;
-            my $attribute = $6;
-            my $seven = $7;
-            my $eight = $8;
-            $attribute = $attribute + $bidiattribute;
-            ${$dialogfile}[$i] = "$one\t$two\t$three\t$four\t$five\t$attribute\t$seven\t$eight\n";
-        }
-    }
-
-    # Searching attributes in Control.idt and adding "224".
-    # Attributes are in column 8 (from 12).
-
-    $bidiattribute = 224;
-    for ( my $i = 0; $i <= $#{$controlfile}; $i++ )
-    {
-        if ( $i < 3 ) { next; }
-        if ( ${$controlfile}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my $one = $1;
-            my $two = $2;
-            my $three = $3;
-            my $four = $4;
-            my $five = $5;
-            my $six = $6;
-            my $seven = $7;
-            my $attribute = $8;
-            my $nine = $9;
-            my $ten = $10;
-            my $eleven = $11;
-            my $twelve = $12;
-            $attribute = $attribute + $bidiattribute;
-            ${$controlfile}[$i] = "$one\t$two\t$three\t$four\t$five\t$six\t$seven\t$attribute\t$nine\t$ten\t$eleven\t$twelve\n";
-        }
-    }
-
-    # Saving the file
-                 
-    installer::files::save_file($dialogfilename, $dialogfile);
-    $infoline = "Set bidi support in idt file \"$dialogfilename\" for language $onelanguage\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-    installer::files::save_file($controlfilename, $controlfile);
-    $infoline = "Set bidi support in idt file \"$controlfilename\" for language $onelanguage\n"; 
-    push(@installer::globals::logfileinfo, $infoline);	
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/inifile.pm b/solenv/bin/modules/installer/windows/inifile.pm
deleted file mode 100644
index 29d0e6f2f..000000000
--- a/solenv/bin/modules/installer/windows/inifile.pm
+++ /dev/null
@@ -1,146 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::inifile;
-
-use installer::existence;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-####################################################
-# Setting the profile for a special profileitem
-####################################################
-
-sub get_profile_for_profileitem
-{
-    my ($profileid, $filesref) = @_;
-
-    my $profile = installer::existence::get_specified_file($filesref, $profileid);
-    
-    return $profile;
-}
-
-####################################################
-# Checking whether profile is included in patch
-####################################################
-
-sub profile_has_patch_flag
-{
-    my ($profile) = @_;
-
-    my $in_patch = 0;
-
-    my $styles = "";
-    if ( $profile->{'Styles'} ) { $styles = $profile->{'Styles'}; }
-    if ( $styles =~ /\bPATCH\b/ ) { $in_patch = 1; }
-    
-    return $in_patch;
-}
-
-####################################################
-# Checking whether profile is part of product
-####################################################
-
-sub file_is_part_of_product
-{
-    my ($profilegid, $filesref) = @_;
-    
-    my $part_of_product = 0;
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        $onefile = ${$filesref}[$i];
-        my $filegid = $onefile->{'gid'};
-
-        if ( $filegid eq $profilegid )
-        {
-            $part_of_product = 1;
-            last;	
-        }
-    }
-    
-    return $part_of_product;
-}
-
-###########################################################################################################
-# Creating the file IniFile.idt dynamically
-# Content: 
-# IniFile\tFileName\tDirProperty\tSection\tKey\tValue\tAction\tComponent_
-###########################################################################################################
-
-sub create_inifile_table
-{
-    my ($inifiletableentries, $filesref, $basedir) = @_;
-
-    my @inifiletable = ();
-    
-    installer::windows::idtglobal::write_idt_header(\@inifiletable, "inifile");
-
-    for ( my $i = 0; $i <= $#{$inifiletableentries}; $i++ )
-    {
-        my $profileitem = ${$inifiletableentries}[$i];
-        
-        my $profileid = $profileitem->{'ProfileID'};
-
-        # Is this profile part of the product? This is not sure, for example in patch process.
-        # If the profile is not part of the product, this ProfileItem must be ignored.
-        
-        if ( ! file_is_part_of_product($profileid, $filesref) ) { next; }
-
-        my $profile = get_profile_for_profileitem($profileid, $filesref);
-        
-        if (( $installer::globals::patch ) && ( ! profile_has_patch_flag($profile) )) { next; }
-        
-        my %inifile = ();
-
-        $inifile{'IniFile'} = $profileitem->{'Inifiletablekey'};
-        $inifile{'FileName'} = $profile->{'Name'};
-        $inifile{'DirProperty'} = $profile->{'uniquedirname'};
-        $inifile{'Section'} = $profileitem->{'Section'};
-        $inifile{'Key'} = $profileitem->{'Key'};
-        $inifile{'Value'} = $profileitem->{'Value'};
-        $inifile{'Action'} = $profileitem->{'Inifiletableaction'};
-        $inifile{'Component_'} = $profile->{'componentname'};
-
-        my $oneline = $inifile{'IniFile'} . "\t" . $inifile{'FileName'} . "\t" . $inifile{'DirProperty'} . "\t"
-                 . $inifile{'Section'} . "\t" . $inifile{'Key'} . "\t" . $inifile{'Value'} . "\t"
-                 . $inifile{'Action'} . "\t" . $inifile{'Component_'} . "\n";
-
-        push(@inifiletable, $oneline);		
-    }
-
-    # Saving the file
-    
-    my $inifiletablename = $basedir . $installer::globals::separator . "IniFile.idt";
-    installer::files::save_file($inifiletablename ,\@inifiletable);
-    my $infoline = "Created idt file: $inifiletablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/java.pm b/solenv/bin/modules/installer/windows/java.pm
deleted file mode 100644
index e61947d2b..000000000
--- a/solenv/bin/modules/installer/windows/java.pm
+++ /dev/null
@@ -1,120 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::java;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-####################################################################################
-# Writing content into RegLocat.idt and AppSearc.idt to find Java on system
-####################################################################################
-
-sub update_java_tables
-{
-    my ($basedir, $allvariables) = @_;
-
-    my $reglocatfile = "";
-    my $appsearchfile = "";
-
-    my $reglocatfilename = $basedir . $installer::globals::separator . "RegLocat.idt";
-    my $appsearchfilename = $basedir . $installer::globals::separator . "AppSearc.idt";
-    my $signaturefilename = $basedir . $installer::globals::separator . "Signatur.idt";
-    
-    if ( -f $reglocatfilename )
-    {
-        $reglocatfile = installer::files::read_file($reglocatfilename);
-    }
-    else
-    {
-        my @reglocattable = ();
-        $reglocatfile = \@reglocattable;
-        installer::windows::idtglobal::write_idt_header($reglocatfile, "reglocat");
-    }
-
-    if ( -f $appsearchfilename )
-    {
-        $appsearchfile = installer::files::read_file($appsearchfilename);
-    }
-    else
-    {
-        my @appsearchtable = ();
-        $appsearchfile = \@appsearchtable;
-        installer::windows::idtglobal::write_idt_header($appsearchfile, "appsearch");	
-    }
-
-    if ( -f $signaturefilename )
-    {
-        $signaturefile = installer::files::read_file($signaturefilename);
-    }
-    else
-    {
-        my @signaturetable = ();
-        $signaturefile = \@signaturetable;
-        installer::windows::idtglobal::write_idt_header($signaturefile, "signatur");	
-    }
-
-    # Writing content into this tables
-    # Java version is saved in scp project
-    # $installer::globals::javafile was defined in installer::windows::idtglobal::add_childprojects
-
-    if ( ! $installer::globals::javafile->{'Javaversion'} ) { installer::exiter::exit_program("ERROR: \"Javaversion\" has to be defined in $installer::globals::javafile->{'gid'} in scp project!", "update_java_tables"); }
-    
-    my $javastring = $installer::globals::javafile->{'Javaversion'};
-    
-    my $signature = "JavaReg";
-    my $rootvalue = "2";
-    my $key = "Software\\JavaSoft\\Java Runtime Environment\\" . $javastring;
-    my $name = "JavaHome";
-    my $type = 2;
-    my $property = "JAVAPATH";
-
-    my $oneline = $signature . "\t" . $rootvalue . "\t" . $key . "\t" . $name . "\t" . $type . "\n";
-    push(@{$reglocatfile}, $oneline);
-        
-    $oneline = $property . "\t" . $signature . "\n";
-    push(@{$appsearchfile}, $oneline);
-
-    # Saving the files
-    
-    installer::files::save_file($reglocatfilename ,$reglocatfile);
-    my $infoline = "Updated idt file for Java: $reglocatfilename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-    installer::files::save_file($appsearchfilename ,$appsearchfile);
-    $infoline = "Updated idt file for Java: $appsearchfilename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-    installer::files::save_file($signaturefilename ,$signaturefile);
-    $infoline = "Updated idt file: $signaturefilename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/language.pm b/solenv/bin/modules/installer/windows/language.pm
deleted file mode 100644
index f20235a50..000000000
--- a/solenv/bin/modules/installer/windows/language.pm
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::language;
-
-use installer::exiter;
-
-####################################################
-# Determining the Windows language (LCID)
-# English: 1033
-####################################################
-
-sub get_windows_language
-{
-    my ($language) = @_;
-
-    my $windowslanguage = "";
-
-    if ( $installer::globals::msilanguage->{$language} ) { $windowslanguage = $installer::globals::msilanguage->{$language}; }
-
-    if ( $windowslanguage eq "" ) { installer::exiter::exit_program("ERROR: Unknown language $language in function get_windows_language", "get_windows_language"); } 
-
-    return $windowslanguage;
-}
-
-####################################################
-# Determining the Windows language ANSI-Codepage
-# English: 1252
-####################################################
-
-sub get_windows_encoding
-{
-    my ($language) = @_;
-    
-    my $windowsencoding = "";
-
-    if ( $installer::globals::msiencoding->{$language} ) { $windowsencoding = $installer::globals::msiencoding->{$language}; }
-
-    if ( $windowsencoding eq "" ) { $windowsencoding = "0"; }	# setting value, if the language is not listed in the encodinglist
-
-    if ( $windowsencoding eq "0" ) { $windowsencoding = "65001"; }	# languages with "0" have to be available in UTF-8 (65001)
-    
-    # Asian multilingual installation sets need a code neutral Windows Installer database -> $windowsencoding = 0
-    if (( $language eq "en-US" ) && (( $installer::globals::product =~ /suitemulti/i ) || ( $installer::globals::product =~ /officemulti/i ) || ( $installer::globals::product =~ /c05office/i ) || ( $installer::globals::added_english ))) { $windowsencoding = "0"; }
-        
-    return $windowsencoding;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/media.pm b/solenv/bin/modules/installer/windows/media.pm
deleted file mode 100644
index efa515769..000000000
--- a/solenv/bin/modules/installer/windows/media.pm
+++ /dev/null
@@ -1,455 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::media;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-##############################################################
-# Returning the diskid for the media table.
-##############################################################
-
-sub get_media_diskid
-{
-    my ($id) = @_;
-    
-    return $id;
-}
-
-##############################################################
-# Returning the lastsequence for the media table.
-##############################################################
-
-sub get_media_lastsequence
-{
-    my ($fileref) = @_;
-    
-    return $fileref->{'sequencenumber'};
-}
-
-##############################################################
-# Returning the diskprompt for the media table.
-##############################################################
-
-sub get_media_diskprompt
-{
-    return 1;
-}
-
-##############################################################
-# Returning the cabinet file name for the media table.
-##############################################################
-
-sub get_media_cabinet
-{
-    my ($id) = @_;
-
-    my $number = 1000 + $id;
-    my $filename = "f_" . $number . ".cab";
-    
-    if ( $installer::globals::include_cab_in_msi ) { $filename = "\#" . $filename; }
-    
-    return $filename;
-}
-
-##############################################################
-# Returning the volumelabel for the media table.
-##############################################################
-
-sub get_media_volumelabel
-{
-    return "DISK1";
-}
-
-##############################################################
-# Returning the source for the media table.
-##############################################################
-
-sub get_media_source
-{
-    return "";
-}
-
-##############################################################
-# Saving the cabinet file name in the files collector.
-# This is useful for making a list to connect the 
-# source of each file with the destination cabinet file.
-##############################################################
-
-sub set_cabinetfilename_for_component_in_file_collector
-{
-    my ($cabinetfilename, $filesref, $componentname, $max) = @_;
-
-    for ( my $i = 0; $i <= $max; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-        my $component = $onefile->{'componentname'};
-
-        if ( $component eq $componentname )
-        {
-            my $cabinet = "";
-            
-            if ( $onefile->{'cabinet'} ) { $cabinet = $onefile->{'cabinet'}; }
-            
-            if ( $cabinet eq "" )
-            {
-                $onefile->{'cabinet'} = $cabinetfilename;				
-            }
-        }
-    }
-}	
-
-#################################################
-# Creating the cab file name dynamically
-#################################################
-
-sub generate_cab_filename_for_some_cabs
-{
-    my ( $allvariables, $id ) = @_;
-
-    my $name = $allvariables->{'PRODUCTNAME'};
-    
-    $name = lc($name);
-    $name =~ s/\.//g;
-    $name =~ s/\s//g;
-
-    # possibility to overwrite the name with variable CABFILENAME
-    if ( $allvariables->{'CABFILENAME'} ) { $name = $allvariables->{'CABFILENAME'}; }
-
-    $name = $name . $id . ".cab";
-
-    if ( $installer::globals::include_cab_in_msi ) { $name = "\#" . $name; }
-
-    return $name;
-}
-
-#################################################
-# Creating the cab file name for cab files
-# defined in packages.
-#################################################
-
-sub get_cabfilename
-{
-    my ($name) = @_;
-    
-    if ( $installer::globals::include_cab_in_msi ) { $name = "\#" . $name; }
-
-    return $name;	
-}
-
-#################################################
-# Creating the cab file name dynamically
-#################################################
-
-sub generate_cab_filename
-{
-    my ( $allvariables ) = @_;
-
-    my $name = $allvariables->{'PRODUCTNAME'};
-    
-    $name = lc($name);
-    $name =~ s/\.//g;
-    $name =~ s/\s//g;
-
-    # possibility to overwrite the name with variable CABFILENAME
-    if ( $allvariables->{'CABFILENAME'} ) { $name = $allvariables->{'CABFILENAME'}; }
-
-    $name = $name . ".cab";
-
-    if ( $installer::globals::include_cab_in_msi ) { $name = "\#" . $name; }
-
-    return $name;
-}
-
-sub get_maximum_filenumber
-{
-    my ($allfiles, $maxcabfilenumber) = @_;
-
-    my $maxfile = 0;
-    
-    while ( ! ( $allfiles%$maxcabfilenumber == 0 ))
-    {
-        $allfiles++;	
-    } 
-    
-    $maxfile = $allfiles / $maxcabfilenumber;
-    
-    $maxfile++;					# for securitry
-    
-    return $maxfile;
-}
-
-#################################################################################
-# Setting the last sequence for the cabinet files
-#################################################################################
-
-sub get_last_sequence
-{
-    my ( $cabfilename, $alludpatelastsequences ) = @_;
-    
-    my $sequence = 0;
-    
-    if (( $installer::globals::updatedatabase ) && ( exists($alludpatelastsequences->{$cabfilename}) ))
-    {
-        $sequence = $alludpatelastsequences->{$cabfilename};
-    }
-    else
-    {
-        $sequence = $installer::globals::lastsequence{$cabfilename};
-    }
-
-    return $sequence;
-}
-
-#################################################################################
-# Creating the file Media.idt dynamically
-# Content: 
-# DiskId LastSequence DiskPrompt Cabinet VolumeLabel Source
-# Idea: Every component is packed into each own cab file 
-#################################################################################
-
-sub create_media_table
-{
-    my ($filesref, $basedir, $allvariables, $alludpatelastsequences, $allupdatediskids) = @_;
-
-    my @mediatable = ();
-    
-    my $diskid = 0;
-
-    installer::windows::idtglobal::write_idt_header(\@mediatable, "media");
-    
-    if ( $allvariables->{'INCLUDE_CAB_IN_MSI'} ) { $installer::globals::include_cab_in_msi = 1; }
-
-    if ( $installer::globals::use_packages_for_cabs )
-    {
-        my $cabfile;
-        foreach $cabfile ( sort keys %installer::globals::lastsequence )
-        {
-            my %media = ();
-            $diskid++;
-        
-            $media{'DiskId'} = get_media_diskid($diskid);
-            $media{'LastSequence'} = get_last_sequence($cabfile, $alludpatelastsequences);
-            $media{'DiskPrompt'} = get_media_diskprompt();
-            $media{'Cabinet'} = get_cabfilename($cabfile);
-            $media{'VolumeLabel'} = get_media_volumelabel();
-            $media{'Source'} = get_media_source();
-
-            my $oneline = $media{'DiskId'} . "\t" . $media{'LastSequence'} . "\t" . $media{'DiskPrompt'} . "\t"  
-                        . $media{'Cabinet'} . "\t" . $media{'VolumeLabel'} . "\t" . $media{'Source'} . "\n";
-
-            push(@mediatable, $oneline);
-
-            # Comparing the disk id with the disk id from update database. Both have to be identical. New files have to be added
-            # to the new pff cabinet file. And existing cab files must not be removed.
-            if ( $installer::globals::updatedatabase )
-            {
-                # Comparing lines in new media table with line from media table in udpate database.
-                if ( exists($allupdatediskids->{$media{'Cabinet'}}) )
-                {
-                    if ( $media{'DiskId'} != $allupdatediskids->{$media{'Cabinet'}} )
-                    {
-                        installer::exiter::exit_program("ERROR: Different DiskIDs for cab file \"$media{'Cabinet'}\".\nCurrent installation set: \"$media{'DiskId'}\", but update database used \"$allupdatediskids->{$media{'Cabinet'}}\".\nWere cabinet files removed or added?", "create_media_table");
-                    }
-                }
-                else
-                {
-                    my $localinfoline = "Warning: Could not find cabinet file \"$media{'Cabinet'}}\" in update database. This seems to be an new cabinet file!?\n"; 
-                    push(@installer::globals::logfileinfo, $localinfoline);
-                }
-            }
-        }
-        
-        # one new cabinet file for all files added after the final release
-        if (( $installer::globals::updatedatabase ) && ( $installer::globals::pfffileexists ))
-        {
-            my %media = ();
-            $diskid++;
-
-            $media{'DiskId'} = get_media_diskid($diskid) + $installer::globals::mergemodulenumber;  # Adding mergemodulenumber, because this files are included later
-            $media{'LastSequence'} = $installer::globals::updatesequencecounter;
-            $media{'DiskPrompt'} = get_media_diskprompt();
-            $media{'Cabinet'} = get_cabfilename($installer::globals::pffcabfilename);
-            $media{'VolumeLabel'} = get_media_volumelabel();
-            $media{'Source'} = get_media_source();
-
-            my $oneline = $media{'DiskId'} . "\t" . $media{'LastSequence'} . "\t" . $media{'DiskPrompt'} . "\t"  
-                        . $media{'Cabinet'} . "\t" . $media{'VolumeLabel'} . "\t" . $media{'Source'} . "\n";
-
-            push(@mediatable, $oneline);
-        }
-        
-    }
-    elsif ( $installer::globals::cab_file_per_component )
-    {
-        for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-        {
-            my $onefile = ${$filesref}[$i];
-            my $nextfile = ${$filesref}[$i+1];
-        
-            my $filecomponent = "";
-            my $nextcomponent = "";
-        
-            if ( $onefile->{'componentname'} ) { $filecomponent = $onefile->{'componentname'}; }
-            if ( $nextfile->{'componentname'} ) { $nextcomponent = $nextfile->{'componentname'}; }
-
-            if ( $filecomponent eq $nextcomponent )
-            {
-                next;		# nothing to do, this is not the last file of a component
-            }
-        
-            my %media = ();
-            $diskid++;
-        
-            $media{'DiskId'} = get_media_diskid($diskid);
-            $media{'LastSequence'} = get_media_lastsequence($onefile);
-            $media{'DiskPrompt'} = get_media_diskprompt();
-            $media{'Cabinet'} = get_media_cabinet($diskid);
-            $media{'VolumeLabel'} = get_media_volumelabel();
-            $media{'Source'} = get_media_source();
-
-            my $oneline = $media{'DiskId'} . "\t" . $media{'LastSequence'} . "\t" . $media{'DiskPrompt'} . "\t"  
-                    . $media{'Cabinet'} . "\t" . $media{'VolumeLabel'} . "\t" . $media{'Source'} . "\n";
-
-            push(@mediatable, $oneline);		
-
-            $media{'Cabinet'} =~ s/^\s*\#//;	# removing leading hash
-            set_cabinetfilename_for_component_in_file_collector($media{'Cabinet'}, $filesref, $filecomponent, $i);	
-        }
-    }
-    elsif ( $installer::globals::fix_number_of_cab_files )
-    {		
-        # number of cabfiles
-        my $maxcabfilenumber = $installer::globals::number_of_cabfiles;
-        if ( $allvariables->{'CABFILENUMBER'} ) { $maxcabfilenumber = $allvariables->{'CABFILENUMBER'}; }
-        my $allfiles = $#{$filesref} + 1;
-        my $maxfilenumber = get_maximum_filenumber($allfiles, $maxcabfilenumber);
-        my $cabfilenumber = 0;
-        my $cabfull = 0;
-        my $counter = 0;
-        
-        # Sorting of files collector files required !
-        # Attention: The order in the cab file is not guaranteed (especially in udpate process)
-        
-        for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-        {
-            if (( $counter >= $maxfilenumber ) || ( $i == $#{$filesref} )) { $cabfull = 1; }
-
-            $counter++; 	 # counting the files in the cab file
-            
-            my $onefile = ${$filesref}[$i];
-            my $nextfile = ${$filesref}[$i+1];
-        
-            my $filecomponent = "";
-            my $nextcomponent = "";
-            
-            if ( $onefile->{'componentname'} ) { $filecomponent = $onefile->{'componentname'}; }
-            if ( $nextfile->{'componentname'} ) { $nextcomponent = $nextfile->{'componentname'}; }
-
-            if ( $filecomponent eq $nextcomponent )	# all files of one component have to be in one cab file
-            {
-                next;		# nothing to do, this is not the last file of a component
-            }
-
-            if ( $cabfull )
-            {
-                my %media = ();
-                $cabfilenumber++;
-
-                $media{'DiskId'} = get_media_diskid($cabfilenumber);
-                $media{'LastSequence'} = $i + 1;	# This should be correct, also for unsorted files collectors
-                $media{'DiskPrompt'} = get_media_diskprompt();
-                $media{'Cabinet'} = generate_cab_filename_for_some_cabs($allvariables, $cabfilenumber);
-                $media{'VolumeLabel'} = get_media_volumelabel();
-                $media{'Source'} = get_media_source();
-
-                my $oneline = $media{'DiskId'} . "\t" . $media{'LastSequence'} . "\t" . $media{'DiskPrompt'} . "\t"  
-                        . $media{'Cabinet'} . "\t" . $media{'VolumeLabel'} . "\t" . $media{'Source'} . "\n";
-
-                push(@mediatable, $oneline);		
-
-                # Saving the cabinet file name in the file collector
-
-                $media{'Cabinet'} =~ s/^\s*\#//;	# removing leading hash
-
-                for ( my $j = 0; $j <= $i; $j++ )
-                {
-                    my $onefile = ${$filesref}[$j];			
-                    if ( ! $onefile->{'cabinet'} ) { $onefile->{'cabinet'} = $media{'Cabinet'}; }				
-                }
-
-                $cabfull = 0;
-                $counter = 0;				
-            }
-        }
-    }
-    elsif ( $installer::globals::one_cab_file )
-    {	
-        my %media = ();
-        $diskid++;
-        
-        my $maximumfile = $#{$filesref};
-
-        $media{'DiskId'} = get_media_diskid($diskid);
-        $media{'LastSequence'} = $maximumfile + 1; # This works also for unsorted file collector
-        $media{'DiskPrompt'} = get_media_diskprompt();
-        $media{'Cabinet'} = generate_cab_filename($allvariables);
-        $media{'VolumeLabel'} = get_media_volumelabel();
-        $media{'Source'} = get_media_source();
-
-        my $oneline = $media{'DiskId'} . "\t" . $media{'LastSequence'} . "\t" . $media{'DiskPrompt'} . "\t"  
-                    . $media{'Cabinet'} . "\t" . $media{'VolumeLabel'} . "\t" . $media{'Source'} . "\n";
-
-        push(@mediatable, $oneline);
-
-        # Saving the cabinet file name in the file collector
-
-        $media{'Cabinet'} =~ s/^\s*\#//;	# removing leading hash
-
-        for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-        {
-            my $onefile = ${$filesref}[$i];			
-            $onefile->{'cabinet'} = $media{'Cabinet'};				
-        }
-    }
-    else
-    {
-        installer::exiter::exit_program("ERROR: No cab file specification in globals.pm !", "create_media_table");
-    }
-    
-    # Saving the file
-    
-    my $mediatablename = $basedir . $installer::globals::separator . "Media.idt";
-    installer::files::save_file($mediatablename ,\@mediatable);
-    my $infoline = "Created idt file: $mediatablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm
deleted file mode 100755
index 833b476f1..000000000
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ /dev/null
@@ -1,1636 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::mergemodule;
-
-use Cwd;
-use Digest::MD5;
-use installer::converter;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::remover;
-use installer::scriptitems;
-use installer::systemactions;
-use installer::worker;
-use installer::windows::idtglobal;
-use installer::windows::language;
-
-#################################################################
-# Merging the Windows MergeModules into the msi database.
-#################################################################
-
-sub merge_mergemodules_into_msi_database
-{
-    my ($mergemodules, $filesref, $msifilename, $languagestringref, $language, $languagefile, $allvariables, $includepatharrayref, $allupdatesequences, $allupdatelastsequences, $allupdatediskids) = @_;
-
-    my $domerge = 0;
-    if (( $#{$mergemodules} > -1 ) && ( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack )) { $domerge = 1; }
-
-    if ( $domerge )
-    {
-        installer::logger::include_header_into_logfile("Merging merge modules into msi database");
-        installer::logger::print_message( "... merging msm files into msi database ... \n" );
-        installer::logger::include_timestamp_into_logfile("\nPerformance Info: MergeModule into msi database, start");
-
-        my $msidb = "msidb.exe";	# Has to be in the path
-        my $cabinetfile = "MergeModule.CABinet"; # the name of each cabinet file in a merge file
-        my $infoline = "";
-        my $systemcall = "";
-        my $returnvalue = "";
-
-        # 1. Analyzing the MergeModule (has only to be done once)
-        #   a. -> Extracting cabinet file: msidb.exe -d <msmfile> -x MergeModule.CABinet
-        #   b. -> Number of files in cabinet file: msidb.exe -d <msmfile> -f <directory> -e File
-        #   c. -> List of components: msidb.exe -d <msmfile> -f <directory> -e Component
-
-        if ( ! $installer::globals::mergemodules_analyzed )
-        {
-            installer::logger::include_timestamp_into_logfile("\nPerformance Info: Analyzing MergeModules, start");
-            $infoline = "Analyzing all Merge Modules\n\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            %installer::globals::mergemodules = ();
-            
-            my $mergemoduledir = installer::systemactions::create_directories("mergefiles", $languagestringref);
-
-            my $mergemodule;
-            foreach $mergemodule ( @{$mergemodules} )
-            {
-                my $filename = $mergemodule->{'Name'};
-                my $mergefile = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
-    
-                if ( ! -f $$mergefile ) { installer::exiter::exit_program("ERROR: msm file not found: $filename !", "merge_mergemodules_into_msi_database"); }
-                my $completesource = $$mergefile;
-            
-                my $mergegid = $mergemodule->{'gid'};
-                my $workdir = $mergemoduledir . $installer::globals::separator . $mergegid;
-                if ( ! -d $workdir ) { installer::systemactions::create_directory($workdir); }
-
-                $infoline = "Analyzing Merge Module: $filename\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            
-                # copy msm file into working directory
-                my $completedest = $workdir . $installer::globals::separator . $filename;
-                installer::systemactions::copy_one_file($completesource, $completedest);
-                if ( ! -f $completedest ) { installer::exiter::exit_program("ERROR: msm file not found: $completedest !", "merge_mergemodules_into_msi_database"); }
-            
-                # changing directory
-                my $from = cwd();
-                my $to = $workdir;
-                chdir($to);
-
-                # remove an existing cabinet file
-                if ( -f $cabinetfile ) { unlink($cabinetfile); }
-
-                # exclude cabinet file
-                $systemcall = $msidb . " -d " . $filename . " -x " . $cabinetfile;
-                $returnvalue = system($systemcall);
-
-                $infoline = "Systemcall: $systemcall\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                if ($returnvalue)
-                {
-                    $infoline = "ERROR: Could not execute $systemcall !\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    installer::exiter::exit_program("ERROR: Could not extract cabinet file from merge file: $completedest !", "merge_mergemodules_into_msi_database");
-                }
-                else
-                {
-                    $infoline = "Success: Executed $systemcall successfully!\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-            
-                # exclude tables from mergefile
-                # Attention: All listed tables have to exist in the database. If they not exist, an error window pops up
-                # and the return value of msidb.exe is not zero. The error window makes it impossible to check the existence
-                # of a table with the help of the return value. 
-                # Solution: Export of all tables by using "*" . Some tables must exist (File Component Directory), other
-                # tables do not need to exist (MsiAssembly).
-
-                if ( $^O =~ /cygwin/i ) {
-                    # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-                    my $localworkdir = $workdir;
-                    $localworkdir =~ s/\//\\\\/g;
-                    $systemcall = $msidb . " -d " . $filename . " -f " . $localworkdir . " -e \\\*";					
-                }
-                else
-                {
-                    $systemcall = $msidb . " -d " . $filename . " -f " . $workdir . " -e \*";					
-                }
-                                            
-                $returnvalue = system($systemcall);
-
-                $infoline = "Systemcall: $systemcall\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                if ($returnvalue)
-                {
-                    $infoline = "ERROR: Could not execute $systemcall !\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    installer::exiter::exit_program("ERROR: Could not exclude tables from merge file: $completedest !", "merge_mergemodules_into_msi_database");
-                }
-                else
-                {
-                    $infoline = "Success: Executed $systemcall successfully!\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-
-                # Determining  files
-                my $idtfilename = "File.idt"; # must exist
-                if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: File \"$idtfilename\" not found in directory \"$workdir\" !", "merge_mergemodules_into_msi_database"); }
-                my $filecontent = installer::files::read_file($idtfilename);
-                my @file_idt_content = ();
-                my $filecounter = 0;
-                my %mergefilesequence = ();
-                for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-                {
-                    if ( $i <= 2 ) { next; }						# ignoring first three lines
-                    if ( ${$filecontent}[$i] =~ /^\s*$/ ) { next; } # ignoring empty lines
-                    $filecounter++;
-                    push(@file_idt_content, ${$filecontent}[$i]);
-                    if ( ${$filecontent}[$i] =~ /^\s*(.+?)\t(.+?)\t(.+?)\t(.+?)\t(.*?)\t(.*?)\t(.*?)\t(\d+?)\s*$/ )
-                    {
-                        my $filename = $1;
-                        my $filesequence = $8;
-                        $mergefilesequence{$filename} = $filesequence;
-                    }
-                    else
-                    {
-                        my $linecount = $i + 1;
-                        installer::exiter::exit_program("ERROR: Unknown line format in table \"$idtfilename\" (line $linecount) !", "merge_mergemodules_into_msi_database");
-                    }
-                }
-
-                # Determining components
-                $idtfilename = "Component.idt"; # must exist
-                if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: File \"$idtfilename\" not found in directory \"$workdir\" !", "merge_mergemodules_into_msi_database"); }
-                $filecontent = installer::files::read_file($idtfilename);
-                my %componentnames = ();
-                for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-                {
-                    if ( $i <= 2 ) { next; }						# ignoring first three lines
-                    if ( ${$filecontent}[$i] =~ /^\s*$/ ) { next; } # ignoring empty lines
-                    if ( ${$filecontent}[$i] =~ /^\s*(\S+)\s+/ ) { $componentnames{$1} = 1; } 
-                }
-
-                # Determining directories
-                $idtfilename = "Directory.idt";  # must exist
-                if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: File \"$idtfilename\" not found in directory \"$workdir\" !", "merge_mergemodules_into_msi_database"); }
-                $filecontent = installer::files::read_file($idtfilename);
-                my %mergedirectories = ();
-                for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-                {
-                    if ( $i <= 2 ) { next; }						# ignoring first three lines
-                    if ( ${$filecontent}[$i] =~ /^\s*$/ ) { next; } # ignoring empty lines
-                    if ( ${$filecontent}[$i] =~ /^\s*(\S+)\s+/ ) { $mergedirectories{$1} = 1; } 
-                }
-
-                # Determining assemblies
-                $idtfilename = "MsiAssembly.idt"; # does not need to exist
-                my $hasmsiassemblies = 0;
-                my %mergeassemblies = ();
-                if ( -f $idtfilename )
-                {
-                    $filecontent = installer::files::read_file($idtfilename);
-                    $hasmsiassemblies = 1;
-                    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-                    {
-                        if ( $i <= 2 ) { next; }						# ignoring first three lines
-                        if ( ${$filecontent}[$i] =~ /^\s*$/ ) { next; } # ignoring empty lines
-                        if ( ${$filecontent}[$i] =~ /^\s*(\S+)\s+/ ) { $mergeassemblies{$1} = 1; } 
-                    }
-                }
-                
-                # It is possible, that other tables have to be checked here. This happens, if tables in the
-                # merge module have to know the "Feature" or the "Directory", under which the content of the 
-                # msm file is integrated into the msi database. 
-
-                # Determining name of cabinet file in installation set
-                my $cabfilename = $mergemodule->{'Cabfilename'};
-                installer::packagelist::resolve_packagevariables(\$cabfilename, $allvariables, 0);
-                
-                # Analyzing styles
-                # Flag REMOVE_FILE_TABLE is required for msvc9 Merge-Module, because otherwise msidb.exe 
-                # fails during integration of msm file into msi database.
-                
-                my $styles = "";
-                my $removefiletable = 0;
-                if ( $mergemodule->{'Styles'} ) { $styles = $mergemodule->{'Styles'}; }
-                if ( $styles =~ /\bREMOVE_FILE_TABLE\b/ ) { $removefiletable = 1; }
-
-                if ( $removefiletable )
-                {
-                    my $removeworkdir = $workdir . $installer::globals::separator . "remove_file_idt";
-                    if ( ! -d $removeworkdir ) { installer::systemactions::create_directory($removeworkdir); }
-                    my $completeremovedest = $removeworkdir . $installer::globals::separator . $filename;
-                    installer::systemactions::copy_one_file($completedest, $completeremovedest);
-                    if ( ! -f $completeremovedest ) { installer::exiter::exit_program("ERROR: msm file not found: $completeremovedest !", "merge_mergemodules_into_msi_database"); }
-
-                    # Unpacking msm file
-                    if ( $^O =~ /cygwin/i ) {
-                        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-                        my $localcompleteremovedest = $completeremovedest;
-                        my $localremoveworkdir = $removeworkdir;
-                        $localcompleteremovedest =~ s/\//\\\\/g;
-                        $localremoveworkdir =~ s/\//\\\\/g;
-                        $systemcall = $msidb . " -d " . $localcompleteremovedest . " -f " . $localremoveworkdir . " -e \\\*";					
-                    }
-                    else
-                    {
-                        $systemcall = $msidb . " -d " . $completeremovedest . " -f " . $removeworkdir . " -e \*";
-                    }
-
-                    $returnvalue = system($systemcall);
-
-                    my $idtfilename = $removeworkdir . $installer::globals::separator . "File.idt";
-                    if ( -f $idtfilename ) { unlink $idtfilename; }
-                    unlink $completeremovedest;
-
-                    # Packing msm file without "File.idt"
-                    if ( $^O =~ /cygwin/i ) {
-                        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-                        my $localcompleteremovedest = $completeremovedest;
-                        my $localremoveworkdir = $removeworkdir;
-                        $localcompleteremovedest =~ s/\//\\\\/g;
-                        $localremoveworkdir =~ s/\//\\\\/g;
-                        $systemcall = $msidb . " -c -d " . $localcompleteremovedest . " -f " . $localremoveworkdir . " -i \\\*";					
-                    }
-                    else
-                    {
-                        $systemcall = $msidb . " -c -d " . $completeremovedest . " -f " . $removeworkdir . " -i \*";
-                    }
-                    $returnvalue = system($systemcall);
-
-                    # Using this msm file for merging
-                    if ( -f $completeremovedest ) { $completedest = $completeremovedest; }
-                    else { installer::exiter::exit_program("ERROR: Could not find msm file without File.idt: $completeremovedest !", "merge_mergemodules_into_msi_database"); }
-                }
-
-                # Saving MergeModule info				
-                
-                my %onemergemodulehash = ();
-                $onemergemodulehash{'mergefilepath'} = $completedest;
-                $onemergemodulehash{'workdir'} = $workdir;
-                $onemergemodulehash{'cabinetfile'} = $workdir . $installer::globals::separator . $cabinetfile;
-                $onemergemodulehash{'filenumber'} = $filecounter;
-                $onemergemodulehash{'componentnames'} = \%componentnames;
-                $onemergemodulehash{'cabfilename'} = $cabfilename;
-                $onemergemodulehash{'feature'} = $mergemodule->{'Feature'};
-                $onemergemodulehash{'rootdir'} = $mergemodule->{'RootDir'};
-                $onemergemodulehash{'name'} = $mergemodule->{'Name'};
-                $onemergemodulehash{'mergefilesequence'} = \%mergefilesequence;
-                $onemergemodulehash{'mergeassemblies'} = \%mergeassemblies;
-                $onemergemodulehash{'mergedirectories'} = \%mergedirectories;
-                $onemergemodulehash{'hasmsiassemblies'} = $hasmsiassemblies;
-                $onemergemodulehash{'removefiletable'} = $removefiletable;
-                $onemergemodulehash{'fileidtcontent'} = \@file_idt_content;
-            
-                $installer::globals::mergemodules{$mergegid} = \%onemergemodulehash;
-                
-                # Collecting all cab files, to copy them into installation set
-                $installer::globals::copy_msm_files{$cabfilename} = $onemergemodulehash{'cabinetfile'};
-
-                chdir($from);
-            }
-
-            $infoline = "All Merge Modules successfully analyzed\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            $installer::globals::mergemodules_analyzed = 1;
-            installer::logger::include_timestamp_into_logfile("\nPerformance Info: Analyzing MergeModules, stop");
-
-            $infoline = "\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-
-        # 2. Change msi database (has to be done for every msi database -> for every language)
-        #   a. Merge msm file into msi database: msidb.exe -d <msifile> -m <mergefile>
-        #   b. Extracting tables from msi database: msidb.exe -d <msifile> -f <directory> -e File Media, ...
-        #   c. Changing content of msi database in tables: File, Media, Directory, FeatureComponent
-        #   d. Including tables into msi database: msidb.exe -d <msifile> -f <directory> -i File Media, ...
-        #   e. Copying cabinet file into installation set (later)
-
-        my $counter = 0;
-        my $mergemodulegid;
-        foreach $mergemodulegid (keys %installer::globals::mergemodules)
-        {
-            my $mergemodulehash = $installer::globals::mergemodules{$mergemodulegid};
-            $counter++;
-            
-            installer::logger::include_header_into_logfile("Merging Module: $mergemodulehash->{'name'}");
-            installer::logger::print_message( "\t... $mergemodulehash->{'name'} ... \n" );
-
-            $msifilename = installer::converter::make_path_conform($msifilename);
-            my $workdir = $msifilename;
-            installer::pathanalyzer::get_path_from_fullqualifiedname(\$workdir);
-
-            # changing directory
-            my $from = cwd();
-            my $to = $workdir;
-            chdir($to);
-
-            # Saving original msi database
-            installer::systemactions::copy_one_file($msifilename, "$msifilename\.$counter");
-            
-            # Merging msm file, this is the "real" merge command
-
-            installer::logger::include_timestamp_into_logfile("\nPerformance Info: Before merging database");
-
-            if ( $^O =~ /cygwin/i ) {
-                # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-                my $localmergemodulepath = $mergemodulehash->{'mergefilepath'};
-                my $localmsifilename = $msifilename;
-                $localmergemodulepath =~ s/\//\\\\/g;
-                $localmsifilename =~ s/\//\\\\/g;
-                $systemcall = $msidb . " -d " . $localmsifilename . " -m " . $localmergemodulepath;					
-            }
-            else
-            {
-                $systemcall = $msidb . " -d " . $msifilename . " -m " . $mergemodulehash->{'mergefilepath'};
-            }
-            $returnvalue = system($systemcall);
-
-            $infoline = "Systemcall: $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            if ($returnvalue)
-            {
-                $infoline = "ERROR: Could not execute $systemcall . Returnvalue: $returnvalue!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                installer::exiter::exit_program("ERROR: Could not merge msm file into database: $mergemodulehash->{'mergefilepath'} !", "merge_mergemodules_into_msi_database");
-            }
-            else
-            {
-                $infoline = "Success: Executed $systemcall successfully!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
-
-            installer::logger::include_timestamp_into_logfile("\nPerformance Info: After merging database");
-            
-            # Saving original idt files
-            if ( -f "File.idt" ) { installer::systemactions::rename_one_file("File.idt", "old.File.idt.$counter"); }
-            if ( -f "Media.idt" ) { installer::systemactions::rename_one_file("Media.idt", "old.Media.idt.$counter"); }
-            if ( -f "Directory.idt" ) { installer::systemactions::rename_one_file("Directory.idt", "old.Directory.idt.$counter"); }
-            if ( -f "Director.idt" ) { installer::systemactions::rename_one_file("Director.idt", "old.Director.idt.$counter"); }
-            if ( -f "FeatureComponents.idt" ) { installer::systemactions::rename_one_file("FeatureComponents.idt", "old.FeatureComponents.idt.$counter"); }
-            if ( -f "FeatureC.idt" ) { installer::systemactions::rename_one_file("FeatureC.idt", "old.FeatureC.idt.$counter"); }
-            if ( -f "MsiAssembly.idt" ) { installer::systemactions::rename_one_file("MsiAssembly.idt", "old.MsiAssembly.idt.$counter"); }
-            if ( -f "MsiAssem.idt" ) { installer::systemactions::rename_one_file("MsiAssem.idt", "old.MsiAssem.idt.$counter"); }
-            
-            # Extracting tables
-
-            installer::logger::include_timestamp_into_logfile("\nPerformance Info: Before extracting tables");
-            
-            my $workingtables = "File Media Directory FeatureComponents"; # required tables
-            # Optional tables can be added now
-            if ( $mergemodulehash->{'hasmsiassemblies'} ) { $workingtables = $workingtables . " MsiAssembly"; }
-
-            # Table "Feature" has to be exported, but it is not necessary to import it.
-            if ( $^O =~ /cygwin/i ) {
-                # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-                my $localmsifilename = $msifilename;
-                my $localworkdir = $workdir;
-                $localmsifilename =~ s/\//\\\\/g;
-                $localworkdir =~ s/\//\\\\/g;
-                $systemcall = $msidb . " -d " . $localmsifilename . " -f " . $localworkdir . " -e " . "Feature " . $workingtables;					
-            }
-            else
-            {
-                $systemcall = $msidb . " -d " . $msifilename . " -f " . $workdir . " -e " . "Feature " . $workingtables;
-            }
-            $returnvalue = system($systemcall);
-
-            $infoline = "Systemcall: $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            if ($returnvalue)
-            {
-                $infoline = "ERROR: Could not execute $systemcall !\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                installer::exiter::exit_program("ERROR: Could not exclude tables from msi database: $msifilename !", "merge_mergemodules_into_msi_database");
-            }
-            else
-            {
-                $infoline = "Success: Executed $systemcall successfully!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
-
-            installer::logger::include_timestamp_into_logfile("\nPerformance Info: After extracting tables");
-
-            # Using 8+3 table names, that are used, when tables are integrated into database. The export of tables
-            # creates idt-files, that have long names.
-
-            if ( -f "Directory.idt" ) { installer::systemactions::rename_one_file("Directory.idt", "Director.idt"); }
-            if ( -f "FeatureComponents.idt" ) { installer::systemactions::rename_one_file("FeatureComponents.idt", "FeatureC.idt"); }
-            if ( -f "MsiAssembly.idt" ) { installer::systemactions::rename_one_file("MsiAssembly.idt", "MsiAssem.idt"); }
-        
-            # Changing content of tables: File, Media, Directory, FeatureComponent, MsiAssembly
-            installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing Media table");
-            change_media_table($mergemodulehash, $workdir, $mergemodulegid, $allupdatelastsequences, $allupdatediskids);
-            installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing File table");
-            $filesref = change_file_table($mergemodulehash, $workdir, $allupdatesequences, $includepatharrayref, $filesref, $mergemodulegid);
-            installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing FeatureComponent table");
-            change_featurecomponent_table($mergemodulehash, $workdir);
-            installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing Directory table");
-            change_directory_table($mergemodulehash, $workdir);
-            if ( $mergemodulehash->{'hasmsiassemblies'} )
-            {
-                installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing MsiAssembly table");
-                change_msiassembly_table($mergemodulehash, $workdir);
-            }
-
-            # msidb.exe does not merge InstallExecuteSequence, AdminExecuteSequence and AdvtExecuteSequence. Instead it creates
-            # new tables ModuleInstallExecuteSequence, ModuleAdminExecuteSequence and ModuleAdvtExecuteSequence that need to be
-            # merged into the three ExecuteSequences with the following process (also into InstallUISequence.idt). 
-            
-            # Saving original idt files
-            if ( -f "InstallE.idt" ) { installer::systemactions::rename_one_file("InstallE.idt", "old.InstallE.idt.$counter"); }
-            if ( -f "InstallU.idt" ) { installer::systemactions::rename_one_file("InstallU.idt", "old.InstallU.idt.$counter"); }
-            if ( -f "AdminExe.idt" ) { installer::systemactions::rename_one_file("AdminExe.idt", "old.AdminExe.idt.$counter"); }
-            if ( -f "AdvtExec.idt" ) { installer::systemactions::rename_one_file("AdvtExec.idt", "old.AdvtExec.idt.$counter"); }
-            if ( -f "ModuleInstallExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleInstallExecuteSequence.idt", "old.ModuleInstallExecuteSequence.idt.$counter"); }
-            if ( -f "ModuleAdminExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleAdminExecuteSequence.idt", "old.ModuleAdminExecuteSequence.idt.$counter"); }
-            if ( -f "ModuleAdvtExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleAdvtExecuteSequence.idt", "old.ModuleAdvtExecuteSequence.idt.$counter"); }
-            
-            # Extracting tables			
-            my $moduleexecutetables = "ModuleInstallExecuteSequence ModuleAdminExecuteSequence ModuleAdvtExecuteSequence"; # new tables
-            my $executetables = "InstallExecuteSequence InstallUISequence AdminExecuteSequence AdvtExecuteSequence"; # tables to be merged
-
-
-            if ( $^O =~ /cygwin/i ) {
-                # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-                my $localmsifilename = $msifilename;
-                my $localworkdir = $workdir;
-                $localmsifilename =~ s/\//\\\\/g;
-                $localworkdir =~ s/\//\\\\/g;
-                $systemcall = $msidb . " -d " . $localmsifilename . " -f " . $localworkdir . " -e " . "Feature " . $moduleexecutetables;					
-            }
-            else
-            {
-                $systemcall = $msidb . " -d " . $msifilename . " -f " . $workdir . " -e " . "Feature " . $moduleexecutetables;
-            }
-            $returnvalue = system($systemcall);
-            
-            if ( $^O =~ /cygwin/i ) {
-                # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-                my $localmsifilename = $msifilename;
-                my $localworkdir = $workdir;
-                $localmsifilename =~ s/\//\\\\/g;
-                $localworkdir =~ s/\//\\\\/g;
-                $systemcall = $msidb . " -d " . $localmsifilename . " -f " . $localworkdir . " -e " . "Feature " . $executetables;					
-            }
-            else
-            {
-                $systemcall = $msidb . " -d " . $msifilename . " -f " . $workdir . " -e " . "Feature " . $executetables;
-            }
-            $returnvalue = system($systemcall);
-
-            # Using 8+3 table names, that are used, when tables are integrated into database. The export of tables
-            # creates idt-files, that have long names.
-
-            if ( -f "InstallExecuteSequence.idt" ) { installer::systemactions::rename_one_file("InstallExecuteSequence.idt", "InstallE.idt"); }
-            if ( -f "InstallUISequence.idt" ) { installer::systemactions::rename_one_file("InstallUISequence.idt", "InstallU.idt"); }
-            if ( -f "AdminExecuteSequence.idt" ) { installer::systemactions::rename_one_file("AdminExecuteSequence.idt", "AdminExe.idt"); }
-            if ( -f "AdvtExecuteSequence.idt" ) { installer::systemactions::rename_one_file("AdvtExecuteSequence.idt", "AdvtExec.idt"); }
-        
-            # Merging content of tables ModuleInstallExecuteSequence, ModuleAdminExecuteSequence and ModuleAdvtExecuteSequence
-            # into tables InstallExecuteSequence, AdminExecuteSequence and AdvtExecuteSequence
-            if ( -f "ModuleInstallExecuteSequence.idt" )
-            {
-                installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing InstallExecuteSequence table");
-                change_executesequence_table($mergemodulehash, $workdir, "InstallE.idt", "ModuleInstallExecuteSequence.idt");
-                installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing InstallUISequence table");
-                change_executesequence_table($mergemodulehash, $workdir, "InstallU.idt", "ModuleInstallExecuteSequence.idt");
-            }
-
-            if ( -f "ModuleAdminExecuteSequence.idt" )
-            {
-                installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing AdminExecuteSequence table");
-                change_executesequence_table($mergemodulehash, $workdir, "AdminExe.idt", "ModuleAdminExecuteSequence.idt");
-            }
-            
-            if ( -f "ModuleAdvtExecuteSequence.idt" )
-            {
-                installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing AdvtExecuteSequence table");
-                change_executesequence_table($mergemodulehash, $workdir, "AdvtExec.idt", "ModuleAdvtExecuteSequence.idt");
-            }
-
-            installer::logger::include_timestamp_into_logfile("\nPerformance Info: All tables edited");
-            
-            # Including tables into msi database
-
-            installer::logger::include_timestamp_into_logfile("\nPerformance Info: Before including tables");
-
-            if ( $^O =~ /cygwin/i ) {
-                # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-                my $localmsifilename = $msifilename;
-                my $localworkdir = $workdir;
-                $localmsifilename =~ s/\//\\\\/g;
-                $localworkdir =~ s/\//\\\\/g;
-        foreach $table (split / /, $workingtables . ' ' . $executetables) {
-          $systemcall = $msidb . " -d " . $localmsifilename . " -f " . $localworkdir . " -i " . $table;
-          my $retval = system($systemcall);
-          $infoline = "Systemcall returned $retval: $systemcall\n";
-          push( @installer::globals::logfileinfo, $infoline);
-          $returnvalue |= $retval;
-        }
-            }
-            else
-            {
-                $systemcall = $msidb . " -d " . $msifilename . " -f " . $workdir . " -i " . $workingtables. " " . $executetables;
-        $returnvalue = system($systemcall);
-        $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-            }
-
-            if ($returnvalue)
-            {
-                $infoline = "ERROR: Could not execute $systemcall !\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                installer::exiter::exit_program("ERROR: Could not include tables into msi database: $msifilename !", "merge_mergemodules_into_msi_database");
-            }
-            else
-            {
-                $infoline = "Success: Executed $systemcall successfully!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
-
-            installer::logger::include_timestamp_into_logfile("\nPerformance Info: After including tables");
-
-            chdir($from);		
-        }
-
-        if ( ! $installer::globals::mergefiles_added_into_collector ) { $installer::globals::mergefiles_added_into_collector = 1; } # Now all mergemodules are merged for one language.
-
-        installer::logger::include_timestamp_into_logfile("\nPerformance Info: MergeModule into msi database, stop");
-    }
-    
-    return $filesref;
-}
-
-#########################################################################
-# Analyzing the content of the media table.
-#########################################################################
-
-sub analyze_media_file
-{
-    my ($filecontent, $workdir) = @_;
-    
-    my %filehash = ();
-    my $linecount = 0;
-    my $counter = 0;
-    my $filename = "Media.idt";
-    
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( $i <= 2 ) { next; }						# ignoring first three lines
-        if ( ${$filecontent}[$i] =~ /^\s*$/ ) { next; } # ignoring empty lines
-        if ( ${$filecontent}[$i] =~ /^\s*(.+?)\t(.+?)\t(.+?)\t(.+?)\t(.+?)\t(.*?)\s*$/ )
-        {
-            my %line = ();
-            # Format: DiskId	LastSequence	DiskPrompt	Cabinet	VolumeLabel	Source
-            $line{'DiskId'} = $1;
-            $line{'LastSequence'} = $2;
-            $line{'DiskPrompt'} = $3;
-            $line{'Cabinet'} = $4;
-            $line{'VolumeLabel'} = $5;
-            $line{'Source'} = $6;
-        
-            $counter++;	
-            $filehash{$counter} = \%line;
-        }
-        else
-        {
-            $linecount = $i + 1;
-            installer::exiter::exit_program("ERROR: Unknown line format in table \"$filename\" in \"$workdir\" (line $linecount) !", "analyze_media_file");	
-        }
-    }
-    
-    return \%filehash;
-}
-
-#########################################################################
-# Setting the DiskID for the new cabinet file
-#########################################################################
-
-sub get_diskid
-{
-    my ($mediafile, $allupdatediskids, $cabfilename) = @_;
-
-    my $diskid = 0;
-    my $line;
-    
-    if (( $installer::globals::updatedatabase ) && ( exists($allupdatediskids->{$cabfilename}) ))
-    {
-        $diskid = $allupdatediskids->{$cabfilename};
-    }
-    else
-    {
-        foreach $line ( keys %{$mediafile} )
-        {
-            if ( $mediafile->{$line}->{'DiskId'} > $diskid ) { $diskid = $mediafile->{$line}->{'DiskId'}; }	
-        }
-
-        $diskid++;
-    } 
-    
-    return $diskid;	
-}
-
-#########################################################################
-# Setting the global LastSequence variable
-#########################################################################
-
-sub set_current_last_sequence
-{
-    my ($mediafile) = @_;
-
-    my $lastsequence = 0;
-    my $line;
-    foreach $line ( keys %{$mediafile} )
-    {
-        if ( $mediafile->{$line}->{'LastSequence'} > $lastsequence ) { $lastsequence = $mediafile->{$line}->{'LastSequence'}; }	
-    } 
-
-    $installer::globals::lastsequence_before_merge = $lastsequence;	
-}
-
-#########################################################################
-# Setting the LastSequence for the new cabinet file
-#########################################################################
-
-sub get_lastsequence
-{
-    my ($mergemodulehash, $allupdatelastsequences) = @_;
-    
-    my $lastsequence = 0;
-    
-    if (( $installer::globals::updatedatabase ) && ( exists($allupdatelastsequences->{$mergemodulehash->{'cabfilename'}}) ))
-    {
-        $lastsequence = $allupdatelastsequences->{$mergemodulehash->{'cabfilename'}};
-    }
-    else
-    {
-        $lastsequence = $installer::globals::lastsequence_before_merge + $mergemodulehash->{'filenumber'};
-    }
-        
-    return $lastsequence;
-}
-
-#########################################################################
-# Setting the DiskPrompt for the new cabinet file
-#########################################################################
-
-sub get_diskprompt
-{
-    my ($mediafile) = @_;
-
-    my $diskprompt = "";
-    my $line;
-    foreach $line ( keys %{$mediafile} )
-    {
-        if ( exists($mediafile->{$line}->{'DiskPrompt'}) )
-        {
-            $diskprompt = $mediafile->{$line}->{'DiskPrompt'};
-            last;
-        }
-    } 
-    
-    return $diskprompt;	
-}
-
-#########################################################################
-# Setting the VolumeLabel for the new cabinet file
-#########################################################################
-
-sub get_volumelabel
-{
-    my ($mediafile) = @_;
-
-    my $volumelabel = "";
-    my $line;
-    foreach $line ( keys %{$mediafile} )
-    {
-        if ( exists($mediafile->{$line}->{'VolumeLabel'}) )
-        {
-            $volumelabel = $mediafile->{$line}->{'VolumeLabel'};
-            last;
-        }
-    } 
-    
-    return $volumelabel;	
-}
-
-#########################################################################
-# Setting the Source for the new cabinet file
-#########################################################################
-
-sub get_source
-{
-    my ($mediafile) = @_;
-
-    my $source = "";
-    my $line;
-    foreach $line ( keys %{$mediafile} )
-    {
-        if ( exists($mediafile->{$line}->{'Source'}) )
-        {
-            $diskprompt = $mediafile->{$line}->{'Source'};
-            last;
-        }
-    } 
-    
-    return $source;	
-}
-
-#########################################################################
-# For each Merge Module one new line has to be included into the
-# media table.
-#########################################################################
-
-sub create_new_media_line
-{
-    my ($mergemodulehash, $mediafile, $allupdatelastsequences, $allupdatediskids) = @_;
-
-    my $diskid = get_diskid($mediafile, $allupdatediskids, $mergemodulehash->{'cabfilename'});
-    my $lastsequence = get_lastsequence($mergemodulehash, $allupdatelastsequences);
-    my $diskprompt = get_diskprompt($mediafile);
-    my $cabinet = $mergemodulehash->{'cabfilename'};
-    my $volumelabel = get_volumelabel($mediafile);
-    my $source = get_source($mediafile);
-
-    if ( $installer::globals::include_cab_in_msi ) { $cabinet = "\#" . $cabinet; }
-
-    my $newline = "$diskid\t$lastsequence\t$diskprompt\t$cabinet\t$volumelabel\t$source\n";
-
-    return $newline;	
-}
-
-#########################################################################
-# Setting the last diskid in media table.
-#########################################################################
-
-sub get_last_diskid
-{
-    my ($mediafile) = @_;
-
-    my $lastdiskid = 0;
-    my $line;
-    foreach $line ( keys %{$mediafile} )
-    {
-        if ( $mediafile->{$line}->{'DiskId'} > $lastdiskid ) { $lastdiskid = $mediafile->{$line}->{'DiskId'}; }	
-    } 
-
-    return $lastdiskid;
-}
-
-#########################################################################
-# Setting global variable for last cab file name.
-#########################################################################
-
-sub set_last_cabfile_name
-{
-    my ($mediafile, $lastdiskid) = @_;
-    
-    my $line;
-    foreach $line ( keys %{$mediafile} )
-    {
-        if ( $mediafile->{$line}->{'DiskId'} == $lastdiskid ) { $installer::globals::lastcabfilename = $mediafile->{$line}->{'Cabinet'}; }	
-    }
-    my $infoline = "Setting last cabinet file: $installer::globals::lastcabfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-#########################################################################
-# In the media table the new cabinet file has to be added or the
-# number of the last cabinet file has to be increased.
-#########################################################################
-
-sub change_media_table
-{
-    my ( $mergemodulehash, $workdir, $mergemodulegid, $allupdatelastsequences, $allupdatediskids ) = @_;
-
-    my $infoline = "Changing content of table \"Media\"\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $filename = "Media.idt";
-    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" in \"$workdir\" !", "change_media_table"); }
-
-    my $filecontent = installer::files::read_file($filename);
-    my $mediafile = analyze_media_file($filecontent, $workdir);
-    set_current_last_sequence($mediafile);
-
-    if ( $installer::globals::fix_number_of_cab_files )
-    {
-        # Determining the line with the highest sequencenumber. That file needs to be updated.
-        my $lastdiskid = get_last_diskid($mediafile);
-        if ( $installer::globals::lastcabfilename eq "" ) { set_last_cabfile_name($mediafile, $lastdiskid); }
-        my $newmaxsequencenumber = $installer::globals::lastsequence_before_merge + $mergemodulehash->{'filenumber'};
-
-        for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-        {
-            if ( $i <= 2 ) { next; }						# ignoring first three lines
-            if ( ${$filecontent}[$i] =~ /^\s*$/ ) { next; } # ignoring empty lines
-            if ( ${$filecontent}[$i] =~ /^\s*(\Q$lastdiskid\E\t)\Q$installer::globals::lastsequence_before_merge\E(\t.*)$/ )
-            {
-                my $start = $1;
-                my $final = $2;
-                $infoline = "Merge: Old line in media table: ${$filecontent}[$i]\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                my $newline = $start . $newmaxsequencenumber . $final . "\n";
-                ${$filecontent}[$i] = $newline;
-                $infoline = "Merge: Changed line in media table: ${$filecontent}[$i]\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
-        }
-    }
-    else
-    {
-        # the new line is identical for all localized databases, but has to be created for each MergeModule ($mergemodulegid)
-        if ( ! exists($installer::globals::merge_media_line{$mergemodulegid}) )
-        {	
-            $installer::globals::merge_media_line{$mergemodulegid} = create_new_media_line($mergemodulehash, $mediafile, $allupdatelastsequences, $allupdatediskids);
-        }
-
-        $infoline = "Adding line: $installer::globals::merge_media_line{$mergemodulegid}\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    
-        # adding new line
-        push(@{$filecontent}, $installer::globals::merge_media_line{$mergemodulegid});
-    }
-    
-    # saving file
-    installer::files::save_file($filename, $filecontent);
-}
-
-#########################################################################
-# Putting the directory table content into a hash.
-#########################################################################
-
-sub analyze_directorytable_file
-{
-    my ($filecontent, $idtfilename) = @_;
-    
-    my %dirhash = ();	
-    # Iterating over the file content
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( $i <= 2 ) { next; }						# ignoring first three lines
-        if ( ${$filecontent}[$i] =~ /^\s*$/ ) { next; } # ignoring empty lines
-        if ( ${$filecontent}[$i] =~ /^\s*(.+?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my %line = ();
-            # Format: Directory	Directory_Parent	DefaultDir
-            $line{'Directory'} = $1;
-            $line{'Directory_Parent'} = $2;
-            $line{'DefaultDir'} = $3;
-            $line{'linenumber'} = $i; # saving also the line number for direct access
-            
-            my $uniquekey = $line{'Directory'};
-            $dirhash{$uniquekey} = \%line;
-        }
-        else
-        {
-            my $linecount = $i + 1;
-            installer::exiter::exit_program("ERROR: Unknown line format in table \"$idtfilename\" (line $linecount) !", "analyze_directorytable_file");	
-        }
-    }
-    
-    return \%dirhash;
-}
-
-#########################################################################
-# Putting the msi assembly table content into a hash.
-#########################################################################
-
-sub analyze_msiassemblytable_file
-{
-    my ($filecontent, $idtfilename) = @_;
-    
-    my %assemblyhash = ();	
-    # Iterating over the file content
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( $i <= 2 ) { next; }						# ignoring first three lines
-        if ( ${$filecontent}[$i] =~ /^\s*$/ ) { next; } # ignoring empty lines
-        if ( ${$filecontent}[$i] =~ /^\s*(.+?)\t(.+?)\t(.+?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my %line = ();
-            # Format: Component_	Feature_	File_Manifest	File_Application	Attributes
-            $line{'Component'} = $1;
-            $line{'Feature'} = $2;
-            $line{'File_Manifest'} = $3;
-            $line{'File_Application'} = $4;
-            $line{'Attributes'} = $5;
-            $line{'linenumber'} = $i; # saving also the line number for direct access
-            
-            my $uniquekey = $line{'Component'};
-            $assemblyhash{$uniquekey} = \%line;
-        }
-        else
-        {
-            my $linecount = $i + 1;
-            installer::exiter::exit_program("ERROR: Unknown line format in table \"$idtfilename\" (line $linecount) !", "analyze_msiassemblytable_file");	
-        }
-    }
-    
-    return \%assemblyhash;
-}
-
-#########################################################################
-# Putting the file table content into a hash.
-#########################################################################
-
-sub analyze_filetable_file
-{
-    my ( $filecontent, $idtfilename ) = @_;
-
-    my %filehash = ();	
-    # Iterating over the file content
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( $i <= 2 ) { next; }						# ignoring first three lines
-        if ( ${$filecontent}[$i] =~ /^\s*$/ ) { next; } # ignoring empty lines
-        if ( ${$filecontent}[$i] =~ /^\s*(.+?)\t(.+?)\t(.+?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.+?)\s*$/ )
-        {
-            my %line = ();
-            # Format: File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
-            $line{'File'} = $1;
-            $line{'Component'} = $2;
-            $line{'FileName'} = $3;
-            $line{'FileSize'} = $4;
-            $line{'Version'} = $5;
-            $line{'Language'} = $6;
-            $line{'Attributes'} = $7;
-            $line{'Sequence'} = $8;
-            $line{'linenumber'} = $i; # saving also the line number for direct access
-            
-            my $uniquekey = $line{'File'};
-            $filehash{$uniquekey} = \%line;
-        }
-        else
-        {
-            my $linecount = $i + 1;
-            installer::exiter::exit_program("ERROR: Unknown line format in table \"$idtfilename\" (line $linecount) !", "analyze_filetable_file");	
-        }
-    }
-    
-    return \%filehash;
-}
-
-#########################################################################
-# Creating a new line for the directory table.
-#########################################################################
-
-sub get_new_line_for_directory_table
-{
-    my ($dir) = @_;
-    
-    my $newline = "$dir->{'Directory'}\t$dir->{'Directory_Parent'}\t$dir->{'DefaultDir'}\n";
-
-    return $newline;
-}
-
-#########################################################################
-# Creating a new line for the file table.
-#########################################################################
-
-sub get_new_line_for_file_table
-{
-    my ($file) = @_;
-    
-    my $newline = "$file->{'File'}\t$file->{'Component'}\t$file->{'FileName'}\t$file->{'FileSize'}\t$file->{'Version'}\t$file->{'Language'}\t$file->{'Attributes'}\t$file->{'Sequence'}\n";
-
-    return $newline;
-}
-
-#########################################################################
-# Creating a new line for the msiassembly table.
-#########################################################################
-
-sub get_new_line_for_msiassembly_table
-{
-    my ($assembly) = @_;
-    
-    my $newline = "$assembly->{'Component'}\t$assembly->{'Feature'}\t$assembly->{'File_Manifest'}\t$assembly->{'File_Application'}\t$assembly->{'Attributes'}\n";
-
-    return $newline;
-}
-
-#########################################################################
-# Sorting the files collector, if there are files, following
-# the merge module files.
-#########################################################################
-
-sub sort_files_collector_for_sequence
-{
-    my ($filesref) = @_;
-
-    my @sortarray = ();
-    my %helphash = ();
-    
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-        if ( ! exists($onefile->{'sequencenumber'}) ) { installer::exiter::exit_program("ERROR: Could not find sequencenumber for file: $onefile->{'uniquename'} !", "sort_files_collector_for_sequence"); }
-        my $sequence = $onefile->{'sequencenumber'};
-        $helphash{$sequence} = $onefile;
-    }
-    
-    foreach my $seq ( sort { $a <=> $b } keys %helphash ) { push(@sortarray, $helphash{$seq}); }
-    
-    return \@sortarray;
-}
-
-#########################################################################
-# In the file table "Sequence" and "Attributes" have to be changed.
-#########################################################################
-
-sub change_file_table
-{
-    my ($mergemodulehash, $workdir, $allupdatesequenceshashref, $includepatharrayref, $filesref, $mergemodulegid) = @_;
-
-    my $infoline = "Changing content of table \"File\"\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $idtfilename = "File.idt";
-    if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$idtfilename\" in \"$workdir\" !", "change_file_table"); }
-
-    my $filecontent = installer::files::read_file($idtfilename);
-    
-    # If File.idt needed to be removed before the msm database was merged into the msi database,
-    # now it is time to add the content into File.idt
-    if ( $mergemodulehash->{'removefiletable'} )
-    {
-        for ( my $i = 0; $i <= $#{$mergemodulehash->{'fileidtcontent'}}; $i++ )
-        {
-            push(@{$filecontent}, ${$mergemodulehash->{'fileidtcontent'}}[$i]);
-        }
-    }
-
-    # Unpacking the MergeModule.CABinet (only once)
-    # Unpacking into temp directory. Warning: expand.exe has problems with very long unpack directories.
-    
-    my $unpackdir = installer::systemactions::create_directories("cab", "");
-    push(@installer::globals::removedirs, $unpackdir);
-    $unpackdir = $unpackdir . $installer::globals::separator . $mergemodulegid;
-
-    my %newfileshash = ();
-    if (( $installer::globals::fix_number_of_cab_files ) && ( ! $installer::globals::mergefiles_added_into_collector ))
-    {
-        if ( ! -d $unpackdir ) { installer::systemactions::create_directory($unpackdir); }
-
-        # changing directory
-        my $from = cwd();
-        my $to = $mergemodulehash->{'workdir'};
-         if ( $^O =~ /cygwin/i ) {
-            $to = qx(cygpath -u "$to");
-            chomp $to;
-        }
-
-        chdir($to) || die "Could not chdir to \"$to\"\n";
-
-        # Unpack the cab file, so that in can be included into the last office cabinet file.
-        # Not using cabarc.exe from cabsdk for unpacking cabinet files, but "expand.exe" that
-        # should be available on every Windows system.
-
-        $infoline = "Unpacking cabinet file: $mergemodulehash->{'cabinetfile'}\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        # Avoid the Cygwin expand command
-        my $expandfile = "expand.exe";	# Has to be in the path
-         if ( $^O =~ /cygwin/i ) {
-            $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe);
-            chomp $expandfile;
-        }
-
-        my $cabfilename = "MergeModule.CABinet";
-
-        my $systemcall = "";
-        if ( $^O =~ /cygwin/i ) {
-            my $localunpackdir = qx(cygpath -m "$unpackdir");
-            chomp $localunpackdir;
-            $systemcall = $expandfile . " " . $cabfilename . " -F:\\\* " . $localunpackdir;
-        }
-        else
-        {
-            $systemcall = $expandfile . " " . $cabfilename . " -F:\* " . $unpackdir . " 2\>\&1";
-        }
-
-        my $returnvalue = system($systemcall);
-
-        $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        if ($returnvalue)
-        {
-            $infoline = "ERROR: Could not execute $systemcall !\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            installer::exiter::exit_program("ERROR: Could not extract cabinet file: $mergemodulehash->{'cabinetfile'} !", "change_file_table");
-        }
-        else
-        {
-            $infoline = "Success: Executed $systemcall successfully!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-
-        chdir($from);	
-    }	
-
-    # For performance reasons creating a hash with file names and rows
-    # The content of File.idt is changed after every merge -> content cannot be saved in global hash
-    $merge_filetablehashref = analyze_filetable_file($filecontent, $idtfilename);
-
-    my $attributes = "16384"; # Always
-
-    my $filename;
-    foreach $filename (keys %{$mergemodulehash->{'mergefilesequence'}} )
-    {
-        my $mergefilesequence = $mergemodulehash->{'mergefilesequence'}->{$filename};
-        
-        if ( ! exists($merge_filetablehashref->{$filename}) ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" in \"$idtfilename\" !", "change_file_table"); }
-        my $filehash = $merge_filetablehashref->{$filename};
-        my $linenumber = $filehash->{'linenumber'};
-        
-        # <- this line has to be changed concerning "Sequence" and "Attributes"
-        $filehash->{'Attributes'} = $attributes;
-        
-        # If this is an update process, the sequence numbers have to be reused.
-        if ( $installer::globals::updatedatabase )
-        {
-            if ( ! exists($allupdatesequenceshashref->{$filehash->{'File'}}) ) { installer::exiter::exit_program("ERROR: Sequence not defined for file \"$filehash->{'File'}\" !", "change_file_table"); }
-            $filehash->{'Sequence'} = $allupdatesequenceshashref->{$filehash->{'File'}};
-            # Saving all mergemodule sequence numbers. This is important for creating ddf files
-            $installer::globals::allmergemodulefilesequences{$filehash->{'Sequence'}} = 1;
-        }
-        else
-        {
-            # Important saved data: $installer::globals::lastsequence_before_merge.
-            # This mechanism keeps the correct order inside the new cabinet file.
-            $filehash->{'Sequence'} = $filehash->{'Sequence'} + $installer::globals::lastsequence_before_merge;
-        } 
-        
-        my $oldline = ${$filecontent}[$linenumber];
-        my $newline = get_new_line_for_file_table($filehash);
-        ${$filecontent}[$linenumber] = $newline;
-        
-        $infoline = "Merge, replacing line:\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $infoline = "Old: $oldline\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $infoline = "New: $newline\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        # Adding files to the files collector (but only once)
-        if (( $installer::globals::fix_number_of_cab_files ) && ( ! $installer::globals::mergefiles_added_into_collector ))
-        {
-            # If the number of cabinet files is kept constant,
-            # all files from the mergemodule cabinet files will
-            # be integrated into the last office cabinet file
-            # (installer::globals::lastcabfilename).
-            # Therefore the files must now be added to the filescollector,
-            # so that they will be integrated into the ddf files.
-                        
-            # Problem with very long filenames -> copying to shorter filenames
-            my $newfilename = "f" . $filehash->{'Sequence'};
-            my $completesource = $unpackdir . $installer::globals::separator . $filehash->{'File'};
-            my $completedest = $unpackdir . $installer::globals::separator . $newfilename;
-            installer::systemactions::copy_one_file($completesource, $completedest);
-
-            my $locallastcabfilename = $installer::globals::lastcabfilename;
-            if ( $locallastcabfilename =~ /^\s*\#/ ) { $locallastcabfilename =~ s/^\s*\#//; }  # removing beginning hashes
-                        
-            # Create new file hash for file collector			
-            my %newfile = ();
-            $newfile{'sequencenumber'} = $filehash->{'Sequence'};
-            $newfile{'assignedsequencenumber'} = $filehash->{'Sequence'};
-            $newfile{'cabinet'} = $locallastcabfilename;
-            $newfile{'sourcepath'} = $completedest;
-            $newfile{'componentname'} = $filehash->{'Component'};
-            $newfile{'uniquename'} = $filehash->{'File'};
-            $newfile{'Name'} = $filehash->{'File'};
-
-            # Saving in globals sequence hash
-            $installer::globals::uniquefilenamesequence{$filehash->{'File'}} = $filehash->{'Sequence'};
-            
-            if ( ! -f $newfile{'sourcepath'} ) { installer::exiter::exit_program("ERROR: File \"$newfile{'sourcepath'}\" must exist!", "change_file_table"); }
-            
-            # Collecting all new files. Attention: This files must be included into files collector in correct order!
-            $newfileshash{$filehash->{'Sequence'}} = \%newfile;
-            # push(@{$filesref}, \%newfile); -> this is not the correct order	
-        }
-    }
-    
-    # Now the files can be added to the files collector
-    # In the case of an update process, there can be new files, that have to be added after the merge module files.
-    # Warning: In multilingual installation sets, the files only have to be added once to the files collector!
-
-    if ( ! $installer::globals::mergefiles_added_into_collector )
-    {
-        foreach my $localsequence ( sort { $a <=> $b } keys %newfileshash ) { push(@{$filesref}, $newfileshash{$localsequence}); }
-        if ( $installer::globals::newfilesexist ) { $filesref = sort_files_collector_for_sequence($filesref); }
-        # $installer::globals::mergefiles_added_into_collector = 1; -> Not yet. Only if all mergemodules are merged for one language.
-    }
-
-    # Saving the idt file (for every language)
-    installer::files::save_file($idtfilename, $filecontent);
-    
-    return $filesref;	
-}
-
-#########################################################################
-# Reading the file "Director.idt". The Directory, that is defined in scp
-# has to be defined in this table.
-#########################################################################
-
-sub collect_directories
-{
-    my $idtfilename = "Director.idt";
-    my $filecontent = installer::files::read_file($idtfilename);
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( $i <= 2 ) { next; }						# ignoring first three lines
-        if ( ${$filecontent}[$i] =~ /^\s*$/ ) { next; } # ignoring empty lines
-        # Format: Directory	Directory_Parent	DefaultDir
-        if ( ${$filecontent}[$i] =~ /^\s*(.+?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            $installer::globals::merge_alldirectory_hash{$1} = 1;
-        }
-        else
-        {
-            my $linecount = $i + 1;
-            installer::exiter::exit_program("ERROR: Unknown line format in table \"$idtfilename\" (line $linecount) !", "collect_directories");	
-        }
-    }	
-}
-
-#########################################################################
-# Reading the file "Feature.idt". The Feature, that is defined in scp
-# has to be defined in this table.
-#########################################################################
-
-sub collect_feature
-{
-    my $idtfilename = "Feature.idt";
-    if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$idtfilename\" in \"$workdir\" !", "collect_feature"); }
-    my $filecontent = installer::files::read_file($idtfilename);
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( $i <= 2 ) { next; }						# ignoring first three lines
-        if ( ${$filecontent}[$i] =~ /^\s*$/ ) { next; } # ignoring empty lines
-        # Format: Feature	Feature_Parent	Title	Description	Display	Level	Directory_	Attributes
-        if ( ${$filecontent}[$i] =~ /^\s*(.+?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            $installer::globals::merge_allfeature_hash{$1} = 1;
-        }
-        else
-        {
-            my $linecount = $i + 1;
-            installer::exiter::exit_program("ERROR: Unknown line format in table \"$idtfilename\" (line $linecount) !", "collect_feature");	
-        }
-    }	
-}
-
-#########################################################################
-# In the featurecomponent table, the new connections have to be added.
-#########################################################################
-
-sub change_featurecomponent_table
-{
-    my ($mergemodulehash, $workdir) = @_;
-    
-    my $infoline = "Changing content of table \"FeatureComponents\"\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $idtfilename = "FeatureC.idt";
-    if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$idtfilename\" in \"$workdir\" !", "change_featurecomponent_table"); }
-
-    my $filecontent = installer::files::read_file($idtfilename);
-
-    # Simply adding for each new component one line. The Feature has to be defined in scp project.
-    my $feature = $mergemodulehash->{'feature'};
-
-    if ( ! $installer::globals::mergefeaturecollected )
-    {
-        collect_feature(); # putting content into hash %installer::globals::merge_allfeature_hash
-        $installer::globals::mergefeaturecollected = 1;
-    }
-
-    if ( ! exists($installer::globals::merge_allfeature_hash{$feature}) )
-    {
-        installer::exiter::exit_program("ERROR: Unknown feature defined in scp: \"$feature\" . Not defined in table \"Feature\" !", "change_featurecomponent_table");
-    }
-
-    my $component;
-    foreach $component ( keys %{$mergemodulehash->{'componentnames'}} )
-    {
-        my $line = "$feature\t$component\n";
-        push(@{$filecontent}, $line);
-        $infoline = "Adding line: $line\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    # saving file
-    installer::files::save_file($idtfilename, $filecontent);	
-}
-
-#########################################################################
-# In the directory table, the directory parent has to be changed,
-# if it is not TARGETDIR.
-#########################################################################
-
-sub change_directory_table
-{
-    my ($mergemodulehash, $workdir) = @_;
-
-    # directory for MergeModule has to be defined in scp project
-    my $scpdirectory = $mergemodulehash->{'rootdir'};
-    
-    if ( $scpdirectory ne "TARGETDIR" )  # TARGETDIR works fine, when using msidb.exe
-    {
-        my $infoline = "Changing content of table \"Directory\"\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        my $idtfilename = "Director.idt";
-        if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$idtfilename\" in \"$workdir\" !", "change_directory_table"); }
-
-        my $filecontent = installer::files::read_file($idtfilename);
-
-        if ( ! $installer::globals::mergedirectoriescollected )
-        {
-            collect_directories(); # putting content into %installer::globals::merge_alldirectory_hash, only first column!
-            $installer::globals::mergedirectoriescollected = 1;
-        }
-
-        if ( ! exists($installer::globals::merge_alldirectory_hash{$scpdirectory}) )
-        {
-            installer::exiter::exit_program("ERROR: Unknown directory defined in scp: \"$scpdirectory\" . Not defined in table \"Directory\" !", "change_directory_table");
-        }
-
-        # If the definition in scp is okay, now the complete content of "Director.idt" can be analyzed
-        my $merge_directorytablehashref = analyze_directorytable_file($filecontent, $idtfilename);
-
-        my $directory;
-        foreach $directory (keys %{$mergemodulehash->{'mergedirectories'}} )
-        {
-            if ( ! exists($merge_directorytablehashref->{$directory}) ) { installer::exiter::exit_program("ERROR: Could not find directory \"$directory\" in \"$idtfilename\" !", "change_directory_table"); }
-            my $dirhash = $merge_directorytablehashref->{$directory};
-            my $linenumber = $dirhash->{'linenumber'};
-        
-            # <- this line has to be changed concerning "Directory_Parent",
-            # if the current value is "TARGETDIR", which is the default value from msidb.exe
-            
-            if ( $dirhash->{'Directory_Parent'} eq "TARGETDIR" )
-            {
-                $dirhash->{'Directory_Parent'} = $scpdirectory;
-        
-                my $oldline = ${$filecontent}[$linenumber];
-                my $newline = get_new_line_for_directory_table($dirhash);
-                ${$filecontent}[$linenumber] = $newline;
-        
-                $infoline = "Merge, replacing line:\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                $infoline = "Old: $oldline\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                $infoline = "New: $newline\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
-        }
-
-        # saving file
-        installer::files::save_file($idtfilename, $filecontent);
-    }	
-}
-
-#########################################################################
-# In the msiassembly table, the feature has to be changed.
-#########################################################################
-
-sub change_msiassembly_table
-{
-    my ($mergemodulehash, $workdir) = @_;
-
-    my $infoline = "Changing content of table \"MsiAssembly\"\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $idtfilename = "MsiAssem.idt";
-    if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$idtfilename\" in \"$workdir\" !", "change_msiassembly_table"); }
-
-    my $filecontent = installer::files::read_file($idtfilename);
-
-    # feature has to be defined in scp project
-    my $feature = $mergemodulehash->{'feature'};
-    
-    if ( ! $installer::globals::mergefeaturecollected )
-    {
-        collect_feature();  # putting content into hash %installer::globals::merge_allfeature_hash
-        $installer::globals::mergefeaturecollected = 1;
-    }
-
-    if ( ! exists($installer::globals::merge_allfeature_hash{$feature}) )
-    {
-        installer::exiter::exit_program("ERROR: Unknown feature defined in scp: \"$feature\" . Not defined in table \"Feature\" !", "change_msiassembly_table");
-    }
-    
-    my $merge_msiassemblytablehashref = analyze_msiassemblytable_file($filecontent, $idtfilename);
-
-    my $component;
-    foreach $component (keys %{$mergemodulehash->{'mergeassemblies'}} )
-    {
-        if ( ! exists($merge_msiassemblytablehashref->{$component}) ) { installer::exiter::exit_program("ERROR: Could not find component \"$component\" in \"$idtfilename\" !", "change_msiassembly_table"); }
-        my $assemblyhash = $merge_msiassemblytablehashref->{$component};
-        my $linenumber = $assemblyhash->{'linenumber'};
-        
-        # <- this line has to be changed concerning "Feature"
-        $assemblyhash->{'Feature'} = $feature;
-        
-        my $oldline = ${$filecontent}[$linenumber];
-        my $newline = get_new_line_for_msiassembly_table($assemblyhash);
-        ${$filecontent}[$linenumber] = $newline;
-        
-        $infoline = "Merge, replacing line:\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $infoline = "Old: $oldline\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $infoline = "New: $newline\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    # saving file
-    installer::files::save_file($idtfilename, $filecontent);	
-}
-
-#########################################################################
-# Creating file content hash
-#########################################################################
-
-sub make_executeidtcontent_hash
-{
-    my ($filecontent, $idtfilename) = @_;
-    
-    my %newhash = ();
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( $i <= 2 ) { next; }						# ignoring first three lines
-        if ( ${$filecontent}[$i] =~ /^\s*$/ ) { next; } # ignoring empty lines
-        # Format for all sequence tables: Action	Condition	Sequence
-        if ( ${$filecontent}[$i] =~ /^\s*(.+?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my %onehash = ();
-            $onehash{'Action'} = $1;
-            $onehash{'Condition'} = $2;
-            $onehash{'Sequence'} = $3;
-            $newhash{$onehash{'Action'}} = \%onehash;
-        }
-        else
-        {
-            my $linecount = $i + 1;
-            installer::exiter::exit_program("ERROR: Unknown line format in table \"$idtfilename\" (line $linecount) !", "make_executeidtcontent_hash");	
-        }
-    }
-    
-    return \%newhash;
-}
-
-#########################################################################
-# Creating file content hash
-#########################################################################
-
-sub make_moduleexecuteidtcontent_hash
-{
-    my ($filecontent, $idtfilename) = @_;
-    
-    my %newhash = ();
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( $i <= 2 ) { next; }						# ignoring first three lines
-        if ( ${$filecontent}[$i] =~ /^\s*$/ ) { next; } # ignoring empty lines
-        # Format for all module sequence tables: Action	Sequence	BaseAction	After Condition
-        if ( ${$filecontent}[$i] =~ /^\s*(.+?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my %onehash = ();
-            $onehash{'Action'} = $1;
-            $onehash{'Sequence'} = $2;
-            $onehash{'BaseAction'} = $3;
-            $onehash{'After'} = $4;
-            $onehash{'Condition'} = $5;
-            $newhash{$onehash{'Action'}} = \%onehash;
-        }
-        else
-        {
-            my $linecount = $i + 1;
-            installer::exiter::exit_program("ERROR: Unknown line format in table \"$idtfilename\" (line $linecount) !", "make_executeidtcontent_hash");	
-        }
-    }
-    
-    return \%newhash;
-}
-
-#########################################################################
-# ExecuteSequence tables need to be merged with
-# ModuleExecuteSequence tables created by msidb.exe.
-#########################################################################
-
-sub change_executesequence_table
-{
-    my ($mergemodulehash, $workdir, $idtfilename, $moduleidtfilename) = @_;
-
-    my $infoline = "Changing content of table \"$idtfilename\"\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$idtfilename\" in \"$workdir\" !", "change_executesequence_table"); }
-    if ( ! -f $moduleidtfilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$moduleidtfilename\" in \"$workdir\" !", "change_executesequence_table"); }
-    
-    # Reading file content
-    my $idtfilecontent = installer::files::read_file($idtfilename);
-    my $moduleidtfilecontent = installer::files::read_file($moduleidtfilename);
-    
-    # Converting to hash
-    my $idtcontenthash = make_executeidtcontent_hash($idtfilecontent, $idtfilename);
-    my $moduleidtcontenthash = make_moduleexecuteidtcontent_hash($moduleidtfilecontent, $moduleidtfilename);
-    
-    # Merging
-    foreach my $action ( keys %{$moduleidtcontenthash} )
-    {
-        if ( exists($idtcontenthash->{$action}) ) { next; }	# Action already exists, can be ignored
-        
-        if (( $idtfilename eq "InstallU.idt" ) && ( ! ( $action =~ /^\s*WindowsFolder\./ ))) { next; } # Only "WindowsFolder.*" CustomActions for UI Sequence table
-        
-        my $actionhashref = $moduleidtcontenthash->{$action};
-        if ( $actionhashref->{'Sequence'} ne "" )
-        {
-            # Format for all sequence tables: Action Condition Sequence
-            my $newline = $actionhashref->{'Action'} . "\t" . $actionhashref->{'Condition'} . "\t" . $actionhashref->{'Sequence'} . "\n";
-            # Adding to table
-            push(@{$idtfilecontent}, $newline);
-            # Also adding to hash
-            my %idttablehash = ();
-            $idttablehash{'Action'} = $actionhashref->{'Action'};
-            $idttablehash{'Condition'} = $actionhashref->{'Condition'};
-            $idttablehash{'Sequence'} = $actionhashref->{'Sequence'};
-            $idtcontenthash->{$action} = \%idttablehash;
-            
-        }
-        else	# no sequence defined, using syntax "BaseAction" and "After"
-        {
-            my $baseactionname = $actionhashref->{'BaseAction'};
-            # If this baseactionname is not defined in execute idt file, it is not possible to merge
-            if ( ! exists($idtcontenthash->{$baseactionname}) ) { installer::exiter::exit_program("ERROR: Merge problem: Could not find action \"$baseactionname\" in file \"$idtfilename\" !", "change_executesequence_table"); }
-            
-            my $baseaction = $idtcontenthash->{$baseactionname};
-            my $sequencenumber = $baseaction->{'Sequence'};
-            if ( $actionhashref->{'After'} == 1 ) { $sequencenumber = $sequencenumber + 1; }
-            else { $sequencenumber = $sequencenumber - 1; }
-            
-            # Format for all sequence tables: Action Condition Sequence
-            my $newline = $actionhashref->{'Action'} . "\t" . $actionhashref->{'Condition'} . "\t" . $sequencenumber . "\n";
-            # Adding to table
-            push(@{$idtfilecontent}, $newline);
-            # Also adding to hash
-            my %idttablehash = ();
-            $idttablehash{'Action'} = $actionhashref->{'Action'};
-            $idttablehash{'Condition'} = $actionhashref->{'Condition'};
-            $idttablehash{'Sequence'} = $sequencenumber;
-            $idtcontenthash->{$action} = \%idttablehash;		
-        }
-    } 
-
-    # saving file
-    installer::files::save_file($idtfilename, $idtfilecontent);
-}
-
-
-1;
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
deleted file mode 100644
index 18b6b9f3b..000000000
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ /dev/null
@@ -1,2321 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::msiglobal;
-
-use Cwd;
-use Digest::MD5;
-use installer::converter;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::remover;
-use installer::scriptitems;
-use installer::systemactions;
-use installer::worker;
-use installer::windows::idtglobal;
-use installer::windows::language;
-
-###########################################################################
-# Generating the header of the ddf file.
-# The usage of ddf files is needed, because makecab.exe can only include
-# one sourcefile into a cab file
-###########################################################################
-
-sub write_ddf_file_header
-{
-    my ($ddffileref, $cabinetfile, $installdir) = @_;
-    
-    my $oneline;
-    
-    $oneline = ".Set CabinetName1=" . $cabinetfile . "\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set ReservePerCabinetSize=128\n";	# This reserves space for a digital signature.
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set MaxDiskSize=2147483648\n";		# This allows the .cab file to get a size of 2 GB.
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set CompressionType=LZX\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set Compress=ON\n";
-    push(@{$ddffileref} ,$oneline);
-# The window size for LZX compression
-# CompressionMemory=15 | 16 | ... | 21
-# Reference: http://msdn.microsoft.com/en-us/library/bb417343.aspx
-    $oneline = ".Set CompressionMemory=$installer::globals::cabfilecompressionlevel\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set Cabinet=ON\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set DiskDirectoryTemplate=" . $installdir . "\n";
-    push(@{$ddffileref} ,$oneline);
-}
-
-##########################################################################
-# Lines in ddf files must not contain more than 256 characters
-##########################################################################
-
-sub check_ddf_file
-{
-    my ( $ddffile, $ddffilename ) = @_;
-
-    my $maxlength = 0;
-    my $maxline = 0;
-    my $linelength = 0;
-    my $linenumber = 0;
-
-    for ( my $i = 0; $i <= $#{$ddffile}; $i++ )
-    {
-        my $oneline = ${$ddffile}[$i];
-        
-        $linelength = length($oneline);
-        $linenumber = $i + 1;
-        
-        if ( $linelength > 256 )
-        {
-            installer::exiter::exit_program("ERROR \"$ddffilename\" line $linenumber: Lines in ddf files must not contain more than 256 characters!", "check_ddf_file");
-        }
-        
-        if ( $linelength > $maxlength )
-        {
-            $maxlength = $linelength;
-            $maxline = $linenumber;
-        }
-    }
-    
-    my $infoline = "Check of ddf file \"$ddffilename\": Maximum length \"$maxlength\" in line \"$maxline\" (allowed line length: 256 characters)\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-}
-
-##########################################################################
-# Lines in ddf files must not be longer than 256 characters.
-# Therefore it can be useful to use relative pathes. Then it is
-# necessary to change into temp directory before calling 
-# makecab.exe.
-##########################################################################
-
-sub make_relative_ddf_path
-{
-    my ( $sourcepath ) = @_;
-
-    my $windowstemppath = $installer::globals::temppath;
-
-    if ( $^O =~ /cygwin/i )
-    {
-        $windowstemppath = $installer::globals::cyg_temppath;
-    }
-    
-    $sourcepath =~ s/\Q$windowstemppath\E//;
-    $sourcepath =~ s/^\\//;
-            
-    return $sourcepath;
-}
-
-##########################################################################
-# Returning the order of the sequences in the files array.
-##########################################################################
-
-sub get_sequenceorder
-{
-    my ($filesref) = @_;
-
-    my %order = ();
-    
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-        if ( ! $onefile->{'assignedsequencenumber'} ) { installer::exiter::exit_program("ERROR: No sequence number assigned to $onefile->{'gid'} ($onefile->{'uniquename'})!", "get_sequenceorder"); }
-        $order{$onefile->{'assignedsequencenumber'}} = $i;
-    }
-    
-    return \%order;
-}
-
-##########################################################################
-# Generation the list, in which the source of the files is connected
-# with the cabinet destination file. Because more than one file needs
-# to be included into a cab file, this has to be done via ddf files.
-##########################################################################
-
-sub generate_cab_file_list
-{
-    my ($filesref, $installdir, $ddfdir, $allvariables) = @_;
-    
-    my @cabfilelist = ();
-        
-    installer::logger::include_header_into_logfile("Generating ddf files");
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: ddf file generation start");
-
-    if ( $^O =~ /cygwin/i ) { installer::worker::generate_cygwin_pathes($filesref); }
-
-    if ( $installer::globals::use_packages_for_cabs )
-    {
-        my $sequenceorder = get_sequenceorder($filesref);
-        
-        my $counter = 1;
-        my $currentcabfile = "";
-        
-        while ( ( exists($sequenceorder->{$counter}) ) || ( exists($installer::globals::allmergemodulefilesequences{$counter}) ) ) # Taking care of files from merge modules
-        {
-            if ( exists($installer::globals::allmergemodulefilesequences{$counter}) )
-            {
-                # Skipping this sequence, it is not included in $filesref, because it is assigned to a file from a merge module.\n";
-                $counter++;
-                next;	
-            }
-            
-            # Files with increasing sequencerorder are included in one cab file
-            my $onefile = ${$filesref}[$sequenceorder->{$counter}];
-            my $cabinetfile = $onefile->{'assignedcabinetfile'};
-            my $sourcepath =  $onefile->{'sourcepath'};
-            if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
-            my $uniquename =  $onefile->{'uniquename'};
-
-            my $styles = "";
-            my $doinclude = 1;
-            if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };
-            if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-            
-            # to avoid lines with more than 256 characters, it can be useful to use relative pathes
-            if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
-
-            # all files with the same cabinetfile have increasing sequencenumbers
-
-            my @ddffile = ();
-
-            write_ddf_file_header(\@ddffile, $cabinetfile, $installdir);
-    
-            my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
-            if ( $doinclude ) { push(@ddffile, $ddfline); }
-            
-            $counter++;	# increasing the counter
-            my $nextfile = "";
-            my $nextcabinetfile = "";
-            if ( exists($sequenceorder->{$counter}) ) { $nextfile = ${$filesref}[$sequenceorder->{$counter}]; }		
-            if ( $nextfile->{'assignedcabinetfile'} ) { $nextcabinetfile = $nextfile->{'assignedcabinetfile'}; }
-        
-            while ( $nextcabinetfile eq $cabinetfile )
-            {
-                $sourcepath =  $nextfile->{'sourcepath'};
-                if ( $^O =~ /cygwin/i ) { $sourcepath = $nextfile->{'cyg_sourcepath'}; }
-                # to avoid lines with more than 256 characters, it can be useful to use relative pathes
-                if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
-                $uniquename =  $nextfile->{'uniquename'};
-                my $localdoinclude = 1;
-                my $nextfilestyles = "";				
-                if ( $nextfile->{'Styles'} ) { $nextfilestyles = $nextfile->{'Styles'}; }
-                if ( $nextfilestyles =~ /\bDONT_PACK\b/ ) { $localdoinclude = 0; }
-                $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
-                if ( $localdoinclude ) { push(@ddffile, $ddfline); }
-                
-                $counter++;	# increasing the counter!
-                $nextcabinetfile = "_lastfile_";
-                if ( exists($sequenceorder->{$counter}) )
-                {
-                    $nextfile = ${$filesref}[$sequenceorder->{$counter}];
-                    $nextcabinetfile = $nextfile->{'assignedcabinetfile'};
-                }
-            }
-        
-            # creating the DDF file
-
-            my $ddffilename = $cabinetfile;
-            $ddffilename =~ s/.cab/.ddf/;
-            $ddfdir =~ s/\Q$installer::globals::separator\E\s*$//;
-            $ddffilename = $ddfdir . $installer::globals::separator . $ddffilename;
-
-            installer::files::save_file($ddffilename ,\@ddffile);
-            my $infoline = "Created ddf file: $ddffilename\n"; 
-            push(@installer::globals::logfileinfo, $infoline);
-
-            # lines in ddf files must not be longer than 256 characters
-            check_ddf_file(\@ddffile, $ddffilename);
-
-            # Writing the makecab system call
-
-            my $oneline = "makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n";
-        
-            push(@cabfilelist, $oneline);
-
-            # collecting all ddf files
-            push(@installer::globals::allddffiles, $ddffilename);
-        }
-    }
-    elsif ((( $installer::globals::cab_file_per_component ) || ( $installer::globals::fix_number_of_cab_files )) && ( $installer::globals::updatedatabase ))
-    {
-        my $sequenceorder = get_sequenceorder($filesref);
-        
-        my $counter = 1;
-        my $currentcabfile = "";
-        
-        while ( ( exists($sequenceorder->{$counter}) ) || ( exists($installer::globals::allmergemodulefilesequences{$counter}) ) ) # Taking care of files from merge modules
-        {
-#			if ( exists($installer::globals::allmergemodulefilesequences{$counter}) )
-#			{
-#				# Skipping this sequence, it is not included in $filesref, because it is assigned to a file from a merge module.\n";
-#				$counter++;
-#				next;	
-#			}
-
-            my $onefile = ${$filesref}[$sequenceorder->{$counter}];
-            $counter++;
-
-            my $cabinetfile = $onefile->{'cabinet'};
-            my $sourcepath =  $onefile->{'sourcepath'};
-            if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
-            my $uniquename =  $onefile->{'uniquename'};
-
-            my $styles = "";
-            my $doinclude = 1;
-            if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };
-            if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-
-            # to avoid lines with more than 256 characters, it can be useful to use relative pathes
-            if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
-
-            my @ddffile = ();
-
-            write_ddf_file_header(\@ddffile, $cabinetfile, $installdir);
-    
-            my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
-            if ( $doinclude ) { push(@ddffile, $ddfline); }
-
-            my $nextfile = "";
-            if ( ${$filesref}[$sequenceorder->{$counter}] ) { $nextfile = ${$filesref}[$sequenceorder->{$counter}]; }
-
-            my $nextcabinetfile = "";
-        
-            if ( $nextfile->{'cabinet'} ) { $nextcabinetfile = $nextfile->{'cabinet'}; }
-        
-            while ( $nextcabinetfile eq $cabinetfile )
-            {
-                $sourcepath =  $nextfile->{'sourcepath'};
-                if ( $^O =~ /cygwin/i ) { $sourcepath = $nextfile->{'cyg_sourcepath'}; }
-                # to avoid lines with more than 256 characters, it can be useful to use relative pathes
-                if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
-                $uniquename =  $nextfile->{'uniquename'};
-                my $localdoinclude = 1;
-                my $nextfilestyles = "";				
-                if ( $nextfile->{'Styles'} ) { $nextfilestyles = $nextfile->{'Styles'}; }
-                if ( $nextfilestyles =~ /\bDONT_PACK\b/ ) { $localdoinclude = 0; }
-                $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
-                if ( $localdoinclude ) { push(@ddffile, $ddfline); }
-                $counter++;											# increasing the counter!
-                $nextfile = "";
-                $nextcabinetfile = "_lastfile_";
-                if (( exists($sequenceorder->{$counter}) ) && ( ${$filesref}[$sequenceorder->{$counter}] ))
-                {
-                    $nextfile = ${$filesref}[$sequenceorder->{$counter}];
-                    $nextcabinetfile = $nextfile->{'cabinet'};
-                }
-            }
-        
-            # creating the DDF file
-
-            my $ddffilename = $cabinetfile;
-            $ddffilename =~ s/.cab/.ddf/;
-            $ddfdir =~ s/\Q$installer::globals::separator\E\s*$//;
-            $ddffilename = $ddfdir . $installer::globals::separator . $ddffilename;
-
-            installer::files::save_file($ddffilename ,\@ddffile);
-            my $infoline = "Created ddf file: $ddffilename\n"; 
-            push(@installer::globals::logfileinfo, $infoline);
-
-            # lines in ddf files must not be longer than 256 characters
-            check_ddf_file(\@ddffile, $ddffilename);
-
-            # Writing the makecab system call
-
-            my $oneline = "makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n";
-        
-            push(@cabfilelist, $oneline);
-
-            # collecting all ddf files
-            push(@installer::globals::allddffiles, $ddffilename);
-        }		
-    }
-    elsif (( $installer::globals::cab_file_per_component ) || ( $installer::globals::fix_number_of_cab_files ))
-    {
-        for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-        {	
-            my $onefile = ${$filesref}[$i];
-            my $cabinetfile = $onefile->{'cabinet'};
-            my $sourcepath =  $onefile->{'sourcepath'};
-            if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
-            my $uniquename =  $onefile->{'uniquename'};
-
-            my $styles = "";
-            my $doinclude = 1;
-            if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };
-            if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-            
-
-            # to avoid lines with more than 256 characters, it can be useful to use relative pathes
-            if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
-
-            # all files with the same cabinetfile are directly behind each other in the files collector
-
-            my @ddffile = ();
-
-            write_ddf_file_header(\@ddffile, $cabinetfile, $installdir);
-    
-            my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
-            if ( $doinclude ) { push(@ddffile, $ddfline); }
-
-            my $nextfile = ${$filesref}[$i+1];
-            my $nextcabinetfile = "";
-        
-            if ( $nextfile->{'cabinet'} ) { $nextcabinetfile = $nextfile->{'cabinet'}; }
-        
-            while ( $nextcabinetfile eq $cabinetfile )
-            {
-                $sourcepath =  $nextfile->{'sourcepath'};
-                if ( $^O =~ /cygwin/i ) { $sourcepath = $nextfile->{'cyg_sourcepath'}; }
-                # to avoid lines with more than 256 characters, it can be useful to use relative pathes
-                if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
-                $uniquename =  $nextfile->{'uniquename'};
-                my $localdoinclude = 1;
-                my $nextfilestyles = "";				
-                if ( $nextfile->{'Styles'} ) { $nextfilestyles = $nextfile->{'Styles'}; }
-                if ( $nextfilestyles =~ /\bDONT_PACK\b/ ) { $localdoinclude = 0; }
-                $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
-                if ( $localdoinclude ) { push(@ddffile, $ddfline); }
-                $i++;											# increasing the counter!
-                $nextfile = ${$filesref}[$i+1];
-                if ( $nextfile ) { $nextcabinetfile = $nextfile->{'cabinet'}; }
-                else { $nextcabinetfile = "_lastfile_"; }
-            }
-        
-            # creating the DDF file
-
-            my $ddffilename = $cabinetfile;
-            $ddffilename =~ s/.cab/.ddf/;
-            $ddfdir =~ s/\Q$installer::globals::separator\E\s*$//;
-            $ddffilename = $ddfdir . $installer::globals::separator . $ddffilename;
-
-            installer::files::save_file($ddffilename ,\@ddffile);
-            my $infoline = "Created ddf file: $ddffilename\n"; 
-            push(@installer::globals::logfileinfo, $infoline);
-
-            # lines in ddf files must not be longer than 256 characters
-            check_ddf_file(\@ddffile, $ddffilename);
-
-            # Writing the makecab system call
-
-            my $oneline = "makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n";
-        
-            push(@cabfilelist, $oneline);
-
-            # collecting all ddf files
-            push(@installer::globals::allddffiles, $ddffilename);
-        }
-    }
-    elsif (( $installer::globals::one_cab_file ) && ( $installer::globals::updatedatabase ))
-    {
-        my $sequenceorder = get_sequenceorder($filesref);
-        
-        my $counter = 1;
-        my $currentcabfile = "";
-        
-        while ( ( exists($sequenceorder->{$counter}) ) || ( exists($installer::globals::allmergemodulefilesequences{$counter}) ) ) # Taking care of files from merge modules
-        {
-            if ( exists($installer::globals::allmergemodulefilesequences{$counter}) )
-            {
-                # Skipping this sequence, it is not included in $filesref, because it is assigned to a file from a merge module.\n";
-                $counter++;
-                next;	
-            }
-
-            my $onefile = ${$filesref}[$sequenceorder->{$counter}];
-        
-            $cabinetfile = $onefile->{'cabinet'};
-            my $sourcepath =  $onefile->{'sourcepath'};
-            if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
-            my $uniquename =  $onefile->{'uniquename'};
-
-            # to avoid lines with more than 256 characters, it can be useful to use relative pathes
-            if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
-
-            if ( $counter == 1 ) { write_ddf_file_header(\@ddffile, $cabinetfile, $installdir); }
-
-            my $styles = "";
-            my $doinclude = 1;
-            if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };
-            if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-
-            my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
-            if ( $doinclude ) { push(@ddffile, $ddfline); }
-
-            $counter++;	# increasing the counter
-        }
-        
-        # creating the DDF file
-
-        my $ddffilename = $cabinetfile;
-        $ddffilename =~ s/.cab/.ddf/;
-        $ddfdir =~ s/[\/\\]\s*$//;
-        $ddffilename = $ddfdir . $installer::globals::separator . $ddffilename;
-
-        installer::files::save_file($ddffilename ,\@ddffile);
-        my $infoline = "Created ddf file: $ddffilename\n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-
-        # lines in ddf files must not be longer than 256 characters
-        check_ddf_file(\@ddffile, $ddffilename);
-
-        # Writing the makecab system call
-
-        # my $oneline = "makecab.exe /F " . $ddffilename . "\n";
-        my $oneline = "makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n";
-        
-        push(@cabfilelist, $oneline);
-
-        # collecting all ddf files
-        push(@installer::globals::allddffiles, $ddffilename);
-    }
-    elsif ( $installer::globals::one_cab_file )
-    {
-        my @ddffile = ();
-        
-        my $cabinetfile = "";
-
-        for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-        {
-            my $onefile = ${$filesref}[$i];
-            $cabinetfile = $onefile->{'cabinet'};
-            my $sourcepath =  $onefile->{'sourcepath'};
-            if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
-            my $uniquename =  $onefile->{'uniquename'};
-
-            # to avoid lines with more than 256 characters, it can be useful to use relative pathes
-            if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
-
-            if ( $i == 0 ) { write_ddf_file_header(\@ddffile, $cabinetfile, $installdir); }
-
-            my $styles = "";
-            my $doinclude = 1;
-            if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };
-            if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-
-            my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
-            if ( $doinclude ) { push(@ddffile, $ddfline); }
-        }
-        
-        # creating the DDF file
-
-        my $ddffilename = $cabinetfile;
-        $ddffilename =~ s/.cab/.ddf/;
-        $ddfdir =~ s/[\/\\]\s*$//;
-        $ddffilename = $ddfdir . $installer::globals::separator . $ddffilename;
-
-        installer::files::save_file($ddffilename ,\@ddffile);
-        my $infoline = "Created ddf file: $ddffilename\n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-
-        # lines in ddf files must not be longer than 256 characters
-        check_ddf_file(\@ddffile, $ddffilename);
-
-        # Writing the makecab system call
-
-        my $oneline = "makecab.exe /F " . $ddffilename . "\n";
-        
-        push(@cabfilelist, $oneline);
-
-        # collecting all ddf files
-        push(@installer::globals::allddffiles, $ddffilename);
-    }
-    else
-    {
-        installer::exiter::exit_program("ERROR: No cab file specification in globals.pm !", "create_media_table");		
-    }
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: ddf file generation end");
-        
-    return \@cabfilelist;	# contains all system calls for packaging process
-}
-
-########################################################################
-# Returning the file sequence of a specified file.
-########################################################################
-
-sub get_file_sequence
-{
-    my ($filesref, $uniquefilename) = @_;
-
-    my $sequence = "";
-    my $found_sequence = 0;
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-        my $uniquename = $onefile->{'uniquename'};
-        
-        if ( $uniquename eq $uniquefilename )
-        {
-            $sequence = $onefile->{'sequencenumber'};			
-            $found_sequence = 1;
-            last;
-        }
-    }
-    
-    if ( ! $found_sequence ) { installer::exiter::exit_program("ERROR: No sequence found for $uniquefilename !", "get_file_sequence"); }
-    
-    return $sequence;
-}
-
-########################################################################
-# For update and patch reasons the pack order needs to be saved.
-# The pack order is saved in the ddf files; the names and locations
-# of the ddf files are saved in @installer::globals::allddffiles.
-# The outputfile "packorder.txt" can be saved in
-# $installer::globals::infodirectory . 
-########################################################################
-
-sub save_packorder
-{
-    installer::logger::include_header_into_logfile("Saving pack order");
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: saving pack order start");
-
-    my $packorderfilename = "packorder.txt";
-    $packorderfilename = $installer::globals::infodirectory . $installer::globals::separator . $packorderfilename;
-
-    my @packorder = ();
-    
-    my $headerline = "\# Syntax\: Filetable_Sequence Cabinetfilename Physical_FileName Unique_FileName\n\n"; 
-    push(@packorder, $headerline);
-    
-    for ( my $i = 0; $i <= $#installer::globals::allddffiles; $i++ )
-    {
-        my $ddffilename = $installer::globals::allddffiles[$i];
-        my $ddffile = installer::files::read_file($ddffilename);
-        my $cabinetfile = "";
-
-        for ( my $j = 0; $j <= $#{$ddffile}; $j++ )
-        {
-            my $oneline = ${$ddffile}[$j];
-            
-            # Getting the Cabinet file name
-            
-            if ( $oneline =~ /^\s*\.Set\s+CabinetName.*\=(.*?)\s*$/ ) { $cabinetfile = $1; }
-            if ( $oneline =~ /^\s*\.Set\s+/ ) { next; } 
-            
-            if ( $oneline =~ /^\s*\"(.*?)\"\s+(.*?)\s*$/ )
-            {
-                my $sourcefile = $1;
-                my $uniquefilename = $2;
-                
-                installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$sourcefile);
-                
-                # Using the hash created in create_files_table for performance reasons to get the sequence number
-                my $filesequence = "";
-                if ( exists($installer::globals::uniquefilenamesequence{$uniquefilename}) ) { $filesequence = $installer::globals::uniquefilenamesequence{$uniquefilename}; }
-                else { installer::exiter::exit_program("ERROR: No sequence number value for $uniquefilename !", "save_packorder"); }
-                
-                my $line = $filesequence . "\t" . $cabinetfile . "\t" . $sourcefile . "\t" . $uniquefilename . "\n";
-                push(@packorder, $line);
-            }
-        }
-    }
-    
-    installer::files::save_file($packorderfilename ,\@packorder);
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: saving pack order end");
-}
-
-#################################################################
-# Returning the name of the msi database
-#################################################################
-
-sub get_msidatabasename
-{
-    my ($allvariableshashref, $language) = @_;
-    
-    my $databasename = $allvariableshashref->{'PRODUCTNAME'} . $allvariableshashref->{'PRODUCTVERSION'};
-    $databasename = lc($databasename);
-    $databasename =~ s/\.//g;
-    $databasename =~ s/\-//g;
-    $databasename =~ s/\s//g;
-
-    # possibility to overwrite the name with variable DATABASENAME
-    if ( $allvariableshashref->{'DATABASENAME'} )
-    {
-        $databasename = $allvariableshashref->{'DATABASENAME'};
-    }
-    
-    if ( $language )
-    {
-        if (!($language eq ""))
-        {
-            $databasename .= "_$language";
-        }
-    }
-    
-    $databasename .= ".msi";
-    
-    return $databasename;
-}
-
-#################################################################
-# Creating the msi database
-# This works only on Windows
-#################################################################
-
-sub create_msi_database
-{
-    my ($idtdirbase ,$msifilename) = @_;			
-
-    # -f : path containing the idt files
-    # -d : msi database, including path
-    # -c : create database
-    # -i : include the following tables ("*" includes all available tables)
-
-    my $msidb = "msidb.exe";	# Has to be in the path
-    my $extraslash = "";		# Has to be set for non-ActiveState perl
-
-    installer::logger::include_header_into_logfile("Creating msi database");
-
-    $idtdirbase = installer::converter::make_path_conform($idtdirbase);
-
-    $msifilename = installer::converter::make_path_conform($msifilename);
-
-    if ( $^O =~ /cygwin/i ) {
-        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-        $idtdirbase =~ s/\//\\\\/g;
-        $msifilename =~ s/\//\\\\/g;
-        $extraslash = "\\";
-    }
-    my $systemcall = $msidb . " -f " . $idtdirbase . " -d " . $msifilename . " -c " . "-i " . $extraslash . "*";
-
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute $msidb!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed $msidb successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-#####################################################################
-# Returning the value from sis.mlf for Summary Information Stream
-#####################################################################
-
-sub get_value_from_sis_lng
-{
-    my ($language, $languagefile, $searchstring) = @_;
-    
-    my $language_block = installer::windows::idtglobal::get_language_block_from_language_file($searchstring, $languagefile);
-    my $newstring = installer::windows::idtglobal::get_language_string_from_language_block($language_block, $language, $searchstring);
-    $newstring = "\"" . $newstring . "\"";
-    
-    return $newstring;
-}
-
-#################################################################
-# Returning the msi version for the Summary Information Stream
-#################################################################
-
-sub get_msiversion_for_sis
-{
-    my $msiversion = "200";
-    return $msiversion;	
-}
-
-#################################################################
-# Returning the word count for the Summary Information Stream
-#################################################################
-
-sub get_wordcount_for_sis
-{
-    my $wordcount = "0";
-    return $wordcount;	
-}
-
-#################################################################
-# Returning the codepage for the Summary Information Stream
-#################################################################
-
-sub get_codepage_for_sis
-{
-    my ( $language ) = @_;
-
-    my $codepage = installer::windows::language::get_windows_encoding($language);
-
-    # Codepage 65001 does not work in Summary Information Stream
-    if ( $codepage == 65001 ) { $codepage = 0; }
-
-    # my $codepage = "1252";	# determine dynamically in a function
-    # my $codepage = "65001";		# UTF-8
-    return $codepage;	
-}
-
-#################################################################
-# Returning the template for the Summary Information Stream
-#################################################################
-
-sub get_template_for_sis
-{
-    my ( $language, $allvariables ) = @_;
-    
-    my $windowslanguage = installer::windows::language::get_windows_language($language); 
-    
-    my $architecture = "Intel";
-
-    # Adding 256, if this is a 64 bit installation set.
-    if (( $allvariables->{'64BITPRODUCT'} ) && ( $allvariables->{'64BITPRODUCT'} == 1 )) { $architecture = "x64"; }
-
-    my $value = "\"" . $architecture . ";" . $windowslanguage;	# adding the Windows language
-    
-    $value = $value . "\"";						# adding ending '"'
-    
-    return $value ;	
-}
-
-#################################################################
-# Returning the PackageCode for the Summary Information Stream
-#################################################################
-
-sub get_packagecode_for_sis
-{
-    # always generating a new package code for each package
-
-    my $guidref = get_guid_list(1, 1);	# only one GUID shall be generated
-
-    ${$guidref}[0] =~ s/\s*$//;		# removing ending spaces
-
-    my $guid = "\{" . ${$guidref}[0] . "\}";
-
-    my $infoline = "PackageCode: $guid\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    return $guid;	
-}
-
-#################################################################
-# Returning the title for the Summary Information Stream
-#################################################################
-
-sub get_title_for_sis
-{
-    my ( $language, $languagefile, $searchstring ) = @_;
-
-    my $title = get_value_from_sis_lng($language, $languagefile, $searchstring );
-
-    return $title;
-}
-
-#################################################################
-# Returning the author for the Summary Information Stream
-#################################################################
-
-sub get_author_for_sis
-{
-    my $author = $installer::globals::longmanufacturer;
-
-    $author = "\"" . $author . "\"";
-
-    return $author;
-}
-
-#################################################################
-# Returning the subject for the Summary Information Stream
-#################################################################
-
-sub get_subject_for_sis
-{
-    my ( $allvariableshashref ) = @_;
-    
-    my $subject = $allvariableshashref->{'PRODUCTNAME'} . " " . $allvariableshashref->{'PRODUCTVERSION'};
-
-    $subject = "\"" . $subject . "\"";
-
-    return $subject;
-}
-
-#################################################################
-# Returning the comment for the Summary Information Stream
-#################################################################
-
-sub get_comment_for_sis
-{
-    my ( $language, $languagefile, $searchstring ) = @_;
-
-    my $comment = get_value_from_sis_lng($language, $languagefile, $searchstring );
-
-    return $comment;
-}
-
-#################################################################
-# Returning the keywords for the Summary Information Stream
-#################################################################
-
-sub get_keywords_for_sis
-{
-    my ( $language, $languagefile, $searchstring ) = @_;
-
-    my $keywords = get_value_from_sis_lng($language, $languagefile, $searchstring );
-
-    return $keywords;
-}
-
-######################################################################
-# Returning the application name for the Summary Information Stream
-######################################################################
-
-sub get_appname_for_sis
-{
-    my ( $language, $languagefile, $searchstring ) = @_;
-
-    my $appname = get_value_from_sis_lng($language, $languagefile, $searchstring );
-
-    return $appname;
-}
-
-######################################################################
-# Returning the security for the Summary Information Stream
-######################################################################
-
-sub get_security_for_sis
-{
-    my $security = "0";
-    return $security;
-}
-
-#################################################################
-# Writing the Summary information stream into the msi database
-# This works only on Windows
-#################################################################
-
-sub write_summary_into_msi_database
-{
-    my ($msifilename, $language, $languagefile, $allvariableshashref) = @_;
-
-    # -g : requrired msi version
-    # -c : codepage
-    # -p : template
-
-    installer::logger::include_header_into_logfile("Writing summary information stream");
-
-    my $msiinfo = "msiinfo.exe";	# Has to be in the path
-    
-    my $sislanguage = "en-US";	# title, comment, keyword and appname alway in english
-        
-    my $msiversion = get_msiversion_for_sis();
-    my $codepage = get_codepage_for_sis($language);
-    my $template = get_template_for_sis($language, $allvariableshashref);
-    my $guid = get_packagecode_for_sis();
-    my $title = get_title_for_sis($sislanguage,$languagefile, "OOO_SIS_TITLE");
-    my $author = get_author_for_sis();
-    my $subject = get_subject_for_sis($allvariableshashref);
-    my $comment = get_comment_for_sis($sislanguage,$languagefile, "OOO_SIS_COMMENT");
-    my $keywords = get_keywords_for_sis($sislanguage,$languagefile, "OOO_SIS_KEYWORDS");
-    my $appname = get_appname_for_sis($sislanguage,$languagefile, "OOO_SIS_APPNAME");
-    my $security = get_security_for_sis();
-    my $wordcount = get_wordcount_for_sis();
-    
-    $msifilename = installer::converter::make_path_conform($msifilename);
-    
-    my $systemcall = $msiinfo . " " . $msifilename . " -g " . $msiversion . " -c " . $codepage 
-                    . " -p " . $template . " -v " . $guid . " -t " . $title . " -a " . $author
-                    . " -j " . $subject . " -o " . $comment . " -k " . $keywords . " -n " . $appname
-                    . " -u " . $security . " -w " . $wordcount;
-
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute $msiinfo!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed $msiinfo successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }	
-}
-
-#########################################################################
-# For more than one language in the installation set:
-# Use one database and create Transformations for all other languages
-#########################################################################
-
-sub create_transforms
-{
-    my ($languagesarray, $defaultlanguage, $installdir, $allvariableshashref) = @_;	
-
-    installer::logger::include_header_into_logfile("Creating Transforms");
-
-    my $msitran = "msitran.exe";	# Has to be in the path
-    
-    $installdir = installer::converter::make_path_conform($installdir);
-    
-    # Syntax for creating a transformation
-    # msitran.exe -g <baseDB> <referenceDB> <transformfile> [<errorhandling>}
-    
-    my $basedbname = get_msidatabasename($allvariableshashref, $defaultlanguage);	
-    $basedbname = $installdir . $installer::globals::separator . $basedbname;
-
-    my $errorhandling = "f";	# Suppress "change codepage" error
-
-    # Iterating over all files
-    
-    foreach ( @{$languagesarray} )
-    {
-        my $onelanguage = $_;
-    
-        if ( $onelanguage eq $defaultlanguage ) { next; }
-    
-        my $referencedbname = get_msidatabasename($allvariableshashref, $onelanguage);	
-        $referencedbname = $installdir . $installer::globals::separator . $referencedbname;
-        
-        my $transformfile = $installdir . $installer::globals::separator . "trans_" . $onelanguage . ".mst";
-
-        my $systemcall = $msitran . " " . " -g " . $basedbname . " " . $referencedbname . " " . $transformfile . " " . $errorhandling; 
-
-        my $returnvalue = system($systemcall);
-
-        my $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        
-        # Problem: msitran.exe in version 4.0 always returns "1", even if no failure occurred.
-        # Therefore it has to be checked, if this is version 4.0. If yes, if the mst file
-        # exists and if it is larger than 0 bytes. If this is true, then no error occurred.
-        # File Version of msitran.exe: 4.0.6000.16384 has checksum: "b66190a70145a57773ec769e16777b29".
-        # Same for msitran.exe from wntmsci12: "aa25d3445b94ffde8ef0c1efb77a56b8"
-        
-        if ($returnvalue)
-        {
-            $infoline = "WARNING: Returnvalue of $msitran is not 0. Checking version of $msitran!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            open(FILE, "<$installer::globals::msitranpath") or die "ERROR: Can't open $installer::globals::msitranpath for creating file hash";
-            binmode(FILE);
-            my $digest = Digest::MD5->new->addfile(*FILE)->hexdigest;			
-            close(FILE);
-
-            my @problemchecksums = ("b66190a70145a57773ec769e16777b29", "aa25d3445b94ffde8ef0c1efb77a56b8", "748206e54fc93efe6a1aaa9d491f3ad1");
-            my $isproblemchecksum = 0;
-            
-            foreach my $problemchecksum ( @problemchecksums )
-            {
-                $infoline = "Checksum of problematic MsiTran.exe: $problemchecksum\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                $infoline = "Checksum of used MsiTran.exe: $digest\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                if ( $digest eq $problemchecksum ) { $isproblemchecksum = 1; }
-            }
-
-            if ( $isproblemchecksum )
-            {
-                # Check existence of mst
-                if ( -f $transformfile )
-                {
-                    $infoline = "File $transformfile exists.\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    my $filesize = ( -s $transformfile );
-                    $infoline = "Size of $transformfile: $filesize\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-
-                    if ( $filesize > 0 )
-                    {
-                        $infoline = "Info: Returnvalue $returnvalue of $msitran is no problem :-) .\n";
-                        push( @installer::globals::logfileinfo, $infoline);
-                        $returnvalue = 0; # reset the error	
-                    }
-                    else
-                    {
-                        $infoline = "Filesize indicates that an error occurred.\n";
-                        push( @installer::globals::logfileinfo, $infoline);
-                    }
-                }
-                else
-                {
-                    $infoline = "File $transformfile does not exist -> An error occurred.\n";
-                    push( @installer::globals::logfileinfo, $infoline);					
-                }
-            }
-            else
-            {
-                $infoline = "This is not a problematic version of msitran.exe. Therefore the error is not caused by problematic msitran.exe.\n";
-                push( @installer::globals::logfileinfo, $infoline);				
-            }
-        }		
-        
-        if ($returnvalue)
-        {
-            $infoline = "ERROR: Could not execute $msitran!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        else	
-        {
-            $infoline = "Success: Executed $msitran successfully!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }	
-
-        # The reference database can be deleted
-        
-        my $result = unlink($referencedbname);		
-        # $result contains the number of deleted files
-        
-        if ( $result == 0 )
-        {
-            $infoline = "ERROR: Could not remove file $$referencedbname !\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            installer::exiter::exit_program($infoline, "create_transforms");
-        }
-    }
-}
-
-#########################################################################
-# The default language msi database does not need to contain
-# the language in the database name. Therefore the file
-# is renamed. Example: "openofficeorg20_01.msi" to "openofficeorg20.msi"
-#########################################################################
-
-sub rename_msi_database_in_installset
-{
-    my ($defaultlanguage, $installdir, $allvariableshashref) = @_;	
-
-    installer::logger::include_header_into_logfile("Renaming msi database");
-
-    my $olddatabasename = get_msidatabasename($allvariableshashref, $defaultlanguage);	
-    $olddatabasename = $installdir . $installer::globals::separator . $olddatabasename;
-
-    my $newdatabasename = get_msidatabasename($allvariableshashref);	
-
-    $installer::globals::shortmsidatabasename = $newdatabasename;
-
-    $newdatabasename = $installdir . $installer::globals::separator . $newdatabasename;
-
-    installer::systemactions::rename_one_file($olddatabasename, $newdatabasename);
-    
-    $installer::globals::msidatabasename = $newdatabasename;
-}
-
-#########################################################################
-# Adding the language to the name of the msi databasename,
-# if this is required (ADDLANGUAGEINDATABASENAME)
-#########################################################################
-
-sub add_language_to_msi_database
-{
-    my ($defaultlanguage, $installdir, $allvariables) = @_;
-
-    my $languagestring = $defaultlanguage;
-    if ( $allvariables->{'USELANGUAGECODE'} ) { $languagestring = installer::windows::language::get_windows_language($defaultlanguage); } 
-    my $newdatabasename = $installer::globals::shortmsidatabasename;
-    $newdatabasename =~ s/\.msi\s*$/_$languagestring\.msi/;
-    $installer::globals::shortmsidatabasename = $newdatabasename;
-    $newdatabasename = $installdir . $installer::globals::separator . $newdatabasename;
-
-    my $olddatabasename = $installer::globals::msidatabasename;
-    
-    installer::systemactions::rename_one_file($olddatabasename, $newdatabasename);
-    
-    $installer::globals::msidatabasename = $newdatabasename;	
-}
-
-##########################################################################
-# Writing the databasename into the setup.ini.
-##########################################################################
-
-sub put_databasename_into_setupini
-{
-    my ($setupinifile, $allvariableshashref) = @_;
-    
-    my $databasename = get_msidatabasename($allvariableshashref);
-    my $line = "database=" . $databasename . "\n";
-    
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the required msi version into setup.ini
-##########################################################################
-
-sub put_msiversion_into_setupini
-{
-    my ($setupinifile) = @_;
-    
-    my $msiversion = "2.0";	
-    my $line = "msiversion=" . $msiversion . "\n";
-    
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the productname into setup.ini
-##########################################################################
-
-sub put_productname_into_setupini
-{
-    my ($setupinifile, $allvariableshashref) = @_;
-    
-    my $productname = $allvariableshashref->{'PRODUCTNAME'};	
-    my $line = "productname=" . $productname . "\n";
-    
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the productcode into setup.ini
-##########################################################################
-
-sub put_productcode_into_setupini
-{
-    my ($setupinifile) = @_;
-    
-    my $productcode = $installer::globals::productcode;	
-    my $line = "productcode=" . $productcode . "\n";
-    
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the ProductVersion from Property table into setup.ini
-##########################################################################
-
-sub put_productversion_into_setupini
-{
-    my ($setupinifile) = @_;
-    
-    my $line = "productversion=" . $installer::globals::msiproductversion . "\n";	
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the key for Minor Upgrades into setup.ini
-##########################################################################
-
-sub put_upgradekey_into_setupini
-{
-    my ($setupinifile) = @_;
-    
-    if ( $installer::globals::minorupgradekey ne "" )
-    {
-        my $line = "upgradekey=" . $installer::globals::minorupgradekey . "\n";	
-        push(@{$setupinifile}, $line);
-    }
-}
-
-##########################################################################
-# Writing the number of languages into setup.ini
-##########################################################################
-
-sub put_languagecount_into_setupini
-{
-    my ($setupinifile, $languagesarray) = @_;
-    
-    my $languagecount = $#{$languagesarray} + 1;
-    my $line = "count=" . $languagecount . "\n";
-    
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the defaultlanguage into setup.ini
-##########################################################################
-
-sub put_defaultlanguage_into_setupini
-{
-    my ($setupinifile, $defaultlanguage) = @_;
-    
-    my $windowslanguage = installer::windows::language::get_windows_language($defaultlanguage);
-    my $line = "default=" . $windowslanguage . "\n";	
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the information about transformations into setup.ini
-##########################################################################
-
-sub put_transforms_into_setupini
-{
-    my ($setupinifile, $onelanguage, $counter) = @_;
-        
-    my $windowslanguage = installer::windows::language::get_windows_language($onelanguage);
-    my $transformfilename = "trans_" . $onelanguage . ".mst";
-    
-    my $line = "lang" . $counter . "=" . $windowslanguage . "," . $transformfilename . "\n";
-        
-    push(@{$setupinifile}, $line);
-}
-
-###################################################
-# Including Windows line ends in ini files
-# Profiles on Windows shall have \r\n line ends
-###################################################
-
-sub include_windows_lineends
-{
-    my ($onefile) = @_;
-
-    for ( my $i = 0; $i <= $#{$onefile}; $i++ )
-    {
-        ${$onefile}[$i] =~ s/\r?\n$/\r\n/;
-    }
-}
-
-##########################################################################
-# Generation the file setup.ini, that is used by the loader setup.exe.
-##########################################################################
-
-sub create_setup_ini
-{
-    my ($languagesarray, $defaultlanguage, $installdir, $allvariableshashref) = @_;	
-
-    installer::logger::include_header_into_logfile("Creating setup.ini");
-
-    my $setupinifilename = $installdir . $installer::globals::separator . "setup.ini";
-    
-    my @setupinifile = ();
-    my $setupinifile = \@setupinifile;
-    
-    my $line = "\[setup\]\n";
-    push(@setupinifile, $line);
-
-    put_databasename_into_setupini($setupinifile, $allvariableshashref);
-    put_msiversion_into_setupini($setupinifile);
-    put_productname_into_setupini($setupinifile, $allvariableshashref);
-    put_productcode_into_setupini($setupinifile);
-    put_productversion_into_setupini($setupinifile);
-    put_upgradekey_into_setupini($setupinifile);
-    
-    $line = "\[languages\]\n";
-    push(@setupinifile, $line);
-
-    put_languagecount_into_setupini($setupinifile, $languagesarray);
-    put_defaultlanguage_into_setupini($setupinifile, $defaultlanguage);
-
-    if ( $#{$languagesarray} > 0 )	# writing the transforms information
-    {
-        my $counter = 1;
-
-        for ( my $i = 0; $i <= $#{$languagesarray}; $i++ )
-        {
-            if ( ${$languagesarray}[$i] eq $defaultlanguage ) { next; }
-
-            put_transforms_into_setupini($setupinifile, ${$languagesarray}[$i], $counter);
-            $counter++;
-        }	
-    }
-
-    if ( $installer::globals::iswin && $installer::globals::plat =~ /cygwin/i)		# Windows line ends only for Cygwin
-    {
-        include_windows_lineends($setupinifile);
-    }
-
-    installer::files::save_file($setupinifilename, $setupinifile);	
-
-    $infoline = "Generated file $setupinifilename !\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-#################################################################
-# Copying the files defined as ScpActions into the 
-# installation set.
-#################################################################
-
-sub copy_scpactions_into_installset
-{
-    my ($defaultlanguage, $installdir, $allscpactions) = @_;	
-
-    installer::logger::include_header_into_logfile("Copying ScpAction files into installation set");
-
-    for ( my $i = 0; $i <= $#{$allscpactions}; $i++ )
-    {
-        my $onescpaction = ${$allscpactions}[$i];
-        
-        if ( $onescpaction->{'Name'} eq "loader.exe" ) { next; }	# do not copy this ScpAction loader
-        
-        # only copying language independent files or files with the correct language (the defaultlanguage)
-        
-        my $filelanguage = $onescpaction->{'specificlanguage'};
-        
-        if ( ($filelanguage eq $defaultlanguage) || ($filelanguage eq "") )
-        { 
-            my $sourcefile = $onescpaction->{'sourcepath'};
-            my $destfile = $installdir . $installer::globals::separator . $onescpaction->{'DestinationName'};
-
-            installer::systemactions::copy_one_file($sourcefile, $destfile);
-        }	
-    }
-}
-
-#################################################################
-# Copying the files for the Windows installer into the 
-# installation set (setup.exe).
-#################################################################
-
-sub copy_windows_installer_files_into_installset
-{
-    my ($installdir, $includepatharrayref, $allvariables) = @_;
-
-    installer::logger::include_header_into_logfile("Copying Windows installer files into installation set");
-    
-    @copyfile = ();
-    push(@copyfile, "loader2.exe");
-    
-    if ( $allvariables->{'NOLOADERREQUIRED'} ) { @copyfile = (); }
-    
-    for ( my $i = 0; $i <= $#copyfile; $i++ )
-    {
-        my $filename = $copyfile[$i];
-        my $sourcefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
-    
-        if ( ! -f $$sourcefileref ) { installer::exiter::exit_program("ERROR: msi file not found: $$sourcefileref !", "copy_windows_installer_files_into_installset"); }
-
-        my $destfile;
-        if ( $copyfile[$i] eq "loader2.exe" ) { $destfile = "setup.exe"; }	# renaming the loader
-        else { $destfile = $copyfile[$i]; }
-
-        $destfile = $installdir . $installer::globals::separator . $destfile;
-
-        installer::systemactions::copy_one_file($$sourcefileref, $destfile);		
-    }
-}
-
-#################################################################
-# Copying MergeModules for the Windows installer into the 
-# installation set. The list of MergeModules is located
-# in %installer::globals::copy_msm_files
-#################################################################
-
-sub copy_merge_modules_into_installset
-{
-    my ($installdir) = @_;
-
-    installer::logger::include_header_into_logfile("Copying Merge files into installation set");
-    
-    my $cabfile;
-    foreach $cabfile ( keys  %installer::globals::copy_msm_files )
-    {
-        my $sourcefile  = $installer::globals::copy_msm_files{$cabfile};
-        my $destfile = $installdir . $installer::globals::separator . $cabfile;
-
-        installer::systemactions::copy_one_file($sourcefile, $destfile);
-    }
-}
-
-#################################################################
-# Copying the child projects into the 
-# installation set
-#################################################################
-
-sub copy_child_projects_into_installset
-{
-    my ($installdir, $allvariables) = @_;
-
-    my $sourcefile = "";
-    my $destdir = "";
-
-    # adding Java
-
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {
-        $sourcefile = $installer::globals::javafile->{'sourcepath'};
-        $destdir = $installdir . $installer::globals::separator . $installer::globals::javafile->{'Subdir'};
-        if ( ! -d $destdir) { installer::systemactions::create_directory($destdir); }
-        installer::systemactions::copy_one_file($sourcefile, $destdir);
-    }
-
-    if ( $allvariables->{'UREPRODUCT'} )
-    {
-        $sourcefile = $installer::globals::urefile->{'sourcepath'};
-        $destdir = $installdir . $installer::globals::separator . $installer::globals::urefile->{'Subdir'};
-        if ( ! -d $destdir) { installer::systemactions::create_directory($destdir); }
-        installer::systemactions::copy_one_file($sourcefile, $destdir);
-    }
-}
-
-#################################################################
-# Getting a list of GUID using uuidgen.exe.
-# This works only on Windows
-#################################################################
-
-sub get_guid_list
-{
-    my ($number, $log) = @_;
-
-    if ( $log ) { installer::logger::include_header_into_logfile("Generating $number GUID"); }
-    
-    my $uuidgen = "uuidgen.exe";		# Has to be in the path
-    
-    # "-c" for uppercase output
-    
-    my $systemcall = "$uuidgen -n$number |";
-    open (UUIDGEN, "$systemcall" ) or die("uuidgen is missing.");
-    my @uuidlist = <UUIDGEN>;
-    close (UUIDGEN);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    if ( $log ) { push( @installer::globals::logfileinfo, $infoline); }
-    
-    my $comparenumber = $#uuidlist + 1;	
-    
-    if ( $comparenumber == $number )
-    {
-        $infoline = "Success: Executed $uuidgen successfully!\n";
-        if ( $log ) { push( @installer::globals::logfileinfo, $infoline); }
-    }
-    else
-    {
-        $infoline = "ERROR: Could not execute $uuidgen successfully!\n";
-        if ( $log ) { push( @installer::globals::logfileinfo, $infoline); }
-    }	
-
-    # uppercase, no longer "-c", because this is only supported in uuidgen.exe v.1.01
-    for ( my $i = 0; $i <= $#uuidlist; $i++ ) { $uuidlist[$i] = uc($uuidlist[$i]); }
-
-    return \@uuidlist;
-}
-
-#################################################################
-# Calculating a GUID with a string using md5.
-#################################################################
-
-sub calculate_guid
-{
-    my ( $string ) = @_;
-    
-    my $guid = "";
-    
-    my $md5 = Digest::MD5->new;
-    $md5->add($string);
-    my $digest = $md5->hexdigest;
-    $digest = uc($digest);
-
-    my ($first, $second, $third, $fourth, $fifth) = unpack ('A8 A4 A4 A4 A12', $digest);
-    $guid = "$first-$second-$third-$fourth-$fifth";
-    
-    return $guid;
-}
-
-#################################################################
-# Filling the component hash with the values of the 
-# component file.
-#################################################################
-
-sub fill_component_hash
-{
-    my ($componentfile) = @_;
-
-    my %components = ();
-
-    for ( my $i = 0; $i <= $#{$componentfile}; $i++ )
-    {
-        my $line = ${$componentfile}[$i];
-        
-        if ( $line =~ /^\s*(.*?)\t(.*?)\s*$/ )
-        {
-            my $key = $1;
-            my $value = $2;
-        
-            $components{$key} = $value;
-        }
-    }
-    
-    return \%components;
-}
-
-#################################################################
-# Creating a new component file, if new guids were generated.
-#################################################################
-
-sub create_new_component_file
-{
-    my ($componenthash) = @_;
-
-    my @componentfile = ();
-    
-    my $key;
-    
-    foreach $key (keys %{$componenthash})
-    {
-        my $value = $componenthash->{$key};
-        my $input = "$key\t$value\n";
-        push(@componentfile ,$input);
-    }
-
-    return \@componentfile;
-}
-
-#################################################################
-# Filling real component GUID into the component table.
-# This works only on Windows
-#################################################################
-
-sub set_uuid_into_component_table
-{
-    my ($idtdirbase, $allvariables) = @_;
-    
-    my $componenttablename  = $idtdirbase . $installer::globals::separator . "Componen.idt";
-    
-    my $componenttable = installer::files::read_file($componenttablename);
-    
-    # For update and patch reasons (small update) the GUID of an existing component must not change!
-    # The collection of component GUIDs is saved in the directory $installer::globals::idttemplatepath in the file "components.txt"
-    
-    my $infoline = "";
-    my $counter = 0;
-    
-    for ( my $i = 3; $i <= $#{$componenttable}; $i++ )	# ignoring the first three lines
-    {
-        my $oneline = ${$componenttable}[$i];
-        my $componentname = "";
-        if ( $oneline =~ /^\s*(\S+?)\t/ ) { $componentname = $1; }
-
-        my $uuid = "";
-
-            if ( exists($installer::globals::calculated_component_guids{$componentname}))
-            {
-                $uuid = $installer::globals::calculated_component_guids{$componentname};				
-            }
-            else
-            {
-                # Calculating new GUID with the help of the component name.
-                my $useooobaseversion = 1;
-                if ( exists($installer::globals::base_independent_components{$componentname})) { $useooobaseversion = 0; }
-                my $sourcestring = $componentname;
-
-                if ( $useooobaseversion )
-                {
-                    if ( ! exists($allvariables->{'OOOBASEVERSION'}) ) { installer::exiter::exit_program("ERROR: Could not find variable \"OOOBASEVERSION\" (required value for GUID creation)!", "set_uuid_into_component_table"); }
-                    $sourcestring = $sourcestring . "_" . $allvariables->{'OOOBASEVERSION'};
-                }
-                $uuid = calculate_guid($sourcestring);
-                $counter++;
-
-                # checking, if there is a conflict with an already created guid
-                if ( exists($installer::globals::allcalculated_guids{$uuid}) ) { installer::exiter::exit_program("ERROR: \"$uuid\" was already created before!", "set_uuid_into_component_table"); }
-                $installer::globals::allcalculated_guids{$uuid} = 1;
-                $installer::globals::calculated_component_guids{$componentname} = $uuid;
-            }
-
-        ${$componenttable}[$i] =~ s/COMPONENTGUID/$uuid/;
-    }
-    
-    installer::files::save_file($componenttablename, $componenttable);
-}
-
-#########################################################################
-# Adding final 64 properties into msi database, if required.
-# RegLocator : +16 in type column to search in 64 bit registry.
-# All conditions: "VersionNT" -> "VersionNT64" (several tables).
-# Already done: "+256" in Attributes column of table "Component".
-# Still following: Setting "x64" instead of "Intel" in Summary 
-# Information Stream of msi database in "get_template_for_sis". 
-#########################################################################
-
-sub prepare_64bit_database
-{
-    my ($basedir, $allvariables) = @_;
-    
-    my $infoline = "";
-
-    if (( $allvariables->{'64BITPRODUCT'} ) && ( $allvariables->{'64BITPRODUCT'} == 1 ))
-    { 
-        # 1. Beginning with table "RegLocat.idt". Adding "16" to the type.
-
-        my $reglocatfile = "";
-        my $reglocatfilename = $basedir . $installer::globals::separator . "RegLocat.idt";
-    
-        if ( -f $reglocatfilename )
-        {
-            my $saving_required = 0;
-            $reglocatfile = installer::files::read_file($reglocatfilename);
-
-            for ( my $i = 3; $i <= $#{$reglocatfile}; $i++ ) 	# ignoring the first three lines
-            {		
-                my $oneline = ${$reglocatfile}[$i];
-
-                if ( $oneline =~ /^\s*\#/ ) { next; }	# this is a comment line
-                if ( $oneline =~ /^\s*$/ ) { next; }
-                
-                if ( $oneline =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(\d+)\s*$/ )
-                {
-                    # Syntax: Signature_ Root Key Name Type
-                    my $sig = $1;
-                    my $root = $2;
-                    my $key = $3;
-                    my $name = $4;
-                    my $type = $5;
-                    
-                    $type = $type + 16;
-                    
-                    my $newline = $sig . "\t" . $root . "\t" . $key . "\t" . $name . "\t" . $type . "\n";
-                    ${$reglocatfile}[$i] = $newline;
-                    
-                    $saving_required = 1;
-                }
-            }
-            
-            if ( $saving_required )
-            {
-                # Saving the files
-                installer::files::save_file($reglocatfilename ,$reglocatfile);
-                $infoline = "Making idt file 64 bit conform: $reglocatfilename\n"; 
-                push(@installer::globals::logfileinfo, $infoline);
-            }
-        }
-        
-        # 2. Replacing all occurences of "VersionNT" by "VersionNT64"
-        
-        my @versionnt_files = ("Componen.idt", "InstallE.idt", "InstallU.idt", "LaunchCo.idt");
-        
-        foreach my $onefile ( @versionnt_files )
-        {
-            my $fullfilename = $basedir . $installer::globals::separator . $onefile;
-            
-            if ( -f $fullfilename )
-            {
-                my $saving_required = 0;
-                $filecontent = installer::files::read_file($fullfilename);		
-
-                for ( my $i = 3; $i <= $#{$filecontent}; $i++ ) 	# ignoring the first three lines
-                {
-                    my $oneline = ${$filecontent}[$i];
-                    
-                    if ( $oneline =~ /\bVersionNT\b/ )
-                    {
-                        ${$filecontent}[$i] =~ s/\bVersionNT\b/VersionNT64/g;
-                        $saving_required = 1;
-                    }			
-                }
-            
-                if ( $saving_required )
-                {
-                    # Saving the files
-                    installer::files::save_file($fullfilename ,$filecontent);
-                    $infoline = "Making idt file 64 bit conform: $fullfilename\n"; 
-                    push(@installer::globals::logfileinfo, $infoline);			
-                }
-            }
-        }
-    }
-
-}
-
-#################################################################
-# Include all cab files into the msi database.
-# This works only on Windows
-#################################################################
-
-sub include_cabs_into_msi
-{
-    my ($installdir) = @_;
-
-    installer::logger::include_header_into_logfile("Including cabs into msi database");
-
-    my $from = cwd();
-    my $to = $installdir;
-
-    chdir($to);
-
-    my $infoline = "Changing into directory: $to";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $msidb = "msidb.exe";	# Has to be in the path
-    my $extraslash = "";		# Has to be set for non-ActiveState perl
-
-    my $msifilename = $installer::globals::msidatabasename;
-
-    $msifilename = installer::converter::make_path_conform($msifilename);
-
-    # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-    $msifilename =~ s/\//\\\\/g;
-    $extraslash = "\\";
-
-    my $allcabfiles = installer::systemactions::find_file_with_file_extension("cab", $installdir);
-
-    for ( my $i = 0; $i <= $#{$allcabfiles}; $i++ )
-    {
-        my $systemcall = $msidb . " -d " . $msifilename . " -a " . ${$allcabfiles}[$i];
-
-        my $returnvalue = system($systemcall);
-
-        $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        
-        if ($returnvalue)
-        {
-            $infoline = "ERROR: Could not execute $systemcall !\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        else
-        {
-            $infoline = "Success: Executed $systemcall successfully!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        
-        # deleting the cab file
-
-        unlink(${$allcabfiles}[$i]);
-
-        $infoline = "Deleted cab file: ${$allcabfiles}[$i]\n";
-        push( @installer::globals::logfileinfo, $infoline);		
-    }
-
-    $infoline = "Changing back into directory: $from";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    chdir($from);
-}
-
-#################################################################
-# Executing the created batch file to pack all files.
-# This works only on Windows
-#################################################################
-
-sub execute_packaging
-{
-    my ($localpackjobref, $loggingdir, $allvariables) = @_;
-
-    installer::logger::include_header_into_logfile("Packaging process");
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: Execute packaging start");
-
-    my $infoline = "";
-    my $from = cwd();
-    my $to = $loggingdir;
-
-    chdir($to);
-    $infoline = "chdir: $to \n";
-    push( @installer::globals::logfileinfo, $infoline);	
-
-    # if the ddf file contains relative pathes, it is necessary to change into the temp directory
-    if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} )
-    {
-        $to = $installer::globals::temppath;
-        chdir($to);
-        $infoline = "chdir: $to \n";
-        push( @installer::globals::logfileinfo, $infoline);	
-    }
-
-    # changing the tmp directory, because makecab.exe generates temporary cab files
-    my $origtemppath = "";
-    if ( $ENV{'TMP'} ) { $origtemppath = $ENV{'TMP'}; }
-    $ENV{'TMP'} = $installer::globals::temppath;	# setting TMP to the new unique directory!
-
-    my $maxmakecabcalls = 3;
-    my $allmakecabcalls = $#{$localpackjobref} + 1;
-
-    for ( my $i = 0; $i <= $#{$localpackjobref}; $i++ )
-    {	
-        my $systemcall = ${$localpackjobref}[$i];
-        
-        my $callscounter = $i + 1;
-        
-        installer::logger::print_message( "... makecab.exe ($callscounter/$allmakecabcalls) ... \n" );
-
-        for ( my $n = 1; $n <= $maxmakecabcalls; $n++ )
-        {			
-            my @ddfoutput = ();
-
-            $infoline = "Systemcall: $systemcall";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            open (DDF, "$systemcall");
-            while (<DDF>) {push(@ddfoutput, $_); }
-            close (DDF);
-
-            my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-            if ($returnvalue)
-            {
-                if ( $n < $maxmakecabcalls )
-                {
-                    installer::logger::print_message( "makecab_error (Try $n): Trying again \n" );
-                    $infoline = "makecab_error (Try $n): $systemcall !";
-                }
-                else
-                {
-                    installer::logger::print_message( "ERROR (Try $n): Abort packing \n" );
-                    $infoline = "ERROR (Try $n): $systemcall !";
-                }
-
-                push( @installer::globals::logfileinfo, $infoline);
-
-                for ( my $m = 0; $m <= $#ddfoutput; $m++ )
-                {
-                    if ( $ddfoutput[$m] =~ /(ERROR\:.*?)\s*$/ )
-                    {
-                        $infoline = $1 . "\n";
-                        if ( $n < $maxmakecabcalls ) { $infoline =~ s/ERROR\:/makecab_error\:/i; }
-                        installer::logger::print_message( $infoline );
-                        push( @installer::globals::logfileinfo, $infoline);
-                    }
-                }
-                
-                if ( $n == $maxmakecabcalls ) { installer::exiter::exit_program("ERROR: \"$systemcall\"!", "execute_packaging"); }
-            }
-            else
-            {
-                $infoline = "Success (Try $n): $systemcall";
-                push( @installer::globals::logfileinfo, $infoline);
-                last;
-            }
-        }
-    }
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: Execute packaging end");
-
-    # setting back to the original tmp directory
-    $ENV{'TMP'} = $origtemppath;
-
-    chdir($from);
-    $infoline = "chdir: $from \n";
-    push( @installer::globals::logfileinfo, $infoline);	
-}
-
-###############################################################
-# Setting the global variables ProductCode and the UpgradeCode
-###############################################################
-
-sub set_global_code_variables
-{
-    my ( $languagesref, $languagestringref, $allvariableshashref, $alloldproperties ) = @_;
-
-    # In the msi template directory a files "codes.txt" has to exist, in which the ProductCode
-    # and the UpgradeCode for the product are defined.
-    # The name "codes.txt" can be overwritten in Product definition with CODEFILENAME . 
-    # Default $installer::globals::codefilename is defined in parameter.pm.
-        
-    if ( $allvariableshashref->{'CODEFILENAME'} )
-    {
-        $installer::globals::codefilename = $installer::globals::idttemplatepath  . $installer::globals::separator . $allvariableshashref->{'CODEFILENAME'};
-        installer::files::check_file($installer::globals::codefilename);
-    } 
-
-    my $infoline = "Using Codes file: $installer::globals::codefilename \n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $codefile = installer::files::read_file($installer::globals::codefilename);
-
-    my $isopensource = 0;
-    if ( $allvariableshashref->{'OPENSOURCE'} ) { $isopensource = $allvariableshashref->{'OPENSOURCE'}; } 
-
-    my $onelanguage = "";
-     
-    if ( $#{$languagesref} > 0 )	# more than one language
-    {
-        if (( $installer::globals::added_english ) && ( $#{$languagesref} == 1 )) # only multilingual because of added English
-        {
-            $onelanguage = ${$languagesref}[1];  # setting the first language, that is not english
-        }
-        else
-        {
-            if (( ${$languagesref}[1] =~ /jp/ ) ||
-                ( ${$languagesref}[1] =~ /ko/ ) ||
-                ( ${$languagesref}[1] =~ /zh/ ))
-            {
-                $onelanguage = "multiasia";
-            }
-            else
-            {
-                $onelanguage = "multiwestern";
-            }
-        }
-    }
-    else	# only one language
-    {
-        $onelanguage = ${$languagesref}[0];
-    }
-
-    # ProductCode must not change, if Windows patches shall be applied
-    if ( $installer::globals::updatedatabase )
-    {
-        $installer::globals::productcode = $alloldproperties->{'ProductCode'};
-    }
-    elsif ( $installer::globals::prepare_winpatch )
-    {	
-        # ProductCode has to be specified in each language
-        my $searchstring = "PRODUCTCODE";
-        my $codeblock = installer::windows::idtglobal::get_language_block_from_language_file($searchstring, $codefile);
-        $installer::globals::productcode = installer::windows::idtglobal::get_code_from_code_block($codeblock, $onelanguage);
-    } else {
-        my $guidref = get_guid_list(1, 1);	# only one GUID shall be generated
-        ${$guidref}[0] =~ s/\s*$//;		# removing ending spaces
-        $installer::globals::productcode = "\{" . ${$guidref}[0] . "\}";
-    }
-
-    if ( $installer::globals::patch ) # patch upgrade codes are defined in soffice.lst
-    {
-        if ( $allvariableshashref->{'PATCHUPGRADECODE'} ) { $installer::globals::upgradecode = $allvariableshashref->{'PATCHUPGRADECODE'}; }
-        else { installer::exiter::exit_program("ERROR: PATCHUPGRADECODE not defined in list file!", "set_global_code_variables"); }
-    }
-    else
-    { 
-        # UpgradeCode can take english as default, if not defined in specified language
-
-        $searchstring = "UPGRADECODE";	# searching in the codes.txt file
-        $codeblock = installer::windows::idtglobal::get_language_block_from_language_file($searchstring, $codefile);
-        $installer::globals::upgradecode = installer::windows::idtglobal::get_language_string_from_language_block($codeblock, $onelanguage, "");
-    }
-    
-    if ( $installer::globals::upgradecode eq "" ) { installer::exiter::exit_program("ERROR: UpgradeCode not defined in $installer::globals::codefilename !", "set_global_code_variables"); }	
-
-    $infoline = "Setting ProductCode to: $installer::globals::productcode \n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "Setting UpgradeCode to: $installer::globals::upgradecode \n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # Adding both variables into the variables array 
-
-    $allvariableshashref->{'PRODUCTCODE'} = $installer::globals::productcode;
-    $allvariableshashref->{'UPGRADECODE'} = $installer::globals::upgradecode;
-
-    $infoline = "Defined variable PRODUCTCODE: $installer::globals::productcode \n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    $infoline = "Defined variable UPGRADECODE: $installer::globals::upgradecode \n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-}
-
-###############################################################
-# Setting the product version used in property table and
-# upgrade table. Saving in global variable $msiproductversion
-###############################################################
-
-sub set_msiproductversion
-{
-    my ( $allvariables ) = @_;
-
-    my $productversion = $allvariables->{'PRODUCTVERSION'};
-
-    if (( $productversion =~ /^\s*\d+\s*$/ ) && ( $productversion > 255 )) { $productversion = $productversion%256; }
-
-    if ( $productversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ )
-    {
-        $productversion = $1 . "\." . $2 . $3 . "\." . $installer::globals::buildid;		
-    }
-    elsif  ( $productversion =~ /^\s*(\d+)\.(\d+)\s*$/ )
-    {
-        $productversion = $1 . "\." . $2 . "\." . $installer::globals::buildid;	
-    }
-    else
-    {
-        my $productminor = "00";
-        if (( $allvariables->{'PACKAGEVERSION'} ) && ( $allvariables->{'PACKAGEVERSION'} ne "" ))
-        {
-            if ( $allvariables->{'PACKAGEVERSION'} =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ ) { $productminor = $2; }
-        }
-                
-        $productversion = $productversion . "\." . $productminor . "\." . $installer::globals::buildid;	
-    }
-    
-    $installer::globals::msiproductversion = $productversion;
-    
-    # Setting $installer::globals::msimajorproductversion, to differ between old version in upgrade table
-    
-    if ( $installer::globals::msiproductversion =~ /^\s*(\d+)\./ )
-    {
-        my $major = $1;
-        $installer::globals::msimajorproductversion = $major . "\.0\.0";
-    }
-}
-
-#################################################################################
-# Including the msi product version into the bootstrap.ini, Windows only
-#################################################################################
-
-sub put_msiproductversion_into_bootstrapfile
-{
-    my ($filesref) = @_;
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-
-        if ( $onefile->{'gid'} eq "gid_Profile_Version_Ini" )
-        {
-            my $file = installer::files::read_file($onefile->{'sourcepath'});
-
-            for ( my $j = 0; $j <= $#{$file}; $j++ )
-            {
-                ${$file}[$j] =~ s/\<msiproductversion\>/$installer::globals::msiproductversion/;
-            }
-
-            installer::files::save_file($onefile->{'sourcepath'}, $file);
-
-            last;
-        }
-    }
-}
-
-####################################################################################
-# Updating the file Property.idt dynamically
-# Content: 
-# Property Value
-####################################################################################
-
-sub update_reglocat_table
-{
-    my ($basedir, $allvariables) = @_;
-
-    my $reglocatfilename = $basedir . $installer::globals::separator . "RegLocat.idt";
-    
-    # Only do something, if this file exists
-    
-    if ( -f $reglocatfilename )
-    {
-        my $reglocatfile = installer::files::read_file($reglocatfilename);
-        
-        my $layername = "";
-        if ( $allvariables->{'REGISTRYLAYERNAME'} )
-        {
-            $layername = $allvariables->{'REGISTRYLAYERNAME'};
-        }
-        else
-        {
-            for ( my $i = 0; $i <= $#{$reglocatfile}; $i++ )
-            {
-                if ( ${$reglocatfile}[$i] =~ /\bLAYERNAMETEMPLATE\b/ )
-                {
-                    installer::exiter::exit_program("ERROR: Variable \"REGISTRYLAYERNAME\" has to be defined", "update_reglocat_table");
-                }
-            }
-        } 
-
-        if ( $layername ne "" )
-        {
-            # Updating the layername in 
-
-            for ( my $i = 0; $i <= $#{$reglocatfile}; $i++ )
-            {
-                ${$reglocatfile}[$i] =~ s/\bLAYERNAMETEMPLATE\b/$layername/;
-            }
-
-            # Saving the file
-            installer::files::save_file($reglocatfilename ,$reglocatfile);
-            my $infoline = "Updated idt file: $reglocatfilename\n"; 
-            push(@installer::globals::logfileinfo, $infoline);
-        }
-    }
-}
-
-
-
-####################################################################################
-# Updating the file RemoveRe.idt dynamically (RemoveRegistry.idt)
-# The name of the component has to be replaced.
-####################################################################################
-
-sub update_removere_table
-{
-    my ($basedir) = @_;
-
-    my $removeregistryfilename = $basedir . $installer::globals::separator . "RemoveRe.idt";
-    
-    # Only do something, if this file exists
-    
-    if ( -f $removeregistryfilename )
-    {
-        my $removeregistryfile = installer::files::read_file($removeregistryfilename);
-
-        for ( my $i = 0; $i <= $#{$removeregistryfile}; $i++ )
-        {
-            for ( my $i = 0; $i <= $#{$removeregistryfile}; $i++ )
-            {
-                ${$removeregistryfile}[$i] =~ s/\bREGISTRYROOTCOMPONENT\b/$installer::globals::registryrootcomponent/;
-            }
-        }
-
-        # Saving the file
-        installer::files::save_file($removeregistryfilename ,$removeregistryfile);
-        my $infoline = "Updated idt file: $removeregistryfilename \n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-}
-
-##########################################################################
-# Reading saved mappings in Files.idt and Director.idt.
-# This is required, if installation sets shall be created,
-# that can be used for creation of msp files.
-##########################################################################
-
-sub read_saved_mappings
-{
-    installer::logger::include_header_into_logfile("Reading saved mappings from older installation sets:");
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: Reading saved mappings start");
-    
-    if ( $installer::globals::previous_idt_dir )
-    {
-        my @errorlines = ();
-        my $errorstring = "";
-        my $error_occurred = 0;
-        my $file_error_occurred = 0;
-        my $dir_error = 0;
-        
-        my $idtdir = $installer::globals::previous_idt_dir;
-        $idtdir =~ s/\Q$installer::globals::separator\E\s*$//;
-
-        # Reading File.idt
-
-        my $idtfile = $idtdir . $installer::globals::separator . "File.idt";
-        push( @installer::globals::globallogfileinfo, "\nAnalyzing file: $idtfile\n" );
-        if ( ! -f $idtfile ) { push( @installer::globals::globallogfileinfo, "Warning: File $idtfile does not exist!\n" ); }
-        
-        my $n = 0;
-        open (F, "<$idtfile") || installer::exiter::exit_program("ERROR: Cannot open file $idtfile for reading", "read_saved_mappings");
-        <F>; <F>; <F>;
-        while (<F>)
-        {
-            m/^([^\t]+)\t([^\t]+)\t((.*)\|)?([^\t]*)/;
-            print "OUT1: \$1: $1, \$2: $2, \$3: $3, \$4: $4, \$5: $5\n";
-            next if ("$1" eq "$5") && (!defined($3));
-            my $lc1 = lc($1);
-            
-            if ( exists($installer::globals::savedmapping{"$2/$5"}))
-            {
-                if ( ! $file_error_occurred )
-                {
-                    $errorstring = "\nErrors in $idtfile: \n";
-                    push(@errorlines, $errorstring);
-                }
-                $errorstring = "Duplicate savedmapping{" . "$2/$5}\n";
-                push(@errorlines, $errorstring);
-                $error_occurred = 1;
-                $file_error_occurred = 1;
-            }
-            
-            if ( exists($installer::globals::savedrevmapping{$lc1}))
-            {
-                if ( ! $file_error_occurred )
-                {
-                    $errorstring = "\nErrors in $idtfile: \n";
-                    push(@errorlines, $errorstring);
-                }
-                $errorstring = "Duplicate savedrevmapping{" . "$lc1}\n";
-                push(@errorlines, $errorstring);
-                $error_occurred = 1;
-                $file_error_occurred = 1;
-            }
-            
-            my $shortname = $4 || '';
-
-            # Don't reuse illegal 8.3 mappings that we used to generate in 2.0.4
-            if (index($shortname, '.') > 8 ||
-                (index($shortname, '.') == -1 && length($shortname) > 8))
-            {
-                $shortname = '';
-            }
-
-            if (( $shortname ne '' ) && ( index($shortname, '~') > 0 ) && ( exists($installer::globals::savedrev83mapping{$shortname}) ))
-            {
-                if ( ! $file_error_occurred )
-                {
-                    $errorstring = "\nErrors in $idtfile: \n";
-                    push(@errorlines, $errorstring);
-                }
-                $errorstring = "Duplicate savedrev83mapping{" . "$shortname}\n";
-                push(@errorlines, $errorstring);
-                $error_occurred = 1;
-                $file_error_occurred = 1;
-            }
-
-            $installer::globals::savedmapping{"$2/$5"} = "$1;$shortname";
-            $installer::globals::savedrevmapping{lc($1)} = "$2/$5";
-            $installer::globals::savedrev83mapping{$shortname} = "$2/$5" if $shortname ne '';
-            $n++;
-        }
-
-        close (F);
-
-        push( @installer::globals::globallogfileinfo, "Read $n old file table key or 8.3 name mappings from $idtfile\n" );
-
-        # Reading Director.idt
-        
-        $idtfile = $idtdir . $installer::globals::separator . "Director.idt";
-        push( @installer::globals::globallogfileinfo, "\nAnalyzing file $idtfile\n" );
-        if ( ! -f $idtfile ) { push( @installer::globals::globallogfileinfo, "Warning: File $idtfile does not exist!\n" ); }
-
-        $n = 0;
-        open (F, "<$idtfile") || installer::exiter::exit_program("ERROR: Cannot open file $idtfile for reading", "read_saved_mappings");
-        <F>; <F>; <F>;
-        while (<F>)
-        {
-            m/^([^\t]+)\t([^\t]+)\t(([^~]+~\d.*)\|)?([^\t]*)/;
-            next if (!defined($3));
-            my $lc1 = lc($1);
-
-            print "OUT2: \$1: $1, \$2: $2, \$3: $3\n";
-
-            if ( exists($installer::globals::saved83dirmapping{$1}) )
-            {
-                if ( ! $dir_error_occurred )
-                {
-                    $errorstring = "\nErrors in $idtfile: \n";
-                    push(@errorlines, $errorstring);
-                }
-                $errorstring = "Duplicate saved83dirmapping{" . "$1}\n";
-                push(@errorlines, $errorstring);
-                $error_occurred = 1;
-                $dir_error_occurred = 1;
-            }
-
-            $installer::globals::saved83dirmapping{$1} = $4;
-            $n++;
-        }
-        close (F);
-
-        push( @installer::globals::globallogfileinfo, "Read $n old directory 8.3 name mappings from $idtfile\n" );
-
-        # Analyzing errors
-        
-        if ( $error_occurred )
-        {
-            for ( my $i = 0; $i <= $#errorlines; $i++ )
-            {
-                print "$errorlines[$i]";
-                push( @installer::globals::globallogfileinfo, "$errorlines[$i]");
-            }
-            installer::exiter::exit_program("ERROR: Duplicate entries in saved mappings!", "read_saved_mappings");			
-        }
-    } else {
-        installer::exiter::exit_program("ERROR: Windows patch shall be prepared, but environment variable PREVIOUS_IDT_DIR is not set!", "read_saved_mappings");			
-    }
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: Reading saved mappings end");
-}
-
-1;
-
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
deleted file mode 100644
index e394596b5..000000000
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ /dev/null
@@ -1,1483 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::msp;
-
-use File::Copy;
-use installer::control;
-use installer::converter;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::systemactions;
-use installer::windows::admin;
-use installer::windows::idtglobal;
-use installer::windows::update;
-
-#################################################################################
-# Making all required administrative installations
-#################################################################################
-
-sub install_installation_sets
-{
-    my ($installationdir) = @_;
-
-    # Finding the msi database in the new installation set, that is located in $installationdir
-    
-    my $msifiles = installer::systemactions::find_file_with_file_extension("msi", $installationdir);
-    
-    if ( $#{$msifiles} < 0 ) { installer::exiter::exit_program("ERROR: Did not find msi database in directory $installationdir", "create_msp_patch"); }
-    if ( $#{$msifiles} > 0 ) { installer::exiter::exit_program("ERROR: Did find more than one msi database in directory $installationdir", "create_msp_patch"); }
-
-    my $newinstallsetdatabasepath = $installationdir . $installer::globals::separator . ${$msifiles}[0];
-    my $oldinstallsetdatabasepath = $installer::globals::updatedatabasepath;
-
-    # Creating temp directory again
-    installer::systemactions::create_directory_structure($installer::globals::temppath);
-
-    # Creating old installation directory
-    my $dirname = "admin";
-    my $installpath = $installer::globals::temppath . $installer::globals::separator . $dirname;
-    if ( ! -d $installpath) { installer::systemactions::create_directory($installpath); }
-
-    my $oldinstallpath = $installpath . $installer::globals::separator . "old";
-    my $newinstallpath = $installpath . $installer::globals::separator . "new";
-
-    if ( ! -d $oldinstallpath) { installer::systemactions::create_directory($oldinstallpath); }
-    if ( ! -d $newinstallpath) { installer::systemactions::create_directory($newinstallpath); }
-    
-    my $olddatabase = installer::windows::admin::make_admin_install($oldinstallsetdatabasepath, $oldinstallpath);
-    my $newdatabase = installer::windows::admin::make_admin_install($newinstallsetdatabasepath, $newinstallpath);
-
-    if ( $^O =~ /cygwin/i ) {
-        $olddatabase = qx{cygpath -w "$olddatabase"};
-        $olddatabase =~ s/\s*$//g;
-        $newdatabase = qx{cygpath -w "$newdatabase"};
-        $newdatabase =~ s/\s*$//g;
-    }
-    
-    return ($olddatabase, $newdatabase);
-}
-
-#################################################################################
-# Collecting the destinations of all files with flag PATCH in a hash.
-#################################################################################
-
-sub collect_patch_file_destinations
-{
-    my ( $filesarray ) = @_;
-
-    my %patchfiledestinations = ();
-    my %nopatchfiledestinations = ();
-    my $patchcounter = 0;
-    my $nopatchcounter = 0;
-
-    for ( my $i = 0; $i <= $#{$filesarray}; $i++ )
-    {
-        my $onefile = ${$filesarray}[$i];
-        my $styles = "";
-
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'} };
-
-        if ( $styles =~ /\bPATCH\b/ )
-        {
-            $patchfiledestinations{$onefile->{'destination'}} = 1;
-            $patchcounter++;
-        }
-        else
-        {
-            $nopatchfiledestinations{$onefile->{'destination'}} = 1;
-            $nopatchcounter++;
-        }
-    }
-
-    return (\%patchfiledestinations, \%nopatchfiledestinations, $patchcounter, $nopatchcounter);
-}
-
-#################################################################################
-# Returning the first path segment of a path
-#################################################################################
-
-sub get_first_path_segment
-{
-    my ( $path ) = @_;
-
-    my $firstsegment = "";
-    my $remainder = $path;
-
-    if ( $path =~ /^\s*(.*?)[\/\\](.*)\s*$/ )
-    {
-        $firstsegment = $1;
-        $remainder = $2;
-    }
-
-    return ($firstsegment, $remainder);
-}
-
-#################################################################################
-# Finding the flexible path in the destinations, that are saved in
-# the hash $nopatchfiledestinations.
-#################################################################################
-
-sub prepare_path_in_nopatchfilehash
-{
-    my ($nopatchfiledestinations, $newpath) = @_;
-
-    my $infoline = "";
-    my $flexiblepath = "";
-    my $found = 0;
-    my %checked_destinations = ();
-
-    foreach my $onedestination ( keys %{$nopatchfiledestinations} )
-    {
-        $flexiblepath = "";
-        $found = 0;
-
-        my $found_first_segement = 1;
-        my $firstsegement = "";
-        my $fixedpath = $onedestination;
-        my $testfile = $newpath . $installer::globals::separator . $fixedpath;
-
-        while (( ! -f $testfile ) && ( $found_first_segement ))
-        {
-            $firstsegement = "";
-            ( $firstsegement, $fixedpath ) = get_first_path_segment($fixedpath);
-
-            if ( $firstsegement ne "" )
-            {
-                $found_first_segement = 1;
-                $flexiblepath = $flexiblepath . $firstsegement . $installer::globals::separator;
-            }
-            else
-            {
-                $found_first_segement = 0;
-            }
-
-            $testfile = $newpath . $installer::globals::separator . $fixedpath;
-        }
-
-        if ( -f $testfile ) { $found = 1; }
-
-        if ( $found ) { last; }
-    }
-
-    if ( ! $found ) { installer::exiter::exit_program("ERROR: Could not determine flexible destination path for msp patch creation!", "prepare_path_in_nopatchfilehash"); }
-
-    $infoline = "Setting flexible path for msp creation: $flexiblepath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    foreach my $onedestination ( keys %{$nopatchfiledestinations} )
-    {
-        $onedestination =~ s/^\s*\Q$flexiblepath\E//;
-        $checked_destinations{$onedestination} = 1;
-    }
-
-    return \%checked_destinations;
-}
-
-#################################################################################
-# Synchronizing the two installed products in that way, that only
-# files with flag PATCH are different.
-#################################################################################
-
-sub synchronize_installation_sets
-{
-    my ($olddatabase, $newdatabase, $filesarray) = @_;
-
-    my $infoline = "\nSynchronizing installed products because of PATCH flag\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "Old product: $olddatabase\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    $infoline = "New product: $newdatabase\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my ( $patchfiledestinations, $nopatchfiledestinations, $patchfilecounter, $nopatchfilecounter ) = collect_patch_file_destinations($filesarray);
-
-    $infoline = "Number of files with PATCH flag: $patchfilecounter\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    $infoline = "Number of files without PATCH flag: $nopatchfilecounter\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    foreach my $localfile ( sort keys %{$patchfiledestinations} )
-    {
-        $infoline = "\tPATCH file: $localfile\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    my $oldpath = $olddatabase;
-    if ( $^O =~ /cygwin/i ) { $oldpath =~ s/\\/\//g; }
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$oldpath);
-    $oldpath =~ s/\\\s*$//;
-    $oldpath =~ s/\/\s*$//;
-
-    my $newpath = $newdatabase;
-    if ( $^O =~ /cygwin/i ) { $newpath =~ s/\\/\//g; }
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$newpath);
-    $newpath =~ s/\\\s*$//;
-    $newpath =~ s/\/\s*$//;
-
-    # The destination path is not correct. destinations in the hash contain
-    # the flexible installation path, that is not part in the administrative installation
-    $nopatchfiledestinations = prepare_path_in_nopatchfilehash($nopatchfiledestinations, $newpath);
-
-    foreach my $onedestination ( keys %{$nopatchfiledestinations} )
-    {
-        my $source = $oldpath . $installer::globals::separator . $onedestination;
-        my $dest = $newpath . $installer::globals::separator . $onedestination;
-
-        if ( -f $source )
-        {
-            if ( -f $dest )
-            {
-                my $copyreturn = copy($source, $dest);
-                # installer::systemactions::copy_one_file($source, $dest);
-                # $infoline = "Synchronizing file: $source to $dest\n";
-                # push( @installer::globals::logfileinfo, $infoline);
-            }
-            else
-            {
-                $infoline = "Not synchronizing. Destination file \"$dest\" does not exist.\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
-        }
-        else
-        {
-            $infoline = "Not synchronizing. Source file \"$source\" does not exist.\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-}
-
-#################################################################################
-# Extracting all tables from a pcp file
-#################################################################################
-
-sub extract_all_tables_from_pcpfile
-{
-    my ($fullpcpfilepath, $workdir) = @_;
-
-    my $msidb = "msidb.exe";	# Has to be in the path
-    my $infoline = "";
-    my $systemcall = "";
-    my $returnvalue = "";
-    my $extraslash = "";		# Has to be set for non-ActiveState perl
-
-    my $localfullpcpfile = $fullpcpfilepath;
-    my $localworkdir = $workdir;
-
-    if ( $^O =~ /cygwin/i ) {
-        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-        $localfullpcpfile =~ s/\//\\\\/g;
-        $localworkdir =~ s/\//\\\\/g;
-        $extraslash = "\\";
-    }
-
-    # Export of all tables by using "*"
-                            
-    $systemcall = $msidb . " -d " . $localfullpcpfile . " -f " . $localworkdir . " -e " . $extraslash . "*";
-    $returnvalue = system($systemcall);
-
-    $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute $systemcall !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        installer::exiter::exit_program("ERROR: Could not exclude tables from pcp file: $fullpcpfilepath !", "extract_all_tables_from_msidatabase");
-    }
-    else
-    {
-        $infoline = "Success: Executed $systemcall successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-#################################################################################
-# Include tables into a pcp file
-#################################################################################
-
-sub include_tables_into_pcpfile
-{
-    my ($fullpcpfilepath, $workdir, $tables) = @_;
-
-    my $msidb = "msidb.exe";	# Has to be in the path
-    my $infoline = "";
-    my $systemcall = "";
-    my $returnvalue = "";
-
-    # Make all table 8+3 conform
-    my $alltables = installer::converter::convert_stringlist_into_array(\$tables, " ");
-    
-    for ( my $i = 0; $i <= $#{$alltables}; $i++ )
-    {
-        my $tablename = ${$alltables}[$i];
-        $tablename =~ s/\s*$//;
-        my $namelength = length($tablename);
-        if ( $namelength > 8 )
-        {
-            my $newtablename = substr($tablename, 0, 8);	# name, offset, length
-            my $oldfile = $workdir . $installer::globals::separator . $tablename . ".idt";
-            my $newfile = $workdir . $installer::globals::separator . $newtablename . ".idt";
-            if ( -f $newfile ) { unlink $newfile; }
-            installer::systemactions::copy_one_file($oldfile, $newfile);
-        }
-    }
-
-    # Import of tables
-
-    my $localworkdir = $workdir;
-    my $localfullpcpfilepath = $fullpcpfilepath;
-
-    if ( $^O =~ /cygwin/i ) {
-        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-        $localfullpcpfilepath =~ s/\//\\\\/g;
-        $localworkdir =~ s/\//\\\\/g;
-    }
-
-    $systemcall = $msidb . " -d " . $localfullpcpfilepath . " -f " . $localworkdir . " -i " . $tables;
-                            
-    $returnvalue = system($systemcall);
-
-    $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute $systemcall !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        installer::exiter::exit_program("ERROR: Could not include tables into pcp file: $fullpcpfilepath !", "include_tables_into_pcpfile");
-    }
-    else
-    {
-        $infoline = "Success: Executed $systemcall successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-#################################################################################
-# Calling msimsp.exe
-#################################################################################
-
-sub execute_msimsp
-{
-    my ($fullpcpfilename, $mspfilename, $localmspdir) = @_;
-
-    my $msimsp = "msimsp.exe";	# Has to be in the path
-    my $infoline = "";
-    my $systemcall = "";
-    my $returnvalue = "";
-    my $logfilename = $localmspdir . $installer::globals::separator . "msimsp.log";
-
-    # Using a specific temp for each msimsp.exe process
-    # Creating temp directory again (should already have happened)
-    installer::systemactions::create_directory_structure($installer::globals::temppath);
-
-    # Creating old installation directory
-    my $dirname = "msimsptemp";
-    my $msimsptemppath = $installer::globals::temppath . $installer::globals::separator . $dirname;
-    if ( ! -d $msimsptemppath) { installer::systemactions::create_directory($msimsptemppath); }
-
-    # r:\msvc9p\PlatformSDK\v6.1\bin\msimsp.exe -s c:\patch\hotfix_qfe1.pcp -p c:\patch\patch_ooo3_m2_m3.msp -l c:\patch\patch_ooo3_m2_m3.log
-
-    if ( -f $logfilename ) { unlink $logfilename; }
-
-    my $localfullpcpfilename = $fullpcpfilename;
-    my $localmspfilename = $mspfilename;
-    my $locallogfilename = $logfilename;
-    my $localmsimsptemppath = $msimsptemppath;
-
-    if ( $^O =~ /cygwin/i ) {
-        # msimsp.exe really wants backslashes. (And double escaping because system() expands the string.)
-        $localfullpcpfilename =~ s/\//\\\\/g;
-        $locallogfilename =~ s/\//\\\\/g;
-
-        $localmspfilename =~ s/\\/\\\\/g; # path already contains backslash
-
-        $localmsimsptemppath = qx{cygpath -w "$localmsimsptemppath"};
-        $localmsimsptemppath =~ s/\\/\\\\/g;
-        $localmsimsptemppath =~ s/\s*$//g;
-    }
-
-    $systemcall = $msimsp . " -s " . $localfullpcpfilename . " -p " . $localmspfilename . " -l " . $locallogfilename . " -f " . $localmsimsptemppath;
-    installer::logger::print_message( "... $systemcall ...\n" );
-                            
-    $returnvalue = system($systemcall);
-
-    $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute $systemcall !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        installer::exiter::exit_program("ERROR: Could not execute $systemcall !", "execute_msimsp");
-    }
-    else
-    {
-        $infoline = "Success: Executed $systemcall successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    return $logfilename;
-}
-
-####################################################################
-# Checking existence and saving all tables, that need to be edited
-####################################################################
-
-sub check_and_save_tables
-{
-    my ($tablelist, $workdir) = @_;
-    
-    my $tables = installer::converter::convert_stringlist_into_array(\$tablelist, " ");
-    
-    for ( my $i = 0; $i <= $#{$tables}; $i++ )
-    {
-        my $filename = ${$tables}[$i];
-        $filename =~ s/\s*$//;
-        my $fullfilename = $workdir . $installer::globals::separator . $filename . ".idt";
-        
-        if ( ! -f $fullfilename ) { installer::exiter::exit_program("ERROR: Required idt file could not be found: \"$fullfilename\"!", "check_and_save_tables"); }
-
-        my $savfilename = $fullfilename . ".sav";
-        installer::systemactions::copy_one_file($fullfilename, $savfilename);		
-    }
-}
-
-####################################################################
-# Setting the languages for the service packs
-####################################################################
-
-sub create_langstring
-{
-    my ( $languagesarrayref ) = @_;
-    
-    my $langstring = "";
-    for ( my $i = 0; $i <= $#{$languagesarrayref}; $i++ ) { $langstring = $langstring . "_" . ${$languagesarrayref}[$i]; }
-
-    return $langstring;
-}
-
-####################################################################
-# Setting the name of the msp database
-####################################################################
-
-sub set_mspfilename
-{
-    my ($allvariables, $mspdir, $languagesarrayref) = @_;
-
-    my $databasename = $allvariables->{'PRODUCTNAME'};
-    $databasename = lc($databasename);
-    $databasename =~ s/\.//g;
-    $databasename =~ s/\-//g;
-    $databasename =~ s/\s//g;
-
-    if ( $allvariables->{'MSPPRODUCTVERSION'} ) { $databasename = $databasename . $allvariables->{'MSPPRODUCTVERSION'}; }
-
-    # possibility to overwrite the name with variable DATABASENAME
-    # if ( $allvariables->{'DATABASENAME'} ) { $databasename = $allvariables->{'DATABASENAME'}; }
-
-    # Adding patch info to database name
-    # if ( $installer::globals::buildid ) { $databasename = $databasename . "_" . $installer::globals::buildid; }
-
-    # if ( $allvariables->{'VENDORPATCHVERSION'} ) { $databasename = $databasename . "_" . $allvariables->{'VENDORPATCHVERSION'}; }
-
-
-    if (( $allvariables->{'SERVICEPACK'} ) && ( $allvariables->{'SERVICEPACK'} == 1 ))
-    {
-        my $windowspatchlevel = 0;
-        if ( $allvariables->{'MSPPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'MSPPATCHLEVEL'}; }
-        $databasename = $databasename . "_servicepack_" . $windowspatchlevel;
-        my $languagestring = create_langstring($languagesarrayref);
-        $databasename = $databasename . $languagestring;
-    }
-    else
-    {
-        my $hotfixaddon = "hotfix_";
-        $hotfixaddon = $hotfixaddon . $installer::globals::buildid;
-        my $cwsname = "";
-        if ( $allvariables->{'OVERWRITE_CWSNAME'} ) { $hotfixaddon = $allvariables->{'OVERWRITE_CWSNAME'}; }
-        $databasename = $databasename . "_" . $hotfixaddon;
-    }
-
-    $databasename = $databasename . ".msp";
-    
-    my $fullmspname = $mspdir . $installer::globals::separator . $databasename;
-
-    if ( $^O =~ /cygwin/i ) { $fullmspname =~ s/\//\\/g; }
-    
-    return $fullmspname;
-}
-
-####################################################################
-# Editing table Properties
-####################################################################
-
-sub change_properties_table
-{
-    my ($localmspdir, $mspfilename) = @_;
-
-    my $infoline = "Changing content of table \"Properties\"\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $filename = $localmspdir . $installer::globals::separator . "Properties.idt";
-    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" !", "change_properties_table"); }
-
-    my $filecontent = installer::files::read_file($filename);
-
-
-    my $guidref = installer::windows::msiglobal::get_guid_list(1, 1);
-    ${$guidref}[0] =~ s/\s*$//;		# removing ending spaces
-    my $patchcode = "\{" . ${$guidref}[0] . "\}";
-
-    # Setting "PatchOutputPath"
-    my $found_patchoutputpath = 0;
-    my $found_patchguid = 0;
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( ${$filecontent}[$i] =~ /^\s*PatchOutputPath\t(.*?)\s*$/ )
-        {
-            my $oldvalue = $1;
-            ${$filecontent}[$i] =~ s/\Q$oldvalue\E/$mspfilename/;
-            $found_patchoutputpath = 1;
-        }
-
-        if ( ${$filecontent}[$i] =~ /^\s*PatchGUID\t(.*?)\s*$/ )
-        {
-            my $oldvalue = $1;
-            ${$filecontent}[$i] =~ s/\Q$oldvalue\E/$patchcode/;
-            $found_patchguid = 1;
-        }
-    }
-    
-    if ( ! $found_patchoutputpath )
-    {
-        my $newline = "PatchOutputPath\t$mspfilename\n";
-        push(@{$filecontent}, $newline);
-    }
-
-    if ( ! $found_patchguid )
-    {
-        my $newline = "PatchGUID\t$patchcode\n";
-        push(@{$filecontent}, $newline);
-    }
-    
-    # saving file
-    installer::files::save_file($filename, $filecontent);
-}
-
-####################################################################
-# Editing table TargetImages
-####################################################################
-
-sub change_targetimages_table
-{
-    my ($localmspdir, $olddatabase) = @_;
-
-    my $infoline = "Changing content of table \"TargetImages\"\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $filename = $localmspdir . $installer::globals::separator . "TargetImages.idt";
-    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" !", "change_targetimages_table"); }
-
-    my $filecontent = installer::files::read_file($filename);
-    my @newcontent = ();
-    
-    # Copying the header
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ ) { if ( $i < 3 ) { push(@newcontent, ${$filecontent}[$i]); } }
-    
-    #Adding all targets
-    my $newline = "T1\t$olddatabase\t\tU1\t1\t0x00000922\t1\n";
-    push(@newcontent, $newline);
-    
-    # saving file
-    installer::files::save_file($filename, \@newcontent);
-}
-
-####################################################################
-# Editing table UpgradedImages
-####################################################################
-
-sub change_upgradedimages_table
-{
-    my ($localmspdir, $newdatabase) = @_;
-
-    my $infoline = "Changing content of table \"UpgradedImages\"\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $filename = $localmspdir . $installer::globals::separator . "UpgradedImages.idt";
-    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" !", "change_upgradedimages_table"); }
-
-    my $filecontent = installer::files::read_file($filename);
-    my @newcontent = ();
-    
-    # Copying the header
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ ) { if ( $i < 3 ) { push(@newcontent, ${$filecontent}[$i]); } }
-
-    # Syntax: Upgraded MsiPath PatchMsiPath SymbolPaths Family
-
-    # default values
-    my $upgraded = "U1";
-    my $msipath = $newdatabase;
-    my $patchmsipath = "";
-    my $symbolpaths = "";
-    my $family = "22334455";
-
-    if ( $#{$filecontent} >= 3 )
-    {
-        my $line = ${$filecontent}[3];
-        if ( $line =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            $upgraded = $1;
-            $patchmsipath = $3;
-            $symbolpaths = $4;
-            $family = $5;
-        }
-    }
-
-    #Adding sequence line, saving PatchFamily
-    my $newline = "$upgraded\t$msipath\t$patchmsipath\t$symbolpaths\t$family\n";
-    push(@newcontent, $newline);
-
-    # saving file
-    installer::files::save_file($filename, \@newcontent);
-}
-
-####################################################################
-# Editing table ImageFamilies
-####################################################################
-
-sub change_imagefamilies_table
-{
-    my ($localmspdir) = @_;
-
-    my $infoline = "Changing content of table \"ImageFamilies\"\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $filename = $localmspdir . $installer::globals::separator . "ImageFamilies.idt";
-    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" !", "change_imagefamilies_table"); }
-
-    my $filecontent = installer::files::read_file($filename);
-    my @newcontent = ();
-
-    # Copying the header
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ ) { if ( $i < 3 ) { push(@newcontent, ${$filecontent}[$i]); } }
-
-    # Syntax: Family MediaSrcPropName MediaDiskId FileSequenceStart DiskPrompt VolumeLabel
-    # "FileSequenceStart has to be set
-
-    # Default values:
-    
-    my $family = "22334455";
-    my $mediasrcpropname = "MediaSrcPropName";
-    my $mediadiskid = "2";
-    my $filesequencestart = get_filesequencestart();
-    my $diskprompt = "";
-    my $volumelabel = "";
-    
-    if ( $#{$filecontent} >= 3 )
-    {
-        my $line = ${$filecontent}[3];
-        if ( $line =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            $family = $1;
-            $mediasrcpropname = $2;
-            $mediadiskid = $3;
-            $diskprompt = $5;
-            $volumelabel = $6;
-        }
-    }
-
-    #Adding sequence line
-    my $newline = "$family\t$mediasrcpropname\t$mediadiskid\t$filesequencestart\t$diskprompt\t$volumelabel\n";
-    push(@newcontent, $newline);
-
-    # saving file
-    installer::files::save_file($filename, \@newcontent);	
-}
-
-####################################################################
-# Setting start sequence for patch
-####################################################################
-
-sub get_filesequencestart
-{
-    my $sequence = 1000;  # default
-    
-    if ( $installer::globals::updatelastsequence ) { $sequence = $installer::globals::updatelastsequence + 500; }
-    
-    return $sequence;
-}
-
-####################################################################
-# Setting time value into pcp file
-# Format mm/dd/yyyy hh:mm
-####################################################################
-
-sub get_patchtime_value
-{
-    # Syntax: 8/8/2008 11:55
-    my $minute = (localtime())[1];
-    my $hour = (localtime())[2];
-    my $day = (localtime())[3];
-    my $month = (localtime())[4];
-    my $year = 1900 + (localtime())[5];
-
-    $month++; # zero based month
-    if ( $minute  < 10 ) { $minute = "0" . $minute; }
-    if ( $hour  < 10 ) { $hour = "0" . $hour; }
-    
-    my $timestring = $month . "/" . $day . "/" . $year . " " . $hour . ":" . $minute;
-
-    return $timestring;	
-}
-
-#################################################################################
-# Checking, if this is the correct database.
-#################################################################################
-
-sub correct_langs
-{
-    my ($langs, $languagestringref) = @_;
-    
-    my $correct_langs = 0;
-    
-    # Comparing $langs with $languagestringref
-
-    my $langlisthash = installer::converter::convert_stringlist_into_hash(\$langs, ",");
-    my $langstringhash = installer::converter::convert_stringlist_into_hash($languagestringref, "_");
-        
-    my $not_included = 0;
-    foreach my $onelang ( keys %{$langlisthash} )
-    {
-        if ( ! exists($langstringhash->{$onelang}) )
-        {
-            $not_included = 1;
-            last;
-        }	
-    }
-
-    if ( ! $not_included )
-    {
-        foreach my $onelanguage ( keys %{$langstringhash} )
-        {
-            if ( ! exists($langlisthash->{$onelanguage}) )
-            {
-                $not_included = 1;
-                last;
-            }	
-        }
-    
-        if ( ! $not_included ) { $correct_langs = 1; }			
-    }
-    
-    return $correct_langs;
-}
-
-#################################################################################
-# Searching for the path to the reference database for this special product.
-#################################################################################
-
-sub get_patchid_from_list
-{
-    my ($filecontent, $languagestringref, $filename) = @_;
-
-    my $patchid = "";
-    
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        my $line = ${$filecontent}[$i];
-        if ( $line =~ /^\s*$/ ) { next; } # empty line
-        if ( $line =~ /^\s*\#/ ) { next; } # comment line
-
-        if ( $line =~ /^\s*(.+?)\s*=\s*(.+?)\s*$/ )
-        {
-            my $langs = $1;
-            my $localpatchid = $2;
-
-            if ( correct_langs($langs, $languagestringref) )
-            {
-                $patchid = $localpatchid;
-                last;	
-            }
-        }
-        else
-        {
-            installer::exiter::exit_program("ERROR: Wrong syntax in file: $filename! Line: \"$line\"", "get_patchid_from_list");
-        }
-    }
-
-    return $patchid;
-}
-
-####################################################################
-# Editing table PatchMetadata
-####################################################################
-    
-sub change_patchmetadata_table
-{
-    my ($localmspdir, $allvariables, $languagestringref) = @_;
-    
-    my $infoline = "Changing content of table \"PatchMetadata\"\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $filename = $localmspdir . $installer::globals::separator . "PatchMetadata.idt";
-    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" !", "change_patchmetadata_table"); }
-
-    my $filecontent = installer::files::read_file($filename);
-    my @newcontent = ();
-
-    # Syntax: Company Property Value
-    # Interesting properties: "Classification" and "CreationTimeUTC"
-    
-    my $classification_set = 0;
-    my $creationtime_set = 0;
-    my $targetproductname_set = 0;
-    my $manufacturer_set = 0;
-    my $displayname_set = 0;
-    my $description_set = 0;
-    my $allowremoval_set = 0;
-    
-    my $defaultcompany = "";
-
-    my $classificationstring = "Classification";
-    my $classificationvalue = "Hotfix";
-    if (( $allvariables->{'SERVICEPACK'} ) && ( $allvariables->{'SERVICEPACK'} == 1 )) { $classificationvalue = "ServicePack"; }
-
-    my $allowremovalstring = "AllowRemoval";
-    my $allowremovalvalue = "1";
-    if (( exists($allvariables->{'MSPALLOWREMOVAL'}) ) && ( $allvariables->{'MSPALLOWREMOVAL'} == 0 )) { $allowremovalvalue = 0; }
-
-    my $timestring = "CreationTimeUTC";
-    # Syntax: 8/8/2008 11:55
-    my $timevalue = get_patchtime_value();
-
-    my $targetproductnamestring = "TargetProductName";
-    my $targetproductnamevalue = $allvariables->{'PRODUCTNAME'};
-    if ( $allvariables->{'PROPERTYTABLEPRODUCTNAME'} ) { $targetproductnamevalue = $allvariables->{'PROPERTYTABLEPRODUCTNAME'}; }
-
-    my $manufacturerstring = "ManufacturerName";
-    my $manufacturervalue = "LibreOffice";
-    if ( $installer::globals::longmanufacturer ) { $manufacturervalue = $installer::globals::longmanufacturer; }
-
-    my $displaynamestring = "DisplayName";
-    my $descriptionstring = "Description";
-    my $displaynamevalue = "";
-    my $descriptionvalue = "";
-
-    my $base = $allvariables->{'PRODUCTNAME'} . " " . $allvariables->{'PRODUCTVERSION'};
-    if ( $installer::globals::languagepack || $installer::globals::helppack ) { $base = $targetproductnamevalue; }
-    
-    my $windowspatchlevel = 0;
-    if ( $allvariables->{'WINDOWSPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'WINDOWSPATCHLEVEL'}; }
-
-    my $displayaddon = "";
-    if ( $allvariables->{'PATCHDISPLAYADDON'} ) { $displayaddon = $allvariables->{'PATCHDISPLAYADDON'}; }
-
-    my $patchsequence = get_patchsequence($allvariables);
-
-    if (( $allvariables->{'SERVICEPACK'} ) && ( $allvariables->{'SERVICEPACK'} == 1 ))
-    {
-        $displaynamevalue = $base . " ServicePack " . $windowspatchlevel . " " . $patchsequence . " Build: " . $installer::globals::buildid;
-        $descriptionvalue = $base . " ServicePack " . $windowspatchlevel . " " . $patchsequence . " Build: " . $installer::globals::buildid;
-    }
-    else
-    {
-        $displaynamevalue = $base . " Hotfix " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid;
-        $descriptionvalue = $base . " Hotfix " . $displayaddon . " " . $patchsequence . " Build: " . $installer::globals::buildid;	
-        $displaynamevalue =~ s/    / /g;	
-        $descriptionvalue =~ s/    / /g;	
-        $displaynamevalue =~ s/   / /g;	
-        $descriptionvalue =~ s/   / /g;	
-        $displaynamevalue =~ s/  / /g;	
-        $descriptionvalue =~ s/  / /g;	
-    }
-
-    if ( $allvariables->{'MSPPATCHNAMELIST'} )
-    {
-        my $patchnamelistfile = $allvariables->{'MSPPATCHNAMELIST'};
-        $patchnamelistfile = $installer::globals::idttemplatepath  . $installer::globals::separator . $patchnamelistfile;
-        if ( ! -f $patchnamelistfile ) { installer::exiter::exit_program("ERROR: Could not find file \"$patchnamelistfile\".", "change_patchmetadata_table"); }
-        my $filecontent = installer::files::read_file($patchnamelistfile);
-
-        # Get name and path of reference database	
-        my $patchid = get_patchid_from_list($filecontent, $languagestringref, $patchnamelistfile);
-        
-        if ( $patchid eq "" ) { installer::exiter::exit_program("ERROR: Could not find file patchid in file \"$patchnamelistfile\" for language(s) \"$$languagestringref\".", "change_patchmetadata_table"); }
-
-        # Setting language specific patch id
-    }	
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my $company = $1;
-            my $property = $2;
-            my $value = $3;
-            
-            if ( $property eq $classificationstring )
-            {
-                ${$filecontent}[$i] = "$company\t$property\t$classificationvalue\n";
-                $classification_set = 1;
-            }
-            
-            if ( $property eq $allowremovalstring )
-            {
-                ${$filecontent}[$i] = "$company\t$property\t$allowremovalvalue\n";
-                $allowremoval_set = 1;
-            }
-
-            if ( $property eq $timestring )
-            {
-                ${$filecontent}[$i] = "$company\t$property\t$timevalue\n";
-                $creationtime_set = 1;
-            }
-
-            if ( $property eq $targetproductnamestring )
-            {
-                ${$filecontent}[$i] = "$company\t$property\t$targetproductnamevalue\n";
-                $targetproductname_set = 1;
-            }
-
-            if ( $property eq $manufacturerstring )
-            {
-                ${$filecontent}[$i] = "$company\t$property\t$manufacturervalue\n";
-                $manufacturer_set = 1;
-            }
-
-            if ( $property eq $displaynamestring )
-            {
-                ${$filecontent}[$i] = "$company\t$property\t$displaynamevalue\n";
-                $displayname_set = 1;
-            }
-
-            if ( $property eq $descriptionstring )
-            {
-                ${$filecontent}[$i] = "$company\t$property\t$descriptionvalue\n";
-                $description_set = 1;
-            }
-        }
-
-        push(@newcontent, ${$filecontent}[$i]);
-    }
-
-    if ( ! $classification_set )
-    {
-        my $line = "$defaultcompany\t$classificationstring\t$classificationvalue\n";	
-        push(@newcontent, $line);
-    }
-
-    if ( ! $allowremoval_set )
-    {
-        my $line = "$defaultcompany\t$classificationstring\t$allowremovalvalue\n";	
-        push(@newcontent, $line);
-    }
-
-    if ( ! $allowremoval_set )
-    {
-        my $line = "$defaultcompany\t$classificationstring\t$allowremovalvalue\n";	
-        push(@newcontent, $line);
-    }
-
-    if ( ! $creationtime_set )
-    {
-        my $line = "$defaultcompany\t$timestring\t$timevalue\n";	
-        push(@newcontent, $line);
-    }
-
-    if ( ! $targetproductname_set )
-    {
-        my $line = "$defaultcompany\t$targetproductnamestring\t$targetproductnamevalue\n";	
-        push(@newcontent, $line);
-    }
-    
-    if ( ! $manufacturer_set )
-    {
-        my $line = "$defaultcompany\t$manufacturerstring\t$manufacturervalue\n";	
-        push(@newcontent, $line);
-    }
-
-    if ( ! $displayname_set )
-    {
-        my $line = "$defaultcompany\t$displaynamestring\t$displaynamevalue\n";	
-        push(@newcontent, $line);
-    }
-
-    if ( ! $description_set )
-    {
-        my $line = "$defaultcompany\t$descriptionstring\t$descriptionvalue\n";	
-        push(@newcontent, $line);
-    }
-
-    # saving file
-    installer::files::save_file($filename, \@newcontent);
-}
-
-####################################################################
-# Editing table PatchSequence
-####################################################################
-    
-sub change_patchsequence_table
-{
-    my ($localmspdir, $allvariables) = @_;
-    
-    my $infoline = "Changing content of table \"PatchSequence\"\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $filename = $localmspdir . $installer::globals::separator . "PatchSequence.idt";
-    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" !", "change_patchsequence_table"); }
-
-    my $filecontent = installer::files::read_file($filename);
-    my @newcontent = ();
-
-    # Copying the header
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ ) { if ( $i < 3 ) { push(@newcontent, ${$filecontent}[$i]); } }
-    
-    # Syntax: PatchFamily Target Sequence Supersede
-
-    my $patchfamily = "SO";
-    my $target = "";
-    my $patchsequence = get_patchsequence($allvariables);
-    my $supersede = get_supersede($allvariables);
-    
-    if ( $#{$filecontent} >= 3 )
-    {
-        my $line = ${$filecontent}[3];
-        if ( $line =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\s$/ )
-        {
-            $patchfamily = $1;
-            $target = $2;
-        }
-    }
-
-    #Adding sequence line, saving PatchFamily
-    my $newline = "$patchfamily\t$target\t$patchsequence\t$supersede\n";
-    push(@newcontent, $newline);
-
-    # saving file
-    installer::files::save_file($filename, \@newcontent);
-}	
-
-####################################################################
-# Setting supersede, "0" for Hotfixes, "1" for ServicePack
-####################################################################
-
-sub get_supersede
-{
-    my ( $allvariables ) = @_;
-    
-    my $supersede = 0;	# if not defined, this is a Hotfix
-    
-    if (( $allvariables->{'SERVICEPACK'} ) && ( $allvariables->{'SERVICEPACK'} == 1 )) { $supersede = 1; }
-    
-    return $supersede;
-}
-
-####################################################################
-# Setting the sequence of the patch
-####################################################################
-
-sub get_patchsequence
-{
-    my ( $allvariables ) = @_;
-    
-    my $patchsequence = "1.0";
-
-    if ( ! $allvariables->{'PACKAGEVERSION'} ) { installer::exiter::exit_program("ERROR: PACKAGEVERSION must be set for msp patch creation!", "get_patchsequence"); } 
-
-    my $packageversion = $allvariables->{'PACKAGEVERSION'};
-
-    if ( $packageversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ )
-    {
-        my $major = $1;
-        my $minor = $2;
-        my $micro = $3;
-        my $concat = 100 * $minor + $micro;
-        $packageversion = $major . "\." . $concat;
-    }
-    my $vendornumber = 0;
-    if ( $allvariables->{'VENDORPATCHVERSION'} ) { $vendornumber = $allvariables->{'VENDORPATCHVERSION'}; }
-    $patchsequence = $packageversion . "\." . $installer::globals::buildid . "\." . $vendornumber;
-
-    if ( $allvariables->{'PATCHSEQUENCE'} ) { $patchsequence = $allvariables->{'PATCHSEQUENCE'}; }
-    
-    return $patchsequence;
-}
-
-####################################################################
-# Editing all tables from pcp file, that need to be edited
-####################################################################
-
-sub edit_tables
-{
-    my ($tablelist, $localmspdir, $olddatabase, $newdatabase, $mspfilename, $allvariables, $languagestringref) = @_;
-
-    # table list contains: 	my $tablelist = "Properties TargetImages UpgradedImages ImageFamilies PatchMetadata PatchSequence";
-
-    change_properties_table($localmspdir, $mspfilename);
-    change_targetimages_table($localmspdir, $olddatabase);
-    change_upgradedimages_table($localmspdir, $newdatabase);	
-    change_imagefamilies_table($localmspdir);	
-    change_patchmetadata_table($localmspdir, $allvariables, $languagestringref);	
-    change_patchsequence_table($localmspdir, $allvariables);	
-}
-
-#################################################################################
-# Checking, if this is the correct database.
-#################################################################################
-
-sub correct_patch
-{
-    my ($product, $pro, $langs, $languagestringref) = @_;
-    
-    my $correct_patch = 0;
-    
-    # Comparing $product with $installer::globals::product and
-    # $pro with $installer::globals::pro and
-    # $langs with $languagestringref
-
-    my $product_is_good = 0;
-    
-    my $localproduct = $installer::globals::product;
-    if ( $installer::globals::languagepack ) { $localproduct = $localproduct . "LanguagePack"; }
-    elsif ( $installer::globals::helppack ) { $localproduct = $localproduct . "HelpPack"; }
-
-    if ( $product eq $localproduct ) { $product_is_good = 1; }
-    
-    if ( $product_is_good )
-    {
-        my $pro_is_good = 0;
-
-        if ((( $pro eq "pro" ) && ( $installer::globals::pro )) || (( $pro eq "nonpro" ) && ( ! $installer::globals::pro ))) { $pro_is_good = 1; }
-
-        if ( $pro_is_good )
-        {
-            my $langlisthash = installer::converter::convert_stringlist_into_hash(\$langs, ",");
-            my $langstringhash = installer::converter::convert_stringlist_into_hash($languagestringref, "_");
-        
-            my $not_included = 0;
-            foreach my $onelang ( keys %{$langlisthash} )
-            {
-                if ( ! exists($langstringhash->{$onelang}) )
-                {
-                    $not_included = 1;
-                    last;
-                }	
-            }
-        
-            if ( ! $not_included )
-            {
-                foreach my $onelanguage ( keys %{$langstringhash} )
-                {
-                    if ( ! exists($langlisthash->{$onelanguage}) )
-                    {
-                        $not_included = 1;
-                        last;
-                    }	
-                }
-            
-                if ( ! $not_included ) { $correct_patch = 1; }			
-            }
-        }
-    }
-    
-    return $correct_patch;
-}
-
-#################################################################################
-# Searching for the path to the required patch for this special product.
-#################################################################################
-
-sub get_requiredpatchfile_from_list
-{
-    my ($filecontent, $languagestringref, $filename) = @_;
-
-    my $patchpath = "";
-    
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        my $line = ${$filecontent}[$i];
-        if ( $line =~ /^\s*$/ ) { next; } # empty line
-        if ( $line =~ /^\s*\#/ ) { next; } # comment line
-
-        if ( $line =~ /^\s*(.+?)\s*\t+\s*(.+?)\s*\t+\s*(.+?)\s*\t+\s*(.+?)\s*$/ )
-        {
-            my $product = $1;
-            my $pro = $2;
-            my $langs = $3;
-            my $path = $4;
-            
-            if (( $pro ne "pro" ) && ( $pro ne "nonpro" )) { installer::exiter::exit_program("ERROR: Wrong syntax in file: $filename. Only \"pro\" or \"nonpro\" allowed in column 1! Line: \"$line\"", "get_databasename_from_list"); }
-
-            if ( correct_patch($product, $pro, $langs, $languagestringref) )
-            {
-                $patchpath = $path;
-                last;	
-            }
-        }
-        else
-        {
-            installer::exiter::exit_program("ERROR: Wrong syntax in file: $filename! Line: \"$line\"", "get_requiredpatchfile_from_list");
-        }
-    }
-
-    return $patchpath;
-}
-
-##################################################################
-# Converting unicode file to ascii 
-# to be more precise: uft-16 little endian to ascii
-##################################################################
-
-sub convert_unicode_to_ascii
-{
-    my ( $filename ) = @_;
-
-    my @localfile = ();
-
-    my $savfilename = $filename . "_before.unicode";
-    installer::systemactions::copy_one_file($filename, $savfilename);
-
-    open( IN, "<:encoding(UTF16-LE)", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_unicode_to_ascii");
-    while ( $line = <IN> ) {
-        push @localfile, $line;
-    }
-    close( IN );
-
-    if ( open( OUT, ">", $filename ) )
-    {
-        print OUT @localfile;
-        close(OUT);	
-    }
-}
-
-####################################################################
-# Analyzing the log file created by msimsp.exe to find all
-# files included into the patch.
-####################################################################
-
-sub analyze_msimsp_logfile
-{
-    my ($logfile, $filesarray) = @_;
-
-    # Reading log file after converting from utf-16 (LE) to ascii
-    convert_unicode_to_ascii($logfile);
-    my $logfilecontent = installer::files::read_file($logfile);
-    
-    # Creating hash from $filesarray: unique file name -> destination of file
-    my %filehash = ();
-    my %destinationcollector = ();
-
-    for ( my $i = 0; $i <= $#{$filesarray}; $i++ )
-    {
-        my $onefile = ${$filesarray}[$i];
-
-        # Only collecting files with "uniquename" and "destination"
-        if (( exists($onefile->{'uniquename'}) ) && ( exists($onefile->{'uniquename'}) ))
-        {
-            my $uniquefilename = $onefile->{'uniquename'};
-            my $destpath = $onefile->{'destination'};
-            $filehash{$uniquefilename} = $destpath;
-        }
-    }
-
-    # Analyzing log file of msimsp.exe, finding all changed files
-    # and searching all destinations of unique file names.
-    # Content in log file: "INFO File Key: <file key> is modified"
-    # Collecting content in @installer::globals::patchfilecollector
-    
-    for ( my $i = 0; $i <= $#{$logfilecontent}; $i++ )
-    {
-        if ( ${$logfilecontent}[$i] =~ /Key\:\s*(.*?) is modified\s*$/ )
-        {
-            my $filekey = $1;
-            if ( exists($filehash{$filekey}) ) { $destinationcollector{$filehash{$filekey}} = 1; }
-            else { installer::exiter::exit_program("ERROR: Could not find file key \"$filekey\" in file collector.", "analyze_msimsp_logfile"); }
-        }
-    }
-
-    foreach my $onedest ( sort keys %destinationcollector ) { push(@installer::globals::patchfilecollector, "$onedest\n"); }	
-
-}
-
-####################################################################
-# Creating msp patch files for Windows
-####################################################################
-
-sub create_msp_patch
-{
-    my ($installationdir, $includepatharrayref, $allvariables, $languagestringref, $languagesarrayref, $filesarray) = @_;
-
-    my $force = 1; # print this message even in 'quiet' mode
-    installer::logger::print_message( "\n******************************************\n" );
-    installer::logger::print_message( "... creating msp installation set ...\n", $force );
-    installer::logger::print_message( "******************************************\n" );
-
-    $installer::globals::creating_windows_installer_patch = 1;
-
-    my @needed_files = ("msimsp.exe");	# only required for patch creation process
-    installer::control::check_needed_files_in_path(\@needed_files);
-
-    installer::logger::include_header_into_logfile("Creating msp installation sets:");
-
-    my $firstdir = $installationdir;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$firstdir);
-    
-    my $lastdir = $installationdir;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$lastdir);
-
-    if ( $lastdir =~ /\./ ) { $lastdir =~ s/\./_msp_inprogress\./ }
-    else { $lastdir = $lastdir . "_msp_inprogress"; }
-
-    # Removing existing directory "_native_packed_inprogress" and "_native_packed_witherror" and "_native_packed"
-
-    my $mspdir = $firstdir . $lastdir;
-    if ( -d $mspdir ) { installer::systemactions::remove_complete_directory($mspdir); }
-    
-    my $olddir = $mspdir;
-    $olddir =~ s/_inprogress/_witherror/;
-    if ( -d $olddir ) { installer::systemactions::remove_complete_directory($olddir); }
-
-    $olddir = $mspdir;
-    $olddir =~ s/_inprogress//;
-    if ( -d $olddir ) { installer::systemactions::remove_complete_directory($olddir); }
-
-    # Creating the new directory for new installation set
-    installer::systemactions::create_directory($mspdir);
-
-    $installer::globals::saveinstalldir = $mspdir;
-
-    installer::logger::include_timestamp_into_logfile("\nPerformance Info: Starting product installation");
-
-    # Installing both installation sets
-    installer::logger::print_message( "... installing products ...\n" );
-    my ($olddatabase, $newdatabase) = install_installation_sets($installationdir);
-
-    installer::logger::include_timestamp_into_logfile("\nPerformance Info: Starting synchronization of installation sets");
-
-    # Synchronizing installed products, allowing only different files with PATCH flag
-    installer::logger::print_message( "... synchronizing installation sets ...\n" );
-    synchronize_installation_sets($olddatabase, $newdatabase, $filesarray);
-
-    installer::logger::include_timestamp_into_logfile("\nPerformance Info: Starting pcp file creation");
-
-    # Create pcp file
-    installer::logger::print_message( "... creating pcp file ...\n" );
-
-    my $localmspdir = installer::systemactions::create_directories("msp", $languagestringref);
-    
-    if ( ! $allvariables->{'PCPFILENAME'} ) { installer::exiter::exit_program("ERROR: Property \"PCPFILENAME\" has to be defined.", "create_msp_patch"); }
-    my $pcpfilename = $allvariables->{'PCPFILENAME'};
-
-    if ( $installer::globals::languagepack ) { $pcpfilename =~ s/.pcp\s*$/languagepack.pcp/; }
-    elsif ( $installer::globals::helppack ) { $pcpfilename =~ s/.pcp\s*$/helppack.pcp/; }
-
-    # Searching the pcp file in the include pathes
-    my $fullpcpfilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$pcpfilename, $includepatharrayref, 1);
-    if ( $$fullpcpfilenameref eq "" ) { installer::exiter::exit_program("ERROR: pcp file not found: $pcpfilename !", "create_msp_patch"); }
-    my $fullpcpfilenamesource = $$fullpcpfilenameref;
-
-    # Copying pcp file
-    my $fullpcpfilename = $localmspdir . $installer::globals::separator . $pcpfilename;
-    installer::systemactions::copy_one_file($fullpcpfilenamesource, $fullpcpfilename);
-
-    #  a. Extracting tables from msi database: msidb.exe -d <msifile> -f <directory> -e File Media, ...
-    #  b. Changing content of msi database in tables: File, Media, Directory, FeatureComponent
-    #  c. Including tables into msi database: msidb.exe -d <msifile> -f <directory> -i File Media, ...
-
-    # Unpacking tables from pcp file
-    extract_all_tables_from_pcpfile($fullpcpfilename, $localmspdir);
-
-    # Tables, that need to be edited
-    my $tablelist = "Properties TargetImages UpgradedImages ImageFamilies PatchMetadata PatchSequence"; # required tables
-
-    # Saving all tables	
-    check_and_save_tables($tablelist, $localmspdir);
-
-    # Setting the name of the new msp file
-    my $mspfilename = set_mspfilename($allvariables, $mspdir, $languagesarrayref);
-
-    # Editing tables
-    edit_tables($tablelist, $localmspdir, $olddatabase, $newdatabase, $mspfilename, $allvariables, $languagestringref);
-    
-    # Adding edited tables into pcp file
-    include_tables_into_pcpfile($fullpcpfilename, $localmspdir, $tablelist);
-
-    # Start msimsp.exe
-    installer::logger::include_timestamp_into_logfile("\nPerformance Info: Starting msimsp.exe");
-    my $msimsplogfile = execute_msimsp($fullpcpfilename, $mspfilename, $localmspdir);
-
-    # Copy final installation set next to msp file
-    installer::logger::include_timestamp_into_logfile("\nPerformance Info: Copying installation set");
-    installer::logger::print_message( "... copying installation set ...\n" );
-
-    my $oldinstallationsetpath = $installer::globals::updatedatabasepath;
-
-    if ( $^O =~ /cygwin/i ) { $oldinstallationsetpath =~ s/\\/\//g; }
-
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$oldinstallationsetpath);
-    installer::systemactions::copy_complete_directory($oldinstallationsetpath, $mspdir);
-    
-    # Copying additional patches into the installation set, if required
-    if (( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ) && ( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ne "" ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
-    {
-        my $filename = $allvariables->{'ADDITIONALREQUIREDPATCHES'};
-
-        my $fullfilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
-        if ( $$fullfilenameref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file with required patches, although it is defined: $filename !", "create_msp_patch"); }
-        my $fullfilename = $$fullfilenameref;
-
-        # Reading list file
-        my $listfile = installer::files::read_file($fullfilename);
-
-        # Get name and path of reference database	
-        my $requiredpatchfile = get_requiredpatchfile_from_list($listfile, $languagestringref, $fullfilename);
-        if ( $requiredpatchfile eq "" ) { installer::exiter::exit_program("ERROR: Could not find path to required patch in file $fullfilename for language(s) $$languagestringref!", "create_msp_patch"); }
-        
-        # Copying patch file
-        installer::systemactions::copy_one_file($requiredpatchfile, $mspdir);		
-        # my $infoline = "Copy $requiredpatchfile to $mspdir\n";
-        # push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    # Find all files included into the patch
-    # Analyzing the msimsp log file $msimsplogfile 
-    analyze_msimsp_logfile($msimsplogfile, $filesarray);
-
-    # Done
-    installer::logger::include_timestamp_into_logfile("\nPerformance Info: msp creation done");
-    
-    return $mspdir;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/patch.pm b/solenv/bin/modules/installer/windows/patch.pm
deleted file mode 100644
index 783373dc1..000000000
--- a/solenv/bin/modules/installer/windows/patch.pm
+++ /dev/null
@@ -1,155 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::patch;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-####################################################################################
-# Creating the file Upgrade.idt dynamically
-# Content: 
-# UpgradeCode VersionMin VersionMax Language Attributes Remove ActionProperty
-####################################################################################
-
-sub update_patch_tables
-{
-    my ($basedir, $allvariables) = @_;
-
-    my $reglocatfile = "";
-    my $appsearchfile = "";
-
-    my $reglocatfilename = $basedir . $installer::globals::separator . "RegLocat.idt";
-    my $appsearchfilename = $basedir . $installer::globals::separator . "AppSearc.idt";
-    my $signaturefilename = $basedir . $installer::globals::separator . "Signatur.idt";
-    
-    if ( -f $reglocatfilename )
-    {
-        $reglocatfile = installer::files::read_file($reglocatfilename);
-    }
-    else
-    {
-        my @reglocattable = ();
-        $reglocatfile = \@reglocattable;
-        installer::windows::idtglobal::write_idt_header($reglocatfile, "reglocat");
-    }
-
-    if ( -f $appsearchfilename )
-    {
-        $appsearchfile = installer::files::read_file($appsearchfilename);
-    }
-    else
-    {
-        my @appsearchtable = ();
-        $appsearchfile = \@appsearchtable;
-        installer::windows::idtglobal::write_idt_header($appsearchfile, "appsearch");	
-    }
-
-    if ( -f $signaturefilename )
-    {
-        $signaturefile = installer::files::read_file($signaturefilename);
-    }
-    else
-    {
-        my @signaturetable = ();
-        $signaturefile = \@signaturetable;
-        installer::windows::idtglobal::write_idt_header($signaturefile, "signatur");	
-    }
-
-    # Writing content into this tables
-    
-    if ( ! $allvariables->{'PATCHCODEFILE'} ) { installer::exiter::exit_program("ERROR: Variable PATCHCODEFILE must be defined for Windows patches!", "update_patch_tables"); }
-    my $patchcodesfilename = $installer::globals::idttemplatepath  . $installer::globals::separator . $allvariables->{'PATCHCODEFILE'};
-    my $patchcodefile = installer::files::read_file($patchcodesfilename);
-
-    my $number = 0;
-
-    for ( my $i = 0; $i <= $#{$patchcodefile}; $i++ )
-    {		
-        my $oneline = ${$patchcodefile}[$i];
-
-        if ( $oneline =~ /^\s*\#/ ) { next; }	# this is a comment line
-        if ( $oneline =~ /^\s*$/ ) { next; }
-
-        my $code = "";
-        if ( $oneline =~ /^\s*(\S+)\s/ ) { $code = $1; }
-
-        foreach my $name ( sort keys %installer::globals::installlocations )
-        {
-            $number++;
-            my $signature = "dir" . $number . "user";
-            my $rootvalue = "1";
-            my $registryname = "";
-            my $registryversion = "";
-        
-            if ( $allvariables->{'SEARCHPRODUCTNAME'} ) { $registryname = $allvariables->{'SEARCHPRODUCTNAME'}; }
-            else { $registryname = $allvariables->{'PRODUCTNAME'}; }
-
-            if ( $allvariables->{'SEARCHPRODUCTVERSION'} ) { $registryversion = $allvariables->{'SEARCHPRODUCTVERSION'}; }
-            else { $registryversion = $allvariables->{'PRODUCTVERSION'}; }
-        
-            my $key = "Software\\" . $allvariables->{'MANUFACTURER'} . "\\" . $registryname . "\\" . $registryversion . "\\" . $code;
-
-            my $type = 2;
-            my $property = $name;
-        
-            $oneline = $signature . "\t" . $rootvalue . "\t" . $key . "\t" . $name . "\t" . $type . "\n";
-            push(@{$reglocatfile}, $oneline);
-        
-            $oneline = $property . "\t" . $signature . "\n";
-            push(@{$appsearchfile}, $oneline);
-
-            $signature = "dir" . $number . "mach";
-            $rootvalue = "2";
-
-            $oneline = $signature . "\t" . $rootvalue . "\t" . $key . "\t" . $name . "\t" . $type . "\n";
-            push(@{$reglocatfile}, $oneline);
-        
-            $oneline = $property . "\t" . $signature . "\n";
-            push(@{$appsearchfile}, $oneline);
-        }
-    }
-
-    # Saving the files
-    
-    installer::files::save_file($reglocatfilename ,$reglocatfile);
-    my $infoline = "Updated idt file: $reglocatfilename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-    installer::files::save_file($appsearchfilename ,$appsearchfile);
-    $infoline = "Updated idt file: $appsearchfilename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-    installer::files::save_file($signaturefilename ,$signaturefile);
-    $infoline = "Updated idt file: $signaturefilename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
deleted file mode 100644
index a13bf3e6a..000000000
--- a/solenv/bin/modules/installer/windows/property.pm
+++ /dev/null
@@ -1,677 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::property;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-use installer::windows::language;
-
-#############################################
-# Setting the properties dynamically
-# for the table Property.idt
-#############################################
-
-sub get_arpcomments_for_property_table
-{
-    my ( $allvariables, $languagestringref ) = @_;
-    
-    my $name = $allvariables->{'PRODUCTNAME'};
-    my $version = $allvariables->{'PRODUCTVERSION'};
-    my $comment = $name . " " . $version;
-
-    my $postversionextension = "";
-    if ( $allvariables->{'POSTVERSIONEXTENSION'} )
-    {
-        $postversionextension = $allvariables->{'POSTVERSIONEXTENSION'};
-        $comment = $comment . " " . $postversionextension;
-    }
-
-    if ( $installer::globals::languagepack ) { $comment = $comment . " " . "Language Pack"; }
-    elsif ( $installer::globals::helppack ) { $comment = $comment . " " . "Help Pack"; }
-
-    if ( $installer::globals::patch )
-    {
-        if ( ! $allvariables->{'WINDOWSPATCHLEVEL'} ) { installer::exiter::exit_program("ERROR: No Patch level defined for Windows patch: WINDOWSPATCHLEVEL", "get_arpcomments_for_property_table"); }
-        my $patchstring = "Product Update" . " " . $allvariables->{'WINDOWSPATCHLEVEL'};
-        $comment = $comment . " " . $patchstring;
-    }
-
-    my $languagestring = $$languagestringref;
-    $languagestring =~ s/\_/\,/g;
-
-    $comment = $comment . " ($languagestring)";
-
-    my $localminor = "";
-    if ( $installer::globals::updatepack ) { $localminor = $installer::globals::lastminor; }
-    else { $localminor = $installer::globals::minor; }
-    
-    my $buildidstring = "(" . $installer::globals::build . $localminor . "(Build:" . $installer::globals::buildid . "))";
-
-    $comment = $comment . " " . $buildidstring;
-    
-    return $comment;
-}
-
-sub get_installlevel_for_property_table
-{
-    my $installlevel = "100";
-    return $installlevel;
-}
-
-sub get_ischeckforproductupdates_for_property_table
-{
-    my $ischeckforproductupdates = "1";
-    return $ischeckforproductupdates;
-}
-
-sub get_manufacturer_for_property_table
-{
-    return $installer::globals::manufacturer;
-}
-
-sub get_productlanguage_for_property_table
-{
-    my ($language) = @_;
-    my $windowslanguage = installer::windows::language::get_windows_language($language);
-    return $windowslanguage;
-}
-
-sub get_language_string
-{
-    my $langstring = "";
-
-    for ( my $i = 0; $i <= $#installer::globals::languagenames; $i++ )
-    {
-        $langstring = $langstring . $installer::globals::languagenames[$i] . ", ";
-    }
-
-    $langstring =~ s/\,\s*$//;
-    $langstring = "(" . $langstring . ")";
-
-    return $langstring;
-}
-
-sub get_english_language_string
-{
-    my $langstring = "";
-    
-    # Sorting value not keys, therefore collecting all values
-    my %helper = ();
-    foreach my $lang ( keys %installer::globals::all_required_english_languagestrings )
-    {		
-        $helper{$installer::globals::all_required_english_languagestrings{$lang}} = 1;
-    }
-
-    foreach my $lang ( sort keys %helper )
-    {
-        $langstring = $langstring . $lang . ", ";
-    }
-
-    $langstring =~ s/\,\s*$//;
-    $langstring = "(" . $langstring . ")";
-
-    return $langstring;
-}
-
-sub get_productname($$)
-{
-    my ( $language, $allvariables ) = @_;
-
-    my $name = $allvariables->{'PRODUCTNAME'};
-
-    return $name;
-}
-
-sub get_productname_for_property_table($$)
-{
-    my ( $language, $allvariables ) = @_;
-
-    my $name = get_productname ($language, $allvariables);
-    my $version = $allvariables->{'PRODUCTVERSION'};
-    my $productname = $name . " " . $version;
-
-    my $postversionextension = "";
-    if ( $allvariables->{'POSTVERSIONEXTENSION'} )
-    {
-        $postversionextension = $allvariables->{'POSTVERSIONEXTENSION'};
-        $productname = $productname . " " . $postversionextension;
-    }
-
-    my $productextension = "";
-    if ( $allvariables->{'PRODUCTEXTENSION'} )
-    {
-        $productextension = $allvariables->{'PRODUCTEXTENSION'};
-        $productname = $productname . " " . $productextension;
-    }
-
-    if ( $installer::globals::languagepack )
-    {
-        my $langstring = get_english_language_string(); # Example: (English, German)
-        $productname = $name . " " . $version . " Language Pack" . " " . $langstring;
-    }
-    elsif ( $installer::globals::helppack )
-    {
-        my $langstring = get_english_language_string(); # New: (English, German)
-        $productname = $name . " " . $version . " Help Pack" . " " . $langstring;
-    }
-
-    if ( $installer::globals::patch )
-    {
-        if ( ! $allvariables->{'WINDOWSPATCHLEVEL'} ) { installer::exiter::exit_program("ERROR: No Patch level defined for Windows patch: WINDOWSPATCHLEVEL", "get_productname_for_property_table"); }
-        my $patchstring = "Product Update" . " " . $allvariables->{'WINDOWSPATCHLEVEL'};
-        $productname = $productname . " " . $patchstring;
-    }
-
-    # Saving this name in hash $allvariables for further usage
-    $allvariables->{'PROPERTYTABLEPRODUCTNAME'} = $productname;
-    my $infoline = "Defined variable PROPERTYTABLEPRODUCTNAME: $productname\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-    return $productname;
-}
-
-sub get_quickstarterlinkname_for_property_table($$)
-{
-    my ( $language, $allvariables ) = @_;
-
-    # no usage of POSTVERSIONEXTENSION for Quickstarter link name!
-    my $name = get_productname ($language, $allvariables);
-    my $version = $allvariables->{'PRODUCTVERSION'};
-    my $quickstartername = $name . " " . $version;
-
-    my $infoline = "Defined Quickstarter Link name: $quickstartername\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-    return $quickstartername;
-}
-
-sub get_productversion_for_property_table
-{
-    return $installer::globals::msiproductversion;
-}
-
-#######################################################
-# Setting all feature names as Properties. This is
-# required for the Windows patch process.
-#######################################################
-
-sub set_featurename_properties_for_patch
-{
-    ($propertyfile) = @_;
-    
-    for ( my $i = 0; $i <= $#installer::globals::featurecollector; $i++ )
-    {
-        my $onepropertyline =  $installer::globals::featurecollector[$i] . "\t" . "1" . "\n";
-        push(@{$propertyfile}, $onepropertyline);
-    }
-
-}
-
-#######################################################
-# Setting some important properties
-# (for finding the product in deinstallation process)
-#######################################################
-
-sub set_important_properties
-{
-    my ($propertyfile, $allvariables, $languagestringref) = @_;
-
-    # Setting new variables with the content of %PRODUCTNAME and %PRODUCTVERSION
-    if ( $allvariables->{'PRODUCTNAME'} )
-    {
-        my $onepropertyline =  "DEFINEDPRODUCT" . "\t" . $allvariables->{'PRODUCTNAME'} . "\n";
-        push(@{$propertyfile}, $onepropertyline);
-    }
-
-    if ( $allvariables->{'PRODUCTVERSION'} )
-    {
-        my $onepropertyline = "DEFINEDVERSION" . "\t" . $allvariables->{'PRODUCTVERSION'} . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-    
-    if (( $allvariables->{'PRODUCTNAME'} ) && ( $allvariables->{'PRODUCTVERSION'} ) && ( $allvariables->{'MANUFACTURER'} ) && ( $allvariables->{'PRODUCTCODE'} ))
-    {
-        my $onepropertyline = "FINDPRODUCT" . "\t" . "Software\\" . $allvariables->{'MANUFACTURER'} . "\\" . $allvariables->{'PRODUCTNAME'} . $allvariables->{'PRODUCTADDON'} . "\\" . $allvariables->{'PRODUCTVERSION'} . "\\" . $allvariables->{'PRODUCTCODE'} . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-    
-    if ( $allvariables->{'PRODUCTMAJOR'} )
-    {
-        my $onepropertyline = "PRODUCTMAJOR" . "\t" . $allvariables->{'PRODUCTMAJOR'} . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-    
-    if ( $allvariables->{'PRODUCTMINOR'} )
-    {
-        my $onepropertyline = "PRODUCTMINOR" . "\t" . $allvariables->{'PRODUCTMINOR'} . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-
-    if ( $allvariables->{'PRODUCTBUILDID'} )
-    {
-        my $onepropertyline = "PRODUCTBUILDID" . "\t" . $allvariables->{'PRODUCTBUILDID'} . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-
-    if ( $allvariables->{'OOOBASEVERSION'} )
-    {
-        my $onepropertyline = "OOOBASEVERSION" . "\t" . $allvariables->{'OOOBASEVERSION'} . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-
-    if ( $allvariables->{'URELAYERVERSION'} )
-    {
-        my $onepropertyline = "URELAYERVERSION" . "\t" . $allvariables->{'URELAYERVERSION'} . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-
-    if ( $allvariables->{'BRANDPACKAGEVERSION'} )
-    {
-        my $onepropertyline = "BRANDPACKAGEVERSION" . "\t" . $allvariables->{'BRANDPACKAGEVERSION'} . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-
-    if ( $allvariables->{'BASISROOTNAME'} )
-    {
-        my $onepropertyline = "BASISROOTNAME" . "\t" . $allvariables->{'BASISROOTNAME'} . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-
-    if ( $allvariables->{'EXCLUDE_FROM_REBASE'} )
-    {
-        my $onepropertyline =  "EXCLUDE_FROM_REBASE" . "\t" . $allvariables->{'EXCLUDE_FROM_REBASE'} . "\n";
-        push(@{$propertyfile}, $onepropertyline);
-    }
-
-    if ( $allvariables->{'PREREQUIREDPATCH'} )
-    {
-        my $onepropertyline = "PREREQUIREDPATCH" . "\t" . $allvariables->{'PREREQUIREDPATCH'} . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-
-    my $onepropertyline = "IGNOREPREREQUIREDPATCH" . "\t" . "1" . "\n";
-    push(@{$propertyfile}, $onepropertyline);	
-
-    $onepropertyline = "DONTOPTIMIZELIBS" . "\t" . "0" . "\n";
-    push(@{$propertyfile}, $onepropertyline);
-
-    if ( $installer::globals::sundirexists )
-    {
-        my $onepropertyline = "SUNDIREXISTS" . "\t" . "1" . "\n";
-        push(@{$propertyfile}, $onepropertyline);			
-    }
-
-    if ( $installer::globals::officedirhostname )
-    {
-        my $onepropertyline = "OFFICEDIRHOSTNAME" . "\t" . $installer::globals::officedirhostname . "\n";
-        push(@{$propertyfile}, $onepropertyline);
-        
-        my $localofficedirhostname = $installer::globals::officedirhostname;
-        $localofficedirhostname =~ s/\//\\/g;
-        $onepropertyline = "OFFICEDIRHOSTNAME_" . "\t" . $localofficedirhostname . "\n";
-        push(@{$propertyfile}, $onepropertyline);
-    }
-
-    if ( $installer::globals::sundirhostname )
-    {
-        my $onepropertyline = "SUNDIRHOSTNAME" . "\t" . $installer::globals::sundirhostname . "\n";
-        push(@{$propertyfile}, $onepropertyline);		
-    }
-        
-    if ( $installer::globals::desktoplinkexists )
-    {
-        my $onepropertyline = "DESKTOPLINKEXISTS" . "\t" . "1" . "\n";
-        push(@{$propertyfile}, $onepropertyline);		
-
-        $onepropertyline = "CREATEDESKTOPLINK" . "\t" . "1" . "\n";	# Setting the default
-        push(@{$propertyfile}, $onepropertyline);		
-    }
-
-    if ( $installer::globals::patch )
-    {
-        my $onepropertyline = "ISPATCH" . "\t" . "1" . "\n";
-        push(@{$propertyfile}, $onepropertyline);
-
-        $onepropertyline = "SETUP_USED" . "\t" . "0" . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-
-    if ( $installer::globals::languagepack )
-    {
-        my $onepropertyline = "ISLANGUAGEPACK" . "\t" . "1" . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-    elsif ( $installer::globals::helppack )
-    {
-        my $onepropertyline = "ISHELPPACK" . "\t" . "1" . "\n";
-        push(@{$propertyfile}, $onepropertyline);
-    }
-
-    my $languagesline = "PRODUCTALLLANGUAGES" . "\t" . $$languagestringref . "\n";
-    push(@{$propertyfile}, $languagesline);	
-
-    if (( $allvariables->{'PRODUCTEXTENSION'} ) && ( $allvariables->{'PRODUCTEXTENSION'}  eq "Beta" ))
-    {
-        # my $registryline = "WRITE_REGISTRY" . "\t" . "0" . "\n";
-        # push(@{$propertyfile}, $registryline);
-        my $betainfoline = "BETAPRODUCT" . "\t" . "1" . "\n";
-        push(@{$propertyfile}, $betainfoline);
-    }
-    elsif ( $allvariables->{'DEVELOPMENTPRODUCT'} )
-    {
-        my $registryline = "WRITE_REGISTRY" . "\t" . "0" . "\n";
-        push(@{$propertyfile}, $registryline);		
-    }
-    else
-    {
-        my $registryline = "WRITE_REGISTRY" . "\t" . "1" . "\n";	# Default: Write complete registry
-        push(@{$propertyfile}, $registryline);		
-    }
-    
-    # Adding also used tree conditions for multilayer products.
-    # These are saved in %installer::globals::usedtreeconditions
-    foreach my $treecondition (keys %installer::globals::usedtreeconditions)
-    {
-        my $onepropertyline = $treecondition . "\t" . "1" . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-
-    # No more license dialog for selected products
-    if ( $allvariables->{'HIDELICENSEDIALOG'} )
-    {
-        my $onepropertyline = "HIDEEULA" . "\t" . "1" . "\n";
-
-        my $already_defined = 0;
-
-        for ( my $i = 0; $i <= $#{$propertyfile}; $i++ )
-        {
-            if ( ${$propertyfile}[$i] =~ /^\s*HIDEEULA\t/ )
-            {
-                ${$propertyfile}[$i] = $onepropertyline;
-                $already_defined = 1;
-                last;
-            }
-        }
-
-        if ( ! $already_defined )
-        {
-            push(@{$propertyfile}, $onepropertyline);
-        }		
-    }
-    
-    # Setting .NET requirements
-    if ( $installer::globals::required_dotnet_version ne "" )
-    {
-        my $onepropertyline = "REQUIRED_DOTNET_VERSION" . "\t" . $installer::globals::required_dotnet_version . "\n";
-        push(@{$propertyfile}, $onepropertyline);		
-
-        $onepropertyline = "DOTNET_SUFFICIENT" . "\t" . "1" . "\n";	# default value for found .NET
-        push(@{$propertyfile}, $onepropertyline);		
-    }
-    
-}
-
-#######################################################
-# Setting properties needed for ms file type registration
-#######################################################
-
-sub set_ms_file_types_properties
-{
-    my ($propertyfile) = @_;
-    
-    push(@{$propertyfile}, "REGISTER_PPS"  . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_PPSX" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_PPSM" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_PPAM" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_PPT"  . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_PPTX" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_PPTM" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_POT"  . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_POTX" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_POTM" . "\t" . "0" . "\n");
-
-    push(@{$propertyfile}, "REGISTER_DOC"  . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_DOCX" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_DOCM" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_DOT"  . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_DOTX" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_DOTM" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_RTF"  . "\t" . "0" . "\n");
-
-    push(@{$propertyfile}, "REGISTER_XLS"  . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_XLSX" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_XLSM" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_XLSB" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_XLAM" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_XLT"  . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_XLTX" . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_XLTM" . "\t" . "0" . "\n");
-
-    push(@{$propertyfile}, "REGISTER_NO_MSO_TYPES"  . "\t" . "0" . "\n");
-    push(@{$propertyfile}, "REGISTER_ALL_MSO_TYPES"  . "\t" . "0" . "\n");
-}
-
-####################################################################################
-# Updating the file Property.idt dynamically
-# Content: 
-# Property Value
-####################################################################################
-
-sub update_property_table
-{
-    my ($basedir, $language, $allvariables, $languagestringref) = @_;
-
-    my $properyfilename = $basedir . $installer::globals::separator . "Property.idt";
-    
-    my $propertyfile = installer::files::read_file($properyfilename);
-
-    # Getting the new values
-    # Some values (arpcomments, arpcontacts, ...) are inserted from the Property.mlf
-
-    my $arpcomments = get_arpcomments_for_property_table($allvariables, $languagestringref);
-    my $installlevel = get_installlevel_for_property_table();
-    my $ischeckforproductupdates = get_ischeckforproductupdates_for_property_table();
-    my $manufacturer = get_manufacturer_for_property_table();
-    my $productlanguage = get_productlanguage_for_property_table($language);
-    my $productname = get_productname_for_property_table($language, $allvariables);
-    my $productversion = get_productversion_for_property_table();
-    my $quickstarterlinkname = get_quickstarterlinkname_for_property_table($language, $allvariables);
-
-    # Updating the values
-
-    for ( my $i = 0; $i <= $#{$propertyfile}; $i++ )
-    {
-        ${$propertyfile}[$i] =~ s/\bARPCOMMENTSTEMPLATE\b/$arpcomments/;
-        ${$propertyfile}[$i] =~ s/\bINSTALLLEVELTEMPLATE\b/$installlevel/;
-        ${$propertyfile}[$i] =~ s/\bISCHECKFORPRODUCTUPDATESTEMPLATE\b/$ischeckforproductupdates/;
-        ${$propertyfile}[$i] =~ s/\bMANUFACTURERTEMPLATE\b/$manufacturer/;
-        ${$propertyfile}[$i] =~ s/\bPRODUCTLANGUAGETEMPLATE\b/$productlanguage/;
-        ${$propertyfile}[$i] =~ s/\bPRODUCTNAMETEMPLATE\b/$productname/;
-        ${$propertyfile}[$i] =~ s/\bPRODUCTVERSIONTEMPLATE\b/$productversion/;
-        ${$propertyfile}[$i] =~ s/\bQUICKSTARTERLINKNAMETEMPLATE\b/$quickstarterlinkname/;
-    }
-
-    # Setting variables into propertytable
-    set_important_properties($propertyfile, $allvariables, $languagestringref);
-
-    # Setting feature names as properties for Windows patch mechanism
-    if ( $installer::globals::patch ) { set_featurename_properties_for_patch($propertyfile); }
-    
-    # Setting variables for register for ms file types
-    set_ms_file_types_properties($propertyfile);
-
-    # Saving the file
-    
-    installer::files::save_file($properyfilename ,$propertyfile);
-    my $infoline = "Updated idt file: $properyfilename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-####################################################################################
-# Setting language specific Properties in file Property.idt dynamically
-# Adding:
-# is1033 = 1
-# isMulti = 1
-####################################################################################
-
-sub set_languages_in_property_table
-{	
-    my ($basedir, $languagesarrayref) = @_;
-
-    my $properyfilename = $basedir . $installer::globals::separator . "Property.idt";
-    my $propertyfile = installer::files::read_file($properyfilename);
-
-    # Setting the component properties saved in %installer::globals::languageproperties
-    foreach my $localproperty ( keys %installer::globals::languageproperties )
-    {
-        $onepropertyline =  $localproperty . "\t" . $installer::globals::languageproperties{$localproperty} . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-
-    # Setting the info about multilingual installation in property "isMulti"
-
-    my $propertyname = "isMulti";	
-    my $ismultivalue = 0;
-
-    if ( $installer::globals::ismultilingual ) { $ismultivalue = 1; }
-
-    my $onepropertyline =  $propertyname . "\t" . $ismultivalue . "\n";
-    push(@{$propertyfile}, $onepropertyline);	
-
-    # setting the ARPPRODUCTICON
-    
-    if ($installer::globals::sofficeiconadded)	# set in shortcut.pm
-    {
-        $onepropertyline =  "ARPPRODUCTICON" . "\t" . "soffice.ico" . "\n";
-        push(@{$propertyfile}, $onepropertyline);	
-    }
-
-    # Saving the file
-    
-    installer::files::save_file($properyfilename ,$propertyfile);
-    my $infoline = "Added language content into idt file: $properyfilename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-    
-}
-
-############################################################
-# Setting the ProductCode and the UpgradeCode
-# into the Property table. Both have to be stored
-# in the global file $installer::globals::codefilename
-############################################################
-
-sub set_codes_in_property_table
-{	
-    my ($basedir) = @_;
-
-    # Reading the property file
-
-    my $properyfilename = $basedir . $installer::globals::separator . "Property.idt";
-    my $propertyfile = installer::files::read_file($properyfilename);
-
-    # Updating the values
-
-    for ( my $i = 0; $i <= $#{$propertyfile}; $i++ )
-    {
-        ${$propertyfile}[$i] =~ s/\bPRODUCTCODETEMPLATE\b/$installer::globals::productcode/;
-        ${$propertyfile}[$i] =~ s/\bUPGRADECODETEMPLATE\b/$installer::globals::upgradecode/;
-    }
-
-    # Saving the property file
-    
-    installer::files::save_file($properyfilename ,$propertyfile);
-    my $infoline = "Added language content into idt file: $properyfilename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-    
-}
-
-############################################################
-# Setting the variable REGKEYPRODPATH, that is used
-# by the language packs.
-############################################################
-
-sub set_regkeyprodpath_in_property_table
-{
-    my ($basedir, , $allvariables) = @_;
-
-    # Reading the property file
-
-    my $properyfilename = $basedir . $installer::globals::separator . "Property.idt";
-    my $propertyfile = installer::files::read_file($properyfilename);
-
-    my $name = $allvariables->{'PRODUCTNAME'};
-    my $version = $allvariables->{'PRODUCTVERSION'};
-
-    my $onepropertyline = "REGKEYPRODPATH" . "\t" . "Software" . "\\" . $installer::globals::manufacturer . "\\". $name;
-
-    push(@{$propertyfile}, $onepropertyline);	
-
-    # Saving the property file
-    
-    installer::files::save_file($properyfilename ,$propertyfile);
-    my $infoline = "Added language content into idt file: $properyfilename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-############################################################
-# Changing default for MS file type registration
-# in Beta products.
-############################################################
-
-sub update_checkbox_table
-{
-    my ($basedir, $allvariables) = @_;
-    
-    if (( $allvariables->{'PRODUCTEXTENSION'} ) && ( $allvariables->{'PRODUCTEXTENSION'}  eq "Beta" ))
-    {
-        my $checkboxfilename = $basedir . $installer::globals::separator . "CheckBox.idt";
-        
-        if ( -f $checkboxfilename )
-        {
-            my $checkboxfile = installer::files::read_file($checkboxfilename);
-        
-            my $checkboxline = "SELECT_WORD" . "\t" . "0" . "\n";
-            push(@{$checkboxfile}, $checkboxline);
-            $checkboxline = "SELECT_EXCEL" . "\t" . "0" . "\n";
-            push(@{$checkboxfile}, $checkboxline);
-            $checkboxline = "SELECT_POWERPOINT" . "\t" . "0" . "\n";
-            push(@{$checkboxfile}, $checkboxline);
-
-            # Saving the property file
-            installer::files::save_file($checkboxfilename ,$checkboxfile);
-            my $infoline = "Added ms file type defaults into idt file: $checkboxfilename\n"; 
-            push(@installer::globals::logfileinfo, $infoline);
-        }
-    }	
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
deleted file mode 100644
index 92a6bcbf1..000000000
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ /dev/null
@@ -1,470 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::registry;
-
-use installer::files;
-use installer::globals;
-use installer::worker;
-use installer::windows::idtglobal;
-
-#####################################################
-# Generating the component name from a registryitem
-#####################################################
-
-sub get_registry_component_name
-{
-    my ($registryref, $allvariables) = @_;
-        
-    # In this function exists the rule to create components from registryitems
-    # Rule:
-    # The componentname can be directly taken from the ModuleID.
-    # All registryitems belonging to one module can get the same component.
-        
-    my $componentname = "";
-    my $isrootmodule = 0;
-    
-    if ( $registryref->{'ModuleID'} ) { $componentname = $registryref->{'ModuleID'}; }
-    
-    $componentname =~ s/\\/\_/g;
-    $componentname =~ s/\//\_/g;
-    $componentname =~ s/\-/\_/g;
-    $componentname =~ s/\_\s*$//g;
-
-    $componentname = lc($componentname);	# componentnames always lowercase
-
-    if ( $componentname eq "gid_module_root" ) { $isrootmodule = 1; }
-
-    # Attention: Maximum length for the componentname is 72 
-
-    # identifying this component as registryitem component
-    $componentname = "registry_" . $componentname;
-
-    $componentname =~ s/gid_module_/g_m_/g;
-    $componentname =~ s/_optional_/_o_/g;
-    $componentname =~ s/_javafilter_/_jf_/g;
-    
-    # This componentname must be more specific
-    my $addon = "_";
-    if ( $allvariables->{'PRODUCTNAME'} ) { $addon = $addon . $allvariables->{'PRODUCTNAME'}; }
-    if ( $allvariables->{'PRODUCTVERSION'} ) { $addon = $addon . $allvariables->{'PRODUCTVERSION'}; }
-    $addon = lc($addon);
-    $addon =~ s/ //g;
-    $addon =~ s/-//g;
-    $addon =~ s/\.//g;
-
-    my $styles = "";	
-    if ( $registryref->{'Styles'} ) { $styles = $registryref->{'Styles'}; }
-
-    # Layer links must have unique Component GUID for all products. This is necessary, because only the 
-    # uninstallation of the last product has to delete registry keys.
-    if ( $styles =~ /\bLAYER_REGISTRY\b/ )
-    {
-        $componentname = "g_m_root_registry_layer_ooo_reglayer";
-        # Styles USE_URELAYERVERSION, USE_OOOBASEVERSION
-        if ( $styles =~ /\bUSE_URELAYERVERSION\b/ ) { $addon = "_ure_" . $allvariables->{'URELAYERVERSION'}; }
-        if ( $styles =~ /\bUSE_OOOBASEVERSION\b/ ) { $addon = "_basis_" . $allvariables->{'OOOBASEVERSION'}; }
-        $addon =~ s/\.//g;
-    }
-
-    $componentname = $componentname . $addon;
-
-    if (( $styles =~ /\bLANGUAGEPACK\b/ ) && ( $installer::globals::languagepack )) { $componentname = $componentname . "_lang"; }
-    elsif (( $styles =~ /\bHELPPACK\b/ ) && ( $installer::globals::helppack )) { $componentname = $componentname . "_help"; }
-    if ( $styles =~ /\bALWAYS_REQUIRED\b/ ) { $componentname = $componentname . "_forced"; }
-
-    # Attention: Maximum length for the componentname is 72
-    # %installer::globals::allregistrycomponents_in_this_database_ : resetted for each database
-    # %installer::globals::allregistrycomponents_ : not resetted for each database
-    # Component strings must be unique for the complete product, because they are used for
-    # the creation of the globally unique identifier.
-
-    my $fullname = $componentname;  # This can be longer than 72
-
-    if (( exists($installer::globals::allregistrycomponents_{$fullname}) ) && ( ! exists($installer::globals::allregistrycomponents_in_this_database_{$fullname}) ))
-    {
-        # This is not allowed: One component cannot be installed with different packages.
-        installer::exiter::exit_program("ERROR: Windows registry component \"$fullname\" is already included into another package. This is not allowed.", "get_registry_component_name");
-    }
-
-    if ( exists($installer::globals::allregistrycomponents_{$fullname}) )
-    {
-        $componentname = $installer::globals::allregistrycomponents_{$fullname};
-    }
-    else
-    {
-        if ( length($componentname) > 60 )
-        {
-            $componentname = generate_new_short_registrycomponentname($componentname); # This has to be unique for the complete product, not only one package
-        }
-
-        $installer::globals::allregistrycomponents_{$fullname} = $componentname;
-        $installer::globals::allregistrycomponents_in_this_database_{$fullname} = 1;
-    }
-
-    if ( $isrootmodule ) { $installer::globals::registryrootcomponent = $componentname; }
-
-    return $componentname;	
-}
-
-#########################################################
-# Create a shorter version of a long component name,
-# because maximum length in msi database is 72.
-# Attention: In multi msi installation sets, the short
-# names have to be unique over all packages, because
-# this string is used to create the globally unique id
-# -> no resetting of
-# %installer::globals::allshortregistrycomponents
-# after a package was created.
-#########################################################
-
-sub generate_new_short_registrycomponentname
-{
-    my ($componentname) = @_;
-
-    my $shortcomponentname = "";
-    my $counter = 1;
-
-    my $startversion = substr($componentname, 0, 60); # taking only the first 60 characters
-    $startversion = $startversion . "_";
-
-    $shortcomponentname = $startversion . $counter;
-
-    while ( exists($installer::globals::allshortregistrycomponents{$shortcomponentname}) )
-    {
-        $counter++;
-        $shortcomponentname = $startversion . $counter;
-    }
-
-    $installer::globals::allshortregistrycomponents{$shortcomponentname} = 1;
-
-    return $shortcomponentname;
-}
-
-##############################################################
-# Returning identifier for registry table.
-##############################################################
-
-sub get_registry_identifier
-{
-    my ($registry) = @_;
-
-    my $identifier = "";
-    
-    if ( $registry->{'gid'} ) { $identifier = $registry->{'gid'}; }
-    
-    $identifier = lc($identifier);	# always lower case
-
-    # Attention: Maximum length is 72
-
-    $identifier =~ s/gid_regitem_/g_r_/;
-    $identifier =~ s/_soffice_/_s_/;
-    $identifier =~ s/_clsid_/_c_/;
-    $identifier =~ s/_currentversion_/_cv_/;
-    $identifier =~ s/_microsoft_/_ms_/;
-    $identifier =~ s/_manufacturer_/_mf_/;
-    $identifier =~ s/_productname_/_pn_/;
-    $identifier =~ s/_productversion_/_pv_/;
-    $identifier =~ s/_staroffice_/_so_/;
-    $identifier =~ s/_software_/_sw_/;
-    $identifier =~ s/_capabilities_/_cap_/;
-    $identifier =~ s/_classpath_/_cp_/;
-    $identifier =~ s/_extension_/_ex_/;
-    $identifier =~ s/_fileassociations_/_fa_/;
-    $identifier =~ s/_propertysheethandlers_/_psh_/;
-    $identifier =~ s/__/_/g;
-        
-    # Saving this in the registry collector
-    
-    $registry->{'uniquename'} = $identifier;
-
-    return $identifier;
-}
-
-##################################################################
-# Returning root value for registry table.
-##################################################################
-
-sub get_registry_root
-{
-    my ($registry) = @_;
-
-    my $rootvalue = 0;	# Default: Parent is KKEY_CLASSES_ROOT
-    my $scproot = "";
-    
-    if ( $registry->{'ParentID'} ) { $scproot = $registry->{'ParentID'}; }
-
-    if ( $scproot eq "PREDEFINED_HKEY_LOCAL_MACHINE" ) { $rootvalue = -1; }
-    
-    if ( $scproot eq "PREDEFINED_HKEY_CLASSES_ROOT" ) { $rootvalue = 0; }
-    
-    if ( $scproot eq "PREDEFINED_HKEY_CURRENT_USER_ONLY" ) { $rootvalue = 1; }
-
-    if ( $scproot eq "PREDEFINED_HKEY_LOCAL_MACHINE_ONLY" ) { $rootvalue = 2; }
-
-    return $rootvalue;
-}
-
-##############################################################
-# Returning key for registry table.
-##############################################################
-
-sub get_registry_key
-{
-    my ($registry, $allvariableshashref) = @_;
-
-    my $key = "";
-    
-    if ( $registry->{'Subkey'} ) { $key = $registry->{'Subkey'}; }
-
-    if ( $key =~ /\%/ ) { $key = installer::worker::replace_variables_in_string($key, $allvariableshashref); }
-
-    return $key;
-}
-
-##############################################################
-# Returning name for registry table.
-##############################################################
-
-sub get_registry_name
-{
-    my ($registry, $allvariableshashref) = @_;
-
-    my $name = "";
-    
-    if ( $registry->{'Name'} ) { $name = $registry->{'Name'}; }
-
-    if ( $name =~ /\%/ ) { $name = installer::worker::replace_variables_in_string($name, $allvariableshashref); }
-
-    return $name;
-}
-
-##############################################################
-# Returning value for registry table.
-##############################################################
-
-sub get_registry_value
-{
-    my ($registry, $allvariableshashref) = @_;
-
-    my $value = "";
-    
-    if ( $registry->{'Value'} ) { $value = $registry->{'Value'}; }
-    
-    $value =~ s/\\\"/\"/g;	# no more masquerading of '"'
-    $value =~ s/\\\\\s*$/\\/g;	# making "\\" at end of value to "\"
-    $value =~ s/\<progpath\>/\[INSTALLLOCATION\]/;
-    $value =~ s/\[INSTALLLOCATION\]\\/\[INSTALLLOCATION\]/;	# removing "\" after "[INSTALLLOCATION]"
-
-    if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }
-
-    return $value;
-}
-
-##############################################################
-# Returning 64 bit value for registry table.
-##############################################################
-
-sub get_registry_val64
-{
-    my ($registry, $allvariableshashref) = @_;
-
-    my $value = "";
-
-    if ( $registry->{'Val64'} ) { $value = $registry->{'Val64'}; }
-    
-    $value =~ s/\\\"/\"/g;	# no more masquerading of '"'
-    $value =~ s/\\\\\s*$/\\/g;	# making "\\" at end of value to "\"
-    $value =~ s/\<progpath\>/\[INSTALLLOCATION\]/;
-    $value =~ s/\[INSTALLLOCATION\]\\/\[INSTALLLOCATION\]/;	# removing "\" after "[INSTALLLOCATION]"
-
-    if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }
-
-    return $value;
-}
-
-##############################################################
-# Returning component for registry table.
-##############################################################
-
-sub get_registry_component
-{
-    my ($registry, $allvariables) = @_;
-
-    # All registry items belonging to one module can
-    # be included into one component
-
-    my $componentname = get_registry_component_name($registry, $allvariables);
-
-    # saving componentname in the registryitem collector
-
-    $registry->{'componentname'} = $componentname;
-
-    return $componentname;
-}
-
-######################################################
-# Adding the content of 
-# @installer::globals::userregistrycollector
-# to the registry table. The content was collected
-# in create_files_table() in file.pm.
-######################################################
-
-sub add_userregs_to_registry_table
-{
-    my ( $registrytable, $allvariables ) = @_;
-
-    for ( my $i = 0; $i <= $#installer::globals::userregistrycollector; $i++ )
-    {
-        my $onefile = $installer::globals::userregistrycollector[$i];
-
-        my $styles = "";
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-        
-        my %registry = ();
-
-        $registry{'Registry'} = $onefile->{'userregkeypath'};
-        $registry{'Root'} = "1";  # always HKCU
-        $registry{'Key'} = "Software\\$allvariables->{'MANUFACTURER'}\\$allvariables->{'PRODUCTNAME'} $allvariables->{'PRODUCTVERSION'}\\";
-        if ( $onefile->{'needs_user_registry_key'} ) { $registry{'Key'} = $registry{'Key'} . "StartMenu"; }
-        else { $registry{'Key'} = $registry{'Key'} . "ShellNew"; }
-        $registry{'Name'} = $onefile->{'Name'};
-        $registry{'Value'} = "1";
-        $registry{'Component_'} = $onefile->{'componentname'};
-
-        my $oneline = $registry{'Registry'} . "\t" . $registry{'Root'} . "\t" . $registry{'Key'} . "\t"
-                    . $registry{'Name'} . "\t" . $registry{'Value'} . "\t" . $registry{'Component_'} . "\n";
-
-        push(@{$registrytable}, $oneline);			
-    }
-}
-
-######################################################
-# Creating the file Registry.idt dynamically
-# Content: 
-# Registry Root Key Name Value Component_
-######################################################
-
-sub create_registry_table
-{
-    my ($registryref, $allregistrycomponentsref, $basedir, $languagesarrayref, $allvariableshashref) = @_;
-
-    for ( my $m = 0; $m <= $#{$languagesarrayref}; $m++ )
-    {
-        my $onelanguage = ${$languagesarrayref}[$m];
-
-        my @registrytable = ();
-        my @reg64table = ();
-    
-        installer::windows::idtglobal::write_idt_header(\@registrytable, "registry");
-        installer::windows::idtglobal::write_idt_header(\@reg64table, "reg64");
-
-        for ( my $i = 0; $i <= $#{$registryref}; $i++ )
-        {
-            my $oneregistry = ${$registryref}[$i];
-
-            # Controlling the language!
-            # Only language independent folderitems or folderitems with the correct language 
-            # will be included into the table
-            
-            if (! (!(( $oneregistry->{'ismultilingual'} )) || ( $oneregistry->{'specificlanguage'} eq $onelanguage )) )  { next; }
-
-            my %registry = ();
-
-            $registry{'Registry'} = get_registry_identifier($oneregistry); 		
-            $registry{'Root'} = get_registry_root($oneregistry);
-            $registry{'Key'} = get_registry_key($oneregistry, $allvariableshashref); 		
-            $registry{'Name'} = get_registry_name($oneregistry, $allvariableshashref);
-            $registry{'Value'} = get_registry_value($oneregistry, $allvariableshashref);
-            $registry{'Val64'} = get_registry_val64($oneregistry, $allvariableshashref);
-            $registry{'Component_'} = get_registry_component($oneregistry, $allvariableshashref);	
-    
-            # Collecting all components
-            if (!(installer::existence::exists_in_array($registry{'Component_'}, $allregistrycomponentsref))) 
-            {
-                push(@{$allregistrycomponentsref}, $registry{'Component_'}); 
-            }
-
-            # Collecting all components with DONT_DELETE style
-            my $style = "";
-            if ( $oneregistry->{'Styles'} ) { $style = $oneregistry->{'Styles'}; }
-            if ( $style =~ /\bDONT_DELETE\b/ ) { $installer::globals::dontdeletecomponents{$registry{'Component_'}} = 1; }
-
-            # Saving upgradekey to write this into setup.ini for minor upgrades
-            if ( $style =~ /\bUPGRADEKEY\b/ ) { $installer::globals::minorupgradekey = $registry{'Key'}; }
-
-            # Collecting all registry components with ALWAYS_REQUIRED style
-            if ( ! ( $style =~ /\bALWAYS_REQUIRED\b/ ))
-            {
-                # Setting a component condition for unforced registry components!
-                # Only write into registry, if WRITE_REGISTRY is set.
-                if ( $oneregistry->{'ComponentCondition'} ) { $oneregistry->{'ComponentCondition'} = "(" . $oneregistry->{'ComponentCondition'} . ") AND (WRITE_REGISTRY=1)"; }
-                else { $oneregistry->{'ComponentCondition'} = "WRITE_REGISTRY=1"; }
-            }
-
-            # Collecting all component conditions
-            if ( $oneregistry->{'ComponentCondition'} )
-            {			
-                if ( ! exists($installer::globals::componentcondition{$registry{'Component_'}}))
-                {
-                    $installer::globals::componentcondition{$registry{'Component_'}} = $oneregistry->{'ComponentCondition'};
-                }
-            }
-
-            my $oneline = $registry{'Registry'} . "\t" . $registry{'Root'} . "\t" . $registry{'Key'} . "\t"
-                        . $registry{'Name'} . "\t" . $registry{'Value'} . "\t" . $registry{'Component_'} . "\n";
-
-            my $oneline64 = $registry{'Registry'} . "\t" . $registry{'Root'} . "\t" . $registry{'Key'} . "\t"
-                        . $registry{'Name'} . "\t" . $registry{'Val64'} . "\t" . $registry{'Component_'} . "\n";
-
-            if ( ! ( $style =~ /\bX64_ONLY\b/ )) { push(@registrytable, $oneline); }	# standard registry table for 32 Bit 
-            if (( $style =~ /\bX64\b/ ) || ( $style =~ /\bX64_ONLY\b/ )) { push(@reg64table , $oneline64); }
-        }
-
-        # If there are added user registry keys for files collected in
-        # @installer::globals::userregistrycollector (file.pm), then
-        # this registry keys have to be added now. This is necessary for
-        # files in PREDEFINED_OSSHELLNEWDIR, because their component
-        # needs as KeyPath a RegistryItem in HKCU.
-
-        if ( $installer::globals::addeduserregitrykeys ) { add_userregs_to_registry_table(\@registrytable, $allvariableshashref); }
-
-        # Saving the file
-        
-        my $registrytablename = $basedir . $installer::globals::separator . "Registry.idt" . "." . $onelanguage;
-        installer::files::save_file($registrytablename ,\@registrytable);
-        my $infoline = "Created idt file: $registrytablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-
-        $registrytablename = $basedir . $installer::globals::separator . "Reg64.idt" . "." . $onelanguage;
-        installer::files::save_file($registrytablename ,\@reg64table );
-        $infoline = "Created idt file: $registrytablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/removefile.pm b/solenv/bin/modules/installer/windows/removefile.pm
deleted file mode 100644
index e65ac3979..000000000
--- a/solenv/bin/modules/installer/windows/removefile.pm
+++ /dev/null
@@ -1,152 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::removefile;
-
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-########################################################################
-# Returning the FileKey for a folderitem for removefile table.
-########################################################################
-
-sub get_removefile_filekey
-{
-    my ($folderitem) = @_;
-    
-    # returning the unique identifier
-    
-    my $identifier = "remove_" . $folderitem->{'directory'};
-    
-    $identifier = lc($identifier);
-
-    return $identifier;
-}
-
-########################################################################
-# Returning the Component for a folderitem for removefile table.
-########################################################################
-
-sub get_removefile_component
-{
-    my ($folderitem) = @_;
-
-    return $folderitem->{'component'};
-}
-
-########################################################################
-# Returning the FileName for a folderitem for removefile table.
-########################################################################
-
-sub get_removefile_filename
-{
-    my ($folderitem) = @_;
-
-     # return nothing: The assigned directory will be removed
-
-    return "";
-}
-
-########################################################################
-# Returning the DirProperty for a folderitem for removefile table.
-########################################################################
-
-sub get_removefile_dirproperty
-{
-    my ($folderitem) = @_;
-
-    return $folderitem->{'directory'};
-}
-
-########################################################################
-# Returning the InstallMode for a folderitem for removefile table.
-########################################################################
-
-sub get_removefile_installmode
-{
-    my ($folderitem) = @_;
-
-    # always returning "2": The file is only removed, if the assigned
-    # component is removed. Name: msidbRemoveFileInstallModeOnRemove
-
-    return 2;
-}
-
-###########################################################################################################
-# Creating the file RemoveFi.idt dynamically
-# Content: 
-# FileKey Component_ FileName DirProperty InstallMode
-###########################################################################################################
-
-sub create_removefile_table
-{
-    my ($folderitemsref, $basedir) = @_;
-
-    my @removefiletable = ();
-    
-    installer::windows::idtglobal::write_idt_header(\@removefiletable, "removefile");
-
-    # Only the directories created for the FolderItems have to be deleted
-    # with the information in the table RemoveFile
-
-    my @directorycollector = ();
-
-    for ( my $i = 0; $i <= $#{$folderitemsref}; $i++ )
-    {
-        my $onelink = ${$folderitemsref}[$i];
-        
-        if ( $onelink->{'used'} == 0 ) { next; }
-        
-        if ( installer::existence::exists_in_array($onelink->{'directory'}, \@directorycollector)) { next; }
-
-        push(@directorycollector, $onelink->{'directory'});		
-        
-        my %removefile = ();
-
-        $removefile{'FileKey'} = get_removefile_filekey($onelink);
-        $removefile{'Component_'} = get_removefile_component($onelink);
-        $removefile{'FileName'} = get_removefile_filename($onelink);
-        $removefile{'DirProperty'} = get_removefile_dirproperty($onelink);
-        $removefile{'InstallMode'} = get_removefile_installmode($onelink);
-
-        my $oneline = $removefile{'FileKey'} . "\t" . $removefile{'Component_'} . "\t" . $removefile{'FileName'} . "\t"
-                    . $removefile{'DirProperty'} . "\t" . $removefile{'InstallMode'} . "\n";
-
-        push(@removefiletable, $oneline);		
-    }
-
-    # Saving the file
-    
-    my $removefiletablename = $basedir . $installer::globals::separator . "RemoveFi.idt";
-    installer::files::save_file($removefiletablename ,\@removefiletable);
-    my $infoline = "Created idt file: $removefiletablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-    
-}
-
-1;
\ No newline at end of file
diff --git a/solenv/bin/modules/installer/windows/selfreg.pm b/solenv/bin/modules/installer/windows/selfreg.pm
deleted file mode 100644
index 6d81415d5..000000000
--- a/solenv/bin/modules/installer/windows/selfreg.pm
+++ /dev/null
@@ -1,88 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::selfreg;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::worker;
-use installer::windows::idtglobal;
-
-##############################################################
-# Returning the cost for the selfreg table.
-##############################################################
-
-sub get_selfreg_cost
-{
-    my ( $onefile ) = @_;
-    
-    return "0";
-}
-
-####################################################################################
-# Creating the file SelfReg.idt dynamically
-# Content:
-# File_ Cost
-# UpgradeCode VersionMin VersionMax Language Attributes Remove ActionProperty
-####################################################################################
-
-sub create_selfreg_table
-{
-    my ($filesref, $basedir) = @_;
-
-    my @selfregtable = ();
-    
-    installer::windows::idtglobal::write_idt_header(\@selfregtable, "selfreg");
-
-    # Registering all libraries with flag "SELFREG"
-
-    my $selfregfiles = installer::worker::collect_all_items_with_special_flag($filesref, "SELFREG");
-
-    for ( my $i = 0; $i <= $#{$selfregfiles}; $i++ )
-    {
-        my $onefile = ${$selfregfiles}[$i];
-
-        my %selfreg = ();
-        
-        $selfreg{'File_'} = $onefile->{'uniquename'};
-        $selfreg{'Cost'} = get_selfreg_cost($onefile);
-
-        my $oneline = $selfreg{'File_'} . "\t" . $selfreg{'Cost'} . "\n";  
-
-        push(@selfregtable, $oneline);
-    }
-        
-    # Saving the file
-    
-    my $selfregtablename = $basedir . $installer::globals::separator . "SelfReg.idt";
-    installer::files::save_file($selfregtablename ,\@selfregtable);
-    my $infoline = "Created idt file: $selfregtablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-}
-
-1;
\ No newline at end of file
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm
deleted file mode 100644
index 91e630261..000000000
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ /dev/null
@@ -1,696 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::shortcut;
-
-use installer::existence;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-##############################################################
-# Returning the file object for the msiassembly table.
-##############################################################
-
-sub get_file_by_name
-{
-    my ( $filesref, $filename ) = @_;
-
-    my $foundfile = 0;
-    my $onefile;
-    
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        $onefile = ${$filesref}[$i];
-        my $name = $onefile->{'Name'};
-        
-        if ( $name eq $filename )
-        {
-            $foundfile = 1;
-            last;	
-        }		
-    }
-
-    if (! $foundfile ) { $onefile  = ""; }
-
-    return $onefile;
-}
-
-##############################################################
-# Returning identifier for shortcut table.
-##############################################################
-
-sub get_shortcut_identifier
-{
-    my ($shortcut) = @_;
-
-    my $identifier = $shortcut->{'gid'};
-    
-    return $identifier;
-}
-
-##############################################################
-# Returning directory for shortcut table.
-##############################################################
-
-sub get_shortcut_directory
-{
-    my ($shortcut, $dirref) = @_;
-    
-    # For shortcuts it is easy to convert the gid_Dir_Abc into the unique name in 
-    # the directory table, for instance help_en_simpressidx.
-    # For files (components) this is not so easy, because files can be included
-    # in zip files with subdirectories that are not defined in scp.
-    
-    my $onedir;
-    my $shortcutdirectory = $shortcut->{'Dir'};
-    my $directory = "";
-    my $found = 0;
-    
-    for ( my $i = 0; $i <= $#{$dirref}; $i++ )
-    {
-        $onedir = ${$dirref}[$i];
-        my $directorygid = $onedir->{'Dir'};
-
-        if ( $directorygid eq $shortcutdirectory )
-        {
-            $found = 1;
-            last;
-        }
-    }	
-
-    if (!($found))
-    {
-        installer::exiter::exit_program("ERROR: Did not find DirectoryID $shortcutdirectory in directory collection for shortcut", "get_shortcut_directory");
-    }
-    
-    $directory = $onedir->{'uniquename'};
-
-    if ($directory eq "") { $directory = "INSTALLLOCATION"; }		# Shortcuts in the root directory
-    
-    return $directory;
-}
-
-##############################################################
-# Returning name for shortcut table.
-##############################################################
-
-sub get_shortcut_name
-{
-    my ($shortcut, $shortnamesref, $onelanguage) = @_;
-    
-    my $returnstring;
-    
-    my $name = $shortcut->{'Name'};
-    
-    my $shortstring = installer::windows::idtglobal::make_eight_three_conform($name, "shortcut", $shortnamesref);
-    $shortstring =~ s/\s/\_/g;	# replacing white spaces with underline	
-    
-    if ( $shortstring eq $name ) { $returnstring = $name; }	# nothing changed
-    else {$returnstring = $shortstring . "\|" . $name; }
-
-    return $returnstring;
-}
-
-##############################################################
-# Returning component for shortcut table.
-##############################################################
-
-sub get_shortcut_component
-{
-    my ($shortcut, $filesref) = @_;
-
-    my $onefile; 
-    my $component = "";
-    my $found = 0;
-    my $shortcut_fileid = $shortcut->{'FileID'};
-
-    my $absolute_filename = 0;
-    if ( $shortcut->{'Styles'} ) { $styles = $shortcut->{'Styles'}; }
-    if ( $styles =~ /\bABSOLUTE_FILENAME\b/ ) { $absolute_filename = 1; }	# FileID contains an absolute filename
-    if ( $styles =~ /\bUSE_HELPER_FILENAME\b/ ) { $absolute_filename = 1; }	# ComponentIDFile contains id of a helper file
-
-    # if the FileID contains an absolute filename, therefore the entry for "ComponentIDFile" has to be used.
-    if ( $absolute_filename ) { $shortcut_fileid = $shortcut->{'ComponentIDFile'}; }
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        $onefile = ${$filesref}[$i];
-        my $filegid = $onefile->{'gid'};
-
-        if ( $filegid eq $shortcut_fileid )
-        {
-            $found = 1;
-            last;
-        }
-    }
-        
-    if (!($found))
-    {
-        installer::exiter::exit_program("ERROR: Did not find FileID $shortcut_fileid in file collection for shortcut", "get_shortcut_component");
-    }
-    
-    $component = $onefile->{'componentname'};
-    
-    # finally saving the componentname in the folderitem collector
-    
-    $shortcut->{'component'} = $component;
-    
-    return $component;
-}
-
-##############################################################
-# Returning target for shortcut table.
-##############################################################
-
-sub get_shortcut_target
-{
-    my ($shortcut, $filesref) = @_;
-
-    my $target = "";
-    my $found = 0;
-    my $shortcut_fileid = $shortcut->{'FileID'};
-    my $onefile;
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        $onefile = ${$filesref}[$i];
-        my $filegid = $onefile->{'gid'};
-        
-        if ( $filegid eq $shortcut_fileid )
-        {
-            $found = 1;
-            last;
-        }
-    }
-        
-    if (!($found))
-    {
-        installer::exiter::exit_program("ERROR: Did not find FileID $shortcut_fileid in file collection for shortcut", "get_shortcut_target");
-    }
-    
-    if ( $onefile->{'Name'} )
-    {
-        $target = $onefile->{'Name'};
-    }
-    
-    $target = "\[\#" . $target . "\]";	# format for Non-Advertised shortcuts
-
-    return $target;
-}
-
-##############################################################
-# Returning arguments for shortcut table.
-##############################################################
-
-sub get_shortcut_arguments
-{
-    my ($shortcut) = @_;
-
-    return "";
-}
-
-##############################################################
-# Returning the localized description for shortcut table.
-##############################################################
-
-sub get_shortcut_description
-{
-    my ($shortcut, $onelanguage) = @_;
-
-    my $description = "";
-    if ( $shortcut->{'Tooltip'} ) { $description = $shortcut->{'Tooltip'}; }
-
-    return $description;
-}
-
-##############################################################
-# Returning hotkey for shortcut table.
-##############################################################
-
-sub get_shortcut_hotkey
-{
-    my ($shortcut) = @_;
-
-    return "";
-}
-
-##############################################################
-# Returning icon for shortcut table.
-##############################################################
-
-sub get_shortcut_icon
-{
-    my ($shortcut) = @_;
-
-    return "";
-}
-
-##############################################################
-# Returning iconindex for shortcut table.
-##############################################################
-
-sub get_shortcut_iconindex
-{
-    my ($shortcut) = @_;
-
-    return "";
-}
-
-##############################################################
-# Returning show command for shortcut table.
-##############################################################
-
-sub get_shortcut_showcmd
-{
-    my ($shortcut) = @_;
-
-    return "";
-}
-
-##############################################################
-# Returning working directory for shortcut table.
-##############################################################
-
-sub get_shortcut_wkdir
-{
-    my ($shortcut) = @_;
-
-    return "";
-}
-
-####################################################################
-# Returning working directory for shortcut table for FolderItems.
-####################################################################
-
-sub get_folderitem_wkdir
-{
-    my ($onelink, $dirref) = @_;
-
-    # For shortcuts it is easy to convert the gid_Dir_Abc into the unique name in 
-    # the directory table, for instance help_en_simpressidx.
-    
-    my $onedir;
-    my $workingdirectory = "";
-    if ( $onelink->{'WkDir'} ) { $workingdirectory = $onelink->{'WkDir'}; }
-    my $directory = "";
-
-    if ( $workingdirectory )
-    {
-        my $found = 0;
-    
-        for ( my $i = 0; $i <= $#{$dirref}; $i++ )
-        {
-            $onedir = ${$dirref}[$i];
-            my $directorygid = $onedir->{'Dir'};
-
-            if ( $directorygid eq $workingdirectory )
-            {
-                $found = 1;
-                last;
-            }
-        }	
-
-        if (!($found))
-        {
-            installer::exiter::exit_program("ERROR: Did not find DirectoryID $workingdirectory in directory collection for FolderItem", "get_folderitem_wkdir");
-        }
-
-        $directory = $onedir->{'uniquename'};
-
-        if ($directory eq "") { $directory = "INSTALLLOCATION"; }
-    }
-
-    return $directory;	
-}
-
-###################################################################
-# Returning the directory for a folderitem for shortcut table.
-###################################################################
-
-sub get_folderitem_directory
-{
-    my ($shortcut) = @_;
-
-    my $directory = "$installer::globals::officemenufolder";	 # default
-
-    # The default is not correct for the
-    # PREDEFINED folders, like PREDEFINED_AUTOSTART
-    
-    if ( $shortcut->{'FolderID'} eq "PREDEFINED_AUTOSTART" )
-    {
-        $directory = $installer::globals::startupfolder;		
-    }
-
-    if ( $shortcut->{'FolderID'} eq "PREDEFINED_DESKTOP" )
-    {
-        $directory = $installer::globals::desktopfolder;
-        $installer::globals::desktoplinkexists = 1;
-    }
-
-    if ( $shortcut->{'FolderID'} eq "PREDEFINED_STARTMENU" )
-    {
-        $directory = $installer::globals::startmenufolder;		
-    }
-
-    # saving the directory in the folderitems collector
-    
-    $shortcut->{'directory'} = $directory;
-
-    return $directory;
-}
-
-########################################################################
-# Returning the target (feature) for a folderitem for shortcut table.
-# For non-advertised shortcuts this is a formatted string.
-########################################################################
-
-sub get_folderitem_target
-{
-    my ($shortcut, $filesref) = @_;
-
-    my $onefile; 
-    my $target = "";
-    my $found = 0;
-    my $shortcut_fileid = $shortcut->{'FileID'};
-
-    my $styles = "";
-    my $nonadvertised = 0;
-    my $absolute_filename = 0;
-    if ( $shortcut->{'Styles'} ) { $styles = $shortcut->{'Styles'}; }
-    if ( $styles =~ /\bNON_ADVERTISED\b/ ) { $nonadvertised = 1; }	# this is a non-advertised shortcut
-    if ( $styles =~ /\bABSOLUTE_FILENAME\b/ ) { $absolute_filename = 1; }	# FileID contains an absolute filename
-
-    # if the FileID contains an absolute filename this can simply be returned as target for the shortcut table.
-    if ( $absolute_filename )
-    {
-        $shortcut->{'target'} = $shortcut_fileid; 
-        return $shortcut_fileid;
-    } 
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        $onefile = ${$filesref}[$i];
-        my $filegid = $onefile->{'gid'};
-        
-        if ( $filegid eq $shortcut_fileid )
-        {
-            $found = 1;
-            last;
-        }
-    }
-        
-    if (!($found))
-    {
-        installer::exiter::exit_program("ERROR: Did not find FileID $shortcut_fileid in file collection for folderitem", "get_folderitem_target");
-    }
-
-    # Non advertised shortcuts do not return the feature, but the path to the file
-    if ( $nonadvertised )
-    {
-        $target = "\[" . $onefile->{'uniquedirname'} . "\]" . "\\" . $onefile->{'Name'};
-        $shortcut->{'target'} = $target; 
-        return $target;
-    }
-
-    # the rest only for advertised shortcuts, which contain the feature in the shortcut table.
-
-    if ( $onefile->{'modules'} ) { $target = $onefile->{'modules'}; }
-
-    # If modules contains a list of modules, only taking the first one.
-    # But this should never be needed
-    
-    if ( $target =~ /^\s*(.*?)\,/ ) { $target = $1; }
-
-    # Attention: Maximum feature length is 38!
-    installer::windows::idtglobal::shorten_feature_gid(\$target);
-    
-    # and finally saving the target in the folderitems collector
-    
-    $shortcut->{'target'} = $target;
-    
-    return $target;
-}
-
-########################################################################
-# Returning the arguments for a folderitem for shortcut table.
-########################################################################
-
-sub get_folderitem_arguments
-{
-    my ($shortcut) = @_;
-    
-    my $parameter = "";
-
-    if ( $shortcut->{'Parameter'} ) { $parameter = $shortcut->{'Parameter'}; }
-    
-    return $parameter;
-}
-
-########################################################################
-# Returning the icon for a folderitem for shortcut table.
-# The returned value has to be defined in the icon table.
-########################################################################
-
-sub get_folderitem_icon
-{
-    my ($shortcut, $filesref, $iconfilecollector) = @_;
-
-    my $styles = "";
-    if ( $shortcut->{'Styles'} ) { $styles = $shortcut->{'Styles'}; }
-    if ( $styles =~ /\bNON_ADVERTISED\b/ ) { return ""; }	# no icon for non-advertised shortcuts
-
-    my $iconfilegid = "";
-    
-    if ( $shortcut->{'IconFile'} ) { $iconfilegid = $shortcut->{'IconFile'}; }
-    else { $iconfilegid = $shortcut->{'FileID'}; }
-
-    my $onefile;
-    my $found = 0;
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        $onefile = ${$filesref}[$i];
-        my $filegid = $onefile->{'gid'};
-        
-        if ( $filegid eq $iconfilegid )
-        {
-            $found = 1;
-            last;
-        }
-    }
-        
-    if (!($found))
-    {
-        installer::exiter::exit_program("ERROR: Did not find FileID $iconfilegid in file collection", "get_folderitem_icon");
-    }
-
-    $iconfile = $onefile->{'Name'};
-    
-    # collecting all icon files to copy them into the icon directory
-    
-    my $sourcepath = $onefile->{'sourcepath'};
-    
-    if (! installer::existence::exists_in_array($sourcepath, $iconfilecollector))
-    {		
-        push(@{$iconfilecollector}, $sourcepath);
-    }			
-
-    return $iconfile;
-}
-
-########################################################################
-# Returning the iconindex for a folderitem for shortcut table.
-########################################################################
-
-sub get_folderitem_iconindex
-{
-    my ($shortcut) = @_;
-
-    my $styles = "";
-    if ( $shortcut->{'Styles'} ) { $styles = $shortcut->{'Styles'}; }
-    if ( $styles =~ /\bNON_ADVERTISED\b/ ) { return ""; }	# no iconindex for non-advertised shortcuts
-
-    my $iconid = 0;
-
-    if ( $shortcut->{'IconID'} ) { $iconid = $shortcut->{'IconID'}; }
-    
-    return $iconid;
-}
-
-########################################################################
-# Returning the show command for a folderitem for shortcut table.
-########################################################################
-
-sub get_folderitem_showcmd
-{
-    my ($shortcut) = @_;
-
-    return "1";
-}
-
-###########################################################################################################
-# Creating the file Shortcut.idt dynamically
-# Content: 
-# Shortcut Directory_ Name Component_ Target Arguments Description Hotkey Icon_ IconIndex ShowCmd WkDir
-###########################################################################################################
-
-sub create_shortcut_table
-{
-    my ($filesref, $linksref, $folderref, $folderitemsref, $dirref, $basedir, $languagesarrayref, $includepatharrayref, $iconfilecollector) = @_;
-
-    for ( my $m = 0; $m <= $#{$languagesarrayref}; $m++ )
-    {
-        my $onelanguage = ${$languagesarrayref}[$m];
-
-        my @shortcuttable = ();
-            
-        my @shortnames = ();	# to collect all short names
-
-        installer::windows::idtglobal::write_idt_header(\@shortcuttable, "shortcut");
-
-        # First the links, defined in scp as ShortCut
-
-        for ( my $i = 0; $i <= $#{$linksref}; $i++ )
-        {
-            my $onelink = ${$linksref}[$i];
-
-            # Controlling the language!
-            # Only language independent folderitems or folderitems with the correct language 
-            # will be included into the table
-            
-            if (! (!(( $onelink->{'ismultilingual'} )) || ( $onelink->{'specificlanguage'} eq $onelanguage )) )  { next; }
-
-            my %shortcut = ();
-    
-            $shortcut{'Shortcut'} = get_shortcut_identifier($onelink); 		
-            $shortcut{'Directory_'} = get_shortcut_directory($onelink, $dirref); 		
-            $shortcut{'Name'} = get_shortcut_name($onelink, \@shortnames, $onelanguage);	# localized name 		
-            $shortcut{'Component_'} = get_shortcut_component($onelink, $filesref); 		
-            $shortcut{'Target'} = get_shortcut_target($onelink, $filesref); 		
-            $shortcut{'Arguments'} = get_shortcut_arguments($onelink); 		
-            $shortcut{'Description'} = get_shortcut_description($onelink, $onelanguage); 	# localized description
-            $shortcut{'Hotkey'} = get_shortcut_hotkey($onelink); 		
-            $shortcut{'Icon_'} = get_shortcut_icon($onelink); 		
-            $shortcut{'IconIndex'} = get_shortcut_iconindex($onelink); 		
-            $shortcut{'ShowCmd'} = get_shortcut_showcmd($onelink); 		
-            $shortcut{'WkDir'} = get_shortcut_wkdir($onelink); 		
-
-            my $oneline = $shortcut{'Shortcut'} . "\t" . $shortcut{'Directory_'} . "\t" . $shortcut{'Name'} . "\t"
-                        . $shortcut{'Component_'} . "\t" . $shortcut{'Target'} . "\t" . $shortcut{'Arguments'} . "\t"
-                        . $shortcut{'Description'} . "\t" . $shortcut{'Hotkey'} . "\t" . $shortcut{'Icon_'} . "\t"
-                        . $shortcut{'IconIndex'} . "\t" . $shortcut{'ShowCmd'} . "\t" . $shortcut{'WkDir'} . "\n";
-
-            push(@shortcuttable, $oneline);	
-        }
-
-        # Second the entries into the start menu, defined in scp as Folder and Folderitem 
-        # These shortcuts will fill the icons table.
-
-        for ( my $i = 0; $i <= $#{$folderref}; $i++ )
-        {
-            my $foldergid = ${$folderref}[$i]->{'gid'};
-        
-            # iterating over all folderitems for this folder
-        
-            for ( my $j = 0; $j <= $#{$folderitemsref}; $j++ )
-            {
-                my $onelink = ${$folderitemsref}[$j];
-    
-                # Controlling the language!
-                # Only language independent folderitems or folderitems with the correct language 
-                # will be included into the table
-            
-                if (! (!(( $onelink->{'ismultilingual'} )) || ( $onelink->{'specificlanguage'} eq $onelanguage )) )  { next; }
-            
-                # controlling the folder	
-
-                my $localused = 0;
-                
-                if ( $onelink->{'used'} ) { $localused = $onelink->{'used'}; }
-
-                if (!($localused == 1)) { $onelink->{'used'} = "0"; }		# no resetting
-    
-                if (!( $onelink->{'FolderID'} eq $foldergid )) { next; }
-
-                $onelink->{'used'} = "1";
-    
-                my %shortcut = ();
-
-                $shortcut{'Shortcut'} = get_shortcut_identifier($onelink); 		
-                $shortcut{'Directory_'} = get_folderitem_directory($onelink); 		
-                $shortcut{'Name'} = get_shortcut_name($onelink, \@shortnames, $onelanguage);	# localized name
-                $shortcut{'Component_'} = get_shortcut_component($onelink, $filesref); 		
-                $shortcut{'Target'} = get_folderitem_target($onelink, $filesref); 		
-                $shortcut{'Arguments'} = get_folderitem_arguments($onelink); 		
-                $shortcut{'Description'} = get_shortcut_description($onelink, $onelanguage);	# localized description
-                $shortcut{'Hotkey'} = get_shortcut_hotkey($onelink); 		
-                $shortcut{'Icon_'} = get_folderitem_icon($onelink, $filesref, $iconfilecollector); 		
-                $shortcut{'IconIndex'} = get_folderitem_iconindex($onelink); 		
-                $shortcut{'ShowCmd'} = get_folderitem_showcmd($onelink); 		
-                $shortcut{'WkDir'} = get_folderitem_wkdir($onelink, $dirref);
-
-                my $oneline = $shortcut{'Shortcut'} . "\t" . $shortcut{'Directory_'} . "\t" . $shortcut{'Name'} . "\t"
-                            . $shortcut{'Component_'} . "\t" . $shortcut{'Target'} . "\t" . $shortcut{'Arguments'} . "\t"
-                            . $shortcut{'Description'} . "\t" . $shortcut{'Hotkey'} . "\t" . $shortcut{'Icon_'} . "\t"
-                            . $shortcut{'IconIndex'} . "\t" . $shortcut{'ShowCmd'} . "\t" . $shortcut{'WkDir'} . "\n";
-
-                push(@shortcuttable, $oneline);
-            }	
-        }
-        
-        # The soffice.ico has to be included into the icon table
-        # as icon for the ARP applet
-
-        my $onefile = "";
-        my $sofficefile = "soffice.ico";
-        
-        my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$sofficefile, $includepatharrayref, 0);
-
-        if ($$sourcepathref eq "") { installer::exiter::exit_program("ERROR: Could not find $sofficefile as icon!", "create_shortcut_table"); }
-
-        if (! installer::existence::exists_in_array($$sourcepathref, $iconfilecollector))
-        {		
-            unshift(@{$iconfilecollector}, $$sourcepathref);
-            $installer::globals::sofficeiconadded = 1;
-        }
-
-        my $localinfoline = "Added icon file $$sourcepathref for language pack into icon file collector.\n"; 
-        push(@installer::globals::logfileinfo, $localinfoline);
-
-        # Saving the file
-    
-        my $shortcuttablename = $basedir . $installer::globals::separator . "Shortcut.idt" . "." . $onelanguage;
-        installer::files::save_file($shortcuttablename ,\@shortcuttable);
-        my $infoline = "Created idt file: $shortcuttablename\n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-}
-
-
-1;
diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm
deleted file mode 100644
index 629ddbaec..000000000
--- a/solenv/bin/modules/installer/windows/sign.pm
+++ /dev/null
@@ -1,1242 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::sign;
-
-use Cwd;
-use installer::converter;
-use installer::existence;
-use installer::files;
-use installer::globals;
-use installer::scriptitems;
-use installer::worker;
-use installer::windows::admin;
-
-########################################################
-# Copying an existing Windows installation set.
-########################################################
-
-sub copy_install_set
-{
-    my ( $installsetpath ) = @_;
-
-    installer::logger::include_header_into_logfile("Start: Copying installation set $installsetpath");
-
-    my $infoline = "";
-
-    my $dirname = $installsetpath;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$dirname);
-
-    my $path = $installsetpath;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$path);
-
-    $path =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    if ( $dirname =~ /\./ ) { $dirname =~ s/\./_signed_inprogress./; }
-    else { $dirname = $dirname . "_signed_inprogress"; }
-    
-    my $newpath = $path . $installer::globals::separator . $dirname;
-    my $removepath = $newpath;
-    $removepath =~ s/_inprogress/_witherror/;
-    
-    if ( -d $newpath ) { installer::systemactions::remove_complete_directory($newpath, 1); }
-    if ( -d $removepath ) { installer::systemactions::remove_complete_directory($removepath, 1); }
-
-    $infoline = "Copy installation set from $installsetpath to $newpath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    $installsetpath = installer::systemactions::copy_complete_directory($installsetpath, $newpath);
-
-    installer::logger::include_header_into_logfile("End: Copying installation set $installsetpath");
-
-    return $newpath;
-}
-
-########################################################
-# Renaming an existing Windows installation set.
-########################################################
-
-sub rename_install_set
-{
-    my ( $installsetpath ) = @_;
-
-    my $infoline = "";
-
-    my $dirname = $installsetpath;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$dirname);
-
-    my $path = $installsetpath;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$path);
-
-    $path =~ s/\Q$installer::globals::separator\E\s*$//;
-
-    if ( $dirname =~ /\./ ) { $dirname =~ s/\./_inprogress./; }
-    else { $dirname = $dirname . "_inprogress"; }
-    
-    my $newpath = $path . $installer::globals::separator . $dirname;
-    my $removepath = $newpath;
-    $removepath =~ s/_inprogress/_witherror/;
-    
-    if ( -d $newpath ) { installer::systemactions::remove_complete_directory($newpath, 1); }
-    if ( -d $removepath ) { installer::systemactions::remove_complete_directory($removepath, 1); }
-
-    $installsetpath = installer::systemactions::rename_directory($installsetpath, $newpath);
-
-    return $newpath;
-}
-
-#########################################################
-# Checking the local system
-# Checking existence of needed files in include path
-#########################################################
-
-sub check_system_path
-{
-    # The following files have to be found in the environment variable PATH
-    # Only, if \"-sign\" is used.
-    # Windows : "msicert.exe", "diff.exe", "msidb.exe", "signtool.exe"
-
-    my @needed_files_in_path = ("msicert.exe", "msidb.exe", "signtool.exe", "diff.exe");
-    if ( $installer::globals::internal_cabinet_signing )
-    {
-        push(@needed_files_in_path, "cabarc.exe");
-        push(@needed_files_in_path, "makecab.exe");
-    }
-
-    my $onefile;	
-    my $error = 0;
-    my $pathvariable = $ENV{'PATH'};
-    my $local_pathseparator = $installer::globals::pathseparator;
-    
-    if( $^O =~ /cygwin/i )
-    {	# When using cygwin's perl the PATH variable is POSIX style and ...
-        $pathvariable = qx{cygpath -mp "$pathvariable"} ;
-        # has to be converted to DOS style for further use.
-        $local_pathseparator = ';';
-    }
-    
-    my $patharrayref = installer::converter::convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
-    
-    $installer::globals::patharray = $patharrayref;
-        
-    foreach my $onefile ( @needed_files_in_path )
-    {
-        installer::logger::print_message( "...... searching $onefile ..." );
-
-        my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$onefile, $patharrayref , 0);
-
-        if ( $$fileref eq "" )
-        {
-            $error = 1;
-            installer::logger::print_error( "$onefile not found\n" );
-        }
-        else
-        {
-            installer::logger::print_message( "\tFound: $$fileref\n" );
-        }		
-    }
-
-    $installer::globals::signfiles_checked = 1;
-
-    if ( $error ) { installer::exiter::exit_program("ERROR: Could not find all needed files in path!", "check_system_path"); }
-}
-
-######################################################
-# Making systemcall
-######################################################
-
-sub make_systemcall
-{
-    my ($systemcall, $displaysystemcall) = @_;
-
-    installer::logger::print_message( "... $displaysystemcall ...\n" );
-
-    my $success = 1;
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $displaysystemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$displaysystemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $success = 0;
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$displaysystemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    return $success;
-}	
-
-######################################################
-# Making systemcall with warning
-######################################################
-
-sub make_systemcall_with_warning
-{
-    my ($systemcall, $displaysystemcall) = @_;
-
-    installer::logger::print_message( "... $displaysystemcall ...\n" );
-
-    my $success = 1;
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $displaysystemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "WARNING: Could not execute \"$displaysystemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $success = 0;
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$displaysystemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    return $success;
-}	
-
-######################################################
-# Making systemcall with more return data
-######################################################
-
-sub execute_open_system_call
-{
-    my ( $systemcall ) = @_;
-
-    my @openoutput = ();
-    my $success = 1;
-
-    my $comspec = $ENV{COMSPEC};
-    $comspec = $comspec . " -c ";
-
-    if( $^O =~ /cygwin/i )
-    {
-        $comspec = "";
-    }
-
-    my $localsystemcall = "$comspec $systemcall 2>&1 |";
-
-    open( OPN, "$localsystemcall") or warn "Can't execute $localsystemcall\n";
-    while (<OPN>) { push(@openoutput, $_); }
-    close (OPN);
-
-    my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $success = 0;
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    return ($success, \@openoutput);
-}
-
-########################################################
-# Reading first line of pw file.
-########################################################
-
-sub get_pw
-{
-    my ( $file ) = @_;
-    
-    my $filecontent = installer::files::read_file($file);
-
-    my $pw = ${$filecontent}[0];
-    $pw =~ s/^\s*//;	
-    $pw =~ s/\s*$//;
-    
-    return $pw;	
-}
-
-########################################################
-# Counting the keys of a hash.
-########################################################
-
-sub get_hash_count
-{
-    my ($hashref) = @_;
-    
-    my $counter = 0;
-    
-    foreach my $key ( keys %{$hashref} ) { $counter++; }
-    
-    return $counter;
-}
-
-############################################################
-# Collect all last files in a cabinet file. This is 
-# necessary to control, if the cabinet file was damaged
-# by calling signtool.exe.
-############################################################
-
-sub analyze_file_file
-{
-    my ($filecontent) = @_;
-
-    my %filenamehash = ();
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( $i < 3 ) { next; }
-
-        if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my $name = $1;
-            my $sequence = $8;
-
-            $filenamehash{$sequence} = $name;
-        }
-    }
-
-    return ( \%filenamehash );
-}
-
-############################################################
-# Collect all DiskIds to the corresponding cabinet files.
-############################################################
-
-sub analyze_media_file
-{
-    my ($filecontent) = @_;
-    
-    my %diskidhash = ();
-    my %lastsequencehash = ();
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if ( $i < 3 ) { next; }
-
-        if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
-        {
-            my $diskid = $1;
-            my $lastsequence = $2;
-            my $cabfile = $4;
-
-            $diskidhash{$cabfile} = $diskid;
-            $lastsequencehash{$cabfile} = $lastsequence;
-        }
-    }
-
-    return ( \%diskidhash, \%lastsequencehash );
-}
-
-########################################################
-# Collect all DiskIds from database table "Media".
-########################################################
-
-sub collect_diskid_from_media_table
-{
-    my ($msidatabase, $languagestring) = @_;
-    
-    # creating working directory
-    my $workdir = installer::systemactions::create_directories("media", \$languagestring);
-    installer::windows::admin::extract_tables_from_pcpfile($msidatabase, $workdir, "Media File");
-
-    # Reading tables
-    my $filename = $workdir . $installer::globals::separator . "Media.idt";
-    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid_from_media_table"); }
-    my $filecontent = installer::files::read_file($filename);
-    my ( $diskidhash, $lastsequencehash ) = analyze_media_file($filecontent);
-
-    $filename = $workdir . $installer::globals::separator . "File.idt";
-    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid_from_media_table"); }
-    $filecontent = installer::files::read_file($filename);
-    my $filenamehash = analyze_file_file($filecontent);
-
-    return ( $diskidhash, $filenamehash, $lastsequencehash );
-}
-
-########################################################
-# Check, if this installation set contains
-# internal cabinet files included into the msi
-# database.
-########################################################
-
-sub check_for_internal_cabfiles
-{
-    my ($cabfilehash) = @_;
-    
-    my $contains_internal_cabfiles = 0;
-    my %allcabfileshash = ();
-    
-    foreach my $filename ( keys %{$cabfilehash} )
-    {
-        if ( $filename =~ /^\s*\#/ )	 # starting with a hash
-        {
-            $contains_internal_cabfiles = 1;
-            # setting real filename without hash as key and name with hash as value
-            my $realfilename = $filename;
-            $realfilename =~ s/^\s*\#//;
-            $allcabfileshash{$realfilename} = $filename;
-        }
-    }
-    
-    return ( $contains_internal_cabfiles, \%allcabfileshash );
-}
-
-########################################################
-# Collecting all files in an installation set.
-########################################################
-
-sub analyze_installset_content
-{
-    my ( $installsetpath ) = @_;
-
-    my @sourcefiles = ();
-    my $pathstring = "";
-    installer::systemactions::read_complete_directory($installsetpath, $pathstring, \@sourcefiles);
-
-    if ( ! ( $#sourcefiles > -1 )) { installer::exiter::exit_program("ERROR: No file in installation set. Path: $installsetpath !", "analyze_installset_content"); }
-
-    my %allcabfileshash = ();
-    my %allmsidatabaseshash = ();
-    my %allfileshash = ();
-    my $contains_external_cabfiles = 0;
-    my $msidatabase = "";
-    my $contains_msidatabase = 0;
-
-    for ( my $j = 0; $j <= $#sourcefiles; $j++ )
-    {
-        if ( $sourcefiles[$j] =~ /\.cab\s*$/ ) { $allcabfileshash{$sourcefiles[$j]} = 1; }
-        else
-        {
-            if ( $sourcefiles[$j] =~ /\.txt\s*$/ ) { next; }
-            if ( $sourcefiles[$j] =~ /\.html\s*$/ ) { next; }
-            if ( $sourcefiles[$j] =~ /\.ini\s*$/ ) { next; }
-            if ( $sourcefiles[$j] =~ /\.bmp\s*$/ ) { next; }
-            if ( $sourcefiles[$j] =~ /\.msi\s*$/ )
-            {
-                if ( $msidatabase eq "" ) { $msidatabase = $sourcefiles[$j]; }
-                else { installer::exiter::exit_program("ERROR: There is more than one msi database in installation set. Path: $installsetpath !", "analyze_installset_content"); }
-            }
-            $allfileshash{$sourcefiles[$j]} = 1;
-        }
-    }
-        
-    # Is there at least one cab file in the installation set?
-    my $cabcounter = get_hash_count(\%allcabfileshash);
-    if ( $cabcounter > 0 ) { $contains_external_cabfiles = 1; }
-    
-    # How about a cab file without a msi database?
-    if (( $cabcounter > 0 ) && ( $msidatabase eq "" )) { installer::exiter::exit_program("ERROR: There is no msi database in the installation set, but an external cabinet file. Path: $installsetpath !", "collect_installset_content"); }
-
-    if ( $msidatabase ne "" ) { $contains_msidatabase = 1; }
-
-    return (\%allcabfileshash, \%allfileshash, $msidatabase, $contains_external_cabfiles, $contains_msidatabase, \@sourcefiles);
-}
-
-########################################################
-# Adding content of external cabinet files into the
-# msi database
-########################################################
-
-sub msicert_database
-{
-    my ($msidatabase, $allcabfiles, $cabfilehash, $internalcabfile) = @_;
-
-    my $fullsuccess = 1;
-
-    foreach my $cabfile ( keys %{$allcabfiles} )
-    {
-        my $origfilesize = -s $cabfile;
-        
-        my $mediacabfilename = $cabfile;
-        if ( $internalcabfile ) { $mediacabfilename = "\#" . $mediacabfilename; }
-        if ( ! exists($cabfilehash->{$mediacabfilename}) ) { installer::exiter::exit_program("ERROR: Could not determine DiskId from media table for cabinet file \"$cabfile\" !", "msicert_database"); }
-        my $diskid = $cabfilehash->{$mediacabfilename};
-
-        my $systemcall = "msicert.exe -d $msidatabase -m $diskid -c $cabfile -h";
-         $success = make_systemcall($systemcall, $systemcall);
-        if ( ! $success ) { $fullsuccess = 0; }
-
-        # size of cabinet file must not change		
-        my $finalfilesize = -s $cabfile;
-        
-        if ( $origfilesize != $finalfilesize ) { installer::exiter::exit_program("ERROR: msicert.exe changed size of cabinet file !", "msicert_database"); }
-    }
-    
-    return $fullsuccess;
-}
-
-########################################################
-# Checking if cabinet file was broken by signtool.
-########################################################
-
-sub cabinet_cosistency_check
-{
-    my ( $onefile, $followmeinfohash, $filenamehash, $lastsequencehash, $temppath ) = @_;
-    
-    my $infoline = "Making consistency check of $onefile\n"; 
-    push( @installer::globals::logfileinfo, $infoline);
-    my $expandfile = "expand.exe";	# Has to be in the path
-
-    if ( $^O =~ /cygwin/i )
-    {
-        $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe);
-        chomp $expandfile;
-    }
-             
-    if ( $filenamehash == 0 )
-    {
-        $infoline = "Warning: Stopping consistency check: Important hash of filenames is empty!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    elsif  ( $lastsequencehash == 0 )
-    {
-        $infoline = "Warning: Stopping consistency check; Important hash of last sequences is empty!\n";
-        push( @installer::globals::logfileinfo, $infoline);	 			
-    }
-    else # both hashes are available
-    {
-        # $onefile contains only the name of the cabinet file without path
-         my $sequence = $lastsequencehash->{$onefile};
-         my $lastfile = $filenamehash->{$sequence};
-        $infoline = "Check of $onefile: Sequence: $sequence is file: $lastfile\n";
-        push( @installer::globals::logfileinfo, $infoline);
-                 
-         # Therefore the file $lastfile need to be binary compared.
-         # It has to be expanded from the cabinet file
-         # of the original installation set and from the
-         # newly signed cabinet file.
-         
-        # How about cabinet files extracted from msi database?
-        my $finalinstalldir = $followmeinfohash->{'finalinstalldir'};
-        
-        $finalinstalldir =~ s/\\\s*$//;
-        $finalinstalldir =~ s/\/\s*$//;
-        my $sourcecabfile = $finalinstalldir . $installer::globals::separator . $onefile;
-        my $currentpath = cwd();
-        my $destcabfile = $currentpath . $installer::globals::separator . $onefile;
-        
-        if ( $^O =~ /cygwin/i )
-        {
-            chomp( $destcabfile = qx{cygpath -w "$destcabfile"} );
-            $destcabfile =~ s/\\/\//g;
-        }
-
-        if ( ! -f $sourcecabfile ) 
-        {
-            $infoline = "WARNING: Check of cab file cannot happen, because source cabinet file was not found: $sourcecabfile\n";
-            push( @installer::globals::logfileinfo, $infoline);	
-        }
-        elsif ( ! -f $destcabfile ) 
-        {
-            $infoline = "WARNING: Check of cab file cannot happen, because destination cabinet file was not found: $sourcecabfile\n";
-            push( @installer::globals::logfileinfo, $infoline);				
-        }
-        else # everything is okay for the check
-        {
-            my $diffpath = get_diff_path($temppath);
-        
-            my $origdiffpath = $diffpath . $installer::globals::separator . "orig";
-            my $newdiffpath = $diffpath . $installer::globals::separator . "new";
-        
-            if ( ! -d $origdiffpath ) { mkdir($origdiffpath); }
-            if ( ! -d $newdiffpath ) { mkdir($newdiffpath); }
-
-            my $systemcall = "$expandfile $sourcecabfile $origdiffpath -f:$lastfile ";
-            $infoline = $systemcall . "\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            my $success = make_systemcall($systemcall, $systemcall);
-            if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); }
-                
-            $systemcall = "$expandfile $destcabfile $newdiffpath -f:$lastfile ";
-            $infoline = $systemcall . "\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        
-            $success = make_systemcall($systemcall, $systemcall);
-            if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); }
-
-            # and finally the two files can be diffed.
-            my $origfile = $origdiffpath . $installer::globals::separator . $lastfile; 
-            my $newfile = $newdiffpath . $installer::globals::separator . $lastfile;
-        
-            if ( ! -f $origfile ) { installer::exiter::exit_program("ERROR: Unpacked original file not found: $origfile !", "cabinet_cosistency_check"); }
-            if ( ! -f $newfile ) { installer::exiter::exit_program("ERROR: Unpacked new file not found: $newfile !", "cabinet_cosistency_check"); }
-        
-            my $origsize = -s $origfile;
-            my $newsize = -s $newfile;
-        
-            if ( $origsize != $newsize ) # This shows an error!
-            {			
-                $infoline = "ERROR: Different filesize after signtool.exe was used. Original: $origsize Bytes, new: $newsize. File: $lastfile\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                installer::exiter::exit_program("ERROR: The cabinet file $destcabfile is broken after signtool.exe signed this file !", "cabinet_cosistency_check");
-            }
-            else
-            {
-                $infoline = "Same size of last file in cabinet file after usage of signtool.exe: $newsize (File: $lastfile)\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                # Also making a binary diff?
-
-                my $difffile = "diff.exe";  # has to be in the path
-                $systemcall = "$difffile $origfile $newfile";
-                $infoline = $systemcall . "\n";
-                $returnvalue = make_systemcall($systemcall, $systemcall);
-
-                my $success = $?;
-
-                if ( $success == 0 )
-                {
-                    $infoline = "Last files are identical after signing cabinet file (File: $lastfile)\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-                elsif ( $success == 1 )
-                {
-                    $infoline = "ERROR: Last files are different after signing cabinet file (File: $lastfile)\n";
-                    push( @installer::globals::logfileinfo, $infoline);				
-                    installer::exiter::exit_program("ERROR: Last files are different after signing cabinet file (File: $lastfile)!", "cabinet_cosistency_check");
-                }		
-                else
-                {
-                    $infoline = "ERROR: Problem occurred calling diff.exe (File: $lastfile)\n";
-                    push( @installer::globals::logfileinfo, $infoline);								
-                    installer::exiter::exit_program("ERROR: Problem occurred calling diff.exe (File: $lastfile) !", "cabinet_cosistency_check");
-                }
-            }
-        }		
-    }	
-
-}
-
-########################################################
-# Signing a list of files
-########################################################
-
-sub sign_files
-{
-    my ( $followmeinfohash, $allfiles, $pw, $cabinternal, $filenamehash, $lastsequencehash, $temppath ) = @_;
-    
-    my $infoline = "";
-    my $fullsuccess = 1;
-    my $maxcounter = 3;
-    
-    my $productname = "";
-    if ( $followmeinfohash->{'allvariableshash'}->{'PRODUCTNAME'} ) { $productname = "/d " . "\"$followmeinfohash->{'allvariableshash'}->{'PRODUCTNAME'}\""; }
-    my $url = "";
-    if (( ! exists($followmeinfohash->{'allvariableshash'}->{'OPENSOURCE'}) ) || ( $followmeinfohash->{'allvariableshash'}->{'OPENSOURCE'} == 0 )) { $url = "/du " . "\"http://www.sun.com\""; }
-    else { $url = "/du " . "\"http://www.openoffice.org\""; }
-    my $timestampurl = "http://timestamp.verisign.com/scripts/timestamp.dll";
-    
-    my $pfxfilepath = $installer::globals::pfxfile;
-    
-    if( $^O =~ /cygwin/i )
-    {
-        $pfxfilepath = qx{cygpath -w "$pfxfilepath"};
-        $pfxfilepath =~ s/\\/\\\\/g;
-        $pfxfilepath =~ s/\s*$//g;
-    }
-    
-    foreach my $onefile ( reverse sort keys %{$allfiles} )
-    {
-        if ( already_certified($onefile) )
-        {
-            $infoline = "Already certified: Skipping file $onefile\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            next;
-        }
-        
-        my $counter = 1;
-        my $success = 0;
-        
-        while (( $counter <= $maxcounter ) && ( ! $success ))
-        {
-            if ( $counter > 1 ) { installer::logger::print_message( "\n\n... repeating file $onefile ...\n" ); }
-            if ( $cabinternal ) { installer::logger::print_message("    Signing: $onefile\n"); }
-            my $systemcall = "signtool.exe sign /f \"$pfxfilepath\" /p $pw $productname $url /t \"$timestampurl\" \"$onefile\"";
-            my $displaysystemcall = "signtool.exe sign /f \"$pfxfilepath\" /p ***** $productname $url /t \"$timestampurl\" \"$onefile\"";
-             $success = make_systemcall_with_warning($systemcall, $displaysystemcall);
-             $counter++;
-         }
-         
-         # Special check for cabinet files, that sometimes get damaged by signtool.exe
-         if (( $success ) && ( $onefile =~ /\.cab\s*$/ ) && ( ! $cabinternal ))
-         {
-             cabinet_cosistency_check($onefile, $followmeinfohash, $filenamehash, $lastsequencehash, $temppath);
-        }
-
-         if ( ! $success )
-         {
-             $fullsuccess = 0;
-            installer::exiter::exit_program("ERROR: Could not sign file: $onefile!", "sign_files");
-        }
-    }
-    
-    return $fullsuccess;
-}
-
-##########################################################################
-# Lines in ddf files must not contain more than 256 characters
-##########################################################################
-
-sub check_ddf_file
-{
-    my ( $ddffile, $ddffilename ) = @_;
-
-    my $maxlength = 0;
-    my $maxline = 0;
-    my $linelength = 0;
-    my $linenumber = 0;
-
-    for ( my $i = 0; $i <= $#{$ddffile}; $i++ )
-    {
-        my $oneline = ${$ddffile}[$i];
-        
-        $linelength = length($oneline);
-        $linenumber = $i + 1;
-        
-        if ( $linelength > 256 )
-        {
-            installer::exiter::exit_program("ERROR \"$ddffilename\" line $linenumber: Lines in ddf files must not contain more than 256 characters!", "check_ddf_file");
-        }
-        
-        if ( $linelength > $maxlength )
-        {
-            $maxlength = $linelength;
-            $maxline = $linenumber;
-        }
-    }
-    
-    my $infoline = "Check of ddf file \"$ddffilename\": Maximum length \"$maxlength\" in line \"$maxline\" (allowed line length: 256 characters)\n"; 
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-#################################################################
-# Setting the path, where the cab files are unpacked.
-#################################################################
-
-sub get_cab_path
-{
-    my ($temppath) = @_;
-
-    my $cabpath = "cabs_" . $$;
-    $cabpath = $temppath . $installer::globals::separator . $cabpath;
-    if ( ! -d $cabpath ) { installer::systemactions::create_directory($cabpath); }
-
-    return $cabpath;	
-}
-
-#################################################################
-# Setting the path, where the diff can happen.
-#################################################################
-
-sub get_diff_path
-{
-    my ($temppath) = @_;
-
-    my $diffpath = "diff_" . $$;
-    $diffpath = $temppath . $installer::globals::separator . $diffpath;
-    if ( ! -d $diffpath ) { installer::systemactions::create_directory($diffpath); }
-
-    return $diffpath;	
-}
-
-#################################################################
-# Exclude all cab files from the msi database.
-#################################################################
-
-sub extract_cabs_from_database
-{
-    my ($msidatabase, $allcabfiles) = @_;
-
-    installer::logger::include_header_into_logfile("Extracting cabs from msi database");
-
-    my $infoline = "";
-    my $fullsuccess = 1;
-    my $msidb = "msidb.exe";	# Has to be in the path
-
-    # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-    $msidatabase =~ s/\//\\\\/g;
-
-    foreach my $onefile ( keys %{$allcabfiles} )
-    {
-        my $systemcall = $msidb . " -d " . $msidatabase . " -x " . $onefile;
-         my $success = make_systemcall($systemcall, $systemcall);
-        if ( ! $success ) { $fullsuccess = 0; }
-        
-        # and removing the stream from the database
-        $systemcall = $msidb . " -d " . $msidatabase . " -k " . $onefile;
-         $success = make_systemcall($systemcall, $systemcall);
-        if ( ! $success ) { $fullsuccess = 0; }
-    }
-    
-    return $fullsuccess;
-}
-
-#################################################################
-# Include cab files into the msi database.
-#################################################################
-
-sub include_cabs_into_database
-{
-    my ($msidatabase, $allcabfiles) = @_;
-
-    installer::logger::include_header_into_logfile("Including cabs into msi database");
-
-    my $infoline = "";
-    my $fullsuccess = 1;
-    my $msidb = "msidb.exe";	# Has to be in the path
-
-    # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-    $msidatabase =~ s/\//\\\\/g;
-
-    foreach my $onefile ( keys %{$allcabfiles} )
-    {
-        my $systemcall = $msidb . " -d " . $msidatabase . " -a " . $onefile;
-         my $success = make_systemcall($systemcall, $systemcall);
-        if ( ! $success ) { $fullsuccess = 0; }
-    }
-    
-    return $fullsuccess;
-}
-
-########################################################
-# Reading the order of the files inside the
-# cabinet files.
-########################################################
-
-sub read_cab_file
-{
-    my ($cabfilename) = @_;
-
-    installer::logger::print_message( "\n... reading cabinet file $cabfilename ...\n" );
-    my $infoline = "Reading cabinet file $cabfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $systemcall = "cabarc.exe" . " L " . $cabfilename;
-    push(@logfile, "$systemcall\n");
-    
-    my ($success, $fileorder) = execute_open_system_call($systemcall);
-
-    my @allfiles = ();
-    
-    for ( my $i = 0; $i <= $#{$fileorder}; $i++ )
-    {
-        my $line = ${$fileorder}[$i];
-        if ( $line =~ /^\s*(.*?)\s+\d+\s+\d+\/\d+\/\d+\s+\d+\:\d+\:\d+\s+[\w-]+\s*$/ )
-        {
-            my $filename = $1;
-            push(@allfiles, $filename);
-        }
-    }
-        
-    return \@allfiles;
-}
-
-########################################################
-# Unpacking a cabinet file.
-########################################################
-
-sub unpack_cab_file
-{
-    my ($cabfilename, $temppath) = @_;
-
-    installer::logger::print_message( "\n... unpacking cabinet file $cabfilename ...\n" );
-    my $infoline = "Unpacking cabinet file $cabfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    
-    my $dirname = $cabfilename;
-    $dirname =~ s/\.cab\s*$//;
-    my $workingpath = $temppath . $installer::globals::separator . "unpack_". $dirname . "_" . $$;	
-    if ( ! -d $workingpath ) { installer::systemactions::create_directory($workingpath); }
-
-    # changing into unpack directory
-    my $from = cwd();
-    chdir($workingpath);
-
-    my $fullcabfilename = $from . $installer::globals::separator . $cabfilename;
-
-    if( $^O =~ /cygwin/i )
-    {
-        $fullcabfilename = qx{cygpath -w "$fullcabfilename"};
-        $fullcabfilename =~ s/\\/\\\\/g;
-        $fullcabfilename =~ s/\s*$//g;
-    }
-
-    my $systemcall = "cabarc.exe" . " -p X " . $fullcabfilename;
-    $success = make_systemcall($systemcall, $systemcall);
-    if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not unpack cabinet file: $fullcabfilename!", "unpack_cab_file"); }
-
-    # returning to directory
-    chdir($from);
-
-    return $workingpath;
-}
-
-########################################################
-# Returning the header of a ddf file.
-########################################################
-
-sub get_ddf_file_header
-{
-    my ($ddffileref, $cabinetfile, $installdir) = @_;
-    
-    my $oneline;
-    my $compressionlevel = 2;
-
-    if( $^O =~ /cygwin/i )
-    {
-        $installdir = qx{cygpath -w "$installdir"};
-        $installdir =~ s/\s*$//g;
-    }
-    
-    $oneline = ".Set CabinetName1=" . $cabinetfile . "\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set ReservePerCabinetSize=128\n";	# This reserves space for a digital signature.
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set MaxDiskSize=2147483648\n";		# This allows the .cab file to get a size of 2 GB.
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set CompressionType=LZX\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set Compress=ON\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set CompressionLevel=$compressionlevel\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set Cabinet=ON\n";
-    push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set DiskDirectoryTemplate=" . $installdir . "\n";
-    push(@{$ddffileref} ,$oneline);
-}
-
-########################################################
-# Writing content into ddf file.
-########################################################
-
-sub put_all_files_into_ddffile
-{
-    my ($ddffile, $allfiles, $workingpath) = @_;
-
-    $workingpath =~ s/\//\\/g;
-
-    for ( my $i = 0; $i <= $#{$allfiles}; $i++ )
-    {
-        my $filename = ${$allfiles}[$i];
-        if( $^O =~ /cygwin/i ) { $filename =~ s/\//\\/g; } # Backslash for Cygwin!
-        if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file: $filename!", "put_all_files_into_ddffile"); }
-        my $infoline = "\"" . $filename . "\"" . " " . ${$allfiles}[$i] . "\n";
-        push( @{$ddffile}, $infoline);
-    }
-}
-
-########################################################
-# Packing a cabinet file.
-########################################################
-
-sub do_pack_cab_file
-{
-    my ($cabfilename, $allfiles, $workingpath, $temppath) = @_;
-
-    installer::logger::print_message( "\n... packing cabinet file $cabfilename ...\n" );
-    my $infoline = "Packing cabinet file $cabfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ( -f $cabfilename ) { unlink($cabfilename); } # removing cab file
-    if ( -f $cabfilename ) { installer::exiter::exit_program("ERROR: Failed to remove file: $cabfilename!", "do_pack_cab_file"); }
-
-    # generate ddf file for makecab.exe
-    my @ddffile = ();
-
-    my $dirname = $cabfilename;
-    $dirname =~ s/\.cab\s*$//;
-    my $ddfpath = $temppath . $installer::globals::separator . "ddf_". $dirname . "_" . $$;	
-
-    my $ddffilename = $cabfilename;
-    $ddffilename =~ s/.cab/.ddf/;
-    $ddffilename = $ddfpath . $installer::globals::separator . $ddffilename;
-        
-    if ( ! -d $ddfpath ) { installer::systemactions::create_directory($ddfpath); }
-
-    my $from = cwd();
-
-    chdir($workingpath); # changing into the directory with the unpacked files
-
-    get_ddf_file_header(\@ddffile, $cabfilename, $from);
-    put_all_files_into_ddffile(\@ddffile, $allfiles, $workingpath);
-    # lines in ddf files must not be longer than 256 characters
-    check_ddf_file(\@ddffile, $ddffilename);
-    
-    installer::files::save_file($ddffilename, \@ddffile);
-
-    if( $^O =~ /cygwin/i )
-    {
-        $ddffilename = qx{cygpath -w "$ddffilename"};
-        $ddffilename =~ s/\\/\\\\/g;
-        $ddffilename =~ s/\s*$//g;
-    }
-
-    my $systemcall = "makecab.exe /V1 /F " . $ddffilename;
-    my $success = make_systemcall($systemcall, $systemcall);
-    if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not pack cabinet file!", "do_pack_cab_file"); }
-
-    chdir($from);
-
-    return ($success);	
-}
-
-########################################################
-# Extraction the file extension from a file
-########################################################
-
-sub get_extension
-{
-    my ( $file ) = @_;
-    
-    my $extension = "";
-    
-    if ( $file =~ /^\s*(.*)\.(\w+?)\s*$/ ) { $extension = $2; }
-    
-    return $extension;	
-}
-
-########################################################
-# Checking, if a file already contains a certificate.
-# This must not be overwritten.
-########################################################
-
-sub already_certified
-{
-    my ( $filename ) = @_;
-    
-    my $success = 1;	
-    my $is_certified = 0;
-    
-    my $systemcall = "signtool.exe verify /q /pa \"$filename\"";
-    my $returnvalue = system($systemcall);
-    
-    if ( $returnvalue ) { $success = 0; }
-
-     if ( $success )
-     {
-         $is_certified = 1;
-        installer::logger::print_message( "... already certified -> skipping $filename ...\n" );
-    }
-
-    return $is_certified;
-}
-
-########################################################
-# Signing the files, that are included into
-# cabinet files.
-########################################################
-
-sub sign_files_in_cabinet_files
-{
-    my ( $followmeinfohash, $allcabfiles, $pw, $temppath ) = @_;
-
-    my $complete_success = 1;
-    my $from = cwd();
-
-    foreach my $cabfilename ( keys %{$allcabfiles} )
-    {
-        my $success = 1;
-        
-        # saving order of files in cab file
-        my $fileorder = read_cab_file($cabfilename);
-
-        # unpack into $working path
-        my $workingpath = unpack_cab_file($cabfilename, $temppath);
-
-        chdir($workingpath);
-
-        # sign files
-        my %allfileshash = ();
-        foreach my $onefile ( @{$fileorder} )
-        {
-            my $extension = get_extension($onefile);
-            if ( exists( $installer::globals::sign_extensions{$extension} ) )
-            {
-                $allfileshash{$onefile} = 1;
-            }
-        }
-         $success = sign_files($followmeinfohash, \%allfileshash, $pw, 1, 0, 0, $temppath);
-        if ( ! $success ) { $complete_success = 0; }
-
-        chdir($from);
-        
-        # pack into new directory
-        do_pack_cab_file($cabfilename, $fileorder, $workingpath, $temppath);
-    }
-    
-    return $complete_success;
-}
-
-########################################################
-# Comparing the content of two directories.
-# Only filesize is compared.
-########################################################
-
-sub compare_directories
-{
-    my ( $dir1, $dir2, $files ) = @_;
-    
-    $dir1 =~ s/\\\s*//;
-    $dir2 =~ s/\\\s*//;
-    $dir1 =~ s/\/\s*//;
-    $dir2 =~ s/\/\s*//;
-
-    my $infoline = "Comparing directories: $dir1 and $dir2\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    
-    foreach my $onefile ( @{$files} )
-    {
-        my $file1 = $dir1 . $installer::globals::separator . $onefile;
-        my $file2 = $dir2 . $installer::globals::separator . $onefile;
-        
-        if ( ! -f $file1 ) { installer::exiter::exit_program("ERROR: Missing file : $file1!", "compare_directories"); }
-        if ( ! -f $file2 ) { installer::exiter::exit_program("ERROR: Missing file : $file2!", "compare_directories"); }
-
-        my $size1 = -s $file1;
-        my $size2 = -s $file2;
-
-        $infoline = "Comparing files: $file1 ($size1) and $file2 ($size2)\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        
-        if ( $size1 != $size2 )
-        {
-            installer::exiter::exit_program("ERROR: File defect after copy (different size) $file1 ($size1 bytes) and $file2 ($size2 bytes)!", "compare_directories");
-        }
-    }
-}
-
-########################################################
-# Signing an existing Windows installation set.
-########################################################
-
-sub sign_install_set
-{
-    my ($followmeinfohash, $make_copy, $temppath) = @_;
-
-    my $installsetpath = $followmeinfohash->{'finalinstalldir'};
-
-    installer::logger::include_header_into_logfile("Start: Signing installation set $installsetpath");
-
-    my $complete_success = 1;
-    my $success = 1;
-    
-    my $infoline = "Signing installation set in $installsetpath\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # check required files.
-    if ( ! $installer::globals::signfiles_checked ) { check_system_path(); }
-    
-    # get cerficate information
-    my $pw = get_pw($installer::globals::pwfile);
-
-    # making a copy of the installation set, if required
-    if ( $make_copy ) { $installsetpath = copy_install_set($installsetpath); }
-    else { $installsetpath = rename_install_set($installsetpath); }
-    
-    # collecting all files in the installation set 
-    my ($allcabfiles, $allfiles, $msidatabase, $contains_external_cabfiles, $contains_msidatabase, $sourcefiles) = analyze_installset_content($installsetpath);
-
-    if ( $make_copy ) { compare_directories($installsetpath, $followmeinfohash->{'finalinstalldir'}, $sourcefiles); }
-
-    # changing into installation set
-    my $from = cwd();
-    my $fullmsidatabase = $installsetpath . $installer::globals::separator . $msidatabase;
-
-    if( $^O =~ /cygwin/i )
-    {
-        $fullmsidatabase = qx{cygpath -w "$fullmsidatabase"};
-        $fullmsidatabase =~ s/\\/\\\\/g;
-        $fullmsidatabase =~ s/\s*$//g;
-    }
-
-    chdir($installsetpath);
-
-    if ( $contains_msidatabase )
-    {
-        # exclude media table from msi database and get all diskids.
-        my ( $cabfilehash, $filenamehash, $lastsequencehash ) = collect_diskid_from_media_table($msidatabase, $followmeinfohash->{'languagestring'});
-
-        # Check, if there are internal cab files 
-        my ( $contains_internal_cabfiles, $all_internal_cab_files) = check_for_internal_cabfiles($cabfilehash);
-
-        if ( $contains_internal_cabfiles )
-        {
-            my $cabpath = get_cab_path($temppath);
-            chdir($cabpath);
-
-            # Exclude all cabinet files from database
-            $success = extract_cabs_from_database($fullmsidatabase, $all_internal_cab_files);
-            if ( ! $success ) { $complete_success = 0; }
-
-            if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $all_internal_cab_files, $pw, $temppath); }
-
-            $success = sign_files($followmeinfohash, $all_internal_cab_files, $pw, 0, $filenamehash, $lastsequencehash, $temppath);
-            if ( ! $success ) { $complete_success = 0; }
-            $success = msicert_database($fullmsidatabase, $all_internal_cab_files, $cabfilehash, 1);
-            if ( ! $success ) { $complete_success = 0; }
-
-            # Include all cabinet files into database
-            $success = include_cabs_into_database($fullmsidatabase, $all_internal_cab_files);
-            if ( ! $success ) { $complete_success = 0; }
-            chdir($installsetpath);
-        }
-
-        # Warning: There might be a problem with very big cabinet files
-        # signing all external cab files first
-        if ( $contains_external_cabfiles )
-        {
-            if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $allcabfiles, $pw, $temppath); }
-
-            $success = sign_files($followmeinfohash, $allcabfiles, $pw, 0, $filenamehash, $lastsequencehash, $temppath);
-            if ( ! $success ) { $complete_success = 0; }
-            $success = msicert_database($msidatabase, $allcabfiles, $cabfilehash, 0);
-            if ( ! $success ) { $complete_success = 0; }
-        }
-    }
-
-    # finally all other files can be signed
-    $success = sign_files($followmeinfohash, $allfiles, $pw, 0, 0, 0, $temppath);
-    if ( ! $success ) { $complete_success = 0; }
-    
-    # and changing back
-    chdir($from);
-
-    installer::logger::include_header_into_logfile("End: Signing installation set $installsetpath");
-    
-    return ($installsetpath);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/strip.pm b/solenv/bin/modules/installer/windows/strip.pm
deleted file mode 100644
index f1733dac4..000000000
--- a/solenv/bin/modules/installer/windows/strip.pm
+++ /dev/null
@@ -1,159 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::strip;
-
-use File::Temp qw(tmpnam);
-use installer::converter;
-use installer::existence;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::systemactions;
-
-#####################################################################
-# Checking whether a file has to be stripped
-#####################################################################
-
-sub need_to_strip
-{
-    my ( $filename ) = @_;
-    
-    my $strip = 0;
-    
-    # Check using the "nm" command
-
-    $filename =~ s/\\/\\\\/g;
-
-    open (FILE, "nm $filename 2>&1 |");
-    my $nmoutput = <FILE>;
-    close (FILE);
-
-    if ( $nmoutput && !( $nmoutput =~ /no symbols/i || $nmoutput =~ /not recognized/i )) { $strip = 1; }
-
-    return $strip		
-}
-
-#####################################################################
-# Checking whether a file has to be stripped
-#####################################################################
-
-sub do_strip
-{
-    my ( $filename ) = @_;
-    
-    my $systemcall = "strip" . " " . $filename;
-    
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not strip $filename!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "SUCCESS: Stripped library $filename!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-#####################################################################
-# Resolving all variables in the packagename.
-#####################################################################
-
-sub strip_binaries
-{
-    my ( $filelist, $languagestringref ) = @_;
-
-    installer::logger::include_header_into_logfile("Stripping files:");
-
-    my $strippeddirbase = installer::systemactions::create_directories("stripped", $languagestringref);
-
-    if (! installer::existence::exists_in_array($strippeddirbase, \@installer::globals::removedirs))
-    {
-        push(@installer::globals::removedirs, $strippeddirbase);		
-    }
-
-    my ($tmpfilehandle, $tmpfilename) = tmpnam();
-    open SOURCEPATHLIST, ">$tmpfilename" or die "oops...\n";
-    for ( my $i = 0; $i <= $#{$filelist}; $i++ )
-    {
-        print SOURCEPATHLIST "${$filelist}[$i]->{'sourcepath'}\n";
-    }
-    close SOURCEPATHLIST;
-    my @filetypelist = qx{file -f "$tmpfilename"};
-    chomp @filetypelist;
-    unlink "$tmpfilename" or die "oops\n";
-    for ( my $i = 0; $i <= $#{$filelist}; $i++ )
-    {
-        ${$filelist}[$i]->{'is_executable'} = ( $filetypelist[$i] =~ /:.*PE executable/ );
-    }	
-
-    if ( $^O =~ /cygwin/i ) { installer::worker::generate_cygwin_pathes($filelist); }
-
-    for ( my $i = 0; $i <= $#{$filelist}; $i++ )
-    {
-        my $sourcefilename = ${$filelist}[$i]->{'cyg_sourcepath'};
-
-        if ( ${$filelist}[$i]->{'is_executable'} && need_to_strip($sourcefilename) )
-        {
-            my $shortfilename = $sourcefilename;
-            installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortfilename);
-            
-            $infoline = "Strip: $shortfilename\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            # copy file into directory for stripped libraries
-
-            my $onelanguage = ${$filelist}[$i]->{'specificlanguage'};
-    
-            # files without language into directory "00"
-            
-            if ($onelanguage eq "") { $onelanguage = "00"; }
-            
-            my $strippeddir = $strippeddirbase . $installer::globals::separator . $onelanguage;
-            installer::systemactions::create_directory($strippeddir);	# creating language specific subdirectories
-
-            my $destfilename = $strippeddir . $installer::globals::separator . $shortfilename;
-            installer::systemactions::copy_one_file($sourcefilename, $destfilename);
-
-            # change sourcepath in files collector
-
-            ${$filelist}[$i]->{'sourcepath'} = $destfilename;
-
-            # strip file
-            
-            do_strip($destfilename);
-        }
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm
deleted file mode 100644
index 9e96e85c5..000000000
--- a/solenv/bin/modules/installer/windows/update.pm
+++ /dev/null
@@ -1,600 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::update;
-
-use installer::converter;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::pathanalyzer;
-use installer::systemactions;
-
-#################################################################################
-# Extracting all tables from an msi database
-#################################################################################
-
-sub extract_all_tables_from_msidatabase
-{
-    my ($fulldatabasepath, $workdir) = @_;
-
-    my $msidb = "msidb.exe";	# Has to be in the path
-    my $infoline = "";
-    my $systemcall = "";
-    my $returnvalue = "";
-    my $extraslash = "";		# Has to be set for non-ActiveState perl
-
-    # Export of all tables by using "*"
-
-    if ( $^O =~ /cygwin/i ) {
-        # msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
-        $fulldatabasepath =~ s/\//\\\\/g;
-        $workdir =~ s/\//\\\\/g;
-        $extraslash = "\\";
-    }
-                            
-    $systemcall = $msidb . " -d " . $fulldatabasepath . " -f " . $workdir . " -e " . $extraslash . "*";
-    $returnvalue = system($systemcall);
-
-    $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute $systemcall !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        installer::exiter::exit_program("ERROR: Could not exclude tables from msi database: $fulldatabasepath !", "extract_all_tables_from_msidatabase");
-    }
-    else
-    {
-        $infoline = "Success: Executed $systemcall successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-#################################################################################
-# Collecting the keys from the first line of the idt file
-#################################################################################
-
-sub collect_all_keys
-{
-    my ($line) = @_;
-
-    my @allkeys = ();
-    my $rownumber = 0;
-    my $onekey = "";
-    
-    while ( $line =~ /^\s*(\S+?)\t(.*)$/ )
-    {
-        $onekey = $1;
-        $line = $2;
-        $rownumber++;
-        push(@allkeys, $onekey);
-    }
-    
-    # and the last key
-    
-    $onekey = $line;
-    $onekey =~ s/^\s*//g;
-    $onekey =~ s/\s*$//g;
-    
-    $rownumber++;
-    push(@allkeys, $onekey);
-
-    return (\@allkeys, $rownumber);
-}
-
-#################################################################################
-# Analyzing the content of one line of an idt file
-#################################################################################
-
-sub get_oneline_hash
-{
-    my ($line, $allkeys, $rownumber) = @_;
-
-    my $counter = 0;	
-    my %linehash = ();
-
-    $line =~ s/^\s*//;
-    $line =~ s/\s*$//;
-
-    my $value = "";
-    my $onekey = "";
-    
-    while ( $line =~ /^(.*?)\t(.*)$/ )
-    {
-        $value = $1;
-        $line = $2;
-        $onekey = ${$allkeys}[$counter];
-        $linehash{$onekey} = $value;
-        $counter++;
-    }
-    
-    # the last column
-
-    $value = $line;
-    $onekey = ${$allkeys}[$counter];
-    
-    $linehash{$onekey} = $value;
-
-    return \%linehash;
-}
-
-#################################################################################
-# Analyzing the content of an idt file
-#################################################################################
-
-sub analyze_idt_file
-{
-    my ($filecontent) = @_;
-    
-    my %table = ();
-    # keys are written in first line
-    my ($allkeys, $rownumber) = collect_all_keys(${$filecontent}[0]);
-
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        if (( $i == 0 ) || ( $i == 1 ) || ( $i == 2 )) { next; }
-
-        my $onelinehash = get_oneline_hash(${$filecontent}[$i], $allkeys, $rownumber);
-        my $linekey = $i - 2;  # ! : The linenumber is the unique key !? Always decrease by two, because of removed first three lines.		
-        $table{$linekey} = $onelinehash;
-    }
-    
-    return \%table;
-}
-
-#################################################################################
-# Reading all idt files in a specified directory
-#################################################################################
-
-sub read_all_tables_from_msidatabase
-{
-    my ($workdir) = @_;
-
-    my %database = ();
-    
-    my $ext = "idt";
-    
-    my $allidtfiles = installer::systemactions::find_file_with_file_extension($ext, $workdir);
-    
-    for ( my $i = 0; $i <= $#{$allidtfiles}; $i++ )
-    {
-        my $onefilename = ${$allidtfiles}[$i];
-        my $longonefilename = $workdir . $installer::globals::separator . $onefilename;
-        if ( ! -f $longonefilename ) { installer::exiter::exit_program("ERROR: Could not find idt file: $longonefilename!", "read_all_tables_from_msidatabase"); }
-        my $filecontent = installer::files::read_file($longonefilename);
-        my $idtcontent = analyze_idt_file($filecontent);
-        my $key = $onefilename;
-        $key =~ s/\.idt\s*$//;
-        $database{$key} = $idtcontent;
-    }
-    
-    return \%database;
-}
-
-#################################################################################
-# Checking, if this is the correct database.
-#################################################################################
-
-sub correct_database
-{
-    my ($product, $pro, $langs, $languagestringref) = @_;
-    
-    my $correct_database = 0;
-    
-    # Comparing $product with $installer::globals::product and
-    # $pro with $installer::globals::pro and
-    # $langs with $languagestringref
-
-    my $product_is_good = 0;
-    
-    my $localproduct = $installer::globals::product;
-    if ( $installer::globals::languagepack ) { $localproduct = $localproduct . "LanguagePack"; }
-    elsif ( $installer::globals::helppack ) { $localproduct = $localproduct . "HelpPack"; }
-
-    if ( $product eq $localproduct ) { $product_is_good = 1; }
-    
-    if ( $product_is_good )
-    {
-        my $pro_is_good = 0;
-
-        if ((( $pro eq "pro" ) && ( $installer::globals::pro )) || (( $pro eq "nonpro" ) && ( ! $installer::globals::pro ))) { $pro_is_good = 1; }
-
-        if ( $pro_is_good )
-        {
-            my $langlisthash = installer::converter::convert_stringlist_into_hash(\$langs, ",");
-            my $langstringhash = installer::converter::convert_stringlist_into_hash($languagestringref, "_");
-        
-            my $not_included = 0;
-            foreach my $onelang ( keys %{$langlisthash} )
-            {
-                if ( ! exists($langstringhash->{$onelang}) )
-                {
-                    $not_included = 1;
-                    last;
-                }	
-            }
-        
-            if ( ! $not_included )
-            {
-                foreach my $onelanguage ( keys %{$langstringhash} )
-                {
-                    if ( ! exists($langlisthash->{$onelanguage}) )
-                    {
-                        $not_included = 1;
-                        last;
-                    }	
-                }
-            
-                if ( ! $not_included ) { $correct_database = 1; }			
-            }
-        }
-    }
-    
-    return $correct_database;
-}
-
-#################################################################################
-# Searching for the path to the reference database for this special product.
-#################################################################################
-
-sub get_databasename_from_list
-{
-    my ($filecontent, $languagestringref, $filename) = @_;
-
-    my $databasepath = "";
-    
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        my $line = ${$filecontent}[$i];
-        if ( $line =~ /^\s*$/ ) { next; } # empty line
-        if ( $line =~ /^\s*\#/ ) { next; } # comment line
-
-        if ( $line =~ /^\s*(.+?)\s*\t+\s*(.+?)\s*\t+\s*(.+?)\s*\t+\s*(.+?)\s*$/ )
-        {
-            my $product = $1;
-            my $pro = $2;
-            my $langs = $3;
-            my $path = $4;
-            
-            if (( $pro ne "pro" ) && ( $pro ne "nonpro" )) { installer::exiter::exit_program("ERROR: Wrong syntax in file: $filename. Only \"pro\" or \"nonpro\" allowed in column 1! Line: \"$line\"", "get_databasename_from_list"); }
-
-            if ( correct_database($product, $pro, $langs, $languagestringref) )
-            {
-                $databasepath = $path;
-                last;	
-            }
-        }
-        else
-        {
-            installer::exiter::exit_program("ERROR: Wrong syntax in file: $filename! Line: \"$line\"", "get_databasename_from_list");
-        }
-    }
-
-    return $databasepath;
-}
-
-#################################################################################
-# Reading an existing database completely
-#################################################################################
-
-sub readdatabase
-{
-    my ($allvariables, $languagestringref, $includepatharrayref) = @_;
-    
-    my $database = "";
-    my $infoline = "";
-
-    if ( ! $allvariables->{'UPDATE_DATABASE_LISTNAME'} ) { installer::exiter::exit_program("ERROR: If \"UPDATE_DATABASE\" is set, \"UPDATE_DATABASE_LISTNAME\" is required.", "Main"); }
-    my $listfilename = $allvariables->{'UPDATE_DATABASE_LISTNAME'};
-
-    # Searching the list in the include pathes
-    my $listname = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$listfilename, $includepatharrayref, 1);
-    if ( $$listname eq "" ) { installer::exiter::exit_program("ERROR: List file not found: $listfilename !", "readdatabase"); }
-    my $completelistname = $$listname;
-
-    # Reading list file
-    my $listfile = installer::files::read_file($completelistname);
-
-    # Get name and path of reference database	
-    my $databasename = get_databasename_from_list($listfile, $languagestringref, $completelistname);
-    
-    # If the correct database was not found, this is not necessarily an error. But in this case, this is not an update packaging process!
-    if (( $databasename ) && ( $databasename ne "" )) # This is an update packaging process!
-    {
-        $installer::globals::updatedatabase = 1;
-        installer::logger::print_message( "... update process, using database $databasename ...\n" );
-        $infoline = "\nDatabase found in $completelistname: \"$databasename\"\n\n";
-        # Saving in global variable
-        $installer::globals::updatedatabasepath = $databasename;
-    }
-    else
-    {
-        $infoline = "\nNo database found in $completelistname. This is no update process!\n\n";
-    }
-    push( @installer::globals::logfileinfo, $infoline);
-    
-    if ( $installer::globals::updatedatabase )
-    {
-        if ( ! -f $databasename ) { installer::exiter::exit_program("ERROR: Could not find reference database: $databasename!", "readdatabase"); }
-
-        my $msifilename = $databasename;
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$msifilename);
-    
-        installer::logger::include_timestamp_into_logfile("Performance Info: readdatabase start");
-
-        # create directory for unpacking
-        my $databasedir = installer::systemactions::create_directories("database", $languagestringref);
-    
-        # copy database
-        my $fulldatabasepath = $databasedir . $installer::globals::separator . $msifilename;
-        installer::systemactions::copy_one_file($databasename, $fulldatabasepath);
-
-        installer::logger::include_timestamp_into_logfile("Performance Info: readdatabase: before extracting tables");
-    
-        # extract all tables from database
-        extract_all_tables_from_msidatabase($fulldatabasepath, $databasedir);
-
-        installer::logger::include_timestamp_into_logfile("Performance Info: readdatabase: before reading tables");
-
-        # read all tables
-        $database = read_all_tables_from_msidatabase($databasedir);
-    
-        # Test output:
-    
-        #	foreach my $key1 ( keys %{$database} )
-        #	{
-        #		print "Test1: $key1\n";
-        #		foreach my $key2 ( keys %{$database->{$key1}} )
-        #		{
-        #			print "\tTest2: $key2\n";			
-        #			foreach my $key3 ( keys %{$database->{$key1}->{$key2}} )
-        #			{
-        #				print "\t\tTest3: $key3: $database->{$key1}->{$key2}->{$key3}\n";
-        #			}
-        #		}
-        #	}
-    
-        # Example: File table
-        
-        # my $filetable = $database->{'File'};
-        # foreach my $linenumber ( keys  %{$filetable} )
-        # {
-        #	print "Test Filenumber: $linenumber\n";
-        #	foreach my $key ( keys %{$filetable->{$linenumber}} )
-        #	{
-        #		print "\t\tTest: $key: $filetable->{$linenumber}->{$key}\n";
-        #	}
-        # }
-
-        # Example: Searching for ProductCode in table Property
-
-        # my $column1 = "Property";
-        # my $column2 = "Value";
-        # my $searchkey = "ProductCode";
-        # my $propertytable = $database->{'Property'};
-        # foreach my $linenumber ( keys  %{$propertytable} )
-        # {
-        #	if ( $propertytable->{$linenumber}->{$column1} eq $searchkey )
-        #	{
-        #		print("Test: $searchkey : $propertytable->{$linenumber}->{$column2}\n");
-        #	}
-        # }
-
-        installer::logger::include_timestamp_into_logfile("Performance Info: readdatabase end");
-    }
-    
-    return $database;
-}
-
-#################################################################################
-# Files can be included in merge modules. This is also important for update.
-#################################################################################
-
-sub readmergedatabase
-{
-    my ( $mergemodules, $languagestringref, $includepatharrayref ) = @_;
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: readmergedatabase start");
-
-    my $mergemoduledir = installer::systemactions::create_directories("mergedatabase", $languagestringref);
-    
-    my %allmergefiles = ();
-
-    $installer::globals::mergemodulenumber = $#{$mergemodules} + 1;
-
-    foreach my $mergemodule ( @{$mergemodules} )
-    {
-        my $filename = $mergemodule->{'Name'};
-        my $mergefile = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
-    
-        if ( $$mergefile eq "" ) { installer::exiter::exit_program("ERROR: msm file not found: $filename !", "readmergedatabase"); }
-        my $completesource = $$mergefile;
-            
-        my $mergegid = $mergemodule->{'gid'};
-        my $workdir = $mergemoduledir . $installer::globals::separator . $mergegid;
-        if ( ! -d $workdir ) { installer::systemactions::create_directory($workdir); }
-
-        my $completedest = $workdir . $installer::globals::separator . $filename;
-        installer::systemactions::copy_one_file($completesource, $completedest);
-        if ( ! -f $completedest ) { installer::exiter::exit_program("ERROR: msm file not found: $completedest !", "readmergedatabase"); }
-        
-        # extract all tables from database
-        extract_all_tables_from_msidatabase($completedest, $workdir);
-
-        # read all tables
-        my $onemergefile = read_all_tables_from_msidatabase($workdir);
-        
-        $allmergefiles{$mergegid} = $onemergefile;
-    }
-    
-    foreach my $mergefilegid ( keys %allmergefiles )
-    {
-        my $onemergefile = $allmergefiles{$mergefilegid};
-        my $filetable = $onemergefile->{'File'};
-        
-        foreach my $linenumber ( keys %{$filetable} )
-        {
-            # Collecting all files from merge modules in global hash
-            $installer::globals::mergemodulefiles{$filetable->{$linenumber}->{'File'}} = 1;
-        }
-    }
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: readmergedatabase end");
-}
-
-#################################################################################
-# Creating several useful hashes from old database
-#################################################################################
-
-sub create_database_hashes
-{
-    my ( $database ) = @_;
-    
-    # 1. Hash ( Component -> UniqueFileName ), required in File table.
-    # Read from File table.
-    
-    my %uniquefilename = ();
-    my %allupdatesequences = ();
-    my %allupdatecomponents = ();
-    my %allupdatefileorder = ();
-    my %allupdatecomponentorder = ();
-    my %revuniquefilename = ();
-    my %revshortfilename = ();
-    my %shortdirname = ();
-    my %componentid = ();
-    my %componentidkeypath = ();
-    my %alloldproperties = ();
-    my %allupdatelastsequences = ();
-    my %allupdatediskids = ();
-
-    my $filetable = $database->{'File'};
-    
-    foreach my $linenumber ( keys  %{$filetable} )
-    {
-        my $comp = $filetable->{$linenumber}->{'Component_'};
-        my $uniquename = $filetable->{$linenumber}->{'File'};
-        my $filename = $filetable->{$linenumber}->{'FileName'};
-        my $sequence = $filetable->{$linenumber}->{'Sequence'};
-            
-        my $shortname = "";
-        if ( $filename =~ /^\s*(.*?)\|\s*(.*?)\s*$/ )
-        {
-            $shortname = $1;	
-            $filename = $2;	
-        }
-
-        # unique is the combination of $component and $filename
-        my $key = "$comp/$filename";
-        
-        if ( exists($uniquefilename{$key}) ) { installer::exiter::exit_program("ERROR: Component/FileName \"$key\" is not unique in table \"File\" !", "create_database_hashes"); }
-
-        my $value = $uniquename;
-        if ( $shortname ne "" ) { $value = "$uniquename;$shortname"; }
-        $uniquefilename{$key} = $value;	# saving the unique keys and short names in hash
-        
-        # Saving reverse keys too
-        $revuniquefilename{$uniquename} = $key;
-        if ( $shortname ne "" ) { $revshortfilename{$shortname} = $key; }
-        
-        # Saving Sequences for unique names (and also components)
-        $allupdatesequences{$uniquename} = $sequence;
-        $allupdatecomponents{$uniquename} = $comp;
-
-        # Saving unique names and components for sequences
-        $allupdatefileorder{$sequence} = $uniquename;
-        $allupdatecomponentorder{$sequence} = $comp;
-    }
-    
-    # 2. Hash, required in Directory table.
-    
-    my $dirtable = $database->{'Directory'};
-    
-    foreach my $linenumber ( keys  %{$dirtable} )
-    {
-        my $dir = $dirtable->{$linenumber}->{'Directory'}; # this is a unique name
-        my $defaultdir = $dirtable->{$linenumber}->{'DefaultDir'};
-        
-        my $shortname = "";
-        if ( $defaultdir =~ /^\s*(.*?)\|\s*(.*?)\s*$/ )
-        {
-            $shortname = $1;
-            $shortdirname{$dir} = $shortname;	# collecting only the short names
-        }
-    }
-
-    # 3. Hash, collecting info from Component table.
-    # ComponentID and KeyPath have to be reused.
-    
-    my $comptable = $database->{'Component'};
-    
-    foreach my $linenumber ( keys  %{$comptable} )
-    {
-        my $comp = $comptable->{$linenumber}->{'Component'};
-        my $compid = $comptable->{$linenumber}->{'ComponentId'};
-        my $keypath = $comptable->{$linenumber}->{'KeyPath'};
-
-        $componentid{$comp} = $compid;
-        $componentidkeypath{$comp} = $keypath;		
-    }
-
-    # 4. Hash, property table, required for ProductCode and Installlocation.
-
-    my $proptable = $database->{'Property'};
-    
-    foreach my $linenumber ( keys  %{$proptable} )
-    {
-        my $prop = $proptable->{$linenumber}->{'Property'};
-        my $value = $proptable->{$linenumber}->{'Value'};
-
-        $alloldproperties{$prop} = $value;
-    }
-    
-    # 5. Media table, getting last sequence
-    
-    my $mediatable = $database->{'Media'};
-    $installer::globals::updatelastsequence = 0;
-    
-    foreach my $linenumber ( keys  %{$mediatable} )
-    {
-        my $cabname = $mediatable->{$linenumber}->{'Cabinet'};
-        my $lastsequence = $mediatable->{$linenumber}->{'LastSequence'};
-        my $diskid = $mediatable->{$linenumber}->{'DiskId'};
-        $allupdatelastsequences{$cabname} = $lastsequence;
-        $allupdatediskids{$cabname} = $diskid;
-        
-        if ( $lastsequence > $installer::globals::updatelastsequence ) { $installer::globals::updatelastsequence = $lastsequence; }
-    }
-
-    $installer::globals::updatesequencecounter = $installer::globals::updatelastsequence;
-
-    return (\%uniquefilename, \%revuniquefilename, \%revshortfilename, \%allupdatesequences, \%allupdatecomponents, \%allupdatefileorder, \%allupdatecomponentorder, \%shortdirname, \%componentid, \%componentidkeypath, \%alloldproperties, \%allupdatelastsequences, \%allupdatediskids);
-}
-
-
-1;
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm
deleted file mode 100644
index 69041664b..000000000
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ /dev/null
@@ -1,168 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::upgrade;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-####################################################################################
-# Creating the file Upgrade.idt dynamically
-# Content: 
-# UpgradeCode VersionMin VersionMax Language Attributes Remove ActionProperty
-####################################################################################
-
-sub create_upgrade_table
-{
-    my ($basedir, $allvariableshashref) = @_;
-
-    my @upgradetable = ();
-
-    # fix for problematic OOo 1.9 versions
-    my $include_ooo_fix = 0;
-    my $ooomaxnew = "";
-    if (($installer::globals::product =~ /^\s*OpenOffice/i ) && ( ! ( $installer::globals::product =~ /SDK/i )) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
-    {
-        $include_ooo_fix = 1;
-        $ooomaxnew = "34.0.0";
-    }
-    
-    installer::windows::idtglobal::write_idt_header(\@upgradetable, "upgrade");
-
-    # Setting also $installer::globals::msimajorproductversion, that is for example "3.0.0", to differ between old products for OOo 2.x and 
-    # older products from OOo 3.x. The latter must be removed always, the removal of the first is controlled with a checkbox.
-    my $newline = $installer::globals::upgradecode . "\t" . "\t" . $installer::globals::msimajorproductversion . "\t" . "\t" . "0" . "\t" . "\t" . "OLDPRODUCTS" . "\n";
-    push(@upgradetable, $newline);
-
-    # Setting all products, that must be removed.
-    # $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msimajorproductversion . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "257" . "\t" . "\t" . "OLDPRODUCTSSAMEMAJOR" . "\n";
-    $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msimajorproductversion . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "769" . "\t" . "\t" . "OLDPRODUCTSSAMEMAJOR" . "\n";
-    push(@upgradetable, $newline);
-
-    if ( ! $installer::globals::patch )
-    {
-        # preventing downgrading
-        $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msiproductversion . "\t" . $ooomaxnew . "\t" . "\t" . "2" . "\t" . "\t" . "NEWPRODUCTS" . "\n";
-        push(@upgradetable, $newline);
-
-        # $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msiproductversion . "\t" . $ooomaxnew . "\t" . "\t" . "258" . "\t" . "\t" . "SAMEPRODUCTS" . "\n";
-        # push(@upgradetable, $newline);
-
-        if ( $include_ooo_fix )
-        {
-            $newline = $installer::globals::upgradecode . "\t" . "35.0.0" . "\t" . "36.0.0" . "\t" . "\t" . "1" . "\t" . "\t" . "OLDPRODUCTS2" . "\n";
-            push(@upgradetable, $newline);
-        }
-
-        # if (( $allvariableshashref->{'PATCHUPGRADECODE'} ) && ( ! $installer::globals::languagepack ))
-        # {
-        #	$newline = $allvariableshashref->{'PATCHUPGRADECODE'} . "\t" . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "1" . "\t" . "\t" . "OLDPRODUCTSPATCH" . "\n";
-        #	push(@upgradetable, $newline);
-        #
-        #	$newline = $allvariableshashref->{'PATCHUPGRADECODE'} . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "\t" . "2" . "\t" . "\t" . "NEWPRODUCTSPATCH" . "\n";
-        #	push(@upgradetable, $newline);
-        #
-        #	$newline = $allvariableshashref->{'PATCHUPGRADECODE'} . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "\t" . "258" . "\t" . "\t" . "SAMEPRODUCTSPATCH" . "\n";
-        #	push(@upgradetable, $newline);	
-        # }
-        
-        # also searching for the beta
-        
-        if (( $allvariableshashref->{'BETAUPGRADECODE'} ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
-        {
-            $newline = $allvariableshashref->{'BETAUPGRADECODE'} . "\t" . "1.0" . "\t" . "\t" . "\t" . "1" . "\t" . "\t" . "BETAPRODUCTS" . "\n";
-            push(@upgradetable, $newline);
-        }
-
-        # also searching for the stub
-        
-        if (( $allvariableshashref->{'STUBUPGRADECODE'} ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
-        {
-            $newline = $allvariableshashref->{'STUBUPGRADECODE'} . "\t" . "1.0" . "\t" . "\t" . "\t" . "1" . "\t" . "\t" . "STUBPRODUCTS" . "\n";
-            push(@upgradetable, $newline);
-        }
-        
-        # searching for all older patches and languagepacks (defined in a extra file)
-
-        if (( $allvariableshashref->{'REMOVE_UPGRADE_CODE_FILE'} ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
-        {
-            my $filename = $allvariableshashref->{'REMOVE_UPGRADE_CODE_FILE'};
-            my $langpackcodefilename = $installer::globals::idttemplatepath  . $installer::globals::separator . $filename;
-            if ( ! -f $langpackcodefilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$langpackcodefilename\".", "create_upgrade_table"); }
-
-            my $filecontent = installer::files::read_file($langpackcodefilename);
-            my $newlines = analyze_file_for_upgrade_table($filecontent);
-
-            for ( my $i = 0; $i <= $#{$newlines}; $i++ ) { push(@upgradetable, ${$newlines}[$i]); }
-        }
-    }
-
-    # No upgrade for Beta versions!
-    
-    if (( $allvariableshashref->{'PRODUCTEXTENSION'} eq "Beta" ) && ( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
-    {
-        @upgradetable = ();
-        installer::windows::idtglobal::write_idt_header(\@upgradetable, "upgrade");
-        my $infoline = "Beta product -> empty Upgrade table\n"; 
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-    
-    # Saving the file
-
-    my $upgradetablename = $basedir . $installer::globals::separator . "Upgrade.idt";
-    installer::files::save_file($upgradetablename ,\@upgradetable);
-    my $infoline = "Created idt file: $upgradetablename\n"; 
-    push(@installer::globals::logfileinfo, $infoline);
-}
-
-##############################################################
-# Reading the file with UpgradeCodes of old products,
-# that can be removed, if the user wants to remove them.
-##############################################################
-
-sub analyze_file_for_upgrade_table
-{
-    my ($filecontent) = @_;
-
-    my @allnewlines = ();
-    
-    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
-    {
-        my $line = ${$filecontent}[$i];
-        if ( $line =~ /^\s*$/ ) { next; } # empty lines can be ignored
-        if ( $line =~ /^\s*\#/ ) { next; } # comment lines starting with a hash
-
-        if ( $line =~ /^(.*)\t(.*)\t(.*)\t(.*)\t(.*)\t(.*)\t(.*)$/ ) { push(@allnewlines, $line); }
-        else { installer::exiter::exit_program("ERROR: Wrong syntax in file for upgrade table", "analyze_file_for_upgrade_table"); }
-    }
-    
-    return \@allnewlines;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
deleted file mode 100644
index af571dc3d..000000000
--- a/solenv/bin/modules/installer/worker.pm
+++ /dev/null
@@ -1,3374 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::worker;
-
-use Cwd;
-use File::Copy;
-use File::stat;
-use File::Temp qw(tmpnam);
-use File::Path;
-use installer::control;
-use installer::converter;
-use installer::existence;
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::scpzipfiles;
-use installer::scriptitems;
-use installer::sorter;
-use installer::systemactions;
-use installer::windows::language;
-
-#####################################################################
-# Unpacking all files ending with tar.gz in a specified directory 
-#####################################################################
-
-sub unpack_all_targzfiles_in_directory
-{
-    my ( $directory ) = @_;
-
-    installer::logger::include_header_into_logfile("Unpacking tar.gz files:");
-
-    installer::logger::print_message( "... unpacking tar.gz files ... \n" );
-
-    my $localdirectory = $directory . $installer::globals::separator . "packages";
-    my $alltargzfiles = installer::systemactions::find_file_with_file_extension("tar.gz", $localdirectory);
-
-    for ( my $i = 0; $i <= $#{$alltargzfiles}; $i++ )
-    {
-        my $onefile = $localdirectory . $installer::globals::separator . ${$alltargzfiles}[$i];
-
-        my $systemcall = "cd $localdirectory; cat ${$alltargzfiles}[$i] \| gunzip \| tar -xf -";
-        $returnvalue = system($systemcall);
-
-        my $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    
-        if ($returnvalue)
-        {
-            $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        else
-        {
-            $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-}
-
-#########################################
-# Copying installation sets to ship 
-#########################################
-
-sub copy_install_sets_to_ship
-{
-    my ( $destdir, $shipinstalldir  ) = @_;
-
-    installer::logger::include_header_into_logfile("Copying installation set to ship:");
-    
-    my $dirname = $destdir;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$dirname);
-    $dirname = $dirname . "_inprogress";
-    my $localshipinstalldir = $shipinstalldir . $installer::globals::separator . $dirname;
-    if ( ! -d $localshipinstalldir ) { installer::systemactions::create_directory_structure($localshipinstalldir); }
-
-    # copy installation set to /ship ($localshipinstalldir)
-    installer::logger::print_message( "... copy installation set from " . $destdir . " to " . $localshipinstalldir . "\n" );
-    installer::systemactions::copy_complete_directory($destdir, $localshipinstalldir);
-
-    # unpacking the tar.gz file for Solaris
-    if ( $installer::globals::issolarisbuild ) { unpack_all_targzfiles_in_directory($localshipinstalldir); }
-    
-    $localshipinstalldir = installer::systemactions::rename_string_in_directory($localshipinstalldir, "_inprogress", "");
-
-    return $localshipinstalldir;
-}
-
-#########################################
-# Copying installation sets to ship 
-#########################################
-
-sub link_install_sets_to_ship
-{
-    my ( $destdir, $shipinstalldir  ) = @_;
-
-    installer::logger::include_header_into_logfile("Linking installation set to ship:");
-
-    my $infoline = "... destination directory: $shipinstalldir ...\n";
-    installer::logger::print_message( $infoline );
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ( ! -d $shipinstalldir)
-    {
-        $infoline = "Creating directory: $shipinstalldir\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        installer::systemactions::create_directory_structure($shipinstalldir);
-        $infoline = "Created directory: $shipinstalldir\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    my $dirname = $destdir;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$dirname);
-
-    my $localshipinstalldir = $shipinstalldir . $installer::globals::separator . $dirname;
-
-    # link installation set to /ship ($localshipinstalldir)
-    installer::logger::print_message( "... linking installation set from " . $destdir . " to " . $localshipinstalldir . "\n" );
-    
-    my $systemcall = "ln -s $destdir $localshipinstalldir";
-
-    $returnvalue = system($systemcall);
-
-    $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not create link \"$localshipinstalldir\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Created link \"$localshipinstalldir\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    return $localshipinstalldir;
-}
-
-#########################################
-# Create checksum file 
-#########################################
-
-sub make_checksum_file
-{
-    my ( $filesref, $includepatharrayref ) = @_;
-    
-    my @checksum = ();
-    
-    my $checksumfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$installer::globals::checksumfile, $includepatharrayref, 1);
-    if ( $$checksumfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $installer::globals::checksumfile !", "make_checksum_file"); }
-
-    my $systemcall = "$$checksumfileref";
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-        $systemcall = $systemcall . " " . $onefile->{'sourcepath'};		# very very long systemcall
-
-        if ((( $i > 0 ) &&  ( $i%100 == 0 )) || ( $i == $#{$filesref} ))	# limiting to 100 files
-        {
-            $systemcall = $systemcall . " \|";
-
-            my @localchecksum = ();
-            open (CHECK, "$systemcall");
-            @localchecksum = <CHECK>;
-            close (CHECK);
-            
-            for ( my $j = 0; $j <= $#localchecksum; $j++ ) { push(@checksum, $localchecksum[$j]); }
-
-            $systemcall = "$$checksumfileref";	# reset the system call
-        }
-    }
-
-    return \@checksum;
-}
-
-#########################################
-# Saving the checksum file 
-#########################################
-
-sub save_checksum_file
-{
-    my ($current_install_number, $installchecksumdir, $checksumfile) = @_;
-    
-    my $numberedchecksumfilename = $installer::globals::checksumfilename;
-    $numberedchecksumfilename =~ s/\./_$current_install_number\./;	# checksum.txt -> checksum_01.txt
-    installer::files::save_file($installchecksumdir . $installer::globals::separator . $numberedchecksumfilename, $checksumfile);
-}
-
-#################################################
-# Writing some global information into 
-# the list of files without flag PATCH
-#################################################
-
-sub write_nopatchlist_header
-{
-    my ( $content ) = @_;
-
-    my @header = ();
-    my $infoline = "This is a list of files, that are defined in scp-projects without\n";
-    push(@header, $infoline);
-    $infoline = "flag \"PATCH\". Important: This does not mean in any case, that \n";
-    push(@header, $infoline);
-    $infoline = "this files are included into or excluded from a patch. \n\n";
-    push(@header, $infoline);
-    $infoline = "Exception Linux: A patch rpm is a complete rpm. This means that all \n";
-    push(@header, $infoline);
-    $infoline = "files are included into a patch rpm, if only one file of the rpm has the \n";
-    push(@header, $infoline);
-    $infoline = "style \"PATCH\". \n\n";
-    push(@header, $infoline);
-
-    for ( my $i = 0; $i <= $#header; $i++ ) { push(@{$content},$header[$i]); }
-}
-
-#################################################
-# Creating the content of the list of files
-# without flag PATCH.
-# All files are saved in 
-# @{$installer::globals::nopatchfilecollector}
-#################################################
-
-sub create_nopatchlist
-{
-    my @content =();
-    
-    write_nopatchlist_header(\@content);
-
-    for ( my $i = 0; $i <= $#{$installer::globals::nopatchfilecollector}; $i++ )
-    {
-        my $onefile = ${$installer::globals::nopatchfilecollector}[$i];
-        my $oneline = $onefile->{'destination'};
-        if ( $onefile->{'zipfilename'} ) { $oneline = $oneline . " (" . $onefile->{'zipfilename'} . ")"; }
-        $oneline = $oneline . "\n";
-        push(@content, $oneline);
-    }
-    
-    return \@content;
-}
-
-#########################################
-# Saving the patchlist file 
-#########################################
-
-sub save_patchlist_file
-{
-    my ($installlogdir, $patchlistfilename) = @_;
-
-    my $installpatchlistdir = installer::systemactions::create_directory_next_to_directory($installlogdir, "patchlist");
-    $patchlistfilename =~ s/log\_/patchfiles\_/;
-    $patchlistfilename =~ s/\.log/\.txt/;
-    installer::files::save_file($installpatchlistdir . $installer::globals::separator . $patchlistfilename, \@installer::globals::patchfilecollector);
-    installer::logger::print_message( "... creating patchlist file $patchlistfilename \n" );
-
-    if (( $installer::globals::patch ) && ( ! $installer::globals::creating_windows_installer_patch ))	# only for non-Windows patches
-    {
-        $patchlistfilename =~ s/patchfiles\_/nopatchfiles\_/;
-        my $nopatchlist = create_nopatchlist();
-        installer::files::save_file($installpatchlistdir . $installer::globals::separator . $patchlistfilename, $nopatchlist);
-        installer::logger::print_message( "... creating patch exclusion file $patchlistfilename \n" );
-    }
-
-}
-
-###############################################################
-# Removing all directories of a special language
-# in the directory $basedir
-###############################################################
-
-sub remove_old_installation_sets
-{
-    my ($basedir) = @_;
-
-    installer::logger::print_message( "... removing old installation directories ...\n" );
-
-    my $removedir = $basedir;	
-    
-    if ( -d $removedir ) { installer::systemactions::remove_complete_directory($removedir, 1); }
-    
-    # looking for non successful old installation sets
-    
-    $removedir = $basedir . "_witherror";
-    if ( -d $removedir ) { installer::systemactions::remove_complete_directory($removedir, 1); }
-
-    $removedir = $basedir . "_inprogress";
-    if ( -d $removedir ) { installer::systemactions::remove_complete_directory($removedir, 1); }
-    
-    # finally the $basedir can be created empty
-    
-    if ( $installer::globals::localinstalldirset ) { installer::systemactions::create_directory_structure($basedir); }
-
-    installer::systemactions::create_directory($basedir);
-}
-
-###############################################################
-# Removing all non successful installation sets on ship
-###############################################################
-
-sub remove_old_ship_installation_sets
-{
-    my ($fulldir, $counter) = @_;
-
-    installer::logger::print_message( "... removing old installation directories ...\n" );
-
-    my $basedir = $fulldir;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$basedir);
-
-    # collecting all directories next to the new installation directory
-    my $alldirs = installer::systemactions::get_all_directories($basedir);
-
-    if ( $fulldir =~ /^\s*(.*?inprogress\-)(\d+)(.*?)\s*$/ )
-    {
-        my $pre_inprogress = $1;		# $pre still contains "inprogress"
-        my $number = $2;
-        my $post = $3;
-        my $pre_witherror = $pre_inprogress;
-        $pre_witherror =~ s/inprogress/witherror/;
-
-        for ( my $i = 0; $i <= $#{$alldirs}; $i++ )
-        {
-            if ( ${$alldirs}[$i] eq $fulldir ) { next; }	# do not delete the newly created directory
-
-            if ( ${$alldirs}[$i] =~ /^\s*\Q$pre_inprogress\E\d+\Q$post\E\s*$/ )	# removing old "inprogress" directories
-            {
-                installer::systemactions::remove_complete_directory(${$alldirs}[$i], 1);
-            }
-
-            if ( ${$alldirs}[$i] =~ /^\s*\Q$pre_witherror\E\d+\Q$post\E\s*$/ )	# removing old "witherror" directories
-            {
-                installer::systemactions::remove_complete_directory(${$alldirs}[$i], 1);
-            }
-        }
-    }	
-}
-
-###############################################################
-# Creating the installation directory structure
-###############################################################
-
-sub create_installation_directory
-{
-    my ($shipinstalldir, $languagestringref, $current_install_number_ref) = @_;
-    
-    my $installdir = "";
-
-    my $languageref = $languagestringref;
-
-    if ( $installer::globals::updatepack )
-    {
-        $installdir = $shipinstalldir;
-        installer::systemactions::create_directory_structure($installdir);
-        $$current_install_number_ref = installer::systemactions::determine_maximum_number($installdir, $languageref);
-        $installdir = installer::systemactions::rename_string_in_directory($installdir, "number", $$current_install_number_ref);
-        remove_old_ship_installation_sets($installdir);
-    }
-    else
-    {		
-        $installdir = installer::systemactions::create_directories("install", $languageref);
-        installer::logger::print_message( "... creating installation set in $installdir ...\n" );
-        remove_old_installation_sets($installdir);
-        my $inprogressinstalldir = $installdir . "_inprogress";
-        installer::systemactions::rename_directory($installdir, $inprogressinstalldir);
-        $installdir = $inprogressinstalldir;
-    }
-
-    $installer::globals::saveinstalldir = $installdir; 	# saving directory globally, in case of exiting
-
-    return $installdir;
-}
-
-###############################################################
-# Analyzing and creating the log file
-###############################################################
-
-sub analyze_and_save_logfile
-{
-    my ($loggingdir, $installdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number) = @_;
-    
-    my $is_success = 1;
-    my $finalinstalldir = "";
-    
-    installer::logger::print_message( "... checking log file " . $loggingdir . $installer::globals::logfilename . "\n" );
-
-    my $contains_error = installer::control::check_logfile(\@installer::globals::logfileinfo);
-
-    # Dependent from the success, the installation directory can be renamed.
-        
-    if ( $contains_error )
-    {
-        my $errordir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "_witherror");
-        # Error output to STDERR
-        for ( my $j = 0; $j <= $#installer::globals::errorlogfileinfo; $j++ )
-        {
-            my $line = $installer::globals::errorlogfileinfo[$j];
-            $line =~ s/\s*$//g;
-            installer::logger::print_error( $line );
-        }
-        $is_success = 0;
-
-        $finalinstalldir = $errordir;
-    }
-    else
-    {
-        my $destdir = "";
-
-        if ( $installer::globals::updatepack )
-        {
-            if ( $installdir =~ /_download_inprogress/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_download_inprogress", "_download"); }
-            elsif ( $installdir =~ /_jds_inprogress/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_jds_inprogress", "_jds"); }
-            elsif ( $installdir =~ /_msp_inprogress/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_msp_inprogress", "_msp"); }
-            else
-            {
-                if ( $installdir =~ /_packed/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", ""); }
-                else { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "_packed"); }
-            }
-        }
-        else
-        {
-            $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "");		
-        }
-        
-        $finalinstalldir = $destdir;
-    }
-        
-    # Saving the logfile in the log file directory and additionally in a log directory in the install directory
-
-    my $numberedlogfilename = $installer::globals::logfilename;
-    if ( $installer::globals::updatepack ) { $numberedlogfilename =~ s /log_/log_$current_install_number\_/; }
-    installer::logger::print_message( "... creating log file $numberedlogfilename \n" );
-    installer::files::save_file($loggingdir . $numberedlogfilename, \@installer::globals::logfileinfo);
-    installer::files::save_file($installlogdir . $installer::globals::separator . $numberedlogfilename, \@installer::globals::logfileinfo);
-
-    # Saving the checksumfile in a checksum directory in the install directory
-    # installer::worker::save_checksum_file($current_install_number, $installchecksumdir, $checksumfile);
-
-    # Saving the list of patchfiles in a patchlist directory in the install directory
-    if (( $installer::globals::patch ) || ( $installer::globals::creating_windows_installer_patch )) { installer::worker::save_patchlist_file($installlogdir, $numberedlogfilename); }
-    
-    if ( $installer::globals::creating_windows_installer_patch ) { $installer::globals::creating_windows_installer_patch = 0; }
-    
-    # Exiting the packaging process, if an error occurred.
-    # This is important, to get an error code "-1", if an error was found in the log file,
-    # that did not break the packaging process
-    
-    if ( ! $is_success) { installer::exiter::exit_program("ERROR: Found an error in the logfile. Packaging failed.", "analyze_and_save_logfile"); }
-    
-    return ($is_success, $finalinstalldir);		
-}
-
-###############################################################
-# Analyzing and creating the log file
-###############################################################
-
-sub save_logfile_after_linking
-{
-    my ($loggingdir, $installlogdir, $current_install_number) = @_;
-
-    # Saving the logfile in the log file directory and additionally in a log directory in the install directory
-    my $numberedlogfilename = $installer::globals::logfilename;
-    if ( $installer::globals::updatepack ) { $numberedlogfilename =~ s /log_/log_$current_install_number\_/; }
-    installer::logger::print_message( "... creating log file $numberedlogfilename \n" );
-    installer::files::save_file($loggingdir . $numberedlogfilename, \@installer::globals::logfileinfo);
-    installer::files::save_file($installlogdir . $installer::globals::separator . $numberedlogfilename, \@installer::globals::logfileinfo);	
-}
-
-###############################################################
-# Removing all directories that are saved in the 
-# global directory @installer::globals::removedirs
-###############################################################
-
-sub clean_output_tree
-{
-    installer::logger::print_message( "... cleaning the output tree ...\n" );
-
-    for ( my $i = 0; $i <= $#installer::globals::removedirs; $i++ )
-    {
-        if ( -d $installer::globals::removedirs[$i] )
-        {
-            installer::logger::print_message( "... removing directory $installer::globals::removedirs[$i] ...\n" );
-            installer::systemactions::remove_complete_directory($installer::globals::removedirs[$i], 1);			
-        }
-    }
-
-    # Last try to remove the ship test directory
-    
-    if ( $installer::globals::shiptestdirectory )
-    {
-        if ( -d $installer::globals::shiptestdirectory )
-        {
-            my $infoline = "Last try to remove $installer::globals::shiptestdirectory . \n";
-            push(@installer::globals::logfileinfo, $infoline);
-            my $systemcall = "rmdir $installer::globals::shiptestdirectory";
-            my $returnvalue = system($systemcall);
-        }
-    }	
-}
-
-###############################################################
-# Removing all directories that are saved in the 
-# global directory @installer::globals::jdsremovedirs
-###############################################################
-
-sub clean_jds_temp_dirs
-{
-    installer::logger::print_message( "... cleaning jds directories ...\n" );
-
-    for ( my $i = 0; $i <= $#installer::globals::jdsremovedirs; $i++ )
-    {
-        if ( -d $installer::globals::jdsremovedirs[$i] )
-        {
-            installer::logger::print_message( "... removing directory $installer::globals::jdsremovedirs[$i] ...\n" );
-            installer::systemactions::remove_complete_directory($installer::globals::jdsremovedirs[$i], 1);			
-        }
-    }
-}
-
-###########################################################
-# Setting one language in the language independent
-# array of include paths with $(LANG)
-###########################################################
-
-sub get_language_specific_include_pathes
-{
-    my ( $patharrayref, $onelanguage ) = @_;
-    
-    my @patharray = ();
-    
-    for ( my $i = 0; $i <= $#{$patharrayref}; $i++ )
-    {
-        my $line = ${$patharrayref}[$i];
-        $line =~ s/\$\(LANG\)/$onelanguage/g;
-        push(@patharray ,$line);
-    }
-
-    return \@patharray;
-}
-
-##############################################################
-# Returning the first item with a defined flag
-##############################################################
-
-sub return_first_item_with_special_flag
-{
-    my ($itemsref, $flag) = @_;
-
-    my $firstitem = "";
-
-    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
-    {
-        my $oneitem = ${$itemsref}[$i];
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'} };
-        
-        if ( $styles =~ /\b$flag\b/ )
-        {
-            $firstitem = $oneitem;
-            last;
-        }
-    }
-    
-    return $firstitem;
-}
-
-##############################################################
-# Collecting all items with a defined flag
-##############################################################
-
-sub collect_all_items_with_special_flag
-{
-    my ($itemsref, $flag) = @_;
-
-    my @allitems = ();
-
-    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
-    {
-        my $oneitem = ${$itemsref}[$i];
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'} };
-        
-        if ( $styles =~ /\b$flag\b/ )
-        {
-            push( @allitems, $oneitem );
-        }
-    }
-    
-    return \@allitems;
-}
-
-##############################################################
-# Collecting all files without patch flag in
-# $installer::globals::nopatchfilecollector
-##############################################################
-
-sub collect_all_files_without_patch_flag
-{
-    my ($filesref) = @_;
-    
-    my $newfiles = collect_all_items_without_special_flag($filesref, "PATCH");
-
-    for ( my $i = 0; $i <= $#{$newfiles}; $i++ ) { push(@{$installer::globals::nopatchfilecollector}, ${$newfiles}[$i]); }
-}
-
-##############################################################
-# Collecting all items without a defined flag
-##############################################################
-
-sub collect_all_items_without_special_flag
-{
-    my ($itemsref, $flag) = @_;
-
-    my @allitems = ();
-
-    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
-    {
-        my $oneitem = ${$itemsref}[$i];
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'} };
-        
-        if ( !( $styles =~ /\b$flag\b/ ))
-        {
-            push( @allitems, $oneitem );
-        }
-    }
-    
-    return \@allitems;
-}
-
-##############################################################
-# Removing all items with a defined flag from collector
-##############################################################
-
-sub remove_all_items_with_special_flag
-{
-    my ($itemsref, $flag) = @_;
-
-    my @allitems = ();
-
-    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
-    {
-        my $oneitem = ${$itemsref}[$i];
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'} };
-        if ( $styles =~ /\b$flag\b/ )
-        {
-            my $infoline = "Attention: Removing from collector: $oneitem->{'Name'} !\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            if ( $flag eq "BINARYTABLE_ONLY" ) { push(@installer::globals::binarytableonlyfiles, $oneitem); }
-            next;
-        }
-        push( @allitems, $oneitem );
-    }
-    
-    return \@allitems;
-}
-
-###########################################################
-# Mechanism for simple installation without packing
-###########################################################
-
-sub install_simple ($$$$$$)
-{
-    my ($packagename, $languagestring, $directoriesarray, $filesarray, $linksarray, $unixlinksarray) = @_;
-
-        # locate GNU cp on the system
-        my $gnucp = 'cp';
-        if ( $ENV{'GNUCOPY'} ) { $gnucp = $ENV{'GNUCOPY'}; }
-    my $copyopts = '-af';
-    $copyopts = '-PpRf' unless ( $ENV{'GNUCOPY'} ); # if not gnucopy, assume POSIX copy
-    
-    installer::logger::print_message( "... installing module $packagename ...\n" );
-
-    my $destdir = $installer::globals::destdir;
-    my @lines = (); 
-
-    installer::logger::print_message( "DestDir: $destdir \n" );
-    installer::logger::print_message( "Rootpath: $installer::globals::rootpath \n" );
-
-    `mkdir -p $destdir` if $destdir ne "";
-    `mkdir -p $destdir$installer::globals::rootpath`;
-
-    # Create Directories
-    for ( my $i = 0; $i <= $#{$directoriesarray}; $i++ )
-    {
-        my $onedir = ${$directoriesarray}[$i];
-        my $dir = "";
-    
-        if ( $onedir->{'Dir'} ) { $dir = $onedir->{'Dir'}; }
-    
-        if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ ))
-        {
-            my $hostname = $onedir->{'HostName'};
-
-            # ignore '.' subdirectories
-            next if ( $hostname =~ m/\.$/ );
-            # remove './' from the path
-            $hostname =~ s/\.\///g;
-
-            # printf "mkdir $destdir$hostname\n";
-            mkdir $destdir . $hostname;
-            push @lines, "%dir " . $hostname . "\n";
-        }
-    }
-
-    for ( my $i = 0; $i <= $#{$filesarray}; $i++ )
-    {
-        my $onefile = ${$filesarray}[$i];
-        my $unixrights = $onefile->{'UnixRights'};
-        my $destination = $onefile->{'destination'};
-        my $sourcepath = $onefile->{'sourcepath'};
-
-        # This is necessary to install SDK that includes files with $ in its name
-        # Otherwise, the following shell commands does not work and the file list
-        # is not correct
-        $destination =~ s/\$\$/\$/;
-        $sourcepath =~ s/\$\$/\$/;
-
-        # remove './' from the path
-        $sourcepath =~ s/\.\///g;
-        $destination =~ s/\.\///g;
-
-        push @lines, "$destination\n";
-        if(-d  "$destdir$destination"){
-            rmtree("$destdir$destination");
-        }
-        if(-e "$destdir$destination") {
-            unlink "$destdir$destination";
-        }
-
-        copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!";
-        my $sourcestat = stat($sourcepath);
-        utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
-        chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
-        push @lines, "$destination\n";
-    }
-    
-    for ( my $i = 0; $i <= $#{$linksarray}; $i++ )
-    {
-        my $onelink = ${$linksarray}[$i];
-        my $destination = $onelink->{'destination'};
-        my $destinationfile = $onelink->{'destinationfile'};
-    
-        if(-e "$destdir$destination") {
-            unlink "$destdir$destination";
-        }
-        symlink ("$destinationfile", "$destdir$destination") || die "Can't create symlink: $!";
-        push @lines, "$destination\n";
-    }
-
-    for ( my $i = 0; $i <= $#{$unixlinksarray}; $i++ )
-    {
-        my $onelink = ${$unixlinksarray}[$i];
-        my $target = $onelink->{'Target'};
-        my $destination = $onelink->{'destination'};
-    
-        `ln -sf '$target' '$destdir$destination'`;
-        push @lines, "$destination\n";
-    }
-
-    if ( $destdir ne "" )
-    {
-        my $filelist;
-        my $fname = $installer::globals::destdir . "/$packagename";
-        open ($filelist, ">$fname") || die "Can't open $fname: $!";
-        print $filelist @lines;
-        close ($filelist);
-    }
-
-}
-
-###########################################################
-# Adding shellnew files into files collector for
-# user installation
-###########################################################
-
-sub add_shellnewfile_into_filesarray
-{
-    my ($filesref, $onefile, $inffile) = @_;
-    
-    my %shellnewfile = ();
-    my $shellnewfileref = \%shellnewfile;
-    
-    installer::converter::copy_item_object($inffile, $shellnewfileref);
-                        
-    $shellnewfileref->{'Name'} = $onefile->{'Name'};
-    $shellnewfileref->{'sourcepath'} = $onefile->{'sourcepath'};
-    $shellnewfileref->{'gid'} = $onefile->{'gid'} . "_Userinstall";
-
-    # the destination has to be adapted
-    my $destination = $inffile->{'destination'};
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
-    $destination = $destination . $onefile->{'Name'};
-    $shellnewfileref->{'destination'} = $destination;
-
-    # add language specific inffile into filesarray
-    push(@{$filesref}, $shellnewfileref);
-}
-
-###########################################################
-# Replacing one placehoder in template file
-###########################################################
-
-sub replace_in_template_file
-{
-    my ($templatefile, $placeholder, $newstring) = @_;
-
-    for ( my $i = 0; $i <= $#{$templatefile}; $i++ )
-    {
-        ${$templatefile}[$i] =~ s/\Q$placeholder\E/$newstring/g;
-    }
-}
-
-###########################################################
-# Replacing one placehoder with an array in template file
-###########################################################
-
-sub replace_array_in_template_file
-{
-    my ($templatefile, $placeholder, $arrayref) = @_;
-
-    for ( my $i = 0; $i <= $#{$templatefile}; $i++ )
-    {
-        if ( ${$templatefile}[$i] =~ /\Q$placeholder\E/ )
-        {
-            my @return = splice(@{$templatefile}, $i, 1, @{$arrayref});
-        }
-    }	
-}
-
-###########################################################
-# Collecting all modules from registry items
-###########################################################
-
-sub collect_all_modules
-{
-    my ($registryitemsref) = @_;
-    
-    my @allmodules = ();
-
-    for ( my $i = 0; $i <= $#{$registryitemsref}; $i++ )
-    {
-        $registryitem = ${$registryitemsref}[$i];
-        my $module = $registryitem->{'ModuleID'};
-
-        if ( ! installer::existence::exists_in_array($module, \@allmodules) )
-        {
-            push(@allmodules, $module);
-        }
-    }
-    
-    return \@allmodules;
-}
-
-###########################################################
-# Changing the content of the inf file
-###########################################################
-
-sub write_content_into_inf_file
-{
-    my ($templatefile, $filesref, $registryitemsref, $folderref, $folderitemsref, $modulesref, $onelanguage, $inffile, $firstlanguage, $allvariableshashref) = @_;
-
-    # First part: Shellnew files
-    # SHELLNEWFILESPLACEHOLDER
-
-    my $rootmodule = 0;
-    # inf files can be assigned to "gid_Module_Root_Files_2"
-    if ( $inffile->{'modules'} =~ /Module_Root/i ) { $rootmodule = 1; }
-
-    if ( $rootmodule )
-    {
-        my $shellnewstring = "";
-
-        for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-        {
-            my $onefile = ${$filesref}[$i];
-            my $directory = $onefile->{'Dir'};
-        
-            if ( $directory =~ /\bPREDEFINED_OSSHELLNEWDIR\b/ )
-            {
-                $shellnewstring = $shellnewstring . $onefile->{'Name'} . "\n";
-                if (( $firstlanguage ) && ( ! $installer::globals::shellnewfilesadded )) { add_shellnewfile_into_filesarray($filesref, $onefile, $inffile); }
-            }
-        }
-
-        $shellnewstring =~ s/\s*$//;
-        replace_in_template_file($templatefile, "SHELLNEWFILESPLACEHOLDER", $shellnewstring);
-
-        $installer::globals::shellnewfilesadded = 1;
-    }
-
-    # Second part: Start menu entries
-
-    # The OfficeMenuFolder is defined as: $productname . " " . $productversion;
-    
-    my $productname = $allvariableshashref->{'PRODUCTNAME'};
-    my $productversion = $allvariableshashref->{'PRODUCTVERSION'};
-    my $productkey = $productname . " " . $productversion;
-
-    replace_in_template_file($templatefile, "OFFICEFOLDERPLACEHOLDER", $productkey);
-
-    # Setting name target and infotip for all applications
-
-    for ( my $i = 0; $i <= $#{$folderitemsref}; $i++ )
-    {
-        my $folderitem = ${$folderitemsref}[$i];
-
-        my $styles = "";
-        if ( $folderitem->{'Styles'} ) { $styles = $folderitem->{'Styles'}; }
-        if ( $styles =~ /\bNON_ADVERTISED\b/ ) { next; }	# no entry for non-advertised shortcuts
-
-        if (( ! $folderitem->{'ismultilingual'} ) || (( $folderitem->{'ismultilingual'} ) && ( $folderitem->{'specificlanguage'} eq $onelanguage )))
-        {
-            my $gid = $folderitem->{'gid'};
-            my $app = $gid;
-            $app =~ s/gid_Folderitem_//;
-            $app = uc($app);
-            
-            my $name = $folderitem->{'Name'};
-            my $placeholder = "PLACEHOLDER_FOLDERITEM_NAME_" . $app;
-            replace_in_template_file($templatefile, $placeholder, $name);
-
-            my $tooltip = $folderitem->{'Tooltip'};
-            $placeholder = "PLACEHOLDER_FOLDERITEM_TOOLTIP_" . $app;
-            replace_in_template_file($templatefile, $placeholder, $tooltip);
-
-            my $executablegid = $folderitem->{'FileID'};
-            my $exefile = installer::existence::get_specified_file($filesref, $executablegid);
-            my $exefilename = $exefile->{'Name'};	
-            $placeholder = "PLACEHOLDER_FOLDERITEM_TARGET_" . $app;
-            replace_in_template_file($templatefile, $placeholder, $exefilename);
-        }
-    }
-    
-    # Third part: Windows registry entries
-
-    # collecting all modules
-    
-    my $allmodules = collect_all_modules($registryitemsref);
-
-    my @registryitems = ();
-    my $allsectionsstring = "";
-
-    for ( my $j = 0; $j <= $#{$allmodules}; $j++ )
-    {
-        my $moduleid = ${$allmodules}[$j];
-    
-        my $inffilemodule = $inffile->{'modules'};
-        # inf files can be assigned to "gid_Module_Root_Files_2", but RegistryItems to "gid_Module_Root"
-        if ( $inffilemodule =~ /Module_Root/i ) { $inffilemodule = $installer::globals::rootmodulegid; }
-
-        if ( ! ( $moduleid eq $inffilemodule )) { next; } 
-        
-        my $shortmodulename = $moduleid;
-        $shortmodulename =~ s/gid_Module_//;
-        my $sectionname = "InstRegKeys." . $shortmodulename;
-        $allsectionsstring = $allsectionsstring . $sectionname . ",";
-        my $sectionheader = "\[" . $sectionname . "\]" . "\n";
-        push(@registryitems, $sectionheader);
-        
-        for ( my $i = 0; $i <= $#{$registryitemsref}; $i++ )
-        {
-            my $registryitem = ${$registryitemsref}[$i];
-
-            if ( ! ( $registryitem->{'ModuleID'} eq $moduleid )) { next; }
-        
-            if (( ! $registryitem->{'ismultilingual'} ) || (( $registryitem->{'ismultilingual'} ) && ( $registryitem->{'specificlanguage'} eq $onelanguage )))
-            {
-                # Syntax: HKCR,".bau",,,"soffice.StarConfigFile.6"
-        
-                my $regroot = "";
-                my $parentid = "";
-                if ( $registryitem->{'ParentID'} ) { $parentid = $registryitem->{'ParentID'}; }
-                if ( $parentid eq "PREDEFINED_HKEY_CLASSES_ROOT" ) { $regroot = "HKCR"; }
-                if ( $parentid eq "PREDEFINED_HKEY_LOCAL_MACHINE" ) { $regroot = "HKCU"; }
-
-                my $subkey = "";
-                if ( $registryitem->{'Subkey'} ) { $subkey = $registryitem->{'Subkey'}; }
-                if ( $subkey ne "" ) { $subkey = "\"" . $subkey . "\""; }
-            
-                my $valueentryname = "";
-                if ( $registryitem->{'Name'} ) { $valueentryname = $registryitem->{'Name'}; }
-                if ( $valueentryname ne "" ) { $valueentryname = "\"" . $valueentryname . "\""; }
-            
-                my $flag = "";
-            
-                my $value = "";
-                if ( $registryitem->{'Value'} ) { $value = $registryitem->{'Value'}; }
-                if ( $value =~ /\<progpath\>/ ) { $value =~ s/\\\"/\"\"/g; } # Quoting for INF is done by double "" 
-                $value =~ s/\\\"/\"/g;	# no more masquerading of '"'
-                $value =~ s/\<progpath\>/\%INSTALLLOCATION\%/g;  
-                if ( $value ne "" ) { $value = "\"" . $value . "\""; }
-
-                my $oneline = $regroot . "," . $subkey . "," . $valueentryname . "," . $flag . "," . $value . "\n";
-
-                push(@registryitems, $oneline);
-            }
-        }
-        
-        push(@registryitems, "\n"); # empty line after each section
-    }
-
-    # replacing the $allsectionsstring
-    $allsectionsstring =~ s/\,\s*$//;
-    replace_in_template_file($templatefile, "ALLREGISTRYSECTIONSPLACEHOLDER", $allsectionsstring);
-    
-    # replacing the placeholder for all registry keys
-    replace_array_in_template_file($templatefile, "REGISTRYKEYSPLACEHOLDER", \@registryitems);		
-
-}
-
-###########################################################
-# Creating inf files for local user system integration
-###########################################################
-
-sub create_inf_file
-{
-    my ($filesref, $registryitemsref, $folderref, $folderitemsref, $modulesref, $languagesarrayref, $languagestringref, $allvariableshashref) = @_;
-
-    # collecting all files with flag INFFILE
-
-    my $inf_files = collect_all_items_with_special_flag($filesref ,"INFFILE");
-
-    if ( $#{$inf_files} > -1 )
-    {
-        # create new language specific inffile
-        installer::logger::include_header_into_logfile("Creating inf files:");
-
-        my $infdirname = "inffiles";
-        my $infdir = installer::systemactions::create_directories($infdirname, $languagestringref);
-
-        my $infoline = "Number of inf files: $#{$inf_files} + 1 \n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        # there are inffiles for all modules
-    
-        for ( my $i = 0; $i <= $#{$inf_files}; $i++ )
-        {
-            my $inffile = ${$inf_files}[$i];
-            my $inf_file_name = $inffile->{'Name'};
-            
-            my $templatefilename = $inffile->{'sourcepath'};
-            
-            if ( ! -f $templatefilename ) { installer::exiter::exit_program("ERROR: Could not find file $templatefilename !", "create_inf_file");  }
-
-            # iterating over all languages
-        
-            for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ )	# iterating over all languages
-            {
-                my $firstlanguage = 0;
-                if ( $j == 0 ) { $firstlanguage = 1; }
-
-                my $onelanguage = ${$languagesarrayref}[$j];
-
-                $infoline = "Templatefile: $inf_file_name, Language: $onelanguage \n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                my $templatefile = installer::files::read_file($templatefilename);
-
-                my $linesbefore = $#{$templatefile};
-
-                write_content_into_inf_file($templatefile, $filesref, $registryitemsref, $folderref, $folderitemsref, $modulesref, $onelanguage, $inffile, $firstlanguage, $allvariableshashref);
-
-                $infoline = "Lines change: From $linesbefore to $#{$templatefile}.\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                # rename language specific inffile
-                my $language_inf_file_name = $inf_file_name;
-                my $windowslanguage = installer::windows::language::get_windows_language($onelanguage);
-                $language_inf_file_name =~ s/\.inf/_$windowslanguage\.inf/;
-
-                my $sourcepath = $infdir . $installer::globals::separator . $language_inf_file_name;
-                installer::files::save_file($sourcepath, $templatefile);
-
-                $infoline = "Saving file: $sourcepath\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                # creating new file object
-
-                my %languageinffile = ();
-                my $languageinifileref = \%languageinffile;
-
-                if ( $j < $#{$languagesarrayref} ) { installer::converter::copy_item_object($inffile, $languageinifileref); }
-                else { $languageinifileref = $inffile; }
-                        
-                $languageinifileref->{'Name'} = $language_inf_file_name;
-                $languageinifileref->{'sourcepath'} = $sourcepath;
-                # destination and gid also have to be adapted
-                $languageinifileref->{'gid'} = $languageinifileref->{'gid'} . "_" . $onelanguage;
-                my $destination = $languageinifileref->{'destination'};
-                installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
-                $destination = $destination . $language_inf_file_name;
-                $languageinifileref->{'destination'} = $destination;
-
-                # add language specific inffile into filesarray
-                if ( $j < $#{$languagesarrayref} ) { push(@{$filesref}, $languageinifileref); }
-            }
-        }
-    }
-}
-
-###########################################################
-# Selecting patch items
-###########################################################
-
-sub select_patch_items
-{
-    my ( $itemsref, $itemname ) = @_;
-
-    installer::logger::include_header_into_logfile("Selecting items for patches. Item: $itemname");
-
-    my @itemsarray = ();
-
-    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
-    {
-        my $oneitem = ${$itemsref}[$i];
-        
-        my $name = $oneitem->{'Name'};
-        if (( $name =~ /\bLICENSE/ ) || ( $name =~ /\bREADME/ ))
-        {
-            push(@itemsarray, $oneitem);
-            next;
-        }
-
-        # Items with style "PATCH" have to be included into the patch			
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-        if ( $styles =~ /\bPATCH\b/ ) { push(@itemsarray, $oneitem); }
-    }
-    
-    return \@itemsarray;
-}
-
-###########################################################
-# Selecting patch items
-###########################################################
-
-sub select_patch_items_without_name
-{
-    my ( $itemsref, $itemname ) = @_;
-
-    installer::logger::include_header_into_logfile("Selecting RegistryItems for patches");
-
-    my @itemsarray = ();
-
-    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
-    {
-        my $oneitem = ${$itemsref}[$i];
-
-        # Items with style "PATCH" have to be included into the patch			
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-        if ( $styles =~ /\bPATCH\b/ ) { push(@itemsarray, $oneitem); }
-    }
-    
-    return \@itemsarray;
-}
-
-###########################################################
-# Selecting langpack items
-###########################################################
-
-sub select_langpack_items
-{
-    my ( $itemsref, $itemname ) = @_;
-
-    installer::logger::include_header_into_logfile("Selecting RegistryItems for Language Packs");
-
-    my @itemsarray = ();
-
-    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
-    {
-        my $oneitem = ${$itemsref}[$i];
-
-        # Items with style "LANGUAGEPACK" have to be included into the patch			
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-        if (( $styles =~ /\bLANGUAGEPACK\b/ ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ )) { push(@itemsarray, $oneitem); }
-    }
-    
-    return \@itemsarray;
-}
-
-###########################################################
-# Selecting helppack items
-###########################################################
-
-sub select_helppack_items
-{
-    my ( $itemsref, $itemname ) = @_;
-
-    installer::logger::include_header_into_logfile("Selecting RegistryItems for Help Packs");
-
-    my @itemsarray = ();
-
-    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
-    {
-        my $oneitem = ${$itemsref}[$i];
-
-        # Items with style "HELPPACK" have to be included into the patch
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-        if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ )) { push(@itemsarray, $oneitem); }
-    }
-
-    return \@itemsarray;
-}
-
-###########################################################
-# Searching if LICENSE and README, which are not removed
-# in select_patch_items are really needed for the patch.
-# If not, they are removed now.
-###########################################################
-
-sub analyze_patch_files
-{
-    my ( $filesref ) = @_;
-
-    installer::logger::include_header_into_logfile("Analyzing patch files");
-
-    my @filesarray = ();
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-        my $styles = "";
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-        if ( !( $styles =~ /\bPATCH\b/) ) { next; }	# removing all files without flag PATCH (LICENSE, README, ...)
-
-        if ( $installer::globals::iswindowsbuild )
-        {
-            # all files of the Windows patch belong to the root module
-            $onefile->{'modules'} = $installer::globals::rootmodulegid;
-        }
-        
-        push(@filesarray, $onefile);
-    }
-    
-    return \@filesarray;
-}
-
-###########################################################
-# Sorting an array
-###########################################################
-
-sub sort_array
-{
-    my ( $arrayref ) = @_;
-
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        my $under = ${$arrayref}[$i];
-
-        for ( my $j = $i + 1; $j <= $#{$arrayref}; $j++ )
-        {
-            my $over = ${$arrayref}[$j];
-
-            if ( $under gt $over)
-            {
-                ${$arrayref}[$i] = $over;
-                ${$arrayref}[$j] = $under;
-                $under = $over;
-            }
-        }
-    }
-}
-
-###########################################################
-# Renaming linux files with flag LINUXLINK
-###########################################################
-
-sub prepare_linuxlinkfiles
-{
-    my ( $filesref ) = @_;
-
-    @installer::globals::linuxlinks = (); # empty this array, because it could be already used
-    @installer::globals::linuxpatchfiles = (); # empty this array, because it could be already used
-    @installer::globals::allfilessav = (); # empty this array, because it could be already used. Required for forced links
-    
-    my @filesarray = ();
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-        my %linkfilehash = ();
-        my $linkfile = \%linkfilehash;
-        installer::converter::copy_item_object($onefile, $linkfile);
-
-        my $ispatchfile = 0;
-        my $styles = "";
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-        if ( $styles =~ /\bPATCH\b/ ) { $ispatchfile = 1; }
-
-        # Collecting all files for the mechanism with forced links
-        # Saving a copy
-        my %copyfilehash = ();
-        my $copyfile = \%copyfilehash;
-        installer::converter::copy_item_object($onefile, $copyfile);			
-        push( @installer::globals::allfilessav, $copyfile);
-
-        my $original_destination = $onefile->{'destination'};
-        # $onefile->{'destination'} is used in the epm list file. This value can be changed now!
-
-        if ( $ispatchfile ) { $onefile->{'destination'} = $onefile->{'destination'} . "\.$installer::globals::linuxlibrarypatchlevel"; }
-        else { $onefile->{'destination'} = $onefile->{'destination'} . "\.$installer::globals::linuxlibrarybaselevel"; }
-
-        my $infoline = "LINUXLINK: Changing file destination from $original_destination to $onefile->{'destination'} !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        # all files without PATCH flag are included into the RPM
-        if ( ! $ispatchfile ) { push( @filesarray, $onefile); }
-        else { push( @installer::globals::linuxpatchfiles, $onefile); }	
-
-        # Preparing the collector for the links
-        # Setting the new file name as destination of the link
-        my $linkdestination = $linkfile->{'Name'};
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$linkdestination);
-        if ( $ispatchfile ) { $linkfile->{'destinationfile'} = $linkdestination . "\.$installer::globals::linuxlibrarypatchlevel"; }
-        else { $linkfile->{'destinationfile'} = $linkdestination . "\.$installer::globals::linuxlibrarybaselevel"; }
-        push( @installer::globals::linuxlinks, $linkfile );
-
-        $infoline = "LINUXLINK: Created link: $linkfile->{'destination'} pointing to $linkfile->{'destinationfile'} !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    return \@filesarray;
-}
-
-###########################################################
-# Adding links into "u-RPMs", that have the flag
-# FORCE_INTO_UPDATE_PACKAGE
-# This is only relevant for Linux
-###########################################################
-
-sub prepare_forced_linuxlinkfiles
-{
-    my ( $linksref ) = @_;
-
-    my @linksarray = ();
-
-    for ( my $i = 0; $i <= $#{$linksref}; $i++ )
-    {
-        my $onelink = ${$linksref}[$i];
-
-        my $isforcedlink = 0;
-        my $styles = "";
-        if ( $onelink->{'Styles'} ) { $styles = $onelink->{'Styles'}; }
-        if ( $styles =~ /\bFORCE_INTO_UPDATE_PACKAGE\b/ ) { $isforcedlink = 1; }
-
-        if ( $isforcedlink )
-        {
-            my $fileid = "";
-
-            if ( $onelink->{'ShortcutID'} )
-            {
-                $fileid = $onelink->{'ShortcutID'};
-
-                my $searchedlinkfile = find_file_by_id($linksref, $fileid);
-
-                # making a copy!
-                my %linkfilehash = ();
-                my $linkfile = \%linkfilehash;
-                installer::converter::copy_item_object($searchedlinkfile, $linkfile);
-
-                $linkfile->{'Name'} = $onelink->{'Name'};
-                $linkfile->{'destinationfile'} = $linkfile->{'destination'};
-                my $linkdestination = $linkfile->{'destinationfile'};
-                installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$linkdestination);
-                $linkfile->{'destinationfile'} = $linkdestination;
-
-                my $localdestination = $linkfile->{'destination'};
-                # Getting the path
-                installer::pathanalyzer::get_path_from_fullqualifiedname(\$localdestination);
-                $localdestination =~ s/\Q$installer::globals::separator\E\s*$//;
-                $linkfile->{'destination'} = $localdestination . $installer::globals::separator . $onelink->{'Name'};
-    
-                $infoline = "Forced link into update file: $linkfile->{'destination'} pointing to $linkfile->{'destinationfile'} !\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            
-                # The file, defined by the link, has to be included into the
-                # link array @installer::globals::linuxlinks
-                push( @installer::globals::linuxlinks, $linkfile );
-            }
-
-            if ( $onelink->{'FileID'} )
-            {
-                $fileid = $onelink->{'FileID'};
-            
-                my $searchedlinkfile = find_file_by_id(\@installer::globals::allfilessav, $fileid);
-            
-                # making a copy!
-                my %linkfilehash = ();
-                my $linkfile = \%linkfilehash;
-                installer::converter::copy_item_object($searchedlinkfile, $linkfile);
-
-                $linkfile->{'Name'} = $onelink->{'Name'};
-                $linkfile->{'destinationfile'} = $linkfile->{'destination'};
-                my $linkdestination = $linkfile->{'destinationfile'};
-                installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$linkdestination);
-                $linkfile->{'destinationfile'} = $linkdestination;
-
-                my $localdestination = $linkfile->{'destination'};
-                # Getting the path
-                installer::pathanalyzer::get_path_from_fullqualifiedname(\$localdestination);
-                $localdestination =~ s/\Q$installer::globals::separator\E\s*$//;
-                $linkfile->{'destination'} = $localdestination . $installer::globals::separator . $onelink->{'Name'};
-    
-                $infoline = "Forced link into update file: $linkfile->{'destination'} pointing to $linkfile->{'destinationfile'} !\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            
-                # The file, defined by the link, has to be included into the
-                # link array @installer::globals::linuxlinks
-                push( @installer::globals::linuxlinks, $linkfile );
-             }
-            
-            if ( $fileid eq "" ) { installer::exiter::exit_program("ERROR: No FileID assigned to forced link $onelink->{'gid'} !", "prepare_forced_linuxlinkfiles"); }
-            
-        }
-        else
-        {
-            # Links with flag FORCE_INTO_UPDATE_PACKAGE are forced into "u"-RPM. All other 
-            # links are included into the non-"u"-package.
-            push( @linksarray, $onelink );		
-        }
-    }
-    
-    return \@linksarray;
-}
-
-###########################################################
-# reorganizing the patchfile content,
-# sorting for directory to decrease the file size
-###########################################################
-
-sub reorg_patchfile
-{
-    my ($patchfiles, $patchfiledirectories) = @_;
-
-    my @patchfilesarray = ();
-    my $line = "";
-    my $directory = "";
-
-    # iterating over all directories, writing content into new patchfiles list
-
-    for ( my $i = 0; $i <= $#{$patchfiledirectories}; $i++ )
-    {
-        $directory = ${$patchfiledirectories}[$i];
-        $line = "[" . $directory . "]" . "\n";
-        push(@patchfilesarray, $line);
-        
-        for ( my $j = 0; $j <= $#{$patchfiles}; $j++ )
-        {
-            if ( ${$patchfiles}[$j] =~ /^\s*(.*?)\s*\tXXXXX\t\Q$directory\E\s*$/ )
-            {
-                $line = $1 . "\n";
-                push(@patchfilesarray, $line);			
-            }
-        }
-    }
-    
-    return \@patchfilesarray;
-}
-
-###########################################################
-# One special file has to be the last in patchfile.txt.
-# Controlling this file, guarantees, that all files were
-# patch correctly. Using version.ini makes it easy to 
-# control this by looking into the about box
-# -> shifting one section to the end
-###########################################################
-
-sub shift_section_to_end
-{
-    my ($patchfilelist) = @_;
-
-    my @patchfile = ();
-    my @lastsection = ();
-    my $lastsection = "program";
-    my $notlastsection = "Basis\\program";
-    my $record = 0;
-
-    for ( my $i = 0; $i <= $#{$patchfilelist}; $i++ )
-    {
-        my $line = ${$patchfilelist}[$i];
-
-        if (( $record ) && ( $line =~ /^\s*\[/ )) { $record = 0; }
-
-        if (( $line =~ /^\s*\[\Q$lastsection\E\\\]\s*$/ ) && ( ! ( $line =~ /\Q$notlastsection\E\\\]\s*$/ ))) { $record = 1; }
-
-        if ( $record ) { push(@lastsection, $line); }
-        else { push(@patchfile, $line); }
-    }
-    
-    if ( $#lastsection > -1 )
-    {
-        for ( my $i = 0; $i <= $#lastsection; $i++ )
-        {
-            push(@patchfile, $lastsection[$i]);
-        }
-    }
-
-    return \@patchfile;
-}
-
-###########################################################
-# One special file has to be the last in patchfile.txt.
-# Controlling this file, guarantees, that all files were
-# patch correctly. Using version.ini makes it easy to 
-# control this by looking into the about box
-# -> shifting one file of the last section to the end
-###########################################################
-
-sub shift_file_to_end
-{
-    my ($patchfilelist) = @_;
-    
-    my @patchfile = ();
-    my $lastfilename = "version.ini";
-    my $lastfileline = "";
-    my $foundfile = 0;
-    
-    # Only searching this file in the last section
-    my $lastsectionname = "";
-
-    for ( my $i = 0; $i <= $#{$patchfilelist}; $i++ )
-    {
-        my $line = ${$patchfilelist}[$i];	
-        if ( $line =~ /^\s*\[(.*?)\]\s*$/ ) { $lastsectionname = $1; }
-    }
-
-    my $record = 0;
-    for ( my $i = 0; $i <= $#{$patchfilelist}; $i++ )
-    {
-        my $line = ${$patchfilelist}[$i];
-
-        if ( $line =~ /^\s*\[\Q$lastsectionname\E\]\s*$/ ) { $record = 1; }
-
-        if (( $line =~ /^\s*\"\Q$lastfilename\E\"\=/ ) && ( $record ))
-        {
-            $lastfileline = $line;
-            $foundfile = 1;
-            $record = 0;
-            next;
-        }
-        
-        push(@patchfile, $line);
-    }
-    
-    if ( $foundfile ) { push(@patchfile, $lastfileline); }
-    
-    return 	\@patchfile;
-}
-
-###########################################################
-# Putting hash content into array and sorting it
-###########################################################
-
-sub sort_hash
-{
-    my ( $hashref ) =  @_;
-
-    my $item = "";
-    my @sortedarray = ();
-
-    foreach $item (keys %{$hashref}) { push(@sortedarray, $item); }	
-    installer::sorter::sorting_array_of_strings(\@sortedarray);
-
-    return \@sortedarray;
-}
-
-###########################################################
-# Renaming Windows files in Patch and creating file
-# patchfiles.txt
-###########################################################
-
-sub prepare_windows_patchfiles
-{
-    my ( $filesref, $languagestringref, $allvariableshashref ) = @_;
-
-    my @patchfiles = ();
-    my %patchfiledirectories = ();
-    my $patchfilename = "patchlist.txt";
-    my $patchfilename2 = "patchmsi.dll";
-
-    if ( ! $allvariableshashref->{'WINDOWSPATCHLEVEL'} ) { installer::exiter::exit_program("ERROR: No Windows patch level defined in list file (WINDOWSPATCHLEVEL) !", "prepare_windows_patchfiles"); }
-    my $windowspatchlevel = $installer::globals::buildid;
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-
-        my $filename = $onefile->{'Name'};
-        if (( $filename eq $patchfilename ) || ( $filename eq $patchfilename2 )) { next; }
-
-        my $styles = "";
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-        if ( $styles =~ /\bDONTRENAMEINPATCH\b/ ) { next; }
-        
-        # special handling for files with flag DONTSHOW. This files get the extension ".dontshow" to be filtered by dialogs.
-        my $localwindowspatchlevel = $windowspatchlevel;
-        if ( $styles =~ /\bDONTSHOW\b/ ) { $localwindowspatchlevel = $localwindowspatchlevel . "\.dontshow"; }
-        
-        my $olddestination = $onefile->{'destination'};
-        my $newdestination = $olddestination . "." . $localwindowspatchlevel;
-        my $localfilename = $olddestination;
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$localfilename);	# file name part
-        my $line = "\"" . $localfilename . "\"" . "=" . "\"" . "\." . $localwindowspatchlevel . "\"";
-        $onefile->{'destination'} = $newdestination;
-        
-        my $newfilename = $onefile->{'Name'} . "." . $localwindowspatchlevel;
-        $onefile->{'Name'} = $newfilename;
-        
-        # adding section information (section is the directory)
-        my $origolddestination = $olddestination;
-        installer::pathanalyzer::get_path_from_fullqualifiedname(\$olddestination);	# directory part
-        if ( ! $olddestination ) { $olddestination = "_root";  }
-        if ( ! exists($patchfiledirectories{$olddestination}) ) { $patchfiledirectories{$olddestination} = 1; }
-        $line = $line . "\tXXXXX\t" . $olddestination . "\n";
-        
-        push(@patchfiles, $line);
-        
-        # also collecting all files from patch in @installer::globals::patchfilecollector
-        my $patchfileline = $origolddestination . "\n";
-        push(@installer::globals::patchfilecollector, $patchfileline);
-    }
-    
-    my $winpatchdirname = "winpatch";
-    my $winpatchdir = installer::systemactions::create_directories($winpatchdirname, $languagestringref);
-
-    my $patchlistfile = installer::existence::get_specified_file_by_name($filesref, $patchfilename);
-    
-    # reorganizing the patchfile content, sorting for directory to decrease the file size
-    my $sorteddirectorylist = sort_hash(\%patchfiledirectories);
-    my $patchfilelist = reorg_patchfile(\@patchfiles, $sorteddirectorylist);
-
-    # shifting version.ini to the end of the list, to guarantee, that all files are patched
-    # if the correct version is shown in the about box
-    $patchfilelist = shift_section_to_end($patchfilelist);
-    $patchfilelist = shift_file_to_end($patchfilelist);
-
-    # saving the file
-    $patchfilename = $winpatchdir . $installer::globals::separator . $patchfilename;
-    installer::files::save_file($patchfilename, $patchfilelist);
-
-    my $infoline = "\nCreated list of patch files: $patchfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-    
-    # and assigning the new source
-    $patchlistfile->{'sourcepath'} = $patchfilename;
-    
-    # and finally checking the file size	
-    if ( -f $patchfilename )	# test of existence
-    {
-        my $filesize = ( -s $patchfilename );
-        $infoline = "Size of patch file list: $filesize\n\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        installer::logger::print_message( "... size of patch list file: $filesize Byte ... \n" );
-    }
-
-}
-
-###########################################################
-# Replacing %-variables with the content
-# of $allvariableshashref
-###########################################################
-
-sub replace_variables_in_string
-{
-    my ( $string, $variableshashref ) = @_;
-
-    if ( $string =~ /^.*\%\w+.*$/ )
-    {
-        my $key;
-
-        # we want to substitute FOO_BR before FOO to avoid floating _BR suffixes
-        foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref})
-        {
-            my $value = $variableshashref->{$key};
-            $key = "\%" . $key;
-            $string =~ s/\Q$key\E/$value/g;			
-        }
-    }
-    
-    return $string;
-}
-
-###########################################################
-# Replacing %-variables with the content
-# of $allvariableshashref
-###########################################################
-
-sub replace_dollar_variables_in_string
-{
-    my ( $string, $variableshashref ) = @_;
-
-    if ( $string =~ /^.*\$\{\w+\}.*$/ )
-    {			
-        my $key;
-
-        foreach $key (keys %{$variableshashref})
-        {
-            my $value = $variableshashref->{$key};
-            $key = "\$\{" . $key . "\}";
-            $string =~ s/\Q$key\E/$value/g;			
-        }
-    }
-    
-    return $string;
-}
-
-###########################################################
-# The list file contains the list of packages/RPMs that
-# have to be copied.
-###########################################################
-
-sub get_all_files_from_filelist
-{
-    my ( $listfile, $section ) = @_;
-
-    my @allpackages = ();	
-
-    for (@{$listfile}) {
-        next unless /^\s*([^#].*?)\s*$/;
-        push @allpackages, $1;
-    }
-
-    return \@allpackages;
-}
-
-###########################################################
-# Getting one section from a file. Section begins with
-# [xyz] and ends with file end or next [abc].
-###########################################################
-
-sub get_section_from_file
-{
-    my ($file, $sectionname) = @_;
-
-    my @section = ();	
-    my $record = 0;
-
-    for ( my $i = 0; $i <= $#{$file}; $i++ )
-    {
-        my $line = ${$file}[$i];
-
-        if (( $record ) && ( $line =~ /^\s*\[/ ))
-        {
-            $record = 0;
-            last;
-        }
-        
-        if ( $line =~ /^\s*\[\Q$sectionname\E\]\s*$/ ) { $record = 1; }
-        
-        if ( $line =~ /^\s*\[/ ) { next; } # this is a section line
-        if ( $line =~ /^\s*\#/ ) { next; } # this is a comment line
-        if ( $line =~ /^\s*$/ ) { next; }  # empty line
-        $line =~ s/^\s*//;
-        $line =~ s/\s*$//;
-        if ( $record ) { push(@section, $line); }
-    }
-
-    return \@section;
-
-}
-
-#######################################################
-# Substituting one variable in the xml file
-#######################################################
-
-sub replace_one_dollar_variable
-{
-    my ($file, $variable, $searchstring) = @_;
-    
-    for ( my $i = 0; $i <= $#{$file}; $i++ )
-    {
-        ${$file}[$i] =~ s/\$\{$searchstring\}/$variable/g;
-    }
-}
-
-#######################################################
-# Substituting the variables in the xml file
-#######################################################
-
-sub substitute_dollar_variables
-{
-    my ($file, $variableshashref) = @_;
-
-    my $key;
-
-    foreach $key (keys %{$variableshashref})
-    {
-        my $value = $variableshashref->{$key};
-        replace_one_dollar_variable($file, $value, $key);
-    }	
-}
-
-#############################################################################
-# Collecting all packages or rpms located in the installation directory
-#############################################################################
-
-sub get_all_packages_in_installdir
-{
-    my ($directory) = @_;
-
-    my $infoline = "";
-
-    my @allpackages = ();
-    my $allpackages = \@allpackages;
-    
-    if ( $installer::globals::isrpmbuild )
-    {
-        $allpackages = installer::systemactions::find_file_with_file_extension("rpm", $directory);
-    }
-
-    if ( $installer::globals::issolarisbuild )
-    {
-        $allpackages = installer::systemactions::get_all_directories($directory);
-    }
-    
-    return $allpackages;
-}
-
-###############################################################
-# The list of exclude packages can contain the 
-# beginning of the package name, not the complete name.
-###############################################################
-
-sub is_matching
-{
-    my ($onepackage, $allexcludepackages ) = @_;
-    
-    my $matches = 0;
-    
-    for ( my $i = 0; $i <= $#{$allexcludepackages}; $i++ )
-    {
-        my $oneexcludepackage = ${$allexcludepackages}[$i];
-    
-        if ( $onepackage =~ /^\s*$oneexcludepackage/ )
-        {
-            $matches = 1;
-            last;
-        }	
-    }
-    
-    return $matches;
-}
-
-###############################################################
-# Copying all Solaris packages or RPMs from installation set
-###############################################################
-
-sub copy_all_packages
-{
-    my ($allexcludepackages, $sourcedir, $destdir) = @_;
-
-    my $infoline = "";
-
-    $sourcedir =~ s/\/\s*$//;
-    $destdir =~ s/\/\s*$//;
-
-    # $allexcludepackages is a list of RPMs and packages, that shall NOT be included into jds product
-    my $allpackages = get_all_packages_in_installdir($sourcedir);
-
-    for ( my $i = 0; $i <= $#{$allpackages}; $i++ )
-    {
-        my $onepackage = ${$allpackages}[$i];
-
-        my $packagename = $onepackage;
-
-        if ( $installer::globals::issolarispkgbuild )	# on Solaris $onepackage contains the complete path
-        {
-            installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$packagename);
-        }
-
-        if ( ! installer::existence::exists_in_array($packagename, $allexcludepackages))
-        {
-            if ( ! is_matching($packagename, $allexcludepackages ) )
-            {
-
-                if ( $installer::globals::isrpmbuild )
-                {
-                    my $sourcepackage = $sourcedir . $installer::globals::separator . $packagename;
-                    my $destfile = $destdir . $installer::globals::separator . $packagename;
-                    if ( ! -f $sourcepackage ) { installer::exiter::exit_program("ERROR: Could not find RPM $sourcepackage!", "copy_all_packages"); }
-                    installer::systemactions::hardlink_one_file($sourcepackage, $destfile);
-                }
-
-                if ( $installer::globals::issolarispkgbuild )
-                {
-                    my $destinationdir = $destdir . $installer::globals::separator . $packagename;
-                    if ( ! -d $onepackage ) { installer::exiter::exit_program("ERROR: Could not find Solaris package $onepackage!", "copy_all_packages"); }
-
-                    my $systemcall = "cp -p -R $onepackage $destinationdir";
-                     make_systemcall($systemcall);
-                }
-            }
-            else
-            {
-                $infoline = "Excluding package (matching): $onepackage\n";
-                push( @installer::globals::logfileinfo, $infoline);		
-            }	
-        }
-        else
-        {
-            $infoline = "Excluding package (precise name): $onepackage\n";
-            push( @installer::globals::logfileinfo, $infoline);		
-        }
-    }
-}
-
-######################################################
-# Making systemcall
-######################################################
-
-sub make_systemcall
-{
-    my ($systemcall) = @_;
-
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}	
-
-###########################################################
-# Copying all Solaris packages or RPMs from solver
-###########################################################
-
-sub copy_additional_packages
-{
-    my ($allcopypackages, $destdir, $includepatharrayref) = @_;
-    
-    my $infoline = "Copy additional packages into installation set.\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    $destdir =~ s/\/\s*$//;
-
-    for ( my $i = 0; $i <= $#{$allcopypackages}; $i++ )
-    {
-        my $onepackage = ${$allcopypackages}[$i];
-        $infoline = "Copy package: $onepackage\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        # this package must be delivered into the solver
-        
-        my $packagesourceref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$onepackage, $includepatharrayref, 0);
-        if ($$packagesourceref eq "") { installer::exiter::exit_program("ERROR: Could not find jds file $onepackage!", "copy_additional_packages"); }
-
-        if ( $onepackage =~ /\.tar\.gz\s*$/ )
-        {
-            my $systemcall = "cd $destdir; cat $$packagesourceref | gunzip | tar -xf -";
-            make_systemcall($systemcall);
-        }
-        else
-        {
-            my $destfile = $destdir . $installer::globals::separator . $onepackage;
-            installer::systemactions::copy_one_file($$packagesourceref, $destfile);
-        }
-    }	
-}
-
-###########################################################
-# Creating jds installation sets
-###########################################################
-
-sub create_jds_sets
-{
-    my ($installationdir, $allvariableshashref, $languagestringref, $languagesarrayref, $includepatharrayref) = @_;
-
-    installer::logger::print_message( "\n******************************************\n" );
-    installer::logger::print_message( "... creating jds installation set ...\n" );
-    installer::logger::print_message( "******************************************\n" );
-
-    installer::logger::include_header_into_logfile("Creating jds installation sets:");
-
-    my $firstdir = $installationdir;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$firstdir);
-    
-    my $lastdir = $installationdir;
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$lastdir);
-
-    if ( $lastdir =~ /\./ ) { $lastdir =~ s/\./_jds_inprogress\./ }
-    else { $lastdir = $lastdir . "_jds_inprogress"; }
-
-    # removing existing directory "_native_packed_inprogress" and "_native_packed_witherror" and "_native_packed"
-
-    my $jdsdir = $firstdir . $lastdir;
-    if ( -d $jdsdir ) { installer::systemactions::remove_complete_directory($jdsdir); }
-    
-    my $olddir = $jdsdir;
-    $olddir =~ s/_inprogress/_witherror/;
-    if ( -d $olddir ) { installer::systemactions::remove_complete_directory($olddir); }
-
-    $olddir = $jdsdir;
-    $olddir =~ s/_inprogress//;
-    if ( -d $olddir ) { installer::systemactions::remove_complete_directory($olddir); }
-
-    # creating the new directory
-    
-    installer::systemactions::create_directory($jdsdir);
-
-    $installer::globals::saveinstalldir = $jdsdir;
-
-    # find and read jds files list
-    my $filelistname = $installer::globals::jdsexcludefilename;
-
-    my $filelistnameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filelistname, "", 0);
-    if ($$filelistnameref eq "") { installer::exiter::exit_program("ERROR: Could not find jds list file $filelistname!", "create_jds_sets"); }
-
-    my $listfile = installer::files::read_file($$filelistnameref);
-
-    my $infoline = "Found jds list file: $$filelistnameref\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    # substituting the variables
-    substitute_dollar_variables($listfile, $allvariableshashref);
-
-    # determining the packages/RPMs to copy
-    my $allexcludepackages = get_section_from_file($listfile, "excludefiles");
-    my $allcopypackages = get_section_from_file($listfile, "copyfiles");
-
-    # determining the source directory
-    my $alldirs = installer::systemactions::get_all_directories($installationdir);
-    my $sourcedir = ${$alldirs}[0]; # there is only one directory
-    
-    if ( $installer::globals::issolarisbuild ) { $sourcedir = $installer::globals::saved_packages_path; }
-
-    # copy all packages/RPMs
-    copy_all_packages($allexcludepackages, $sourcedir, $jdsdir);
-    copy_additional_packages($allcopypackages, $jdsdir, $includepatharrayref);
-
-    return $jdsdir;
-}
-
-#############################################################################
-# Checking, whether this installation set contains the correct languages
-#############################################################################
-
-sub check_jds_language
-{
-    my ($allvariableshashref, $languagestringref) = @_;
-
-    my $infoline = "";
-        
-    if ( ! $allvariableshashref->{'JDSLANG'} ) { installer::exiter::exit_program("ERROR: For building JDS installation sets \"JDSLANG\" must be defined!", "check_jds_language"); }
-    my $languagestring = $allvariableshashref->{'JDSLANG'};
-
-    my $sortedarray1 = installer::converter::convert_stringlist_into_array(\$languagestring, ",");
-
-    installer::sorter::sorting_array_of_strings($sortedarray1);
-
-    my $sortedarray2 = installer::converter::convert_stringlist_into_array($languagestringref, "_");
-    installer::sorter::sorting_array_of_strings($sortedarray2);
-
-    my $string1 = installer::converter::convert_array_to_comma_separated_string($sortedarray1);
-    my $string2 = installer::converter::convert_array_to_comma_separated_string($sortedarray2);
-
-    my $arrays_are_equal = compare_arrays($sortedarray1, $sortedarray2);
-    
-    return $arrays_are_equal;
-}
-
-###################################################################################
-# Comparing two arrays. The arrays are equal, if the complete content is equal.
-###################################################################################
-
-sub compare_arrays
-{
-    my ($array1, $array2) = @_;
-    
-    my $arrays_are_equal = 1;
-
-    # checking the size
-    
-    if ( ! ( $#{$array1} == $#{$array2} )) { $arrays_are_equal = 0; }	# different size
-
-    if ( $arrays_are_equal ) # only make further investigations if size is equal
-    {
-        for ( my $i = 0; $i <= $#{$array1}; $i++ )
-        {
-            # ingnoring whitespaces at end and beginning
-            ${$array1}[$i] =~ s/^\s*//;
-            ${$array2}[$i] =~ s/^\s*//;
-            ${$array1}[$i] =~ s/\s*$//;
-            ${$array2}[$i] =~ s/\s*$//;
-
-            if ( ! ( ${$array1}[$i] eq ${$array2}[$i] ))
-            {
-                $arrays_are_equal = 0;
-                last;
-            }
-        }
-    }
-
-    return $arrays_are_equal;
-}
-
-#################################################################
-# Copying the files defined as ScpActions into the 
-# installation set.
-#################################################################
-
-sub put_scpactions_into_installset
-{
-    my ($installdir) = @_;	
-
-    installer::logger::include_header_into_logfile("Start: Copying scp action files into installation set");
-
-    for ( my $i = 0; $i <= $#installer::globals::allscpactions; $i++ )
-    {
-        my $onescpaction = $installer::globals::allscpactions[$i];
-        
-        my $subdir = "";
-        if ( $onescpaction->{'Subdir'} ) { $subdir = $onescpaction->{'Subdir'}; }
-        
-        if ( $onescpaction->{'Name'} eq "loader.exe" ) { next; }	# do not copy this ScpAction loader
-
-        my $destdir = $installdir;
-        $destdir =~ s/\Q$installer::globals::separator\E\s*$//;
-        if ( $subdir ) { $destdir = $destdir . $installer::globals::separator . $subdir; }
-        
-        my $sourcefile = $onescpaction->{'sourcepath'};
-        my $destfile = $destdir . $installer::globals::separator . $onescpaction->{'DestinationName'};
-
-        my $styles = "";
-        if ( $onescpaction->{'Styles'} ) { $styles = $onescpaction->{'Styles'}; }
-        if (( $styles =~ /\bFILE_CAN_MISS\b/ ) && ( $sourcefile eq "" )) { next; }
-
-        if (( $subdir =~ /\// ) || ( $subdir =~ /\\/ )) 
-        {
-            installer::systemactions::create_directory_structure($destdir);		
-        }
-        else
-        { 
-            installer::systemactions::create_directory($destdir);
-        }
-
-        installer::systemactions::copy_one_file($sourcefile, $destfile);
-        
-        if ( $onescpaction->{'UnixRights'} )
-        {
-            chmod oct($onescpaction->{'UnixRights'}), $destfile;
-        }
-
-    }
-
-    installer::logger::include_header_into_logfile("End: Copying scp action files into installation set");
-
-}
-
-#################################################################
-# Collecting scp actions for all languages
-#################################################################
-
-sub collect_scpactions
-{
-    my ($allscpactions) = @_;
-
-    for ( my $i = 0; $i <= $#{$allscpactions}; $i++ )
-    {
-        push(@installer::globals::allscpactions, ${$allscpactions}[$i]);
-    }
-}
-
-#################################################################
-# Setting the platform name for download
-#################################################################
-
-sub get_platform_name
-{
-    my $platformname = "";
-    
-    if (( $installer::globals::islinuxintelrpmbuild ) || ( $installer::globals::islinuxinteldebbuild ))
-    {
-        $platformname = "LinuxIntel";
-    }
-    elsif (( $installer::globals::islinuxppcrpmbuild ) || ( $installer::globals::islinuxppcdebbuild ))
-    { 
-        $platformname = "LinuxPowerPC";
-    }
-    elsif (( $installer::globals::islinuxx86_64rpmbuild ) || ( $installer::globals::islinuxx86_64debbuild ))
-    {
-        $platformname = "LinuxX86-64";
-    }
-    elsif ( $installer::globals::issolarissparcbuild )
-    {
-        $platformname = "SolarisSparc";
-    }
-    elsif ( $installer::globals::issolarisx86build )
-    {
-        $platformname = "Solarisx86";	
-    }
-    elsif ( $installer::globals::iswindowsbuild )
-    {
-        $platformname = "Win32Intel";
-    }
-    elsif ( $installer::globals::compiler =~ /^unxmacxi/ )
-    {
-        $platformname = "MacOSXIntel";
-    }
-    elsif ( $installer::globals::compiler =~ /^unxmacxp/ )
-    {
-        $platformname = "MacOSXPowerPC";
-    }
-    else
-    {
-        $platformname = $installer::globals::compiler;		
-    }
-    
-    return $platformname;
-}
-
-###########################################################
-# Adding additional variables into the variableshashref,
-# that are defined in include files in the solver. The
-# names of the include files are stored in
-# ADD_INCLUDE_FILES (comma separated list).
-###########################################################
-
-sub add_variables_from_inc_to_hashref
-{
-    my ($allvariables, $includepatharrayref) = @_;
-    
-    my $infoline = "";
-    my $includefilelist = "";
-    if ( $allvariables->{'ADD_INCLUDE_FILES'} ) { $includefilelist = $allvariables->{'ADD_INCLUDE_FILES'}; }
-    
-    my $includefiles = installer::converter::convert_stringlist_into_array_without_newline(\$includefilelist, ",");
-
-    for ( my $i = 0; $i <= $#{$includefiles}; $i++ )
-    {
-        my $includefilename = ${$includefiles}[$i];
-        $includefilename =~ s/^\s*//;
-        $includefilename =~ s/\s*$//;
-        $includefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$includefilename, $includepatharrayref, 1);
-        if ( $$includefilenameref eq "" ) { installer::exiter::exit_program("Include file $includefilename not found!\nADD_INCLUDE_FILES = $allvariables->{'ADD_INCLUDE_FILES'}", "add_variables_from_inc_to_hashref"); }
-
-        $infoline = "Including inc file: $$includefilenameref \n";
-        push( @installer::globals::globallogfileinfo, $infoline);
-
-        my $includefile = installer::files::read_file($$includefilenameref);
-
-        for ( my $j = 0; $j <= $#{$includefile}; $j++ )
-        {
-            # Analyzing all "key=value" lines
-            my $oneline = ${$includefile}[$j];
-            
-            if ( $oneline =~ /^\s*(\S+)\s*\=\s*(.*?)\s*$/ )	# no white space allowed in key
-            {
-                my $key = $1;
-                my $value = $2;
-                $allvariables->{$key} = $value;
-                $infoline = "Setting of variable: $key = $value\n";
-                push( @installer::globals::globallogfileinfo, $infoline);
-            }
-        }
-    }
-    
-    # Allowing different Java versions for Windows and Unix. Instead of "JAVAVERSION"
-    # the property "WINDOWSJAVAVERSION" has to be used, if it is set.
-    
-    if ( $installer::globals::iswindowsbuild )
-    {
-        if (( exists($allvariables->{'WINDOWSJAVAVERSION'})) && ( $allvariables->{'WINDOWSJAVAVERSION'} ne "" ))
-        {
-            $allvariables->{'JAVAVERSION'} = $allvariables->{'WINDOWSJAVAVERSION'};
-            $infoline = "Changing value of property \"JAVAVERSION\" to $allvariables->{'JAVAVERSION'} (property \"WINDOWSJAVAVERSION\").\n";
-            push( @installer::globals::globallogfileinfo, $infoline);
-        }	
-    }	
-}
-
-##############################################
-# Collecting all files from include paths
-##############################################
-
-sub collect_all_files_from_includepathes
-{
-    my ($patharrayref) = @_;
-
-    installer::logger::globallog("Reading all directories: Start");
-    installer::logger::print_message( "... reading include paths ...\n" );
-    # empty the global 
-    
-    @installer::globals::allincludepathes =();
-    my $infoline;	
-    
-    for ( my $i = 0; $i <= $#{$patharrayref}; $i++ )
-    {
-        $includepath = ${$patharrayref}[$i];
-        installer::remover::remove_leading_and_ending_whitespaces(\$includepath);
-
-        if ( ! -d $includepath )
-        {
-            $infoline = "$includepath does not exist. (Can be removed from include path list?)\n";
-            push( @installer::globals::globallogfileinfo, $infoline);
-            next;
-        }
-
-        my @sourcefiles = ();
-        my $pathstring = "";
-        installer::systemactions::read_full_directory($includepath, $pathstring, \@sourcefiles);
-
-        if ( ! ( $#sourcefiles > -1 ))
-        {
-            $infoline = "$includepath is empty. (Can be removed from include path list?)\n";
-            push( @installer::globals::globallogfileinfo, $infoline);		
-        }
-        else
-        {
-            my $number = $#sourcefiles + 1;
-            $infoline = "Directory $includepath contains $number files (including subdirs)\n";
-            push( @installer::globals::globallogfileinfo, $infoline);		
-            
-            my %allfileshash = ();
-            $allfileshash{'includepath'} = $includepath;
-            
-            for ( my $j = 0; $j <= $#sourcefiles; $j++ )
-            {
-                $allfileshash{$sourcefiles[$j]} = 1;
-            }
-
-            push(@installer::globals::allincludepathes, \%allfileshash);			
-        }
-    }	
-    
-    $installer::globals::include_pathes_read = 1;
-
-    installer::logger::globallog("Reading all directories: End");
-    push( @installer::globals::globallogfileinfo, "\n");						
-}
-
-##############################################
-# Searching for a file with the gid
-##############################################
-
-sub find_file_by_id
-{
-    my ( $filesref, $gid ) = @_;
-
-    my $foundfile = 0;
-    my $onefile;
-    
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        $onefile = ${$filesref}[$i];
-        my $filegid = $onefile->{'gid'};
-        
-        if ( $filegid eq $gid )
-        {
-            $foundfile = 1;
-            last;	
-        }		
-    }
-
-    if (! $foundfile ) { $onefile  = ""; }
-
-    return $onefile;	
-}
-
-##############################################
-# Searching for an item with the gid
-##############################################
-
-sub find_item_by_gid
-{
-    my ( $itemsref, $gid ) = @_;
-
-    my $founditem = 0;
-    my $oneitem = "";
-    
-    for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
-    {
-        my $localitem = ${$itemsref}[$i];
-        my $itemgid = $localitem->{'gid'};
-        
-        if ( $itemgid eq $gid )
-        {
-            $oneitem = $localitem;
-            $founditem = 1;
-            last;	
-        }		
-    }
-
-    return $oneitem;	
-}
-
-#########################################################
-# Calling sum 
-#########################################################
-
-sub call_sum
-{
-    my ($filename) = @_;
-
-    $sumfile = "/usr/bin/sum";
-    
-    if ( ! -f $sumfile ) { installer::exiter::exit_program("ERROR: No file /usr/bin/sum", "call_sum"); }
-    
-    my $systemcall = "$sumfile $filename |";
-    
-    my $sumoutput = "";
-
-    open (SUM, "$systemcall");
-    $sumoutput = <SUM>;
-    close (SUM);
-
-    my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    return $sumoutput;		
-}
-
-#########################################################
-# Calling wc 
-# wc -c pkginfo | cut -f6 -d' '
-#########################################################
-
-sub call_wc
-{
-    my ($filename) = @_;
-
-    $wcfile = "/usr/bin/wc";
-    
-    if ( ! -f $wcfile ) { installer::exiter::exit_program("ERROR: No file /usr/bin/wc", "call_wc"); }
-    
-    my $systemcall = "$wcfile -c $filename |";
-    
-    my $wcoutput = "";
-
-    open (WC, "$systemcall");
-    $wcoutput = <WC>;
-    close (WC);
-
-    my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    return $wcoutput;		
-}
-
-##############################################
-# Setting architecture ARCH=i86pc 
-# instead of ARCH=i386.
-##############################################
-
-sub set_old_architecture_string
-{
-    my ($pkginfofile) = @_;
-
-    for ( my $i = 0; $i <= $#{$pkginfofile}; $i++ )
-    {
-        if ( ${$pkginfofile}[$i] =~ /^\s*ARCH=i386\s*$/ )
-        {
-            ${$pkginfofile}[$i] =~ s/i386/i86pc/;
-            last;
-        }
-    }
-}
-
-##############################################
-# For the new copied package, it is necessary
-# that a value for the key SUNW_REQUIRES
-# is set. Otherwise this copied package
-# with ARCH=i86pc would be useless.
-##############################################
-
-sub check_requires_setting
-{
-    my ($pkginfofile) = @_;
-    
-    my $found = 0;
-    my $patchid = "";
-
-    for ( my $i = 0; $i <= $#{$pkginfofile}; $i++ )
-    {
-        if ( ${$pkginfofile}[$i] =~ /^\s*SUNW_REQUIRES=(\S*?)\s*$/ )
-        {
-            $patchid = $1;
-            $found = 1;
-            last;
-        }
-    }
-    
-    if (( ! $found ) || ( $patchid eq "" )) { installer::exiter::exit_program("ERROR: No patch id defined for SUNW_REQUIRES in patch pkginfo file!", "check_requires_setting"); }	
-}
-
-##############################################
-# Setting checksum and wordcount for changed
-# pkginfo file into pkgmap.
-##############################################
-
-sub set_pkginfo_line
-{
-    my ($pkgmapfile, $pkginfofilename) = @_;
-
-    # 1 i pkginfo 442 34577 1166716297
-    # ->
-    # 1 i pkginfo 443 34737 1166716297
-    # 
-    # wc -c pkginfo | cut -f6 -d' '  -> 442  (variable)
-    # sum pkginfo | cut -f1 -d' '  -> 34577  (variable)
-    # grep 'pkginfo' pkgmap | cut -f6 -d' '  -> 1166716297  (fix)
-
-    my $checksum = call_sum($pkginfofilename);
-    if ( $checksum =~ /^\s*(\d+)\s+.*$/ ) { $checksum = $1; }
-    
-    my $wordcount = call_wc($pkginfofilename);
-    if ( $wordcount =~ /^\s*(\d+)\s+.*$/ ) { $wordcount = $1; }
-
-    for ( my $i = 0; $i <= $#{$pkgmapfile}; $i++ )
-    {
-        if ( ${$pkgmapfile}[$i] =~ /(^.*\bpkginfo\b\s+)(\d+)(\s+)(\d+)(\s+)(\d+)(\s*$)/ )
-        {
-            my $newline = $1 . $wordcount . $3 . $checksum . $5 . $6 . $7;
-            ${$pkgmapfile}[$i] = $newline;
-            last;
-        }
-    }
-}
-
-##############################################
-# Setting time stamp of copied files to avoid
-# errors from pkgchk.
-##############################################
-
-sub set_time_stamp
-{
-    my ($olddir, $newdir, $copyfiles) = @_;
-    
-    for ( my $i = 0; $i <= $#{$copyfiles}; $i++ )
-    {
-        my $sourcefile = $olddir . $installer::globals::separator . ${$copyfiles}[$i];
-        my $destfile = $newdir . $installer::globals::separator . ${$copyfiles}[$i];
-
-        my $systemcall = "touch -r $sourcefile $destfile";
-
-        my $returnvalue = system($systemcall);
-
-        my $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        if ($returnvalue)
-        {
-            $infoline = "ERROR: \"$systemcall\" failed!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        else
-        {
-            $infoline = "Success: \"$systemcall\" !\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }	
-}
-
-############################################################
-# Generating pathes for cygwin (first version)
-# This function has problems with cygwin, if $tmpfilename
-# contains many thousand files (OpenOffice SDK).
-############################################################
-
-sub generate_cygwin_pathes_old
-{
-    my ($filesref) = @_;
-    
-    my ($tmpfilehandle, $tmpfilename) = tmpnam();
-    open SOURCEPATHLIST, ">$tmpfilename" or die "oops...\n";
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        print SOURCEPATHLIST "${$filesref}[$i]->{'sourcepath'}\n";
-    }
-    close SOURCEPATHLIST;
-    my @cyg_sourcepathlist = qx{cygpath -w -f "$tmpfilename"};
-    chomp @cyg_sourcepathlist;
-    unlink "$tmpfilename" or die "oops\n";
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        ${$filesref}[$i]->{'cyg_sourcepath'} = $cyg_sourcepathlist[$i];
-    }
-    
-}
-
-#################################################
-# Generating pathes for cygwin (second version)
-# This function generates smaller files for
-#################################################
-
-sub generate_cygwin_pathes
-{
-    my ($filesref) = @_;
-
-    installer::logger::include_timestamp_into_logfile("Starting generating cygwin pathes");
-    
-    my $infoline = "Generating cygwin pathes (generate_cygwin_pathes)\n";
-    push( @installer::globals::logfileinfo, $infoline);	
-    
-    my $max = 5000;  # number of pathes in one file
-    
-    my @pathcollector = ();
-    my $startnumber = 0;
-    my $counter = 0;
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $line = ${$filesref}[$i]->{'sourcepath'} . "\n";
-        push(@pathcollector, $line);
-        $counter++;
-        
-        if (( $i == $#{$filesref} ) || ((( $counter % $max ) == 0 ) && ( $i > 0 )))
-        {
-            my $tmpfilename = "cygwinhelper_" . $i . ".txt";
-            my $temppath = $installer::globals::temppath;
-            $temppath =~ s/\Q$installer::globals::separator\E\s*$//;
-            $tmpfilename = $temppath . $installer::globals::separator . $tmpfilename;
-            $infoline = "Creating temporary file for cygwin conversion: $tmpfilename (contains $counter pathes)\n";
-            push( @installer::globals::logfileinfo, $infoline);	
-            if ( -f $tmpfilename ) { unlink $tmpfilename; }
-
-            installer::files::save_file($tmpfilename, \@pathcollector);
-
-            my $success = 0;
-            my @cyg_sourcepathlist = qx{cygpath -w -f "$tmpfilename"};
-            chomp @cyg_sourcepathlist;
-            
-            # Validating the array, it has to contain the correct number of values
-            my $new_pathes = $#cyg_sourcepathlist + 1;
-            if ( $new_pathes == $counter ) { $success = 1; }
-        
-            if ($success)
-            {
-                $infoline = "Success: Successfully converted to cygwin pathes!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
-            else
-            {
-                $infoline = "ERROR: Failed to convert to cygwin pathes!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                installer::exiter::exit_program("ERROR: Failed to convert to cygwin pathes!", "generate_cygwin_pathes");
-            }
-
-            for ( my $j = 0; $j <= $#cyg_sourcepathlist; $j++ )
-            {
-                my $number = $startnumber + $j;
-                ${$filesref}[$number]->{'cyg_sourcepath'} = $cyg_sourcepathlist[$j];		
-            }
-
-            if ( -f $tmpfilename ) { unlink $tmpfilename; }
-            
-            @pathcollector = ();
-            $startnumber = $startnumber + $max;
-            $counter = 0;
-        }
-    }
-
-    # Checking existence fo cyg_sourcepath for every file	
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        if (( ! exists(${$filesref}[$i]->{'cyg_sourcepath'}) ) || ( ${$filesref}[$i]->{'cyg_sourcepath'} eq "" ))
-        {
-            $infoline = "ERROR: No cygwin sourcepath defined for file ${$filesref}[$i]->{'sourcepath'}\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            installer::exiter::exit_program("ERROR: No cygwin sourcepath defined for file ${$filesref}[$i]->{'sourcepath'}!", "generate_cygwin_pathes");
-        }
-    }
-
-    installer::logger::include_timestamp_into_logfile("Ending generating cygwin pathes");
-}
-
-##############################################
-# Include only files from install directory
-# in pkgmap file.
-##############################################
-
-sub filter_pkgmapfile
-{
-    my ($pkgmapfile) = @_;
-
-    my @pkgmap = ();
-
-    my $line = ": 1 10\n";
-    push(@pkgmap, $line);	
-
-    for ( my $i = 0; $i <= $#{$pkgmapfile}; $i++ )
-    {
-        $line = ${$pkgmapfile}[$i];
-        if ( $line =~ /^\s*1\si\s/ ) { push(@pkgmap, $line); }	
-    }
-    
-    return \@pkgmap;
-}
-
-##############################################
-# Creating double packages for Solaris x86.
-# One package with ARCH=i386 and one with
-# ARCH=i86pc.
-##############################################
-
-sub fix_solaris_x86_patch
-{
-    my ($packagename, $subdir) = @_;
-    
-    # changing into directory of packages, important for soft linking
-    my $startdir = cwd();
-    chdir($subdir);
-    
-    # $packagename is: "SUNWstaroffice-core01"
-    # Current working directory is: "<path>/install/en-US_inprogress"
-    
-    # create new folder in "packages": $packagename . ".i"
-    my $newpackagename = $packagename . "\.i";
-    my $newdir = $newpackagename;
-    installer::systemactions::create_directory($newdir);
-
-    # collecting all directories in the package
-    my $olddir = $packagename;
-    my $allsubdirs = installer::systemactions::get_all_directories_without_path($olddir);
-
-    # link all directories from $packagename to $packagename . ".i"
-    for ( my $i = 0; $i <= $#{$allsubdirs}; $i++ )
-    {
-        my $sourcedir = $olddir . $installer::globals::separator . ${$allsubdirs}[$i];
-        my $destdir = $newdir . $installer::globals::separator . ${$allsubdirs}[$i];
-        my $directory_depth = 2; # important for soft links, two directories already exist
-        installer::systemactions::softlink_complete_directory($sourcedir, $destdir, $directory_depth);
-    }
-
-    # copy "pkginfo" and "pkgmap" from $packagename to $packagename . ".i"
-    my @allcopyfiles = ("pkginfo", "pkgmap");
-    for ( my $i = 0; $i <= $#allcopyfiles; $i++ )
-    {
-        my $sourcefile = $olddir . $installer::globals::separator . $allcopyfiles[$i];
-        my $destfile = $newdir . $installer::globals::separator . $allcopyfiles[$i];
-        installer::systemactions::copy_one_file($sourcefile, $destfile);
-    }
-    
-    # change in pkginfo in $packagename . ".i" the value for ARCH from i386 to i86pc
-    my $pkginfofilename = "pkginfo";
-    $pkginfofilename = $newdir . $installer::globals::separator . $pkginfofilename;
-
-    my $pkginfofile = installer::files::read_file($pkginfofilename);
-    set_old_architecture_string($pkginfofile);
-    installer::files::save_file($pkginfofilename, $pkginfofile);
-    
-    # adapt the values in pkgmap for pkginfo file, because this file was edited
-    my $pkgmapfilename = "pkgmap";
-    $pkgmapfilename = $newdir . $installer::globals::separator . $pkgmapfilename;
-
-    my $pkgmapfile = installer::files::read_file($pkgmapfilename);
-    set_pkginfo_line($pkgmapfile, $pkginfofilename);
-    installer::files::save_file($pkgmapfilename, $pkgmapfile);
-    
-    # changing back to startdir
-    chdir($startdir);
-}
-
-###################################################
-# Creating double core01 package for Solaris x86.
-# One package with ARCH=i386 and one with
-# ARCH=i86pc. This is necessary, to inform the
-# user about the missing "small patch", if 
-# packages with ARCH=i86pc are installed.
-###################################################
-
-sub fix2_solaris_x86_patch
-{
-    my ($packagename, $subdir) = @_;
-    
-    if ( $packagename =~ /-core01\s*$/ )	# only this one package needs to be duplicated
-    {	
-        my $startdir = cwd();
-        chdir($subdir);
-    
-        # $packagename is: "SUNWstaroffice-core01"
-        # Current working directory is: "<path>/install/en-US_inprogress"
-    
-        # create new package in "packages": $packagename . ".i"
-        my $olddir = $packagename;
-        my $newpackagename = $packagename . "\.i";
-        my $newdir = $newpackagename;
-
-        installer::systemactions::create_directory($newdir);
-
-        my $oldinstalldir = $olddir . $installer::globals::separator . "install";
-        my $newinstalldir = $newdir . $installer::globals::separator . "install";
-
-        installer::systemactions::copy_complete_directory($oldinstalldir, $newinstalldir);
-
-        # setting time stamp of all copied files to avoid errors from pkgchk
-        my $allinstallfiles = installer::systemactions::get_all_files_from_one_directory_without_path($newinstalldir);
-        set_time_stamp($oldinstalldir, $newinstalldir, $allinstallfiles);
-
-        # copy "pkginfo" and "pkgmap" from $packagename to $packagename . ".i"
-        my @allcopyfiles = ("pkginfo", "pkgmap");
-        for ( my $i = 0; $i <= $#allcopyfiles; $i++ )
-        {
-            my $sourcefile = $olddir . $installer::globals::separator . $allcopyfiles[$i];
-            my $destfile = $newdir . $installer::globals::separator . $allcopyfiles[$i];
-            installer::systemactions::copy_one_file($sourcefile, $destfile);
-        }
-    
-        # change in pkginfo in $packagename . ".i" the value for ARCH from i386 to i86pc
-        my $pkginfofilename = "pkginfo";
-        $pkginfofilename = $newdir . $installer::globals::separator . $pkginfofilename;
-
-        my $pkginfofile = installer::files::read_file($pkginfofilename);
-        set_old_architecture_string($pkginfofile);
-        check_requires_setting($pkginfofile);
-        installer::files::save_file($pkginfofilename, $pkginfofile);
-    
-        # adapt the values in pkgmap for pkginfo file, because this file was edited
-        my $pkgmapfilename = "pkgmap";
-        $pkgmapfilename = $newdir . $installer::globals::separator . $pkgmapfilename;
-
-        my $pkgmapfile = installer::files::read_file($pkgmapfilename);
-        set_pkginfo_line($pkgmapfile, $pkginfofilename);
-        $pkgmapfile = filter_pkgmapfile($pkgmapfile);
-        installer::files::save_file($pkgmapfilename, $pkgmapfile);
-
-        # setting time stamp of all copied files to avoid errors from pkgchk
-        set_time_stamp($olddir, $newdir, \@allcopyfiles);
-
-        # changing back to startdir
-        chdir($startdir);
-    }
-}
-
-################################################
-# Files with flag HIDDEN get a dot at the
-# beginning of the file name. This cannot be
-# defined in scp2 project, because tooling
-# cannot handle files with beginning dot
-# correctly.
-################################################
-
-sub resolving_hidden_flag
-{
-    my ($filesarrayref, $variableshashref, $item, $languagestringref) = @_;
-    
-    my $diritem = lc($item);
-    my $infoline = "";
-
-    my $hiddendirbase = installer::systemactions::create_directories("hidden_$diritem", $languagestringref);
-
-    installer::logger::include_header_into_logfile("$item with flag HIDDEN:");
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $styles = "";
-
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-    
-        if ( $styles =~ /\bHIDDEN\b/ )
-        {
-            # Language specific subdirectory
-
-            my $onelanguage = $onefile->{'specificlanguage'};
-            
-            if ($onelanguage eq "")
-            {
-                $onelanguage = "00";	# files without language into directory "00"
-            }
-            
-            my $hiddendir = $hiddendirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; 
-            installer::systemactions::create_directory($hiddendir);	# creating language specific directories
-
-            # copy files and edit them with the variables defined in the zip.lst
-                
-            my $onefilename = $onefile->{'Name'};
-            my $newfilename = "\." . $onefilename;
-            my $sourcefile = $onefile->{'sourcepath'};
-            my $destfile = $hiddendir . $newfilename;  
-                
-            my $copysuccess = installer::systemactions::copy_one_file($sourcefile, $destfile);
-    
-            if ( $copysuccess )
-            {
-                $onefile->{'sourcepath'} = $destfile;
-                $destination = $onefile->{'destination'};
-                installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
-                if ( $destination eq "" ) { $onefile->{'destination'} = $newfilename; }
-                else { $onefile->{'destination'} = $destination . $installer::globals::separator . $newfilename; }
-                
-                $infoline = "Success: Using file with flag HIDDEN from \"$onefile->{'sourcepath'}\"!\n";
-                push( @installer::globals::logfileinfo, $infoline);			
-            }
-            else
-            {
-                $infoline = "Error: Failed to copy HIDDEN file from \"$sourcefile\" to \"$destfile\"!\n";
-                push( @installer::globals::logfileinfo, $infoline);			
-            }		
-        }
-    }
-
-    $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);	
-}
-
-################################################
-# Controlling that all keys in hash A are
-# also key in hash B.
-################################################
-
-sub key_in_a_is_also_key_in_b
-{
-    my ( $hashref_a, $hashref_b) = @_;
-    
-    my $returnvalue = 1;
-
-    my $key;
-    foreach $key ( keys %{$hashref_a} )
-    {
-        if ( ! exists($hashref_b->{$key}) )
-        {
-            print "*****\n";
-            foreach $keyb ( keys %{$hashref_b} ) { print "$keyb : $hashref_b->{$keyb}\n"; }
-            print "*****\n";
-            $returnvalue = 0;
-        }	
-    }
-
-    return $returnvalue;
-}
-
-######################################################
-# Getting the first entry from a list of languages
-######################################################
-
-sub get_first_from_list
-{
-    my ( $list ) = @_;
-    
-    my $first = $list;
-
-    if ( $list =~ /^\s*(.+?),(.+)\s*$/)	# "?" for minimal matching
-    {
-        $first = $1;
-    }
-    
-    return $first;
-}
-
-################################################
-# Setting all spellchecker languages
-################################################
-
-sub set_spellcheckerlanguages
-{
-    my ( $productlanguagesarrayref, $allvariables ) = @_;
-
-    my %productlanguages = ();
-    for ( my $i = 0; $i <= $#{$productlanguagesarrayref}; $i++ ) { $productlanguages{${$productlanguagesarrayref}[$i]} = 1;  }
-    
-    my $spellcheckfilename = $allvariables->{'SPELLCHECKERFILE'};
-    
-    my $spellcheckfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$spellcheckfilename, "", 1);
-
-    if ($$spellcheckfileref eq "") { installer::exiter::exit_program("ERROR: Could not find $spellcheckfilename!", "set_spellcheckerlanguages"); }
-
-    my $infoline = "Using spellchecker file: $$spellcheckfileref \n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-
-    my $spellcheckfile = installer::files::read_file($$spellcheckfileref);
-    my %spellcheckhash = (); 
-
-    for ( my $j = 0; $j <= $#{$spellcheckfile}; $j++ )
-    {
-        # Analyzing all "key=value" lines
-        my $oneline = ${$spellcheckfile}[$j];
-            
-        if ( $oneline =~ /^\s*(\S+)\s*\=\s*\"(.*?)\"\s*$/ )	# no white space allowed in key
-        {
-            my $onelang = $1;
-            my $languagelist = $2;
-
-            # Special handling for language packs. Only include the first language of the language list.
-            # If no spellchecker shall be included, the keyword "EMPTY" can be used.
-            
-            if ( $installer::globals::languagepack )
-            {
-                my $first = get_first_from_list($languagelist);
-                
-                if ( $first eq "EMPTY" )	 # no spellchecker into language pack
-                {
-                    $languagelist = "";
-                }
-                else
-                {
-                    $languagelist = $first;
-                }
-            }
-            else  # no language pack, so EMPTY is not required
-            {
-                $languagelist =~ s/^\s*EMPTY\s*,//;	# removing the entry EMPTY
-            }
-                    
-            $spellcheckhash{$onelang} = $languagelist;
-        }
-    }			
-
-    # Collecting all required languages in %installer::globals::spellcheckerlanguagehash
-    
-    foreach my $lang (keys %productlanguages)
-    {
-        my $languagelist = "";
-        if ( exists($spellcheckhash{$lang}) ) { $languagelist = $spellcheckhash{$lang}; }
-        else { $languagelist = $spellcheckhash{'en-US'}; }	# defaulting to English
-        
-        my $langlisthash = installer::converter::convert_stringlist_into_hash(\$languagelist, ",");
-        foreach my $onelang ( keys %{$langlisthash} ) { $installer::globals::spellcheckerlanguagehash{$onelang} = 1; }
-    }
-    
-    $installer::globals::analyze_spellcheckerlanguage = 1;
-    
-    # Logging
-
-    my $langstring = "";
-    foreach my $lang (sort keys %installer::globals::spellcheckerlanguagehash) { $langstring = $langstring . "," . $lang }
-    $langstring =~ s/^\s*,//;
-    
-    $infoline = "Collected spellchecker languages for spellchecker: $langstring \n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-}
-
-################################################
-# Including a license text into setup script
-################################################
-
-sub put_license_into_setup
-{
-    my ($installdir, $includepatharrayref) = @_;	
-
-    # find and read english license file
-    my $licenselanguage = "en-US";					# always english !
-    # my $licensefilename = "LICENSE"; # _" . $licenselanguage;
-    my $licensefilename = "license"; # . $licenselanguage . ".txt";
-    my $licenseincludepatharrayref = get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
-
-    my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);
-    if ($$licenseref eq "") { installer::exiter::exit_program("ERROR: Could not find License file $licensefilename!", "put_license_into_setup"); }
-    my $licensefile = installer::files::read_file($$licenseref);
-    
-    # Read setup
-    my $setupfilename = $installdir . $installer::globals::separator . "setup";
-    my $setupfile = installer::files::read_file($setupfilename);
-    
-    # Replacement
-    my $infoline = "Adding licensefile into setup script\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    my $includestring = "";
-    for ( my $i = 0; $i <= $#{$licensefile}; $i++ ) { $includestring = $includestring . ${$licensefile}[$i]; }
-    for ( my $i = 0; $i <= $#{$setupfile}; $i++ ) { ${$setupfile}[$i] =~ s/LICENSEFILEPLACEHOLDER/$includestring/; }
-
-    # Write setup
-    installer::files::save_file($setupfilename, $setupfile);
-}
-
-################################################
-# Setting global path to getuid.so library
-################################################
-
-sub set_getuid_path
-{
-    my ($includepatharrayref) = @_;
-    
-    my $getuidlibraryname = "getuid.so";
-    my $getuidlibraryref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$getuidlibraryname, $includepatharrayref, 0);
-    if ($$getuidlibraryref eq "") { installer::exiter::exit_program("ERROR: Could not find $getuidlibraryname!", "set_getuid_path"); }
-    
-    $installer::globals::getuidpath = $$getuidlibraryref;
-    $installer::globals::getuidpathset = 1;	
-}
-
-#########################################################
-# Create a tar file from the binary package 
-#########################################################
-
-sub tar_package
-{
-    my ( $installdir, $packagename, $tarfilename, $getuidlibrary) = @_;
-
-    my $ldpreloadstring = "";
-    if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
-
-    my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - $packagename > $tarfilename";
-    
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    chmod 0775, $tarfilename;
-
-    my $fulltarfile = $installdir . $installer::globals::separator . $tarfilename;
-    my $filesize = ( -s $fulltarfile );
-
-    return $filesize;
-}
-
-#########################################################
-# Create a tar file from the binary package 
-#########################################################
-
-sub untar_package
-{
-    my ( $installdir, $tarfilename, $getuidlibrary) = @_;
-
-    my $ldpreloadstring = "";
-    if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
-
-    my $systemcall = "cd $installdir; $ldpreloadstring tar -xf $tarfilename";
-    
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-        
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    chmod 0775, $tarfilename;
-}
-
-#########################################################
-# Shuffle an array (Fisher Yates shuffle)
-#########################################################
-
-sub shuffle_array
-{
-    my ( $arrayref ) = @_;
-
-    my $i = @$arrayref;
-    while (--$i)
-    {
-        my $j = int rand ($i+1);
-        @$arrayref[$i,$j] = @$arrayref[$j,$i];
-    }
-}
-
-################################################
-# Defining the English license text to add
-# it into Solaris packages.
-################################################
-
-sub set_english_license
-{
-    my $additional_license_name = $installer::globals::englishsolarislicensename;	# always the English file
-    my $licensefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$additional_license_name, "" , 0);
-    if ( $$licensefileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find license file $additional_license_name!", "set_english_license"); }
-    $installer::globals::englishlicenseset = 1;
-    $installer::globals::englishlicense = installer::files::read_file($$licensefileref);
-    installer::scpzipfiles::replace_all_ziplistvariables_in_file($installer::globals::englishlicense, $variableshashref);
-}
-
-##############################################
-# Setting time stamp of copied files to avoid
-# errors from pkgchk.
-##############################################
-
-sub set_time_stamp_for_file
-{
-    my ($sourcefile, $destfile) = @_;
-    
-    my $systemcall = "touch -r $sourcefile $destfile";
-
-    my $returnvalue = system($systemcall);
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: \"$systemcall\" failed!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    else
-    {
-        $infoline = "Success: \"$systemcall\" !\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-##############################################
-# Setting checksum and wordcount for changed
-# pkginfo file into pkgmap.
-##############################################
-
-sub change_onefile_in_pkgmap
-{
-    my ($pkgmapfile, $fullfilename, $shortfilename) = @_;
-
-    # 1 i pkginfo 442 34577 1166716297
-    # ->
-    # 1 i pkginfo 443 34737 1166716297
-    # 
-    # wc -c pkginfo | cut -f6 -d' '  -> 442  (variable)
-    # sum pkginfo | cut -f1 -d' '  -> 34577  (variable)
-    # grep 'pkginfo' pkgmap | cut -f6 -d' '  -> 1166716297  (fix)
-
-    my $checksum = call_sum($fullfilename);
-    if ( $checksum =~ /^\s*(\d+)\s+.*$/ ) { $checksum = $1; }
-    
-    my $wordcount = call_wc($fullfilename);
-    if ( $wordcount =~ /^\s*(\d+)\s+.*$/ ) { $wordcount = $1; }
-
-    for ( my $i = 0; $i <= $#{$pkgmapfile}; $i++ )
-    {
-        if ( ${$pkgmapfile}[$i] =~ /(^.*\b\Q$shortfilename\E\b\s+)(\d+)(\s+)(\d+)(\s+)(\d+)(\s*$)/ )
-        {
-            my $newline = $1 . $wordcount . $3 . $checksum . $5 . $6 . $7;
-            ${$pkgmapfile}[$i] = $newline;
-            last;
-        }
-    }
-}
-
-################################################
-# Adding the content of the English license
-# file into the system integration packages.
-################################################
-
-sub add_license_into_systemintegrationpackages
-{
-    my ($destdir, $packages) = @_;
-
-    for ( my $i = 0; $i <= $#{$packages}; $i++ )
-    {
-        my $copyrightfilename = ${$packages}[$i] . $installer::globals::separator . "install" . $installer::globals::separator . "copyright";
-        if ( ! -f $copyrightfilename ) { installer::exiter::exit_program("ERROR: Could not find license file in system integration package: $copyrightfilename!", "add_license_into_systemintegrationpackages"); }
-        my $copyrightfile = installer::files::read_file($copyrightfilename);
-        
-        # Saving time stamp of old copyrightfile
-        my $savcopyrightfilename = $copyrightfilename . ".sav";
-        installer::systemactions::copy_one_file($copyrightfilename, $savcopyrightfilename);
-        set_time_stamp_for_file($copyrightfilename, $savcopyrightfilename); # now $savcopyrightfile has the time stamp of $copyrightfile
-    
-        # Adding license content to copyright file
-        push(@{$copyrightfile}, "\n");
-        for ( my $i = 0; $i <= $#{$installer::globals::englishlicense}; $i++ ) { push(@{$copyrightfile}, ${$installer::globals::englishlicense}[$i]); }
-        installer::files::save_file($copyrightfilename, $copyrightfile);
-
-        # Setting the old time stamp saved with $savcopyrightfilename
-        set_time_stamp_for_file($savcopyrightfilename, $copyrightfilename); # now $copyrightfile has the time stamp of $savcopyrightfile
-        unlink($savcopyrightfilename);
-    
-        # Changing content of copyright file in pkgmap
-        my $pkgmapfilename = ${$packages}[$i] . $installer::globals::separator . "pkgmap";
-        if ( ! -f $pkgmapfilename ) { installer::exiter::exit_program("ERROR: Could not find pkgmap in system integration package: $pkgmapfilename!", "add_license_into_systemintegrationpackages"); }
-        my $pkgmap = installer::files::read_file($pkgmapfilename);
-        change_onefile_in_pkgmap($pkgmap, $copyrightfilename, "copyright");
-        installer::files::save_file($pkgmapfilename, $pkgmap);		
-    }
-}
-
-#########################################################
-# Collecting all pkgmap files from an installation set
-#########################################################
-
-sub collectpackagemaps
-{
-    my ( $installdir, $languagestringref, $allvariables ) = @_;
-    
-    installer::logger::include_header_into_logfile("Collecing all packagemaps (pkgmap):");
-    
-    my $pkgmapdir = installer::systemactions::create_directories("pkgmap", $languagestringref);
-    my $subdirname = $allvariables->{'UNIXPRODUCTNAME'} . "_pkgmaps";
-    my $pkgmapsubdir = $pkgmapdir . $installer::globals::separator . $subdirname;
-    if ( -d $pkgmapsubdir ) { installer::systemactions::remove_complete_directory($pkgmapsubdir); }
-    if ( ! -d $pkgmapsubdir ) { installer::systemactions::create_directory($pkgmapsubdir); }
-
-    $installdir =~ s/\/\s*$//;
-    # Collecting all packages in $installdir and its sub package ("packages")
-    my $searchdir = $installdir . $installer::globals::separator . $installer::globals::epmoutpath;
-
-    my $allpackages = installer::systemactions::get_all_directories_without_path($searchdir);
-
-    for ( my $i = 0; $i <= $#{$allpackages}; $i++ )
-    {
-        my $pkgmapfile = $searchdir . $installer::globals::separator . ${$allpackages}[$i] . $installer::globals::separator . "pkgmap";
-        my $destfilename = $pkgmapsubdir . $installer::globals::separator . ${$allpackages}[$i] . "_pkgmap";
-        installer::systemactions::copy_one_file($pkgmapfile, $destfilename);
-    }
-
-    # Create a tar gz file with all package maps
-    my $tarfilename = $subdirname . ".tar";
-    my $targzname = $tarfilename . ".gz";
-    $systemcall = "cd $pkgmapdir; tar -cf - $subdirname | gzip > $targzname";
-    make_systemcall($systemcall);
-    installer::systemactions::remove_complete_directory($pkgmapsubdir, 1);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
deleted file mode 100644
index fe3998845..000000000
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ /dev/null
@@ -1,1820 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-package installer::xpdinstaller;
-
-use Cwd;
-use installer::converter;
-use installer::exiter;
-use installer::globals;
-use installer::languages;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::remover;
-use installer::systemactions;
-
-
-#######################################################
-# Searching for the module name and description in the
-# modules collector
-#######################################################
-
-sub get_module_name_description
-{
-    my ($modulesarrayref, $onelanguage, $gid, $type) = @_;
-
-    my $found = 0;
-    
-    my $newstring = "";
-
-    for ( my $i = 0; $i <= $#{$modulesarrayref}; $i++ )
-    {
-        my $onemodule = ${$modulesarrayref}[$i];
-        
-        if ( $onemodule->{'gid'} eq $gid )
-        {
-            my $typestring = $type . " " . "(" . $onelanguage . ")";
-            if ( $onemodule->{$typestring} ) { $newstring = $onemodule->{$typestring}; }
-            $found = 1;
-        }
-
-        if ( $found ) { last; }
-    }
-    
-    # defaulting to english
-    
-    if ( ! $found )
-    {
-        my $defaultlanguage = "en-US";
-        
-        for ( my $i = 0; $i <= $#{$modulesarrayref}; $i++ )
-        {
-            my $onemodule = ${$modulesarrayref}[$i];
-
-            if ( $onemodule->{'gid'} eq $gid )
-            {
-                my $typestring = $type . " " . "(" . $defaultlanguage . ")";
-                if ( $onemodule->{$typestring} ) { $newstring = $onemodule->{$typestring}; }
-                $found = 1;
-            }
-
-            if ( $found ) { last; }
-        }
-    }
-
-    return $newstring;
-}
-
-###################################################
-# Finding module, specified by the gid 
-###################################################
-
-sub get_module
-{
-    my ($modulegid, $modulesarrayref) = @_;
-
-    my $found = 0;
-    my $searchmodule = "";
-    
-    for ( my $i = 0; $i <= $#{$modulesarrayref}; $i++ )
-    {
-        my $onemodule = ${$modulesarrayref}[$i];
-        
-        if ( $onemodule->{'gid'} eq $modulegid )
-        {
-            $searchmodule = $onemodule;
-            $found = 1;
-            last;
-        }
-    }
-    
-    return $searchmodule;
-}
-
-###################################################
-# Creating package start tag 
-###################################################
-
-sub get_package_tag
-{
-    my ( $module, $indent, $linkpackage ) = @_;
-    
-    my $modulegid = $module->{'gid'};
-    if ( $linkpackage ) { $modulegid = $modulegid . "u"; }
-    my $parentgid = "";
-    if ( $module->{'ParentID'} ) { $parentgid = $module->{'ParentID'}; }
-    if ( $parentgid eq "" ) { $parentgid = "root"; }
-    if ( $module->{'XPDParentID'} ) { $parentgid = $module->{'XPDParentID'}; } # changing parent of "Prg" and "Opt" to "root"
-    
-    my $tag = $indent . "<package " . "name=" . "\"" . $modulegid . "\" " . "parent=" . "\"" . $parentgid . "\">" . "\n"; 
-
-    return ( $tag, $parentgid );
-}
-
-###################################################
-# Creating display start tag 
-###################################################
-
-sub get_display_tag
-{
-    my ( $module, $indent ) = @_;
-    
-    # Styles=(HIDDEN_ROOT)
-    my $styles = "";
-    my $type = "";
-    if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
-    if ( $styles =~ /\bHIDDEN_ROOT\b/ ) { $type = "hidden"; }
-    else { $type = "show"; }
-
-    # special handling for language modules. Only visible in multilingual installation set.
-    if (( $styles =~ /\bSHOW_MULTILINGUAL_ONLY\b/ ) && ( ! $installer::globals::ismultilingual )) { $type = "hidden"; }
-    
-    # special handling for the root module, which has no parent
-    my $parentgid = "";
-    if ( $module->{'ParentID'} ) { $parentgid = $module->{'ParentID'}; }
-    if ( $parentgid eq "" ) { $type = "hidden"; }
-
-    my $tag = $indent . "<display " . "type=" . "\"" . $type . "\"" . ">" . "\n"; 
-
-    return $tag;
-}
-
-###################################################
-# Creating installunit start tag 
-###################################################
-
-sub get_installunit_tag
-{
-    my ( $indent ) = @_;
-    
-    my $type = $installer::globals::packageformat;
-    
-    my $tag = $indent . "<installunit " . "type=" . "\"" . $type . "\"" . ">" . "\n"; 
-
-    return $tag;
-}
-
-###################################################
-# Creating simple start tags 
-###################################################
-
-sub get_start_tag
-{
-    my ( $tag, $indent ) = @_;
-
-    my $starttag = $indent . "<" . $tag . ">" . "\n";
-    return $starttag;
-}
-
-###################################################
-# Creating end tags 
-###################################################
-
-sub get_end_tag
-{
-    my ( $tag, $indent ) = @_;
-
-    my $endtag = $indent . "</" . $tag . ">" . "\n";
-    return $endtag;
-}
-
-###################################################
-# Creating simple complete tag 
-###################################################
-
-sub get_tag_line
-{
-    my ( $indent, $name, $value ) = @_; 
-    $value = '' unless defined $value;
-
-    my $line = $indent . "<" . $name . ">" . $value . "</" . $name . ">" . "\n";
-
-}
-
-###################################################
-# Asking module for sortkey entry 
-###################################################
-
-sub get_sortkey_value
-{
-    my ( $module ) = @_;
-
-    my $value = "9999";
-        
-    if ( $module->{'Sortkey'} ) { $value = $module->{'Sortkey'}; }
-    
-    return $value;
-}
-
-###################################################
-# Asking module for default entry 
-###################################################
-
-sub get_default_value
-{
-    my ( $module ) = @_;
-
-    my $value = "";
-        
-    if ( $module->{'Default'} ) { $value = $module->{'Default'}; } # is YES or NO
-    
-    if ( $value =~ /\bNO\b/i ) { $value = "false"; }
-    else { $value = "true"; }
-        
-    return $value;
-}
-
-###################################################
-# Asking module for showinuserinstall entry 
-# scp style: DONTSHOWINUSERINSTALL
-###################################################
-
-sub get_showinuserinstall_value
-{
-    my ( $module ) = @_;
-
-    my $value = "true";
-    
-    my $styles = "";
-    if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; } 
-    if ( $styles =~ /\bDONTSHOWINUSERINSTALL\b/ ) { $value = "false"; }	
-    
-    return $value;
-}
-
-###################################################
-# Asking module for showinuserinstall entry 
-# scp style: USERINSTALLONLY
-###################################################
-
-sub get_userinstallonly_value
-{
-    my ( $module ) = @_;
-
-    my $value = "false";
-    
-    my $styles = "";
-    if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; } 
-    if ( $styles =~ /\bUSERINSTALLONLY\b/ ) { $value = "true"; }	
-    
-    return $value;
-}
-
-###################################################
-# Asking module for dontuninstall entry 
-# scp style: DONTUNINSTALL
-###################################################
-
-sub get_dontuninstall_value
-{
-    my ( $module ) = @_;
-
-    my $value = "false";
-
-    my $styles = "";
-    if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; } 
-    if ( $styles =~ /\bDONTUNINSTALL\b/ ) { $value = "true"; }
-    
-    return $value;
-}
-
-###################################################
-# Asking module for XpdCheckSolaris entry 
-# (belongs to scp module)
-###################################################
-
-sub get_checksolaris_value
-{
-    my ( $module ) = @_;
-
-    my $value = "";
-    if ( $module->{'XpdCheckSolaris'} ) { $value = $module->{'XpdCheckSolaris'}; } 
-    
-    return $value;
-}
-
-###################################################
-# Asking module for isupdatepackage entry 
-# scp style: ISUPDATEPACKAGE
-###################################################
-
-sub get_isupdatepackage_value
-{
-    my ( $module ) = @_;
-
-    my $value = "false";
-
-    my $styles = "";
-    if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; } 
-    if ( $styles =~ /\bISUPDATEPACKAGE\b/ ) { $value = "true"; }
-    
-    return $value;
-}
-
-###################################################
-# Asking module for showmultilingualonly entry 
-# scp style: SHOW_MULTILINGUAL_ONLY
-###################################################
-
-sub get_showmultilingualonly_value
-{
-    my ( $module ) = @_;
-
-    my $value = "false";
-
-    my $styles = "";
-    if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; } 
-    if ( $styles =~ /\bSHOW_MULTILINGUAL_ONLY\b/ ) { $value = "true"; }
-    
-    return $value;
-}
-
-###################################################
-# Asking module for showmultilingualonly entry 
-# scp style: SHOW_MULTILINGUAL_ONLY
-###################################################
-
-sub get_applicationmodule_value
-{
-    my ( $module ) = @_;
-
-    my $value = "false";
-
-    my $styles = "";
-    if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; } 
-    if ( $styles =~ /\bAPPLICATIONMODULE\b/ ) { $value = "true"; }
-    
-    return $value;
-}
-
-###################################################
-# Asking module for java module entry 
-# scp style: JAVAMODULE
-###################################################
-
-sub get_isjavamodule_value
-{
-    my ( $module ) = @_;
-
-    my $value = "false";
-
-    my $styles = "";
-    if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; } 
-    if ( $styles =~ /\bJAVAMODULE\b/ ) { $value = "true"; }
-    
-    return $value;
-}
-
-#####################################################################
-# Asking module, if installation shall use --force 
-# scp style: USEFORCE  (Linux only)
-#####################################################################
-
-sub get_useforce_value
-{
-    my ( $module ) = @_;
-
-    my $value = "false";
-
-    my $styles = "";
-    if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; } 
-    if ( $styles =~ /\bUSEFORCE\b/ ) { $value = "true"; }
-    
-    return $value;
-}
-
-###################################################
-# Asking module, if installation can fail 
-# scp style: INSTALLCANFAIL
-###################################################
-
-sub get_installcanfail_value
-{
-    my ( $module ) = @_;
-
-    my $value = "false";
-
-    my $styles = "";
-    if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; } 
-    if ( $styles =~ /\bINSTALLCANFAIL\b/ ) { $value = "true"; }
-    
-    return $value;
-}
-
-###################################################
-# Asking module, if installation can fail 
-# scp style: INSTALLCANFAIL
-###################################################
-
-sub get_forceintoupdate_value
-{
-    my ( $module ) = @_;
-
-    my $value = "false";
-
-    my $styles = "";
-    if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; } 
-    if ( $styles =~ /\bFORCEINTOUPDATE\b/ ) { $value = "true"; }
-    
-    return $value;
-}
-
-###################################################
-# Substituting all occurrences of "<" by "&lt;"
-# and all occurrences of ">" by "&gt;"
-###################################################
-
-sub replace_brackets_in_string
-{
-    my ( $string ) = @_;
-    
-    if ( $string =~ /\</ ) { $string =~ s/\</\&lt\;/g; }
-    if ( $string =~ /\>/ ) { $string =~ s/\>/\&gt\;/g; }
-
-    return $string;	
-}
-
-###################################################
-# Substituting all occurrences of "\uUXYZ" by
-# "&#xUXYZ;", because the use xml saxparser does
-# not know anything about this encoding. Therfore
-# the xml file can keep standard encoding "UTF-8"
-# and all strings with "\uUXYZ" do not need to 
-# be converted from the Java installer.
-###################################################
-
-sub replace_javaencoding_in_string
-{
-    my ( $string ) = @_;
-    
-    while ( $string =~ /(\\u\w\w\w\w)/ )
-    {
-        my $oldvalue = $1;
-        my $newvalue = "";
-        if ( $oldvalue =~ /\\u(\w\w\w\w)/ )
-        {
-            my $number = $1;
-            $newvalue = "&#x" . $number . ";";
-        }
-        
-        $string =~ s/\Q$oldvalue\E/$newvalue/;
-    }
-
-    return $string;
-}
-
-###################################################
-# Collecting language dependent entries from scp
-# (Name and Description)
-###################################################
-
-sub collect_lang_values
-{
-    my ($indent, $module, $xpdfile, $searchentry, $saveentry) = @_;	
-
-    foreach $key (keys %{$module})
-    {
-        my $write_line = 0;
-        my $javalanguage = "";
-        
-        if ( $key =~ /^\s*\Q$searchentry\E\s+\((\S+)\)\s*$/ )	# this are the language dependent keys
-        {
-            $language = $1;
-            $javalanguage = installer::languages::get_java_language($language);
-            $write_line = 1;
-        } 
-        elsif ( $key =~ /^\s*\Q$searchentry\E\s*$/ )	# this are the language independent keys
-        {
-            $javalanguage = "en_US";
-            $write_line = 1;
-        }
-        
-        if ( $write_line ) 
-        {
-            my $value = $module->{$key};
-            $value = replace_brackets_in_string($value);
-            $value = replace_javaencoding_in_string($value);
-            my $line = $indent . "<" . $saveentry . " lang=" . "\"" . $javalanguage . "\"" . ">" . $value . "<\/" . $saveentry . ">" . "\n";
-            push(@{$xpdfile}, $line);
-        }
-    }
-}
-
-###################################################
-# Removing language dependent entries from 
-# module hash (Name and Description)
-###################################################
-
-sub remove_lang_values
-{
-    my ($module, $searchentry) = @_;	
-
-    my $key = "";
-
-    foreach $key (keys %{$module})
-    {		
-        if ( $key =~ /^\s*\Q$searchentry\E\s+\((\S+)\)\s*$/ )	# this are the language dependent keys
-        {
-            delete($module->{$key});
-        } 
-    }
-}
-
-###################################################
-# Setting package install order 
-###################################################
-
-sub get_order_value
-{
-    my ( $module ) = @_;
-
-    my $value = "1000"; # Setting the default value
-    
-    if ( $module->{'InstallOrder'} ) { $value = $module->{'InstallOrder'}; }
-
-    return $value;
-}
-
-###################################################
-# Checking size of package 
-###################################################
-
-sub get_size_value
-{
-    my ( $packagename, $xpdinfo ) = @_;
-
-    my $value = "";
-
-    if ( $xpdinfo->{'FileSize'} )
-    {
-        $value =  $xpdinfo->{'FileSize'};
-        return $value;
-    }
-
-    my $isrpmfile = 0;
-    if ( $packagename =~ /\.rpm\s*$/ ) { $isrpmfile = 1; }
-
-    if (( $installer::globals::isrpmbuild ) && ( $isrpmfile ))
-    {	
-        if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
-
-        my $systemcall = "$installer::globals::rpmquerycommand -qp --queryformat \"\[\%\{FILESIZES\}\\n\]\" $packagename 2\>\&1 |";
-        my $ld_library_backup = $ENV{LD_LIBRARY_PATH};
-        if ( defined $ENV{SYSBASE}) {
-            my $sysbase = $ENV{SYSBASE};
-            if ( !defined ($ld_library_backup) or ("$ld_library_backup" eq "") ) {
-                $ld_library_backup = "" if ! defined $ld_library_backup;
-                $ENV{LD_LIBRARY_PATH} = "$sysbase/usr/lib";
-            } else {
-                $ENV{LD_LIBRARY_PATH} = "$ld_library_backup:$sysbase/lib";
-            }
-        }
-        my ($rpmout, $error) = make_systemcall_allowing_error($systemcall, 0, 1);
-        $ENV{LD_LIBRARY_PATH} = $ld_library_backup;
-        # Evaluating an error, because of rpm problems with removed LD_LIBRARY_PATH 
-        if ( $error )
-        {
-            installer::logger::print_message( "... trying /usr/bin/rpm ...\n" );
-            my $systemcall = "/usr/bin/rpm -qp --queryformat \"\[\%\{FILESIZES\}\\n\]\" $packagename 2\>\&1 |";
-            ($rpmout, $error) = make_systemcall_allowing_error($systemcall, 0, 0);
-            if ( $error ) { installer::exiter::exit_program("ERROR: rpm failed to query package!", "get_size_value"); }
-        }
-        $value = do_sum($rpmout);		# adding all filesizes in bytes
-        $value = $value/1000;
-
-        my $ganzzahl = int $value;
-        if ($ganzzahl < $value) { $value = $ganzzahl + 1; }
-        else { $value = $ganzzahl; }
-
-        my $rpmname = $packagename;
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$rpmname);		
-        $infoline = "Filesize $rpmname : $value\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    if ( $installer::globals::issolarispkgbuild )
-    {
-        my $filename = "pkgmap";
-        $filename = $packagename . $installer::globals::separator . $filename;
-        $file = installer::files::read_file($filename);
-        
-        for ( my $i = 0; $i <= $#{$file}; $i++ )
-        {
-            my $line = ${$file}[$i];
-            if ( $line =~ /^\s*\:\s+\d+\s+(\d+?)\s+/ )
-            {
-                $value = $1;
-                if ( ! ( $value%2 == 0 )) { $value = $value + 1; }
-                $value = $value/2;		# not blocks, but kB
-                last;
-            }
-        }		
-    }
-    
-    if ( $value eq "" ) { $value = "0"; }
-    
-    return $value;
-}
-
-###################################################
-# Checking md5 of package 
-###################################################
-
-sub get_md5_value
-{
-    my ( $packagename, $xpdinfo ) = @_;
-
-    my $value = "";
-    
-    if ( $xpdinfo->{'md5sum'} )
-    {
-        $value =  $xpdinfo->{'md5sum'};
-        return $value;
-    }
-
-    if ( $installer::globals::isrpmbuild )
-    {
-        my $md5file = "/usr/bin/md5sum";
-    
-        if ( -x $md5file )
-        {
-            my $systemcall = "$md5file $packagename 2\>\&1 |";
-            my $md5out = make_systemcall($systemcall, 1);
-            $value = ${$md5out}[0];
-            if ( $value =~ /^\s*(\S+?)\s+.*$/ )
-            {
-                $value = $1;
-            }
-            
-            my $rpmname = $packagename;
-            installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$rpmname);		
-            $infoline = "md5sum of $rpmname : $value\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-    
-    return $value;
-}
-
-###################################################
-# Checking name of package 
-###################################################
-
-sub get_name_value
-{
-    my ( $packagename ) = @_;
-
-    my $value = $packagename;
-
-    # $packagename contains the complete path to the package
-    # Only the name of file or directory is required
-    
-    installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$value);		
-    
-    return $value;
-}
-
-###################################################
-# Checking full package name (Linux only) 
-###################################################
-
-sub get_fullpkgname_value
-{
-    my ( $packagename, $xpdinfo ) = @_;
-
-    my $value = "";
-    my $isrpmfile = 0;
-    if ( $packagename =~ /\.rpm\s*$/ ) { $isrpmfile = 1; }
-
-    if (( $installer::globals::isrpmbuild ) && ( $isrpmfile ))
-    {
-        if ( $xpdinfo->{'FullPackageName'} )
-        {
-            $value =  $xpdinfo->{'FullPackageName'};
-            return $value;
-        }
-        
-        if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
-        my $systemcall = "$installer::globals::rpmquerycommand -qp $packagename |";
-        my $ld_library_backup = $ENV{LD_LIBRARY_PATH};
-        if ( defined $ENV{SYSBASE}) {
-            my $sysbase = $ENV{SYSBASE};
-            if ( !defined ($ld_library_backup) or ("$ld_library_backup" eq "") ) {
-                $ld_library_backup = "" if ! defined $ld_library_backup;
-                $ENV{LD_LIBRARY_PATH} = "$sysbase/usr/lib";
-            } else {
-                $ENV{LD_LIBRARY_PATH} = "$ld_library_backup:$sysbase/lib";
-            }
-        }
-        my ($returnarray, $error) = make_systemcall_allowing_error($systemcall, 0, 1);
-        $ENV{LD_LIBRARY_PATH} = $ld_library_backup;
-        # Evaluating an error, because of rpm problems with removed LD_LIBRARY_PATH 
-        if ( $error )
-        {
-            installer::logger::print_message( "... trying /usr/bin/rpm ...\n" );
-            my $systemcall = "/usr/bin/rpm -qp $packagename |";
-            ($returnarray, $error) = make_systemcall_allowing_error($systemcall, 0, 0);
-            if ( $error ) { installer::exiter::exit_program("ERROR: rpm failed to query package!", "get_fullpkgname_value"); }
-        }
-        $value = ${$returnarray}[0];
-        installer::remover::remove_leading_and_ending_whitespaces(\$value);
-
-        my $rpmname = $packagename;
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$rpmname);		
-
-        $infoline = "Full package name from $rpmname: $value\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }	
-    
-    return $value;
-}
-
-###################################################
-# Checking package version (Solaris only) 
-###################################################
-
-sub get_pkgversion_value
-{
-    my ( $completepackagename, $xpdinfo ) = @_;
-
-    my $value = "";
-    
-    if ( $xpdinfo->{'PkgVersion'} )
-    {
-        $value =  $xpdinfo->{'PkgVersion'};
-        return $value;
-    }
-
-    if ( $installer::globals::issolarispkgbuild )
-    {
-        my $pkgfile = "pkgparam";
-        my $packagepath = $completepackagename;
-        installer::pathanalyzer::get_path_from_fullqualifiedname(\$packagepath);
-
-        my $packagename = $completepackagename;
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$packagename);
-
-        my $systemcall = "$pkgfile -d $packagepath $packagename param VERSION 2\>\&1 |";
-        my $returnarray = make_systemcall($systemcall, 0);
-
-        $value = ${$returnarray}[0];
-        installer::remover::remove_leading_and_ending_whitespaces(\$value);
-    }
-    
-    return $value;
-}
-
-###################################################
-# Writing subdirectory into xpd file 
-###################################################
-
-sub get_subdir_value
-{
-    my ( $packagename, $subdir, $module ) = @_;
-
-    my $value = "";
-    
-    if ( $subdir ) { $value = $subdir; }
-    
-    if ( $module->{'Subdir'} ) { $value = $module->{'Subdir'}; }
-    
-    return $value;
-}
-
-###################################################
-# Checking if package is relocatable 
-###################################################
-
-sub get_relocatable_value
-{
-    my ( $module ) = @_;
-
-    my $value = "true";
-    
-    my $styles = "";
-    if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; } 
-    if ( $styles =~ /\bNOTRELOCATABLE\b/ ) { $value = "false"; }	
-
-    return $value;
-}
-
-###################################################
-# Checking if package is relocatable 
-###################################################
-
-sub get_languagespecific_value
-{
-    my ( $islanguagemodule ) = @_;
-
-    my $value = "false";
-    
-    if ( defined $islanguagemodule && $islanguagemodule == 1 ) { $value = "true"; }
-
-    return $value;
-}
-
-#######################################################
-# Adding the values of the array
-#######################################################
-
-sub do_sum
-{
-    my ( $allnumbers ) = @_;
-
-    my $sum = 0;
-
-    for ( my $i = 0; $i <= $#{$allnumbers}; $i++ )
-    {
-        $sum = $sum + ${$allnumbers}[$i];
-    }
-
-    return $sum;
-}
-
-#######################################################
-# Executing one system call
-#######################################################
-
-sub make_systemcall
-{
-    my ( $systemcall, $logreturn ) = @_;
-
-    my @returns = ();
-
-    installer::logger::print_message( "... $systemcall ...\n" );
-
-    open (REG, "$systemcall");
-    while (<REG>) {push(@returns, $_); }
-    close (REG);
-
-    my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ( $logreturn )
-    {
-        for ( my $j = 0; $j <= $#returns; $j++ ) { push( @installer::globals::logfileinfo, "$returns[$j]"); }
-    }
-    
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $error_occurred = 1;
-    }
-    else
-    {
-        $infoline = "SUCCESS: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    return \@returns;
-}
-
-#######################################################
-# Executing one system call
-#######################################################
-
-sub make_systemcall_allowing_error
-{
-    my ( $systemcall, $logreturn, $can_fail ) = @_;
-
-    my @returns = ();
-
-    installer::logger::print_message( "... $systemcall ...\n" );
-
-    open (REG, "$systemcall");
-    while (<REG>) {push(@returns, $_); }
-    close (REG);
-
-    my $returnvalue = $?;	# $? contains the return value of the systemcall
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ( $logreturn )
-    {
-        for ( my $j = 0; $j <= $#returns; $j++ ) { push( @installer::globals::logfileinfo, "$returns[$j]"); }
-    }
-    
-    if ($returnvalue)
-    {
-        if ( $can_fail )
-        {
-            $infoline = "WARNING: Failed system call:  $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            $error_occurred = 1;
-        }
-        else
-        {
-            $infoline = "ERROR: $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            $error_occurred = 1;
-        }
-    }
-    else
-    {
-        $infoline = "SUCCESS: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-    
-    return (\@returns, $returnvalue);
-}
-
-###################################################
-# Setting product name tag
-###################################################
-
-sub get_product_tag
-{
-    my ($allvariables, $indent) = @_;
-
-    my $productname = $allvariables->{'LCONEWORDPRODUCTNAME'};
-    my $tag = $indent . "<product " . "name=" . "\"" . $productname . "\">" . "\n"; 
-
-    return $tag;
-}
-
-###################################################
-# Macro tags 
-###################################################
-
-sub set_macro_tag
-{
-    my ($allvariables, $indent, $key) = @_;
-    
-    my $property = "";
-    my $value = "";
-
-    if ( $key eq "product_name" ) { $property = "PRODUCTNAME"; }
-    elsif ( $key eq "product_version" ) { $property = "PRODUCTVERSION"; }
-    elsif ( $key eq "product_suffix" ) { $property = "PRODUCTEXTENSION"; }
-    elsif ( $key eq "product_fullname" ) { $property = "FULLPRODUCTNAME"; }
-    
-    if (( $property eq "PRODUCTNAME" ) || ( $property eq "PRODUCTVERSION" ) || ( $property eq "PRODUCTEXTENSION" ))
-    {
-        $value = $allvariables->{$property};
-    }
-
-    if ( $property eq "FULLPRODUCTNAME" )
-    {
-        $value = $allvariables->{"PRODUCTNAME"} . " " . $allvariables->{"PRODUCTVERSION"};
-        if ( $allvariables->{"PRODUCTEXTENSION"} ) { $value = $value . " " . $allvariables->{"PRODUCTEXTENSION"}; }
-    }
-
-    my $tag = $indent . "<macro " . "key=" . "\"" . $key . "\">" . $value . "\<\/macro\>" . "\n"; 
-
-    return $tag;
-
-}
-
-###################################################
-# Setting the minor of the product version
-# Required to check for Major Upgrades. 
-###################################################
-
-sub set_minor_tag
-{
-    my ($allvariables, $indent) = @_;
-
-    my $productminor = 0;
-    if ( $allvariables->{"PACKAGEVERSION"} )
-    {
-        if ( $allvariables->{"PACKAGEVERSION"} =~ /^\s*\d+\.(\d+)/ ) { $productminor = $1; }
-    }
-    my $tag = $indent . "<productminor>" . $productminor . "</productminor>" . "\n"; 
-
-    return $tag;
-}
-
-###################################################
-# Setting the update behaviour 
-###################################################
-
-sub set_update_tag
-{
-    my ($allvariables, $indent) = @_;
-
-    my $updateflag = "false";
-    if ( $allvariables->{"DONTUPDATE"} ) { $updateflag = "true"; }
-    my $tag = $indent . "<dontupdate>" . $updateflag . "</dontupdate>" . "\n"; 
-
-    return $tag;
-}
-
-###################################################
-# Setting the license dialog behaviour 
-###################################################
-
-sub set_hideeula_tag
-{
-    my ($allvariables, $indent) = @_;
-
-    my $hidelicenseflag = "false";
-    if ( $allvariables->{"HIDELICENSEDIALOG"} ) { $hidelicenseflag = "true"; }
-    my $tag = $indent . "<hideeula>" . $hidelicenseflag . "</hideeula>" . "\n"; 
-
-    return $tag;
-}
-
-###################################################
-# Setting default directory 
-###################################################
-
-sub set_defaultdir_tag
-{
-    my ($allvariables, $indent) = @_;
-
-    my $defaultdir = "";
-    if ( $allvariables->{"DEFAULTDESTPATH"} ) { $defaultdir = $allvariables->{"DEFAULTDESTPATH"}; }
-    my $tag = $indent . "<defaultdir>" . $defaultdir . "</defaultdir>" . "\n"; 
-
-    return $tag;
-}
-
-###################################################
-# Setting product directory 
-###################################################
-
-sub set_productdir_tag
-{
-    my ($allvariables, $indent) = @_;
-
-    my $productdir = "";
-    if ( $allvariables->{"UNIXPRODUCTNAME"} )
-    {
-        $productdir = $allvariables->{"UNIXPRODUCTNAME"};
-        
-        if ( $allvariables->{"BRANDPACKAGEVERSION"} )
-        {
-            $productdir = $productdir . $allvariables->{"BRANDPACKAGEVERSION"};
-        }
-        else
-        {
-            if ( $allvariables->{"PRODUCTVERSION"} )
-            {
-                $productdir = $productdir . $allvariables->{"PRODUCTVERSION"};
-            }			
-        }
-    }
-    my $tag = $indent . "<productdir>" . $productdir . "</productdir>" . "\n"; 
-
-    return $tag;
-}
-
-#####################################################
-# Setting the package directory in installation set
-#####################################################
-
-sub set_packagedir_tag
-{
-    my ($indent) = @_;
-
-    my $tag = $indent . "<packagedirectory>" . $installer::globals::epmoutpath . "</packagedirectory>" . "\n"; 
-
-    return $tag;
-}
-
-###################################################
-# Setting the packagetype of installation set
-###################################################
-
-sub set_packagetype_tag
-{
-    my ($indent) = @_;
-
-    my $tag = $indent . "<packageformat>" . $installer::globals::packageformat . "</packageformat>" . "\n"; 
-
-    return $tag;
-}
-
-###################################################
-# Setting the architecture of installation set
-###################################################
-
-sub set_architecture_tag
-{
-    my ($indent) = @_;
-    
-    my $architecture = "";
-    if ( $installer::globals::issolarissparcbuild ) { $architecture = "sparc"; } 
-    if ( $installer::globals::issolarisx86build ) { $architecture = "i386"; }	
-    
-    my $tag = $indent . "<architecture>" . $architecture . "</architecture>" . "\n"; 
-
-    return $tag;
-}
-
-###################################################
-# Setting the multi language tag
-###################################################
-
-sub set_multilanguage_tag
-{
-    my ($indent) = @_;
-    
-    my $value = "false";
-    if ( $installer::globals::ismultilingual == 1 ) { $value = "true"; }
-    
-    my $tag = $indent . "<multilingual>" . $value . "</multilingual>" . "\n"; 
-
-    return $tag;	
-}
-
-###################################################
-# Setting the language tag
-###################################################
-
-sub set_language_tag
-{
-    my ($languagestringref, $indent) = @_;
-    
-    my $tag = $indent . "<languages>" . $$languagestringref . "</languages>" . "\n"; 
-
-    return $tag;	
-}
-
-###################################################
-# Collecting content for product xpd file 
-###################################################
-
-# <?xml version='1.0' encoding='utf-8'?>
-#
-# <!-- General application description -->
-#
-# <product name="openoffice">
-#     <macro key="product_name">Sun OpenOffice.org</macro>
-#     <macro key="product_version">1.0</macro>
-#     <macro key="product_suffix">Mephisto</macro>
-#     <macro key="product_fullname">Sun OpenOffice.org 1.0 Mephisto</macro>
-#     <defaultdir>/opt/Sun/OpenOffice.org-Mephisto</defaultdir>
-# </product>
-
-sub get_setup_file_content
-{
-    my ($allvariables, $languagestringref) = @_;
-
-    my @xpdfile = ();
-    my $noindent = "";
-    my $singleindent = "    ";
-
-    my $line = "<?xml version='1.0' encoding='utf-8'?>\n\n";
-    push(@xpdfile, $line);
-    $line = "<!-- General application description -->\n\n";
-    push(@xpdfile, $line);
-
-    my $tag = get_product_tag($allvariables, $noindent);
-    push(@xpdfile, $tag);
-
-    $tag = set_macro_tag($allvariables, $singleindent, "product_name");
-    push(@xpdfile, $tag);
-    $tag = set_macro_tag($allvariables, $singleindent, "product_version");
-    push(@xpdfile, $tag);
-    $tag = set_macro_tag($allvariables, $singleindent, "product_suffix");
-    push(@xpdfile, $tag);
-    $tag = set_macro_tag($allvariables, $singleindent, "product_fullname");
-    push(@xpdfile, $tag);
-
-    $tag = set_defaultdir_tag($allvariables, $singleindent);
-    push(@xpdfile, $tag);
-
-    $tag = set_productdir_tag($allvariables, $singleindent);
-    push(@xpdfile, $tag);
-
-    $tag = set_minor_tag($allvariables, $singleindent);
-    push(@xpdfile, $tag);
-
-    $tag = set_update_tag($allvariables, $singleindent);
-    push(@xpdfile, $tag);
-
-    $tag = set_packagedir_tag($singleindent);
-    push(@xpdfile, $tag);
-    
-    $tag = set_packagetype_tag($singleindent);
-    push(@xpdfile, $tag);
-
-    $tag = set_architecture_tag($singleindent);
-    push(@xpdfile, $tag);
-
-    $tag = set_multilanguage_tag($singleindent);
-    push(@xpdfile, $tag);
-
-    $tag = set_language_tag($languagestringref, $singleindent);
-    push(@xpdfile, $tag);
-
-    $tag = set_hideeula_tag($allvariables, $singleindent);
-    push(@xpdfile, $tag);
-
-    $tag = get_end_tag("product", $noindent);
-    push(@xpdfile, $tag);
-    
-    return \@xpdfile;	
-}
-
-###################################################
-# Collecting content for xpd file 
-###################################################
-
-sub get_file_content
-{
-    my ( $module, $packagename, $solslanguage, $linkpackage, $isemptyparent, $subdir, $islanguagemodule, $onelanguage, $xpdinfo ) = @_;
-    
-    my @xpdfile = ();
-    my $value = "";
-    my $line = "";
-    my $noindent = "";
-    my $singleindent = "    ";
-    my $doubleindent = $singleindent . $singleindent;
-
-    my ( $tag, $parentgid ) = get_package_tag($module, $noindent, $linkpackage);
-    push(@xpdfile, $tag);
-
-    # start of installunit tag -> using info from scp module
-
-    $tag = get_display_tag($module, $singleindent);
-    push(@xpdfile, $tag);
-
-    $value = get_sortkey_value($module);
-    $line = get_tag_line($doubleindent, "sortkey", $value);
-    push(@xpdfile, $line);
-
-    $value = get_default_value($module);
-    $line = get_tag_line($doubleindent, "default", $value);
-    push(@xpdfile, $line);
-
-    $value = get_showinuserinstall_value($module);
-    $line = get_tag_line($doubleindent, "showinuserinstall", $value);
-    push(@xpdfile, $line);
-
-    $value = get_userinstallonly_value($module);
-    $line = get_tag_line($doubleindent, "showinuserinstallonly", $value);
-    push(@xpdfile, $line);
-
-    $value = get_dontuninstall_value($module);
-    $line = get_tag_line($doubleindent, "dontuninstall", $value);
-    push(@xpdfile, $line);
-
-    $value = get_checksolaris_value($module);
-    $line = get_tag_line($doubleindent, "checksolaris", $value);
-    push(@xpdfile, $line);
-
-    $value = get_isupdatepackage_value($module);
-    $line = get_tag_line($doubleindent, "isupdatepackage", $value);
-    push(@xpdfile, $line);
-
-    $value = get_showmultilingualonly_value($module);
-    $line = get_tag_line($doubleindent, "showmultilingualonly", $value);
-    push(@xpdfile, $line);
-
-    $value = get_applicationmodule_value($module);
-    $line = get_tag_line($doubleindent, "applicationmodule", $value);
-    push(@xpdfile, $line);
-
-    $value = get_isjavamodule_value($module);
-    $line = get_tag_line($doubleindent, "isjavapackage", $value);
-    push(@xpdfile, $line);
-
-    $value = get_installcanfail_value($module);
-    $line = get_tag_line($doubleindent, "installcanfail", $value);
-    push(@xpdfile, $line);
-
-    $value = get_forceintoupdate_value($module);
-    $line = get_tag_line($doubleindent, "forceintoupdate", $value);
-    push(@xpdfile, $line);
-
-    $value = get_useforce_value($module);
-    $line = get_tag_line($doubleindent, "useforce", $value);
-    push(@xpdfile, $line);
-
-    # iterating over all languages to get names and descriptions
-    collect_lang_values($doubleindent, $module, \@xpdfile, "Name", "name");	
-    collect_lang_values($doubleindent, $module, \@xpdfile, "Description", "description");	
-
-    $tag = get_end_tag("display", $singleindent);
-    push(@xpdfile, $tag);
-
-    # end of display tag
-    
-    if ( ! $isemptyparent )
-    {
-        # start of installunit tag -> using info from package defined in packagelist
-
-        $tag = get_installunit_tag($singleindent);
-        push(@xpdfile, $tag);
-
-        $value = get_size_value($packagename, $xpdinfo);
-        $line = get_tag_line($doubleindent, "size", $value);
-        push(@xpdfile, $line);
-
-        $value = get_order_value($module);
-        $line = get_tag_line($doubleindent, "installorder", $value);
-        push(@xpdfile, $line);
-
-        $value = get_md5_value($packagename, $xpdinfo);
-        $line = get_tag_line($doubleindent, "md5", $value);
-        push(@xpdfile, $line);
-
-        $value = get_name_value($packagename);
-        $line = get_tag_line($doubleindent, "name", $value);
-        push(@xpdfile, $line);
-
-        $value = get_fullpkgname_value($packagename, $xpdinfo);
-        $line = get_tag_line($doubleindent, "fullpkgname", $value);
-        push(@xpdfile, $line);
-
-        $value = get_pkgversion_value($packagename, $xpdinfo);
-        $line = get_tag_line($doubleindent, "pkgversion", $value);
-        push(@xpdfile, $line);
-
-        $value = get_subdir_value($packagename, $subdir, $module);
-        $line = get_tag_line($doubleindent, "subdir", $value);
-        push(@xpdfile, $line);
-
-        $value = get_relocatable_value($module);
-        $line = get_tag_line($doubleindent, "relocatable", $value);
-        push(@xpdfile, $line);
-
-        $value = get_languagespecific_value($islanguagemodule);
-        $line = get_tag_line($doubleindent, "languagespecific", $value);
-        push(@xpdfile, $line);
-
-        $value = $onelanguage;
-        $line = get_tag_line($doubleindent, "language", $value);
-        push(@xpdfile, $line);
-
-        $line = get_tag_line($doubleindent, "solarislanguage", $solslanguage);
-        push(@xpdfile, $line);
-
-        $tag = get_end_tag("installunit", $singleindent);
-        push(@xpdfile, $tag);
-
-        # end of installunit tag
-    }
-
-    $tag = get_end_tag("package", $noindent);
-    push(@xpdfile, $tag);
-    
-    return ( \@xpdfile, $parentgid );
-}
-
-###################################################
-# Setting xpd file name
-###################################################
-
-sub get_xpd_filename
-{
-    my ($modulegid, $linkpackage) = @_;
-    
-    if ( $linkpackage ) { $modulegid = $modulegid . "u"; }
-    
-    my $filename = $modulegid . ".xpd";
-    
-    return $filename;
-}
-
-###################################################
-# Determine, which package was created newly 
-###################################################
-
-sub determine_new_packagename
-{
-    my ( $installdir, $subdir, $xpdinfo ) = @_;
-    
-    my $newpackage = "";
-    $installdir =~ s/\Q$installer::globals::separator\E\s*$//;	
-    my $directory = $installdir . $installer::globals::separator . $subdir;
-    $directory =~ s/\Q$installer::globals::separator\E\s*$//;	
-
-    if ( $xpdinfo->{'RealPackageName'} )
-    {
-        $newpackage = $directory . $installer::globals::separator . $xpdinfo->{'RealPackageName'};
-        push(@installer::globals::currentcontent, $newpackage);
-        return $newpackage;
-    }
-
-    my ($newcontent, $allcontent) = installer::systemactions::find_new_content_in_directory($directory, \@installer::globals::currentcontent);
-    @installer::globals::currentcontent = ();
-    foreach my $element ( @{$allcontent} ) { push(@installer::globals::currentcontent, $element); }
-    
-    my $newentriesnumber = $#{$newcontent} + 1;
-    if ( $newentriesnumber > 1 ) { installer::exiter::exit_program("ERROR: More than one new package in directory $directory", "determine_new_packagename (xpdinstaller)"); }
-    elsif ( $newentriesnumber < 1 )  { installer::exiter::exit_program("ERROR: No new package in directory $directory", "determine_new_packagename (xpdinstaller)"); }
-    $newpackage = ${$newcontent}[0];
-    
-    return $newpackage;
-}
-
-###################################################
-# Checking, if the parentgid is defined in 
-# another package 
-###################################################
-
-sub is_empty_parent
-{
-    my ($gid, $packages) = @_;
-
-    my $is_empty_parent = 1;
-    
-    for ( my $k = 0; $k <= $#{$packages}; $k++ )
-    {
-        my $onepackage = ${$packages}[$k];
-        my $packagegid = $onepackage->{'module'};
-        
-        if ( $packagegid eq $gid )
-        {
-            $is_empty_parent = 0;
-            last;
-        }
-    }
-
-    return $is_empty_parent;
-}
-
-###################################################
-# Creating additional xpd files for empty parents 
-###################################################
-
-sub create_emptyparents_xpd_file
-{
-    my ($parentgid, $modulesarrayref, $xpddir) = @_;
-
-    my $module = get_module($parentgid, $modulesarrayref);
-    my $grandpagid = "";
-
-    if ( $module ne "" )
-    {
-        my $packagename = "";
-        # all content saved in scp is now available and can be used to create the xpd file
-        my ( $xpdfile, $newparentgid ) = get_file_content($module, $packagename, "", 0, 1, "", 0, "", "");
-
-        $grandpagid = $newparentgid;
-
-        my $xpdfilename = get_xpd_filename($parentgid, 0);
-        $xpdfilename = $xpddir . $installer::globals::separator . $xpdfilename;
-    
-        installer::files::save_file($xpdfilename, $xpdfile);
-        push(@installer::globals::allxpdfiles, $xpdfilename);
-        my $infoline = "Saving xpd file: $xpdfilename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
-    push( @installer::globals::createdxpdfiles, $parentgid);
-
-    return $grandpagid;
-}
-
-###################################################
-# Creating additional xpd files for empty parents 
-###################################################
-
-sub filter_content_from_xpdfile
-{
-    my ($xpdfile) = @_;
-
-    my @newxpdfile = ();
-    
-    my $include = 1;
-    
-    for ( my $i = 0; $i <= $#{$xpdfile}; $i++ )
-    {
-        my $line = ${$xpdfile}[$i];
-
-        if (( $line =~ /^\s*\<installunit/ ) && ( $include )) { $include = 0; }
-        if ( $include ) { push(@newxpdfile, $line); }
-        if (( $line =~ /^\s*\<\/installunit/ ) && ( ! $include )) { $include = 1; }
-    }
-    
-    return \@newxpdfile;
-}
-
-##########################################################################
-# Changing the parent inside the xpd file 
-# Old: <package name="gid_Module_Root" parent="root">
-# New: <package name="gid_Module_Root_Files_1" parent="gid_Module_Root">
-##########################################################################
-
-sub change_parent_in_xpdfile
-{
-    my ($xpdfile, $modulename) = @_;
-
-    for ( my $i = 0; $i <= $#{$xpdfile}; $i++ )
-    {
-        if ( ${$xpdfile}[$i] =~ /^\s*\<package name\s*=\s*\"(\S+?)\"\s+parent\s*=\s*\"(\S+?)\"\s*\>\s*$/ )
-        {
-            my $oldname = $1;
-            my $oldparent = $2;
-            
-            my $newname = $modulename;
-            my $newparent = $oldname;
-
-            ${$xpdfile}[$i] =~ s/\"\Q$oldname\E\"/\"$newname\"/;
-            ${$xpdfile}[$i] =~ s/\"\Q$oldparent\E\"/\"$newparent\"/;
-            
-            last;	
-        }
-    }
-}
-
-###################################################
-# Creating one xpd file for each package 
-###################################################
-
-sub create_xpd_file
-{
-    my ($onepackage, $allpackages, $languagestringref, $allvariables, $modulesarrayref, $installdir, $subdir, $linkpackage, $xpdinfo) = @_;
-
-    my $infoline = "";
-    # creating the directory
-    my $xpddir = installer::systemactions::create_directories("xpdinstaller", $languagestringref);
-    $xpddir =~ s/\/\s*$//;
-    $installer::globals::xpddir = $xpddir;
-
-    my $modulegid = $onepackage->{'module'};
-
-    my $onelanguage = "";	# 
-    my $solslanguage = "";	# 
-    my $islanguagemodule = 0;	# 
-    if ( $onepackage->{'islanguagemodule'} ) { $islanguagemodule = $onepackage->{'islanguagemodule'}; }	# 
-    if ( $islanguagemodule )	# 
-    {
-        $onelanguage = $onepackage->{'language'};	# 
-        if ( $installer::globals::issolarispkgbuild ) { $solslanguage = installer::epmfile::get_solaris_language_for_langpack($onelanguage); }	# 
-    }
-
-    installer::logger::include_header_into_logfile("Creating xpd file ($modulegid):");
-
-    my $module = get_module($modulegid, $modulesarrayref);
-    
-    if ( $module ne "" )
-    {
-        my $packagename = determine_new_packagename($installdir, $subdir, $xpdinfo);
-
-        # all content saved in scp is now available and can be used to create the xpd file
-        my ( $xpdfile, $parentgid ) = get_file_content($module, $packagename, $solslanguage, $linkpackage, 0, "", $islanguagemodule, $onelanguage, $xpdinfo);
-    
-        my $xpdfilename = get_xpd_filename($modulegid, $linkpackage);
-        $xpdfilename = $xpddir . $installer::globals::separator . $xpdfilename;
-        
-        # Very special handling for Root module:
-        # Because packages should only be assigned to leaves and not to knods,
-        # the root module is divided into a knod without package and a new
-        # leave with package. The name of the leave is defined at $module->{'XpdPackageName'}.
-        if ( $module->{'XpdPackageName'} )
-        {
-            my $newxpdfilename = get_xpd_filename($module->{'XpdPackageName'}, 0);
-            $newxpdfilename = $xpddir . $installer::globals::separator . $newxpdfilename;
-            my $emptyfilecontent = filter_content_from_xpdfile($xpdfile);
-
-            installer::files::save_file($xpdfilename, $emptyfilecontent);
-            push(@installer::globals::allxpdfiles, $xpdfilename);
-            $infoline = "Saving xpd file: $xpdfilename\n";
-            push( @installer::globals::logfileinfo, $infoline);
-
-            $xpdfilename = $newxpdfilename;
-            change_parent_in_xpdfile($xpdfile, $module->{'XpdPackageName'});
-        }
-
-        installer::files::save_file($xpdfilename, $xpdfile);
-        push( @installer::globals::createdxpdfiles, $modulegid);
-        push(@installer::globals::allxpdfiles, $xpdfilename);
-        $infoline = "Saving xpd file: $xpdfilename\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        my $grandpagid = "root";
-        if ( $parentgid ne "root" )
-        {
-            my $create_missing_parent = is_empty_parent($parentgid, $allpackages);
-
-            if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::createdxpdfiles) )) 
-            {
-                $grandpagid = create_emptyparents_xpd_file($parentgid, $modulesarrayref, $xpddir);
-            }
-        }
-
-        if ( $grandpagid ne "root" )
-        {
-            my $create_missing_parent = is_empty_parent($grandpagid, $allpackages);
-
-            if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($grandpagid, \@installer::globals::createdxpdfiles) )) 
-            {
-                create_emptyparents_xpd_file($grandpagid, $modulesarrayref, $xpddir);
-             }
-         }
-    }
-    else
-    {
-        installer::exiter::exit_program("ERROR: No module definition found for gid: $modulegid", "create_xpd_file (xpdinstaller)");
-    }
-
-}
-
-###################################################
-# Creating a xpd file for a copied package 
-###################################################
-
-sub create_xpd_file_for_childproject
-{
-    my ($module, $destdir, $packagename, $allvariableshashref, $modulesarrayref) = @_;
-    
-    my $modulegid = $module->{'gid'};
-
-    my $currentdir = cwd();
-    $destdir =~ s/\/\s*$//;
-    $currentdir =~ s/\/\s*$//;
-    
-    my $completepackage = $currentdir . $installer::globals::separator . $destdir . $installer::globals::separator . $packagename;
-
-    # all content saved in scp is now available and can be used to create the xpd file
-    my ( $xpdfile, $parentgid ) = get_file_content($module, $completepackage, "", 0, 0, "", 0, "", "");
-    
-    my $xpdfilename = get_xpd_filename($modulegid, 0);
-    $xpdfilename = $installer::globals::xpddir . $installer::globals::separator . $xpdfilename;
-    
-    installer::files::save_file($xpdfilename, $xpdfile);
-    push( @installer::globals::createdxpdfiles, $modulegid);
-    push(@installer::globals::allxpdfiles, $xpdfilename);
-    my $infoline = "Saving xpd file: $xpdfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    if ( $parentgid ne "root" )
-    {
-        my $create_missing_parent = 1; # -> Always missing parent by child projects!
-        # Parent is now created, if it was not created before. Attention: Parent module must not come later.
-        if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::createdxpdfiles) )) 
-        {
-            create_emptyparents_xpd_file($parentgid, $modulesarrayref, $installer::globals::xpddir);
-        }
-    }
-}
-
-##############################################################
-# Creating a xpd file for copied system integration package 
-##############################################################
-
-sub create_xpd_file_for_systemintegration
-{
-    my ($module, $newcontent, $modulesarrayref, $subdir) = @_;
-
-    my $parentgid = $module->{'gid'};
-
-    # Create new visible module from scp info and create 
-    # new hidden module for each package inside in tar file
-    
-    for ( my $i = 0; $i <= $#{$newcontent}; $i++ )
-    {
-        my $newpackagename = ${$newcontent}[$i];
-        
-        my $infoline = "Creating xpd file for package: $newpackagename\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        my $childmodule = {%{$module}};
-        $childmodule->{'ParentID'} = $module->{'gid'};  # the module gid is the new parent
-        $childmodule->{'InstallOrder'} = $installer::globals::defaultsystemintinstallorder;
-        my $number = $i + 1;
-        my $modulegid = $module->{'gid'} . "_child_" . $number; # setting a dynamic new gid
-        $childmodule->{'gid'} = $modulegid;
-        $childmodule->{'Styles'} =~ s/\)/\,HIDDEN_ROOT\)/;
-        # iterating over all languages to get names and descriptions
-        remove_lang_values($childmodule, "Name");	
-        remove_lang_values($childmodule, "Description");	
-
-        my $shortpackagename = $newpackagename;
-        installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortpackagename);
-        $childmodule->{'PackageName'} = $shortpackagename;
-        $childmodule->{'Name'} = $modulegid;
-        $childmodule->{'Description'} = $modulegid;
-
-        # Checking, if installorder can be set:
-        # scp syntax: InstallOrder = "desktop:1050, suse:1060";
-        # The string before the number can be compared with $shortpackagename
-        if ( $module->{'InstallOrder'} )
-        {
-            my $installorder = $module->{'InstallOrder'};
-            $installorder =~ s/^\s*\"//g;
-            $installorder =~ s/\"\s*$//g;
-            # $installorder is comma separated list
-            my $allorders = installer::converter::convert_stringlist_into_array(\$installorder, ",");
-            for ( my $j = 0; $j <= $#{$allorders}; $j++ )
-            {
-                my $oneitem = ${$allorders}[$j];
-                if ( $oneitem =~ /^\s*(\S+?)\s*:\s*(\S+?)\s*$/ )
-                {
-                    my $name = $1;
-                    my $order = $2;
-                    
-                    if ( $shortpackagename =~ /\Q$name\E/ ) { $childmodule->{'InstallOrder'} = $order; }
-                }
-            }
-        }
-
-        # all content saved in scp is now available and can be used to create the xpd file
-        my ( $xpdfile, $parentgid_ ) = get_file_content($childmodule, $newpackagename, "", 0, 0, $subdir, 0, "", "");
-
-        my $xpdfilename = get_xpd_filename($modulegid, 0);
-        $xpdfilename = $installer::globals::xpddir . $installer::globals::separator . $xpdfilename;
-    
-        installer::files::save_file($xpdfilename, $xpdfile);
-        push(@installer::globals::allxpdfiles, $xpdfilename);
-        $infoline = "Saving xpd file: $xpdfilename\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    # Creating the top level visible xpd file
-    create_emptyparents_xpd_file($parentgid, $modulesarrayref, $installer::globals::xpddir);
-}
-
-##############################################################
-# Copying xpd files into installation set 
-##############################################################
-
-sub copy_xpd_files
-{
-    my ( $destdir ) = @_;
-    
-    for ( my $i = 0; $i <= $#installer::globals::allxpdfiles; $i++ )
-    {
-        if ( ! -f $installer::globals::allxpdfiles[$i] ) { installer::exiter::exit_program("ERROR: Could not find xpd file: $installer::globals::allxpdfiles[$i]!", "copy_xpd_files"); }
-        installer::systemactions::copy_one_file($installer::globals::allxpdfiles[$i], $destdir);
-    }
-}
-
-##############################################################
-# Copying all xpd files into the installation set
-##############################################################
-
-sub copy_xpd_files_into_installset
-{
-    my ($installdir) = @_;
-
-    $installdir =~ s/\Q$installer::globals::separator\E\s*$//;	
-
-    my $instdir = $installdir . $installer::globals::separator . "installdata";
-    installer::systemactions::create_directory($instdir);
-
-    my $xpddir = $instdir . $installer::globals::separator . "xpd";
-    installer::systemactions::create_directory($xpddir);
-    copy_xpd_files($xpddir);		
-}
-
-##############################################################
-# Creating base xpd file with product information 
-##############################################################
-
-sub create_setup_xpd
-{
-    my ($allvariables, $languagestringref) = @_;
-    
-    my ( $xpdfile ) = get_setup_file_content($allvariables, $languagestringref);
-
-    my $xpdfilename = $installer::globals::productxpdfile;
-    $xpdfilename = $installer::globals::xpddir . $installer::globals::separator . $xpdfilename;
-    
-    installer::files::save_file($xpdfilename, $xpdfile);
-    push(@installer::globals::allxpdfiles, $xpdfilename);
-    my $infoline = "Saving xpd file: $xpdfilename\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-###################################################
-# Copying the files needed by the xpd installer
-# into the installation directory
-###################################################
-
-sub create_xpd_installer
-{
-    my ( $installdir, $allvariables, $languagestringref) = @_;
-
-    installer::logger::include_header_into_logfile("Creating xpd installer:");
-
-    # create setup.xpd file
-    create_setup_xpd($allvariables, $languagestringref);
-    
-    # copy xpd files into installation set
-    copy_xpd_files_into_installset($installdir);
-}
-
-1;
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
deleted file mode 100644
index 78172ffa2..000000000
--- a/solenv/bin/modules/installer/ziplist.pm
+++ /dev/null
@@ -1,800 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::ziplist;
-
-use installer::existence;
-use installer::exiter;
-use installer::globals;
-use installer::logger;
-use installer::parameter;
-use installer::remover;
-use installer::systemactions;
-
-#################################################
-# Getting data from path file and zip list file
-#################################################
-
-sub getproductblock
-{
-    my ($fileref, $search, $inheritance) = @_;
-
-    my @searchblock = ();
-    my $searchexists = 0;
-    my $record = 0;
-    my $count = 0;
-    my $line;
-    my $inh = $inheritance ? '(?::\s*(\S+)\s*)?' : "";
-    my $parent;
-
-    for ( my $i = 0; $i <= $#{$fileref}; $i++ )
-    {
-        $line = ${$fileref}[$i];
-    
-        if ( $line =~ /^\s*\Q$search\E\s*$inh$/i )		# case insensitive 
-        {
-            $record = 1;
-            $searchexists = 1;
-            $parent = $1 if $inheritance;
-        }
-
-        if ($record)
-        {
-            push(@searchblock, $line);
-        }
-    
-        if ( ($record) && ($line =~ /\{/) )
-        {
-            $count++;
-        } 
-        
-        if ( ($record) && ($line =~ /\}/) )
-        {
-            $count--;
-        } 
-    
-        if ( ($record) && ($line =~ /\}/) && ( $count == 0 ) )
-        {
-            $record = 0;
-        }
-    }
-
-    if (( ! $searchexists ) && ( $search ne $installer::globals::globalblock ))
-    {
-        if ($search eq $installer::globals::product )
-        {
-            installer::exiter::exit_program("ERROR: Product $installer::globals::product not defined in $installer::globals::ziplistname", "getproductblock");
-        }
-        elsif ($search eq $installer::globals::compiler )
-        {
-            installer::exiter::exit_program("ERROR: Compiler $installer::globals::compiler not defined in $installer::globals::pathfilename", "getproductblock");
-        }
-        else	# this is not possible
-        {
-            installer::exiter::exit_program("ERROR: Unknown value for $search in getproductblock()", "getproductblock");
-        }
-    }
-
-    return (\@searchblock, $parent);
-}
-
-###############################################
-# Analyzing the settings in the zip list file
-###############################################
-
-sub analyze_settings_block
-{
-    my ($blockref) = @_;
-
-    my @newsettingsblock = ();
-    my $compilerstring = "";
-    my $record = 1;
-    my $counter = 0;
-
-    # Allowed values in settings block:
-    # "Settings", "Variables", "unix" (for destination path and logfile)
-    # Furthermore allowed values are $installer::globals::build (srx645) and $installer::globals::compiler (pro and nonpro (unxsols4.pro))
-    
-    # Comment line in settings block begin with "#" or ";"
-
-    if ( $installer::globals::pro )
-    {
-        $compilerstring = $installer::globals::compiler . ".pro";
-    }
-    else
-    {
-        $compilerstring = $installer::globals::compiler;
-    }
-
-    for ( my $i = 0; $i <= $#{$blockref}; $i++ )
-    {
-        my $line = ${$blockref}[$i];
-        my $nextline = "";
-        
-        if ( ${$blockref}[$i+1] ) { $nextline = ${$blockref}[$i+1]; }
-
-        # removing comment lines
-
-        if (($line =~ /^\s*\#/) || ($line =~ /^\s*\;/)) 
-        {
-            next;	
-        }
-        
-        # complete blocks of unknows strings are not recorded
-
-        if ((!($line =~ /^\s*\Q$compilerstring\E\s*$/i)) &&
-            (!($line =~ /^\s*\Q$installer::globals::build\E\s*$/i)) &&
-            (!($line =~ /^\s*\bSettings\b\s*$/i)) &&
-            (!($line =~ /^\s*\bVariables\b\s*$/i)) &&
-            (!($line =~ /^\s*\bunix\b\s*$/i)) &&
-            ($nextline =~ /^\s*\{\s*$/i))
-        {
-            $record = 0;
-            next;			# continue with next $i
-        }
-
-        if (!( $record ))
-        {
-            if ($line =~ /^\s*\{\s*$/i)
-            {
-                $counter++;	
-            }
-
-            if ($line =~ /^\s*\}\s*$/i)
-            {
-                $counter--;	
-            }
-            
-            if ($counter == 0)
-            {
-                $record = 1;
-                next;	# continue with next $i
-            }
-        }
-
-        if ($record)
-        {
-            push(@newsettingsblock, $line);
-        }
-    }	
-
-    return \@newsettingsblock;
-}
-
-########################################
-# Settings in zip list file
-########################################
-
-sub get_settings_from_ziplist
-{
-    my ($blockref) = @_;
-
-    my @allsettings = ();
-    my $isvariables = 0;
-    my $counter = 0;
-    my $variablescounter = 0;
-
-    # Take all settings from the settings block
-    # Do not take the variables from the settings block
-    # If a setting is defined more than once, take the 
-    # setting with the largest counter (open brackets)
-
-    for ( my $i = 0; $i <= $#{$blockref}; $i++ )
-    {
-        my $line = ${$blockref}[$i];
-        my $nextline = "";
-
-        if ( ${$blockref}[$i+1] ) { $nextline = ${$blockref}[$i+1]; }
-
-        if (($line =~ /^\s*\S+\s*$/i) && 
-            ($nextline =~ /^\s*\{\s*$/i) && 
-            (!($line =~ /^\s*Variables\s*$/i)))
-        {
-            next;
-        }
-
-        if ($line =~ /^\s*Variables\s*$/i)
-        {
-            # This is a block of variables
-            
-            $isvariables = 1;
-            next;
-        }
-
-        if ($line =~ /^\s*\{\s*$/i)
-        {
-            if ($isvariables)
-            {
-                $variablescounter++;
-            }
-            else
-            {
-                $counter++;
-            }	
-
-            next;
-        }
-
-        if ($line =~ /^\s*\}\s*$/i)
-        {
-            if ($isvariables)
-            {
-                $variablescounter--;
-                
-                if ($variablescounter == 0)
-                {
-                    $isvariables = 0;
-                }
-            }
-            else
-            {
-                $counter--;
-            }	
-
-            next;	
-        }
-        
-        if ($isvariables)
-        {
-            next;
-        }
-
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        
-        $line .= "\t##$counter##\n";
-        
-        push(@allsettings, $line);
-    }
-
-    return \@allsettings;	
-}
-
-#######################################
-# Variables from zip list file
-#######################################
-
-sub get_variables_from_ziplist
-{
-    my ($blockref) = @_;
-
-    my @allvariables = ();
-    my $isvariables = 0;
-    my $counter = 0;
-    my $variablescounter = 0;
-    my $countersum = 0;
-    
-    # Take all variables from the settings block
-    # Do not take the other settings from the settings block
-    # If a variable is defined more than once, take the 
-    # variable with the largest counter (open brackets)
-
-    for ( my $i = 0; $i <= $#{$blockref}; $i++ )
-    {
-        my $line = ${$blockref}[$i];
-        my $nextline = ${$blockref}[$i+1];
-
-        if ($line =~ /^\s*Variables\s*$/i)
-        {
-            # This is a block of variables
-            
-            $isvariables = 1;
-            next;
-        }
-
-        if ($line =~ /^\s*\{\s*$/i)
-        {
-            if ($isvariables)
-            {
-                $variablescounter++;
-            }
-            else
-            {
-                $counter++;
-            }	
-
-            next;
-        }
-
-        if ($line =~ /^\s*\}\s*$/i)
-        {
-            if ($isvariables)
-            {
-                $variablescounter--;
-                
-                if ($variablescounter == 0)
-                {
-                    $isvariables = 0;
-                }
-            }
-            else
-            {
-                $counter--;
-            }	
-
-            next;	
-        }
-        
-        if (!($isvariables))
-        {
-            next;
-        }
-
-        $countersum = $counter + $variablescounter;
-
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        
-        $line .= "\t##$countersum##\n";
-        
-        push(@allvariables, $line);
-    }
-
-    return \@allvariables;	
-}
-
-#######################################################################
-# Removing multiple variables and settings, defined in zip list file
-#######################################################################
-
-sub remove_multiples_from_ziplist
-{
-    my ($blockref) = @_;
-
-    # remove all definitions of settings and variables
-    # that occur more than once in the zip list file.
-    # Take the one with the most open brackets. This
-    # number is stored at the end of the string.
-
-    my @newarray = ();
-    my @itemarray = ();
-    my ($line, $itemname, $itemnumber);
-
-    # first collecting all variables and settings names
-    
-    for ( my $i = 0; $i <= $#{$blockref}; $i++ )
-    {
-        $line = ${$blockref}[$i];
-
-        if ($line =~ /^\s*\b(\S*)\b\s+.*\#\#\d+\#\#\s*$/i)
-        {
-            $itemname = $1;
-        }
-        
-        if (! installer::existence::exists_in_array($itemname, \@itemarray))
-        {
-            push(@itemarray, $itemname);
-        }
-    }
-    
-    # and now all $items can be selected with the highest number
-
-    for ( my $i = 0; $i <= $#itemarray; $i++ )
-    {
-        $itemname = $itemarray[$i];
-
-        my $itemnumbermax = 0;
-        my $printline = "";
-
-        for ( my $j = 0; $j <= $#{$blockref}; $j++ )
-        {			
-            $line = ${$blockref}[$j];
-
-            if ($line =~ /^\s*\Q$itemname\E\s+.*\#\#(\d+)\#\#\s*$/)
-            {
-                $itemnumber = $1;
-
-                if ($itemnumber >= $itemnumbermax)
-                {
-                    $printline = $line;
-                    $itemnumbermax = $itemnumber;
-                }
-            }
-        }
-        
-        # removing the ending number from the printline
-        # and putting it into the array
-    
-        $printline =~ s/\#\#\d+\#\#//;
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        push(@newarray, $printline); 
-    }
-
-    return \@newarray;	
-}
-
-#########################################################
-# Reading one variable defined in the zip list file
-#########################################################
-
-sub getinfofromziplist
-{
-    my ($blockref, $variable) = @_;
-
-    my $searchstring = "";
-    my $line;
-
-    for ( my $i = 0; $i <= $#{$blockref}; $i++ )
-    {
-        $line = ${$blockref}[$i];
-        
-        if ( $line =~ /^\s*\Q$variable\E\s+(.+?)\s*$/ )	# "?" for minimal matching
-        {
-            $searchstring = $1;
-            last;
-        }		
-    }
-    
-    return \$searchstring;
-}
-
-####################################################
-# Replacing variables in include path
-####################################################
-
-sub replace_all_variables_in_pathes
-{
-    my ( $patharrayref, $variableshashref ) = @_;
-        
-    for ( my $i = 0; $i <= $#{$patharrayref}; $i++ )
-    {
-        my $line = ${$patharrayref}[$i];
-
-        my $key;
-
-        foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref})
-        {
-            my $value = $variableshashref->{$key};
-            
-            if (( $line =~ /\{$key\}/ ) && ( $value eq "" )) { $line = ".\n"; }
-            
-            $line =~ s/\{\Q$key\E\}/$value/g;			
-        }
-        
-        ${$patharrayref}[$i] = $line;
-    }
-}
-
-####################################################
-# Replacing minor in include path
-####################################################
-
-sub replace_minor_in_pathes
-{
-    my ( $patharrayref ) = @_;
-    
-    for ( my $i = 0; $i <= $#{$patharrayref}; $i++ )
-    {
-        my $line = ${$patharrayref}[$i];
-
-        $line =~ s/\.\{minor\}//g;
-        $line =~ s/\.\{minornonpre\}//g;
-        
-        ${$patharrayref}[$i] = $line;
-    }
-}
-
-####################################################
-# Replacing packagetype in include path
-####################################################
-
-sub replace_packagetype_in_pathes
-{
-    my ( $patharrayref ) = @_;
-    
-    for ( my $i = 0; $i <= $#{$patharrayref}; $i++ )
-    {
-        my $line = ${$patharrayref}[$i];
-
-        if (( $installer::globals::installertypedir ) && ( $line =~ /\{pkgtype\}/ ))
-        {
-            $line =~ s/\{pkgtype\}/$installer::globals::installertypedir/g;			
-        }
-        
-        ${$patharrayref}[$i] = $line;
-    }
-}
-
-####################################################
-# Removing ending separators in pathes
-####################################################
-
-sub remove_ending_separator
-{
-    my ( $patharrayref ) = @_;
-    
-    for ( my $i = 0; $i <= $#{$patharrayref}; $i++ )
-    {
-        my $line = ${$patharrayref}[$i];
-        
-        installer::remover::remove_ending_pathseparator(\$line);
-        
-        $line =~ s/\s*$//;
-        $line = $line . "\n";
-        
-        ${$patharrayref}[$i] = $line;
-    }
-}
-
-####################################################
-# Replacing languages in include path
-####################################################
-
-sub replace_languages_in_pathes
-{
-    my ( $patharrayref, $languagesref ) = @_;
-
-    installer::logger::include_header_into_logfile("Replacing languages in include pathes:");
-    
-    my @patharray = ();
-    my $infoline = "";
-    
-    for ( my $i = 0; $i <= $#{$patharrayref}; $i++ )
-    {
-        my $line = ${$patharrayref}[$i];
-
-        if ( $line =~ /\$\(LANG\)/ )
-        {
-            my $originalline = $line;
-            my $newline = "";
-            
-            for ( my $j = 0; $j <= $#{$languagesref}; $j++ )
-            {
-                my $language = ${$languagesref}[$j];
-                $line =~ s/\$\(LANG\)/$language/g;
-                push(@patharray ,$line);
-                $newdir = $line;
-                $line = $originalline;
-                
-                installer::remover::remove_leading_and_ending_whitespaces(\$newline);
-
-                # Is it necessary to refresh the global array, containing all files of all include pathes?
-                if ( -d $newdir )
-                {
-                    # Checking if $newdir is empty
-                    if ( ! installer::systemactions::is_empty_dir($newdir) )
-                    {
-                        $installer::globals::refresh_includepathes = 1;
-                        $infoline = "Directory $newdir exists and is not empty. Refreshing global file array is required.\n"; 
-                        push( @installer::globals::logfileinfo, $infoline);
-                    }
-                    else
-                    {
-                        $infoline = "Directory $newdir is empty. No refresh of global file array required.\n"; 
-                        push( @installer::globals::logfileinfo, $infoline);				
-                    }
-                }
-                else
-                {
-                    $infoline = "Directory $newdir does not exist. No refresh of global file array required.\n"; 
-                    push( @installer::globals::logfileinfo, $infoline);			
-                }
-            }			
-        }			
-        else		# not language dependent include path
-        {
-            push(@patharray ,$line);
-        }
-    }
-    
-    return \@patharray;
-}
-
-#####################################################
-# Collecting all files from all include paths
-#####################################################
-
-sub list_all_files_from_include_path
-{
-    my ( $patharrayref) = @_;
-    
-    installer::logger::include_header_into_logfile("Include pathes:");
-    
-    for ( my $i = 0; $i <= $#{$patharrayref}; $i++ )
-    {
-        my $path = ${$patharrayref}[$i];
-        installer::remover::remove_leading_and_ending_whitespaces(\$path);
-        my $infoline = "$path\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    push( @installer::globals::logfileinfo, "\n");
-    
-    return \@filesarray;
-}
-
-#####################################################
-# Collecting all files from all include paths
-#####################################################
-
-sub set_manufacturer
-{
-    my ($allvariables) = @_;
-    
-    my $openofficeproductname = "LibreOffice";
-    my $sunname = "";
-    
-    
-    if ( $allvariables->{'OPENSOURCE'} && $allvariables->{'OPENSOURCE'} == 1 )
-    {
-        $installer::globals::isopensourceproduct = 1;
-        $installer::globals::manufacturer = $openofficeproductname;
-        $installer::globals::longmanufacturer = $openofficeproductname;
-    }
-    else
-    {
-        $installer::globals::isopensourceproduct = 0;
-        if (( $allvariables->{'DEFINEDMANUFACTURER'} ) && ( $allvariables->{'DEFINEDMANUFACTURER'} ne "" )) { $sunname = $allvariables->{'DEFINEDMANUFACTURER'}; }
-        else { installer::exiter::exit_program("ERROR: Property DEFINEDMANUFACTURER has to be set for this product!", "set_manufacturer"); }
-        $installer::globals::manufacturer = $sunname;
-        $installer::globals::longmanufacturer = $sunname;
-    }
-    
-    $allvariables->{'MANUFACTURER'} = $installer::globals::manufacturer;
-}
-
-##############################################################
-# A ProductVersion has to be defined. If it is not set in
-# zip.lst, it is set now to "1"
-##############################################################
-
-sub set_default_productversion_if_required
-{
-    my ($allvariables) = @_;
-
-    if (!($allvariables->{'PRODUCTVERSION'}))
-    {
-        $allvariables->{'PRODUCTVERSION'} = 1;	# FAKE
-    }
-    
-    # Creating differentiators for BUILD_SPECIAL in layering
-    if ( ! $ENV{'BUILD_SPECIAL'} )
-    {
-        if ( $allvariables->{'REGISTRYLAYERNAME'} ) { $allvariables->{'REGISTRYLAYERNAME'} = $allvariables->{'REGISTRYLAYERNAME'} . "_"; }
-        if (( $installer::globals::iswindowsbuild ) && ( $allvariables->{'BASISROOTNAME'} )) { $allvariables->{'BASISROOTNAME'} = $allvariables->{'BASISROOTNAME'} . "_"; }
-    } 
-}
-
-####################################################
-# Removing .. in pathes
-####################################################
-
-sub simplify_path
-{
-    my ( $pathref ) = @_;
-
-    my $oldpath = $$pathref;
-    
-    my $change = 0;
-    
-    while ( $oldpath =~ /(^.*)(\Q$installer::globals::separator\E.*\w+?)(\Q$installer::globals::separator\E\.\.)(\Q$installer::globals::separator\E.*$)/ )
-    {
-        my $part1 = $1;
-        my $part2 = $4;
-        $oldpath = $part1 . $part2;		
-        $change = 1;
-    }
-    
-    if ( $change ) { $$pathref = $oldpath . "\n"; } 
-}
-
-####################################################
-# Removing ending separators in pathes
-####################################################
-
-sub resolve_relative_pathes
-{
-    my ( $patharrayref ) = @_;
-    
-    for ( my $i = 0; $i <= $#{$patharrayref}; $i++ )
-    {
-        installer::parameter::make_path_absolute(\${$patharrayref}[$i]);
-        simplify_path(\${$patharrayref}[$i]);
-    }
-}
-
-####################################################
-# Replacing variables inside zip list variables
-# Example: {milestone} to be replaced by
-# $installer::globals::lastminor
-####################################################
-
-sub replace_variables_in_ziplist_variables
-{
-    my ($blockref) = @_;
-
-    my $milestonevariable = $installer::globals::lastminor;
-    $milestonevariable =~ s/m//;
-    $milestonevariable =~ s/s/\./;
-
-    my $localminor = $installer::globals::lastminor;
-    if ( $installer::globals::minor ) { $localminor = $installer::globals::minor; }
-    
-    my $buildidstringcws = $installer::globals::build . $localminor . "(Build:" . $installer::globals::buildid . ")";
-
-    for ( my $i = 0; $i <= $#{$blockref}; $i++ )
-    {
-        if ($installer::globals::lastminor) { ${$blockref}[$i] =~ s/\{milestone\}/$milestonevariable/; }
-        else { ${$blockref}[$i] =~ s/\{milestone\}//; }
-        if ( $localminor ) { ${$blockref}[$i] =~ s/\{minor\}/$localminor/; }
-        else { ${$blockref}[$i] =~ s/\{minor\}//; }
-        if ( $installer::globals::buildid ) { ${$blockref}[$i] =~ s/\{buildid\}/$installer::globals::buildid/; }
-        else { ${$blockref}[$i] =~ s/\{buildid\}//; }
-        if ( $installer::globals::build ) { ${$blockref}[$i] =~ s/\{buildsource\}/$installer::globals::build/; }
-        else { ${$blockref}[$i] =~ s/\{build\}//; }
-        ${$blockref}[$i] =~ s/\{buildidcws\}/$buildidstringcws/;
-    }
-}
-
-###########################################################
-# Overwrite the vendor string in openoffice.lst that is defined in configure
-###########################################################
-
-sub overwrite_ooovendor
-{
-    my ($variableshashref) = @_;
-    $variableshashref->{'OOOVENDOR'} = $ENV{'OOO_VENDOR'} , if( defined $ENV{'OOO_VENDOR'}  && $ENV{'OOO_VENDOR'} ne "" );
-}
-
-###########################################################
-# Adding the lowercase variables into the variableshashref
-###########################################################
-
-sub add_variables_to_allvariableshashref
-{
-    my ($variableshashref) = @_;
-
-    my $lcvariable = lc($variableshashref->{'PRODUCTNAME'});
-    $variableshashref->{'LCPRODUCTNAME'} = $lcvariable;
-
-    if ($variableshashref->{'SHORT_PRODUCTEXTENSION'})
-    {
-        $variableshashref->{'LCPRODUCTEXTENSION'} = "\-" . lc($variableshashref->{'SHORT_PRODUCTEXTENSION'}); # including the "-" !
-    }
-    else
-    {
-        $variableshashref->{'LCPRODUCTEXTENSION'} = "";		
-    }
-
-    if ( $installer::globals::patch ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::patchaddon; }
-    elsif ( $installer::globals::languagepack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::languagepackaddon; }
-    elsif ( $installer::globals::helppack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::helppackpackaddon; }
-    else { $variableshashref->{'PRODUCTADDON'} = ""; }
-
-    my $localbuild = $installer::globals::build;
-    if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; }	# using "680" instead of "src680"
-    $variableshashref->{'PRODUCTMAJOR'} = $localbuild;
-
-    my $localminor = "";
-    if ( $installer::globals::minor ne "" ) { $localminor = $installer::globals::minor; }
-    else { $localminor = $installer::globals::lastminor; }
-    if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; }
-    $variableshashref->{'PRODUCTMINOR'} = $localminor;
-
-    $variableshashref->{'PRODUCTBUILDID'} = $installer::globals::buildid;
-    $variableshashref->{'SYSTEM_LIBTEXTCAT_DATA'} = $ENV{'SYSTEM_LIBTEXTCAT_DATA'} , if( defined $ENV{'SYSTEM_LIBTEXTCAT_DATA'} && $ENV{'SYSTEM_LIBTEXTCAT_DATA'} ne "" );
-}
-
-1;
diff --git a/solenv/bin/modules/macosxotoolhelper.pm b/solenv/bin/modules/macosxotoolhelper.pm
deleted file mode 100644
index 19f59e5bf..000000000
--- a/solenv/bin/modules/macosxotoolhelper.pm
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package macosxotoolhelper;
-require Exporter;
-our @ISA = Exporter;
-our @EXPORT = otoolD;
-
-sub otoolD($) {
-    my ($file) = @_;
-    my $call = "otool -D $file";
-    open(IN, "-|", $call) or die "cannot $call";
-    my $line = <IN>;
-    $line =~ /^$file:\n$/ or
-        die "unexpected otool -D output (\"$line\", expecting \"$file:\")";
-    $line = <IN>;
-    <IN> == undef or die "unexpected otool -D output";
-    close(IN);
-    return $line;
-}
diff --git a/solenv/bin/modules/packager/check.pm b/solenv/bin/modules/packager/check.pm
deleted file mode 100644
index 9c0b65021..000000000
--- a/solenv/bin/modules/packager/check.pm
+++ /dev/null
@@ -1,88 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package packager::check;
-
-use packager::exiter;
-use packager::globals;
-
-##############################################
-# Check 1: The package list has to exist
-##############################################
-
-sub check_packlist
-{
-    my $projectdir = $ENV{'PRJ'};
-    $projectdir =~ s/$packager::globals::separator\s*$//;
-    $packager::globals::packlistname = $projectdir . $packager::globals::separator . "util" . $packager::globals::separator . $packager::globals::packlistname;
-
-    if ( ! -f $packager::globals::packlistname )
-    {
-        packager::exiter::exit_program("ERROR: Package list not found: $packager::globals::packlistname", "check_packlist");
-    }
-}
-
-#############################################################
-# Check 2: The environment variable OUTPATH has to be set
-#############################################################
-
-sub check_environment
-{
-    if ( ! $ENV{'OUTPATH'} )
-    {
-        packager::exiter::exit_program("ERROR: Environment variable OUTPATH not set!", "check_environment");
-    }
-
-    if ( ! $ENV{'PRJ'} )
-    {
-        packager::exiter::exit_program("ERROR: Environment variable PRJ not set!", "check_environment");
-    }
-}
-
-#############################################################
-# Check 3: Checking the parameter. Only "-i" is valid
-#############################################################
-
-sub check_parameter
-{
-    while ( $#ARGV >= 0 )
-    {
-        my $param = shift(@ARGV);
-        
-        if ($param eq "-i") { $packager::globals::ignoreerrors = 1; }
-        else
-        {
-            print("\n*************************************\n");
-            print("Sorry, unknown parameter: $param");
-            print("\n*************************************\n");
-            usage();
-            exit(-1);
-        }
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/packager/existence.pm b/solenv/bin/modules/packager/existence.pm
deleted file mode 100644
index a7a8d3f57..000000000
--- a/solenv/bin/modules/packager/existence.pm
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package packager::existence;
-
-#############################
-# Test of existence
-#############################
-
-sub exists_in_array
-{
-    my ($searchstring, $arrayref) = @_;
-    
-    my $alreadyexists = 0;
-    
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        if ( ${$arrayref}[$i] eq $searchstring)
-        {
-            $alreadyexists = 1;
-            last;
-        }
-    }
-    
-    return $alreadyexists;
-}
-
-1;
diff --git a/solenv/bin/modules/packager/exiter.pm b/solenv/bin/modules/packager/exiter.pm
deleted file mode 100644
index 3ba099ec9..000000000
--- a/solenv/bin/modules/packager/exiter.pm
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package packager::exiter;
-
-use packager::files;
-use packager::globals;
-
-############################################
-# Exiting the program with an error
-# This function is used instead of "die"
-############################################
-
-sub exit_program
-{
-    my ($message, $function) = @_;
-    
-    my $infoline;
-
-    $infoline = "\n***************************************************************\n";
-    push(@packager::globals::logfileinfo, $infoline);
-    print("$infoline");
-    
-    $infoline = "$message\n";
-    push(@packager::globals::logfileinfo, $infoline);
-    print("$infoline");
-
-    $infoline = "in function: $function\n";
-    push(@packager::globals::logfileinfo, $infoline);
-    print("$infoline");
-
-    $infoline = "***************************************************************\n";
-    push(@packager::globals::logfileinfo, $infoline);
-
-    if ( $packager::globals::logging )
-    {
-        packager::files::save_file($packager::globals::logfilename ,\@packager::globals::logfileinfo);
-        print("Saved logfile: $packager::globals::logfilename\n");
-    }
-
-    print("$infoline");
-        
-    exit(-1);	
-}
-
-1;
diff --git a/solenv/bin/modules/packager/files.pm b/solenv/bin/modules/packager/files.pm
deleted file mode 100644
index dd7130099..000000000
--- a/solenv/bin/modules/packager/files.pm
+++ /dev/null
@@ -1,184 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package packager::files;
-
-use packager::exiter;
-
-############################################
-# File Operations
-############################################
-
-sub check_file
-{
-    my ($arg) = @_;
-
-    if(!( -f $arg ))
-    {
-        packager::exiter::exit_program("ERROR: Cannot find file $arg", "check_file");
-    }
-}
-
-sub read_file
-{
-    my ($localfile) = @_;
-
-    if ( ! open( IN, $localfile ) ) {
-        # try again - sometimes we get errors caused by race conditions in parallel builds
-        sleep 5;
-        open( IN, $localfile ) or packager::exiter::exit_program("ERROR: Cannot open file: $localfile", "read_file");
-    }
-    my @localfile = <IN>;
-    close( IN );
-
-    return \@localfile;
-}
-
-###########################################
-# Saving files
-###########################################
-
-sub save_file
-{
-    my ($savefile, $savecontent) = @_;
-    open( OUT, ">$savefile" );
-    print OUT @{$savecontent};
-    close( OUT);
-    if (! -f $savefile) { packager::exiter::exit_program("ERROR: Cannot write file: $savefile", "save_file"); }
-}
-
-######################################################
-# Creating a new direcotory
-######################################################
-
-sub create_directory
-{
-    my ($directory) = @_;
-        
-    my $returnvalue = 1;
-
-    if (!(-d $directory))
-    {
-        $returnvalue = mkdir($directory, 0775);
-
-        if ($returnvalue)
-        {
-            $infoline = "\nCreated directory: $directory\n"; 
-            push(@packager::globals::logfileinfo, $infoline);
-    
-            if ($packager::globals::isunix)
-            {
-                my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
-                system($localcall);
-            }			
-        }
-        else
-        {
-            packager::exiter::exit_program("ERROR: Could not create directory: $directory", "create_directory");
-        }
-    }
-}
-
-######################################################
-# Creating a unique directory with number extension	
-######################################################
-
-sub create_unique_directory
-{
-    my ($directory) = @_;
-    
-    $directory =~ s/\Q$packager::globals::separator\E\s*$//;
-    $directory = $directory . "_INCREASINGNUMBER";
-    
-    my $counter = 1;
-    my $created = 0;
-    my $localdirectory = "";	
-
-    do
-    {
-        $localdirectory = $directory; 
-        $localdirectory =~ s/INCREASINGNUMBER/$counter/;
-        $counter++;			
-        
-        if ( ! -d $localdirectory )
-        {
-            create_directory($localdirectory);
-            $created = 1;	
-        }		
-    }
-    while ( ! $created );
-    
-    return $localdirectory;
-}
-
-######################################################
-# Removing a complete directory with subdirectories
-######################################################
-
-sub remove_complete_directory
-{
-    my ($directory) = @_;
-
-    my @content = ();
-    
-    $directory =~ s/\Q$packager::globals::separator\E\s*$//;
-
-    if ( -d $directory )
-    {
-        opendir(DIR, $directory);
-        @content = readdir(DIR);
-        closedir(DIR);
-
-        my $oneitem;
-    
-        foreach $oneitem (@content)
-        {
-            if ((!($oneitem eq ".")) && (!($oneitem eq "..")))
-            {
-                my $item = $directory . $packager::globals::separator . $oneitem;
-
-                if ( -f $item ) 	# deleting files
-                {
-                    unlink($item);
-                }
-
-                if ( -d $item ) 	# recursive
-                {
-                    remove_complete_directory($item, 0);
-                }
-            }
-        }
-        
-        # try to remove empty directory
-        
-        rmdir $directory;
-        
-    }	
-}
-
-1;
diff --git a/solenv/bin/modules/packager/globals.pm b/solenv/bin/modules/packager/globals.pm
deleted file mode 100644
index f001ba19b..000000000
--- a/solenv/bin/modules/packager/globals.pm
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package packager::globals;
-
-############################################
-# Global settings
-############################################
-
-BEGIN
-{	
-    $prog="packager";
-
-    $packlistname = "pack.lst";
-    $compiler = "";
-    $ignoreerrors = 0;
-
-    $logging = 0;
-    $logfilename = "packager_logfile.log";	# the default logfile name for global errors
-    @logfileinfo = ();
-
-    $plat = $^O;
-
-    $separator = "/";
-    $iswin = 0;
-    $isunix = 1;
-
-}
-
-1;
diff --git a/solenv/bin/modules/packager/work.pm b/solenv/bin/modules/packager/work.pm
deleted file mode 100644
index 283810a09..000000000
--- a/solenv/bin/modules/packager/work.pm
+++ /dev/null
@@ -1,320 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package packager::work;
-
-use packager::exiter;
-use packager::existence;
-use packager::files;
-use packager::globals;
-
-###########################################
-# Setting global variables
-###########################################
-
-sub set_global_variable
-{
-    my $compiler = $ENV{'OUTPATH'};
-    
-    if ( $ENV{'PROEXT'} ) { $compiler = $compiler . $ENV{'PROEXT'}; }
-
-    $packager::globals::compiler = $compiler;	
-}
-
-#############################################################################
-# Converting a string list with separator $listseparator 
-# into an array
-#############################################################################
-
-sub convert_stringlist_into_array
-{
-    my ( $includestringref, $listseparator ) = @_;
-    
-    my @newarray = ();
-    my $first;
-    my $last = ${$includestringref};
-
-    while ( $last =~ /^\s*(.+?)\Q$listseparator\E(.+)\s*$/)	# "$" for minimal matching
-    {
-        $first = $1;
-        $last = $2;	
-        push(@newarray, "$first");
-    }	
-
-    push(@newarray, "$last");	
-    
-    return \@newarray;
-}
-
-###########################################
-# Generating a list of package calls
-# corresponding to the package list
-###########################################
-
-sub create_package_todos
-{
-    my ( $packagelist ) = @_;
-    
-    my @targets = ();	# only used, if the build server is not used
-
-    for ( my $i = 0; $i <= $#{$packagelist}; $i++ )
-    {
-        my $line = ${$packagelist}[$i];
-        
-        if ( $line =~ /^\s*\#/ ) { next; }	# comment line
-        
-        if ( $line =~ /^\s*(\w+?)\s+(\S+?)\s+(\S+?)\s+(\w+?)\s*$/ )
-        {
-            my $product = $1;
-            my $compilerlist = $2;
-            my $languagelist = $3;
-            my $target = $4;
-
-            $product =~ s/\s//g;
-            $compilerlist =~ s/\s//g;
-            $languagelist =~ s/\s//g;
-            $target =~ s/\s//g;
-            
-            my $compilers = convert_stringlist_into_array(\$compilerlist, ",");
-            
-            # is the compiler of this "build" part of the compiler list in pack.lst ? 
-            
-            if ( packager::existence::exists_in_array($packager::globals::compiler, $compilers) )
-            {			
-                # products are separated in pack.lst by "|"
-                
-                my $languagesets = convert_stringlist_into_array(\$languagelist, "\|");
-            
-                # now all information is available to create the targets for the systemcalls
-            
-                for ( my $j = 0; $j <= $#{$languagesets}; $j++ )
-                {
-                    my $languagestring = ${$languagesets}[$j];
-                    $languagestring =~ s/\,/\_/g;	# comma in pack.lst becomes "_" in dmake command
-
-                    my $target = $target . "_" . $languagestring;
-                    push(@targets, $target);	
-
-                    my $insertline = $target . "\n"; 
-                    push( @packager::globals::logfileinfo, $insertline);
-                }
-            }
-        }
-    }
-    
-    return \@targets;
-}
-
-###########################################
-# Executing the generated system calls
-###########################################
-
-sub execute_system_calls
-{
-    my ( $targets ) = @_;
-
-    for ( my $i = 0; $i <= $#{$targets}; $i++ )
-    {
-        my $systemcall = "dmake " . ${$targets}[$i];
-
-        my $infoline = "Packager: $systemcall\n";
-        print $infoline;
-        push( @packager::globals::logfileinfo, $infoline);
-
-        my $returnvalue = system($systemcall);
-
-        $infoline = "Packager finished: $systemcall\n";
-        print $infoline;
-        push( @packager::globals::logfileinfo, $infoline);
-
-        if ( $returnvalue )
-        {
-            $infoline = "\nERROR: Packager $systemcall\n";
-            print $infoline;
-            push( @packager::globals::logfileinfo, $infoline);
-            if (!($packager::globals::ignoreerrors)) { packager::exiter::exit_program("ERROR: Packing not successful : $systemcall", "execute_system_calls"); }
-        }
-    }	
-}
-
-##############################################################
-# Starting the build server with the generated system calls
-##############################################################
-
-sub start_build_server
-{
-    my ( $targets ) = @_;
-
-    # preparing the directory structure
-
-    my $prj = $ENV{PRJ};				# for example "..";
-    my $platform = $ENV{INPATH};		# wntmsci10.pro, unxsols4.pro
-    my $platformpath = $prj . $packager::globals::separator . $platform;
-    if ( ! -d $platformpath ) { packager::files::create_directory($miscpath); }
-    my $miscpath = $platformpath  . $packager::globals::separator . "misc";
-    if ( ! -d $miscpath ) { packager::files::create_directory($miscpath); }
-    $miscpath = $miscpath  . $packager::globals::separator . "temp";
-    if ( -d $miscpath ) { packager::files::remove_complete_directory($miscpath); }	# removing old files !
-    if ( ! -d $miscpath ) { packager::files::create_directory($miscpath); }
-
-    my $prjroot = ".." . $packager::globals::separator . ".." . $packager::globals::separator . ".." . $packager::globals::separator . ".."; # platform/misc/temp/uniquetempdir
-
-    my $makefilepath = $prj . $packager::globals::separator . "util" . $packager::globals::separator . "makefile.mk";
-
-    if ( ! $ENV{'PRJNAME'} ) { packager::exiter::exit_program("ERROR: Environment variable PRJNAME not set!", "do_broadcast"); }
-    my $prjname = $ENV{PRJNAME};
-
-    my $pkgformat = $ENV{PKGFORMAT};
-
-    my $prjdep = $prjname . "\\" . "util";	# always windows like path
-    my @targetdirs;
-    my @targetlines = ();
-    # iterating over all targets
-    for ( my $i = 0; $i <= $#{$targets}; $i++ )
-    {
-        my $target = ${$targets}[$i];
-        my $tempdir = $miscpath . $packager::globals::separator . $target;
-        $tempdir = packager::files::create_unique_directory ($tempdir);
-        @targetlines=();
-        push( @targetlines, "\ngenerated_target : $target\n\n");	# to be included into the makefile.mk
-
-        if ( defined $pkgformat ) {
-            push( @targetlines, "\n$target : ".'$$@{$(PKGFORMAT:^".")}'."\n\n");	# to be included into the makefile.mk
-        }
-        
-        generate_makefile($tempdir, $makefilepath, $prjroot, $target, \@targetlines);
-
-        do_broadcast($tempdir, $prjname, $prj, $platform, $prjdep);
-        push @targetdirs, $tempdir;
-    }
-}
-
-##############################################################
-# Generating the makefile in the temporary directory
-##############################################################
-
-sub generate_makefile
-{
-    my ( $tempdir, $makefilepath, $prjroot, $target, $targetlines_ref ) = @_;
-
-    my $makefile = packager::files::read_file($makefilepath);
-
-    my @targetlines = ();
-    push( @targetlines, @{$targetlines_ref});	# to be included into the makefile.mk
-    
-    $prjroot = $prjroot . "\n";
-    
-    my $uniquename = $tempdir;
-    get_filename_from_path(\$uniquename);
-    $uniquename = $uniquename . "\n";
-
-    my $counter = 0;
-    my $increase = 1;
-
-    for ( my $i = 0; $i <= $#{$makefile}; $i++ )
-    {
-        if ( ${$makefile}[$i] =~ /^\s*TARGET\s*=.*/ ) { ${$makefile}[$i] = "TARGET=" . $uniquename; }	# setting the new project root
-
-        if ( ${$makefile}[$i] =~ /^\s*PRJ\s*=.*/ ) { ${$makefile}[$i] = "PRJ=" . $prjroot; }	# setting the new project root
-
-        if ( ${$makefile}[$i] =~ /^\s*\.INCLUDE[\t ]*:[\t ]*target.mk[\t ]*$/ ) { $increase = 0; }	# no more increase of the counter
-
-        if ( $increase ) { $counter++; }
-    }
-    
-    splice(@{$makefile}, $counter, 0, @targetlines);	# including the new target lines at position $counter
-
-    my $newmakefilepath = $tempdir . $packager::globals::separator . "makefile.mk";
-    packager::files::save_file($newmakefilepath, $makefile);
-}
-
-##############################################################
-# Generating the broadcasts for the build server
-##############################################################
-
-sub do_broadcast
-{
-    use  File::Temp;
-    
-    my ( $tempdir, $prjname, $prj, $platform, $prjdep ) = @_;
-
-    # Syntax:  cmd_bcst -s 18 "Version;Environment;Project;Verzeichnis;Restriction[;Abhaengigkeit1][;Abhaengigkeit n]..." 
-    # Example: cmd_bcst -s 18 "SRC680;wntmsci10.pro;instsetoo_native;;instsetoo_native\bla1;instsetoo_native\util"
-
-    if ( ! $ENV{'WORK_STAMP'} ) { packager::exiter::exit_program("ERROR: Environment variable WORK_STAMP not set!", "do_broadcast"); }
-    my $workstamp = $ENV{WORK_STAMP};
-
-    my $prjdir = $tempdir;
-    $prjdir =~ s/$prj/$prjname/;
-    $prjdir =~ s/\//\\/g;					# convert to windows path syntax
-
-    my $tempfiledir = $ENV{TMP};
-    $tempfiledir = $tempdir if ( ! defined $tempfiledir );
-    my ( $tmpfile_handle, $tmpfile_name ) = mkstemp( $tempfiledir . $packager::globals::separator . "packagerXXXXX");
-    if ( ! $tmpfile_handle ) {
-        packager::exiter::exit_program("ERROR: Couldn't open temporary file \"$tmpfile_name\"!", "do_broadcast");
-    }
-    print $tmpfile_handle "\"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"";
-    print "to tmpfile: \"$workstamp;$platform;$prjname;$prjdir;nobase;$prjdep\"\n";
-    close $tmpfile_handle;
-    my $returnvalue = system("cmd_bcst -s 18 \@$tmpfile_name");
-    print "cmd_bcst -s 18 \@$tmpfile_name\n";
-    unlink "$tmpfile_name";
-
-    if ( $returnvalue )	# an error occurred
-    {
-        if (!($packager::globals::ignoreerrors)) { packager::exiter::exit_program("ERROR: Packing not successful!", "do_broadcast"); }
-    }
-}
-
-##############################################################
-# Returning the name of file or directory from complete path
-##############################################################
-
-sub get_filename_from_path
-{
-    my ($longfilenameref) = @_;
-    
-    if ( $packager::globals::isunix )
-    {
-        if ( $$longfilenameref =~ /^.*\/(\S.+\S?)/ )
-        {
-            $$longfilenameref = $1;
-        }
-    }
-
-    if ( $packager::globals::iswin )
-    {
-        if ( $$longfilenameref =~ /^.*\\(\S.+\S?)/ )
-        {
-            $$longfilenameref = $1;
-        }
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/par2script/check.pm b/solenv/bin/modules/par2script/check.pm
deleted file mode 100644
index bd84c147e..000000000
--- a/solenv/bin/modules/par2script/check.pm
+++ /dev/null
@@ -1,347 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package par2script::check;
-
-use par2script::globals;
-
-################################
-# Checks of the setup script
-################################
-
-########################################################
-# Checking if all defined directories are needed
-########################################################
-
-sub check_needed_directories
-{
-    my $allfiles = $par2script::globals::definitions{'File'};
-    my $alldirs = $par2script::globals::definitions{'Directory'};
-
-    # checking if all defined directories are needed
-
-    my $dir;
-    foreach $dir ( keys %{$alldirs} )
-    {
-        # I. directory has create flag
-        if (( exists($alldirs->{$dir}->{'Styles'}) ) && ( $alldirs->{$dir}->{'Styles'} =~ /\bCREATE\b/ )) { next; }
-
-        # II. there is at least one file in the directory
-        my $fileinside = 0;
-        my $file;
-        foreach $file ( keys %{$allfiles} )
-        {
-            if (( $allfiles->{$file}->{'Dir'} eq $dir ) || ( $allfiles->{$file}->{'NetDir'} eq $dir ))
-            {
-                $fileinside = 1;
-                last;
-            }
-        }
-        if ( $fileinside ) { next; }	
-
-        # III. the directory is parent for another directory
-        my $isparent = 0;
-        my $onedir;
-        foreach $onedir ( keys %{$alldirs} )
-        {
-            if ( $alldirs->{$onedir}->{'ParentID'} eq $dir )
-            {
-                $isparent = 1;
-                last;
-            }
-        }
-        if ( $isparent ) { next; }	
-
-        # no condition is true -> directory definition is superfluous
-        my $infoline = "\tINFO: Directory definition $dir is superfluous\n";
-        # print $infoline;
-        push(@par2script::globals::logfileinfo, $infoline);
-    }
-}
-
-##################################################
-# Checking if the directories in the item
-# definitions are defined.
-##################################################
-
-sub check_directories_in_item_definitions
-{
-    my $item;
-    foreach $item ( @par2script::globals::items_with_directories )
-    {
-        my $allitems = $par2script::globals::definitions{$item};
-        
-        my $onegid;
-        foreach $onegid ( keys %{$allitems} )
-        {
-            if ( ! exists($allitems->{$onegid}->{'Dir'}) ) { die "\nERROR: No directory defined for item: $onegid!\n\n"; }
-            my $dir = $allitems->{$onegid}->{'Dir'};
-            if (( $dir eq "PD_PROGDIR" ) || ( $dir =~ /PREDEFINED_/ )) { next; }
-            
-            # checking if this directoryid is defined
-            if ( ! exists($par2script::globals::definitions{'Directory'}->{$dir}) )
-            {
-                die "\nERROR: Directory $dir in item $onegid not defined!\n\n";
-            }
-        }
-    }
-}
-
-########################################################
-# Checking for all Items, that know their modules,
-# whether these modules exist.
-########################################################
-
-sub check_module_existence
-{
-    my $item;
-    foreach $item ( @par2script::globals::items_with_moduleid )
-    {
-        my $allitems = $par2script::globals::definitions{$item};
-
-        my $onegid;
-        foreach $onegid ( keys %{$allitems} )
-        {
-            if ( ! exists($allitems->{$onegid}->{'ModuleID'}) ) { die "\nERROR: No ModuleID defined for item: $onegid!\n\n"; }
-            my $moduleid = $allitems->{$onegid}->{'ModuleID'};
-            
-            # checking if this directoryid is defined
-            if ( ! exists($par2script::globals::definitions{'Module'}->{$moduleid}) )
-            {
-                die "\nERROR: ModuleID $moduleid in item $onegid not defined!\n\n";
-            }
-        }
-    }
-}
-
-########################################################
-# Every script has to contain exactly one root module.
-# This module has no ParentID or an empty ParentID.
-########################################################
-
-sub check_rootmodule
-{
-    my $rootgid = "";
-    my $foundroot = 0;
-
-    my $allmodules = $par2script::globals::definitions{'Module'};
-    
-    my $modulegid = "";
-    foreach $modulegid (keys %{$allmodules} )
-    {
-        if (( ! exists($allmodules->{$modulegid}->{'ParentID'}) ) || ( $allmodules->{$modulegid}->{'ParentID'} eq "" ))
-        {
-            if ( $foundroot )
-            {
-                die "\nERROR: More than one Root module. Only one module without ParentID or with empty ParentID allowed ($rootgid and $modulegid).\n";
-            }
-            $rootgid = $modulegid;
-            $foundroot = 1;
-        }
-    }
-    
-    if ( ! $foundroot )
-    {
-        die "\nERROR: Could not find Root module. Did not find module without ParentID or with empty ParentID.\n";
-    }
-    
-    print " $rootgid\n";	
-
-}
-
-########################################################
-# File, Shortcut, Directory, Unixlink must not 
-# contain a ModuleID
-########################################################
-
-sub check_moduleid_at_items
-{
-    my $item;
-    foreach $item ( @par2script::globals::items_without_moduleid )
-    {
-        my $allitems = $par2script::globals::definitions{$item};
-
-        my $onegid;
-        foreach $onegid ( keys %{$allitems} )
-        {
-            if ( exists($allitems->{$onegid}->{'ModuleID'}) )
-            {
-                die "\nERROR: ModuleID assigned to $onegid! No module assignment to $item!\n\n";
-            }
-        }
-    }
-}
-
-########################################################
-# Controlling existence of multi assignments
-########################################################
-
-sub check_multiple_assignments
-{
-    my @multiassignments = ();
-    my $error;
-    
-    my $topitem;
-    foreach $topitem ( keys %par2script::globals::assignedgids )
-    {
-        my $item;
-        foreach $item ( keys %{$par2script::globals::assignedgids{$topitem}} )
-        {
-            if ( $par2script::globals::assignedgids{$topitem}->{$item} > 1 )
-            {
-                $error = 1;
-                my $string = "\tGID: $item Assignments: $par2script::globals::assignedgids{$topitem}->{$item}";
-                push(@multiassignments, $string);
-            }
-        }
-    }
-
-    if ( $error ) { par2script::exiter::multiassignmenterror(\@multiassignments); }
-}
-
-########################################################
-# Check, if a defined directory has a flag CREATE
-########################################################
-
-sub contains_create_flag
-{
-    my ($gid) = @_;
-    
-    my $createflag = 0;
-    
-    if (( exists($par2script::globals::definitions{'Directory'}->{$gid}->{'Styles'}) ) &&
-        ( $par2script::globals::definitions{'Directory'}->{$gid}->{'Styles'} =~ /\bCREATE\b/ ))
-    {
-        $createflag = 1;
-    }
-
-    return $createflag;
-}
-
-########################################################
-# Controlling existence of definitions without
-# any assignment
-########################################################
-
-sub check_missing_assignments
-{
-    # If defined gids for "File", "Directory" or "Unixlink" are not assigned, 
-    # this causes an error.
-    # Directories only have to be assigned, if they have the flag "CREATE". 
-
-    my @missingassignments = ();
-    $error = 0;
-
-    my $item;
-    foreach $item ( @par2script::globals::items_assigned_at_modules )
-    {
-        my $assignedgids = $par2script::globals::assignedgids{$item};
-        my $definedgids = $par2script::globals::definitions{$item};
-
-        my $gid;
-        foreach $gid ( keys %{$definedgids} )
-        {
-            if ( $item eq "Directory" ) { if ( ! contains_create_flag($gid) ) { next; }	}
-
-            if ( ! exists( $assignedgids->{$gid} ))
-            {
-                $error = 1;
-                push(@missingassignments, $gid);
-            }
-        }
-    }
-
-    if ( $error ) { par2script::exiter::missingassignmenterror(\@missingassignments); }
-}
-
-#############################################################
-# Controlling if for all shortcuts with file assignment
-# the file is defined. And for all shortcuts with
-# shortcut assignment the shortcut has to be defined.
-#############################################################
-
-sub check_shortcut_assignments
-{
-    my $allshortcuts = $par2script::globals::definitions{'Shortcut'};
-    my $allfiles = $par2script::globals::definitions{'File'};
-    
-    my $shortcut;
-    foreach $shortcut ( keys %{$allshortcuts} )
-    {
-        if (( exists($allshortcuts->{$shortcut}->{'FileID'}) ) &&
-            ( ! exists($allfiles->{$allshortcuts->{$shortcut}->{'FileID'}}) ))
-        {
-            # die "\nERROR: FileID $allshortcuts->{$shortcut}->{'FileID'} has no definition at shortcut $shortcut !\n";
-            print "\n\tWARNING: FileID $allshortcuts->{$shortcut}->{'FileID'} has no definition at shortcut $shortcut !\n";
-        }
-
-        if (( exists($allshortcuts->{$shortcut}->{'ShortcutID'}) ) &&
-            ( ! exists($allshortcuts->{$allshortcuts->{$shortcut}->{'ShortcutID'}}) ))
-        {
-            die "\nERROR: ShortcutID $allshortcuts->{$shortcut}->{'ShortcutID'} has no definition at shortcut $shortcut !\n";
-        }
-        
-        if (( ! exists($allshortcuts->{$shortcut}->{'ShortcutID'}) ) &&
-            ( ! exists($allshortcuts->{$shortcut}->{'FileID'}) ))
-        {
-            die "\nERROR: Shortcut requires assignment to \"ShortcutID\" or \"FileID\". Missing at shortcut $shortcut !\n";
-        }		
-    }
-}
-
-#############################################################
-# Controlling if for Modules and Directories, the parents
-# are defined. If not, this can lead to a problem during
-# script creation, because only recursively added 
-# Modules or Directories are added to the script.
-#############################################################
-
-sub check_missing_parents
-{
-    my @parentitems = ("Module", "Directory");
-    my %rootparents = ("PREDEFINED_PROGDIR" => "1");
-    
-    my $oneitem;
-    foreach $oneitem ( @parentitems )
-    {
-        my $alldefinitions = $par2script::globals::definitions{$oneitem};
-        
-        my $onegid;
-        foreach $onegid ( keys %{$alldefinitions} )
-        {
-            # If there is a ParentID used, it must be defined
-            if (( exists($alldefinitions->{$onegid}->{'ParentID'}) ) &&
-                ( ! exists($alldefinitions->{$alldefinitions->{$onegid}->{'ParentID'}}) ) &&
-                ( ! exists($rootparents{$alldefinitions->{$onegid}->{'ParentID'}}) ))
-            {
-                die "\nERROR: Parent \"$alldefinitions->{$onegid}->{'ParentID'}\" at $oneitem \"$onegid\" is not defined!\n";				
-            }	
-        }
-    } 	
-}
-
-1;
diff --git a/solenv/bin/modules/par2script/converter.pm b/solenv/bin/modules/par2script/converter.pm
deleted file mode 100644
index d51f176e6..000000000
--- a/solenv/bin/modules/par2script/converter.pm
+++ /dev/null
@@ -1,142 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package par2script::converter;
-
-use par2script::remover;
-
-#############################
-# Converter
-#############################
-
-sub convert_array_to_hash
-{
-    my ($arrayref) = @_;  
-
-    my ($line, $key, $value);
-    
-    my %newhash = ();
-
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        $line = ${$arrayref}[$i];
-        
-        if ( $line =~ /^\s*(\w+?)\s+(.*?)\s*$/ )
-        {
-            $key = $1;
-            $value = $2;
-            $newhash{$key} = $value;
-        }
-    }
-
-    return \%newhash;
-}
-
-sub convert_hash_into_array
-{
-    my ($hashref) = @_;
-    
-    my @array = ();
-    my ($key, $value, $input);
-    
-    foreach $key (keys %{$hashref})
-    {
-        $value = $hashref->{$key};
-        $input = "$key = $value\n";
-        push(@array ,$input);
-    }
-
-    return \@array
-}
-
-sub convert_stringlist_into_array_2
-{
-    my ( $input, $separator ) = @_;
-    
-    my @newarray = ();
-    my $first = "";
-    my $last = "";
-
-    $last = $input;
-
-    while ( $last =~ /^\s*(.+?)\s*\Q$separator\E\s*(.+)\s*$/)	# "$" for minimal matching
-    {
-        $first = $1;
-        $last = $2;
-        par2script::remover::remove_leading_and_ending_whitespaces(\$first);
-        if ( $first ) { push(@newarray, $first); }
-    }	
-
-    par2script::remover::remove_leading_and_ending_whitespaces(\$last);
-    if ( $last ) { push(@newarray, $last); }	
-    
-    return \@newarray;
-}
-
-sub convert_stringlist_into_array
-{
-    my ( $includestringref, $separator ) = @_;
-    
-    my @newarray = ();
-    my ($first, $last);
-
-    $last = ${$includestringref};
-
-    while ( $last =~ /^\s*(.+?)\s*\Q$separator\E\s*(.+)\s*$/)	# "$" for minimal matching
-    {
-        $first = $1;
-        $last = $2;
-        par2script::remover::remove_leading_and_ending_whitespaces(\$first);
-        push(@newarray, $first);
-    }	
-
-    par2script::remover::remove_leading_and_ending_whitespaces(\$last);
-    push(@newarray, $last);	
-    
-    return \@newarray;
-}
-
-#############################################################################
-# The file name contains for some files "/". If this programs runs on 
-# a windows platform, this has to be converted to "\".
-#############################################################################
-
-sub convert_slash_to_backslash
-{
-    my ($filesarrayref) = @_;
-
-    my ($onefile, $filename);
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        $onefile = ${$filesarrayref}[$i];
-        $onefile->{'Name'} =~ s/\//\\/g;
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/par2script/existence.pm b/solenv/bin/modules/par2script/existence.pm
deleted file mode 100644
index 87b441d16..000000000
--- a/solenv/bin/modules/par2script/existence.pm
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package par2script::existence;
-
-#############################
-# Test of existence
-#############################
-
-sub exists_in_array
-{
-    my ($searchstring, $arrayref) = @_;
-
-    my $alreadyexists = 0;
-    
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        if ( ${$arrayref}[$i] eq $searchstring)
-        {
-            $alreadyexists = 1;
-            last;
-        }
-    }
-    
-    return $alreadyexists;
-}
-
-sub exists_in_array_of_hashes
-{
-    my ($searchkey, $searchvalue, $arrayref) = @_;
-
-    my $hashref;
-    my $valueexists = 0;
-
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        $hashref = ${$arrayref}[$i];
-        
-        if ( $hashref->{$searchkey} eq $searchvalue )
-        {
-            $valueexists = 1;
-            last;
-        }
-    }
-    
-    return $valueexists;
-}
-
-1;
diff --git a/solenv/bin/modules/par2script/exiter.pm b/solenv/bin/modules/par2script/exiter.pm
deleted file mode 100644
index 6f9b144fa..000000000
--- a/solenv/bin/modules/par2script/exiter.pm
+++ /dev/null
@@ -1,122 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package par2script::exiter;
-
-use par2script::files;
-use par2script::globals;
-
-############################################
-# Exiting the program with an error
-# This function is used instead of "die"
-############################################
-
-sub exit_program
-{
-    my ($message, $function) = @_;
-    
-    my $infoline;
-        
-    $infoline = "\n***************************************************************\n";
-    push(@par2script::globals::logfileinfo, $infoline);
-    print("$infoline");
-    
-    $infoline = "$message\n";
-    push(@par2script::globals::logfileinfo, $infoline);
-    print("$infoline");
-
-    $infoline = "in function: $function\n";
-    push(@par2script::globals::logfileinfo, $infoline);
-    print("$infoline");
-
-    $infoline = "***************************************************************\n";
-    push(@par2script::globals::logfileinfo, $infoline);
-
-    if ($par2script::globals::logging)
-    {
-        par2script::files::save_file($par2script::globals::logfilename, \@par2script::globals::logfileinfo);
-        print("Saved logfile: $par2script::globals::logfilename\n");
-    }
-
-    print("$infoline");
-        
-    exit(-1);	
-}
-
-#####################################
-# Error, because a gid is defined
-# more than once
-#####################################
-
-sub multidefinitionerror
-{
-    my ( $multidefinitiongids ) = @_;
-    print "************************************************\n";	
-    print "ERROR: multiple definition of gids:\n";
-    print "************************************************\n";	
-
-    my $gid;
-    foreach $gid ( @{$multidefinitiongids} ) { print "\t$gid\n"; }
-    exit(-1);	
-}
-
-#####################################
-# Error, because a gid is assigned
-# more than once
-#####################################
-
-sub multiassignmenterror
-{
-    my ( $multiassignmentgids ) = @_;
-    #print "************************************************\n";	
-    #print "ERROR: multiple assignments of gids:\n";
-    #print "************************************************\n";	
-
-    my $line;
-    foreach $line ( @{$multiassignmentgids} ) { print "\t$line\n"; }
-    # exit(-1);
-}
-
-#####################################
-# Error, because a defined gid
-# is not assigned
-#####################################
-
-sub missingassignmenterror
-{
-    my ( $missingassignmentgids ) = @_;
-    print "********************************************************\n";	
-    print "ERROR: Missing assignments for the following GIDs:\n";
-    print "********************************************************\n";	
-
-    my $gid;
-    foreach $gid ( @{$missingassignmentgids} ) { print "\t$gid\n"; }
-    exit(-1);	
-}
-
-1;
diff --git a/solenv/bin/modules/par2script/files.pm b/solenv/bin/modules/par2script/files.pm
deleted file mode 100644
index 340bc3fef..000000000
--- a/solenv/bin/modules/par2script/files.pm
+++ /dev/null
@@ -1,124 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package par2script::files;
-
-use par2script::exiter;
-
-############################################
-# File Operations
-############################################
-
-sub check_file
-{
-    my ($arg) = @_;
-
-    if(!( -f $arg ))
-    {
-        par2script::exiter::exit_program("ERROR: Cannot find file $arg", "check_file");
-    }
-}
-
-sub read_file
-{
-    my ($localfile) = @_;
-
-    my @localfile = ();
-
-    open( IN, "<$localfile" ) || par2script::exiter::exit_program("ERROR: Cannot open file: $localfile", "read_file");
-    while ( <IN> ) { push(@localfile, $_); }
-    close( IN );
-
-    return \@localfile;
-}
-
-###########################################
-# Saving files, arrays and hashes
-###########################################
-
-sub save_file
-{
-    my ($savefile, $savecontent) = @_;
-    open( OUT, ">$savefile" );
-    print OUT @{$savecontent};
-    close( OUT);
-    if (! -f $savefile) { pre2par::exiter::exit_program("ERROR: Cannot write file: $savefile", "save_file"); }
-}
-
-sub save_hash
-{
-    my ($savefile, $hashref) = @_;
-
-    my @printcontent = ();
-    
-    my ($itemkey, $itemvalue, $line);
-        
-    foreach $itemkey ( keys %{$hashref} )
-    {
-        $line = "";
-        $itemvalue = $hashref->{$itemkey};
-        $line = $itemkey . "=" . $itemvalue . "\n";
-        push(@printcontent, $line);
-    }
-
-    open( OUT, ">$savefile" );
-    print OUT @printcontent;
-    close( OUT);
-}
-
-sub save_array_of_hashes
-{
-    my ($savefile, $arrayref) = @_;
-
-    my @printcontent = ();
-    
-    my ($itemkey, $itemvalue, $line, $hashref);
-        
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {		
-        $line = "";
-        $hashref = ${$arrayref}[$i];
-                
-        foreach $itemkey ( keys %{$hashref} )
-        {
-            $itemvalue = $hashref->{$itemkey};
-
-            $line = $line . $itemkey . "=" . $itemvalue . "\t";
-        }
-
-        $line = $line . "\n";
-        
-        push(@printcontent, $line);
-    }
-
-    open( OUT, ">$savefile" );
-    print OUT @printcontent;
-    close( OUT);
-}
-
-1;
diff --git a/solenv/bin/modules/par2script/globals.pm b/solenv/bin/modules/par2script/globals.pm
deleted file mode 100644
index b06827047..000000000
--- a/solenv/bin/modules/par2script/globals.pm
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package par2script::globals;
-
-############################################
-# Global settings
-############################################
-
-BEGIN
-{	
-    $prog="par2script";
-    
-    $includepathlist = "";
-    $scriptname = "";
-    $parfilelistorig = "";
-    $parfilelist = "";
-
-    @allitems = ("Installation", "ScpAction", "Directory", "File",
-                 "Shortcut", "Unixlink", "Module", "Profile", "ProfileItem",
-                 "Folder", "FolderItem", "RegistryItem", "WindowsCustomAction",
-                 "MergeModule");
-
-    @items_assigned_at_modules = ("File", "Directory", "Unixlink");
-    @items_with_directories = ("File", "Profile", "Shortcut", "Unixlink");
-    @items_with_moduleid = ("Profile", "ProfileItem", "FolderItem", "RegistryItem");
-    @items_without_moduleid = ("File", "Directory", "Shortcut", "Unixlink");
-
-    %searchkeys = ("File" => "Files", "Directory" => "Dirs", "Unixlink" => "Unixlinks");
-
-    $logging = 0;
-    $logfilename = "logfile.log";	# the default logfile name for global errors
-    @logfileinfo = ();
-
-    $multidefinitionerror = 0;
-    $multiassignmenterror = 0;
-
-    %definitions;
-    %assignedgids;
-        
-    $plat = $^O;
-
-    $separator = "/";
-    $pathseparator = "\:";
-    $isunix = 1;
-    $iswin = 0;
-
-    $islinux = 0;
-    $issolaris = 0;
-
-    if ( $plat =~ /linux/i ) { $islinux = 1; } 
-    if ( $plat =~ /solaris/i ) { $issolaris = 1; } 
-
-}
-
-1;
diff --git a/solenv/bin/modules/par2script/module.pm b/solenv/bin/modules/par2script/module.pm
deleted file mode 100644
index d1da979bc..000000000
--- a/solenv/bin/modules/par2script/module.pm
+++ /dev/null
@@ -1,264 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package par2script::module;
-
-use par2script::converter;
-use par2script::exiter;
-
-###########################################
-# Removing undefined gids 
-# from modules
-###########################################
-
-sub remove_from_modules
-{
-    my ($gid, $item) = @_;
-
-    my $counter = 0;
-
-    if ( ! exists($par2script::globals::searchkeys{$item}) ) { par2script::exiter::exit_program("ERROR: Unknown type \"$item\" at modules.", "remove_from_modules"); }
-    my $searchkey = $par2script::globals::searchkeys{$item};
-
-    my $allmodules = $par2script::globals::definitions{'Module'};
-
-    my $onemodule;
-    foreach $onemodule (keys %{$allmodules})
-    {
-        if (( exists($allmodules->{$onemodule}->{$searchkey}) ) && ( $allmodules->{$onemodule}->{$searchkey} =~ /\b$gid\b/ ))
-        {
-            my $infoline = "WARNING: Removing $gid because of missing definition\n";
-            # print $infoline;
-            push(@par2script::globals::logfileinfo, $infoline);
-
-            $allmodules->{$onemodule}->{$searchkey} =~ s/\b$gid\b//;
-            $allmodules->{$onemodule}->{$searchkey} =~ s/\,\s*\,/\,/;
-            $allmodules->{$onemodule}->{$searchkey} =~ s/\(\s*\,\s*/\(/;
-            $allmodules->{$onemodule}->{$searchkey} =~ s/\s*\,\s*\)/\)/;
-                    
-            if (( $allmodules->{$onemodule}->{$searchkey} =~ /\(\s*\,\s*\)/ ) || 
-                ( $allmodules->{$onemodule}->{$searchkey} =~ /\(\s*\)/ ))
-            {
-                delete($allmodules->{$onemodule}->{$searchkey});
-            }
-            
-            $counter++;			
-        }
-    }
-    
-    return $counter;	
-}
-
-###########################################
-# Removing undefined gids automatically
-# from modules
-###########################################
-
-sub remove_undefined_gids_from_modules
-{
-    # If assigned gids for "File", "Directory" or "Unixlink" are not defined, 
-    # they are automatically removed from the module
-
-    foreach $item ( @par2script::globals::items_assigned_at_modules )
-    {
-        my $assignedgids = $par2script::globals::assignedgids{$item};
-        my $definedgids = $par2script::globals::definitions{$item};
-
-        my $gid;
-        foreach $gid ( keys %{$assignedgids} )
-        {
-            if ( ! exists( $definedgids->{$gid} ))
-            {
-                # deleting entry in module definition
-                my $number_of_removals = remove_from_modules($gid, $item);
-                # decreasing counter in assignments
-                if ( $assignedgids->{$gid} > $number_of_removals ) { $assignedgids->{$gid} = $assignedgids->{$gid} - $number_of_removals; }
-                else { delete($assignedgids->{$gid}); }								
-            }
-        }
-    }
-}
-
-############################################
-# Getting the gid of the root module. The 
-# root module has no ParentID or an empty
-# ParentID.
-############################################
-
-sub get_rootmodule_gid
-{
-    my $rootgid = "";
-    my $foundroot = 0;
-
-    my $allmodules = $par2script::globals::definitions{'Module'};
-    
-    my $modulegid = "";
-    foreach $modulegid (keys %{$allmodules} )
-    {
-        # print "Module $modulegid\n";
-        # my $content = "";
-        # foreach $content (sort keys %{$allmodules->{$modulegid}}) { print "\t$content = $allmodules->{$modulegid}->{$content};\n"; }
-        # print "End\n";
-        # print "\n";
-
-        if (( ! exists($allmodules->{$modulegid}->{'ParentID'})) || ( $allmodules->{$modulegid}->{'ParentID'} eq "" ))
-        {
-            if ( $foundroot ) { par2script::exiter::exit_program("ERROR: More than one Root module. Only one module without ParentID or with empty ParentID allowed ($rootgid and $modulegid).", "get_rootmodule_gid"); }
-            $rootgid = $modulegid;
-            $foundroot = 1;
-        }
-    }
-    
-    if ( ! $foundroot ) { par2script::exiter::exit_program("ERROR: Could not find Root module. Did not find module without ParentID or with empty ParentID.", "get_rootmodule_gid"); }
-    
-    return $rootgid;	
-}
-
-####################################
-# Adding defined items without 
-# assignment to the root module.
-####################################
-
-sub add_to_root_module
-{
-    # If defined gids for "File", "Directory" or "Unixlink" are not assigned, 
-    # they are automatically assigned to the root module
-    
-    my $rootmodulegid = get_rootmodule_gid();
-
-    my $item;
-    foreach $item ( @par2script::globals::items_assigned_at_modules )
-    {
-        my $assignedgids = $par2script::globals::assignedgids{$item};
-        my $definedgids = $par2script::globals::definitions{$item};
-
-        my $gidstring = "";
-        
-        # Perhaps there are already items assigned to the root
-        if ( ! exists($par2script::globals::searchkeys{$item}) ) { par2script::exiter::exit_program("ERROR: Unknown type \"$item\" at modules.", "remove_from_modules"); }
-        my $modulekey = $par2script::globals::searchkeys{$item};
-        if ( exists($par2script::globals::definitions{'Module'}->{$rootmodulegid}->{$modulekey}) )
-        {
-            $gidstring = $par2script::globals::definitions{'Module'}->{$rootmodulegid}->{$modulekey};
-            $gidstring =~ s/\(//;
-            $gidstring =~ s/\)//;
-        }
-
-        my $gid;
-        foreach $gid ( keys %{$definedgids} )
-        {
-            if ( ! exists( $assignedgids->{$gid} ))
-            {
-                if ( $gidstring eq "" )
-                {
-                    $gidstring = $gid;
-                }
-                else
-                {
-                    $gidstring = "$gidstring,$gid";
-                }
-                
-                $assignedgids->{$gid} = 1;
-            }
-        }
-
-        if ( $gidstring ne "" )
-        {
-            $gidstring = "\($gidstring\)";
-            $par2script::globals::definitions{'Module'}->{$rootmodulegid}->{$modulekey} = $gidstring;
-        }
-    }	
-}
-
-###################################################
-# Including \n in a very long string
-###################################################
-
-sub include_linebreaks
-{
-    my ($allgidstring) = @_;
-
-    my $newline = "";
-    my $newlength = 0;
-
-    $allgidstring =~ s/\(//;
-    $allgidstring =~ s/\)//;
-    
-    my $allgids = par2script::converter::convert_stringlist_into_array_2($allgidstring, ",");
-
-    if ( $#{$allgids} > -1 )
-    {
-        my $onegid;
-        foreach $onegid ( @{$allgids} )
-        {
-            $newline = "$newline$onegid,";
-            $newlength = $newlength + length($onegid) + 1; # +1 for the comma
-
-            if ( $newlength > 80 )
-            {
-                $newline = $newline . "\n\t\t\t\t";
-                $newlength = 0;	
-            }
-        }
-    }	
-
-    $newline =~ s/,\s*$//;
-    $newline = "($newline)";
-
-    return $newline;
-}
-
-###################################################
-# Shorten the lines that belong to modules, if
-# the length of the line is greater 100
-###################################################
-
-sub shorten_lines_at_modules
-{
-    my $item;
-    foreach $item ( @par2script::globals::items_assigned_at_modules )
-    {
-        if ( ! exists($par2script::globals::searchkeys{$item}) ) { par2script::exiter::exit_program("ERROR: Unknown type \"$item\" at modules.", "shorten_lines_at_modules"); }
-        my $searchkey = $par2script::globals::searchkeys{$item};
-
-        my $allmodules = $par2script::globals::definitions{'Module'};
-
-        my $onemodule;
-        foreach $onemodule (keys %{$allmodules})
-        {
-            if (( exists($allmodules->{$onemodule}->{$searchkey}) ) && 
-                ( length($allmodules->{$onemodule}->{$searchkey}) > 100 ))
-            {
-                # including "\n\t\t\t\t"
-                my $newstring = include_linebreaks($allmodules->{$onemodule}->{$searchkey});
-                $allmodules->{$onemodule}->{$searchkey} = $newstring;
-            }
-        }
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/par2script/parameter.pm b/solenv/bin/modules/par2script/parameter.pm
deleted file mode 100644
index 4ca1354d9..000000000
--- a/solenv/bin/modules/par2script/parameter.pm
+++ /dev/null
@@ -1,154 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package par2script::parameter;
-
-use Cwd;
-use par2script::files;
-use par2script::globals;
-use par2script::systemactions;
-
-############################################
-# Parameter Operations
-############################################
-
-###############################################################################
-# Usage:
-# perl par2script.pl -i ..\wntmsci8.pro\par,o:\SRX645\wntmsci8.pro\par.m24 
-# 					@@C:\DOCUMEN~1\is\LOCALS~1\Temp\mk6pd
-# 					-o ..\wntmsci8.pro\bin\osl\setup_osl.inf
-###############################################################################
-
-sub usage
-{
-    print <<Ende;
-
---------------------------------------------------------------
-$par2script::globals::prog
-The following parameter are needed:
--i: include pathes, comma separated list
--o: setup script file name
--v: writing logfile.txt (optional)
-\@\@list: list of all par files
- 
-Example:
- perl par2script.pl -i ..\\wntmsci8\\par\,o\:\\SRX645\\wntmsci8\\par.m24 
-         \@\@C\:\\DOCUMEN\~1\\is\\LOCALS\~1\\Temp\\mk6pd
-         -o ..\\wntmsci8.pro\\bin\\osl\\setup_osl.inf \[-v\]
-
---------------------------------------------------------------
-Ende
-    exit(-1);
-}
-
-#####################################
-# Reading parameter
-#####################################
-
-sub getparameter
-{
-    while ( $#ARGV >= 0 )
-    {
-        my $param = shift(@ARGV);
-        
-        if ($param eq "-o") { $par2script::globals::scriptname = shift(@ARGV); }
-        elsif ($param eq "-v") { $par2script::globals::logging = 1; }
-        elsif ($param =~ /\@\@/) { $par2script::globals::parfilelistorig = $param; }
-        elsif ($param eq "-i") { $par2script::globals::includepathlist = shift(@ARGV); }
-        elsif (($param =~ /\//) || ($param =~ /\\/))	# another include parameter!
-        {
-            $par2script::globals::includepathlist = $par2script::globals::includepathlist . "," . $param;
-        }
-        else
-        {
-            print("\n*************************************\n");
-            print("Sorry, unknown parameter: $param");
-            print("\n*************************************\n");
-            usage();
-            exit(-1);
-        }	
-    }
-}
-
-############################################
-# Controlling  the fundamental parameter
-# (required for every process)
-############################################
-
-sub control_parameter
-{
-    if ($par2script::globals::includepathlist eq "")
-    {
-        print "\n************************************************\n";
-        print "Error: Include pathes not set not set (-i)!";
-        print "\n************************************************\n";
-        usage();
-        exit(-1);
-    }
-    
-    if ($par2script::globals::scriptname eq "")
-    {
-        print "\n************************************************\n";
-        print "Error: Name of the setup script not set (-o)!";
-        print "\n************************************************\n";
-        usage();
-        exit(-1);
-    }
-
-    if ($par2script::globals::parfilelistorig eq "")
-    {
-        print "\n************************************************\n";
-        print "Error: List of par files not set!";
-        print "\n************************************************\n";
-        usage();
-        exit(-1);
-    }
-    
-    # The par file list has to exist
-    
-    $par2script::globals::parfilelist = $par2script::globals::parfilelistorig;
-    $par2script::globals::parfilelist =~ s/\@\@//;
-    par2script::files::check_file($par2script::globals::parfilelist);
-}
-
-#####################################
-# Writing parameter to shell
-#####################################
-
-sub outputparameter
-{
-    my $outputline = "\n$par2script::globals::prog -i $par2script::globals::includepathlist $par2script::globals::parfilelistorig -o $par2script::globals::scriptname";
-
-    if ($par2script::globals::logging) { $outputline .= " -v"; }
-    
-    $outputline .= "\n";
-
-    print $outputline;
-}
-
-1;
diff --git a/solenv/bin/modules/par2script/remover.pm b/solenv/bin/modules/par2script/remover.pm
deleted file mode 100644
index 0a41bf6c4..000000000
--- a/solenv/bin/modules/par2script/remover.pm
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package par2script::remover;
-
-############################################
-# Remover
-############################################
-
-sub remove_leading_and_ending_whitespaces
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/^\s*//g;
-    $$stringref =~ s/\s*$//g;	
-}
-
-sub remove_leading_and_ending_comma
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/^\s*\,//g;
-    $$stringref =~ s/\,\s*$//g;	
-}
-
-sub remove_leading_and_ending_quotationmarks
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/^\s*\"//g;
-    $$stringref =~ s/\"\s*$//g;	
-}
-
-sub remove_leading_and_ending_slashes
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/^\s*\///g;
-    $$stringref =~ s/\/\s*$//g;	
-}
-
-sub remove_leading_and_ending_backslashes
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/^\s*\\//g;
-    $$stringref =~ s/\\\s*$//g;	
-}
-
-1;
diff --git a/solenv/bin/modules/par2script/shortcut.pm b/solenv/bin/modules/par2script/shortcut.pm
deleted file mode 100644
index d78ad795b..000000000
--- a/solenv/bin/modules/par2script/shortcut.pm
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package par2script::shortcut;
-
-use par2script::work;
-
-############################################################
-# Writing shortcuts to files behind the correct files and
-# then shortcuts to shortcuts behind these shortcuts.
-############################################################
-
-sub shift_shortcut_positions
-{
-    my ($script) = @_;
-        
-    my $allshortcutgids = par2script::work::get_all_gids_from_script($script, "Shortcut");
-
-    # first all shortcuts that are assigned to files
-
-    for ( my $i = 0; $i <= $#{$allshortcutgids}; $i++ )
-    {	
-        my $codeblock = par2script::work::get_definitionblock_from_script($script, ${$allshortcutgids}[$i]);
-
-        my $filegid = par2script::work::get_value_from_definitionblock($codeblock, "FileID");
-
-        if (!($filegid eq ""))
-        {
-            par2script::work::remove_definitionblock_from_script($script, ${$allshortcutgids}[$i]);
-            par2script::work::add_definitionblock_into_script($script, $codeblock, $filegid);
-        }
-    }
-
-    # secondly all shortcuts that are assigned to other shortcuts
-
-    for ( my $i = 0; $i <= $#{$allshortcutgids}; $i++ )
-    {	
-        my $codeblock = par2script::work::get_definitionblock_from_script($script, ${$allshortcutgids}[$i]);
-        my $shortcutgid = par2script::work::get_value_from_definitionblock($codeblock, "ShortcutID");
-
-        if (!($shortcutgid eq ""))
-        {
-            par2script::work::remove_definitionblock_from_script($script, ${$allshortcutgids}[$i]);
-            par2script::work::add_definitionblock_into_script($script, $codeblock, $shortcutgid);
-        }
-    }
-}
-
-
-1;
diff --git a/solenv/bin/modules/par2script/systemactions.pm b/solenv/bin/modules/par2script/systemactions.pm
deleted file mode 100644
index 5f5d62bcd..000000000
--- a/solenv/bin/modules/par2script/systemactions.pm
+++ /dev/null
@@ -1,184 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package par2script::systemactions;
-
-use File::Copy;
-use par2script::exiter;
-use par2script::globals;
-
-######################################################
-# Creating a new direcotory
-######################################################
-
-sub create_directory
-{
-    my ($directory) = @_;
-        
-    my $returnvalue = 1;
-
-    if (!(-d $directory))
-    {
-        $returnvalue = mkdir($directory, 0775);
-
-        if ($returnvalue)
-        {
-            $infoline = "Created directory: $directory\n"; 
-            push(@par2script::globals::logfileinfo, $infoline);
-    
-            if ($par2script::globals::isunix)
-            {
-                my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
-                system($localcall);
-            }			
-        }
-        else
-        {
-            par2script::exiter::exit_program("Error: Could not create directory: $directory", "create_directory");
-        }
-    }
-}
-
-#######################################################################
-# Creating the directories, in which files are generated or unzipped
-#######################################################################
-
-sub create_directories
-{
-    my ($directory, $languagesref) =@_;
-    
-    $par2script::globals::unpackpath =~ s/\Q$par2script::globals::separator\E\s*$//;	# removing ending slashes and backslashes
-    
-    my $path = $par2script::globals::unpackpath;	 # this path already exists
-    
-    $path = $path . $par2script::globals::separator . $par2script::globals::build . $par2script::globals::separator;
-    create_directory($path);
-
-    $path = $path . $par2script::globals::minor . $par2script::globals::separator;
-    create_directory($path);
-
-    if ($directory eq "unzip" )
-    {
-        $path = $path . "common" . $par2script::globals::productextension . $par2script::globals::separator;
-        create_directory($path);
-
-        $path = $path . $directory . $par2script::globals::separator;
-        create_directory($path);
-    }
-    else
-    {
-        $path = $path . $par2script::globals::compiler . $par2script::globals::productextension . $par2script::globals::separator;
-        create_directory($path);
-
-        $path = $path . $par2script::globals::product . $par2script::globals::separator;
-        create_directory($path);
-
-        $path = $path . $directory . $par2script::globals::separator;
-        create_directory($path);
-        
-        if (!($$languagesref eq "" ))	# this will be a path like "01_49", for Profiles and ConfigurationFiles, idt-Files
-        {
-            $path = $path . $$languagesref . $par2script::globals::separator;
-            create_directory($path);			
-        }
-    }
-    
-    $path =~ s/\Q$par2script::globals::separator\E\s*$//;
-    
-    return $path;
-}
-
-########################
-# Copying one file
-########################
-
-sub copy_one_file
-{
-    my ($source, $dest) = @_;
-
-    my ($copyreturn, $returnvalue);
-    my $infoline;
-    
-    $copyreturn = copy($source, $dest);
-        
-    if ($copyreturn)
-    {
-        $infoline = "Copy: $source to $dest\n";
-        $returnvalue = 1;
-    }
-    else
-    {
-        $infoline = "Error: Could not copy $source to $dest $!\n";
-        $returnvalue = 0;
-    }
-    
-    push(@par2script::globals::logfileinfo, $infoline);
-    
-    return $returnvalue;
-}
-
-##########################################
-# Copying all files from one directory
-# to another directory
-##########################################
-
-sub copy_directory
-{
-    my ($sourcedir, $destdir) = @_;
-    
-    my ($onefile, $sourcefile, $destfile);
-    my @sourcefiles = ();
-    
-    $sourcedir =~ s/\Q$par2script::globals::separator\E\s*$//;
-    $destdir =~ s/\Q$par2script::globals::separator\E\s*$//;
-
-    $infoline = "\n";
-    push(@par2script::globals::logfileinfo, $infoline);
-    $infoline = "Copying files from directory $sourcedir to directory $destdir\n";
-    push(@par2script::globals::logfileinfo, $infoline);
-    
-    opendir(DIR, $sourcedir);
-    @sourcefiles = readdir(DIR);
-    closedir(DIR);
-    
-    foreach $onefile (@sourcefiles)
-    {
-        if ((!($onefile eq ".")) && (!($onefile eq "..")))
-        {
-            $sourcefile = $sourcedir . $par2script::globals::separator . $onefile;
-            $destfile = $destdir . $par2script::globals::separator . $onefile;
-            if ( -f $sourcefile ) 	# only files, no directories
-            {
-                copy_one_file($sourcefile, $destfile);
-            }
-        }
-    }
-}
-
-
-1;
diff --git a/solenv/bin/modules/par2script/undefine.pm b/solenv/bin/modules/par2script/undefine.pm
deleted file mode 100644
index 3ffc76709..000000000
--- a/solenv/bin/modules/par2script/undefine.pm
+++ /dev/null
@@ -1,144 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package par2script::undefine;
-
-use par2script::globals;
-
-##########################################################
-# Removing in the script all the gids, that are listed 
-# in undefine scp files
-##########################################################
-
-sub undefine_gids
-{
-    my ($parfilecontent) = @_;
-
-    my $item;
-    foreach $item ( @par2script::globals::allitems )
-    {
-        my $unitem = "Un$item";
-
-        for ( my $i = 0; $i <= $#{$parfilecontent}; $i++ )
-        {	
-            if ( ${$parfilecontent}[$i] =~ /^\s*$unitem\s*(\w+?)\s*$/ )
-            {
-                my $gid = $1;
-                delete($par2script::globals::definitions{$item}->{$gid});
-            }
-        }
-    }
-}
-
-##########################################################
-# Collecting all subdirectories of a specified directory 
-##########################################################
-
-sub collect_children_dirs
-{
-    my ($gid, $collector) = @_;
-    
-    my $diritem = "Directory";
-    my $parentkey = "ParentID";
-
-    if ( exists($par2script::globals::definitions{$diritem}) )
-    {
-        my $onedefinition;
-                
-        foreach $onedefinition (keys %{$par2script::globals::definitions{$diritem}})
-        {
-            if ( $par2script::globals::definitions{$diritem}->{$onedefinition}->{$parentkey} eq $gid )
-            {
-                push(@{$collector}, $onedefinition);
-                collect_children_dirs($onedefinition, $collector);
-            }
-        }
-    }
-}
-
-##########################################################
-# Removing in the script complete profiles. 
-# This includes the Profile and its ProfileItems.
-##########################################################
-
-sub remove_complete_item
-{
-    my ($item, $parfilecontent) = @_;
-
-    my $removeitem = "Remove$item";
-    my $dependentkey = "";
-    my $collect_children = 0;
-    my @gidcollector = ();
-    my @dependentitems = ();
-
-    if ( $item eq "Profile" )
-    {
-        @dependentitems = ("ProfileItem");
-        $dependentkey = "ProfileID";
-    }
-    elsif ( $item eq "Directory" )
-    {
-        @dependentitems = ("File", "Shortcut", "Unixlink");
-        $dependentkey = "Dir";
-        $collect_children = 1;
-    }
-
-    for ( my $i = 0; $i <= $#{$parfilecontent}; $i++ )
-    {	
-        if ( ${$parfilecontent}[$i] =~ /^\s*$removeitem\s*(\w+?)\s*$/ )
-        {
-            my $onegid = $1;
-            push(@gidcollector, $onegid);
-            if ( $collect_children ) { collect_children_dirs($onegid, \@gidcollector); }
-
-            my $gid;
-            foreach $gid (@gidcollector)
-            {
-                delete($par2script::globals::definitions{$item}->{$gid});
-
-                # also deleting all dependent items, for example "ProfileItems" whose "ProfileID" is this "Profile"
-                my $depitem;
-                foreach $depitem ( @dependentitems )
-                {
-                    if ( exists($par2script::globals::definitions{$depitem}) )
-                    {
-                        my $onedefinition;				
-                        foreach $onedefinition (keys %{$par2script::globals::definitions{$depitem}})
-                        {
-                            if ( $par2script::globals::definitions{$depitem}->{$onedefinition}->{$dependentkey} eq $gid )
-                            {
-                                delete($par2script::globals::definitions{$depitem}->{$onedefinition});
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/par2script/work.pm b/solenv/bin/modules/par2script/work.pm
deleted file mode 100644
index f8b97087f..000000000
--- a/solenv/bin/modules/par2script/work.pm
+++ /dev/null
@@ -1,423 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package par2script::work;
-
-use par2script::existence;
-use par2script::globals;
-use par2script::remover;
-
-############################################
-# par2script working module
-############################################
-
-sub analyze_comma_separated_list
-{
-    my ($list, $listref) = @_;  # second parameter is optional
-
-    my @list = ();
-    my $locallistref;
-    
-    if (!( $listref )) { $locallistref = \@list; }
-    else { $locallistref = $listref; }
-    
-    par2script::remover::remove_leading_and_ending_comma(\$list);
-    par2script::remover::remove_leading_and_ending_whitespaces(\$list);
-
-    while ( $list =~ /^\s*(.*?)\s*\,\s*(.*)\s*$/ )
-    {
-        my $oneentry = $1;
-        $list = $2;
-        par2script::remover::remove_leading_and_ending_whitespaces(\$oneentry);
-        push(@{$locallistref}, $oneentry);
-    }
-
-    # the last entry
-
-    par2script::remover::remove_leading_and_ending_whitespaces(\$list);
-    push(@{$locallistref}, $list);
-
-    return $locallistref;
-}
-
-############################################
-# setting list of include pathes
-############################################
-
-sub setincludes
-{
-    my ($list) = @_;
-    
-    # input is the comma separated list of include pathes
-    
-    my $includes = analyze_comma_separated_list($list);
-
-    return $includes;
-}
-
-############################################
-# setting list of all par files
-############################################
-
-sub setparfiles
-{
-    my ($filename) = @_;
-
-    # input is the name of the list file
-    $filename =~ s/\@//;    # removing the leading \@
-
-    my $filecontent = par2script::files::read_file($filename);
-    
-    my @parfiles = ();
-    my $parfilesref = \@parfiles;
-
-    foreach ( @{$filecontent} ) { $parfilesref = analyze_comma_separated_list($_, $parfilesref); }
-
-    return $parfilesref;
-}
-
-############################################
-# finding the correct include path
-# for the par files
-############################################
-
-sub make_complete_pathes_for_parfiles
-{
-    my ($parfiles, $includes) = @_;
-
-    my $oneparfile;
-
-    foreach $oneparfile ( @{$parfiles} )
-    {
-        my $foundparfile = 0;
-        my $includepath;
-        
-        foreach $includepath ( @{$includes} )
-        {
-            my $parfile = "$includepath/$oneparfile"; 
-
-            if ( -f $parfile )
-            {
-                $foundparfile = 1;
-                $oneparfile = $parfile;
-                last;
-            }
-        }
-
-        if ( ! $foundparfile )
-        {
-            die "ERROR: Could not find parfile ${$parfiles}[$i] in includes pathes: $par2script::globals::includepathlist !\n";
-        }
-    }
-}
-
-######################################################
-# collecting one special item in the par files and 
-# including it into the "definitions" hash
-######################################################
-
-sub collect_definitions
-{
-    my ($parfilecontent) = @_;
-    
-    my $multidefinitionerror = 0;
-    my @multidefinitiongids = ();
-
-    my %itemhash;
-
-    # create empty item hashes
-    foreach $oneitem ( @par2script::globals::allitems ) {
-    my %items;
-        $par2script::globals::definitions{$oneitem} = \%items;
-    }
-
-    for ( my $i = 0; $i <= $#{$parfilecontent}; $i++ )
-    {
-    my $line = ${$parfilecontent}[$i];
-    my $oneitem, $gid;
-
-    $line =~ /^\s*$/ && next; # skip blank lines
-
-    # lines should be well formed:
-    if ($line =~ m/^\s*(\w+)\s+(\w+)\s*$/)
-    {
-        $oneitem = $1;
-        $gid = $2;
-    } else {
-        chomp ($line);
-        my $invalid = $line;
-        $invalid =~ s/[\s\w]*//g;
-        par2script::exiter::exit_program("ERROR: malformed par file, invalid character '$invalid', expecting <token> <gid> but saw '$line'", "test_par_syntax");
-    }
-#   print STDERR "line '$line' -> '$oneitem' '$gid'\n";
-
-    # hunt badness variously
-    if ( ! defined $par2script::globals::definitions{$oneitem} )
-    {
-        par2script::exiter::exit_program("ERROR: invalid scp2 fragment item type '$oneitem' in line: '$line'", "test_par_syntax");
-    }
-
-    # no hyphen allowed in gids -> cannot happen here because (\w+) is required for gids
-    if ( $gid =~ /-/ ) { par2script::exiter::exit_program("ERROR: No hyphen allowed in global id: $gid", "test_of_hyphen"); }
-
-    my %oneitemhash;
-
-    while (! ( ${$parfilecontent}[$i] =~ /^\s*End\s*$/i ) )
-    {
-        if ( ${$parfilecontent}[$i] =~ /^\s*(.+?)\s*\=\s*(.+?)\s*\;\s*$/ )  # only oneliner!
-        {
-        $itemkey = $1;
-        $itemvalue = $2;
-
-        if ( $oneitem eq "Directory" ) { if ( $itemkey =~ "DosName" ) { $itemkey =~ s/DosName/HostName/; } }
-        if (( $oneitem eq "Directory" ) || ( $oneitem eq "File" ) || ( $oneitem eq "Unixlink" )) { if ( $itemvalue eq "PD_PROGDIR" ) { $itemvalue = "PREDEFINED_PROGDIR"; }}
-        if (( $itemkey eq "Styles" ) && ( $itemvalue =~ /^\s*(\w+)(\s*\;\s*)$/ )) { $itemvalue = "($1)$2"; }
-
-        $oneitemhash{$itemkey} = $itemvalue;
-        }
-        $i++;
-    }
-
-    my $allitemhash = \$par2script::globals::definitions{$oneitem};
-
-    # test of uniqueness
-    if ( defined ($par2script::globals::definitions{$oneitem}->{$gid}) )
-    {
-        $multidefinitionerror = 1;
-        push(@multidefinitiongids, $gid);
-    }
-
-    $par2script::globals::definitions{$oneitem}->{$gid} = \%oneitemhash;
-    }
-
-    if ( $multidefinitionerror ) { par2script::exiter::multidefinitionerror(\@multidefinitiongids); }
-
-    # foreach $key (keys %par2script::globals::definitions)
-    # {
-    #   print "Key: $key \n";
-    #
-    #   foreach $key (keys %{$par2script::globals::definitions{$key}})
-    #   {
-    #       print "\t$key \n";
-    #   }
-    # }
-}
-
-######################################################
-# Filling content into the script
-######################################################
-
-sub put_oneitem_into_script
-{
-    my ( $script, $item, $itemhash, $itemkey ) = @_;
-    
-    push(@{$script}, "$item $itemkey\n" );
-    my $content = "";
-    foreach $content (sort keys %{$itemhash->{$itemkey}}) { push(@{$script}, "\t$content = $itemhash->{$itemkey}->{$content};\n" ); }
-    push(@{$script}, "End\n" );
-    push(@{$script}, "\n" );
-}
-
-######################################################
-# Creating the script
-######################################################
-
-sub create_script
-{
-    my @script = ();
-    my $oneitem;
-    
-    foreach $oneitem ( @par2script::globals::allitems )
-    {
-        if ( exists($par2script::globals::definitions{$oneitem}) )
-        {
-            if ( $oneitem eq "Shortcut" ) { next; } # "Shortcuts" after "Files"
-
-            if (( $oneitem eq "Module" ) || ( $oneitem eq "Directory" )) { write_sorted_items(\@script, $oneitem); }
-            else { write_unsorted_items(\@script, $oneitem); }
-        }
-    }
-
-    return \@script;
-}
-
-######################################################
-# Adding script content for the unsorted items
-######################################################
-
-sub write_unsorted_items
-{
-    my ( $script, $oneitem ) = @_;
-    
-    my $itemhash = $par2script::globals::definitions{$oneitem};
-
-    my $itemkey = "";
-    foreach $itemkey (sort keys %{$itemhash})
-    {
-        put_oneitem_into_script($script, $oneitem, $itemhash, $itemkey);
-            
-        # special handling for Shortcuts after Files
-        if (( $oneitem eq "File" ) && ( exists($par2script::globals::definitions{"Shortcut"}) ))
-        {
-            my $shortcutkey;
-            foreach $shortcutkey ( keys %{$par2script::globals::definitions{"Shortcut"}} )
-            {
-                if ( $par2script::globals::definitions{"Shortcut"}->{$shortcutkey}->{'FileID'} eq $itemkey )
-                {
-                    put_oneitem_into_script($script, "Shortcut", $par2script::globals::definitions{"Shortcut"}, $shortcutkey);
-
-                    # and Shortcut to Shortcut also
-                    my $internshortcutkey;
-                    foreach $internshortcutkey ( keys %{$par2script::globals::definitions{"Shortcut"}} )
-                    {
-                        if ( $par2script::globals::definitions{"Shortcut"}->{$internshortcutkey}->{'ShortcutID'} eq $shortcutkey )
-                        {
-                            put_oneitem_into_script($script, "Shortcut", $par2script::globals::definitions{"Shortcut"}, $internshortcutkey);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-######################################################
-# Collecting all children of a specified parent
-######################################################
-
-sub collect_children
-{
-    my ( $itemhash, $parent, $order ) = @_;
-    
-    my $item;
-    foreach $item ( keys %{$itemhash} )
-    {
-        if ( $itemhash->{$item}->{'ParentID'} eq $parent )
-        {
-            push(@{$order}, $item);
-            my $newparent = $item;
-            collect_children($itemhash, $newparent, $order);
-        }
-    }
-}
-
-######################################################
-# Adding script content for the sorted items
-######################################################
-
-sub write_sorted_items
-{
-    my ( $script, $oneitem ) = @_;
-    
-    my $itemhash = $par2script::globals::definitions{$oneitem};
-
-    my @itemorder = ();
-    my @startparents = ();
-
-    if ( $oneitem eq "Module" ) { push(@startparents, ""); }
-    elsif ( $oneitem eq "Directory" ) { push(@startparents, "PREDEFINED_PROGDIR"); }
-    else { die "ERROR: No root parent defined for item type $oneitem !\n"; }
-
-    # supporting more than one toplevel item
-    my $parent;
-    foreach $parent ( @startparents ) { collect_children($itemhash, $parent, \@itemorder); }
-    
-    my $itemkey;
-    foreach $itemkey ( @itemorder ) { put_oneitem_into_script($script, $oneitem, $itemhash, $itemkey); }
-}
-
-#######################################################################
-# Collecting all assigned gids of the type "item" from the modules
-# in the par files. Using a hash!
-#######################################################################
-
-sub collect_assigned_gids
-{
-    my $allmodules = $par2script::globals::definitions{'Module'};
-
-    my $item;
-    foreach $item ( @par2script::globals::items_assigned_at_modules )
-    {
-        if ( ! exists($par2script::globals::searchkeys{$item}) ) { par2script::exiter::exit_program("ERROR: Unknown type \"$item\" at modules.", "collect_assigned_gids"); }
-
-        my $searchkey = $par2script::globals::searchkeys{$item};
-        
-        my %assignitems = ();
-        my $modulegid = "";
-        
-        foreach $modulegid (keys %{$allmodules} )
-        {
-            # print "Module $modulegid\n";
-            # my $content = "";
-            # foreach $content (sort keys %{$allmodules->{$modulegid}}) { print "\t$content = $allmodules->{$modulegid}->{$content};\n"; }
-            # print "End\n";
-            # print "\n";
-                        
-            if ( exists($allmodules->{$modulegid}->{$searchkey}) )
-            {
-                my $list = $allmodules->{$modulegid}->{$searchkey};
-                if ( $list =~ /^\s*\((.*?)\)\s*(.*?)\s*$/ ) { $list = $1; }
-                else { par2script::exiter::exit_program("ERROR: Invalid module list: $list", "collect_assigned_gids"); }
-                my $allassigneditems = par2script::converter::convert_stringlist_into_array_2($list, ",");
-
-                my $gid;
-                foreach $gid ( @{$allassigneditems} )
-                {
-                    if ( exists($assignitems{$gid}) ) { $assignitems{$gid} = $assignitems{$gid} + 1; }
-                    else { $assignitems{$gid} = 1; }
-                }
-            }
-        }
-        
-        $par2script::globals::assignedgids{$item} = \%assignitems;
-    }
-}
-
-##################################################
-# Collecting the content of all par files.
-# Then the files do not need to be opened twice.
-##################################################
-
-sub read_all_parfiles
-{
-    my ($parfiles) = @_;
-
-    my @parfilecontent = ();
-    my $parfilename;
-
-    foreach $parfilename ( @{$parfiles} )
-    {
-        my $parfile = par2script::files::read_file($parfilename);
-        foreach ( @{$parfile} ) { push(@parfilecontent, $_); }
-        push(@parfilecontent, "\n");
-    }
-
-    return \@parfilecontent;
-}
-
-1;
diff --git a/solenv/bin/modules/pre2par/directory.pm b/solenv/bin/modules/pre2par/directory.pm
deleted file mode 100644
index 2637843ad..000000000
--- a/solenv/bin/modules/pre2par/directory.pm
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package pre2par::directory;
-
-use pre2par::pathanalyzer;
-use pre2par::systemactions;
-
-############################################
-# Checking, whether the output directories
-# exist. If not, they are created.
-############################################
-
-sub check_directory
-{	
-    my ($parfilename) = @_;
-    
-    my $productdirectory = $parfilename;
-    pre2par::pathanalyzer::get_path_from_fullqualifiedname(\$productdirectory);
-    $productdirectory =~ s/\Q$pre2par::globals::separator\E\s*$//;
-    
-    my $pardirectory = $productdirectory;
-    pre2par::pathanalyzer::get_path_from_fullqualifiedname(\$pardirectory);
-    $pardirectory =~ s/\Q$pre2par::globals::separator\E\s*$//;
-    
-    if ( ! -d $pardirectory ) { pre2par::systemactions::create_directory($pardirectory); }
-    if ( ! -d $productdirectory ) { pre2par::systemactions::create_directory($productdirectory); }
-}
-
-1;
\ No newline at end of file
diff --git a/solenv/bin/modules/pre2par/existence.pm b/solenv/bin/modules/pre2par/existence.pm
deleted file mode 100644
index 3bbdd64b6..000000000
--- a/solenv/bin/modules/pre2par/existence.pm
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package pre2par::existence;
-
-#############################
-# Test of existence
-#############################
-
-sub exists_in_array
-{
-    my ($searchstring, $arrayref) = @_;
-
-    my $alreadyexists = 0;
-    
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        if ( ${$arrayref}[$i] eq $searchstring)
-        {
-            $alreadyexists = 1;
-            last;
-        }
-    }
-    
-    return $alreadyexists;
-}
-
-sub exists_in_array_of_hashes
-{
-    my ($searchkey, $searchvalue, $arrayref) = @_;
-
-    my $hashref;
-    my $valueexists = 0;
-
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {
-        $hashref = ${$arrayref}[$i];
-        
-        if ( $hashref->{$searchkey} eq $searchvalue )
-        {
-            $valueexists = 1;
-            last;
-        }
-    }
-    
-    return $valueexists;
-}
-
-1;
diff --git a/solenv/bin/modules/pre2par/exiter.pm b/solenv/bin/modules/pre2par/exiter.pm
deleted file mode 100644
index 72909e89a..000000000
--- a/solenv/bin/modules/pre2par/exiter.pm
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package pre2par::exiter;
-
-use pre2par::files;
-use pre2par::globals;
-
-############################################
-# Exiting the program with an error
-# This function is used instead of "die"
-############################################
-
-sub exit_program
-{
-    my ($message, $function) = @_;
-    
-    my $infoline;
-        
-    $infoline = "\n***************************************************************\n";
-    push(@pre2par::globals::logfileinfo, $infoline);
-    print("$infoline");
-    
-    $infoline = "$message\n";
-    push(@pre2par::globals::logfileinfo, $infoline);
-    print("$infoline");
-
-    $infoline = "in function: $function\n";
-    push(@pre2par::globals::logfileinfo, $infoline);
-    print("$infoline");
-
-    $infoline = "***************************************************************\n";
-    push(@pre2par::globals::logfileinfo, $infoline);
-
-    if ($pre2par::globals::logging)
-    {
-        pre2par::files::save_file($pre2par::globals::logfilename ,\@pre2par::globals::logfileinfo);
-        print("Saved logfile: $pre2par::globals::logfilename\n");
-    }
-
-    print("$infoline");
-        
-    exit(-1);	
-}
-
-1;
diff --git a/solenv/bin/modules/pre2par/files.pm b/solenv/bin/modules/pre2par/files.pm
deleted file mode 100644
index 212c7433b..000000000
--- a/solenv/bin/modules/pre2par/files.pm
+++ /dev/null
@@ -1,125 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package pre2par::files;
-
-use pre2par::exiter;
-
-############################################
-# File Operations
-############################################
-
-sub check_file
-{
-    my ($arg) = @_;
-
-    if(!( -f $arg ))
-    {
-        pre2par::exiter::exit_program("ERROR: Cannot find file $arg", "check_file");
-    }
-}
-
-sub read_file
-{
-    my ($localfile) = @_;
-
-    my @localfile = ();
-
-    open( IN, "<$localfile" ) || pre2par::exiter::exit_program("ERROR: Cannot open file: $localfile", "read_file");
-    while ( <IN> ) { push(@localfile, $_); }
-    close( IN );
-
-    return \@localfile;
-}
-
-###########################################
-# Saving files, arrays and hashes
-###########################################
-
-sub save_file
-{
-    my ($savefile, $savecontent) = @_;
-    if (-f $savefile) { unlink $savefile };
-    if (-f $savefile) { pre2par::exiter::exit_program("ERROR: Cannot delete existing file: $savefile", "save_file"); };
-    open( OUT, ">$savefile" );
-    print OUT @{$savecontent};
-    close( OUT);
-    if (! -f $savefile) { pre2par::exiter::exit_program("ERROR: Cannot write file: $savefile", "save_file"); }
-}
-
-sub save_hash
-{
-    my ($savefile, $hashref) = @_;
-
-    my @printcontent = ();
-    
-    my ($itemkey, $itemvalue, $line);
-        
-    foreach $itemkey ( keys %{$hashref} )
-    {
-        $line = "";
-        $itemvalue = $hashref->{$itemkey};
-        $line = $itemkey . "=" . $itemvalue . "\n";
-        push(@printcontent, $line);
-    }
-
-    open( OUT, ">$savefile" );
-    print OUT @printcontent;
-    close( OUT);
-}
-
-sub save_array_of_hashes
-{
-    my ($savefile, $arrayref) = @_;
-
-    my @printcontent = ();
-    
-    my ($itemkey, $itemvalue, $line, $hashref);
-        
-    for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
-    {		
-        $line = "";
-        $hashref = ${$arrayref}[$i];
-                
-        foreach $itemkey ( keys %{$hashref} )
-        {
-            $itemvalue = $hashref->{$itemkey};
-
-            $line = $line . $itemkey . "=" . $itemvalue . "\t";
-        }
-
-        $line = $line . "\n";
-        
-        push(@printcontent, $line);
-    }
-
-    open( OUT, ">$savefile" );
-    print OUT @printcontent;
-    close( OUT);
-}
-
-1;
diff --git a/solenv/bin/modules/pre2par/globals.pm b/solenv/bin/modules/pre2par/globals.pm
deleted file mode 100644
index 4ad568a2c..000000000
--- a/solenv/bin/modules/pre2par/globals.pm
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package pre2par::globals;
-
-############################################
-# Global settings
-############################################
-
-BEGIN
-{	
-    $prog="pre2par";
-    
-    $prefilename = "";
-    $parfilename = "";
-    $langfilename = "";
-
-    @allitems = ("Installation", "ScpAction", "HelpText", "Directory", "DataCarrier", "StarRegistry", "File",
-                 "Shortcut", "Custom", "Unixlink", "Procedure", "Module", "Profile", "ProfileItem",
-                 "Folder", "FolderItem", "RegistryItem", "StarRegistryItem", "WindowsCustomAction",
-                 "MergeModule");
-
-    $logging     = 0;
-    $logfilename = "logfile.log";	# the default logfile name for global errors
-    @logfileinfo = ();
-    
-    $plat = $^O;
-
-    $separator = "/";
-    $pathseparator = "\:";
-    $isunix = 1;
-    $iswin = 0;
-
-    $islinux = 0;
-    $issolaris = 0;
-
-    if ( $plat =~ /linux/i ) { $islinux = 1; } 
-    if ( $plat =~ /kfreebsd/i ) { $islinux = 1; } 
-    if ( $plat =~ /solaris/i ) { $issolaris = 1; } 
-
-}
-
-1;
diff --git a/solenv/bin/modules/pre2par/language.pm b/solenv/bin/modules/pre2par/language.pm
deleted file mode 100644
index 9d8c9e820..000000000
--- a/solenv/bin/modules/pre2par/language.pm
+++ /dev/null
@@ -1,147 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package pre2par::language;
-
-use strict;
-use pre2par::existence;
-
-##############################################################
-# Returning a specific language string from the block
-# of all translations
-##############################################################
-
-sub get_language_string_from_language_block
-{
-    my ($language_block, $language) = @_;
-    
-    my $newstring = "";
-
-    for ( my $i = 0; $i <= $#{$language_block}; $i++ )
-    {
-    
-        if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ )
-        {
-            $newstring = $1;
-            $newstring =~ s/\"/\\\"/g;  # masquerading all '"' in the string
-            $newstring = "\"" . $newstring . "\"";
-            last;
-        }
-    }
-    
-    # defaulting to english!
-    
-    if ( $newstring eq "" )
-    {
-        $language = "en-US";    # defaulting to english
-    
-        for ( my $i = 0; $i <= $#{$language_block}; $i++ )
-        {
-            if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*(\".*\")\s*$/ )
-            {
-                $newstring = $1;
-                last;
-            }
-        }
-    }
-    
-    return $newstring;
-}
-
-############################################
-# collecting all replace variables
-# in a language file
-############################################
-
-sub get_all_replace_variables
-{
-    my ($langfile) = @_;
-
-    my %allvars = ();
-
-    for ( my $i = 0; $i <= $#{$langfile}; $i++ )
-    {
-        if ( ${$langfile}[$i] =~ /^\s*\[\s*(.*?)\s*\]\s*$/ )
-        {
-        my $variable = $1;
-#       print "lang block '$variable'\n";
-        my @lang_block = ();
-        my $counter;
-
-        # Store the complete block in all languages for a specified variable
-            for ( $counter = $i + 1; $counter <= $#{$langfile}; $counter++ ) {
-        my $line = ${$langfile}[$counter];
-        last if ($line =~ /^s*\[/); # next decl.
-        push @lang_block, $line;
-        }
-#       print "$variable = '@lang_block'\n";
-        $allvars{$variable} = \@lang_block;
-        $i = $counter - 1;
-        }
-    }
-
-    return \%allvars;
-}
-
-############################################
-# localizing the par file with the
-# corresponding language file
-############################################
-
-sub localize
-{
-    my ($parfile, $langfile) = @_;
-
-    my $replace_hash = get_all_replace_variables($langfile);
-
-    # parse lines of the form Name (st) = STR_NAME_MODULE_HELPPACK_OC;
-    # for variable substitution
-    my $langlinere = qr/^\s*\w+\s*\(([\w-]+)\)\s*\=\s*([\w-]+)\s*;/;
-    for ( my $i = 0; $i <= $#{$parfile}; $i++ )
-    {
-        my $oneline = ${$parfile}[$i];
-
-    if ( $oneline =~ $langlinere) {
-        my $language = $1;   # can be "01" or "en" or "en-US" or ...
-        my $variable = $2;
-
-#       print "line '$oneline' split to '$language' '$variable'\n";
-
-        if (defined $replace_hash->{$variable}) {
-                    my $languageblock = $replace_hash->{$variable};
-                    my $newstring = get_language_string_from_language_block($replace_hash->{$variable}, $language);
-                    if ( $newstring eq "" ) { $newstring = "\"" . $variable . "\""; }
-
-                    $oneline =~ s/$variable/$newstring/g;
-
-                    ${$parfile}[$i] = $oneline;
-                }
-        }
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/pre2par/parameter.pm b/solenv/bin/modules/pre2par/parameter.pm
deleted file mode 100644
index 5dfd87975..000000000
--- a/solenv/bin/modules/pre2par/parameter.pm
+++ /dev/null
@@ -1,178 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package pre2par::parameter;
-
-use Cwd;
-use pre2par::files;
-use pre2par::globals;
-use pre2par::systemactions;
-
-############################################
-# Parameter Operations
-############################################
-
-sub usage
-{
-    print <<Ende;
----------------------------------------------------------
-$pre2par::globals::prog
-The following parameter are needed:
--s: path to the pre file
--o: path to the par file
--l: path to the ulf file (mlf or jlf file)
--v: log  process (optional)
-  
-Example:
-
-perl pre2par.pl -l test.mlf -s readme.pre -o readme.par -v
-                        
----------------------------------------------------------
-Ende
-    exit(-1);
-}
-
-#####################################
-# Reading parameter
-#####################################
-
-sub getparameter
-{
-    while ( $#ARGV >= 0 )
-    {
-        my $param = shift(@ARGV);
-        
-        if ($param eq "-s") { $pre2par::globals::prefilename = shift(@ARGV); }
-        elsif ($param eq "-o") { $pre2par::globals::parfilename = shift(@ARGV); }
-        elsif ($param eq "-l") { $pre2par::globals::langfilename = shift(@ARGV); }
-        elsif ($param eq "-v") { $pre2par::globals::logging = 1; }
-        else
-        {
-            print("\n*************************************\n");
-            print("Sorry, unknown parameter: $param");
-            print("\n*************************************\n");
-            usage();
-            exit(-1);
-        }
-    }
-}
-
-############################################
-# Controlling  the fundamental parameter
-# (required for every process)
-############################################
-
-sub control_parameter
-{
-    if ($pre2par::globals::prefilename eq "")
-    {
-        print "\n************************************************\n";
-        print "Error: Name of the input file not set (-s)!";
-        print "\n************************************************\n";
-        usage();
-        exit(-1);
-    }
-    
-    if ($pre2par::globals::parfilename eq "")
-    {
-        print "\n************************************************\n";
-        print "Error: Name of the output file not set (-o)!";
-        print "\n************************************************\n";
-        usage();
-        exit(-1);
-    }
-
-    if (!($pre2par::globals::prefilename =~ /\.pre\s*$/))
-    {
-        print "\n************************************************\n";
-        print "Error: Input file is no .pre file!";
-        print "\n************************************************\n";
-        usage();
-        exit(-1);
-    }
-    
-    if (!($pre2par::globals::parfilename =~ /\.par\s*$/))
-    {
-        print "\n************************************************\n";
-        print "Error: Output file is no .par file!";
-        print "\n************************************************\n";
-        usage();
-        exit(-1);
-    }
-    
-    # The input file has to exist
-    
-    pre2par::files::check_file($pre2par::globals::prefilename);
-}
-
-##########################################################
-# The path parameters can be relative or absolute.
-# This function creates absolute pathes.
-##########################################################
-
-sub make_path_absolute
-{
-    my ($pathref) = @_;
-
-    if ( $pre2par::globals::isunix )
-    {
-        if (!($$pathref =~ /^\s*\//))	# this is a relative unix path
-        {
-            $$pathref = cwd() . $pre2par::globals::separator . $$pathref;
-        }
-    }
-
-    if ( $pre2par::globals::iswin )
-    {
-        if (!($$pathref =~ /^\s*\w\:/))	# this is a relative windows path
-        {
-            $$pathref = cwd() . $pre2par::globals::separator . $$pathref;
-            $$pathref =~ s/\//\\/g;
-        }
-    }
-
-    $$pathref =~ s/\Q$pre2par::globals::separator\E\s*$//;	# removing ending slashes	
-}
-
-#####################################
-# Writing parameter to shell
-#####################################
-
-sub outputparameter
-{
-    $pre2par::globals::logging ? ($logoption = " -v") : ($logoption = "");
-    print "\n$pre2par::globals::prog -l $pre2par::globals::langfilename -s $pre2par::globals::prefilename -o $pre2par::globals::parfilename$logoption\n";
-    
-#	print "\n********************************************************\n";
-#	print "This is $pre2par::globals::prog, version 1.0\n";
-#	print "Input file: $pre2par::globals::prefilename\n";
-#	print "Output file: $pre2par::globals::parfilename\n";
-#	print "********************************************************\n";
-}
-
-1;
diff --git a/solenv/bin/modules/pre2par/pathanalyzer.pm b/solenv/bin/modules/pre2par/pathanalyzer.pm
deleted file mode 100644
index b766a8c77..000000000
--- a/solenv/bin/modules/pre2par/pathanalyzer.pm
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package pre2par::pathanalyzer;
-
-use pre2par::globals;
-
-###########################################
-# Path analyzer
-###########################################
-
-sub get_path_from_fullqualifiedname
-{
-    my ($longfilenameref) = @_;
-
-    if ( $$longfilenameref =~ /\Q$pre2par::globals::separator\E/ )	# Is there a separator in the path? Otherwise the path is empty.
-    {	
-        if ( $$longfilenameref =~ /^\s*(\S.*\S\Q$pre2par::globals::separator\E)(\S.+?\S)/ )
-        {
-            $$longfilenameref = $1;
-        }
-    }
-    else
-    {
-        $$longfilenameref = "";	# there is no path
-    }	
-}
-
-sub make_absolute_filename_to_relative_filename
-{
-    my ($longfilenameref) = @_;
-
-    if ( $pre2par::globals::isunix )
-    {
-        if ( $$longfilenameref =~ /^.*\/(\S.+\S?)/ )
-        {
-            $$longfilenameref = $1;
-        }
-    }
-
-    if ( $pre2par::globals::iswin )
-    {
-        if ( $$longfilenameref =~ /^.*\\(\S.+\S?)/ )
-        {
-            $$longfilenameref = $1;
-        }
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/pre2par/remover.pm b/solenv/bin/modules/pre2par/remover.pm
deleted file mode 100644
index adae116bf..000000000
--- a/solenv/bin/modules/pre2par/remover.pm
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package pre2par::remover;
-
-############################################
-# Remover
-############################################
-
-sub remove_leading_and_ending_whitespaces
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/^\s*//g;
-    $$stringref =~ s/\s*$//g;	
-}
-
-sub remove_leading_and_ending_quotationmarks
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/^\s*\"//g;
-    $$stringref =~ s/\"\s*$//g;	
-}
-
-sub remove_leading_and_ending_slashes
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/^\s*\///g;
-    $$stringref =~ s/\/\s*$//g;	
-}
-
-sub remove_leading_and_ending_backslashes
-{
-    my ( $stringref ) = @_;
-
-    $$stringref =~ s/^\s*\\//g;
-    $$stringref =~ s/\\\s*$//g;	
-}
-
-1;
diff --git a/solenv/bin/modules/pre2par/systemactions.pm b/solenv/bin/modules/pre2par/systemactions.pm
deleted file mode 100644
index 1634a2d46..000000000
--- a/solenv/bin/modules/pre2par/systemactions.pm
+++ /dev/null
@@ -1,206 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package pre2par::systemactions;
-
-use File::Copy;
-use pre2par::exiter;
-use pre2par::globals;
-
-######################################################
-# Creating a new direcotory
-######################################################
-
-sub create_directory
-{
-    my ($directory) = @_;
-        
-    my $returnvalue = 1;
-    my $infoline = "";
-
-    if ($directory eq "" )
-    {
-        return 0;
-    }
-
-    if (!(-d $directory))
-    {
-        $returnvalue = mkdir($directory, 0775);
-
-        if ($returnvalue)
-        {
-            $infoline = "Created directory: $directory\n"; 
-            push(@pre2par::globals::logfileinfo, $infoline);
-    
-            if ($pre2par::globals::isunix)
-            {
-                my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
-                system($localcall);
-            }			
-        }
-        else
-        {
-            # New solution in parallel packing: It is possible, that the directory now exists, although it
-            # was not created in this process. There is only an important error, if the directory does not
-            # exist now. 
-            
-            if (!(-d $directory))
-            {
-                pre2par::exiter::exit_program("Error: Could not create directory: $directory", "create_directory");
-            }
-            else
-            {
-                $infoline = "\nAnother process created this directory in exactly this moment :-) : $directory\n"; 
-                push(@pre2par::globals::logfileinfo, $infoline);
-            }
-        }
-    }
-    else
-    {
-        $infoline = "\nAlready existing directory, did not create: $directory\n"; 
-        push(@pre2par::globals::logfileinfo, $infoline);
-    }	
-}
-
-#######################################################################
-# Creating the directories, in which files are generated or unzipped
-#######################################################################
-
-sub create_directories
-{
-    my ($directory, $languagesref) =@_;
-    
-    $pre2par::globals::unpackpath =~ s/\Q$pre2par::globals::separator\E\s*$//;	# removing ending slashes and backslashes
-    
-    my $path = $pre2par::globals::unpackpath;	 # this path already exists
-    
-    $path = $path . $pre2par::globals::separator . $pre2par::globals::build . $pre2par::globals::separator;
-    create_directory($path);
-
-    $path = $path . $pre2par::globals::minor . $pre2par::globals::separator;
-    create_directory($path);
-
-    if ($directory eq "unzip" )
-    {
-        $path = $path . "common" . $pre2par::globals::productextension . $pre2par::globals::separator;
-        create_directory($path);
-
-        $path = $path . $directory . $pre2par::globals::separator;
-        create_directory($path);
-    }
-    else
-    {
-        $path = $path . $pre2par::globals::compiler . $pre2par::globals::productextension . $pre2par::globals::separator;
-        create_directory($path);
-
-        $path = $path . $pre2par::globals::product . $pre2par::globals::separator;
-        create_directory($path);
-
-        $path = $path . $directory . $pre2par::globals::separator;
-        create_directory($path);
-        
-        if (!($$languagesref eq "" ))	# this will be a path like "01_49", for Profiles and ConfigurationFiles, idt-Files
-        {
-            $path = $path . $$languagesref . $pre2par::globals::separator;
-            create_directory($path);			
-        }
-    }
-    
-    $path =~ s/\Q$pre2par::globals::separator\E\s*$//;
-    
-    return $path;
-}
-
-########################
-# Copying one file
-########################
-
-sub copy_one_file
-{
-    my ($source, $dest) = @_;
-
-    my ($copyreturn, $returnvalue, $infoline);
-    
-    $copyreturn = copy($source, $dest);
-        
-    if ($copyreturn)
-    {
-        $infoline = "Copy: $source to $dest\n";
-        $returnvalue = 1;
-    }
-    else
-    {
-        $infoline = "Error: Could not copy $source to $dest $!\n";
-        $returnvalue = 0;
-    }
-    
-    push(@pre2par::globals::logfileinfo, $infoline);
-    
-    return $returnvalue;
-}
-
-##########################################
-# Copying all files from one directory
-# to another directory
-##########################################
-
-sub copy_directory
-{
-    my ($sourcedir, $destdir) = @_;
-    
-    my ($onefile, $sourcefile, $destfile);
-    my @sourcefiles = ();
-    
-    $sourcedir =~ s/\Q$pre2par::globals::separator\E\s*$//;
-    $destdir =~ s/\Q$pre2par::globals::separator\E\s*$//;
-
-    $infoline = "\n";
-    push(@pre2par::globals::logfileinfo, $infoline);
-    $infoline = "Copying files from directory $sourcedir to directory $destdir\n";
-    push(@pre2par::globals::logfileinfo, $infoline);
-    
-    opendir(DIR, $sourcedir);
-    @sourcefiles = readdir(DIR);
-    closedir(DIR);
-    
-    foreach $onefile (@sourcefiles)
-    {
-        if ((!($onefile eq ".")) && (!($onefile eq "..")))
-        {
-            $sourcefile = $sourcedir . $pre2par::globals::separator . $onefile;
-            $destfile = $destdir . $pre2par::globals::separator . $onefile;
-            if ( -f $sourcefile ) 	# only files, no directories
-            {
-                copy_one_file($sourcefile, $destfile);
-            }
-        }
-    }
-}
-
-
-1;
diff --git a/solenv/bin/modules/pre2par/work.pm b/solenv/bin/modules/pre2par/work.pm
deleted file mode 100644
index 5651d060e..000000000
--- a/solenv/bin/modules/pre2par/work.pm
+++ /dev/null
@@ -1,363 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-package pre2par::work;
-
-use pre2par::exiter;
-use pre2par::remover;
-use pre2par::pathanalyzer;
-
-############################################
-# pre2par working module
-############################################
-
-############################################
-# procedure to split a line, that contains
-# more than one par file lines
-############################################
-
-sub split_line
-{
-    my ($line, $parfile) = @_;
-    
-    while ( $line =~ /^((?:[^"]|\"(?:[^"\\]|\\.)*\")*?\;\s+)\s*(.*)$/ )
-    {
-        my $oneline = $1;
-        $line = $2;
-        pre2par::remover::remove_leading_and_ending_whitespaces(\$oneline);
-        $oneline = $oneline . "\n";
-        push(@{$parfile}, $oneline);
-
-        if ( $line =~ /^\s*End\s+(\w+.*$)/i )
-        {
-            $line = $1;
-            push(@{$parfile}, "End\n\n");
-        }
-    }
-
-    # the last line
-
-    pre2par::remover::remove_leading_and_ending_whitespaces(\$line);
-    $line = $line . "\n";
-    push(@{$parfile}, $line);
-    
-    if ( $line =~ /^\s*End\s*$/i ) { push(@{$parfile}, "\n"); }
-}
-
-###################################################################
-# Preprocessing the pre file to split all lines with semicolon
-###################################################################
-
-sub preprocess_macros
-{
-    my ($prefile) = @_;
-
-    my @newprefile = ();
-
-    for ( my $i = 0; $i <= $#{$prefile}; $i++ )
-    {
-        my $oneline = ${$prefile}[$i];
-        if ( $oneline =~ /\;\s*\w+/ )
-        {
-            split_line($oneline, \@newprefile);
-        }
-        else
-        {
-            push(@newprefile, $oneline);	
-        }
-    }	
-
-    return \@newprefile;
-}
-
-############################################
-# main working procedure
-############################################
-
-sub convert
-{
-    my ($prefile) = @_;
-    
-    my @parfile = ();
-    
-    my $iscodesection = 0;
-    my $ismultiliner = 0;
-    my $globalline = "";
-
-    # Preprocessing the pre file to split all lines with semicolon
-    $prefile = preprocess_macros($prefile);
-    
-    for ( my $i = 0; $i <= $#{$prefile}; $i++ )
-    {
-        my $oneline = ${$prefile}[$i];
-        
-        if ($iscodesection)
-        {
-            if ( $oneline =~ /^\s*\}\;\s*$/ )
-            {
-                $iscodesection = 0;
-            }
-            else	# nothing to do for code inside a code section 
-            {
-                push(@parfile, $oneline);
-                next;
-             }
-        } 
-
-        if ( $oneline =~ /^\s*$/ ) { next; }
-
-        if ( $oneline =~ /^\s*Code\s+\=\s+\{/ )
-        { 
-            $iscodesection = 1;
-        }
-
-        pre2par::remover::remove_leading_and_ending_whitespaces(\$oneline);
-
-        my $insertemptyline = 0;
-
-        if ( $oneline =~ /^\s*End\s*$/i ) { $insertemptyline = 1; }
-
-        # Sometimes the complete file is in one line, then the gid line has to be separated
-
-        if ( $oneline =~ /^\s*(\w+\s+\w+)\s+(\w+\s+\=.*$)/ )	# three words before the equal sign
-        {
-            my $gidline = $1;
-            $oneline = $2;
-            $gidline = $gidline . "\n";
-
-            push(@parfile, $gidline);					
-        }
-
-        if ( $oneline =~ /\;\s*\w+/ )
-        {
-            split_line($oneline, \@parfile);
-            next;
-        }
-
-        # searching for lines with brackets, like Customs = { ..., which can be parted above several lines
-
-        if ( $oneline =~ /^\s*\w+\s+\=\s*\(.*\)\s*\;\s*$/ )		# only one line
-        {
-            if (( ! ( $oneline =~ /^\s*Assignment\d+\s*\=/ )) && ( ! ( $oneline =~ /^\s*PatchAssignment\d+\s*\=/ )))
-            {
-                $oneline =~ s/\s//g;		# removing whitespaces in lists
-                $oneline =~ s/\=/\ \=\ /;	# adding whitespace around equals sign
-            }
-        }
-        
-        if ( $oneline =~ /^\s*\w+\s+\=\s*$/ )
-        {
-            $oneline =~ s/\s*$//;
-            pre2par::exiter::exit_program("Error: Illegal syntax, no line break after eqals sign allowed. Line: \"$oneline\"", "convert");
-        }
-        
-        if (( $oneline =~ /^\s*\w+\s+\=\s*\(/ ) && (!( $oneline =~ /\)\s*\;\s*$/ )))	 # several lines
-        {
-            $ismultiliner = 1;
-            $oneline =~ s/\s//g;
-            $globalline .= $oneline;
-            next;						# not including yet
-        }
-        
-        if ( $ismultiliner )
-        {
-            $oneline =~ s/\s//g;
-            $globalline .= $oneline;
-            
-            if ( $oneline =~ /\)\s*\;\s*$/ ) {	$ismultiliner = 0; }
-            
-            if (! ( $ismultiliner ))
-            {
-                $globalline =~ s/\=/\ \=\ /;	# adding whitespace around equals sign
-                $globalline .= "\n";
-                push(@parfile, $globalline);
-                $globalline = "";
-            }
-            
-            next;
-        }		
-
-        $oneline = $oneline . "\n";
-
-        $oneline =~ s/\s*\=\s*/ \= /;	# nice, to have only one whitespace around equal signs
-
-        # Concatenate adjacent string literals:
-        while ($oneline =~
-               s/^((?:[^"]*
-                      \"(?:[^\\"]|\\.)*\"
-                      (?:[^"]*[^[:blank:]"][^"]*\"(?:[^\\"]|\\.)*\")*)*
-                   [^"]*
-                   \"(?:[^\\"]|\\.)*)
-                 \"[[:blank:]]*\"
-                 ((?:[^\\"]|\\.)*\")
-                /\1\2/x)
-        {}
-    
-        push(@parfile, $oneline);
-
-        if ($insertemptyline) { push(@parfile, "\n"); }
-
-    }	
-    
-    return \@parfile;	
-}
-
-############################################
-# formatting the par file
-############################################
-
-sub formatter
-{
-    my ($parfile) = @_;
-    
-    my $iscodesection = 0;
-
-    my $tabcounter = 0;
-    my $isinsideitem = 0;
-    my $currentitem;
-    
-    for ( my $i = 0; $i <= $#{$parfile}; $i++ )
-    {
-        my $oneline = ${$parfile}[$i];
-        my $isitemline = 0;
-
-        if (! $isinsideitem )
-        {		
-            for ( my $j = 0; $j <= $#pre2par::globals::allitems; $j++ )
-            {
-                if ( $oneline =~ /^\s*$pre2par::globals::allitems[$j]\s+\w+\s*$/ )
-                {
-                    $currentitem = $pre2par::globals::allitems[$j];
-                    $isitemline = 1;
-                    $isinsideitem = 1;
-                    $tabcounter = 0;	
-                    last;
-                }
-            }
-        }
-        
-        if ( $isitemline )
-        {
-            next;	# nothing to do	
-        }
-
-        if ( $oneline =~ /^\s*end\s*$/i )
-        {
-            $isinsideitem = 0;
-            $tabcounter--;
-        }
-
-        if ( $isinsideitem )
-        {
-            $oneline = "\t" . $oneline;
-            ${$parfile}[$i] = $oneline;
-        }
-    }	
-}
-
-###################################################
-# Returning the language file name
-###################################################
-
-sub getlangfilename
-{
-    return $pre2par::globals::langfilename;
-}
-
-###################################################
-# Creating the ulf file name from the 
-# corresponding pre file name
-###################################################
-
-sub getulffilename
-{
-    my ($prefilename) = @_;
-
-    my $ulffilename = $prefilename;
-    $ulffilename =~ s/\.pre\s*$/\.ulf/;
-    pre2par::pathanalyzer::make_absolute_filename_to_relative_filename(\$ulffilename);
-
-    return $ulffilename;
-}
-
-############################################
-# Checking if a file exists
-############################################
-
-sub fileexists
-{
-    my ($langfilename) = @_;
-    
-    my $fileexists = 0;
-    
-    if( -f $langfilename ) { $fileexists = 1; }
-
-    return $fileexists;
-}
-
-############################################
-# Checking the existence of ulf and 
-# jlf/mlf files
-############################################
-
-sub check_existence_of_langfiles
-{
-    my ($langfilename, $ulffilename) = @_;
-
-    my $do_localize = 0;
-
-    if (( fileexists($ulffilename) ) && ( ! fileexists($langfilename) )) { pre2par::exiter::exit_program("Error: Did not find language file $langfilename", "check_existence_of_langfiles"); }
-    if (( fileexists($ulffilename) ) && ( fileexists($langfilename) )) { $do_localize = 1; }
-    
-    return $do_localize;
-}
-
-############################################
-# Checking that the pre file has content
-############################################
-
-sub check_content
-{
-    my ($filecontent, $filename) = @_;
-    
-    if ( $#{$filecontent} < 0 ) { pre2par::exiter::exit_program("Error: $filename has no content!", "check_content"); }
-}
-
-############################################
-# Checking content of par files.
-# Currently only size.
-############################################
-
-sub diff_content
-{
-    my ($content1, $content2, $filename) = @_;
-    
-    if ( $#{$content1} != $#{$content2} ) { pre2par::exiter::exit_program("Error: $filename was not saved correctly!", "diff_content"); }
-}
-
-1;
diff --git a/solenv/bin/msg_filter b/solenv/bin/msg_filter
deleted file mode 100755
index a7149c35a..000000000
--- a/solenv/bin/msg_filter
+++ /dev/null
@@ -1,61 +0,0 @@
-: # -*- perl -*-
-eval 'exec perl -wS $0 ${1+"$@"}'
-	if 0;
-# This is a script to get rid of bogus error messages that are spit out
-# by the compiler - sub 30/11/1999
-
-# Lines that contain `xxxx' where xxxx belongs to the list knownMessages
-# and is surrounded by a backtick (`) and a forward tick (') 
-# will not be seen in the compiler output
-
-
-@knownMessages	= (
-"__pure_virtual",
-"__vt_9bad_alloc",
-"__vt_9exception",
-"_._9bad_alloc",
-"__cp_push_exception",
-"__uncatch_exception",
-"__rtti_user",
-"__rtti_si",
-"__throw",
-"terminate__Fv",
-"__cp_pop_exception",
-"__builtin_vec_new",
-"__cmpdi2",
-"__builtin_vec_delete",
-"__cp_eh_info",
-"__builtin_delete",
-"__builtin_new",
-"__eh_alloc",
-"__check_eh_spec",
-"_type_match_rtti",
-"__rtti_class",
-"set_new_handler_FPFv_v",
-"__throw_type_match_rtti",
-"__check_eh_spec",
-"exception_type_info",
-"exception type_info function",
-"exception type_info node",
-"exception virtual table",
-"terminate(void)"
-);
-
-# Create a hash %msgHash from list @knownMessages
-foreach $msg (@knownMessages) {
-	$msgHash {$msg}++;
-}
-while ( <STDIN> ) {
-	
-	if (/\`([\s\w]+)\'/) {
-		$entry = $1;
-		if (defined($entry)) {
-			if (!exists $msgHash{$entry}) {
-				print $_;
-			}
-		}
-	}
-	else {
-		print $_;
-	}
-}
diff --git a/solenv/bin/newfolderforce b/solenv/bin/newfolderforce
deleted file mode 100644
index 8f77f3990..000000000
--- a/solenv/bin/newfolderforce
+++ /dev/null
@@ -1 +0,0 @@
-#rg 16.6.98

if {#} != 1
	echo emuliert "mkdir -p"
	echo d.h. des gesamte Directory-Baum wird angelegt
	exit
end

set wo "{1}"
set regex ""

set exit 0
for i in  in 1 2 3 4 5 6 7 8 9 10
set regex "{regex}[Â:]+:"
(evaluate "{wo}" =~ /([:]+{regex})¨1Å/) > Dev:null
if not `exists -d "{¨1}"`
newfolder "{¨1}"
end
end
set exit 1
\ No newline at end of file
diff --git a/solenv/bin/oochkpatch b/solenv/bin/oochkpatch
deleted file mode 100755
index 719f0765b..000000000
--- a/solenv/bin/oochkpatch
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'configure' or 'setsolar'
-    exit 1
-fi
-exec perl -w $SOLARENV/bin/oochkpatch.pl "$@"
diff --git a/solenv/bin/oochkpatch.btm b/solenv/bin/oochkpatch.btm
deleted file mode 100755
index 9d17c2f76..000000000
--- a/solenv/bin/oochkpatch.btm
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-call perl5 %SOLARENV\bin\oochkpatch.pl %1&
diff --git a/solenv/bin/oochkpatch.pl b/solenv/bin/oochkpatch.pl
deleted file mode 100644
index 4b2e08ad2..000000000
--- a/solenv/bin/oochkpatch.pl
+++ /dev/null
@@ -1,301 +0,0 @@
-:
-    eval 'exec perl -S $0 ${1+"$@"}'
-        if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-#
-# oochkpatch - check patch flags against CWS modules
-#
-
-require File::Temp;
-require File::Find;
-require Getopt::Long;
-require Pod::Usage;
-use Pod::Usage;
-use Getopt::Long;
-use File::Temp qw/ tempfile tempdir /;
-use File::Find;
-
-
-# configuration goes here
-##########################################################
-
-# uncomment this, if in pure OOo environment
-#my $toplevel_module = "instsetoo_native";
-#my $scp_module	    = "scp2";
-#my $setup_file	    = "setup_osl";
-
-# uncomment this, if within the StarOffice environment
-my $toplevel_module = "instset_native";
-my $scp_module	    = "scp2so";
-my $setup_file	    = "setup";
-
-my $deliver = "solenv/bin/deliver.pl";
-my $build	= "solenv/bin/build.pl";
-
-# list of hardcoded exceptions (files that are _never_ considered
-# missing from the patch)
-my %hardcoded_exceptions = ('build.lst' => 1);
-
-
-# no configuration below this point, please!
-##########################################################
-
-# defaults
-my $from_module = "";
-my $verbose		= '';
-my $help		= '';
-my $man			= '';
-my $modules		= '';
-my $from		= '';
-my $perl		= '';
-
-GetOptions('help|?'  => \$help,
-           'man'     => \$man,
-           'verbose' => \$verbose,
-           'from=s'  => \$from_module ) or pod2usage(2);
-pod2usage(1) if $help;
-pod2usage(-exitstatus => 0, -verbose => 2) if $man;
-
-# process remaining args
-print "Processing args...\n" if $verbose;
-foreach my $argument (@ARGV)
-{
-    print " Checking module ", $argument, "\n" if $verbose;
-    push @modules, $argument;
-}
-
-# platform-dependent stuff
-if( $^O eq 'MSWin32' )
-{
-    $perl = "$ENV{COMSPEC} -c $ENV{PERL}";
-    $setup_file = $setup_file . ".inf";
-} 
-else 
-{
-    $perl = 'perl';
-    $setup_file = $setup_file . ".ins";
-};
-
-# read some SOLAR stuff from env
-my $SRC_ROOT = $ENV{"SRC_ROOT"};
-my $INPATH = $ENV{"INPATH"};
-
-# process --from modules
-if( $from_module )
-{
-    print "Checking all modules upwards and including ", $from_module, "\n" if $verbose;
-
-    # append build.pl-generated list of modules
-    chdir "$SRC_ROOT/$toplevel_module" or 
-        chdir "$SRC_ROOT/$toplevel_module.lnk" or die "ERROR: cannot cd to $SRC_ROOT/$toplevel_module!";
-    open(ALLMODULES,
-         "$perl $SRC_ROOT/$build --all:$from_module --show 2>&1 |") or die "ERROR: cannot build --show!\n";
-    while(<ALLMODULES>)
-    {
-        if( /Building project/ )
-        {
-            my @module = split( /\s+/, $_ );
-            print " which is ", $module[2], "\n" if $verbose;
-            push(@modules,$module[2]);
-        }
-    }
-}
-
-die "ERROR: no modules to check!\n" if !@modules;
-
-$tempdir = tempdir( TMPDIR => 1, CLEANUP => 1);
-
-# generate list of files with PATCH flag
-print "Generating list of files which have the PATCH flag...\n" if $verbose;
-
-my $path_to_setup_file = $SRC_ROOT."/".$scp_module."/".$INPATH."/bin/osl/".$setup_file;
-my $alternate_path_to_setup_file = $SRC_ROOT."/".$scp_module.".lnk/".$INPATH."/bin/osl/".$setup_file;
-my $in_file_block=0;
-my $patch_flag=0;
-my $file_name='';
-my $base;
-my $ext;
-my %pack_files;
-open(SETUP, "<".$path_to_setup_file) or
-   open(SETUP, "<".$alternate_path_to_setup_file) or die "ERROR: cannot open $path_to_setup_file!\n";
-while(<SETUP>)
-{
-    if( /^File\s+/ && !$in_file_block )
-    {
-        $in_file_block = 1;
-        $patch_flag=0;
-        $file_name='';
-    }
-    elsif( /^End/ && $file_name ne '' && $in_file_block )
-    {
-        $file_name =~ s/["']//g;
-        $pack_files{$file_name} = $patch_flag;
-
-        if( $patch_flag )
-        {
-            print( " File $file_name included in patch\n") if $verbose;
-        }
-        else
-        {
-            print( " File $file_name NOT included in patch\n") if $verbose;
-        }
-
-        $in_file_block = 0;
-    }
-    elsif( /^\s+Styles\s*=\s*.*PATCH/ && $in_file_block )
-    {
-        $patch_flag = 1;
-    }
-    elsif( ($res) = /^\s+Name\s*=\s*(.*);/ )
-    {
-        $file_name = $res;
-    }
-}
-
-# generate list of delivered files
-print "Generating list of delivered libs...\n" if $verbose;
-
-# first, deliver all modules to tempdir
-foreach my $module (@modules)
-{
-    print " dummy-delivering $module...\n" if $verbose;
-    chdir "$SRC_ROOT/$module" or 
-        chdir "$SRC_ROOT/$module.lnk" or die "ERROR: cannot cd to $SRC_ROOT/$module!";
-    `$perl $SRC_ROOT/$deliver $tempdir`;
-}
-
-# now, check all files in delivered dirs for containedness in PATCH
-# set
-print "Checking against delivered files...\n" if $verbose;
-find(\&wanted, $tempdir );
-
-sub wanted
-{
-    my $fname;
-
-    if( -f )
-    {
-        $fname = $_;
-        if( !exists $pack_files{$fname} )
-        {
-            print " File $fname is not packed.\n" if $verbose;
-        }
-        elsif( $pack_files{$fname} == 0 )
-        {
-            if( !$hardcoded_exceptions{ $fname } )
-            {
-                # file not in patch set, and not in exception list
-                print " File $fname is packed, but NOT included in patch set and part of delivered output\n" if $verbose;
-                print "$fname\n" if !$verbose;
-            }
-            else
-            {
-                print " File $fname is NOT included in patch set, but member of hardcoded exception list\n" if $verbose;
-            }
-        }
-        elsif( $pack_files{$fname} == 1 )
-        {
-            print " File $fname packed and patched.\n" if $verbose;
-        }
-    }
-}
-
-
-__END__
-
-=head1 NAME
-
-oochkpatch.pl - Verify patch flags against module libraries
-
-=head1 SYNOPSIS
-
-oochkpatch.pl [options] [module-name ...]
-
- Options:
-   --help|-h         brief help message
-   --man|-m          full documentation
-   --verbose|-v      tell what's happening
-   --from=module     check all modules from
-                     given one upwards
-
-=head1 OPTIONS
-
-=over 8
-
-=item B<--help>
-
-Print a brief help message and exits.
-
-=item B<--man>
-
-Prints the manual page and exits.
-
-=item B<--verbose>
-
-Verbosely tell what's currently happening
-
-=item B<--from=module>
-
-Assumes OOo was built incompatibly from given module 
-upwards, and check against all libs from all upwards modules.
-Further modules can be given at the command line, which are merged 
-with the ones generated from this option
-
-=back
-
-=head1 DESCRIPTION
-
-B<This program> will compare all libs delivered from the specified modules
-against the set of files marked with the B<patch> flag in scp2. Useful to check 
-if the patch set is complete. Please note that this program needs to be run in 
-a solar shell, i.e. the OOo build environment needs to be set up in the shell.
-
-There's kind of a heuristic involved, to determine exactly which files
-to check against includedness in the patch set (since e.g. all headers
-are delivered, but clearly need not be checked against patch
-flags). It works by first collecting all files that are mentioned in
-the pack master file, and then checking all files delivered from the
-specified modules against that pack list: if the file is not packed,
-or if it's packed and has the patch flag set, all is well. Otherwise,
-the file in question potentially misses the patch flag (because one of
-the modified modules contains it).
-
-=head1 EXAMPLE
-
-To determine the set of libs not yet carrying the patch flag for a CWS
-containing sfx2, svx, and vcl, which is incompatible from sfx2
-upwards, use something like this:
-
-oochkpatch.pl --from=sfx2 `cwsquery modules`
-
-This puts every module upwards and including sfx2 in the check list,
-plus vcl. Note that with this approach, you'll usually get a larger
-set of files for the patch than necessary - but at least you get all
-files that might have changed theoretically.
-
-=cut
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
deleted file mode 100755
index 56825e18e..000000000
--- a/solenv/bin/ooinstall
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/env perl
-
-# This script has three uses:
-# 1. From the command line to install straight into a given directory:
-#    bin/ooinstall /opt/Foo
-# 2. From the command line to link into a given directory:
-#    bin/ooinstall -l /opt/FooLinked
-# 3. When packaging (called from package-ooo), to install to DESTDIR
-
-use File::Find;
-use File::Path qw(mkpath);
-use Cwd;
-
-$path = '';
-$do_link = 0;
-$is_windows = 0;
-my $tmp_dir;
-
-if ($ENV{GUI} eq 'WNT') {
-    $is_windows = 1;
-}
-
-if( defined($ENV{TMPDIR}) ) {
-    $tmp_dir = $ENV{TMPDIR};
-} elsif( defined($ENV{TMP}) ) {
-   $tmp_dir = $ENV{TMP};
-} else {
-   $tmp_dir = '/tmp';
-}
-if (!-d $tmp_dir) {die "Set TMP or TMPDIR!\n";}
-
-# Workaround for system Mozilla
-if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {
-    $ENV{'LD_LIBRARY_PATH'} = "$ENV{'MOZ_LIB'}:$ENV{'LD_LIBRARY_PATH'}";
-}
-
-# Workaround for the Python
-$ENV{'PYTHONPATH'} = "$ENV{'SRC_ROOT'}/instsetoo_native/$ENV{'INPATH'}/bin:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python/lib-dynload";
-
-for $arg (@ARGV) {
-    if ($arg eq '-l') {
-	$do_link = 1;
-    } elsif ($arg eq '-h' || $arg eq '--help') {
-	$help = 1;
-    } else {
-		# Cwd::realpath does not work if the path does not exist
-		mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
-		$path = Cwd::realpath( $ENV{DESTDIR} . $arg );
-		if (!$do_link) {
-			my $destdir = Cwd::realpath( $ENV{DESTDIR} );
-			$path =~ s|$destdir||;
-	    }
-    }
-}
-
-$help = 1 if $path eq '';
-
-if ($help) {
-    print "ooinstall [-l] <prefix to install to>\n";
-    print "  -l - performs a linkoo on the installed source\n";
-    exit 1;
-}
-
-my $BUILD=undef;
-my $LAST_MINOR=undef;
-open MINORMK, "$ENV{'SOLARENV'}/inc/minor.mk";
-while (<MINORMK>) {
-	my $t = "\$" . $_;
-	if(/^BUILD/ || /^LAST_MINOR/) {
-		eval $t;
-	}
-}
-close MINORMK;
-$ENV{LAST_MINOR} = $LAST_MINOR;
-$ENV{OUT} = "../$ENV{'INPATH'}";
-$ENV{LOCAL_OUT} = $ENV{OUT};
-$ENV{LOCAL_COMMON_OUT} = $ENV{OUT};
-# FIXME: the following variable helps to install localizations even if some
-# files are not localized (like Japanese, Chinese wordbook), it makes
-# the installer to use the English localization of the file instead.
-$ENV{DEFAULT_TO_ENGLISH_FOR_PACKING} = 1;
-
-my @larr;
-$langs=$ENV{WITH_LANG};
-$langs='en-US' if $langs eq '';
-if ($langs eq 'ALL') {
-    opendir(DIR,$ENV{L10N_MODULE} . "/source");
-    @larr = readdir(DIR);
-    @larr = grep { $_ ne '.' } @larr;
-    @larr = grep { $_ ne '..' } @larr;
-    @larr = (@larr,"en-US");
-    closedir(DIR);
-}
-else {
-    @larr = grep { $_ ne '' } split(/ /, $langs);
-}
-$langs = join (",", @larr);
-
-$destdir='';
-if ( defined $ENV{DESTDIR} &&
-     $ENV{DESTDIR} ne "" ) {
-    $destdir = "-destdir \"$ENV{DESTDIR}\"";
-}
-
-$strip='';
-if ( defined $ENV{DISABLE_STRIP} &&
-     $ENV{DISABLE_STRIP} eq "TRUE" ) {
-    $strip = "-dontstrip";
-}
-
-$msi='';
-if ($is_windows) {
-    $msi = "-msitemplate $ENV{SRC_ROOT}/instsetoo_native/$ENV{INPATH}/misc/openoffice/msi_templates " .
-           "-msilanguage $ENV{SRC_ROOT}/instsetoo_native/$ENV{INPATH}/misc/win_ulffiles";
-}
-
-print "Running LibreOffice installer\n";
-system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
-	"perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
-	"-f openoffice.lst -l $langs -p LibreOffice " .
-	"-u $tmp_dir " .
-	"-buildid $BUILD $destdir $strip $msi " .
-	"-simple $path") && die "Failed to install: $!";
-
-if ($ENV{BUILD_TYPE} =~ m/ODK/) {
-    print "Running SDK installer\n";
-    system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
-	"perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
-	"-f openoffice.lst -l en-US -p LibreOffice_SDK " .
-	"-u $tmp_dir " .
-	"-buildid $BUILD $destdir $strip $msi" .
-	"-simple $path") && die "Failed to install: $!";
-}
-print "Installer finished\n";
-
-if ($do_link && !$is_windows) {
-    `$ENV{SOLARENV}/bin/linkoo $path $ENV{SRC_ROOT}`;
-}
diff --git a/solenv/bin/packager.pl b/solenv/bin/packager.pl
deleted file mode 100644
index 408caff8c..000000000
--- a/solenv/bin/packager.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use lib ("$ENV{SOLARENV}/bin/modules");
-
-use Cwd;
-use packager::check;
-use packager::files;
-use packager::globals;
-use packager::work;
-
-####################################
-# Main program
-####################################
-
-packager::check::check_environment();
-packager::check::check_packlist();
-packager::check::check_parameter();
-
-packager::work::set_global_variable();
-
-my $packagelist = packager::files::read_file($packager::globals::packlistname);
-
-my $targets = packager::work::create_package_todos($packagelist);
-
-if ( $ENV{'BSCLIENT'} ) { packager::work::start_build_server($targets); }
-else { packager::work::execute_system_calls($targets); }
-
-if ( $packager::globals::logging )
-{
-    packager::files::save_file($packager::globals::logfilename, \@packager::globals::logfileinfo);
-    print "Log file written: $packager::globals::logfilename\n";
-}
-
-####################################
-# End main program
-####################################
diff --git a/solenv/bin/packcomponents.xslt b/solenv/bin/packcomponents.xslt
deleted file mode 100644
index 6e037a677..000000000
--- a/solenv/bin/packcomponents.xslt
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org 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 version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:uc="http://openoffice.org/2010/uno-components">
-  <xsl:param name="prefix"/>
-  <xsl:strip-space elements="*"/>
-  <xsl:template match="/">
-    <xsl:element name="components"
-        namespace="http://openoffice.org/2010/uno-components">
-      <xsl:for-each select="list/filename">
-        <xsl:variable name="doc" select="document(concat($prefix, .))"/>
-        <xsl:choose>
-          <xsl:when test="count($doc/uc:component) = 1">
-            <xsl:copy-of select="$doc/uc:component"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message terminate="yes">
-              <xsl:text>cannot process </xsl:text>
-              <xsl:value-of select="."/>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:element>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
deleted file mode 100755
index 0c75993b6..000000000
--- a/solenv/bin/packimages.pl
+++ /dev/null
@@ -1,441 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# packimages.pl - pack images into archives
-#
-
-use strict;
-use Getopt::Long;
-use File::Find;
-use File::Basename;
-use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
-
-#### globals ####
-
-my $img_global = '%GLOBALRES%';  # 'global' image prefix
-my $img_module = '%MODULE%';  # 'module' image prefix
-
-my $out_file;                # path to output archive
-my $tmp_out_file;            # path to temporary output file
-my $global_path;             # path to global images directory
-my $module_path;             # path to module images directory
-my $sort_file;               # path to file containing sorting data
-my @custom_path;             # path to custom images directory
-my @imagelist_path;          # pathes to directories containing the image lists
-my $verbose;                 # be verbose
-my $extra_verbose;           # be extra verbose
-my $do_rebuild = 0;          # is rebuilding zipfile required?
-
-my @custom_list;
-#### script id #####
-
-( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-
-my $script_rev;
-my $id_str = ' $Revision: 1.17 $ ';
-$id_str =~ /Revision:\s+(\S+)\s+\$/
-  ? ($script_rev = $1) : ($script_rev = "-");
-
-print "$script_name -- version: $script_rev\n";
-
-#### main #####
-
-parse_options();
-my $image_lists_ref = get_image_lists();
-my %image_lists_hash;
-foreach ( @{$image_lists_ref} ) {
-    $image_lists_hash{$_}="";
-}
-$do_rebuild = is_file_newer(\%image_lists_hash) if $do_rebuild == 0;
-my ($global_hash_ref, $module_hash_ref, $custom_hash_ref) = iterate_image_lists($image_lists_ref);
-# custom_hash filled from filesystem lookup
-find_custom($custom_hash_ref);
-my $zip_hash_ref = create_zip_list($global_hash_ref, $module_hash_ref, $custom_hash_ref);
-$do_rebuild = is_file_newer($zip_hash_ref) if $do_rebuild == 0;
-if ( $do_rebuild == 1 ) {
-    create_zip_archive($zip_hash_ref);
-    replace_file($tmp_out_file, $out_file);
-    print_message("packing  $out_file finished.");
-} else {
-    print_message("$out_file up to date. nothing to do.");
-}
-
-exit(0);
-
-#### subroutines ####
-
-sub parse_options
-{
-    my $opt_help;
-    my $p = Getopt::Long::Parser->new();
-    my @custom_path_list;
-    my $custom_path_extended;
-    my $success =$p->getoptions(
-                             '-h' => \$opt_help,
-                             '-o=s' => \$out_file,
-                             '-g=s' => \$global_path,
-                 '-s=s' => \$sort_file,
-                             '-m=s' => \$module_path,
-                             '-c=s' => \@custom_path_list,
-                             '-e=s' => \$custom_path_extended,
-                             '-l=s' => \@imagelist_path,
-                             '-v'   => \$verbose,
-                             '-vv'  => \$extra_verbose
-                            );
-    push @custom_path_list, $custom_path_extended if ($custom_path_extended);
-    if ( $opt_help || !$success || !$out_file || !$global_path
-        || !$module_path || !@custom_path_list || !@imagelist_path )
-    {
-        usage();
-        exit(1);
-    }
-    #define intermediate output file
-    $tmp_out_file="$out_file"."$$".$ENV{INPATH};
-    # Sanity checks.
-
-    # Check if out_file can be written.
-    my $out_dir = dirname($out_file);
-
-    # Check paths.
-    foreach ($out_dir, $global_path, $module_path, @imagelist_path) {
-        print_error("no such directory: '$_'", 2) if ! -d $_;
-        print_error("can't search directory: '$_'", 2) if ! -x $_;
-    }
-    print_error("directory is not writable: '$out_dir'", 2) if ! -w $out_dir;
-
-    # Use just the working paths
-    @custom_path = ();
-    foreach (@custom_path_list) {
-        if ( ! -d $_ ) {
-            print_warning("skipping non-existing directory: '$_'", 2);
-        }
-        elsif ( ! -x $_ ) {
-            print_error("can't search directory: '$_'", 2);
-        }
-        else {
-            push @custom_path, $_;
-        }
-    }
-}
-
-sub get_image_lists
-{
-    my @image_lists;
-    my $glob_imagelist_path;
-
-    foreach ( @imagelist_path ) {
-        $glob_imagelist_path = $_;
-        # cygwin perl
-        chomp( $glob_imagelist_path = qx{cygpath -u "$glob_imagelist_path"} ) if "$^O" eq "cygwin";
-        push @image_lists, glob("$glob_imagelist_path/*.ilst");
-    }
-    if ( !@image_lists ) {
-        print_error("can't find any image lists in '@imagelist_path'", 3);
-    }
-
-    return wantarray ? @image_lists : \@image_lists;
-}
-
-sub iterate_image_lists
-{
-    my $image_lists_ref = shift;
-
-    my %global_hash;
-    my %module_hash;
-    my %custom_hash;
-
-    foreach my $i ( @{$image_lists_ref} ) {
-        parse_image_list($i, \%global_hash, \%module_hash, \%custom_hash);
-    }
-
-    return (\%global_hash, \%module_hash, \%custom_hash);
-}
-
-sub parse_image_list
-{
-    my $image_list      = shift;
-    my $global_hash_ref = shift;
-    my $module_hash_ref = shift;
-    my $custom_hash_ref = shift;
-
-    print_message("parsing '$image_list' ...") if $verbose;
-    my $linecount = 0;
-    open(IMAGE_LIST, "< $image_list") or die "ERROR: can't open $image_list: $!";
-    while ( <IMAGE_LIST> ) {
-        $linecount++;
-        next if /^\s*#/;
-        next if /^\s*$/;
-        # clean up trailing whitespace
-        tr/\r\n//d;
-        s/\s+$//;
-        # clean up backslashes and double slashes
-        tr{\\}{/}s;
-        tr{/}{}s;
-        # hack "res" back into globals
-        if ( /^\Q$img_global\E\/(.*)$/o ) {
-            $global_hash_ref->{"res/".$1}++;
-            next;
-        }
-        if ( /^\Q$img_module\E\/(.*)$/o ) {
-            $module_hash_ref->{$1}++;
-            next;
-        }
-        # parse failed if we reach this point, bail out
-        close(IMAGE_LIST);
-        print_error("can't parse line $linecount from file '$image_list'", 4);
-    }
-    close(IMAGE_LIST);
-
-    return ($global_hash_ref, $module_hash_ref, $custom_hash_ref);
-}
-
-sub find_custom
-{
-    my $custom_hash_ref = shift;
-    my $keep_back;
-    for my $path (@custom_path) {
-    find({ wanted => \&wanted, no_chdir => 0 }, $path);
-    foreach ( @custom_list ) {
-        if ( /^\Q$path\E\/(.*)$/ ) {
-        $keep_back=$1;
-        if (!defined $custom_hash_ref->{$keep_back}) {
-            $custom_hash_ref->{$keep_back} = $path;
-        }
-        }
-    }
-    }
-}
-
-sub wanted
-{
-    my $file = $_;
-    
-    if ( $file =~ /.*\.png$/ && -f $file ) {
-        push @custom_list, $File::Find::name;
-    }
-}
-
-sub create_zip_list
-{
-    my $global_hash_ref = shift;
-    my $module_hash_ref = shift;
-    my $custom_hash_ref = shift;
-
-    my %zip_hash;
-    my @warn_list;
-
-    print_message("assemble image list ...") if $verbose;
-    foreach ( keys %{$global_hash_ref} ) {
-        # check if in 'global' and in 'module' list and add to warn list
-        if ( exists $module_hash_ref->{$_} ) {
-            push(@warn_list, $_);
-            next;
-        }
-        if ( exists $custom_hash_ref->{$_} ) {
-            $zip_hash{$_} = $custom_hash_ref->{$_};
-            next;
-        }
-        # it's neither in 'module' nor 'custom', record it in zip hash
-        $zip_hash{$_} = $global_path;
-    }
-    foreach ( keys %{$module_hash_ref} ) {
-        if ( exists $custom_hash_ref->{$_} ) {
-            $zip_hash{$_} = $custom_hash_ref->{$_};
-            next;
-        }
-        # it's not in 'custom', record it in zip hash
-        $zip_hash{$_} = $module_path;
-    }
-
-    if ( @warn_list ) {
-        foreach ( @warn_list ) {
-            print_warning("$_ is duplicated in 'global' and 'module' list");
-        }
-    }
-
-    return \%zip_hash
-}
-
-sub is_file_newer 
-{
-    my $test_hash_ref = shift;
-    my $reference_stamp = 0;
-    
-    print_message("checking timestamps ...") if $verbose;
-    if ( -e $out_file ) {
-        $reference_stamp = (stat($out_file))[9];
-        print_message("found $out_file with $reference_stamp ...") if $verbose;
-    }
-    return 1 if $reference_stamp == 0;
-        
-    foreach ( sort keys %{$test_hash_ref} ) {
-        my $path = $test_hash_ref->{$_};
-        $path .= "/" if "$path" ne "";
-        $path .= "$_";
-        print_message("checking '$path' ...") if $extra_verbose;
-        my $mtime = (stat($path))[9];
-        return 1 if $reference_stamp < $mtime;
-    }
-    return 0;
-}
-
-sub optimize_zip_layout($)
-{
-    my $zip_hash_ref = shift;
-
-    if (!defined $sort_file) {
-    print_message("no sort file - sorting alphabetically ...") if $verbose;
-    return sort keys %{$zip_hash_ref};
-    }
-    print_message("sorting from $sort_file ...") if $verbose;
-
-    my $orderh;
-    my %included;
-    my @sorted;
-    open ($orderh, $sort_file) || die "Can't open $sort_file: $!";
-    while (<$orderh>) {
-    /^\#.*/ && next; # comments
-    s/[\r\n]*$//;
-    /^\s*$/ && next;
-    my $file = $_;
-    if (!defined $zip_hash_ref->{$file}) {
-        print "unknown file '$file'\n" if ($extra_verbose);
-    } else {
-        push @sorted, $file;
-        $included{$file} = 1;
-    }
-    }
-    close ($orderh);
-
-    for my $img (sort keys %{$zip_hash_ref}) {
-    push @sorted, $img if (!$included{$img});
-    }
-
-    print_message("done sort ...") if $verbose;
-
-    return @sorted;
-}
-
-sub create_zip_archive
-{
-    my $zip_hash_ref = shift;
-
-    print_message("creating image archive ...") if $verbose;
-    my $zip = Archive::Zip->new();
-
-# FIXME: test - $member = addfile ... $member->desiredCompressionMethod( COMPRESSION_STORED );
-# any measurable performance win/loss ?
-    foreach ( optimize_zip_layout($zip_hash_ref) ) {
-        my $path = $zip_hash_ref->{$_} . "/$_";
-        print_message("zipping '$path' ...") if $extra_verbose;
-        if ( -e $path) {
-            my $member = $zip->addFile($path, $_, COMPRESSION_STORED);
-            if ( !$member ) {
-                print_error("can't add file '$path' to image zip archive: $!", 5);
-            }
-        } else {
-                print_message("file '$path' not found");
-        }
-    }
-    my $status = $zip->writeToFileNamed($tmp_out_file);
-    if ( $status != AZ_OK ) {
-        print_error("write image zip archive '$tmp_out_file' failed. Reason: $status", 6);
-    }
-    return;
-}
-
-sub replace_file
-{
-    my $source_file = shift;
-    my $dest_file = shift;
-    my $result = 0;
-
-    $result = unlink($dest_file) if -f $dest_file;
-    if ( $result != 1 && -f $dest_file ) {
-        unlink $source_file;
-        print_error("couldn't remove '$dest_file'",1);
-    }  else {
-        if ( !rename($source_file, $dest_file)) {
-            unlink $source_file;
-            print_error("couldn't rename '$source_file'",1);
-        }
-    }
-    return;
-}
-
-sub usage
-{
-    print STDERR "Usage: packimages.pl [-h] -o out_file -g g_path -m m_path -c c_path -l imagelist_path\n";
-    print STDERR "Creates archive of images\n";
-    print STDERR "Options:\n";
-    print STDERR "    -h                 print this help\n";
-    print STDERR "    -o out_file        path to output archive\n";
-    print STDERR "    -g g_path          path to global images directory\n";
-    print STDERR "    -m m_path          path to module images directory\n";
-    print STDERR "    -c c_path          path to custom images directory\n";
-    print STDERR "    -s sort_file       path to image sort order file\n";
-    print STDERR "    -l imagelist_path  path to directory containing image lists (may appear mutiple times)\n";
-    print STDERR "    -v                 verbose\n";
-    print STDERR "    -vv                very verbose\n";
-}
-
-sub print_message
-{
-    my $message     = shift;
-
-    print "$script_name: ";
-    print "$message\n";
-    return;
-}
-
-sub print_warning
-{
-    my $message     = shift;
-
-    print STDERR "$script_name: ";
-    print STDERR "WARNING $message\n";
-    return;
-}
-
-sub print_error
-{
-    my $message     = shift;
-    my $error_code  = shift;
-
-    print STDERR "$script_name: ";
-    print STDERR "ERROR: $message\n";
-
-    if ( $error_code ) {
-        print STDERR "\nFAILURE: $script_name aborted.\n";
-        exit($error_code);
-    }
-    return;
-}
diff --git a/solenv/bin/packmodule b/solenv/bin/packmodule
deleted file mode 100755
index f2279cfed..000000000
--- a/solenv/bin/packmodule
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /usr/bin/env python
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-import os, os.path, sys, zipfile
-
-def paths_to_pack(loglines):
-    """Returns a generator iterating the outdir fields (with platform) of gb_deliver.log lines."""
-    lines=[]
-    for line in loglines:
-        fields = line.split()
-        if len(fields) >= 3:
-            lines.append(fields[2])
-    return lines
-
-def stripped_paths_to_pack(loglines):
-    """returns a generator iterating the outdir fields (stripped of the platform) of gb_deliver.log lines."""
-    return (path.partition('/')[2] for path in paths_to_pack(loglines))
-
-def main(args):
-    """creates/overwrites a file at OUTDIR/zip/MODULE.zip containing the contents of the gb_deliver.log."""
-    if len(args) != 3:
-        print('usage: packmodule OUTDIR MODULE')
-        sys.exit(2)
-    (executable, outdir, module) = args
-    os.chdir(outdir)
-    zipdir = 'zip'
-    try:
-        os.makedirs(zipdir)
-    except OSError:
-        pass
-    deliverlog = open(os.path.join('inc', module, 'gb_deliver.log'))
-    packedmodule = zipfile.ZipFile(os.path.join(zipdir,module+'.zip'), 'w')
-    [packedmodule.write(path) for path in stripped_paths_to_pack(deliverlog)]
-    packedmodule.write(os.path.join('inc', module, 'gb_deliver.log'))
-    packedmodule.close()
-
-if __name__ == "__main__":
-    main(sys.argv)
-
-# vim:set et sw=4 ts=4 filetype=python:
diff --git a/solenv/bin/packregistry.xslt b/solenv/bin/packregistry.xslt
deleted file mode 100644
index 7c118f901..000000000
--- a/solenv/bin/packregistry.xslt
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org 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 version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:oor="http://openoffice.org/2001/registry">
-  <xsl:param name="prefix"/>
-  <xsl:strip-space elements="*"/>
-  <xsl:preserve-space elements="value it"/>
-    <!-- TODO: strip space from "value" elements that have "it" children -->
-  <xsl:template match="/">
-    <oor:data xmlns:xs="http://www.w3.org/2001/XMLSchema"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-      <xsl:copy-of select="list/dependency"/>
-<!--
-      <xsl:copy-of select="document(list/filename)/oor:component-schema"/>
-      <xsl:copy-of select="document(list/filename)/oor:component-data"/>
-
-      instead of the below for-each would only issue warnings, not errors, for
-      non-existing or otherwise bad input files; it is important that the input
-      filename list is already sorted in an order suitable for the configmgr
-      (e.g., xcs files preceeding xcu files).
--->
-      <xsl:for-each select="list/filename">
-        <xsl:variable name="doc" select="document(concat($prefix, .))"/>
-        <xsl:choose>
-          <xsl:when test="count($doc/oor:component-schema) = 1">
-            <xsl:apply-templates select="$doc/oor:component-schema"/>
-          </xsl:when>
-          <xsl:when test="count($doc/oor:component-data) = 1">
-            <xsl:apply-templates select="$doc/oor:component-data"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message terminate="yes">
-              <xsl:text>cannot process </xsl:text>
-              <xsl:value-of select="."/>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-    </oor:data>
-  </xsl:template>
-  <xsl:template
-     match="oor:component-schema|oor:component-data|templates|component|group|
-            set|node-ref|prop|item|value|it|unicode|node">
-    <xsl:copy copy-namespaces="no">
-      <!-- prune oor:component-data xmlns:install="..." namespaces (would only
-           work in XSLT 2.0, however) -->
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates/>
-    </xsl:copy>
-  </xsl:template>
-  <xsl:template match="value[it]">
-    <xsl:copy copy-namespaces="no">
-      <xsl:apply-templates select="@*"/>
-      <xsl:apply-templates select="*"/>
-        <!-- ignore text elements (which must be whitespace only) -->
-    </xsl:copy>
-  </xsl:template>
-  <xsl:template match="info|import|uses|constraints"/>
-    <!-- TODO: no longer strip elements when they are eventually read by
-         configmgr implementation -->
-  <xsl:template match="@*">
-    <xsl:copy/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/solenv/bin/par2script.pl b/solenv/bin/par2script.pl
deleted file mode 100644
index 8c60ab477..000000000
--- a/solenv/bin/par2script.pl
+++ /dev/null
@@ -1,115 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use lib ("$ENV{SOLARENV}/bin/modules");
-
-use Cwd;
-use par2script::check;
-use par2script::files;
-use par2script::globals;
-use par2script::parameter;
-use par2script::module;
-use par2script::undefine;
-use par2script::work;
-
-####################################
-# Main program
-####################################
-
-par2script::parameter::getparameter();
-par2script::parameter::control_parameter();
-par2script::parameter::outputparameter();
-
-my $includes = par2script::work::setincludes($par2script::globals::includepathlist);
-my $parfiles = par2script::work::setparfiles($par2script::globals::parfilelist);
-
-par2script::work::make_complete_pathes_for_parfiles($parfiles, $includes);
-
-print "Reading par files\n";
-my $parfilecontent = par2script::work::read_all_parfiles($parfiles);
-
-print "Collecting items\n";
-par2script::work::collect_definitions($parfilecontent);
-
-print "Collecting assigned items\n";
-par2script::work::collect_assigned_gids();
-
-# print "First control of multiple assignments\n";
-# par2script::check::check_multiple_assignments();
-
-print "Searching for Undefinitions\n";
-par2script::undefine::undefine_gids($parfilecontent);
-par2script::undefine::remove_complete_item("Directory", $parfilecontent);
-par2script::undefine::remove_complete_item("Profile", $parfilecontent);
-
-print "Removing assigned GIDs without definitions\n";
-par2script::module::remove_undefined_gids_from_modules();
-
-print "Adding definitions without assignment to the root\n";
-par2script::module::add_to_root_module();
-
-print "Control of multiple assignments\n";
-par2script::check::check_multiple_assignments();
-
-print "Control of definitions with missing assignments\n";
-par2script::check::check_missing_assignments();
-
-# checking the setup script
-print "Checking directory definitions ...\n";
-par2script::check::check_needed_directories();
-par2script::check::check_directories_in_item_definitions();
-print "Checking module definitions ...\n";
-par2script::check::check_module_existence();
-print "Checking module assignments ...\n";
-par2script::check::check_moduleid_at_items();
-print "Checking Root Module ...";
-par2script::check::check_rootmodule();
-print "Checking Shortcut assignments ...\n";
-par2script::check::check_shortcut_assignments();
-print "Checking missing parents ...\n";
-par2script::check::check_missing_parents();
-
-print "Shorten lines at modules\n";
-par2script::module::shorten_lines_at_modules();
-
-# Now the script can be created
-print "Creating setup script\n";
-my $setupscript = par2script::work::create_script();
-
-print "Saving script\n";
-par2script::files::save_file($par2script::globals::scriptname, $setupscript);
-
-# logging, if set
-if ($par2script::globals::logging)
-{
-    par2script::files::save_file($par2script::globals::logfilename, \@par2script::globals::logfileinfo);
-    print "Log file written: $par2script::globals::logfilename\n";
-}
-
-####################################
-# End main program
-####################################
diff --git a/solenv/bin/patch_sanitizer.pl b/solenv/bin/patch_sanitizer.pl
deleted file mode 100755
index 12d6c34d2..000000000
--- a/solenv/bin/patch_sanitizer.pl
+++ /dev/null
@@ -1,126 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use utf8;
-use warnings;
-use strict;
-
-# command line arguments
-my $oldpatchfile = shift;
-my $newpatchfile = shift;
-my $sortedfile = shift;
-
-show_help() unless defined $oldpatchfile and defined $newpatchfile and defined $sortedfile;
-
-my %oldpatchfile = parse_patch($oldpatchfile);
-my %newpatchfile = parse_patch($newpatchfile);
-
-open SORTEDPATCH, "> $sortedfile";
-
-foreach my $file (sort (keys %newpatchfile)) {
-    print SORTEDPATCH $file."\t";
-    if (defined($oldpatchfile{$file})) {
-        if ( (join '', @{$oldpatchfile{$file}{'data'}}) eq (join '', @{$newpatchfile{$file}{'data'}}) ) {
-            # patch data for the file hasn't been modified, use the header from
-            # the old patch, to reduce noise (keep the old timestamps)
-            print SORTEDPATCH $oldpatchfile{$file}{'origtimestamp'}."\n";
-            print SORTEDPATCH $oldpatchfile{$file}{'patchedfilename'}."\t";
-            print SORTEDPATCH $oldpatchfile{$file}{'patchedtimestamp'}."\n";
-            print SORTEDPATCH @{$oldpatchfile{$file}{'data'}};
-            next;
-        }
-    }
-    # either file wasn't patched before, or the patchset changed, so use the new
-    # values for it..
-    print SORTEDPATCH $newpatchfile{$file}{'origtimestamp'}."\n";
-    print SORTEDPATCH $newpatchfile{$file}{'patchedfilename'}."\t";
-    print SORTEDPATCH $newpatchfile{$file}{'patchedtimestamp'}."\n";
-    print SORTEDPATCH @{$newpatchfile{$file}{'data'}};
-}
-close SORTEDPATCH;
-
-###############
-# Helper subs
-###############
-sub show_help {
-    print "Usage: $0 oldpatch newpatch outputfilename\n";
-    print "oldpatch and newpatch can be the very same file\n";
-    print "will output a sanitized form of newpatch to outputfilename\n";
-    print "if outputfilename is '-', the patch will be printed to stdout\n";
-    print "sanitized means: It will avoid all unnecessary changes\n";
-    exit 1;
-}
-sub parse_patch {
-    my $patchfile = shift;
-    my $patchtype;
-    my $pfirst;
-    my $psecond;
-
-    my %hunks = ();
-    my $origfilename;
-    open PATCHFILE, "< $patchfile" or die "Cannot open file $patchfile $!";
-    my @patchfile = <PATCHFILE>;
-    close PATCHFILE;
-    return %hunks if ( $#patchfile == -1 );
-    if ( $patchfile[0] =~ /^---/ ) {
-        $patchtype = "unified";
-        $pfirst = '^--- [^\*]*$';
-        $psecond = '^\+\+\+ [^\*]*$';
-    } elsif ( $patchfile[0] =~ /^\*\*\*/ ) {
-        $patchtype = "content";
-        $pfirst = '^\*\*\* [^\*]*$';
-        $psecond = '^--- .*\t.*$';
-    } else {
-        die "unknown patch format\n";
-    }
-
-    foreach (@patchfile) {
-        if ( /$pfirst/ ) {
-            my $timestamp;
-            # extract the filename, to be able to compare the old
-            # with the new file...
-            ($origfilename, $timestamp) = split(/\t/, $_, 2);
-            chomp $timestamp;
-            # ideally convert the timestamp to iso-format...
-            $hunks{$origfilename}{'origtimestamp'} = $timestamp; 
-            next;
-        } elsif ( $_ =~ /$psecond/ ) {
-            my ($filename, $timestamp) = split(/\t/, $_, 2);
-            chomp $timestamp;
-            # ideally convert the timestamp to iso-format...
-            $hunks{$origfilename}{'patchedfilename'} = $filename;
-            $hunks{$origfilename}{'patchedtimestamp'} = $timestamp;
-            next;
-        }
-        push (@{$hunks{$origfilename}{'data'}}, $_);
-        
-    }
-    return %hunks;
-}
diff --git a/solenv/bin/pchdelta b/solenv/bin/pchdelta
deleted file mode 100755
index e33db2f96..000000000
--- a/solenv/bin/pchdelta
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Wrapper around the pchdelta.py script
-bash -c "unset PYTHONHOME PYTHONPATH; /usr/bin/python ../solenv/bin/pchdelta.py $*"
diff --git a/solenv/bin/pchdelta.py b/solenv/bin/pchdelta.py
deleted file mode 100755
index 52a0df4ec..000000000
--- a/solenv/bin/pchdelta.py
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/usr/bin/python
-
-# ------------------------------------------------------------------------------
-# Hacky little delta debug tool to figure out the proper includes for a pch file
-#
-# Usage:
-# 
-# pchdelta.py <pch_target> <dir1> [<dir2> <dir3> ...]
-#
-# <pch_target>      File to perform delta debugging on. The section to test
-#                   is delimeted by '//---MARKER---' lines.
-# <dir1> .. <dirn>  Sequence of directories to run dmake in to test if the
-#                   modification works
-#
-# Examples:
-#
-# pchdelta.py inc/pch/precompiled_sfx2.hxx inc source/dialog
-#
-#  Run pchdelta inside sfx2 first building the pch files and then files in
-# source/dialog
-#
-# ------------------------------------------------------------------------------
-
-import os
-import os.path
-import sys
-
-# C++
-MARKER="//---MARKER---\n"
-
-# dmake
-#MARKER="#---MARKER---\n"
-
-# ------------------------------------------------------------------------------
-# Sequentially build all argument directories from scratch
-
-def testSequenceBuild(dirlist):
-    cwd = os.path.abspath(os.getcwd())
-    for path in dirlist:
-        os.chdir(path)
-        buildcommand = "dmake -u"
-        buildcommand += " >>" + cwd + "/buildlog.txt 2>&1"
-        buildresult = os.system(buildcommand)
-        os.chdir(cwd)
-        if buildresult != 0:
-            return False
-    return True
-
-# ------------------------------------------------------------------------------
-# Dump out the delta file with corresponding markers
-
-def writePch(pchname, header, footer, acceptedlines, testlines):
-    outputfile = file(pchname, "w")
-    outputfile.write(header)
-    outputfile.write(MARKER)
-    outputfile.write("\n".join(acceptedlines))
-    if len(testlines) > 0:
-        outputfile.write("\n\n//---Candidate marker---\n")
-        outputfile.write("\n".join(testlines) + "\n")
-        outputfile.write("//---Candidate marker end---\n")
-    outputfile.write(MARKER)
-    outputfile.write(footer)
-    outputfile.close()
-    
-
-# ------------------------------------------------------------------------------
-# Recursive tester routine. Test the segment given and if an error is
-# encountered splits the segment into <fanout> subsegment and recurses. Failing
-# one liners are rejected. The set of accepted lines are built sequentially from
-# the beginning.
-
-def binaryTest(dirlist, lines, pchname, header, footer, acceptedlines, indent, startpoint):
-    linecount = len(lines)
-    if linecount == 0:
-        return
-    # Test if this slice passes the buildtest
-    writePch(pchname, header, footer, acceptedlines, lines)
-    if testSequenceBuild(dirlist):
-        return acceptedlines + lines
-
-    # Reject one liners
-    if linecount == 1:
-        print indent + "Rejected: " + lines[0]
-        return acceptedlines
-
-    # Recurse with multiline slices
-    fanout = 4
-    splits = []
-    for i in range(3):
-        splits.append(linecount * (i + 1) / fanout)
-    splits.append(linecount)
-
-    splitstart = 0
-    for splitend in splits:
-        # avoid splitting in case we have no resulting lines
-        if (splitend - splitstart) == 0:
-            continue
-        splitslice = lines[splitstart:splitend]
-        print indent + "[" + str(startpoint + splitstart) + ":" + str(startpoint + splitend) + "] (" + str(splitend - splitstart) + ")"
-        acceptedlines = binaryTest(dirlist, splitslice, pchname, header, footer, acceptedlines, indent + " ", startpoint + splitstart)
-        splitstart = splitend
-
-    return acceptedlines
-
-# ------------------------------------------------------------------------------
-# Main entry point
-
-if len(sys.argv) < 3:
-    print "Usage: " + sys.argv[0] + " <pch_target> <dir1> [<dir2> <dir3> ...]"
-    sys.exit(1)
-
-pchname = os.path.abspath(sys.argv[1])
-dirlist = sys.argv[2:]
-
-# remove old build log file
-if os.path.exists("buildlog.txt"):
-    os.remove("buildlog.txt")
-
-# test for corner case of everything working from the start
-if testSequenceBuild(dirlist):
-    print "pch working, nothing to do."
-    sys.exit(0)
-
-# Open the header file for reading
-inputfile = file(pchname, "r+")
-inputdata = inputfile.read()
-inputfile.close()
-
-segments = inputdata.split(MARKER)
-header = segments[0]
-footer = segments[2]
-lines = segments[1].split("\n")
-
-writePch(pchname + "_backup", header, footer, lines, [])
-
-# test for corner case of no convergence possible
-writePch(pchname, header, footer, [], [])
-if not testSequenceBuild(dirlist):
-    writePch(pchname, header, footer, lines, [])
-    print "Building with no candidate lines failed. Convergence questionable, aborting."
-    sys.exit(0)
-
-# Starting pruning
-print "Starting evaluation of " + str(len(lines)) + " lines"
-acceptedlines = binaryTest(dirlist, lines, pchname, header, footer, [], "", 0)
-writePch(pchname, header, footer, acceptedlines, [])
-
-
-
diff --git a/solenv/bin/pre2par.pl b/solenv/bin/pre2par.pl
deleted file mode 100644
index 0a524ee06..000000000
--- a/solenv/bin/pre2par.pl
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-use lib ("$ENV{SOLARENV}/bin/modules");
-
-use Cwd;
-use pre2par::directory;
-use pre2par::files;
-use pre2par::globals;
-use pre2par::language;
-use pre2par::parameter;
-use pre2par::work;
-
-####################################
-# Main program
-####################################
-
-pre2par::parameter::getparameter();
-pre2par::parameter::control_parameter();
-
-pre2par::directory::check_directory($pre2par::globals::parfilename);
-
-my $prefile = pre2par::files::read_file($pre2par::globals::prefilename);
-
-pre2par::work::check_content($prefile, $pre2par::globals::prefilename);
-
-my $parfile = pre2par::work::convert($prefile);
-
-pre2par::work::formatter($parfile);
-
-my $langfilename = pre2par::work::getlangfilename();
-my $ulffilename = pre2par::work::getulffilename($pre2par::globals::prefilename);
-
-my $dolocalization = pre2par::work::check_existence_of_langfiles($langfilename, $ulffilename); 
-
-if ( $dolocalization )
-{
-    my $langfile = pre2par::files::read_file($langfilename);
-    pre2par::language::localize($parfile, $langfile);
-}
-
-pre2par::files::save_file($pre2par::globals::parfilename, $parfile);
-
-# checking of par file was written correctly
-my $parfilecomp = pre2par::files::read_file($pre2par::globals::parfilename);
-pre2par::work::diff_content($parfile, $parfilecomp, $pre2par::globals::parfilename);
-
-####################################
-# End main program
-####################################
diff --git a/solenv/bin/receditor b/solenv/bin/receditor
deleted file mode 100755
index d0549c6c7..000000000
--- a/solenv/bin/receditor
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'configure' or 'setsolar'
-    exit 1
-fi
-exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -jar ${SOLARVER}/${INPATH}/bin/receditor.jar
diff --git a/solenv/bin/relocate b/solenv/bin/relocate
deleted file mode 100755
index 6a5cfb992..000000000
--- a/solenv/bin/relocate
+++ /dev/null
@@ -1,302 +0,0 @@
-:
-    eval 'exec perl -S $0 ${1+"$@"}'
-        if 0;
-
-#*************************************************************************
-#
-#    This tool makes it easy to cleanly re-locate a
-# build, eg. after you have copied or moved it to a new
-# path. It tries to re-write all the hard-coded path logic
-# internally.
-#
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-# written substantially, if not entirely by non-Sun volunteers
-#
-#*************************************************************************
-
-sub sniff_set($)
-{
-    my $build_dir = shift;
-    my ($dirhandle, $fname);
-
-    opendir ($dirhandle, $build_dir) || die "Can't open $build_dir";
-    while ($fname = readdir ($dirhandle)) {
-	$fname =~ /Set.sh$/ && last;
-    }
-    closedir ($dirhandle);
-
-    return $fname;
-}
-
-sub sed_file($$$)
-{
-    my ($old_fname, $function, $state) = @_;
-    my $tmp_fname = "$old_fname.new";
-    my $old_file;
-    my $new_file;
-
-    open ($old_file, $old_fname) || die "Can't open $old_fname: $!";
-    open ($new_file, ">$tmp_fname") || die "Can't open $tmp_fname: $!";
-    
-    while (<$old_file>) {
-	my $value = &$function($state, $_);
-	print $new_file $value;
-    }
-    
-    close ($new_file) || die "Failed to close $tmp_fname: $!";
-    close ($old_file) || die "Failed to close $old_fname: $!";
-
-    rename $tmp_fname, $old_fname || die "Failed to replace $old_fname: $!";
-}
-
-sub rewrite_value($$)
-{
-    my ($state, $value) = @_;
-
-    $value =~ s/$state->{'old_root'}/$state->{'new_root'}/g;
-    $value =~ s/$state->{'win32_old_root'}/$state->{'win32_new_root'}/g;
-
-    return $value;
-}
-
-sub rewrite_set($$$)
-{
-    my $new_root = shift;
-    my $old_root = shift;
-    my $set = shift;
-    my $tmp;
-    my %state;
-
-    print "   $set\n";
-
-# unix style
-    $state{'old_root'} = $old_root;
-    $state{'new_root'} = $new_root;
-# win32 style
-    $tmp = $old_root;
-    $tmp =~ s/\//\\\\\\\\\\\\\\\\/g;
-    $state{'win32_old_root'} = $tmp;
-    $tmp = $new_root;
-    $tmp =~ s/\//\\\\\\\\/g;
-    $state{'win32_new_root'} = $tmp;
-
-    sed_file ("$new_root/$set", \&rewrite_value, \%state);
-}
-
-sub read_set($$)
-{
-    my $new_root = shift;
-    my $set = shift;
-    my $fname = "$new_root/$set";
-    my $file;
-    my %env_keys;
-
-    open ($file, $fname) || die "Can't open $fname: $!";
-
-    while (<$file>) {
-	if (/\s*([^=]+)\s*=\s*\"([^\"]+)\"/) {
-	    my ($name, $value) = ($1, $2);
-
-	    $env_keys{$name} = $value;
-	}
-    }
-
-    close ($file) || die "Failed to close $fname: $!";
-
-    return \%env_keys;
-}
-
-sub sed_file_no_touch($$$)
-{
-    my ($new_root, $old_root, $file) = @_;
-    my ($fin, $fout);
-
-    ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
-     $atime,$mtime,$ctime,$blksize,$blocks) = stat ($file);
-
-    open ($fin, $file) || die "Can't open $fin: $!";
-    open ($fout, ">$file.sed.bak") || die "Can't open $file.sed.bak: $!";
-    while (<$fin>) {
-	s/$old_root/$new_root/g;
-	print $fout $_;
-    }
-    close ($fin);
-    close ($fout);
-    rename ("$file.sed.bak", $file);
-#    print "rename $file.sed.bak to $file\n";
-
-    utime $atime, $mtime, $file;
-}
-
-sub sed_no_touch_recursive ($$$)
-{
-    my ($new_root, $old_root, $dir) = @_;
-    my $dh;
-    opendir ($dh, $dir) || die "Can't open dir: $dir: $!";
-    while (my $entry = readdir ($dh)) {
-	$entry =~ /^\./ && next;
-	my $path = "$dir/$entry";
-	sed_no_touch_recursive ($new_root, $old_root, $path) if (-d $path);
-	sed_file_no_touch ($new_root, $old_root, $path) if (-f $path);
-    }
-    closedir ($dh);
-}
-
-sub rewrite_product_deps($$$)
-{
-    my $new_root = shift;
-    my $product_path = shift;
-    my $old_root = shift;
-
-    my $path = "$new_root/$product_path/misc";
-    my $misc_dir;
-    opendir ($misc_dir, $path) || return;
-    my $name;
-    while ($name = readdir ($misc_dir)) {
-# Should try re-writing these - but perhaps this would
-# screw with timestamps ?
-	if ($name =~ m/\.dpcc$/ || $name =~ m/\.dpslo$/ || $name =~ m/\.dpobj$/) {
-	    sed_file_no_touch ($new_root, $old_root, "$path/$name");
-	}
-    }
-    closedir ($misc_dir);
-}
-
-sub rewrite_dpcc($$)
-{
-    my $new_root = shift;
-    my $old_root = shift;
-
-    my $top_dir;
-    my $idx = 0;
-    opendir ($top_dir, $new_root) || die "Can't open $new_root: $!";
-    my $name;
-    while ($name = readdir ($top_dir)) {
-	my $sub_dir;
-	opendir ($sub_dir, "$new_root/$name") || next;
-	my $sub_name;
-	while ($sub_name = readdir ($sub_dir)) {
-	    if ($sub_name =~ /\.pro$/) {
-		$idx || print "\n    ";
-		if ($idx++ == 6) {
-		    $idx = 0;
-		}
-		print "$name ";
-		rewrite_product_deps ($new_root, "$name/$sub_name", $old_root);
-	    }
-	}
-	closedir ($sub_dir);
-    }
-    closedir ($top_dir);
-    print "\n";
-}
-
-sub rewrite_symlinks($$)
-{
-    my $new_root = shift;
-    my $old_root = shift;
-
-    my $dirh;
-    opendir ($dirh, $new_root);
-    while (my $ent = readdir ($dirh)) {
-	$ent =~ /^\./ && next;
-	my $link = "$new_root/$ent";
-	-l $link || next;
-	my $target = readlink ($link);
-	my $newtarget = $target;
-	$newtarget =~ s/$old_root/$new_root/;
-	if ($target =~ m/$new_root/) {
-	    print STDERR "skip correct link $target\n";
-	} elsif ($newtarget eq $target) {
-	    print STDERR "unusual - possibly stale link: $target\n";
-	    if ($target =~ m/\/clone\//) { die "failed to rename link"; }
-	} else {
-	    print "Re-write link $target to $newtarget\n";
-	    unlink ($link);
-	    symlink ($newtarget, $link);
-	}
-    }
-    closedir ($dirh);
-}
-
-sub rewrite_bootstrap($$)
-{
-    my $new_root = shift;
-    my $old_root = shift;
-
-    print "   bootstrap\n";
-
-    my %state;
-    $state{'old_root'} = $old_root;
-    $state{'new_root'} = $new_root;
-
-    my $rewrite = sub { my $state = shift; my $value = shift;
-			$value =~ s/$state->{'old_root'}/$state->{'new_root'}/g;
-			return $value; };
-    sed_file ("$new_root/bootstrap", $rewrite, \%state);
-    `chmod +x $new_root/bootstrap`;
-}
-
-for $a (@ARGV) {
-    if ($a eq '--help' || $a eq '-h') {
-	print "relocate: syntax\n";
-	print "  relocate /path/to/new/ooo/source_root\n";
-    }
-}
-
-$OOO_BUILD = shift (@ARGV) || die "Pass path to relocated source tree";
-substr ($OOO_BUILD, 0, 1) eq '/' || die "relocate requires absolute paths";
-
-my $set;
-
-$set = sniff_set($OOO_BUILD) || die "Can't find env. set";
-my $env_keys = read_set ($OOO_BUILD, $set);
-$OLD_ROOT = $env_keys->{'SRC_ROOT'};
-my $solver = $env_keys->{SOLARVER} . "/" . $env_keys->{INPATH};
-
-print "Relocate: $OLD_ROOT -> $OOO_BUILD\n";
-if ($OLD_ROOT eq $OOO_BUILD) {
-    print "nothing to do\n";
-    exit 0;
-}
-
-print "re-writing symlinks\n";
-rewrite_symlinks($OOO_BUILD, $OLD_ROOT);
-
-print "re-writing dependencies:\n";
-rewrite_dpcc($OOO_BUILD, $OLD_ROOT);
-
-if (-d "$solver/workdir/Dep") {
-    print "re-writing new dependencies:\n";
-    sed_no_touch_recursive ($OOO_BUILD, $OLD_ROOT, "$solver/workdir/Dep");
-}
-
-print "re-writing environment:\n";
-rewrite_set($OOO_BUILD, $OLD_ROOT, $set);
-rewrite_bootstrap($OOO_BUILD, $OLD_ROOT);
-
-print "done.\n";
diff --git a/solenv/bin/remangle32to64.pl b/solenv/bin/remangle32to64.pl
deleted file mode 100644
index 0ed98fbd4..000000000
--- a/solenv/bin/remangle32to64.pl
+++ /dev/null
@@ -1,327 +0,0 @@
-#!/usr/bin/perl -w /* -*- indent-tabs-mode: nil -*- */
-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Novell, Inc
-# Portions created by the Initial Developer are Copyright (C) 2011 Novell,
-# Inc. All Rights Reserved.
-#
-# Contributor(s): Tor Lillqvist <tml@iki.fi>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-# Change MSVC mangled C++ names from 32-bit form to the corresponding
-# 64-bit form.  Each line of input can contain at most one mangled
-# name.
-
-# Based on experimentation with MSVC2008 and the following web pages:
-
-# http://www.geoffchappell.com/viewer.htm?doc=studies/msvc/language/decoration/index.htm
-# Thorough but incomplete. Still, describes details the below sources
-# don't mention.
-
-# http://cvs.winehq.com/cvsweb/wine/dlls/msvcrt/undname.c
-# Wine's __unDname function, presumably the most complete, although
-# not really written to act as "documentation"
-
-# http://mearie.org/documents/mscmangle/
-# Relatively complete but a bit badly structured and terse.
-
-# http://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B_Name_Mangling
-# seems to be mostly a ripoff on the mearie.org page
-
-# Example transformation:
-# ??0ORealDynamicLoader@salhelper@@IAE@PAPAV01@ABVOUString@rtl@@1PAX2@Z =>
-# ??0ORealDynamicLoader@salhelper@@IEAA@PEAPEAV01@AEBVOUString@rtl@@1PEAX2@Z
-
-# It should be relatively easy to remove the modification parts of the
-# below code and use the regex for some other task on MSVC mangled
-# names.
-
-# The regular expression below accepts also nonsensical mangled names,
-# so it should not be used to verify correctness of mangled names.
-
-use strict;
-
-my @opstack = ();
-
-sub parse_number($)
-{
-  my ($num) = @_;
-
-  return $num + 1 if ($num eq '0' || ($num ge '1' && $num le '9'));
-
-  $num =~ tr/ABCDEFGHIJKLMNOP@/0123456789ABCDEF /;
-  hex($num);
-}
-
-sub format_number($)
-{
-  my ($num) = @_;
-
-  return $num - 1 if ($num <= 10);
-
-  $num = sprintf("%X", $num);
-  $num =~ tr/0123456789ABCDEF/ABCDEFGHIJKLMNOP/;
-  $num.'@';
-}
-
-sub double_thunk($$)
-{
-  my ($number, $position) = @_;
-
-  my $bytes = parse_number($number);
-  $bytes *= 2;
-  push(@opstack, 'r '.($position - length($number)).' '.length($number).' '.format_number($bytes));
-}
-
-while (<>)
-  {
-    m/
-      # Named subpattern definitions. I use names of the form
-      # __CamelCase__ for the named subpatters so that they are easier
-      # to see.
-      (?(DEFINE)
-        (?<__Number__>
-          \?? ([0-9] | [A-P]+@)
-        )
-        (?<__32BitChecksum__>
-          [A-P]{8}@
-        )
-        (?<__CallingConvention__>
-          (?:
-            [AB]
-            |
-            [C-L]
-              (?{ push(@opstack, 'r '.(pos()-1).' 1 A cdecl'); })
-          )
-        )
-        (?<__StringLiteralText__>
-          (?:
-            [_a-zA-Z0-9]
-            |
-            \?\$[A-P][A-P]
-            |
-            \?[0-9A-Za-z]
-          ){1,20}
-        )
-        (?<__Identifier__>
-          [_a-zA-Z\$][_a-zA-Z0-9\$]*@
-        )
-        (?<__ArgsZTerminated__>
-          (?&__DataTypeInArgs__)+ @? Z
-        )
-        (?<__ArgsNonZTerminated__>
-          (?&__DataTypeInArgs__)+ @?
-        )
-        (?<__TemplateName__>
-          (?&__Identifier__) (?&__ArgsNonZTerminated__)
-        )
-        (?<__Class__>
-          (?:
-            [0-9]
-            |
-            \?\$ (?&__TemplateName__)
-            |
-            (?&__Identifier__)
-          )+@
-        )
-        (?<__DataTypeCommon__>
-          (?:
-            # extended types like _int64, bool and wchar_t
-            _[D-NW]
-            |
-            # simple types
-            [C-KMNOXZ]
-            |
-            # class, struct, union, cointerface
-            [TUVY] (?&__Class__)
-            |
-            # references
-            [AB]
-              (?{ push(@opstack, 'i '.pos().' E reference'); })
-              (?&__ModifiedType__)
-            |
-            # pointers
-            [QRS]
-              (?{ push(@opstack, 'i '.pos().' E pointer'); })
-              (?&__ModifiedType__)
-            |
-            P
-              (?:
-                # function pointer
-                6 (?&__CallingConvention__) (?&__DataTypeNotInArgs__) (?&__ArgsZTerminated__)
-                |
-                # other pointer
-                (?{ push(@opstack, 'i '.pos().' E pointer'); })
-                (?&__ModifiedType__)
-              )
-            |
-            W 4 (?&__Class__)
-            |
-            [0-9]
-            |
-            \$ (?:
-                 [0DQ] (?&__Number__)
-                 |
-                 F (?&__Number__){2}
-                 |
-                 G (?&__Number__){3}
-                 |
-                 \$ [ABCD] (?&__DataTypeNotInArgs__)
-               )
-          )
-        )
-        (?<__ModifiedType__>
-          [ABCD]
-          (?:
-            # multidimensional array
-            Y (?&__Number__)+
-          )?
-          (?&__DataTypeNotInArgs__)
-        )
-        (?<__DataTypeInArgs__>
-          (?:
-            (?&__DataTypeCommon__)
-            |
-            # template parameter
-            \? (?&__Number__)
-          )
-        )
-        (?<__DataTypeNotInArgs__>
-          (?:
-            (?&__DataTypeCommon__)
-            |
-            \? (?&__ModifiedType__)
-          )
-        )
-      )
-
-      # All mangled names start with a question mark
-      \?
-      (?:
-        # Ctors, dtors, operators etc have separate a priori defined
-        # special mangled names like the very simple ?0 for constructor
-        # and ?_R16789 for "RTTI Base Class Descriptor at (6,7,8,9)"
-        # whatever that might mean.
-        (
-          \?
-          ([0-9A-Z]
-           |
-           _(?:
-              # C is for string literals, see below
-              # R is RTTI, see immediately below
-              [0-9ABD-QS-Z]
-              |
-              R0(?&__DataTypeNotInArgs__)
-              |
-              R1(?&__Number__){4}
-              |
-              R[234]
-              |
-              _(?:
-                 E
-               )
-           )
-          )
-        )?
-        (?&__Class__)
-
-        (?:
-          # Static members and normal variables
-          [0-5]
-            (?&__DataTypeNotInArgs__)
-            [ABCD]
-          |
-          # Compiler-generated static
-          [67]
-            [ABCD]
-            (?:
-              @
-              |
-              (?&__Class__)
-            )
-          |
-          # Non-static Methods, implicit 'this'
-          [ABEFIJMNQRUV]
-            [AB]
-            (?{ push(@opstack, 'i '.(pos()-1).' E this'); })
-            (?&__CallingConvention__)
-            (?:
-              @
-              |
-              (?&__DataTypeNotInArgs__)
-            )
-            (?&__ArgsZTerminated__)
-          |
-          # Static methods
-          [CDKLST]
-            (?&__CallingConvention__)
-            (?:
-              @
-              |
-              (?&__DataTypeNotInArgs__)
-            )
-            (?&__ArgsZTerminated__)
-          |
-          # Thunks
-          [GHOPWX]
-            ((?&__Number__))
-            (?{ double_thunk($^N, pos()); })
-            [AB]
-            (?{ push(@opstack, 'i '.(pos()-1).' E this'); })
-            (?&__CallingConvention__)
-            (?:
-              @
-              |
-              (?&__DataTypeNotInArgs__)
-            )
-            (?&__ArgsZTerminated__)
-          |
-          # Functions
-          [YZ]
-            (?&__CallingConvention__)
-            (?:
-              @
-              |
-              (?&__DataTypeNotInArgs__)
-            )
-            (?&__ArgsZTerminated__)
-          |
-          # Template
-          \$ (?&__Identifier__) (?&__ArgsNonZTerminated__)
-        )
-        |
-        # pooled string literals
-        \?_C\@_[01](?&__Number__)(?&__32BitChecksum__)(?&__StringLiteralText__)@
-      )
-      /x;
-
-    while (my $op = pop(@opstack))
-      {
-        # print STDERR "op=$op\n";
-        my @a = split (' ', $op);
-        if ($a[0] eq 'i') {
-          substr($_,$a[1],0) = $a[2];
-        } elsif ($a[0] eq 'r') {
-          substr($_,$a[1],$a[2]) = $a[3];
-        }
-      }
-
-    print;
-  }
diff --git a/solenv/bin/rmdir.pl b/solenv/bin/rmdir.pl
deleted file mode 100644
index 8b4789b0c..000000000
--- a/solenv/bin/rmdir.pl
+++ /dev/null
@@ -1,46 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-my $r_code=0;
-if ( ! defined $ARGV[0] || "$ARGV[0]" eq "" ) {
-    print STDERR "Nothing to delete\n";
-    exit 1;
-}
-while ( defined $ARGV[0] ) {
-if ( rmdir $ARGV[0] ) {
-#    exit 0;
-} else {
-    print STDERR "ERROR removing $ARGV[0]: $!\n";
-    $r_code = 1;
-}
-shift @ARGV;
-}
-exit $r_code;
-
diff --git a/solenv/bin/rpm-wrapper b/solenv/bin/rpm-wrapper
deleted file mode 100755
index f4234a9c5..000000000
--- a/solenv/bin/rpm-wrapper
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-# At least on v20z-so3, when /so/env/bt_linux_libc2.11/DEV300/bin/rpm is called
-# and internally looks for a ld-linux.so.2, it picks up
-# /lib/tls/i686/cmov/ld-linux.so.2 and SIGSEGVs.  This is prevented by
-# adding /so/env/bt_linux_libc2.11/DEV300/lib to the LD_LIBRARY_PATH, thus
-# picking up the ld-linux.so.2 from there:
-
-set -e
-if [ "$OUTPATH" = "unxlngi6" ]
-then
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
-    ${BUILD_TOOLS?}/rpmbuild "$@"
-else
-if [ "$OUTPATH" = "unxlngx6" ]
-then
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
-    ${BUILD_TOOLS?}/rpmbuild "$@"
-else
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
-    ${BUILD_TOOLS?}/rpm "$@"
-fi
-fi
diff --git a/solenv/bin/slfl.pl b/solenv/bin/slfl.pl
deleted file mode 100755
index e139dddce..000000000
--- a/solenv/bin/slfl.pl
+++ /dev/null
@@ -1,176 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-# Description: Wrapper script to change '/' to '\' in command-line
-# arguments.
-
-#---------------------------------------------------------------------------
-# external modules
-use Text::ParseWords;
-
-# global vars
-@params = ();
-
-#---------------------------------------------------------------------------
-# procedures
-
-
-#----------------------------------------------------------
-# Function name: WinFormat
-# Description:   Format variables to Windows Format.
-# Arguments:     1. Variable (string) with one token
-# Return value:  Reformatted String
-#----------------------------------------------------------
-sub WinFormat {
-    my $variable = shift @_;
-
-    $variable =~ s!(.)/!$1\\!g; # Replace all but the leading slashes with backslashes
-
-    if ( defined $debug ) {
-        print(STDERR "WinFormat:\nresult:$variable\n");
-    }
-
-    return $variable;
-}
-
-#----------------------------------------------------------
-# Function name: replace_cyg
-# Description:   Process all arguments and change them to Windows Format.
-# Arguments:     Reference to array with arguments
-# Return value:  -
-#----------------------------------------------------------
-sub replace_cyg {
-    my $args = shift;
-    my( @cmd_file, @cmd_temp );
-    my $atchars;
-    foreach my $para ( @$args ) {
-        if ( $para =~ "^@" ) {
-            # it's a command file
-            if ( defined $debug ) {
-                print(STDERR "----------------------------\n");
-            }
-            ;
-            # Workaround, iz28717, keep number of @'s.
-            $para =~ s/(^\@+)//;
-            $atchars = $1;
-            $filename = $para;
-            if ( defined $debug ) {
-                print(STDERR "filename = $filename \n");
-            }
-            ;
-            # open this command file for reading
-            open(CMD, "$filename");
-            while ( <CMD> ) {
-                # Remove DOS lineendings. Bug in Cygwin / Perl?
-                $_ =~ s/\r//g;
-                # Remove lineendings and trailing spaces. ( Needed by &parse_line )
-                $_ =~ s/\n$//g;
-                $_ =~ s/\s+$//g;
-                # Fill all tokens into array
-                @cmd_temp = &parse_line('\s+', 1, $_ );
-                if ( $#cmd_temp > -1 ) {
-                    push( @cmd_file, @cmd_temp);
-                }
-            }
-            close(CMD);
-            # reformat all tokens
-            replace_cyg(\@cmd_file);
-            if ( defined $debug ) {
-                print(STDERR "Tokens processed:\n");
-            }
-            ;
-            foreach $i (@cmd_file) {
-                if ( defined $debug ) {
-                    print(STDERR "!".$i."!\n");
-                }
-                ;
-            }
-            # open this filename for writing (truncate) Textmode?
-            open(CMD, '>', $filename);
-            # write all tokens back into this file
-            print(CMD join(' ', @cmd_file));
-            close(CMD);
-            # convert '@filename' to dos style
-            $para = WinFormat( $para );
-            if ( defined $debug ) {
-                print(STDERR "----------------------------\n");
-            }
-            ;
-            if ( (defined $debug_light) or (defined $debug) ) {
-                print(STDERR "\nParameter in File:".join(' ', @cmd_file).":\n");
-            }
-            $para = $atchars.$para;
-        } else {
-            # it's just a parameter
-            if ( defined $debug ) {
-                print(STDERR "\nParameter:---${para}---\n");
-            }
-            ;
-            # If $tmp1 is empty then $para is a parameter.
-            my $is_no_para = 1;
-            # remove .exe and convert to lower case
-            $shortcommand = lc $command ;
-            $shortcommand =~ s/\.exe$//;
-            $shortcommand =~ /([^\/]+$)/;
-            $shortcommand = $1;
-            if ( $is_no_para ) {
-                $para = WinFormat($para);
-            }
-            if ( defined $debug ) {
-                print(STDERR "Converted line:${para}:\n" );
-            }
-        }                       # else
-    }                           # foreach loop
-}
-
-
-#---------------------------------------------------------------------------
-# main
-@params = @ARGV;
-
-$command = shift(@params);
-
-while ( $command =~ /^-/ )
-{
-    if ( $command eq "-dbg" ) {
-        $debug="true";
-    }
-    elsif ( $command eq "-ldbg" ) {
-        $debug_light="true";
-    }
-
-    $command = shift(@params);
-}
-
-if ( (defined $debug_light) or (defined $debug) ) { print( STDERR "Command: $command\n" ); }
-
-replace_cyg(\@params);
-if ( (defined $debug_light) or (defined $debug) ) { print(STDERR "\n---------------------\nExecute: $command @params\n----------------\n");};
-exec( "$command", @params) or die( "\nError: slfl.pl: executing $command failed!\n" );
-
diff --git a/solenv/bin/soirpm.sh b/solenv/bin/soirpm.sh
deleted file mode 100755
index f984bbec1..000000000
--- a/solenv/bin/soirpm.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-LIBRPMBUILD=$(find ${COMPATH} -name 'librpmbuild-4.1*' -print)
-# echo $(dirname $LIBRPMBUILD)
-LD_LIBRARY_PATH=$(dirname ${LIBRPMBUILD}) ${BUILD_TOOLS?}/rpm "$@"
-# LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
-# ${BUILD_TOOLS?}/rpm "$@"
diff --git a/solenv/bin/sort.pl b/solenv/bin/sort.pl
deleted file mode 100644
index 577ac4cf8..000000000
--- a/solenv/bin/sort.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# sort.pl - Simply sort the input from stdin and pipe it to stdout.
-#           The sort needs to be *independent* of the settings of 
-#           LC_ALL resp. LC_COLLATE
-#           
-
-use strict;
-# be explicit: we want the perl standard sorting regardless the locale
-no locale;
-              
-
-my @buffer;
-
-while(<>) {
-    push(@buffer, $_);
-}
-
-foreach (sort @buffer) {
-    print $_;
-}
diff --git a/solenv/bin/striplanguagetags.sh b/solenv/bin/striplanguagetags.sh
deleted file mode 100755
index a8834795e..000000000
--- a/solenv/bin/striplanguagetags.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-#take a .zip containing a flat hierarchy of odf files and strip out the
-#language and country tags in each of them and repack it all up
-#should convert templates so that documents based on them use
-#the default-document-language rather than the hardcoded lang-tag
-
-#All a bit hacky, but it should work
-
-tempfoo=`basename $0`
-
-XSL=`mktemp /tmp/${tempfoo}.XXXXXX`
-if [ $? -ne 0 ]; then
-    echo "$0: Can't create temp file, exiting..."
-    exit 1
-fi
-
-# On Windows, xsltproc is a non-Cygwin program, so we can't pass
-# a Cygwin /tmp path to it
-[ "$COM" == MSC ] && XSL=`cygpath -m -s $XSL`
-
-WRKDIR=`mktemp -d /tmp/${tempfoo}.XXXXXX`
-if [ $? -ne 0 ]; then
-    echo "$0: Can't create temp dir, exiting..."
-    exit 1
-fi
-
-cat > $XSL << EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
-
-<xsl:template match="node()|@*">
-  <xsl:copy>
-    <xsl:apply-templates select="@*|node()"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="@fo:language"/>
-<xsl:template match="@fo:country"/>
-
-</xsl:stylesheet>
-EOF
-
-unzip -q $1 -d $WRKDIR
-pushd $WRKDIR
-for a in *; do
-    unzip -qc $a styles.xml > styles.tmp
-    eval "$CALLXSLTPROC -o styles.xml $XSL styles.tmp"
-    zip -qr $a styles.xml
-    rm styles.xml styles.tmp
-done
-popd
-zip -qrj $1 $WRKDIR
-rm -rf $WRKDIR
-rm -f $XSL
diff --git a/solenv/bin/subsequenttests b/solenv/bin/subsequenttests
deleted file mode 100755
index 5052523cf..000000000
--- a/solenv/bin/subsequenttests
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-set -e
-${GNUMAKE} -sf ${SOLARSRC}/GNUmakefile.mk subsequentcheck $*
diff --git a/solenv/bin/touch.pl b/solenv/bin/touch.pl
deleted file mode 100644
index d13903d41..000000000
--- a/solenv/bin/touch.pl
+++ /dev/null
@@ -1,42 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-#
-# workaround for broken 4nt
-# internal touch command
-#
-
-foreach my $filename (@ARGV) {
-    open KKK, ">>$filename" or die "ERROR: cannot open $filename!\n";
-    $size=(stat($filename))[7];
-    print KKK "x";
-    truncate KKK, $size;
-    close KKK;
-}
-
diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl
deleted file mode 100644
index da0d0556c..000000000
--- a/solenv/bin/transform_description.pl
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/perl
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-parse_args();
-execute_args();
-exit(0);
-
-my $source = undef;
-my $dest = undef;
-my @languages = undef;
-
-sub parse_args
-{
-    # at most two arguments
-    explain(), exit(100) if ( $#ARGV > 1 );
-
-    # destination file is the second argument, if present
-    $dest = $ARGV[1] if ( $#ARGV > 0 );
-
-    # source file is the first argument if present
-    if ( $#ARGV > -1 )
-    {
-        $source = $ARGV[0];
-        if ( ! -f $source )
-        {
-            print STDERR "$source is not a valid file, aborting";
-            exit(101);
-        }
-    }
-
-    # check which languages to use
-    my $languages = $ENV{WITH_LANG};
-    if ( ( ! defined $languages ) || ( "$languages" eq "" ) )
-    {
-        print STDERR "$0: WITH_LANG not set or empty, defaulting to 'en-US'\n";
-        $languages = "en-US";
-    }
-    @languages = split ( ' ', $languages );
-}
-
-sub execute_args
-{
-    my @description = ();
-    if ( defined $source )
-    {
-        open SOURCE, "$source" || die "could not open $source: $?\n";
-        @description = <SOURCE>;
-        close SOURCE;
-    }
-    else
-    {
-        @description = <STDIN>;
-    }
-
-    if ( defined $dest )
-    {
-        open DEST, ">$dest" || die "could not open $dest for writing: $?\n";
-    }
-
-    foreach (@description)
-    {
-        chomp; s/\r//;
-
-        if ( /\#LANG\#/ )
-        {
-            foreach $lang ( @languages )
-            {
-                my $transformed = $_;
-                $transformed =~ s/\#LANG#/$lang/g;
-                if ( defined $dest )
-                {
-                    print DEST "$transformed\n";
-                }
-                else
-                {
-                    print STDOUT "$transformed\n";
-                }
-            }
-        }
-        else
-        {
-            if ( defined $dest )
-            {
-                print DEST "$_\n";
-            }
-            else
-            {
-                print STDOUT "$_\n";
-            }
-        }
-    }
-    
-    close DEST if ( defined $dest );
-}
-
-# explains the program's usage
-sub explain
-{
-    print STDOUT "usage:\n";
-    print STDOUT "  $0 [<description_file> [<output_file>]]\n";
-    print STDOUT "  transforms the given extension description file\n";
-    print STDOUT "\n";
-    print STDOUT "  If <output_file> is not given, STDOUT is used.\n";
-    print STDOUT "  If <description_file> is not given, STDIN is used.\n";
-    print STDOUT "\n";
-    print STDOUT "  The following transformations are done at the moment:\n";
-    print STDOUT "  - duplicate all lines containing #LANG#, for ever token of \$WITH_LANG\n";
-    print STDOUT "    replacing every occurrence of \$LANG with a token\n";
-    print STDOUT "\n";
-    print STDOUT "  And yes, the functionality of this script should be\n";
-    print STDOUT "  - moved to solenv/inc/tg_ext.mk\n";
-    print STDOUT "  - implemented as XSLT, to be much less error-prone\n";
-}
diff --git a/solenv/bin/unxmap-to-macosx-explist.awk b/solenv/bin/unxmap-to-macosx-explist.awk
deleted file mode 100644
index b791d46a2..000000000
--- a/solenv/bin/unxmap-to-macosx-explist.awk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Generate an exported symbols list out of a map file (as use on Linux/Solaris) in order to
-# build shared libraries on Mac OS X
-#
-# The below code fails may fail with 'perverted' mapfiles (using a strange line layout etc.)
-
-# Skip 'SECTION_NAME {' lines
-/^[\t ]*.*[\t ]*\{/ { next }
-
-# Skip 'global:' or 'local:' lines
-/global:/ || /local:/ { next }
-
-# Skip '*;' lines
-/^[\t ]*\*;[\t ]*/ { next }
-
-# Skip section end '}?;' lines
-/^[\t ]*\}[\t ]*.*[;]*/ { next }
-
-# Skip comment or empty lines
-/^[\t ]*#.*/ || /^[\t ]*$/ || /^$/ { next }
-
-# Echo all lines containing symbol names and prefix them with '_'
-# because symbols on Mac OS X start always with '__'
-{
-    # There may appear multiple symbols in one line
-    # e.g. "sym1; sym2; # and finally a comment"
-    # take this into account
-    for (i = 1; i <= NF ; i++) {
-	if ($i !~ /^[\t ]*#.*/) { # as long as the current field doesn't start with '#'
-	    gsub(/[\t ;]/, "", $i) # Remove leading spaces and trailing ';'
-	    printf("_%s\n",$i)
-	}
-	else { # ignore everything after a '#' (comment) sign
-	    break
-	}
-    }
-}
diff --git a/solenv/bin/zipdep.pl b/solenv/bin/zipdep.pl
deleted file mode 100755
index 42803310e..000000000
--- a/solenv/bin/zipdep.pl
+++ /dev/null
@@ -1,326 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# mapgen  - generate a dependencies file for zip commando 
-#
-use Cwd;
-
-#########################
-#                       #
-#   Globale Variablen   #
-#                       #
-#########################
-
-$zip_file = '';
-$R = '';
-$r = '';
-$exclude = '';
-$include = '';
-@given_patterns = ();	# patterns(files) list from command line
-%files_in_arch = ();
-@exc_patterns = (); 	# array of all patterns for files to be excluded
-@inc_patterns = (); 	# array of all patterns for files to be included
-%exc_files_hash = ();	# hash of files to be excluded (according to @exc_patterns)
-%inc_files_hash = ();	# hash of files to be included (according to @inc_patterns)
-$prefix = '';
-
-#### main ####
-
-&get_options;
-&get_zip_content;
-&write_zip_file;
-
-#### end of main procedure ####
-
-#########################
-#                       #
-#      Procedures       #
-#                       #
-#########################
-
-#
-# procedure writes zipdep file
-#
-sub write_zip_file {
-    my @dependencies = keys %files_in_arch;
-    if ($#dependencies != -1) {
-        print "\n". &convert_slashes($zip_file) . ' :';
-        foreach (@dependencies) {
-            next if (-d);
-            print " \\\n\t" . $prefix . &convert_slashes($_);
-        };
-        print "\n\n";
-    };
-};
-
-#
-# convert slashes
-#
-sub convert_slashes {
-    my $path = shift;
-    $path =~ s/\//\$\//g;
-    $path =~ s/\\/\$\//g;
-    return $path;
-};
-
-#
-# convert slashes to internal perl representation
-#
-sub perled_slashes {
-    my $path = shift;
-    $path =~ s/\\/\//g;
-    $path =~ s/\/+/\//g;
-    return $path;
-};
-
-#
-# Collect all files to zip in @patterns_array array
-#
-sub get_zip_content {
-    &get_zip_entries(\@given_patterns);
-    my $file_name = ''; 
-    foreach $file_name (keys %files_in_arch) {
-        if (-d $file_name) {
-            &get_dir_content($file_name, \%files_in_arch) if ($r || $R);
-            undef $files_in_arch{$file_name};
-        };
-    };
-    &remove_uncompliant(\@given_patterns) if ($R);
-    &get_patterns_files(\@exc_patterns, \%exc_files_hash) if ($exclude);
-    &get_patterns_files(\@inc_patterns, \%inc_files_hash) if ($include);
-    foreach my $file_name (keys %exc_files_hash) {
-        if (defined $files_in_arch{$file_name}) {
-            delete $files_in_arch{$file_name};
-            #print STDERR "excluded $file_name\n";
-        };
-    };
-    if ($include) {
-        foreach my $file_name (keys %files_in_arch) {
-            if (!(defined $inc_files_hash{$file_name})) {
-                delete $files_in_arch{$file_name};
-            };
-        };
-    }
-};
-
-#
-# Procedure removes from %files_in_arch all files which
-# are not compliant to patterns in @given_patterns
-#
-sub remove_uncompliant {
-    my $given_patterns = shift;
-    my @reg_exps = ();
-    my $pattern = '';
-    foreach $pattern (@$given_patterns) {
-        push(@reg_exps, &make_reg_exp($pattern));
-    };
-    # write file name as a value for the path(key)	
-    foreach my $file (keys %files_in_arch) {
-        next if (-d $file);
-        #print "$file\n"; 
-        if ($file =~ /[\\ | \/](.+)$/) {
-            $files_in_arch{$file} = $1;
-        } else {
-            $files_in_arch{$file} = $file;
-        };
-    };	
-    foreach $pattern (@reg_exps) {
-        foreach my $file (keys %files_in_arch) {
-            if (!($files_in_arch{$file} =~ /$pattern/)) {
-                delete $files_in_arch{$file};
-            #} else {
-            #	print "Complient: $file\n";
-            };
-        };
-    };
-};
-
-#
-# Procedure adds/removes to/from %files_in_arch all files, that are 
-# compliant to the patterns in array passed 
-#
-sub get_zip_entries {
-    if ($R) {
-        opendir DIR, '.';
-        my @dir_content = readdir(DIR);
-        close DIR;
-        foreach my $file_name(@dir_content) {
-            $file_name =~ /^\.$/ and next;
-            $file_name =~ /^\.\.$/ and next;
-            $files_in_arch{$file_name}++;
-            #print "included $file_name\n";
-        };
-    } else {
-        my $patterns_array = shift;
-        my $pattern = '';
-        foreach $pattern (@$patterns_array) {
-            if ((-d $pattern) || (-f $pattern)) {
-                $files_in_arch{$pattern}++;
-                next;
-            }
-            my $file_name = '';
-            foreach $file_name (glob $pattern) {
-                #next if (!(-d $file_name) || !(-f $file_name));
-                $files_in_arch{$file_name}++;
-            };
-        };
-    } 
-};
-
-#
-# Procedure converts given parameter to a regular expression
-#
-sub make_reg_exp {
-    my $arg = shift;
-    $arg =~ s/\\/\\\\/g;
-    $arg =~ s/\//\\\//g;
-    $arg =~ s/\./\\\./g;
-    $arg =~ s/\+/\\\+/g;
-    $arg =~ s/\{/\\\{/g;
-    $arg =~ s/\}/\\\}/g;
-    $arg =~ s/\*/\.\*/g;
-    $arg =~ s/\?/\./g;
-    #$arg = '/'.$arg.'/';
-    #print "Regular expression:	$arg\n";
-    return $arg;
-};
-
-#
-# Procedure retrieves shell pattern and converts them into regular expressions
-#
-sub get_patterns {
-    my $patterns = shift;
-    my $arg = '';
-    while ($arg = shift @ARGV) {
-        $arg =~ /^-/	and unshift(@ARGV, $arg) and return;
-        if (!$zip_file) {
-            $zip_file = $arg;
-            next;
-        };
-        $arg = &make_reg_exp($arg);
-        push(@$patterns, $arg);
-    };
-};
-
-#
-# Get all options passed
-#
-sub get_options {
-    my ($arg);
-    &usage() && exit(0) if ($#ARGV == -1);
-    while ($arg = shift @ARGV) {
-        $arg = &perled_slashes($arg);
-        #print STDERR "$arg\n";
-        $arg =~ /^-R$/			and $R = 1	and next;
-        $arg =~ /^-r$/			and $r = 1	and next;
-        $arg =~ /^-x$/			and $exclude = 1 and &get_patterns(\@exc_patterns) and next;
-        $arg =~ /^-i$/			and $include = 1 and &get_patterns(\@inc_patterns) and next;
-        $arg =~ /^-prefix$/		and $prefix = shift @ARGV					and next;
-        $arg =~ /^-b$/			and shift @ARGV					and next;
-        $arg =~ /^-n$/			and shift @ARGV					and next;
-        $arg =~ /^-t$/			and shift @ARGV					and next;
-        $arg =~ /^-tt$/			and shift @ARGV					and next;
-        $arg =~ /^-h$/			and &usage						and exit(0);
-        $arg =~ /^--help$/		and &usage						and exit(0);
-        $arg =~ /^-?$/			and &usage						and exit(0);
-        if ($arg =~ /^-(\w)(\w+)$/) {
-            unshift (@ARGV, '-'.$1);
-            unshift (@ARGV, '-'.$2);
-            next;
-        };
-# just ignore other switches...		
-        $arg =~ /^-(\w+)$/		and	next;
-        $arg =~ /^\/\?$/			and &usage						and exit(0);
-        $zip_file = $arg		and next if (!$zip_file);
-        push(@given_patterns, $arg);
-    };
-    &print_error('error: Invalid command arguments (do not specify both -r and -R)') if ($r && $R);
-    if ($r && ($#given_patterns == -1)) {
-        &print_error('no list specified');
-    };
-};
-
-#
-# Procedure fills out passed hash with files from passed dir
-# compliant to the pattern from @$patterns
-#
-sub get_patterns_files {
-    my $patterns_array = shift;
-    my $files_hash = shift;
-    my @zip_files = keys %files_in_arch;
-    foreach my $pattern (@$patterns_array) {
-        my @fit_pattern = grep /$pattern/, @zip_files;
-        foreach my $entry (@fit_pattern) {
-            $$files_hash{$entry}++;
-            #print "$entry\n";
-        };
-    };
-};
-
-#
-# Get dir stuff to pack
-#
-sub get_dir_content {
-    my $dir = shift;
-    my $dir_hash_ref = shift;
-    my $entry = '';
-    if (opendir(DIR, $dir)) {
-        my @prj_dir_list = readdir(DIR);
-        closedir (DIR);
-        foreach $entry (@prj_dir_list) {
-            $entry =~ /^\.$/ and next;
-            $entry =~ /^\.\.$/ and next;
-            
-            $entry = $dir . '/' . $entry;
-            # if $enry is a dir - read all its files,
-            # otherwise store $entry itself
-            if (-d $entry) {
-                &get_dir_content($entry, $dir_hash_ref);
-            } else {
-                $$dir_hash_ref{$entry}++;
-            };
-        };
-    };
-    return '1';
-};
-
-sub print_error {
-    my $message = shift;
-    print STDERR "\nERROR: $message\n";
-    exit (1);
-};
-
-sub usage {
-    print STDERR "      zipdep  [-aABcdDeEfFghjklLmoqrRSTuvVwXyz]     [-b path]\n";
-    print STDERR "      [-n suffixes]  [-t mmddyyyy]  [-tt mmddyyyy]  [  zipfile [\n";
-    print STDERR "      file1 file2 ...]] [-xi list]\n";
-}
-
diff --git a/solenv/doc/gbuild/doxygen.cfg b/solenv/doc/gbuild/doxygen.cfg
deleted file mode 100644
index 2345b58d5..000000000
--- a/solenv/doc/gbuild/doxygen.cfg
+++ /dev/null
@@ -1,1510 +0,0 @@
-# Doxyfile 1.5.8
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file 
-# that follow. The default is UTF-8 which is also the encoding used for all 
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
-# iconv built into libc) for the transcoding. See 
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = gbuild
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
-
-PROJECT_NUMBER         = 
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = ./output
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
-# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
-# Spanish, Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       = 
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH        = 
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like regular Qt-style comments 
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                = 
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Java. For instance, namespaces will be presented as packages, qualified 
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
-# sources. Doxygen will then generate output that is tailored for 
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it parses. 
-# With this tag you can assign which parser to use for a given extension. 
-# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
-# The format is ext=language, where ext is a file extension, and language is one of 
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
-# use: inc=Fortran f=C
-
-EXTENSION_MAPPING      = mk=IDL 
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
-# to include (a tag file for) the STL sources as input, then you should 
-# set this tag to YES in order to let doxygen match functions declarations and 
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
-# func(std::string) {}). This also make the inheritance and collaboration 
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to 
-# enable parsing support.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
-# Doxygen will parse them like normal C++ but will assume all classes use public 
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter 
-# and setter methods for a property. Setting this option to YES (the default) 
-# will make doxygen to replace the get and set methods by a property in the 
-# documentation. This will only work if the methods are indeed getting or 
-# setting a simple type. If this is not the case, or you want to show the 
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
-# is documented as struct, union, or enum with the name of the typedef. So 
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
-# with name TypeT. When disabled the typedef will appear as a member of a file, 
-# namespace, or class. And the struct will be named TypeS. This can typically 
-# be useful for C code in case the coding convention dictates that all compound 
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
-# determine which symbols to keep in memory and which to flush to disk. 
-# When the cache is full, less often used symbols will be written to disk. 
-# For small to medium size projects (<1000 input files) the default value is 
-# probably good enough. For larger projects a too small cache size can cause 
-# doxygen to be busy swapping symbols to and from disk most of the time 
-# causing a significant performance penality. 
-# If the system has enough physical memory increasing the cache will improve the 
-# performance by keeping more symbols in memory. Note that the value works on 
-# a logarithmic scale so increasing the size by one will rougly double the 
-# memory usage. The cache size is given by this formula: 
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = YES 
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be 
-# extracted and appear in the documentation as a namespace called 
-# 'anonymous_namespace{file}', where file will be replaced with the base 
-# name of the file that contains the anonymous namespace. By default 
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
-# hierarchy of group names into alphabetical order. If set to NO (the default) 
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
-# This will remove the Files entry from the Quick Index and from the 
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
-# Namespaces page. 
-# This will remove the Namespaces entry from the Quick Index 
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from 
-# the version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the program writes to standard output 
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    = 
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
-# doxygen. The layout file controls the global structure of the generated output files 
-# in an output format independent way. The create the layout file that represents 
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
-# of the layout file.
-
-LAYOUT_FILE            = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
-
-WARN_LOGFILE           = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-
-INPUT                  = solenv/gbuild
-
-# This tag can be used to specify the character encoding of the source files 
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-# also the default input encoding. Doxygen uses libiconv (or the iconv built 
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
-# the list of possible encodings.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS          = *.mk
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                = 
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix filesystem feature) are excluded 
-# from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = 
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the 
-# output. The symbol name can be a fully qualified name, a word, or if the 
-# wildcard * is used, a substring. Examples: ANamespace, AClass, 
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS        = 
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
-
-EXAMPLE_PATH           = 
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
-
-EXAMPLE_PATTERNS       = 
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
-
-IMAGE_PATH             = 
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output. 
-# If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
-
-INPUT_FILTER           = 
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis. 
-# Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match. 
-# The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
-# is applied to all files.
-
-FILTER_PATTERNS        = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES 
-# then for each documented function all documented 
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
-# link to the source code. 
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code 
-# will point to the HTML generated by the htags(1) tool instead of doxygen 
-# built-in source browser. The htags tool is part of GNU's global source 
-# tagging system (see http://www.gnu.org/software/global/global.html). You 
-# will need version 4.8.6 or higher.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER            = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
-# documentation will contain sections that can be hidden and shown after the 
-# page has loaded. For this to work a browser that supports 
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files 
-# will be generated that can be used as input for Apple's Xcode 3 
-# integrated development environment, introduced with OSX 10.5 (Leopard). 
-# To create a documentation set, doxygen will generate a Makefile in the 
-# HTML output directory. Running make will produce the docset in that 
-# directory and running "make install" will install the docset in 
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
-# it at startup. 
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-
-GENERATE_DOCSET        = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
-# feed. A documentation feed provides an umbrella under which multiple 
-# documentation sets from a single provider (such as a company or product suite) 
-# can be grouped.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
-# should uniquely identify the documentation set bundle. This should be a 
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID       = org.openoffice.gbuild
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
-# written to the html output directory.
-
-CHM_FILE               = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
-# content.
-
-CHM_INDEX_ENCODING     = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
-# are set, an additional index file will be generated that can be used as input for 
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
-# HTML documentation.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
-# be used to specify the file name of the resulting .qch file. 
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE               = 
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE          = 
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
-# For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME   = 
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS  = 
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
-# filter section matches. 
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS  = 
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
-# be used to specify the location of Qt's qhelpgenerator. 
-# If non-empty doxygen will try to run qhelpgenerator on the generated 
-# .qhp file.
-
-QHG_LOCATION           = 
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
-# structure should be generated to display hierarchical information. 
-# If the tag value is set to FRAME, a side panel will be generated 
-# containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature. Other possible values 
-# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
-# and Class Hierarchy pages using a tree view instead of an ordered list; 
-# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
-# disables this behavior completely. For backwards compatibility with previous 
-# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
-# respectively.
-
-GENERATE_TREEVIEW      = NONE
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-# Use this tag to change the font size of Latex formulas included 
-# as images in the HTML documentation. The default is 10. Note that 
-# when you change the font size after a successful doxygen run you need 
-# to manually remove any form_*.png images from the HTML output directory 
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE       = 10
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
-
-GENERATE_LATEX         = YES
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    = 
-
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader. 
-# This is useful 
-# if you want to understand what is going on. 
-# On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
-
-INCLUDE_PATH           = 
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
-
-INCLUDE_FILE_PATTERNS  = 
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
-
-PREDEFINED             = 
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#  
-# TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#  
-# TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links. 
-# Note that each tag file must have a unique name 
-# (where the name does NOT include the path) 
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       = 
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option is superseded by the HAVE_DOT option below. This is only a 
-# fallback. It is recommended to install and use dot, since it yields more 
-# powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see 
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
-# the mscgen tool resides. If left empty the tool is assumed to be found in the 
-# default search path.
-
-MSCGEN_PATH            = 
-
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = NO
-
-# By default doxygen will write a font called FreeSans.ttf to the output 
-# directory and reference it in all dot files that doxygen generates. This 
-# font does not include all possible unicode characters however, so when you need 
-# these (or just want a differently looking font) you can specify the font name 
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
-# which can be done by putting it in a standard location or by setting the 
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
-# containing the font.
-
-DOT_FONTNAME           = FreeSans
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
-# The default size is 10pt.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the output directory to look for the 
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
-# different font using DOT_FONTNAME you can set the path where dot 
-# can find it using this tag.
-
-DOT_FONTPATH           = 
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
-# Language.
-
-UML_LOOK               = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
-# doxygen will generate a call dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable call graphs 
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
-# doxygen will generate a caller dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable caller 
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include 
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif 
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH               = 
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
-
-DOTFILE_DIRS           = 
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
-# nodes that will be shown in the graph. If the number of nodes in a graph 
-# becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the 
-# number of direct children of the root node in a graph is already larger than 
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that the size of a graph can be further restricted by 
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, because dot on Windows does not 
-# seem to support this out of the box. Warning: Depending on the platform used, 
-# enabling this option may lead to badly anti-aliased labels on the edges of 
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Options related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/solenv/doc/gbuild/solenv/gbuild/alllangres.mk b/solenv/doc/gbuild/solenv/gbuild/alllangres.mk
deleted file mode 100644
index 8d5034e88..000000000
--- a/solenv/doc/gbuild/solenv/gbuild/alllangres.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#include <types.h>
-
-namespace gb
-{
-    class SrsTarget;
-    class ResTarget;
-    class AllLangResTarget;
-
-    class SrsPartTarget : public Target, public HasDependencies, public UsesRsc
-    {
-        private:
-            /// SrsPartTarget s do not need to be explicitly constructed.
-
-            /// They are a helper class for the SrsTarget class.
-            /// They are named after the path of their source file (without
-            /// file extension) from the root of their source repository.
-            SrsPartTarget(String name);
-            friend class SrsTarget;
-
-            /// Platformdependant command to generate the dependencies for the srs target.
-            static const Command command_dep(
-                String srsname,
-                Path sourcefile,
-                List<Path> include,
-                List<String> defs);
-    };
-
-    class SrsTarget : public Target, public HasDependencies, public IsCleanable
-    {
-        public:
-            /// Sets defines for srs processing.
-            /// \$\$(DEFS) contains the current flags and can be used, if
-            /// just a few need to be modified.
-            void set_defs(List<String> defs);
-            /// Sets the include paths for srs processing.
-            /// \$\$(INCLUDE) contains the current paths and can be used, if
-            /// just a few need to be modified.
-            void set_include(List<String> include);
-            /// Adds a SrsPartTarget to be processed.
-            void add_file(SrsPartTarget part);
-            /// Adds multiple SrsPartTarget s to be processed.
-            void add_files(List<SrsPartTarget> parts);
-        private:
-            /// SrsTarget s do not need to be explicitly constructed.
-
-            /// They are a helper class for the ResTarget class.
-            SrsTarget(String name);
-            friend class ResTarget;
-
-            List<String> DEFS;
-            List<String> INCLUDE
-            List<SrsPartTarget> PARTS;
-            static const List<String> DEFAULTDEFS;
-    };
-
-    class ResTarget : public Target, public IsCleanable, public HasSrs
-    {
-        public:
-            void add_file(Path file);
-            void add_files(List<Path> files);
-        private:
-            /// ResTarget do not need to be explicitly constructed.
-
-            /// They are a helper class for the AllLangResTarget class.
-            ResTarget(String name, String library, Language lang, Path reslocation);
-            friend class AllLangResTarget;
-
-            String LIBRARY;
-            Language LANGUAGE;
-            Path RESLOCATION;
-    };
-
-    class AllLangResTarget : public Target, public IsCleanable, public HasSrs
-    {
-        public:
-            AllLangResTarget(String name);
-            /// Sets the location where resources are to be found. reslocation is a path relative to the default_images directory.
-            /// Resources will be found in reslocation itself and in the subdirectories res/ and imglst/ of it and again in subdirectories
-            /// of those named as the language of the processed resource. In addition, resources are found in the res/ directory directly
-            /// below default_images and the subdirectory of it named as the language of the processed resource.
-            void set_reslocation(Path reslocation);
-        private:
-            /// Sets the languages for which to create resources.
-            static void set_langs(List<Language> langs);
-
-            /// The list of languages that need to be build.
-            static List<Language> LANGS;
-    };
-}
-/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/executable.mk b/solenv/doc/gbuild/solenv/gbuild/executable.mk
deleted file mode 100644
index 8f7fcc9b0..000000000
--- a/solenv/doc/gbuild/solenv/gbuild/executable.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <types.h>
-
-namespace gb
-{
-    using namespace types;
-
-    class LinkTarget;
-
-    class Executable : public IsCleanable, public HasDependencies, public IsLinking, public DeliversHeaders, public HasCompileSettings, public Target
-    {
-        public:
-            Executable(String name);
-
-        private:
-            /// private helper function for the constructor
-            void Executable_impl(LinkTarget library_linktarget);
-            /// platformdependant additional setup for constructor (used on Windows only)
-            void Executable_platform(LinkTarget library_linktarget);
-            /// helper function to wrap LinkTargets functions (this is more or less pimpl ...)
-            void forward_to_linktarget(Function f);
-
-            static const List<String> TARGETTYPEFLAGS;
-    };
-}
-/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
deleted file mode 100644
index 2b65f3fce..000000000
--- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-
-#include <types.mk>
-using namespace gb::types;
-
-// GNU make specific setup
-static const Command SHELL;
-
-
-// gbuild root directorys
-static Path SRCDIR;
-static Path OUTDIR;
-static Path WORKDIR;
-
-// Expected from configure/environment
-static const Integer OSL_DEBUG_LEVEL;
-static const List<Path> JDKINCS;
-static const List<Path> SOLARINC;
-static const List<Path> SOLARLIB;
-static const Path GBUILDDIR;
-static const Path INPATH;
-static const Path JAVA_HOME;
-static const Path UPD;
-static const String LIBXML_CFLAGS;
-static const String OS;
-static const String STLPORT_VER;
-static const Bool DEBUG;
-static const Bool PRODUCT;
-
-// gbuild global variables derived from the configure/environment
-// some of these are defined per platform
-namespace gb
-{
-    /// building with generated dependencies
-    static const Bool FULLDEPS;
-    /// product build or non-product build with additional assertions and tests
-    static const Bool PRODUCT;
-    /// command to run awk scripts
-    static const Command AWK;
-    /// command to compile c source files
-    static const Command CC;
-    /// command to compile c++ source files
-    static const Command CXX;
-    /// command to process input with a gcc compatible preprocessor
-    static const Command GCCP;
-    /// command to link objects on the microsoft toolchain
-    static const Command LINK;
-    /// command to create a unique temporary file
-    static const Command MKTEMP;
-    /// debuglevel:
-    /// 0=no debugging,
-    /// 1=non-product build,
-    /// 2=debugging build (either product or nonproduct)
-    static const Integer DEBUGLEVEL;
-    /// compiler specific optimization flags
-    static const List<String> COMPILEROPTFLAGS;
-    /// default c compilation compiler flags
-    static const List<String> CFLAGS;
-    /// compiler specific defines
-    static const List<String> COMPILERDEFS;
-    /// cpu-specific default defines
-    static const List<String> CPUDEFS;
-    /// default c++ compilation compiler flags
-    static const List<String> CXXFLAGS;
-    /// platform- and compilerindependent default defines
-    static const List<String> GLOBALDEFS;
-    /// default objective c++ compilation compiler flags
-    static const List<String> OBJCXXFLAGS;
-    /// platfomspecific default defines
-    static const List<String> OSDEFS;
-    /// ?
-    static const Path SDKDIR;
-};
-
-// GXX_INCLUDE_PATH (Linux)
-// PTHREAD_CFLAGS (Linux)
-// SYSTEM_ICU (Linux)
-// SYSTEM_JPEG (Linux)
-// SYSTEM_LIBXML (Linux)
-// USE_SYSTEM_STL (Linux)
-
-/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/helper.mk b/solenv/doc/gbuild/solenv/gbuild/helper.mk
deleted file mode 100644
index 3fa666b85..000000000
--- a/solenv/doc/gbuild/solenv/gbuild/helper.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <types.h>
-
-String NEWLINE;
-String COMMA;
-
-namespace gb
-{
-    using namespace types;
-
-    class Helper
-    {
-        public:
-            /// Abbreviates the common directory roots in a command
-            static Command abbreviate_dirs(Command c);
-            /// Announces the start/end of an task.
-            static void announce(String announcement);
-            /// Creates the default get_clean_target() function for the type.
-            static void make_clean_target(TargetType t);
-            /// Creates the default get_clean_target() function for the types.
-            static void make_clean_targets(List<TargetType> ts);
-            /// Creates the default get_dep_target() function for the type.
-            static void make_dep_target(TargetType t);
-            /// Creates the default get_dep_target() function for the types.
-            static void make_dep_targets(List<TargetType> ts);
-            /// Creates the default get_dep_target() function for the type modifying the \$(OUTDIR).
-            static void make_outdir_clean_target(TargetType t);
-            /// Creates the default get_dep_target() function for types modifying the \$(OUTDIR).
-            static void make_outdir_clean_targets(List<TargetType> ts);
-            /// Returns the clean target of a target modifying the \$(OUTDIR).
-            static Path get_outdir_clean_target(Path target);
-
-            /// The path to a zero length file.
-            static const Path NULLFILE;
-            /// The path to the misc directory for temporary files etc.
-            static const Path MISC;
-            /// The path to a phony target, that is always outdated.
-            static const Path PHONY;
-            /// Internally used dummy file. 
-            static const Path MISCDUMMY;
-    };
-}
-/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/library.mk b/solenv/doc/gbuild/solenv/gbuild/library.mk
deleted file mode 100644
index eba19a861..000000000
--- a/solenv/doc/gbuild/solenv/gbuild/library.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <types.h>
-
-namespace gb
-{
-    using namespace types;
-
-    class LinkTarget;
-
-    class Library : public IsCleanable, public HasDependencies, public IsLinking, public DeliversHeaders, public HasCompileSettings, public Target
-    {
-        public:
-            Library(String name);
-            /// Returns how the library is named in the filesystem on the current platform.
-            /// Library filename schemes are defined in solenv/gbuild/libnames.mk (with some platformdependant hacks in solenv/gbuild/platform/*.mk.
-
-            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
-            Path get_filename();
-
-        private:
-            /// private helper function for the constructor
-            void Library_impl(LinkTarget library_linktarget);
-            /// platformdependant additional setup for constructor (used on Windows only)
-            void Library_platform(
-                LinkTarget library_linktarget,
-                Path dllfile);
-            /// helper function to wrap LinkTargets functions (this is more or less pimpl ...)
-            void forward_to_linktarget(Function f);
-
-            /// List of buildable libraries (i.e. libraries that are not expected to exist outside of \$(OUTDIR) on the system).
-            static const List<Library> TARGETS;
-            /// List of additional defines for compiling objects for libraries
-            static const List<String> DEFS;
-            /// List of additional flags for linking a library
-            static const List<String> TARGETTYPEFLAGS;
-            /// Mapping from symbolic library names to dll filenames
-            static const Map<Library,Path> DLLFILENAMES;
-            /// Mapping from symbolic library names to filenames
-            static const Map<Library,Path> FILENAMES;
-    };
-}
-/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/linktarget.mk b/solenv/doc/gbuild/solenv/gbuild/linktarget.mk
deleted file mode 100644
index 5fb7ead86..000000000
--- a/solenv/doc/gbuild/solenv/gbuild/linktarget.mk
+++ /dev/null
@@ -1,128 +0,0 @@
-#include <types.h>
-
-namespace gb
-{
-    using namespace types;
-
-    class LinkTarget;
-    class Library;
-    class StaticLibrary;
-    class SdiTarget;
-    class Package;
-
-    /// CObjects are never used standalone. They only exist as part of a 
-    /// LinkTarget.
-    class CObject : public HasSource, public HasDependencies, public Target
-    {
-        public:
-            Path get_source();
-        private:
-            /// CObjects do not need to be explicitly constructed.
-            /// They are named after the path of their source file (without
-            /// file extension) from the root of their source repository.
-            CObject(String name);
-            friend class LinkTarget;
-
-            /// Platformdependent command to compile a plain C object.
-            static const Command command(
-                Path objectfile,
-                String name,
-                Path sourcefile,
-                List<String> defs,
-                List<String> cxxflags,
-                List<Path> include);
-            /// Platformdependent command to generate plain C object dependencies.
-            static const Command command_dep(
-                Path depfile,
-                String name,
-                Path sourcefile,
-                List<String> defs,
-                List<String> cxxflags,
-                List<Path> include);
-    };
-
-    /// CxxObjects are never used standalone. They only exist as part of a 
-    /// LinkTarget.
-    class CxxObject : public HasSource, public HasDependencies, public Target
-    {
-        public:
-            Path get_source();
-        private:
-            /// CxxObjects do not need to be explicitly constructed.
-            /// They are named after the path of their source file (without
-            /// file extension) from the root of their source repository.
-            CxxObject(String name);
-            friend class LinkTarget;
-
-            /// Platformdependent command to compile a C++ object.
-            static const Command command(
-                Path objectfile,
-                String name,
-                Path sourcefile,
-                List<String> defs,
-                List<String> cxxflags,
-                List<Path> include);
-            /// Platformdependent command to generate C++ object dependencies.
-            static const Command command_dep(
-                Path objectfile,
-                String name,
-                Path sourcefile,
-                List<String> defs,
-                List<String> cxxflags,
-                List<Path> include);
-    };
-
-    class LinkTarget : public IsCleanable, public HasDependencies, public IsLinking, public DeliversHeaders, public HasCompileSettings, public Target
-    {
-        public:
-            LinkTarget(String name);
-
-        private:
-            void get_external_headers_check();
-            void add_internal_headers(const List<Target>& internal_headers);
-
-            /// @warning Evil Hack: SELF is set to the name of the LinkTarget
-            /// in the constructor. If SELF is not set to the LinkTarget name in
-            /// the execution of the header rule, the LinkTarget is used (linked
-            /// against) but was never defined. This might work out, if the
-            /// LinkTarget has been provided by other means (for example:
-            /// build.pl/dmake), but it should never happen in a project where
-            /// all LinkTarget s are controlled by gbuild.
-            LinkTarget& SELF;
-            List<CObject> COBJECTS;
-            List<CxxObject> CXXOBJECTS;
-            List<Library> LINKED_LIBS;
-            List<Path> AUXTARGETS;
-            List<Path> INCLUDE;
-            List<Path> INCLUDE_STL;
-            List<StaticLibrary> LINKED_STATIC_LIBS;
-            List<String> CFLAGS;
-            List<String> CXXFLAGS;
-            List<String> DEFS;
-            List<String> LDFLAGS;
-            List<String> TARGETTYPE_FLAGS;
-            Path DLLTARGET;
-
-            /// Platformdependent command for linking.
-            static const Command command (
-                Path linktargetfile,
-                String linktargetname,
-                List<String> linkflags,
-                List<Library> linked_libs,
-                List<StaticLibrary> linked_static_libs,
-                List<CObject> cobjects,
-                List<CxxObject> cxxobjects);
-            /// Command to collect all dependencies of this LinkTarget.
-            static const Command command_dep(
-                Path depfile,
-                String linktargetname,
-                List<CObject> cobjects,
-                List<CxxObject> cxxobjects);
-            static const List<String> DEFAULTDEFS;
-            static const List<String> CXXFLAGS;
-            static const List<String> LDFLAGS;
-            static const List<Path> INCLUDE;
-            static const List<Path> INCLUDE_STL;
-    };
-}
-/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/package.mk b/solenv/doc/gbuild/solenv/gbuild/package.mk
deleted file mode 100644
index 53daeb5c8..000000000
--- a/solenv/doc/gbuild/solenv/gbuild/package.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <types.h>
-
-namespace gb
-{
-    using namespace types;
-    class PackagePart
-    {
-        private:
-            /// PackagePart s do not need to be explicitly constructed.
-            /// They are named after the path of their source file (without
-            /// file extension) from the root of their source repository.
-            PackagePart(String name, Path Source);
-            friend Package;
-            /// Returns a list of aboslute paths where files are copied to with the PackagePart class.
-
-            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
-            static const List<Path> get_destinations();
-    };
-
-    class Package : public Target, public IsCleanable
-    {
-        public:
-            /// Creates a new package that copies files from source_dir to the \$(OUTDIR).
-            Package(String name, Path source_dir);
-            /// Adds a file to the package. destination is the relative path in
-            /// the \$(OUTDIR) and source is the relative path in the source_dir.
-            add_file(Path destination, Path source);
-    }
-}
-/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/sdi.mk b/solenv/doc/gbuild/solenv/gbuild/sdi.mk
deleted file mode 100644
index f9f913fb1..000000000
--- a/solenv/doc/gbuild/solenv/gbuild/sdi.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <types.h>
-
-namespace gb
-{
-    using namespace types;
-
-    class SdiTarget : public Target, public IsCleanable
-    {
-        public:
-            /// Creates a new SdiTarget. 
-            SdiTarget(String name, String exports);
-            /// Sets the include paths for this SdiTarget.
-            set_include(List<Path> includes);
-        private:
-            /// The command to execute svidl.
-            static const Command SVIDLCOMMAND;
-            /// The target on with to depend to make sure the svidl executable is available.
-            static const Path SVIDLTARGET;
-            /// The target on with to depend to make sure the auxiliary files (libraries etc.) for the svidl executable are available.
-            static const Path SVIDLAUXDEPS;
-    };
-}
-/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/static_library.mk b/solenv/doc/gbuild/solenv/gbuild/static_library.mk
deleted file mode 100644
index 787c6e732..000000000
--- a/solenv/doc/gbuild/solenv/gbuild/static_library.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <types.h>
-
-namespace gb
-{
-    using namespace types;
-
-    class LinkTarget;
-
-    class StaticLibrary : public IsCleanable, public HasDependencies, public IsLinking, public DeliversHeaders, public HasCompileSettings, public Target
-    {
-        public:
-            StaticLibrary(String name);
-            /// Returns how the library is named in the filesystem on the current platform.
-            /// StaticLibrary filename schemes are defined in solenv/gbuild/libnames.mk (with some platformdependant hacks in solenv/gbuild/platform/*.mk.
-
-            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
-            Path get_filename();
-
-        private:
-            /// private helper function for the constructor
-            void StaticLibrary_impl(LinkTarget library_linktarget);
-            /// helper function to wrap LinkTargets functions (this is more or less pimpl ...).
-            void forward_to_linktarget(Function f);
-
-            /// List of buildable static libraries (i.e. static libraries that are not expected to exist outside of \$(OUTDIR) on the system).
-            static const List<StaticLibrary> TARGETS;
-            /// List of additional defines for compiling objects for static libraries
-            static const List<String> DEFS;
-            /// List of additional flags for linking a static library
-            static const List<String> TARGETTYPEFLAGS;
-            /// Mapping from symbolic static library names to filenames
-            static const Map<StaticLibrary,Path> FILENAMES;
-            /// location to place static libraries in the \$(OUTDIR)
-            static const Path OUTDIRLOCATION;
-            /// platformdependant file extension for static libraries
-            static const String PLAINEXT;
-    };
-}
-/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/types.mk b/solenv/doc/gbuild/solenv/gbuild/types.mk
deleted file mode 100644
index ecb736834..000000000
--- a/solenv/doc/gbuild/solenv/gbuild/types.mk
+++ /dev/null
@@ -1,169 +0,0 @@
-namespace gb {
-    class CObject;
-    class CxxObject;
-    class Library;
-    class StaticLibrary;
-    class Package;
-    class SdiTarget;
-};
-
-namespace gb { namespace types
-{
-    /// A type of target, with its set of rules etc., as used in the build system.
-    class TargetType {};
-    /// A plain old string.
-    class String {};
-    /// A partial, relative or absolute filesystem path.
-    class Path {};
-    /// A target to be build.
-    class Target
-    {
-        public:
-            /// The absolute filesystem path representing the target.
-
-            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
-            Path get_target();
-    };
-    /// A partial or complete shell-command.
-    class Command {};
-    /// A integer number.
-    class Integer {};
-    /// A boolean value.
-
-    /// There are const boolean values true and false for
-    /// comparisons (written as $(true) and $(false) in makefiles.
-    class Bool {};
-    /// A language (for localisation)
-
-    /// A language represented by its ISO 639-1:2002 code.
-    class Language {};
-    /// A List of objects.
-
-    /// A List of objects represented by a whitespace separated list
-    /// in makefiles.
-    template <typename T>
-        class List<T> {};
-
-    /// A Mapping from with a key of type K and a value of type V
-
-    /// A Mapping is represented by a whitespace separated list
-    /// of key-value pairs. Key and value are separated by a colon (:).
-    template <typename K, typename V>
-        class Map<K,V> {};
-    /// A target that can be cleaned.
-    class IsCleanable
-    {
-        public:
-            /// The (phony) absolute filesystem path to clean the target.
-
-            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
-            Path get_clean_target();
-    };
-    /// A target that has generated dependencies.
-    class HasDependencies
-    {
-        public:
-            /// The absolute filesystem path to the file containing the dependencies.
-
-            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
-            Path get_dep_target();
-    };
-    /// A target that has a source file from which it is generated.
-    class HasSource
-    {
-        public:
-            /// The absolute filesystem path to the source file.
-            Path get_source();
-    };
-    /// A target that links objects and libraries.
-    class IsLinking
-    {
-        public:
-            /// Add a CObject to be compiled and linked.
-            void add_cobject(CObject cobject);
-            /// Add multiple CObject s to be compiled and linked.
-            void add_cobjects(List<CObject> cobjects);
-            /// Add a CxxObject to be compiled and linked.
-            void add_cxxobject(CxxObject cobject);
-            /// Add multiple CxxObject s to be compiled and linked.
-            void add_cxxobjects(List<CxxObject> cobjects);
-            /// Add multiple CxxObject s to be compiled and linked (with exceptions enabled).
-            void add_exception_objects(List<CxxObject> cobject);
-            /// Add libraries to link against dynamically.
-            void add_linked_libs(List<Library> linked_libs);
-            /// Add libraries to link against statically.
-            void add_linked_static_libs(List<StaticLibrary> linked_static_libs);
-            /// Add multiple CxxObject s to be compiled and linked (without exceptions enabled).
-            /// @deprecated We should not care about disabling exception.
-            void add_noexception_objects(List<CxxObject> cobject);
-            /// Set auxiliary files that are produced by linking (for cleanup and copying).
-            void set_auxtargets(List<Path> auxtargets);
-            /// Set the location for the produced DLL (used on Windows only).
-            void set_dll_target(Path dlltarget);
-            /// Set additional flags for the link command.
-            void set_ldflags(List<Path> ldflags);
-    };
-    /// A target that delivers headers of some kind.
-    class DeliversHeaders
-    {
-        public:
-            /// The absolute filesystem path which is touched when all headers for this target are prepared.
-
-            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
-            Path get_headers_target();
-            /// The absolute filesystem path which is touched when all external headers for this target are prepared.
-
-            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
-            Path get_external_headers_target();
-            /// Add multiple Packages that need to be delivered/generated
-            /// before compilation or dependency generation can start.
-            void add_package_headers(List<Package> packages);
-            /// Add multiple SdiTargets that need to be delivered/generated
-            /// before compilation or dependency generation can start.
-            void add_sdi_headers(List<SdiTarget> sdis);
-    };
-    /// A target where settings for the compilation can be set.
-    class HasCompileSettings
-    {
-        public:
-            /// Sets flags for plain C compilation.
-            /// \$\$(CFLAGS) contains the current flags and can be used if
-            /// just a few need to be modified.
-            void set_cflags(List<String> cflags);
-            /// Sets flags for C++ compilation.
-            /// \$\$(CXXFLAGS) contains the current flags and can be used if
-            /// just a few need to be modified.
-            void set_cxxflags(List<String> cxxflags);
-            /// Sets defines for C/C++ compilation.
-            /// \$\$(DEFS) contains the current flags and can be used if
-            /// just a few need to be modified.
-            void set_defs(List<String> defs);
-            /// Sets the include paths for C/C++ compilation.
-            /// \$\$(INCLUDE) contains the current paths and can be used if
-            /// just a few need to be modified.
-            void set_include(List<Path> include);
-            /// Sets the stl include paths for C++ compilation.
-            /// \$\$(INCLUDE_STL) contains the current paths and can be used if
-            /// just a few need to be modified.
-            void set_include_stl(List<Path> include_stl);
-    };
-    /// A target using the resource compiler
-    class UsesRsc
-    {
-        public:
-            /// The command to execute rsc.
-            static const Command RSCCOMMAND;
-            /// The target on with to depend to make sure the rsc executable is available.
-            static const Path RSCTARGET;
-    };
-    /// A target processing a set of srs files
-    class HasSrs
-    {
-        public:
-            /// Add a SrsTarget to be processed.
-            void add_one_srs(SrsTarget srs);
-            /// Add multiple SrsTarget s to be processed.
-            void add_srs(List<SrsTarget> srs);
-    };
-}};
-/* vim: set filetype=cpp : */
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
deleted file mode 100644
index 7999e0322..000000000
--- a/solenv/gbuild/AllLangResTarget.mk
+++ /dev/null
@@ -1,422 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# Overview of dependencies and tasks of SrsTarget
-#
-# target                task                depends on
-# SrsTarget             joining the parts   SrsPartTarget
-#                                           SrsTemplateTarget
-# SrsPartTarget         preprocessing       SrsPartMergeTarget (with l10n)
-#                                           source file (without l10n)
-# SrsTemplateTarget     handling templates  SrsTemplatePartTarget
-# SrsTemplatePartTarget handling template   SrsPartMergeTarget
-# SrsPartMergeTarget    merging/transex     source file (only needed with l10n)
-
-# Overview of dependencies and tasks of AllLangResTarget
-#
-# target                task                depends on
-# AllLangResTarget      nothing             ResTarget for all active langs
-# ResTarget             running rsc         SrsTarget, resources
-
-
-# SrsPartMergeTarget class
-
-gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target_for_build,transex3)
-# gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
-
-gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
-gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
-gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
-
-define gb_SrsPartMergeTarget__command
-$(call gb_Output_announce,$(3),$(true),srs,1)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-		-p $(firstword $(subst /, ,$(2))) \
-		-i $(realpath $(3)) \
-		-o $(1) \
-		-m $(SDF) \
-		-l all)
-
-endef
-
-define gb_SrsPartMergeTarget__rules
-$$(call gb_SrsPartMergeTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartMergeTarget_TRANSEXTARGET)
-	$$(if $$(SDF),$$(call gb_SrsPartMergeTarget__command,$$@,$$*,$$<),mkdir -p $$(dir $$@) && cp $$< $$@)
-
-endef
-
-$(foreach repo,$(gb_SrsPartMergeTarget_REPOS),$(eval $(call gb_SrsPartMergeTarget__rules,$(repo))))
-
-# SrsPartTarget class
-
-gb_SrsPartTarget_REPOS := $(gb_REPOS)
-# defined by platform
-#  gb_SrsPartTarget_RSCTARGET
-#  gb_SrsPartTarget_RSCCOMMAND
-#  gb_SrsPartTarget__command_dep
-
-define gb_SrsPartTarget__command
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
-	RESPONSEFILE=`$(gb_MKTEMP)` && \
-	echo "-s \
-		$(INCLUDE) \
-		-I$(realpath $(dir $(3))) \
-		$(DEFS) \
-		-fp=$(1) \
-		$(realpath $(if $(MERGEDFILE),$(MERGEDFILE),$<))" > $${RESPONSEFILE} && \
-	$(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
-	rm -rf $${RESPONSEFILE})
-
-endef
-
-define gb_SrsPartTarget__rules
-$$(call gb_SrsPartTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartTarget_RSCTARGET)
-	$$(call gb_SrsPartTarget__command_dep,$$*,$$<)
-	$$(call gb_SrsPartTarget__command,$$@,$$*,$$<)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_SrsPartTarget_get_dep_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY)
-	$$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $$(dir $$@) && \
-		echo '$$(call gb_SrsPartTarget_get_target,$$*) : $$(gb_Helper_PHONY)' > $$@)
-endif
-
-endef
-
-$(foreach repo,$(gb_SrsPartTarget_REPOS),$(eval $(call gb_SrsPartTarget__rules,$(repo))))
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsPartTarget_get_dep_target,%) :
-	$(eval $(call gb_Output_error,Unable to find resource definition file $* in repositories: $(gb_SrsPartTarget_REPOS)))
-endif
-
-
-define gb_SrsPartTarget_SrsPartTarget
-ifeq ($(strip $(gb_WITH_LANG)),)
-$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := 
-else
-$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
-endif
-
-endef
-
-# SrsTemplatePartTarget class
-
-define gb_SrsTemplatePartTarget_SrsTemplatePartTarget
-$(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1))
-	$$(call gb_Helper_abbreviate_dirs,\
-	    mkdir -p $$(dir $$@) && \
-	    cp $$< $$@)
-ifneq ($(strip $(WITH_LANG)),)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(SDF)
-endif
-endef
-
-# SrsTemplateTarget class
-
-define gb_SrsTemplateTarget__command
-	$(call gb_Helper_abbreviate_dirs,\
-	    mkdir -p $(dir $(1)) && \
-	    touch $(1))
-endef
-
-gb_SrsTemplateTarget__get_merged_target = $(call gb_SrsTemplateTarget_get_target,$(1))_merged_last
-gb_SrsTemplateTarget__get_unmerged_target = $(call gb_SrsTemplateTarget_get_target,$(1))_unmerged_last
-
-ifeq ($(strip $(WITH_LANG)),)
-gb_SrsTemplateTarget__get_target = $(call gb_SrsTemplateTarget__get_unmerged_target,$(1))
-gb_SrsTemplateTarget__get_update_target = $(call gb_SrsTemplateTarget__get_merged_target,$(1))
-else
-gb_SrsTemplateTarget__get_target = $(call gb_SrsTemplateTarget__get_merged_target,$(1))
-gb_SrsTemplateTarget__get_update_target = $(call gb_SrsTemplateTarget__get_unmerged_target,$(1))
-endif
-
-define gb_SrsTemplateTarget_SrsTemplateTarget
-$(call gb_SrsTemplateTarget_get_target,$(1)) : PARTS :=
-$(call gb_SrsTemplateTarget_get_clean_target,$(1)) : PARTS :=
-$(call gb_SrsTemplateTarget_get_target,$(1)) : $(call gb_SrsTemplateTarget__get_target,$(1))
-$(call gb_SrsTemplateTarget__get_target,$(1)) : $(call gb_SrsTemplateTarget__get_update_target,$(1))
-endef
-
-.PHONY : $(call gb_SrsTemplateTarget_get_target,%_last)
-$(call gb_SrsTemplateTarget_get_target,%_last) :
-	$(call gb_SrsTemplateTarget__command,$@)
-
-.PHONY : $(call gb_SrsTemplateTarget_get_target,%)
-$(call gb_SrsTemplateTarget_get_target,%) :
-	$(if $(strip $(PARTS)),$(call gb_Output_announce,$*,$(true),SRT,4))
-	$(call gb_SrsTemplateTarget__command,$@)
-
-.PHONY : $(call gb_SrsTemplateTarget_get_clean_target,%)
-$(call gb_SrsTemplateTarget_get_clean_target,%) :
-	$(if $(strip $(PARTS)),$(call gb_Output_announce,$*,$(false),SRT,4))
-	-$(call gb_Helper_abbreviate_dirs,\
-	    rm -f $(call gb_SrsTemplateTarget_get_target,$*) \
-		    $(call gb_SrsTemplateTarget__get_merged_target,$*) \
-		    $(call gb_SrsTemplateTarget__get_unmerged_target,$*) \
-		    $(foreach part,$(PARTS),$(call gb_SrsTemplatePartTarget_get_target,$(part))) \
-		    $(foreach part,$(PARTS),$(call gb_SrsPartMergeTarget_get_target,$(part))))
-
-define gb_SrsTemplateTarget_add_file
-$(call gb_SrsTemplatePartTarget_SrsTemplatePartTarget,$(2))
-$(call gb_SrsTemplateTarget_get_target,$(1)) : PARTS += $(2)
-$(call gb_SrsTemplateTarget_get_clean_target,$(1)) : PARTS += $(2)
-$(call gb_SrsTemplateTarget__get_target,$(1)) : $(call gb_SrsTemplatePartTarget_get_target,$(2))
-$(call gb_SrsTemplatePartTarget_get_target,$(2)) : $(call gb_SrsTemplateTarget__get_update_target,$(1))
-$(call gb_SrsPartMergeTarget_get_target,$(2)) : $(call gb_SrsTemplateTarget__get_update_target,$(1))
-endef
-
-# SrsTarget class
-
-gb_SrsTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
-
-.PHONY : $(call gb_SrsTarget_get_clean_target,%)
-$(call gb_SrsTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),SRS,1)
-	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_SrsTarget_get_target,$*) \
-			$(call gb_SrsTarget_get_dep_target,$*) \
-			$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_target,$(part))) \
-			$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))) \
-			$(foreach part,$(PARTS),$(call gb_SrsPartMergeTarget_get_target,$(part))))
-
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_SrsTarget__command_dep
-$(call gb_Output_announce,SRS:$(2),$(true),DEP,1)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	cat $(3) > $(1))
-endef
-endif
-
-$(call gb_SrsTarget_get_target,%) :
-	$(call gb_SrsTarget__command_dep,$(call gb_SrsTarget_get_dep_target,$*),$*,$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))))
-	$(call gb_Output_announce,$*,$(true),SRS,1)
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && \
-		cat $^ > $@)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsTarget_get_dep_target,%) :
-	$(call gb_SrsTarget__command_dep,$@,$*,$^)
-endif
-
-define gb_SrsTarget_SrsTarget
-$(call gb_SrsTemplateTarget_SrsTemplateTarget,$(1))
-$(call gb_SrsTarget_get_target,$(1)) : DEFS := $(gb_SrsTarget_DEFAULTDEFS)
-$(call gb_SrsTarget_get_target,$(1)) : INCLUDE := $(SOLARINC)
-$(call gb_SrsTarget_get_clean_target,$(1)) : PARTS :=
-$(call gb_SrsTarget_get_target,$(1)) : PARTS :=
-$(call gb_SrsTarget_get_target,$(1)) : $(call gb_SrsTemplateTarget_get_target,$(1))
-$(call gb_SrsTarget_get_clean_target,$(1)) : $(call gb_SrsTemplateTarget_get_clean_target,$(1))
-ifeq ($(gb_FULLDEPS),$(true))
-ifneq ($(wildcard $(call gb_SrsTarget_get_dep_target,$(1))),)
-include $(call gb_SrsTarget_get_dep_target,$(1))
-else
-$(firstword $(MAKEFILE_LIST)) : $(call gb_SrsTarget_get_dep_target,$(1))
-endif
-endif
-
-endef
-
-define gb_SrsTarget_set_defs
-$(call gb_SrsTarget_get_target,$(1)) : DEFS := $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsTarget_get_dep_target,$(1)) : DEFS := $(2)
-endif
-
-endef
-
-define gb_SrsTarget_set_include
-$(call gb_SrsTarget_get_target,$(1)) : INCLUDE := $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsTarget_get_dep_target,$(1)) : INCLUDE := $(2)
-endif
-
-endef
-
-define gb_SrsTarget_add_file
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsTarget_get_dep_target,$(1)) : $(call gb_SrsPartTarget_get_dep_target,$(2))
-endif
-$(call gb_SrsPartTarget_SrsPartTarget,$(2))
-$(call gb_SrsTarget_get_target,$(1)) : $(call gb_SrsPartTarget_get_target,$(2))
-$(call gb_SrsPartTarget_get_target,$(2)) :| $(call gb_SrsTemplateTarget_get_target,$(1))
-$(call gb_SrsTarget_get_clean_target,$(1)) : PARTS += $(2)
-$(call gb_SrsTarget_get_target,$(1)) : PARTS += $(2)
-
-endef
-
-define gb_SrsTarget_add_files
-$(foreach file,$(2),$(call gb_SrsTarget_add_file,$(1),$(file)))
-
-endef
-
-define gb_SrsTarget_add_template
-$(call gb_SrsTemplateTarget_add_file,$(1),$(2))
-endef
-
-define gb_SrsTarget_add_templates
-$(foreach template,$(2),$(eval $(call gb_SrsTarget_add_template,$(1),$(template))))
-endef
-
-
-# ResTarget
-
-gb_ResTarget_RSCTARGET := $(gb_SrsPartTarget_RSCTARGET)
-gb_ResTarget_RSCCOMMAND := $(gb_SrsPartTarget_RSCCOMMAND)
-gb_ResTarget_DEFIMAGESLOCATION := $(realpath $(SRCDIR)/default_images)/
-
-$(call gb_ResTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),RES,2)
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_outdir_imagelist_target,$*))
-
-$(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCTARGET)
-	$(call gb_Output_announce,$*,$(true),RES,2)
-	$(call gb_Helper_abbreviate_dirs_native,\
-		mkdir -p $(dir $@) $(OUTDIR)/bin \
-			$(dir $(call gb_ResTarget_get_imagelist_target,$*)) && \
-		RESPONSEFILE=`$(gb_MKTEMP)` && \
-		echo "-r -p \
-			-lg$(LANGUAGE) \
-			-fs=$@ \
-			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/$(LIBRARY)) \
-			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE)) \
-			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst) \
-			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE)) \
-			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/imagelst) \
-			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res) \
-			-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \
-			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \
-			-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-			-subMODULE=$(dir $(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION))) \
-			-subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-			-oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \
-			$(filter-out $(gb_Helper_MISCDUMMY),$^)" > $${RESPONSEFILE} && \
-		$(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
-		rm -f $${RESPONSEFILE})
-
-$(call gb_ResTarget_get_outdir_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		$(call gb_Deliver_deliver,$<,$@) && \
-		$(call gb_Deliver_deliver,$(dir $<)/$(notdir $(ILSTTARGET)),$(ILSTTARGET)))
-
-define gb_ResTarget_ResTarget
-$(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
-$(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3)
-$(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2)
-$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_outdir_target,$(1))
-$(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clean_target,$(1))
-$(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
-
-$(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) 
-$(call gb_ResTarget_get_outdir_target,$(1)) : ILSTTARGET = $(call gb_ResTarget_get_outdir_imagelist_target,$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)),$(1))
-
-endef
-
-define gb_ResTarget_add_file
-$(call gb_ResTarget_get_target,$(1)) : $(2)
-
-endef
-
-define gb_ResTarget_add_one_srs
-$(call gb_ResTarget_add_file,$(1),$(call gb_SrsTarget_get_target,$(2)))
-$(call gb_ResTarget_get_clean_target,$(1)) : $(call gb_SrsTarget_get_clean_target,$(2))
-
-endef
-
-define gb_ResTarget_add_files
-$(foreach file,$(2),\
-	$(call gb_ResTarget_add_file,$(1),$(file)))
-
-endef
-
-define gb_ResTarget_add_srs
-$(foreach srs,$(2),\
-	$(call gb_ResTarget_add_one_srs,$(1),$(srs)))
-
-endef
-
-define gb_ResTarget_set_reslocation
-$(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2)
-
-endef
-
-
-# AllLangResTarget
-
-gb_AllLangResTarget_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
-
-define gb_AllLangResTarget_set_langs
-gb_AllLangResTarget_LANGS := $(1)
-endef
-
-$(call gb_AllLangResTarget_get_clean_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_AllLangResTarget_get_target,$*))
-
-$(call gb_AllLangResTarget_get_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && touch $@)
-
-define gb_AllLangResTarget_AllLangResTarget
-$(foreach lang,$(gb_AllLangResTarget_LANGS),\
-	$(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
-$$(eval $$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1))))
-
-endef
-
-define gb_AllLangResTarget_add_one_srs
-$(foreach lang,$(gb_AllLangResTarget_LANGS),\
-	$(call gb_ResTarget_add_one_srs,$(1)$(lang),$(2)))
-
-endef
-
-define gb_AllLangResTarget_add_srs
-$(foreach srs,$(2),\
-	$(call gb_AllLangResTarget_add_one_srs,$(1),$(srs)))
-
-endef
-
-define gb_AllLangResTarget_set_reslocation
-$(foreach lang,$(gb_AllLangResTarget_LANGS),\
-	$(call gb_ResTarget_set_reslocation,$(1)$(lang),$(2)))
-
-endef
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
deleted file mode 100644
index 6c19db07e..000000000
--- a/solenv/gbuild/BuildDirs.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# extend for JDK include (seems only needed in setsolar env?)
-SOLARINC += $(JDKINCS)
-
-OUTDIR := $(SOLARVERSION)/$(INPATH)
-OUTDIR_FOR_BUILD := $(SOLARVERSION)/$(INPATH_FOR_BUILD)
-ifeq ($(strip $(WORKDIR)),)
-$(error WORKDIR variable is empty, no environment set, aborting)
-endif
-
-# Override for SetupLocal
-ifneq ($(and $(gb_LOCALBUILDDIR),$(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk)),)
-include $(gb_LOCALBUILDDIR)/SetupLocal.mk
-endif
-
-ifeq ($(strip $(gb_REPOS)),)
-gb_REPOS := $(SOLARSRC)
-endif
-
-# HACK
-# unixify windoze paths
-ifeq ($(OS_FOR_BUILD),WNT)
-override WORKDIR := $(shell cygpath -u $(WORKDIR))
-override OUTDIR := $(shell cygpath -u $(OUTDIR))
-override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD))
-override gb_REPOS := $(shell cygpath -u $(gb_REPOS))
-endif
-
-REPODIR := $(patsubst %/,%,$(dir $(firstword $(gb_REPOS))))
-
-ifeq ($(filter setuplocal removelocal,$(MAKECMDGOALS)),)
-ifneq ($(filter-out $(foreach repo,$(gb_REPOS),$(realpath $(repo))/%),$(realpath $(firstword $(MAKEFILE_LIST)))),)
-$(eval $(call gb_Output_error,The initial makefile $(realpath $(firstword $(MAKEFILE_LIST))) is not in the repositories $(foreach repo,$(gb_REPOS),$(realpath $(repo))).,ALL))
-endif
-endif
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
deleted file mode 100644
index 790a7883c..000000000
--- a/solenv/gbuild/ComponentTarget.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-gb_ComponentTarget_REPOS := $(gb_REPOS)
-
-gb_ComponentTarget_XSLTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt
-gb_ComponentTarget_get_source = $(1)/$(2).component
-
-define gb_ComponentTarget__command
-$(call gb_Output_announce,$(3),$(true),CMP,1)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_XSLTPROC) --nonet --stringparam uri \
-		'$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
-		$(gb_ComponentTarget_XSLTCOMMANDFILE) $(realpath $(2)))
-endef
-
-# creates 2 componentfiles: the first is for the installation set,
-# the second is for using the component during the build.
-# bit of a hack, hopefully inbuild can be removed when solver layout is fixed.
-define gb_ComponentTarget__rules
-$$(call gb_ComponentTarget_get_inbuild_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
-	$$(call gb_ComponentTarget__command,$$@,$$<,$$*)
-
-$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
-	$$(call gb_ComponentTarget__command,$$@,$$<,$$*)
-
-endef
-
-$(call gb_ComponentTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),CMP,1)
-	rm -f $(call gb_ComponentTarget_get_outdir_target,$*) \
-		$(call gb_ComponentTarget_get_target,$*) \
-		$(call gb_ComponentTarget_get_outdir_inbuild_target,$*) \
-		$(call gb_ComponentTarget_get_inbuild_target,$*) \
-
-$(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rules,$(repo))))
-
-$(call gb_ComponentTarget_get_target,%) :
-	$(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xsltproc is missing.))
-
-$(call gb_ComponentTarget_get_external_target,%) :
-	$(call gb_Deliver_deliver,$<,$@)
-
-define gb_ComponentTarget_ComponentTarget
-$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
-$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
-$(call gb_ComponentTarget_get_inbuild_target,$(1)) : COMPONENTPREFIX := $(call gb_Library__get_layer_componentprefix,NONE)
-$(call gb_ComponentTarget_get_inbuild_target,$(1)) : LIBFILENAME := $(3)
-$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
-$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)) : $(call gb_ComponentTarget_get_inbuild_target,$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)),$(1))
-
-endef
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
deleted file mode 100644
index 043fdcdf5..000000000
--- a/solenv/gbuild/CppunitTest.mk
+++ /dev/null
@@ -1,194 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# CppunitTest class
-
-# in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
-DBGSV_ERROR_OUT := shell
-export DBGSV_ERROR_OUT
-
-ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
-gb_CppunitTest_GDBTRACE := gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace-stdout -return-child-result --args
-else ifneq ($(strip $(GDBCPPUNITTRACE)),)
-gb_CppunitTest_GDBTRACE := $(GDBCPPUNITTRACE)
-gb_CppunitTest__interactive := $(true)
-endif
-
-ifneq ($(strip $(VALGRIND)),)
-gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50
-ifeq ($(strip $(VALGRIND)),memcheck)
-gb_CppunitTest_VALGRINDTOOL += --leak-check=yes
-G_SLICE := always-malloc
-export G_SLICE
-GLIBCXX_FORCE_NEW := 1
-export GLIBCXX_FORCE_NEW
-endif
-endif
-
-# defined by platform
-#  gb_CppunitTest_TARGETTYPE
-#  gb_CppunitTest_get_filename
-gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester)
-gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET)
-gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
-
-# TODO: move this to platform under suitable name
-gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS)),/)$(1)
-
-gb_CppunitTest__get_uno_type_target = $(OUTDIR)/bin/$(1).rdb
-define gb_CppunitTest__make_args
-$(ARGS) \
-$(if $(strip $(UNO_TYPES)),\
-	"-env:UNO_TYPES=$(foreach rdb,udkapi $(UNO_TYPES),\
-		$(call gb_CppunitTarget__make_url,$(call gb_CppunitTest__get_uno_type_target,$(rdb))))") \
-$(if $(strip $(UNO_SERVICES)),\
-	"-env:UNO_SERVICES=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/ure/services.rdb) \
-		$(foreach rdb,$(UNO_SERVICES),\
-			$(call gb_CppunitTarget__make_url,$(call gb_RdbTarget_get_target,$(rdb))))") \
-$(if $(URE),\
-	$(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR,\
-		-env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib)))
-endef
-
-.PHONY : $(call gb_CppunitTest_get_clean_target,%)
-$(call gb_CppunitTest_get_clean_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_CppunitTest_get_target,$*) $(call gb_CppunitTest_get_target,$*).log)
-
-.PHONY : $(call gb_CppunitTest_get_target,%)
-$(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET)
-	$(call gb_Output_announce,$*,$(true),CUT,2)
-	$(call gb_Helper_abbreviate_dirs_native,\
-		mkdir -p $(dir $@) && \
-		$(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) $(call gb_CppunitTest__make_args,$(ARGS),$(UNO_SERVICES),$(UNO_TYPES)) $(if $(gb_CppunitTest__interactive),,> $@.log 2>&1 || (cat $@.log && false)))
-
-define gb_CppunitTest_CppunitTest
-$(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest__get_linktargetname,$(1)))
-
-endef
-
-define gb_CppunitTest__CppunitTest_impl
-$(call gb_LinkTarget_LinkTarget,$(2))
-$(call gb_LinkTarget_set_targettype,$(2),CppunitTest)
-$(call gb_LinkTarget_add_defs,$(2),\
-	$(gb_CppunitTest_DEFS) \
-)
-$(call gb_LinkTarget_use_external,$(2),cppunit)
-$(call gb_LinkTarget_add_includes,$(2),$(filter -I%,$(CPPUNIT_CFLAGS)))
-$(call gb_LinkTarget_add_defs,$(2), \
-    $(filter-out -I%,$(CPPUNIT_CFLAGS)) \
-)
-$(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
-$(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
-$(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(call gb_CppunitTest_get_libfilename,$(1)))
-$(call gb_CppunitTest_get_target,$(1)) : ARGS :=
-$(call gb_CppunitTest_get_target,$(1)) : URE := $(false)
-$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES :=
-$(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES :=
-$$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1))))
-
-endef
-
-define gb_CppunitTest_set_args
-$(call gb_CppunitTest_get_target,$(1)) : ARGS := $(2)
-
-endef
-
-# TODO: Once we build the services.rdb with gbuild we should use its *_get_target method
-define gb_CppunitTest_uses_ure
-$(call gb_CppunitTest_get_target,$(1)) : $(call gb_CppunitTest__get_uno_type_target,udkapi)
-$(call gb_CppunitTest_get_target,$(1)) : $(OUTDIR)/xml/ure/services.rdb
-$(call gb_CppunitTest_get_target,$(1)) : URE := $(true)
-
-endef
-
-define gb_CppunitTest_add_type_rdb
-$(call gb_CppunitTest_get_target,$(1)) : $(call gb_CppunitTest__get_uno_type_target,$(2))
-$(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES += $(2)
-endef
-
-define gb_CppunitTest_add_type_rdbs
-$(foreach rdb,$(2),$(eval $(call gb_CppunitTest_add_type_rdb,$(1),$(rdb))))
-endef
-
-define gb_CppunitTest_add_service_rdb
-$(call gb_CppunitTest_get_target,$(1)) : $(call gb_RdbTarget_get_target,$(2))
-$(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_RdbTarget_get_clean_target,$(2))
-$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES += $(2)
-endef
-
-define gb_CppunitTest_add_service_rdbs
-$(foreach rdb,$(2),$(eval $(call gb_CppunitTest_add_service_rdb,$(1),$(rdb))))
-endef
-
-define gb_CppunitTest__forward_to_Linktarget
-gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_linktargetname,$$(1)),$$(2),$$(3))
-
-endef
-
-$(eval $(foreach method,\
-	add_api \
-	add_cobject \
-	add_cobjects \
-	add_cxxobject \
-	add_cxxobjects \
-	add_exception_objects \
-	add_executable_objects \
-	add_library_objects \
-	add_linked_libs \
-	add_linked_static_libs \
-	add_noexception_objects \
-	add_objcobject \
-	add_objcobjects \
-	add_objcxxobject \
-	add_objcxxobjects \
-	add_package_headers \
-	add_precompiled_header \
-	add_sdi_headers \
-	add_cflags \
-	set_cflags \
-	add_cxxflags \
-	set_yaccflags \
-	add_objcxxflags \
-	add_defs \
-	set_defs \
-	set_include \
-	add_ldflags \
-	set_ldflags \
-	add_libs \
-	set_library_path_flags \
-	set_objcflags \
-	set_objcxxflags \
-	use_external \
-	use_externals \
-,\
-	$(call gb_CppunitTest__forward_to_Linktarget,$(method))\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
deleted file mode 100644
index 0fc8d28ec..000000000
--- a/solenv/gbuild/CustomTarget.mk
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-gb_CustomTarget_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
-
-# N.B.: putting the "+" there at the start activates the GNU make job server
-define gb_CustomTarget__command
-+$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
-	$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
-	touch $(1))
-
-endef
-
-$(call gb_CustomTarget_get_target,%) :
-	$(call gb_Output_announce,$*,$(true),MAK,3)
-	$(call gb_CustomTarget__command,$@,$*)
-
-.PHONY: $(call gb_CustomTarget_get_clean_target,%)
-$(call gb_CustomTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),MAK,3)
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -rf $(call gb_CustomTarget_get_workdir,$*) && \
-		rm -f $(call gb_CustomTarget_get_target,$*))
-
-define gb_CustomTarget__get_makefile
-$(1)/$(2)/Makefile
-endef
-
-define gb_CustomTarget_CustomTarget
-$(if $(filter $(2),$(gb_CustomTarget_REPOSITORYNAMES)),,\
- $(error CustomTarget: no or invalid repository given; known repositories: \
-  $(gb_JavaClassSet_REPOSITORYNAMES)))
-gb_CustomTarget_REPO_$(1) := $(2)
-$(call gb_CustomTarget_get_target,$(1)) : \
-  $(call gb_CustomTarget__get_makefile,$($(2)),$(1))
-$(call gb_CustomTarget_get_workdir,$(1))/% : \
-  $(call gb_CustomTarget_get_target,$(1))
-endef
-
-
-define gb_CustomTarget_add_dependency
-$(eval $(call gb_CustomTarget_get_target,$(1)) : \
-	$($(gb_CustomTarget_REPO_$(1)))/$(2))
-endef
-
-define gb_CustomTarget_add_dependencies
-$(foreach dependency,$(2),$(call gb_CustomTarget_add_dependency,$(1),$(dependency)))
-endef
-
-define gb_CustomTarget_add_outdir_dependency
-$(eval $(call gb_CustomTarget_get_target,$(1)) : $(2))
-endef
-
-define gb_CustomTarget_add_outdir_dependencies
-$(foreach dependency,$(2),$(call gb_CustomTarget_add_outdir_dependency,$(1),$(dependency)))
-
-endef
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
deleted file mode 100644
index 039118919..000000000
--- a/solenv/gbuild/Deliver.mk
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-gb_Deliver_GNUCOPY := $(GNUCOPY)
-
-# if ($true) then old files will get removed from the target location before
-# they are copied there. In multi-user environments, this is needed you need to
-# be the owner of the target file to be able to modify timestamps
-gb_Deliver_CLEARONDELIVER := $(true)
-
-define gb_Deliver_init
-gb_Deliver_DELIVERABLES :=
-gb_Deliver_DELIVERABLES_INDEX := 
-
-endef
-
-define gb_Deliver_do_add
-$$(if $(3),,$$(error - missing third parameter for deliverable $(1)))
-gb_Deliver_DELIVERABLES_$(notdir $(3)) += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1))
-gb_Deliver_DELIVERABLES_INDEX := $(sort $(gb_Deliver_DELIVERABLES_INDEX) $(notdir $(3)))
-$(if $(gb_LOWRESTIME),.LOW_RESOLUTION_TIME : $(1),)
-
-endef
-
-define gb_Deliver_add_deliverable
-ifeq ($(MAKECMDGOALS),showdeliverables)
-$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3))
-else
-$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3))
-endif
-
-endef
-
-ifeq ($(strip $(gb_Deliver_GNUCOPY)),)
-define gb_Deliver__deliver
-mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -f) $(1) $(2) && touch -r $(1) $(2)
-endef
-else
-define gb_Deliver__deliver
-mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) $(if $(gb_Deliver_HARDLINK),--link) --force --preserve=timestamps $(1) $(2)
-endef
-endif
-
-define gb_Deliver_deliver
-$(if $(1),$(call gb_Deliver__deliver,$(1),$(2)),\
- $(error gb_Deliver_deliver:\
-  file does not exist in solver, and cannot be delivered: $(2)))
-endef
-
-
-# We are currently only creating a deliver.log, if only one module gets build.
-# As it is possible to add gbuild modules into other (which is done for example for
-# the toplevel ooo module already) it does not make sense to create a deliver.log once
-# fully migrated. The whole process should be rethought then.
-# We need the trailing whitespace so that the newline of echo does not become part of the last record.
-define gb_Deliver_setdeliverlogcommand
-ifeq ($$(words $(gb_Module_ALLMODULES)),1)
-$$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),LOG,1))
-deliverlog : COMMAND := \
- mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) \
- && RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),100,$$(sort $$(foreach list,$$(gb_Deliver_DELIVERABLES_INDEX),$$(gb_Deliver_DELIVERABLES_$$(list))))) \
- && $(gb_AWK) -f $$(GBUILDDIR)/processdelivered.awk < $$$${RESPONSEFILE} \
-		> $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log \
- && rm -f $$$${RESPONSEFILE}
-else
-$$(eval $$(call gb_Output_announce,more than one module - creating no deliver.log,$$(true),LOG,1))
-deliverlog : COMMAND := true
-endif
-endef
-
-# FIXME: this does not really work for real multi repository builds, but the
-# deliver.log format is broken in that case anyway
-.PHONY : deliverlog showdeliverables
-deliverlog:
-	$(eval $(call gb_Deliver_setdeliverlogcommand))
-	$(call gb_Helper_abbreviate_dirs, $(COMMAND))
-
-# all : deliverlog
-
-define gb_Deliver_print_deliverable
-$(info $(1) $(patsubst $(OUTDIR)/%,%,$(2)))
-endef
-
-showdeliverables :
-	$(eval MAKEFLAGS := s)
-	$(foreach deliverable,$(sort $(foreach list,$(gb_Deliver_DELIVERABLES_INDEX),$(gb_Deliver_DELIVERABLES_$(list)))),\
-			$(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable)))))
-	true
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
deleted file mode 100644
index bd353769e..000000000
--- a/solenv/gbuild/Executable.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Executable class
-
-# defined by platform
-#  gb_Executable_Executable_platform
-
-.PHONY : $(call gb_Executable_get_clean_target,%)
-$(call gb_Executable_get_clean_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_Executable_get_target,$*) \
-			$(AUXTARGETS))
-
-$(call gb_Executable_get_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		$(call gb_Deliver_deliver,$<,$@) \
-			$(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
-
-define gb_Executable_Executable
-$(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT))
-
-endef
-
-define gb_Executable__Executable_impl
-$(call gb_Executable_set_targettype_gui,$(2))
-$(call gb_LinkTarget_LinkTarget,$(2))
-$(call gb_LinkTarget_set_targettype,$(2),Executable)
-$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
-$(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
-$(call gb_Executable_Executable_platform,$(1),$(2))
-$$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
-
-endef
-
-define gb_Executable_set_targettype_gui
-$(call gb_Executable_get_target,$(1)) : gb_Executable_TARGETGUI := $(2)
-endef
-
-
-define gb_Executable_forward_to_Linktarget
-gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_Executable_get_linktargetname,$$(1)),$$(2),$$(3))
-
-endef
-
-$(eval $(foreach method,\
-	add_cobject \
-	add_cobjects \
-	add_cxxobject \
-	add_cxxobjects \
-	add_objcobject \
-	add_objcobjects \
-	add_objcxxobject \
-	add_objcxxobjects \
-	add_exception_objects \
-	add_noexception_objects \
-	add_generated_cxxobjects \
-	add_generated_exception_objects \
-	add_cflags \
-	set_cflags \
-	add_cxxflags \
-	set_cxxflags \
-	add_objcxxflags \
-	set_objcflags \
-	set_objcxxflags \
-	add_defs \
-	set_defs \
-	set_include \
-	add_ldflags \
-	set_ldflags \
-	add_libs \
-	set_library_path_flags \
-	add_api \
-	add_linked_libs \
-	add_linked_static_libs \
-	use_external \
-	use_externals \
-	add_package_headers \
-	add_sdi_headers \
-	add_precompiled_header \
-,\
-	$(call gb_Executable_forward_to_Linktarget,$(method))\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
deleted file mode 100644
index 4c9f2de8f..000000000
--- a/solenv/gbuild/Helper.mk
+++ /dev/null
@@ -1,187 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-gb_Helper_NULLFILE := /dev/null
-
-gb_Helper_MISC := $(WORKDIR)/Misc
-
-# general propose phony target
-gb_Helper_PHONY := $(gb_Helper_MISC)/PHONY
-
-# general propose empty dummy target
-gb_Helper_MISCDUMMY := $(gb_Helper_MISC)/DUMMY
-
-gb_Helper_REPOSITORYNAMES :=
-
-.PHONY : $(WORKDIR)/Misc/PHONY
-$(gb_Helper_MISCDUMMY) :
-	@mkdir -p $(dir $@) && touch $@
-
-define gb_Helper_abbreviate_dirs
-R=$(REPODIR) && \
-$(subst $(REPODIR)/,$$R/,S=$(SRCDIR) && \
-$(subst $(SRCDIR)/,$$S/,O=$(OUTDIR)) && \
-$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR) && $(subst $(WORKDIR)/,$$W/,$(1)))))
-endef
-
-define gb_Helper_make_clean_target
-gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1)
-
-endef
-
-define gb_Helper_make_outdir_clean_target
-gb_$(1)_get_clean_target = $$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$$(call gb_$(1)_get_target,$$(1)))
-
-endef
-
-define gb_Helper_make_dep_target
-gb_$(1)_get_dep_target = $(WORKDIR)/Dep/$(1)/$$(1).d
-
-endef
-
-define gb_Helper_make_clean_targets
-$(foreach targettype,$(1),\
-	$(call gb_Helper_make_clean_target,$(targettype)))
-
-endef
-
-define gb_Helper_make_outdir_clean_targets
-$(foreach targettype,$(1),\
-	$(call gb_Helper_make_outdir_clean_target,$(targettype)))
-
-endef
-
-define gb_Helper_make_dep_targets
-$(foreach targettype,$(1),\
-	$(call gb_Helper_make_dep_target,$(targettype)))
-
-endef
-
-define gb_Helper_get_outdir_clean_target
-$$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$(1))
-endef
-
-define gb_Helper_register_repository
-gb_Helper_CURRENTREPOSITORY := $(1)
-gb_Helper_REPOSITORYNAMES += $(1)
-
-endef
-
-# RepositoryExternal.mk is optional
-define gb_Helper_add_repository
-gb_Helper_CURRENTREPOSITORY :=
-include $(1)/Repository.mk
-ifeq ($$(gb_Helper_CURRENTREPOSITORY),)
-$$(eval $$(call gb_Output_error,No call to gb_Helper_register_repository in Repository.mk for repository $(1)))
-endif
-$$(gb_Helper_CURRENTREPOSITORY) := $(1)
--include $(1)/RepositoryExternal.mk
-
-endef
-
-define gb_Helper_add_repositories
-$(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo)))
-
-endef
-
-define gb_Helper_init_registries
-gb_Executable_VALIDGROUPS := UREBIN SDK OOO BRAND NONE
-gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS
-gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
-
-$$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=))
-$$(foreach group,$$(gb_Library_VALIDGROUPS),$$(eval gb_Library_$$(group) :=))
-$$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(eval gb_StaticLibrary_$$(group) :=))
-
-endef
-
-define gb_Helper_collect_libtargets
-gb_Library_TARGETS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
-gb_StaticLibrary_TARGETS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
-
-endef
-
-define gb_Helper_collect_knownlibs
-gb_Library_KNOWNLIBS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
-gb_StaticLibrary_KNOWNLIBS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
-
-endef
-
-define gb_Helper_register_executables
-ifeq ($$(filter $(1),$$(gb_Executable_VALIDGROUPS)),)
-$$(eval $$(call gb_Output_error,$(1) is not a valid group for executables. Valid groups are: $$(gb_Executable_VALIDGROUPS)))
-endif
-$(foreach group,$(gb_Executable_VALIDGROUPS),\
- $(foreach target,$(2),\
-  $(if $(filter $(target),$(gb_Executable_$(group))),\
-   $(call gb_Output_error,gb_Helper_register_executables: already registered: $(target)))))
-$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
- $(call gb_Output_error,gb_Helper_register_executables: contains duplicates: $(2)))
-
-gb_Executable_$(1) += $(2)
-
-endef
-
-define gb_Helper_register_libraries
-ifeq ($$(filter $(1),$$(gb_Library_VALIDGROUPS)),)
-$$(eval $$(call gb_Output_error,$(1) is not a valid group for libraries. Valid groups are: $$(gb_Library_VALIDGROUPS)))
-endif
-$(foreach group,$(gb_Library_VALIDGROUPS),\
- $(foreach target,$(2),\
-  $(if $(filter $(target),$(gb_Library_$(group))),\
-   $(call gb_Output_error,gb_Helper_register_libraries: already registered: $(target)))))
-$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
- $(call gb_Output_error,gb_Helper_register_libraries: contains duplicates: $(2)))
-
-gb_Library_$(1) += $(2)
-
-endef
-
-define gb_Helper_register_static_libraries
-ifeq ($$(filter $(1),$$(gb_StaticLibrary_VALIDGROUPS)),)
-$$(eval $$(call gb_Output_error,$(1) is not a valid group for static libraries. Valid groups are: $$(gb_StaticLibrary_VALIDGROUPS)))
-endif
-$(foreach group,$(gb_StaticLibrary_VALIDGROUPS),\
- $(foreach target,$(2),\
-  $(if $(filter $(target),$(gb_StaticLibrary_$(group))),\
-   $(call gb_Output_error,gb_Helper_register_static_libraries: already registered: $(target)))))
-$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
- $(call gb_Output_error,gb_Helper_register_static_libraries: contains duplicates: $(2)))
-
-gb_StaticLibrary_$(1) += $(2)
-
-endef
-
-define gb_Helper_execute
-$(call gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
-endef
-
-export gb_Helper_set_ld_path
-export gb_Helper_execute
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
deleted file mode 100644
index 6b0fd9c63..000000000
--- a/solenv/gbuild/Jar.mk
+++ /dev/null
@@ -1,167 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# if a jar prerequisite has changed, the ClassSet must be recompiled. How?
-
-# Jar class
-
-gb_Jar_JAVACOMMAND := $(JAVAINTERPRETER)
-gb_Jar_JARCOMMAND := jar
-
-# location of manifest file in workdir
-define gb_Jar_get_manifest_target 
-$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(1)))/META-INF/MANIFEST.MF
-endef
-
-# creates classset and META-INF folders if they don't exist
-# adds manifest version, class path, solarversion and content from sources to manifest file 
-# creates the target folder of the jar file if it doesn't exist
-# creates the jar file
-define gb_Jar__command
-	$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(1)))/META-INF && \
-	echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) && \
-	echo "Class-Path: $(JARCLASSPATH)" >> $(call gb_Jar_get_manifest_target,$(1)) && \
-	echo "Solar-Version: $(RSCREVISION)" >> $(call gb_Jar_get_manifest_target,$(1)) && \
-	cat $(MANIFEST) >> $(call gb_Jar_get_manifest_target,$(1)) && \
-	mkdir -p $(dir $(2)) && \
-	cd $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(1))) && $(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) META-INF $(PACKAGEROOTS) )
-endef
-
-# clean target reuses clean target of ClassSet
-$(call gb_Jar_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_Jar_get_classsetname,%))
-	$(call gb_Output_announce,$*,$(false),JAR,3)
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_Jar_get_target,$*) $(call gb_Jar_get_outdir_target,$*))
-
-# the outdir target depends on the workdir target and is built by delivering the latter
-# the workdir target is created by cd'ing to the target directory and adding/updating the files
-
-# rule for creating the jar file using the command defined above
-$(call gb_Jar_get_target,%) : $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,%))
-	$(call gb_Jar__command,$*,$@,$*,$?)
-
-# resets scoped variables (see explanations where they are set)
-# creates a class set and a dependency to it 
-# registers target and clean target
-# adds jar files to DeliverLogTarget
-# adds dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk)
-define gb_Jar_Jar
-$(call gb_Jar_get_target,$(1)) : MANIFEST :=
-$(call gb_Jar_get_target,$(1)) : JARCLASSPATH :=
-$(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
-$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)),$(2))
-$(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH))
-$(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1))
-$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
-
-endef
-
-# source files are forwarded to the ClassSet
-define gb_Jar_add_sourcefile
-$(call gb_JavaClassSet_add_sourcefile,$(call gb_Jar_get_classsetname,$(1)),$(2))
-endef
-
-# PACKAGEROOTS is the list of all root folders to pack into the jar (without META-INF as this is added automatically)
-define gb_Jar_set_packageroot
-$(call gb_Jar_get_target,$(1)) : PACKAGEROOTS := $(2)
-endef
-
-define gb_Jar_add_sourcefiles
-$(foreach sourcefile,$(2),$(call gb_Jar_add_sourcefile,$(1),$(sourcefile)))
-endef
-
-define gb_JarTest_set_classpath
-$(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(2))
-endef
-
-# JARCLASSPATH is the class path that is written to the manifest of the jar
-define gb_Jar_set_jarclasspath
-
-$(call gb_Jar_get_target,$(1)) : JARCLASSPATH := $(2)
-endef
-
-# provide a manifest template containing jar specific information to be written into the manifest
-# it will be appended to the standard content that is written in the build command explicitly
-# the jar file gets a dependency to the manifest template
-define gb_Jar_set_manifest
-$(call gb_Jar_get_target,$(1)) : MANIFEST := $(2)
-$(call gb_Jar_get_target,$(1)) : $(2)
-
-endef
-
-# remember: classpath is "inherited" to ClassSet
-define gb_Jar_add_jar
-$(call gb_JavaClassSet_add_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
-endef
-
-define gb_Jar_add_system_jar
-$(call gb_JavaClassSet_add_system_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
-endef
-
-# specify jars with imported modules
-define gb_Jar_add_jars
-$(call gb_JavaClassSet_add_jars,$(call gb_Jar_get_classsetname,$(1)),$(2))
-endef
-
-define gb_Jar_add_system_jars
-$(call gb_JavaClassSet_add_system_jars,$(call gb_Jar_get_classsetname,$(1)),$(2))
-endef
-
-define gb_Jar_use_external
-$(call gb_JavaClassSet_use_external,$(call gb_Jar_get_classsetname,$(1)),$(2))
-endef
-
-define gb_Jar_use_externals
-$(call gb_JavaClassSet_use_externals,$(call gb_Jar_get_classsetname,$(1)),$(2))
-endef
-
-# possible directories for jar files containing UNO services 
-gb_Jar_COMPONENTPREFIXES := \
-    OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/classes/ \
-    URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \
-    INTERN:vnd.sun.star.expand:\dOOO_INBUILD_JAVA_DIR/
-
-# get component prefix from layer name ("OOO", "URE", "INTERN")
-gb_Jar__get_componentprefix = \
-    $(patsubst $(1):%,%,$(or \
-        $(filter $(1):%,$(gb_Jar_COMPONENTPREFIXES)), \
-        $(call gb_Output_error,no ComponentTarget native prefix for layer '$(1)')))
-
-# layer must be specified explicitly in this macro (different to libraries)
-define gb_Jar_set_componentfile
-$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Jar__get_componentprefix,$(3)),$(notdir $(call gb_Jar_get_target,$(1))))
-$(call gb_Jar_get_target,$(1)) : \
-	$(call gb_ComponentTarget_get_outdir_target,$(2))
-$(call gb_Jar_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
-
-endef
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
deleted file mode 100644
index fac036e91..000000000
--- a/solenv/gbuild/JavaClassSet.mk
+++ /dev/null
@@ -1,117 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-gb_JavaClassSet_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
-gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
-
-define gb_JavaClassSet__command
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
-	$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
-		-cp "$(CLASSPATH)" \
-		-d $(call gb_JavaClassSet_get_classdir,$(2)) \
-		$(if $(filter-out $(JARDEPS),$(3)),\
-			$(filter-out $(JARDEPS),$(3)),\
-			$(filter-out $(JARDEPS),$(4))) &&) \
-	touch $(1))
-
-endef
-
-$(call gb_JavaClassSet_get_target,%) :
-	$(call gb_Output_announce,$*,$(true),JCS,3)
-	$(call gb_JavaClassSet__command,$@,$*,$?,$^)
-
-$(call gb_JavaClassSet_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),JCS,3)
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
-
-# no initialization of scoped variable CLASSPATH as it is "inherited" from controlling instance (e.g. JUnitTest, Jar)
-# UGLY: cannot use target local variable for REPO because it's needed in prereq
-define gb_JavaClassSet_JavaClassSet
-$(if $(filter $(2),$(gb_JavaClassSet_REPOSITORYNAMES)),,\
-  $(error JavaClassSet: no or invalid repository given; known repositories: \
-  $(gb_JavaClassSet_REPOSITORYNAMES)))
-gb_JavaClassSet_REPO_$(1) := $(2)
-$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS :=
-endef
-
-define gb_JavaClassSet__get_sourcefile
-$($(1))/$(2).java
-endef
-
-define gb_JavaClassSet_add_sourcefile
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : \
-   $(call gb_JavaClassSet__get_sourcefile,$(gb_JavaClassSet_REPO_$(1)),$(2)))
-endef
-
-define gb_JavaClassSet_add_sourcefiles
-$(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefile)))
-
-endef
-
-define gb_JavaClassSet_set_classpath
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2))
-
-endef
-
-# problem: currently we can't get these dependencies to work
-# build order dependency is a hack to get these prerequisites out of the way in the build command
-define gb_JavaClassSet_add_jar
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2))
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(strip $(2)))
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
-endef
-
-# this does not generate dependency on the jar
-define gb_JavaClassSet_add_system_jar
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(strip $(2)))
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
-endef
-
-define gb_JavaClassSet_add_jars
-$(foreach jar,$(2),$(call gb_JavaClassSet_add_jar,$(1),$(jar)))
-endef
-
-define gb_JavaClassSet_add_system_jars
-$(foreach jar,$(2),$(call gb_JavaClassSet_add_system_jar,$(1),$(jar)))
-endef
-
-# this forwards to functions that must be defined in RepositoryExternal.mk.
-# $(call gb_LinkTarget_use_external,library,external)
-define gb_JavaClassSet_use_external
-$(eval $(if $(value gb_JavaClassSet__use_$(2)),\
-  $(call gb_JavaClassSet__use_$(2),$(1)),\
-  $(error gb_JavaClassSet_use_external: unknown external: $(2))))
-endef
-
-define gb_JavaClassSet_use_externals
-$(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external)))
-endef
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
deleted file mode 100644
index dbd246b7c..000000000
--- a/solenv/gbuild/JunitTest.mk
+++ /dev/null
@@ -1,135 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# JunitTest class
-
-gb_JunitTest_JAVACOMMAND := $(JAVAINTERPRETER) $(JAVAIFLAGS)
-gb_JunitTest_HEADLESS := $(true)
-
-# in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
-DBGSV_ERROR_OUT := shell
-export DBGSV_ERROR_OUT
-
-.PHONY : $(call gb_JunitTest_get_clean_target,%)
-$(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_JunitTest_get_classsetname,%))
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $@ $@.log)
-
-ifneq (,$(strip $(OOO_JUNIT_JAR)))
-
-.PHONY : $(call gb_JunitTest_get_target,%)
-$(call gb_JunitTest_get_target,%) :
-	$(call gb_Output_announce,$*,$(true),JUT,2)
-	$(call gb_Helper_abbreviate_dirs_native,\
-		mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
-		$(gb_JunitTest_JAVACOMMAND) \
-            -cp "$(CLASSPATH)" \
-            $(if $(strip $(gb_JunitTest_HEADLESS)),\
-                -Dorg.openoffice.test.arg.headless=$(gb_JunitTest_HEADLESS)) \
-            $(if $(strip $(gb_JunitTest_DEBUGCOMMAND)),\
-                '-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \
-            $(DEFS) \
-            org.junit.runner.JUnitCore \
-            $(CLASSES) 2>&1 > $@.log || (cat $@.log && false))
-	$(CLEAN_CMD)
-
-define gb_JunitTest_JunitTest
-$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib
-$(call gb_JunitTest_get_target,$(1)) : CLASSES :=
-$(call gb_JunitTest_JunitTest_platform,$(1))
-
-$(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
-$(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1)))
-$(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
-endef
-
-define gb_JunitTest_set_defs
-$(call gb_JunitTest_get_target,$(1)) : DEFS := $(2)
-
-endef
-
-define gb_JunitTest_add_classes
-$(call gb_JunitTest_get_target,$(1)) : CLASSES += $(2)
-
-endef
-
-define gb_JunitTest_add_class
-$(call gb_JunitTest_add_classes,$(1),$(2))
-
-endef
-
-
-define gb_JunitTest_add_sourcefile
-$(call gb_JavaClassSet_add_sourcefile,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
-
-endef
-
-define gb_JunitTest_add_sourcefiles
-$(foreach sourcefile,$(2),$(call gb_JunitTest_add_sourcefile,$(1),$(sourcefile)))
-
-endef
-
-define gb_JunitTest_set_classpath
-$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(2)
-
-endef
-
-define gb_JunitTest_add_jar
-$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(2)
-$(call gb_JunitTest_get_target,$(1)) : $(2)
-
-endef
-
-define gb_JunitTest_add_jars
-$(foreach jar,$(2),$(call gb_JunitTest_add_jar,$(1),$(jar)))
-
-endef
-
-else # OOO_JUNIT_JAR
-
-.PHONY : $(call gb_JunitTest_get_target,$(1))
-$(call gb_JunitTest_get_target,%) :
-	$(call gb_Output_announce,$* (skipped - no Junit),$(true),JUT,2)
-	@true
-
-define gb_JunitTest_JunitTest
-$(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
-endef
-
-gb_JunitTest_set_defs :=
-gb_JunitTest_add_classes :=
-gb_JunitTest_add_class :=
-gb_JunitTest_add_sourcefile :=
-gb_JunitTest_add_sourcefiles :=
-gb_JunitTest_set_classpath :=
-gb_JunitTest_add_jar :=
-gb_JunitTest_add_jars :=
-
-endif # OOO_JUNIT_JAR
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
deleted file mode 100644
index 455bd8ff4..000000000
--- a/solenv/gbuild/Library.mk
+++ /dev/null
@@ -1,147 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# Library class
-
-# defined globally in TargetLocations.mk
-#  gb_Library_OUTDIRLOCATION := $(OUTDIR)/lib
-#  gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library
-# defined by platform
-#  gb_Library_COMPONENTPREFIXES
-#  gb_Library_DEFS
-#  gb_Library_DLLFILENAMES
-#  gb_Library_FILENAMES
-#  gb_Library_Library_platform
-#  gb_Library_TARGETS
-
-
-# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
-.PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT)
-$(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) :
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(OUTDIR)/lib/$*$(gb_Library_PLAINEXT) \
-			$(AUXTARGETS))
-
-# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
-$(gb_Library_OUTDIRLOCATION)/%$(gb_Library_PLAINEXT) : 
-	$(call gb_Helper_abbreviate_dirs,\
-		$(call gb_Deliver_deliver,$<,$@) \
-			$(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
-
-define gb_Library_Library
-ifeq (,$$(findstring $(1),$$(gb_Library_KNOWNLIBS)))
-$$(eval $$(call gb_Output_info,Currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
-$$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk))
-endif
-$(call gb_Library_get_target,$(1)) : AUXTARGETS :=
-$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1)))
-$(call gb_Library_add_default_nativeres,$(1),default)
-
-endef
-
-define gb_Library__Library_impl
-$(call gb_LinkTarget_LinkTarget,$(2))
-$(call gb_LinkTarget_set_targettype,$(2),Library)
-$(call gb_LinkTarget_add_defs,$(2),\
-	$(gb_Library_DEFS) \
-)
-$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
-$(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
-$(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))
-$$(eval $$(call gb_Module_register_target,$(call gb_Library_get_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
-
-endef
-
-define gb_Library_set_componentfile
-$(call gb_ComponentTarget_ComponentTarget,$(or $(strip $(3)),$(strip $(2))),$(call gb_Library__get_componentprefix,$(1)),$(call gb_Library_get_runtime_filename,$(1)),$(2))
-$(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2)) $(call gb_ComponentTarget_get_outdir_inbuild_target,$(2))
-$(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(or $(strip $(3)),$(strip $(2))))
-
-endef
-
-gb_Library__get_componentprefix = \
-	$(call gb_Library__get_layer_componentprefix,$(call \
-		gb_Library_get_layer,$(1)))
-
-gb_Library__get_layer_componentprefix = \
-	$(patsubst $(1):%,%,$(or \
-		$(filter $(1):%,$(gb_Library_COMPONENTPREFIXES)), \
-		$(call gb_Output_error,no ComponentTarget native prefix for layer '$(1)')))
-
-
-define gb_Library__forward_to_Linktarget
-gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_Library_get_linktargetname,$$(1)),$$(2),$$(3))
-
-endef
-
-gb_Library_get_runtime_filename = \
- $(or $(call gb_Library_get_dllname,$(1)),$(call gb_Library_get_filename,$(1)))
-
-$(eval $(foreach method,\
-	add_cobject \
-	add_cobjects \
-	add_cxxobject \
-	add_cxxobjects \
-	add_objcobject \
-	add_objcobjects \
-	add_objcxxobject \
-	add_objcxxobjects \
-	add_exception_objects \
-	add_noexception_objects \
-	add_generated_cxxobjects \
-	add_generated_exception_objects \
-	add_cflags \
-	set_cflags \
-	add_cxxflags \
-	set_cxxflags \
-	add_objcxxflags \
-	set_objcflags \
-	set_objcxxflags \
-	add_defs \
-	set_defs \
-	set_include \
-	add_ldflags \
-	set_ldflags \
-	add_libs \
-	set_library_path_flags \
-	add_api \
-	add_linked_libs \
-	add_linked_static_libs \
-	use_external \
-	use_externals \
-	add_package_headers \
-	add_sdi_headers \
-	add_precompiled_header \
-	export_objects_list \
-,\
-	$(call gb_Library__forward_to_Linktarget,$(method))\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
deleted file mode 100644
index 25f9737fb..000000000
--- a/solenv/gbuild/LinkTarget.mk
+++ /dev/null
@@ -1,895 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#the following user-defined variables are supported:
-# CPPFLAGS
-# CFLAGS
-# CXXFLAGS
-# OBJCXXFLAGS
-# LDFLAGS
-
-# CFLAGS from environment override debug/optimization flags
-ifeq ($(gb_DEBUGLEVEL),2)
-CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
-CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
-OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
-else
-CFLAGS ?= $(gb_COMPILEROPTFLAGS)
-CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
-OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
-endif
-
-# Overview of dependencies and tasks of LinkTarget
-#
-# target                      task                         depends on
-# LinkTarget                  linking                      CObject CxxObject GenCxxObject ObjCObject ObjCxxObject
-#                                                          LinkTarget/headers
-# LinkTarget/dep              joined dep file              CObject/dep CxxObject/dep GenCxxObject/dep ObjCObject/dep ObjCxxObject/dep
-#                                                          | LinkTarget/headers
-# LinkTarget/headers          all headers available        LinkTarget/external_headers PCH
-#                              including own generated     own generated headers
-# PCH                         precompiled headers (win)    LinkTarget/external_headers
-# LinkTarget/external_headers all external headers avail.  header files of linked libs
-#
-# CObject                     plain c compile              | LinkTarget/headers
-# CxxObject                   c++ compile                  | LinkTarget/headers
-# GenCxxObject                C++ compile from             | LinkTarget/headers
-#                              generated source
-# ObjCObject                  objective c compile          | LinkTarget/headers
-# ObjCxxObject                objective c++ compile        | LinkTarget/headers
-#
-# CObject/dep                 dependencies                 these targets generate empty dep files
-# CxxObject/dep               dependencies                 that are populated upon compile
-# GenCxxObject/dep            dependencies
-# ObjCObject/dep            dependencies
-# ObjCxxObject/dep            dependencies
-
-# LinkTarget/headers means gb_LinkTarget_get_headers_target etc.
-# dependencies prefixed with | are build-order only dependencies
-
-
-
-# For every object there is a dep file (if gb_FULLDEPS is active).
-# The dep file depends on the object: the Object__command also updates the
-# dep file as a side effect.
-# In the dep file rule just touch it so it's newer than the object.
-
-# The gb_Object__command_dep generates an "always rebuild" dep file;
-# It is _only_ used in case the user deletes the object dep file.
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_Object__command_dep
-mkdir -p $(dir $(1)) && \
-	echo '$(2) : $$(gb_Helper_PHONY)' > $(1)
-
-endef
-else
-gb_Object__command_dep = \
- $(call gb_Output_error,gb_Object__command_dep is only for gb_FULLDEPS)
-endif
-
-
-# CObject class
-
-gb_CObject_REPOS := $(gb_REPOS)
-
-gb_CObject_get_source = $(1)/$(2).c
-# defined by platform
-#  gb_CObject__command
-
-define gb_CObject__rules
-$$(call gb_CObject_get_target,%) : $$(call gb_CObject_get_source,$(1),%)
-	$$(call gb_CObject__command,$$@,$$*,$$<,$$(call gb_CObject_get_dep_target,$$*))
-
-ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_CObject_get_dep_target,%) : $$(call gb_CObject_get_target,%)
-	$$(if $$(wildcard $$@),touch $$@,\
-	  $$(call gb_Object__command_dep,$$@,$$(call gb_CObject_get_target,$$*)))
-endif
-
-endef
-
-$(foreach repo,$(gb_CObject_REPOS),$(eval $(call gb_CObject__rules,$(repo))))
-
-$(call gb_CObject_get_dep_target,%) :
-	$(eval $(call gb_Output_error,Unable to find plain C file $(call gb_CObject_get_source,,$*) in the repositories: $(gb_CObject_REPOS)))
-
-gb_CObject_CObject =
-
-
-# CxxObject class
-
-gb_CxxObject_REPOS := $(gb_REPOS)
-
-gb_CxxObject_get_source = $(1)/$(2).cxx
-# defined by platform
-#  gb_CxxObject__command
-
-# Only enable PCH if the PCH_CXXFLAGS and the PCH_DEFS (from the linktarget)
-# are the same as the T_CXXFLAGS and DEFS we want to use for this object. This
-# should usually be the case.  The DEFS/T_CXXFLAGS would have too be manually
-# overridden for one object file for them to differ.  PCH_CXXFLAGS/PCH_DEFS
-# should never be overridden on an object -- they should be the same as for the
-# whole linktarget. In general it should be cleaner to use a static library
-# compiled with different flags and link that in rather than mixing different
-# flags in one linktarget.
-define gb_CxxObject__set_pchflags
-ifeq ($(gb_ENABLE_PCH),$(true))
-ifneq ($(strip $$(PCH_NAME)),)
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
-$$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME))
-else
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
-$$@ : PCHFLAGS := $$(call gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME))
-else
-$$(info No precompiled header available for $$*.)
-$$(info precompiled header flags (  ex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)))
-$$(info precompiled header flags (noex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)))
-$$(info .           object flags        : $$(sort $$(T_CXXFLAGS) $$(DEFS)))
-$$@ : PCHFLAGS := 
-endif
-endif
-endif
-endif
-endef
-
-define gb_CxxObject__rules
-$$(call gb_CxxObject_get_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
-	$$(eval $$(gb_CxxObject__set_pchflags))
-	$$(call gb_CxxObject__command,$$@,$$*,$$<,$$(call gb_CxxObject_get_dep_target,$$*))
-
-ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_CxxObject_get_dep_target,%) : $$(call gb_CxxObject_get_target,%)
-	$$(if $$(wildcard $$@),touch $$@,\
-	  $$(eval $$(gb_CxxObject__set_pchflags))\
-	  $$(call gb_Object__command_dep,$$@,$$(call gb_CxxObject_get_target,$$*)))
-endif
-
-endef
-
-$(foreach repo,$(gb_CxxObject_REPOS),$(eval $(call gb_CxxObject__rules,$(repo))))
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_CxxObject_get_dep_target,%) :
-	$(eval $(call gb_Output_error,Unable to find C++ file $(call gb_CxxObject_get_source,,$*) in repositories: $(gb_CxxObject_REPOS)))
-
-endif
-
-gb_CxxObject_CxxObject =
-
-
-# GenCxxObject class
-
-gb_GenCxxObject_get_source = $(WORKDIR)/$(1).cxx
-# defined by platform
-#  gb_CxxObject__command
-
-$(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%)
-	$(call gb_CxxObject__command,$@,$*,$<,$(call gb_GenCxxObject_get_dep_target,$*))
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_GenCxxObject_get_dep_target,%) : $(call gb_GenCxxObject_get_target,%)
-	$(if $(wildcard $@),touch $@,\
-	  $(call gb_Object__command_dep,$@,$(call gb_GenCxxObject_get_target,$*)))
-endif
-
-gb_GenCxxObject_GenCxxObject =
-
-
-# ObjCxxObject class
-#
-gb_ObjCxxObject_REPOS := $(gb_REPOS)
-
-gb_ObjCxxObject_get_source = $(1)/$(2).mm
-# defined by platform
-#  gb_ObjCxxObject__command
-
-define gb_ObjCxxObject__rules
-$$(call gb_ObjCxxObject_get_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%)
-	$$(call gb_ObjCxxObject__command,$$@,$$*,$$<,$$(call gb_ObjCxxObject_get_dep_target,$$*))
-
-ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_ObjCxxObject_get_dep_target,%) : $$(call gb_ObjCxxObject_get_target,%)
-	$$(if $$(wildcard $$@),touch $$@,\
-	  $$(call gb_Object__command_dep,$$@,$$(call gb_ObjCxxObject_get_target,$$*)))
-endif
-
-endef
-
-$(foreach repo,$(gb_ObjCxxObject_REPOS),$(eval $(call gb_ObjCxxObject__rules,$(repo))))
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_ObjCxxObject_get_dep_target,%) :
-	$(eval $(call gb_Output_error,Unable to find Objective C++ file $(call gb_ObjCxxObject_get_source,,$*) in repositories: $(gb_ObjCxxObject_REPOS)))
-endif
-
-gb_ObjCxxObject_ObjCxxObject =
-
-# ObjCObject class
-#
-gb_ObjCObject_REPOS := $(gb_REPOS)
-
-gb_ObjCObject_get_source = $(1)/$(2).m
-# defined by platform
-#  gb_ObjCObject__command
-
-# this rule generates an "always rebuild" dep file, to have something to include.
-# the dep file will be overridden on the fly, when the object is compiled
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_ObjCObject__command_dep
-mkdir -p $(dir $(1)) && \
-	echo '$(call gb_ObjCObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-
-endef
-else
-gb_ObjCObject__command_dep =
-endif
-
-define gb_ObjCObject__rules
-$$(call gb_ObjCObject_get_target,%) : $$(call gb_ObjCObject_get_source,$(1),%)
-	$$(call gb_ObjCObject__command,$$@,$$*,$$<,$$(DEFS),$$(OBJCFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
-
-ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_ObjCObject_get_dep_target,%) : $$(call gb_ObjCObject_get_source,$(1),%)
-	$$(call gb_ObjCObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(OBJCFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
-endif
-
-endef
-
-$(foreach repo,$(gb_ObjCObject_REPOS),$(eval $(call gb_ObjCObject__rules,$(repo))))
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_ObjCObject_get_dep_target,%) :
-	$(eval $(call gb_Output_error,Unable to find Objective C++ file $(call gb_ObjCObject_get_source,,$*) in repositories: $(gb_ObjCObject_REPOS)))
-endif
-
-gb_ObjCObject_ObjCObject =
-
-
-
-# LinkTarget class
-
-gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
-gb_LinkTarget_OBJECTOWNER :=
-gb_LinkTarget_OBJECTS :=
-
-# defined by platform
-#  gb_LinkTarget_CXXFLAGS
-#  gb_LinkTarget_LDFLAGS
-#  gb_LinkTarget_INCLUDE 
-#  gb_LinkTarget_INCLUDE_STL
-
-.PHONY : $(call gb_LinkTarget_get_clean_target,%)
-$(call gb_LinkTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),LNK,4)
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_dep_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_dep_target,$(object))) \
-		$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \
-		$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_dep_target,$(object))) \
-		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
-		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_dep_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_dep_target,$(object))) \
-		$(call gb_LinkTarget_get_target,$*) \
-		$(call gb_LinkTarget_get_dep_target,$*) \
-		$(call gb_LinkTarget_get_headers_target,$*) \
-		$(call gb_LinkTarget_get_external_headers_target,$*) \
-		$(call gb_LinkTarget_get_objects_list,$*) \
-		$(DLLTARGET) \
-		$(AUXTARGETS)) && \
-	cat $${RESPONSEFILE} /dev/null | xargs -n 200 rm -f && \
-	rm -f $${RESPONSEFILE}
-
-
-# cat the deps of all objects in one file, then we need only open that one file
-define gb_LinkTarget__command_dep
-$(call gb_Output_announce,LNK:$(2),$(true),DEP,1)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
-		$(foreach object,$(3),$(call gb_CObject_get_dep_target,$(object))) \
-		$(foreach object,$(4),$(call gb_CxxObject_get_dep_target,$(object))) \
-		$(foreach object,$(5),$(call gb_ObjCObject_get_dep_target,$(object)))\
-		$(foreach object,$(6),$(call gb_ObjCxxObject_get_dep_target,$(object)))\
-		 $(foreach object,$(7),$(call gb_GenCxxObject_get_dep_target,$(object)))\
-		) && \
-	cat $${RESPONSEFILE} /dev/null | xargs -n 200 cat > $(1)) && \
-	rm -f $${RESPONSEFILE}
-
-endef
-
-define gb_LinkTarget__command_objectlist
-TEMPFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
-	$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-	$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-	$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \
-	$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
-	$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object)))) && \
-$(if $(EXTRAOBJECTLISTS),cat $(EXTRAOBJECTLISTS) >> $${TEMPFILE} && ) \
-mv $${TEMPFILE} $(call gb_LinkTarget_get_objects_list,$(2)) 
-
-endef
-
-$(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY)
-	$(call gb_LinkTarget__command,$@,$*)
-	$(call gb_LinkTarget__command_objectlist,$@,$*)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_dep_target,%)
-$(call gb_LinkTarget_get_dep_target,%) : | $(call gb_LinkTarget_get_headers_target,%)
-	$(call gb_LinkTarget__command_dep,$@,$*,$(COBJECTS),$(CXXOBJECTS),$(OBJCOBJECTS),$(OBJCXXOBJECTS),$(GENCXXOBJECTS))
-endif
-
-# Ok, this is some dark voodoo: When declaring a linktarget with
-# gb_LinkTarget_LinkTarget we set SELF in the headertarget to name of the
-# target. When the rule for the headertarget is executed and SELF does not
-# match the target name, we are depending on a linktarget that was never
-# declared. In a full build exclusively in gbuild that should never happen.
-# However, partial gbuild build will not know about how to build lower level
-# linktargets, just as gbuild can not know about linktargets generated in the
-# old build.pl/dmake system. Once all is migrated, gbuild should error out
-# when is is told to depend on a linktarget it does not know about and not
-# only warn.
-define gb_LinkTarget__get_external_headers_check
-ifneq ($$(SELF),$$*)
-$$(eval $$(call gb_Output_info,LinkTarget $$* not defined: Assuming headers to be there!,ALL))
-endif
-$$@ : COMMAND := $$(call gb_Helper_abbreviate_dirs, mkdir -p $$(dir $$@) && touch $$@ && mkdir -p $(call gb_LinkTarget_get_target,)pdb/$$(dir $$*))
-
-endef
-
-$(call gb_LinkTarget_get_external_headers_target,%) :
-	$(eval $(gb_LinkTarget__get_external_headers_check))
-	$(COMMAND)
-
-$(call gb_LinkTarget_get_headers_target,%) : $(call gb_LinkTarget_get_external_headers_target,%)
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && touch $@)
-
-# Explanation of some of the targets:
-# - gb_LinkTarget_get_external_headers_target is the targets that guarantees all
-#   headers from linked against libraries are in OUTDIR.
-# - gb_LinkTarget_get_headers_target is the target that guarantees all headers
-#   from the linked against the libraries and the linktargets own headers
-#   (including generated headers) are in the OUTDIR.
-# - gb_LinkTarget_get_target links the objects into a file in WORKDIR.
-# gb_LinkTarget_get_target depends on gb_LinkTarget_get_headers_target which in
-# turn depends gb_LinkTarget_get_external_headers_target.
-# gb_LinkTarget_get_target depends additionally on the objects, which in turn
-# depend build-order only on the gb_LinkTarget_get_headers_target. The build
-# order-only dependency ensures all headers to be there for compiling and
-# dependency generation without causing all objects to be rebuild when one
-# header changes. Only the ones with an explicit dependency in their generated
-# dependency file will be rebuild.
-#
-# gb_LinkTarget_get_target is the target that links the objects into a file in
-# WORKDIR
-# Explanation of some of the variables:
-# - AUXTARGETS are the additionally generated files that need to be cleaned out
-#   on clean.
-# - PCH_CXXFLAGS and PCH_DEFS are the flags that the precompiled headers will
-#   be compiled with.  They should never be overridden in a single object
-#   files.
-# - TARGETTYPE is the type of linktarget as some platforms need very different
-#   command to link different targettypes.
-#
-# Since most variables are set on the linktarget and not on the object, the
-# object learns about these setting via GNU makes scoping of target variables.
-# Therefore it is important that objects are only directly depended on by the
-# linktarget. This for example means that you cannot build a single object
-# alone, because then you would directly depend on the object.
-#
-# A note about flags: because the overriding the global variables with a target
-# local variable of the same name is considered obscure, the target local
-# variables have a T_ prefix.
-define gb_LinkTarget_LinkTarget
-$(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS :=
-$(call gb_LinkTarget_get_external_headers_target,$(1)) : SELF := $(1)
-$(call gb_LinkTarget_get_target,$(1)) : DLLTARGET := 
-$(call gb_LinkTarget_get_clean_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : COBJECTS := 
-$(call gb_LinkTarget_get_clean_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS := 
-$(call gb_LinkTarget_get_clean_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : OBJCOBJECTS :=
-$(call gb_LinkTarget_get_clean_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS :=
-$(call gb_LinkTarget_get_clean_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
-$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
-$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS := $$(gb_LinkTarget_OBJCFLAGS) $(OBJCFLAGS)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL)
-$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(LDFLAGS)
-$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS := 
-$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := 
-$(call gb_LinkTarget_get_target,$(1)) : LIBS :=
-$(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE := 
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : PCH_NAME :=
-$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS :=
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : PDBFILE :=
-$(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS := 
-$(call gb_LinkTarget_get_target,$(1)) : NATIVERES :=
-
-ifeq ($(gb_FULLDEPS),$(true))
--include $(call gb_LinkTarget_get_dep_target,$(1))
-$(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS := 
-$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS := 
-$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCOBJECTS :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCFLAGS := $$(gb_LinkTarget_OBJCFLAGS) $(OBJCFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
-$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL)
-$(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := 
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_NAME :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : EXTRAOBJECTLISTS := 
-endif
-
-endef
-
-define gb_LinkTarget_add_defs
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS += $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS += $(2)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS += $(2)
-endif
-endef
-
-define gb_LinkTarget_set_defs
-ifeq (,)
-$$(call gb_Output_error,\
- gb_LinkTarget_set_defs: use gb_LinkTarget_add_defs instead.)
-else
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : DEFS := $(2)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $(2)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $(2)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $(2)
-endif
-endif
-
-endef
-
-define gb_LinkTarget_add_cflags
-$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS += $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS += $(2)
-endif
-
-endef
-
-define gb_LinkTarget_set_cflags
-ifeq (,)
-$$(call gb_Output_error,\
- gb_LinkTarget_set_cflags: use gb_LinkTarget_add_cflags instead.)
-else
-$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $(2)
-endif
-endif
-
-endef
-
-define gb_LinkTarget_add_cxxflags
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS += $(2)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS += $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS += $(2)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS += $(2)
-endif
-endef
-
-define gb_LinkTarget_set_cxxflags
-ifeq (,)
-$$(call gb_Output_error,\
- gb_LinkTarget_set_cxxflags: use gb_LinkTarget_add_cxxflags instead.)
-else
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $(2)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $(2)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $(2)
-endif
-endif
-
-endef
-
-define gb_LinkTarget_add_objcxxflags
-$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS += $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS += $(2)
-endif
-endef
-
-define gb_LinkTarget_set_objcxxflags
-ifeq (,)
-$$(call gb_Output_error,\
- gb_LinkTarget_set_objcxxflags: use gb_LinkTarget_add_objcxxflags instead.)
-else
-$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $(2)
-endif
-endif
-
-endef
-
-define gb_LinkTarget_set_objcflags
-$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS := $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCFLAGS := $(2)
-endif
-
-endef
-
-define gb_LinkTarget_set_include
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $(2)
-endif
-
-endef
-
-define gb_LinkTarget_set_include_stl
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $(2)
-endif
-
-endef
-
-define gb_LinkTarget_add_ldflags
-$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2)
-endef
-
-# real use in RepositoryExternal.mk
-define gb_LinkTarget_set_ldflags
-$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $(2)
-endef
-
-define gb_LinkTarget_add_libs
-$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2)
-endef
-
-define gb_LinkTarget_add_api
-$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
-	$$(foreach api,$(2),$$(call gb_Package_get_target,$$(api)_inc))
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api))
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api))
-endif
-
-endef
-
-define gb_LinkTarget_add_linked_libs
-ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
-$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
-$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk))
-endif
-
-$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $(2)
-
-$(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call gb_Library_get_target,$$(lib)))
-$(call gb_LinkTarget_get_external_headers_target,$(1)) : \
-$$(foreach lib,$(2),$$(call gb_Library_get_headers_target,$$(lib)))
-
-endef
-
-define gb_LinkTarget_add_linked_static_libs
-ifneq (,$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)))
-$$(eval $$(call gb_Output_info, currently known static libraries are: $(sort $(gb_StaticLibrary_KNOWNLIBS)),ALL))
-$$(eval $$(call gb_Output_error,Cannot link against static library/libraries $$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)). Static libraries must be registered in Repository.mk))
-endif
-
-$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(2)
-
-$(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call gb_StaticLibrary_get_target,$$(lib)))
-$(call gb_LinkTarget_get_external_headers_target,$(1)) : \
-$$(foreach lib,$(2),$$(call gb_StaticLibrary_get_headers_target,$$(lib)))
-
-endef
-
-define gb_LinkTarget_add_cobject
-$(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2)
-$(call gb_LinkTarget_get_clean_target,$(1)) : COBJECTS += $(2)
-
-$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CObject_get_target,$(2))
-$(call gb_CObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_CObject_get_target,$(2)) : T_CFLAGS += $(3)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS += $(2)
-$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CObject_get_dep_target,$(2))
-endif
-
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-gb_LinkTarget_OBJECTOWNER += $(call gb_CObject_get_target,$(2)):$(1)
-gb_LinkTarget_OBJECTS +=  $(call gb_CObject_get_target,$(2))
-endif
-
-endef
-
-define gb_LinkTarget_add_cxxobject
-$(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS += $(2)
-$(call gb_LinkTarget_get_clean_target,$(1)) : CXXOBJECTS += $(2)
-
-$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CxxObject_get_target,$(2))
-$(call gb_CxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_CxxObject_get_target,$(2)) : T_CXXFLAGS += $(3)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2)
-$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CxxObject_get_dep_target,$(2))
-endif
-
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-gb_LinkTarget_OBJECTOWNER += $(call gb_CxxObject_get_target,$(2)):$(1)
-gb_LinkTarget_OBJECTS +=  $(call gb_CxxObject_get_target,$(2))
-endif
-
-endef
-
-define gb_LinkTarget_add_objcobject
-$(call gb_LinkTarget_get_target,$(1)) : OBJCOBJECTS += $(2)
-$(call gb_LinkTarget_get_clean_target,$(1)) : OBJCOBJECTS += $(2)
-
-$(call gb_LinkTarget_get_target,$(1)) : $(call gb_ObjCObject_get_target,$(2))
-$(call gb_ObjCObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_ObjCObject_get_target,$(2)) : T_OBJCFLAGS += $(3)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCOBJECTS += $(2)
-$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_ObjCObject_get_dep_target,$(2))
-endif
-
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-gb_LinkTarget_OBJECTOWNER += $(call gb_ObjCObject_get_target,$(2)):$(1)
-gb_LinkTarget_OBJECTS +=  $(call gb_ObjCObject_get_target,$(2))
-endif
-
-endef
-
-define gb_LinkTarget_add_objcxxobject
-$(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS += $(2)
-$(call gb_LinkTarget_get_clean_target,$(1)) : OBJCXXOBJECTS += $(2)
-
-$(call gb_LinkTarget_get_target,$(1)) : $(call gb_ObjCxxObject_get_target,$(2))
-$(call gb_ObjCxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_ObjCxxObject_get_target,$(2)) : T_OBJCXXFLAGS += $(3)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS += $(2)
-$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_ObjCxxObject_get_dep_target,$(2))
-endif
-
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-gb_LinkTarget_OBJECTOWNER += $(call gb_ObjCxxObject_get_target,$(2)):$(1)
-gb_LinkTarget_OBJECTS +=  $(call gb_ObjCxxObject_get_target,$(2))
-endif
-
-endef
-
-define gb_LinkTarget_add_generated_cxx_object
-$(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2)
-$(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXOBJECTS += $(2)
-
-$(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2))
-$(call gb_GenCxxObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2)
-$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_GenCxxObject_get_dep_target,$(2))
-endif
-
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-gb_LinkTarget_OBJECTOWNER += $(call gb_GenCxxObject_get_target,$(2)):$(1)
-gb_LinkTarget_OBJECTS +=  $(call gb_GenCxxObject_get_target,$(2))
-endif
-
-endef
-
-define gb_LinkTarget_add_noexception_object
-$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS) $(CXXFLAGS))
-endef
-
-define gb_LinkTarget_add_exception_object
-$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(CXXFLAGS))
-endef
-
-define gb_LinkTarget_add_cobjects
-$(foreach obj,$(2),$(call gb_LinkTarget_add_cobject,$(1),$(obj),$(3)))
-endef
-
-define gb_LinkTarget_add_linktarget_objects
-$(call gb_LinkTarget_get_target,$(1)) : $(foreach linktarget,$(2),$(call gb_LinkTarget_get_target,$(linktarget)))
-$(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS += $(foreach linktarget,$(2),$(call gb_LinkTarget_get_objects_list,$(linktarget)))
-
-endef
-
-define gb_LinkTarget_add_library_objects
-ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
-$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
-$$(eval $$(call gb_Output_error,Cannot import objects library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk))
-endif
-$(call gb_LinkTarget_add_linktarget_objects,$(1),$(foreach lib,$(2),$(call gb_Library_get_linktargetname,$(lib))))
-
-endef
-
-define gb_LinkTarget_add_executable_objects
-$(call gb_LinkTarget_add_linktarget_objects,$(1),$(foreach exe,$(2),$(call gb_Executable_get_linktargetname,$(lib))))
-
-endef
-
-define gb_LinkTarget_add_cxxobjects
-$(foreach obj,$(2),$(call gb_LinkTarget_add_cxxobject,$(1),$(obj),$(3)))
-endef
-
-define gb_LinkTarget_add_objcobjects
-$(foreach obj,$(2),$(call gb_LinkTarget_add_objcobject,$(1),$(obj),$(3)))
-endef
-
-define gb_LinkTarget_add_objcxxobjects
-$(foreach obj,$(2),$(call gb_LinkTarget_add_objcxxobject,$(1),$(obj),$(3)))
-endef
-
-define gb_LinkTarget_add_noexception_objects
-$(foreach obj,$(2),$(call gb_LinkTarget_add_noexception_object,$(1),$(obj)))
-endef
-
-define gb_LinkTarget_add_exception_objects
-$(foreach obj,$(2),$(call gb_LinkTarget_add_exception_object,$(1),$(obj)))
-endef
-
-define gb_LinkTarget_add_generated_cxxobjects
-$(foreach obj,$(2),$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(obj),$(3)))
-endef
-
-define gb_LinkTarget_add_generated_exception_object
-$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) $(CXXFLAGS))
-endef
-
-define gb_LinkTarget_add_generated_exception_objects
-$(foreach obj,$(2),$(call gb_LinkTarget_add_generated_exception_object,$(1),$(obj)))
-endef
-
-define gb_LinkTarget_set_targettype
-$(call gb_LinkTarget_get_target,$(1)) \
-$(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := $(2)
-endef
-
-define gb_LinkTarget_set_dlltarget
-$(call gb_LinkTarget_get_clean_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : DLLTARGET := $(2)
-endef
-
-define gb_LinkTarget_set_auxtargets
-$(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS := $(2)
-endef
-
-define gb_LinkTarget__add_internal_headers
-$(call gb_LinkTarget_get_headers_target,$(1)) : $(2)
-$(2) :|	$(call gb_LinkTarget_get_external_headers_target,$(1))
-
-endef
-
-define gb_LinkTarget_add_package_headers
-$(foreach package,$(2),$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_Package_get_target,$(package))))
-$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call gb_Package_get_clean_target,$(package)))
-
-endef
-
-define gb_LinkTarget_add_sdi_headers
-$(call gb_LinkTarget__add_internal_headers,$(1),$(foreach sdi,$(2),$(call gb_SdiTarget_get_target,$(sdi))))
-$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach sdi,$(2),$(call gb_SdiTarget_get_clean_target,$(sdi)))
-endef
-
-define gb_LinkTarget__add_precompiled_header_impl
-$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_PrecompiledHeader_get_target,$(3)))
-$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_PrecompiledHeader_get_clean_target,$(3))
-$(call gb_PrecompiledHeader_get_target,$(3)) : $(2).cxx
-
-$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_NoexPrecompiledHeader_get_target,$(3)))
-$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_NoexPrecompiledHeader_get_clean_target,$(3))
-$(call gb_NoexPrecompiledHeader_get_target,$(3)) : $(2).cxx
-
-$(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := $(3)
-$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $(call gb_PrecompiledHeader_get_target,$(3)).obj $(call gb_NoexPrecompiledHeader_get_target,$(3)).obj
-
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS
-$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS = $$(DEFS)
-ifeq ($(gb_FULLDEPS),$(true))
--include \
-	$(call gb_PrecompiledHeader_get_dep_target,$(3)) \
-	$(call gb_NoexPrecompiledHeader_get_dep_target,$(3))
-$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS = $$(DEFS)
-endif
-
-endef
-
-define gb_LinkTarget_add_precompiled_header
-ifeq ($(gb_ENABLE_PCH),$(true))
-$(call gb_LinkTarget__add_precompiled_header_impl,$(1),$(2),$(notdir $(2)))
-endif
-
-endef
-
-# this forwards to functions that must be defined in RepositoryExternal.mk.
-# $(eval $(call gb_LinkTarget_use_external,library,external))
-define gb_LinkTarget_use_external
-$(if $(value gb_LinkTarget__use_$(2)),\
-  $(call gb_LinkTarget__use_$(2),$(1)),\
-  $(error gb_LinkTarget_use_external: unknown external: $(2)))
-endef
-
-# $(call gb_LinkTarget_use_externals,library,externals)
-gb_LinkTarget_use_externals = \
- $(foreach external,$(2),$(eval $(call gb_LinkTarget_use_external,$(1),$(external))))
-
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
deleted file mode 100644
index 7ecd947c6..000000000
--- a/solenv/gbuild/Module.mk
+++ /dev/null
@@ -1,245 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# Overview of dependencies and tasks of Module
-#
-# target                      task                         depends on
-# Module                      build the product            all product targets
-#                              excluding tests             recursive Modules
-# Module/check                run unit tests               all unit tests
-#                                                          recursive Module/checks
-# Module/subsequentcheck      run system tests             all system tests
-#                                                          recursive Module/subsequentchecks
-# all (global)                build the product            top-level Module
-# check (global)              run unit tests               top-level Module/check
-# subsequentcheck (global)    run system tests             top-level Module/subsequentcheck
-# allandcheck (global)        default goal                 all check
-
-
-# Module class
-
-gb_Module_ALLMODULES :=
-gb_Module_MODULELOCATIONS :=
-gb_Module_TARGETSTACK :=
-gb_Module_CHECKTARGETSTACK :=
-gb_Module_SUBSEQUENTCHECKTARGETSTACK :=
-gb_Module_CLEANTARGETSTACK :=
-
-.PHONY : $(call gb_Module_get_clean_target,%)
-$(call gb_Module_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),MOD,5)
-	$(call gb_Output_announce_title,module $* cleared.)
-	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_Module_get_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_subsequentcheck_target,$*))
-
-$(call gb_Module_get_check_target,%) :
-	$(call gb_Output_announce,$*,$(true),CHK,5)
-	$(call gb_Output_announce_title,module $* checks done.)
-	-$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && \
-		touch $@)
-
-$(call gb_Module_get_subsequentcheck_target,%) :
-	$(call gb_Output_announce,$*,$(true),SCK,5)
-	$(call gb_Output_announce_title,module $* subsequentchecks done.)
-	-$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && \
-		touch $@)
-
-$(call gb_Module_get_target,%) :
-	$(call gb_Output_announce,$*,$(true),MOD,5)
-	$(call gb_Output_announce_title,module $* done.)
-	-$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && \
-		touch $@)
-
-.PHONY : all allandcheck clean check subsequentcheck
-.DEFAULT_GOAL := allandcheck
-
-allandcheck : all check
-
-# compatibility with the old build system
-ifneq ($(strip $(OOO_SUBSEQUENT_TESTS)),)
-.DEFAULT_GOAL := subsequentcheck
-endif
-
-all : 
-	$(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog,$^),$(notdir $(module))),$(true),ALL,6)
-	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6)
-	$(call gb_Output_announce_title,all done.)
-	$(call gb_Output_announce_bell)
-
-check :
-	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),CHK,6)
-	$(call gb_Output_announce_title,all tests checked.)
-	$(call gb_Output_announce_bell)
-
-# removing the dependency on all for now until we can make a full build with gbuild
-#subsequentcheck : all 
-subsequentcheck : 
-	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SCK,6)
-	$(call gb_Output_announce_title,all subsequent tests checked.)
-	$(call gb_Output_announce_bell)
-
-clean : 
-	$(call gb_Output_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(false),ALL,6)
-	$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(false),ALL,6)
-	$(call gb_Output_announce_title,all cleared.)
-	$(call gb_Output_announce_bell)
-
-define gb_Module_Module
-gb_Module_ALLMODULES += $(1)
-gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-gb_Module_TARGETSTACK := $(call gb_Module_get_target,$(1)) $(gb_Module_TARGETSTACK)
-gb_Module_CHECKTARGETSTACK := $(call gb_Module_get_check_target,$(1)) $(gb_Module_CHECKTARGETSTACK)
-gb_Module_SUBSEQUENTCHECKTARGETSTACK := $(call gb_Module_get_subsequentcheck_target,$(1)) $(gb_Module_SUBSEQUENTCHECKTARGETSTACK)
-gb_Module_CLEANTARGETSTACK := $(call gb_Module_get_clean_target,$(1)) $(gb_Module_CLEANTARGETSTACK)
-
-endef
-
-# This is called inside the included file and pushes one target on each stack.
-# This has to be called with full late evaluation ($$(eval $$(call ))) and
-# should never be inlined ($(call )) as the calls defining it might be sourced
-# before gb_Module.
-define gb_Module_register_target
-gb_Module_CURRENTTARGET := $(1)
-gb_Module_CURRENTCLEANTARGET := $(2)
-
-endef
-
-# Here we include the file (in it there will be a call to gb_Module_register_target)
-define gb_Module__read_targetfile
-gb_Module_CURRENTTARGET :=
-gb_Module_CURRENTCLEANTARGET :=
-include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))$(2).mk
-ifneq ($$(words $$(gb_Module_CURRENTTARGET)) $$(words $$(gb_Module_CURRENTCLEANTARGET)),1 1)
-$$(eval $$(call gb_Output_error,No $(3) registered while reading $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))$(2).mk!))
-endif
-
-endef
-
-define gb_Module_add_target
-$(call gb_Module__read_targetfile,$(1),$(2),target)
-
-$(call gb_Module_get_target,$(1)) : $$(gb_Module_CURRENTTARGET)
-$(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
-
-endef
-
-# We don't build normal unit test dynamic libraries (CppUnit
-# "plugins") for iOS, but instead statically linked unit test
-# executables, so make gb_Module_add_check_target a no-op for iOS.
-
-# As such we could build normal "plugins", as dynamic loading of
-# modules presumably does work on iOS, it is just not allowed in apps
-# distributed through the App Store. Unit testing at LO development
-# time obviously is not anything that would be distributed as
-# apps. But let's not, as we have to make this stuff work without
-# dynamic loading anyway if the App Store is an eventual target, and
-# why shouldn't it be.
-
-define gb_Module_add_check_target
-$(if $(filter-out IOS,$(OS)),\
-$(call gb_Module__read_targetfile,$(1),$(2),check target)
-
-$(call gb_Module_get_check_target,$(1)) : $$(gb_Module_CURRENTTARGET)
-$(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
-)
-
-endef
-
-define gb_Module_add_subsequentcheck_target
-$(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target)
-
-$(call gb_Module_get_subsequentcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
-$(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
-
-endef
-
-define gb_Module_add_moduledir
-include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk
-$(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK))
-$(call gb_Module_get_check_target,$(1)) : $$(firstword $$(gb_Module_CHECKTARGETSTACK))
-$(call gb_Module_get_subsequentcheck_target,$(1)) : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
-$(call gb_Module_get_clean_target,$(1)) : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
-gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK))
-gb_Module_CHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CHECKTARGETSTACK)),$$(gb_Module_CHECKTARGETSTACK))
-gb_Module_SUBSEQUENTCHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
-gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK))
-
-endef
-
-define gb_Module_add_targets
-$(foreach target,$(2),$(call gb_Module_add_target,$(1),$(target)))
-
-endef
-
-define gb_Module_add_check_targets
-$(foreach target,$(2),$(call gb_Module_add_check_target,$(1),$(target)))
-
-endef
-
-define gb_Module_add_subsequentcheck_targets
-$(foreach target,$(2),$(call gb_Module_add_subsequentcheck_target,$(1),$(target)))
-
-endef
-
-define gb_Module_add_moduledirs
-$(foreach target,$(2),$(call gb_Module_add_moduledir,$(1),$(target)))
-endef
-
-define gb_Module_make_global_targets
-ifneq ($$(gb_Module_TARGETSTACK),)
-$$(eval $$(call gb_Output_error,Corrupted module target stack!1))
-endif
-
-include $(1)
-
-all : $$(firstword $$(gb_Module_TARGETSTACK))
-check : $$(firstword $$(gb_Module_CHECKTARGETSTACK))
-subsequentcheck : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
-clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
-
-ifneq ($$(words $$(gb_Module_TARGETSTACK)),1)
-$$(eval $$(call gb_Output_error,Corrupted module target stack! $(gb_Module_TARGETSTACK)))
-endif
-
-gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK))
-gb_Module_CHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CHECKTARGETSTACK)),$$(gb_Module_CHECKTARGETSTACK))
-gb_Module_SUBSEQUENTCHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
-gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK))
-
-ifneq ($$(and $$(gb_Module_TARGETSTACK),$$(gb_Module_CHECKTARGETSTACK),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),)
-$$(eval $$(call gb_Output_error,Corrupted module target stack!3))
-endif
-
-$$(eval $$(gb_Extensions_final_hook))
-endef
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
deleted file mode 100644
index 681721ec4..000000000
--- a/solenv/gbuild/Output.mk
+++ /dev/null
@@ -1,148 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# user notifications and formatting
-
-define gb_Output__format_type
-[ $(word 2,$(1) build clean) $(2) ]
-endef
-
-define gb_Output__format_target
-$(1)
-endef
-
-define gb_Output_error
-$(error $(1))
-endef
-
-define gb_Output_announce_title
-endef
-
-define gb_Output_announce_bell
-endef
-
-define gb_Output_info
-$(info [ info  $(2) ] $(1))
-endef
-
-define gb_Output_warn
-$(warning $(NEWLINE)[ WARN  $(2) ] !!!$(NEWLINE)[ WARN  $(2) ] !!! $(1)$(NEWLINE)[ WARN  $(2) ] !!!)
-endef
-
-gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf "%c", 27 }' -)
-gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
-
-# only enable colorized output if
-# - gb_COLOR is set
-# - we have a known term
-ifneq ($(strip $(gb_COLOR)),)
-ifneq ($(filter $(TERM),Eterm aterm gnome kterm linux rxvt rxvt-unicode screen xterm xterm-color xtermc),)
-
-gb_Output_COLOR_RESET := $(gb_Output_ESCAPE)[0m
-gb_Output_COLOR_RESETANDESCAPE := $(gb_Output_COLOR_RESET)$(gb_Output_ESCAPE)
-
-gb_Output_COLOR_OUTBUILD_LEVEL1 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
-gb_Output_COLOR_OUTBUILD_LEVEL2 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
-gb_Output_COLOR_OUTBUILD_LEVEL3 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
-gb_Output_COLOR_OUTBUILD_LEVEL4 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
-gb_Output_COLOR_OUTBUILD_LEVEL5 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;46m
-gb_Output_COLOR_OUTBUILD_LEVEL6 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;44m
-
-gb_Output_COLOR_INBUILD_LEVEL1 := $(gb_Output_COLOR_RESETANDESCAPE)[36;40m
-gb_Output_COLOR_INBUILD_LEVEL2 := $(gb_Output_COLOR_RESETANDESCAPE)[36;1;40m
-gb_Output_COLOR_INBUILD_LEVEL3 := $(gb_Output_COLOR_RESETANDESCAPE)[32;40m
-gb_Output_COLOR_INBUILD_LEVEL4 := $(gb_Output_COLOR_RESETANDESCAPE)[32;1;40m
-gb_Output_COLOR_INBUILD_LEVEL5 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;46m
-gb_Output_COLOR_INBUILD_LEVEL6 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;44m
-
-gb_Output_COLOR_OUTCLEAN_LEVEL1 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
-gb_Output_COLOR_OUTCLEAN_LEVEL2 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
-gb_Output_COLOR_OUTCLEAN_LEVEL3 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
-gb_Output_COLOR_OUTCLEAN_LEVEL4 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
-gb_Output_COLOR_OUTCLEAN_LEVEL5 := $(gb_Output_COLOR_RESETANDESCAPE)[33;1;41m
-gb_Output_COLOR_OUTCLEAN_LEVEL6 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;41m
-
-gb_Output_COLOR_INCLEAN_LEVEL1 := $(gb_Output_COLOR_RESETANDESCAPE)[33;40m
-gb_Output_COLOR_INCLEAN_LEVEL2 := $(gb_Output_COLOR_RESETANDESCAPE)[33;1;40m
-gb_Output_COLOR_INCLEAN_LEVEL3 := $(gb_Output_COLOR_RESETANDESCAPE)[31;40m
-gb_Output_COLOR_INCLEAN_LEVEL4 := $(gb_Output_COLOR_RESETANDESCAPE)[31;1;40m
-gb_Output_COLOR_INCLEAN_LEVEL5 := $(gb_Output_COLOR_RESETANDESCAPE)[33;1;41m
-gb_Output_COLOR_INCLEAN_LEVEL6 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;41m
-
-gb_Output_COLOR_ERROR := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;41m
-
-define gb_Output__format_type
-$(subst :, ,$(word 2,$(1) \
-	$(gb_Output_COLOR_OUTBUILD_LEVEL$(3))[:$(gb_Output_COLOR_INBUILD_LEVEL$(3))__.oO:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTBUILD_LEVEL$(3)):] \
-	$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3))[:$(gb_Output_COLOR_INCLEAN_LEVEL$(3))Xx.__:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3)):]))$(gb_Output_COLOR_RESET)
-endef
-
-define gb_Output_info
-$(info $(gb_Output_COLOR_OUTBUILD_LEVEL6)[ $(gb_Output_COLOR_INBUILD_LEVEL6)info  $(2)$(gb_Output_COLOR_OUTBUILD_LEVEL6) ]$(gb_Output_COLOR_RESET) $(1))
-endef
-
-define gb_Output_warn
-$(warning $(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[ $(gb_Output_COLOR_INCLEAN_LEVEL6)WARN  $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6) ]$(gb_Output_COLOR_RESET) !!!$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[ $(gb_Output_COLOR_INCLEAN_LEVEL6)WARN  $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6) ]$(gb_Output_COLOR_RESET) !!! $(1)$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[ $(gb_Output_COLOR_INCLEAN_LEVEL6)WARN  $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6) ]$(gb_Output_COLOR_RESET) !!!)
-endef
-
-define gb_Output_error
-$(error $(gb_Output_COLOR_ERROR)$(1)$(gb_Output_COLOR_RESET))
-endef
-
-endif
-endif
-
-# only enable title output if
-# - gb_TITLES is set
-# - we have a known term
-ifneq ($(strip $(gb_TITLES)),)
-ifneq ($(filter $(TERM),Eterm aterm gnome kterm rxvt rxvt-unicode screen xterm xterm-color),)
-define gb_Output_announce_title
-$(info $(gb_Output_ESCAPE)]2;gbuild: $(1)$(gb_Output_BELL)$(gb_Output_ESCAPE)[A)
-endef
-
-$(call gb_Output_announce_title,...)
-
-endif
-endif
-
-# only enable bell output if
-# - gb_BELL is set
-# - gb_TTY is true (not piping to a file)
-ifneq ($(strip $(gb_BELL)),)
-define gb_Output_announce_bell
-$(info $(gb_Output_BELL)$(gb_Output_ESCAPE)[A)
-endef
-endif
-
-define gb_Output_announce
-$(info $(call gb_Output__format_type,$(2),$(3),$(4)) $(call gb_Output__format_target,$(1)))
-endef
-
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
deleted file mode 100644
index 40ef5b7d5..000000000
--- a/solenv/gbuild/Package.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# PackagePart class
-
-$(foreach destination,$(call gb_PackagePart_get_destinations), $(destination)/%) :
-	$(call gb_Deliver_deliver,$<,$@)
-
-define gb_PackagePart_PackagePart
-$(OUTDIR)/$(1) : $(2)
-$(2) :| $(3)
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2),$(3))
-endef
-
-
-# Package class
-
-.PHONY : $(call gb_Package_get_clean_target,%)
-$(call gb_Package_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),PKG,2)
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
-	&& cat $${RESPONSEFILE} | xargs rm -f \
- 	&& rm -f $${RESPONSEFILE}
-
-$(call gb_Package_get_preparation_target,%) :
-	mkdir -p $(dir $@) && touch $@
-
-$(call gb_Package_get_target,%) :
-	$(call gb_Output_announce,$*,$(true),PKG,2)
-	mkdir -p $(dir $@) && touch $@
-
-
-define gb_Package_Package
-gb_Package_SOURCEDIR_$(1) := $(2)
-$(call gb_Package_get_clean_target,$(1)) : FILES := $(call gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1))
-$$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1))))
-$(call gb_Package_get_target,$(1)) : $(call gb_Package_get_preparation_target,$(1))
-
-endef
-
-define gb_Package_add_file
-$(call gb_Package_get_target,$(1)) : $(OUTDIR)/$(2)
-$(call gb_Package_get_clean_target,$(1)) : FILES += $(OUTDIR)/$(2)
-$(call gb_PackagePart_PackagePart,$(2),$$(gb_Package_SOURCEDIR_$(1))/$(3),$(call gb_Package_get_preparation_target,$(1)))
-
-endef
-
-define gb_Package_add_customtarget
-$(call gb_Package_get_preparation_target,$(1)) : $(call gb_CustomTarget_get_target,$(2))
-$(call gb_Package_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2))
-$(eval $(call gb_CustomTarget_CustomTarget,$(2),$(3)))
-
-endef
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk
deleted file mode 100644
index 9ef2b7d60..000000000
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# PrecompiledHeader class
-
-ifeq ($(gb_ENABLE_PCH),$(true))
-
-# gb_PrecompiledHeader_get_enableflags defined by platform
-ifeq ($(gb_DEBUGLEVEL),2)
-gb_PrecompiledHeader_DEBUGDIR := debug
-gb_NoexPrecompiledHeader_DEBUGDIR := debug
-else
-gb_PrecompiledHeader_DEBUGDIR := nodebug
-gb_NoexPrecompiledHeader_DEBUGDIR := nodebug
-endif
-
-$(call gb_PrecompiledHeader_get_dep_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && \
-		echo '$(call gb_PrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
-
-$(call gb_NoexPrecompiledHeader_get_dep_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && \
-		echo '$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
-
-$(call gb_PrecompiledHeader_get_target,%) :
-	$(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
-
-$(call gb_NoexPrecompiledHeader_get_target,%) :
-	$(call gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
-
-.PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call gb_NoExPrecompiledHeader_get_clean_target,%)
-$(call gb_PrecompiledHeader_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),PCH,1)
-	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_PrecompiledHeader_get_target,$*) \
-			$(call gb_PrecompiledHeader_get_target,$*).obj \
-			$(call gb_PrecompiledHeader_get_target,$*).pdb \
-			$(call gb_PrecompiledHeader_get_dep_target,$*))
-
-
-$(call gb_NoexPrecompiledHeader_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),PCH,1)
-	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_NoexPrecompiledHeader_get_target,$*) \
-			$(call gb_NoexPrecompiledHeader_get_target,$*).obj \
-			$(call gb_NoexPrecompiledHeader_get_target,$*).pdb \
-			$(call gb_NoexPrecompiledHeader_get_dep_target,$*))
-endif
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
deleted file mode 100644
index 6d8b95f96..000000000
--- a/solenv/gbuild/RdbTarget.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-gb_RdbTarget__get_old_component_target = $(OUTDIR)/xml/$(1).component
-
-$(call gb_RdbTarget_get_target,%) :
-	$(call gb_Output_announce,$*,$(true),RDB,1)
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@) && \
-		echo '<?xml version="1.0"?><components xmlns="http://openoffice.org/2010/uno-components">' > $@ && \
-		$(gb_AWK) -- \
-			'/^<\?xml version.*/ { next; } \
-			{ gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, "vnd.sun.star.expand:$$OOO_BASE_DIR",$$0); gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, "vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); print; }' \
-			$(foreach component,$(COMPONENTS),$(call gb_ComponentTarget_get_target,$(component))) \
-			$(foreach component,$(OLD_COMPONENTS),$(call gb_RdbTarget__get_old_component_target,$(component))) \
-			>> $@ && \
-		echo '</components>' >> $@)
-
-.PHONY : $(call gb_RdbTarget_get_clean_target,%)
-$(call gb_RdbTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),RDB,1)
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_RdbTarget_get_outdir_target,$*) $(call gb_RdbTarget_get_target,$*))
-
-$(call gb_RdbTarget_get_external_target,%) :
-	$(call gb_Deliver_deliver,$<,$@)
-
-define gb_RdbTarget_RdbTarget
-$(call gb_RdbTarget_get_target,$(1)) : COMPONENTS :=
-$(call gb_RdbTarget_get_target,$(1)) : OLD_COMPONENTS :=
-$(call gb_RdbTarget_get_clean_target,$(1)) : COMPONENTS :=
-$(call gb_RdbTarget_get_clean_target,$(1)) : OLD_COMPONENTS :=
-ifeq ($(2),$(true))
-$(call gb_RdbTarget_get_outdir_target,$(1)) : $(call gb_RdbTarget_get_target,$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_RdbTarget_get_target,$(1)))
-endif
-endef
-
-define gb_RdbTarget_add_component
-$(call gb_RdbTarget_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
-$(call gb_RdbTarget_get_target,$(1)) : COMPONENTS += $(2)
-$(call gb_RdbTarget_get_clean_target,$(1)) : COMPONENTS += $(2)
-endef
-
-define gb_RdbTarget_add_components
-$(foreach component,$(2),$(eval $(call gb_RdbTarget_add_component,$(1),$(component))))
-endef
-
-define gb_RdbTarget_add_old_component
-$(call gb_RdbTarget_get_target,$(1)) : $(call gb_RdbTarget__get_old_component_target,$(2))
-$(call gb_RdbTarget_get_target,$(1)) : OLD_COMPONENTS += $(2)
-$(call gb_RdbTarget_get_clean_target,$(1)) : OLD_COMPONENTS += $(2)
-endef
-
-define gb_RdbTarget_add_old_components
-$(foreach component,$(2),$(eval $(call gb_RdbTarget_add_old_component,$(1),$(component))))
-endef
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
deleted file mode 100644
index da2939e7e..000000000
--- a/solenv/gbuild/SdiTarget.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# SdiTarget is evil, in that it does not support multiple repositories for now (hardcoded to SRCDIR)
-# Also there is no way to cleanly deliver the generated header to OUTDIR.
-# (This can be workarounded by using gb_Package, but really should not.)
-
-# SdiTarget class
-
-gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target_for_build,svidl)
-gb_SdiTarget_SVIDLCOMMAND := $(gb_SdiTarget_SVIDLPRECOMMAND) $(gb_SdiTarget_SVIDLTARGET)
-
-$(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET)
-	$(call gb_Output_announce,$*,$(true),SDI,1)
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@))
-	$(call gb_Helper_abbreviate_dirs_native,\
-		cd $(dir $<) && \
-		$(gb_SdiTarget_SVIDLCOMMAND) -quiet \
-			$(INCLUDE) \
-			-fs$@.hxx \
-			-fd$@.ilb \
-			-fl$@.lst \
-			-fz$@.sid \
-			-fx$(EXPORTS) \
-			-fm$@ \
-			$(realpath $<))
-
-.PHONY : $(call gb_SdiTarget_get_clean_target,%)
-$(call gb_SdiTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),SDI,1)
-	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(foreach ext,.hxx .ilb .lst .sid,\
-			$(call gb_SdiTarget_get_target,$*)$(ext)) \
-			$(call gb_SdiTarget_get_target,$*))
-
-define gb_SdiTarget_SdiTarget
-$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $$(subst -I. ,-I$$(dir $(SRCDIR)/$(1)) ,$$(SOLARINC))
-$(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi
-endef
-
-define gb_SdiTarget_set_include
-$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $(2)
-
-endef
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
deleted file mode 100644
index d0224969a..000000000
--- a/solenv/gbuild/StaticLibrary.mk
+++ /dev/null
@@ -1,118 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# Static Library class
-
-# defined globally in gbuild.mk
-#  gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib
-# defined by platform
-#  gb_StaticLibrary_DEFS
-#  gb_StaticLibrary_FILENAMES
-#  gb_StaticLibrary_TARGETS
-
-
-# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
-.PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT)
-$(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT) :
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(OUTDIR)/lib/$*$(gb_StaticLibrary_PLAINEXT) \
-			$(AUXTARGETS))
-
-# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
-$(gb_StaticLibrary_OUTDIRLOCATION)/%$(gb_StaticLibrary_PLAINEXT) : 
-	$(call gb_Helper_abbreviate_dirs,\
-		$(call gb_Deliver_deliver,$<,$@) \
-			$(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
-
-define gb_StaticLibrary_StaticLibrary
-ifeq (,$$(findstring $(1),$$(gb_StaticLibrary_KNOWNLIBS)))
-$$(eval $$(call gb_Output_info,Currently known static libraries are: $(sort $(gb_StaticLibrary_KNOWNLIBS)),ALL))
-$$(eval $$(call gb_Output_error,Static library $(1) must be registered in Repository.mk))
-endif
-$(call gb_StaticLibrary_get_target,$(1)) : AUXTARGETS :=
-$(call gb_StaticLibrary__StaticLibrary_impl,$(1),$(call gb_StaticLibrary_get_linktargetname,$(1)))
-
-endef
-
-define gb_StaticLibrary__StaticLibrary_impl
-$(call gb_LinkTarget_LinkTarget,$(2))
-$(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
-$(call gb_LinkTarget_add_defs,$(2),\
-	$(gb_StaticLibrary_DEFS) \
-)
-$(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
-$(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
-$(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
-$$(eval $$(call gb_Module_register_target,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
-
-endef
-
-define gb_StaticLibrary_forward_to_Linktarget
-gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_StaticLibrary_get_linktargetname,$$(1)),$$(2),$$(3))
-
-endef
-
-$(eval $(foreach method,\
-	add_api \
-	add_cobject \
-	add_cobjects \
-	add_cxxobject \
-	add_cxxobjects \
-	add_objcxxobject \
-	add_objcxxobjects \
-	add_exception_objects \
-	add_noexception_objects \
-	add_generated_cxxobjects \
-	add_generated_exception_objects \
-	add_cflags \
-	set_cflags \
-	add_cxxflags \
-	set_cxxflags \
-	add_objcxxflags \
-	set_objcxxflags \
-	add_defs \
-	set_defs \
-	set_include \
-	add_ldflags \
-	set_ldflags \
-	add_libs \
-	set_library_path_flags \
-	add_linked_libs \
-	add_linked_static_libs \
-	use_external \
-	use_externals \
-	add_package_headers \
-	add_sdi_headers \
-	add_precompiled_header \
-,\
-	$(call gb_StaticLibrary_forward_to_Linktarget,$(method))\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
deleted file mode 100644
index b959eed56..000000000
--- a/solenv/gbuild/TargetLocations.mk
+++ /dev/null
@@ -1,200 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# outdir target pattern
-
-gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
-gb_ComponentTarget_get_outdir_inbuild_target = $(OUTDIR)/xml/component/$(1).inbuild.component
-gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
-gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build)
-gb_PackagePart_get_destinations = \
-	$(OUTDIR)/xml \
-	$(OUTDIR)/pck \
-	$(OUTDIR)/inc \
-	$(OUTDIR)/idl \
-	$(OUTDIR)/bin \
-
-gb_PackagePart_get_target = $(OUTDIR)/$(1)
-gb_RdbTarget_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
-gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
-gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
-gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
-gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip
-
-define gb_Library_get_target
-$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES)))
-endef
-
-define gb_StaticLibrary_get_target
-$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_StaticLibrary_TARGETS)):%,$(gb_StaticLibrary_FILENAMES)))
-endef
-
-
-# workdir target patterns
-
-gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1)
-gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
-gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
-gb_ComponentTarget_get_inbuild_target = $(WORKDIR)/ComponentTarget/$(1).inbuild.component
-gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
-gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
-gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
-gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1)
-gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o
-gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o
-gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1)
-gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
-gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar
-gb_Jar_get_classsetname = Jar/$(1)
-gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1)
-gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done
-gb_JavaClassSet_get_target = $(WORKDIR)/JavaClassSet/$(1)/done
-gb_JunitTest_get_classsetname = JunitTest/$(1)
-gb_JunitTest_get_target = $(WORKDIR)/JunitTest/$(1)/done
-gb_JunitTest_get_userdir = $(WORKDIR)/JunitTest/$(1)/user
-gb_LinkTarget_get_external_headers_target = $(WORKDIR)/ExternalHeaders/$(1)
-gb_LinkTarget_get_headers_target = $(WORKDIR)/Headers/$(1)
-gb_LinkTarget_get_target = $(WORKDIR)/LinkTarget/$(1)
-gb_LinkTarget_get_objects_list = $(WORKDIR)/LinkTarget/$(1).objectlist
-gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1)
-gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1)
-gb_Module_get_target = $(WORKDIR)/Module/$(1)
-gb_NoexPrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
-gb_NoexPrecompiledHeader_get_target = $(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
-gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
-gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
-gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
-gb_Package_get_target = $(WORKDIR)/Package/$(1)
-gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
-gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
-gb_RdbTarget_get_target = $(WORKDIR)/RdbTarget/$(1).rdb
-gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
-gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
-gb_SdiTarget_get_target = $(WORKDIR)/SdiTarget/$(1)
-gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1)
-gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
-gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
-gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1)))
-gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
-gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
-gb_UnoApiOutTarget_get_target = $(OUTDIR)/bin/$(1).rdb
-gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1)
-gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1)
-gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
-gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip
-gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
-
-define gb_Library_get_external_headers_target
-$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
-endef
-
-define gb_Library_get_headers_target
-$(patsubst $(1):%,$(WORKDIR)/Headers/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
-endef
-
-define gb_StaticLibrary_get_external_headers_target
-$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/StaticLibrary/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
-endef
-
-define gb_StaticLibrary_get_headers_target
-$(patsubst $(1):%,$(WORKDIR)/Headers/StaticLibrary/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
-endef
-
-$(eval $(call gb_Helper_make_clean_targets,\
-	AllLangResTarget \
-	ComponentTarget \
-	JavaClassSet \
-	Jar \
-	JunitTest \
-	LinkTarget \
-	Module \
-	NoexPrecompiledHeader \
-	PackagePart \
-	Package \
-	PrecompiledHeader \
-	RdbTarget \
-	ResTarget \
-	SdiTarget \
-	SrsTarget \
-	SrsTemplateTarget \
-	CppunitTest \
-	CustomTarget \
-	UnoApiTarget \
-	WinResTarget \
-	Zip \
-))
-
-$(eval $(call gb_Helper_make_outdir_clean_targets,\
-	Executable \
-	Library \
-	StaticLibrary \
-	UnoApiOutTarget \
-))
-
-$(eval $(call gb_Helper_make_dep_targets,\
-	CObject \
-	CxxObject \
-	ObjCObject \
-	ObjCxxObject \
-	GenCxxObject \
-	LinkTarget \
-	SrsPartTarget \
-	SrsTarget \
-	UnoApiTarget \
-))
-
-# other getters
-
-define gb_Library_get_layer
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER)))
-endef
-
-define gb_Executable_get_layer
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Executable_LAYER)))
-endef
-
-define gb_Library_get_filename
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_FILENAMES)))
-endef
-
-define gb_StaticLibrary_get_filename
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
-endef
-
-gb_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT)
-gb_Library_get_linktargetname = Library/$(call gb_Library_get_filename,$(1))
-gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1))
-
-# static members declared here because they are used globally
-
-gb_Library_OUTDIRLOCATION = $(OUTDIR)/lib
-gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library
-gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest
-gb_StaticLibrary_OUTDIRLOCATION = $(OUTDIR)/lib
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk
deleted file mode 100644
index bad6bd4a1..000000000
--- a/solenv/gbuild/Tempfile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Write string to temporary file by chopping into pieces that
-# fit the commandline
-# parameters: filename, maxitems (for one write), string
-# returns: filename
-define var2file
-$(strip $(1)
-$(eval gb_var2file_helpervar := $$(shell printf "%s" "" > $(1) ))\
-$(foreach item,$(3),$(eval gb_var2file_curblock += $(item)
-	ifeq ($$(words $$(gb_var2file_curblock)),$(2)) 
-		gb_var2file_helpervar := $$(shell printf "%s" "$$(gb_var2file_curblock)" >> $(1) )
-		gb_var2file_curblock :=
-	endif
-	))\
-	$(eval gb_var2file_helpervar := $(shell echo " "$(gb_var2file_curblock) >> $(1) )
-		gb_var2file_curblock :=
-	))
-endef
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
deleted file mode 100644
index 99dc5578e..000000000
--- a/solenv/gbuild/UnoApiTarget.mk
+++ /dev/null
@@ -1,211 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-define gb_UnoApiTarget_autopackage_inc
-$$(eval $$(call gb_Package_Package,$(1)_inc,$$(patsubst %/empty,%,$$(call gb_UnoApiTarget_get_header_target,empty))))
-$(foreach onefile,$(gb_UnoApiTarget_HPPFILES_$(1)), \
-	$$(eval $$(call gb_Package_add_file,$(1)_inc,$(patsubst $(1)/%,inc/$(1)/%,$(onefile)),$(onefile))))
-
-$(call gb_Package_get_target,$(1)_inc) : $(call gb_UnoApiTarget_get_target,$(1))
-
-endef
-
-# TODO: make multi repo safe
-define gb_UnoApiTarget_autopackage_idl
-$$(eval $$(call gb_Package_Package,$(1)_idl,$(SRCDIR)))
-$(foreach onefile,$(gb_UnoApiTarget_IDLFILES_$(1)), \
-	$$(eval $$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,idl/%,$(onefile)),$(onefile))))
-
-endef
-
-$(call gb_UnoApiTarget_get_header_target,$(1))/% : $(call gb_UnoApiTarget_get_target,$(1))
-	mkdir -p $$(dir $$@)
-
-define gb_UnoApiTarget_UnoApiTarget
-$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1))))
-$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
-$(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
-gb_UnoApiTarget_HPPFILES_$(1) :=
-gb_UnoApiTarget_IDLFILES_$(1) :=
-
-.DELETE_ON_ERROR : \
-    $(call gb_UnoApiTarget_get_clean_target,$(1)) \
-    $(call gb_UnoApiTarget_get_target,$(1))
-
-endef
-
-define gb_UnoApiTarget_add_idlfiles
-$(foreach idl,$(2),$(call gb_UnoApiTarget_add_idlfile,$(1),$(idl)))
-
-endef
-
-define gb_UnoApiTarget_add_idlfile
-$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiPartTarget_get_target,$(2).urd)
-$(call gb_UnoApiPartTarget_get_target,$(2).urd) : $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(2).idl))
-gb_UnoApiTarget_HPPFILES_$(1) += $(2).hdl
-gb_UnoApiTarget_HPPFILES_$(1) += $(2).hpp
-gb_UnoApiTarget_IDLFILES_$(1) += $(2).idl
-
-$(call gb_UnoApiTarget_get_header_target,)$(2).hpp :| $(call gb_UnoApiTarget_get_target,$(1))
-$(call gb_UnoApiTarget_get_header_target,)$(2).hdl :| $(call gb_UnoApiTarget_get_target,$(1))
-
-endef
-
-define gb_UnoApiTarget_add_idlfiles_noheader
-$(foreach idl,$(2),$(call gb_UnoApiTarget_add_idlfile_noheader,$(1),$(idl)))
-
-endef
-
-define gb_UnoApiTarget_add_idlfile_noheader
-$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiPartTarget_get_target,$(2).urd)
-$(call gb_UnoApiPartTarget_get_target,$(2).urd) : $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(2).idl))
-gb_UnoApiTarget_IDLFILES_$(1) += $(2).idl
-
-endef
-
-define gb_UnoApiTarget_add_idlfiles_nohdl
-$(foreach idl,$(2),$(call gb_UnoApiTarget_add_idlfile_nohdl,$(1),$(idl)))
-
-endef
-
-define gb_UnoApiTarget_add_idlfile_nohdl
-$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiPartTarget_get_target,$(2).urd)
-$(call gb_UnoApiPartTarget_get_target,$(2).urd) : $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(2).idl))
-gb_UnoApiTarget_HPPFILES_$(1) += $(2).hpp
-gb_UnoApiTarget_IDLFILES_$(1) += $(2).idl
-
-$(call gb_UnoApiTarget_get_header_target,)$(2).hpp :| $(call gb_UnoApiTarget_get_target,$(1))
-
-endef
-
-define gb_UnoApiTarget_add_rdbfiles
-$(foreach rdb,$(2),$(call gb_UnoApiTarget_add_rdbfile,$(1),$(rdb)))
-
-endef
-
-define gb_UnoApiTarget_add_rdbfile
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApiOutTarget_get_target,$(2))
-$(call gb_UnoApiTarget_get_target,$(1)) : \
-	$(call gb_UnoApiOutTarget_get_target,$(2)) \
-	$(call gb_Package_get_target,$(2)_idl)
-
-endef
-
-define gb_UnoApiTarget_add_merge_rdbfiles
-$(foreach rdb,$(2),$(call gb_UnoApiTarget_add_merge_rdbfile,$(1),$(rdb)))
-
-endef
-
-define gb_UnoApiTarget_add_merge_rdbfile
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE += $(call gb_UnoApiOutTarget_get_target,$(2))
-$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiOutTarget_get_target,$(2))
-
-endef
-
-#UNOAPI_REFERENCE_$(1) := $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(2)).rdb))
-define gb_UnoApiTarget_add_reference_rdbfile
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(2)).rdb))
-
-endef
-
-define gb_UnoApiTarget_set_include
-$(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := $(2)
-
-endef
-
-.PHONY : $(call gb_UnoApiOutTarget_get_clean_target,%)
-$(call gb_UnoApiOutTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),UNOAPI,1)
-	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_UnoApiOutTarget_get_target,$*)) 
-
-.PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
-$(call gb_UnoApiTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),UNOAPI,1)
-	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_UnoApiTarget_get_target,$*)) 
-	-rm -rf $(call gb_UnoApiTarget_get_header_target,$*)\
-			$(call gb_UnoApiPartTarget_get_target,$*)
-
-# idlc doesn't return error codes != 0 in case of an error, so
-# check self 
-define gb_UnoApiPartTarget__command
-mkdir -p $(dir $(1)) && \
-	mkdir -p  $(gb_Helper_MISC) && \
-	RESPONSEFILE=`$(gb_MKTEMP)` && \
-	echo "$(call gb_Helper_convert_native,$(5) $(6) -O $(call gb_UnoApiPartTarget_get_target,$(2)) -verbose -C $(4))" > $${RESPONSEFILE} && \
-	$(gb_UnoApiTarget_IDLCCOMMAND) @$${RESPONSEFILE} > /dev/null && \
-	rm -f $${RESPONSEFILE} && \
-	test -f $(@)
-
-endef
-
-$(call gb_UnoApiPartTarget_get_target,%) :
-	$(call gb_Output_announce,$*,$(true),IDL,2)
-	$(call gb_UnoApiPartTarget__command,$@,$(dir $*),$<,$?,$(INCLUDE),$(DEFS))
-	
-
-define gb_UnoApiTarget__command
-	mkdir -p $(dir $(1)) && \
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(call gb_Helper_convert_native,$(1) $(4) $(5))) && \
-	$(gb_UnoApiTarget_REGMERGECOMMAND) @$${RESPONSEFILE} && \
-	rm -f $${RESPONSEFILE}
-
-endef
-
-define gb_UnoApiHeaderTarget__command
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
-	mkdir -p  $(gb_Helper_MISC) && \
-	RESPONSEFILE=`$(gb_MKTEMP)` && \
-	echo " -Gc -L -BUCR -O$(call gb_UnoApiTarget_get_header_target,$*) $(7) \
-		$(1) \
-		" > $${RESPONSEFILE} && \
-	$(gb_UnoApiTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \
-	rm -f $${RESPONSEFILE})
-
-endef
-
-# TODO:
-# - get idlc switch "-P" (generate .urd into package dir)
-# - generate dependencies for included idls
-# - empty $? in headertarget?
-
-# TODO: reenable the check
-$(call gb_UnoApiTarget_get_target,%):
-	$(call gb_Output_announce,$*,$(true),RDB,3)
-	$(if $(gb_UnoApiTarget_IDLFILES_$*),$(call gb_UnoApiTarget__command,$@,$*,$<,UCR,$(addprefix $(call gb_UnoApiPartTarget_get_target,),$(patsubst %.idl,%.urd,$(gb_UnoApiTarget_IDLFILES_$*)))))
-	$(if $(UNOAPI_MERGE),$(call gb_UnoApiTarget__command,$@,$*,$<,/,$(UNOAPI_MERGE)))
-	$(if $(and $(false),$(UNOAPI_REFERENCE)), \
-		$(call gb_Output_announce,$*,$(true),RDBCHEK,4) \
-	    $(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) -r2 $(call gb_Helper_convert_native,$@))
-	$(if $(gb_UnoApiTarget_IDLFILES_$*), \
-		$(call gb_Output_announce,$*,$(true),HPP,4) \
-		$(call gb_UnoApiHeaderTarget__command,$@,$*,$<,$?,$(INCLUDE),$(DEFS),$(UNOAPI_DEPS)))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
deleted file mode 100644
index 4ed592f7d..000000000
--- a/solenv/gbuild/WinResTarget.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-
-# WinResTarget class
-
-gb_WinResTarget_DEFAULTDEFS := $(gb_RCDEFS)
-
-define gb_WinResTarget_WinResTarget
-$(call gb_WinResTarget_WinResTarget_init,$(1))
-$$(eval $$(call gb_Module_register_target,$(call gb_WinResTarget_get_target,$(1)),$(call gb_WinResTarget_get_clean_target,$(1))))
-
-endef
-
-define gb_WinResTarget_WinResTarget_init
-$(call gb_WinResTarget_get_target,$(1)) : DEFS := $(gb_WinResTarget_DEFAULTDEFS)
-$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(SOLARINC)
-$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
-$(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_target,$(1)) : $(call gb_WinResTarget_get_dep_target,$(1))
-ifneq ($(wildcard $(call gb_WinResTarget_get_dep_target,$(1))),)
-include $(call gb_WinResTarget_get_dep_target,$(1))
-else
-$(firstword $(MAKEFILE_LIST)) : $(call gb_WinResTarget_get_dep_target,$(1))
-endif
-$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS)
-$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE)
-$(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE :=
-endif
-
-endef
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,%) : $(gb_Helper_MISCDUMMY)
-		mkdir -p $(dir $@) && \
-			echo '$(call gb_WinResTarget_get_target,$*) : $$(gb_Helper_PHONY)' > $@
-endif
-
-
-$(call gb_WinResTarget_get_target,%) :
-	$(call gb_Output_announce,$*,$(true),RES,1)
-	$(call gb_WinResTarget__command_dep,$*,$<)
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@))
-	$(call gb_WinResTarget__command,$@)
-
-$(call gb_WinResTarget_get_clean_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_WinResTarget_get_target,$*))
-
-define gb_WinResTarget_set_defs
-$(call gb_WinResTarget_get_target,$(1)) : DEFS := $(2)
-$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $(2)
-
-endef
-
-define gb_WinResTarget_set_include
-$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(2)
-
-endef
-
-define gb_WinResTarget_add_file
-$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE=$(gb_Helper_SRCDIR_NATIVE)/$(2).rc
-$(call gb_WinResTarget_get_target,$(1)) : RCFILE=$(foreach file,$(gb_REPOS),$(realpath $(file)/$(strip $(2)).rc))
-$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(gb_REPOS),$(realpath $(file)/$(strip $(2)).rc))
-
-endef
-
-define gb_WinResTarget_add_dependency
-$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(2),$(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(file)))))
-
-endef
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
deleted file mode 100644
index 15d0da8cb..000000000
--- a/solenv/gbuild/Zip.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Zip class
-
-gb_Zip_ZIPCOMMAND := zip
-
-# remove zip file in workdir and outdir
-$(call gb_Zip_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),ZIP,3)
-	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_Zip_get_target,$*) && \
-		rm -f $(call gb_Zip_get_final_target,$*) && \
-		rm -f $(call gb_Zip_get_outdir_target,$*))
-
-# rule to create zip package in workdir
-# --filesync makes sure that all files in the zip package will be removed that no longer are in $(FILES)
-$(call gb_Zip_get_target,%) :
-	$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(call gb_Zip_get_target,$*)) && \
-	cd $(LOCATION) && $(gb_Zip_ZIPCOMMAND) -rX --filesync $(call gb_Zip_get_target,$*) $(FILES) )
-
-# the final target is a touch target; we use it as registered targets should be in workdir, not in outdir
-# the outdir target depends on the workdir target and is built by delivering the latter
-# the workdir target is created by cd'ing to the target directory and adding/updating the files
-$(call gb_Zip_get_final_target,%) : $(call gb_Zip_get_outdir_target,%)
-	touch $@
-
-# clear file list, set location (zipping uses relative paths)
-# register target and clean target
-# add deliverable
-# add dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk)
-# the zip package target requires that all added files have a common root directory (package location)
-# names of added files are relative to it; the zip will store them with their complete relative path name
-# the location can't be stored in a scoped variable as it is needed in the add_file macro (see rule above)
-define gb_Zip_Zip
-$(call gb_Zip_get_target,$(1)) : FILES :=
-$(call gb_Zip_get_target,$(1)) : LOCATION := $(2)
-gb_Package_Location_$(1) := $(2)
-$(eval $(call gb_Module_register_target,$(call gb_Zip_get_final_target,$(1)),$(call gb_Zip_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Zip_get_outdir_target,$(1)),$(call gb_Zip_get_target,$(1)),$(1))
-$(call gb_Zip_get_outdir_target,$(1)) : $(call gb_Zip_get_target,$(1))
-
-endef
-
-# adding a file creates a dependency to it
-# the full path name of the file needs access to the package location
-# as scoped variables only exist in rules, we use a postfixed name to refer to the location
-define gb_Zip_add_file
-$(call gb_Zip_get_target,$(1)) : FILES += $(2)
-$(call gb_Zip_get_target,$(1)) : $(gb_Package_Location_$(1))/$(2)
-
-endef
-
-define gb_Zip_add_files
-$(foreach file,$(2),$(call gb_Zip_add_file,$(1),$(file)))
-endef
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/final_ObjectOwner.mk b/solenv/gbuild/extensions/final_ObjectOwner.mk
deleted file mode 100644
index f66a7a2e8..000000000
--- a/solenv/gbuild/extensions/final_ObjectOwner.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-
-define gb_LinkTarget_check_object_owner
-ifneq (1,$$(words $$(filter $(1):%,$$(gb_LinkTarget_OBJECTOWNER))))
-$$(info \
-	$(patsubst $(WORKDIR)/%,%,$(1))\
-	is linked in by\
-	$$(patsubst $(1):%,%,$$(filter $(1):%,$$(gb_LinkTarget_OBJECTOWNER))))
-gb_CHECKOBJECTOWNER_VALID := $(false)
-endif
-endef
-
-gb_CHECKOBJECTOWNER_VALID := $(true)
-$(foreach object,$(sort $(gb_LinkTarget_OBJECTS)),$(eval $(call gb_LinkTarget_check_object_owner,$(object))))
-ifneq ($(gb_CHECKOBJECTOWNER_VALID),$(true))
-$(eval $(call gb_Output_warn,duplicate linked objects))
-endif
-
-endif
-# vim: set noet ts=4 sw=4:
diff --git a/solenv/gbuild/extensions/post_PackModule.mk b/solenv/gbuild/extensions/post_PackModule.mk
deleted file mode 100644
index 566c46d2e..000000000
--- a/solenv/gbuild/extensions/post_PackModule.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# this is an optional extension to gbuild
-# it depends on scripts outside the gbuild directory
-# nothing in the gbuild core should ever depend on it
-
-.PHONY : packmodule cleanpackmodule
-
-define gb_PackModule_setpackmodulecommand
-ifeq ($$(words $(gb_Module_ALLMODULES)),1)
-$$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),ZIP,5))
-packmodule : COMMAND := $$(SOLARENV)/bin/packmodule $$(OUTDIR) $$(strip $$(gb_Module_ALLMODULES))
-else
-$$(eval $$(call gb_Output_announce,more than one module - creating no zipped package,$$(true),ZIP,5))
-packmodule : COMMAND := true
-endif
-endef
-
-packmodule : allandcheck deliverlog
-	$(eval $(call gb_PackModule_setpackmodulecommand))
-	$(COMMAND)
-
-define gb_PackModule_setcleanpackmodulecommand
-ifeq ($$(words $(gb_Module_ALLMODULES)),1)
-$$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(false),ZIP,5))
-cleanpackmodule : COMMAND := rm -f $$(OUTDIR)/zip/$$(strip $$(gb_Module_ALLMODULES)).zip
-else
-$$(eval $$(call gb_Output_announce,more than one module - deleting no zipped package,$$(false),ZIP,5))
-cleanpackmodule : COMMAND := true
-endif
-endef
-
-cleanpackmodule : clean
-	$(eval $(call gb_PackModule_setcleanpackmodulecommand))
-	$(COMMAND)
-	
-# vim: set noet ts=4 sw=4:
diff --git a/solenv/gbuild/extensions/post_SetupLocal.mk b/solenv/gbuild/extensions/post_SetupLocal.mk
deleted file mode 100644
index 175903c3a..000000000
--- a/solenv/gbuild/extensions/post_SetupLocal.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.PHONY : setuplocal removelocal
-ifneq ($(gb_LOCALBUILDDIR),)
-ifneq ($(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk),)
-setuplocal :
-	$(eval $(call gb_Output_error,$(gb_LOCALBUILDDIR) exists already.))
-
-else
-
-setuplocal :
-	$(eval MODULE := $(firstword $(MODULE) $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))))
-	$(eval modulerepo := $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))))
-	$(eval $(call gb_Output_announce,setting up local build directory (module: $(MODULE)).,$(true),SYC,5))
-	mkdir -p $(gb_LOCALBUILDDIR)/srcdir $(gb_LOCALBUILDDIR)/workdir $(gb_LOCALBUILDDIR)/outdir
-	rsync --archive --exclude 'workdir/**' $(SOLARVERSION)/$(INPATH)/ $(gb_LOCALBUILDDIR)/outdir
-	cp $(modulerepo)/Repository.mk $(gb_LOCALBUILDDIR)/srcdir/Repository.mk
-	cp $(modulerepo)/RepositoryFixes.mk $(gb_LOCALBUILDDIR)/srcdir/RepositoryFixes.mk
-	rsync --archive $(modulerepo)/$(MODULE)/ $(gb_LOCALBUILDDIR)/srcdir/$(MODULE)
-	echo "gb_REPOS := $(gb_LOCALBUILDDIR)/srcdir $(filter-out $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))),$(gb_REPOS))" > $(gb_LOCALBUILDDIR)/SetupLocal.mk
-	echo "#original gb_REPOS was $(gb_REPOS)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-	echo "OUTDIR := $(gb_LOCALBUILDDIR)/outdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-	echo "#original OUTDIR was $(OUTDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-	echo "WORKDIR := $(gb_LOCALBUILDDIR)/workdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-	echo "#original WORKDIR was $(WORKDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-
-endif
-
-removelocal :
-	$(eval $(call gb_Output_warn,removing directory $(gb_LOCALBUILDDIR).,SYC))
-	sleep 10
-	rm -rf $(gb_LOCALBUILDDIR)
-
-else
-setuplocal:
-	$(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
-
-removelocal:
-	$(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
-
-endif
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/extensions/pre_SharedLangList.mk b/solenv/gbuild/extensions/pre_SharedLangList.mk
deleted file mode 100644
index 47669daa0..000000000
--- a/solenv/gbuild/extensions/pre_SharedLangList.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# share language list with dmake build system
-include $(SOLARENV)/inc/langlist.mk
-
-ifneq ($(WITH_LANG),ALL)
-gb_WITH_LANG=$(WITH_LANG)
-else
-# expand ALL based on language list)
-gb_WITH_LANG=$(completelangiso)
-endif
-
-# vim: set noet ts=4 sw=4:
diff --git a/solenv/gbuild/filter-showIncludes.pl b/solenv/gbuild/filter-showIncludes.pl
deleted file mode 100755
index f72a9eb07..000000000
--- a/solenv/gbuild/filter-showIncludes.pl
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env perl
-#
-# filter-showIncludes.pl depfile.d objfile.o orginal.cxx
-#
-# Create dependency information from the output of cl.exe's showInclude.  It
-# needs additional information - the output name to which to write, objfile
-# that depends on the includes, and the original file name.
-#
-# It also consolidates the file names to a canonical form, and filters out
-# duplicates.
-#
-# LGPL v3 / GPL v3 / MPL 1.1
-#
-# Original author: Jan Holesovsky <kendy@suse.cz>
-
-my $outfile = $ARGV[0];
-my $objfile = $ARGV[1];
-my $srcfile = $ARGV[2];
-if ( !defined $outfile || !defined $objfile || !defined $srcfile ) {
-    die "Not enough parameters to create dependencies.";
-}
-
-my $showincludes_prefix = $ENV{'SHOWINCLUDES_PREFIX'};
-if ( !defined( $showincludes_prefix ) || $showincludes_prefix eq "" ) {
-    $showincludes_prefix = 'Note: including file:';
-}
-
-open( OUT, "> $outfile" ) or die "Cannot open $outfile for writing.";
-print OUT "$objfile: \\\n $srcfile";
-
-my %seen;
-my $first_line = 1;
-while ( <STDIN> ) {
-    if ( /^$showincludes_prefix/ ) {
-        s/^$showincludes_prefix\s*//;
-        s/\r$//;
-
-        chomp;
-        s/\\/\//g;
-
-        # X: -> /cygdrive/x/
-        s/^(.):/\/cygdrive\/\l\1/;
-
-        s/ /\\ /g;
-
-        if ( !defined $seen{$_} ) {
-            $seen{$_} = 1;
-            print OUT " \\\n  $_";
-        }
-    }
-    else {
-        # skip the first line, it always just duplicates what is being
-        # compiled
-        print unless ( $first_line );
-    }
-    $first_line = 0;
-}
-
-print OUT "\n";
-close( OUT ) or die "Cannot close $outfile.";
-
-# vim: shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
deleted file mode 100644
index aed26318c..000000000
--- a/solenv/gbuild/gbuild.mk
+++ /dev/null
@@ -1,397 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# vars needed from the env/calling makefile
-
-# DEBUG
-# GBUILDDIR
-# INPATH
-# JAVA_HOME
-# JDKINCS
-# LIBXML_CFLAGS
-# OS
-# PRODUCT
-# SOLARINC
-# SOLARLIB
-# UPD
-
-# GXX_INCLUDE_PATH (Linux)
-# PTHREAD_CFLAGS (Linux)
-# SYSTEM_ICU (Linux)
-# SYSTEM_JPEG (Linux)
-# SYSTEM_LIBXML (Linux)
-
-SHELL := /bin/sh
-true := T
-false :=
-define NEWLINE
-
-
-endef
-
-define WHITESPACE
- 
-endef
-
-COMMA :=,
-
-# optional extensions that should never be essential
-ifneq ($(wildcard $(GBUILDDIR)/extensions/pre_*.mk),)
-include $(wildcard $(GBUILDDIR)/extensions/pre_*.mk)
-endif
-
-include $(GBUILDDIR)/Output.mk
-
-# BuildDirs uses the Output functions already
-include $(GBUILDDIR)/BuildDirs.mk
-
-
-ifneq ($(strip $(PRODUCT)$(product)),)
-gb_PRODUCT := $(true)
-else
-ifneq ($(strip $(product)),)
-gb_PRODUCT := $(true)
-else
-gb_PRODUCT := $(false)
-endif
-endif
-
-ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),)
-gb_SYMBOL := $(true)
-else
-gb_SYMBOL := $(false)
-endif
-
-gb_DEBUGLEVEL := 0
-ifneq ($(strip $(DEBUG)$(debug)),)
-gb_DEBUGLEVEL := 1
-endif
-
-ifneq ($(strip $(DBGLEVEL)$(dbglevel)),)
-ifneq ($(strip $(dbglevel)),)
-gb_DEBUGLEVEL := $(strip $(dbglevel))
-else
-gb_DEBUGLEVEL := $(strip $(DBGLEVEL))
-endif
-endif
-
-ifneq ($(gb_DEBUGLEVEL),0)
-gb_SYMBOL := $(true)
-endif
-
-ifneq ($(strip $(ENABLE_PCH)),)
-gb_ENABLE_PCH := $(true)
-else
-gb_ENABLE_PCH := $(false)
-endif
-
-# for clean, setuplocal and removelocal goals we switch off dependencies
-ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables help,$(MAKECMDGOALS)),)
-gb_FULLDEPS := $(false)
-else
-gb_FULLDEPS := $(true)
-endif
-
-gb_CHECKOBJECTOWNER := $(true)
-
-# save user-supplied flags for latter use
-ifneq ($(strip $(CFLAGS)),)
-gb__ENV_CFLAGS := $(CFLAGS)
-else
-# TODO remove after the old build system is abolished
-ifneq ($(strip $(ENVCFLAGS)),)
-gb__ENV_CFLAGS := $(ENVCFLAGS)
-endif
-endif
-ifneq ($(strip $(CXXFLAGS)),)
-gb__ENV_CXXFLAGS := $(CXXFLAGS)
-else
-# TODO remove after the old build system is abolished
-ifneq ($(strip $(ENVCFLAGSCXX)),)
-gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
-endif
-endif
-
-include $(GBUILDDIR)/Helper.mk
-include $(GBUILDDIR)/TargetLocations.mk
-
-$(eval $(call gb_Helper_init_registries))
-$(eval $(call gb_Helper_add_repositories,$(gb_REPOS)))
-$(eval $(call gb_Helper_collect_libtargets))
-
-gb_Library_DLLPOSTFIX := lo
-
-ifeq ($(OS),LINUX)
-include $(GBUILDDIR)/platform/linux-$(CPUNAME).mk
-else ifeq ($(OS),MACOSX)
-include $(GBUILDDIR)/platform/macosx.mk
-else ifeq ($(OS),WNT)
-ifeq ($(COM),GCC)
-include $(GBUILDDIR)/platform/winmingw.mk
-else
-include $(GBUILDDIR)/platform/windows.mk
-endif
-else ifeq ($(OS),OPENBSD)
-include $(GBUILDDIR)/platform/openbsd.mk
-else ifeq ($(OS),FREEBSD)
-include $(GBUILDDIR)/platform/freebsd.mk
-else ifeq ($(OS),NETBSD)
-include $(GBUILDDIR)/platform/netbsd.mk
-else ifeq ($(OS),DRAGONFLY)
-include $(GBUILDDIR)/platform/dragonfly.mk
-else ifeq ($(OS),SOLARIS)
-include $(GBUILDDIR)/platform/solaris.mk
-else ifeq ($(OS),IOS)
-include $(GBUILDDIR)/platform/ios.mk
-else ifeq ($(OS),ANDROID)
-include $(GBUILDDIR)/platform/android.mk
-else
-$(eval $(call gb_Output_error,Unsupported OS: $(OS)))
-endif
-
-ifeq ($(CROSS_COMPILING),YES)
-# We can safely Assume all cross-compilation is from Unix systems.
-gb_Executable_EXT_for_build :=
-else
-gb_Executable_EXT_for_build := $(gb_Executable_EXT)
-endif
-
-include $(GBUILDDIR)/Tempfile.mk
-
-include $(GBUILDDIR)/Tempfile.mk
-
-include $(foreach repo,$(gb_REPOS),$(repo)/RepositoryFixes.mk)
-
-$(eval $(call gb_Helper_collect_knownlibs))
-
-# add user-supplied flags
-ifneq ($(strip gb__ENV_CFLAGS),)
-gb_LinkTarget_CFLAGS += $(gb__ENV_CFLAGS)
-endif
-ifneq ($(strip gb__ENV_CXXFLAGS),)
-gb_LinkTarget_CXXFLAGS += $(gb__ENV_CXXFLAGS)
-endif
-
-gb_GLOBALDEFS := \
-	-D_REENTRANT \
-	-DCUI \
-	-DENABLE_LAYOUT_EXPERIMENTAL=0 \
-	-DENABLE_LAYOUT=0 \
-	-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
-	-DSUPD=$(UPD) \
-	-DVCL \
-	$(gb_OSDEFS) \
-	$(gb_COMPILERDEFS) \
-	$(gb_CPUDEFS) \
-
-ifeq ($(gb_PRODUCT),$(true))
-gb_GLOBALDEFS += \
-	-DPRODUCT \
-	-DPRODUCT_FULL \
-
-else
-gb_GLOBALDEFS += \
-	-DDBG_UTIL \
-	-D_DEBUG \
-
-endif
-
-ifneq ($(strip $(SOLAR_JAVA)),)
-gb_GLOBALDEFS += -DSOLAR_JAVA
-endif
-
-ifeq ($(gb_DEBUGLEVEL),0)
-gb_GLOBALDEFS += \
-	-DOPTIMIZE \
-	-DNDEBUG \
-
-else ifneq ($(gb_DEBUGLEVEL),1) # 2 or more
-gb_GLOBALDEFS += \
-	-DDEBUG \
-
-endif
-
-ifneq ($(strip $(ENABLE_GTK)),)
-gb_GLOBALDEFS += -DENABLE_GTK
-endif
-
-ifneq ($(strip $(ENABLE_KDE)),)
-gb_GLOBALDEFS += -DENABLE_KDE
-endif
-
-ifneq ($(strip $(ENABLE_KDE4)),)
-gb_GLOBALDEFS += -DENABLE_KDE4
-endif
-
-ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE)
-gb_GLOBALDEFS += -DENABLE_GRAPHITE
-endif
-
-gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
-
-include $(GBUILDDIR)/Deliver.mk
-
-$(eval $(call gb_Deliver_init))
-
-include $(SOLARENV)/inc/minor.mk
-
-# We are using a set of scopes that we might as well call classes.
-
-# It is important to include them in the right order as that is
-# -- at least in part -- defining precedence. This is not an issue in the
-# WORKDIR as there are no nameing collisions there, but OUTDIR is a mess
-# and precedence is important there. This is also platform dependant.
-# For example:
-# $(OUTDIR)/bin/% for executables collides
-#	with $(OUTDIR)/bin/%.res for resources on unix
-# $(OUTDIR)/lib/%.lib collides
-#	on windows (static and dynamic libs)
-# $(OUTDIR)/xml/% for packageparts collides
-#	with $(OUTDIR)/xml/component/%.component for components
-# This is less of an issue with GNU Make versions > 3.82 which matches for
-# shortest stem instead of first match. However, upon intoduction this version
-# is not available everywhere by default.
-
-include $(foreach class, \
-	ComponentTarget \
-	AllLangResTarget \
-	WinResTarget \
-	LinkTarget \
-	Library \
-	StaticLibrary \
-	Executable \
-	SdiTarget \
-	Package \
-	CustomTarget \
-	PrecompiledHeaders \
-	RdbTarget \
-	CppunitTest \
-	Jar \
-	JavaClassSet \
-	JunitTest \
-	Module \
-	UnoApiTarget \
-	Zip \
-,$(GBUILDDIR)/$(class).mk)
-
-# optional extensions that should never be essential
-ifneq ($(wildcard $(GBUILDDIR)/extensions/post_*.mk),)
-include $(wildcard $(GBUILDDIR)/extensions/post_*.mk)
-endif
-
-define gb_Extensions_final_hook
-ifneq ($(wildcard $(GBUILDDIR)/extensions/final_*.mk),)
-include $(wildcard $(GBUILDDIR)/extensions/final_*.mk)
-endif
-
-endef
-
-
-ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES)
-gb_XSLTPROCTARGET :=
-gb_XSLTPROC := xsltproc
-else
-gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $(gb_XSLTPROCPRECOMMAND) $(gb_XSLTPROCTARGET)
-endif
-
-export gb_AWK
-export gb_XSLTPROC
-export GBUILDDIR
-# FIXME exporting SRCDIR seems kind of a hack
-export SRCDIR
-
-define gb_HelpMessage
-NAME
-       gbuild - GNU make based build system for LibreOffice
-
-SYNOPSIS
-       make [ -f makefile ] [ options ] [ variable=value ... ] [ targets ] ...
-
-IMPORTANT OPTIONS
-       -r Eliminate use of the built-in implicit rules. Improves performance,
-          please use always.
-       -s Silent operation; do not print the commands as they are executed.
-
-       -n Print the commands that would be executed, but do not execute them.
-       -k Continue as much as possible after an error.
-
-       -j Specifies the number of jobs (commands) to run simultaneously.
-       -l Specifies that no new jobs (commands) should be started if there are
-          others jobs running and the load average is at least load.
-
-       -t Touch files (mark them up to date without really changing them)
-          instead of running their commands.
-       -W Pretend that the target file has just been modified.
-       -o Do not remake the file file even if it is older than its
-          dependencies, and do not remake anything on account of changes in file.
-
-       -p Print the data base (rules and variable values) that results from
-          reading the makefiles.
-       --debug=b debug make run, see GNU make man page for details
-
-       (descriptions from GNU make man page)
-
-AVAILABLE TARGETS
-       allandcheck     build product and run unit tests (default goal)
-       all             build product
-       check           run unit tests
-       subsequentcheck run system tests (requires full installation)
-       clean           remove all generated files
-
-INTERACTIVE VARIABLES:
-       DEBUG / debug   If not empty, build with DBGLEVEL=1 (see below).
-       ENABLE_SYMBOLS / enable_symbols
-                       If not empty, build with debug symbols. Automatically
-                       enabled by DEBUG/debug.
-       DBGLEVEL / dbglevel
-                       If not empty, force the debug level to the specified value. The
-                       debug level is passed to the source code through OSL_DEBUG_LEVEL
-                       macro.
-                       0 = no debug
-                       1 = symbols + no optimizations
-                       2 = symbols + no optimizations + extra debug output. OSL_TRACE
-                           starts being active on this level.
-                       3... = symbols + no optimizations + extra debug output (usually
-                              extremely verbose). Levels > 2 are not used very much.
-
-       ENABLE_PCH      If not empty, use precompiled headers (Windows only).
-       CFLAGS          Add as compiler flags for plain c compilation.
-       CXXFLAGS        Add as compiler flags for c++ compilation.
-       gb_FULLDEPS     Generate and use dependencies (on by default, handle with care).
-       gb_COLOR        Use ASCII color output.
-       gb_TITLES       Show progress in terminal title.
-
-endef
-
-.PHONY: help
-help :
-	$(info $(gb_HelpMessage))
-	@true
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
deleted file mode 100644
index 0d056dac9..000000000
--- a/solenv/gbuild/gbuild_simple.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# this is a subset of gbuild functionality, for use in custom makefiles
-
-include $(GBUILDDIR)/Output.mk
-
-# BuildDirs uses the Output functions already
-include $(GBUILDDIR)/BuildDirs.mk
-
-include $(GBUILDDIR)/Helper.mk
-
-ifeq ($(OS),LINUX)
-include $(GBUILDDIR)/platform/linux.mk
-else ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-include $(GBUILDDIR)/platform/winmingw.mk
-else
-include $(GBUILDDIR)/platform/windows.mk
-endif
-else ifeq ($(OS),SOLARIS)
-include $(GBUILDDIR)/platform/solaris.mk
-else ifeq ($(OS),MACOSX)
-include $(GBUILDDIR)/platform/macosx.mk
-else ifeq ($(OS),OPENBSD)
-include $(GBUILDDIR)/platform/openbsd.mk
-else ifeq ($(OS),FREEBSD)
-include $(GBUILDDIR)/platform/freebsd.mk
-else ifeq ($(OS),NETBSD)
-include $(GBUILDDIR)/platform/netbsd.mk
-else ifeq ($(OS),DRAGONFLY)
-include $(GBUILDDIR)/platform/dragonfly.mk
-else ifeq ($(OS),IOS)
-include $(GBUILDDIR)/platform/ios.mk
-else ifeq ($(OS),ANDROID)
-include $(GBUILDDIR)/platform/android.mk
-else
-$(eval $(call gb_Output_error,Unsupported OS: $(OS)))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
deleted file mode 100644
index 647fd24db..000000000
--- a/solenv/gbuild/platform/android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -DARM32
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-gb_CXXFLAGS += -fno-omit-frame-pointer
-gb_CFLAGS += -fno-omit-frame-pointer
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# No unit testing can be run
-gb_CppunitTest_CPPTESTPRECOMMAND := :
-
-# Set the proper enirotment variable so that our BUILD platform
-# build-time shared libraries are found.
-ifeq ($(OS_FOR_BUILD),MACOSX)
-gb_Helper_set_ld_path := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-else
-gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-endif
-
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR_FOR_BUILD)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR_FOR_BUILD)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/dragonfly.mk b/solenv/gbuild/platform/dragonfly.mk
deleted file mode 100644
index f84d32540..000000000
--- a/solenv/gbuild/platform/dragonfly.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-
-ifeq ($(CPUNAME),INTEL)
-gb_CPUDEFS := -DX86
-else
-gb_CPUDEFS := -D$(CPUNAME)
-endif
-
-gb_COMPILERDEFAULTOPTFLAGS := -O -g
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
deleted file mode 100644
index e77607644..000000000
--- a/solenv/gbuild/platform/freebsd.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-
-ifeq ($(CPUNAME),INTEL)
-gb_CPUDEFS := -DX86
-else
-gb_CPUDEFS := -D$(CPUNAME)
-endif
-
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
deleted file mode 100644
index 29305bda6..000000000
--- a/solenv/gbuild/platform/ios.mk
+++ /dev/null
@@ -1,433 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-GUI := UNX
-COM := GCC
-
-# Darwin mktemp -t expects a prefix, not a pattern
-gb_MKTEMP := /usr/bin/mktemp -t gbuild.
-
-ifeq ($(CC),)
-$(error You must set CC in the environment. See README.cross for example.)
-endif
-ifeq ($(CXX),)
-$(error You must set CXX in the environment. See README.cross for example.)
-endif
-
-gb_CC := $(CC)
-gb_CXX := $(CXX)
-gb_GCCP := $(CC)
-gb_AR := ar
-gb_AWK := awk
-gb_CLASSPATHSEP := :
-
-gb_OSDEFS := \
-	-D$(OS) \
-	-D_PTHREADS \
-	-DUNIX \
-	-DUNX \
-	-D_REENTRANT \
-	-DNO_PTHREAD_PRIORITY \
-	$(EXTRA_CDEFS) \
-
-gb_COMPILERDEFS := \
-	-D$(COM) \
-	-DCPPU_ENV=gcc3 \
-	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
-
-gb_CPUDEFS := -DARM32
-
-gb_CFLAGS := \
-	-Wall \
-	-Wendif-labels \
-	-Wextra \
-	-Wshadow \
-	-fmessage-length=0 \
-	-fno-common \
-	-fno-strict-aliasing \
-	-pipe \
-
-gb_CXXFLAGS := \
-	-Wall \
-	-Wendif-labels \
-	-Wextra \
-	-Wno-ctor-dtor-privacy \
-	-Wno-non-virtual-dtor \
-	-fmessage-length=0 \
-	-fno-common \
-	-fno-strict-aliasing \
-	-fsigned-char \
-	-malign-natural \
-	-pipe \
-	#-Wshadow \ break in compiler headers already
-	#-fsigned-char \ might be removed?
-	#-malign-natural \ might be removed?
-
-# these are to get gcc to switch to Objective-C++ or Objective-C mode
-gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
-
-gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS)
-
-gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
-
-ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
-endif
-
-gb_LinkTarget_EXCEPTIONFLAGS := \
-	-DEXCEPTIONS_ON \
-	-fexceptions \
-	-fno-enforce-eh-specs \
-
-gb_LinkTarget_NOEXCEPTIONFLAGS := \
-	-DEXCEPTIONS_OFF \
-	-fno-exceptions \
-
-gb_LinkTarget_LDFLAGS := \
-	$(subst -L../lib , ,$(SOLARLIB)) \
-#man ld says: obsolete	-Wl,-multiply_defined,suppress \
-
-ifneq ($(gb_DEBUGLEVEL),0)
-gb_COMPILEROPTFLAGS := -O0
-else
-gb_COMPILEROPTFLAGS := -O2
-endif
-
-gb_COMPILERNOOPTFLAGS := -O0
-
-# Helper class
-
-gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
-
-gb_Helper_set_ld_path := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
-
-# CObject class
-
-define gb_CObject__command
-$(call gb_Output_announce,$(2),$(true),C  ,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CC) \
-		$(DEFS) \
-		$(T_CFLAGS) \
-		-c $(3) \
-		-o $(1) \
-		-MMD -MT $(1) \
-		-MF $(4) \
-		-I$(dir $(3)) \
-		$(INCLUDE))
-endef
-
-
-# CxxObject class
-
-# N.B: $(T_CXXFLAGS) may contain -x objective-c++, which must come before -c
-define gb_CxxObject__command
-$(call gb_Output_announce,$(2),$(true),CXX,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CXX) \
-		$(DEFS) \
-		$(T_CXXFLAGS) \
-		-c $(3) \
-		-o $(1) \
-		-MMD -MT $(1) \
-		-MF $(4) \
-		-I$(dir $(3)) \
-		$(INCLUDE_STL) $(INCLUDE))
-endef
-
-
-# ObjCxxObject class
-
-define gb_ObjCxxObject__command
-$(call gb_Output_announce,$(2),$(true),OCX,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CXX) \
-		$(DEFS) \
-		$(T_OBJCXXFLAGS) \
-		-c $(3) \
-		-o $(1) \
-		-MMD -MT $(1) \
-		-MF $(4) \
-		-I$(dir $(3)) \
-		$(INCLUDE_STL) $(INCLUDE))
-endef
-
-# ObjCObject class
-
-define gb_ObjCObject__command
-$(call gb_Output_announce,$(2),$(true),OCC,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	mkdir -p $(dir $(call gb_ObjCObject_get_dep_target,$(2))) && \
-	$(gb_CC) \
-		$(DEFS) $(OBJCFLAGS) \
-		-c $(3) \
-		-o $(1) \
-		-MMD -MT $(call gb_ObjCObject_get_target,$(2)) \
-		-MF $(call gb_ObjCObject_get_dep_target,$(2)) \
-		-I$(dir $(3)) \
-		$(INCLUDE_STL) $(INCLUDE))
-endef
-
-
-# LinkTarget class
-
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
-gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
-gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) $(gb_OBJCXXFLAGS) $(gb_COMPILEROPTFLAGS)
-gb_LinkTarget_OBJCFLAGS := $(gb_CFLAGS) $(gb_OBJCFLAGS) $(gb_COMPILEROPTFLAGS)
-
-ifeq ($(gb_SYMBOL),$(true))
-gb_LinkTarget_CFLAGS += -g
-gb_LinkTarget_CXXFLAGS += -g
-gb_LinkTarget_OBJCXXFLAGS += -g
-gb_LinkTarget_OBJCFLAGS += -g
-endif
-
-gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
-gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
-
-# FIXME framework handling very hackish
-define gb_LinkTarget__get_liblinkflags
-$(patsubst lib%.a,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS),$(1)),$(call gb_Library_get_filename,$(lib)))) \
-$(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(1)))
-endef
-
-define gb_LinkTarget__get_layer
-$(if $(filter Executable,$(1)),\
-	$$(call gb_Executable_get_layer,$(2)),\
-	$$(call gb_Library_get_layer,$(2)))
-endef
-
-
-define gb_LinkTarget__command_dynamiclink
-	$(if $(filter Library CppunitTest,$(TARGETTYPE)),@echo No dynamic libraries should be built for iOS && exit 1, \
-	mkdir -p $(dir $(1)) && \
-	$(gb_CXX) \
-		$(gb_Executable_TARGETTYPEFLAGS) \
-		$(subst \d,$$,$(RPATH)) \
-		$(T_LDFLAGS) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \
-		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
-		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
-		$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
-		$(LIBS) \
-		-o $(1))
-endef
-
-# parameters: 1-linktarget 2-cobjects 3-cxxobjects
-define gb_LinkTarget__command_staticlink
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_AR) -rsu $(1) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \
-		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
-		$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
-endef
-
-define gb_LinkTarget__command
-$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
-$(if $(filter Library StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
-endef
-
-
-# Library class
-
-gb_Library_DEFS :=
-gb_Library_SYSPRE := lib
-gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
-gb_Library_PLAINEXT := .a
-gb_Library_DLLEXT := .a
-gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
-
-gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-
-gb_Library__FRAMEWORKS := \
-    Foundation \
-    CoreFoundation \
-    CoreGraphics \
-
-gb_Library_PLAINLIBS_NONE += \
-    objc \
-	jpeg \
-	m \
-	pthread \
-	z \
-
-gb_Library_FILENAMES := \
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
-
-
-gb_Library_LAYER := \
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
-
-define gb_Library_Library_platform
-$(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call gb_Library_get_layer,$(1))
-
-endef
-
-
-# StaticLibrary class
-
-gb_StaticLibrary_DEFS :=
-gb_StaticLibrary_SYSPRE := lib
-gb_StaticLibrary_PLAINEXT := .a
-gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
-
-gb_StaticLibrary_FILENAMES := \
-	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
-	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
-
-gb_StaticLibrary_StaticLibrary_platform =
-
-
-# Executable class
-
-gb_Executable_EXT :=
-gb_Executable_TARGETTYPEFLAGS := -dead_strip
-
-gb_Executable_LAYER := \
-	$(foreach exe,$(gb_Executable_UREBIN),$(exe):OOO) \
-	$(foreach exe,$(gb_Executable_SDK),$(exe):OOO) \
-	$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
-	$(foreach exe,$(gb_Executable_BRAND),$(exe):OOO) \
-	$(foreach exe,$(gb_Executable_NONE),$(exe):OOO) \
-
-
-define gb_Executable_Executable_platform
-$(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call gb_Executable_get_layer,$(1))
-
-endef
-
-
-# CppunitTest class
-
-gb_CppunitTest_CPPTESTPRECOMMAND := :
-gb_CppunitTest_SYSPRE := libtest_
-gb_CppunitTest_EXT := .dylib
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_get_target,$(2)) : LAYER := NONE
-
-endef
-
-# JunitTest class
-
-define gb_JunitTest_JunitTest_platform
-$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice}" \
-	-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
-	-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
-
-endef
-
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
-# SrsPartTarget class
-
-gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
-gb_SrsPartTarget_RSCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_SrsPartTarget_RSCTARGET)
-
-define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs,\
-	$(gb_GCCP) \
-		-MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
-		$(INCLUDE) \
-		$(DEFS) \
-		-c -x c++-header $(2) \
-		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
-endef
-
-
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-gb_Library_COMPONENTPREFIXES := \
-	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-	NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
-
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR_FOR_BUILD)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR_FOR_BUILD)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-ARM.mk b/solenv/gbuild/platform/linux-ARM.mk
deleted file mode 100644
index 3354305a7..000000000
--- a/solenv/gbuild/platform/linux-ARM.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -DARM32
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-gb_CXXFLAGS += -fno-omit-frame-pointer
-gb_CFLAGS += -fno-omit-frame-pointer
-
-include $(GBUILDDIR)/platform/linux.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-AXP.mk b/solenv/gbuild/platform/linux-AXP.mk
deleted file mode 100644
index 5698d743f..000000000
--- a/solenv/gbuild/platform/linux-AXP.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -D$(CPUNAME)
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
-gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
-gb_LinkTarget_LDFLAGS += -Wl,--no-relax
-
-include $(GBUILDDIR)/platform/linux.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-GODSON.mk b/solenv/gbuild/platform/linux-GODSON.mk
deleted file mode 100644
index d0b48895a..000000000
--- a/solenv/gbuild/platform/linux-GODSON.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -DMIPS
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-
-include $(GBUILDDIR)/platform/linux.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-HPPA.mk b/solenv/gbuild/platform/linux-HPPA.mk
deleted file mode 100644
index a2d2109ac..000000000
--- a/solenv/gbuild/platform/linux-HPPA.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -D$(CPUNAME)
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
-include $(GBUILDDIR)/platform/linux.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-IA64.mk b/solenv/gbuild/platform/linux-IA64.mk
deleted file mode 100644
index d72eedcdc..000000000
--- a/solenv/gbuild/platform/linux-IA64.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS := -D$(CPUNAME)
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
-include $(GBUILDDIR)/platform/linux.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-INTEL.mk b/solenv/gbuild/platform/linux-INTEL.mk
deleted file mode 100644
index b20f9d0b8..000000000
--- a/solenv/gbuild/platform/linux-INTEL.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS := -DX86
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-
-include $(GBUILDDIR)/platform/linux.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-M68K.mk b/solenv/gbuild/platform/linux-M68K.mk
deleted file mode 100644
index 5e6034068..000000000
--- a/solenv/gbuild/platform/linux-M68K.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -D$(CPUNAME)
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
-gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
-
-include $(GBUILDDIR)/platform/linux.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-POWERPC.mk b/solenv/gbuild/platform/linux-POWERPC.mk
deleted file mode 100644
index 9616a6d21..000000000
--- a/solenv/gbuild/platform/linux-POWERPC.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -DPOWERPC -DPPC
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-gb_CXXFLAGS += -fsigned-char
-gb_CFLAGS += -fsigned-char
-
-include $(GBUILDDIR)/platform/linux.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-POWERPC64.mk b/solenv/gbuild/platform/linux-POWERPC64.mk
deleted file mode 100644
index e3e94bd00..000000000
--- a/solenv/gbuild/platform/linux-POWERPC64.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS := -D$(CPUNAME)
-gb_CXXFLAGS += -mminimal-toc
-gb_CFLAGS += -fsigned-char
-
-include $(GBUILDDIR)/platform/linux-POWERPC.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-S390.mk b/solenv/gbuild/platform/linux-S390.mk
deleted file mode 100644
index 39a6472af..000000000
--- a/solenv/gbuild/platform/linux-S390.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -D$(CPUNAME)
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
-gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
-
-include $(GBUILDDIR)/platform/linux.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-S390X.mk b/solenv/gbuild/platform/linux-S390X.mk
deleted file mode 100644
index 776a22e44..000000000
--- a/solenv/gbuild/platform/linux-S390X.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS := -D$(CPUNAME)
-
-include $(GBUILDDIR)/platform/linux-S390.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-SPARC.mk b/solenv/gbuild/platform/linux-SPARC.mk
deleted file mode 100644
index a976f2ba5..000000000
--- a/solenv/gbuild/platform/linux-SPARC.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS := -D$(CPUNAME)
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-
-include $(GBUILDDIR)/platform/linux.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux-X86_64.mk b/solenv/gbuild/platform/linux-X86_64.mk
deleted file mode 100644
index d72eedcdc..000000000
--- a/solenv/gbuild/platform/linux-X86_64.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS := -D$(CPUNAME)
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
-include $(GBUILDDIR)/platform/linux.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
deleted file mode 100644
index 8624d9eff..000000000
--- a/solenv/gbuild/platform/linux.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-gb_LinkTarget_LDFLAGS += \
-        -Wl,-z,defs \
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
deleted file mode 100644
index 00f0dd0c7..000000000
--- a/solenv/gbuild/platform/macosx.mk
+++ /dev/null
@@ -1,505 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-GUI := UNX
-COM := GCC
-
-# Darwin mktemp -t expects a prefix, not a pattern
-gb_MKTEMP ?= /usr/bin/mktemp -t gbuild.
-
-gb_CC := cc
-gb_CXX := g++
-gb_GCCP := gcc
-gb_AR := ar
-gb_AWK := awk
-gb_CLASSPATHSEP := :
-
-# use CC/CXX if they are nondefaults
-ifneq ($(origin CC),default)
-gb_CC := $(CC)
-gb_GCCP := $(CC)
-endif
-ifneq ($(origin CXX),default)
-gb_CXX := $(CXX)
-endif
-
-gb_OSDEFS := \
-	-D$(OS) \
-	-D_PTHREADS \
-	-DUNIX \
-	-DUNX \
-	-D_REENTRANT \
-	-DNO_PTHREAD_PRIORITY \
-	-DQUARTZ \
-	-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) \
-	-DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) \
-	$(EXTRA_CDEFS) \
-
-gb_COMPILERDEFS := \
-	-D$(COM) \
-	-DHAVE_GCC_VISIBILITY_FEATURE \
-	-DCPPU_ENV=gcc3 \
-	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
-
-ifeq ($(CPUNAME),POWERPC)
-gb_CPUDEFS := -DPOWERPC -DPPC
-else
-gb_CPUDEFS := -DX86
-endif
-
-gb_SDKDIR := $(MACOSX_SDK_PATH)
-
-gb_CFLAGS := \
-	-isysroot $(gb_SDKDIR) \
-	-Wall \
-	-Wendif-labels \
-	-Wextra \
-	-Wshadow \
-	-fPIC \
-	-fmessage-length=0 \
-	-fno-common \
-	-fno-strict-aliasing \
-	-pipe \
-
-gb_CXXFLAGS := \
-	-isysroot $(gb_SDKDIR) \
-	-Wall \
-	-Wendif-labels \
-	-Wextra \
-	-Wno-ctor-dtor-privacy \
-	-Wno-non-virtual-dtor \
-	-fPIC \
-	-fmessage-length=0 \
-	-fno-common \
-	-fno-strict-aliasing \
-	-fsigned-char \
-	-malign-natural \
-	-pipe \
-	#-Wshadow \ break in compiler headers already
-	#-fsigned-char \ might be removed?
-	#-malign-natural \ might be removed?
-
-ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE)
-gb_CXXFLAGS += -Wno-long-double
-endif
-
-# these are to get g++ to switch to Objective-C++ mode
-# (see toolkit module for a case where it is necessary to do it this way)
-gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
-
-gb_OBJCFLAGS := -x objective-c
-
-ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
-endif
-
-gb_LinkTarget_EXCEPTIONFLAGS := \
-	-DEXCEPTIONS_ON \
-	-fexceptions \
-	-fno-enforce-eh-specs \
-
-gb_LinkTarget_NOEXCEPTIONFLAGS := \
-	-DEXCEPTIONS_OFF \
-	-fno-exceptions \
-
-gb_LinkTarget_LDFLAGS := \
-	-Wl,-syslibroot,$(gb_SDKDIR) \
-	$(subst -L../lib , ,$(SOLARLIB)) \
-#man ld says: obsolete	-Wl,-multiply_defined,suppress \
-
-gb_DEBUG_CFLAGS := -g
-ifneq ($(gb_DEBUGLEVEL),0)
-
-gb_COMPILEROPTFLAGS := -O0
-else
-gb_COMPILEROPTFLAGS := -O2
-endif
-
-gb_COMPILERNOOPTFLAGS := -O0
-
-# Helper class
-
-gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
-
-gb_Helper_set_ld_path := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
-
-# CObject class
-
-define gb_CObject__command
-$(call gb_Output_announce,$(2),$(true),C  ,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CC) \
-		$(DEFS) \
-		$(T_CFLAGS) \
-		-c $(3) \
-		-o $(1) \
-		-MMD -MT $(1) \
-		-MF $(4) \
-		-I$(dir $(3)) \
-		$(INCLUDE))
-endef
-
-
-# CxxObject class
-
-# N.B: $(CXXFLAGS) may contain -x objective-c++, which must come before -c
-define gb_CxxObject__command
-$(call gb_Output_announce,$(2),$(true),CXX,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CXX) \
-		$(DEFS) \
-		$(T_CXXFLAGS) \
-		-c $(3) \
-		-o $(1) \
-		-MMD -MT $(1) \
-		-MF $(4) \
-		-I$(dir $(3)) \
-		$(INCLUDE_STL) $(INCLUDE))
-endef
-
-
-# ObjCxxObject class
-
-define gb_ObjCxxObject__command
-$(call gb_Output_announce,$(2),$(true),OCX,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CXX) \
-		$(DEFS) \
-		$(T_OBJCXXFLAGS) \
-		-c $(3) \
-		-o $(1) \
-		-MMD -MT $(1) \
-		-MF $(4) \
-		-I$(dir $(3)) \
-		$(INCLUDE_STL) $(INCLUDE))
-endef
-
-# ObjCObject class
-
-define gb_ObjCObject__command
-$(call gb_Output_announce,$(2),$(true),OCC,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	mkdir -p $(dir $(call gb_ObjCObject_get_dep_target,$(2))) && \
-	$(gb_CC) \
-		$(DEFS) $(T_OBJCFLAGS) \
-		-c $(3) \
-		-o $(1) \
-		-MMD -MT $(call gb_ObjCObject_get_target,$(2)) \
-		-MF $(call gb_ObjCObject_get_dep_target,$(2)) \
-		-I$(dir $(3)) \
-		$(INCLUDE_STL) $(INCLUDE))
-endef
-
-
-# LinkTarget class
-
-define gb_LinkTarget__get_rpath_for_layer
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
-endef
-
-gb_LinkTarget__RPATHS := \
-	URELIB:@__________________________________________________URELIB/ \
-	UREBIN: \
-	OOO:@__________________________________________________OOO/ \
-	BRAND: \
-	SDKBIN: \
-	NONEBIN: \
-
-define gb_LinkTarget__get_installname
-$(if $(2),-install_name '$(2)$(1)',)
-endef
-
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
-gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
-gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) $(gb_OBJCXXFLAGS)
-gb_LinkTarget_OBJCFLAGS := $(gb_CFLAGS) $(gb_OBJCFLAGS) $(gb_COMPILEROPTFLAGS)
-
-ifeq ($(gb_SYMBOL),$(true))
-gb_LinkTarget_CFLAGS += -g
-gb_LinkTarget_CXXFLAGS += -g
-gb_LinkTarget_OBJCFLAGS += -g
-gb_LinkTarget_OBJCXXFLAGS += -g
-endif
-
-gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
-gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
-
-# FIXME framework handling very hackish
-define gb_LinkTarget__get_liblinkflags
-$(patsubst lib%.dylib,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS),$(1)),$(call gb_Library_get_filename,$(lib)))) \
-$(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(1)))
-endef
-
-define gb_LinkTarget__get_layer
-$(if $(filter Executable,$(1)),\
-	$$(call gb_Executable_get_layer,$(2)),\
-	$$(call gb_Library_get_layer,$(2)))
-endef
-
-# FIXME the DYLIB_FILE mess is only necessary because
-# solver layout is different from installation layout
-define gb_LinkTarget__command_dynamiclink
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	DYLIB_FILE=`$(gb_MKTEMP)` && \
-	$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
-		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(subst \d,$$,$(RPATH)) \
-		$(T_LDFLAGS) \
-		$(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) > $${DYLIB_FILE} && \
-	$(gb_CXX) \
-		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
-		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(subst \d,$$,$(RPATH)) \
-		$(T_LDFLAGS) \
-		$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \
-		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
-		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
-		$(LIBS) \
-		-o $(1) \
-		`cat $${DYLIB_FILE}` && \
-	$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
-		$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \
-		ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
-	rm -f $${DYLIB_FILE})
-endef
-
-# parameters: 1-linktarget 2-cobjects 3-cxxobjects
-define gb_LinkTarget__command_staticlink
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_AR) -rsu $(1) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \
-		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
-		$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
-endef
-
-define gb_LinkTarget__command
-$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
-$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
-endef
-
-
-# Library class
-
-gb_Library_DEFS :=
-gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
-gb_Library_SYSPRE := lib
-gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
-gb_Library_PLAINEXT := .dylib
-gb_Library_DLLEXT := .dylib
-gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
-
-gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-
-gb_Library__FRAMEWORKS := \
-	Cocoa \
-	GLUT \
-	OpenGL \
-
-gb_Library_PLAINLIBS_NONE += \
-	GLUT \
-	Cocoa \
-	objc \
-	OpenGL \
-	m \
-	pthread \
-
-gb_Library_FILENAMES := \
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
-
-
-gb_Library_LAYER := \
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
-
-define gb_Library_get_rpath
-$(call gb_LinkTarget__get_installname,$(call gb_Library_get_filename,$(1)),$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))))
-endef
-
-define gb_Library_Library_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1))
-$(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call gb_Library_get_layer,$(1))
-
-endef
-
-
-# StaticLibrary class
-
-gb_StaticLibrary_DEFS :=
-gb_StaticLibrary_SYSPRE := lib
-gb_StaticLibrary_PLAINEXT := .a
-gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
-
-gb_StaticLibrary_FILENAMES := \
-	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
-	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
-
-gb_StaticLibrary_StaticLibrary_platform =
-
-
-# Executable class
-
-gb_Executable_EXT :=
-gb_Executable_TARGETTYPEFLAGS := -bind_at_load
-
-gb_Executable_LAYER := \
-	$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
-	$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
-	$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
-	$(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
-	$(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
-
-
-define gb_Executable_get_rpath
-$(call gb_LinkTarget__get_installname,$(1),$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1))))
-endef
-
-define gb_Executable_Executable_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Executable_get_rpath,$(1))
-$(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call gb_Executable_get_layer,$(1))
-
-endef
-
-
-# CppunitTest class
-
-gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_CppunitTest_SYSPRE := libtest_
-gb_CppunitTest_EXT := .dylib
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
-$(call gb_LinkTarget_get_target,$(2)) : LAYER := NONE
-
-endef
-
-# JunitTest class
-
-define gb_JunitTest_JunitTest_platform
-$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice}" \
-	-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
-	-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
-
-endef
-
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-
-# SrsPartTarget class
-
-gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
-gb_SrsPartTarget_RSCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
-
-define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs,\
-	$(gb_GCCP) \
-		-MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
-		$(INCLUDE) \
-		$(DEFS) \
-		-c -x c++-header $(2) \
-		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
-endef
-
-
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_Library_COMPONENTPREFIXES := \
-	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-	NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
-
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/netbsd.mk b/solenv/gbuild/platform/netbsd.mk
deleted file mode 100644
index d274e9760..000000000
--- a/solenv/gbuild/platform/netbsd.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-
-ifeq ($(CPUNAME),INTEL)
-gb_CPUDEFS := -DX86
-else
-gb_CPUDEFS := -D$(CPUNAME)
-endif
-
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib:/usr/X11R7/lib
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk
deleted file mode 100644
index 00f76e255..000000000
--- a/solenv/gbuild/platform/openbsd.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-
-ifeq ($(CPUNAME),INTEL)
-gb_CPUDEFS := -DX86
-else
-gb_CPUDEFS := -D$(CPUNAME)
-endif
-
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-gb_STDLIBS := pthread
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS
-
-define gb_LinkTarget__command_dynamiclink
-$(call gb_Helper_abbreviate_dirs,\
-mkdir -p $(dir $(1)) && \
-	$(gb_CXX) \
-		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(subst \d,$$,$(RPATH)) \
-		$(T_LDFLAGS) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
-		-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
-		$(LIBS) \
-		$(subst -lpthread,$(PTHREAD_LIBS),$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \
-		-o $(1))
-endef
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
deleted file mode 100644
index aa351ad16..000000000
--- a/solenv/gbuild/platform/solaris.mk
+++ /dev/null
@@ -1,418 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-GUI := UNX
-COM := C52
-
-gb_MKTEMP := mktemp -t gbuild.XXXXXX
-
-gb_CC := cc
-gb_CXX := CC
-gb_GCCP := cc
-gb_AR := ar
-gb_AWK := /usr/xpg4/bin/awk
-gb_CLASSPATHSEP := :
-
-# use CC/CXX if they are nondefaults
-ifneq ($(origin CC),default)
-gb_CC := $(CC)
-gb_GCCP := $(CC)
-endif
-ifneq ($(origin CXX),default)
-gb_CXX := $(CXX)
-endif
-
-gb_OSDEFS := \
-	-D$(OS) \
-	-D$(GUI) \
-	-DSYSV \
-	-DSUN \
-	-DSUN4 \
-	-D_REENTRANT \
-	-D_POSIX_PTHREAD_SEMANTICS \
-	-D_PTHREADS \
-	-DUNIX \
-
-gb_COMPILERDEFS := \
-	-D$(COM) \
-	-DCPPU_ENV=sunpro5 \
-
-gb_CPUDEFS := -D$(CPUNAME)
-ifeq ($(CPUNAME),SPARC)
-gb_CPUDEFS += -D__sparcv8plus
-endif
-
-gb_CFLAGS := \
-	-temp=/tmp \
-	-KPIC \
-	-mt \
-	-xldscope=hidden \
-	-xCC \
-	-xc99=none \
-
-gb_CXXFLAGS := \
-	-temp=/tmp \
-	-KPIC \
-	-mt \
-	-xldscope=hidden \
-	-features=no%altspell \
-	-library=no%Cstd \
-	+w2 \
-	-erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype \
-
-ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -errwarn=%all
-gb_CXXFLAGS_WERROR := -xwe
-endif
-
-gb_LinkTarget_EXCEPTIONFLAGS := \
-	-DEXCEPTIONS_ON \
-
-gb_LinkTarget_NOEXCEPTIONFLAGS := \
-	-DEXCEPTIONS_OFF \
-	-noex \
-
-gb_LinkTarget_LDFLAGS := \
-	$(subst -L../lib , ,$(SOLARLIB)) \
-	-temp=/tmp \
-	-w \
-	-mt \
-	-Bdirect \
-	-z defs \
-	-z combreloc \
-	-norunpath \
-	-PIC \
-	-library=no%Cstd \
-
-
-gb_DEBUG_CFLAGS := -g
-ifneq ($(gb_DEBUGLEVEL),0)
-gb_COMPILEROPTFLAGS :=
-else
-ifeq ($(CPUNAME),INTEL)
-gb_COMPILEROPTFLAGS := -xarch=generic -xO3
-else # ifeq ($(CPUNAME),SPARC)
-#  -m32 -xarch=sparc		restrict target to 32 bit sparc
-#  -xO3					 optimization level 3
-#  -xspace				  don't do optimizations which do increase binary size
-#  -xprefetch=yes		   do prefetching (helps on UltraSparc III)
-gb_COMPILEROPTFLAGS := -m32 -xarch=sparc -xO3 -xspace -xprefetch=yes
-endif
-endif
-
-gb_COMPILERNOOPTFLAGS :=
-
-# Helper class
-
-gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
-
-# CObject class
-
-define gb_CObject__command
-$(call gb_Output_announce,$(2),$(true),C  ,3)
-$(call gb_Helper_abbreviate_dirs,\
-	rm -f $(4) && \
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CC) \
-		-c $(3) \
-		-o $(1) \
-		-xMMD \
-		-xMF $(4) \
-		$(DEFS) \
-		$(T_CFLAGS) \
-		-I$(dir $(3)) \
-		$(INCLUDE))
-endef
-
-
-# CxxObject class
-
-define gb_CxxObject__command
-$(call gb_Output_announce,$(2),$(true),CXX,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CXX) \
-		$(DEFS) \
-		$(T_CXXFLAGS) \
-		-c $(3) \
-		-o $(1) \
-		-xMMD \
-		-xMF $(4) \
-		-I$(dir $(3)) \
-		$(INCLUDE_STL) $(INCLUDE))
-endef
-
-
-# LinkTarget class
-
-define gb_LinkTarget__get_rpath_for_layer
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
-endef
-
-gb_LinkTarget__RPATHS := \
-	URELIB:\dORIGIN \
-	UREBIN:\dORIGIN/../lib:\dORIGIN \
-	OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
-	BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib \
-	SDKBIN:\dORIGIN/../../ure-link/lib \
-	NONEBIN:\dORIGIN/../lib:\dORIGIN \
-
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
-gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
-
-
-gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
-gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
-
-define gb_LinkTarget__command_dynamiclink
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_CXX) \
-		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(subst \d,$$,$(RPATH)) \
-		$(T_LDFLAGS) \
-		$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
-		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
-		$(LIBS) \
-		-o $(1))
-endef
-
-define gb_LinkTarget__command_staticlink
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_AR) -rsu $(1) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
-endef
-
-define gb_LinkTarget__command
-$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1)))
-$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
-endef
-
-# Library class
-
-gb_Library_DEFS :=
-gb_Library_TARGETTYPEFLAGS := -Bdynamic -z text -G
-gb_Library_SYSPRE := lib
-gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
-gb_Library_PLAINEXT := .so
-gb_Library_DLLEXT := .so
-gb_Library_RTEXT := C52$(gb_Library_PLAINEXT)
-
-gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-
-gb_STDLIBS := \
-	Crun \
-	m \
-	c \
-
-gb_Library_PLAINLIBS_NONE += \
-	$(gb_STDLIBS) \
-	dl \
-	fontconfig \
-	freetype \
-	GL \
-	GLU \
-	jpeg \
-	m \
-	nsl \
-	pthread \
-	socket \
-	X11 \
-	Xext \
-	SM \
-	ICE \
-
-gb_Library_FILENAMES := \
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
-
-
-gb_Library_LAYER := \
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
-
-define gb_Library_get_rpath
-'-R$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))'
-endef
-
-define gb_Library_Library_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1))
-
-endef
-
-
-# StaticLibrary class
-
-gb_StaticLibrary_DEFS :=
-gb_StaticLibrary_SYSPRE := lib
-gb_StaticLibrary_PLAINEXT := .a
-gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
-
-gb_StaticLibrary_FILENAMES := \
-	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
-	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
-
-gb_StaticLibrary_StaticLibrary_platform =
-
-
-# Executable class
-
-gb_Executable_EXT :=
-
-gb_Executable_LAYER := \
-	$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
-	$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
-	$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
-	$(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
-	$(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
-
-
-define gb_Executable_get_rpath
-'-R$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))'
-endef
-
-define gb_Executable_Executable_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Executable_get_rpath,$(1))
-
-endef
-
-
-# CppunitTest class
-
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_CppunitTest_SYSPRE := libtest_
-gb_CppunitTest_EXT := .so
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
-
-endef
-
-# JunitTest class
-
-define gb_JunitTest_JunitTest_platform
-$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice}" \
-	-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-	-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
-
-endef
-
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-
-# SrsPartTarget class
-
-gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
-gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
-
-# Sun cc/CC support -xM1/-xMF flags, but unfortunately refuse input files that
-# do not have the right suffix, so use makedepend here...
-define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs_native,\
-	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-		$(INCLUDE) \
-		$(DEFS) \
-		$(2) \
-		-f - \
-	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-		-v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
-		-v OUTDIR=$(OUTDIR)/ \
-		-v WORKDIR=$(WORKDIR)/ \
-		-v SRCDIR=$(SRCDIR)/ \
-		-v REPODIR=$(REPODIR)/ \
-	> $(call gb_SrsPartTarget_get_dep_target,$(1)))
-endef
-
-
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_Library_COMPONENTPREFIXES := \
-	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
deleted file mode 100644
index 9210c937e..000000000
--- a/solenv/gbuild/platform/unxgcc.mk
+++ /dev/null
@@ -1,443 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-GUI := UNX
-COM := GCC
-
-gb_MKTEMP := mktemp -t gbuild.XXXXXX
-
-gb_CC := gcc
-gb_CXX := g++
-gb_GCCP := gcc
-gb_AR := ar
-gb_AWK := awk
-gb_CLASSPATHSEP := :
-
-# use CC/CXX if they are nondefaults
-ifneq ($(origin CC),default)
-gb_CC := $(CC)
-gb_GCCP := $(CC)
-endif
-ifneq ($(origin CXX),default)
-gb_CXX := $(CXX)
-endif
-
-gb_OSDEFS := \
-	-D$(OS) \
-	-D_PTHREADS \
-	-DUNIX \
-	-DUNX \
-	$(PTHREAD_CFLAGS) \
-
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
-gb_COMPILERDEFS := \
-	-D$(COM) \
-	-DCPPU_ENV=gcc3 \
-	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
-
-gb_CFLAGS := \
-	-Wall \
-	-Wendif-labels \
-	-Wextra \
-	-Wshadow \
-	-fPIC \
-	-fmessage-length=0 \
-	-fno-common \
-	-pipe \
-
-gb_CXXFLAGS := \
-	-Wall \
-	-Wendif-labels \
-	-Wextra \
-	-Wno-ctor-dtor-privacy \
-	-Wno-non-virtual-dtor \
-	-Woverloaded-virtual \
-	-Wshadow \
-	-fPIC \
-	-fmessage-length=0 \
-	-fno-common \
-	-pipe \
-
-ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
-gb_COMPILERDEFS += \
-        -DHAVE_GCC_VISIBILITY_FEATURE \
-
-gb_CFLAGS += \
-        -fvisibility=hidden
-
-gb_CXXFLAGS += \
-	-fvisibility=hidden \
-
-ifneq ($(HAVE_GCC_VISIBILITY_BROKEN),TRUE)
-gb_CXXFLAGS += \
-        -fvisibility-inlines-hidden \
-
-endif
-
-endif
-
-gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }')
-gb_StrictAliasingUnsafe := $(shell expr $(gb_CCVER) \< 40600)
-
-ifeq ($(gb_StrictAliasingUnsafe),1)
-gb_CFLAGS += -fno-strict-aliasing
-gb_CXXFLAGS += -fno-strict-aliasing
-endif
-
-ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
-endif
-
-ifeq ($(HAVE_CXX0X),TRUE)
-gb_CXXFLAGS += -std=c++0x -Wno-deprecated-declarations
-endif
-
-ifneq ($(strip $(SYSBASE)),)
-gb_CXXFLAGS += --sysroot=$(SYSBASE)
-gb_CFLAGS += --sysroot=$(SYSBASE)
-gb_LinkTarget_LDFLAGS += \
-	-Wl,--sysroot=$(SYSBASE)
-endif
-gb_LinkTarget_EXCEPTIONFLAGS := \
-	-DEXCEPTIONS_ON \
-	-fexceptions \
-	-fno-enforce-eh-specs \
-
-gb_LinkTarget_NOEXCEPTIONFLAGS := \
-	-DEXCEPTIONS_OFF \
-	-fno-exceptions \
-
-gb_LinkTarget_LDFLAGS += \
-	-Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
-	-Wl,-z,combreloc \
-	$(subst -L../lib , ,$(SOLARLIB)) \
-
-ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
-gb_LinkTarget_LDFLAGS += \
-	-Wl,--hash-style=$(WITH_LINKER_HASH_STYLE) \
-
-endif
-
-ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
-gb_LinkTarget_LDFLAGS += \
-	-Wl,--dynamic-list-cpp-new \
-	-Wl,--dynamic-list-cpp-typeinfo \
-	-Wl,-Bsymbolic-functions \
-
-endif
-
-ifneq ($(gb_SYMBOL),$(true))
-gb_LinkTarget_LDFLAGS += \
-	-Wl,--strip-all \
-
-endif
-
-ifneq ($(gb_DEBUGLEVEL),0)
-gb_COMPILEROPTFLAGS := -O0
-gb_LINKEROPTFLAGS :=
-else
-gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS)
-gb_LINKEROPTFLAGS := -Wl,-O1
-endif
-
-gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
-
-gb_COMPILERNOOPTFLAGS := -O0
-
-# Helper class
-
-gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
-
-gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(1)
-endef
-
-# CObject class
-
-# $(call gb_CObject__command,object,relative-source,source,dep-file)
-define gb_CObject__command
-$(call gb_Output_announce,$(2),$(true),C  ,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CC) \
-		$(DEFS) \
-		$(T_CFLAGS) \
-		-c $(3) \
-		-o $(1) \
-		-MMD -MT $(1) \
-		-MF $(4) \
-		-I$(dir $(3)) \
-		$(INCLUDE))
-endef
-
-
-# CxxObject class
-
-# $(call gb_CxxObject__command,object,relative-source,source,dep-file)
-define gb_CxxObject__command
-$(call gb_Output_announce,$(2),$(true),CXX,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CXX) \
-		$(DEFS) \
-		$(T_CXXFLAGS) \
-		-c $(3) \
-		-o $(1) \
-		-MMD -MT $(1) \
-		-MF $(4) \
-		-I$(dir $(3)) \
-		$(INCLUDE_STL) $(INCLUDE))
-endef
-
-
-# LinkTarget class
-
-define gb_LinkTarget__get_rpath_for_layer
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
-endef
-
-gb_LinkTarget__RPATHS := \
-	URELIB:\dORIGIN \
-	UREBIN:\dORIGIN/../lib:\dORIGIN \
-	OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
-	BRAND:\dORIGIN:\dORIGIN/../basis-link/program:\dORIGIN/../basis-link/ure-link/lib \
-	SDKBIN:\dORIGIN/../../ure-link/lib \
-	NONEBIN:\dORIGIN/../lib:\dORIGIN \
-
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
-gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
-
-ifeq ($(gb_SYMBOL),$(true))
-gb_LinkTarget_CXXFLAGS += -ggdb2
-gb_LinkTarget_CFLAGS += -ggdb2
-endif
-
-gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
-gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
-
-# note that `cat $(extraobjectlist)` is needed to build with older gcc versions, e.g. 4.1.2 on SLED10
-# we want to use @$(extraobjectlist) in the long run
-define gb_LinkTarget__command_dynamiclink
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_CXX) \
-		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(subst \d,$$,$(RPATH)) \
-		$(T_LDFLAGS) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
-		-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
-		$(LIBS) \
-		$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
-		-o $(1))
-endef
-
-define gb_LinkTarget__command_staticlink
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_AR) -rsu $(1) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
-		$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
-endef
-
-define gb_LinkTarget__command
-$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1)))
-$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
-endef
-
-
-# Library class
-
-gb_Library_DEFS :=
-gb_Library_TARGETTYPEFLAGS := -shared -Wl,-z,noexecstack
-gb_Library_SYSPRE := lib
-gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
-gb_Library_PLAINEXT := .so
-gb_Library_DLLEXT := .so
-gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
-
-gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-
-gb_Library_PLAINLIBS_NONE += \
-	dl \
-	fontconfig \
-	freetype \
-	GL \
-	GLU \
-	ICE \
-	m \
-	pthread \
-	SM \
-	ICE \
-	X11 \
-	Xext \
-	Xrender \
-
-gb_Library_FILENAMES := \
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
-
-
-gb_Library_LAYER := \
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
-
-define gb_Library_get_rpath
-'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \
-'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
-endef
-
-define gb_Library_Library_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1))
-
-endef
-
-
-# StaticLibrary class
-
-gb_StaticLibrary_DEFS :=
-gb_StaticLibrary_SYSPRE := lib
-gb_StaticLibrary_PLAINEXT := .a
-gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
-
-gb_StaticLibrary_FILENAMES := \
-	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
-	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
-
-gb_StaticLibrary_StaticLibrary_platform =
-
-
-# Executable class
-
-gb_Executable_EXT :=
-
-gb_Executable_LAYER := \
-	$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
-	$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
-	$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
-	$(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
-	$(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
-
-
-define gb_Executable_get_rpath
-'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' \
--Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
-endef
-
-define gb_Executable_Executable_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Executable_get_rpath,$(1))
-
-endef
-
-
-# CppunitTest class
-
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-gb_CppunitTest_SYSPRE := libtest_
-gb_CppunitTest_EXT := .so
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
-
-endef
-
-# JunitTest class
-
-define gb_JunitTest_JunitTest_platform
-$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice}" \
-	-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-	-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
-
-endef
-
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-
-# SrsPartTarget class
-
-gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
-gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(OUTDIR_FOR_BUILD)/bin/rsc
-
-define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs,\
-	$(gb_GCCP) \
-		-MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
-		$(INCLUDE) \
-		$(DEFS) \
-		-c -x c++-header $(2) \
-		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
-endef
-
-
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-gb_Library_COMPONENTPREFIXES := \
-	OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
-	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
-
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
deleted file mode 100644
index b0b4d9fcd..000000000
--- a/solenv/gbuild/platform/windows.mk
+++ /dev/null
@@ -1,734 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-GUI := WNT
-COM := MSC
-
-# set tmpdir to some mixed case path, suitable for native tools
-gb_TMPDIR:=$(if $(TMPDIR),$(shell cygpath -m $(TMPDIR)),$(shell cygpath -m /tmp))
-gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
-
-gb_CC := cl
-gb_CXX := cl
-gb_LINK := link
-gb_AWK := awk
-gb_CLASSPATHSEP := ;
-gb_RC := rc
-
-# use CC/CXX if they are nondefaults
-ifneq ($(origin CC),default)
-gb_CC := $(CC)
-gb_GCCP := $(CC)
-endif
-ifneq ($(origin CXX),default)
-gb_CXX := $(CXX)
-endif
-
-gb_OSDEFS := \
-	-DWINVER=0x0500 \
-	-D_WIN32_IE=0x0500 \
-	-DNT351 \
-	-DWIN32 \
-	-DWNT \
-
-gb_COMPILERDEFS := \
-	-DMSC \
-	-D_CRT_NON_CONFORMING_SWPRINTFS \
-	-D_CRT_NONSTDC_NO_DEPRECATE \
-	-D_CRT_SECURE_NO_DEPRECATE \
-	-D_MT \
-	-D_DLL \
-	-DBOOST_MEM_FN_ENABLE_CDECL \
-	-DCPPU_ENV=msci \
-	-DM1500 \
-
-gb_CPUDEFS := -DINTEL -D_X86_=1
-
-gb_RCDEFS := \
-	 -DWINVER=0x0400 \
-	 -DWIN32 \
-
-gb_RCFLAGS := \
-	 -V
-
-gb_CFLAGS := \
-	-Gd \
-	-GR \
-	-Gs \
-	-GS \
-	-MD \
-	-nologo \
-	-Wall \
-	-wd4005 \
-	-wd4061 \
-	-wd4127 \
-	-wd4180 \
-	-wd4189 \
-	-wd4191 \
-	-wd4217 \
-	-wd4250 \
-	-wd4251 \
-	-wd4255 \
-	-wd4275 \
-	-wd4290 \
-	-wd4294 \
-	-wd4350 \
-	-wd4355 \
-	-wd4365 \
-	-wd4503 \
-	-wd4505 \
-	-wd4511 \
-	-wd4512 \
-	-wd4514 \
-	-wd4611 \
-	-wd4619 \
-	-wd4625 \
-	-wd4626 \
-	-wd4640 \
-	-wd4668 \
-	-wd4675 \
-	-wd4692 \
-	-wd4710 \
-	-wd4711 \
-	-wd4738 \
-	-wd4786 \
-	-wd4800 \
-	-wd4820 \
-	-wd4826 \
-	-Zc:forScope,wchar_t- \
-	-Zm500 \
-
-gb_CXXFLAGS := \
-	-Gd \
-	-GR \
-	-Gs \
-	-GS \
-	-Gy \
-	-MD \
-	-nologo \
-	-Wall \
-	-wd4005 \
-	-wd4061 \
-	-wd4127 \
-	-wd4180 \
-	-wd4189 \
-	-wd4191 \
-	-wd4217 \
-	-wd4250 \
-	-wd4251 \
-	-wd4275 \
-	-wd4290 \
-	-wd4294 \
-	-wd4350 \
-	-wd4355 \
-	-wd4365 \
-	-wd4503 \
-	-wd4505 \
-	-wd4511 \
-	-wd4512 \
-	-wd4514 \
-	-wd4611 \
-	-wd4619 \
-	-wd4625 \
-	-wd4626 \
-	-wd4640 \
-	-wd4668 \
-	-wd4675 \
-	-wd4692 \
-	-wd4710 \
-	-wd4711 \
-	-wd4738 \
-	-wd4786 \
-	-wd4800 \
-	-wd4820 \
-	-wd4826 \
-	-Zc:forScope,wchar_t- \
-	-Zm500 \
-
-gb_STDLIBS := \
-	uwinapi \
-	advapi32 \
-
-ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -WX
-gb_CXXFLAGS_WERROR := -WX
-endif
-
-gb_LinkTarget_EXCEPTIONFLAGS := \
-	-DEXCEPTIONS_ON \
-	-EHa \
-
-gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
-
-
-gb_LinkTarget_NOEXCEPTIONFLAGS := \
-	-DEXCEPTIONS_OFF \
-
-gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
-
-gb_LinkTarget_LDFLAGS := \
-	-MACHINE:IX86 \
-	-OPT:NOREF \
-	-safeseh \
-	-nxcompat \
-	-dynamicbase \
-	$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
-	
-gb_DEBUG_CFLAGS := -Zi
-
-# this does not use CFLAGS so it is not overridable
-ifneq ($(ENABLE_CRASHDUMP),)
-gb_LinkTarget_LDFLAGS += -DEBUG
-gb_CFLAGS+=-Zi
-gb_CXXFLAGS+=-Zi
-endif
-
-ifeq ($(gb_SYMBOL),$(true))
-endif
-
-ifneq ($(gb_DEBUGLEVEL),0)
-gb_LinkTarget_LDFLAGS += -DEBUG
-gb_COMPILEROPTFLAGS :=
-else
-gb_COMPILEROPTFLAGS := -Ob1 -Oxs -Oy-
-endif
-
-gb_COMPILERNOOPTFLAGS := -Od
-
-ifeq ($(gb_FULLDEPS),$(true))
-gb_COMPILERDEPFLAGS := -showIncludes
-define gb_create_deps
-| $(GBUILDDIR)/filter-showIncludes.pl $(2) $(1) $(3); exit $${PIPESTATUS[0]}
-endef
-else
-gb_COMPILERDEPFLAGS :=
-define gb_create_deps
-endef
-endif
-
-# Helper class
-gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
-gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
-gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
-gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
-
-define gb_Helper_abbreviate_dirs_native
-R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,O=$(gb_Helper_OUTDIR_NATIVE) && W=$(gb_Helper_WORKDIR_NATIVE) && S=$(gb_Helper_SRCDIR_NATIVE))) && \
-$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)))))))))
-endef
-
-gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
-$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
-$(1)))))
-endef
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
-$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
-$(1)))))
-endef
-
-
-# CObject class
-
-define gb_CObject__command
-$(call gb_Output_announce,$(2),$(true),C  ,3)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
-	unset INCLUDE && \
-	$(gb_CC) \
-		$(DEFS) \
-		$(T_CFLAGS) \
-		-Fd$(PDBFILE) \
-		$(PCHFLAGS) \
-		$(gb_COMPILERDEPFLAGS) \
-		-I$(realpath $(dir $(3))) \
-		$(INCLUDE) \
-		-c $(realpath $(3)) \
-		-Fo$(1)) $(call gb_create_deps,$(1),$(call gb_CObject_get_dep_target,$(2)),$(realpath $(3)))
-$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
-endef
-
-
-# CxxObject class
-
-define gb_CxxObject__command
-$(call gb_Output_announce,$(2),$(true),CXX,3)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
-	unset INCLUDE && \
-	$(gb_CXX) \
-		$(DEFS) \
-		$(T_CXXFLAGS) \
-		-Fd$(PDBFILE) \
-		$(PCHFLAGS) \
-		$(gb_COMPILERDEPFLAGS) \
-		-I$(realpath $(dir $(3))) \
-		$(INCLUDE_STL) $(INCLUDE) \
-		-c $(realpath $(3)) \
-		-Fo$(1))  $(call gb_create_deps,$(1),$(4),$(realpath $(3)))
-$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE))
-endef
-
-
-# PrecompiledHeader class
-
-gb_PrecompiledHeader_get_enableflags = -Yu$(1).hxx \
-	-Fp$(call gb_PrecompiledHeader_get_target,$(1))
-
-define gb_PrecompiledHeader__command
-$(call gb_Output_announce,$(2),$(true),PCH,1)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \
-	unset INCLUDE && \
-	$(gb_CXX) \
-		$(4) $(5) -Fd$(PDBFILE) \
-		$(gb_COMPILERDEPFLAGS) \
-		-I$(realpath $(dir $(3))) \
-		$(6) \
-		-c $(realpath $(3)) \
-		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(1),$(call gb_PrecompiledHeader_get_dep_target,$(2)),$(realpath $(3)))
-endef
-
-# NoexPrecompiledHeader class
-
-gb_NoexPrecompiledHeader_get_enableflags = -Yu$(1).hxx \
-	-Fp$(call gb_NoexPrecompiledHeader_get_target,$(1))
-
-define gb_NoexPrecompiledHeader__command
-$(call gb_Output_announce,$(2),$(true),PCH,1)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \
-	unset INCLUDE && \
-	$(gb_CXX) \
-		$(4) $(5) -Fd$(PDBFILE) \
-		$(gb_COMPILERDEPFLAGS) \
-		-I$(realpath $(dir $(3))) \
-		$(6) \
-		-c $(realpath $(3)) \
-		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(1),$(call gb_NoexPrecompiledHeader,$(2)),$(realpath $(3)))
-endef
-
-# LinkTarget class
-
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
-gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
-
-gb_LinkTarget_INCLUDE :=\
-	$(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \
-	$(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
-
-gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
-
-gb_LinkTarget_get_pdbfile = $(call gb_LinkTarget_get_target,)pdb/$(1).pdb
-
-define gb_LinkTarget__command
-$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
-	rm -f $(1) && \
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100, \
-		$(call gb_Helper_convert_native,$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist))) \
-		$(PCHOBJS) $(NATIVERES))) && \
-	$(gb_LINK) \
-		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
-		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
-		$(if $(filter YES,$(gb_Executable_TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \
-		$(T_LDFLAGS) \
-		@$${RESPONSEFILE} \
-		$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
-		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \
-		$(LIBS) \
-		$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \
-	$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC)
-endef
-
-
-# Library class
-
-gb_Library_DEFS := -D_DLL
-gb_Library_TARGETTYPEFLAGS := -DLL
-gb_Library_get_rpath :=
-
-gb_Library_SYSPRE := i
-gb_Library_PLAINEXT := .lib
-
-gb_Library_win32_OLDNAMES := oldnames
-
-gb_Library_PLAINLIBS_NONE += \
-	advapi32 \
-	d3d9 \
-	d3dx \
-	ddraw \
-	gdi32 \
-	gdiplus \
-	gnu_getopt \
-	imm32\
-	kernel32 \
-	msimg32 \
-	msvcrt \
-	msvcprt \
-	mpr \
-	$(gb_Library_win32_OLDNAMES) \
-	ole32 \
-	oleaut32 \
-	shell32 \
-	shlwapi \
-	unicows \
-	user32 \
-	uuid \
-	uwinapi \
-	version \
-	winmm \
-	winspool \
-
-gb_Library_LAYER := \
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
-
-gb_Library_FILENAMES :=\
-	$(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-
-gb_Library_DLLEXT := .dll
-gb_Library_MAJORVER := 3
-gb_Library_RTEXT := MSC$(gb_Library_DLLEXT)
-gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT)
-gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT)
-gb_Library_RTVEREXT := $(gb_Library_MAJORVER)$(gb_Library_RTEXT)
-
-gb_Library_DLLFILENAMES :=\
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(lib)$(gb_Library_OOOEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTEXT)) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \
-
-define gb_Library_Library_platform
-$(call gb_LinkTarget_set_dlltarget,$(2),$(3))
-
-$(call gb_LinkTarget_set_auxtargets,$(2),\
-	$(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \
-	$(3).manifest \
-	$(call gb_LinkTarget_get_pdbfile,$(2)) \
-	$(patsubst %.dll,%.pdb,$(3)) \
-	$(patsubst %.dll,%.ilk,$(3)) \
-)
-
-$(call gb_Library_get_target,$(1)) \
-$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))
-
-ifneq ($(ENABLE_CRASHDUMP),)
-$(call gb_Library_get_target,$(1)) \
-$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS +=  \
-		$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
-		$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
-
-endif
-
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
-
-$(call gb_LinkTarget_get_target,$(2)) \
-$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
-
-endef
-
-define gb_Library_add_default_nativeres
-$(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
-$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
-$(call gb_WinResTarget_set_defs,$(1)/$(2),\
-		$$(DEFS) \
-		-DADDITIONAL_VERINFO1 \
-		-DADDITIONAL_VERINFO2 \
-		-DADDITIONAL_VERINFO3 \
-)
-$(call gb_Library_add_nativeres,$(1),$(2))
-$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
-
-endef
-
-define gb_Library_add_nativeres
-$(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : $(call gb_WinResTarget_get_target,$(1)/$(2))
-$(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2))
-
-endef
-
-define gb_Library_get_dllname
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES)))
-endef
-
-
-# StaticLibrary class
-
-gb_StaticLibrary_DEFS :=
-gb_StaticLibrary_TARGETTYPEFLAGS := -LIB
-gb_StaticLibrary_SYSPRE :=
-gb_StaticLibrary_PLAINEXT := .lib
-gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
-
-gb_StaticLibrary_FILENAMES := \
-	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
-	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
-
-gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
-
-define gb_StaticLibrary_StaticLibrary_platform
-$(call gb_LinkTarget_get_target,$(2)) \
-$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
-
-$(call gb_LinkTarget_set_auxtargets,$(2),\
-	$(call gb_LinkTarget_get_pdbfile,$(2)) \
-)
-
-endef
-
-# Executable class
-
-gb_Executable_EXT := .exe
-gb_Executable_TARGETTYPEFLAGS := -RELEASE -OPT:NOREF -INCREMENTAL:NO -DEBUG
-gb_Executable_get_rpath :=
-gb_Executable_TARGETGUI := 
-
-define gb_Executable_Executable_platform
-$(call gb_LinkTarget_set_auxtargets,$(2),\
-	$(patsubst %.exe,%.pdb,$(call gb_LinkTarget_get_target,$(2))) \
-	$(call gb_LinkTarget_get_pdbfile,$(2)) \
-	$(call gb_LinkTarget_get_target,$(2)).manifest \
-)
-
-$(call gb_Executable_get_target,$(1)) \
-$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_get_target,$(1)).manifest
-$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest,$(1))
-
-$(call gb_LinkTarget_get_target,$(2)) \
-$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
-
-endef
-
-# CppunitTest class
-
-gb_CppunitTest_DEFS := -D_DLL
-# cppunittester.exe is in the cppunit subdirectory of ${OUTDIR}/bin,
-# thus it won't find its DLLs unless ${OUTDIR}/bin is added to PATH.
-# PATH is the Cygwin one while ${OUTDIR} is a Win32 pathname, thus
-# cygpath -u.
-gb_CppunitTest_CPPTESTPRECOMMAND := PATH="`cygpath -u $(OUTDIR)`/bin:$${PATH}"
-
-gb_CppunitTest_SYSPRE := itest_
-gb_CppunitTest_EXT := .lib
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = test_$(1).dll
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_set_dlltarget,$(2),$(3))
-
-$(call gb_LinkTarget_set_auxtargets,$(2),\
-	$(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \
-	$(3).manifest \
-	$(patsubst %.dll,%.pdb,$(3)) \
-	$(call gb_LinkTarget_get_pdbfile,$(2)) \
-	$(patsubst %.dll,%.ilk,$(3)) \
-)
-
-$(call gb_LinkTarget_get_target,$(2)) \
-$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
-
-endef
-
-# JunitTest class
-
-gb_defaultlangiso := en-US
-gb_smoketest_instset := $(SRCDIR)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(gb_defaultlangiso)/OOo_*_install-arc_$(gb_defaultlangiso).zip
-
-ifeq ($(OOO_TEST_SOFFICE),)
-
-
-# Work around Windows problems with long pathnames (see issue 50885) by
-# installing into the temp directory instead of the module output tree (in which
-# case $(target).instpath contains the path to the temp installation,
-# which is removed after smoketest); can be removed once issue 50885 is fixed;
-# on other platforms, a single installation to solver is created in
-# smoketestoo_native.
-
-# for now, no dependency on $(shell ls $(gb_smoketest_instset))
-# because that doesn't work before the instset is built
-# and there is not much of a benefit anyway (gbuild not knowing about smoketest)
-define gb_JunitTest_JunitTest_platform_longpathname_hack
-$(call gb_JunitTest_get_target,$(1)) : $(call gb_JunitTest_get_target,$(1)).instpath
-$(call gb_JunitTest_get_target,$(1)) : CLEAN_CMD = $(call gb_Helper_abbreviate_dirs,rm -rf `cat $$@.instpath` $$@.instpath)
-
-$(call gb_JunitTest_get_target,$(1)).instpath : 
-	INST_DIR=$$$$(cygpath -m `mktemp -d -t testinst.XXXXXX`) \
-	&& unzip -d "$$$${INST_DIR}"  $$(gb_smoketest_instset) \
-	&& mv "$$$${INST_DIR}"/OOo_*_install-arc_$$(gb_defaultlangiso) "$$$${INST_DIR}"/opt\
-	&& mkdir -p $$(dir $$@) \
-	&& echo "$$$${INST_DIR}" > $$@
-
-endef
-else # OOO_TEST_SOFFICE
-gb_JunitTest_JunitTest_platform_longpathname_hack =
-endif # OOO_TEST_SOFFICE
-
-define gb_JunitTest_JunitTest_platform
-$(call gb_JunitTest_JunitTest_platform_longpathname_hack,$(1))
-
-$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:`cat $(call gb_JunitTest_get_target,$(1)).instpath`/opt/OpenOffice.org 3/program/soffice.exe}" \
-	-Dorg.openoffice.test.arg.env=PATH \
-	-Dorg.openoffice.test.arg.user=file:///$(call gb_JunitTest_get_userdir,$(1)) \
-
-endef
-
-
-# SdiTarget class
-
-# svidl.exe is in ${OUTDIR}/bin itself, so nothing special needed to have it find
-# DLLs in the same directory
-gb_SdiTarget_SVIDLPRECOMMAND :=
-
-# SrsPartMergeTarget
-# Ditto for transex3
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND :=
-
-# SrsPartTarget class
-
-gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc.exe
-gb_SrsPartTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
-
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs_native,\
-	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-		$(INCLUDE) \
-		$(DEFS) \
-		$(2) \
-		-f - \
-	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-		-v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
-		-v OUTDIR=$(OUTDIR)/ \
-		-v WORKDIR=$(WORKDIR)/ \
-		-v SRCDIR=$(SRCDIR)/ \
-		-v REPODIR=$(REPODIR)/ \
-	> $(call gb_SrsPartTarget_get_dep_target,$(1)))
-endef
-else
-gb_SrsPartTarget__command_dep =
-endif
-
-# WinResTarget class
-
-gb_WinResTarget_POSTFIX :=.res
-
-define gb_WinResTarget__command
-$(call gb_Output_announce,$(2),$(true),RES,3)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_RC) \
-		$(DEFS) $(FLAGS) \
-		-I$(dir $(3)) \
-		$(INCLUDE) \
-		-Fo$(1) \
-		$(RCFILE) )
-endef
-
-$(eval $(call gb_Helper_make_dep_targets,\
-	WinResTarget \
-))
-
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_WinResTarget__command_dep
-$(call gb_Helper_abbreviate_dirs_native,\
-	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-		$(INCLUDE) \
-		$(DEFS) \
-		$(2) \
-		-f - \
-	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-		-v OBJECTFILE=$(call gb_WinResTarget_get_target,$(1)) \
-		-v OUTDIR=$(OUTDIR)/ \
-		-v WORKDIR=$(WORKDIR)/ \
-		-v SRCDIR=$(SRCDIR)/ \
-		-v REPODIR=$(REPODIR)/ \
-	> $(call gb_WinResTarget_get_dep_target,$(1)))
-endef
-else
-gb_WinResTarget__command_dep =
-endif
-
-# ComponentTarget
-
-# See comment for svidl.exe
-gb_XSLTPROCPRECOMMAND :=
-
-gb_Library_COMPONENTPREFIXES := \
-	OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
-	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
-
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
-gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
-gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe
-gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
-gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
-gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
deleted file mode 100644
index fee27f929..000000000
--- a/solenv/gbuild/platform/winmingw.mk
+++ /dev/null
@@ -1,714 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2009 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-GUI := WNT
-COM := GCC
-
-# set tmpdir to some mixed case path, suitable for native tools
-ifeq ($(OS_FOR_BUILD),WNT)
-gb_TMPDIR:=$(if $(TMPDIR),$(shell cygpath -m $(TMPDIR)),$(shell cygpath -m /tmp))
-else
-gb_TMPDIR:=/tmp
-endif
-gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
-
-gb_CC := $(CC)
-gb_CXX := $(CXX)
-gb_AR := $(shell $(CC) -print-prog-name=ar)
-gb_AWK := awk
-gb_RC := $(WINDRES)
-ifeq ($(USE_MINGW),cygwin)
-gb_MINGWLIBDIR := $(COMPATH)/lib/mingw
-else
-ifeq ($(USE_MINGW),cygwin-w64-mingw32)
-gb_MINGWLIBDIR := $(COMPATH)/usr/i686-w64-mingw32/sys-root/mingw/lib
-else
-gb_MINGWLIBDIR := $(COMPATH)/lib
-endif
-endif
-ifeq ($(MINGW_SHARED_GXXLIB),YES)
-gb_MINGW_LIBSTDCPP := $(subst -l,,$(MINGW_SHARED_LIBSTDCPP))
-else
-gb_MINGW_LIBSTDCPP := \
-		stdc++ \
-		moldname
-endif
-ifeq ($(MINGW_SHARED_GCCLIB),YES)
-gb_MINGW_LIBGCC := \
-		gcc_s \
-		gcc
-else
-ifeq ($(MINGW_GCCLIB_EH),YES)
-gb_MINGW_LIBGCC := \
-		gcc \
-		gcc_eh
-else
-gb_MINGW_LIBGCC := gcc
-endif
-endif
-
-gb_OSDEFS := \
-	-DWINVER=0x0500 \
-	-D_WIN32_IE=0x0500 \
-	-DNT351 \
-	-DWIN32 \
-	-DWNT \
-
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
-gb_COMPILERDEFS := \
-	-DGCC \
-	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
-	-DCPPU_ENV=gcc3 \
-	-D_MT \
-	-D_NATIVE_WCHAR_T_DEFINED \
-	-D_MSC_EXTENSIONS \
-	-D_FORCENAMELESSUNION \
-
-ifeq ($(USE_MINGW),cygwin-w64-mingw32)
-gb_COMPILERDEFS +=-D_declspec=__declspec
-endif
-
-gb_CPUDEFS := \
-	-DINTEL \
-	-D_M_IX86 \
-
-gb_RCDEFS := \
-	 -DWINVER=0x0400 \
-	 -DWIN32 \
-
-gb_RCFLAGS := \
-	 -V
-
-gb_CFLAGS := \
-	-Wall \
-	-Wendif-labels \
-	-Wextra \
-	-fmessage-length=0 \
-	-fno-strict-aliasing \
-	-pipe \
-
-gb_CXXFLAGS := \
-	-Wall \
-	-Wendif-labels \
-	-Wextra \
-	-Wno-ctor-dtor-privacy \
-	-Wno-non-virtual-dtor \
-	-Wreturn-type \
-	-Wshadow \
-	-Wuninitialized \
-	-fmessage-length=0 \
-	-fno-strict-aliasing \
-	-pipe \
-
-ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
-endif
-
-ifneq ($(SYSBASE),)
-gb_CXXFLAGS += --sysroot=$(SYSBASE)
-gb_CFLAGS += --sysroot=$(SYSBASE)
-endif
-gb_LinkTarget_EXCEPTIONFLAGS := \
-	-DEXCEPTIONS_ON \
-	-fexceptions \
-	-fno-enforce-eh-specs \
-
-gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
-
-
-gb_LinkTarget_NOEXCEPTIONFLAGS := \
-	-DEXCEPTIONS_OFF \
-	-fno-exceptions \
-
-gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
-
-gb_LinkTarget_LDFLAGS := \
-	-Wl,--export-all-symbols \
-	-Wl,--enable-stdcall-fixup \
-	-Wl,--enable-runtime-pseudo-reloc-v2 \
-	$(subst -L../lib , ,$(SOLARLIB)) \
-
-ifeq ($(MINGW_GCCLIB_EH),YES)
-gb_LinkTarget_LDFLAGS += -shared-libgcc
-endif
-
-gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
-ifneq ($(gb_DEBUGLEVEL),0)
-
-gb_COMPILEROPTFLAGS := -O0
-else
-gb_COMPILEROPTFLAGS := -Os
-endif
-
-gb_COMPILERNOOPTFLAGS := -O0
-
-gb_STDLIBS := \
-	mingwthrd \
-	$(gb_MINGW_LIBSTDCPP) \
-	mingw32 \
-	$(gb_MINGW_LIBGCC) \
-	uwinapi \
-	mingwex \
-
-
-# Helper class
-
-ifeq ($(OS_FOR_BUILD),WNT)
-gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
-gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
-gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
-gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
-else
-gb_Helper_SRCDIR_NATIVE := $(SRCDIR)
-gb_Helper_WORKDIR_NATIVE := $(WORKDIR)
-gb_Helper_OUTDIR_NATIVE := $(OUTDIR)
-gb_Helper_REPODIR_NATIVE := $(REPODIR)
-endif
-
-# convert parameters filesystem root to native notation
-define gb_Helper_abbreviate_dirs_native
-R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,O=$(gb_Helper_OUTDIR_NATIVE) && W=$(gb_Helper_WORKDIR_NATIVE) && S=$(gb_Helper_SRCDIR_NATIVE))) && \
-$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)))))))))
-endef
-
-# Set the proper enirotment variable so that our BUILD platform
-# build-time shared libraries are found.
-ifeq ($(OS_FOR_BUILD),WNT)
-gb_Helper_set_ld_path := PATH=$(OUTDIR_FOR_BUILD)/bin:$$PATH
-else ifeq ($(OS_FOR_BUILD),MACOSX)
-gb_Helper_set_ld_path := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-else
-gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
-endif
-
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
-$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
-$(1)))))
-endef
-
-# convert parameters filesystem root to native notation
-# does some real work only on windows, make sure not to
-# break the dummy implementations on unx*
-define gb_Helper_convert_native
-$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
-$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
-$(1)))))
-endef
-
-# CObject class
-
-# We (LibreOffice) support MinGW only for cross-compilation. This is identical to
-# gb_CObject__command in unxgcc.mk
-
-# $(call gb_CObject__command,object,relative-source,source,dep-file)
-define gb_CObject__command
-$(call gb_Output_announce,$(2),$(true),C  ,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CC) \
-		$(DEFS) \
-		$(T_CFLAGS) \
-		-c $(3) \
-		-o $(1) \
-		-MMD -MT $(1) \
-		-MF $(4) \
-		-I$(dir $(3)) \
-		$(INCLUDE))
-endef
-
-
-# CxxObject class
-
-# $(call gb_CxxObject__command,object,relative-source,source,dep-file)
-define gb_CxxObject__command
-$(call gb_Output_announce,$(2),$(true),CXX,3)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CXX) \
-		$(DEFS) \
-		$(T_CXXFLAGS) \
-		-c $(3) \
-		-o $(1) \
-		-MMD -MT $(1) \
-		-MF $(4) \
-		-I$(dir $(3)) \
-		$(INCLUDE_STL) $(INCLUDE))
-endef
-
-
-# PrecompiledHeader class
-
-gb_PrecompiledHeader_EXT := .gch
-
-gb_PrecompiledHeader_get_enableflags = -I$(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR) \
-					-DPRECOMPILED_HEADERS \
-					-Winvalid-pch \
-
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_PrecompiledHeader__command_deponcompile
-$(call gb_Helper_abbreviate_dirs_native,\
-	$(OUTDIR_FOR_BUILD)/bin/makedepend \
-		$(4) $(5) \
-		-I$(dir $(3)) \
-		$(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
-		$(3) \
-		-f - \
-	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-		-v OBJECTFILE=$(1) \
-		-v OUTDIR=$(OUTDIR)/ \
-		-v WORKDIR=$(WORKDIR)/ \
-		-v SRCDIR=$(SRCDIR)/ \
-		-v REPODIR=$(REPODIR)/ \
-	> $(call gb_PrecompiledHeader_get_dep_target,$(2)))
-endef
-else
-gb_PrecompiledHeader__command_deponcompile =
-endif
-
-define gb_PrecompiledHeader__command
-$(call gb_Output_announce,$(2),$(true),PCH,1)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \
-	$(gb_CXX) \
-		-x c++-header \
-		$(4) $(5) \
-		-I$(dir $(3)) \
-		$(6) \
-		-c $(3) \
-		-o$(1))
-$(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
-
-endef
-
-# NoexPrecompiledHeader class
-
-gb_NoexPrecompiledHeader_EXT := .gch
-
-gb_NoexPrecompiledHeader_get_enableflags = -I$(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR) \
-					-Winvalid-pch \
-
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_NoexPrecompiledHeader__command_deponcompile
-$(call gb_Helper_abbreviate_dirs_native,\
-	$(OUTDIR_FOR_BUILD)/bin/makedepend \
-		$(4) $(5) \
-		-I$(dir $(3)) \
-		$(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
-		$(3) \
-		-f - \
-	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-		-v OBJECTFILE=$(1) \
-		-v OUTDIR=$(OUTDIR)/ \
-		-v WORKDIR=$(WORKDIR)/ \
-		-v SRCDIR=$(SRCDIR)/ \
-		-v REPODIR=$(REPODIR)/ \
-	> $(call gb_NoexPrecompiledHeader_get_dep_target,$(2)))
-endef
-else
-gb_NoexPrecompiledHeader__command_deponcompile =
-endif
-
-define gb_NoexPrecompiledHeader__command
-$(call gb_Output_announce,$(2),$(true),PCH,1)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \
-	$(gb_CXX) \
-		-x c++-header \
-		$(4) $(5) \
-		-I$(dir $(3)) \
-		$(6) \
-		-c $(3) \
-		-o$(1))
-$(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
-
-endef
-
-
-# LinkTarget class
-
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
-gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
-
-ifeq ($(gb_SYMBOL),$(true))
-gb_LinkTarget_CXXFLAGS += -ggdb2
-gb_LinkTarget_CFLAGS += -ggdb2
-endif
-
-gb_LinkTarget_INCLUDE :=\
-	$(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \
-	$(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
-
-gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
-
-define gb_LinkTarget__command_dynamiclinkexecutable
-$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_CXX) $(strip \
-		$(gb_Executable_TARGETTYPEFLAGS) \
-		$(if $(filter YES,$(gb_Executable_TARGETGUI)), --subsystem windows, --subsystem console) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
-		$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
-		$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
-		$(LIBS) \
-		-Wl$(COMMA)-Map$(COMMA)$(basename $(1)).map \
-		-o $(1)))
-endef
-
-define gb_LinkTarget__command_dynamiclinklibrary
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_CXX) $(strip \
-		$(gb_Library_TARGETTYPEFLAGS) \
-		$(T_LDFLAGS) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
-		$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
-		$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
-		$(LIBS) \
-		-Wl$(COMMA)-Map$(COMMA)$(basename $(DLLTARGET)).map \
-		-Wl$(COMMA)--out-implib$(COMMA)$(1) \
-		-o $(dir $(1))/$(notdir $(DLLTARGET))))
-endef
-
-define gb_LinkTarget__command_staticlinklibrary
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_AR) -rsu $(1) \
-		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
-		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
-		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
-		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
-		$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
-endef
-
-define gb_LinkTarget__command
-$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinkexecutable,$(1),$(2)))
-$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinklibrary,$(1),$(2)))
-$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlinklibrary,$(1)))
-endef
-
-
-# Library class
-
-gb_Library_DEFS := -D_DLL
-gb_Library_TARGETTYPEFLAGS := -shared
-gb_Library_get_rpath :=
-
-gb_Library_SYSPRE := lib
-gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
-gb_Library_UDK_MAJORVER := 3
-
-gb_Library_PLAINEXT := .dll.a
-
-gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
-gb_Library_RTVEREXT := $(gb_Library_RTEXT)
-gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-gb_Library_UNOVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_PLAINEXT)
-
-gb_Library_DLLEXT := .dll
-
-gb_Library_RTDLLEXT := gcc3$(gb_Library_DLLEXT)
-gb_Library_RTVERDLLEXT := $(gb_Library_RTDLLEXT)
-gb_Library_OOODLLEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT)
-gb_Library_UNODLLEXT := .uno$(gb_Library_DLLEXT)
-gb_Library_UNOVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_DLLEXT)
-
-gb_Library_win32_OLDNAMES := moldname
-
-gb_Library_PLAINLIBS_NONE += \
-	mingwthrd \
-	mingw32 \
-	mingwex \
-	$(gb_MINGW_LIBSTDCPP) \
-	$(gb_MINGW_LIBGCC) \
-	advapi32 \
-	d3d9 \
-	d3dx \
-	ddraw \
-	gdi32 \
-	gdiplus \
-	gnu_getopt \
-	imm32 \
-	kernel32 \
-	msimg32 \
-	msvcrt \
-	msvcprt \
-	mpr \
-	$(gb_Library_win32_OLDNAMES) \
-	ole32 \
-	oleaut32 \
-	shell32 \
-	shlwapi \
-	unicows \
-	user32 \
-	uuid \
-	uwinapi \
-	winmm \
-	version \
-	winspool \
-
-gb_Library_LAYER := \
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
-
-gb_Library_FILENAMES :=\
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
-
-
-gb_Library_DLLFILENAMES :=\
-	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(lib)$(gb_Library_OOODLLEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-	$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTDLLEXT)) \
-	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTDLLEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
-	$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \
-	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVERDLLEXT)) \
-
-gb_Library_IARCSYSPRE := lib
-gb_Library_IARCEXT := .a
-
-gb_Library_ILIBEXT := .lib
-
-define gb_Library_Library_platform
-$(call gb_LinkTarget_set_dlltarget,$(2),$(OUTDIR)/bin/$(notdir $(3)))
-
-$(call gb_LinkTarget_set_auxtargets,$(2),\
-	$(patsubst %.dll,%.map,$(3)) \
-)
-
-$(call gb_Library_get_target,$(1)) \
-$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))
-
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
-
-endef
-
-define gb_Library_add_default_nativeres
-$(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
-$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
-$(call gb_WinResTarget_set_defs,$(1)/$(2),\
-		$$(DEFS) \
-		-DADDITIONAL_VERINFO1 \
-		-DADDITIONAL_VERINFO2 \
-		-DADDITIONAL_VERINFO3 \
-)
-$(call gb_Library_add_nativeres,$(1),$(2))
-$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
-
-endef
-
-define gb_Library_add_nativeres
-$(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : $(call gb_WinResTarget_get_target,$(1)/$(2))
-$(call gb_LinkTarget_get_target,$(call gb_Library__get_linktargetname,$(1))) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2))
-
-endef
-
-define gb_Library_get_dllname
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES)))
-endef
-
-define gb_Library_get_implibname
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_FILENAMES)))
-endef
-
-
-# StaticLibrary class
-
-gb_StaticLibrary_DEFS :=
-gb_StaticLibrary_SYSPRE := lib
-gb_StaticLibrary_PLAINEXT := .a
-gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
-
-gb_StaticLibrary_FILENAMES := \
-	$(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
-	$(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
-
-gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
-
-gb_StaticLibrary_StaticLibrary_platform =
-
-# Executable class
-
-gb_Executable_EXT := .exe
-gb_Executable_TARGETTYPEFLAGS :=
-gb_Executable_get_rpath :=
-gb_Executable_Executable_platform =
-gb_Executable_TARGETGUI :=
-
-# CppunitTest class
-
-ifeq ($(CROSS_COMPILING),YES)
-gb_CppunitTest_CPPTESTPRECOMMAND := :
-else
-gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
-endif
-gb_CppunitTest_SYSPRE := itest_
-gb_CppunitTest_EXT := .lib
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = test_$(1).dll
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_set_dlltarget,$(2),$(3))
-
-$(call gb_LinkTarget_set_auxtargets,$(2),\
-	$(patsubst %.dll,%.map,$(3)) \
-)
-
-endef
-
-# SdiTarget class
-
-gb_SdiTarget_SVIDLPRECOMMAND := $(gb_Helper_set_ld_path)
-
-# SrsPartMergeTarget
-
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := $(gb_Helper_set_ld_path)
-
-# SrsPartTarget class
-
-gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc
-gb_SrsPartTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_SrsPartTarget_RSCTARGET)
-
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs_native,\
-	$(OUTDIR_FOR_BUILD)/bin/makedepend \
-		$(INCLUDE) \
-		$(DEFS) \
-		$(2) \
-		-f - \
-	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-		-v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
-		-v OUTDIR=$(OUTDIR)/ \
-		-v WORKDIR=$(WORKDIR)/ \
-		-v SRCDIR=$(SRCDIR)/ \
-		-v REPODIR=$(REPODIR)/ \
-	> $(call gb_SrsPartTarget_get_dep_target,$(1)))
-endef
-else
-gb_SrsPartTarget__command_dep =
-endif
-
-# WinResTarget class
-
-gb_WinResTarget_POSTFIX :=.res
-
-define gb_WinResTarget__command
-$(call gb_Output_announce,$(2),$(true),RES,3)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
-	$(gb_RC) \
-		$(DEFS) $(FLAGS) \
-		-I$(dir $(3)) \
-		$(INCLUDE) \
-		-o $(1) \
-		$(RCFILE) )
-endef
-
-$(eval $(call gb_Helper_make_dep_targets,\
-	WinResTarget \
-))
-
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_WinResTarget__command_dep
-$(call gb_Helper_abbreviate_dirs_native,\
-	$(OUTDIR_FOR_BUILD)/bin/makedepend \
-		$(INCLUDE) \
-		$(DEFS) \
-		$(2) \
-		-f - \
-	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-		-v OBJECTFILE=$(call gb_WinResTarget_get_target,$(1)) \
-		-v OUTDIR=$(OUTDIR)/ \
-		-v WORKDIR=$(WORKDIR)/ \
-		-v SRCDIR=$(SRCDIR)/ \
-		-v REPODIR=$(REPODIR)/ \
-	> $(call gb_WinResTarget_get_dep_target,$(1)))
-endef
-else
-gb_WinResTarget__command_dep =
-endif
-
-# ComponentTarget
-
-gb_XSLTPROCPRECOMMAND := $(gb_Helper_set_ld_path)
-gb_Library_COMPONENTPREFIXES := \
-	OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
-	URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-	NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
-
-# UnoApiTarget
-
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc
-gb_UnoApiTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/regmerge
-gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR_FOR_BUILD)/bin/regcompare
-gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR_FOR_BUILD)/bin/cppumaker
-gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview
-gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/processdelivered.awk b/solenv/gbuild/processdelivered.awk
deleted file mode 100644
index 9fdb2ec30..000000000
--- a/solenv/gbuild/processdelivered.awk
+++ /dev/null
@@ -1,36 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-BEGIN {
-    RS=" "
-    FS=":"
-}
-
-{
-    if( NF == 2 )
-        print "COPY " $1 " " $2;
-}
diff --git a/solenv/gbuild/processdeps.awk b/solenv/gbuild/processdeps.awk
deleted file mode 100644
index 9014427fa..000000000
--- a/solenv/gbuild/processdeps.awk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# this awk script mangles makedepend output for a single object file
-# usage:
-# awk -f .../processdeps.awk \
-#     -v OUTDIR=outdir \
-#     -v SRCDIR=srcdir \
-#     -v WORKDIR=workdir \
-#     -v REPODIR=repodir \
-#     -v OBJECTFILE=objectfile
-# called like this the script will read from stdin
-# and write to stdout. It will:
-#  - replace the objectfile with the one given on the commandline
-#  - normalize paths to mixed paths (replacing all \ with /)
-#  - replace the string given as WORKDIR with $(WORKDIR)/
-#  - replace the string given as OUTDIR with $(OUTDIR)/
-#  - replace the string given as SRCDIR with $(SRCDIR)/
-#  - replace the string given as REPODIR with $(REPODIR)/
-#  - translates absolute mixed windows paths to cygwin paths by
-#    substituting a path starting with X:... to /cygdrive/X/...
-
-function mangle_path(path) {
-    gsub("\\\\", "/", path);
-    if( path ~ /^[a-zA-Z]:/ )
-        path = tolower(substr(path,0,1)) substr(path,2);
-    gsub(WORKDIR, "$(WORKDIR)/", path);
-    gsub(OUTDIR, "$(OUTDIR)/", path);
-    gsub(SRCDIR, "$(SRCDIR)/", path);
-    gsub(REPODIR, "$(REPODIR)/", path);
-    if( path ~ /^[a-zA-Z]:/ )
-        path = "/cygdrive/" tolower(substr(path,0,1)) substr(path,3);
-    return path;
-}
-
-BEGIN {
-   WORKDIR = tolower(substr(WORKDIR,0,1)) substr(WORKDIR,2); 
-   OUTDIR = tolower(substr(OUTDIR,0,1)) substr(OUTDIR,2); 
-   SRCDIR = tolower(substr(SRCDIR,0,1)) substr(SRCDIR,2); 
-   REPODIR = tolower(substr(REPODIR,0,1)) substr(REPODIR,2); 
-#   print "# WORKDIR=" WORKDIR;
-#   print "# OUTDIR=" OUTDIR;
-#   print "# SRCDIR=" SRCDIR;
-#   print "# REPODIR=" REPODIR;
-   print mangle_path(OBJECTFILE) ": \\";
-}
-
-/^[^#]/ {
-    print "\t" mangle_path($2) " \\";
-}
-
-END {
-    print "\n";
-}
diff --git a/solenv/gbuild/templates/AllLangResTarget.mk b/solenv/gbuild/templates/AllLangResTarget.mk
deleted file mode 100644
index 3f8d12379..000000000
--- a/solenv/gbuild/templates/AllLangResTarget.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# RES is the name of the resource; its file name will be RES-LOCALE.res
-# MODULE is the name of the code module the makefile is located in
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,RES))
-
-# declaration of images folder (e.g. default_images/MODULE/res)
-$(eval $(call gb_AllLangResTarget_set_reslocation,RES,MODULE))
-
-# declaration of a resource intermediate file (srs)
-$(eval $(call gb_AllLangResTarget_add_srs,RES, RES/res))
-$(eval $(call gb_SrsTarget_SrsTarget,RES/res))
-
-# add any additional include paths here
-$(eval $(call gb_SrsTarget_set_include,RES/res,\
-	$$(INCLUDE) \
-))
-
-# add src files here (complete path relative to repository root)
-$(eval $(call gb_SrsTarget_add_files,RES/res,\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/CppunitTest.mk b/solenv/gbuild/templates/CppunitTest.mk
deleted file mode 100644
index 28e940688..000000000
--- a/solenv/gbuild/templates/CppunitTest.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_CppunitTest_CppunitTest,MODULE_NAME))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,MODULE_NAME, \
-))
-
-$(eval $(call gb_CppunitTest_add_linked_libs,MODULE_NAME, \
-	$(gb_STDLIBS) \
-))
-
-$(eval $(call gb_CppunitTest_set_include,MODULE_NAME,\
-	$$(INCLUDE) \
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/Executable.mk b/solenv/gbuild/templates/Executable.mk
deleted file mode 100644
index 5a11ca65a..000000000
--- a/solenv/gbuild/templates/Executable.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Executable_Executable,EXEC))
-
-$(eval $(call gb_Executable_set_include,EXEC,\
-	$$(INCLUDE) \
-))
-
-#$(eval $(call gb_Executable_add_defs,EXEC,\
-#	-Dfoo \
-#))
-
-$(eval $(call gb_Executable_add_linked_libs,EXEC,\
-	$(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,EXEC,\
-))
-
-$(eval $(call gb_Executable_set_targettype_gui,EXEC,\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/JunitTest.mk b/solenv/gbuild/templates/JunitTest.mk
deleted file mode 100644
index d4e515fa2..000000000
--- a/solenv/gbuild/templates/JunitTest.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_JunitTest_JunitTest,MODULE_TYPE))
-
-$(eval $(call gb_JunitTest_set_defs,MODULE_TYPE,\
-	$$(DEFS) \
-	-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/MODULE/DOCUMENTPATH \
-))
-
-$(eval $(call gb_JunitTest_add_jars,MODULE_TYPE,\
-	$(OUTDIR)/bin/OOoRunner.jar \
-	$(OUTDIR)/bin/ridl.jar \
-	$(OUTDIR)/bin/test.jar \
-	$(OUTDIR)/bin/unoil.jar \
-	$(OUTDIR)/bin/jurt.jar \
-))
-
-$(eval $(call gb_JunitTest_add_sourcefiles,MODULE_TYPE,\
-))
-
-$(eval $(call gb_JunitTest_add_classes,MODULE_COMPLEX,\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/Library.mk b/solenv/gbuild/templates/Library.mk
deleted file mode 100644
index 249bbdfce..000000000
--- a/solenv/gbuild/templates/Library.mk
+++ /dev/null
@@ -1,85 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# MODULE is the name of the module the makefile is located in
-
-# declare a library
-# LIB is the name of the library as it is found in Repository.mk
-$(eval $(call gb_Library_Library,LIB))
-
-# declare packages that will be delivered before compilation of LIB
-# learn more about TYPE in the Package.mk template
-$(eval $(call gb_Library_add_package_headers,LIB,MODULE_TYPE))
-
-# for platforms supporting PCH: declare the location of the pch file
-# this is the name of the cxx file (without extension)
-$(eval $(call gb_Library_add_precompiled_header,LIB,$(SRCDIR)/MODULE/PCH_FILE))
-
-# in case UNO services are exported: declare location of component file
-$(eval $(call gb_Library_set_componentfile,LIB,MODULE/COMPONENT_FILE))
-
-# add any additional include paths for this library here
-$(eval $(call gb_Library_set_include,LIB,\
-	$$(INCLUDE) \
-))
-
-# add any additional definitions to be set for compilation here
-# (e.g. -DLIB_DLLIMPLEMENTATION)
-#$(eval $(call gb_Library_add_defs,LIB,\
-#))
-
-# add libraries to be linked to LIB; again these names need to be given as
-# specified in Repository.mk
-$(eval $(call gb_Library_add_linked_libs,LIB,\
-	$(gb_STDLIBS) \
-))
-
-# add all source files that shall be compiled with exceptions enabled
-# the name is relative to $(SRCROOT) and must not contain an extension
-$(eval $(call gb_Library_add_exception_objects,LIB,\
-))
-
-# in case sdi files need to be processed: declare "root" (main) sdi target and sdi header target
-# "ROOT_SDI_FILE" is the file that is handed over to svidl (all other sdi files are included in the root file)
-$(eval $(call gb_Library_add_sdi_headers,LIB,MODULE/sdi/ROOT_SDI_FILE))
-$(eval $(call gb_SdiTarget_SdiTarget,MODULE/sdi/ROOT_SDI_FILE,MODULE/sdi/LIB))
-
-# add any additional include paths for sdi processing here
-$(eval $(call gb_SdiTarget_set_include,MODULE/sdi/ROOT_SDI_FILE,\
-	$$(INCLUDE) \
-))
-
-# this is an example how files can be added that require special compiler settings, e.g. building without optimizing
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_cxxobjects,LIB,\
-	MODULE/source/foo/bar \
-	, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-
-endif
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/Makefile b/solenv/gbuild/templates/Makefile
deleted file mode 100644
index 90947b2e5..000000000
--- a/solenv/gbuild/templates/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-ifeq ($(strip $(SOLARENV)),)
-$(error No environment set!)
-endif
-
-gb_PARTIALBUILD := T
-GBUILDDIR := $(SOLARENV)/gbuild
-include $(GBUILDDIR)/gbuild.mk
-
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/templates/Module.mk b/solenv/gbuild/templates/Module.mk
deleted file mode 100644
index 3b2f7fa04..000000000
--- a/solenv/gbuild/templates/Module.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# replace MODULE by the name of the module you are creating
-
-$(eval $(call gb_Module_Module,MODULE))
-
-# the targets to be inserted are their file names without .mk extension
-$(eval $(call gb_Module_add_targets,MODULE,\
-))
-
-# add any runtime tests (unit tests) here
-# remove if no tests
-$(eval $(call gb_Module_add_check_targets,MODULE,\
-))
-
-# add any subsequent checks (e.g. complex tests) here
-$(eval $(call gb_Module_add_subsequentcheck_targets,MODULE,\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/Package.mk b/solenv/gbuild/templates/Package.mk
deleted file mode 100644
index c71ca5f4f..000000000
--- a/solenv/gbuild/templates/Package.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# MODULE is the name of the module the makefile is located in
-
-# TYPE is an arbitrary name that should denote what is inside this package
-# typical names are "inc", "uiconfig", "xml" etc.
-# "MODULE_TYPE" is the package name
-# the file name of the corresponding makefile should be Package_TYPE.mk
-# SOURCE is the name of the root folder of the package that shall be delivered
-$(eval $(call gb_Package_Package,MODULE_TYPE,$(SRCDIR)/MODULE/SOURCE))
-
-# add files to the package
-# SOURCE_RELPATH/file.ext is the name of the source file (relative to the root give above)
-# DESTINATION_RELPATH/file.ext is the destination file (relative to $(OUTDIR))
-$(eval $(call gb_Package_add_file,MODULE_TYPE,DESTINATION_RELPATH/file.ext,SOURCE_RELPATH/file.ext))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/StaticLibrary.mk b/solenv/gbuild/templates/StaticLibrary.mk
deleted file mode 100644
index 0bee7b930..000000000
--- a/solenv/gbuild/templates/StaticLibrary.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,LIB))
-
-$(eval $(call gb_StaticLibrary_add_package_headers,LIB,MODULE_inc))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,LIB,\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/makefile.mk b/solenv/gbuild/templates/makefile.mk
deleted file mode 100644
index 88cd9dfe0..000000000
--- a/solenv/gbuild/templates/makefile.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-TARGET=prj
-
-.INCLUDE : settings.mk
-
-.IF "$(VERBOSE)"!=""
-VERBOSEFLAG :=
-.ELSE
-VERBOSEFLAG := -s
-.ENDIF
-
-all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/solenv/inc/_cppunit.mk b/solenv/inc/_cppunit.mk
deleted file mode 100644
index 85804dd41..000000000
--- a/solenv/inc/_cppunit.mk
+++ /dev/null
@@ -1,120 +0,0 @@
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL1TARGETN)"!=""
-ALLTAR : test1
-test1 .PHONY : $(SHL1TARGETN)
-        @echo ----------------------------------------------------------
-        @echo - start unit test \#1 on library $(SHL1TARGETN)
-        @echo ----------------------------------------------------------
-        $(CPPUNITTESTER) $(SHL1TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL2TARGETN)"!=""
-ALLTAR : test2
-test2 .PHONY : $(SHL2TARGETN)
-        @echo ----------------------------------------------------------
-        @echo - start unit test \#2 on library $(SHL2TARGETN)
-        @echo ----------------------------------------------------------
-        $(CPPUNITTESTER) $(SHL2TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL3TARGETN)"!=""
-ALLTAR : test3
-test3 .PHONY : $(SHL3TARGETN)
-        @echo ----------------------------------------------------------
-        @echo - start unit test \#3 on library $(SHL3TARGETN)
-        @echo ----------------------------------------------------------
-        $(CPPUNITTESTER) $(SHL3TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL4TARGETN)"!=""
-ALLTAR : test4
-test4 .PHONY : $(SHL4TARGETN)
-        @echo ----------------------------------------------------------
-        @echo - start unit test \#4 on library $(SHL4TARGETN)
-        @echo ----------------------------------------------------------
-        $(CPPUNITTESTER) $(SHL4TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL5TARGETN)"!=""
-ALLTAR : test5
-test5 .PHONY : $(SHL5TARGETN)
-        @echo ----------------------------------------------------------
-        @echo - start unit test \#5 on library $(SHL5TARGETN)
-        @echo ----------------------------------------------------------
-        $(CPPUNITTESTER) $(SHL5TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL6TARGETN)"!=""
-ALLTAR : test6
-test6 .PHONY : $(SHL6TARGETN)
-        @echo ----------------------------------------------------------
-        @echo - start unit test \#6 on library $(SHL6TARGETN)
-        @echo ----------------------------------------------------------
-        $(CPPUNITTESTER) $(SHL6TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL7TARGETN)"!=""
-ALLTAR : test7
-test7 .PHONY : $(SHL7TARGETN)
-        @echo ----------------------------------------------------------
-        @echo - start unit test \#7 on library $(SHL7TARGETN)
-        @echo ----------------------------------------------------------
-        $(CPPUNITTESTER) $(SHL7TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL8TARGETN)"!=""
-ALLTAR : test8
-test8 .PHONY : $(SHL8TARGETN)
-        @echo ----------------------------------------------------------
-        @echo - start unit test \#8 on library $(SHL8TARGETN)
-        @echo ----------------------------------------------------------
-        $(CPPUNITTESTER) $(SHL8TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL9TARGETN)"!=""
-ALLTAR : test9
-test9 .PHONY : $(SHL9TARGETN)
-        @echo ----------------------------------------------------------
-        @echo - start unit test \#9 on library $(SHL9TARGETN)
-        @echo ----------------------------------------------------------
-        $(CPPUNITTESTER) $(SHL9TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL10TARGETN)"!=""
-ALLTAR : test10
-test10 .PHONY : $(SHL10TARGETN)
-        @echo ----------------------------------------------------------
-        @echo - start unit test \#10 on library $(SHL10TARGETN)
-        @echo ----------------------------------------------------------
-        $(CPPUNITTESTER) $(SHL10TARGETN)
-.ENDIF
-
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
deleted file mode 100644
index 4a98fae26..000000000
--- a/solenv/inc/_tg_app.mk
+++ /dev/null
@@ -1,2100 +0,0 @@
-# unroll begin
-
-.IF "$(APP1LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP1LINKTYPEFLAG=$(APPLINK$(APP1LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP1CODETYPE)"=="C"
-APP1LINKER=$(LINKC)
-APP1STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP1LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(APP1CODETYPE)"=="C"
-APP1LINKER=$(LINK)
-APP1STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP1LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(APP1CODETYPE)"=="C"
-
-APP1RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP1RPATH)*=/ERROR:/Bad_APP1RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP1LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP1RPATH))
-.ENDIF
-
-.IF "$(APP1STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP1STACKN=$(LINKFLAGSTACK)$(APP1STACK)
-.ENDIF
-.ELSE
-APP1STACKN=
-.ENDIF
-
-.IF "$(APP1NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP1OBJS+= $(STDOBJVCL)
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)$(COM)" == "WNTGCC"
-APP1RESO=
-.IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
-APP1RESO=$(MISC)/$(APP1TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-APP1DEPN+:=$(APP1DEPNU)
-USE_APP1DEF=
-.ENDIF
-
-.IF "$(APP1TARGETN)"!=""
-
-.IF "$(APP1PRODUCTNAME)"!=""
-APP1PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\"
-.ENDIF			# "$(APP1PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP1LIBS)"!=""
-$(MISC)/$(APP1TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP1LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP1LIBS)"!="" 
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP1TARGETN:b)_linkinc.ls
-$(APP1TARGETN) : $(LINKINCTARGETS)
-.ENDIF          # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP1LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
-    $(APP1RES) \
-    $(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
-    @-$(RM) $(MISC)/$(@:b).strip
-    @echo $(STDSLO) $(APP1OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
-    $(APP1LINKTYPEFLAG) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_1.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_1.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_1.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-    @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        app $(APP1RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
-    @echo "Making:   " $(@:f).app
-    @macosx-create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
-.ELSE		# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
-    @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-    $(APP1OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_1.cmd
-    @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_1.cmd
-    @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)/$(TARGET).$(@:b)_1.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_1.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-  .ENDIF
-.ENDIF		# "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(GUI)" == "WNT"
-    @@-$(MKDIR) $(@:d:d)
-.IF "$(APP1LINKRES)" != ""
-    @@-$(RM) $(MISC)/$(APP1LINKRES:b).rc
-.IF "$(APP1ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP1ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc
-.ENDIF		# "$(APP1ICON)" != ""
-.IF "$(APP1VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc
-.ENDIF		# "$(APP1VERINFO)" != ""
-.IF "$(COM)" == "GCC"
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP1LINKRES:b).res $(MISC)/$(APP1LINKRES:b).rc
-.ELSE
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc
-.ENDIF
-.ENDIF			# "$(APP1LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
-    @cat $(APP1LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) >  $(MISC)/$(@:b)_all.res
-    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP1RESO)
-.ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-        $(APP1BASEX) $(APP1STACKN) -o $@ $(APP1OBJS) \
-        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP1RESO) \
-        `$(TYPE) /dev/null $(APP1LIBS) | sed s#$(ROUT)#$(OUT)#g` \
-        $(APP_LINKTYPE) $(APP1LIBSALCPPRT) \
-        -Wl,--start-group $(APP1STDLIBS) -Wl,--end-group $(APP1STDLIB) \
-        $(STDLIB1) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_1.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_1.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
-.ELSE	# "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
-    $(COMMAND_ECHO)$(APP1LINKER) @$(mktmp \
-        $(APP1LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP1BASEX) \
-        $(APP1STACKN) \
-        -out:$@ \
-        -map:$(MISC)/{$(subst,/,_ $(APP1TARGET)).map} \
-        $(STDOBJ) \
-        $(APP1LINKRES) \
-        $(APP1RES) \
-        $(APP1OBJS) \
-        $(APP1LIBS) \
-        $(APP1STDLIBS) \
-        $(APP1STDLIB) $(STDLIB1) \
-        )
-    @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP1TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP1TARGET).lst
-        $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
-        for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
-    type $(mktmp,$(MISC)\$(APP1TARGET).lst
-        $(APP1LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP1BASEX) \
-        $(APP1STACKN) \
-        -out:$@ \
-        $(STDOBJ) \
-        $(APP1LINKRES) \
-        $(APP1RES) \
-        $(APP1OBJS) \
-        $(APP1LIBS) \
-        $(APP1STDLIBS) \
-        $(APP1STDLIB) $(STDLIB1))
-        $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP1TARGETN:b)_linkobj.lst >> $(MISC)\$(APP1TARGET).lst
-        $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP1TARGET).lst $(THEN) type $(MISC)/$(APP1TARGET).lst  >> $(MISC)/$(APP1TARGET).lnk $(FI)
-        $(COMMAND_ECHO)$(SED)$(APP1LINKER) @$(MISC)\$(APP1TARGET).lnk
-.ENDIF		# "$(linkinc)" == ""
-.ENDIF		# "$(COM)" == "GCC"
-.IF "$(APP1TARGET)" == "loader"
-    $(COMMAND_ECHO)$(PERL) loader.pl $@
-    $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "WNT"
-
-.ENDIF			# "$(APP1TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP2LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP2LINKTYPEFLAG=$(APPLINK$(APP2LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP2CODETYPE)"=="C"
-APP2LINKER=$(LINKC)
-APP2STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP2LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(APP2CODETYPE)"=="C"
-APP2LINKER=$(LINK)
-APP2STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP2LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(APP2CODETYPE)"=="C"
-
-APP2RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP2RPATH)*=/ERROR:/Bad_APP2RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP2LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP2RPATH))
-.ENDIF
-
-.IF "$(APP2STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP2STACKN=$(LINKFLAGSTACK)$(APP2STACK)
-.ENDIF
-.ELSE
-APP2STACKN=
-.ENDIF
-
-.IF "$(APP2NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP2OBJS+= $(STDOBJVCL)
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)$(COM)" == "WNTGCC"
-APP2RESO=
-.IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
-APP2RESO=$(MISC)/$(APP2TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-APP2DEPN+:=$(APP2DEPNU)
-USE_APP2DEF=
-.ENDIF
-
-.IF "$(APP2TARGETN)"!=""
-
-.IF "$(APP2PRODUCTNAME)"!=""
-APP2PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\"
-.ENDIF			# "$(APP2PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP2LIBS)"!=""
-$(MISC)/$(APP2TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP2LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP2LIBS)"!="" 
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP2TARGETN:b)_linkinc.ls
-$(APP2TARGETN) : $(LINKINCTARGETS)
-.ENDIF          # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP2LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
-    $(APP2RES) \
-    $(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
-    @-$(RM) $(MISC)/$(@:b).strip
-    @echo $(STDSLO) $(APP2OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
-    $(APP2LINKTYPEFLAG) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_2.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_2.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_2.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-    @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        app $(APP2RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
-    @echo "Making:   " $(@:f).app
-    @macosx-create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
-.ELSE		# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
-    @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-    $(APP2OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_2.cmd
-    @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_2.cmd
-    @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)/$(TARGET).$(@:b)_2.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_2.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-  .ENDIF
-.ENDIF		# "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(GUI)" == "WNT"
-    @@-$(MKDIR) $(@:d:d)
-.IF "$(APP2LINKRES)" != ""
-    @@-$(RM) $(MISC)/$(APP2LINKRES:b).rc
-.IF "$(APP2ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP2ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc
-.ENDIF		# "$(APP2ICON)" != ""
-.IF "$(APP2VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc
-.ENDIF		# "$(APP2VERINFO)" != ""
-.IF "$(COM)" == "GCC"
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP2LINKRES:b).res $(MISC)/$(APP2LINKRES:b).rc
-.ELSE
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc
-.ENDIF
-.ENDIF			# "$(APP2LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
-    @cat $(APP2LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) >  $(MISC)/$(@:b)_all.res
-    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP2RESO)
-.ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-        $(APP2BASEX) $(APP2STACKN) -o $@ $(APP2OBJS) \
-        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP2RESO) \
-        `$(TYPE) /dev/null $(APP2LIBS) | sed s#$(ROUT)#$(OUT)#g` \
-        $(APP_LINKTYPE) $(APP2LIBSALCPPRT) \
-        -Wl,--start-group $(APP2STDLIBS) -Wl,--end-group $(APP2STDLIB) \
-        $(STDLIB2) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_2.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_2.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
-.ELSE	# "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
-    $(COMMAND_ECHO)$(APP2LINKER) @$(mktmp \
-        $(APP2LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP2BASEX) \
-        $(APP2STACKN) \
-        -out:$@ \
-        -map:$(MISC)/{$(subst,/,_ $(APP2TARGET)).map} \
-        $(STDOBJ) \
-        $(APP2LINKRES) \
-        $(APP2RES) \
-        $(APP2OBJS) \
-        $(APP2LIBS) \
-        $(APP2STDLIBS) \
-        $(APP2STDLIB) $(STDLIB2) \
-        )
-    @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP2TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP2TARGET).lst
-        $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
-        for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
-    type $(mktmp,$(MISC)\$(APP2TARGET).lst
-        $(APP2LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP2BASEX) \
-        $(APP2STACKN) \
-        -out:$@ \
-        $(STDOBJ) \
-        $(APP2LINKRES) \
-        $(APP2RES) \
-        $(APP2OBJS) \
-        $(APP2LIBS) \
-        $(APP2STDLIBS) \
-        $(APP2STDLIB) $(STDLIB2))
-        $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP2TARGETN:b)_linkobj.lst >> $(MISC)\$(APP2TARGET).lst
-        $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP2TARGET).lst $(THEN) type $(MISC)/$(APP2TARGET).lst  >> $(MISC)/$(APP2TARGET).lnk $(FI)
-        $(COMMAND_ECHO)$(SED)$(APP2LINKER) @$(MISC)\$(APP2TARGET).lnk
-.ENDIF		# "$(linkinc)" == ""
-.ENDIF		# "$(COM)" == "GCC"
-.IF "$(APP2TARGET)" == "loader"
-    $(COMMAND_ECHO)$(PERL) loader.pl $@
-    $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "WNT"
-
-.ENDIF			# "$(APP2TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP3LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP3LINKTYPEFLAG=$(APPLINK$(APP3LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP3CODETYPE)"=="C"
-APP3LINKER=$(LINKC)
-APP3STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP3LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(APP3CODETYPE)"=="C"
-APP3LINKER=$(LINK)
-APP3STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP3LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(APP3CODETYPE)"=="C"
-
-APP3RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP3RPATH)*=/ERROR:/Bad_APP3RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP3LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP3RPATH))
-.ENDIF
-
-.IF "$(APP3STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP3STACKN=$(LINKFLAGSTACK)$(APP3STACK)
-.ENDIF
-.ELSE
-APP3STACKN=
-.ENDIF
-
-.IF "$(APP3NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP3OBJS+= $(STDOBJVCL)
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)$(COM)" == "WNTGCC"
-APP3RESO=
-.IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
-APP3RESO=$(MISC)/$(APP3TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-APP3DEPN+:=$(APP3DEPNU)
-USE_APP3DEF=
-.ENDIF
-
-.IF "$(APP3TARGETN)"!=""
-
-.IF "$(APP3PRODUCTNAME)"!=""
-APP3PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\"
-.ENDIF			# "$(APP3PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP3LIBS)"!=""
-$(MISC)/$(APP3TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP3LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP3LIBS)"!="" 
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP3TARGETN:b)_linkinc.ls
-$(APP3TARGETN) : $(LINKINCTARGETS)
-.ENDIF          # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP3LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
-    $(APP3RES) \
-    $(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
-    @-$(RM) $(MISC)/$(@:b).strip
-    @echo $(STDSLO) $(APP3OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
-    $(APP3LINKTYPEFLAG) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_3.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_3.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_3.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-    @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        app $(APP3RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
-    @echo "Making:   " $(@:f).app
-    @macosx-create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
-.ELSE		# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
-    @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-    $(APP3OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_3.cmd
-    @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_3.cmd
-    @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)/$(TARGET).$(@:b)_3.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_3.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-  .ENDIF
-.ENDIF		# "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(GUI)" == "WNT"
-    @@-$(MKDIR) $(@:d:d)
-.IF "$(APP3LINKRES)" != ""
-    @@-$(RM) $(MISC)/$(APP3LINKRES:b).rc
-.IF "$(APP3ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP3ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc
-.ENDIF		# "$(APP3ICON)" != ""
-.IF "$(APP3VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc
-.ENDIF		# "$(APP3VERINFO)" != ""
-.IF "$(COM)" == "GCC"
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP3LINKRES:b).res $(MISC)/$(APP3LINKRES:b).rc
-.ELSE
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc
-.ENDIF
-.ENDIF			# "$(APP3LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
-    @cat $(APP3LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) >  $(MISC)/$(@:b)_all.res
-    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP3RESO)
-.ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-        $(APP3BASEX) $(APP3STACKN) -o $@ $(APP3OBJS) \
-        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP3RESO) \
-        `$(TYPE) /dev/null $(APP3LIBS) | sed s#$(ROUT)#$(OUT)#g` \
-        $(APP_LINKTYPE) $(APP3LIBSALCPPRT) \
-        -Wl,--start-group $(APP3STDLIBS) -Wl,--end-group $(APP3STDLIB) \
-        $(STDLIB3) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_3.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_3.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
-.ELSE	# "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
-    $(COMMAND_ECHO)$(APP3LINKER) @$(mktmp \
-        $(APP3LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP3BASEX) \
-        $(APP3STACKN) \
-        -out:$@ \
-        -map:$(MISC)/{$(subst,/,_ $(APP3TARGET)).map} \
-        $(STDOBJ) \
-        $(APP3LINKRES) \
-        $(APP3RES) \
-        $(APP3OBJS) \
-        $(APP3LIBS) \
-        $(APP3STDLIBS) \
-        $(APP3STDLIB) $(STDLIB3) \
-        )
-    @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP3TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP3TARGET).lst
-        $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
-        for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
-    type $(mktmp,$(MISC)\$(APP3TARGET).lst
-        $(APP3LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP3BASEX) \
-        $(APP3STACKN) \
-        -out:$@ \
-        $(STDOBJ) \
-        $(APP3LINKRES) \
-        $(APP3RES) \
-        $(APP3OBJS) \
-        $(APP3LIBS) \
-        $(APP3STDLIBS) \
-        $(APP3STDLIB) $(STDLIB3))
-        $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP3TARGETN:b)_linkobj.lst >> $(MISC)\$(APP3TARGET).lst
-        $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP3TARGET).lst $(THEN) type $(MISC)/$(APP3TARGET).lst  >> $(MISC)/$(APP3TARGET).lnk $(FI)
-        $(COMMAND_ECHO)$(SED)$(APP3LINKER) @$(MISC)\$(APP3TARGET).lnk
-.ENDIF		# "$(linkinc)" == ""
-.ENDIF		# "$(COM)" == "GCC"
-.IF "$(APP3TARGET)" == "loader"
-    $(COMMAND_ECHO)$(PERL) loader.pl $@
-    $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "WNT"
-
-.ENDIF			# "$(APP3TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP4LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP4LINKTYPEFLAG=$(APPLINK$(APP4LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP4CODETYPE)"=="C"
-APP4LINKER=$(LINKC)
-APP4STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP4LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(APP4CODETYPE)"=="C"
-APP4LINKER=$(LINK)
-APP4STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP4LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(APP4CODETYPE)"=="C"
-
-APP4RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP4RPATH)*=/ERROR:/Bad_APP4RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP4LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP4RPATH))
-.ENDIF
-
-.IF "$(APP4STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP4STACKN=$(LINKFLAGSTACK)$(APP4STACK)
-.ENDIF
-.ELSE
-APP4STACKN=
-.ENDIF
-
-.IF "$(APP4NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP4OBJS+= $(STDOBJVCL)
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)$(COM)" == "WNTGCC"
-APP4RESO=
-.IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
-APP4RESO=$(MISC)/$(APP4TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-APP4DEPN+:=$(APP4DEPNU)
-USE_APP4DEF=
-.ENDIF
-
-.IF "$(APP4TARGETN)"!=""
-
-.IF "$(APP4PRODUCTNAME)"!=""
-APP4PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\"
-.ENDIF			# "$(APP4PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP4LIBS)"!=""
-$(MISC)/$(APP4TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP4LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP4LIBS)"!="" 
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP4TARGETN:b)_linkinc.ls
-$(APP4TARGETN) : $(LINKINCTARGETS)
-.ENDIF          # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP4LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
-    $(APP4RES) \
-    $(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
-    @-$(RM) $(MISC)/$(@:b).strip
-    @echo $(STDSLO) $(APP4OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
-    $(APP4LINKTYPEFLAG) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_4.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_4.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_4.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-    @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        app $(APP4RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
-    @echo "Making:   " $(@:f).app
-    @macosx-create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
-.ELSE		# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
-    @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-    $(APP4OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_4.cmd
-    @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_4.cmd
-    @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)/$(TARGET).$(@:b)_4.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_4.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-  .ENDIF
-.ENDIF		# "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(GUI)" == "WNT"
-    @@-$(MKDIR) $(@:d:d)
-.IF "$(APP4LINKRES)" != ""
-    @@-$(RM) $(MISC)/$(APP4LINKRES:b).rc
-.IF "$(APP4ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP4ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc
-.ENDIF		# "$(APP4ICON)" != ""
-.IF "$(APP4VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc
-.ENDIF		# "$(APP4VERINFO)" != ""
-.IF "$(COM)" == "GCC"
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP4LINKRES:b).res $(MISC)/$(APP4LINKRES:b).rc
-.ELSE
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc
-.ENDIF
-.ENDIF			# "$(APP4LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
-    @cat $(APP4LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) >  $(MISC)/$(@:b)_all.res
-    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP4RESO)
-.ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-        $(APP4BASEX) $(APP4STACKN) -o $@ $(APP4OBJS) \
-        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP4RESO) \
-        `$(TYPE) /dev/null $(APP4LIBS) | sed s#$(ROUT)#$(OUT)#g` \
-        $(APP_LINKTYPE) $(APP4LIBSALCPPRT) \
-        -Wl,--start-group $(APP4STDLIBS) -Wl,--end-group $(APP4STDLIB) \
-        $(STDLIB4) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_4.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_4.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
-.ELSE	# "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
-    $(COMMAND_ECHO)$(APP4LINKER) @$(mktmp \
-        $(APP4LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP4BASEX) \
-        $(APP4STACKN) \
-        -out:$@ \
-        -map:$(MISC)/{$(subst,/,_ $(APP4TARGET)).map} \
-        $(STDOBJ) \
-        $(APP4LINKRES) \
-        $(APP4RES) \
-        $(APP4OBJS) \
-        $(APP4LIBS) \
-        $(APP4STDLIBS) \
-        $(APP4STDLIB) $(STDLIB4) \
-        )
-    @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP4TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP4TARGET).lst
-        $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
-        for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
-    type $(mktmp,$(MISC)\$(APP4TARGET).lst
-        $(APP4LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP4BASEX) \
-        $(APP4STACKN) \
-        -out:$@ \
-        $(STDOBJ) \
-        $(APP4LINKRES) \
-        $(APP4RES) \
-        $(APP4OBJS) \
-        $(APP4LIBS) \
-        $(APP4STDLIBS) \
-        $(APP4STDLIB) $(STDLIB4))
-        $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP4TARGETN:b)_linkobj.lst >> $(MISC)\$(APP4TARGET).lst
-        $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP4TARGET).lst $(THEN) type $(MISC)/$(APP4TARGET).lst  >> $(MISC)/$(APP4TARGET).lnk $(FI)
-        $(COMMAND_ECHO)$(SED)$(APP4LINKER) @$(MISC)\$(APP4TARGET).lnk
-.ENDIF		# "$(linkinc)" == ""
-.ENDIF		# "$(COM)" == "GCC"
-.IF "$(APP4TARGET)" == "loader"
-    $(COMMAND_ECHO)$(PERL) loader.pl $@
-    $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "WNT"
-
-.ENDIF			# "$(APP4TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP5LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP5LINKTYPEFLAG=$(APPLINK$(APP5LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP5CODETYPE)"=="C"
-APP5LINKER=$(LINKC)
-APP5STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP5LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(APP5CODETYPE)"=="C"
-APP5LINKER=$(LINK)
-APP5STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP5LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(APP5CODETYPE)"=="C"
-
-APP5RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP5RPATH)*=/ERROR:/Bad_APP5RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP5LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP5RPATH))
-.ENDIF
-
-.IF "$(APP5STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP5STACKN=$(LINKFLAGSTACK)$(APP5STACK)
-.ENDIF
-.ELSE
-APP5STACKN=
-.ENDIF
-
-.IF "$(APP5NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP5OBJS+= $(STDOBJVCL)
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)$(COM)" == "WNTGCC"
-APP5RESO=
-.IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
-APP5RESO=$(MISC)/$(APP5TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-APP5DEPN+:=$(APP5DEPNU)
-USE_APP5DEF=
-.ENDIF
-
-.IF "$(APP5TARGETN)"!=""
-
-.IF "$(APP5PRODUCTNAME)"!=""
-APP5PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\"
-.ENDIF			# "$(APP5PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP5LIBS)"!=""
-$(MISC)/$(APP5TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP5LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP5LIBS)"!="" 
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP5TARGETN:b)_linkinc.ls
-$(APP5TARGETN) : $(LINKINCTARGETS)
-.ENDIF          # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP5LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
-    $(APP5RES) \
-    $(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
-    @-$(RM) $(MISC)/$(@:b).strip
-    @echo $(STDSLO) $(APP5OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
-    $(APP5LINKTYPEFLAG) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_5.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_5.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_5.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-    @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        app $(APP5RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
-    @echo "Making:   " $(@:f).app
-    @macosx-create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
-.ELSE		# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
-    @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-    $(APP5OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_5.cmd
-    @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_5.cmd
-    @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)/$(TARGET).$(@:b)_5.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_5.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-  .ENDIF
-.ENDIF		# "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(GUI)" == "WNT"
-    @@-$(MKDIR) $(@:d:d)
-.IF "$(APP5LINKRES)" != ""
-    @@-$(RM) $(MISC)/$(APP5LINKRES:b).rc
-.IF "$(APP5ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP5ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc
-.ENDIF		# "$(APP5ICON)" != ""
-.IF "$(APP5VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc
-.ENDIF		# "$(APP5VERINFO)" != ""
-.IF "$(COM)" == "GCC"
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP5LINKRES:b).res $(MISC)/$(APP5LINKRES:b).rc
-.ELSE
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc
-.ENDIF
-.ENDIF			# "$(APP5LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
-    @cat $(APP5LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) >  $(MISC)/$(@:b)_all.res
-    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP5RESO)
-.ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-        $(APP5BASEX) $(APP5STACKN) -o $@ $(APP5OBJS) \
-        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP5RESO) \
-        `$(TYPE) /dev/null $(APP5LIBS) | sed s#$(ROUT)#$(OUT)#g` \
-        $(APP_LINKTYPE) $(APP5LIBSALCPPRT) \
-        -Wl,--start-group $(APP5STDLIBS) -Wl,--end-group $(APP5STDLIB) \
-        $(STDLIB5) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_5.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_5.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
-.ELSE	# "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
-    $(COMMAND_ECHO)$(APP5LINKER) @$(mktmp \
-        $(APP5LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP5BASEX) \
-        $(APP5STACKN) \
-        -out:$@ \
-        -map:$(MISC)/{$(subst,/,_ $(APP5TARGET)).map} \
-        $(STDOBJ) \
-        $(APP5LINKRES) \
-        $(APP5RES) \
-        $(APP5OBJS) \
-        $(APP5LIBS) \
-        $(APP5STDLIBS) \
-        $(APP5STDLIB) $(STDLIB5) \
-        )
-    @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP5TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP5TARGET).lst
-        $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
-        for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
-    type $(mktmp,$(MISC)\$(APP5TARGET).lst
-        $(APP5LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP5BASEX) \
-        $(APP5STACKN) \
-        -out:$@ \
-        $(STDOBJ) \
-        $(APP5LINKRES) \
-        $(APP5RES) \
-        $(APP5OBJS) \
-        $(APP5LIBS) \
-        $(APP5STDLIBS) \
-        $(APP5STDLIB) $(STDLIB5))
-        $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP5TARGETN:b)_linkobj.lst >> $(MISC)\$(APP5TARGET).lst
-        $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP5TARGET).lst $(THEN) type $(MISC)/$(APP5TARGET).lst  >> $(MISC)/$(APP5TARGET).lnk $(FI)
-        $(COMMAND_ECHO)$(SED)$(APP5LINKER) @$(MISC)\$(APP5TARGET).lnk
-.ENDIF		# "$(linkinc)" == ""
-.ENDIF		# "$(COM)" == "GCC"
-.IF "$(APP5TARGET)" == "loader"
-    $(COMMAND_ECHO)$(PERL) loader.pl $@
-    $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "WNT"
-
-.ENDIF			# "$(APP5TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP6LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP6LINKTYPEFLAG=$(APPLINK$(APP6LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP6CODETYPE)"=="C"
-APP6LINKER=$(LINKC)
-APP6STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP6LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(APP6CODETYPE)"=="C"
-APP6LINKER=$(LINK)
-APP6STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP6LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(APP6CODETYPE)"=="C"
-
-APP6RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP6RPATH)*=/ERROR:/Bad_APP6RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP6LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP6RPATH))
-.ENDIF
-
-.IF "$(APP6STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP6STACKN=$(LINKFLAGSTACK)$(APP6STACK)
-.ENDIF
-.ELSE
-APP6STACKN=
-.ENDIF
-
-.IF "$(APP6NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP6OBJS+= $(STDOBJVCL)
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)$(COM)" == "WNTGCC"
-APP6RESO=
-.IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
-APP6RESO=$(MISC)/$(APP6TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-APP6DEPN+:=$(APP6DEPNU)
-USE_APP6DEF=
-.ENDIF
-
-.IF "$(APP6TARGETN)"!=""
-
-.IF "$(APP6PRODUCTNAME)"!=""
-APP6PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\"
-.ENDIF			# "$(APP6PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP6LIBS)"!=""
-$(MISC)/$(APP6TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP6LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP6LIBS)"!="" 
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP6TARGETN:b)_linkinc.ls
-$(APP6TARGETN) : $(LINKINCTARGETS)
-.ENDIF          # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP6LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
-    $(APP6RES) \
-    $(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
-    @-$(RM) $(MISC)/$(@:b).strip
-    @echo $(STDSLO) $(APP6OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
-    $(APP6LINKTYPEFLAG) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_6.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_6.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_6.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-    @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        app $(APP6RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
-    @echo "Making:   " $(@:f).app
-    @macosx-create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
-.ELSE		# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
-    @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-    $(APP6OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_6.cmd
-    @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_6.cmd
-    @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)/$(TARGET).$(@:b)_6.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_6.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-  .ENDIF
-.ENDIF		# "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(GUI)" == "WNT"
-    @@-$(MKDIR) $(@:d:d)
-.IF "$(APP6LINKRES)" != ""
-    @@-$(RM) $(MISC)/$(APP6LINKRES:b).rc
-.IF "$(APP6ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP6ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc
-.ENDIF		# "$(APP6ICON)" != ""
-.IF "$(APP6VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc
-.ENDIF		# "$(APP6VERINFO)" != ""
-.IF "$(COM)" == "GCC"
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP6LINKRES:b).res $(MISC)/$(APP6LINKRES:b).rc
-.ELSE
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc
-.ENDIF
-.ENDIF			# "$(APP6LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
-    @cat $(APP6LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) >  $(MISC)/$(@:b)_all.res
-    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP6RESO)
-.ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-        $(APP6BASEX) $(APP6STACKN) -o $@ $(APP6OBJS) \
-        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP6RESO) \
-        `$(TYPE) /dev/null $(APP6LIBS) | sed s#$(ROUT)#$(OUT)#g` \
-        $(APP_LINKTYPE) $(APP6LIBSALCPPRT) \
-        -Wl,--start-group $(APP6STDLIBS) -Wl,--end-group $(APP6STDLIB) \
-        $(STDLIB6) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_6.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_6.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
-.ELSE	# "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
-    $(COMMAND_ECHO)$(APP6LINKER) @$(mktmp \
-        $(APP6LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP6BASEX) \
-        $(APP6STACKN) \
-        -out:$@ \
-        -map:$(MISC)/{$(subst,/,_ $(APP6TARGET)).map} \
-        $(STDOBJ) \
-        $(APP6LINKRES) \
-        $(APP6RES) \
-        $(APP6OBJS) \
-        $(APP6LIBS) \
-        $(APP6STDLIBS) \
-        $(APP6STDLIB) $(STDLIB6) \
-        )
-    @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP6TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP6TARGET).lst
-        $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
-        for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
-    type $(mktmp,$(MISC)\$(APP6TARGET).lst
-        $(APP6LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP6BASEX) \
-        $(APP6STACKN) \
-        -out:$@ \
-        $(STDOBJ) \
-        $(APP6LINKRES) \
-        $(APP6RES) \
-        $(APP6OBJS) \
-        $(APP6LIBS) \
-        $(APP6STDLIBS) \
-        $(APP6STDLIB) $(STDLIB6))
-        $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP6TARGETN:b)_linkobj.lst >> $(MISC)\$(APP6TARGET).lst
-        $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP6TARGET).lst $(THEN) type $(MISC)/$(APP6TARGET).lst  >> $(MISC)/$(APP6TARGET).lnk $(FI)
-        $(COMMAND_ECHO)$(SED)$(APP6LINKER) @$(MISC)\$(APP6TARGET).lnk
-.ENDIF		# "$(linkinc)" == ""
-.ENDIF		# "$(COM)" == "GCC"
-.IF "$(APP6TARGET)" == "loader"
-    $(COMMAND_ECHO)$(PERL) loader.pl $@
-    $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "WNT"
-
-.ENDIF			# "$(APP6TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP7LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP7LINKTYPEFLAG=$(APPLINK$(APP7LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP7CODETYPE)"=="C"
-APP7LINKER=$(LINKC)
-APP7STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP7LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(APP7CODETYPE)"=="C"
-APP7LINKER=$(LINK)
-APP7STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP7LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(APP7CODETYPE)"=="C"
-
-APP7RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP7RPATH)*=/ERROR:/Bad_APP7RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP7LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP7RPATH))
-.ENDIF
-
-.IF "$(APP7STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP7STACKN=$(LINKFLAGSTACK)$(APP7STACK)
-.ENDIF
-.ELSE
-APP7STACKN=
-.ENDIF
-
-.IF "$(APP7NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP7OBJS+= $(STDOBJVCL)
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)$(COM)" == "WNTGCC"
-APP7RESO=
-.IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
-APP7RESO=$(MISC)/$(APP7TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-APP7DEPN+:=$(APP7DEPNU)
-USE_APP7DEF=
-.ENDIF
-
-.IF "$(APP7TARGETN)"!=""
-
-.IF "$(APP7PRODUCTNAME)"!=""
-APP7PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\"
-.ENDIF			# "$(APP7PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP7LIBS)"!=""
-$(MISC)/$(APP7TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP7LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP7LIBS)"!="" 
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP7TARGETN:b)_linkinc.ls
-$(APP7TARGETN) : $(LINKINCTARGETS)
-.ENDIF          # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP7LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
-    $(APP7RES) \
-    $(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
-    @-$(RM) $(MISC)/$(@:b).strip
-    @echo $(STDSLO) $(APP7OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
-    $(APP7LINKTYPEFLAG) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_7.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_7.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_7.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-    @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        app $(APP7RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
-    @echo "Making:   " $(@:f).app
-    @macosx-create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
-.ELSE		# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
-    @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-    $(APP7OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_7.cmd
-    @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_7.cmd
-    @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)/$(TARGET).$(@:b)_7.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_7.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-  .ENDIF
-.ENDIF		# "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(GUI)" == "WNT"
-    @@-$(MKDIR) $(@:d:d)
-.IF "$(APP7LINKRES)" != ""
-    @@-$(RM) $(MISC)/$(APP7LINKRES:b).rc
-.IF "$(APP7ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP7ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc
-.ENDIF		# "$(APP7ICON)" != ""
-.IF "$(APP7VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc
-.ENDIF		# "$(APP7VERINFO)" != ""
-.IF "$(COM)" == "GCC"
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP7LINKRES:b).res $(MISC)/$(APP7LINKRES:b).rc
-.ELSE
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc
-.ENDIF
-.ENDIF			# "$(APP7LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
-    @cat $(APP7LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) >  $(MISC)/$(@:b)_all.res
-    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP7RESO)
-.ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-        $(APP7BASEX) $(APP7STACKN) -o $@ $(APP7OBJS) \
-        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP7RESO) \
-        `$(TYPE) /dev/null $(APP7LIBS) | sed s#$(ROUT)#$(OUT)#g` \
-        $(APP_LINKTYPE) $(APP7LIBSALCPPRT) \
-        -Wl,--start-group $(APP7STDLIBS) -Wl,--end-group $(APP7STDLIB) \
-        $(STDLIB7) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_7.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_7.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
-.ELSE	# "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
-    $(COMMAND_ECHO)$(APP7LINKER) @$(mktmp \
-        $(APP7LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP7BASEX) \
-        $(APP7STACKN) \
-        -out:$@ \
-        -map:$(MISC)/{$(subst,/,_ $(APP7TARGET)).map} \
-        $(STDOBJ) \
-        $(APP7LINKRES) \
-        $(APP7RES) \
-        $(APP7OBJS) \
-        $(APP7LIBS) \
-        $(APP7STDLIBS) \
-        $(APP7STDLIB) $(STDLIB7) \
-        )
-    @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP7TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP7TARGET).lst
-        $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
-        for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
-    type $(mktmp,$(MISC)\$(APP7TARGET).lst
-        $(APP7LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP7BASEX) \
-        $(APP7STACKN) \
-        -out:$@ \
-        $(STDOBJ) \
-        $(APP7LINKRES) \
-        $(APP7RES) \
-        $(APP7OBJS) \
-        $(APP7LIBS) \
-        $(APP7STDLIBS) \
-        $(APP7STDLIB) $(STDLIB7))
-        $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP7TARGETN:b)_linkobj.lst >> $(MISC)\$(APP7TARGET).lst
-        $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP7TARGET).lst $(THEN) type $(MISC)/$(APP7TARGET).lst  >> $(MISC)/$(APP7TARGET).lnk $(FI)
-        $(COMMAND_ECHO)$(SED)$(APP7LINKER) @$(MISC)\$(APP7TARGET).lnk
-.ENDIF		# "$(linkinc)" == ""
-.ENDIF		# "$(COM)" == "GCC"
-.IF "$(APP7TARGET)" == "loader"
-    $(COMMAND_ECHO)$(PERL) loader.pl $@
-    $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "WNT"
-
-.ENDIF			# "$(APP7TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP8LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP8LINKTYPEFLAG=$(APPLINK$(APP8LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP8CODETYPE)"=="C"
-APP8LINKER=$(LINKC)
-APP8STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP8LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(APP8CODETYPE)"=="C"
-APP8LINKER=$(LINK)
-APP8STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP8LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(APP8CODETYPE)"=="C"
-
-APP8RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP8RPATH)*=/ERROR:/Bad_APP8RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP8LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP8RPATH))
-.ENDIF
-
-.IF "$(APP8STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP8STACKN=$(LINKFLAGSTACK)$(APP8STACK)
-.ENDIF
-.ELSE
-APP8STACKN=
-.ENDIF
-
-.IF "$(APP8NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP8OBJS+= $(STDOBJVCL)
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)$(COM)" == "WNTGCC"
-APP8RESO=
-.IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
-APP8RESO=$(MISC)/$(APP8TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-APP8DEPN+:=$(APP8DEPNU)
-USE_APP8DEF=
-.ENDIF
-
-.IF "$(APP8TARGETN)"!=""
-
-.IF "$(APP8PRODUCTNAME)"!=""
-APP8PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\"
-.ENDIF			# "$(APP8PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP8LIBS)"!=""
-$(MISC)/$(APP8TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP8LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP8LIBS)"!="" 
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP8TARGETN:b)_linkinc.ls
-$(APP8TARGETN) : $(LINKINCTARGETS)
-.ENDIF          # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP8LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
-    $(APP8RES) \
-    $(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
-    @-$(RM) $(MISC)/$(@:b).strip
-    @echo $(STDSLO) $(APP8OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
-    $(APP8LINKTYPEFLAG) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_8.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_8.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_8.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-    @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        app $(APP8RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
-    @echo "Making:   " $(@:f).app
-    @macosx-create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
-.ELSE		# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
-    @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-    $(APP8OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_8.cmd
-    @cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_8.cmd
-    @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)/$(TARGET).$(@:b)_8.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_8.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-  .ENDIF
-.ENDIF		# "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(GUI)" == "WNT"
-    @@-$(MKDIR) $(@:d:d)
-.IF "$(APP8LINKRES)" != ""
-    @@-$(RM) $(MISC)/$(APP8LINKRES:b).rc
-.IF "$(APP8ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP8ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc
-.ENDIF		# "$(APP8ICON)" != ""
-.IF "$(APP8VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc
-.ENDIF		# "$(APP8VERINFO)" != ""
-.IF "$(COM)" == "GCC"
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP8LINKRES:b).res $(MISC)/$(APP8LINKRES:b).rc
-.ELSE
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc
-.ENDIF
-.ENDIF			# "$(APP8LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
-    @cat $(APP8LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) >  $(MISC)/$(@:b)_all.res
-    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP8RESO)
-.ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-        $(APP8BASEX) $(APP8STACKN) -o $@ $(APP8OBJS) \
-        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP8RESO) \
-        `$(TYPE) /dev/null $(APP8LIBS) | sed s#$(ROUT)#$(OUT)#g` \
-        $(APP_LINKTYPE) $(APP8LIBSALCPPRT) \
-        -Wl,--start-group $(APP8STDLIBS) -Wl,--end-group $(APP8STDLIB) \
-        $(STDLIB8) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_8.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_8.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
-.ELSE	# "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
-    $(COMMAND_ECHO)$(APP8LINKER) @$(mktmp \
-        $(APP8LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP8BASEX) \
-        $(APP8STACKN) \
-        -out:$@ \
-        -map:$(MISC)/{$(subst,/,_ $(APP8TARGET)).map} \
-        $(STDOBJ) \
-        $(APP8LINKRES) \
-        $(APP8RES) \
-        $(APP8OBJS) \
-        $(APP8LIBS) \
-        $(APP8STDLIBS) \
-        $(APP8STDLIB) $(STDLIB8) \
-        )
-    @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP8TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP8TARGET).lst
-        $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
-        for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
-    type $(mktmp,$(MISC)\$(APP8TARGET).lst
-        $(APP8LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP8BASEX) \
-        $(APP8STACKN) \
-        -out:$@ \
-        $(STDOBJ) \
-        $(APP8LINKRES) \
-        $(APP8RES) \
-        $(APP8OBJS) \
-        $(APP8LIBS) \
-        $(APP8STDLIBS) \
-        $(APP8STDLIB) $(STDLIB8))
-        $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP8TARGETN:b)_linkobj.lst >> $(MISC)\$(APP8TARGET).lst
-        $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP8TARGET).lst $(THEN) type $(MISC)/$(APP8TARGET).lst  >> $(MISC)/$(APP8TARGET).lnk $(FI)
-        $(COMMAND_ECHO)$(SED)$(APP8LINKER) @$(MISC)\$(APP8TARGET).lnk
-.ENDIF		# "$(linkinc)" == ""
-.ENDIF		# "$(COM)" == "GCC"
-.IF "$(APP8TARGET)" == "loader"
-    $(COMMAND_ECHO)$(PERL) loader.pl $@
-    $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "WNT"
-
-.ENDIF			# "$(APP8TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP9LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP9LINKTYPEFLAG=$(APPLINK$(APP9LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP9CODETYPE)"=="C"
-APP9LINKER=$(LINKC)
-APP9STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP9LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(APP9CODETYPE)"=="C"
-APP9LINKER=$(LINK)
-APP9STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP9LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(APP9CODETYPE)"=="C"
-
-APP9RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP9RPATH)*=/ERROR:/Bad_APP9RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP9LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP9RPATH))
-.ENDIF
-
-.IF "$(APP9STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP9STACKN=$(LINKFLAGSTACK)$(APP9STACK)
-.ENDIF
-.ELSE
-APP9STACKN=
-.ENDIF
-
-.IF "$(APP9NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP9OBJS+= $(STDOBJVCL)
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)$(COM)" == "WNTGCC"
-APP9RESO=
-.IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
-APP9RESO=$(MISC)/$(APP9TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-APP9DEPN+:=$(APP9DEPNU)
-USE_APP9DEF=
-.ENDIF
-
-.IF "$(APP9TARGETN)"!=""
-
-.IF "$(APP9PRODUCTNAME)"!=""
-APP9PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\"
-.ENDIF			# "$(APP9PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP9LIBS)"!=""
-$(MISC)/$(APP9TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP9LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP9LIBS)"!="" 
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP9TARGETN:b)_linkinc.ls
-$(APP9TARGETN) : $(LINKINCTARGETS)
-.ENDIF          # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP9LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
-    $(APP9RES) \
-    $(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
-    @-$(RM) $(MISC)/$(@:b).strip
-    @echo $(STDSLO) $(APP9OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
-    $(APP9LINKTYPEFLAG) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_9.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_9.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_9.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-    @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        app $(APP9RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
-    @echo "Making:   " $(@:f).app
-    @macosx-create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
-.ELSE		# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
-    @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-    $(APP9OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_9.cmd
-    @cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_9.cmd
-    @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)/$(TARGET).$(@:b)_9.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_9.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-  .ENDIF
-.ENDIF		# "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(GUI)" == "WNT"
-    @@-$(MKDIR) $(@:d:d)
-.IF "$(APP9LINKRES)" != ""
-    @@-$(RM) $(MISC)/$(APP9LINKRES:b).rc
-.IF "$(APP9ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP9ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc
-.ENDIF		# "$(APP9ICON)" != ""
-.IF "$(APP9VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc
-.ENDIF		# "$(APP9VERINFO)" != ""
-.IF "$(COM)" == "GCC"
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP9LINKRES:b).res $(MISC)/$(APP9LINKRES:b).rc
-.ELSE
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc
-.ENDIF
-.ENDIF			# "$(APP9LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
-    @cat $(APP9LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) >  $(MISC)/$(@:b)_all.res
-    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP9RESO)
-.ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-        $(APP9BASEX) $(APP9STACKN) -o $@ $(APP9OBJS) \
-        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP9RESO) \
-        `$(TYPE) /dev/null $(APP9LIBS) | sed s#$(ROUT)#$(OUT)#g` \
-        $(APP_LINKTYPE) $(APP9LIBSALCPPRT) \
-        -Wl,--start-group $(APP9STDLIBS) -Wl,--end-group $(APP9STDLIB) \
-        $(STDLIB9) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_9.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_9.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
-.ELSE	# "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
-    $(COMMAND_ECHO)$(APP9LINKER) @$(mktmp \
-        $(APP9LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP9BASEX) \
-        $(APP9STACKN) \
-        -out:$@ \
-        -map:$(MISC)/{$(subst,/,_ $(APP9TARGET)).map} \
-        $(STDOBJ) \
-        $(APP9LINKRES) \
-        $(APP9RES) \
-        $(APP9OBJS) \
-        $(APP9LIBS) \
-        $(APP9STDLIBS) \
-        $(APP9STDLIB) $(STDLIB9) \
-        )
-    @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP9TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP9TARGET).lst
-        $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
-        for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
-    type $(mktmp,$(MISC)\$(APP9TARGET).lst
-        $(APP9LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP9BASEX) \
-        $(APP9STACKN) \
-        -out:$@ \
-        $(STDOBJ) \
-        $(APP9LINKRES) \
-        $(APP9RES) \
-        $(APP9OBJS) \
-        $(APP9LIBS) \
-        $(APP9STDLIBS) \
-        $(APP9STDLIB) $(STDLIB9))
-        $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP9TARGETN:b)_linkobj.lst >> $(MISC)\$(APP9TARGET).lst
-        $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP9TARGET).lst $(THEN) type $(MISC)/$(APP9TARGET).lst  >> $(MISC)/$(APP9TARGET).lnk $(FI)
-        $(COMMAND_ECHO)$(SED)$(APP9LINKER) @$(MISC)\$(APP9TARGET).lnk
-.ENDIF		# "$(linkinc)" == ""
-.ENDIF		# "$(COM)" == "GCC"
-.IF "$(APP9TARGET)" == "loader"
-    $(COMMAND_ECHO)$(PERL) loader.pl $@
-    $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "WNT"
-
-.ENDIF			# "$(APP9TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP10LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP10LINKTYPEFLAG=$(APPLINK$(APP10LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP10CODETYPE)"=="C"
-APP10LINKER=$(LINKC)
-APP10STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP10LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(APP10CODETYPE)"=="C"
-APP10LINKER=$(LINK)
-APP10STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP10LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(APP10CODETYPE)"=="C"
-
-APP10RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP10RPATH)*=/ERROR:/Bad_APP10RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP10LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP10RPATH))
-.ENDIF
-
-.IF "$(APP10STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP10STACKN=$(LINKFLAGSTACK)$(APP10STACK)
-.ENDIF
-.ELSE
-APP10STACKN=
-.ENDIF
-
-.IF "$(APP10NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP10OBJS+= $(STDOBJVCL)
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)$(COM)" == "WNTGCC"
-APP10RESO=
-.IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != ""
-APP10RESO=$(MISC)/$(APP10TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-APP10DEPN+:=$(APP10DEPNU)
-USE_APP10DEF=
-.ENDIF
-
-.IF "$(APP10TARGETN)"!=""
-
-.IF "$(APP10PRODUCTNAME)"!=""
-APP10PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\"
-.ENDIF			# "$(APP10PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP10LIBS)"!=""
-$(MISC)/$(APP10TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP10LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP10LIBS)"!="" 
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP10TARGETN:b)_linkinc.ls
-$(APP10TARGETN) : $(LINKINCTARGETS)
-.ENDIF          # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP10LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
-    $(APP10RES) \
-    $(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
-    @-$(RM) $(MISC)/$(@:b).strip
-    @echo $(STDSLO) $(APP10OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
-    $(APP10LINKTYPEFLAG) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_10.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_10.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_10.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_10.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-    @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        app $(APP10RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
-    @echo "Making:   " $(@:f).app
-    @macosx-create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
-.ELSE		# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
-    @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-    $(APP10OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_10.cmd
-    @cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_10.cmd
-    @echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)/$(TARGET).$(@:b)_10.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_10.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-  .ENDIF
-.ENDIF		# "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(GUI)" == "WNT"
-    @@-$(MKDIR) $(@:d:d)
-.IF "$(APP10LINKRES)" != ""
-    @@-$(RM) $(MISC)/$(APP10LINKRES:b).rc
-.IF "$(APP10ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP10ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP10LINKRES:b).rc
-.ENDIF		# "$(APP10ICON)" != ""
-.IF "$(APP10VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP10LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP10VERINFO)$(EMQ)" >> $(MISC)/$(APP10LINKRES:b).rc
-.ENDIF		# "$(APP10VERINFO)" != ""
-.IF "$(COM)" == "GCC"
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP10LINKRES:b).res $(MISC)/$(APP10LINKRES:b).rc
-.ELSE
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc
-.ENDIF
-.ENDIF			# "$(APP10LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != ""
-    @cat $(APP10LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) >  $(MISC)/$(@:b)_all.res
-    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP10RESO)
-.ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-        $(APP10BASEX) $(APP10STACKN) -o $@ $(APP10OBJS) \
-        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP10RESO) \
-        `$(TYPE) /dev/null $(APP10LIBS) | sed s#$(ROUT)#$(OUT)#g` \
-        $(APP_LINKTYPE) $(APP10LIBSALCPPRT) \
-        -Wl,--start-group $(APP10STDLIBS) -Wl,--end-group $(APP10STDLIB) \
-        $(STDLIB10) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_10.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_10.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
-.ELSE	# "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
-    $(COMMAND_ECHO)$(APP10LINKER) @$(mktmp \
-        $(APP10LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP10BASEX) \
-        $(APP10STACKN) \
-        -out:$@ \
-        -map:$(MISC)/{$(subst,/,_ $(APP10TARGET)).map} \
-        $(STDOBJ) \
-        $(APP10LINKRES) \
-        $(APP10RES) \
-        $(APP10OBJS) \
-        $(APP10LIBS) \
-        $(APP10STDLIBS) \
-        $(APP10STDLIB) $(STDLIB10) \
-        )
-    @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP10TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP10TARGET).lst
-        $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
-        for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
-    type $(mktmp,$(MISC)\$(APP10TARGET).lst
-        $(APP10LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP10BASEX) \
-        $(APP10STACKN) \
-        -out:$@ \
-        $(STDOBJ) \
-        $(APP10LINKRES) \
-        $(APP10RES) \
-        $(APP10OBJS) \
-        $(APP10LIBS) \
-        $(APP10STDLIBS) \
-        $(APP10STDLIB) $(STDLIB10))
-        $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP10TARGETN:b)_linkobj.lst >> $(MISC)\$(APP10TARGET).lst
-        $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP10TARGET).lst $(THEN) type $(MISC)/$(APP10TARGET).lst  >> $(MISC)/$(APP10TARGET).lnk $(FI)
-        $(COMMAND_ECHO)$(SED)$(APP10LINKER) @$(MISC)\$(APP10TARGET).lnk
-.ENDIF		# "$(linkinc)" == ""
-.ENDIF		# "$(COM)" == "GCC"
-.IF "$(APP10TARGET)" == "loader"
-    $(COMMAND_ECHO)$(PERL) loader.pl $@
-    $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "WNT"
-
-.ENDIF			# "$(APP10TARGETN)"!=""
-
-
-# Instruction for linking
diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
deleted file mode 100644
index b0b35d8d5..000000000
--- a/solenv/inc/_tg_def.mk
+++ /dev/null
@@ -1,1690 +0,0 @@
-# unroll begin
-
-.IF "$(DEF1TARGETN)"!=""
-
-#to make intuitiv naming work
-.IF "$(DEF1LIBNAME)"!=""
-DEFLIB1NAME*=$(DEF1LIBNAME)
-.ENDIF			# "$(DEF1LIBNAME)"!=""
-
-.IF "$(DEFLIB1NAME)"!=""
-DEF1DEPN+=$(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib)
-.ENDIF
-
-.IF "$(SHL1VERSIONMAP)"!=""
-.IF "$(DEF1EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
-DEF1EXPORTFILE=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp
-.IF "$(COM)"=="GCC"
-$(DEF1EXPORTFILE) : $(SHL1OBJS) $(SHL1LIBS)
-.ENDIF # .IF "$(COM)"=="GCC"
-
-$(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
-    $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
-    $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)$(NM) -gP $(SHL1OBJS) \
-        `$(TYPE) /dev/null $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
-.ENDIF # .IF "$(COM)"=="GCC"
-
-.ENDIF			# "$(GUI)"=="WNT"
-
-.ENDIF			# "$(DEF1EXPORTFILE)"==""
-.ENDIF			# "$(SHL1VERSIONMAP)"!=""
-
-.IF "$(GUI)"=="WNT"
-
-DEF1FILTER=$(SOLARENV)/inc/dummy.flt
-
-RMHACK1:=$(RM)
-
-.IF "$(DEF1CEXP)"!=""
-EXPORT_ALL_SWITCH=-A $(DEF1CEXP)
-.ENDIF
-
-.IF "$(link_always)"==""
-$(DEF1TARGETN) : \
-        $(DEF1DEPN) \
-        $(DEF1EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF1TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    $(COMMAND_ECHO)-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL1TARGETN:f)$(EMQ)" 								 >$@.tmpfile
-.IF "$(COM)"!="GCC"
-    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
-.ENDIF
-    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
-.ENDIF
-.IF "$(DEFLIB1NAME)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL1TARGET).exp
-    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL1TARGET).exp --export-all-symbols \
-        `$(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
-    $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL1TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL1TARGET).exp
-.ELSE
-.IF "$(SHL1USE_EXPORTS)"==""
-    $(COMMAND_ECHO)-$(RMHACK1) $(MISC)/$(SHL1TARGET).exp
-    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL1TARGET).exp $(SLB)/$(DEFLIB1NAME).lib
-    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL1TARGET).flt $(MISC)/$(SHL1TARGET).exp			   >>$@.tmpfile
-    $(COMMAND_ECHO)$(RMHACK1) $(MISC)/$(SHL1TARGET).exp
-.ELSE			# "$(SHL1USE_EXPORTS)"==""
-    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL1TARGET).direct
-    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF1FILTER) $(MISC)/$(SHL1TARGET).direct >>$@.tmpfile
-.ENDIF			# "$(SHL1USE_EXPORTS)"==""
-.ENDIF
-.ENDIF				# "$(DEFLIB1NAME)"!=""
-.IF "$(DEF1EXPORT1)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT2)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT3)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT4)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT5)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT6)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT7)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT8)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT9)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT10)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT11)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT12)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT13)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT14)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT15)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT16)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT17)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT18)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT19)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORT20)"!=""
-    $(COMMAND_ECHO)echo $(DEF1EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORTFILE)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(TYPE) $(DEF1EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
-.ELSE
-    $(COMMAND_ECHO)$(TYPE) $(DEF1EXPORTFILE) >> $@.tmpfile
-.ENDIF
-.ENDIF
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="UNX"
-$(DEF1TARGETN): \
-        $(DEF1DEPN) \
-        $(DEF1EXPORTFILE)
-    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
-.ENDIF
-.ENDIF			# "$(DEF1TARGETN)"!=""
-
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(DEF2TARGETN)"!=""
-
-#to make intuitiv naming work
-.IF "$(DEF2LIBNAME)"!=""
-DEFLIB2NAME*=$(DEF2LIBNAME)
-.ENDIF			# "$(DEF2LIBNAME)"!=""
-
-.IF "$(DEFLIB2NAME)"!=""
-DEF2DEPN+=$(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib)
-.ENDIF
-
-.IF "$(SHL2VERSIONMAP)"!=""
-.IF "$(DEF2EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
-DEF2EXPORTFILE=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp
-.IF "$(COM)"=="GCC"
-$(DEF2EXPORTFILE) : $(SHL2OBJS) $(SHL2LIBS)
-.ENDIF # .IF "$(COM)"=="GCC"
-
-$(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
-    $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
-    $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)$(NM) -gP $(SHL2OBJS) \
-        `$(TYPE) /dev/null $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
-.ENDIF # .IF "$(COM)"=="GCC"
-
-.ENDIF			# "$(GUI)"=="WNT"
-
-.ENDIF			# "$(DEF2EXPORTFILE)"==""
-.ENDIF			# "$(SHL2VERSIONMAP)"!=""
-
-.IF "$(GUI)"=="WNT"
-
-DEF2FILTER=$(SOLARENV)/inc/dummy.flt
-
-RMHACK2:=$(RM)
-
-.IF "$(DEF2CEXP)"!=""
-EXPORT_ALL_SWITCH=-A $(DEF2CEXP)
-.ENDIF
-
-.IF "$(link_always)"==""
-$(DEF2TARGETN) : \
-        $(DEF2DEPN) \
-        $(DEF2EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF2TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    $(COMMAND_ECHO)-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL2TARGETN:f)$(EMQ)" 								 >$@.tmpfile
-.IF "$(COM)"!="GCC"
-    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
-.ENDIF
-    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
-.ENDIF
-.IF "$(DEFLIB2NAME)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL2TARGET).exp
-    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL2TARGET).exp --export-all-symbols \
-        `$(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
-    $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL2TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL2TARGET).exp
-.ELSE
-.IF "$(SHL2USE_EXPORTS)"==""
-    $(COMMAND_ECHO)-$(RMHACK2) $(MISC)/$(SHL2TARGET).exp
-    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL2TARGET).exp $(SLB)/$(DEFLIB2NAME).lib
-    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL2TARGET).flt $(MISC)/$(SHL2TARGET).exp			   >>$@.tmpfile
-    $(COMMAND_ECHO)$(RMHACK2) $(MISC)/$(SHL2TARGET).exp
-.ELSE			# "$(SHL2USE_EXPORTS)"==""
-    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL2TARGET).direct
-    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF2FILTER) $(MISC)/$(SHL2TARGET).direct >>$@.tmpfile
-.ENDIF			# "$(SHL2USE_EXPORTS)"==""
-.ENDIF
-.ENDIF				# "$(DEFLIB2NAME)"!=""
-.IF "$(DEF2EXPORT1)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT2)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT3)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT4)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT5)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT6)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT7)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT8)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT9)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT10)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT11)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT12)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT13)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT14)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT15)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT16)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT17)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT18)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT19)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORT20)"!=""
-    $(COMMAND_ECHO)echo $(DEF2EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORTFILE)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(TYPE) $(DEF2EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
-.ELSE
-    $(COMMAND_ECHO)$(TYPE) $(DEF2EXPORTFILE) >> $@.tmpfile
-.ENDIF
-.ENDIF
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="UNX"
-$(DEF2TARGETN): \
-        $(DEF2DEPN) \
-        $(DEF2EXPORTFILE)
-    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
-.ENDIF
-.ENDIF			# "$(DEF2TARGETN)"!=""
-
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(DEF3TARGETN)"!=""
-
-#to make intuitiv naming work
-.IF "$(DEF3LIBNAME)"!=""
-DEFLIB3NAME*=$(DEF3LIBNAME)
-.ENDIF			# "$(DEF3LIBNAME)"!=""
-
-.IF "$(DEFLIB3NAME)"!=""
-DEF3DEPN+=$(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib)
-.ENDIF
-
-.IF "$(SHL3VERSIONMAP)"!=""
-.IF "$(DEF3EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
-DEF3EXPORTFILE=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp
-.IF "$(COM)"=="GCC"
-$(DEF3EXPORTFILE) : $(SHL3OBJS) $(SHL3LIBS)
-.ENDIF # .IF "$(COM)"=="GCC"
-
-$(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
-    $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
-    $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)$(NM) -gP $(SHL3OBJS) \
-        `$(TYPE) /dev/null $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
-.ENDIF # .IF "$(COM)"=="GCC"
-
-.ENDIF			# "$(GUI)"=="WNT"
-
-.ENDIF			# "$(DEF3EXPORTFILE)"==""
-.ENDIF			# "$(SHL3VERSIONMAP)"!=""
-
-.IF "$(GUI)"=="WNT"
-
-DEF3FILTER=$(SOLARENV)/inc/dummy.flt
-
-RMHACK3:=$(RM)
-
-.IF "$(DEF3CEXP)"!=""
-EXPORT_ALL_SWITCH=-A $(DEF3CEXP)
-.ENDIF
-
-.IF "$(link_always)"==""
-$(DEF3TARGETN) : \
-        $(DEF3DEPN) \
-        $(DEF3EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF3TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    $(COMMAND_ECHO)-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL3TARGETN:f)$(EMQ)" 								 >$@.tmpfile
-.IF "$(COM)"!="GCC"
-    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
-.ENDIF
-    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
-.ENDIF
-.IF "$(DEFLIB3NAME)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL3TARGET).exp
-    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL3TARGET).exp --export-all-symbols \
-        `$(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
-    $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL3TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL3TARGET).exp
-.ELSE
-.IF "$(SHL3USE_EXPORTS)"==""
-    $(COMMAND_ECHO)-$(RMHACK3) $(MISC)/$(SHL3TARGET).exp
-    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL3TARGET).exp $(SLB)/$(DEFLIB3NAME).lib
-    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL3TARGET).flt $(MISC)/$(SHL3TARGET).exp			   >>$@.tmpfile
-    $(COMMAND_ECHO)$(RMHACK3) $(MISC)/$(SHL3TARGET).exp
-.ELSE			# "$(SHL3USE_EXPORTS)"==""
-    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL3TARGET).direct
-    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF3FILTER) $(MISC)/$(SHL3TARGET).direct >>$@.tmpfile
-.ENDIF			# "$(SHL3USE_EXPORTS)"==""
-.ENDIF
-.ENDIF				# "$(DEFLIB3NAME)"!=""
-.IF "$(DEF3EXPORT1)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT2)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT3)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT4)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT5)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT6)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT7)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT8)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT9)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT10)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT11)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT12)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT13)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT14)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT15)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT16)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT17)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT18)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT19)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORT20)"!=""
-    $(COMMAND_ECHO)echo $(DEF3EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF3EXPORTFILE)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(TYPE) $(DEF3EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
-.ELSE
-    $(COMMAND_ECHO)$(TYPE) $(DEF3EXPORTFILE) >> $@.tmpfile
-.ENDIF
-.ENDIF
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="UNX"
-$(DEF3TARGETN): \
-        $(DEF3DEPN) \
-        $(DEF3EXPORTFILE)
-    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
-.ENDIF
-.ENDIF			# "$(DEF3TARGETN)"!=""
-
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(DEF4TARGETN)"!=""
-
-#to make intuitiv naming work
-.IF "$(DEF4LIBNAME)"!=""
-DEFLIB4NAME*=$(DEF4LIBNAME)
-.ENDIF			# "$(DEF4LIBNAME)"!=""
-
-.IF "$(DEFLIB4NAME)"!=""
-DEF4DEPN+=$(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib)
-.ENDIF
-
-.IF "$(SHL4VERSIONMAP)"!=""
-.IF "$(DEF4EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
-DEF4EXPORTFILE=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp
-.IF "$(COM)"=="GCC"
-$(DEF4EXPORTFILE) : $(SHL4OBJS) $(SHL4LIBS)
-.ENDIF # .IF "$(COM)"=="GCC"
-
-$(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
-    $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
-    $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)$(NM) -gP $(SHL4OBJS) \
-        `$(TYPE) /dev/null $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
-.ENDIF # .IF "$(COM)"=="GCC"
-
-.ENDIF			# "$(GUI)"=="WNT"
-
-.ENDIF			# "$(DEF4EXPORTFILE)"==""
-.ENDIF			# "$(SHL4VERSIONMAP)"!=""
-
-.IF "$(GUI)"=="WNT"
-
-DEF4FILTER=$(SOLARENV)/inc/dummy.flt
-
-RMHACK4:=$(RM)
-
-.IF "$(DEF4CEXP)"!=""
-EXPORT_ALL_SWITCH=-A $(DEF4CEXP)
-.ENDIF
-
-.IF "$(link_always)"==""
-$(DEF4TARGETN) : \
-        $(DEF4DEPN) \
-        $(DEF4EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF4TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    $(COMMAND_ECHO)-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL4TARGETN:f)$(EMQ)" 								 >$@.tmpfile
-.IF "$(COM)"!="GCC"
-    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
-.ENDIF
-    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
-.ENDIF
-.IF "$(DEFLIB4NAME)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL4TARGET).exp
-    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL4TARGET).exp --export-all-symbols \
-        `$(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
-    $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL4TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL4TARGET).exp
-.ELSE
-.IF "$(SHL4USE_EXPORTS)"==""
-    $(COMMAND_ECHO)-$(RMHACK4) $(MISC)/$(SHL4TARGET).exp
-    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL4TARGET).exp $(SLB)/$(DEFLIB4NAME).lib
-    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL4TARGET).flt $(MISC)/$(SHL4TARGET).exp			   >>$@.tmpfile
-    $(COMMAND_ECHO)$(RMHACK4) $(MISC)/$(SHL4TARGET).exp
-.ELSE			# "$(SHL4USE_EXPORTS)"==""
-    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL4TARGET).direct
-    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF4FILTER) $(MISC)/$(SHL4TARGET).direct >>$@.tmpfile
-.ENDIF			# "$(SHL4USE_EXPORTS)"==""
-.ENDIF
-.ENDIF				# "$(DEFLIB4NAME)"!=""
-.IF "$(DEF4EXPORT1)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT2)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT3)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT4)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT5)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT6)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT7)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT8)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT9)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT10)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT11)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT12)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT13)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT14)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT15)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT16)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT17)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT18)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT19)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORT20)"!=""
-    $(COMMAND_ECHO)echo $(DEF4EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF4EXPORTFILE)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(TYPE) $(DEF4EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
-.ELSE
-    $(COMMAND_ECHO)$(TYPE) $(DEF4EXPORTFILE) >> $@.tmpfile
-.ENDIF
-.ENDIF
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="UNX"
-$(DEF4TARGETN): \
-        $(DEF4DEPN) \
-        $(DEF4EXPORTFILE)
-    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
-.ENDIF
-.ENDIF			# "$(DEF4TARGETN)"!=""
-
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(DEF5TARGETN)"!=""
-
-#to make intuitiv naming work
-.IF "$(DEF5LIBNAME)"!=""
-DEFLIB5NAME*=$(DEF5LIBNAME)
-.ENDIF			# "$(DEF5LIBNAME)"!=""
-
-.IF "$(DEFLIB5NAME)"!=""
-DEF5DEPN+=$(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib)
-.ENDIF
-
-.IF "$(SHL5VERSIONMAP)"!=""
-.IF "$(DEF5EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
-DEF5EXPORTFILE=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp
-.IF "$(COM)"=="GCC"
-$(DEF5EXPORTFILE) : $(SHL5OBJS) $(SHL5LIBS)
-.ENDIF # .IF "$(COM)"=="GCC"
-
-$(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
-    $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
-    $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)$(NM) -gP $(SHL5OBJS) \
-        `$(TYPE) /dev/null $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
-.ENDIF # .IF "$(COM)"=="GCC"
-
-.ENDIF			# "$(GUI)"=="WNT"
-
-.ENDIF			# "$(DEF5EXPORTFILE)"==""
-.ENDIF			# "$(SHL5VERSIONMAP)"!=""
-
-.IF "$(GUI)"=="WNT"
-
-DEF5FILTER=$(SOLARENV)/inc/dummy.flt
-
-RMHACK5:=$(RM)
-
-.IF "$(DEF5CEXP)"!=""
-EXPORT_ALL_SWITCH=-A $(DEF5CEXP)
-.ENDIF
-
-.IF "$(link_always)"==""
-$(DEF5TARGETN) : \
-        $(DEF5DEPN) \
-        $(DEF5EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF5TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    $(COMMAND_ECHO)-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL5TARGETN:f)$(EMQ)" 								 >$@.tmpfile
-.IF "$(COM)"!="GCC"
-    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
-.ENDIF
-    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
-.ENDIF
-.IF "$(DEFLIB5NAME)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL5TARGET).exp
-    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL5TARGET).exp --export-all-symbols \
-        `$(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
-    $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL5TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL5TARGET).exp
-.ELSE
-.IF "$(SHL5USE_EXPORTS)"==""
-    $(COMMAND_ECHO)-$(RMHACK5) $(MISC)/$(SHL5TARGET).exp
-    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL5TARGET).exp $(SLB)/$(DEFLIB5NAME).lib
-    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL5TARGET).flt $(MISC)/$(SHL5TARGET).exp			   >>$@.tmpfile
-    $(COMMAND_ECHO)$(RMHACK5) $(MISC)/$(SHL5TARGET).exp
-.ELSE			# "$(SHL5USE_EXPORTS)"==""
-    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL5TARGET).direct
-    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF5FILTER) $(MISC)/$(SHL5TARGET).direct >>$@.tmpfile
-.ENDIF			# "$(SHL5USE_EXPORTS)"==""
-.ENDIF
-.ENDIF				# "$(DEFLIB5NAME)"!=""
-.IF "$(DEF5EXPORT1)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT2)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT3)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT4)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT5)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT6)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT7)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT8)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT9)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT10)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT11)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT12)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT13)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT14)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT15)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT16)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT17)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT18)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT19)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORT20)"!=""
-    $(COMMAND_ECHO)echo $(DEF5EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF5EXPORTFILE)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(TYPE) $(DEF5EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
-.ELSE
-    $(COMMAND_ECHO)$(TYPE) $(DEF5EXPORTFILE) >> $@.tmpfile
-.ENDIF
-.ENDIF
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="UNX"
-$(DEF5TARGETN): \
-        $(DEF5DEPN) \
-        $(DEF5EXPORTFILE)
-    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
-.ENDIF
-.ENDIF			# "$(DEF5TARGETN)"!=""
-
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(DEF6TARGETN)"!=""
-
-#to make intuitiv naming work
-.IF "$(DEF6LIBNAME)"!=""
-DEFLIB6NAME*=$(DEF6LIBNAME)
-.ENDIF			# "$(DEF6LIBNAME)"!=""
-
-.IF "$(DEFLIB6NAME)"!=""
-DEF6DEPN+=$(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib)
-.ENDIF
-
-.IF "$(SHL6VERSIONMAP)"!=""
-.IF "$(DEF6EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
-DEF6EXPORTFILE=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp
-.IF "$(COM)"=="GCC"
-$(DEF6EXPORTFILE) : $(SHL6OBJS) $(SHL6LIBS)
-.ENDIF # .IF "$(COM)"=="GCC"
-
-$(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
-    $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
-    $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)$(NM) -gP $(SHL6OBJS) \
-        `$(TYPE) /dev/null $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
-.ENDIF # .IF "$(COM)"=="GCC"
-
-.ENDIF			# "$(GUI)"=="WNT"
-
-.ENDIF			# "$(DEF6EXPORTFILE)"==""
-.ENDIF			# "$(SHL6VERSIONMAP)"!=""
-
-.IF "$(GUI)"=="WNT"
-
-DEF6FILTER=$(SOLARENV)/inc/dummy.flt
-
-RMHACK6:=$(RM)
-
-.IF "$(DEF6CEXP)"!=""
-EXPORT_ALL_SWITCH=-A $(DEF6CEXP)
-.ENDIF
-
-.IF "$(link_always)"==""
-$(DEF6TARGETN) : \
-        $(DEF6DEPN) \
-        $(DEF6EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF6TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    $(COMMAND_ECHO)-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL6TARGETN:f)$(EMQ)" 								 >$@.tmpfile
-.IF "$(COM)"!="GCC"
-    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
-.ENDIF
-    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
-.ENDIF
-.IF "$(DEFLIB6NAME)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL6TARGET).exp
-    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL6TARGET).exp --export-all-symbols \
-        `$(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
-    $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL6TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL6TARGET).exp
-.ELSE
-.IF "$(SHL6USE_EXPORTS)"==""
-    $(COMMAND_ECHO)-$(RMHACK6) $(MISC)/$(SHL6TARGET).exp
-    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL6TARGET).exp $(SLB)/$(DEFLIB6NAME).lib
-    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL6TARGET).flt $(MISC)/$(SHL6TARGET).exp			   >>$@.tmpfile
-    $(COMMAND_ECHO)$(RMHACK6) $(MISC)/$(SHL6TARGET).exp
-.ELSE			# "$(SHL6USE_EXPORTS)"==""
-    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL6TARGET).direct
-    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF6FILTER) $(MISC)/$(SHL6TARGET).direct >>$@.tmpfile
-.ENDIF			# "$(SHL6USE_EXPORTS)"==""
-.ENDIF
-.ENDIF				# "$(DEFLIB6NAME)"!=""
-.IF "$(DEF6EXPORT1)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT2)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT3)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT4)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT5)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT6)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT7)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT8)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT9)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT10)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT11)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT12)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT13)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT14)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT15)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT16)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT17)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT18)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT19)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORT20)"!=""
-    $(COMMAND_ECHO)echo $(DEF6EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF6EXPORTFILE)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(TYPE) $(DEF6EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
-.ELSE
-    $(COMMAND_ECHO)$(TYPE) $(DEF6EXPORTFILE) >> $@.tmpfile
-.ENDIF
-.ENDIF
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="UNX"
-$(DEF6TARGETN): \
-        $(DEF6DEPN) \
-        $(DEF6EXPORTFILE)
-    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
-.ENDIF
-.ENDIF			# "$(DEF6TARGETN)"!=""
-
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(DEF7TARGETN)"!=""
-
-#to make intuitiv naming work
-.IF "$(DEF7LIBNAME)"!=""
-DEFLIB7NAME*=$(DEF7LIBNAME)
-.ENDIF			# "$(DEF7LIBNAME)"!=""
-
-.IF "$(DEFLIB7NAME)"!=""
-DEF7DEPN+=$(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib)
-.ENDIF
-
-.IF "$(SHL7VERSIONMAP)"!=""
-.IF "$(DEF7EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
-DEF7EXPORTFILE=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp
-.IF "$(COM)"=="GCC"
-$(DEF7EXPORTFILE) : $(SHL7OBJS) $(SHL7LIBS)
-.ENDIF # .IF "$(COM)"=="GCC"
-
-$(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
-    $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
-    $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)$(NM) -gP $(SHL7OBJS) \
-        `$(TYPE) /dev/null $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
-.ENDIF # .IF "$(COM)"=="GCC"
-
-.ENDIF			# "$(GUI)"=="WNT"
-
-.ENDIF			# "$(DEF7EXPORTFILE)"==""
-.ENDIF			# "$(SHL7VERSIONMAP)"!=""
-
-.IF "$(GUI)"=="WNT"
-
-DEF7FILTER=$(SOLARENV)/inc/dummy.flt
-
-RMHACK7:=$(RM)
-
-.IF "$(DEF7CEXP)"!=""
-EXPORT_ALL_SWITCH=-A $(DEF7CEXP)
-.ENDIF
-
-.IF "$(link_always)"==""
-$(DEF7TARGETN) : \
-        $(DEF7DEPN) \
-        $(DEF7EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF7TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    $(COMMAND_ECHO)-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL7TARGETN:f)$(EMQ)" 								 >$@.tmpfile
-.IF "$(COM)"!="GCC"
-    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
-.ENDIF
-    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
-.ENDIF
-.IF "$(DEFLIB7NAME)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL7TARGET).exp
-    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL7TARGET).exp --export-all-symbols \
-        `$(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
-    $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL7TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL7TARGET).exp
-.ELSE
-.IF "$(SHL7USE_EXPORTS)"==""
-    $(COMMAND_ECHO)-$(RMHACK7) $(MISC)/$(SHL7TARGET).exp
-    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL7TARGET).exp $(SLB)/$(DEFLIB7NAME).lib
-    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL7TARGET).flt $(MISC)/$(SHL7TARGET).exp			   >>$@.tmpfile
-    $(COMMAND_ECHO)$(RMHACK7) $(MISC)/$(SHL7TARGET).exp
-.ELSE			# "$(SHL7USE_EXPORTS)"==""
-    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL7TARGET).direct
-    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF7FILTER) $(MISC)/$(SHL7TARGET).direct >>$@.tmpfile
-.ENDIF			# "$(SHL7USE_EXPORTS)"==""
-.ENDIF
-.ENDIF				# "$(DEFLIB7NAME)"!=""
-.IF "$(DEF7EXPORT1)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT2)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT3)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT4)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT5)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT6)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT7)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT8)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT9)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT10)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT11)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT12)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT13)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT14)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT15)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT16)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT17)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT18)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT19)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORT20)"!=""
-    $(COMMAND_ECHO)echo $(DEF7EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF7EXPORTFILE)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(TYPE) $(DEF7EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
-.ELSE
-    $(COMMAND_ECHO)$(TYPE) $(DEF7EXPORTFILE) >> $@.tmpfile
-.ENDIF
-.ENDIF
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="UNX"
-$(DEF7TARGETN): \
-        $(DEF7DEPN) \
-        $(DEF7EXPORTFILE)
-    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
-.ENDIF
-.ENDIF			# "$(DEF7TARGETN)"!=""
-
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(DEF8TARGETN)"!=""
-
-#to make intuitiv naming work
-.IF "$(DEF8LIBNAME)"!=""
-DEFLIB8NAME*=$(DEF8LIBNAME)
-.ENDIF			# "$(DEF8LIBNAME)"!=""
-
-.IF "$(DEFLIB8NAME)"!=""
-DEF8DEPN+=$(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib)
-.ENDIF
-
-.IF "$(SHL8VERSIONMAP)"!=""
-.IF "$(DEF8EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
-DEF8EXPORTFILE=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp
-.IF "$(COM)"=="GCC"
-$(DEF8EXPORTFILE) : $(SHL8OBJS) $(SHL8LIBS)
-.ENDIF # .IF "$(COM)"=="GCC"
-
-$(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
-    $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
-    $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)$(NM) -gP $(SHL8OBJS) \
-        `$(TYPE) /dev/null $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
-.ENDIF # .IF "$(COM)"=="GCC"
-
-.ENDIF			# "$(GUI)"=="WNT"
-
-.ENDIF			# "$(DEF8EXPORTFILE)"==""
-.ENDIF			# "$(SHL8VERSIONMAP)"!=""
-
-.IF "$(GUI)"=="WNT"
-
-DEF8FILTER=$(SOLARENV)/inc/dummy.flt
-
-RMHACK8:=$(RM)
-
-.IF "$(DEF8CEXP)"!=""
-EXPORT_ALL_SWITCH=-A $(DEF8CEXP)
-.ENDIF
-
-.IF "$(link_always)"==""
-$(DEF8TARGETN) : \
-        $(DEF8DEPN) \
-        $(DEF8EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF8TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    $(COMMAND_ECHO)-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL8TARGETN:f)$(EMQ)" 								 >$@.tmpfile
-.IF "$(COM)"!="GCC"
-    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
-.ENDIF
-    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
-.ENDIF
-.IF "$(DEFLIB8NAME)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL8TARGET).exp
-    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL8TARGET).exp --export-all-symbols \
-        `$(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
-    $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL8TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL8TARGET).exp
-.ELSE
-.IF "$(SHL8USE_EXPORTS)"==""
-    $(COMMAND_ECHO)-$(RMHACK8) $(MISC)/$(SHL8TARGET).exp
-    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL8TARGET).exp $(SLB)/$(DEFLIB8NAME).lib
-    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL8TARGET).flt $(MISC)/$(SHL8TARGET).exp			   >>$@.tmpfile
-    $(COMMAND_ECHO)$(RMHACK8) $(MISC)/$(SHL8TARGET).exp
-.ELSE			# "$(SHL8USE_EXPORTS)"==""
-    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL8TARGET).direct
-    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF8FILTER) $(MISC)/$(SHL8TARGET).direct >>$@.tmpfile
-.ENDIF			# "$(SHL8USE_EXPORTS)"==""
-.ENDIF
-.ENDIF				# "$(DEFLIB8NAME)"!=""
-.IF "$(DEF8EXPORT1)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT2)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT3)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT4)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT5)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT6)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT7)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT8)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT9)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT10)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT11)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT12)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT13)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT14)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT15)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT16)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT17)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT18)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT19)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORT20)"!=""
-    $(COMMAND_ECHO)echo $(DEF8EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF8EXPORTFILE)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(TYPE) $(DEF8EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
-.ELSE
-    $(COMMAND_ECHO)$(TYPE) $(DEF8EXPORTFILE) >> $@.tmpfile
-.ENDIF
-.ENDIF
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="UNX"
-$(DEF8TARGETN): \
-        $(DEF8DEPN) \
-        $(DEF8EXPORTFILE)
-    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
-.ENDIF
-.ENDIF			# "$(DEF8TARGETN)"!=""
-
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(DEF9TARGETN)"!=""
-
-#to make intuitiv naming work
-.IF "$(DEF9LIBNAME)"!=""
-DEFLIB9NAME*=$(DEF9LIBNAME)
-.ENDIF			# "$(DEF9LIBNAME)"!=""
-
-.IF "$(DEFLIB9NAME)"!=""
-DEF9DEPN+=$(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib)
-.ENDIF
-
-.IF "$(SHL9VERSIONMAP)"!=""
-.IF "$(DEF9EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
-DEF9EXPORTFILE=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp
-.IF "$(COM)"=="GCC"
-$(DEF9EXPORTFILE) : $(SHL9OBJS) $(SHL9LIBS)
-.ENDIF # .IF "$(COM)"=="GCC"
-
-$(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
-    $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
-    $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)$(NM) -gP $(SHL9OBJS) \
-        `$(TYPE) /dev/null $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
-.ENDIF # .IF "$(COM)"=="GCC"
-
-.ENDIF			# "$(GUI)"=="WNT"
-
-.ENDIF			# "$(DEF9EXPORTFILE)"==""
-.ENDIF			# "$(SHL9VERSIONMAP)"!=""
-
-.IF "$(GUI)"=="WNT"
-
-DEF9FILTER=$(SOLARENV)/inc/dummy.flt
-
-RMHACK9:=$(RM)
-
-.IF "$(DEF9CEXP)"!=""
-EXPORT_ALL_SWITCH=-A $(DEF9CEXP)
-.ENDIF
-
-.IF "$(link_always)"==""
-$(DEF9TARGETN) : \
-        $(DEF9DEPN) \
-        $(DEF9EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF9TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    $(COMMAND_ECHO)-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL9TARGETN:f)$(EMQ)" 								 >$@.tmpfile
-.IF "$(COM)"!="GCC"
-    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
-.ENDIF
-    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
-.ENDIF
-.IF "$(DEFLIB9NAME)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL9TARGET).exp
-    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL9TARGET).exp --export-all-symbols \
-        `$(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
-    $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL9TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL9TARGET).exp
-.ELSE
-.IF "$(SHL9USE_EXPORTS)"==""
-    $(COMMAND_ECHO)-$(RMHACK9) $(MISC)/$(SHL9TARGET).exp
-    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL9TARGET).exp $(SLB)/$(DEFLIB9NAME).lib
-    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL9TARGET).flt $(MISC)/$(SHL9TARGET).exp			   >>$@.tmpfile
-    $(COMMAND_ECHO)$(RMHACK9) $(MISC)/$(SHL9TARGET).exp
-.ELSE			# "$(SHL9USE_EXPORTS)"==""
-    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL9TARGET).direct
-    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF9FILTER) $(MISC)/$(SHL9TARGET).direct >>$@.tmpfile
-.ENDIF			# "$(SHL9USE_EXPORTS)"==""
-.ENDIF
-.ENDIF				# "$(DEFLIB9NAME)"!=""
-.IF "$(DEF9EXPORT1)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT2)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT3)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT4)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT5)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT6)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT7)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT8)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT9)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT10)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT11)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT12)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT13)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT14)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT15)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT16)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT17)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT18)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT19)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORT20)"!=""
-    $(COMMAND_ECHO)echo $(DEF9EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF9EXPORTFILE)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(TYPE) $(DEF9EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
-.ELSE
-    $(COMMAND_ECHO)$(TYPE) $(DEF9EXPORTFILE) >> $@.tmpfile
-.ENDIF
-.ENDIF
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="UNX"
-$(DEF9TARGETN): \
-        $(DEF9DEPN) \
-        $(DEF9EXPORTFILE)
-    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
-.ENDIF
-.ENDIF			# "$(DEF9TARGETN)"!=""
-
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(DEF10TARGETN)"!=""
-
-#to make intuitiv naming work
-.IF "$(DEF10LIBNAME)"!=""
-DEFLIB10NAME*=$(DEF10LIBNAME)
-.ENDIF			# "$(DEF10LIBNAME)"!=""
-
-.IF "$(DEFLIB10NAME)"!=""
-DEF10DEPN+=$(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib)
-.ENDIF
-
-.IF "$(SHL10VERSIONMAP)"!=""
-.IF "$(DEF10EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
-DEF10EXPORTFILE=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp
-.IF "$(COM)"=="GCC"
-$(DEF10EXPORTFILE) : $(SHL10OBJS) $(SHL10LIBS)
-.ENDIF # .IF "$(COM)"=="GCC"
-
-$(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
-    $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
-    $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)$(NM) -gP $(SHL10OBJS) \
-        `$(TYPE) /dev/null $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
-.ENDIF # .IF "$(COM)"=="GCC"
-
-.ENDIF			# "$(GUI)"=="WNT"
-
-.ENDIF			# "$(DEF10EXPORTFILE)"==""
-.ENDIF			# "$(SHL10VERSIONMAP)"!=""
-
-.IF "$(GUI)"=="WNT"
-
-DEF10FILTER=$(SOLARENV)/inc/dummy.flt
-
-RMHACK10:=$(RM)
-
-.IF "$(DEF10CEXP)"!=""
-EXPORT_ALL_SWITCH=-A $(DEF10CEXP)
-.ENDIF
-
-.IF "$(link_always)"==""
-$(DEF10TARGETN) : \
-        $(DEF10DEPN) \
-        $(DEF10EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF10TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    $(COMMAND_ECHO)-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL10TARGETN:f)$(EMQ)" 								 >$@.tmpfile
-.IF "$(COM)"!="GCC"
-    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
-.ENDIF
-    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
-.ENDIF
-.IF "$(DEFLIB10NAME)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL10TARGET).exp
-    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL10TARGET).exp --export-all-symbols \
-        `$(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
-    $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL10TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL10TARGET).exp
-.ELSE
-.IF "$(SHL10USE_EXPORTS)"==""
-    $(COMMAND_ECHO)-$(RMHACK10) $(MISC)/$(SHL10TARGET).exp
-    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL10TARGET).exp $(SLB)/$(DEFLIB10NAME).lib
-    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL10TARGET).flt $(MISC)/$(SHL10TARGET).exp			   >>$@.tmpfile
-    $(COMMAND_ECHO)$(RMHACK10) $(MISC)/$(SHL10TARGET).exp
-.ELSE			# "$(SHL10USE_EXPORTS)"==""
-    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL10TARGET).direct
-    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF10FILTER) $(MISC)/$(SHL10TARGET).direct >>$@.tmpfile
-.ENDIF			# "$(SHL10USE_EXPORTS)"==""
-.ENDIF
-.ENDIF				# "$(DEFLIB10NAME)"!=""
-.IF "$(DEF10EXPORT1)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT2)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT3)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT4)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT5)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT6)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT7)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT8)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT9)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT10)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT11)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT12)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT13)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT14)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT15)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT16)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT17)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT18)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT19)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORT20)"!=""
-    $(COMMAND_ECHO)echo $(DEF10EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF10EXPORTFILE)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(TYPE) $(DEF10EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
-.ELSE
-    $(COMMAND_ECHO)$(TYPE) $(DEF10EXPORTFILE) >> $@.tmpfile
-.ENDIF
-.ENDIF
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="UNX"
-$(DEF10TARGETN): \
-        $(DEF10DEPN) \
-        $(DEF10EXPORTFILE)
-    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
-.ENDIF
-.ENDIF			# "$(DEF10TARGETN)"!=""
-
-
-# Anweisungen fuer das Linken
diff --git a/solenv/inc/_tg_lib.mk b/solenv/inc/_tg_lib.mk
deleted file mode 100644
index 5b6c46355..000000000
--- a/solenv/inc/_tg_lib.mk
+++ /dev/null
@@ -1,850 +0,0 @@
-# unroll begin
-
-.IF "$(LIB1TARGET)" != ""
-.IF "$(LIB1ARCHIV)" != ""
-
-$(LIB1ARCHIV) :	$(LIB1TARGET)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd
-    @echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB1ARCHIV:b).cmd
-.IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd
-.ENDIF
-.IF "$(OS)" == "MACOSX"
-    @echo  ranlib $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd
-.ENDIF
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB1ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB1ARCHIV:b).cmd
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB1ARCHIV:b).cmd
-    @+echo $(RANLIB) $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB1ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB1ARCHIV:b).cmd
-.ELSE
-    @echo just a dummy > $@
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF			# "$(GUI)"=="UNX"
-
-.ENDIF			# "$(LIB1ARCHIV)" != ""
-
-$(LIB1TARGET) :	$(LIB1FILES) \
-                        $(LIB1OBJFILES) \
-                        $(LIB1DEPN)
-.IF "$(VERBOSE)" == "TRUE"
-    @echo ------------------------------
-    @echo using: $(LIB1FILES)
-    @echo using: $(LIB1TARGET)
-    @echo ------------------------------
-.ENDIF
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @echo $(LIB1OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-    @cat /dev/null $(LIB1FILES:s/.obj/.o/) | xargs -n 1 >> $@
-    @$(RM) $(@:d)$(@:b).dump
-.IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ELSE
-    @nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ENDIF
-
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB1OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
-    @+cat /dev/null $(LIB1FILES) | xargs -n1 >> $@
-.ELSE
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB1FILES) $(LIB1OBJFILES))
-    @-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB1OBJFILES)"!=""    
-    @$(TYPE) $(mktmp $(LIB1OBJFILES)) > $(null,$(LIB1OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB1OBJFILES)"!=""    
-.IF "$(LIB1FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB1FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB1FILES)"!=""    
-    @$(ECHONL)
-.ENDIF          # "$(LIB1FILES)"!=""    
-.ELSE			# "$(GUI)"=="WNT"
-    @-$(RM) $@
-  .IF "$(VERBOSE)" == "TRUE"
-    @echo $(LIBMGR) r $@ $(LIB1OBJFILES)
-  .ENDIF
-    $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB1OBJFILES) $(LIB1FILES) bla.lib
-.ENDIF          # "$(GUI)"=="WNT"
-.ENDIF          # "$(GUI)"=="UNX"
-.ENDIF          # "$(LIB1TARGET)" != ""
-
-# Anweisungen fuer das LIBTARGETs
-# unroll begin
-
-.IF "$(LIB2TARGET)" != ""
-.IF "$(LIB2ARCHIV)" != ""
-
-$(LIB2ARCHIV) :	$(LIB2TARGET)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd
-    @echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB2ARCHIV:b).cmd
-.IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd
-.ENDIF
-.IF "$(OS)" == "MACOSX"
-    @echo  ranlib $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd
-.ENDIF
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB2ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB2ARCHIV:b).cmd
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB2ARCHIV:b).cmd
-    @+echo $(RANLIB) $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB2ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB2ARCHIV:b).cmd
-.ELSE
-    @echo just a dummy > $@
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF			# "$(GUI)"=="UNX"
-
-.ENDIF			# "$(LIB2ARCHIV)" != ""
-
-$(LIB2TARGET) :	$(LIB2FILES) \
-                        $(LIB2OBJFILES) \
-                        $(LIB2DEPN)
-.IF "$(VERBOSE)" == "TRUE"
-    @echo ------------------------------
-    @echo using: $(LIB2FILES)
-    @echo using: $(LIB2TARGET)
-    @echo ------------------------------
-.ENDIF
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @echo $(LIB2OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-    @cat /dev/null $(LIB2FILES:s/.obj/.o/) | xargs -n 1 >> $@
-    @$(RM) $(@:d)$(@:b).dump
-.IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ELSE
-    @nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ENDIF
-
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB2OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
-    @+cat /dev/null $(LIB2FILES) | xargs -n1 >> $@
-.ELSE
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB2FILES) $(LIB2OBJFILES))
-    @-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB2OBJFILES)"!=""    
-    @$(TYPE) $(mktmp $(LIB2OBJFILES)) > $(null,$(LIB2OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB2OBJFILES)"!=""    
-.IF "$(LIB2FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB2FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB2FILES)"!=""    
-    @$(ECHONL)
-.ENDIF          # "$(LIB2FILES)"!=""    
-.ELSE			# "$(GUI)"=="WNT"
-    @-$(RM) $@
-  .IF "$(VERBOSE)" == "TRUE"
-    @echo $(LIBMGR) r $@ $(LIB2OBJFILES)
-  .ENDIF
-    $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB2OBJFILES) $(LIB2FILES) bla.lib
-.ENDIF          # "$(GUI)"=="WNT"
-.ENDIF          # "$(GUI)"=="UNX"
-.ENDIF          # "$(LIB2TARGET)" != ""
-
-# Anweisungen fuer das LIBTARGETs
-# unroll begin
-
-.IF "$(LIB3TARGET)" != ""
-.IF "$(LIB3ARCHIV)" != ""
-
-$(LIB3ARCHIV) :	$(LIB3TARGET)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd
-    @echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB3ARCHIV:b).cmd
-.IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd
-.ENDIF
-.IF "$(OS)" == "MACOSX"
-    @echo  ranlib $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd
-.ENDIF
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB3ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB3ARCHIV:b).cmd
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB3ARCHIV:b).cmd
-    @+echo $(RANLIB) $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB3ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB3ARCHIV:b).cmd
-.ELSE
-    @echo just a dummy > $@
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF			# "$(GUI)"=="UNX"
-
-.ENDIF			# "$(LIB3ARCHIV)" != ""
-
-$(LIB3TARGET) :	$(LIB3FILES) \
-                        $(LIB3OBJFILES) \
-                        $(LIB3DEPN)
-.IF "$(VERBOSE)" == "TRUE"
-    @echo ------------------------------
-    @echo using: $(LIB3FILES)
-    @echo using: $(LIB3TARGET)
-    @echo ------------------------------
-.ENDIF
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @echo $(LIB3OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-    @cat /dev/null $(LIB3FILES:s/.obj/.o/) | xargs -n 1 >> $@
-    @$(RM) $(@:d)$(@:b).dump
-.IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ELSE
-    @nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ENDIF
-
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB3OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
-    @+cat /dev/null $(LIB3FILES) | xargs -n1 >> $@
-.ELSE
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB3FILES) $(LIB3OBJFILES))
-    @-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB3OBJFILES)"!=""    
-    @$(TYPE) $(mktmp $(LIB3OBJFILES)) > $(null,$(LIB3OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB3OBJFILES)"!=""    
-.IF "$(LIB3FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB3FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB3FILES)"!=""    
-    @$(ECHONL)
-.ENDIF          # "$(LIB3FILES)"!=""    
-.ELSE			# "$(GUI)"=="WNT"
-    @-$(RM) $@
-  .IF "$(VERBOSE)" == "TRUE"
-    @echo $(LIBMGR) r $@ $(LIB3OBJFILES)
-  .ENDIF
-    $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB3OBJFILES) $(LIB3FILES) bla.lib
-.ENDIF          # "$(GUI)"=="WNT"
-.ENDIF          # "$(GUI)"=="UNX"
-.ENDIF          # "$(LIB3TARGET)" != ""
-
-# Anweisungen fuer das LIBTARGETs
-# unroll begin
-
-.IF "$(LIB4TARGET)" != ""
-.IF "$(LIB4ARCHIV)" != ""
-
-$(LIB4ARCHIV) :	$(LIB4TARGET)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd
-    @echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB4ARCHIV:b).cmd
-.IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd
-.ENDIF
-.IF "$(OS)" == "MACOSX"
-    @echo  ranlib $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd
-.ENDIF
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB4ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB4ARCHIV:b).cmd
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB4ARCHIV:b).cmd
-    @+echo $(RANLIB) $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB4ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB4ARCHIV:b).cmd
-.ELSE
-    @echo just a dummy > $@
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF			# "$(GUI)"=="UNX"
-
-.ENDIF			# "$(LIB4ARCHIV)" != ""
-
-$(LIB4TARGET) :	$(LIB4FILES) \
-                        $(LIB4OBJFILES) \
-                        $(LIB4DEPN)
-.IF "$(VERBOSE)" == "TRUE"
-    @echo ------------------------------
-    @echo using: $(LIB4FILES)
-    @echo using: $(LIB4TARGET)
-    @echo ------------------------------
-.ENDIF
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @echo $(LIB4OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-    @cat /dev/null $(LIB4FILES:s/.obj/.o/) | xargs -n 1 >> $@
-    @$(RM) $(@:d)$(@:b).dump
-.IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ELSE
-    @nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ENDIF
-
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB4OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
-    @+cat /dev/null $(LIB4FILES) | xargs -n1 >> $@
-.ELSE
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB4FILES) $(LIB4OBJFILES))
-    @-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB4OBJFILES)"!=""    
-    @$(TYPE) $(mktmp $(LIB4OBJFILES)) > $(null,$(LIB4OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB4OBJFILES)"!=""    
-.IF "$(LIB4FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB4FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB4FILES)"!=""    
-    @$(ECHONL)
-.ENDIF          # "$(LIB4FILES)"!=""    
-.ELSE			# "$(GUI)"=="WNT"
-    @-$(RM) $@
-  .IF "$(VERBOSE)" == "TRUE"
-    @echo $(LIBMGR) r $@ $(LIB4OBJFILES)
-  .ENDIF
-    $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB4OBJFILES) $(LIB4FILES) bla.lib
-.ENDIF          # "$(GUI)"=="WNT"
-.ENDIF          # "$(GUI)"=="UNX"
-.ENDIF          # "$(LIB4TARGET)" != ""
-
-# Anweisungen fuer das LIBTARGETs
-# unroll begin
-
-.IF "$(LIB5TARGET)" != ""
-.IF "$(LIB5ARCHIV)" != ""
-
-$(LIB5ARCHIV) :	$(LIB5TARGET)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd
-    @echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB5ARCHIV:b).cmd
-.IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd
-.ENDIF
-.IF "$(OS)" == "MACOSX"
-    @echo  ranlib $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd
-.ENDIF
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB5ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB5ARCHIV:b).cmd
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB5ARCHIV:b).cmd
-    @+echo $(RANLIB) $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB5ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB5ARCHIV:b).cmd
-.ELSE
-    @echo just a dummy > $@
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF			# "$(GUI)"=="UNX"
-
-.ENDIF			# "$(LIB5ARCHIV)" != ""
-
-$(LIB5TARGET) :	$(LIB5FILES) \
-                        $(LIB5OBJFILES) \
-                        $(LIB5DEPN)
-.IF "$(VERBOSE)" == "TRUE"
-    @echo ------------------------------
-    @echo using: $(LIB5FILES)
-    @echo using: $(LIB5TARGET)
-    @echo ------------------------------
-.ENDIF
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @echo $(LIB5OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-    @cat /dev/null $(LIB5FILES:s/.obj/.o/) | xargs -n 1 >> $@
-    @$(RM) $(@:d)$(@:b).dump
-.IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ELSE
-    @nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ENDIF
-
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB5OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
-    @+cat /dev/null $(LIB5FILES) | xargs -n1 >> $@
-.ELSE
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB5FILES) $(LIB5OBJFILES))
-    @-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB5OBJFILES)"!=""    
-    @$(TYPE) $(mktmp $(LIB5OBJFILES)) > $(null,$(LIB5OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB5OBJFILES)"!=""    
-.IF "$(LIB5FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB5FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB5FILES)"!=""    
-    @$(ECHONL)
-.ENDIF          # "$(LIB5FILES)"!=""    
-.ELSE			# "$(GUI)"=="WNT"
-    @-$(RM) $@
-  .IF "$(VERBOSE)" == "TRUE"
-    @echo $(LIBMGR) r $@ $(LIB5OBJFILES)
-  .ENDIF
-    $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB5OBJFILES) $(LIB5FILES) bla.lib
-.ENDIF          # "$(GUI)"=="WNT"
-.ENDIF          # "$(GUI)"=="UNX"
-.ENDIF          # "$(LIB5TARGET)" != ""
-
-# Anweisungen fuer das LIBTARGETs
-# unroll begin
-
-.IF "$(LIB6TARGET)" != ""
-.IF "$(LIB6ARCHIV)" != ""
-
-$(LIB6ARCHIV) :	$(LIB6TARGET)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd
-    @echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB6ARCHIV:b).cmd
-.IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd
-.ENDIF
-.IF "$(OS)" == "MACOSX"
-    @echo  ranlib $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd
-.ENDIF
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB6ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB6ARCHIV:b).cmd
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB6ARCHIV:b).cmd
-    @+echo $(RANLIB) $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB6ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB6ARCHIV:b).cmd
-.ELSE
-    @echo just a dummy > $@
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF			# "$(GUI)"=="UNX"
-
-.ENDIF			# "$(LIB6ARCHIV)" != ""
-
-$(LIB6TARGET) :	$(LIB6FILES) \
-                        $(LIB6OBJFILES) \
-                        $(LIB6DEPN)
-.IF "$(VERBOSE)" == "TRUE"
-    @echo ------------------------------
-    @echo using: $(LIB6FILES)
-    @echo using: $(LIB6TARGET)
-    @echo ------------------------------
-.ENDIF
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @echo $(LIB6OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-    @cat /dev/null $(LIB6FILES:s/.obj/.o/) | xargs -n 1 >> $@
-    @$(RM) $(@:d)$(@:b).dump
-.IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ELSE
-    @nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ENDIF
-
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB6OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
-    @+cat /dev/null $(LIB6FILES) | xargs -n1 >> $@
-.ELSE
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB6FILES) $(LIB6OBJFILES))
-    @-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB6OBJFILES)"!=""    
-    @$(TYPE) $(mktmp $(LIB6OBJFILES)) > $(null,$(LIB6OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB6OBJFILES)"!=""    
-.IF "$(LIB6FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB6FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB6FILES)"!=""    
-    @$(ECHONL)
-.ENDIF          # "$(LIB6FILES)"!=""    
-.ELSE			# "$(GUI)"=="WNT"
-    @-$(RM) $@
-  .IF "$(VERBOSE)" == "TRUE"
-    @echo $(LIBMGR) r $@ $(LIB6OBJFILES)
-  .ENDIF
-    $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB6OBJFILES) $(LIB6FILES) bla.lib
-.ENDIF          # "$(GUI)"=="WNT"
-.ENDIF          # "$(GUI)"=="UNX"
-.ENDIF          # "$(LIB6TARGET)" != ""
-
-# Anweisungen fuer das LIBTARGETs
-# unroll begin
-
-.IF "$(LIB7TARGET)" != ""
-.IF "$(LIB7ARCHIV)" != ""
-
-$(LIB7ARCHIV) :	$(LIB7TARGET)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd
-    @echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB7ARCHIV:b).cmd
-.IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd
-.ENDIF
-.IF "$(OS)" == "MACOSX"
-    @echo  ranlib $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd
-.ENDIF
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB7ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB7ARCHIV:b).cmd
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB7ARCHIV:b).cmd
-    @+echo $(RANLIB) $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB7ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB7ARCHIV:b).cmd
-.ELSE
-    @echo just a dummy > $@
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF			# "$(GUI)"=="UNX"
-
-.ENDIF			# "$(LIB7ARCHIV)" != ""
-
-$(LIB7TARGET) :	$(LIB7FILES) \
-                        $(LIB7OBJFILES) \
-                        $(LIB7DEPN)
-.IF "$(VERBOSE)" == "TRUE"
-    @echo ------------------------------
-    @echo using: $(LIB7FILES)
-    @echo using: $(LIB7TARGET)
-    @echo ------------------------------
-.ENDIF
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @echo $(LIB7OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-    @cat /dev/null $(LIB7FILES:s/.obj/.o/) | xargs -n 1 >> $@
-    @$(RM) $(@:d)$(@:b).dump
-.IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ELSE
-    @nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ENDIF
-
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB7OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
-    @+cat /dev/null $(LIB7FILES) | xargs -n1 >> $@
-.ELSE
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB7FILES) $(LIB7OBJFILES))
-    @-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB7OBJFILES)"!=""    
-    @$(TYPE) $(mktmp $(LIB7OBJFILES)) > $(null,$(LIB7OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB7OBJFILES)"!=""    
-.IF "$(LIB7FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB7FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB7FILES)"!=""    
-    @$(ECHONL)
-.ENDIF          # "$(LIB7FILES)"!=""    
-.ELSE			# "$(GUI)"=="WNT"
-    @-$(RM) $@
-  .IF "$(VERBOSE)" == "TRUE"
-    @echo $(LIBMGR) r $@ $(LIB7OBJFILES)
-  .ENDIF
-    $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB7OBJFILES) $(LIB7FILES) bla.lib
-.ENDIF          # "$(GUI)"=="WNT"
-.ENDIF          # "$(GUI)"=="UNX"
-.ENDIF          # "$(LIB7TARGET)" != ""
-
-# Anweisungen fuer das LIBTARGETs
-# unroll begin
-
-.IF "$(LIB8TARGET)" != ""
-.IF "$(LIB8ARCHIV)" != ""
-
-$(LIB8ARCHIV) :	$(LIB8TARGET)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd
-    @echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB8ARCHIV:b).cmd
-.IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd
-.ENDIF
-.IF "$(OS)" == "MACOSX"
-    @echo  ranlib $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd
-.ENDIF
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB8ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB8ARCHIV:b).cmd
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB8ARCHIV:b).cmd
-    @+echo $(RANLIB) $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB8ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB8ARCHIV:b).cmd
-.ELSE
-    @echo just a dummy > $@
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF			# "$(GUI)"=="UNX"
-
-.ENDIF			# "$(LIB8ARCHIV)" != ""
-
-$(LIB8TARGET) :	$(LIB8FILES) \
-                        $(LIB8OBJFILES) \
-                        $(LIB8DEPN)
-.IF "$(VERBOSE)" == "TRUE"
-    @echo ------------------------------
-    @echo using: $(LIB8FILES)
-    @echo using: $(LIB8TARGET)
-    @echo ------------------------------
-.ENDIF
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @echo $(LIB8OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-    @cat /dev/null $(LIB8FILES:s/.obj/.o/) | xargs -n 1 >> $@
-    @$(RM) $(@:d)$(@:b).dump
-.IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ELSE
-    @nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ENDIF
-
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB8OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
-    @+cat /dev/null $(LIB8FILES) | xargs -n1 >> $@
-.ELSE
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB8FILES) $(LIB8OBJFILES))
-    @-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB8OBJFILES)"!=""    
-    @$(TYPE) $(mktmp $(LIB8OBJFILES)) > $(null,$(LIB8OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB8OBJFILES)"!=""    
-.IF "$(LIB8FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB8FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB8FILES)"!=""    
-    @$(ECHONL)
-.ENDIF          # "$(LIB8FILES)"!=""    
-.ELSE			# "$(GUI)"=="WNT"
-    @-$(RM) $@
-  .IF "$(VERBOSE)" == "TRUE"
-    @echo $(LIBMGR) r $@ $(LIB8OBJFILES)
-  .ENDIF
-    $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB8OBJFILES) $(LIB8FILES) bla.lib
-.ENDIF          # "$(GUI)"=="WNT"
-.ENDIF          # "$(GUI)"=="UNX"
-.ENDIF          # "$(LIB8TARGET)" != ""
-
-# Anweisungen fuer das LIBTARGETs
-# unroll begin
-
-.IF "$(LIB9TARGET)" != ""
-.IF "$(LIB9ARCHIV)" != ""
-
-$(LIB9ARCHIV) :	$(LIB9TARGET)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd
-    @echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB9ARCHIV:b).cmd
-.IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd
-.ENDIF
-.IF "$(OS)" == "MACOSX"
-    @echo  ranlib $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd
-.ENDIF
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB9ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB9ARCHIV:b).cmd
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB9ARCHIV:b).cmd
-    @+echo $(RANLIB) $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB9ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB9ARCHIV:b).cmd
-.ELSE
-    @echo just a dummy > $@
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF			# "$(GUI)"=="UNX"
-
-.ENDIF			# "$(LIB9ARCHIV)" != ""
-
-$(LIB9TARGET) :	$(LIB9FILES) \
-                        $(LIB9OBJFILES) \
-                        $(LIB9DEPN)
-.IF "$(VERBOSE)" == "TRUE"
-    @echo ------------------------------
-    @echo using: $(LIB9FILES)
-    @echo using: $(LIB9TARGET)
-    @echo ------------------------------
-.ENDIF
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @echo $(LIB9OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-    @cat /dev/null $(LIB9FILES:s/.obj/.o/) | xargs -n 1 >> $@
-    @$(RM) $(@:d)$(@:b).dump
-.IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ELSE
-    @nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ENDIF
-
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB9OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
-    @+cat /dev/null $(LIB9FILES) | xargs -n1 >> $@
-.ELSE
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB9FILES) $(LIB9OBJFILES))
-    @-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB9OBJFILES)"!=""    
-    @$(TYPE) $(mktmp $(LIB9OBJFILES)) > $(null,$(LIB9OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB9OBJFILES)"!=""    
-.IF "$(LIB9FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB9FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB9FILES)"!=""    
-    @$(ECHONL)
-.ENDIF          # "$(LIB9FILES)"!=""    
-.ELSE			# "$(GUI)"=="WNT"
-    @-$(RM) $@
-  .IF "$(VERBOSE)" == "TRUE"
-    @echo $(LIBMGR) r $@ $(LIB9OBJFILES)
-  .ENDIF
-    $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB9OBJFILES) $(LIB9FILES) bla.lib
-.ENDIF          # "$(GUI)"=="WNT"
-.ENDIF          # "$(GUI)"=="UNX"
-.ENDIF          # "$(LIB9TARGET)" != ""
-
-# Anweisungen fuer das LIBTARGETs
-# unroll begin
-
-.IF "$(LIB10TARGET)" != ""
-.IF "$(LIB10ARCHIV)" != ""
-
-$(LIB10ARCHIV) :	$(LIB10TARGET)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)/$(LIB10ARCHIV:b).cmd
-    @echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB10ARCHIV:b).cmd
-.IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd
-.ENDIF
-.IF "$(OS)" == "MACOSX"
-    @echo  ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd
-.ENDIF
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB10ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB10ARCHIV:b).cmd
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)/$(LIB10ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB10ARCHIV:b).cmd
-    @+echo  ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB10ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB10ARCHIV:b).cmd
-.ELSE
-    @echo just a dummy > $@
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF			# "$(GUI)"=="UNX"
-
-.ENDIF			# "$(LIB10ARCHIV)" != ""
-
-$(LIB10TARGET) :	$(LIB10FILES) \
-                        $(LIB10OBJFILES) \
-                        $(LIB10DEPN)
-.IF "$(VERBOSE)" == "TRUE"
-    @echo ------------------------------
-    @echo using: $(LIB10FILES)
-    @echo using: $(LIB10TARGET)
-    @echo ------------------------------
-.ENDIF
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @echo $(LIB10OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-    @cat /dev/null $(LIB10FILES:s/.obj/.o/) | xargs -n 1 >> $@
-    @$(RM) $(@:d)$(@:b).dump
-.IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ELSE
-    @nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ENDIF
-
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB10OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
-    @+cat /dev/null $(LIB10FILES) | xargs -n1 >> $@
-.ELSE
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB10FILES) $(LIB10OBJFILES))
-    @-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB10OBJFILES)"!=""    
-    @$(TYPE) $(mktmp $(LIB10OBJFILES)) > $(null,$(LIB10OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB10OBJFILES)"!=""    
-.IF "$(LIB10FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB10FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB10FILES)"!=""    
-    @$(ECHONL)
-.ENDIF          # "$(LIB10FILES)"!=""    
-.ELSE			# "$(GUI)"=="WNT"
-    @-$(RM) $@
-  .IF "$(VERBOSE)" == "TRUE"
-    @echo $(LIBMGR) r $@ $(LIB10OBJFILES)
-  .ENDIF
-    $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB10OBJFILES) $(LIB10FILES) bla.lib
-.ENDIF          # "$(GUI)"=="WNT"
-.ENDIF          # "$(GUI)"=="UNX"
-.ENDIF          # "$(LIB10TARGET)" != ""
-
-# Anweisungen fuer das LIBTARGETs
diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
deleted file mode 100755
index 1edebb8a0..000000000
--- a/solenv/inc/_tg_rslb.mk
+++ /dev/null
@@ -1,610 +0,0 @@
-# unroll begin
-
-.IF "$(RESLIB1TARGETN)"!=""
-
-$(RSC_MULTI1) : \
-        $(RESLIB1SRSFILES) \
-        $(RESLIB1TARGETN) \
-        $(RESLIB1BMPS)
-    @echo Compiling: $(@:f)
-.IF "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-    -ft=$@ \
-    $(RSC1HEADER) $(RESLIB1SRSFILES) \
-    ) > $(NULLDEV)
-.ELSE			# "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)/$(RESLIB1NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil=$(BIN) \
-    -ft=$@ \
-    $(RSC1HEADER) $(RESLIB1SRSFILES) \
-    ) > $(NULLDEV)
-.ENDIF			# "$(common_build_reslib)"!=""
-
-$(RESLIB1TARGETN): \
-        $(RESLIB1SRSFILES) \
-        $(RESLIB1BMPS)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI1)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI1)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ELSE				# "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI1)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI1)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF              # "$(GUI)"=="UNX"
-.ENDIF				# "$(RESLIB1TARGETN)"!=""
-
-
-# unroll begin
-
-.IF "$(RESLIB2TARGETN)"!=""
-
-$(RSC_MULTI2) : \
-        $(RESLIB2SRSFILES) \
-        $(RESLIB2TARGETN) \
-        $(RESLIB2BMPS)
-    @echo Compiling: $(@:f)
-.IF "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-    -ft=$@ \
-    $(RSC2HEADER) $(RESLIB2SRSFILES) \
-    ) > $(NULLDEV)
-.ELSE			# "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)/$(RESLIB2NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil=$(BIN) \
-    -ft=$@ \
-    $(RSC2HEADER) $(RESLIB2SRSFILES) \
-    ) > $(NULLDEV)
-.ENDIF			# "$(common_build_reslib)"!=""
-
-$(RESLIB2TARGETN): \
-        $(RESLIB2SRSFILES) \
-        $(RESLIB2BMPS)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI2)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI2)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ELSE				# "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI2)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI2)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF              # "$(GUI)"=="UNX"
-.ENDIF				# "$(RESLIB2TARGETN)"!=""
-
-
-# unroll begin
-
-.IF "$(RESLIB3TARGETN)"!=""
-
-$(RSC_MULTI3) : \
-        $(RESLIB3SRSFILES) \
-        $(RESLIB3TARGETN) \
-        $(RESLIB3BMPS)
-    @echo Compiling: $(@:f)
-.IF "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-    -ft=$@ \
-    $(RSC3HEADER) $(RESLIB3SRSFILES) \
-    ) > $(NULLDEV)
-.ELSE			# "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)/$(RESLIB3NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil=$(BIN) \
-    -ft=$@ \
-    $(RSC3HEADER) $(RESLIB3SRSFILES) \
-    ) > $(NULLDEV)
-.ENDIF			# "$(common_build_reslib)"!=""
-
-$(RESLIB3TARGETN): \
-        $(RESLIB3SRSFILES) \
-        $(RESLIB3BMPS)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI3)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI3)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ELSE				# "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI3)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI3)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF              # "$(GUI)"=="UNX"
-.ENDIF				# "$(RESLIB3TARGETN)"!=""
-
-
-# unroll begin
-
-.IF "$(RESLIB4TARGETN)"!=""
-
-$(RSC_MULTI4) : \
-        $(RESLIB4SRSFILES) \
-        $(RESLIB4TARGETN) \
-        $(RESLIB4BMPS)
-    @echo Compiling: $(@:f)
-.IF "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-    -ft=$@ \
-    $(RSC4HEADER) $(RESLIB4SRSFILES) \
-    ) > $(NULLDEV)
-.ELSE			# "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)/$(RESLIB4NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil=$(BIN) \
-    -ft=$@ \
-    $(RSC4HEADER) $(RESLIB4SRSFILES) \
-    ) > $(NULLDEV)
-.ENDIF			# "$(common_build_reslib)"!=""
-
-$(RESLIB4TARGETN): \
-        $(RESLIB4SRSFILES) \
-        $(RESLIB4BMPS)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI4)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI4)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ELSE				# "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI4)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI4)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF              # "$(GUI)"=="UNX"
-.ENDIF				# "$(RESLIB4TARGETN)"!=""
-
-
-# unroll begin
-
-.IF "$(RESLIB5TARGETN)"!=""
-
-$(RSC_MULTI5) : \
-        $(RESLIB5SRSFILES) \
-        $(RESLIB5TARGETN) \
-        $(RESLIB5BMPS)
-    @echo Compiling: $(@:f)
-.IF "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-    -ft=$@ \
-    $(RSC5HEADER) $(RESLIB5SRSFILES) \
-    ) > $(NULLDEV)
-.ELSE			# "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)/$(RESLIB5NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil=$(BIN) \
-    -ft=$@ \
-    $(RSC5HEADER) $(RESLIB5SRSFILES) \
-    ) > $(NULLDEV)
-.ENDIF			# "$(common_build_reslib)"!=""
-
-$(RESLIB5TARGETN): \
-        $(RESLIB5SRSFILES) \
-        $(RESLIB5BMPS)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI5)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI5)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ELSE				# "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI5)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI5)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF              # "$(GUI)"=="UNX"
-.ENDIF				# "$(RESLIB5TARGETN)"!=""
-
-
-# unroll begin
-
-.IF "$(RESLIB6TARGETN)"!=""
-
-$(RSC_MULTI6) : \
-        $(RESLIB6SRSFILES) \
-        $(RESLIB6TARGETN) \
-        $(RESLIB6BMPS)
-    @echo Compiling: $(@:f)
-.IF "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-    -ft=$@ \
-    $(RSC6HEADER) $(RESLIB6SRSFILES) \
-    ) > $(NULLDEV)
-.ELSE			# "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)/$(RESLIB6NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil=$(BIN) \
-    -ft=$@ \
-    $(RSC6HEADER) $(RESLIB6SRSFILES) \
-    ) > $(NULLDEV)
-.ENDIF			# "$(common_build_reslib)"!=""
-
-$(RESLIB6TARGETN): \
-        $(RESLIB6SRSFILES) \
-        $(RESLIB6BMPS)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI6)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI6)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ELSE				# "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI6)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI6)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF              # "$(GUI)"=="UNX"
-.ENDIF				# "$(RESLIB6TARGETN)"!=""
-
-
-# unroll begin
-
-.IF "$(RESLIB7TARGETN)"!=""
-
-$(RSC_MULTI7) : \
-        $(RESLIB7SRSFILES) \
-        $(RESLIB7TARGETN) \
-        $(RESLIB7BMPS)
-    @echo Compiling: $(@:f)
-.IF "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-    -ft=$@ \
-    $(RSC7HEADER) $(RESLIB7SRSFILES) \
-    ) > $(NULLDEV)
-.ELSE			# "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)/$(RESLIB7NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil=$(BIN) \
-    -ft=$@ \
-    $(RSC7HEADER) $(RESLIB7SRSFILES) \
-    ) > $(NULLDEV)
-.ENDIF			# "$(common_build_reslib)"!=""
-
-$(RESLIB7TARGETN): \
-        $(RESLIB7SRSFILES) \
-        $(RESLIB7BMPS)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI7)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI7)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ELSE				# "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI7)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI7)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF              # "$(GUI)"=="UNX"
-.ENDIF				# "$(RESLIB7TARGETN)"!=""
-
-
-# unroll begin
-
-.IF "$(RESLIB8TARGETN)"!=""
-
-$(RSC_MULTI8) : \
-        $(RESLIB8SRSFILES) \
-        $(RESLIB8TARGETN) \
-        $(RESLIB8BMPS)
-    @echo Compiling: $(@:f)
-.IF "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-    -ft=$@ \
-    $(RSC8HEADER) $(RESLIB8SRSFILES) \
-    ) > $(NULLDEV)
-.ELSE			# "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)/$(RESLIB8NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil=$(BIN) \
-    -ft=$@ \
-    $(RSC8HEADER) $(RESLIB8SRSFILES) \
-    ) > $(NULLDEV)
-.ENDIF			# "$(common_build_reslib)"!=""
-
-$(RESLIB8TARGETN): \
-        $(RESLIB8SRSFILES) \
-        $(RESLIB8BMPS)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI8)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI8)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ELSE				# "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI8)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI8)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF              # "$(GUI)"=="UNX"
-.ENDIF				# "$(RESLIB8TARGETN)"!=""
-
-
-# unroll begin
-
-.IF "$(RESLIB9TARGETN)"!=""
-
-$(RSC_MULTI9) : \
-        $(RESLIB9SRSFILES) \
-        $(RESLIB9TARGETN) \
-        $(RESLIB9BMPS)
-    @echo Compiling: $(@:f)
-.IF "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-    -ft=$@ \
-    $(RSC9HEADER) $(RESLIB9SRSFILES) \
-    ) > $(NULLDEV)
-.ELSE			# "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)/$(RESLIB9NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil=$(BIN) \
-    -ft=$@ \
-    $(RSC9HEADER) $(RESLIB9SRSFILES) \
-    ) > $(NULLDEV)
-.ENDIF			# "$(common_build_reslib)"!=""
-
-$(RESLIB9TARGETN): \
-        $(RESLIB9SRSFILES) \
-        $(RESLIB9BMPS)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI9)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI9)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ELSE				# "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI9)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI9)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF              # "$(GUI)"=="UNX"
-.ENDIF				# "$(RESLIB9TARGETN)"!=""
-
-
-# unroll begin
-
-.IF "$(RESLIB10TARGETN)"!=""
-
-$(RSC_MULTI10) : \
-        $(RESLIB10SRSFILES) \
-        $(RESLIB10TARGETN) \
-        $(RESLIB10BMPS)
-    @echo Compiling: $(@:f)
-.IF "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB10NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-    -ft=$@ \
-    $(RSC10HEADER) $(RESLIB10SRSFILES) \
-    ) > $(NULLDEV)
-.ELSE			# "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)/$(RESLIB10NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil=$(BIN) \
-    -ft=$@ \
-    $(RSC10HEADER) $(RESLIB10SRSFILES) \
-    ) > $(NULLDEV)
-.ENDIF			# "$(common_build_reslib)"!=""
-
-$(RESLIB10TARGETN): \
-        $(RESLIB10SRSFILES) \
-        $(RESLIB10BMPS)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI10)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI10)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ELSE				# "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI10)
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI10)
-.ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF              # "$(GUI)"=="UNX"
-.ENDIF				# "$(RESLIB10TARGETN)"!=""
-
-
diff --git a/solenv/inc/_tg_scp.mk b/solenv/inc/_tg_scp.mk
deleted file mode 100644
index d13e57990..000000000
--- a/solenv/inc/_tg_scp.mk
+++ /dev/null
@@ -1,180 +0,0 @@
-# unroll begin
-
-.IF "$(SCP1TARGETN)"!=""
-
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
-    @@-$(MKDIRHIER) $(@:d:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-LOCALSCP1FILES+=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
-
-$(SCP1TARGETN): $(LOCALSCP1FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)/$(SCP1LINK_PRODUCT_TYPE)
-    $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP1FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
-.ENDIF
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(SCP2TARGETN)"!=""
-
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
-    @@-$(MKDIRHIER) $(@:d:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-LOCALSCP2FILES+=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
-
-$(SCP2TARGETN): $(LOCALSCP2FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)/$(SCP2LINK_PRODUCT_TYPE)
-    $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP2FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
-.ENDIF
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(SCP3TARGETN)"!=""
-
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
-    @@-$(MKDIRHIER) $(@:d:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-LOCALSCP3FILES+=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
-
-$(SCP3TARGETN): $(LOCALSCP3FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)/$(SCP3LINK_PRODUCT_TYPE)
-    $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP3FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
-.ENDIF
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(SCP4TARGETN)"!=""
-
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
-    @@-$(MKDIRHIER) $(@:d:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-LOCALSCP4FILES+=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
-
-$(SCP4TARGETN): $(LOCALSCP4FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)/$(SCP4LINK_PRODUCT_TYPE)
-    $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP4FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
-.ENDIF
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(SCP5TARGETN)"!=""
-
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
-    @@-$(MKDIRHIER) $(@:d:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-LOCALSCP5FILES+=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
-
-$(SCP5TARGETN): $(LOCALSCP5FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)/$(SCP5LINK_PRODUCT_TYPE)
-    $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP5FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
-.ENDIF
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(SCP6TARGETN)"!=""
-
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
-    @@-$(MKDIRHIER) $(@:d:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-LOCALSCP6FILES+=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
-
-$(SCP6TARGETN): $(LOCALSCP6FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)/$(SCP6LINK_PRODUCT_TYPE)
-    $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP6FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
-.ENDIF
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(SCP7TARGETN)"!=""
-
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
-    @@-$(MKDIRHIER) $(@:d:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-LOCALSCP7FILES+=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
-
-$(SCP7TARGETN): $(LOCALSCP7FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)/$(SCP7LINK_PRODUCT_TYPE)
-    $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP7FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
-.ENDIF
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(SCP8TARGETN)"!=""
-
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
-    @@-$(MKDIRHIER) $(@:d:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-LOCALSCP8FILES+=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
-
-$(SCP8TARGETN): $(LOCALSCP8FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)/$(SCP8LINK_PRODUCT_TYPE)
-    $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP8FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
-.ENDIF
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(SCP9TARGETN)"!=""
-
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
-    @@-$(MKDIRHIER) $(@:d:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-LOCALSCP9FILES+=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
-
-$(SCP9TARGETN): $(LOCALSCP9FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)/$(SCP9LINK_PRODUCT_TYPE)
-    $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP9FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
-.ENDIF
-
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(SCP10TARGETN)"!=""
-
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
-    @@-$(MKDIRHIER) $(@:d:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-LOCALSCP10FILES+=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
-
-$(SCP10TARGETN): $(LOCALSCP10FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)/$(SCP10LINK_PRODUCT_TYPE)
-    $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP10FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
-.ENDIF
-
-# Anweisungen fuer das Linken
diff --git a/solenv/inc/_tg_sdi.mk b/solenv/inc/_tg_sdi.mk
deleted file mode 100644
index 45ea433b0..000000000
--- a/solenv/inc/_tg_sdi.mk
+++ /dev/null
@@ -1,180 +0,0 @@
-# unroll begin
-
-.IF "$(SDI1TARGET)"!=""
-$(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
-    $(VERBOSITY) \
-    -fs$(INCCOMX)/$(SDI1NAME).hxx	\
-    -fd$(INCCOMX)/$(SDI1NAME).ilb	\
-    -fm$(MISC)/$(SDI1NAME).don	\
-    -fl$(MISC)/$(SDI1NAME).lst         \
-    -fx$(SDI1EXPORT).sdi		\
-    -fz$(MISC)/$(SDI1NAME).sid	\
-    $(SDI1NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
-.ENDIF # "$(SDI1TARGET)"!=""
-
-# Instruction for ???
-# unroll begin
-
-.IF "$(SDI2TARGET)"!=""
-$(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
-    $(VERBOSITY) \
-    -fs$(INCCOMX)/$(SDI2NAME).hxx	\
-    -fd$(INCCOMX)/$(SDI2NAME).ilb	\
-    -fm$(MISC)/$(SDI2NAME).don	\
-    -fl$(MISC)/$(SDI2NAME).lst         \
-    -fx$(SDI2EXPORT).sdi		\
-    -fz$(MISC)/$(SDI2NAME).sid	\
-    $(SDI2NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
-.ENDIF # "$(SDI2TARGET)"!=""
-
-# Instruction for ???
-# unroll begin
-
-.IF "$(SDI3TARGET)"!=""
-$(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
-    $(VERBOSITY) \
-    -fs$(INCCOMX)/$(SDI3NAME).hxx	\
-    -fd$(INCCOMX)/$(SDI3NAME).ilb	\
-    -fm$(MISC)/$(SDI3NAME).don	\
-    -fl$(MISC)/$(SDI3NAME).lst         \
-    -fx$(SDI3EXPORT).sdi		\
-    -fz$(MISC)/$(SDI3NAME).sid	\
-    $(SDI3NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
-.ENDIF # "$(SDI3TARGET)"!=""
-
-# Instruction for ???
-# unroll begin
-
-.IF "$(SDI4TARGET)"!=""
-$(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
-    $(VERBOSITY) \
-    -fs$(INCCOMX)/$(SDI4NAME).hxx	\
-    -fd$(INCCOMX)/$(SDI4NAME).ilb	\
-    -fm$(MISC)/$(SDI4NAME).don	\
-    -fl$(MISC)/$(SDI4NAME).lst         \
-    -fx$(SDI4EXPORT).sdi		\
-    -fz$(MISC)/$(SDI4NAME).sid	\
-    $(SDI4NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
-.ENDIF # "$(SDI4TARGET)"!=""
-
-# Instruction for ???
-# unroll begin
-
-.IF "$(SDI5TARGET)"!=""
-$(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
-    $(VERBOSITY) \
-    -fs$(INCCOMX)/$(SDI5NAME).hxx	\
-    -fd$(INCCOMX)/$(SDI5NAME).ilb	\
-    -fm$(MISC)/$(SDI5NAME).don	\
-    -fl$(MISC)/$(SDI5NAME).lst         \
-    -fx$(SDI5EXPORT).sdi		\
-    -fz$(MISC)/$(SDI5NAME).sid	\
-    $(SDI5NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
-.ENDIF # "$(SDI5TARGET)"!=""
-
-# Instruction for ???
-# unroll begin
-
-.IF "$(SDI6TARGET)"!=""
-$(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
-    $(VERBOSITY) \
-    -fs$(INCCOMX)/$(SDI6NAME).hxx	\
-    -fd$(INCCOMX)/$(SDI6NAME).ilb	\
-    -fm$(MISC)/$(SDI6NAME).don	\
-    -fl$(MISC)/$(SDI6NAME).lst         \
-    -fx$(SDI6EXPORT).sdi		\
-    -fz$(MISC)/$(SDI6NAME).sid	\
-    $(SDI6NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
-.ENDIF # "$(SDI6TARGET)"!=""
-
-# Instruction for ???
-# unroll begin
-
-.IF "$(SDI7TARGET)"!=""
-$(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
-    $(VERBOSITY) \
-    -fs$(INCCOMX)/$(SDI7NAME).hxx	\
-    -fd$(INCCOMX)/$(SDI7NAME).ilb	\
-    -fm$(MISC)/$(SDI7NAME).don	\
-    -fl$(MISC)/$(SDI7NAME).lst         \
-    -fx$(SDI7EXPORT).sdi		\
-    -fz$(MISC)/$(SDI7NAME).sid	\
-    $(SDI7NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
-.ENDIF # "$(SDI7TARGET)"!=""
-
-# Instruction for ???
-# unroll begin
-
-.IF "$(SDI8TARGET)"!=""
-$(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
-    $(VERBOSITY) \
-    -fs$(INCCOMX)/$(SDI8NAME).hxx	\
-    -fd$(INCCOMX)/$(SDI8NAME).ilb	\
-    -fm$(MISC)/$(SDI8NAME).don	\
-    -fl$(MISC)/$(SDI8NAME).lst         \
-    -fx$(SDI8EXPORT).sdi		\
-    -fz$(MISC)/$(SDI8NAME).sid	\
-    $(SDI8NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
-.ENDIF # "$(SDI8TARGET)"!=""
-
-# Instruction for ???
-# unroll begin
-
-.IF "$(SDI9TARGET)"!=""
-$(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
-    $(VERBOSITY) \
-    -fs$(INCCOMX)/$(SDI9NAME).hxx	\
-    -fd$(INCCOMX)/$(SDI9NAME).ilb	\
-    -fm$(MISC)/$(SDI9NAME).don	\
-    -fl$(MISC)/$(SDI9NAME).lst         \
-    -fx$(SDI9EXPORT).sdi		\
-    -fz$(MISC)/$(SDI9NAME).sid	\
-    $(SDI9NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
-.ENDIF # "$(SDI9TARGET)"!=""
-
-# Instruction for ???
-# unroll begin
-
-.IF "$(SDI10TARGET)"!=""
-$(SDI10TARGET): $(SVSDI10DEPEND) $(SDI10NAME).sdi
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
-    $(VERBOSITY) \
-    -fs$(INCCOMX)/$(SDI10NAME).hxx	\
-    -fd$(INCCOMX)/$(SDI10NAME).ilb	\
-    -fm$(MISC)/$(SDI10NAME).don	\
-    -fl$(MISC)/$(SDI10NAME).lst         \
-    -fx$(SDI10EXPORT).sdi		\
-    -fz$(MISC)/$(SDI10NAME).sid	\
-    $(SDI10NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
-.ENDIF # "$(SDI10TARGET)"!=""
-
-# Instruction for ???
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
deleted file mode 100644
index a60f9cec8..000000000
--- a/solenv/inc/_tg_shl.mk
+++ /dev/null
@@ -1,5470 +0,0 @@
-# unroll begin
-
-.IF "$(SHL1TARGETN)"!=""
-
-.IF "$(SHLLINKARCONLY)" != ""
-SHL1STDLIBS=
-STDSHL=
-.ELSE
-SHL1ARCHIVES=
-.ENDIF
-
-# decide how to link
-.IF "$(SHL1CODETYPE)"=="C"
-SHL1LINKER=$(LINKC)
-SHL1STDSHL=$(subst,CPPRUNTIME, $(STDSHL))
-SHL1LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(SHL1CODETYPE)"=="C"
-SHL1LINKER=$(LINK)
-SHL1STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
-SHL1LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(SHL1CODETYPE)"=="C"
-
-SHL1RPATH*=OOO
-LINKFLAGSRUNPATH_$(SHL1RPATH)*=/ERROR:/Bad_SHL1RPATH_value
-SHL1LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL1RPATH))
-
-.IF "$(SHL1USE_EXPORTS)"==""
-SHL1DEF*=$(MISC)/$(SHL1TARGET).def
-.ENDIF			# "$(SHL1USE_EXPORTS)"==""
-
-EXTRALIBPATHS1=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL1NOCHECK)"==""
-.IF "$(SOLAR_STLLIBPATH)"!=""
-EXTRALIBPATHS1+=-L$(SOLAR_STLLIBPATH)
-.ENDIF
-.ENDIF				# "$(SHL1NOCHECK)"!=""
-.ENDIF
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-.IF "$(L10N_framework)"==""
-.IF "$(VERSIONOBJ)"!=""
-SHL1VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)/$(SHL1VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
-SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE           # "$(GUI)" == "UNX"
-SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f)
-.ENDIF          # "$(GUI)" == "UNX"
-$(MISC)/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)/src/version.c $@
-    $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ:b).h/ > $@
-
-.INIT : $(SHL1VERSIONOBJDEP)
-.ENDIF			# "$(VERSIONOBJ)"!=""
-.ENDIF
-
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL1IMPLIB)" == ""
-SHL1IMPLIB=i$(TARGET)_t1
-.ENDIF			# "$(SHL1IMPLIB)" == ""
-.IF "$(COM)" != "GCC"
-USE_1IMPLIB=-implib:$(LB)/$(SHL1IMPLIB).lib
-SHL1IMPLIBN=$(LB)/$(SHL1IMPLIB).lib
-.ELSE
-USE_1IMPLIB=-Wl,--out-implib=$(SHL1IMPLIBN)
-SHL1IMPLIBN=$(LB)/lib$(SHL1IMPLIB).dll.a
-.ENDIF			# "$(COM)" != "GCC"
-ALLTAR : $(SHL1IMPLIBN)
-
-.IF "$(USE_DEFFILE)"==""
-.IF "$(COM)" != "GCC"
-USE_1IMPLIB_DEPS=$(LB)/$(SHL1IMPLIB).lib
-.ENDIF
-.ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT"
-USE_SHL1DEF=$(SHL1DEF)
-.ELSE			# "$(GUI)" != "UNX"
-USE_SHL1DEF=
-SHL1DEPN+:=$(SHL1DEPNU)
-
-.IF "$(SHL1VERSIONMAP)"==""
-# to activate vmaps remove "#"
-USE_SHL1VERSIONMAP=$(MISC)/$(SHL1TARGET).vmap
-.ENDIF			# "$(SHL1VERSIONMAP)"==""
-
-.IF "$(USE_SHL1VERSIONMAP)"!=""
-
-.IF "$(SHL1FILTERFILE)"!=""
-.IF "$(SHL1VERSIONMAP)"!=""
-#eine von beiden ist zuviel
-USE_SHL1VERSIONMAP=$(MISC)/$(SHL1TARGET).vmap
-$(USE_SHL1VERSIONMAP) .PHONY:
-    @echo -----------------------------
-    @echo you should only use versionmap OR exportfile
-    @echo -----------------------------
-#	force_dmake_to_error
-
-.ENDIF			# "$(SHL1VERSIONMAP)"!=""
-
-.IF "$(OS)" != "AIX"
-SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
-.ENDIF
-
-$(USE_SHL1VERSIONMAP): \
-                    $(SHL1OBJS)\
-                    $(SHL1LIBS)\
-                    $(SHL1FILTERFILE)
-    @$(RM) $@.dump
-.IF "$(SHL1OBJS)"!=""
-# dump remaining objects on the fly
-.IF "$(OS)"=="MACOSX"
-    @-nm $(SHL1OBJS:s/.obj/.o/) > $@.dump
-.ELSE
-    @nm $(SHL1OBJS:s/.obj/.o/) > $@.dump
-.ENDIF
-.ENDIF			# "$(SHL1OBJS)!"=""
-    @$(TYPE) /dev/null $(SHL1LIBS:s/.lib/.dump/) >> $@.dump
-    $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL1INTERFACE) -f $(SHL1FILTERFILE) -m $@
-
-.ELSE			# "$(SHL1FILTERFILE)"!=""
-USE_SHL1VERSIONMAP=$(MISC)/$(SHL1TARGET).vmap
-$(USE_SHL1VERSIONMAP) :
-.IF "$(VERBOSE)" == "TRUE"
-    @echo -----------------------------
-    @echo SHL1FILTERFILE not set!
-    @echo -----------------------------
-    @$(TOUCH) $@
-    @echo dummy file to keep the dependencies for later use.
-.ELSE
-    @$(TOUCH) $@
-.ENDIF
-#	force_dmake_to_error
-.ENDIF			# "$(SHL1FILTERFILE)"!=""
-.ELSE			# "$(USE_SHL1VERSIONMAP)"!=""
-
-#and now for the plain non-generic way...
-.IF "$(SHL1VERSIONMAP)"!=""
-USE_SHL1VERSIONMAP=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
-SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
-$(USE_SHL1VERSIONMAP): $(SHL1OBJS) $(SHL1LIBS)
-.ENDIF
-
-# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
-# even if the $(AWK) part fails:
-$(USE_SHL1VERSIONMAP) .ERRREMOVE: $(SHL1VERSIONMAP)
-    @@-$(RM) -f $@
-# The following files will only be generated and needed on Mac OS X as temporary files
-# in order to generate exported symbols list out of Linux/Solaris map files
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) -f $@.symregexp >& $(NULLDEV)
-    @-$(RM) -f $@.expsymlist >& $(NULLDEV)
-.ENDIF
-# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
-# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL1VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
-.ELIF "$(COMNAME)"=="sunpro5"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL1VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-.ELSE           # "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL1VERSIONMAP) > $@
-.ENDIF          # "$(COMID)"=="gcc3"
-    @chmod a+w $@
-# Mac OS X post-processing generate an exported symbols list from the generated map file
-# for details on exported symbols list see man ld on Mac OS X
-.IF "$(OS)"=="MACOSX"
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-.IF "$(SHL1OBJS)"!=""
-    -echo $(foreach,i,$(SHL1OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-.IF "$(SHL1LIBS)"!=""
-    $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    cp $@.exported-symbols $@
-.ENDIF # .IF "$(OS)"=="MACOSX"
-.ENDIF			# "$(SHL1VERSIONMAP)"!=""
-.ENDIF			# "$(USE_SHL1VERSIONMAP)"!=""
-.ENDIF			# "$(GUI)" != "UNX"
-
-.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
-SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\"
-.ENDIF			# "$(GUI)"!="UNX"
-.ENDIF			# "$(OS)"!="MACOSX"
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-
-.IF "$(SHL1RES)"!=""
-SHL1ALLRES+=$(SHL1RES)
-SHL1LINKRES*=$(MISC)/$(SHL1TARGET).res
-SHL1LINKRESO*=$(MISC)/$(SHL1TARGET)_res.o
-.ENDIF			# "$(SHL1RES)"!=""
-
-.IF "$(SHL1DEFAULTRES)$(use_shl_versions)"!=""
-SHL1DEFAULTRES*=$(MISC)/$(SHL1TARGET)_def.res
-SHL1ALLRES+=$(SHL1DEFAULTRES)
-SHL1LINKRES*=$(MISC)/$(SHL1TARGET).res
-SHL1LINKRESO*=$(MISC)/$(SHL1TARGET)_res.o
-.ENDIF			# "$(SHL1DEFAULTRES)$(use_shl_versions)"!=""
-
-#.IF "$(SHL1TARGETN)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL1LIBS)"!=""
-$(MISC)/$(SHL1TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL1LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(SHL1TARGETN:b)_linkinc.ls
-$(SHL1TARGETN) : $(LINKINCTARGETS)
-
-.ELSE
-.IF "$(SHL1USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-.IF "$(SHL1LIBS)"!=""
-SHL1LINKLIST=$(MISC)/$(SHL1TARGET)_link.lst
-SHL1LINKLISTPARAM=@$(SHL1LINKLIST)
-$(SHL1LINKLIST) : $(SHL1LIBS)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL1LIBS)"!=""
-.ENDIF          # "$(COM)"!="GCC"
-.ENDIF
-.ENDIF			# "$(SHL1USE_EXPORTS)"=="name"
-
-$(MISC)/%linkinc.ls:
-    @echo . > $@
-.ENDIF          # "$(linkinc)"!=""
-
-.IF "$(COM)" == "GCC" && "$(SHL1IMPLIBN)" != ""
-$(SHL1IMPLIBN) : $(SHL1TARGETN)
-.ENDIF
-
-$(SHL1TARGETN) : \
-                    $(SHL1OBJS)\
-                    $(SHL1LIBS)\
-                    $(USE_1IMPLIB_DEPS)\
-                    $(USE_SHL1DEF)\
-                    $(USE_SHL1VERSIONMAP)\
-                    $(SHL1RES)\
-                    $(SHL1DEPN) \
-                    $(SHL1LINKLIST)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL1DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)/$(SHL1DEFAULTRES:b).rc
-.IF "$(SHL1ICON)" != ""
-    @echo 1 ICON $(SHL1ICON) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL1ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc
-.ELSE			# "$(SHL1ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL1DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL1DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL1DEFAULTRES:b).rc
-.ENDIF			# "$(SHL1ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL1TARGET)$(DLLPOST) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-.IF "$(RCFLAGSOUTRES)"!=""
-# rc, takes separate flag naming output file, source .rc file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL1DEFAULTRES) $(MISC)/$(SHL1DEFAULTRES:b).rc
-.ELSE
-# windres, just takes output file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc $(SHL1DEFAULTRES)
-.ENDIF
-.ENDIF			# "$(SHL1DEFAULTRES)"!=""
-.IF "$(SHL1ALLRES)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES)
-.IF "$(COM)"=="GCC"
-    $(WINDRES) $(SHL1LINKRES) $(SHL1LINKRESO)
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(SHL1ALLRES)"!=""
-.IF "$(COM)"=="GCC"
-# GNU ld since 2.17 supports @cmdfile syntax
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL1LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL1DEF) \
-        $(USE_1IMPLIB) \
-        $(STDOBJ) \
-        $(SHL1VERSIONOBJ) $(SHL1OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL1LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL1STDLIBS) -Wl,--end-group \
-        $(SHL1STDSHL) $(STDSHL1) \
-        $(SHL1LINKRESO) \
-    ))
-.ELSE
-    @noop $(assign ALL1OBJLIST:=$(STDOBJ) $(SHL1OBJS) $(SHL1LINKRESO) $(shell $(TYPE) /dev/null $(SHL1LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-.IF "$(DEFLIB1NAME)"!=""	# do not have to include objs
-    @noop $(assign DEF1OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-    @noop $(foreach,i,$(DEF1OBJLIST) $(assign ALL1OBJLIST:=$(ALL1OBJLIST:s?$i??)))
-.ENDIF			# "$(DEFLIB1NAME)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL1LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL1DEF) \
-        $(USE_1IMPLIB) \
-        $(STDOBJ) \
-        $(SHL1VERSIONOBJ) $(SHL1OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL1LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL1STDLIBS) -Wl,--end-group \
-        $(SHL1STDSHL) $(STDSHL1) \
-        $(SHL1LINKRESO) \
-    ))
-.ENDIF
-.ELSE
-.IF "$(linkinc)"==""
-.IF "$(SHL1USE_EXPORTS)"!="name"
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL1LINKER) @$(mktmp \
-        $(SHL1LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL1STACK) $(SHL1BASEX)	\
-        -out:$@ \
-        -map:$(MISC)/$(@:b).map \
-        -def:$(SHL1DEF) \
-        $(USE_1IMPLIB) \
-        $(STDOBJ) \
-        $(SHL1VERSIONOBJ) $(SHL1OBJS) \
-        $(SHL1LIBS) \
-        $(SHL1STDLIBS) \
-        $(SHL1STDSHL) $(STDSHL1) \
-        $(SHL1LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE			# "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL1LINKER) @$(mktmp	$(SHL1LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL1BASEX)		\
-        $(SHL1STACK) -out:$(SHL1TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(LB)/$(SHL1IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL1OBJS) $(SHL1VERSIONOBJ) \
-        $(SHL1LIBS)                         \
-        $(SHL1STDLIBS)                      \
-        $(SHL1STDSHL) $(STDSHL1)                           \
-        $(SHL1LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(USE_DEFFILE)"!=""
-.ELSE			# "$(SHL1USE_EXPORTS)"!="name"
-    $(COMMAND_ECHO)$(SHL1LINKER) @$(mktmp	$(SHL1LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL1BASEX)		\
-        $(SHL1STACK) -out:$(SHL1TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(USE_1IMPLIB) \
-        $(STDOBJ)							\
-        $(SHL1OBJS) $(SHL1VERSIONOBJ))   \
-        $(SHL1LINKLISTPARAM) \
-        @$(mktmp $(SHL1STDLIBS)                      \
-        $(SHL1STDSHL) $(STDSHL1)                           \
-        $(SHL1LINKRES) \
-    )
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(SHL1USE_EXPORTS)"!="name"
-.ELSE			# "$(linkinc)"==""
-        $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL1TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL1TARGET).lst
-        $(COMMAND_ECHO)$(TYPE) $(mktmp \
-        $(SHL1LINKFLAGS) \
-        $(LINKFLAGSSHL) $(SHL1BASEX) \
-        $(SHL1STACK) $(MAPFILE) \
-        -out:$@ \
-        $(LB)/$(SHL1IMPLIB).exp \
-        $(STDOBJ) \
-        $(SHL1OBJS) \
-        $(SHL1STDLIBS) \
-        $(SHL1STDSHL) $(STDSHL1) \
-        $(SHL1LINKRES) \
-        ) >> $(MISC)/$(SHL1TARGET).lnk
-        $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL1TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL1TARGET).lnk
-        $(COMMAND_ECHO)$(SHL1LINKER) @$(MISC)/$(SHL1TARGET).lnk
-        @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(linkinc)"==""
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
-    @echo $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
-    $(SHL1VERSIONOBJ) \
-    `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
-    $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_1.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_1.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_1.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        shl $(SHL1RPATH) $@
-.IF "$(SHL1CREATEJNILIB)"!=""
-    @echo "Making:   " $(@:f).jnilib
-    @macosx-create-bundle $@
-.ENDIF          # "$(SHL1CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL1NOCHECK)"==""
-    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN)
-.ENDIF				# "$(SHL1NOCHECK)"!=""
-.ENDIF
-.ELIF "$(OS)"=="IOS"
-    $(COMMAND_ECHO)$(AR) $(LIB1FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL1OBJS)) $(shell cat /dev/null $(LIB1TARGET) $(SHL1LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
-    $(COMMAND_ECHO)$(RANLIB) $@
-.ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
-    @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
-    $(SHL1VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
-    $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_1.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_1.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL1NOCHECK)"==""
-    $(COMMAND_ECHO)-$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-    $(COMMAND_ECHO)$(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-.IF "$(VERBOSE)"=="TRUE"
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-.ELSE
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) -- -s $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-.ENDIF
-.ENDIF				# "$(SHL1NOCHECK)"!=""
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
-    $(COMMAND_ECHO)$(RM) $(LB)/$(SHL1TARGETN:b)
-    $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL1TARGETN:f) $(SHL1TARGETN:b)
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
-.ENDIF
-.ENDIF			# "$(GUI)" == "UNX"
-
-.ENDIF			# "$(SHL1TARGETN)"!=""
-
-# unroll begin
-
-.IF "$(SHL2TARGETN)"!=""
-
-.IF "$(SHLLINKARCONLY)" != ""
-SHL2STDLIBS=
-STDSHL=
-.ELSE
-SHL2ARCHIVES=
-.ENDIF
-
-# decide how to link
-.IF "$(SHL2CODETYPE)"=="C"
-SHL2LINKER=$(LINKC)
-SHL2STDSHL=$(subst,CPPRUNTIME, $(STDSHL))
-SHL2LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(SHL2CODETYPE)"=="C"
-SHL2LINKER=$(LINK)
-SHL2STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
-SHL2LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(SHL2CODETYPE)"=="C"
-
-SHL2RPATH*=OOO
-LINKFLAGSRUNPATH_$(SHL2RPATH)*=/ERROR:/Bad_SHL2RPATH_value
-SHL2LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL2RPATH))
-
-.IF "$(SHL2USE_EXPORTS)"==""
-SHL2DEF*=$(MISC)/$(SHL2TARGET).def
-.ENDIF			# "$(SHL2USE_EXPORTS)"==""
-
-EXTRALIBPATHS2=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL2NOCHECK)"==""
-.IF "$(SOLAR_STLLIBPATH)"!=""
-EXTRALIBPATHS2+=-L$(SOLAR_STLLIBPATH)
-.ENDIF
-.ENDIF				# "$(SHL2NOCHECK)"!=""
-.ENDIF
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-.IF "$(L10N_framework)"==""
-.IF "$(VERSIONOBJ)"!=""
-SHL2VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)/$(SHL2VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
-SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE           # "$(GUI)" == "UNX"
-SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f)
-.ENDIF          # "$(GUI)" == "UNX"
-$(MISC)/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)/src/version.c $@
-    $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ:b).h/ > $@
-
-.INIT : $(SHL2VERSIONOBJDEP)
-.ENDIF			# "$(VERSIONOBJ)"!=""
-.ENDIF
-
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL2IMPLIB)" == ""
-SHL2IMPLIB=i$(TARGET)_t2
-.ENDIF			# "$(SHL2IMPLIB)" == ""
-.IF "$(COM)" != "GCC"
-USE_2IMPLIB=-implib:$(LB)/$(SHL2IMPLIB).lib
-SHL2IMPLIBN=$(LB)/$(SHL2IMPLIB).lib
-.ELSE
-USE_2IMPLIB=-Wl,--out-implib=$(SHL2IMPLIBN)
-SHL2IMPLIBN=$(LB)/lib$(SHL2IMPLIB).dll.a
-.ENDIF			# "$(COM)" != "GCC"
-ALLTAR : $(SHL2IMPLIBN)
-
-.IF "$(USE_DEFFILE)"==""
-.IF "$(COM)" != "GCC"
-USE_2IMPLIB_DEPS=$(LB)/$(SHL2IMPLIB).lib
-.ENDIF
-.ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT"
-USE_SHL2DEF=$(SHL2DEF)
-.ELSE			# "$(GUI)" != "UNX"
-USE_SHL2DEF=
-SHL2DEPN+:=$(SHL2DEPNU)
-
-.IF "$(SHL2VERSIONMAP)"==""
-# to activate vmaps remove "#"
-USE_SHL2VERSIONMAP=$(MISC)/$(SHL2TARGET).vmap
-.ENDIF			# "$(SHL2VERSIONMAP)"==""
-
-.IF "$(USE_SHL2VERSIONMAP)"!=""
-
-.IF "$(SHL2FILTERFILE)"!=""
-.IF "$(SHL2VERSIONMAP)"!=""
-#eine von beiden ist zuviel
-USE_SHL2VERSIONMAP=$(MISC)/$(SHL2TARGET).vmap
-$(USE_SHL2VERSIONMAP) .PHONY:
-    @echo -----------------------------
-    @echo you should only use versionmap OR exportfile
-    @echo -----------------------------
-#	force_dmake_to_error
-
-.ENDIF			# "$(SHL2VERSIONMAP)"!=""
-
-.IF "$(OS)" != "AIX"
-SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
-.ENDIF
-
-$(USE_SHL2VERSIONMAP): \
-                    $(SHL2OBJS)\
-                    $(SHL2LIBS)\
-                    $(SHL2FILTERFILE)
-    @$(RM) $@.dump
-.IF "$(SHL2OBJS)"!=""
-# dump remaining objects on the fly
-.IF "$(OS)"=="MACOSX"
-    @-nm $(SHL2OBJS:s/.obj/.o/) > $@.dump
-.ELSE
-    @nm $(SHL2OBJS:s/.obj/.o/) > $@.dump
-.ENDIF
-.ENDIF			# "$(SHL2OBJS)!"=""
-    @$(TYPE) /dev/null $(SHL2LIBS:s/.lib/.dump/) >> $@.dump
-    $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL2INTERFACE) -f $(SHL2FILTERFILE) -m $@
-
-.ELSE			# "$(SHL2FILTERFILE)"!=""
-USE_SHL2VERSIONMAP=$(MISC)/$(SHL2TARGET).vmap
-$(USE_SHL2VERSIONMAP) :
-.IF "$(VERBOSE)" == "TRUE"
-    @echo -----------------------------
-    @echo SHL2FILTERFILE not set!
-    @echo -----------------------------
-    @$(TOUCH) $@
-    @echo dummy file to keep the dependencies for later use.
-.ELSE
-    @$(TOUCH) $@
-.ENDIF
-#	force_dmake_to_error
-.ENDIF			# "$(SHL2FILTERFILE)"!=""
-.ELSE			# "$(USE_SHL2VERSIONMAP)"!=""
-
-#and now for the plain non-generic way...
-.IF "$(SHL2VERSIONMAP)"!=""
-USE_SHL2VERSIONMAP=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
-SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
-$(USE_SHL2VERSIONMAP): $(SHL2OBJS) $(SHL2LIBS)
-.ENDIF
-
-# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
-# even if the $(AWK) part fails:
-$(USE_SHL2VERSIONMAP) .ERRREMOVE: $(SHL2VERSIONMAP)
-    @@-$(RM) -f $@
-# The following files will only be generated and needed on Mac OS X as temporary files
-# in order to generate exported symbols list out of Linux/Solaris map files
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) -f $@.symregexp >& $(NULLDEV)
-    @-$(RM) -f $@.expsymlist >& $(NULLDEV)
-.ENDIF
-# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
-# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL2VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
-.ELIF "$(COMNAME)"=="sunpro5"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL2VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-.ELSE           # "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL2VERSIONMAP) > $@
-.ENDIF          # "$(COMID)"=="gcc3"
-    @chmod a+w $@
-# Mac OS X post-processing generate an exported symbols list from the generated map file
-# for details on exported symbols list see man ld on Mac OS X
-.IF "$(OS)"=="MACOSX"
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-.IF "$(SHL2OBJS)"!=""
-    -echo $(foreach,i,$(SHL2OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-.IF "$(SHL2LIBS)"!=""
-    $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    cp $@.exported-symbols $@
-.ENDIF # .IF "$(OS)"=="MACOSX"
-.ENDIF			# "$(SHL2VERSIONMAP)"!=""
-.ENDIF			# "$(USE_SHL2VERSIONMAP)"!=""
-.ENDIF			# "$(GUI)" != "UNX"
-
-.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
-SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\"
-.ENDIF			# "$(GUI)"!="UNX"
-.ENDIF			# "$(OS)"!="MACOSX"
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-
-.IF "$(SHL2RES)"!=""
-SHL2ALLRES+=$(SHL2RES)
-SHL2LINKRES*=$(MISC)/$(SHL2TARGET).res
-SHL2LINKRESO*=$(MISC)/$(SHL2TARGET)_res.o
-.ENDIF			# "$(SHL2RES)"!=""
-
-.IF "$(SHL2DEFAULTRES)$(use_shl_versions)"!=""
-SHL2DEFAULTRES*=$(MISC)/$(SHL2TARGET)_def.res
-SHL2ALLRES+=$(SHL2DEFAULTRES)
-SHL2LINKRES*=$(MISC)/$(SHL2TARGET).res
-SHL2LINKRESO*=$(MISC)/$(SHL2TARGET)_res.o
-.ENDIF			# "$(SHL2DEFAULTRES)$(use_shl_versions)"!=""
-
-#.IF "$(SHL2TARGETN)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL2LIBS)"!=""
-$(MISC)/$(SHL2TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL2LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(SHL2TARGETN:b)_linkinc.ls
-$(SHL2TARGETN) : $(LINKINCTARGETS)
-
-.ELSE
-.IF "$(SHL2USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-.IF "$(SHL2LIBS)"!=""
-SHL2LINKLIST=$(MISC)/$(SHL2TARGET)_link.lst
-SHL2LINKLISTPARAM=@$(SHL2LINKLIST)
-$(SHL2LINKLIST) : $(SHL2LIBS)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL2LIBS)"!=""
-.ENDIF          # "$(COM)"!="GCC"
-.ENDIF
-.ENDIF			# "$(SHL2USE_EXPORTS)"=="name"
-
-$(MISC)/%linkinc.ls:
-    @echo . > $@
-.ENDIF          # "$(linkinc)"!=""
-
-.IF "$(COM)" == "GCC" && "$(SHL2IMPLIBN)" != ""
-$(SHL2IMPLIBN) : $(SHL2TARGETN)
-.ENDIF
-
-$(SHL2TARGETN) : \
-                    $(SHL2OBJS)\
-                    $(SHL2LIBS)\
-                    $(USE_2IMPLIB_DEPS)\
-                    $(USE_SHL2DEF)\
-                    $(USE_SHL2VERSIONMAP)\
-                    $(SHL2RES)\
-                    $(SHL2DEPN) \
-                    $(SHL2LINKLIST)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL2DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)/$(SHL2DEFAULTRES:b).rc
-.IF "$(SHL2ICON)" != ""
-    @echo 1 ICON $(SHL2ICON) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL2ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc
-.ELSE			# "$(SHL2ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL2DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL2DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL2DEFAULTRES:b).rc
-.ENDIF			# "$(SHL2ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL2TARGET)$(DLLPOST) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-.IF "$(RCFLAGSOUTRES)"!=""
-# rc, takes separate flag naming output file, source .rc file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL2DEFAULTRES) $(MISC)/$(SHL2DEFAULTRES:b).rc
-.ELSE
-# windres, just takes output file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc $(SHL2DEFAULTRES)
-.ENDIF
-.ENDIF			# "$(SHL2DEFAULTRES)"!=""
-.IF "$(SHL2ALLRES)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES)
-.IF "$(COM)"=="GCC"
-    $(WINDRES) $(SHL2LINKRES) $(SHL2LINKRESO)
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(SHL2ALLRES)"!=""
-.IF "$(COM)"=="GCC"
-# GNU ld since 2.17 supports @cmdfile syntax
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL2LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL2DEF) \
-        $(USE_2IMPLIB) \
-        $(STDOBJ) \
-        $(SHL2VERSIONOBJ) $(SHL2OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL2LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL2STDLIBS) -Wl,--end-group \
-        $(SHL2STDSHL) $(STDSHL2) \
-        $(SHL2LINKRESO) \
-    ))
-.ELSE
-    @noop $(assign ALL2OBJLIST:=$(STDOBJ) $(SHL2OBJS) $(SHL2LINKRESO) $(shell $(TYPE) /dev/null $(SHL2LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-.IF "$(DEFLIB2NAME)"!=""	# do not have to include objs
-    @noop $(assign DEF2OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-    @noop $(foreach,i,$(DEF2OBJLIST) $(assign ALL2OBJLIST:=$(ALL2OBJLIST:s?$i??)))
-.ENDIF			# "$(DEFLIB2NAME)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL2LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL2DEF) \
-        $(USE_2IMPLIB) \
-        $(STDOBJ) \
-        $(SHL2VERSIONOBJ) $(SHL2OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL2LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL2STDLIBS) -Wl,--end-group \
-        $(SHL2STDSHL) $(STDSHL2) \
-        $(SHL2LINKRESO) \
-    ))
-.ENDIF
-.ELSE
-.IF "$(linkinc)"==""
-.IF "$(SHL2USE_EXPORTS)"!="name"
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL2LINKER) @$(mktmp \
-        $(SHL2LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL2STACK) $(SHL2BASEX)	\
-        -out:$@ \
-        -map:$(MISC)/$(@:b).map \
-        -def:$(SHL2DEF) \
-        $(USE_2IMPLIB) \
-        $(STDOBJ) \
-        $(SHL2VERSIONOBJ) $(SHL2OBJS) \
-        $(SHL2LIBS) \
-        $(SHL2STDLIBS) \
-        $(SHL2STDSHL) $(STDSHL2) \
-        $(SHL2LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE			# "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL2LINKER) @$(mktmp	$(SHL2LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL2BASEX)		\
-        $(SHL2STACK) -out:$(SHL2TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(LB)/$(SHL2IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL2OBJS) $(SHL2VERSIONOBJ) \
-        $(SHL2LIBS)                         \
-        $(SHL2STDLIBS)                      \
-        $(SHL2STDSHL) $(STDSHL2)                           \
-        $(SHL2LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(USE_DEFFILE)"!=""
-.ELSE			# "$(SHL2USE_EXPORTS)"!="name"
-    $(COMMAND_ECHO)$(SHL2LINKER) @$(mktmp	$(SHL2LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL2BASEX)		\
-        $(SHL2STACK) -out:$(SHL2TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(USE_2IMPLIB) \
-        $(STDOBJ)							\
-        $(SHL2OBJS) $(SHL2VERSIONOBJ))   \
-        $(SHL2LINKLISTPARAM) \
-        @$(mktmp $(SHL2STDLIBS)                      \
-        $(SHL2STDSHL) $(STDSHL2)                           \
-        $(SHL2LINKRES) \
-    )
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(SHL2USE_EXPORTS)"!="name"
-.ELSE			# "$(linkinc)"==""
-        $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL2TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL2TARGET).lst
-        $(COMMAND_ECHO)$(TYPE) $(mktmp \
-        $(SHL2LINKFLAGS) \
-        $(LINKFLAGSSHL) $(SHL2BASEX) \
-        $(SHL2STACK) $(MAPFILE) \
-        -out:$@ \
-        $(LB)/$(SHL2IMPLIB).exp \
-        $(STDOBJ) \
-        $(SHL2OBJS) \
-        $(SHL2STDLIBS) \
-        $(SHL2STDSHL) $(STDSHL2) \
-        $(SHL2LINKRES) \
-        ) >> $(MISC)/$(SHL2TARGET).lnk
-        $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL2TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL2TARGET).lnk
-        $(COMMAND_ECHO)$(SHL2LINKER) @$(MISC)/$(SHL2TARGET).lnk
-        @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(linkinc)"==""
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
-    @echo $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
-    $(SHL2VERSIONOBJ) \
-    `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
-    $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_2.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_2.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_2.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        shl $(SHL2RPATH) $@
-.IF "$(SHL2CREATEJNILIB)"!=""
-    @echo "Making:   " $(@:f).jnilib
-    @macosx-create-bundle $@
-.ENDIF          # "$(SHL2CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL2NOCHECK)"==""
-    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN)
-.ENDIF				# "$(SHL2NOCHECK)"!=""
-.ENDIF
-.ELIF "$(OS)"=="IOS"
-    $(COMMAND_ECHO)$(AR) $(LIB2FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL2OBJS)) $(shell cat /dev/null $(LIB2TARGET) $(SHL2LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
-    $(COMMAND_ECHO)$(RANLIB) $@
-.ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
-    @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
-    $(SHL2VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
-    $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_2.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_2.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL2NOCHECK)"==""
-    $(COMMAND_ECHO)-$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-    $(COMMAND_ECHO)$(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-.IF "$(VERBOSE)"=="TRUE"
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-.ELSE
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) -- -s $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-.ENDIF
-.ENDIF				# "$(SHL2NOCHECK)"!=""
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
-    $(COMMAND_ECHO)$(RM) $(LB)/$(SHL2TARGETN:b)
-    $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL2TARGETN:f) $(SHL2TARGETN:b)
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
-.ENDIF
-.ENDIF			# "$(GUI)" == "UNX"
-
-.ENDIF			# "$(SHL2TARGETN)"!=""
-
-# unroll begin
-
-.IF "$(SHL3TARGETN)"!=""
-
-.IF "$(SHLLINKARCONLY)" != ""
-SHL3STDLIBS=
-STDSHL=
-.ELSE
-SHL3ARCHIVES=
-.ENDIF
-
-# decide how to link
-.IF "$(SHL3CODETYPE)"=="C"
-SHL3LINKER=$(LINKC)
-SHL3STDSHL=$(subst,CPPRUNTIME, $(STDSHL))
-SHL3LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(SHL3CODETYPE)"=="C"
-SHL3LINKER=$(LINK)
-SHL3STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
-SHL3LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(SHL3CODETYPE)"=="C"
-
-SHL3RPATH*=OOO
-LINKFLAGSRUNPATH_$(SHL3RPATH)*=/ERROR:/Bad_SHL3RPATH_value
-SHL3LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL3RPATH))
-
-.IF "$(SHL3USE_EXPORTS)"==""
-SHL3DEF*=$(MISC)/$(SHL3TARGET).def
-.ENDIF			# "$(SHL3USE_EXPORTS)"==""
-
-EXTRALIBPATHS3=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL3NOCHECK)"==""
-.IF "$(SOLAR_STLLIBPATH)"!=""
-EXTRALIBPATHS3+=-L$(SOLAR_STLLIBPATH)
-.ENDIF
-.ENDIF				# "$(SHL3NOCHECK)"!=""
-.ENDIF
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-.IF "$(L10N_framework)"==""
-.IF "$(VERSIONOBJ)"!=""
-SHL3VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)/$(SHL3VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
-SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE           # "$(GUI)" == "UNX"
-SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f)
-.ENDIF          # "$(GUI)" == "UNX"
-$(MISC)/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL3VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)/src/version.c $@
-    $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL3VERSIONOBJ:b).h/ > $@
-
-.INIT : $(SHL3VERSIONOBJDEP)
-.ENDIF			# "$(VERSIONOBJ)"!=""
-.ENDIF
-
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL3IMPLIB)" == ""
-SHL3IMPLIB=i$(TARGET)_t3
-.ENDIF			# "$(SHL3IMPLIB)" == ""
-.IF "$(COM)" != "GCC"
-USE_3IMPLIB=-implib:$(LB)/$(SHL3IMPLIB).lib
-SHL3IMPLIBN=$(LB)/$(SHL3IMPLIB).lib
-.ELSE
-USE_3IMPLIB=-Wl,--out-implib=$(SHL3IMPLIBN)
-SHL3IMPLIBN=$(LB)/lib$(SHL3IMPLIB).dll.a
-.ENDIF			# "$(COM)" != "GCC"
-ALLTAR : $(SHL3IMPLIBN)
-
-.IF "$(USE_DEFFILE)"==""
-.IF "$(COM)" != "GCC"
-USE_3IMPLIB_DEPS=$(LB)/$(SHL3IMPLIB).lib
-.ENDIF
-.ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT"
-USE_SHL3DEF=$(SHL3DEF)
-.ELSE			# "$(GUI)" != "UNX"
-USE_SHL3DEF=
-SHL3DEPN+:=$(SHL3DEPNU)
-
-.IF "$(SHL3VERSIONMAP)"==""
-# to activate vmaps remove "#"
-USE_SHL3VERSIONMAP=$(MISC)/$(SHL3TARGET).vmap
-.ENDIF			# "$(SHL3VERSIONMAP)"==""
-
-.IF "$(USE_SHL3VERSIONMAP)"!=""
-
-.IF "$(SHL3FILTERFILE)"!=""
-.IF "$(SHL3VERSIONMAP)"!=""
-#eine von beiden ist zuviel
-USE_SHL3VERSIONMAP=$(MISC)/$(SHL3TARGET).vmap
-$(USE_SHL3VERSIONMAP) .PHONY:
-    @echo -----------------------------
-    @echo you should only use versionmap OR exportfile
-    @echo -----------------------------
-#	force_dmake_to_error
-
-.ENDIF			# "$(SHL3VERSIONMAP)"!=""
-
-.IF "$(OS)" != "AIX"
-SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
-.ENDIF
-
-$(USE_SHL3VERSIONMAP): \
-                    $(SHL3OBJS)\
-                    $(SHL3LIBS)\
-                    $(SHL3FILTERFILE)
-    @$(RM) $@.dump
-.IF "$(SHL3OBJS)"!=""
-# dump remaining objects on the fly
-.IF "$(OS)"=="MACOSX"
-    @-nm $(SHL3OBJS:s/.obj/.o/) > $@.dump
-.ELSE
-    @nm $(SHL3OBJS:s/.obj/.o/) > $@.dump
-.ENDIF
-.ENDIF			# "$(SHL3OBJS)!"=""
-    @$(TYPE) /dev/null $(SHL3LIBS:s/.lib/.dump/) >> $@.dump
-    $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL3INTERFACE) -f $(SHL3FILTERFILE) -m $@
-
-.ELSE			# "$(SHL3FILTERFILE)"!=""
-USE_SHL3VERSIONMAP=$(MISC)/$(SHL3TARGET).vmap
-$(USE_SHL3VERSIONMAP) :
-.IF "$(VERBOSE)" == "TRUE"
-    @echo -----------------------------
-    @echo SHL3FILTERFILE not set!
-    @echo -----------------------------
-    @$(TOUCH) $@
-    @echo dummy file to keep the dependencies for later use.
-.ELSE
-    @$(TOUCH) $@
-.ENDIF
-#	force_dmake_to_error
-.ENDIF			# "$(SHL3FILTERFILE)"!=""
-.ELSE			# "$(USE_SHL3VERSIONMAP)"!=""
-
-#and now for the plain non-generic way...
-.IF "$(SHL3VERSIONMAP)"!=""
-USE_SHL3VERSIONMAP=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
-SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
-$(USE_SHL3VERSIONMAP): $(SHL3OBJS) $(SHL3LIBS)
-.ENDIF
-
-# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
-# even if the $(AWK) part fails:
-$(USE_SHL3VERSIONMAP) .ERRREMOVE: $(SHL3VERSIONMAP)
-    @@-$(RM) -f $@
-# The following files will only be generated and needed on Mac OS X as temporary files
-# in order to generate exported symbols list out of Linux/Solaris map files
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) -f $@.symregexp >& $(NULLDEV)
-    @-$(RM) -f $@.expsymlist >& $(NULLDEV)
-.ENDIF
-# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
-# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL3VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
-.ELIF "$(COMNAME)"=="sunpro5"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL3VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-.ELSE           # "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL3VERSIONMAP) > $@
-.ENDIF          # "$(COMID)"=="gcc3"
-    @chmod a+w $@
-# Mac OS X post-processing generate an exported symbols list from the generated map file
-# for details on exported symbols list see man ld on Mac OS X
-.IF "$(OS)"=="MACOSX"
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-.IF "$(SHL3OBJS)"!=""
-    -echo $(foreach,i,$(SHL3OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-.IF "$(SHL3LIBS)"!=""
-    $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    cp $@.exported-symbols $@
-.ENDIF # .IF "$(OS)"=="MACOSX"
-.ENDIF			# "$(SHL3VERSIONMAP)"!=""
-.ENDIF			# "$(USE_SHL3VERSIONMAP)"!=""
-.ENDIF			# "$(GUI)" != "UNX"
-
-.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
-SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\"
-.ENDIF			# "$(GUI)"!="UNX"
-.ENDIF			# "$(OS)"!="MACOSX"
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-
-.IF "$(SHL3RES)"!=""
-SHL3ALLRES+=$(SHL3RES)
-SHL3LINKRES*=$(MISC)/$(SHL3TARGET).res
-SHL3LINKRESO*=$(MISC)/$(SHL3TARGET)_res.o
-.ENDIF			# "$(SHL3RES)"!=""
-
-.IF "$(SHL3DEFAULTRES)$(use_shl_versions)"!=""
-SHL3DEFAULTRES*=$(MISC)/$(SHL3TARGET)_def.res
-SHL3ALLRES+=$(SHL3DEFAULTRES)
-SHL3LINKRES*=$(MISC)/$(SHL3TARGET).res
-SHL3LINKRESO*=$(MISC)/$(SHL3TARGET)_res.o
-.ENDIF			# "$(SHL3DEFAULTRES)$(use_shl_versions)"!=""
-
-#.IF "$(SHL3TARGETN)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL3LIBS)"!=""
-$(MISC)/$(SHL3TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL3LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(SHL3TARGETN:b)_linkinc.ls
-$(SHL3TARGETN) : $(LINKINCTARGETS)
-
-.ELSE
-.IF "$(SHL3USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-.IF "$(SHL3LIBS)"!=""
-SHL3LINKLIST=$(MISC)/$(SHL3TARGET)_link.lst
-SHL3LINKLISTPARAM=@$(SHL3LINKLIST)
-$(SHL3LINKLIST) : $(SHL3LIBS)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL3LIBS)"!=""
-.ENDIF          # "$(COM)"!="GCC"
-.ENDIF
-.ENDIF			# "$(SHL3USE_EXPORTS)"=="name"
-
-$(MISC)/%linkinc.ls:
-    @echo . > $@
-.ENDIF          # "$(linkinc)"!=""
-
-.IF "$(COM)" == "GCC" && "$(SHL3IMPLIBN)" != ""
-$(SHL3IMPLIBN) : $(SHL3TARGETN)
-.ENDIF
-
-$(SHL3TARGETN) : \
-                    $(SHL3OBJS)\
-                    $(SHL3LIBS)\
-                    $(USE_3IMPLIB_DEPS)\
-                    $(USE_SHL3DEF)\
-                    $(USE_SHL3VERSIONMAP)\
-                    $(SHL3RES)\
-                    $(SHL3DEPN) \
-                    $(SHL3LINKLIST)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL3DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)/$(SHL3DEFAULTRES:b).rc
-.IF "$(SHL3ICON)" != ""
-    @echo 1 ICON $(SHL3ICON) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL3ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL3ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc
-.ELSE			# "$(SHL3ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL3DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL3DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL3DEFAULTRES:b).rc
-.ENDIF			# "$(SHL3ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL3TARGET)$(DLLPOST) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-.IF "$(RCFLAGSOUTRES)"!=""
-# rc, takes separate flag naming output file, source .rc file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL3DEFAULTRES) $(MISC)/$(SHL3DEFAULTRES:b).rc
-.ELSE
-# windres, just takes output file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc $(SHL3DEFAULTRES)
-.ENDIF
-.ENDIF			# "$(SHL3DEFAULTRES)"!=""
-.IF "$(SHL3ALLRES)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES)
-.IF "$(COM)"=="GCC"
-    $(WINDRES) $(SHL3LINKRES) $(SHL3LINKRESO)
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(SHL3ALLRES)"!=""
-.IF "$(COM)"=="GCC"
-# GNU ld since 2.17 supports @cmdfile syntax
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL3LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL3DEF) \
-        $(USE_3IMPLIB) \
-        $(STDOBJ) \
-        $(SHL3VERSIONOBJ) $(SHL3OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL3LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL3STDLIBS) -Wl,--end-group \
-        $(SHL3STDSHL) $(STDSHL3) \
-        $(SHL3LINKRESO) \
-    ))
-.ELSE
-    @noop $(assign ALL3OBJLIST:=$(STDOBJ) $(SHL3OBJS) $(SHL3LINKRESO) $(shell $(TYPE) /dev/null $(SHL3LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-.IF "$(DEFLIB3NAME)"!=""	# do not have to include objs
-    @noop $(assign DEF3OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-    @noop $(foreach,i,$(DEF3OBJLIST) $(assign ALL3OBJLIST:=$(ALL3OBJLIST:s?$i??)))
-.ENDIF			# "$(DEFLIB3NAME)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL3LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL3DEF) \
-        $(USE_3IMPLIB) \
-        $(STDOBJ) \
-        $(SHL3VERSIONOBJ) $(SHL3OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL3LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL3STDLIBS) -Wl,--end-group \
-        $(SHL3STDSHL) $(STDSHL3) \
-        $(SHL3LINKRESO) \
-    ))
-.ENDIF
-.ELSE
-.IF "$(linkinc)"==""
-.IF "$(SHL3USE_EXPORTS)"!="name"
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL3LINKER) @$(mktmp \
-        $(SHL3LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL3STACK) $(SHL3BASEX)	\
-        -out:$@ \
-        -map:$(MISC)/$(@:b).map \
-        -def:$(SHL3DEF) \
-        $(USE_3IMPLIB) \
-        $(STDOBJ) \
-        $(SHL3VERSIONOBJ) $(SHL3OBJS) \
-        $(SHL3LIBS) \
-        $(SHL3STDLIBS) \
-        $(SHL3STDSHL) $(STDSHL3) \
-        $(SHL3LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE			# "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL3LINKER) @$(mktmp	$(SHL3LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL3BASEX)		\
-        $(SHL3STACK) -out:$(SHL3TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(LB)/$(SHL3IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL3OBJS) $(SHL3VERSIONOBJ) \
-        $(SHL3LIBS)                         \
-        $(SHL3STDLIBS)                      \
-        $(SHL3STDSHL) $(STDSHL3)                           \
-        $(SHL3LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(USE_DEFFILE)"!=""
-.ELSE			# "$(SHL3USE_EXPORTS)"!="name"
-    $(COMMAND_ECHO)$(SHL3LINKER) @$(mktmp	$(SHL3LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL3BASEX)		\
-        $(SHL3STACK) -out:$(SHL3TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(USE_3IMPLIB) \
-        $(STDOBJ)							\
-        $(SHL3OBJS) $(SHL3VERSIONOBJ))   \
-        $(SHL3LINKLISTPARAM) \
-        @$(mktmp $(SHL3STDLIBS)                      \
-        $(SHL3STDSHL) $(STDSHL3)                           \
-        $(SHL3LINKRES) \
-    )
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(SHL3USE_EXPORTS)"!="name"
-.ELSE			# "$(linkinc)"==""
-        $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL3TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL3TARGET).lst
-        $(COMMAND_ECHO)$(TYPE) $(mktmp \
-        $(SHL3LINKFLAGS) \
-        $(LINKFLAGSSHL) $(SHL3BASEX) \
-        $(SHL3STACK) $(MAPFILE) \
-        -out:$@ \
-        $(LB)/$(SHL3IMPLIB).exp \
-        $(STDOBJ) \
-        $(SHL3OBJS) \
-        $(SHL3STDLIBS) \
-        $(SHL3STDSHL) $(STDSHL3) \
-        $(SHL3LINKRES) \
-        ) >> $(MISC)/$(SHL3TARGET).lnk
-        $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL3TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL3TARGET).lnk
-        $(COMMAND_ECHO)$(SHL3LINKER) @$(MISC)/$(SHL3TARGET).lnk
-        @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(linkinc)"==""
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
-    @echo $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
-    $(SHL3VERSIONOBJ) \
-    `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
-    $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_3.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_3.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_3.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        shl $(SHL3RPATH) $@
-.IF "$(SHL3CREATEJNILIB)"!=""
-    @echo "Making:   " $(@:f).jnilib
-    @macosx-create-bundle $@
-.ENDIF          # "$(SHL3CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL3NOCHECK)"==""
-    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN)
-.ENDIF				# "$(SHL3NOCHECK)"!=""
-.ENDIF
-.ELIF "$(OS)"=="IOS"
-    $(COMMAND_ECHO)$(AR) $(LIB3FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL3OBJS)) $(shell cat /dev/null $(LIB3TARGET) $(SHL3LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
-    $(COMMAND_ECHO)$(RANLIB) $@
-.ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
-    @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
-    $(SHL3VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
-    $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_3.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_3.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL3NOCHECK)"==""
-    $(COMMAND_ECHO)-$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-    $(COMMAND_ECHO)$(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-.IF "$(VERBOSE)"=="TRUE"
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-.ELSE
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) -- -s $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-.ENDIF
-.ENDIF				# "$(SHL3NOCHECK)"!=""
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
-    $(COMMAND_ECHO)$(RM) $(LB)/$(SHL3TARGETN:b)
-    $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL3TARGETN:f) $(SHL3TARGETN:b)
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
-.ENDIF
-.ENDIF			# "$(GUI)" == "UNX"
-
-.ENDIF			# "$(SHL3TARGETN)"!=""
-
-# unroll begin
-
-.IF "$(SHL4TARGETN)"!=""
-
-.IF "$(SHLLINKARCONLY)" != ""
-SHL4STDLIBS=
-STDSHL=
-.ELSE
-SHL4ARCHIVES=
-.ENDIF
-
-# decide how to link
-.IF "$(SHL4CODETYPE)"=="C"
-SHL4LINKER=$(LINKC)
-SHL4STDSHL=$(subst,CPPRUNTIME, $(STDSHL))
-SHL4LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(SHL4CODETYPE)"=="C"
-SHL4LINKER=$(LINK)
-SHL4STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
-SHL4LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(SHL4CODETYPE)"=="C"
-
-SHL4RPATH*=OOO
-LINKFLAGSRUNPATH_$(SHL4RPATH)*=/ERROR:/Bad_SHL4RPATH_value
-SHL4LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL4RPATH))
-
-.IF "$(SHL4USE_EXPORTS)"==""
-SHL4DEF*=$(MISC)/$(SHL4TARGET).def
-.ENDIF			# "$(SHL4USE_EXPORTS)"==""
-
-EXTRALIBPATHS4=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL4NOCHECK)"==""
-.IF "$(SOLAR_STLLIBPATH)"!=""
-EXTRALIBPATHS4+=-L$(SOLAR_STLLIBPATH)
-.ENDIF
-.ENDIF				# "$(SHL4NOCHECK)"!=""
-.ENDIF
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-.IF "$(L10N_framework)"==""
-.IF "$(VERSIONOBJ)"!=""
-SHL4VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)/$(SHL4VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
-SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE           # "$(GUI)" == "UNX"
-SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f)
-.ENDIF          # "$(GUI)" == "UNX"
-$(MISC)/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL4VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)/src/version.c $@
-    $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL4VERSIONOBJ:b).h/ > $@
-
-.INIT : $(SHL4VERSIONOBJDEP)
-.ENDIF			# "$(VERSIONOBJ)"!=""
-.ENDIF
-
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL4IMPLIB)" == ""
-SHL4IMPLIB=i$(TARGET)_t4
-.ENDIF			# "$(SHL4IMPLIB)" == ""
-.IF "$(COM)" != "GCC"
-USE_4IMPLIB=-implib:$(LB)/$(SHL4IMPLIB).lib
-SHL4IMPLIBN=$(LB)/$(SHL4IMPLIB).lib
-.ELSE
-USE_4IMPLIB=-Wl,--out-implib=$(SHL4IMPLIBN)
-SHL4IMPLIBN=$(LB)/lib$(SHL4IMPLIB).dll.a
-.ENDIF			# "$(COM)" != "GCC"
-ALLTAR : $(SHL4IMPLIBN)
-
-.IF "$(USE_DEFFILE)"==""
-.IF "$(COM)" != "GCC"
-USE_4IMPLIB_DEPS=$(LB)/$(SHL4IMPLIB).lib
-.ENDIF
-.ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT"
-USE_SHL4DEF=$(SHL4DEF)
-.ELSE			# "$(GUI)" != "UNX"
-USE_SHL4DEF=
-SHL4DEPN+:=$(SHL4DEPNU)
-
-.IF "$(SHL4VERSIONMAP)"==""
-# to activate vmaps remove "#"
-USE_SHL4VERSIONMAP=$(MISC)/$(SHL4TARGET).vmap
-.ENDIF			# "$(SHL4VERSIONMAP)"==""
-
-.IF "$(USE_SHL4VERSIONMAP)"!=""
-
-.IF "$(SHL4FILTERFILE)"!=""
-.IF "$(SHL4VERSIONMAP)"!=""
-#eine von beiden ist zuviel
-USE_SHL4VERSIONMAP=$(MISC)/$(SHL4TARGET).vmap
-$(USE_SHL4VERSIONMAP) .PHONY:
-    @echo -----------------------------
-    @echo you should only use versionmap OR exportfile
-    @echo -----------------------------
-#	force_dmake_to_error
-
-.ENDIF			# "$(SHL4VERSIONMAP)"!=""
-
-.IF "$(OS)" != "AIX"
-SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
-.ENDIF
-
-$(USE_SHL4VERSIONMAP): \
-                    $(SHL4OBJS)\
-                    $(SHL4LIBS)\
-                    $(SHL4FILTERFILE)
-    @$(RM) $@.dump
-.IF "$(SHL4OBJS)"!=""
-# dump remaining objects on the fly
-.IF "$(OS)"=="MACOSX"
-    @-nm $(SHL4OBJS:s/.obj/.o/) > $@.dump
-.ELSE
-    @nm $(SHL4OBJS:s/.obj/.o/) > $@.dump
-.ENDIF
-.ENDIF			# "$(SHL4OBJS)!"=""
-    @$(TYPE) /dev/null $(SHL4LIBS:s/.lib/.dump/) >> $@.dump
-    $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL4INTERFACE) -f $(SHL4FILTERFILE) -m $@
-
-.ELSE			# "$(SHL4FILTERFILE)"!=""
-USE_SHL4VERSIONMAP=$(MISC)/$(SHL4TARGET).vmap
-$(USE_SHL4VERSIONMAP) :
-.IF "$(VERBOSE)" == "TRUE"
-    @echo -----------------------------
-    @echo SHL4FILTERFILE not set!
-    @echo -----------------------------
-    @$(TOUCH) $@
-    @echo dummy file to keep the dependencies for later use.
-.ELSE
-    @$(TOUCH) $@
-.ENDIF
-#	force_dmake_to_error
-.ENDIF			# "$(SHL4FILTERFILE)"!=""
-.ELSE			# "$(USE_SHL4VERSIONMAP)"!=""
-
-#and now for the plain non-generic way...
-.IF "$(SHL4VERSIONMAP)"!=""
-USE_SHL4VERSIONMAP=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
-SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
-$(USE_SHL4VERSIONMAP): $(SHL4OBJS) $(SHL4LIBS)
-.ENDIF
-
-# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
-# even if the $(AWK) part fails:
-$(USE_SHL4VERSIONMAP) .ERRREMOVE: $(SHL4VERSIONMAP)
-    @@-$(RM) -f $@
-# The following files will only be generated and needed on Mac OS X as temporary files
-# in order to generate exported symbols list out of Linux/Solaris map files
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) -f $@.symregexp >& $(NULLDEV)
-    @-$(RM) -f $@.expsymlist >& $(NULLDEV)
-.ENDIF
-# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
-# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL4VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
-.ELIF "$(COMNAME)"=="sunpro5"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL4VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-.ELSE           # "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL4VERSIONMAP) > $@
-.ENDIF          # "$(COMID)"=="gcc3"
-    @chmod a+w $@
-# Mac OS X post-processing generate an exported symbols list from the generated map file
-# for details on exported symbols list see man ld on Mac OS X
-.IF "$(OS)"=="MACOSX"
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-.IF "$(SHL4OBJS)"!=""
-    -echo $(foreach,i,$(SHL4OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-.IF "$(SHL4LIBS)"!=""
-    $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    cp $@.exported-symbols $@
-.ENDIF # .IF "$(OS)"=="MACOSX"
-.ENDIF			# "$(SHL4VERSIONMAP)"!=""
-.ENDIF			# "$(USE_SHL4VERSIONMAP)"!=""
-.ENDIF			# "$(GUI)" != "UNX"
-
-.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
-SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\"
-.ENDIF			# "$(GUI)"!="UNX"
-.ENDIF			# "$(OS)"!="MACOSX"
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-
-.IF "$(SHL4RES)"!=""
-SHL4ALLRES+=$(SHL4RES)
-SHL4LINKRES*=$(MISC)/$(SHL4TARGET).res
-SHL4LINKRESO*=$(MISC)/$(SHL4TARGET)_res.o
-.ENDIF			# "$(SHL4RES)"!=""
-
-.IF "$(SHL4DEFAULTRES)$(use_shl_versions)"!=""
-SHL4DEFAULTRES*=$(MISC)/$(SHL4TARGET)_def.res
-SHL4ALLRES+=$(SHL4DEFAULTRES)
-SHL4LINKRES*=$(MISC)/$(SHL4TARGET).res
-SHL4LINKRESO*=$(MISC)/$(SHL4TARGET)_res.o
-.ENDIF			# "$(SHL4DEFAULTRES)$(use_shl_versions)"!=""
-
-#.IF "$(SHL4TARGETN)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL4LIBS)"!=""
-$(MISC)/$(SHL4TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL4LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(SHL4TARGETN:b)_linkinc.ls
-$(SHL4TARGETN) : $(LINKINCTARGETS)
-
-.ELSE
-.IF "$(SHL4USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-.IF "$(SHL4LIBS)"!=""
-SHL4LINKLIST=$(MISC)/$(SHL4TARGET)_link.lst
-SHL4LINKLISTPARAM=@$(SHL4LINKLIST)
-$(SHL4LINKLIST) : $(SHL4LIBS)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL4LIBS)"!=""
-.ENDIF          # "$(COM)"!="GCC"
-.ENDIF
-.ENDIF			# "$(SHL4USE_EXPORTS)"=="name"
-
-$(MISC)/%linkinc.ls:
-    @echo . > $@
-.ENDIF          # "$(linkinc)"!=""
-
-.IF "$(COM)" == "GCC" && "$(SHL4IMPLIBN)" != ""
-$(SHL4IMPLIBN) : $(SHL4TARGETN)
-.ENDIF
-
-$(SHL4TARGETN) : \
-                    $(SHL4OBJS)\
-                    $(SHL4LIBS)\
-                    $(USE_4IMPLIB_DEPS)\
-                    $(USE_SHL4DEF)\
-                    $(USE_SHL4VERSIONMAP)\
-                    $(SHL4RES)\
-                    $(SHL4DEPN) \
-                    $(SHL4LINKLIST)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL4DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)/$(SHL4DEFAULTRES:b).rc
-.IF "$(SHL4ICON)" != ""
-    @echo 1 ICON $(SHL4ICON) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL4ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL4ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc
-.ELSE			# "$(SHL4ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL4DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL4DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL4DEFAULTRES:b).rc
-.ENDIF			# "$(SHL4ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL4TARGET)$(DLLPOST) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-.IF "$(RCFLAGSOUTRES)"!=""
-# rc, takes separate flag naming output file, source .rc file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL4DEFAULTRES) $(MISC)/$(SHL4DEFAULTRES:b).rc
-.ELSE
-# windres, just takes output file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc $(SHL4DEFAULTRES)
-.ENDIF
-.ENDIF			# "$(SHL4DEFAULTRES)"!=""
-.IF "$(SHL4ALLRES)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES)
-.IF "$(COM)"=="GCC"
-    $(WINDRES) $(SHL4LINKRES) $(SHL4LINKRESO)
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(SHL4ALLRES)"!=""
-.IF "$(COM)"=="GCC"
-# GNU ld since 2.17 supports @cmdfile syntax
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL4LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL4DEF) \
-        $(USE_4IMPLIB) \
-        $(STDOBJ) \
-        $(SHL4VERSIONOBJ) $(SHL4OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL4LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL4STDLIBS) -Wl,--end-group \
-        $(SHL4STDSHL) $(STDSHL4) \
-        $(SHL4LINKRESO) \
-    ))
-.ELSE
-    @noop $(assign ALL4OBJLIST:=$(STDOBJ) $(SHL4OBJS) $(SHL4LINKRESO) $(shell $(TYPE) /dev/null $(SHL4LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-.IF "$(DEFLIB4NAME)"!=""	# do not have to include objs
-    @noop $(assign DEF4OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-    @noop $(foreach,i,$(DEF4OBJLIST) $(assign ALL4OBJLIST:=$(ALL4OBJLIST:s?$i??)))
-.ENDIF			# "$(DEFLIB4NAME)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL4LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL4DEF) \
-        $(USE_4IMPLIB) \
-        $(STDOBJ) \
-        $(SHL4VERSIONOBJ) $(SHL4OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL4LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL4STDLIBS) -Wl,--end-group \
-        $(SHL4STDSHL) $(STDSHL4) \
-        $(SHL4LINKRESO) \
-    ))
-.ENDIF
-.ELSE
-.IF "$(linkinc)"==""
-.IF "$(SHL4USE_EXPORTS)"!="name"
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL4LINKER) @$(mktmp \
-        $(SHL4LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL4STACK) $(SHL4BASEX)	\
-        -out:$@ \
-        -map:$(MISC)/$(@:b).map \
-        -def:$(SHL4DEF) \
-        $(USE_4IMPLIB) \
-        $(STDOBJ) \
-        $(SHL4VERSIONOBJ) $(SHL4OBJS) \
-        $(SHL4LIBS) \
-        $(SHL4STDLIBS) \
-        $(SHL4STDSHL) $(STDSHL4) \
-        $(SHL4LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE			# "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL4LINKER) @$(mktmp	$(SHL4LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL4BASEX)		\
-        $(SHL4STACK) -out:$(SHL4TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(LB)/$(SHL4IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL4OBJS) $(SHL4VERSIONOBJ) \
-        $(SHL4LIBS)                         \
-        $(SHL4STDLIBS)                      \
-        $(SHL4STDSHL) $(STDSHL4)                           \
-        $(SHL4LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(USE_DEFFILE)"!=""
-.ELSE			# "$(SHL4USE_EXPORTS)"!="name"
-    $(COMMAND_ECHO)$(SHL4LINKER) @$(mktmp	$(SHL4LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL4BASEX)		\
-        $(SHL4STACK) -out:$(SHL4TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(USE_4IMPLIB) \
-        $(STDOBJ)							\
-        $(SHL4OBJS) $(SHL4VERSIONOBJ))   \
-        $(SHL4LINKLISTPARAM) \
-        @$(mktmp $(SHL4STDLIBS)                      \
-        $(SHL4STDSHL) $(STDSHL4)                           \
-        $(SHL4LINKRES) \
-    )
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(SHL4USE_EXPORTS)"!="name"
-.ELSE			# "$(linkinc)"==""
-        $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL4TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL4TARGET).lst
-        $(COMMAND_ECHO)$(TYPE) $(mktmp \
-        $(SHL4LINKFLAGS) \
-        $(LINKFLAGSSHL) $(SHL4BASEX) \
-        $(SHL4STACK) $(MAPFILE) \
-        -out:$@ \
-        $(LB)/$(SHL4IMPLIB).exp \
-        $(STDOBJ) \
-        $(SHL4OBJS) \
-        $(SHL4STDLIBS) \
-        $(SHL4STDSHL) $(STDSHL4) \
-        $(SHL4LINKRES) \
-        ) >> $(MISC)/$(SHL4TARGET).lnk
-        $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL4TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL4TARGET).lnk
-        $(COMMAND_ECHO)$(SHL4LINKER) @$(MISC)/$(SHL4TARGET).lnk
-        @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(linkinc)"==""
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
-    @echo $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
-    $(SHL4VERSIONOBJ) \
-    `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
-    $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_4.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_4.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_4.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        shl $(SHL4RPATH) $@
-.IF "$(SHL4CREATEJNILIB)"!=""
-    @echo "Making:   " $(@:f).jnilib
-    @macosx-create-bundle $@
-.ENDIF          # "$(SHL4CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL4NOCHECK)"==""
-    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN)
-.ENDIF				# "$(SHL4NOCHECK)"!=""
-.ENDIF
-.ELIF "$(OS)"=="IOS"
-    $(COMMAND_ECHO)$(AR) $(LIB4FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL4OBJS)) $(shell cat /dev/null $(LIB4TARGET) $(SHL4LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
-    $(COMMAND_ECHO)$(RANLIB) $@
-.ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
-    @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
-    $(SHL4VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
-    $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_4.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_4.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL4NOCHECK)"==""
-    $(COMMAND_ECHO)-$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-    $(COMMAND_ECHO)$(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-.IF "$(VERBOSE)"=="TRUE"
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-.ELSE
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) -- -s $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-.ENDIF
-.ENDIF				# "$(SHL4NOCHECK)"!=""
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
-    $(COMMAND_ECHO)$(RM) $(LB)/$(SHL4TARGETN:b)
-    $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL4TARGETN:f) $(SHL4TARGETN:b)
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
-.ENDIF
-.ENDIF			# "$(GUI)" == "UNX"
-
-.ENDIF			# "$(SHL4TARGETN)"!=""
-
-# unroll begin
-
-.IF "$(SHL5TARGETN)"!=""
-
-.IF "$(SHLLINKARCONLY)" != ""
-SHL5STDLIBS=
-STDSHL=
-.ELSE
-SHL5ARCHIVES=
-.ENDIF
-
-# decide how to link
-.IF "$(SHL5CODETYPE)"=="C"
-SHL5LINKER=$(LINKC)
-SHL5STDSHL=$(subst,CPPRUNTIME, $(STDSHL))
-SHL5LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(SHL5CODETYPE)"=="C"
-SHL5LINKER=$(LINK)
-SHL5STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
-SHL5LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(SHL5CODETYPE)"=="C"
-
-SHL5RPATH*=OOO
-LINKFLAGSRUNPATH_$(SHL5RPATH)*=/ERROR:/Bad_SHL5RPATH_value
-SHL5LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL5RPATH))
-
-.IF "$(SHL5USE_EXPORTS)"==""
-SHL5DEF*=$(MISC)/$(SHL5TARGET).def
-.ENDIF			# "$(SHL5USE_EXPORTS)"==""
-
-EXTRALIBPATHS5=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL5NOCHECK)"==""
-.IF "$(SOLAR_STLLIBPATH)"!=""
-EXTRALIBPATHS5+=-L$(SOLAR_STLLIBPATH)
-.ENDIF
-.ENDIF				# "$(SHL5NOCHECK)"!=""
-.ENDIF
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-.IF "$(L10N_framework)"==""
-.IF "$(VERSIONOBJ)"!=""
-SHL5VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)/$(SHL5VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
-SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE           # "$(GUI)" == "UNX"
-SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f)
-.ENDIF          # "$(GUI)" == "UNX"
-$(MISC)/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL5VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)/src/version.c $@
-    $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL5VERSIONOBJ:b).h/ > $@
-
-.INIT : $(SHL5VERSIONOBJDEP)
-.ENDIF			# "$(VERSIONOBJ)"!=""
-.ENDIF
-
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL5IMPLIB)" == ""
-SHL5IMPLIB=i$(TARGET)_t5
-.ENDIF			# "$(SHL5IMPLIB)" == ""
-.IF "$(COM)" != "GCC"
-USE_5IMPLIB=-implib:$(LB)/$(SHL5IMPLIB).lib
-SHL5IMPLIBN=$(LB)/$(SHL5IMPLIB).lib
-.ELSE
-USE_5IMPLIB=-Wl,--out-implib=$(SHL5IMPLIBN)
-SHL5IMPLIBN=$(LB)/lib$(SHL5IMPLIB).dll.a
-.ENDIF			# "$(COM)" != "GCC"
-ALLTAR : $(SHL5IMPLIBN)
-
-.IF "$(USE_DEFFILE)"==""
-.IF "$(COM)" != "GCC"
-USE_5IMPLIB_DEPS=$(LB)/$(SHL5IMPLIB).lib
-.ENDIF
-.ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT"
-USE_SHL5DEF=$(SHL5DEF)
-.ELSE			# "$(GUI)" != "UNX"
-USE_SHL5DEF=
-SHL5DEPN+:=$(SHL5DEPNU)
-
-.IF "$(SHL5VERSIONMAP)"==""
-# to activate vmaps remove "#"
-USE_SHL5VERSIONMAP=$(MISC)/$(SHL5TARGET).vmap
-.ENDIF			# "$(SHL5VERSIONMAP)"==""
-
-.IF "$(USE_SHL5VERSIONMAP)"!=""
-
-.IF "$(SHL5FILTERFILE)"!=""
-.IF "$(SHL5VERSIONMAP)"!=""
-#eine von beiden ist zuviel
-USE_SHL5VERSIONMAP=$(MISC)/$(SHL5TARGET).vmap
-$(USE_SHL5VERSIONMAP) .PHONY:
-    @echo -----------------------------
-    @echo you should only use versionmap OR exportfile
-    @echo -----------------------------
-#	force_dmake_to_error
-
-.ENDIF			# "$(SHL5VERSIONMAP)"!=""
-
-.IF "$(OS)" != "AIX"
-SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
-.ENDIF
-
-$(USE_SHL5VERSIONMAP): \
-                    $(SHL5OBJS)\
-                    $(SHL5LIBS)\
-                    $(SHL5FILTERFILE)
-    @$(RM) $@.dump
-.IF "$(SHL5OBJS)"!=""
-# dump remaining objects on the fly
-.IF "$(OS)"=="MACOSX"
-    @-nm $(SHL5OBJS:s/.obj/.o/) > $@.dump
-.ELSE
-    @nm $(SHL5OBJS:s/.obj/.o/) > $@.dump
-.ENDIF
-.ENDIF			# "$(SHL5OBJS)!"=""
-    @$(TYPE) /dev/null $(SHL5LIBS:s/.lib/.dump/) >> $@.dump
-    $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL5INTERFACE) -f $(SHL5FILTERFILE) -m $@
-
-.ELSE			# "$(SHL5FILTERFILE)"!=""
-USE_SHL5VERSIONMAP=$(MISC)/$(SHL5TARGET).vmap
-$(USE_SHL5VERSIONMAP) :
-.IF "$(VERBOSE)" == "TRUE"
-    @echo -----------------------------
-    @echo SHL5FILTERFILE not set!
-    @echo -----------------------------
-    @$(TOUCH) $@
-    @echo dummy file to keep the dependencies for later use.
-.ELSE
-    @$(TOUCH) $@
-.ENDIF
-#	force_dmake_to_error
-.ENDIF			# "$(SHL5FILTERFILE)"!=""
-.ELSE			# "$(USE_SHL5VERSIONMAP)"!=""
-
-#and now for the plain non-generic way...
-.IF "$(SHL5VERSIONMAP)"!=""
-USE_SHL5VERSIONMAP=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
-SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
-$(USE_SHL5VERSIONMAP): $(SHL5OBJS) $(SHL5LIBS)
-.ENDIF
-
-# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
-# even if the $(AWK) part fails:
-$(USE_SHL5VERSIONMAP) .ERRREMOVE: $(SHL5VERSIONMAP)
-    @@-$(RM) -f $@
-# The following files will only be generated and needed on Mac OS X as temporary files
-# in order to generate exported symbols list out of Linux/Solaris map files
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) -f $@.symregexp >& $(NULLDEV)
-    @-$(RM) -f $@.expsymlist >& $(NULLDEV)
-.ENDIF
-# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
-# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL5VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
-.ELIF "$(COMNAME)"=="sunpro5"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL5VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-.ELSE           # "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL5VERSIONMAP) > $@
-.ENDIF          # "$(COMID)"=="gcc3"
-    @chmod a+w $@
-# Mac OS X post-processing generate an exported symbols list from the generated map file
-# for details on exported symbols list see man ld on Mac OS X
-.IF "$(OS)"=="MACOSX"
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-.IF "$(SHL5OBJS)"!=""
-    -echo $(foreach,i,$(SHL5OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-.IF "$(SHL5LIBS)"!=""
-    $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    cp $@.exported-symbols $@
-.ENDIF # .IF "$(OS)"=="MACOSX"
-.ENDIF			# "$(SHL5VERSIONMAP)"!=""
-.ENDIF			# "$(USE_SHL5VERSIONMAP)"!=""
-.ENDIF			# "$(GUI)" != "UNX"
-
-.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
-SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\"
-.ENDIF			# "$(GUI)"!="UNX"
-.ENDIF			# "$(OS)"!="MACOSX"
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-
-.IF "$(SHL5RES)"!=""
-SHL5ALLRES+=$(SHL5RES)
-SHL5LINKRES*=$(MISC)/$(SHL5TARGET).res
-SHL5LINKRESO*=$(MISC)/$(SHL5TARGET)_res.o
-.ENDIF			# "$(SHL5RES)"!=""
-
-.IF "$(SHL5DEFAULTRES)$(use_shl_versions)"!=""
-SHL5DEFAULTRES*=$(MISC)/$(SHL5TARGET)_def.res
-SHL5ALLRES+=$(SHL5DEFAULTRES)
-SHL5LINKRES*=$(MISC)/$(SHL5TARGET).res
-SHL5LINKRESO*=$(MISC)/$(SHL5TARGET)_res.o
-.ENDIF			# "$(SHL5DEFAULTRES)$(use_shl_versions)"!=""
-
-#.IF "$(SHL5TARGETN)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL5LIBS)"!=""
-$(MISC)/$(SHL5TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL5LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(SHL5TARGETN:b)_linkinc.ls
-$(SHL5TARGETN) : $(LINKINCTARGETS)
-
-.ELSE
-.IF "$(SHL5USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-.IF "$(SHL5LIBS)"!=""
-SHL5LINKLIST=$(MISC)/$(SHL5TARGET)_link.lst
-SHL5LINKLISTPARAM=@$(SHL5LINKLIST)
-$(SHL5LINKLIST) : $(SHL5LIBS)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL5LIBS)"!=""
-.ENDIF          # "$(COM)"!="GCC"
-.ENDIF
-.ENDIF			# "$(SHL5USE_EXPORTS)"=="name"
-
-$(MISC)/%linkinc.ls:
-    @echo . > $@
-.ENDIF          # "$(linkinc)"!=""
-
-.IF "$(COM)" == "GCC" && "$(SHL5IMPLIBN)" != ""
-$(SHL5IMPLIBN) : $(SHL5TARGETN)
-.ENDIF
-
-$(SHL5TARGETN) : \
-                    $(SHL5OBJS)\
-                    $(SHL5LIBS)\
-                    $(USE_5IMPLIB_DEPS)\
-                    $(USE_SHL5DEF)\
-                    $(USE_SHL5VERSIONMAP)\
-                    $(SHL5RES)\
-                    $(SHL5DEPN) \
-                    $(SHL5LINKLIST)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL5DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)/$(SHL5DEFAULTRES:b).rc
-.IF "$(SHL5ICON)" != ""
-    @echo 1 ICON $(SHL5ICON) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL5ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL5ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc
-.ELSE			# "$(SHL5ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL5DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL5DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL5DEFAULTRES:b).rc
-.ENDIF			# "$(SHL5ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL5TARGET)$(DLLPOST) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-.IF "$(RCFLAGSOUTRES)"!=""
-# rc, takes separate flag naming output file, source .rc file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL5DEFAULTRES) $(MISC)/$(SHL5DEFAULTRES:b).rc
-.ELSE
-# windres, just takes output file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc $(SHL5DEFAULTRES)
-.ENDIF
-.ENDIF			# "$(SHL5DEFAULTRES)"!=""
-.IF "$(SHL5ALLRES)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES)
-.IF "$(COM)"=="GCC"
-    $(WINDRES) $(SHL5LINKRES) $(SHL5LINKRESO)
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(SHL5ALLRES)"!=""
-.IF "$(COM)"=="GCC"
-# GNU ld since 2.17 supports @cmdfile syntax
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL5LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL5DEF) \
-        $(USE_5IMPLIB) \
-        $(STDOBJ) \
-        $(SHL5VERSIONOBJ) $(SHL5OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL5LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL5STDLIBS) -Wl,--end-group \
-        $(SHL5STDSHL) $(STDSHL5) \
-        $(SHL5LINKRESO) \
-    ))
-.ELSE
-    @noop $(assign ALL5OBJLIST:=$(STDOBJ) $(SHL5OBJS) $(SHL5LINKRESO) $(shell $(TYPE) /dev/null $(SHL5LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-.IF "$(DEFLIB5NAME)"!=""	# do not have to include objs
-    @noop $(assign DEF5OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-    @noop $(foreach,i,$(DEF5OBJLIST) $(assign ALL5OBJLIST:=$(ALL5OBJLIST:s?$i??)))
-.ENDIF			# "$(DEFLIB5NAME)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL5LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL5DEF) \
-        $(USE_5IMPLIB) \
-        $(STDOBJ) \
-        $(SHL5VERSIONOBJ) $(SHL5OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL5LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL5STDLIBS) -Wl,--end-group \
-        $(SHL5STDSHL) $(STDSHL5) \
-        $(SHL5LINKRESO) \
-    ))
-.ENDIF
-.ELSE
-.IF "$(linkinc)"==""
-.IF "$(SHL5USE_EXPORTS)"!="name"
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL5LINKER) @$(mktmp \
-        $(SHL5LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL5STACK) $(SHL5BASEX)	\
-        -out:$@ \
-        -map:$(MISC)/$(@:b).map \
-        -def:$(SHL5DEF) \
-        $(USE_5IMPLIB) \
-        $(STDOBJ) \
-        $(SHL5VERSIONOBJ) $(SHL5OBJS) \
-        $(SHL5LIBS) \
-        $(SHL5STDLIBS) \
-        $(SHL5STDSHL) $(STDSHL5) \
-        $(SHL5LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE			# "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL5LINKER) @$(mktmp	$(SHL5LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL5BASEX)		\
-        $(SHL5STACK) -out:$(SHL5TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(LB)/$(SHL5IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL5OBJS) $(SHL5VERSIONOBJ) \
-        $(SHL5LIBS)                         \
-        $(SHL5STDLIBS)                      \
-        $(SHL5STDSHL) $(STDSHL5)                           \
-        $(SHL5LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(USE_DEFFILE)"!=""
-.ELSE			# "$(SHL5USE_EXPORTS)"!="name"
-    $(COMMAND_ECHO)$(SHL5LINKER) @$(mktmp	$(SHL5LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL5BASEX)		\
-        $(SHL5STACK) -out:$(SHL5TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(USE_5IMPLIB) \
-        $(STDOBJ)							\
-        $(SHL5OBJS) $(SHL5VERSIONOBJ))   \
-        $(SHL5LINKLISTPARAM) \
-        @$(mktmp $(SHL5STDLIBS)                      \
-        $(SHL5STDSHL) $(STDSHL5)                           \
-        $(SHL5LINKRES) \
-    )
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(SHL5USE_EXPORTS)"!="name"
-.ELSE			# "$(linkinc)"==""
-        $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL5TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL5TARGET).lst
-        $(COMMAND_ECHO)$(TYPE) $(mktmp \
-        $(SHL5LINKFLAGS) \
-        $(LINKFLAGSSHL) $(SHL5BASEX) \
-        $(SHL5STACK) $(MAPFILE) \
-        -out:$@ \
-        $(LB)/$(SHL5IMPLIB).exp \
-        $(STDOBJ) \
-        $(SHL5OBJS) \
-        $(SHL5STDLIBS) \
-        $(SHL5STDSHL) $(STDSHL5) \
-        $(SHL5LINKRES) \
-        ) >> $(MISC)/$(SHL5TARGET).lnk
-        $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL5TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL5TARGET).lnk
-        $(COMMAND_ECHO)$(SHL5LINKER) @$(MISC)/$(SHL5TARGET).lnk
-        @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(linkinc)"==""
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
-    @echo $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
-    $(SHL5VERSIONOBJ) \
-    `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
-    $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_5.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_5.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_5.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        shl $(SHL5RPATH) $@
-.IF "$(SHL5CREATEJNILIB)"!=""
-    @echo "Making:   " $(@:f).jnilib
-    @macosx-create-bundle $@
-.ENDIF          # "$(SHL5CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL5NOCHECK)"==""
-    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN)
-.ENDIF				# "$(SHL5NOCHECK)"!=""
-.ENDIF
-.ELIF "$(OS)"=="IOS"
-    $(COMMAND_ECHO)$(AR) $(LIB5FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL5OBJS)) $(shell cat /dev/null $(LIB5TARGET) $(SHL5LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
-    $(COMMAND_ECHO)$(RANLIB) $@
-.ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
-    @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
-    $(SHL5VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
-    $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_5.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_5.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL5NOCHECK)"==""
-    $(COMMAND_ECHO)-$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-    $(COMMAND_ECHO)$(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-.IF "$(VERBOSE)"=="TRUE"
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-.ELSE
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) -- -s $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-.ENDIF
-.ENDIF				# "$(SHL5NOCHECK)"!=""
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
-    $(COMMAND_ECHO)$(RM) $(LB)/$(SHL5TARGETN:b)
-    $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL5TARGETN:f) $(SHL5TARGETN:b)
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
-.ENDIF
-.ENDIF			# "$(GUI)" == "UNX"
-
-.ENDIF			# "$(SHL5TARGETN)"!=""
-
-# unroll begin
-
-.IF "$(SHL6TARGETN)"!=""
-
-.IF "$(SHLLINKARCONLY)" != ""
-SHL6STDLIBS=
-STDSHL=
-.ELSE
-SHL6ARCHIVES=
-.ENDIF
-
-# decide how to link
-.IF "$(SHL6CODETYPE)"=="C"
-SHL6LINKER=$(LINKC)
-SHL6STDSHL=$(subst,CPPRUNTIME, $(STDSHL))
-SHL6LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(SHL6CODETYPE)"=="C"
-SHL6LINKER=$(LINK)
-SHL6STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
-SHL6LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(SHL6CODETYPE)"=="C"
-
-SHL6RPATH*=OOO
-LINKFLAGSRUNPATH_$(SHL6RPATH)*=/ERROR:/Bad_SHL6RPATH_value
-SHL6LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL6RPATH))
-
-.IF "$(SHL6USE_EXPORTS)"==""
-SHL6DEF*=$(MISC)/$(SHL6TARGET).def
-.ENDIF			# "$(SHL6USE_EXPORTS)"==""
-
-EXTRALIBPATHS6=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL6NOCHECK)"==""
-.IF "$(SOLAR_STLLIBPATH)"!=""
-EXTRALIBPATHS6+=-L$(SOLAR_STLLIBPATH)
-.ENDIF
-.ENDIF				# "$(SHL6NOCHECK)"!=""
-.ENDIF
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-.IF "$(L10N_framework)"==""
-.IF "$(VERSIONOBJ)"!=""
-SHL6VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)/$(SHL6VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
-SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE           # "$(GUI)" == "UNX"
-SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f)
-.ENDIF          # "$(GUI)" == "UNX"
-$(MISC)/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL6VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)/src/version.c $@
-    $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL6VERSIONOBJ:b).h/ > $@
-
-.INIT : $(SHL6VERSIONOBJDEP)
-.ENDIF			# "$(VERSIONOBJ)"!=""
-.ENDIF
-
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL6IMPLIB)" == ""
-SHL6IMPLIB=i$(TARGET)_t6
-.ENDIF			# "$(SHL6IMPLIB)" == ""
-.IF "$(COM)" != "GCC"
-USE_6IMPLIB=-implib:$(LB)/$(SHL6IMPLIB).lib
-SHL6IMPLIBN=$(LB)/$(SHL6IMPLIB).lib
-.ELSE
-USE_6IMPLIB=-Wl,--out-implib=$(SHL6IMPLIBN)
-SHL6IMPLIBN=$(LB)/lib$(SHL6IMPLIB).dll.a
-.ENDIF			# "$(COM)" != "GCC"
-ALLTAR : $(SHL6IMPLIBN)
-
-.IF "$(USE_DEFFILE)"==""
-.IF "$(COM)" != "GCC"
-USE_6IMPLIB_DEPS=$(LB)/$(SHL6IMPLIB).lib
-.ENDIF
-.ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT"
-USE_SHL6DEF=$(SHL6DEF)
-.ELSE			# "$(GUI)" != "UNX"
-USE_SHL6DEF=
-SHL6DEPN+:=$(SHL6DEPNU)
-
-.IF "$(SHL6VERSIONMAP)"==""
-# to activate vmaps remove "#"
-USE_SHL6VERSIONMAP=$(MISC)/$(SHL6TARGET).vmap
-.ENDIF			# "$(SHL6VERSIONMAP)"==""
-
-.IF "$(USE_SHL6VERSIONMAP)"!=""
-
-.IF "$(SHL6FILTERFILE)"!=""
-.IF "$(SHL6VERSIONMAP)"!=""
-#eine von beiden ist zuviel
-USE_SHL6VERSIONMAP=$(MISC)/$(SHL6TARGET).vmap
-$(USE_SHL6VERSIONMAP) .PHONY:
-    @echo -----------------------------
-    @echo you should only use versionmap OR exportfile
-    @echo -----------------------------
-#	force_dmake_to_error
-
-.ENDIF			# "$(SHL6VERSIONMAP)"!=""
-
-.IF "$(OS)" != "AIX"
-SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
-.ENDIF
-
-$(USE_SHL6VERSIONMAP): \
-                    $(SHL6OBJS)\
-                    $(SHL6LIBS)\
-                    $(SHL6FILTERFILE)
-    @$(RM) $@.dump
-.IF "$(SHL6OBJS)"!=""
-# dump remaining objects on the fly
-.IF "$(OS)"=="MACOSX"
-    @-nm $(SHL6OBJS:s/.obj/.o/) > $@.dump
-.ELSE
-    @nm $(SHL6OBJS:s/.obj/.o/) > $@.dump
-.ENDIF
-.ENDIF			# "$(SHL6OBJS)!"=""
-    @$(TYPE) /dev/null $(SHL6LIBS:s/.lib/.dump/) >> $@.dump
-    $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL6INTERFACE) -f $(SHL6FILTERFILE) -m $@
-
-.ELSE			# "$(SHL6FILTERFILE)"!=""
-USE_SHL6VERSIONMAP=$(MISC)/$(SHL6TARGET).vmap
-$(USE_SHL6VERSIONMAP) :
-.IF "$(VERBOSE)" == "TRUE"
-    @echo -----------------------------
-    @echo SHL6FILTERFILE not set!
-    @echo -----------------------------
-    @$(TOUCH) $@
-    @echo dummy file to keep the dependencies for later use.
-.ELSE
-    @$(TOUCH) $@
-.ENDIF
-#	force_dmake_to_error
-.ENDIF			# "$(SHL6FILTERFILE)"!=""
-.ELSE			# "$(USE_SHL6VERSIONMAP)"!=""
-
-#and now for the plain non-generic way...
-.IF "$(SHL6VERSIONMAP)"!=""
-USE_SHL6VERSIONMAP=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
-SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
-$(USE_SHL6VERSIONMAP): $(SHL6OBJS) $(SHL6LIBS)
-.ENDIF
-
-# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
-# even if the $(AWK) part fails:
-$(USE_SHL6VERSIONMAP) .ERRREMOVE: $(SHL6VERSIONMAP)
-    @@-$(RM) -f $@
-# The following files will only be generated and needed on Mac OS X as temporary files
-# in order to generate exported symbols list out of Linux/Solaris map files
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) -f $@.symregexp >& $(NULLDEV)
-    @-$(RM) -f $@.expsymlist >& $(NULLDEV)
-.ENDIF
-# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
-# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL6VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
-.ELIF "$(COMNAME)"=="sunpro5"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL6VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-.ELSE           # "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL6VERSIONMAP) > $@
-.ENDIF          # "$(COMID)"=="gcc3"
-    @chmod a+w $@
-# Mac OS X post-processing generate an exported symbols list from the generated map file
-# for details on exported symbols list see man ld on Mac OS X
-.IF "$(OS)"=="MACOSX"
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-.IF "$(SHL6OBJS)"!=""
-    -echo $(foreach,i,$(SHL6OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-.IF "$(SHL6LIBS)"!=""
-    $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    cp $@.exported-symbols $@
-.ENDIF # .IF "$(OS)"=="MACOSX"
-.ENDIF			# "$(SHL6VERSIONMAP)"!=""
-.ENDIF			# "$(USE_SHL6VERSIONMAP)"!=""
-.ENDIF			# "$(GUI)" != "UNX"
-
-.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
-SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\"
-.ENDIF			# "$(GUI)"!="UNX"
-.ENDIF			# "$(OS)"!="MACOSX"
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-
-.IF "$(SHL6RES)"!=""
-SHL6ALLRES+=$(SHL6RES)
-SHL6LINKRES*=$(MISC)/$(SHL6TARGET).res
-SHL6LINKRESO*=$(MISC)/$(SHL6TARGET)_res.o
-.ENDIF			# "$(SHL6RES)"!=""
-
-.IF "$(SHL6DEFAULTRES)$(use_shl_versions)"!=""
-SHL6DEFAULTRES*=$(MISC)/$(SHL6TARGET)_def.res
-SHL6ALLRES+=$(SHL6DEFAULTRES)
-SHL6LINKRES*=$(MISC)/$(SHL6TARGET).res
-SHL6LINKRESO*=$(MISC)/$(SHL6TARGET)_res.o
-.ENDIF			# "$(SHL6DEFAULTRES)$(use_shl_versions)"!=""
-
-#.IF "$(SHL6TARGETN)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL6LIBS)"!=""
-$(MISC)/$(SHL6TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL6LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(SHL6TARGETN:b)_linkinc.ls
-$(SHL6TARGETN) : $(LINKINCTARGETS)
-
-.ELSE
-.IF "$(SHL6USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-.IF "$(SHL6LIBS)"!=""
-SHL6LINKLIST=$(MISC)/$(SHL6TARGET)_link.lst
-SHL6LINKLISTPARAM=@$(SHL6LINKLIST)
-$(SHL6LINKLIST) : $(SHL6LIBS)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL6LIBS)"!=""
-.ENDIF          # "$(COM)"!="GCC"
-.ENDIF
-.ENDIF			# "$(SHL6USE_EXPORTS)"=="name"
-
-$(MISC)/%linkinc.ls:
-    @echo . > $@
-.ENDIF          # "$(linkinc)"!=""
-
-.IF "$(COM)" == "GCC" && "$(SHL6IMPLIBN)" != ""
-$(SHL6IMPLIBN) : $(SHL6TARGETN)
-.ENDIF
-
-$(SHL6TARGETN) : \
-                    $(SHL6OBJS)\
-                    $(SHL6LIBS)\
-                    $(USE_6IMPLIB_DEPS)\
-                    $(USE_SHL6DEF)\
-                    $(USE_SHL6VERSIONMAP)\
-                    $(SHL6RES)\
-                    $(SHL6DEPN) \
-                    $(SHL6LINKLIST)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL6DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)/$(SHL6DEFAULTRES:b).rc
-.IF "$(SHL6ICON)" != ""
-    @echo 1 ICON $(SHL6ICON) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL6ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL6ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc
-.ELSE			# "$(SHL6ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL6DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL6DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL6DEFAULTRES:b).rc
-.ENDIF			# "$(SHL6ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL6TARGET)$(DLLPOST) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-.IF "$(RCFLAGSOUTRES)"!=""
-# rc, takes separate flag naming output file, source .rc file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL6DEFAULTRES) $(MISC)/$(SHL6DEFAULTRES:b).rc
-.ELSE
-# windres, just takes output file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc $(SHL6DEFAULTRES)
-.ENDIF
-.ENDIF			# "$(SHL6DEFAULTRES)"!=""
-.IF "$(SHL6ALLRES)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES)
-.IF "$(COM)"=="GCC"
-    $(WINDRES) $(SHL6LINKRES) $(SHL6LINKRESO)
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(SHL6ALLRES)"!=""
-.IF "$(COM)"=="GCC"
-# GNU ld since 2.17 supports @cmdfile syntax
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL6LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL6DEF) \
-        $(USE_6IMPLIB) \
-        $(STDOBJ) \
-        $(SHL6VERSIONOBJ) $(SHL6OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL6LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL6STDLIBS) -Wl,--end-group \
-        $(SHL6STDSHL) $(STDSHL6) \
-        $(SHL6LINKRESO) \
-    ))
-.ELSE
-    @noop $(assign ALL6OBJLIST:=$(STDOBJ) $(SHL6OBJS) $(SHL6LINKRESO) $(shell $(TYPE) /dev/null $(SHL6LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-.IF "$(DEFLIB6NAME)"!=""	# do not have to include objs
-    @noop $(assign DEF6OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-    @noop $(foreach,i,$(DEF6OBJLIST) $(assign ALL6OBJLIST:=$(ALL6OBJLIST:s?$i??)))
-.ENDIF			# "$(DEFLIB6NAME)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL6LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL6DEF) \
-        $(USE_6IMPLIB) \
-        $(STDOBJ) \
-        $(SHL6VERSIONOBJ) $(SHL6OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL6LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL6STDLIBS) -Wl,--end-group \
-        $(SHL6STDSHL) $(STDSHL6) \
-        $(SHL6LINKRESO) \
-    ))
-.ENDIF
-.ELSE
-.IF "$(linkinc)"==""
-.IF "$(SHL6USE_EXPORTS)"!="name"
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL6LINKER) @$(mktmp \
-        $(SHL6LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL6STACK) $(SHL6BASEX)	\
-        -out:$@ \
-        -map:$(MISC)/$(@:b).map \
-        -def:$(SHL6DEF) \
-        $(USE_6IMPLIB) \
-        $(STDOBJ) \
-        $(SHL6VERSIONOBJ) $(SHL6OBJS) \
-        $(SHL6LIBS) \
-        $(SHL6STDLIBS) \
-        $(SHL6STDSHL) $(STDSHL6) \
-        $(SHL6LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE			# "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL6LINKER) @$(mktmp	$(SHL6LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL6BASEX)		\
-        $(SHL6STACK) -out:$(SHL6TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(LB)/$(SHL6IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL6OBJS) $(SHL6VERSIONOBJ) \
-        $(SHL6LIBS)                         \
-        $(SHL6STDLIBS)                      \
-        $(SHL6STDSHL) $(STDSHL6)                           \
-        $(SHL6LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(USE_DEFFILE)"!=""
-.ELSE			# "$(SHL6USE_EXPORTS)"!="name"
-    $(COMMAND_ECHO)$(SHL6LINKER) @$(mktmp	$(SHL6LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL6BASEX)		\
-        $(SHL6STACK) -out:$(SHL6TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(USE_6IMPLIB) \
-        $(STDOBJ)							\
-        $(SHL6OBJS) $(SHL6VERSIONOBJ))   \
-        $(SHL6LINKLISTPARAM) \
-        @$(mktmp $(SHL6STDLIBS)                      \
-        $(SHL6STDSHL) $(STDSHL6)                           \
-        $(SHL6LINKRES) \
-    )
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(SHL6USE_EXPORTS)"!="name"
-.ELSE			# "$(linkinc)"==""
-        $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL6TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL6TARGET).lst
-        $(COMMAND_ECHO)$(TYPE) $(mktmp \
-        $(SHL6LINKFLAGS) \
-        $(LINKFLAGSSHL) $(SHL6BASEX) \
-        $(SHL6STACK) $(MAPFILE) \
-        -out:$@ \
-        $(LB)/$(SHL6IMPLIB).exp \
-        $(STDOBJ) \
-        $(SHL6OBJS) \
-        $(SHL6STDLIBS) \
-        $(SHL6STDSHL) $(STDSHL6) \
-        $(SHL6LINKRES) \
-        ) >> $(MISC)/$(SHL6TARGET).lnk
-        $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL6TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL6TARGET).lnk
-        $(COMMAND_ECHO)$(SHL6LINKER) @$(MISC)/$(SHL6TARGET).lnk
-        @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(linkinc)"==""
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
-    @echo $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
-    $(SHL6VERSIONOBJ) \
-    `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
-    $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_6.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_6.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_6.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        shl $(SHL6RPATH) $@
-.IF "$(SHL6CREATEJNILIB)"!=""
-    @echo "Making:   " $(@:f).jnilib
-    @macosx-create-bundle $@
-.ENDIF          # "$(SHL6CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL6NOCHECK)"==""
-    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN)
-.ENDIF				# "$(SHL6NOCHECK)"!=""
-.ENDIF
-.ELIF "$(OS)"=="IOS"
-    $(COMMAND_ECHO)$(AR) $(LIB6FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL6OBJS)) $(shell cat /dev/null $(LIB6TARGET) $(SHL6LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
-    $(COMMAND_ECHO)$(RANLIB) $@
-.ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
-    @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
-    $(SHL6VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
-    $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_6.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_6.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL6NOCHECK)"==""
-    $(COMMAND_ECHO)-$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-    $(COMMAND_ECHO)$(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-.IF "$(VERBOSE)"=="TRUE"
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-.ELSE
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) -- -s $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-.ENDIF
-.ENDIF				# "$(SHL6NOCHECK)"!=""
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
-    $(COMMAND_ECHO)$(RM) $(LB)/$(SHL6TARGETN:b)
-    $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL6TARGETN:f) $(SHL6TARGETN:b)
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
-.ENDIF
-.ENDIF			# "$(GUI)" == "UNX"
-
-.ENDIF			# "$(SHL6TARGETN)"!=""
-
-# unroll begin
-
-.IF "$(SHL7TARGETN)"!=""
-
-.IF "$(SHLLINKARCONLY)" != ""
-SHL7STDLIBS=
-STDSHL=
-.ELSE
-SHL7ARCHIVES=
-.ENDIF
-
-# decide how to link
-.IF "$(SHL7CODETYPE)"=="C"
-SHL7LINKER=$(LINKC)
-SHL7STDSHL=$(subst,CPPRUNTIME, $(STDSHL))
-SHL7LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(SHL7CODETYPE)"=="C"
-SHL7LINKER=$(LINK)
-SHL7STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
-SHL7LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(SHL7CODETYPE)"=="C"
-
-SHL7RPATH*=OOO
-LINKFLAGSRUNPATH_$(SHL7RPATH)*=/ERROR:/Bad_SHL7RPATH_value
-SHL7LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL7RPATH))
-
-.IF "$(SHL7USE_EXPORTS)"==""
-SHL7DEF*=$(MISC)/$(SHL7TARGET).def
-.ENDIF			# "$(SHL7USE_EXPORTS)"==""
-
-EXTRALIBPATHS7=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL7NOCHECK)"==""
-.IF "$(SOLAR_STLLIBPATH)"!=""
-EXTRALIBPATHS7+=-L$(SOLAR_STLLIBPATH)
-.ENDIF
-.ENDIF				# "$(SHL7NOCHECK)"!=""
-.ENDIF
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-.IF "$(L10N_framework)"==""
-.IF "$(VERSIONOBJ)"!=""
-SHL7VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)/$(SHL7VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
-SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE           # "$(GUI)" == "UNX"
-SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f)
-.ENDIF          # "$(GUI)" == "UNX"
-$(MISC)/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL7VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)/src/version.c $@
-    $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL7VERSIONOBJ:b).h/ > $@
-
-.INIT : $(SHL7VERSIONOBJDEP)
-.ENDIF			# "$(VERSIONOBJ)"!=""
-.ENDIF
-
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL7IMPLIB)" == ""
-SHL7IMPLIB=i$(TARGET)_t7
-.ENDIF			# "$(SHL7IMPLIB)" == ""
-.IF "$(COM)" != "GCC"
-USE_7IMPLIB=-implib:$(LB)/$(SHL7IMPLIB).lib
-SHL7IMPLIBN=$(LB)/$(SHL7IMPLIB).lib
-.ELSE
-USE_7IMPLIB=-Wl,--out-implib=$(SHL7IMPLIBN)
-SHL7IMPLIBN=$(LB)/lib$(SHL7IMPLIB).dll.a
-.ENDIF			# "$(COM)" != "GCC"
-ALLTAR : $(SHL7IMPLIBN)
-
-.IF "$(USE_DEFFILE)"==""
-.IF "$(COM)" != "GCC"
-USE_7IMPLIB_DEPS=$(LB)/$(SHL7IMPLIB).lib
-.ENDIF
-.ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT"
-USE_SHL7DEF=$(SHL7DEF)
-.ELSE			# "$(GUI)" != "UNX"
-USE_SHL7DEF=
-SHL7DEPN+:=$(SHL7DEPNU)
-
-.IF "$(SHL7VERSIONMAP)"==""
-# to activate vmaps remove "#"
-USE_SHL7VERSIONMAP=$(MISC)/$(SHL7TARGET).vmap
-.ENDIF			# "$(SHL7VERSIONMAP)"==""
-
-.IF "$(USE_SHL7VERSIONMAP)"!=""
-
-.IF "$(SHL7FILTERFILE)"!=""
-.IF "$(SHL7VERSIONMAP)"!=""
-#eine von beiden ist zuviel
-USE_SHL7VERSIONMAP=$(MISC)/$(SHL7TARGET).vmap
-$(USE_SHL7VERSIONMAP) .PHONY:
-    @echo -----------------------------
-    @echo you should only use versionmap OR exportfile
-    @echo -----------------------------
-#	force_dmake_to_error
-
-.ENDIF			# "$(SHL7VERSIONMAP)"!=""
-
-.IF "$(OS)" != "AIX"
-SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
-.ENDIF
-
-$(USE_SHL7VERSIONMAP): \
-                    $(SHL7OBJS)\
-                    $(SHL7LIBS)\
-                    $(SHL7FILTERFILE)
-    @$(RM) $@.dump
-.IF "$(SHL7OBJS)"!=""
-# dump remaining objects on the fly
-.IF "$(OS)"=="MACOSX"
-    @-nm $(SHL7OBJS:s/.obj/.o/) > $@.dump
-.ELSE
-    @nm $(SHL7OBJS:s/.obj/.o/) > $@.dump
-.ENDIF
-.ENDIF			# "$(SHL7OBJS)!"=""
-    @$(TYPE) /dev/null $(SHL7LIBS:s/.lib/.dump/) >> $@.dump
-    $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL7INTERFACE) -f $(SHL7FILTERFILE) -m $@
-
-.ELSE			# "$(SHL7FILTERFILE)"!=""
-USE_SHL7VERSIONMAP=$(MISC)/$(SHL7TARGET).vmap
-$(USE_SHL7VERSIONMAP) :
-.IF "$(VERBOSE)" == "TRUE"
-    @echo -----------------------------
-    @echo SHL7FILTERFILE not set!
-    @echo -----------------------------
-    @$(TOUCH) $@
-    @echo dummy file to keep the dependencies for later use.
-.ELSE
-    @$(TOUCH) $@
-.ENDIF
-#	force_dmake_to_error
-.ENDIF			# "$(SHL7FILTERFILE)"!=""
-.ELSE			# "$(USE_SHL7VERSIONMAP)"!=""
-
-#and now for the plain non-generic way...
-.IF "$(SHL7VERSIONMAP)"!=""
-USE_SHL7VERSIONMAP=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
-SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
-$(USE_SHL7VERSIONMAP): $(SHL7OBJS) $(SHL7LIBS)
-.ENDIF
-
-# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
-# even if the $(AWK) part fails:
-$(USE_SHL7VERSIONMAP) .ERRREMOVE: $(SHL7VERSIONMAP)
-    @@-$(RM) -f $@
-# The following files will only be generated and needed on Mac OS X as temporary files
-# in order to generate exported symbols list out of Linux/Solaris map files
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) -f $@.symregexp >& $(NULLDEV)
-    @-$(RM) -f $@.expsymlist >& $(NULLDEV)
-.ENDIF
-# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
-# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL7VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
-.ELIF "$(COMNAME)"=="sunpro5"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL7VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-.ELSE           # "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL7VERSIONMAP) > $@
-.ENDIF          # "$(COMID)"=="gcc3"
-    @chmod a+w $@
-# Mac OS X post-processing generate an exported symbols list from the generated map file
-# for details on exported symbols list see man ld on Mac OS X
-.IF "$(OS)"=="MACOSX"
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-.IF "$(SHL7OBJS)"!=""
-    -echo $(foreach,i,$(SHL7OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-.IF "$(SHL7LIBS)"!=""
-    $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    cp $@.exported-symbols $@
-.ENDIF # .IF "$(OS)"=="MACOSX"
-.ENDIF			# "$(SHL7VERSIONMAP)"!=""
-.ENDIF			# "$(USE_SHL7VERSIONMAP)"!=""
-.ENDIF			# "$(GUI)" != "UNX"
-
-.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
-SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\"
-.ENDIF			# "$(GUI)"!="UNX"
-.ENDIF			# "$(OS)"!="MACOSX"
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-
-.IF "$(SHL7RES)"!=""
-SHL7ALLRES+=$(SHL7RES)
-SHL7LINKRES*=$(MISC)/$(SHL7TARGET).res
-SHL7LINKRESO*=$(MISC)/$(SHL7TARGET)_res.o
-.ENDIF			# "$(SHL7RES)"!=""
-
-.IF "$(SHL7DEFAULTRES)$(use_shl_versions)"!=""
-SHL7DEFAULTRES*=$(MISC)/$(SHL7TARGET)_def.res
-SHL7ALLRES+=$(SHL7DEFAULTRES)
-SHL7LINKRES*=$(MISC)/$(SHL7TARGET).res
-SHL7LINKRESO*=$(MISC)/$(SHL7TARGET)_res.o
-.ENDIF			# "$(SHL7DEFAULTRES)$(use_shl_versions)"!=""
-
-#.IF "$(SHL7TARGETN)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL7LIBS)"!=""
-$(MISC)/$(SHL7TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL7LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(SHL7TARGETN:b)_linkinc.ls
-$(SHL7TARGETN) : $(LINKINCTARGETS)
-
-.ELSE
-.IF "$(SHL7USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-.IF "$(SHL7LIBS)"!=""
-SHL7LINKLIST=$(MISC)/$(SHL7TARGET)_link.lst
-SHL7LINKLISTPARAM=@$(SHL7LINKLIST)
-$(SHL7LINKLIST) : $(SHL7LIBS)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL7LIBS)"!=""
-.ENDIF          # "$(COM)"!="GCC"
-.ENDIF
-.ENDIF			# "$(SHL7USE_EXPORTS)"=="name"
-
-$(MISC)/%linkinc.ls:
-    @echo . > $@
-.ENDIF          # "$(linkinc)"!=""
-
-.IF "$(COM)" == "GCC" && "$(SHL7IMPLIBN)" != ""
-$(SHL7IMPLIBN) : $(SHL7TARGETN)
-.ENDIF
-
-$(SHL7TARGETN) : \
-                    $(SHL7OBJS)\
-                    $(SHL7LIBS)\
-                    $(USE_7IMPLIB_DEPS)\
-                    $(USE_SHL7DEF)\
-                    $(USE_SHL7VERSIONMAP)\
-                    $(SHL7RES)\
-                    $(SHL7DEPN) \
-                    $(SHL7LINKLIST)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL7DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)/$(SHL7DEFAULTRES:b).rc
-.IF "$(SHL7ICON)" != ""
-    @echo 1 ICON $(SHL7ICON) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL7ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL7ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc
-.ELSE			# "$(SHL7ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL7DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL7DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL7DEFAULTRES:b).rc
-.ENDIF			# "$(SHL7ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL7TARGET)$(DLLPOST) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-.IF "$(RCFLAGSOUTRES)"!=""
-# rc, takes separate flag naming output file, source .rc file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL7DEFAULTRES) $(MISC)/$(SHL7DEFAULTRES:b).rc
-.ELSE
-# windres, just takes output file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc $(SHL7DEFAULTRES)
-.ENDIF
-.ENDIF			# "$(SHL7DEFAULTRES)"!=""
-.IF "$(SHL7ALLRES)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES)
-.IF "$(COM)"=="GCC"
-    $(WINDRES) $(SHL7LINKRES) $(SHL7LINKRESO)
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(SHL7ALLRES)"!=""
-.IF "$(COM)"=="GCC"
-# GNU ld since 2.17 supports @cmdfile syntax
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL7LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL7DEF) \
-        $(USE_7IMPLIB) \
-        $(STDOBJ) \
-        $(SHL7VERSIONOBJ) $(SHL7OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL7LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL7STDLIBS) -Wl,--end-group \
-        $(SHL7STDSHL) $(STDSHL7) \
-        $(SHL7LINKRESO) \
-    ))
-.ELSE
-    @noop $(assign ALL7OBJLIST:=$(STDOBJ) $(SHL7OBJS) $(SHL7LINKRESO) $(shell $(TYPE) /dev/null $(SHL7LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-.IF "$(DEFLIB7NAME)"!=""	# do not have to include objs
-    @noop $(assign DEF7OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-    @noop $(foreach,i,$(DEF7OBJLIST) $(assign ALL7OBJLIST:=$(ALL7OBJLIST:s?$i??)))
-.ENDIF			# "$(DEFLIB7NAME)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL7LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL7DEF) \
-        $(USE_7IMPLIB) \
-        $(STDOBJ) \
-        $(SHL7VERSIONOBJ) $(SHL7OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL7LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL7STDLIBS) -Wl,--end-group \
-        $(SHL7STDSHL) $(STDSHL7) \
-        $(SHL7LINKRESO) \
-    ))
-.ENDIF
-.ELSE
-.IF "$(linkinc)"==""
-.IF "$(SHL7USE_EXPORTS)"!="name"
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL7LINKER) @$(mktmp \
-        $(SHL7LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL7STACK) $(SHL7BASEX)	\
-        -out:$@ \
-        -map:$(MISC)/$(@:b).map \
-        -def:$(SHL7DEF) \
-        $(USE_7IMPLIB) \
-        $(STDOBJ) \
-        $(SHL7VERSIONOBJ) $(SHL7OBJS) \
-        $(SHL7LIBS) \
-        $(SHL7STDLIBS) \
-        $(SHL7STDSHL) $(STDSHL7) \
-        $(SHL7LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE			# "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL7LINKER) @$(mktmp	$(SHL7LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL7BASEX)		\
-        $(SHL7STACK) -out:$(SHL7TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(LB)/$(SHL7IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL7OBJS) $(SHL7VERSIONOBJ) \
-        $(SHL7LIBS)                         \
-        $(SHL7STDLIBS)                      \
-        $(SHL7STDSHL) $(STDSHL7)                           \
-        $(SHL7LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(USE_DEFFILE)"!=""
-.ELSE			# "$(SHL7USE_EXPORTS)"!="name"
-    $(COMMAND_ECHO)$(SHL7LINKER) @$(mktmp	$(SHL7LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL7BASEX)		\
-        $(SHL7STACK) -out:$(SHL7TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(USE_7IMPLIB) \
-        $(STDOBJ)							\
-        $(SHL7OBJS) $(SHL7VERSIONOBJ))   \
-        $(SHL7LINKLISTPARAM) \
-        @$(mktmp $(SHL7STDLIBS)                      \
-        $(SHL7STDSHL) $(STDSHL7)                           \
-        $(SHL7LINKRES) \
-    )
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(SHL7USE_EXPORTS)"!="name"
-.ELSE			# "$(linkinc)"==""
-        $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL7TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL7TARGET).lst
-        $(COMMAND_ECHO)$(TYPE) $(mktmp \
-        $(SHL7LINKFLAGS) \
-        $(LINKFLAGSSHL) $(SHL7BASEX) \
-        $(SHL7STACK) $(MAPFILE) \
-        -out:$@ \
-        $(LB)/$(SHL7IMPLIB).exp \
-        $(STDOBJ) \
-        $(SHL7OBJS) \
-        $(SHL7STDLIBS) \
-        $(SHL7STDSHL) $(STDSHL7) \
-        $(SHL7LINKRES) \
-        ) >> $(MISC)/$(SHL7TARGET).lnk
-        $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL7TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL7TARGET).lnk
-        $(COMMAND_ECHO)$(SHL7LINKER) @$(MISC)/$(SHL7TARGET).lnk
-        @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(linkinc)"==""
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
-    @echo $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
-    $(SHL7VERSIONOBJ) \
-    `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
-    $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_7.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_7.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_7.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        shl $(SHL7RPATH) $@
-.IF "$(SHL7CREATEJNILIB)"!=""
-    @echo "Making:   " $(@:f).jnilib
-    @macosx-create-bundle $@
-.ENDIF          # "$(SHL7CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL7NOCHECK)"==""
-    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN)
-.ENDIF				# "$(SHL7NOCHECK)"!=""
-.ENDIF
-.ELIF "$(OS)"=="IOS"
-    $(COMMAND_ECHO)$(AR) $(LIB7FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL7OBJS)) $(shell cat /dev/null $(LIB7TARGET) $(SHL7LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
-    $(COMMAND_ECHO)$(RANLIB) $@
-.ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
-    @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
-    $(SHL7VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
-    $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_7.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_7.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL7NOCHECK)"==""
-    $(COMMAND_ECHO)-$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-    $(COMMAND_ECHO)$(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-.IF "$(VERBOSE)"=="TRUE"
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-.ELSE
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) -- -s $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-.ENDIF
-.ENDIF				# "$(SHL7NOCHECK)"!=""
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
-    $(COMMAND_ECHO)$(RM) $(LB)/$(SHL7TARGETN:b)
-    $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL7TARGETN:f) $(SHL7TARGETN:b)
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
-.ENDIF
-.ENDIF			# "$(GUI)" == "UNX"
-
-.ENDIF			# "$(SHL7TARGETN)"!=""
-
-# unroll begin
-
-.IF "$(SHL8TARGETN)"!=""
-
-.IF "$(SHLLINKARCONLY)" != ""
-SHL8STDLIBS=
-STDSHL=
-.ELSE
-SHL8ARCHIVES=
-.ENDIF
-
-# decide how to link
-.IF "$(SHL8CODETYPE)"=="C"
-SHL8LINKER=$(LINKC)
-SHL8STDSHL=$(subst,CPPRUNTIME, $(STDSHL))
-SHL8LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(SHL8CODETYPE)"=="C"
-SHL8LINKER=$(LINK)
-SHL8STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
-SHL8LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(SHL8CODETYPE)"=="C"
-
-SHL8RPATH*=OOO
-LINKFLAGSRUNPATH_$(SHL8RPATH)*=/ERROR:/Bad_SHL8RPATH_value
-SHL8LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL8RPATH))
-
-.IF "$(SHL8USE_EXPORTS)"==""
-SHL8DEF*=$(MISC)/$(SHL8TARGET).def
-.ENDIF			# "$(SHL8USE_EXPORTS)"==""
-
-EXTRALIBPATHS8=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL8NOCHECK)"==""
-.IF "$(SOLAR_STLLIBPATH)"!=""
-EXTRALIBPATHS8+=-L$(SOLAR_STLLIBPATH)
-.ENDIF
-.ENDIF				# "$(SHL8NOCHECK)"!=""
-.ENDIF
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-.IF "$(L10N_framework)"==""
-.IF "$(VERSIONOBJ)"!=""
-SHL8VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)/$(SHL8VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
-SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE           # "$(GUI)" == "UNX"
-SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f)
-.ENDIF          # "$(GUI)" == "UNX"
-$(MISC)/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL8VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)/src/version.c $@
-    $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL8VERSIONOBJ:b).h/ > $@
-
-.INIT : $(SHL8VERSIONOBJDEP)
-.ENDIF			# "$(VERSIONOBJ)"!=""
-.ENDIF
-
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL8IMPLIB)" == ""
-SHL8IMPLIB=i$(TARGET)_t8
-.ENDIF			# "$(SHL8IMPLIB)" == ""
-.IF "$(COM)" != "GCC"
-USE_8IMPLIB=-implib:$(LB)/$(SHL8IMPLIB).lib
-SHL8IMPLIBN=$(LB)/$(SHL8IMPLIB).lib
-.ELSE
-USE_8IMPLIB=-Wl,--out-implib=$(SHL8IMPLIBN)
-SHL8IMPLIBN=$(LB)/lib$(SHL8IMPLIB).dll.a
-.ENDIF			# "$(COM)" != "GCC"
-ALLTAR : $(SHL8IMPLIBN)
-
-.IF "$(USE_DEFFILE)"==""
-.IF "$(COM)" != "GCC"
-USE_8IMPLIB_DEPS=$(LB)/$(SHL8IMPLIB).lib
-.ENDIF
-.ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT"
-USE_SHL8DEF=$(SHL8DEF)
-.ELSE			# "$(GUI)" != "UNX"
-USE_SHL8DEF=
-SHL8DEPN+:=$(SHL8DEPNU)
-
-.IF "$(SHL8VERSIONMAP)"==""
-# to activate vmaps remove "#"
-USE_SHL8VERSIONMAP=$(MISC)/$(SHL8TARGET).vmap
-.ENDIF			# "$(SHL8VERSIONMAP)"==""
-
-.IF "$(USE_SHL8VERSIONMAP)"!=""
-
-.IF "$(SHL8FILTERFILE)"!=""
-.IF "$(SHL8VERSIONMAP)"!=""
-#eine von beiden ist zuviel
-USE_SHL8VERSIONMAP=$(MISC)/$(SHL8TARGET).vmap
-$(USE_SHL8VERSIONMAP) .PHONY:
-    @echo -----------------------------
-    @echo you should only use versionmap OR exportfile
-    @echo -----------------------------
-#	force_dmake_to_error
-
-.ENDIF			# "$(SHL8VERSIONMAP)"!=""
-
-.IF "$(OS)" != "AIX"
-SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
-.ENDIF
-
-$(USE_SHL8VERSIONMAP): \
-                    $(SHL8OBJS)\
-                    $(SHL8LIBS)\
-                    $(SHL8FILTERFILE)
-    @$(RM) $@.dump
-.IF "$(SHL8OBJS)"!=""
-# dump remaining objects on the fly
-.IF "$(OS)"=="MACOSX"
-    @-nm $(SHL8OBJS:s/.obj/.o/) > $@.dump
-.ELSE
-    @nm $(SHL8OBJS:s/.obj/.o/) > $@.dump
-.ENDIF
-.ENDIF			# "$(SHL8OBJS)!"=""
-    @$(TYPE) /dev/null $(SHL8LIBS:s/.lib/.dump/) >> $@.dump
-    $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL8INTERFACE) -f $(SHL8FILTERFILE) -m $@
-
-.ELSE			# "$(SHL8FILTERFILE)"!=""
-USE_SHL8VERSIONMAP=$(MISC)/$(SHL8TARGET).vmap
-$(USE_SHL8VERSIONMAP) :
-.IF "$(VERBOSE)" == "TRUE"
-    @echo -----------------------------
-    @echo SHL8FILTERFILE not set!
-    @echo -----------------------------
-    @$(TOUCH) $@
-    @echo dummy file to keep the dependencies for later use.
-.ELSE
-    @$(TOUCH) $@
-.ENDIF
-#	force_dmake_to_error
-.ENDIF			# "$(SHL8FILTERFILE)"!=""
-.ELSE			# "$(USE_SHL8VERSIONMAP)"!=""
-
-#and now for the plain non-generic way...
-.IF "$(SHL8VERSIONMAP)"!=""
-USE_SHL8VERSIONMAP=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
-SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
-$(USE_SHL8VERSIONMAP): $(SHL8OBJS) $(SHL8LIBS)
-.ENDIF
-
-# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
-# even if the $(AWK) part fails:
-$(USE_SHL8VERSIONMAP) .ERRREMOVE: $(SHL8VERSIONMAP)
-    @@-$(RM) -f $@
-# The following files will only be generated and needed on Mac OS X as temporary files
-# in order to generate exported symbols list out of Linux/Solaris map files
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) -f $@.symregexp >& $(NULLDEV)
-    @-$(RM) -f $@.expsymlist >& $(NULLDEV)
-.ENDIF
-# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
-# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL8VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
-.ELIF "$(COMNAME)"=="sunpro5"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL8VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-.ELSE           # "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL8VERSIONMAP) > $@
-.ENDIF          # "$(COMID)"=="gcc3"
-    @chmod a+w $@
-# Mac OS X post-processing generate an exported symbols list from the generated map file
-# for details on exported symbols list see man ld on Mac OS X
-.IF "$(OS)"=="MACOSX"
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-.IF "$(SHL8OBJS)"!=""
-    -echo $(foreach,i,$(SHL8OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-.IF "$(SHL8LIBS)"!=""
-    $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    cp $@.exported-symbols $@
-.ENDIF # .IF "$(OS)"=="MACOSX"
-.ENDIF			# "$(SHL8VERSIONMAP)"!=""
-.ENDIF			# "$(USE_SHL8VERSIONMAP)"!=""
-.ENDIF			# "$(GUI)" != "UNX"
-
-.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
-SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\"
-.ENDIF			# "$(GUI)"!="UNX"
-.ENDIF			# "$(OS)"!="MACOSX"
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-
-.IF "$(SHL8RES)"!=""
-SHL8ALLRES+=$(SHL8RES)
-SHL8LINKRES*=$(MISC)/$(SHL8TARGET).res
-SHL8LINKRESO*=$(MISC)/$(SHL8TARGET)_res.o
-.ENDIF			# "$(SHL8RES)"!=""
-
-.IF "$(SHL8DEFAULTRES)$(use_shl_versions)"!=""
-SHL8DEFAULTRES*=$(MISC)/$(SHL8TARGET)_def.res
-SHL8ALLRES+=$(SHL8DEFAULTRES)
-SHL8LINKRES*=$(MISC)/$(SHL8TARGET).res
-SHL8LINKRESO*=$(MISC)/$(SHL8TARGET)_res.o
-.ENDIF			# "$(SHL8DEFAULTRES)$(use_shl_versions)"!=""
-
-#.IF "$(SHL8TARGETN)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL8LIBS)"!=""
-$(MISC)/$(SHL8TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL8LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(SHL8TARGETN:b)_linkinc.ls
-$(SHL8TARGETN) : $(LINKINCTARGETS)
-
-.ELSE
-.IF "$(SHL8USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-.IF "$(SHL8LIBS)"!=""
-SHL8LINKLIST=$(MISC)/$(SHL8TARGET)_link.lst
-SHL8LINKLISTPARAM=@$(SHL8LINKLIST)
-$(SHL8LINKLIST) : $(SHL8LIBS)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL8LIBS)"!=""
-.ENDIF          # "$(COM)"!="GCC"
-.ENDIF
-.ENDIF			# "$(SHL8USE_EXPORTS)"=="name"
-
-$(MISC)/%linkinc.ls:
-    @echo . > $@
-.ENDIF          # "$(linkinc)"!=""
-
-.IF "$(COM)" == "GCC" && "$(SHL8IMPLIBN)" != ""
-$(SHL8IMPLIBN) : $(SHL8TARGETN)
-.ENDIF
-
-$(SHL8TARGETN) : \
-                    $(SHL8OBJS)\
-                    $(SHL8LIBS)\
-                    $(USE_8IMPLIB_DEPS)\
-                    $(USE_SHL8DEF)\
-                    $(USE_SHL8VERSIONMAP)\
-                    $(SHL8RES)\
-                    $(SHL8DEPN) \
-                    $(SHL8LINKLIST)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL8DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)/$(SHL8DEFAULTRES:b).rc
-.IF "$(SHL8ICON)" != ""
-    @echo 1 ICON $(SHL8ICON) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL8ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL8ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc
-.ELSE			# "$(SHL8ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL8DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL8DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL8DEFAULTRES:b).rc
-.ENDIF			# "$(SHL8ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL8TARGET)$(DLLPOST) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-.IF "$(RCFLAGSOUTRES)"!=""
-# rc, takes separate flag naming output file, source .rc file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL8DEFAULTRES) $(MISC)/$(SHL8DEFAULTRES:b).rc
-.ELSE
-# windres, just takes output file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc $(SHL8DEFAULTRES)
-.ENDIF
-.ENDIF			# "$(SHL8DEFAULTRES)"!=""
-.IF "$(SHL8ALLRES)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES)
-.IF "$(COM)"=="GCC"
-    $(WINDRES) $(SHL8LINKRES) $(SHL8LINKRESO)
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(SHL8ALLRES)"!=""
-.IF "$(COM)"=="GCC"
-# GNU ld since 2.17 supports @cmdfile syntax
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL8LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL8DEF) \
-        $(USE_8IMPLIB) \
-        $(STDOBJ) \
-        $(SHL8VERSIONOBJ) $(SHL8OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL8LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL8STDLIBS) -Wl,--end-group \
-        $(SHL8STDSHL) $(STDSHL8) \
-        $(SHL8LINKRESO) \
-    ))
-.ELSE
-    @noop $(assign ALL8OBJLIST:=$(STDOBJ) $(SHL8OBJS) $(SHL8LINKRESO) $(shell $(TYPE) /dev/null $(SHL8LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-.IF "$(DEFLIB8NAME)"!=""	# do not have to include objs
-    @noop $(assign DEF8OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-    @noop $(foreach,i,$(DEF8OBJLIST) $(assign ALL8OBJLIST:=$(ALL8OBJLIST:s?$i??)))
-.ENDIF			# "$(DEFLIB8NAME)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL8LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL8DEF) \
-        $(USE_8IMPLIB) \
-        $(STDOBJ) \
-        $(SHL8VERSIONOBJ) $(SHL8OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL8LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL8STDLIBS) -Wl,--end-group \
-        $(SHL8STDSHL) $(STDSHL8) \
-        $(SHL8LINKRESO) \
-    ))
-.ENDIF
-.ELSE
-.IF "$(linkinc)"==""
-.IF "$(SHL8USE_EXPORTS)"!="name"
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL8LINKER) @$(mktmp \
-        $(SHL8LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL8STACK) $(SHL8BASEX)	\
-        -out:$@ \
-        -map:$(MISC)/$(@:b).map \
-        -def:$(SHL8DEF) \
-        $(USE_8IMPLIB) \
-        $(STDOBJ) \
-        $(SHL8VERSIONOBJ) $(SHL8OBJS) \
-        $(SHL8LIBS) \
-        $(SHL8STDLIBS) \
-        $(SHL8STDSHL) $(STDSHL8) \
-        $(SHL8LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE			# "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL8LINKER) @$(mktmp	$(SHL8LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL8BASEX)		\
-        $(SHL8STACK) -out:$(SHL8TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(LB)/$(SHL8IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL8OBJS) $(SHL8VERSIONOBJ) \
-        $(SHL8LIBS)                         \
-        $(SHL8STDLIBS)                      \
-        $(SHL8STDSHL) $(STDSHL8)                           \
-        $(SHL8LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(USE_DEFFILE)"!=""
-.ELSE			# "$(SHL8USE_EXPORTS)"!="name"
-    $(COMMAND_ECHO)$(SHL8LINKER) @$(mktmp	$(SHL8LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL8BASEX)		\
-        $(SHL8STACK) -out:$(SHL8TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(USE_8IMPLIB) \
-        $(STDOBJ)							\
-        $(SHL8OBJS) $(SHL8VERSIONOBJ))   \
-        $(SHL8LINKLISTPARAM) \
-        @$(mktmp $(SHL8STDLIBS)                      \
-        $(SHL8STDSHL) $(STDSHL8)                           \
-        $(SHL8LINKRES) \
-    )
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(SHL8USE_EXPORTS)"!="name"
-.ELSE			# "$(linkinc)"==""
-        $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL8TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL8TARGET).lst
-        $(COMMAND_ECHO)$(TYPE) $(mktmp \
-        $(SHL8LINKFLAGS) \
-        $(LINKFLAGSSHL) $(SHL8BASEX) \
-        $(SHL8STACK) $(MAPFILE) \
-        -out:$@ \
-        $(LB)/$(SHL8IMPLIB).exp \
-        $(STDOBJ) \
-        $(SHL8OBJS) \
-        $(SHL8STDLIBS) \
-        $(SHL8STDSHL) $(STDSHL8) \
-        $(SHL8LINKRES) \
-        ) >> $(MISC)/$(SHL8TARGET).lnk
-        $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL8TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL8TARGET).lnk
-        $(COMMAND_ECHO)$(SHL8LINKER) @$(MISC)/$(SHL8TARGET).lnk
-        @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(linkinc)"==""
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
-    @echo $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
-    $(SHL8VERSIONOBJ) \
-    `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
-    $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_8.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_8.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_8.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        shl $(SHL8RPATH) $@
-.IF "$(SHL8CREATEJNILIB)"!=""
-    @echo "Making:   " $(@:f).jnilib
-    @macosx-create-bundle $@
-.ENDIF          # "$(SHL8CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL8NOCHECK)"==""
-    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN)
-.ENDIF				# "$(SHL8NOCHECK)"!=""
-.ENDIF
-.ELIF "$(OS)"=="IOS"
-    $(COMMAND_ECHO)$(AR) $(LIB8FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL8OBJS)) $(shell cat /dev/null $(LIB8TARGET) $(SHL8LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
-    $(COMMAND_ECHO)$(RANLIB) $@
-.ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
-    @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
-    $(SHL8VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
-    $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_8.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_8.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL8NOCHECK)"==""
-    $(COMMAND_ECHO)-$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-    $(COMMAND_ECHO)$(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-.IF "$(VERBOSE)"=="TRUE"
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-.ELSE
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) -- -s $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-.ENDIF
-.ENDIF				# "$(SHL8NOCHECK)"!=""
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
-    $(COMMAND_ECHO)$(RM) $(LB)/$(SHL8TARGETN:b)
-    $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL8TARGETN:f) $(SHL8TARGETN:b)
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
-.ENDIF
-.ENDIF			# "$(GUI)" == "UNX"
-
-.ENDIF			# "$(SHL8TARGETN)"!=""
-
-# unroll begin
-
-.IF "$(SHL9TARGETN)"!=""
-
-.IF "$(SHLLINKARCONLY)" != ""
-SHL9STDLIBS=
-STDSHL=
-.ELSE
-SHL9ARCHIVES=
-.ENDIF
-
-# decide how to link
-.IF "$(SHL9CODETYPE)"=="C"
-SHL9LINKER=$(LINKC)
-SHL9STDSHL=$(subst,CPPRUNTIME, $(STDSHL))
-SHL9LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(SHL9CODETYPE)"=="C"
-SHL9LINKER=$(LINK)
-SHL9STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
-SHL9LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(SHL9CODETYPE)"=="C"
-
-SHL9RPATH*=OOO
-LINKFLAGSRUNPATH_$(SHL9RPATH)*=/ERROR:/Bad_SHL9RPATH_value
-SHL9LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL9RPATH))
-
-.IF "$(SHL9USE_EXPORTS)"==""
-SHL9DEF*=$(MISC)/$(SHL9TARGET).def
-.ENDIF			# "$(SHL9USE_EXPORTS)"==""
-
-EXTRALIBPATHS9=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL9NOCHECK)"==""
-.IF "$(SOLAR_STLLIBPATH)"!=""
-EXTRALIBPATHS9+=-L$(SOLAR_STLLIBPATH)
-.ENDIF
-.ENDIF				# "$(SHL9NOCHECK)"!=""
-.ENDIF
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-.IF "$(L10N_framework)"==""
-.IF "$(VERSIONOBJ)"!=""
-SHL9VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)/$(SHL9VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
-SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE           # "$(GUI)" == "UNX"
-SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f)
-.ENDIF          # "$(GUI)" == "UNX"
-$(MISC)/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL9VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)/src/version.c $@
-    $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL9VERSIONOBJ:b).h/ > $@
-
-.INIT : $(SHL9VERSIONOBJDEP)
-.ENDIF			# "$(VERSIONOBJ)"!=""
-.ENDIF
-
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL9IMPLIB)" == ""
-SHL9IMPLIB=i$(TARGET)_t9
-.ENDIF			# "$(SHL9IMPLIB)" == ""
-.IF "$(COM)" != "GCC"
-USE_9IMPLIB=-implib:$(LB)/$(SHL9IMPLIB).lib
-SHL9IMPLIBN=$(LB)/$(SHL9IMPLIB).lib
-.ELSE
-USE_9IMPLIB=-Wl,--out-implib=$(SHL9IMPLIBN)
-SHL9IMPLIBN=$(LB)/lib$(SHL9IMPLIB).dll.a
-.ENDIF			# "$(COM)" != "GCC"
-ALLTAR : $(SHL9IMPLIBN)
-
-.IF "$(USE_DEFFILE)"==""
-.IF "$(COM)" != "GCC"
-USE_9IMPLIB_DEPS=$(LB)/$(SHL9IMPLIB).lib
-.ENDIF
-.ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT"
-USE_SHL9DEF=$(SHL9DEF)
-.ELSE			# "$(GUI)" != "UNX"
-USE_SHL9DEF=
-SHL9DEPN+:=$(SHL9DEPNU)
-
-.IF "$(SHL9VERSIONMAP)"==""
-# to activate vmaps remove "#"
-USE_SHL9VERSIONMAP=$(MISC)/$(SHL9TARGET).vmap
-.ENDIF			# "$(SHL9VERSIONMAP)"==""
-
-.IF "$(USE_SHL9VERSIONMAP)"!=""
-
-.IF "$(SHL9FILTERFILE)"!=""
-.IF "$(SHL9VERSIONMAP)"!=""
-#eine von beiden ist zuviel
-USE_SHL9VERSIONMAP=$(MISC)/$(SHL9TARGET).vmap
-$(USE_SHL9VERSIONMAP) .PHONY:
-    @echo -----------------------------
-    @echo you should only use versionmap OR exportfile
-    @echo -----------------------------
-#	force_dmake_to_error
-
-.ENDIF			# "$(SHL9VERSIONMAP)"!=""
-
-.IF "$(OS)" != "AIX"
-SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
-.ENDIF
-
-$(USE_SHL9VERSIONMAP): \
-                    $(SHL9OBJS)\
-                    $(SHL9LIBS)\
-                    $(SHL9FILTERFILE)
-    @$(RM) $@.dump
-.IF "$(SHL9OBJS)"!=""
-# dump remaining objects on the fly
-.IF "$(OS)"=="MACOSX"
-    @-nm $(SHL9OBJS:s/.obj/.o/) > $@.dump
-.ELSE
-    @nm $(SHL9OBJS:s/.obj/.o/) > $@.dump
-.ENDIF
-.ENDIF			# "$(SHL9OBJS)!"=""
-    @$(TYPE) /dev/null $(SHL9LIBS:s/.lib/.dump/) >> $@.dump
-    $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL9INTERFACE) -f $(SHL9FILTERFILE) -m $@
-
-.ELSE			# "$(SHL9FILTERFILE)"!=""
-USE_SHL9VERSIONMAP=$(MISC)/$(SHL9TARGET).vmap
-$(USE_SHL9VERSIONMAP) :
-.IF "$(VERBOSE)" == "TRUE"
-    @echo -----------------------------
-    @echo SHL9FILTERFILE not set!
-    @echo -----------------------------
-    @$(TOUCH) $@
-    @echo dummy file to keep the dependencies for later use.
-.ELSE
-    @$(TOUCH) $@
-.ENDIF
-#	force_dmake_to_error
-.ENDIF			# "$(SHL9FILTERFILE)"!=""
-.ELSE			# "$(USE_SHL9VERSIONMAP)"!=""
-
-#and now for the plain non-generic way...
-.IF "$(SHL9VERSIONMAP)"!=""
-USE_SHL9VERSIONMAP=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
-SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
-$(USE_SHL9VERSIONMAP): $(SHL9OBJS) $(SHL9LIBS)
-.ENDIF
-
-# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
-# even if the $(AWK) part fails:
-$(USE_SHL9VERSIONMAP) .ERRREMOVE: $(SHL9VERSIONMAP)
-    @@-$(RM) -f $@
-# The following files will only be generated and needed on Mac OS X as temporary files
-# in order to generate exported symbols list out of Linux/Solaris map files
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) -f $@.symregexp >& $(NULLDEV)
-    @-$(RM) -f $@.expsymlist >& $(NULLDEV)
-.ENDIF
-# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
-# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL9VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
-.ELIF "$(COMNAME)"=="sunpro5"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL9VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-.ELSE           # "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL9VERSIONMAP) > $@
-.ENDIF          # "$(COMID)"=="gcc3"
-    @chmod a+w $@
-# Mac OS X post-processing generate an exported symbols list from the generated map file
-# for details on exported symbols list see man ld on Mac OS X
-.IF "$(OS)"=="MACOSX"
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-.IF "$(SHL9OBJS)"!=""
-    -echo $(foreach,i,$(SHL9OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-.IF "$(SHL9LIBS)"!=""
-    $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    cp $@.exported-symbols $@
-.ENDIF # .IF "$(OS)"=="MACOSX"
-.ENDIF			# "$(SHL9VERSIONMAP)"!=""
-.ENDIF			# "$(USE_SHL9VERSIONMAP)"!=""
-.ENDIF			# "$(GUI)" != "UNX"
-
-.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
-SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\"
-.ENDIF			# "$(GUI)"!="UNX"
-.ENDIF			# "$(OS)"!="MACOSX"
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-
-.IF "$(SHL9RES)"!=""
-SHL9ALLRES+=$(SHL9RES)
-SHL9LINKRES*=$(MISC)/$(SHL9TARGET).res
-SHL9LINKRESO*=$(MISC)/$(SHL9TARGET)_res.o
-.ENDIF			# "$(SHL9RES)"!=""
-
-.IF "$(SHL9DEFAULTRES)$(use_shl_versions)"!=""
-SHL9DEFAULTRES*=$(MISC)/$(SHL9TARGET)_def.res
-SHL9ALLRES+=$(SHL9DEFAULTRES)
-SHL9LINKRES*=$(MISC)/$(SHL9TARGET).res
-SHL9LINKRESO*=$(MISC)/$(SHL9TARGET)_res.o
-.ENDIF			# "$(SHL9DEFAULTRES)$(use_shl_versions)"!=""
-
-#.IF "$(SHL9TARGETN)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL9LIBS)"!=""
-$(MISC)/$(SHL9TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL9LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(SHL9TARGETN:b)_linkinc.ls
-$(SHL9TARGETN) : $(LINKINCTARGETS)
-
-.ELSE
-.IF "$(SHL9USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-.IF "$(SHL9LIBS)"!=""
-SHL9LINKLIST=$(MISC)/$(SHL9TARGET)_link.lst
-SHL9LINKLISTPARAM=@$(SHL9LINKLIST)
-$(SHL9LINKLIST) : $(SHL9LIBS)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL9LIBS)"!=""
-.ENDIF          # "$(COM)"!="GCC"
-.ENDIF
-.ENDIF			# "$(SHL9USE_EXPORTS)"=="name"
-
-$(MISC)/%linkinc.ls:
-    @echo . > $@
-.ENDIF          # "$(linkinc)"!=""
-
-.IF "$(COM)" == "GCC" && "$(SHL9IMPLIBN)" != ""
-$(SHL9IMPLIBN) : $(SHL9TARGETN)
-.ENDIF
-
-$(SHL9TARGETN) : \
-                    $(SHL9OBJS)\
-                    $(SHL9LIBS)\
-                    $(USE_9IMPLIB_DEPS)\
-                    $(USE_SHL9DEF)\
-                    $(USE_SHL9VERSIONMAP)\
-                    $(SHL9RES)\
-                    $(SHL9DEPN) \
-                    $(SHL9LINKLIST)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL9DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)/$(SHL9DEFAULTRES:b).rc
-.IF "$(SHL9ICON)" != ""
-    @echo 1 ICON $(SHL9ICON) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL9ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL9ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc
-.ELSE			# "$(SHL9ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL9DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL9DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL9DEFAULTRES:b).rc
-.ENDIF			# "$(SHL9ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL9TARGET)$(DLLPOST) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-.IF "$(RCFLAGSOUTRES)"!=""
-# rc, takes separate flag naming output file, source .rc file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL9DEFAULTRES) $(MISC)/$(SHL9DEFAULTRES:b).rc
-.ELSE
-# windres, just takes output file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc $(SHL9DEFAULTRES)
-.ENDIF
-.ENDIF			# "$(SHL9DEFAULTRES)"!=""
-.IF "$(SHL9ALLRES)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES)
-.IF "$(COM)"=="GCC"
-    $(WINDRES) $(SHL9LINKRES) $(SHL9LINKRESO)
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(SHL9ALLRES)"!=""
-.IF "$(COM)"=="GCC"
-# GNU ld since 2.17 supports @cmdfile syntax
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL9LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL9DEF) \
-        $(USE_9IMPLIB) \
-        $(STDOBJ) \
-        $(SHL9VERSIONOBJ) $(SHL9OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL9LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL9STDLIBS) -Wl,--end-group \
-        $(SHL9STDSHL) $(STDSHL9) \
-        $(SHL9LINKRESO) \
-    ))
-.ELSE
-    @noop $(assign ALL9OBJLIST:=$(STDOBJ) $(SHL9OBJS) $(SHL9LINKRESO) $(shell $(TYPE) /dev/null $(SHL9LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-.IF "$(DEFLIB9NAME)"!=""	# do not have to include objs
-    @noop $(assign DEF9OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-    @noop $(foreach,i,$(DEF9OBJLIST) $(assign ALL9OBJLIST:=$(ALL9OBJLIST:s?$i??)))
-.ENDIF			# "$(DEFLIB9NAME)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL9LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL9DEF) \
-        $(USE_9IMPLIB) \
-        $(STDOBJ) \
-        $(SHL9VERSIONOBJ) $(SHL9OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL9LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL9STDLIBS) -Wl,--end-group \
-        $(SHL9STDSHL) $(STDSHL9) \
-        $(SHL9LINKRESO) \
-    ))
-.ENDIF
-.ELSE
-.IF "$(linkinc)"==""
-.IF "$(SHL9USE_EXPORTS)"!="name"
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL9LINKER) @$(mktmp \
-        $(SHL9LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL9STACK) $(SHL9BASEX)	\
-        -out:$@ \
-        -map:$(MISC)/$(@:b).map \
-        -def:$(SHL9DEF) \
-        $(USE_9IMPLIB) \
-        $(STDOBJ) \
-        $(SHL9VERSIONOBJ) $(SHL9OBJS) \
-        $(SHL9LIBS) \
-        $(SHL9STDLIBS) \
-        $(SHL9STDSHL) $(STDSHL9) \
-        $(SHL9LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE			# "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL9LINKER) @$(mktmp	$(SHL9LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL9BASEX)		\
-        $(SHL9STACK) -out:$(SHL9TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(LB)/$(SHL9IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL9OBJS) $(SHL9VERSIONOBJ) \
-        $(SHL9LIBS)                         \
-        $(SHL9STDLIBS)                      \
-        $(SHL9STDSHL) $(STDSHL9)                           \
-        $(SHL9LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(USE_DEFFILE)"!=""
-.ELSE			# "$(SHL9USE_EXPORTS)"!="name"
-    $(COMMAND_ECHO)$(SHL9LINKER) @$(mktmp	$(SHL9LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL9BASEX)		\
-        $(SHL9STACK) -out:$(SHL9TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(USE_9IMPLIB) \
-        $(STDOBJ)							\
-        $(SHL9OBJS) $(SHL9VERSIONOBJ))   \
-        $(SHL9LINKLISTPARAM) \
-        @$(mktmp $(SHL9STDLIBS)                      \
-        $(SHL9STDSHL) $(STDSHL9)                           \
-        $(SHL9LINKRES) \
-    )
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(SHL9USE_EXPORTS)"!="name"
-.ELSE			# "$(linkinc)"==""
-        $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL9TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL9TARGET).lst
-        $(COMMAND_ECHO)$(TYPE) $(mktmp \
-        $(SHL9LINKFLAGS) \
-        $(LINKFLAGSSHL) $(SHL9BASEX) \
-        $(SHL9STACK) $(MAPFILE) \
-        -out:$@ \
-        $(LB)/$(SHL9IMPLIB).exp \
-        $(STDOBJ) \
-        $(SHL9OBJS) \
-        $(SHL9STDLIBS) \
-        $(SHL9STDSHL) $(STDSHL9) \
-        $(SHL9LINKRES) \
-        ) >> $(MISC)/$(SHL9TARGET).lnk
-        $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL9TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL9TARGET).lnk
-        $(COMMAND_ECHO)$(SHL9LINKER) @$(MISC)/$(SHL9TARGET).lnk
-        @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(linkinc)"==""
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
-    @echo $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
-    $(SHL9VERSIONOBJ) \
-    `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
-    $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_9.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_9.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_9.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        shl $(SHL9RPATH) $@
-.IF "$(SHL9CREATEJNILIB)"!=""
-    @echo "Making:   " $(@:f).jnilib
-    @macosx-create-bundle $@
-.ENDIF          # "$(SHL9CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL9NOCHECK)"==""
-    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN)
-.ENDIF				# "$(SHL9NOCHECK)"!=""
-.ENDIF
-.ELIF "$(OS)"=="IOS"
-    $(COMMAND_ECHO)$(AR) $(LIB9FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL9OBJS)) $(shell cat /dev/null $(LIB9TARGET) $(SHL9LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
-    $(COMMAND_ECHO)$(RANLIB) $@
-.ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
-    @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
-    $(SHL9VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
-    $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_9.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_9.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL9NOCHECK)"==""
-    $(COMMAND_ECHO)-$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-    $(COMMAND_ECHO)$(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-.IF "$(VERBOSE)"=="TRUE"
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-.ELSE
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) -- -s $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-.ENDIF
-.ENDIF				# "$(SHL9NOCHECK)"!=""
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
-    $(COMMAND_ECHO)$(RM) $(LB)/$(SHL9TARGETN:b)
-    $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL9TARGETN:f) $(SHL9TARGETN:b)
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
-.ENDIF
-.ENDIF			# "$(GUI)" == "UNX"
-
-.ENDIF			# "$(SHL9TARGETN)"!=""
-
-# unroll begin
-
-.IF "$(SHL10TARGETN)"!=""
-
-.IF "$(SHLLINKARCONLY)" != ""
-SHL10STDLIBS=
-STDSHL=
-.ELSE
-SHL10ARCHIVES=
-.ENDIF
-
-# decide how to link
-.IF "$(SHL10CODETYPE)"=="C"
-SHL10LINKER=$(LINKC)
-SHL10STDSHL=$(subst,CPPRUNTIME, $(STDSHL))
-SHL10LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(SHL10CODETYPE)"=="C"
-SHL10LINKER=$(LINK)
-SHL10STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
-SHL10LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(SHL10CODETYPE)"=="C"
-
-SHL10RPATH*=OOO
-LINKFLAGSRUNPATH_$(SHL10RPATH)*=/ERROR:/Bad_SHL10RPATH_value
-SHL10LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL10RPATH))
-
-.IF "$(SHL10USE_EXPORTS)"==""
-SHL10DEF*=$(MISC)/$(SHL10TARGET).def
-.ENDIF			# "$(SHL10USE_EXPORTS)"==""
-
-EXTRALIBPATHS10=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL10NOCHECK)"==""
-.IF "$(SOLAR_STLLIBPATH)"!=""
-EXTRALIBPATHS10+=-L$(SOLAR_STLLIBPATH)
-.ENDIF
-.ENDIF				# "$(SHL10NOCHECK)"!=""
-.ENDIF
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-.IF "$(L10N_framework)"==""
-.IF "$(VERSIONOBJ)"!=""
-SHL10VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)/$(SHL10VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
-SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE           # "$(GUI)" == "UNX"
-SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f)
-.ENDIF          # "$(GUI)" == "UNX"
-$(MISC)/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL10VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)/src/version.c $@
-    $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL10VERSIONOBJ:b).h/ > $@
-
-.INIT : $(SHL10VERSIONOBJDEP)
-.ENDIF			# "$(VERSIONOBJ)"!=""
-.ENDIF
-
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL10IMPLIB)" == ""
-SHL10IMPLIB=i$(TARGET)_t10
-.ENDIF			# "$(SHL10IMPLIB)" == ""
-.IF "$(COM)" != "GCC"
-USE_10IMPLIB=-implib:$(LB)/$(SHL10IMPLIB).lib
-SHL10IMPLIBN=$(LB)/$(SHL10IMPLIB).lib
-.ELSE
-USE_10IMPLIB=-Wl,--out-implib=$(SHL10IMPLIBN)
-SHL10IMPLIBN=$(LB)/lib$(SHL10IMPLIB).dll.a
-.ENDIF			# "$(COM)" != "GCC"
-ALLTAR : $(SHL10IMPLIBN)
-
-.IF "$(USE_DEFFILE)"==""
-.IF "$(COM)" != "GCC"
-USE_10IMPLIB_DEPS=$(LB)/$(SHL10IMPLIB).lib
-.ENDIF
-.ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT"
-USE_SHL10DEF=$(SHL10DEF)
-.ELSE			# "$(GUI)" != "UNX"
-USE_SHL10DEF=
-SHL10DEPN+:=$(SHL10DEPNU)
-
-.IF "$(SHL10VERSIONMAP)"==""
-# to activate vmaps remove "#"
-USE_SHL10VERSIONMAP=$(MISC)/$(SHL10TARGET).vmap
-.ENDIF			# "$(SHL10VERSIONMAP)"==""
-
-.IF "$(USE_SHL10VERSIONMAP)"!=""
-
-.IF "$(SHL10FILTERFILE)"!=""
-.IF "$(SHL10VERSIONMAP)"!=""
-#eine von beiden ist zuviel
-USE_SHL10VERSIONMAP=$(MISC)/$(SHL10TARGET).vmap
-$(USE_SHL10VERSIONMAP) .PHONY:
-    @echo -----------------------------
-    @echo you should only use versionmap OR exportfile
-    @echo -----------------------------
-#	force_dmake_to_error
-
-.ENDIF			# "$(SHL10VERSIONMAP)"!=""
-
-.IF "$(OS)" != "AIX"
-SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
-.ENDIF
-
-$(USE_SHL10VERSIONMAP): \
-                    $(SHL10OBJS)\
-                    $(SHL10LIBS)\
-                    $(SHL10FILTERFILE)
-    @$(RM) $@.dump
-.IF "$(SHL10OBJS)"!=""
-# dump remaining objects on the fly
-.IF "$(OS)"=="MACOSX"
-    @-nm $(SHL10OBJS:s/.obj/.o/) > $@.dump
-.ELSE
-    @nm $(SHL10OBJS:s/.obj/.o/) > $@.dump
-.ENDIF
-.ENDIF			# "$(SHL10OBJS)!"=""
-    @$(TYPE) /dev/null $(SHL10LIBS:s/.lib/.dump/) >> $@.dump
-    $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL10INTERFACE) -f $(SHL10FILTERFILE) -m $@
-
-.ELSE			# "$(SHL10FILTERFILE)"!=""
-USE_SHL10VERSIONMAP=$(MISC)/$(SHL10TARGET).vmap
-$(USE_SHL10VERSIONMAP) :
-.IF "$(VERBOSE)" == "TRUE"
-    @echo -----------------------------
-    @echo SHL10FILTERFILE not set!
-    @echo -----------------------------
-    @$(TOUCH) $@
-    @echo dummy file to keep the dependencies for later use.
-.ELSE
-    @$(TOUCH) $@
-.ENDIF
-#	force_dmake_to_error
-.ENDIF			# "$(SHL10FILTERFILE)"!=""
-.ELSE			# "$(USE_SHL10VERSIONMAP)"!=""
-
-#and now for the plain non-generic way...
-.IF "$(SHL10VERSIONMAP)"!=""
-USE_SHL10VERSIONMAP=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
-SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
-$(USE_SHL10VERSIONMAP): $(SHL10OBJS) $(SHL10LIBS)
-.ENDIF
-
-# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
-# even if the $(AWK) part fails:
-$(USE_SHL10VERSIONMAP) .ERRREMOVE: $(SHL10VERSIONMAP)
-    @@-$(RM) -f $@
-# The following files will only be generated and needed on Mac OS X as temporary files
-# in order to generate exported symbols list out of Linux/Solaris map files
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) -f $@.symregexp >& $(NULLDEV)
-    @-$(RM) -f $@.expsymlist >& $(NULLDEV)
-.ENDIF
-# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
-# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL10VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
-.ELIF "$(COMNAME)"=="sunpro5"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL10VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-.ELSE           # "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL10VERSIONMAP) > $@
-.ENDIF          # "$(COMID)"=="gcc3"
-    @chmod a+w $@
-# Mac OS X post-processing generate an exported symbols list from the generated map file
-# for details on exported symbols list see man ld on Mac OS X
-.IF "$(OS)"=="MACOSX"
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-.IF "$(SHL10OBJS)"!=""
-    -echo $(foreach,i,$(SHL10OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-.IF "$(SHL10LIBS)"!=""
-    $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    cp $@.exported-symbols $@
-.ENDIF # .IF "$(OS)"=="MACOSX"
-.ENDIF			# "$(SHL10VERSIONMAP)"!=""
-.ENDIF			# "$(USE_SHL10VERSIONMAP)"!=""
-.ENDIF			# "$(GUI)" != "UNX"
-
-.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
-SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\"
-.ENDIF			# "$(GUI)"!="UNX"
-.ENDIF			# "$(OS)"!="MACOSX"
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-
-.IF "$(SHL10RES)"!=""
-SHL10ALLRES+=$(SHL10RES)
-SHL10LINKRES*=$(MISC)/$(SHL10TARGET).res
-SHL10LINKRESO*=$(MISC)/$(SHL10TARGET)_res.o
-.ENDIF			# "$(SHL10RES)"!=""
-
-.IF "$(SHL10DEFAULTRES)$(use_shl_versions)"!=""
-SHL10DEFAULTRES*=$(MISC)/$(SHL10TARGET)_def.res
-SHL10ALLRES+=$(SHL10DEFAULTRES)
-SHL10LINKRES*=$(MISC)/$(SHL10TARGET).res
-SHL10LINKRESO*=$(MISC)/$(SHL10TARGET)_res.o
-.ENDIF			# "$(SHL10DEFAULTRES)$(use_shl_versions)"!=""
-
-#.IF "$(SHL10TARGETN)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL10LIBS)"!=""
-$(MISC)/$(SHL10TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL10LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(SHL10TARGETN:b)_linkinc.ls
-$(SHL10TARGETN) : $(LINKINCTARGETS)
-
-.ELSE
-.IF "$(SHL10USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-.IF "$(SHL10LIBS)"!=""
-SHL10LINKLIST=$(MISC)/$(SHL10TARGET)_link.lst
-SHL10LINKLISTPARAM=@$(SHL10LINKLIST)
-$(SHL10LINKLIST) : $(SHL10LIBS)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL10LIBS)"!=""
-.ENDIF          # "$(COM)"!="GCC"
-.ENDIF
-.ENDIF			# "$(SHL10USE_EXPORTS)"=="name"
-
-$(MISC)/%linkinc.ls:
-    @echo . > $@
-.ENDIF          # "$(linkinc)"!=""
-
-.IF "$(COM)" == "GCC" && "$(SHL10IMPLIBN)" != ""
-$(SHL10IMPLIBN) : $(SHL10TARGETN)
-.ENDIF
-
-$(SHL10TARGETN) : \
-                    $(SHL10OBJS)\
-                    $(SHL10LIBS)\
-                    $(USE_10IMPLIB_DEPS)\
-                    $(USE_SHL10DEF)\
-                    $(USE_SHL10VERSIONMAP)\
-                    $(SHL10RES)\
-                    $(SHL10DEPN) \
-                    $(SHL10LINKLIST)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL10DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)/$(SHL10DEFAULTRES:b).rc
-.IF "$(SHL10ICON)" != ""
-    @echo 1 ICON $(SHL10ICON) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL10ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL10ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc
-.ELSE			# "$(SHL10ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL10DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL10DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL10DEFAULTRES:b).rc
-.ENDIF			# "$(SHL10ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL10TARGET)$(DLLPOST) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-.IF "$(RCFLAGSOUTRES)"!=""
-# rc, takes separate flag naming output file, source .rc file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL10DEFAULTRES) $(MISC)/$(SHL10DEFAULTRES:b).rc
-.ELSE
-# windres, just takes output file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc $(SHL10DEFAULTRES)
-.ENDIF
-.ENDIF			# "$(SHL10DEFAULTRES)"!=""
-.IF "$(SHL10ALLRES)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES)
-.IF "$(COM)"=="GCC"
-    $(WINDRES) $(SHL10LINKRES) $(SHL10LINKRESO)
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(SHL10ALLRES)"!=""
-.IF "$(COM)"=="GCC"
-# GNU ld since 2.17 supports @cmdfile syntax
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL10LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL10DEF) \
-        $(USE_10IMPLIB) \
-        $(STDOBJ) \
-        $(SHL10VERSIONOBJ) $(SHL10OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL10LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL10STDLIBS) -Wl,--end-group \
-        $(SHL10STDSHL) $(STDSHL10) \
-        $(SHL10LINKRESO) \
-    ))
-.ELSE
-    @noop $(assign ALL10OBJLIST:=$(STDOBJ) $(SHL10OBJS) $(SHL10LINKRESO) $(shell $(TYPE) /dev/null $(SHL10LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-.IF "$(DEFLIB10NAME)"!=""	# do not have to include objs
-    @noop $(assign DEF10OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-    @noop $(foreach,i,$(DEF10OBJLIST) $(assign ALL10OBJLIST:=$(ALL10OBJLIST:s?$i??)))
-.ENDIF			# "$(DEFLIB10NAME)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL10LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL10DEF) \
-        $(USE_10IMPLIB) \
-        $(STDOBJ) \
-        $(SHL10VERSIONOBJ) $(SHL10OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL10LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL10STDLIBS) -Wl,--end-group \
-        $(SHL10STDSHL) $(STDSHL10) \
-        $(SHL10LINKRESO) \
-    ))
-.ENDIF
-.ELSE
-.IF "$(linkinc)"==""
-.IF "$(SHL10USE_EXPORTS)"!="name"
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL10LINKER) @$(mktmp \
-        $(SHL10LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL10STACK) $(SHL10BASEX)	\
-        -out:$@ \
-        -map:$(MISC)/$(@:b).map \
-        -def:$(SHL10DEF) \
-        $(USE_10IMPLIB) \
-        $(STDOBJ) \
-        $(SHL10VERSIONOBJ) $(SHL10OBJS) \
-        $(SHL10LIBS) \
-        $(SHL10STDLIBS) \
-        $(SHL10STDSHL) $(STDSHL10) \
-        $(SHL10LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE			# "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL10LINKER) @$(mktmp	$(SHL10LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL10BASEX)		\
-        $(SHL10STACK) -out:$(SHL10TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(LB)/$(SHL10IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL10OBJS) $(SHL10VERSIONOBJ) \
-        $(SHL10LIBS)                         \
-        $(SHL10STDLIBS)                      \
-        $(SHL10STDSHL) $(STDSHL10)                           \
-        $(SHL10LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(USE_DEFFILE)"!=""
-.ELSE			# "$(SHL10USE_EXPORTS)"!="name"
-    $(COMMAND_ECHO)$(SHL10LINKER) @$(mktmp	$(SHL10LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL10BASEX)		\
-        $(SHL10STACK) -out:$(SHL10TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(USE_10IMPLIB) \
-        $(STDOBJ)							\
-        $(SHL10OBJS) $(SHL10VERSIONOBJ))   \
-        $(SHL10LINKLISTPARAM) \
-        @$(mktmp $(SHL10STDLIBS)                      \
-        $(SHL10STDSHL) $(STDSHL10)                           \
-        $(SHL10LINKRES) \
-    )
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(SHL10USE_EXPORTS)"!="name"
-.ELSE			# "$(linkinc)"==""
-        $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL10TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL10TARGET).lst
-        $(COMMAND_ECHO)$(TYPE) $(mktmp \
-        $(SHL10LINKFLAGS) \
-        $(LINKFLAGSSHL) $(SHL10BASEX) \
-        $(SHL10STACK) $(MAPFILE) \
-        -out:$@ \
-        $(LB)/$(SHL10IMPLIB).exp \
-        $(STDOBJ) \
-        $(SHL10OBJS) \
-        $(SHL10STDLIBS) \
-        $(SHL10STDSHL) $(STDSHL10) \
-        $(SHL10LINKRES) \
-        ) >> $(MISC)/$(SHL10TARGET).lnk
-        $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL10TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL10TARGET).lnk
-        $(COMMAND_ECHO)$(SHL10LINKER) @$(MISC)/$(SHL10TARGET).lnk
-        @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(linkinc)"==""
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
-    @echo $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
-    $(SHL10VERSIONOBJ) \
-    `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
-    $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_10.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_10.cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_10.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_10.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        shl $(SHL10RPATH) $@
-.IF "$(SHL10CREATEJNILIB)"!=""
-    @echo "Making:   " $(@:f).jnilib
-    @macosx-create-bundle $@
-.ENDIF          # "$(SHL10CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL10NOCHECK)"==""
-    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN)
-.ENDIF				# "$(SHL10NOCHECK)"!=""
-.ENDIF
-.ELIF "$(OS)"=="IOS"
-    $(COMMAND_ECHO)$(AR) $(LIB10FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL10OBJS)) $(shell cat /dev/null $(LIB10TARGET) $(SHL10LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
-    $(COMMAND_ECHO)$(RANLIB) $@
-.ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
-    @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
-    $(SHL10VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
-    $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_10.cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_10.cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL10NOCHECK)"==""
-    $(COMMAND_ECHO)-$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-    $(COMMAND_ECHO)$(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-.IF "$(VERBOSE)"=="TRUE"
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-.ELSE
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) -- -s $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-.ENDIF
-.ENDIF				# "$(SHL10NOCHECK)"!=""
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
-    $(COMMAND_ECHO)$(RM) $(LB)/$(SHL10TARGETN:b)
-    $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL10TARGETN:f) $(SHL10TARGETN:b)
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
-.ENDIF
-.ENDIF			# "$(GUI)" == "UNX"
-
-.ENDIF			# "$(SHL10TARGETN)"!=""
-
-# unroll begin
-
-.IF "$(SHL1IMPLIBN)" != ""
-
-.IF "$(UPDATER)"=="YES"
-USELIB1DEPN+=$(SHL1LIBS)
-.ELSE
-.ENDIF
-
-.IF "$(USE_DEFFILE)"!=""
-USE_SHL1TARGET=$(SHL1TARGETN)
-.ENDIF
-
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
-$(SHL1IMPLIBN):	\
-                    $(SHL1DEF) \
-                    $(USE_SHL1TARGET) \
-                    $(USELIB1DEPN) \
-                    $(USELIBDEPN)
-.ELSE
-$(SHL1IMPLIBN):	\
-                    $(SHL1LIBS)
-.ENDIF
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-# bei use_deffile implib von linker erstellt
-.IF "$(USE_DEFFILE)"==""
-    $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL1IMPLIBN) \
-    -def:$(SHL1DEF) )
-.ELSE			# "$(USE_DEFFILE)==""
-    @echo build of $(SHL1TARGETN) creates $@
-    @$(TOUCH) $@
-.ENDIF			# "$(USE_DEFFILE)==""
-
-.ELSE
-    @echo no ImportLibs on Mac and *ix
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ENDIF
-.ENDIF
-.ENDIF
-
-# unroll begin
-
-.IF "$(SHL2IMPLIBN)" != ""
-
-.IF "$(UPDATER)"=="YES"
-USELIB2DEPN+=$(SHL2LIBS)
-.ELSE
-.ENDIF
-
-.IF "$(USE_DEFFILE)"!=""
-USE_SHL2TARGET=$(SHL2TARGETN)
-.ENDIF
-
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
-$(SHL2IMPLIBN):	\
-                    $(SHL2DEF) \
-                    $(USE_SHL2TARGET) \
-                    $(USELIB2DEPN) \
-                    $(USELIBDEPN)
-.ELSE
-$(SHL2IMPLIBN):	\
-                    $(SHL2LIBS)
-.ENDIF
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-# bei use_deffile implib von linker erstellt
-.IF "$(USE_DEFFILE)"==""
-    $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL2IMPLIBN) \
-    -def:$(SHL2DEF) )
-.ELSE			# "$(USE_DEFFILE)==""
-    @echo build of $(SHL2TARGETN) creates $@
-    @$(TOUCH) $@
-.ENDIF			# "$(USE_DEFFILE)==""
-
-.ELSE
-    @echo no ImportLibs on Mac and *ix
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ENDIF
-.ENDIF
-.ENDIF
-
-# unroll begin
-
-.IF "$(SHL3IMPLIBN)" != ""
-
-.IF "$(UPDATER)"=="YES"
-USELIB3DEPN+=$(SHL3LIBS)
-.ELSE
-.ENDIF
-
-.IF "$(USE_DEFFILE)"!=""
-USE_SHL3TARGET=$(SHL3TARGETN)
-.ENDIF
-
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
-$(SHL3IMPLIBN):	\
-                    $(SHL3DEF) \
-                    $(USE_SHL3TARGET) \
-                    $(USELIB3DEPN) \
-                    $(USELIBDEPN)
-.ELSE
-$(SHL3IMPLIBN):	\
-                    $(SHL3LIBS)
-.ENDIF
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-# bei use_deffile implib von linker erstellt
-.IF "$(USE_DEFFILE)"==""
-    $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL3IMPLIBN) \
-    -def:$(SHL3DEF) )
-.ELSE			# "$(USE_DEFFILE)==""
-    @echo build of $(SHL3TARGETN) creates $@
-    @$(TOUCH) $@
-.ENDIF			# "$(USE_DEFFILE)==""
-
-.ELSE
-    @echo no ImportLibs on Mac and *ix
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ENDIF
-.ENDIF
-.ENDIF
-
-# unroll begin
-
-.IF "$(SHL4IMPLIBN)" != ""
-
-.IF "$(UPDATER)"=="YES"
-USELIB4DEPN+=$(SHL4LIBS)
-.ELSE
-.ENDIF
-
-.IF "$(USE_DEFFILE)"!=""
-USE_SHL4TARGET=$(SHL4TARGETN)
-.ENDIF
-
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
-$(SHL4IMPLIBN):	\
-                    $(SHL4DEF) \
-                    $(USE_SHL4TARGET) \
-                    $(USELIB4DEPN) \
-                    $(USELIBDEPN)
-.ELSE
-$(SHL4IMPLIBN):	\
-                    $(SHL4LIBS)
-.ENDIF
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-# bei use_deffile implib von linker erstellt
-.IF "$(USE_DEFFILE)"==""
-    $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL4IMPLIBN) \
-    -def:$(SHL4DEF) )
-.ELSE			# "$(USE_DEFFILE)==""
-    @echo build of $(SHL4TARGETN) creates $@
-    @$(TOUCH) $@
-.ENDIF			# "$(USE_DEFFILE)==""
-
-.ELSE
-    @echo no ImportLibs on Mac and *ix
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ENDIF
-.ENDIF
-.ENDIF
-
-# unroll begin
-
-.IF "$(SHL5IMPLIBN)" != ""
-
-.IF "$(UPDATER)"=="YES"
-USELIB5DEPN+=$(SHL5LIBS)
-.ELSE
-.ENDIF
-
-.IF "$(USE_DEFFILE)"!=""
-USE_SHL5TARGET=$(SHL5TARGETN)
-.ENDIF
-
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
-$(SHL5IMPLIBN):	\
-                    $(SHL5DEF) \
-                    $(USE_SHL5TARGET) \
-                    $(USELIB5DEPN) \
-                    $(USELIBDEPN)
-.ELSE
-$(SHL5IMPLIBN):	\
-                    $(SHL5LIBS)
-.ENDIF
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-# bei use_deffile implib von linker erstellt
-.IF "$(USE_DEFFILE)"==""
-    $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL5IMPLIBN) \
-    -def:$(SHL5DEF) )
-.ELSE			# "$(USE_DEFFILE)==""
-    @echo build of $(SHL5TARGETN) creates $@
-    @$(TOUCH) $@
-.ENDIF			# "$(USE_DEFFILE)==""
-
-.ELSE
-    @echo no ImportLibs on Mac and *ix
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ENDIF
-.ENDIF
-.ENDIF
-
-# unroll begin
-
-.IF "$(SHL6IMPLIBN)" != ""
-
-.IF "$(UPDATER)"=="YES"
-USELIB6DEPN+=$(SHL6LIBS)
-.ELSE
-.ENDIF
-
-.IF "$(USE_DEFFILE)"!=""
-USE_SHL6TARGET=$(SHL6TARGETN)
-.ENDIF
-
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
-$(SHL6IMPLIBN):	\
-                    $(SHL6DEF) \
-                    $(USE_SHL6TARGET) \
-                    $(USELIB6DEPN) \
-                    $(USELIBDEPN)
-.ELSE
-$(SHL6IMPLIBN):	\
-                    $(SHL6LIBS)
-.ENDIF
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-# bei use_deffile implib von linker erstellt
-.IF "$(USE_DEFFILE)"==""
-    $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL6IMPLIBN) \
-    -def:$(SHL6DEF) )
-.ELSE			# "$(USE_DEFFILE)==""
-    @echo build of $(SHL6TARGETN) creates $@
-    @$(TOUCH) $@
-.ENDIF			# "$(USE_DEFFILE)==""
-
-.ELSE
-    @echo no ImportLibs on Mac and *ix
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ENDIF
-.ENDIF
-.ENDIF
-
-# unroll begin
-
-.IF "$(SHL7IMPLIBN)" != ""
-
-.IF "$(UPDATER)"=="YES"
-USELIB7DEPN+=$(SHL7LIBS)
-.ELSE
-.ENDIF
-
-.IF "$(USE_DEFFILE)"!=""
-USE_SHL7TARGET=$(SHL7TARGETN)
-.ENDIF
-
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
-$(SHL7IMPLIBN):	\
-                    $(SHL7DEF) \
-                    $(USE_SHL7TARGET) \
-                    $(USELIB7DEPN) \
-                    $(USELIBDEPN)
-.ELSE
-$(SHL7IMPLIBN):	\
-                    $(SHL7LIBS)
-.ENDIF
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-# bei use_deffile implib von linker erstellt
-.IF "$(USE_DEFFILE)"==""
-    $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL7IMPLIBN) \
-    -def:$(SHL7DEF) )
-.ELSE			# "$(USE_DEFFILE)==""
-    @echo build of $(SHL7TARGETN) creates $@
-    @$(TOUCH) $@
-.ENDIF			# "$(USE_DEFFILE)==""
-
-.ELSE
-    @echo no ImportLibs on Mac and *ix
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ENDIF
-.ENDIF
-.ENDIF
-
-# unroll begin
-
-.IF "$(SHL8IMPLIBN)" != ""
-
-.IF "$(UPDATER)"=="YES"
-USELIB8DEPN+=$(SHL8LIBS)
-.ELSE
-.ENDIF
-
-.IF "$(USE_DEFFILE)"!=""
-USE_SHL8TARGET=$(SHL8TARGETN)
-.ENDIF
-
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
-$(SHL8IMPLIBN):	\
-                    $(SHL8DEF) \
-                    $(USE_SHL8TARGET) \
-                    $(USELIB8DEPN) \
-                    $(USELIBDEPN)
-.ELSE
-$(SHL8IMPLIBN):	\
-                    $(SHL8LIBS)
-.ENDIF
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-# bei use_deffile implib von linker erstellt
-.IF "$(USE_DEFFILE)"==""
-    $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL8IMPLIBN) \
-    -def:$(SHL8DEF) )
-.ELSE			# "$(USE_DEFFILE)==""
-    @echo build of $(SHL8TARGETN) creates $@
-    @$(TOUCH) $@
-.ENDIF			# "$(USE_DEFFILE)==""
-
-.ELSE
-    @echo no ImportLibs on Mac and *ix
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ENDIF
-.ENDIF
-.ENDIF
-
-# unroll begin
-
-.IF "$(SHL9IMPLIBN)" != ""
-
-.IF "$(UPDATER)"=="YES"
-USELIB9DEPN+=$(SHL9LIBS)
-.ELSE
-.ENDIF
-
-.IF "$(USE_DEFFILE)"!=""
-USE_SHL9TARGET=$(SHL9TARGETN)
-.ENDIF
-
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
-$(SHL9IMPLIBN):	\
-                    $(SHL9DEF) \
-                    $(USE_SHL9TARGET) \
-                    $(USELIB9DEPN) \
-                    $(USELIBDEPN)
-.ELSE
-$(SHL9IMPLIBN):	\
-                    $(SHL9LIBS)
-.ENDIF
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-# bei use_deffile implib von linker erstellt
-.IF "$(USE_DEFFILE)"==""
-    $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL9IMPLIBN) \
-    -def:$(SHL9DEF) )
-.ELSE			# "$(USE_DEFFILE)==""
-    @echo build of $(SHL9TARGETN) creates $@
-    @$(TOUCH) $@
-.ENDIF			# "$(USE_DEFFILE)==""
-
-.ELSE
-    @echo no ImportLibs on Mac and *ix
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ENDIF
-.ENDIF
-.ENDIF
-
-# unroll begin
-
-.IF "$(SHL10IMPLIBN)" != ""
-
-.IF "$(UPDATER)"=="YES"
-USELIB10DEPN+=$(SHL10LIBS)
-.ELSE
-.ENDIF
-
-.IF "$(USE_DEFFILE)"!=""
-USE_SHL10TARGET=$(SHL10TARGETN)
-.ENDIF
-
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
-$(SHL10IMPLIBN):	\
-                    $(SHL10DEF) \
-                    $(USE_SHL10TARGET) \
-                    $(USELIB10DEPN) \
-                    $(USELIBDEPN)
-.ELSE
-$(SHL10IMPLIBN):	\
-                    $(SHL10LIBS)
-.ENDIF
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-# bei use_deffile implib von linker erstellt
-.IF "$(USE_DEFFILE)"==""
-    $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL10IMPLIBN) \
-    -def:$(SHL10DEF) )
-.ELSE			# "$(USE_DEFFILE)==""
-    @echo build of $(SHL10TARGETN) creates $@
-    @$(TOUCH) $@
-.ENDIF			# "$(USE_DEFFILE)==""
-
-.ELSE
-    @echo no ImportLibs on Mac and *ix
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ENDIF
-.ENDIF
-.ENDIF
-
diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
deleted file mode 100644
index 375fab35b..000000000
--- a/solenv/inc/_tg_srs.mk
+++ /dev/null
@@ -1,410 +0,0 @@
-# unroll begin
-
-.IF "$(SRS1NAME)"!=""
-
-$(MISC)/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)/$(TARGET).$(SRS1NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC1FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-$(SRS)/$(SRS1NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)/$(TARGET)/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)/$(SRS1NAME).srs: $(SRC1FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS1NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS2NAME)"!=""
-
-$(MISC)/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)/$(TARGET).$(SRS2NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC2FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-$(SRS)/$(SRS2NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)/$(TARGET)/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)/$(SRS2NAME).srs: $(SRC2FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS2NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS3NAME)"!=""
-
-$(MISC)/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)/$(TARGET).$(SRS3NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC3FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-$(SRS)/$(SRS3NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)/$(TARGET)/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)/$(SRS3NAME).srs: $(SRC3FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS3NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS4NAME)"!=""
-
-$(MISC)/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)/$(TARGET).$(SRS4NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC4FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-$(SRS)/$(SRS4NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)/$(TARGET)/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)/$(SRS4NAME).srs: $(SRC4FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS4NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS5NAME)"!=""
-
-$(MISC)/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)/$(TARGET).$(SRS5NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC5FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-$(SRS)/$(SRS5NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)/$(TARGET)/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)/$(SRS5NAME).srs: $(SRC5FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS5NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS6NAME)"!=""
-
-$(MISC)/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)/$(TARGET).$(SRS6NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC6FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-$(SRS)/$(SRS6NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)/$(TARGET)/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)/$(SRS6NAME).srs: $(SRC6FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS6NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS7NAME)"!=""
-
-$(MISC)/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)/$(TARGET).$(SRS7NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC7FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-$(SRS)/$(SRS7NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)/$(TARGET)/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)/$(SRS7NAME).srs: $(SRC7FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS7NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS8NAME)"!=""
-
-$(MISC)/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)/$(TARGET).$(SRS8NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC8FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-$(SRS)/$(SRS8NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)/$(TARGET)/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)/$(SRS8NAME).srs: $(SRC8FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS8NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS9NAME)"!=""
-
-$(MISC)/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)/$(TARGET).$(SRS9NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC9FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-$(SRS)/$(SRS9NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)/$(TARGET)/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)/$(SRS9NAME).srs: $(SRC9FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS9NAME)"!=""
-
-# unroll begin
-
-.IF "$(SRS10NAME)"!=""
-
-$(MISC)/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)/$(TARGET).$(SRS10NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC10FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-$(SRS)/$(SRS10NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)/$(TARGET)/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)/$(SRS10NAME).srs: $(SRC10FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS10NAME)"!=""
-
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
deleted file mode 100644
index c60480bc5..000000000
--- a/solenv/inc/_tg_zip.mk
+++ /dev/null
@@ -1,1310 +0,0 @@
-# unroll begin
-
-.IF "$(GUI)"=="WNT"
-command_seperator=&&
-#command_seperator=^
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELSE
-command_seperator=;
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
- 
-.ENDIF
-
-.IF "$(ZIP1TARGET)"!=""
-
-.IF "$(ZIP1STRIPLANGUAGETAGS)" != ""
-CALLXSLTPROC:=$(XSLTPROC)
-.EXPORT: CALLXSLTPROC
-.ENDIF
-
-ZIP1EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP1LIST:s/LANGDIR//)" == "$(ZIP1LIST)"
-ZIP1TARGETN=$(COMMONBIN)/$(ZIP1TARGET)$(ZIP1EXT)
-.ELSE
-ZIP1TARGETN=$(foreach,i,$(zip1alllangiso) $(COMMONBIN)/$(ZIP1TARGET)_$i$(ZIP1EXT) )
-.ENDIF
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP1LIST:s/LANGDIR//)" == "$(ZIP1LIST)"
-ZIP1TARGETN=$(BIN)/$(ZIP1TARGET)$(ZIP1EXT)
-.ELSE
-ZIP1TARGETN=$(foreach,i,$(zip1alllangiso) $(BIN)/$(ZIP1TARGET)_$i$(ZIP1EXT) )
-.ENDIF
-.ENDIF			# "$(common_build_zip)"!=""
-ZIP1DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP1TARGETN:s/$(ZIP1EXT)/.dpzz/)))
-ZIPDEPFILES+=$(ZIP1DEPFILE)
-
-ZIP1DIR*=$(ZIPDIR)
-ZIP1FLAGS*=$(ZIPFLAGS)
-.IF "$(zip1generatedlangs)"!=""
-zip1langdirs*=$(alllangiso)
-.ELSE           # "$(zip1generatedlangs)"!=""
-zip1langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ENDIF          # "$(zip1generatedlangs)"!=""
-.IF "$(ZIP1FORCEALLLANG)"!=""
-zip1alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip1langdirs) $(eq,$i,$j  $i $(NULL))))
-.ELSE          # "$(ZIP1ALLLANG)" != ""
-zip1alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip1langdirs) $(eq,$i,$j  $i $(NULL))))
-.ENDIF          # "$(ZIP1ALLLANG)" != ""
-.ENDIF			# "$(ZIP1TARGET)"!=""
-
-.IF "$(ZIP1TARGETN)"!=""
-
-ZIP1TMP:=$(mktmp iii)
-
-$(MISC)/$(TARGET).$(PWD:f).$(ZIP1TARGET).dpzz : $(ZIP1TARGETN)
-
-.IF "$(common_build_zip)"!=""
-ZIP1HELPVAR=$(COMMONBIN)/$(ZIP1TARGET)
-.ELSE			# "$(common_build_zip)"!=""
-ZIP1HELPVAR=$(BIN)/$(ZIP1TARGET)
-.ENDIF			# "$(common_build_zip)"!=""
-
-$(ZIP1DEPFILE) :
-    @echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP1DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP1DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP1DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP1FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP1DIR)" != ""
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP1DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP1DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP1DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP1FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP1DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
-
-
-$(ZIP1TARGETN) : delzip $(ZIP1DEPS)
-    @echo "Making:   " $(@:f)
-    @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
-    @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
-    @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP1DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $@.$(INPATH)
-    $(COMMAND_ECHO)$(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
-.ELSE			# "$(ZIP1DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
-        $(FI)
-    @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
-    @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-.ENDIF			# "$(ZIP1DIR)" != ""
-    @@-$(RM) $@
-    @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-#	@$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI)  # even if it's not used...
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP1DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)  $@ 
-    $(COMMAND_ECHO)$(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
-.ELSE			# "$(ZIP1DIR)" != ""
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $@ $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
-        $(FI)
-.IF "$(ZIP1STRIPLANGUAGETAGS)" != ""
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(SOLARENV)/bin/striplanguagetags.sh $@ \
-        $(FI)
-.ENDIF
-.ENDIF			# "$(ZIP1DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-.ENDIF
-
-# unroll begin
-
-.IF "$(GUI)"=="WNT"
-command_seperator=&&
-#command_seperator=^
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELSE
-command_seperator=;
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
- 
-.ENDIF
-
-.IF "$(ZIP2TARGET)"!=""
-
-.IF "$(ZIP2STRIPLANGUAGETAGS)" != ""
-CALLXSLTPROC:=$(XSLTPROC)
-.EXPORT: CALLXSLTPROC
-.ENDIF
-
-ZIP2EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP2LIST:s/LANGDIR//)" == "$(ZIP2LIST)"
-ZIP2TARGETN=$(COMMONBIN)/$(ZIP2TARGET)$(ZIP2EXT)
-.ELSE
-ZIP2TARGETN=$(foreach,i,$(zip2alllangiso) $(COMMONBIN)/$(ZIP2TARGET)_$i$(ZIP2EXT) )
-.ENDIF
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP2LIST:s/LANGDIR//)" == "$(ZIP2LIST)"
-ZIP2TARGETN=$(BIN)/$(ZIP2TARGET)$(ZIP2EXT)
-.ELSE
-ZIP2TARGETN=$(foreach,i,$(zip2alllangiso) $(BIN)/$(ZIP2TARGET)_$i$(ZIP2EXT) )
-.ENDIF
-.ENDIF			# "$(common_build_zip)"!=""
-ZIP2DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP2TARGETN:s/$(ZIP2EXT)/.dpzz/)))
-ZIPDEPFILES+=$(ZIP2DEPFILE)
-
-ZIP2DIR*=$(ZIPDIR)
-ZIP2FLAGS*=$(ZIPFLAGS)
-.IF "$(zip2generatedlangs)"!=""
-zip2langdirs*=$(alllangiso)
-.ELSE           # "$(zip2generatedlangs)"!=""
-zip2langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ENDIF          # "$(zip2generatedlangs)"!=""
-.IF "$(ZIP2FORCEALLLANG)"!=""
-zip2alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip2langdirs) $(eq,$i,$j  $i $(NULL))))
-.ELSE          # "$(ZIP2ALLLANG)" != ""
-zip2alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip2langdirs) $(eq,$i,$j  $i $(NULL))))
-.ENDIF          # "$(ZIP2ALLLANG)" != ""
-.ENDIF			# "$(ZIP2TARGET)"!=""
-
-.IF "$(ZIP2TARGETN)"!=""
-
-ZIP2TMP:=$(mktmp iii)
-
-$(MISC)/$(TARGET).$(PWD:f).$(ZIP2TARGET).dpzz : $(ZIP2TARGETN)
-
-.IF "$(common_build_zip)"!=""
-ZIP2HELPVAR=$(COMMONBIN)/$(ZIP2TARGET)
-.ELSE			# "$(common_build_zip)"!=""
-ZIP2HELPVAR=$(BIN)/$(ZIP2TARGET)
-.ENDIF			# "$(common_build_zip)"!=""
-
-$(ZIP2DEPFILE) :
-    @echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP2DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP2DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP2DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP2FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP2DIR)" != ""
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP2DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP2DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP2DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP2FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP2DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
-
-
-$(ZIP2TARGETN) : delzip $(ZIP2DEPS)
-    @echo "Making:   " $(@:f)
-    @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
-    @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
-    @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP2DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $@.$(INPATH)
-    $(COMMAND_ECHO)$(RM) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
-.ELSE			# "$(ZIP2DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP2FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
-        $(FI)
-    @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
-    @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-.ENDIF			# "$(ZIP2DIR)" != ""
-    @@-$(RM) $@
-    @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-#	@$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI)  # even if it's not used...
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP2DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)  $@ 
-    $(COMMAND_ECHO)$(RM) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
-.ELSE			# "$(ZIP2DIR)" != ""
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
-        $(FI)
-.IF "$(ZIP2STRIPLANGUAGETAGS)" != ""
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(SOLARENV)/bin/striplanguagetags.sh $@ \
-        $(FI)
-.ENDIF
-.ENDIF			# "$(ZIP2DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-.ENDIF
-
-# unroll begin
-
-.IF "$(GUI)"=="WNT"
-command_seperator=&&
-#command_seperator=^
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELSE
-command_seperator=;
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
- 
-.ENDIF
-
-.IF "$(ZIP3TARGET)"!=""
-
-.IF "$(ZIP3STRIPLANGUAGETAGS)" != ""
-CALLXSLTPROC:=$(XSLTPROC)
-.EXPORT: CALLXSLTPROC
-.ENDIF
-
-ZIP3EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP3LIST:s/LANGDIR//)" == "$(ZIP3LIST)"
-ZIP3TARGETN=$(COMMONBIN)/$(ZIP3TARGET)$(ZIP3EXT)
-.ELSE
-ZIP3TARGETN=$(foreach,i,$(zip3alllangiso) $(COMMONBIN)/$(ZIP3TARGET)_$i$(ZIP3EXT) )
-.ENDIF
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP3LIST:s/LANGDIR//)" == "$(ZIP3LIST)"
-ZIP3TARGETN=$(BIN)/$(ZIP3TARGET)$(ZIP3EXT)
-.ELSE
-ZIP3TARGETN=$(foreach,i,$(zip3alllangiso) $(BIN)/$(ZIP3TARGET)_$i$(ZIP3EXT) )
-.ENDIF
-.ENDIF			# "$(common_build_zip)"!=""
-ZIP3DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP3TARGETN:s/$(ZIP3EXT)/.dpzz/)))
-ZIPDEPFILES+=$(ZIP3DEPFILE)
-
-ZIP3DIR*=$(ZIPDIR)
-ZIP3FLAGS*=$(ZIPFLAGS)
-.IF "$(zip3generatedlangs)"!=""
-zip3langdirs*=$(alllangiso)
-.ELSE           # "$(zip3generatedlangs)"!=""
-zip3langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ENDIF          # "$(zip3generatedlangs)"!=""
-.IF "$(ZIP3FORCEALLLANG)"!=""
-zip3alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip3langdirs) $(eq,$i,$j  $i $(NULL))))
-.ELSE          # "$(ZIP3ALLLANG)" != ""
-zip3alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip3langdirs) $(eq,$i,$j  $i $(NULL))))
-.ENDIF          # "$(ZIP3ALLLANG)" != ""
-.ENDIF			# "$(ZIP3TARGET)"!=""
-
-.IF "$(ZIP3TARGETN)"!=""
-
-ZIP3TMP:=$(mktmp iii)
-
-$(MISC)/$(TARGET).$(PWD:f).$(ZIP3TARGET).dpzz : $(ZIP3TARGETN)
-
-.IF "$(common_build_zip)"!=""
-ZIP3HELPVAR=$(COMMONBIN)/$(ZIP3TARGET)
-.ELSE			# "$(common_build_zip)"!=""
-ZIP3HELPVAR=$(BIN)/$(ZIP3TARGET)
-.ENDIF			# "$(common_build_zip)"!=""
-
-$(ZIP3DEPFILE) :
-    @echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP3DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP3DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP3DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP3FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP3DIR)" != ""
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP3DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP3DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP3DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP3FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP3DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
-
-
-$(ZIP3TARGETN) : delzip $(ZIP3DEPS)
-    @echo "Making:   " $(@:f)
-    @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
-    @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
-    @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP3DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $@.$(INPATH)
-    $(COMMAND_ECHO)$(RM) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
-.ELSE			# "$(ZIP3DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP3FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
-        $(FI)
-    @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
-    @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-.ENDIF			# "$(ZIP3DIR)" != ""
-    @@-$(RM) $@
-    @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-#	@$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI)  # even if it's not used...
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP3DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)  $@ 
-    $(COMMAND_ECHO)$(RM) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
-.ELSE			# "$(ZIP3DIR)" != ""
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP3FLAGS) $@ $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
-        $(FI)
-.IF "$(ZIP3STRIPLANGUAGETAGS)" != ""
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(SOLARENV)/bin/striplanguagetags.sh $@ \
-        $(FI)
-.ENDIF
-.ENDIF			# "$(ZIP3DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-.ENDIF
-
-# unroll begin
-
-.IF "$(GUI)"=="WNT"
-command_seperator=&&
-#command_seperator=^
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELSE
-command_seperator=;
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
- 
-.ENDIF
-
-.IF "$(ZIP4TARGET)"!=""
-
-.IF "$(ZIP4STRIPLANGUAGETAGS)" != ""
-CALLXSLTPROC:=$(XSLTPROC)
-.EXPORT: CALLXSLTPROC
-.ENDIF
-
-ZIP4EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP4LIST:s/LANGDIR//)" == "$(ZIP4LIST)"
-ZIP4TARGETN=$(COMMONBIN)/$(ZIP4TARGET)$(ZIP4EXT)
-.ELSE
-ZIP4TARGETN=$(foreach,i,$(zip4alllangiso) $(COMMONBIN)/$(ZIP4TARGET)_$i$(ZIP4EXT) )
-.ENDIF
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP4LIST:s/LANGDIR//)" == "$(ZIP4LIST)"
-ZIP4TARGETN=$(BIN)/$(ZIP4TARGET)$(ZIP4EXT)
-.ELSE
-ZIP4TARGETN=$(foreach,i,$(zip4alllangiso) $(BIN)/$(ZIP4TARGET)_$i$(ZIP4EXT) )
-.ENDIF
-.ENDIF			# "$(common_build_zip)"!=""
-ZIP4DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP4TARGETN:s/$(ZIP4EXT)/.dpzz/)))
-ZIPDEPFILES+=$(ZIP4DEPFILE)
-
-ZIP4DIR*=$(ZIPDIR)
-ZIP4FLAGS*=$(ZIPFLAGS)
-.IF "$(zip4generatedlangs)"!=""
-zip4langdirs*=$(alllangiso)
-.ELSE           # "$(zip4generatedlangs)"!=""
-zip4langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ENDIF          # "$(zip4generatedlangs)"!=""
-.IF "$(ZIP4FORCEALLLANG)"!=""
-zip4alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip4langdirs) $(eq,$i,$j  $i $(NULL))))
-.ELSE          # "$(ZIP4ALLLANG)" != ""
-zip4alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip4langdirs) $(eq,$i,$j  $i $(NULL))))
-.ENDIF          # "$(ZIP4ALLLANG)" != ""
-.ENDIF			# "$(ZIP4TARGET)"!=""
-
-.IF "$(ZIP4TARGETN)"!=""
-
-ZIP4TMP:=$(mktmp iii)
-
-$(MISC)/$(TARGET).$(PWD:f).$(ZIP4TARGET).dpzz : $(ZIP4TARGETN)
-
-.IF "$(common_build_zip)"!=""
-ZIP4HELPVAR=$(COMMONBIN)/$(ZIP4TARGET)
-.ELSE			# "$(common_build_zip)"!=""
-ZIP4HELPVAR=$(BIN)/$(ZIP4TARGET)
-.ENDIF			# "$(common_build_zip)"!=""
-
-$(ZIP4DEPFILE) :
-    @echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP4DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP4DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP4DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP4FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP4DIR)" != ""
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP4DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP4DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP4DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP4FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP4DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
-
-
-$(ZIP4TARGETN) : delzip $(ZIP4DEPS)
-    @echo "Making:   " $(@:f)
-    @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
-    @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
-    @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP4DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $@.$(INPATH)
-    $(COMMAND_ECHO)$(RM) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
-.ELSE			# "$(ZIP4DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP4FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
-        $(FI)
-    @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
-    @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-.ENDIF			# "$(ZIP4DIR)" != ""
-    @@-$(RM) $@
-    @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-#	@$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI)  # even if it's not used...
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP4DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)  $@ 
-    $(COMMAND_ECHO)$(RM) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
-.ELSE			# "$(ZIP4DIR)" != ""
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP4FLAGS) $@ $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
-        $(FI)
-.IF "$(ZIP4STRIPLANGUAGETAGS)" != ""
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(SOLARENV)/bin/striplanguagetags.sh $@ \
-        $(FI)
-.ENDIF
-.ENDIF			# "$(ZIP4DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-.ENDIF
-
-# unroll begin
-
-.IF "$(GUI)"=="WNT"
-command_seperator=&&
-#command_seperator=^
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELSE
-command_seperator=;
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
- 
-.ENDIF
-
-.IF "$(ZIP5TARGET)"!=""
-
-.IF "$(ZIP5STRIPLANGUAGETAGS)" != ""
-CALLXSLTPROC:=$(XSLTPROC)
-.EXPORT: CALLXSLTPROC
-.ENDIF
-
-ZIP5EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP5LIST:s/LANGDIR//)" == "$(ZIP5LIST)"
-ZIP5TARGETN=$(COMMONBIN)/$(ZIP5TARGET)$(ZIP5EXT)
-.ELSE
-ZIP5TARGETN=$(foreach,i,$(zip5alllangiso) $(COMMONBIN)/$(ZIP5TARGET)_$i$(ZIP5EXT) )
-.ENDIF
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP5LIST:s/LANGDIR//)" == "$(ZIP5LIST)"
-ZIP5TARGETN=$(BIN)/$(ZIP5TARGET)$(ZIP5EXT)
-.ELSE
-ZIP5TARGETN=$(foreach,i,$(zip5alllangiso) $(BIN)/$(ZIP5TARGET)_$i$(ZIP5EXT) )
-.ENDIF
-.ENDIF			# "$(common_build_zip)"!=""
-ZIP5DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP5TARGETN:s/$(ZIP5EXT)/.dpzz/)))
-ZIPDEPFILES+=$(ZIP5DEPFILE)
-
-ZIP5DIR*=$(ZIPDIR)
-ZIP5FLAGS*=$(ZIPFLAGS)
-.IF "$(zip5generatedlangs)"!=""
-zip5langdirs*=$(alllangiso)
-.ELSE           # "$(zip5generatedlangs)"!=""
-zip5langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ENDIF          # "$(zip5generatedlangs)"!=""
-.IF "$(ZIP5FORCEALLLANG)"!=""
-zip5alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip5langdirs) $(eq,$i,$j  $i $(NULL))))
-.ELSE          # "$(ZIP5ALLLANG)" != ""
-zip5alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip5langdirs) $(eq,$i,$j  $i $(NULL))))
-.ENDIF          # "$(ZIP5ALLLANG)" != ""
-.ENDIF			# "$(ZIP5TARGET)"!=""
-
-.IF "$(ZIP5TARGETN)"!=""
-
-ZIP5TMP:=$(mktmp iii)
-
-$(MISC)/$(TARGET).$(PWD:f).$(ZIP5TARGET).dpzz : $(ZIP5TARGETN)
-
-.IF "$(common_build_zip)"!=""
-ZIP5HELPVAR=$(COMMONBIN)/$(ZIP5TARGET)
-.ELSE			# "$(common_build_zip)"!=""
-ZIP5HELPVAR=$(BIN)/$(ZIP5TARGET)
-.ENDIF			# "$(common_build_zip)"!=""
-
-$(ZIP5DEPFILE) :
-    @echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP5DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP5DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP5DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP5FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP5DIR)" != ""
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP5DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP5DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP5DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP5FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP5DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
-
-
-$(ZIP5TARGETN) : delzip $(ZIP5DEPS)
-    @echo "Making:   " $(@:f)
-    @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
-    @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
-    @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP5DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $@.$(INPATH)
-    $(COMMAND_ECHO)$(RM) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
-.ELSE			# "$(ZIP5DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP5FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
-        $(FI)
-    @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
-    @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-.ENDIF			# "$(ZIP5DIR)" != ""
-    @@-$(RM) $@
-    @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-#	@$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI)  # even if it's not used...
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP5DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)  $@ 
-    $(COMMAND_ECHO)$(RM) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
-.ELSE			# "$(ZIP5DIR)" != ""
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP5FLAGS) $@ $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
-        $(FI)
-.IF "$(ZIP5STRIPLANGUAGETAGS)" != ""
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(SOLARENV)/bin/striplanguagetags.sh $@ \
-        $(FI)
-.ENDIF
-.ENDIF			# "$(ZIP5DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-.ENDIF
-
-# unroll begin
-
-.IF "$(GUI)"=="WNT"
-command_seperator=&&
-#command_seperator=^
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELSE
-command_seperator=;
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
- 
-.ENDIF
-
-.IF "$(ZIP6TARGET)"!=""
-
-.IF "$(ZIP6STRIPLANGUAGETAGS)" != ""
-CALLXSLTPROC:=$(XSLTPROC)
-.EXPORT: CALLXSLTPROC
-.ENDIF
-
-ZIP6EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP6LIST:s/LANGDIR//)" == "$(ZIP6LIST)"
-ZIP6TARGETN=$(COMMONBIN)/$(ZIP6TARGET)$(ZIP6EXT)
-.ELSE
-ZIP6TARGETN=$(foreach,i,$(zip6alllangiso) $(COMMONBIN)/$(ZIP6TARGET)_$i$(ZIP6EXT) )
-.ENDIF
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP6LIST:s/LANGDIR//)" == "$(ZIP6LIST)"
-ZIP6TARGETN=$(BIN)/$(ZIP6TARGET)$(ZIP6EXT)
-.ELSE
-ZIP6TARGETN=$(foreach,i,$(zip6alllangiso) $(BIN)/$(ZIP6TARGET)_$i$(ZIP6EXT) )
-.ENDIF
-.ENDIF			# "$(common_build_zip)"!=""
-ZIP6DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP6TARGETN:s/$(ZIP6EXT)/.dpzz/)))
-ZIPDEPFILES+=$(ZIP6DEPFILE)
-
-ZIP6DIR*=$(ZIPDIR)
-ZIP6FLAGS*=$(ZIPFLAGS)
-.IF "$(zip6generatedlangs)"!=""
-zip6langdirs*=$(alllangiso)
-.ELSE           # "$(zip6generatedlangs)"!=""
-zip6langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ENDIF          # "$(zip6generatedlangs)"!=""
-.IF "$(ZIP6FORCEALLLANG)"!=""
-zip6alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip6langdirs) $(eq,$i,$j  $i $(NULL))))
-.ELSE          # "$(ZIP6ALLLANG)" != ""
-zip6alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip6langdirs) $(eq,$i,$j  $i $(NULL))))
-.ENDIF          # "$(ZIP6ALLLANG)" != ""
-.ENDIF			# "$(ZIP6TARGET)"!=""
-
-.IF "$(ZIP6TARGETN)"!=""
-
-ZIP6TMP:=$(mktmp iii)
-
-$(MISC)/$(TARGET).$(PWD:f).$(ZIP6TARGET).dpzz : $(ZIP6TARGETN)
-
-.IF "$(common_build_zip)"!=""
-ZIP6HELPVAR=$(COMMONBIN)/$(ZIP6TARGET)
-.ELSE			# "$(common_build_zip)"!=""
-ZIP6HELPVAR=$(BIN)/$(ZIP6TARGET)
-.ENDIF			# "$(common_build_zip)"!=""
-
-$(ZIP6DEPFILE) :
-    @echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP6DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP6DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP6DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP6FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP6DIR)" != ""
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP6DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP6DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP6DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP6FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP6DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
-
-
-$(ZIP6TARGETN) : delzip $(ZIP6DEPS)
-    @echo "Making:   " $(@:f)
-    @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
-    @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
-    @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP6DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $@.$(INPATH)
-    $(COMMAND_ECHO)$(RM) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
-.ELSE			# "$(ZIP6DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP6FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
-        $(FI)
-    @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
-    @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-.ENDIF			# "$(ZIP6DIR)" != ""
-    @@-$(RM) $@
-    @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-#	@$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI)  # even if it's not used...
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP6DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)  $@ 
-    $(COMMAND_ECHO)$(RM) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
-.ELSE			# "$(ZIP6DIR)" != ""
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP6FLAGS) $@ $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
-        $(FI)
-.IF "$(ZIP6STRIPLANGUAGETAGS)" != ""
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(SOLARENV)/bin/striplanguagetags.sh $@ \
-        $(FI)
-.ENDIF
-.ENDIF			# "$(ZIP6DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-.ENDIF
-
-# unroll begin
-
-.IF "$(GUI)"=="WNT"
-command_seperator=&&
-#command_seperator=^
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELSE
-command_seperator=;
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
- 
-.ENDIF
-
-.IF "$(ZIP7TARGET)"!=""
-
-.IF "$(ZIP7STRIPLANGUAGETAGS)" != ""
-CALLXSLTPROC:=$(XSLTPROC)
-.EXPORT: CALLXSLTPROC
-.ENDIF
-
-ZIP7EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP7LIST:s/LANGDIR//)" == "$(ZIP7LIST)"
-ZIP7TARGETN=$(COMMONBIN)/$(ZIP7TARGET)$(ZIP7EXT)
-.ELSE
-ZIP7TARGETN=$(foreach,i,$(zip7alllangiso) $(COMMONBIN)/$(ZIP7TARGET)_$i$(ZIP7EXT) )
-.ENDIF
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP7LIST:s/LANGDIR//)" == "$(ZIP7LIST)"
-ZIP7TARGETN=$(BIN)/$(ZIP7TARGET)$(ZIP7EXT)
-.ELSE
-ZIP7TARGETN=$(foreach,i,$(zip7alllangiso) $(BIN)/$(ZIP7TARGET)_$i$(ZIP7EXT) )
-.ENDIF
-.ENDIF			# "$(common_build_zip)"!=""
-ZIP7DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP7TARGETN:s/$(ZIP7EXT)/.dpzz/)))
-ZIPDEPFILES+=$(ZIP7DEPFILE)
-
-ZIP7DIR*=$(ZIPDIR)
-ZIP7FLAGS*=$(ZIPFLAGS)
-.IF "$(zip7generatedlangs)"!=""
-zip7langdirs*=$(alllangiso)
-.ELSE           # "$(zip7generatedlangs)"!=""
-zip7langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ENDIF          # "$(zip7generatedlangs)"!=""
-.IF "$(ZIP7FORCEALLLANG)"!=""
-zip7alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip7langdirs) $(eq,$i,$j  $i $(NULL))))
-.ELSE          # "$(ZIP7ALLLANG)" != ""
-zip7alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip7langdirs) $(eq,$i,$j  $i $(NULL))))
-.ENDIF          # "$(ZIP7ALLLANG)" != ""
-.ENDIF			# "$(ZIP7TARGET)"!=""
-
-.IF "$(ZIP7TARGETN)"!=""
-
-ZIP7TMP:=$(mktmp iii)
-
-$(MISC)/$(TARGET).$(PWD:f).$(ZIP7TARGET).dpzz : $(ZIP7TARGETN)
-
-.IF "$(common_build_zip)"!=""
-ZIP7HELPVAR=$(COMMONBIN)/$(ZIP7TARGET)
-.ELSE			# "$(common_build_zip)"!=""
-ZIP7HELPVAR=$(BIN)/$(ZIP7TARGET)
-.ENDIF			# "$(common_build_zip)"!=""
-
-$(ZIP7DEPFILE) :
-    @echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP7DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP7DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP7DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP7FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP7DIR)" != ""
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP7DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP7DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP7DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP7FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP7DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
-
-
-$(ZIP7TARGETN) : delzip $(ZIP7DEPS)
-    @echo "Making:   " $(@:f)
-    @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
-    @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
-    @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP7DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $@.$(INPATH)
-    $(COMMAND_ECHO)$(RM) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
-.ELSE			# "$(ZIP7DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP7FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
-        $(FI)
-    @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
-    @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-.ENDIF			# "$(ZIP7DIR)" != ""
-    @@-$(RM) $@
-    @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-#	@$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI)  # even if it's not used...
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP7DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)  $@ 
-    $(COMMAND_ECHO)$(RM) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
-.ELSE			# "$(ZIP7DIR)" != ""
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP7FLAGS) $@ $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
-        $(FI)
-.IF "$(ZIP7STRIPLANGUAGETAGS)" != ""
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(SOLARENV)/bin/striplanguagetags.sh $@ \
-        $(FI)
-.ENDIF
-.ENDIF			# "$(ZIP7DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-.ENDIF
-
-# unroll begin
-
-.IF "$(GUI)"=="WNT"
-command_seperator=&&
-#command_seperator=^
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELSE
-command_seperator=;
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
- 
-.ENDIF
-
-.IF "$(ZIP8TARGET)"!=""
-
-.IF "$(ZIP8STRIPLANGUAGETAGS)" != ""
-CALLXSLTPROC:=$(XSLTPROC)
-.EXPORT: CALLXSLTPROC
-.ENDIF
-
-ZIP8EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP8LIST:s/LANGDIR//)" == "$(ZIP8LIST)"
-ZIP8TARGETN=$(COMMONBIN)/$(ZIP8TARGET)$(ZIP8EXT)
-.ELSE
-ZIP8TARGETN=$(foreach,i,$(zip8alllangiso) $(COMMONBIN)/$(ZIP8TARGET)_$i$(ZIP8EXT) )
-.ENDIF
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP8LIST:s/LANGDIR//)" == "$(ZIP8LIST)"
-ZIP8TARGETN=$(BIN)/$(ZIP8TARGET)$(ZIP8EXT)
-.ELSE
-ZIP8TARGETN=$(foreach,i,$(zip8alllangiso) $(BIN)/$(ZIP8TARGET)_$i$(ZIP8EXT) )
-.ENDIF
-.ENDIF			# "$(common_build_zip)"!=""
-ZIP8DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP8TARGETN:s/$(ZIP8EXT)/.dpzz/)))
-ZIPDEPFILES+=$(ZIP8DEPFILE)
-
-ZIP8DIR*=$(ZIPDIR)
-ZIP8FLAGS*=$(ZIPFLAGS)
-.IF "$(zip8generatedlangs)"!=""
-zip8langdirs*=$(alllangiso)
-.ELSE           # "$(zip8generatedlangs)"!=""
-zip8langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ENDIF          # "$(zip8generatedlangs)"!=""
-.IF "$(ZIP8FORCEALLLANG)"!=""
-zip8alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip8langdirs) $(eq,$i,$j  $i $(NULL))))
-.ELSE          # "$(ZIP8ALLLANG)" != ""
-zip8alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip8langdirs) $(eq,$i,$j  $i $(NULL))))
-.ENDIF          # "$(ZIP8ALLLANG)" != ""
-.ENDIF			# "$(ZIP8TARGET)"!=""
-
-.IF "$(ZIP8TARGETN)"!=""
-
-ZIP8TMP:=$(mktmp iii)
-
-$(MISC)/$(TARGET).$(PWD:f).$(ZIP8TARGET).dpzz : $(ZIP8TARGETN)
-
-.IF "$(common_build_zip)"!=""
-ZIP8HELPVAR=$(COMMONBIN)/$(ZIP8TARGET)
-.ELSE			# "$(common_build_zip)"!=""
-ZIP8HELPVAR=$(BIN)/$(ZIP8TARGET)
-.ENDIF			# "$(common_build_zip)"!=""
-
-$(ZIP8DEPFILE) :
-    @echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP8DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP8DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP8DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP8FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP8DIR)" != ""
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP8DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP8DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP8DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP8FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP8DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
-
-
-$(ZIP8TARGETN) : delzip $(ZIP8DEPS)
-    @echo "Making:   " $(@:f)
-    @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
-    @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
-    @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP8DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $@.$(INPATH)
-    $(COMMAND_ECHO)$(RM) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
-.ELSE			# "$(ZIP8DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP8FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
-        $(FI)
-    @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
-    @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-.ENDIF			# "$(ZIP8DIR)" != ""
-    @@-$(RM) $@
-    @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-#	@$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI)  # even if it's not used...
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP8DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)  $@ 
-    $(COMMAND_ECHO)$(RM) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
-.ELSE			# "$(ZIP8DIR)" != ""
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP8FLAGS) $@ $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
-        $(FI)
-.IF "$(ZIP8STRIPLANGUAGETAGS)" != ""
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(SOLARENV)/bin/striplanguagetags.sh $@ \
-        $(FI)
-.ENDIF
-.ENDIF			# "$(ZIP8DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-.ENDIF
-
-# unroll begin
-
-.IF "$(GUI)"=="WNT"
-command_seperator=&&
-#command_seperator=^
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELSE
-command_seperator=;
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
- 
-.ENDIF
-
-.IF "$(ZIP9TARGET)"!=""
-
-.IF "$(ZIP9STRIPLANGUAGETAGS)" != ""
-CALLXSLTPROC:=$(XSLTPROC)
-.EXPORT: CALLXSLTPROC
-.ENDIF
-
-ZIP9EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP9LIST:s/LANGDIR//)" == "$(ZIP9LIST)"
-ZIP9TARGETN=$(COMMONBIN)/$(ZIP9TARGET)$(ZIP9EXT)
-.ELSE
-ZIP9TARGETN=$(foreach,i,$(zip9alllangiso) $(COMMONBIN)/$(ZIP9TARGET)_$i$(ZIP9EXT) )
-.ENDIF
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP9LIST:s/LANGDIR//)" == "$(ZIP9LIST)"
-ZIP9TARGETN=$(BIN)/$(ZIP9TARGET)$(ZIP9EXT)
-.ELSE
-ZIP9TARGETN=$(foreach,i,$(zip9alllangiso) $(BIN)/$(ZIP9TARGET)_$i$(ZIP9EXT) )
-.ENDIF
-.ENDIF			# "$(common_build_zip)"!=""
-ZIP9DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP9TARGETN:s/$(ZIP9EXT)/.dpzz/)))
-ZIPDEPFILES+=$(ZIP9DEPFILE)
-
-ZIP9DIR*=$(ZIPDIR)
-ZIP9FLAGS*=$(ZIPFLAGS)
-.IF "$(zip9generatedlangs)"!=""
-zip9langdirs*=$(alllangiso)
-.ELSE           # "$(zip9generatedlangs)"!=""
-zip9langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ENDIF          # "$(zip9generatedlangs)"!=""
-.IF "$(ZIP9FORCEALLLANG)"!=""
-zip9alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip9langdirs) $(eq,$i,$j  $i $(NULL))))
-.ELSE          # "$(ZIP9ALLLANG)" != ""
-zip9alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip9langdirs) $(eq,$i,$j  $i $(NULL))))
-.ENDIF          # "$(ZIP9ALLLANG)" != ""
-.ENDIF			# "$(ZIP9TARGET)"!=""
-
-.IF "$(ZIP9TARGETN)"!=""
-
-ZIP9TMP:=$(mktmp iii)
-
-$(MISC)/$(TARGET).$(PWD:f).$(ZIP9TARGET).dpzz : $(ZIP9TARGETN)
-
-.IF "$(common_build_zip)"!=""
-ZIP9HELPVAR=$(COMMONBIN)/$(ZIP9TARGET)
-.ELSE			# "$(common_build_zip)"!=""
-ZIP9HELPVAR=$(BIN)/$(ZIP9TARGET)
-.ENDIF			# "$(common_build_zip)"!=""
-
-$(ZIP9DEPFILE) :
-    @echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP9DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP9DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP9DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP9FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP9DIR)" != ""
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP9DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP9DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP9DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP9FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP9DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
-
-
-$(ZIP9TARGETN) : delzip $(ZIP9DEPS)
-    @echo "Making:   " $(@:f)
-    @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
-    @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
-    @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP9DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $@.$(INPATH)
-    $(COMMAND_ECHO)$(RM) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
-.ELSE			# "$(ZIP9DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP9FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
-        $(FI)
-    @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
-    @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-.ENDIF			# "$(ZIP9DIR)" != ""
-    @@-$(RM) $@
-    @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-#	@$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI)  # even if it's not used...
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP9DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)  $@ 
-    $(COMMAND_ECHO)$(RM) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
-.ELSE			# "$(ZIP9DIR)" != ""
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP9FLAGS) $@ $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
-        $(FI)
-.IF "$(ZIP9STRIPLANGUAGETAGS)" != ""
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(SOLARENV)/bin/striplanguagetags.sh $@ \
-        $(FI)
-.ENDIF
-.ENDIF			# "$(ZIP9DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-.ENDIF
-
-# unroll begin
-
-.IF "$(GUI)"=="WNT"
-command_seperator=&&
-#command_seperator=^
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELSE
-command_seperator=;
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
- 
-.ENDIF
-
-.IF "$(ZIP10TARGET)"!=""
-
-.IF "$(ZIP10STRIPLANGUAGETAGS)" != ""
-CALLXSLTPROC:=$(XSLTPROC)
-.EXPORT: CALLXSLTPROC
-.ENDIF
-
-ZIP10EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP10LIST:s/LANGDIR//)" == "$(ZIP10LIST)"
-ZIP10TARGETN=$(COMMONBIN)/$(ZIP10TARGET)$(ZIP10EXT)
-.ELSE
-ZIP10TARGETN=$(foreach,i,$(zip10alllangiso) $(COMMONBIN)/$(ZIP10TARGET)_$i$(ZIP10EXT) )
-.ENDIF
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP10LIST:s/LANGDIR//)" == "$(ZIP10LIST)"
-ZIP10TARGETN=$(BIN)/$(ZIP10TARGET)$(ZIP10EXT)
-.ELSE
-ZIP10TARGETN=$(foreach,i,$(zip10alllangiso) $(BIN)/$(ZIP10TARGET)_$i$(ZIP10EXT) )
-.ENDIF
-.ENDIF			# "$(common_build_zip)"!=""
-ZIP10DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP10TARGETN:s/$(ZIP10EXT)/.dpzz/)))
-ZIPDEPFILES+=$(ZIP10DEPFILE)
-
-ZIP10DIR*=$(ZIPDIR)
-ZIP10FLAGS*=$(ZIPFLAGS)
-.IF "$(zip10generatedlangs)"!=""
-zip10langdirs*=$(alllangiso)
-.ELSE           # "$(zip10generatedlangs)"!=""
-zip10langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ENDIF          # "$(zip10generatedlangs)"!=""
-.IF "$(ZIP10FORCEALLLANG)"!=""
-zip10alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip10langdirs) $(eq,$i,$j  $i $(NULL))))
-.ELSE          # "$(ZIP10ALLLANG)" != ""
-zip10alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip10langdirs) $(eq,$i,$j  $i $(NULL))))
-.ENDIF          # "$(ZIP10ALLLANG)" != ""
-.ENDIF			# "$(ZIP10TARGET)"!=""
-
-.IF "$(ZIP10TARGETN)"!=""
-
-ZIP10TMP:=$(mktmp iii)
-
-$(MISC)/$(TARGET).$(PWD:f).$(ZIP10TARGET).dpzz : $(ZIP10TARGETN)
-
-.IF "$(common_build_zip)"!=""
-ZIP10HELPVAR=$(COMMONBIN)/$(ZIP10TARGET)
-.ELSE			# "$(common_build_zip)"!=""
-ZIP10HELPVAR=$(BIN)/$(ZIP10TARGET)
-.ENDIF			# "$(common_build_zip)"!=""
-
-$(ZIP10DEPFILE) :
-    @echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP10DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP10DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP10DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP10FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP10DIR)" != ""
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP10DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP10DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP10DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP10FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP10DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
-
-
-$(ZIP10TARGETN) : delzip $(ZIP10DEPS)
-    @echo "Making:   " $(@:f)
-    @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
-    @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
-    @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP10DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $@.$(INPATH)
-    $(COMMAND_ECHO)$(RM) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
-.ELSE			# "$(ZIP10DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP10FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
-        $(FI)
-    @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
-    @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-.ENDIF			# "$(ZIP10DIR)" != ""
-    @@-$(RM) $@
-    @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-#	@$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI)  # even if it's not used...
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP10DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)  $@ 
-    $(COMMAND_ECHO)$(RM) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
-.ELSE			# "$(ZIP10DIR)" != ""
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP10FLAGS) $@ $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
-        $(FI)
-.IF "$(ZIP10STRIPLANGUAGETAGS)" != ""
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(SOLARENV)/bin/striplanguagetags.sh $@ \
-        $(FI)
-.ENDIF
-.ENDIF			# "$(ZIP10DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-.ENDIF
-
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk
deleted file mode 100644
index dd86f7e4a..000000000
--- a/solenv/inc/ant.mk
+++ /dev/null
@@ -1,98 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# --- Force JDK14 switch  ------------------------------------------
-
-.IF "$(USE_JDK_VERSION)" == "140"
-JDK_VERSION=140
-JAVA_HOME=$(JDK14PATH)
-
-PATH!:=$(JDK14PATH)/bin$(PATH_SEPERATOR)$(PATH)
-XCLASSPATH:=$(JDK14PATH)/jre/lib/rt.jar
-CLASSPATH:=$(XCLASSPATH)
-.ENDIF
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-
-# --- ANT build environment  ---------------------------------------
-
-.INCLUDE : antsettings.mk
-
-.INCLUDE : target.mk
-
-CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA_HOME)/lib/tools.jar
-.EXPORT : CLASSPATH
-.EXPORT : PATH
-
-# --- TARGETS -----------------------------------------------------
-
-$(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg $(SOLARENV)/inc/ant.properties
-    @echo "Making:   " $@
-    @echo solar.build=$(BUILD) > $@
-    @echo solar.rscversion=$(USQ)$(RSCVERSION)$(USQ) >> $@
-    @echo solar.rscrevision=$(USQ)$(RSCREVISION)$(USQ) >> $@
-    @echo solar.minor=$(LAST_MINOR) >> $@
-    @echo solar.sourceversion=$(SOURCEVERSION) >> $@
-    @echo solar.udkstamp=$(UDKSTAMP) >> $@
-    @echo solar.extstamp=$(EXTSTAMP) >> $@
-    @cat $(DMAKEROOT)/../ant.properties >> $@
-
-ANTBUILD .PHONY:
-    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS)
-
-clean  .PHONY:
-    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
-
-prepare .PHONY:
-    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
-
-main: .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
-
-info: .PHONY
-    $(ANT) $(ANT_FLAGS) $@
-
-jar .PHONY:
-    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
-
-compile .PHONY:
-    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
-
-depend .PHONY:
-    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
-
-javadoc .PHONY:
-    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
-
-config .PHONY:
-    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
-
-test .PHONY:
-    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
diff --git a/solenv/inc/ant.properties b/solenv/inc/ant.properties
deleted file mode 100644
index b2c0f748e..000000000
--- a/solenv/inc/ant.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# x-no-translate
-build.bin=${build.dir}/bin
-build.class=${build.dir}/class
-build.inc=${build.dir}/inc
-build.lib=${build.dir}/lib
-build.misc=${build.dir}/misc
-build.obj=${build.dir}/obj
-build.res=${build.dir}/res
-build.slb=${build.dir}/slb
-build.slo=${build.dir}/slo
-build.srs=${build.dir}/srs
-
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
deleted file mode 100644
index 0137e33b6..000000000
--- a/solenv/inc/antsettings.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-.IF "$(SOLAR_JAVA)"!=""
-
-ANT_LIB*:=$(ANT_HOME)/lib
-
-ANT_CLASSPATH:=$(ANT_LIB)/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)/ant.jar
-
-# PATH_SEPERATOR won't work here as it is defined
-# as ; for wondows (all shells)
-#PATH!:=$(ANT_HOME)/bin$(PATH_SEPERATOR)$(PATH)
-PATH!:=$(ANT_HOME)/bin:$(PATH)
-
-ANT*:=$(ANT_HOME)/bin/ant
-ANT_BUILDFILE*=build.xml
-
-.IF "$(ANT_COMPILER_FLAGS)"==""
-.IF "$(JAVACISGCJ)" == "yes"
-ANT_COMPILER_FLAGS=-Dbuild.compiler=gcj
-.ENDIF
-.ENDIF
-
-.IF "$(ANT_JAVA_VER_FLAGS)"==""
-.IF "$(JDK)" != "gcj" && $(JAVACISKAFFE) != "yes"
-ANT_JAVA_VER_FLAGS=-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
-.ENDIF
-.ENDIF
-
-.IF "$(ANT_DEBUG)"==""
-.IF "$(debug)"==""
-ANT_DEBUG=off
-.ELSE
-ANT_DEBUG=on
-.ENDIF
-.ENDIF
-
-.IF "$(ANT_OPT)"==""
-.IF "$(optimize)"==""
-ANT_OPT=off
-.ELSE
-ANT_OPT=on
-.ENDIF
-.ENDIF
-
-.IF "$(VERBOSE)" == "TRUE"
-    ANT_VERBOSE=-v
-.ELSE
-    ANT_VERBOSE=-q
-.ENDIF
-
-.IF "$(JDK)"=="gcj"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-.ENDIF
-
-ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=$(PRJ) -Dprjname=$(PRJNAME) $(ANT_JAVA_VER_FLAGS) \
- -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on \
- -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
- -Dsolar.jar=$(SOLARVER)/$(INPATH)/bin -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
- -Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
- -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) \
- -emacs $(ANT_VERBOSE)
-.ELSE # No java
-ANT=
-ANT_FLAGS=
-.ENDIF
-
-.IF "$(WITH_LANG)"!=""
-ANT_FLAGS+=-Dsolar.langs="$(WITH_LANG)" -Dsolar.localized="true"
-.ENDIF			# "$(WITH_LANG)"!=""
- 
diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk
deleted file mode 100644
index b30ca7152..000000000
--- a/solenv/inc/cppunit.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Helper makefile additional, to support
-# dmake test
-# for cppunittester (cppunit testing)
-# for simple start all generated libraries:
-# dmake test
-#
-# for library 1 & 2:
-# or dmake test1 test2
-
-# This file have to be unroll by
-# cat cppunit.mk | mkunroll >_cppunit.mk
-# all between begin and end will repeat n times (at the moment n=10) to create such iterations
-# $(TNR) is the number
-# $(SHL$(TNR)TARGETN) is the same like $(OUT)/bin/$(SHL1TARGET) for every number, within unix, "bin" is replaced by "lib"
-
-################################################################################
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL$(TNR)TARGETN)"!=""
-ALLTAR : test$(TNR)
-test$(TNR) .PHONY : $(SHL$(TNR)TARGETN)
-        @echo ----------------------------------------------------------
-        @echo - start unit test \#$(TNR) on library $(SHL$(TNR)TARGETN)
-        @echo ----------------------------------------------------------
-        $(CPPUNITTESTER) $(SHL$(TNR)TARGETN)
-.ENDIF
-
-# unroll end
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
deleted file mode 100644
index 7aa1548c0..000000000
--- a/solenv/inc/doxygen.cfg
+++ /dev/null
@@ -1,1314 +0,0 @@
-# Doxyfile 1.5.3
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file that
-# follow. The default is UTF-8 which is also the encoding used for all text before
-# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into
-# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of
-# possible encodings.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = "$(DOXYGEN_PROJECTNAME) ($(DOXYGEN_VERSION)) "
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         = 1
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = $(DOXYGEN_OUTPUT)
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian,
-# Italian, Japanese, Japanese-en (Japanese with English messages), Korean,
-# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian,
-# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP         = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                = "tpl=\par Template parameter: \n" "since=\par Available since: \n" "derive=\par Derive: \n" "attention=\par Attention: \n"
-# precond throws see path todo(own section, can enable!)
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to
-# include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT        = NO
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be extracted
-# and appear in the documentation as a namespace called 'anonymous_namespace{file}',
-# where file will be replaced with the base name of the file that contains the anonymous
-# namespace. By default anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST      = NO
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST      = NO
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST       = NO
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from the
-# version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = NO
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT            =
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT                  = $(DOXYGEN_INPUT)
-
-# This tag can be used to specify the character encoding of the source files that
-# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default
-# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding.
-# See http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
-
-FILE_PATTERNS          =
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the output.
-# The symbol name can be a fully qualified name, a word, or if the wildcard * is used,
-# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.  Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.  The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH
-# then you must also enable this option. If you don't then doxygen will produce
-# a warning and turn it on anyway
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.  Otherwise they will link to the documentstion.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            =
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        =
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE               =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 1
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           =
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             =
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             =
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          =
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.  This is useful
-# if you want to understand what is going on.  On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH           = $(DOXYGEN_INCLUDE_PATH)
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED             = LINUX \
-                         UNX \
-                         VCL \
-                         GCC \
-                         C341 \
-                         X86_64 \
-                         _DEBUG_RUNTIME \
-                         VER=C341 \
-                         NPTL \
-                         GLIBC=2 \
-                         NEW_SOLAR \
-                         _USE_NAMESPACE=1 \
-                         UNIX \
-                         SUPD=300 \
-                         DEBUG \
-                         DBG_UTIL \
-                         OSL_DEBUG_LEVEL=2 \
-                         CUI \
-                         SOLAR_JAVA \
-                         EXCEPTIONS_ON
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#   TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#   TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               = $(DOXYGEN_REF_TAGFILES)
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       = $(DOXYGEN_OUR_TAGFILE)
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to
-# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to
-# specify the directory where the mscgen tool resides. If left empty the tool is assumed to
-# be found in the default search path.
-
-MSCGEN_PATH            =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = YES
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK               = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will
-# generate a call dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will
-# generate a caller dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS           =
-
-# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the number
-# of direct children of the root node in a graph is already larger than
-# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, which results in a white background.
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP            = NO
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/solenv/inc/dummy.flt b/solenv/inc/dummy.flt
deleted file mode 100644
index e69de29bb..000000000
--- a/solenv/inc/dummy.flt
+++ /dev/null
diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk
deleted file mode 100644
index c9fa15e67..000000000
--- a/solenv/inc/extension_helplink.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/HelpIndexerTool.jar$
-
-.IF "$(SYSTEM_LUCENE)" == "YES"
-my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
-.ELSE
-my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar
-.ENDIF
-
-.IF "$(SYSTEM_DB)" != "YES"
-JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
-.ENDIF
-
-#aux_alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j  $i $(NULL))))
-aux_alllangiso*:=$(alllangiso)
-
-#########################################################
-
-
-HELPLINKALLTARGETS=$(foreach,i,$(aux_alllangiso) $(MISC)/$(TARGET)_$(LINKNAME)_$i.done)
-HELPLINKALLADDEDDEPS=$(foreach,i,$(aux_alllangiso) $(subst,LANGUAGE,$i $(LINKADDEDDPES)))
-
-ALLTAR : $(HELPLINKALLTARGETS)
-
-.IF "$(SYSTEM_DB)" != "YES"
-JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
-.ENDIF
-
-XSL_DIR*:=$(SOLARBINDIR)
-XHPLINKSRC*:=$(XHPDEST)
-STY_SWITCH:= -sty $(XSL_DIR)/embed.xsl
-
-.IF "$(XHPFILES)"!="" && "$(HELP_OUT)"!=""
-$(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/{$(aux_alllangiso)}/$i) : $(HELP_OUT)/$(TARGET).done
-LINKDEPS+=$(HELP_OUT)/xhp_changed.flag
-.ENDIF          # "$(XHPFILES)"!="" && "$(HELP_OUT)"!=""
-
-$(HELPLINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKDEPS))
-    @echo Building help index for $(@:b:s/_/./:e:s/.//)
-    $(COMMAND_ECHO)$(HELPLINKER) -mod $(LINKNAME) -extlangsrc $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} $(STY_SWITCH) -extlangdest $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} -idxcaption $(XSL_DIR)/idxcaption.xsl -idxcontent $(XSL_DIR)/idxcontent.xsl $(LINKLINKFILES)
-    $(COMMAND_ECHO)cd $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} && zip -u -r $(LINKNAME).jar $(PACKAGE)/* $(CHECKZIPRESULT)
-.IF "$(SOLAR_JAVA)" == "TRUE"
-# cleanup index dir
-    -$(RM) $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))}/$(LINKNAME).idxl/*
-.IF "$(CHECK_LUCENCE_INDEXER_OUTPUT)" == ""
-    $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -extension -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} && $(TOUCH) $@
-.ELSE
-    $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -extension -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} -checkcfsandsegname _0 _3  && $(TOUCH) $@
-.ENDIF
-.ELSE
-    -$(RM) $(XHPLINKSRC)/$(@:b)/content/*.*
-    -$(RM) $(XHPLINKSRC)/$(@:b)/caption/*.*
-.ENDIF
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
deleted file mode 100644
index 82421e240..000000000
--- a/solenv/inc/extension_post.mk
+++ /dev/null
@@ -1,186 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-EXTENSION_TARGET:=$(ZIP9TARGETN)
-
-.SOURCE.xcu : $(MISC)/$(EXTNAME)/merge $(MISC)/$(EXTNAME)/registry/data $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/merge $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/registry/data $(COMPONENT_CONFIGDIR) .
-.SOURCE.xcs : $(MISC)/$(EXTNAME)/registry $(MISC)/$(EXTNAME)/registry/schema .
-
-fixme=$(MISC)/$(EXTNAME)/merge/$(MISC)
-fixme2=$(fixme:n)
-
-fixme3=$(MISC)/$(EXTNAME)/$(MISC)
-fixme4=$(fixme:n)
-
-$(EXTENSIONDIR)/$(COMPONENT_CONFIGDEST)/%.xcu : %.xcu
-# ugly hacking to workaround prepended first source path
-    @@-$(MKDIRHIER) $(subst,$(fixme2),$(MISC) $(@:d))
-.IF "$(COMPONENT_XCU_REPLACEMENT)"!=""
-    $(TYPE) $< | sed '$(COMPONENT_XCU_REPLACEMENT)' > $(subst,$(fixme2),$(MISC) $@)
-.ELSE          # "$(COMPONENT_REPLACEMENT)"!=""
-    $(GNUCOPY) $< $(subst,$(fixme2),$(MISC) $@)
-.ENDIF          # "$(COMPONENT_REPLACEMENT)"!=""
-    
-$(EXTENSIONDIR)/$(COMPONENT_CONFIGDESTSCHEMA)/%.xcs : %.xcs
-    @@-$(MKDIRHIER) $(subst,$(fixme4),$(MISC) $(@:d))
-    $(GNUCOPY) $< $(subst,$(fixme4),$(MISC) $@)
-
-$(EXTENSIONDIR)/%.jar : $(SOLARBINDIR)/%.jar
-    @@-$(MKDIRHIER) $(@:d)
-    $(GNUCOPY) $< $@
-
-.IF "$(COMPONENT_FILES)"!=""
-COMPONENT_FILES_SRC*=./
-# ugly hacking to workaround prepended first source path - also hits
-# here in case of "just copied" .xcu files
-$(COMPONENT_FILES) : $$(@:s|$(fixme2)|$(MISC)|:s|$(EXTENSIONDIR)/|$(COMPONENT_FILES_SRC)|)
-    @@-$(MKDIRHIER) $(@:s|$(fixme2)|$(MISC)|:d)
-    $(COMMAND_ECHO)$(COPY) $< $(@:s|$(fixme2)|$(MISC)|)
-.ENDIF			# "$(COMPONENT_FILES)"!=""
-
-.IF "$(COMPONENT_JARFILES)"!=""
-$(COMPONENT_JARFILES) : $(CLASSDIR)/$$(@:f)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-.ENDIF			# "$(COMPONENT_JARFILES)"!=""
-
-.IF "$(COMPONENT_LIBRARIES)"!=""
-PACK_RUNTIME!:=TRUE
-# TODO(Q3): strip the binary?
-$(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-.ENDIF			# "$(COMPONENT_LIBRARIES)"!=""
-
-.IF "$(PACK_RUNTIME)"!=""
-PACK_RUNTIME_FLAG:=$(MISC)/$(TARGET)_pack_runtime.flag
-$(EXTENSION_TARGET) : $(PACK_RUNTIME_FLAG)
-
-$(EXTENSIONDIR) :
-    @@-$(MKDIRHIER) $(@:d)
-
-$(PACK_RUNTIME_FLAG) : $(EXTENSIONDIR)
-    @@-$(MKDIRHIER) $(@:d)
-.IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
-.IF "$(COM)"=="GCC"
-   $(GNUCOPY) $(SOLARBINDIR)/mingwm10.dll $(EXTENSIONDIR)
-   .IF "$(MINGW_GCCDLL)"!=""
-     $(GNUCOPY) $(SOLARBINDIR)/$(MINGW_GCCDLL) $(EXTENSIONDIR)
-   .ENDIF
-   .IF "$(MINGW_GXXDLL)"!=""
-     $(GNUCOPY) $(SOLARBINDIR)/$(MINGW_GXXDLL) $(EXTENSIONDIR)
-   .ENDIF
-.ELSE
-.IF "$(PACKMS)"!=""
-.IF "$(CCNUMVER)" <= "001399999999"
-    $(GNUCOPY) $(PACKMS)/msvcr71.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/msvcp71.dll $(EXTENSIONDIR)
-.ELSE			# "$(CCNUMVER)" <= "001399999999"
-.IF "$(CCNUMVER)" <= "001499999999"
-    $(GNUCOPY) $(PACKMS)/msvcr80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/msvcp80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/msvcm80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
-.ELSE			# "$(CCNUMVER)" <= "001499999999"
-    $(GNUCOPY) $(PACKMS)/msvcr90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/msvcp90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/msvcm90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(PACKMS)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR)
-.ENDIF 			# "$(CCNUMVER)" <= "001499999999"
-.ENDIF			# "$(CCNUMVER)" <= "001399999999"
-.ELSE        # "$(PACKMS)"!=""
-.IF "$(CCNUMVER)" <= "001399999999"
-    $(GNUCOPY) $(SOLARBINDIR)/msvcr71.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/msvcp71.dll $(EXTENSIONDIR)
-.ELSE			# "$(CCNUMVER)" <= "001399999999"
-.IF "$(CCNUMVER)" <= "001499999999"
-    $(GNUCOPY) $(SOLARBINDIR)/msvcr80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/msvcp80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/msvcm80.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
-.ELSE    		# "$(CCNUMVER)" <= "001499999999"
-    $(GNUCOPY) $(SOLARBINDIR)/msvcr90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/msvcp90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/msvcm90.dll $(EXTENSIONDIR)
-    $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR)
-.ENDIF			# "$(CCNUMVER)" <= "001499999999"
-.ENDIF			# "$(CCNUMVER)" <= "001399999999"
-.ENDIF          # "$(PACKMS)"!=""
-.ENDIF	#"$(COM)"=="GCC" 
-.ENDIF 			# "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
-    @$(TOUCH) $@
-.ENDIF			# "$(PACK_RUNTIME)"!=""
-
-IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)-$(PLATFORMID)"
-
-.INCLUDE .IGNORE : $(MISC)/$(TARGET)_lang_track.mk
-.IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
-PHONYDESC=.PHONY
-.ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
-.IF "$(DESCRIPTION)"!=""
-$(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
-    @@-$(MKDIRHIER) $(@:d)
-    @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)/$(TARGET)_lang_track.mk
-
-    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/transform_description.pl $(DESCRIPTION_SRC) $@.1.$(EXTNAME)
-
-    $(COMMAND_ECHO)$(TYPE) $@.1.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $@.2.$(EXTNAME)
-    @@-$(RM) $@.1.$(EXTNAME)
-
-    $(COMMAND_ECHO)$(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
-    @@-$(RM) $@.2.$(EXTNAME)
-
-.ENDIF			# "$(DESCRIPTION)"!=""
-# default OOo license text!!!
-# may not fit...
-.IF "$(CUSTOM_LICENSE)"==""
-.IF "$(GUI)" == "WNT"
-PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/license.txt
-.ELSE			# "$(GUI)" == "WNT"
-PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE
-.ENDIF			# "$(GUI)" == "WNT"
-.ELSE			# "$(CUSTOM_LICENSE)" == ""
-PACKLICDEPS=$(CUSTOM_LICENSE)
-.ENDIF			# "$(CUSTOM_LICENSE)" == ""
-.IF "$(PACKLICS)"!=""
-$(PACKLICS) : $(PACKLICDEPS)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(GNUCOPY) $< $@
-.ENDIF			# "$(PACKLICS)"!=""
-
-.IF "$(COMPONENT_MANIFEST)"!=""
-#$(COMPONENT_MANIFEST) : $$(@:f)
-$(COMPONENT_MANIFEST) : $(MANIFEST_SRC) $(MANIFEST_DEPS)
-    @@-$(MKDIRHIER) $(@:d)
-.IF "$(COMPONENT_MANIFEST_GENERIC)" == ""
-    $(COMMAND_ECHO)$(TYPE) $(MANIFEST_SRC) | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" | $(SED) "s/EXEC_EXTENSION/$(EXECPOST)/" > $@
-.ELSE			# "$(COMPONENT_MANIFEST_GENERIC)" != ""
-    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/makemani.pl $(PRJ)/util/manifest.xml $(EXTENSIONDIR) $(COMPONENT_MANIFEST_SEARCHDIR) $(@:d:d)
-.ENDIF			# "$(COMPONENT_MANIFEST_GENERIC)" != ""
-.ENDIF			# "$(COMPONENT_MANIFEST)"!=""
-
-ALLTAR : $(EXTENSION_PACKDEPS)
diff --git a/solenv/inc/extension_pre.mk b/solenv/inc/extension_pre.mk
deleted file mode 100644
index 7fd8f5d86..000000000
--- a/solenv/inc/extension_pre.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-EXTENSIONDIR*:=$(MISC)/$(EXTENSIONNAME)
-
-COMPONENT_CONFIGDIR*:=.
-COMPONENT_CONFIGDEST*:=registry/data
-COMPONENT_CONFIGDESTSCHEMA*:=registry/schema
-
-.IF "$(COMPONENT_COPYONLY)"==""
-DESCRIPTION:=$(EXTENSIONDIR)/description.xml
-DESCRIPTION_SRC*:=description.xml
-
-COMPONENT_MANIFEST*:=$(EXTENSIONDIR)/META-INF/manifest.xml
-MANIFEST_SRC*:=manifest.xml
-
-.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
-PACKLICS*:=$(EXTENSIONDIR)/registration/license.txt
-COMPONENT_LIC_TEMPL*:=registration/license.txt
-.ELSE
-PACKLICS*:=$(EXTENSIONDIR)/registration/LICENSE
-COMPONENT_LIC_TEMPL*:=registration/LICENSE
-.ENDIF
-
-#TODO:  check ZIP9TARGET for previous use!
-common_build_zip=
-MANIFEST_DEPS=	$(PACKLICS) $(DESCRIPTION) $(COMPONENT_FILES) $(COMPONENT_LIBRARIES) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) $(EXTENSION_PACKDEPS)
-ZIP9DEPS=		$(PACKLICS) $(DESCRIPTION) $(COMPONENT_XCU) $(COMPONENT_FILES) $(COMPONENT_LIBRARIES) $(COMPONENT_MANIFEST) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) $(EXTENSION_PACKDEPS)
-ZIP9TARGET=		$(EXTENSION_ZIPNAME)
-ZIP9DIR=		$(EXTENSIONDIR)
-ZIP9EXT=		.oxt
-ZIP9FLAGS=-r
-ZIP9LIST=		*
-.ENDIF			# "$(COMPONNENT_COPYONLY)"==""
-
diff --git a/solenv/inc/found_no.mk b/solenv/inc/found_no.mk
deleted file mode 100644
index 43c888f8d..000000000
--- a/solenv/inc/found_no.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-no_traget:
-    @echo -----------------------------------------------
-    @echo         Error: No makefile.mk found!
-    @echo -----------------------------------------------
-    force_dmake_to_error
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
deleted file mode 100644
index 69e57381d..000000000
--- a/solenv/inc/installationtest.mk
+++ /dev/null
@@ -1,158 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-# relevant for non-product builds only, but built unconditionally
-.IF "$(ABORT_ON_ASSERTION)" != ""
-    DBGSV_ERROR_OUT=abort
-    SAL_DIAGNOSE_ABORT=TRUE
-    .EXPORT: SAL_DIAGNOSE_ABORT
-.ELSE
-    DBGSV_ERROR_OUT=shell
-.ENDIF
-.EXPORT: DBGSV_ERROR_OUT
-
-# don't allow to overwrite DBGSV_ERROR_OUT with an INI file. Otherwise, people
-# might be tempted to put an DBGSV_INIT into their .bash_profile which points to a file
-# delcaring to ignore all assertions completely ...
-DBGSV_INIT=
-.EXPORT: DBGSV_INIT
-
-.IF "$(OS)" == "WNT"
-my_file = file:///
-.ELSE
-my_file = file://
-.END
-
-# The following conditional is an approximation of: UPDATER set to YES and
-# SHIPDRIVE set and either SOL_TMP not set or
-# SOLARENV set to a pathname of which SOL_TMP is not a prefix:
-.IF "$(UPDATER)" == "YES" && "$(SHIPDRIVE)" != "" && \
-    "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
-my_instsets = $(shell ls -dt \
-    $(SHIPDRIVE)/$(INPATH)/LibreOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
-installationtest_instset = $(my_instsets:1)
-.ELSE
-installationtest_instset = \
-    $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
-.END
-
-.IF "$(OS)" == "WNT"
-installationtest_instpath = `cat $(MISC)/$(TARGET)/installation.flag`
-.ELSE
-installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation
-.END
-
-.IF "$(OS)" == "MACOSX"
-my_sofficepath = \
-    $(installationtest_instpath)/opt/LibreOffice.app/Contents/MacOS/soffice
-.ELIF "$(OS)" == "WNT"
-my_sofficepath = \
-    $(installationtest_instpath)'/opt/LibreOffice 3/program/soffice.exe'
-.ELSE
-my_sofficepath = \
-    $(installationtest_instpath)/opt/program/soffice
-.END
-
-.IF "$(OOO_TEST_SOFFICE)" == ""
-my_soffice = path:$(my_sofficepath)
-.ELSE
-my_soffice = '$(OOO_TEST_SOFFICE:s/'/'\''/)'
-.END
-
-.IF "$(OOO_LIBRARY_PATH_VAR)" != ""
-my_cppenv = \
-    -env:arg-env=$(OOO_LIBRARY_PATH_VAR)"$${{$(OOO_LIBRARY_PATH_VAR)+=$$$(OOO_LIBRARY_PATH_VAR)}}"
-my_javaenv = \
-    -Dorg.openoffice.test.arg.env=$(OOO_LIBRARY_PATH_VAR)"$${{$(OOO_LIBRARY_PATH_VAR)+=$$$(OOO_LIBRARY_PATH_VAR)}}"
-.END
-
-# Work around Windows problems with long pathnames (see issue 50885) by
-# installing into the temp directory instead of the module output tree (in which
-# case $(TARGET).installation.flag contains the path to the temp installation,
-# which is removed after smoketest); can be removed once issue 50885 is fixed;
-# on other platforms, a single installation to solver is created in
-# smoketestoo_native:
-.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
-OOO_EXTRACT_TO:=$(shell cygpath -m `mktemp -dt ooosmoke.XXXXXX`)
-$(MISC)/$(TARGET)/installation.flag : $(shell \
-        ls $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip)
-    $(COMMAND_ECHO)$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)unzip -q $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip -d "$(OOO_EXTRACT_TO)"
-    $(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/LibO_*_install-arc_$(defaultlangiso) "$(OOO_EXTRACT_TO)"/opt
-    $(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@
-.END
-
-cpptest .PHONY :
-    $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user
-    $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user
-    $(CPPUNITTESTER) \
-        -env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb \
-        -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \
-        -env:arg-soffice=$(my_soffice) -env:arg-user=$(MISC)/$(TARGET)/user \
-        $(my_cppenv) $(TEST_ARGUMENTS:^"-env:arg-testarg.") --protector \
-        $(SOLARSHAREDBIN)/unoexceptionprotector$(DLLPOST) \
-        unoexceptionprotector $(CPPTEST_LIBRARY)
-# As a workaround for #i111400#, ignore failure of $(RM):
-    $(COMMAND_ECHO)- $(RM) -r $(MISC)/$(TARGET)/user
-.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
-    $(COMMAND_ECHO)$(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
-cpptest : $(MISC)/$(TARGET)/installation.flag
-.END
-
-.IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != ""
-javatest_% .PHONY : $(JAVATARGET)
-    $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user
-    $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user
-    $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
-        '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \
-        -Dorg.openoffice.test.arg.soffice=$(my_soffice) \
-        -Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \
-        $(my_javaenv) $(TEST_ARGUMENTS:^"-Dorg.openoffice.test.arg.testarg.") \
-        org.junit.runner.JUnitCore \
-        $(subst,/,. $(PACKAGE)).$(@:s/javatest_//)
-    $(RM) -r $(MISC)/$(TARGET)/user
-.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
-    $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
-javatest : $(MISC)/$(TARGET)/installation.flag
-.END
-javatest .PHONY : $(JAVATARGET)
-    $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user
-    $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user
-    $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
-        '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \
-        -Dorg.openoffice.test.arg.soffice=$(my_soffice) \
-        -Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \
-        $(my_javaenv) $(TEST_ARGUMENTS:^"-Dorg.openoffice.test.arg.testarg.") \
-        org.junit.runner.JUnitCore \
-        $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//))
-    $(RM) -r $(MISC)/$(TARGET)/user
-.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
-    $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
-javatest : $(MISC)/$(TARGET)/installation.flag
-.END
-.ELSE
-javatest .PHONY :
-    @echo 'javatest needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR'
-.END
diff --git a/solenv/inc/javaunittest.mk b/solenv/inc/javaunittest.mk
deleted file mode 100644
index 6d7c564da..000000000
--- a/solenv/inc/javaunittest.mk
+++ /dev/null
@@ -1,110 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Makefile template for directories that contain Java unit tests.
-#
-# Before including this makefile, the following variables should be set:
-# - PRJ, PRJNAME, TARGET
-# - PACKAGE
-# - JAVATESTFILES: the unit test classes;
-#     each one of the form <basename>.java;
-#     these java files must only define classes within the package corresponding
-#     to PACKAGE, the name of each defined (outer) class should end with "_Test"
-# - JAVAFILES: optional java files, corresponding class files are generated
-#     that can be used when compiling or running the tests;
-#     each one of the form <basename>.java;
-#     these java files must only define classes within the package corresponding
-#     to PACKAGE, the name of each defined (outer) class should start with
-#     "Test"
-# - IDLTESTFILES: optional idl files, corresponding class files are generated
-#     that can be used when compiling or running the tests;
-#     each one of the form <basename>.idl;
-#     these idl files must only define entities within the module corresponding
-#     to PACKAGE, the name of each defined entity should start with "Test"
-# - JARFILES: optional jar files that can be used when compiling or running the
-#     tests;
-#     each one of the form <basename>.jar
-# All generated class files are placed into <platform>/class/test/ instead of
-# <platform>/class/, so that they are not accidentally included in jar files
-# packed from <platform>/class/ subdirectories.
-
-JAVAFILES +:= $(JAVATESTFILES)
-EXTRAJARFILES += $(OOO_JUNIT_JAR)
-
-.INCLUDE: settings.mk
-
-.IF "$(XCLASSPATH)" == ""
-XCLASSPATH := $(CLASSDIR)
-.ELSE
-XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPERATOR)$(CLASSDIR)
-.ENDIF
-CLASSDIR !:= $(CLASSDIR)/test
-
-.INCLUDE: target.mk
-
-$(JAVATARGET) : $(MISC)/$(TARGET).classdir.flag
-
-$(MISC)/$(TARGET).classdir.flag:
-    - $(MKDIR) $(CLASSDIR)
-    $(TOUCH) $@
-
-.IF "$(JAVATESTFILES)" != ""
-ALLTAR : test
-.END
-
-.IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != ""
-test .PHONY : $(JAVATARGET)
-    $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
-        '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \
-        org.junit.runner.JUnitCore \
-        $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//))
-.ELSE
-test .PHONY :
-    echo 'test needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR'
-.END
-
-.IF "$(IDLTESTFILES)" != ""
-
-# The following dependency (to execute javac whenever javamaker has run) does
-# not work reliably, see #i28827#:
-$(JAVAFILES) $(JAVACLASSFILES): $(MISC)/$(TARGET).javamaker.flag
-
-$(MISC)/$(TARGET).javamaker.flag: $(MISC)/$(TARGET).rdb
-    $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD $< -X$(SOLARBINDIR)/types.rdb
-    $(TOUCH) $@
-
-$(MISC)/$(TARGET).rdb .ERRREMOVE: \
-        $(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)/$(TARGET)/$i))
-    - rm $@
-    $(REGMERGE) $@ /UCR $<
-
-$(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)/$(TARGET)/$i)): \
-        $(IDLTESTFILES)
-    - $(MKDIR) $(MISC)/$(TARGET)
-    $(IDLC) -O$(MISC)/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
-
-.ENDIF
diff --git a/solenv/inc/lang.mk b/solenv/inc/lang.mk
deleted file mode 100644
index fc5321653..000000000
--- a/solenv/inc/lang.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-#.IF "$(GUI)"=="UNX" || "$(GUIBASE)"=="WIN"
-#LANG_GUI=WIN
-#.ELSE
-LANG_GUI=$(GUI)
-#.ENDIF
-
-###################################################
-#
-# entries for charsets
-
-# variable name equals $(solarlang)$(LANG_GUI)
-#
-###################################################
-
-#deut$(LANG_GUI)*=-CHARSET_microsoft-cp1252
-
-###################################################
-#
-# set defaults
-#
-###################################################
-
-#.IF "$(solarlang)" == ""
-#solarlang=deut
-#.ENDIF
-
-RSC_SRS_CHARSET=-CHARSET_DONTKNOW
-default$(LANG_GUI)*=-CHARSET_UTF8
-
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
deleted file mode 100644
index c0d03c7f7..000000000
--- a/solenv/inc/langlist.mk
+++ /dev/null
@@ -1,136 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Complete list of all supported localizations (ISO codes)
-completelangiso=af \
-ar \
-as \
-ast \
-be \
-bo \
-bg \
-br \
-brx \
-bn \
-bs \
-ca \
-ca-XV \
-cs \
-cy \
-da \
-de \
-dgo \
-dz \
-el \
-en-GB \
-en-US \
-en-ZA \
-eo \
-es \
-et \
-eu \
-fa \
-fi \
-fr \
-ga \
-gd \
-gl \
-gu \
-he \
-hi \
-hr \
-hu \
-id \
-is \
-it \
-ja \
-ka \
-kk \
-km \
-kn \
-ko \
-kok \
-ks \
-ku \
-lb \
-lo \
-lt \
-lv \
-mai \
-mk \
-mn \
-mni \
-ml \
-mr \
-my \
-ne \
-nb \
-nl \
-nn \
-nr \
-nso \
-om \
-oc \
-or \
-pa-IN \
-pl \
-pt \
-pt-BR \
-ro \
-ru \
-rw \
-sat \
-sa-IN \
-si \
-sd \
-sq \
-sk \
-sl \
-sh \
-sr \
-ss \
-st \
-sv \
-sw-TZ \
-te \
-ta \
-th \
-tn \
-tr \
-tk \
-ts \
-tg \
-tt \
-ug \
-uk \
-uz \
-ve \
-vi \
-xh \
-zh-CN \
-zh-TW \
-zu
diff --git a/solenv/inc/layout.mk b/solenv/inc/layout.mk
deleted file mode 100644
index 7b808f0b3..000000000
--- a/solenv/inc/layout.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/tralay
-XML_DEST=$(DLLDEST)
-XML_LANGS=$(alllangiso)
-
-ALL_XMLS=$(foreach,i,$(XML_FILES) "$(XML_DEST)/$i") $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) "$(XML_DEST)/$i/$j"))
-
-# Must remove the -j (no duplicate base file names) flag
-ZIPUPDATE=-u
-XML_ZIP = $(PRJNAME)-layout
-
-ALLTAR: localize.sdf $(XML_ZIP)
-
-$(XML_ZIP): $(ALL_XMLS)
-
-ZIP1DIR=$(XML_DEST)
-ZIP1TARGET=$(XML_ZIP)
-ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@)
-
-$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
-    $(TRALAY) -m localize.sdf -o "$(XML_DEST)" -l $(XML_LANGS:f:t" -l ") "$<"
-
-$(XML_DEST)/%.xml: %.xml
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)$(COPY) "$<" "$@"
-
-# Don't want to overwrite filled localize.sdf with empty template
-template.sdf:
-    $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US "$i") > $@
-
-$(ZIP1LIST): localize.sdf
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
deleted file mode 100644
index 46d23002d..000000000
--- a/solenv/inc/libs.mk
+++ /dev/null
@@ -1,517 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
-
-.INCLUDE .IGNORE : icuversion.mk
-.INCLUDE .IGNORE : i18npool/version.mk
-.INCLUDE .IGNORE : comphelper/version.mk
-.INCLUDE .IGNORE : ucbhelper/version.mk
-.INCLUDE .IGNORE : connectivity/version.mk
-
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
-
-.IF "$(GUI)" == "WNT"
-ODMA_LIB_LIB=-lodma_lib
-.ENDIF
-
-#
-#externe libs in plattform.mk
-#
-AWTLIB*=-ljawt
-AVMEDIALIB=-lavmedia$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
-ICUINLIB=-licuin$(ICU_MAJOR)$(ICU_MINOR)
-ICULELIB=-licule$(ICU_MAJOR)$(ICU_MINOR)
-ICUUCLIB=-licuuc$(ICU_MAJOR)$(ICU_MINOR)
-ICUDATALIB=-licudt$(ICU_MAJOR)$(ICU_MINOR)
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
-ICUINLIB=-licui18n
-ICULELIB=-licule
-ICUUCLIB=-licuuc
-ICUDATALIB=-licudata
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
-I18NUTILLIB=-li18nutil$(COMID)
-I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
-I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
-I18NREGEXPLIB=-li18nregexp$(DLLPOSTFIX)
-SALHELPERLIB=-luno_salhelper$(COMID)
-XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX)
-COMPHELPERLIB=-lcomphelp$(COMID)
-CONNECTIVITYLIB=-lconnectivity
-LDAPBERLIB=-lldapber
-TOOLSLIBST=-latools
-BPICONVLIB=-lbpiconv
-TOOLSLIB=-ltl$(DLLPOSTFIX)
-CPPULIB=-luno_cppu
-CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-UCBHELPERLIB=-lucbhelper4$(COMID)
-.IF "$(SYSTEM_OPENSSL)" == "YES"
-OPENSSLLIB=$(OPENSSL_LIBS)
-OPENSSLLIBST=$(STATIC) $(OPENSSL_LIBS) $(DYNAMIC)
-.ELSE           # "$(SYSTEM_OPENSSL)" == "YES
-OPENSSLLIB=-lssl -lcrypto
-.IF "$(GUI)$(COM)"=="WNTGCC"
-OPENSSLLIBST=-lssl_static -lcrypto_static
-.ELSE          # "$(GUI)$(COM)"=="WNTGCC"
-OPENSSLLIBST=$(STATIC) -lssl -lcrypto $(DYNAMIC)
-.ENDIF          # "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF          # "$(SYSTEM_OPENSSL)" == "YES"
-REGLIB=-lreg
-XMLOFFLIB=-lxo$(DLLPOSTFIX)
-XMLOFFLLIB=-lxol
-STORELIB=-lstore
-SALLIB=-luno_sal
-ODBCLIB=-lodbc$(DLLPOSTFIX)
-ODBCBASELIB=-lodbcbase$(DLLPOSTFIX)
-DBFILELIB=-lfile$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
-RMCXTLIB=-lrmcxt$(UDK_MAJOR)
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
-RMCXTLIB=-lrmcxt
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-BTSTRPLIB=-lbtstrp
-BTSTRPDTLIB=-lbootstrpdt$(DLLPOSTFIX)
-TRANSEXLIB=-ltransex
-OTXLIB=-lotx_ind
-OSXLIB=-losx
-UNOTOOLSLIB=-lutl$(DLLPOSTFIX)
-SOTLIB=-lsot$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
-MOZBASELIBST=$(STATIC) -lnspr4_s -lxpcombase_s
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
-MOZBASELIBST=$(STATIC) -lnspr4 -lxpcombase_s $(DYNAMIC)
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-MOZBASELIB=-lnspr4 -lxpcom
-.IF "$(GUI)$(COM)"=="WNTGCC"
-LDAPSDKLIB=-lnsldap32v50
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
-.IF "$(WITH_OPENLDAP)" == "YES"
-LDAPSDKLIB=-lldap
-.ELSE
-LDAPSDKLIB=-lldap50
-.ENDIF
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-
-ICOLIB=-lico$(DLLPOSTFIX)
-VCLLIB=-lvcl$(DLLPOSTFIX)
-OOXLIB=-loox$(DLLPOSTFIX)
-BASEGFXLIB=-lbasegfx$(DLLPOSTFIX)
-DRAWINGLAYERLIB=-ldrawinglayer$(DLLPOSTFIX)
-BASEBMPLIB=-lbasebmp$(DLLPOSTFIX)
-CANVASTOOLSLIB=-lcanvastools$(DLLPOSTFIX)
-CPPCANVASLIB=-lcppcanvas$(DLLPOSTFIX)
-FORLIB=-lfor$(DLLPOSTFIX)
-FORUILIB=-lforui$(DLLPOSTFIX)
-
-.IF "$(SYSTEM_AGG)" == "YES"
-AGGLIB=-lagg
-.ELSE
-AGGLIB=-lagg$(DLLPOSTFIX)
-.ENDIF
-FREETYPE_LIBS*=-lfreetype
-FREETYPELIB=$(FREETYPE_LIBS)
-TKLIB=-ltk$(DLLPOSTFIX)
-LAYOUTLIB=-ltklayout$(DLLPOSTFIX)
-SVTOOLLIB=-lsvt$(DLLPOSTFIX)
-XMLSECLIB=-lxmlsec1
-XMLSECLIB-NSS=-lxmlsec1-nss
-.IF "$(SYSTEM_LIBXML)"=="YES"
-LIBXML2LIB=$(LIBXML_LIBS)
-.ELSE
-LIBXML2LIB=-lxml2
-.ENDIF
-NSS3LIB=-lnss3
-NSPR4LIB=-lnspr4
-PLC4LIB=-lplc4
-NSSCRYPTOLIBS=$(XMLSECLIB-NSS) $(XMLSECLIB) $(LIBXML2LIB) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB)
-.IF "$(GUI)$(COM)"=="WNTGCC"
-XMLSECLIB-MS=-lxmlsec1-mscrypto
-MSCRYPTOLIBS=$(XMLSECLIB) $(XMLSECLIB-MS) $(LIBXML2LIB) $(CRYPT32LIB) $(ADVAPI32LIB)
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-BROOKERLIB=-lbrooker$(DLLPOSTFIX)
-SIMPLECMLIB=-lsimplecm$(DLLPOSTFIX)
-COMMUNILIB=-lcommuni$(DLLPOSTFIX)
-BTCOMMUNILIB=-lbtcommuni$(DLLPOSTFIX)
-AUTOMATIONLIB=-lsts$(DLLPOSTFIX)
-SVLLIB=-lsvl$(DLLPOSTFIX)
-TKTLIB=-ltkt$(DLLPOSTFIX)
-SAXLIB=-lsax$(DLLPOSTFIX)
-MAILLIB=-lmail
-DOCMGRLIB=-ldmg$(DLLPOSTFIX)
-BASICLIB=-lsb$(DLLPOSTFIX)
-VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX)
-DBTOOLSLIB=-ldbtools$(DLLPOSTFIX)
-HM2LIBSH=-lhmwrpdll
-HM2LIBST=-lhmwrap
-LINGULIB=$(HM2LIBST)
-LNGLIB=-llng$(DLLPOSTFIX)
-.IF "$(SYSTEM_EXPAT)"=="YES"
-EXPAT3RDLIB=-lexpat
-EXPATASCII3RDLIB=-lexpat
-.ELSE
-EXPAT3RDLIB=-lexpat_xmlparse -lexpat_xmltok
-EXPATASCII3RDLIB=-lascii_expat_xmlparse -lexpat_xmltok
-.ENDIF
-.IF "$(SYSTEM_ZLIB)"=="YES"
-ZLIB3RDLIB=-lz
-.ELSE
-ZLIB3RDLIB=-lzlib
-.ENDIF
-.IF "$(SYSTEM_JPEG)"=="YES"
-JPEG3RDLIB=-ljpeg
-.ELSE
-JPEG3RDLIB=-ljpeglib
-.ENDIF
-.IF "$(SYSTEM_NEON)" == "YES"
-NEON3RDLIB=-lneon
-.ELIF "$(GUI)$(COM)"=="WNTGCC"
-NEON3RDLIB=-lneon
-.ELIF "$(OS)" == "MACOSX"
-NEON3RDLIB=$(SOLARLIBDIR)/libneon.dylib
-.ELSE
-NEON3RDLIB=-lneon
-.ENDIF
-.IF "$(SYSTEM_DB)" == "YES"
-BERKELEYLIB=-l$(DB_LIB)
-.ELSE
-BERKELEYLIB=-ldb-4.7
-.ENDIF
-CURLLIB=-lcurl
-SFX2LIB=-lsfx$(DLLPOSTFIX)
-SFXLIB=-lsfx$(DLLPOSTFIX)
-SFXDEBUGLIB=
-FWELIB=-lfwe$(DLLPOSTFIX)
-FWILIB=-lfwi$(DLLPOSTFIX)
-SVXCORELIB=-lsvxcore$(DLLPOSTFIX)
-MSFILTERLIB=-lmsfilter$(DLLPOSTFIX)
-SVXLIB=-lsvx$(DLLPOSTFIX)
-EDITENGLIB=-lediteng$(DLLPOSTFIX)
-BASCTLLIB=-lbasctl$(DLLPOSTFIX)
-BASICIDELIB=-lybctl
-SVXLLIB=-lsvxl
-CHAOSLIB=-lcnt$(DLLPOSTFIX)
-UUILIB=-luui$(DLLPOSTFIX)
-DGLIB=
-SCHLIB=-lysch
-SMLIB=-lysm
-OFALIB=-lofa$(DLLPOSTFIX)
-PRXLIB=-llprx2$(DLLPOSTFIX)
-PACKAGE2LIB=-lpackage2
-PAPILIB=-lpap$(DLLPOSTFIX)
-SCLIB=-lsclib
-SDLIB=-lsdlib
-SDLLIB=-lsdl
-SWLIB=-lswlib
-ISWLIB=-lsw$(DLLPOSTFIX)
-ISCLIB=-lsc$(DLLPOSTFIX)
-ISDLIB=-lsd$(DLLPOSTFIX)
-PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
-HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-JVMACCESSLIB = -ljvmaccess$(COMID)
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CPPUNITLIB = $(CPPUNIT_LIBS)
-.ELSE
-CPPUNITLIB = -lcppunit
-.ENDIF
-.IF "$(SYSTEM_LIBXSLT)"=="YES"
-XSLTLIB=$(LIBXSLT_LIBS)
-.ELSE
-XSLTLIB=-lxslt $(LIBXML2LIB)
-.ENDIF
-JVMFWKLIB = -ljvmfwk
-.IF "$(SYSTEM_REDLAND)"=="YES"
-REDLANDLIB=$(REDLAND_LIBS)
-.ELSE
-REDLANDLIB=-lrdf
-.ENDIF
-
-
-# #110743#
-# For BinFilters, some libs were added.
-#
-
-BFSVXLIB=-lbf_svx$(DLLPOSTFIX)
-BFSCHLIB=-lbf_ysch
-BFSMLIB=-lbf_ysm
-BFSCLIB=-lbf_sclib
-BFSDLIB=-lbf_sdlib
-BFSWLIB=-lbf_swlib
-BFOFALIB=-lbf_ofa$(DLLPOSTFIX)
-LEGACYSMGRLIB=-llegacy_binfilters$(DLLPOSTFIX)
-BFXMLOFFLIB=-lbf_xo$(DLLPOSTFIX)
-BFGOODIESLIB=-lbf_go$(DLLPOSTFIX)
-BFBASICLIB=-lbf_sb$(DLLPOSTFIX)
-BFSO3LIB=-lbf_so$(DLLPOSTFIX)
-BFSVTOOLLIB=-lbf_svt$(DLLPOSTFIX)
-
-#
-# USED_%NAME%_LIBS
-# Variablen, in denen in gueltiger Reihenfolge ALLE Libraries,
-# die unterhalb von %NAME% liegen, zusammengefasst werden
-#
-
-# Libraries
-USED_OSL_LIBS =
-USED_VOS_LIBS =		$(OSLLIB)
-USED_UNO_LIBS =		 $(OSLLIB)
-USED_TOOLS_LIBS =
-USED_SOT_LIBS = 	$(TOOLSLIB)
-USED_VCL_LIBS =		$(SOTLIB) $(TOOLSLIB) $(USED_UNO_LIBS)
-
-# Applikationen
-USED_BOOTSTRP_LIBS= $(TOOLSLIB)
-USED_RCLIENT_LIBS =	$(VCLLIB) $(SOTLIB) $(TOOLSLIB) \
-                    $(USED_UNO_LIBS)
-
-SABLOT3RDLIB=-lsablot
-APP3RDLIB=-lapp
-SAMPLE3RDLIB=-lsample
-HNJLIB*=-lhyphen
-MYSPELLLIB=-lmyspell
-COSVLIB=-lcosv
-UDMLIB=-ludm
-ULINGULIB=-lulingu
-.IF "$(SYSTEM_HUNSPELL)" == "YES"
-HUNSPELLLIB=$(HUNSPELL_LIBS)
-.ELSE
-HUNSPELLLIB=-lhunspell-1.3
-.ENDIF
-.IF "$(SYSTEM_MYTHES)" == "YES"
-MYTHESLIB=$(MYTHES_LIBS)
-.ELSE
-MYTHESLIB=-lmythes-1.2
-.ENDIF
-PYUNOLIB=-lpyuno
-LPSOLVELIB=-llpsolve55
-SOFFICELIB=-lsofficeapp
-UNOPKGAPPLIB=-lunopkgapp
-TESTLIB=-ltest
-XMLREADERLIB=-lxmlreader
-
-.IF "$(OS)" == "IOS"
-
-# As we build static libraries for iOS, we append to each library its
-# dependencies, recursively. Start from the bottom of the dependency
-# stack. This is experimental and obviously incomplete.
-
-SALLIB+=-lsal_textenc
-
-UCBHELPERLIB+=$(SALHELPERLIB)
-
-UNOTOOLSLIB+=$(I18NISOLANGLIB)
-UNOTOOLSLIB+=$(UCBHELPERLIB)
-
-TOOLSLIB+=$(BASEGFXLIB)
-TOOLSLIB+=$(ZLIB3RDLIB)
-
-VCLLIB+=$(ICUUCLIB) $(I18NPAPERLIB)
-
-.ENDIF
-
-.IF "$(OS)" == "ANDROID"
-
-# Some of the external libraries get built as static libraries for
-# Android, mostly by accident, because we haven't bothered fixing up
-# their configury to realize that it would work to build shared
-# libraries.
-
-CURLLIB+=$(ZLIB3RDLIB)
-
-.ENDIF
-
-.ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
-
-ODMA_LIB_LIB=odma_lib.lib
-AWTLIB*=jawt.lib
-AVMEDIALIB=iavmedia.lib
-ICUINLIB=icuin.lib
-ICULELIB=icule.lib
-ICUUCLIB=icuuc.lib
-ICUDATALIB=icudt.lib
-I18NUTILLIB=ii18nutil.lib
-I18NISOLANGLIB=ii18nisolang.lib
-I18NPAPERLIB=ii18npaper.lib
-I18NREGEXPLIB=ii18nregexp.lib
-SALHELPERLIB=isalhelper.lib
-XMLSCRIPTLIB=ixcr.lib
-COMPHELPERLIB=icomphelp.lib
-CONNECTIVITYLIB=connectivity.lib
-LDAPBERLIB=ldapber.lib
-CPPULIB=icppu.lib
-CPPUHELPERLIB=icppuhelper.lib
-UCBHELPERLIB=iucbhelper.lib
-OPENSSLLIB=ssleay32.lib libeay32.lib
-ODBCLIB=iodbc.lib
-ODBCBASELIB=iodbcbase.lib
-DBFILELIB=ifile.lib
-TOOLSLIB=itools.lib
-TOOLSLIBST=atools.lib
-BPICONVLIB=bpiconv.lib
-SALLIB=isal.lib
-UNOTOOLSLIB=iutl.lib
-RMCXTLIB=irmcxt.lib
-XMLOFFLIB=ixo.lib
-XMLOFFLLIB=xol.lib
-STORELIB=istore.lib
-OTXLIB=otx_ind.lib
-OSXLIB=osx.lib
-REGLIB=ireg.lib
-EXTLIB=iext.lib
-SOTLIB=isot.lib
-MOZBASELIBST=nspr4_s.lib xpcombase_s.lib
-MOZBASELIB=nspr4.lib xpcom.lib
-LDAPSDKLIB=nsldap32v50.lib
-PAPILIB=ipap.lib
-SFX2LIB=sfx.lib
-SFXLIB=$(SFX2LIB)
-FWELIB=ifwe.lib
-FWILIB=ifwi.lib
-BTSTRPLIB=btstrp.lib
-BTSTRPDTLIB=bootstrpdt.lib
-TRANSEXLIB=transex.lib
-ICOLIB=icom.lib
-SVTOOLLIB=svtool.lib
-XMLSECLIB=libxmlsec.lib
-XMLSECLIB-MS=libxmlsec-mscrypto.lib
-XMLSECLIB-NSS=libxmlsec-nss.lib
-LIBXML2LIB=libxml2.lib
-NSS3LIB=nss3.lib
-NSPR4LIB=nspr4.lib
-PLC4LIB=plc4.lib
-NSSCRYPTOLIBS=$(XMLSECLIB-NSS) $(XMLSECLIB) $(LIBXML2LIB) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB)
-MSCRYPTOLIBS=$(XMLSECLIB-MS) $(XMLSECLIB) $(LIBXML2LIB) crypt32.lib advapi32.lib
-BROOKERLIB=ibrooker.lib
-SIMPLECMLIB=isimplecm.lib
-COMMUNILIB=icommuni.lib
-BTCOMMUNILIB=ibtcommuni.lib
-AUTOMATIONLIB=ists.lib
-SVLLIB=isvl.lib
-PLUGAPPLIB=plugapp.lib
-SAXLIB=isax.lib
-MAILLIB=mail.lib
-DOCMGRLIB=docmgr.lib
-BASICLIB=basic.lib
-VBAHELPERLIB=vbahelper.lib
-TKTLIB=tkt.lib
-SVXCORELIB=isvxcore.lib
-MSFILTERLIB=imsfilter.lib
-SVXLIB=isvx.lib
-EDITENGLIB=iediteng.lib
-BASCTLLIB=basctl.lib
-BASICIDELIB=ybctl.lib
-SVXLLIB=svxl.lib
-DBTOOLSLIB=idbtools.lib
-HM2LIBSH=hmwrpdll.lib
-HM2LIBST=hmwrap.lib
-LINGULIB=$(HM2LIBST)
-LNGLIB=ilng.lib
-EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib
-EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib
-ZLIB3RDLIB=zlib.lib
-JPEG3RDLIB=jpeglib.lib
-NEON3RDLIB=ineon.lib
-BERKELEYLIB=libdb47.lib
-CURLLIB=libcurl.lib
-CHAOSLIB=ichaos.lib
-UUILIB=iuui.lib
-DGLIB=
-SCHLIB=ysch.lib
-SMLIB=ysm.lib
-OFALIB=aofa.lib
-SCLIB=sclib.lib
-SDLIB=sdlib.lib
-SDLLIB=sdl.lib
-SWLIB=swlib.lib
-PRXLIB=ilprx2.lib
-PACKAGE2LIB=ipackage.lib
-ISWLIB=_sw.lib
-ISCLIB=sci.lib
-ISDLIB=sdi.lib
-VCLLIB=ivcl.lib
-OOXLIB=ioox.lib
-BASEGFXLIB=ibasegfx.lib
-DRAWINGLAYERLIB=idrawinglayer.lib
-BASEBMPLIB=ibasebmp.lib
-CANVASTOOLSLIB=icanvastools.lib
-CPPCANVASLIB=icppcanvas.lib
-FORLIB=ifor.lib
-FORUILIB=iforui.lib
-AGGLIB=iagg.lib
-TKLIB=itk.lib
-LAYOUTLIB=itklayout.lib
-SVXLLIB=svxl.lib
-FREETYPELIB=freetype.lib
-PKGCHKLIB=ipkgchk.lib
-HELPLINKERLIB=ihelplinker.lib
-JVMACCESSLIB = ijvmaccess.lib
-CPPUNITLIB = icppunit_dll.lib
-XSLTLIB = libxslt.lib $(LIBXML2LIB)
-REDLANDLIB = librdf.lib
-
-JVMFWKLIB = ijvmfwk.lib
-
-# #110743#
-# For BinFilters, some libs were added.
-#
-
-BFSVXLIB=bf_svx.lib
-BFSCHLIB=bf_ysch.lib
-BFSMLIB=bf_ysm.lib
-BFSCLIB=bf_sclib.lib
-BFSDLIB=bf_sdlib.lib
-BFSWLIB=bf_swlib.lib
-BFOFALIB=bf_ofa.lib
-BFXMLOFFLIB=ibf_xo.lib
-BFGOODIESLIB=bf_go.lib
-BFBASICLIB=bf_sb.lib
-BFSO3LIB=bf_so.lib
-LEGACYSMGRLIB=ilegacy_binfilters.lib
-BFSVTOOLLIB=bf_svt.lib
-
-SABLOT3RDLIB= $(LIBPRE) sablot.lib
-APP3RDLIB= $(LIBPRE) app.lib
-SAMPLE3RDLIB= $(LIBPRE) sample.lib
-HNJLIB*=libhnj.lib
-MYSPELLLIB= $(LIBPRE) myspell.lib
-COSVLIB= $(LIBPRE) cosv.lib
-UDMLIB= $(LIBPRE) udm.lib
-ULINGULIB=$(LIBPRE) libulingu.lib
-.IF "$(SYSTEM_HUNSPELL)" == "YES"
-HUNSPELLLIB=$(HUNSPELL_LIBS)
-.ELSE
-HUNSPELLLIB=$(LIBPRE) libhunspell.lib
-.ENDIF
-MYTHESLIB=libmythes.lib
-PYUNOLIB=ipyuno.lib
-LPSOLVELIB=lpsolve55.lib
-SOFFICELIB=isofficeapp.lib
-UNOPKGAPPLIB=iunopkgapp.lib
-TESTLIB=itest.lib
-BOOSTTHREADLIB=boostthread.lib
-XMLREADERLIB=ixmlreader.lib
-
-.ENDIF              # ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
diff --git a/solenv/inc/mime.types b/solenv/inc/mime.types
deleted file mode 100644
index 43820404c..000000000
--- a/solenv/inc/mime.types
+++ /dev/null
@@ -1,201 +0,0 @@
-# This file controls what Internet media types are sent to the client for
-# given file extension(s).  Sending the correct media type to the client
-# is important so they know how to handle the content of the file.
-# For more information about Internet media types, please read 
-# RFC 2045, 2046, 2047, 2048, and 2077.  The Internet media type
-# registry is at <ftp://ftp.iana.org/assignments/media-types/>.
-# MIME type			Extension
-application/EDI-Consent
-application/EDI-X12
-application/EDIFACT
-application/activemessage
-application/andrew-inset	ez
-application/applefile
-application/atomicmail
-application/cals-1840
-application/commonground
-application/cybercash
-application/cu-seeme		csm cu
-application/dca-rft
-application/dec-dx
-application/eshop
-application/excel		xls
-application/ghostview
-application/hyperstudio
-application/iges
-application/mac-binhex40	hqx
-application/mac-compactpro	cpt
-application/macwriteii
-application/marc
-application/mathematica
-application/msword		doc dot wrd
-application/news-message-id
-application/news-transmission
-application/octet-stream	bin dms lha lzh exe class iso
-application/oda			oda
-application/pdf			pdf
-application/pgp			pgp
-application/pgp-encrypted
-application/pgp-keys
-application/pgp-signature	pgp
-application/postscript		ai eps ps
-application/powerpoint		ppt
-application/remote-printing
-application/rtf			rtf
-application/slate
-application/wita
-application/wordperfect5.1	wp5
-application/vnd.wap.wbxml	wbxml
-application/vnd.wap.wmlc	wmlc
-application/vnd.wap.wmlscriptc	wmlsc
-application/x-123		wk
-application/x-Wingz		wz
-application/x-bcpio		bcpio
-application/x-bzip2		bz2
-application/x-cdlink		vcd
-application/x-chess-pgn		pgn
-application/x-compress		z Z
-application/x-cpio		cpio
-application/x-csh		csh
-application/x-debian-package	deb
-application/x-director		dcr dir dxr
-application/x-dvi		dvi
-application/x-gtar		gtar tgz
-application/x-gunzip		gz
-application/x-gzip		gz
-application/x-hdf		hdf
-application/x-httpd-php		phtml pht php
-application/x-javascript	js
-application/x-java-jnlp-file	jnlp
-application/x-kword		kwd kwt
-application/x-kspread		ksp
-application/x-kpresenter	kpr kpt
-application/x-kchart		chrt
-application/x-koan		skp skd skt skm
-application/x-latex		latex
-application/x-maker		frm maker frame fm fb book fbdoc
-application/x-mif		mif
-application/x-msdos-program	com exe bat
-application/x-netcdf		nc cdf
-application/x-ns-proxy-autoconfig	pac
-application/x-perl		pl pm
-application/x-rad		rad
-application/x-rpm		rpm spm
-application/x-sh		sh
-application/x-shar		shar
-application/x-shockwave-flash	swf
-application/x-stuffit		sit
-application/x-sv4cpio		sv4cpio
-application/x-sv4crc		sv4crc
-application/x-tar		tar
-application/x-tcl		tcl
-application/x-tex		tex
-application/x-texinfo		texinfo texi
-application/x-troff		t tr roff
-application/x-troff-man		man
-application/x-troff-me		me
-application/x-troff-ms		ms
-application/x-ustar		ustar
-application/x-wais-source	src
-application/xhtml+xml           xhtml xht
-application/zip			zip
-audio/basic			au snd
-audio/midi			mid midi kar
-audio/mpeg			mpga mp2 mp3
-audio/x-mpegurl			m3u
-audio/x-aiff			aif aifc aiff
-audio/x-realaudio		ra
-audio/x-wav			wav
-chemical/x-pdb			pdb
-chemical/x-xyz			xyz
-image/bmp			bmp
-image/gif			gif
-image/ief			ief
-image/jpeg			jpeg jpg jpe
-image/png			png
-image/tiff			tiff tif
-image/vnd.djvu			djvu djv
-image/vnd.wap.wbmp		wbmp
-image/x-cmu-raster		ras
-image/x-portable-anymap		pnm
-image/x-portable-bitmap		pbm
-image/x-portable-graymap	pgm
-image/x-portable-pixmap		ppm
-image/x-rgb			rgb
-image/x-xbitmap			xbm
-image/x-xpixmap			xpm
-image/x-xwindowdump		xwd
-message/external-body
-message/news
-message/partial
-message/rfc822
-model/iges			igs iges
-model/mesh			msh mesh silo
-model/vrml			wrl vrml
-multipart/alternative
-multipart/appledouble
-multipart/digest
-multipart/mixed
-multipart/parallel
-text/css			css
-text/html			html htm
-text/plain			asc txt c cc h hh cpp hpp
-text/richtext			rtx
-text/rtf			rtf
-text/sgml			sgml sgm
-text/tab-separated-values	tsv
-text/x-setext			etx
-text/x-vCalendar		vcs
-text/x-vCard			vcf
-text/xml			xml dtd xsl
-video/dl			dl
-video/fli			fli
-video/gl			gl
-video/mpeg			mp2 mpe mpeg mpg
-video/quicktime			qt mov
-video/x-msvideo			avi
-video/x-sgi-movie		movie
-x-conference/x-cooltalk		ice
-x-world/x-vrml			wrl vrml
-audio/x-pn-realaudio rmm ram
-audio/vnd.rn-realaudio ra
-application/smil smi smil
-text/vnd.rn-realtext rt
-video/vnd.rn-realvideo rv
-image/vnd.rn-realflash rf swf
-application/x-shockwave-flash2-preview rf swf
-application/sdp sdp
-application/x-sdp sdp
-application/vnd.rn-realmedia rm
-image/vnd.rn-realpix rp
-application/vnd.oasis.opendocument.text odt
-application/vnd.oasis.opendocument.text-template ott
-application/vnd.oasis.opendocument.text-web oth
-application/vnd.oasis.opendocument.text-master odm
-application/vnd.oasis.opendocument.graphics odg
-application/vnd.oasis.opendocument.graphics-template otg
-application/vnd.oasis.opendocument.presentation odp
-application/vnd.oasis.opendocument.presentation-template otp
-application/vnd.oasis.opendocument.spreadsheet ods
-application/vnd.oasis.opendocument.spreadsheet-template ots
-application/vnd.oasis.opendocument.chart odc
-application/vnd.oasis.opendocument.formula odf
-application/vnd.oasis.opendocument.image odi
-application/vnd.sun.xml.writer sxw
-application/vnd.sun.xml.writer.template stw
-application/vnd.sun.xml.writer.global sxg
-application/vnd.stardivision.writer sdw vor
-application/vnd.stardivision.writer-global sgl
-application/vnd.sun.xml.calc sxc
-application/vnd.sun.xml.calc.template stc
-application/vnd.stardivision.calc sdc
-application/vnd.stardivision.chart sds
-application/vnd.sun.xml.impress sxi
-application/vnd.sun.xml.impress.template sti
-application/vnd.stardivision.impress sdd sdp
-application/vnd.sun.xml.draw sxd
-application/vnd.sun.xml.draw.template std
-application/vnd.stardivision.draw sda
-application/vnd.sun.xml.math sxm
-application/vnd.stardivision.math smf
-application/vnd.sun.xml.base odb
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
deleted file mode 100644
index c4403f37a..000000000
--- a/solenv/inc/minor.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-RSCVERSION=350
-RSCREVISION=350m1(Build:0)
-BUILD=0
-LAST_MINOR=m1
-SOURCEVERSION=OOO350
diff --git a/solenv/inc/pkg_config.mk b/solenv/inc/pkg_config.mk
deleted file mode 100644
index 3654083e7..000000000
--- a/solenv/inc/pkg_config.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.INCLUDE .IGNORE : pkgroot.mk
-
-.IF "$(PKGCONFIG_ROOT)"!=""
-PKG_CONFIG=$(PKGCONFIG_ROOT)/bin/pkg-config
-.IF "$(OS)"=="SOLARIS" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U"
-PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)/lib/64/pkgconfig
-.ELSE
-PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)/lib/pkgconfig
-.ENDIF
-.EXPORT : PKG_CONFIG_PATH
-PKGCONFIG_PREFIX=--define-variable=prefix=$(PKGCONFIG_ROOT)
-.ELSE
-PKG_CONFIG*=pkg-config
-.IF "$(OS)"=="SOLARIS" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U"
-PKG_CONFIG_PATH=/usr/lib/64/pkgconfig
-.EXPORT : PKG_CONFIG_PATH
-.ENDIF
-.ENDIF
-
-PKGCONFIG_CFLAGS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --cflags $(PKGCONFIG_MODULES))
-PKGCONFIG_LIBS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --libs $(PKGCONFIG_MODULES))
-CFLAGS+=$(PKGCONFIG_CFLAGS)
diff --git a/solenv/inc/postmac.h b/solenv/inc/postmac.h
deleted file mode 100644
index 4c722befa..000000000
--- a/solenv/inc/postmac.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#undef Button
-#undef Byte
-#undef Control
-#undef Cursor
-#undef DirInfo
-#undef FontInfo
-#undef LSize
-#undef Line
-#undef MemoryBlock
-#undef ModalDialog
-#undef Palette
-#undef Pattern
-#undef Point
-#undef Polygon
-#undef Ptr
-#undef Region
-#undef SetCursor
-#undef Size
-#undef StringPtr
-#undef TimeValue
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
deleted file mode 100644
index 3d4f4158d..000000000
--- a/solenv/inc/postset.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Default ISO code used when no languages specified
-# This language will be always included!
-defaultlangiso=en-US
-
-# Complete list of all supported localizations (ISO codes)
-.INCLUDE : langlist.mk
-
-alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))
diff --git a/solenv/inc/postwin.h b/solenv/inc/postwin.h
deleted file mode 100644
index 885e08cb2..000000000
--- a/solenv/inc/postwin.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/* nicht geschuetz, muss als gegenstueck zu prewin.h includet werden */
-
-#ifdef WNT
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-#undef Region
-#undef PolyPolygon
-#undef Polygon
-#undef Rectangle
-#undef DELETE
-
-#undef Folder
-#undef GradientStyle_RECT
-
-/* Hilfe-Ids umbenennen */
-#define WIN_HELP_INDEX		 0x0003
-#define WIN_HELP_HELPONHELP  0x0004
-#undef HELP_INDEX
-#undef HELP_HELPONHELP
-
-#define WIN_MOUSE_MOVED 0x0001
-#undef MOUSE_MOVED
-
-#define WIN_WB_LEFT 			  0
-#define WIN_WB_RIGHT			  1
-#undef WB_LEFT
-#undef WB_RIGHT
-
-#ifdef GetObject
-#undef GetObject
-#ifdef UNICODE
-#define WIN_GetObject	GetObjectW
-#else
-#define WIN_GetObject	GetObjectA
-#endif
-#else
-#define WIN_GetObject	GetObject
-#endif
-
-#ifdef SetPrinter
-#undef SetPrinter
-#ifdef UNICODE
-#define WIN_SetPrinter	SetPrinterW
-#else
-#define WIN_SetPrinter	SetPrinterA
-#endif
-#else
-#define WIN_SetPrinter	SetPrinter
-#endif
-
-#ifdef GetPrinter
-#undef GetPrinter
-#ifdef UNICODE
-#define WIN_GetPrinter	GetPrinterW
-#else
-#define WIN_GetPrinter	GetPrinterA
-#endif
-#else
-#define WIN_GetPrinter	GetPrinter
-#endif
-
-#ifdef DrawText
-#undef DrawText
-#ifdef UNICODE
-#define WIN_DrawText	DrawTextW
-#else
-#define WIN_DrawText	DrawTextA
-#endif
-#else
-#define WIN_DrawText	DrawText
-#endif
-
-#ifdef mciSetCommand
-#undef mciSetCommand
-#ifdef UNICODE
-#define WIN_mciSetCommand	mciSetCommandW
-#else
-#define WIN_mciSetCommand	mciSetCommandA
-#endif
-#else
-#define mciSetCommand	mciSetCommand
-#endif
-
-#ifdef SetPort
-#undef SetPort
-#ifdef UNICODE
-#define WIN_SetPort 	SetPortW
-#else
-#define WIN_SetPort 	SetPortA
-#endif
-#else
-#define WIN_SetPort 	SetPort
-#endif
-
-#ifdef CopyFile
-#undef CopyFile
-#ifdef UNICODE
-#define WIN_CopyFile	CopyFileW
-#else
-#define WIN_CopyFile	CopyFileA
-#endif
-#else
-#define WIN_CopyFile	CopyFile
-#endif
-
-
-#ifdef GetUserName
-#undef GetUserName
-#ifdef UNICODE
-#define WIN_GetUserName GetUserNameW
-#else
-#define WIN_GetUserName GetUserNameA
-#endif
-#else
-#define WIN_GetUserName GetUserName
-#endif
-
-#ifdef GetClassName
-#undef GetClassName
-#ifdef UNICODE
-#define WIN_GetClassName GetClassNameW
-#else
-#define WIN_GetClassName GetClassNameA
-#endif
-#else
-#define WIN_GetClassName GetClassName
-#endif
-
-#ifdef GetCharWidth
-#undef GetCharWidth
-#ifdef UNICODE
-#define WIN_GetCharWidth GetCharWidthW
-#else
-#define WIN_GetCharWidth GetCharWidthA
-#endif
-#else
-#define WIN_GetCharWidth GetCharWidth
-#endif
-
-#ifdef GetMetaFile
-#undef GetMetaFile
-#ifdef UNICODE
-#define WIN_GetMetaFile GetMetaFileW
-#else
-#define WIN_GetMetaFile GetMetaFileA
-#endif
-#else
-#define WIN_GetMetaFile GetMetaFile
-#endif
-
-#ifdef GetNumberFormat
-#undef GetNumberFormat
-#ifdef UNICODE
-#define WIN_GetNumberFormat GetNumberFormatW
-#else
-#define WIN_GetNumberFormat GetNumberFormatA
-#endif
-#else
-#define WIN_GetNumberFormat GetNumberFormat
-#endif
-
-#ifdef GetGlyphOutline
-#undef GetGlyphOutline
-#ifdef UNICODE
-#define WIN_GetGlyphOutline GetGlyphOutlineW
-#else
-#define WIN_GetGlyphOutline GetGlyphOutlineA
-#endif
-#else
-#define WIN_GetGlyphOutline GetGlyphOutline
-#endif
-
-#ifdef GetKerningPairs
-#undef GetKerningPairs
-#ifdef UNICODE
-#define WIN_GetKerningPairs GetKerningPairsW
-#else
-#define WIN_GetKerningPairs GetKerningPairsA
-#endif
-#else
-#define WIN_GetKerningPairs GetKerningPairs
-#endif
-
-#ifdef FindWindow
-#undef FindWindow
-#ifdef UNICODE
-#define WIN_FindWindow FindWindowW
-#else
-#define WIN_FindWindow FindWindowA
-#endif
-#else
-#define WIN_FindWindow FindWindow
-#endif
-
-// keine Yield-Definition
-#undef Yield
-
-/* new StretchBlt() Modes (simpler names) */
-#ifndef STRETCH_ANDSCANS
-#define STRETCH_ANDSCANS		1
-#endif
-#ifndef STRETCH_ORSCANS
-#define STRETCH_ORSCANS 		2
-#endif
-#ifndef STRETCH_DELETESCANS
-#define STRETCH_DELETESCANS 	3
-#endif
-
-#ifdef WNT
-extern "C"
-{
-BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
-BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt );
-BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt );
-}
-#endif
-
-// svwin.h nicht mehr includen
-#define _SVWIN_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/preinclude.h b/solenv/inc/preinclude.h
deleted file mode 100644
index 0d99bc93b..000000000
--- a/solenv/inc/preinclude.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-/* HACK: include certain standard header to enable build on glibc-2.2 systems
- * and compile vs. glibc-2.1 header
- *
- * please add more if necessary
- */
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-#include <wchar.h>
-#include <features.h>
-#include <assert.h>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h
deleted file mode 100644
index b5650dc94..000000000
--- a/solenv/inc/premac.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define Button MacOSButton
-#define Byte MacOSByte
-#define Control MacOSControl
-#define Cursor MacOSCursor
-#define DirInfo MacOSDirInfo
-#define FontInfo MacOSFontInfo
-#define LSize MacOSLSize
-#define Line MacOSLine
-#define MemoryBlock MacOSMemoryBlock
-#define ModalDialog MacOSModalDialog
-#define Palette MacOSPalette
-#define Pattern MacOSPattern
-#define Point MacOSPoint
-#define Polygon MacOSPolygon
-#define Ptr MacOSPtr
-#define Region MacOSRegion
-#define SetCursor MacOSSetCursor
-#define Size MacOSSize
-#define StringPtr MacOSStringPtr
-#define TimeValue MacOSTimeValue
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/prewin.h b/solenv/inc/prewin.h
deleted file mode 100644
index fac67a6ba..000000000
--- a/solenv/inc/prewin.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/* nicht geschuetzt, darf nur einmal includet werden */
-
-#if defined WNT
-
-#define Rectangle    BLA_Rectangle
-#define Polygon      BLA_Polygon
-#define PolyPolygon  BLA_PolyPolygon
-#define Region       WIN_Region
-#define Folder       WIN_Folder
-#define GradientStyle_RECT	WIN_GradientStyle_RECT
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define STRICT
-#ifdef _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-#include <shellapi.h>
-#include <commdlg.h>
-#include <dlgs.h>
-#ifdef USE_TOOLHELP
-#include <tlhelp32.h>
-#endif
-#ifdef USE_IMAGEHLP
-#include <imagehlp.h>
-#endif
-#ifdef INCLUDE_MMSYSTEM
-#include <mmsystem.h>
-#endif
-#ifdef _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <commctrl.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk
deleted file mode 100644
index fc5ffcdd5..000000000
--- a/solenv/inc/productversion.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRODUCTLIST = libreoffice oxygenoffice
-
-# default values to minimize maintainance effort
-PRODUCTVERSION = 3.5
-PRODUCTVERSIONSHORT = 3
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
deleted file mode 100644
index 1669a2511..000000000
--- a/solenv/inc/pstrules.mk
+++ /dev/null
@@ -1,156 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#+++++++++++	second_build rules			+++++++++++++++++++++++++++++++++++++
-#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-.IF "$(SECOND_BUILD)"!=""
-.IF "$($(SECOND_BUILD)_OBJFILES)"!=""
-
-$(OBJ)/$(SECOND_BUILD)_%.obj : %.cxx
-    @echo "Making:   " $@
-.IF "$(GUI)"=="UNX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ELSE
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI)
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
-.ENDIF
-
-$(OBJ)/$(SECOND_BUILD)_%.obj : %.c
-    @echo "Making:   " $@
-.IF "$(GUI)"=="UNX"
-.IF "$(TEST)"!=""
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $*.c
-.ELSE
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ENDIF
-.ELSE
-    @$(TYPE) $(mktmp $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
-    @echo.
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
-.ELSE
-    $(COMMAND_ECHO)$(CC) @$(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
-.ENDIF
-    $(SEMADEBUG)
-.ENDIF
-
-.ENDIF			# "$($(SECOND_BUILD)_OBJFILES)"!=""
-
-.IF "$($(SECOND_BUILD)_SLOFILES)"!=""
-
-$(SLO)/$(SECOND_BUILD)_%.obj : %.cxx
-    @echo "Making:   " $@
-.IF "$(GUI)"=="UNX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ELSE
-    @-$(RM) $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
-.ELSE
-    $(COMMAND_ECHO)$(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx )
-.ENDIF
-.ENDIF
-
-$(SLO)/$(SECOND_BUILD)_%.obj :  %.c
-    @echo "Making:   " $@
-.IF "$(GUI)"=="UNX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ELSE
-    @-$(RM) $@
-.IF "$(COM)"=="GCC"
-       $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c 
-.ELSE
-       $(COMMAND_ECHO)$(TYPE) $(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c )
-       $(COMMAND_ECHO)$(CC) @$(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c )
-.ENDIF
-.ENDIF
-
-.ENDIF			# "$($(SECOND_BUILD)_SLOFILES)"!=""
-.ENDIF			# "$(SECOND_BUILD)"!=""
-
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#+++++++++++	srcipting rules		++++++++++++++++++++++++++++++++++++++++
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-.IF "$(PARFILES)"!=""
-ULFPARFILES=$(foreach,i,$(ULFFILES) $(foreach,j,$(SCP_PRODUCT_TYPE) $(PAR)/$j/$(i:b).par))
-MOREPARFILES=$(foreach,i,$(PARFILES) $(foreach,j,$(SCP_PRODUCT_TYPE) $(PAR)/$j/$i ))
-ALLPARFILES=$(uniq $(ULFPARFILES) $(MOREPARFILES))
-
-SCP_PRODUCT_TYPE*=FAT
-
-.IF "$(GUI)" == "WNT"
-LANGFILEEXT=mlf
-.ELSE
-LANGFILEEXT=jlf
-.ENDIF
-
-$(PAR)/%.par :
-    @echo "Making:   " $@
-    @@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}
-.IF "$(GUI)"=="WNT"
-.IF "$(CROSS_COMPILING)" == "NO"
-    $(COMMAND_ECHO)$(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
-.ELSE
-    $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I#$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
-.ENDIF
-.ENDIF
-# YD: INCLUDE macro too long, include only few items (scp2 compile)
-.IF "$(GUI)"=="UNX"
-    $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
-.ENDIF
-.IF "$(common_build_srs)"!=""
-    $(COMMAND_ECHO)$(SCPCOMP) -l {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(TARGET)/$(@:b).$(LANGFILEEXT)} -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
-.ELSE          # "$(common_build_srs)"!=""
-    $(COMMAND_ECHO)$(SCPCOMP) -l {$(MISC)/$(TARGET)/$(@:b).$(LANGFILEEXT)} -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
-.ENDIF          # "$(common_build_srs)"!=""
-# hacked version    
-#    $(COMMAND_ECHO)$(SCPCOMP) -l $(@:b).$(LANGFILEEXT) -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
-
-.ENDIF			# "$(PARFILES)"!=""
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
deleted file mode 100644
index ca816d8e6..000000000
--- a/solenv/inc/rules.mk
+++ /dev/null
@@ -1,799 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-MKFILENAME:=RULES.MK
-
-$(OBJ)/%.obj : %.cxx
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-.IF "$(noadjust)"==""   
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(noadjust)"==""   
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ELSE
-    @@-$(RM) $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx 
-.ELSE
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
-.ENDIF
-.ENDIF
-.IF "$(nodep)"==""
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
-    @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
-.ENDIF			# "$(nodep)"==""
-
-$(OBJ)/%.obj : %.cpp
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ELSE
-    @@-$(RM) $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp 
-.ELSE
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
-.ENDIF
-.ENDIF
-.IF "$(nodep)"==""
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
-    @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
-.ENDIF			# "$(nodep)"==""
-
-$(OBJ)/%.obj : %.cc
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ELSE
-    @@$(RM) $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc 
-.ELSE
-    $(COMMAND_ECHO)$(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc )
-.ENDIF
-.ENDIF
-
-.IF "$(ENABLE_PCH)"!=""
-# workaround for file locking problems on network volumes
-.IF "$(NETWORK_BUILD)"==""
-PCHOUTDIR=$(SLO)/pch
-PCHEXOUTDIR=$(SLO)/pch_ex
-.ELSE			# "$(NETWORK_BUILD)"==""
-PCHOUTDIR=$(TMP)/$(BUILD)$(PRJNAME)$(PROEXT)
-PCHEXOUTDIR=$(TMP)/$(BUILD)$(PRJNAME)_ex$(PROEXT)
-.ENDIF			# "$(NETWORK_BUILD)"==""
-$(SLO)/precompiled.% .PHONY:
-    -$(MKDIRHIER) $(SLO)/pch
-.IF "$(COM)"=="MSC"
-.IF "$(NETWORK_BUILD)"!=""
-    -$(MKDIRHIER) $(PCHOUTDIR)
-.IF "$(HAVE_BIG_TMP)"==""
-    $(COMMAND_ECHO)-$(COPY) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) 
-.ENDIF			# "$(HAVE_BIG_TMP)"==""
-.ENDIF			# "$(NETWORK_BUILD)"!=""
-    $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
-.IF "$(NETWORK_BUILD)"!=""
-    $(COMMAND_ECHO)$(COPY) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.IF "$(HAVE_BIG_TMP)"==""
-    $(COMMAND_ECHO)$(RM) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
-    $(COMMAND_ECHO)$(RMDIR) $(PCHOUTDIR)
-.ENDIF			# "$(HAVE_BIG_TMP)"==""
-.ENDIF			# "$(NETWORK_BUILD)"!=""
-.ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
-    $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
-    @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch/precompiled_$(PRJNAME).hxx
-.ELSE			# "$(COM)"=="MSC"
-    @$(TOUCH) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.ENDIF			# "$(COM)"=="MSC"
-    @echo USED_PCHFLAGS=$(CFLAGS)$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF$(CFLAGSAPPEND)> $(INCCOM)/pch.mk
-
-$(SLO)/precompiled_ex.% .PHONY:
-    -$(MKDIRHIER) $(SLO)/pch_ex
-.IF "$(COM)"=="MSC"
-.IF "$(NETWORK_BUILD)"!=""
-    -$(MKDIRHIER) $(PCHEXOUTDIR)
-.IF "$(HAVE_BIG_TMP)"==""
-    $(COMMAND_ECHO)-$(COPY) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) 
-.ENDIF			# "$(HAVE_BIG_TMP)"==""
-.ENDIF			# "$(NETWORK_BUILD)"!=""
-    $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
-.IF "$(NETWORK_BUILD)"!=""
-    $(COMMAND_ECHO)$(COPY) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.IF "$(HAVE_BIG_TMP)"==""
-    $(COMMAND_ECHO)$(RM) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
-    $(COMMAND_ECHO)$(RMDIR) $(PCHEXOUTDIR)
-.ENDIF			# "$(HAVE_BIG_TMP)"==""
-.ENDIF			# "$(NETWORK_BUILD)"!=""
-.ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
-    $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
-    @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx
-.ELSE			# "$(COM)"=="MSC"
-    @$(TOUCH) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.ENDIF			# "$(COM)"=="MSC"
-    @echo USED_EXCEPTIONS_PCHFLAGS=$(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON$(CFLAGSAPPEND)> $(INCCOM)/pch_ex.mk
-
-.INCLUDE .IGNORE : $(INCCOM)/pch.mk
-.INCLUDE .IGNORE : $(INCCOM)/pch_ex.mk
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
-$(SLO)/%.obj : %.cxx
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(ENABLE_PCH)"!=""
-# just a helper var	
-    @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
-# cleanup first
-    @noop $(assign ACT_PCH_SWITCHES:=$(NULL))
-# eq: first string is a copy of the compile line,
-# second generated by pch creation
-# use pch with exception support
-    @noop $(assign ACT_PCH_SWITCHES+=$(eq,$(strip $(USED_EXCEPTIONS_PCHFLAGS)),$(strip $(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS:s/\//)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches)$(CFLAGSAPPEND)) $(CFLAGS_USE_EXCEPTIONS_PCH) $(NULL)))
-# use pch without exception support
-    @noop $(assign ACT_PCH_SWITCHES+=$(eq,$(strip $(USED_PCHFLAGS)),$(strip $(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS:s/\//)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches)$(CFLAGSAPPEND)) $(CFLAGS_USE_PCH) $(NULL)))
-.ENDIF			# "$(ENABLE_PCH)"!=""
-.IF "$(GUI)"=="UNX"
-.IF "$(TEST)"!=""
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E  $(CFLAGSINCXX)$(PWD)/$*.cxx
-.ELSE
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(CAPTURE_COMMAND)"==""
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ENDIF
-.ELSE			# "$(GUI)"=="UNX"
-    @@-$(RM) $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
-.ELSE
-    $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
-.ENDIF		    # "$(COM)"=="GCC"	
-.ENDIF			# "$(GUI)"=="UNX"
-.IF "$(nodep)"==""
-# fixme: write to file
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
-    @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
-.ENDIF			# "$(nodep)"==""
-
-$(SLO)/%.obj : %.cpp
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
-.IF "$(TEST)"!=""
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(PWD)/$*.cpp
-.ELSE
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ENDIF
-.ELSE
-    @@-$(RM) $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
-.ELSE
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
-.ENDIF
-.ENDIF
-.IF "$(nodep)"==""
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
-    @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
-.ENDIF			# "$(nodep)"==""
-
-$(SLO)/%.obj : $(MISC)/%.cxx
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
-.IF "$(TEST)"!=""
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cxx
-.ELSE
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ENDIF
-.ELSE
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
-.ELSE
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
-.ENDIF
-.ENDIF
-.IF "$(nodep)"==""
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $@ ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
-    @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
-.ENDIF			# "$(nodep)"==""
-
-$(SLO)/%.obj : $(MISC)/%.cc
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
-.IF "$(TEST)"!=""
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cc
-.ELSE
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cc
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ENDIF
-.ELSE
-    $(COMMAND_ECHO)$(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cc )
-.ENDIF
-
-$(OBJ)/%.obj : $(MISC)/%.cxx
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
-.IF "$(TEST)"!=""
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cxx
-.ELSE
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ENDIF
-.ELSE
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
-.ELSE
-    $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
-.ENDIF
-.ENDIF
-.IF "$(nodep)"==""
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
-    @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
-.ENDIF			# "$(nodep)"==""
-
-$(OBJ)/%.obj : %.c
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
-.IF "$(TEST)"!=""
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
-.ELSE
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-.IF "$(noadjust)"==""   
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF			# "$(noadjust)"==""   
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ENDIF
-.ELSE
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c
-.ELSE
-  .IF "$(VERBOSE)" == "TRUE"
-    -@echo Cflags: $(CFLAGS) $(INCLUDE)
-  .ENDIF
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c
-.ENDIF
-.ENDIF
-.IF "$(nodep)"==""
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
-    @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
-.ENDIF			# "$(nodep)"==""
-
-$(OBJ)/%.obj : $(MISC)/%.c
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ELSE
-    @@-$(RM) $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c
-.ELSE
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c
-.ENDIF
-.ENDIF
-.IF "$(nodep)"==""
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
-    @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
-.ENDIF			# "$(nodep)"==""
-
-$(SLO)/%.obj : $(MISC)/%.c
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ELSE
-    @@-$(RM) $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c 
-.ELSE
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c
-.ENDIF
-.ENDIF
-.IF "$(nodep)"==""
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
-# avoid _version objects (see tg_shl.mk) - quite hacky...
-    @noop $(!eq,$@,$(@:s/_version.obj/.obj/) $(NULL) $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)))
-.ENDIF			# "$(nodep)"==""
-
-$(SLO)/%.obj : %.c
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c
-.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
-.ENDIF          # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""    
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ELSE
-    @@-$(RM) $@
-.IF "$(COM)"=="GCC"
-       $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c 
-.ELSE
-       $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c
-.ENDIF
-.ENDIF
-.IF "$(nodep)"==""
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
-    @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
-.ENDIF			# "$(nodep)"==""
-
-# Objective-C files
-$(OBJ)/%.obj : %.m
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(OS)"=="MACOSX"
-.IF "$(TEST)"!=""
-    $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m
-.ELSE
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ENDIF
-.ELSE			# "$(OS)"=="MACOSX"
-    @echo "No recipe for compiling Objective-C files is available for this platform"
-.ENDIF		"$(OS)"=="MACOSX"
-
-# Objective-C files
-$(OBJ)/%.obj : $(MISC)/%.m
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(OS)"=="MACOSX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ELSE			# "$(OS)"=="MACOSX"
-    @echo "No recipe for compiling Objective-C files is available for this platform"
-.ENDIF		"$(OS)"=="MACOSX"
-
-# Objective-C files
-$(SLO)/%.obj : $(MISC)/%.m
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(OS)"=="MACOSX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ELSE			# "$(OS)"=="MACOSX"
-    @echo "No recipe for compiling Objective-C files is available for this platform"
-.ENDIF		"$(OS)"=="MACOSX"
-
-# Objective-C files
-$(SLO)/%.obj : %.m
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(OS)"=="MACOSX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.m
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ELSE			# "$(OS)"=="MACOSX"
-    @echo "No recipe for compiling Objective-C files is available for this platform"
-.ENDIF		"$(OS)"=="MACOSX"
-
-# dependencies c / c++
-
-not_existing/s_%.dpcc : %.c;@noop $(assign all_local_slo+:=$<)
-not_existing/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<)
-
-# Objective-C++ files
-$(OBJ)/%.obj : %.mm
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(OS)"=="MACOSX"
-.IF "$(TEST)"!=""
-    $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm
-.ELSE
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.ENDIF
-.IF "$(nodep)"==""
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
-    @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
-.ENDIF			# "$(nodep)"==""
-.ELSE			# "$(OS)"=="MACOSX"
-    @echo "No recipe for compiling Objective-C++ files is available for this platform"
-.ENDIF			# "$(OS)"=="MACOSX"
-
-# Objective-C++ files
-$(OBJ)/%.obj : $(MISC)/%.mm
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(OS)"=="MACOSX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.IF "$(nodep)"==""
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
-    @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
-.ENDIF			# "$(nodep)"==""
-.ELSE			# "$(OS)"=="MACOSX"
-    @echo "No recipe for compiling Objective-C++ files is available for this platform"
-.ENDIF			# "$(OS)"=="MACOSX"
-
-# Objective-C++ files
-$(SLO)/%.obj : $(MISC)/%.mm
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(OS)"=="MACOSX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.IF "$(nodep)"==""
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
-    @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
-.ENDIF			# "$(nodep)"==""
-.ELSE			# "$(OS)"=="MACOSX"
-    @echo "No recipe for compiling Objective-C++ files is available for this platform"
-.ENDIF			# "$(OS)"=="MACOSX"
-
-# Objective-C++ files
-$(SLO)/%.obj : %.mm
-    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(OS)"=="MACOSX"
-    @$(RM) $@ $(@:s/.obj/.o/)
-    $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.mm
-    @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
-.IF "$(nodep)"==""
-    $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
-    @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
-.ENDIF			# "$(nodep)"==""
-.ELSE			# "$(OS)"=="MACOSX"
-    @echo "No recipe for compiling Objective-C++ files is available for this platform"
-.ENDIF			# "$(OS)"=="MACOSX"
-
-$(MISC)/%.dpslo :
-    @echo "Making:   " $(@:f)
-    @@$(RM) $@
-    @@-$(CDD) $(MISC) && $(!null,$(all_local_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_slo:b:+".dpcc") s_$(i)) > $(@:f)
-    @@-$(CDD) $(MISC) && $(!null,$(all_misc_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_slo:b:+".dpcc") s_$(i)) >> $(@:f)
-    @$(TYPE) $(mktmp $(foreach,i,$(all_local_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/s_$i) $(foreach,i,$(all_misc_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/s_$i)) >> $@
-    @$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_slo:b:+".dpcc":^"s_") $(all_misc_slo:b:+".dpcc":^"s_")) >> $@
-
-$(MISC)/%.dpobj :
-    @echo "Making:   " $(@:f)
-    @@$(RM) $@
-    @@-$(CDD) $(MISC) && $(!null,$(all_local_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_obj:b:+".dpcc") o_$(i)) > $(@:f)
-    @@-$(CDD) $(MISC) && $(!null,$(all_misc_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_obj:b:+".dpcc") o_$(i)) >> $(@:f)
-    @$(TYPE) $(mktmp $(foreach,i,$(all_local_obj:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/o_$i) $(foreach,i,$(all_misc_obj:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/o_$i)) >> $@
-    @$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_obj:b:+".dpcc":^"s_") $(all_misc_obj:b:+".dpcc":^"s_")) >> $@
-
-# see also %.dpslo 
-not_existing/s_%.dpcc : %.cxx;@noop $(assign all_local_slo+:=$<)
-not_existing/o_%.dpcc : %.cxx;@noop $(assign all_local_obj+:=$<)
-
-not_existing/s_%.dpcc : %.cpp;@noop $(assign all_local_slo+:=$<)
-not_existing/o_%.dpcc : %.cpp;@noop $(assign all_local_obj+:=$<)
-
-not_existing/s_%.dpcc : $(MISC)/%.c;@noop $(assign all_misc_slo+:=$<)
-not_existing/o_%.dpcc : $(MISC)/%.c;@noop $(assign all_misc_obj+:=$<)
-
-not_existing/s_%.dpcc : $(MISC)/%.cxx;@noop $(assign all_misc_slo+:=$<)
-not_existing/o_%.dpcc : $(MISC)/%.cxx;@noop $(assign all_misc_obj+:=$<)
-
-not_existing/s_%.dpcc : %.mm;@noop $(assign all_local_slo+:=$<)
-not_existing/o_%.dpcc : %.mm;@noop $(assign all_local_obj+:=$<)
-
-not_existing/s_%.dpcc : $(MISC)/%.mm;@noop $(assign all_misc_slo+:=$<)
-not_existing/o_%.dpcc : $(MISC)/%.mm;@noop $(assign all_misc_obj+:=$<)
-
-# dependencies objective-c
-
-$(MISC)/s_%.dpcc : %.m
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
-    @echo $@ : $(SLO)/$(<:b).obj >> $@
-
-$(MISC)/o_%.dpcc : %.m
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@
-    @echo $@ : $(OBJ)/$(<:b).obj >> $@
-
-$(MISC)/s_%.dpcc : $(MISC)/%.m
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"	
-    $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
-.ELSE			# "$(GUI)"=="UNX"	
-    $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
-.ENDIF			# "$(GUI)"=="UNX"	
-    @echo $@ : $(SLO)/$(<:b).obj >> $@
-
-$(MISC)/o_%.dpcc : $(MISC)/%.m
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"	
-    $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
-.ELSE			# "$(GUI)"=="UNX"	
-    $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
-.ENDIF			# "$(GUI)"=="UNX"	
-    @echo $@ : $(OBJ)/$(<:b).obj >> $@
-
-# dependency dummy for *.s files
-
-$(MISC)/s_%.dpcc : %.s
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
-    @echo $@ : $(SLO)/$(<:b).obj >> $@
-
-$(MISC)/s_%.dpcc : $(SLO)/%.obj
-    @noop $(assign DEPS_MISSING+:=$(@:f))
-
-$(MISC)/o_%.dpcc : $(OBJ)/%.obj
-    @noop $(assign DEPS_MISSING+:=$(@:f))
-
-# dependencies script files
-
-$(MISC)/%.dpsc :
-    @@-$(RM) $@
-    @@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}
-    $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))} -o.par -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(*:b).scp > $@
-    @echo $@ : $(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).par  >> $@
-    @echo $(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).par : $(*:b).scp >> $@
-
-# dependencies rc files (native resources for windows)
-
-$(MISC)/%.dprc : 
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(RES) -o.res $(RCLANGFLAGS_{$(subst,$(@:d:d:d:u), $(@:d:d:u))}:u:s/ //) $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) -I$(SOLARENV)/inc $(*:b).rc >> $@
-#	@echo $@ : $(RES)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).res  >> $@
-    @echo $@ : $(RES)/$(*:b).res  >> $@
-
-$(MISC)/%.dpr :
-    @@noop
-.IF "$(nodep)"==""
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_srs_deps=true $(DEPSRSFILES)
-    $(COMMAND_ECHO)-$(TYPE) $(MISC)/$(TARGET).*.dprr >> $@
-.ENDIF			# "$(nodep)"==""
-
-$(MISC)/%.dpz :
-    @@noop
-.IF "$(nodep)"==""
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_zip_deps=true $(ZIPDEPFILES)
-    $(COMMAND_ECHO)$(TYPE) $(ZIPDEPFILES) $(mktmp $(NULL)) | grep -v "CVS" | grep -v "\.svn" >> $@
-    @echo zipdep_langs=$(alllangiso) >> $@
-    @@-$(RM) $(ZIPDEPFILES)
-.ENDIF			# "$(nodep)"==""
-
-# Dependencies fuer java - Files
-
-$(MISC)/%.dpj :
-    @echo "Making:   " $(@:f)
-.IF "$(nodep)"!=""
-.IF "$(GUI)"=="UNX"
-    @echo > $@
-.ELSE
-    @$(ECHONL) > $@
-.ENDIF
-.ELSE 			# "$(ndep)"==""
-.IF "$(GUI)"=="UNX"
-    @echo $(shell @$(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR) $(foreach,i,$(JAVADEPINCLUDES:s/:/ /) -i $i) $(JAVACLASSFILES)))
-.ELSE
-    @echo javadeps
-    @echo $(shell @$(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR) $(foreach,i,$(JAVADEPINCLUDES:s/;/ /) -i $i) $(JAVACLASSFILES)))
-.ENDIF
-.ENDIF			# "$(nodep)"==""
-
-$(SLO)/%.obj : %.asm
-       @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(COM)"=="GCC"
-.IF "$(ASM)"=="ml" || "$(ASM)"=="ml64"
-       $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
-       @@-$(RM) $*.err
-.ELSE			# "$(ASM)"=="ml"
-        @@-$(RM) $@
-        $(COMMAND_ECHO)$(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj;
-.ENDIF			# "$(ASM)"=="ml"
-.ELSE
-.IF "$(COM)"=="WTC"
-        $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)/$*.obj
-        @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
-.ELSE
-.IF "$(COM)"=="MSC"
-.IF "$(ASM)"=="ml" || "$(ASM)"=="ml64"
-    $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
-    @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
-.ELSE			# "$(ASM)"=="ml"
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj;
-.ENDIF			# "$(ASM)"=="ml"
-.ENDIF			 "$(COM)"=="MSC"
-.ENDIF
-.ENDIF
-
-$(OBJ)/%.obj : %.asm
-       @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(COM)"=="GCC"
-.IF "$(ASM)"=="ml"
-       $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)/$*.obj $*.asm
-       @@-$(RM) $*.err
-.ELSE			# "$(ASM)"=="ml"
-        @@-$(RM) $@
-        $(COMMAND_ECHO)$(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj;
-.ENDIF			# "$(ASM)"=="ml"
-.ELSE
-.IF "$(COM)"=="MSC"
-.IF "$(ASM)"=="ml"
-    $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
-    @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
-.ELSE			# "$(ASM)"=="ml"
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI)
-    $(COMMAND_ECHO)$(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj;
-.ENDIF			# "$(ASM)"=="ml"
-.ENDIF			 "$(COM)"=="MSC"
-.ENDIF
-
-$(OUT)/ucr/$(IDLPACKAGE)/%.urd : %.idl
-        @noop $(assign all_outdated_idl+:=$<)
-
-$(OUT)/ucrdoc/$(IDLPACKAGE)/%.urd : %.idl
-        @noop $(assign all_outdated_doc_idl+:=$<)
-
-# make *.xml descriptions available in $(MISC)
-$(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml : %.xml
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-# dummy rule to make sure xml file is in place when used in settings.mk
-$(MISC)/%.mk : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml
-    @$(TOUCH) $@
-    @echo XML2MK_FILES += $(@:b) >> $@
-
-#generate descriptions from xml
-$(MISC)/%$($(WINVERSIONNAMES)_MAJOR)_description.cxx : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml 
-    xml2cmp -func $(MISC)/$*$($(WINVERSIONNAMES)_MAJOR)_description.cxx $<
-
-#generate private rdb
-$(BIN)/%.rdb: $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml
-    $(COMMAND_ECHO)$(RDBMAKER) -BUCR -O$(BIN)/$*.rdb @$(mktmp $(foreach,i,$($(@:b)_XML2CMPTYPES) -T$i ) $(COMPRDB))
-
-#strip dos lineends
-$(MISC)/%.sh : %.sh
-    @@-$(RM) -f $@
-    @tr -d "\015" < $< > $@
-
-# merge targets
-.IF "$(WITH_LANG)"!=""
-$(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-$(COMMONMISC)/$(TARGET)/%.xrb : %.xrb
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-$(COMMONMISC)/$(MYPATH)/%.xrm : %.xrm
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    @echo trysdf = $(TRYSDF)
-    $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-#$(COMMONMISC)/$(TARGET)/%.xrm : %.xrm
-#    -$(MKDIRHIER) $(@:d)
-#    -$(RM) $@
-#	$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-#    $(RENAME) $@.$(INPATH) $@
-#    -$(RM) $@.$(INPATH)
-#
-#$(COMMONMISC)/%.xrm : %.xrm
-#    -$(MKDIR) $(@:d)
-#    -$(RM) $@
-#	$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-#    $(RENAME) $@.$(INPATH) $@
-#    -$(RM) $@.$(INPATH)
-.ENDIF			# "$(WITH_LANG)"!=""
-
-.IF "$(WITH_LANG)"!=""
-$(COMMONMISC)/$(TARGET)/%.jlf : $$(@:db).ulf
-.ELSE			# "$(WITH_LANG)"!=""
-$(COMMONMISC)/$(TARGET)/%.jlf : $$(@:b).ulf
-.ENDIF			# "$(WITH_LANG)"!=""
-    @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(ULFCONV) -o $@.$(INPATH) $<
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-.IF "$(WITH_LANG)"!=""
-$(COMMONMISC)/$(TARGET)/%.mlf : $$(@:db).ulf
-.ELSE			# "$(WITH_LANG)"!=""
-$(COMMONMISC)/$(TARGET)/%.mlf : $$(@:b).ulf
-.ENDIF			# "$(WITH_LANG)"!=""
-    @-$(MKDIRHIER) $(@:d)
-    @-$(RM) $@
-    @$(ULFCONV) -o $@.$(INPATH) -t $(SOLARBINDIR)/msi-encodinglist.txt $<
-    @$(RENAME) $@.$(INPATH) $@
-    @-$(RM) $@.$(INPATH)
-
-.IF "$(WITH_LANG)"!=""
-$(COMMONMISC)/$(TARGET)/%.uulf : $$(@:db).ulf
-.ELSE			# "$(WITH_LANG)"!=""
-$(COMMONMISC)/$(TARGET)/%.uulf : $$(@:b).ulf
-.ENDIF			# "$(WITH_LANG)"!=""
-    @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    @$(COPY) $< $@.$(INPATH)
-    @$(RENAME) $@.$(INPATH) $@
-    @-$(RM) $@.$(INPATH)
-
-# This is still needed?????
-$(COMMONMISC)/$(TARGET)/%.xrm : %.xrm
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-# dirty hack
-# if local *.sdf file is missing
-#%.sdf:
-#    echo > $@
-
diff --git a/solenv/inc/set_ext.mk b/solenv/inc/set_ext.mk
deleted file mode 100644
index 8d6d4db5a..000000000
--- a/solenv/inc/set_ext.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#defaults
-TARFILE_ROOTDIR*=$(TARFILE_NAME)
-UNTAR_FLAG_FILE*=so_unpacked_$(TARGET)
-ADD_FILES_FLAG_FILE*=so_addfiles_$(TARGET)
-PATCH_FLAG_FILE*=so_patched_$(TARGET)
-CONFIGURE_FLAG_FILE*=so_configured_$(TARGET)
-BUILD_FLAG_FILE*=so_built_$(TARGET)
-INSTALL_FLAG_FILE*=so_installed_$(TARGET)
-PREDELIVER_FLAG_FILE*=so_predeliver_$(TARGET)
-
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
deleted file mode 100644
index bc8fb7445..000000000
--- a/solenv/inc/set_wntx64.mk
+++ /dev/null
@@ -1,213 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-###############################################
-#        Windows 64 bit special
-#	only used for 64 bit shell extension
-#          ( Windows Vista )
-# ---------------------------------------------
-# THIS FILE WILL BE DELETED when a fully ported
-# Windows 64 bit version is available
-###############################################
-
-.IF "$(BUILD_X64)"!=""
-# ----------------- settings for x64 --------------------
-CC_X64*:="$(CXX_X64_BINARY)"
-CXX_X64*:="$(CXX_X64_BINARY)"
-LINK_X64*:="$(LINK_X64_BINARY)" $(NOLOGO) -MACHINE:X64
-LIBMGR_X64="$(LIBMGR_X64_BINARY)" $(NOLOGO)
-IMPLIB_X64="$(LIBMGR_X64_BINARY)"
-
-USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR
-
-# Stack buffer overrun detection.
-CFLAGS+=-GS
-
-USE_CDEFS_X64+= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -DX86_64 -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
-.IF "$(debug)"!=""
-USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb
-USE_CDEFS_X64+=-DDEBUG
-.ENDIF # "$(debug)"!=""
-USE_CFLAGS_X64+=$(CFLAGS_X64)
-USE_CDEFS_X64+=$(CDEFS_X64)
-INCLUDE_X64=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
-
-.IF "$(product)" != ""
-USE_CFLAGS_X64+=-Gy
-.ENDIF # "$(product)" != ""
-
-# inline expansion
-USE_CFLAGS_X64+=-Ob1
-
-.IF "$(DYNAMIC_CRT)"!=""
-CDEFSSLOMT_X64+=-D_MT -D_DLL
-CDEFSSLOMT_X64+=-D_MT -D_DLL
-.IF "$(NO_DYNAMIC_OBJ)"==""
-CDEFSOBJMT_X64+=-D_MT -D_DLL
-CDEFSOBJMT_X64+=-D_MT -D_DLL
-.ELSE
-CDEFSOBJMT_X64+=-D_MT
-CDEFSOBJMT_X64+=-D_MT
-.ENDIF # "$(NO_DYNAMIC_OBJ)"==""
-.ELSE
-CDEFSSLOMT_X64+=-D_MT
-CDEFSOBJMT_X64+=-D_MT
-.ENDIF # "$(DYNAMIC_CRT)"!=""
-
-.IF "$(PRODUCT)"!="full"
-.ELSE
-LINKFLAGS_X64=/MAP /OPT:NOREF
-.ENDIF
-
-# excetion handling protection
-LINKFLAGS+=-safeseh
-
-# enable DEP
-LINKFLAGS+=-nxcompat
-
-# enable ASLR
-LINKFLAGS+=-dynamicbase
-
-.IF "$(PRODUCT)"!="full"
-LINKFLAGS_X64+= -NODEFAULTLIB -DEBUG
-.ELSE # "$(PRODUCT)"!="full"
-LINKFLAGS_X64+= -NODEFAULTLIB -RELEASE -DEBUG -INCREMENTAL:NO
-.ENDIF # "$(PRODUCT)"!="full"
-MAPFILE=-out:$$@
-
-.IF "$(debug)" != ""
-LINKFLAGS_X64+= $(LINKFLAGSDEBUG)
-.ENDIF
-
-LINKFLAGSSHLCUI_X64=/SUBSYSTEM:CONSOLE /DLL
-LINKFLAGSSHL_X64=$(LINKFLAGSSHLCUI_X64)
-CDEFSSLO_X64+=$(CDEFSMT_X64) $(CDEFSOBJMT_X64)
-CFLAGSSLO_X64+=-MT
-
-STDOBJGUI_X64=
-STDSLOGUI_X64=
-STDOBJCUI_X64=
-STDSLOCUI_X64=
-
-IMPLIBFLAGS_X64=-machine:X64
-
-LIBPATH_X64=$(WINDOWS_SDK_HOME)/lib/x64
-LIBPATH_VC_X64=$(COMPATH)/lib/amd64
-
-ADVAPI32LIB_X64=$(LIBPATH_X64)/advapi32.lib
-SHELL32LIB_X64=$(LIBPATH_X64)/shell32.lib
-GDI32LIB_X64=$(LIBPATH_X64)/gdi32.lib
-OLE32LIB_X64=$(LIBPATH_X64)/ole32.lib
-OLEAUT32LIB_X64=$(LIBPATH_X64)/oleaut32.lib
-UUIDLIB_X64=$(LIBPATH_X64)/uuid.lib
-WINSPOOLLIB_X64=$(LIBPATH_X64)/winspool.lib
-IMM32LIB_X64=$(LIBPATH_X64)/imm32.lib
-VERSIONLIB_X64=$(LIBPATH_X64)/version.lib
-WINMMLIB_X64=$(LIBPATH_X64)/winmm.lib
-MPRLIB_X64=$(LIBPATH_X64)/mpr.lib
-WS2_32LIB_X64=$(LIBPATH_X64)/ws2_32.lib
-KERNEL32LIB_X64=$(LIBPATH_X64)/kernel32.lib
-USER32LIB_X64=$(LIBPATH_X64)/user32.lib
-COMDLG32LIB_X64=$(LIBPATH_X64)/comdlg32.lib
-COMCTL32LIB_X64=$(LIBPATH_X64)/comctl32.lib
-CRYPT32LIB_X64=$(LIBPATH_X64)/crypt32.lib
-GDIPLUSLIB_X64=$(LIBPATH_X64)/gdiplus.lib
-DBGHELPLIB_X64=$(LIBPATH_X64)/dbghelp.lib
-PROPSYSLIB_X64=$(LIBPATH_X64)/propsys.lib
-MSILIB_X64=$(LIBPATH_X64)/msi.lib
-DDRAWLIB_X64=$(LIBPATH_X64)/ddraw.lib
-SHLWAPILIB_X64=$(LIBPATH_X64)/shlwapi.lib
-URLMONLIB_X64=$(LIBPATH_X64)/urlmon.lib
-WININETLIB_X64=$(LIBPATH_X64)/wininet.lib
-OLDNAMESLIB_X64=$(LIBPATH_VC_X64)/oldnames.lib
-MSIMG32LIB_X64=$(LIBPATH_X64)/msimg32.lib
-MSVCPRT_X64=$(LIBPATH_VC_X64)/msvcprt.lib
-MSVCRT_X64=$(LIBPATH_VC_X64)/msvcrt.lib
-
-MISC_X64=$(MISC)/x64
-OBJ_X64=$(OBJ)/x64
-SLO_X64=$(SLO)/x64
-LB_X64=$(LB)/x64
-SLB_X64=$(SLB)/x64
-L_X64=$(SOLARLIBDIR_X64)
-VERSIONOBJ_X64=$(SLO_X64)/_version.obj
-BIN_X64=$(BIN)/x64
-RES_X64=$(RES)/x64
-SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib/x64
-LIB_X64:=$(LB_X64);$(SLB_X64);$(ILIB_X64)
-
-.IF "$(LIBTARGET)"==""
-.IF "$(OBJFILES_X64)$(IDLOBJFILES_X64)"!=""
-OBJTARGET_X64=$(LB_X64)/$(TARGET).lib
-.ENDIF # "$(OBJFILES_X64)$(IDLOBJFILES_X64)"!=""
-.IF "$(SLOFILES_X64)$(IDLSLOFILES_x64)"!=""
-SLOTARGET_X64=$(SLB_X64)/$(TARGET).lib
-.ENDIF # "$(SLOFILES_X64)$(IDLSLOFILES_x64)"!=""
-.ENDIF # "$(LIBTARGET)"==""
-
-.IF "$(OBJFILES_X64)"!=""
-.IF "$(LIBTARGET)" != ""
-NOLIBOBJTARGET_X64=$(OBJFILES_X64)
-.ENDIF
-.ENDIF
-
-.IF "$(SLOFILES_X64)"!=""
-.IF "$(LIBTARGET)" != ""
-NOLIBSLOTARGET_X64=$(SLOFILES_X64)
-.ENDIF
-.ENDIF
-
-.IF "$(SHL1TARGET_X64)"!=""
-SHL1TARGETN_X64=$(BIN_X64)/$(DLLPRE)$(SHL1TARGET_X64)$(DLLPOST)
-.ENDIF
-.IF "$(SHL2TARGET_X64)"!=""
-SHL2TARGETN_X64=$(BIN_X64)/$(DLLPRE)$(SHL2TARGET_X64)$(DLLPOST)
-.ENDIF
-.IF "$(LIB1TARGET_X64)" != ""
-LIB1TARGETN_X64=$(LIB1TARGET_X64)
-.ENDIF
-.IF "$(LIB2TARGET_X64)" != ""
-LIB2TARGETN_X64=$(LIB2TARGET_X64)
-.ENDIF
-.IF "$(DEF1NAME_X64)"!=""
-DEF1TARGETN_X64=$(MISC_X64)/$(DEF1NAME_X64).def
-.ENDIF
-.IF "$(DEF2NAME_X64)"!=""
-DEF2TARGETN_X64=$(MISC_X64)/$(DEF2NAME_X64).def
-.ENDIF
-
-$(SLO_X64)/%.obj : $(MISC_X64)/%.c
-    @echo ------------------------------
-    @echo Making: $@
-    -$(MKDIR) $(@:d)
-    @-$(MKDIR) $(MISC_X64)
-    @@-$(RM) $@
-    @$(TYPE) $(mktmp $(CC_X64) $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC_X64)/$*.c )
-    @$(ECHONL)
-    $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC_X64)/$*.c )
-
-.ENDIF # "$(BUILD_X64)"!=""
-
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
deleted file mode 100644
index 352b8503b..000000000
--- a/solenv/inc/settings.mk
+++ /dev/null
@@ -1,1402 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-MKFILENAME:=SETTINGS.MK
-
-# smaller/greater arithmetic's like ".IF 400<=200" are an OOo extention to
-# the initial dmake 4.1PL0 (unfortunately called 4.10) version and are
-# tested implicitly by the construction below.
-.IF $(MAKEVERSION:s/-cvs//:s/.//)<=410
-.ERROR : ; @echo Forced error: dmake version 4.11 or newer is needed!
-force_dmake_to_error
-.ENDIF
-
-.INCLUDE .IGNORE : ooo_vendor.mk
-
-# --- common tool makros --------------------------------------
-
-.IF "$(USE_PCH)"!=""
-ENABLE_PCH=TRUE
-.ENDIF			# "$(USE_PCH)"!=""
-
-.IF "$(ENABLE_PCH)"!="" && "$(BUILD_SPECIAL)"!=""
-.IF "$(SOLARSRC)"=="$(SRC_ROOT)"
-NETWORK_BUILD:=TRUE
-.ENDIF			# "$(SOLARSRC)"=="$(SRC_ROOT)"
-.ENDIF			# "$(ENABLE_PCH)"!="" && "$(BUILD_SPECIAL)"!=""
-
-.INCLUDE : unitools.mk
-
-.INCLUDE : minor.mk
-
-.INCLUDE .IGNORE : rtlbootstrap.mk
-
-PLATFORMID = $(RTL_OS:l)_$(RTL_ARCH:l)
-EXTNAME*=$(EXTENSIONNAME)_in
-
-.IF "$(UPDATER)"!=""
-
-.IF "$(SOURCEVERSION)"!="$(WORK_STAMP)"
-.ERROR : ; @echo Forced error: minor.mk in solenv/inc does not match your version!
-WRONG_SOURCEVERSION
-.ENDIF
-
-# Create $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk if needed
-%minor.mk : $(SOLARENV)/inc/minor.mk
-    @@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc
-    @@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk
-    @@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
-.ENDIF          # "$(UPDATER)"!=""
-
-# Force creation of $(SOLARVERSION)/$(INPATH)/inc/
-# $(UPD)minor.mk could be empty as it's contents were already included from minor.mk
-.INCLUDE : $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk
-
-.IF "$(BSCLIENT)"=="TRUE"
-.IF "$(UPDATER)"!="YES"
-incorrect_settings:
-    @echo "#"
-    @echo "#" ERROR: setsolar option -bsclient used but UPDATER=YES not set!
-    @echo "#"
-    force_dmake_to_error
-.ENDIF
-.ENDIF
-
-.INCLUDE : udkversion.mk
-
-# --- reset defined Environments --------------------
-ASM=
-AFLAGS=
-
-
-#START JAVA
-
-#interpreter location
-.IF "$(JAVAINTERPRETER)" == ""
-.IF "$(JDK)" == "J++"
-JAVAINTERPRETER=jview.exe
-.ELSE
-.IF "$(JDK)" == "SCAFE"
-.IF "$(JDK_VERSION)" != ""
-JAVAINTERPRETER=$(DEVROOT)/vcafe11/java/bin/java.exe
-.ELSE
-JAVAINTERPRETER=$(DEVROOT)/cafepro/java/bin/java.exe
-.ENDIF
-.ELSE
-.IF "$(JAVACISGCJ)" == "yes"
-JAVAINTERPRETER=gij
-.ELSE
-JAVAINTERPRETER=java
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-
-#compiler location
-.IF "$(JAVACOMPILER)" == ""
-.IF "$(JDK)" == "J++"
-JAVACOMPILER=jvc.exe
-.ELSE
-.IF "$(JDK)" == "SCAFE"
-.IF "$(JDK_VERSION)" != ""
-JAVACOMPILER=$(DEVROOT)/vcafe11/bin/sj.exe
-.ELSE
-JAVACOMPILER=$(DEVROOT)/cafepro/bin/sj.exe
-.ENDIF
-.ELSE
-.IF "$(JAVACISGCJ)" == "yes"
-JAVACOMPILER=gcj
-.ELSE
-JAVACOMPILER=javac
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-
-#if javadoc is not already set
-.IF "$(JAVADOC)"==""
-JAVADOC=javadoc -J-Xmx120m
-.ENDIF
-
-#required arguments
-JAVAC=$(JAVACOMPILER)
-JAVAI:=$(JAVAINTERPRETER)
-.IF "$(JAVACISGCJ)" == "yes"
-JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
-.ENDIF
-.IF "$(JDK)" != "gcj" && $(JAVACISKAFFE) != "yes"
-JAVAC+=-source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
-.ENDIF
-
-#classpath and response
-.IF "$(JDK)" == "J++"
-JAVACPS=/cp
-.ELSE
-.IF "$(JDK)" == "SCAFE"
-JAVACPS=-classpath
-JAVARESPONSE=TRUE
-.ELSE
-JAVACPS=-classpath
-JAVARESPONSE=
-.ENDIF
-.ENDIF
-
-JAVAFLAGS+=$(JAVA_TARGET_FLAG)
-
-#END JAVA
-
-CDEFS=
-CXXDEFS=
-CDEFSCXX=
-CDEFSOBJ=
-CDEFSSLO=
-CDEFSGUI=
-CDEFSCUI=
-CDEFSMT=
-CDEFSPROF=
-CDEFSDEBUG=
-CDEFSDBGUTIL=
-CDEFSOPT=
-
-CFLAGS=
-CFLAGSCALL=
-CFLAGSCXX=
-CFLAGSCC=
-CFLAGSOBJ=
-CFLAGSSLO=
-CFLAGSOBJGUIMT=
-CFLAGSOBJCUIMT=
-CFLAGSSLOGUIMT=
-CFLAGSSLOCUIMT=
-CFLAGSPROF=
-CFLAGSDEBUG=
-CFLAGSDBGUTIL=
-CFLAGSOPT=
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=
-
-CFLAGSINCXX=
-
-LINKFLAGS=
-LINKFLAGSAPPGUI=
-LINKFLAGSSHLGUI=
-LINKFLAGSAPPCUI=
-LINKFLAGSSHLCUI=
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=
-LINKFLAGSOPT=
-LINKFLAGSAPP=
-LINKFLAGSSHL=
-LINKEXTENDLINE=
-
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-STDLIBGUIMT=
-STDLIBCUIMT=
-STDSHLGUIMT=
-STDSHLCUIMT=
-STDOBJ=
-STDSLO=
-STDLIB=
-STDSHL=
-
-LIBFLAGS=
-
-IMPLIBMGR=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RSC=
-RSCFLAGS=
-RSCDEFS=
-RSCLANG=
-
-RC=
-RCFLAGS=
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=
-
-HC=
-HCFLAGS=
-
-MKDEP=
-
-AS=
-BC=
-COBOL=
-CPP=
-FOR=
-PASCAL=
-
-BFLAGS=
-COBFLAGS=
-CPPFLAGS=
-CXXFLAGS=
-FFLAGS=
-PFLAGS=
-RFLAGS=
-
-LNT=
-LNTFLAGS=
-LNTFLAGSGUI=
-LNTFLAGSCOM=
-
-# doesn't make sense
-#IDLSTATICOBJS=
-
-E2P=
-CAP=
-cap=
-
-# not to reset because possibly taken from environment
-#CC=
-#CXX=
-#LINK=
-#LIBMGR=
-
-
-# avoid confusion with CUE PROFILE variable...
-PROFILE=
-
-# can be set on the command line. we shouldn't delete them!
-#profile=
-
-# reset as setting those manually is no lonjger supported
-DBGUTIL=
-dbgutil=
-
-# ===========================================================================
-# unter NT werden Variablennamen an untergeordnete makefiles UPPERCASE
-# weitergereicht, aber case significant ausgewertet!
-# ---------------------------------------------------------------------------
-
-DMAKE_WORK_DIR*:=$(subst,/,/ $(PWD))
-.IF "$(GUI_FOR_BUILD)"=="WNT"
-posix_PWD:=/cygdrive/$(PWD:s/://)
-.ELSE
-posix_PWD:=$(PWD)
-.ENDIF
-
-
-.IF "$(TMP)"!=""
-tmp*=$(TMP)
-.ENDIF
-
-.IF "$(tmp)"!=""
-TMP*=$(tmp)
-.ENDIF
-
-.IF "$(TEMP)"!=""
-temp*=$(TEMP)
-.ENDIF
-
-.IF "$(temp)"!=""
-TEMP*=$(temp)
-.ENDIF
-
-.IF "$(DEPEND)"!=""
-depend=$(DEPEND)
-.ENDIF
-
-.IF "$(OPTIMIZE)"!=""
-optimize=$(OPTIMIZE)
-.ENDIF
-
-.IF "$(NOPT)"!=""
-nopt*=$(NOPT)
-.ENDIF
-
-.IF "$(GROUP)"!=""
-group*=$(GROUP)
-.ENDIF
-
-.IF "$(group)"!=""
-GROUP*=$(group)
-.ENDIF
-
-# override dbglevel if set manually
-.IF "$(dbglevel)"!=""
-DBG_LEVEL=$(dbglevel)
-.ENDIF
-
-.IF "$(NODEBUG)"!=""
-nodebug=$(NODEBUG)
-.ENDIF
-
-.IF "$(PRODUCT)"!=""
-product*=$(PRODUCT)
-.ENDIF
-
-.IF "$(product)"!=""
-PRODUCT*=$(product)
-.ENDIF
-
-.IF "$(VERBOSE)"!=""
-verbose*=$(VERBOSE)
-.ENDIF
-
-.IF "$(verbose)"!=""
-# normalize: "false" (any upper/lower case) and "0" mean FALSE, everything else means TRUE
-VERBOSE_IS_FALSE:=$(or $(eq,"$(verbose:u)","FALSE" "false"  ) $(eq,"$(verbose)","0" "false"  ))
-VERBOSE!:=$(eq,"$(VERBOSE_IS_FALSE)","t" FALSE TRUE)
-.ENDIF
-
-.IF "$(SOLARLANG)" != ""
-solarlang*=$(SOLARLANG)
-.ENDIF
-
-.IF "$(solarlang)" != ""
-SOLARLANG:=$(solarlang)
-.ENDIF
-
-.IF "$(wall)"!=""
-COMPILER_WARN_ALL=TRUE
-.ENDIF          # "$(wall)"!=""
-
-.IF "$(werror)"!=""
-COMPILER_WARN_ERRORS=TRUE
-.ENDIF
-
-#.IF "$(COMMON_BUILD)"!=""
-#common_build*=$(COMMON_BUILD)
-#.ENDIF
-common_build:=
-COMMON_BUILD:=
-
-.IF "$(USE_SHL_VERSIONS)"!=""
-use_shl_versions*=$(USE_SHL_VERSIONS)
-.ENDIF
-
-.IF "$(noremove)"!=""
-NOREMOVE*=$(noremove)
-.ENDIF
-
-# --- env flags not case sensitive --------------------------------
-
-#.IF "$(envcflags)"!=""
-ENVCFLAGS*=$(envcflags)
-#.ENDIF
-
-#.IF "$(envcflagscxx)"!=""
-ENVCFLAGSCXX*=$(envcflagscxx)
-#.ENDIF
-
-
-.IF "$(envcdefs)"!=""
-ENVCDEFS*=$(envcdefs)
-.ENDIF
-
-.IF "$(envlibflags)"!=""
-ENVLIBFLAGS*=$(envlibflags)
-.ENDIF
-
-.IF "$(envcflagsincxx)"!=""
-ENVCFLAGSINCXX*=$(envcflagsincxx)
-.ENDIF
-
-.IF "$(envlinkflags)"!=""
-ENVLINKFLAGS*=$(envlinkflags)
-.ENDIF
-
-.IF "$(envrscflags)"!=""
-ENVRSCFLAGS*=$(envrscflags)
-.ENDIF
-
-.IF "$(envrscdefs)"!=""
-ENVRSCDEFS*=$(envrscdefs)
-.ENDIF
-
-.IF "$(envrsclinkflags)"!=""
-# ENVRSCLINKFLAGS*=$(envrsclinkflags)
-.ENDIF
-
-.IF "$(envrcflags)"!=""
-ENVRCFLAGS*=$(envrcflags)
-.ENDIF
-
-.IF "$(envrclinkflags)"!=""
-ENVRCLINKFLAGS*=$(envrclinkflags)
-.ENDIF
-
-# --- set both L10N variables to keep things working ---------------
-
-L10N-framework=$(L10N_framework)
-
-# --- Parameter Einstellungen ueberpruefen und umsetzen ------------
-
-# profile immer mit product
-.IF "$(profile)"!=""
-.IF "$(product)"==""
-product=full
-.ENDIF
-.ENDIF
-
-.IF "$(debug)"!=""
-DBG_LEVEL*=1
-.ENDIF
-
-# Produkt auf einen Wert setzen (alles klein)
-.IF "$(product)" != ""
-optimize=true
-.IF "$(product)" == "full" || "$(product)" == "Full" || "$(product)" == "FULL"
-product!=full
-.ENDIF
-.IF "$(product)" == "demo" || "$(product)" == "Demo" || "$(product)" == "DEMO"
-product!=demo
-.ENDIF
-.IF "$(product)" == "compact" || "$(product)" == "Compact" || "$(product)" == "COMPACT"
-product!=compact
-.ENDIF
-DBG_LEVEL*=0
-.ELSE
-optimize!=true
-dbgutil!=true
-DBG_LEVEL*=1
-USE_DEBUG_RUNTIME*=TRUE
-.ENDIF
-
-.IF "$(debug)"!=""
-.IF "$(debug)"!="D_FORCE_OPT"
-optimize=
-OPTIMIZE=
-.ENDIF
-.ENDIF
-
-.IF "$(nopt)"!=""
-optimize=
-OPTIMIZE=
-.ENDIF
-
-# Optimierung bei FinalCheck funktioniert nicht!
-.IF "$(bndchk)" != ""
-optimize=
-OPTIMIZE=
-.ENDIF
-
-######################################################
-#
-# sprachabh. einstellungen
-#
-######################################################
-
-.INCLUDE : lang.mk
-
-.INCLUDE : postset.mk
-
-RSC_LANG_ISO+:=$(completelangiso)
-.EXPORT : RSC_LANG_ISO
-
-######################################################
-
-.IF "$(TARGETTYPE)"==""
-TARGETTYPE=CUI
-.ENDIF
-
-# --- Pfade setzen -------------------------------------------------
-
-# Output-Pfad
-# profile has to be first for not getting the .pro extension
-.IF "$(profile)"!=""
-OUT=$(PRJ)/$(OUTPATH).cap
-OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).cap
-ROUT=$(OUTPATH).cap
-.ELSE
-
-.IF "$(product)"!=""
-OUT=$(PRJ)/$(OUTPATH).pro
-OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).pro
-ROUT=$(OUTPATH).pro
-
-.ELSE
-.IF "$(profile)"!=""
-OUT=$(PRJ)/$(OUTPATH).cap
-OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).cap
-ROUT=$(OUTPATH).cap
-.ENDIF
-.IF "$(dbcs)"!=""
-OUT=$(PRJ)/$(OUTPATH).w
-OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).w
-ROUT=$(OUTPATH).w
-.ENDIF
-# could already be set by makefile.mk
-.IF "$(OUT)" == ""
-OUT*=$(PRJ)/$(OUTPATH)
-OUT_FOR_BUILD*=$(PRJ)/$(OUTPATH_FOR_BUILD)
-ROUT*=$(OUTPATH)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(bndchk)" != ""
-OUT:=$(PRJ)/$(OUTPATH).bnd
-OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).bnd
-ROUT=$(OUTPATH).bnd
-.ENDIF
-.IF "$(truetime)" != ""
-OUT=$(PRJ)/$(OUTPATH).tt
-OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).tt
-ROUT=$(OUTPATH).tt
-.ENDIF
-
-.IF "$(PRJ)"!="."
-.IF "$(GUI)"=="WNT"
-PATH_IN_MODULE:=\
-    $(subst,$(normpath $(shell @+cd $(PRJ) && pwd $(PWDFLAGS)))/, $(PWD))
-.ELSE			# "$(GUI)"=="WNT"
-PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) && pwd $(PWDFLAGS))/, $(PWD))
-.ENDIF			# "$(GUI)"=="WNT"
-.ELSE			# "$(PRJ)"!="."
-PATH_IN_MODULE:=
-.ENDIF			# "$(PRJ)"!="."
-
-## common output tree
-#.IF "$(common_build)"!=""
-#COMMON_OUTDIR*=common
-#.IF "$(no_common_build_reslib)"==""
-#common_build_reslib=true
-#.ENDIF			# "$(no_common_build_reslib)"==""
-#.IF "$(no_common_build_zip)"==""
-#common_build_zip=true
-#.ENDIF			# "$(no_common_build_zip)"==""
-#.IF "$(no_common_build_sign_jar)"==""
-#common_build_sign_jar=true
-#.ENDIF			# "$(no_common_build_sign_jar)"==""
-#.IF "$(no_common_build_srs)"==""
-#common_build_srs=true
-#.ENDIF			# "$(no_common_build_srs)"==""
-#.ELSE			# "$(common_build)"!=""
-COMMON_OUTDIR:=$(OUTPATH)
-#.ENDIF			# "$(common_build)"!=""
-
-LOCAL_OUT:=$(OUT)
-LOCAL_OUT_FOR_BUILD:=$(OUT_FOR_BUILD)
-LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))
-.EXPORT : LOCAL_OUT LOCAL_COMMON_OUT
-
-# --- generate output tree -----------------------------------------
-
-# disable for makefiles wrapping a gnumake module
-.IF "$(TARGET)"!="prj"
-# As this is not part of the initial startup makefile we define an infered
-# target instead of using $(OUT)/inc/myworld.mk as target name.
-# (See iz62795)
-$(posix_PWD)/$(OUT)/inc/%world.mk :
-    @$(MKOUT) $(ROUT)
-    @echo $(EMQ)# > $@
-
-.INCLUDE :  $(posix_PWD)/$(OUT)/inc/myworld.mk
-
-.IF "$(common_build)"!=""
-$(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/%world.mk :
-    @$(MKOUT) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT))
-    @echo $(EMQ)# > $@
-
-.INCLUDE : $(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/myworld.mk
-.ENDIF			# "$(common_build)"!=""
-.ENDIF          # "$(TARGET)"!="prj"
-
-.INCLUDE .IGNORE : office.mk
-
-# Misc-Pfad
-.IF "$(UNR)"!=""
-MISCX=$(OUT)/umisc
-MISC=$(OUT)/umisc
-.ELSE
-MISC=$(OUT)/misc
-MISC_FOR_BUILD=$(OUT_FOR_BUILD)/misc
-# pointing to misc in common output tree if exists
-COMMONMISC={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))}
-.ENDIF
-
-OUTCXX=$(OUT)/cxx
-
-.IF "$(PACKAGE)"!=""
-IDLPACKAGE:=$(PACKAGE)
-IDLPACKAGENAME:=$(IDLPACKAGE:sX\X/X)
-.ELSE
-IDLPACKAGE=$(PRJNAME)
-IDLPACKAGENAME=$(PRJNAME)
-.ENDIF
-
-# Objekt-Pfad
-OBJ=$(OUT)/obj
-SLO=$(OUT)/slo
-ROBJ=$(ROUT)/obj
-RSLO=$(ROUT)/slo
-
-# Particle Path
-PAR=$(OUT)/par
-
-# Library-Pfad
-LB=$(OUT)/lib
-SLB=$(OUT)/slb
-
-# wir haben ein ucr verzeichnis
-UCR=$(OUT)/ucr
-
-# $(L) nur noch pfad ins solver\upd\...\lib
-#L:={$(LB);$(SLB);$(ILIB)}
-L=$(SOLARLIBDIR)
-
-#.EXPORT : SLB LB L LIB
-ENVPRJ:=$(PRJ)
-#todo: check PRJ is still expected to exist in environment
-.EXPORT : PRJ ENVPRJ
-
-# Class-Path for java-classes
-# obwohl der generierte Bytecode plattformunabhg. sein sollte
-# generieren wir ihn ersteinmal ins abhaengige Verzeichnis
-CLASSDIR=$(OUT)/class
-CLASSPATH!:=.$(PATH_SEPERATOR)$(CLASSDIR)$(PATH_SEPERATOR)$(CLASSPATH)
-STARJAR=java -classpath $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARENV)/bin/jtools.jar com.sun.star.tool.starjar.StarJar
-
-STARDEP=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javadep
-.IF "$(PRJNAME)"=="sj2"
-CLASSPATH!:=$(CLASSPATH:s/sj2/no/)
-.ENDIF
-.IF "$(PRJNAME)"=="uno"
-CLASSPATH!:=$(CLASSPATH:s/uno/no/)
-.ENDIF
-.IF "$(PRJNAME)"=="tkt"
-CLASSPATH!:=$(CLASSPATH:s/tkt/no/)
-.ENDIF
-
-# default output directory when processing
-# configuration files
-PROCESSOUT*:=$(MISC)
-
-# Makros fuer die Librarynamen des Solar
-.INCLUDE : libs.mk
-
-.IF "$(GUI)"=="WNT"
-VERSIONOBJ=$(SLO)/_version.obj
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-VERSIONOBJ=$(SLO)/_version.o
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-WINVERSIONNAMES=$(UNIXVERSIONNAMES)
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-SHELLLIB=-lgdi32 -lshell32 -ladvapi32 -lcomdlg32
-.ELSE
-SHELLLIB=gdi32.lib shell32.lib advapi32.lib comdlg32.lib
-.ENDIF
-.ENDIF
-
-# BIN-Pfad
-.IF "$(UNR)"!=""
-BIN=$(OUT)/ubin
-.ELSE
-BIN=$(OUT)/bin
-.ENDIF
-# pointing to misc in common output tree if exists
-COMMONBIN=$(LOCAL_COMMON_OUT)/bin
-
-# Include-Pfad
-# still without -I here s.a. target.mk INCLUDE
-INC=$(PRJ)/inc
-INCPCH=$(PRJ)/inc/pch
-INCLOCAL=../inc
-INCGUI=$(PRJ)/$(GUIBASE)/inc
-INCCOM=$(OUT)/inc
-INCCOMX=$(OUT)/inc
-INCUNOIDL=$(INCCOM)/$(PRJNAME)
-INCDEPN=. $(INCGUI) $(INCLOCAL) $(INC) $(INC)/$(PRJNAME)
-.IF "$(PRJINC)"!=""
-INCLOCPRJ=$(foreach,i,$(PRJINC) $i/inc)
-INCDEPN+=$(INCLOCPRJ)
-.ENDIF
-.IF "$(INCPRE)"!=""
-INCDEPN+=$(INCPRE)
-.ENDIF
-
-# Resource-Pfad fuer .SRS
-
-.IF "$(common_build_srs)"!=""
-SRS=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))/srs
-SRSX=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))/srs
-.ELSE          # "$(common_build_srs)"!=""
-SRS=$(OUT)/srs
-SRSX=$(OUT)/srs
-.ENDIF          # "$(common_build_srs)"!=""
-
-# Resource-Pfad fuer .RC und .RES
-RES=$(OUT)/res
-
-# das normale MISC wird nicht an LDMISC angepasst, stattdessen MISCX
-
-.IF "$(make_xl)"!=""
-BIN=$(PRJ)/$(OUTPATH).xl/bin
-.ENDIF
-
-# damit gezielt Abhaengigkeiten auf s: angegeben werden koennen
-
-.IF "$(common_build)"!=""
-SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl
-.ELSE
-SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl
-.ENDIF
-
-SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res
-SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res
-SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib
-SOLARLIBDIR_FOR_BUILD=$(SOLARVERSION)/$(INPATH_FOR_BUILD)/lib
-SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java
-SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc
-SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc
-.IF "$(SOLARLANG)"!="deut"
-.IF "$(SOLARLANG)" != ""
-SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc/$(SOLARLANG)
-SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res/$(SOLARLANG)
-.ENDIF
-.ENDIF
-SOLARBINDIR:=$(SOLARVERSION)/$(INPATH_FOR_BUILD)/bin
-SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr
-SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par
-SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml
-SOLARDOCDIR=$(SOLARVERSION)/$(INPATH)/doc
-SOLARPCKDIR=$(SOLARVERSION)/$(INPATH)/pck
-SOLARSDFDIR=$(SOLARVERSION)/$(INPATH)/sdf
-SOLARCOMMONBINDIR=$(SOLARVERSION)/common$(PROEXT)/bin
-SOLARCOMMONRESDIR=$(SOLARVERSION)/common$(PROEXT)/res
-SOLARCOMMONPCKDIR=$(SOLARVERSION)/common$(PROEXT)/pck
-SOLARCOMMONSDFDIR=$(SOLARVERSION)/common$(PROEXT)/sdf
-.IF "$(common_build)"==""
-SOLARCOMMONBINDIR=$(SOLARBINDIR)
-SOLARCOMMONRESDIR=$(SOLARRESDIR)
-SOLARCOMMONPCKDIR=$(SOLARPCKDIR)
-SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
-.ENDIF
-
-.EXPORT : SOLARBINDIR
-
-.IF "$(WITH_LANG)"!=""
-.INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
-
-# if the l10n module exists, use split localize.sdf directly from there
-.IF "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"==""
-# still check for existence as there may be no localization yet
-TRYSDF:=$(L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
-LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI)))
-.ENDIF			# "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"==""
-# else use localize.sdf from local output tree if localization .zip exists
-.IF  "$(LOCALIZESDF)"==""
-LOCALSDFFILE:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
-LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(THEN) echo $(LOCALSDFFILE) $(FI)))
-.IF  "$(LOCALIZESDF)"==""
-LOCALSDFFILE!:=
-.ENDIF			# "$(LOCALIZESDF)"==""
-.ENDIF			# "$(LOCALIZESDF)"==""
-# dummy target to keep the build happy.
-.IF  "$(LOCALIZESDF)"==""
-LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/dummy$/localize.sdf
-.ENDIF			# "$(LOCALIZESDF)"==""
-.ENDIF			# "$(WITH_LANG)"!=""
-
-JARDIR=$(OUT)/class
-
-# needs to be expanded!!!
-
-# extend library path for MS Compiler
-.IF "$(COM)"=="MSC"
-LIB:=$(LB);$(SLB);$(ILIB)
-.ENDIF
-
-# extend library path for MinGW Compiler
-.IF "$(GUI)$(COM)"=="WNTGCC"
-LIB:=$(LB);$(BIN);$(ILIB)
-.ENDIF
-
-# --- Environment-Allgemein ----------------------------------------
-
-.IF "$(CPUNAME)" == ""
-CPUNAME=CPUNAME_HAS_TO_BE_SET_IN_ENVIRONMENT
-.ENDIF
-
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-SCPCDEFS+=-D_DEBUG_RUNTIME
-.ENDIF
-
-.IF "$(UDK_MAJOR)"!=""
-SCPDEFS+=-DUDK_MAJOR=$(UDK_MAJOR)
-.ENDIF			# "$(UDK_MAJOR)"!=""
-
-SCPDEFS+=-U$(COMID) -DCOMID=$(COMID) -DCOMNAME=$(COMNAME) -D_$(COMID)
-SCPDEFS+=-DCCNUMVER=$(CCNUMVER)
-.IF "$(COM)"=="GCC"
-SCPDEFS+=-DSHORTSTDCPP3=$(SHORTSTDCPP3) -DSHORTSTDC3=$(SHORTSTDC3)
-.ENDIF			# "$(SHORTSTDCPP3)"!=""
-
-
-UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD)
-
-UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER)
-
-UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
-
-CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CPUNAME)
-
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-CDEFS+=-D_DEBUG_RUNTIME
-.ENDIF
-
-.IF "$(CDEFS_PRESET)" != ""
-CDEFS+=$(CDEFS_PRESET)
-.ENDIF
-
-.IF "$(TIMELOG)" != ""
-CDEFS+=-DTIMELOG
-.ENDIF
-
-CDEFSCXX=
-CDEFSOBJ=
-.IF "$(OS)"=="IOS"
-CDEFSSLO=
-.ELSE
-CDEFSSLO=-DSHAREDLIB -D_DLL_
-.ENDIF
-CDEFSGUI=-DGUI
-CDEFSCUI=-DCUI
-#CDEFSMT=-DMULTITHREAD
-CDEFSPROF=-DPROFILE
-.IF "$(dbg_build_only)" == ""
-CDEFSDEBUG=-DDEBUG
-.ENDIF
-CDEFSDBGUTIL=-DDBG_UTIL
-CDEFSOPT=-DOPTIMIZE
-
-MKDEPFLAGS+=-I$(INCDEPN:s/ / -I/:s/-I-I/-I/)
-MKDEPALLINC=$(SOLARINC:s/-I/ -I/)
-MKDEPPREINC=-I$(PREPATH)/$(INPATH)/inc
-MKDEPSOLENV=-I$(SOLARENV)/inc -I$(SOLARENV)/$(GUI)$(COMEX)/inc
-MKDEPSOLVER=-I$(SOLARVERSION)/$(INPATH)/inc
-MKDEPLOCAL=-I$(INCCOM)
-
-.IF "$(MKDEPENDALL)"!=""
-MKDEPFLAGS+=$(MKDEPALLINC)
-.ENDIF
-
-.IF "$(MKDEPENDSOLENV)"!=""
-MKDEPFLAGS+=$(MKDEPSOLENV)
-.ENDIF
-
-.IF "$(MKDEPENDPREPATH)"!=""
-MKDEPFLAGS+=$(MKDEPPREINC)
-.ENDIF
-
-.IF "$(MKDEPENDSOLVER)"!=""
-MKDEPFLAGS+=$(MKDEPSOLVER)
-.ENDIF
-# unused - nodep should do the same now
-#.IF "$(MKDEPENDLOCAL)"!="NO"
-MKDEPFLAGS+=$(MKDEPLOCAL)
-#.ENDIF
-
-BISON*=bison
-YACCFLAGS*=-d 
-
-SVIDL=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/svidl
-
-LDUMP2*=$(SOLARBINDIR)/ldump4
-
-ZIPUPDATE=-u -j
-ZIPFLAGS=$(ZIPUPDATE)
-#hack for dynamic language subdirs
-LANGDIR=LANGDIR
-
-#scplinker flags
-SCPLINKFLAGS=-i $(PAR),$(SOLARPARDIR)
-.IF "$(SCPLINKVERSION)"!=""
-SCPLINKFLAGS+=-v $(SCPLINKVERSION)
-.ENDIF			# "$(SCPLINKVERSION)"!=""
-
-.IF "$(make_srs_deps)"!=""
-RSC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rscdep
-.ELSE # "$(make_srs_deps)"!=""
-RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
-.ENDIF # "$(make_srs_deps)"!=""
-
-.IF "$(VERBOSE)" == "TRUE"
-    VERBOSITY=-verbose
-.ELSE
-    COMMAND_ECHO=@
-    VERBOSITY=-quiet
-    ZIP_VERBOSITY=-q
-.ENDIF # "$(VERBOSE)" == "TRUE"
-COMPILE_ECHO_SWITCH=
-COMPILE_ECHO_FILE=$(<:f)
-
-#new
-RSCUPDVER=$(RSCREVISION)
-RSCUPDVERDEF=-DUPDVER="$(RSCUPDVER)"
-
-RSCFLAGS=-s
-RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) $(JAVADEF)
-
-.IF "$(BUILD_SPECIAL)"!=""
-RSCDEFS+=-DBUILD_SPECIAL=$(BUILD_SPECIAL)
-.ENDIF
-
-RSCDEFIMG*=default_images
-
-RSCEXTINC=.
-
-.IF "$(DEBUG)" != ""
-RSCDEFS+= -DDEBUG
-.ENDIF
-
-# settings for mozilla idl compiler
-XPIDL=xpidl
-XPIDL_LINK=xpt_link
-
-# alle bisher verwendeten Linker benutzen + um LIBs auf der naechsten Zeile
-# weiter zu schreiben, wenn es da eine Ausnahme geben sollte, muss
-# LINKEXTENDLINE compilerabhaengig definiert werden
-LINKEXTENDLINE=+
-
-LNT=$(DEVROOT)/lint/lint
-#LNTFLAGS=+v -i$(DEVROOT)/lint\ -mL options.lnt -u
-LNTFLAGS=+v -i$(DEVROOT)/lint/ -mL options.lnt -u
-LNTFLAGSOUTOBJ=-os
-
-.IF "$(GUI)"=="WNT"
-.INCLUDE : wnt.mk
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-.INCLUDE : unx.mk
-.ENDIF
-
-DLLPOSTFIX=lo
-
-.IF "$(CROSS_COMPILING)" == "YES"
-# Assume always cross-compiling from Unix
-EXECPOST_FOR_BUILD=
-.ELSE
-EXECPOST_FOR_BUILD=$(EXECPOST)
-.ENDIF
-
-.IF "$(OOO_LIBRARY_PATH_VAR)" != ""
-# Add SOLARLIBDIR at the begin of a (potentially previously undefined) library
-# path (LD_LIBRARY_PATH, PATH, etc.; prepending avoids fetching libraries from
-# an existing office/URE installation; the ": &&" enables this to work at the
-# start of a recipe line that is not prefixed by "+" as well as in the middle of
-# an existing && chain:
-.IF "$(CROSS_COMPILING)"=="YES" && "$(OS)"=="WNT"
-# Sigh, special-case cross-compiling to Windows. Here OOO_LIBRARY_PATH_VAR is the correct one
-# for the BUILD platform but SOLARSHAREDBIN is the one for Windows, i.e. "foo/bin".
-AUGMENT_LIBRARY_PATH = : && \
-    $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(SOLARLIBDIR_FOR_BUILD))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
-AUGMENT_LIBRARY_PATH_LOCAL = : && \
-    $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
-.ELSE
-AUGMENT_LIBRARY_PATH = : && \
-    $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
-AUGMENT_LIBRARY_PATH_LOCAL = : && \
-    $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
-.ENDIF
-.END
-
-# for multiprocess building in external modules
-# allow seperate handling
-EXTMAXPROCESS*=$(MAXPROCESS)
-
-GDBTRACE=gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace --args
-
-#use with export VALGRIND=memcheck, that method of invocation is used because
-#hunspell will aslo run its own unit tests under valgrind when this variable is
-#set.
-.IF "$(VALGRIND)" != ""
-VALGRINDTOOL=valgrind --tool=$(VALGRIND) --num-callers=50
-.IF "$(VALGRIND)" == "memcheck"
-VALGRINDTOOL+=--leak-check=yes
-G_SLICE*:=always-malloc
-.EXPORT : G_SLICE
-GLIBCXX_FORCE_NEW*:=1
-.EXPORT : GLIBCXX_FORCE_NEW
-.ENDIF
-.ENDIF
-
-IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/idlc
-REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(VALGRINDTOOL) $(SOLARBINDIR)/regmerge
-REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(VALGRINDTOOL) $(SOLARBINDIR)/regcompare
-
-.IF "$(DEBUGREGCOMP)" != "" || "$(debugregcomp)" != ""
-GDBREGCOMPTRACE=$(GDBTRACE)
-.ENDIF
-
-REGCOMP*=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBREGCOMPTRACE) $(SOLARBINDIR)/regcomp
-CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cppumaker
-JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker
-RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker
-CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
-
-.IF "$(DEBUGCPPUNIT)" != "" || "$(debugcppunit)" != ""
-GDBCPPUNITTRACE=$(GDBTRACE)
-.ENDIF
-
-.IF "$(CROSS_COMPILING)" == "YES"
-CPPUNITTESTER=\#
-.ELSE
-CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(SOLARBINDIR)/cppunit/cppunittester
-.ENDIF
-HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex
-LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex
-HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker
-
-.IF "$(JAVAINTERPRETER)" == ""
-JAVA*:=java
-.ELSE
-JAVA*:=$(JAVAINTERPRETER)
-.ENDIF
-.EXPORT : JAVA JAVAI
-
-# Define SCPCOMP without wrapper because pre2par.pl chokes on DOS style
-# pathes. (See iz57443)
-SCPCOMP=$(PERL) $(SOLARENV)/bin/pre2par.pl
-SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl
-LZIP*=lzip
-
-# Note that $(CPPLCC) is oddly enough only used when $(OS)==WNT, see pstrules.mk.
-# For the BUILD platform when cross-compiling (always Unix), it is called cpp.lcc
-.IF "$(CROSS_COMPILING)" == "YES"
-CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc
-.ELSE
-CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
-.ENDIF
-
-.IF "$(DISABLE_ENHANCED_COMID)"==""
-.INCLUDE : tg_compv.mk
-.ELSE          # "$(DISABLE_ENHANCED_COMID)"==""
-COMID=$(COM)
-.ENDIF          # "$(DISABLE_ENHANCED_COMID)"==""
-.IF "$(SOLAR_JAVA)"=="TRUE"
-.IF "$(USE_JAVAVER)"!=""
-.INCLUDE : tg_javav.mk
-.ENDIF "$(USE_JAVAVER)"!=""
-.ENDIF			# "$(SOLAR_JAVA)"=="TRUE"
-
-.IF "$(COM)"=="GCC"
-GXX_INCLUDE_PATH*:=$(COMPATH)/include/c++/$(CCVER)
-.EXPORT : GXX_INCLUDE_PATH
-CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
-.ENDIF
-
-# --- extend new environment ----------------------------------
-CDEFS+= -DSUPD=$(UPD)
-
-# flags to enable build with symbols; required for crashdump feature
-.IF ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || "$(ENABLE_SYMBOLS)"!=""
-# if debug is enabled, this may enable less debug info than debug, so rely just on debug
-.IF "$(debug)" == ""
-CFLAGSENABLESYMBOLS_CC_ONLY*=$(CFLAGSENABLESYMBOLS)
-CFLAGSCXX+=$(CFLAGSENABLESYMBOLS)
-CFLAGSCC+=$(CFLAGSENABLESYMBOLS_CC_ONLY)
-.ENDIF          # "$(DEBUG)" == ""
-.ENDIF          # ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || "$(ENABLE_SYMBOLS)"!=""
-
-.IF "$(profile)"!=""
-CDEFS+= $(CDEFSPROF)
-CFLAGS+= $(CFLAGSPROF)
-.IF "$(WST)"!=""
-LINKFLAGS=$(LINKFLAGSWST)
-LINKCFLAGS=$(LINKFLAGSWST)
-.ELSE
-LINKFLAGSADD+=$(LINKFLAGSPROF)
-.ENDIF
-.ENDIF
-
-.IF "$(debug)"!=""
-JAVAFLAGS+=$(JAVAFLAGSDEBUG)
-CDEFS+= $(CDEFSDEBUG)
-CFLAGS+= $(CFLAGSDEBUG)
-LINKFLAGSADD+= $(LINKFLAGSDEBUG)
-.ENDIF
-
-.IF "$(dbgutil)"!=""
-CDEFS+=$(CDEFSDBGUTIL)
-CFLAGS+=$(CFLAGSDBGUTIL)
-RSCDEFS+=-DDBG_UTIL
-.ENDIF
-
-.IF "$(product)"!=""
-CDEFS+= -DPRODUCT -DNDEBUG
-RSCDEFS+= -DPRODUCT 
-RSCDEFS+= -DNDEBUG
-.ENDIF
-
-.IF "$(DBG_LEVEL)"!=""
-CDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
-RSCDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
-.ENDIF
-
-.IF "$(optimize)"!=""
-CDEFS+=$(CDEFSOPT)
-CFLAGS+=$(CFLAGSOPT)
-LINKFLAGSADD+=$(LINKFLAGSOPT)
-.ELSE
-CFLAGS+=$(CFLAGSNOOPT)
-.ENDIF
-
-.IF "$(ENABLE_EXCEPTIONS)"!=""
-GLOBAL_EXCEPTIONS_FLAGS+=$(CFLAGSEXCEPTIONS)
-GLOBAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_ON
-.ELSE
-GLOBAL_EXCEPTIONS_FLAGS+=$(CFLAGS_NO_EXCEPTIONS)
-GLOBAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_OFF
-.ENDIF
-# used if an object appears in the EXCEPTIONSFILES list
-# see also rules.mk
-LOCAL_EXCEPTIONS_FLAGS+=$(CFLAGSEXCEPTIONS)
-LOCAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_ON
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-CDEFS+=-DENABLE_LAYOUT=1
-.ELSE # ENABLE_LAYOUT != TRUE
-CFLAGS+=-DENABLE_LAYOUT=0
-.ENDIF # ENABLE_LAYOUT != TRUE
-
-.IF "$(ENABLE_LAYOUT_EXPERIMENTAL)" == "TRUE"
-CDEFS+=-DENABLE_LAYOUT_EXPERIMENTAL=1
-.ELSE # ENABLE_LAYOUT_EXPERIMENTAL != TRUE
-CFLAGS+=-DENABLE_LAYOUT_EXPERIMENTAL=0
-.ENDIF # ENABLE_LAYOUT_EXPERIMENTAL != TRUE
-
-.IF "$(ENABLE_GSTREAMER)" == "TRUE"
-CDEFS+=-DGSTREAMER
-.ENDIF
-
-# compose flags and defines for GUI
-.IF "$(TARGETTYPE)"=="GUI"
-CDEFS+= $(CDEFSGUI)
-CFLAGSSLO+=$(CFLAGSSLOGUIMT)
-CDEFSSLO+=$(CDEFSSLOMT)
-LINKFLAGSAPP=$(LINKFLAGSAPPGUI)
-LINKFLAGSSHL=$(LINKFLAGSSHLGUI)
-STDOBJ=$(STDOBJGUI)
-STDSLO=$(STDSLOGUI)
-
-CDEFSOBJ+= $(CDEFSMT) $(CDEFSOBJMT)
-CFLAGSOBJ+=$(CFLAGSOBJGUIMT)
-STDLIB=$(STDLIBGUIMT)
-STDSHL=$(STDSHLGUIMT)
-
-.ENDIF
-
-# compose flags and defines for CUI
-.IF "$(TARGETTYPE)" == "CUI" || "$(TARGETTYPE)"=="cui"
-CDEFS+= $(CDEFSCUI)
-CFLAGSSLO+=$(CFLAGSSLOCUIMT)
-CDEFSSLO+=$(CDEFSSLOMT)
-LINKFLAGSAPP=$(LINKFLAGSAPPCUI)
-LINKFLAGSSHL=$(LINKFLAGSSHLCUI)
-STDOBJ=$(STDOBJCUI)
-STDSLO=$(STDSLOCUI)
-
-CDEFSOBJ+=$(CDEFSMT) $(CDEFSOBJMT)
-CFLAGSOBJ+=$(CFLAGSOBJCUIMT)
-STDLIB=$(STDLIBCUIMT)
-STDSHL=$(STDSHLCUIMT)
-
-.ENDIF
-
-.EXPORT : PICSWITCH
-
-# fill up unresolved symbols not found else where
-.IF "$(FILLUPARC)"!=""
-STDLIB+=$(FILLUPARC)
-STDSHL+=$(FILLUPARC)
-.ENDIF			# "$(FILUPARC)"!=""
-
-.IF "$(SOLAR_JAVA)"!=""
-CDEFS+=$(JAVADEF)
-.ENDIF          # "$(SOLAR_JAVA)"!=""
-
-.INCLUDE .IGNORE: $(UPD)$(LAST_MINOR).mk
-
-# Once all modules on a given platform compile without warnings, the specific
-# .mk file for that platform should set COMPILER_WARN_ERRORS=TRUE and no longer
-# set MODULES_WITH_WARNINGS, and once no platform sets MODULES_WITH_WARNINGS any
-# longer, this code can go away:
-.IF "$(MODULES_WITH_WARNINGS)" == ""
-COMPILER_WARN_ERRORS=TRUE
-.ELSE
-MODULES_WITH_WARNINGS_1 := $(foreach,i,$(MODULES_WITH_WARNINGS) .$(i).)
-MODULES_WITH_WARNINGS_2 := $(subst,.$(PRJNAME)., $(MODULES_WITH_WARNINGS_1))
-.IF "$(MODULES_WITH_WARNINGS_1)" == "$(MODULES_WITH_WARNINGS_2)"
-COMPILER_WARN_ERRORS=TRUE
-.ENDIF
-.ENDIF
-
-CFLAGSWARNCXX *= $(CFLAGSWARNCC)
-CFLAGSWALLCXX *= $(CFLAGSWALLCC)
-CFLAGSWERRCXX *= $(CFLAGSWERRCC)
-
-.IF "$(ENVWARNFLAGS)"==""
-.IF "$(COMPILER_WARN_ALL)"==""
-CFLAGSCC+=$(CFLAGSWARNCC)
-CFLAGSCXX+=$(CFLAGSWARNCXX)
-.ELSE
-CFLAGSCC+=$(CFLAGSWALLCC)
-CFLAGSCXX+=$(CFLAGSWALLCXX)
-.ENDIF
-.IF "$(COMPILER_WARN_ERRORS)"!="" && "$(EXTERNAL_WARNINGS_NOT_ERRORS)"==""
-CFLAGSCC+=$(CFLAGSWERRCC)
-CFLAGSCXX+=$(CFLAGSWERRCXX)
-.ENDIF
-.ELSE			# "$(ENVWARNFLAGS)"==""
-CFLAGSAPPEND+=$(ENVWARNFLAGS)
-.ENDIF			# "$(ENVWARNFLAGS)"==""
-
-CDEFS+= $(ADDCDEFS)
-CDEFS+= $(ENVCDEFS)
-CFLAGS+= $(CFLAGSCALL) $(ENVCFLAGS)
-CFLAGSCXX+= $(ENVCFLAGSCXX)
-# andersrum wg. -TPxxxx
-CFLAGSINCXX+:=$(ENVCFLAGSINCXX)
-LIBFLAGS+= $(ENVLIBFLAGS)
-LINKFLAGSADD+= $(ENVLINKFLAGS)
-RSCFLAGS+= $(ENVRSCFLAGS)
-RSCDEFS+= $(ENVRSCDEFS)
-# RSCLINKFLAGS+= $(ENVRSCLINKFLAGS)
-RCFLAGS+= $(ENVRCFLAGS)
-RCLINKFLAGS+= $(ENVRCLINKFLAGS)
-
-LINKFLAGSRUNPATH_URELIB*=
-LINKFLAGSRUNPATH_UREBIN*=
-LINKFLAGSRUNPATH_OOO*=
-LINKFLAGSRUNPATH_SDK*=
-LINKFLAGSRUNPATH_BRAND*=
-LINKFLAGSRUNPATH_OXT*=
-LINKFLAGSRUNPATH_BOXT*=
-LINKFLAGSRUNPATH_NONE*=
-
-# make sure both linker variables are set
-LINKC*=$(LINK)
-LINKCFLAGS*=$(LINKFLAGS)
-LINKFLAGS+=$(LINKFLAGSADD)
-LINKCFLAGS+=$(LINKFLAGSADD)
-
-#defaults for UCR HEADER
-UNOUCRBASE*=UCR
-UNOUCROUT*=$(OUT)/inc/$(TARGET)
-INCPRE+=-I$(UNOUCROUT)
-UNOUCRRDB*=$(SOLARBINDIR)/types.rdb
-
-# location of trustedinfo.manifest for Windows Vista
-.IF "$(COM)"=="MSC"
-TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)/inc
-.ENDIF # "$(COM)"=="MSC"
-
-# --- Compiler -----------------------------------------------------
-.INCLUDE : rules.mk
-
-# --- include typelists --------------------------------------------
-
-.IF "$(COMP1TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP1TYPELIST).mk
-$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP2TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP2TYPELIST).mk
-$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP3TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP3TYPELIST).mk
-$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP4TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP4TYPELIST).mk
-$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP5TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP5TYPELIST).mk
-$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP6TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP6TYPELIST).mk
-$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP7TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP7TYPELIST).mk
-$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP8TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP8TYPELIST).mk
-$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-.IF "$(COMP9TYPELIST)"!=""
-.INCLUDE .IGNORE : $(MISC)/$(COMP9TYPELIST).mk
-$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
-.ENDIF
-
-# some place to define these jars for SO environment
-XML_APIS_JAR*=$(SOLARBINDIR)/xml-apis.jar
-XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar
-
-.IF "$(SYSTEM_CPPUNIT)" != "YES"
-CPPUNIT_CFLAGS =
-.END
-
-COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/
-COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/
-.IF "$(OS)" == "WNT"
-COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$BRAND_BASE_DIR/program/
-.ELSE
-COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$OOO_BASE_DIR/program/
-.END
-COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$OOO_BASE_DIR/program/classes/
-COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule:
-COMPONENTPREFIX_INBUILD_NATIVE = \
-    vnd.sun.star.expand:$$OOO_INBUILD_SHAREDLIB_DIR/
-COMPONENTPREFIX_INBUILD_JAVA = vnd.sun.star.expand:$$OOO_INBUILD_JAR_DIR/
-COMPONENTPREFIX_EXTENSION = ./
-
-# workaround for strange dmake bug:
-# if the previous block was a rule or a target, "\#" isn't recognized
-# as an escaped "#". if it was an assignment, escaping works...
-some_unique_variable_name:=1
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
deleted file mode 100644
index 5896f2b55..000000000
--- a/solenv/inc/shlinfo.rc
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#define VER_FIRSTYEAR	2010
-
-#include <windows.h>
-#include "version.hrc"
-
-// -----------------------------------------------------------------------
-// 				version information
-// -----------------------------------------------------------------------
-
-VS_VERSION_INFO VERSIONINFO
-#ifndef SUBVERSION
-	FILEVERSION    VERSION, 0, VERVARIANT, VER_COUNT
-	PRODUCTVERSION VERSION, 0, VERVARIANT, VER_COUNT
-#else
-	FILEVERSION    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-	PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-#endif
-	FILEFLAGSMASK 0x3F
-	FILEFLAGS
-#if defined(DEBUG)
-	VS_FF_DEBUG |
-#endif
-#ifdef VER_PREL
-	VS_FF_PRERELEASE |
-#endif
-	0
-	FILEOS VOS_NT_WINDOWS32
-	FILETYPE VFT_APP
-	{
-		BLOCK "StringFileInfo"
-		{
-			BLOCK "040904E4"
-			{
-				// International StringTable
-                VALUE "CompanyName",		"The Document Foundation\0"
-				VALUE "FileVersion",		PPS(VER_LEVEL) "\0"
-				VALUE "OriginalFilename",	PPS(ORG_NAME) "\0"
-				VALUE "InternalName", 		PPS(INTERNAL_NAME) "\0"
-                VALUE "LegalCopyright", 	S_CRIGHT " The Document Foundation\0"
-				ADDITIONAL_VERINFO1
-				ADDITIONAL_VERINFO2
-				ADDITIONAL_VERINFO3
-			}
-		}
-
-		BLOCK "VarFileInfo"
-		{
-			VALUE "Translation", 0x0409, 1252
-		}
-	}
diff --git a/solenv/inc/startup/OS2/macros.mk b/solenv/inc/startup/OS2/macros.mk
deleted file mode 100644
index 2f1447e6e..000000000
--- a/solenv/inc/startup/OS2/macros.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Define additional OS/2 specific macros.
-#
-
-# Process release-specific refinements, if any.
-# YD .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/macros.mk
-
-# Directory entries are case incensitive
-.DIRCACHERESPCASE *:= no
-
-# tmp is already imported - use it!
-TMPDIR *= $(TMP)
-
-# Applicable suffix definitions
-A *:= .lib	# Libraries
-E *:= .exe	# Executables
-F *:= .for	# Fortran
-O *:= .obj	# Objects
-P *:= .pas	# Pascal
-S *:= .asm	# Assembler sources
-V *:= 		# RCS suffix
-
-.MKSARGS         *:= yes
-RM               *=  $(ROOTDIR)$/bin$/rm
-MV	            *=  $(ROOTDIR)$/bin$/mv
-DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
-__.DIVSEP-sh-yes !:= \\\
-__.DIVSEP-sh-no  !:= \\
-
-NAMEMAX		=	256
-
diff --git a/solenv/inc/startup/Readme b/solenv/inc/startup/Readme
deleted file mode 100644
index 63a023d10..000000000
--- a/solenv/inc/startup/Readme
+++ /dev/null
@@ -1,6 +0,0 @@
-
-here are some hints about our use of the startup directory.
-
-the .INCLUDEDIRS line in startup.mk gives you the oportunity of switching
-to your own set of central makefiles.
-
diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk
deleted file mode 100644
index da4f38e5e..000000000
--- a/solenv/inc/startup/startup.mk
+++ /dev/null
@@ -1,107 +0,0 @@
-# This is the root DMAKE startup file.
-#
-# Definitions common to all environments are given at the root.
-# Definitions parameterized at the root have their parameters specified
-# in sub-makefiles which are included based on the values of the three
-# make variables:
-#
-#	OS		- core operating system flavour
-#
-# See the file 'summary', found in this directory for a list of
-# environments supported by this release.
-
-# Disable warnings for macros given on the command line but redefined here.
-__.silent !:= $(.SILENT)	# Preserve user's .SILENT flag
-.SILENT   !:= yes
-.NOTABS	  !:= yes
-.ERROR :
-    @echo '---* $(MKFILENAME) *---'
-
-# Define the directory separator string.
-/ *=  $(DIRSEPSTR)
-
-.IMPORT .IGNORE : .EVERYTHING
-
-.IF "$(TNR)" == ""
-
-CALLMACROS:=$(MAKEMACROS)
-.EXPORT : CALLMACROS
-
-CALLTARGETS=$(MAKETARGETS)
-.ENDIF			# "$(TNR)" == ""
-
-.INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc $(SOLARENV)$/inc
-
-# Grab key definitions from the environment
-# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL SO3 ENVCFLAGS
-
-.IF "$(OS)" == "" || "$(OS)" == "Windows_NT"
-.ERROR : ; @echo Forced error: Environment variable OS has to be set for OOo build!
-OS_variable_needed
-.ENDIF
-
-# Customize macro definitions based on seting of OS.
-# This must come before the default macro definitions which follow.
-.IF "$(OS_FOR_BUILD)" == "WNT"
-.INCLUDE: $(INCFILENAME:d)wnt/macros.mk
-.END
-
-# ----------------- Default Control Macro definitions -----------------------
-# Select appropriate defaults for basic macros
-MAKE          *=  $(MAKECMD) $(MFLAGS)
-TMPDIR        *:= $/tmp
-DIVFILE       *=  $(TMPFILE)
-
-MAXLINELENGTH	= 65530
-
-# Recipe execution configuration
-SHELL := $(OOO_SHELL)
-SHELLFLAGS := -c
-SHELLMETAS := !"\#$$%&'()*;<=>?[\]`{{|}}~
-    # the colon (":") utility is typically only available as a shell built-in,
-    # so it should be included in SHELLMETAS; however, this would result in very
-    # many false positives on Windows where ":" is used in drive letter notation
-GROUPSHELL := $(SHELL)
-GROUPFLAGS :=
-GROUPSUFFIX :=
-
-# Intermediate target removal configuration
-RM            *:= rm
-RMFLAGS       *=  -f
-RMTARGET      *=  $<
-
-# Default recipe that is used to remove intermediate targets.
-.REMOVE :; #echo dummy remove #$(RM) $(RMFLAGS) $(RMTARGET)
-#.REMOVE :; echo $(RM) $(RMFLAGS) $(RMTARGET)
-
-# Directory caching configuration.
-.DIRCACHE         *:= yes
-.DIRCACHERESPCASE *:= yes
-
-# Define the special NULL Prerequisite
-NULLPRQ *:= __.NULLPRQ
-
-# Primary suffixes in common use
-E *:= # Executables
-
-# Other Compilers, Tools and their flags
-MV *:= mv     # File rename command
-
-
-# Finally, define the default construction strategy
-.ROOT .PHONY .NOSTATE .SEQUENTIAL :- .INIT .TARGETS .DONE;
-.INIT .DONE .PHONY: $(NULLPRQ);
-
-# Define the NULL Prerequisite as having no recipe.
-$(NULLPRQ) .PHONY :;
-
-# Reset warnings back to previous setting.
-.SILENT !:= $(__.silent)
-
-# Check for a Local project file, gets parsed before user makefile.
-.INCLUDE .IGNORE .NOINFER: "project.mk"
-
-.MAKEFILES :- makefile.mk MAKEFILE.MK $(CONFIG_PROJECT)$/makefile.rc $(SOLARENV)$/inc$/found_no.mk
-
-LANG=C
-.EXPORT : LANG
diff --git a/solenv/inc/startup/summary b/solenv/inc/startup/summary
deleted file mode 100644
index 4ae18860d..000000000
--- a/solenv/inc/startup/summary
+++ /dev/null
@@ -1,3 +0,0 @@
-The following is a summary of the supported dmake environments.  When you
-issue the build command 'dmake tag' where tag is the target environment it
-will build one of these by default.
diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk
deleted file mode 100644
index 391c1a914..000000000
--- a/solenv/inc/startup/wnt/macros.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Define additional Windows-specific settings.
-#
-
-# This is a no-op for native Windows dmake
-.WINPATH !:= yes
-
-# Directory cache configuration.
-.DIRCACHE  *:= no
-
-# Applicable suffix definitions
-E *:= .exe	# Executables
-
-# This is hopefully not used. Only in: dmake/msdos/spawn.c  
-#  .MKSARGS         *:= yes
-   DIVFILE          *=  $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
-   RM               *=  $/bin$/rm
-   MV	            *=  $/bin$/mv
-   __.DIVSEP-sh-yes *:= \\\
-   __.DIVSEP-sh-no  *:= \\
-   DIRSEPSTR :=/
-
-# Does not respect case of filenames.
-.DIRCACHERESPCASE := no
-NAMEMAX	=	256
diff --git a/solenv/inc/starview.hid b/solenv/inc/starview.hid
deleted file mode 100644
index 54474c566..000000000
--- a/solenv/inc/starview.hid
+++ /dev/null
@@ -1,304 +0,0 @@
-#include <stdio.h>
-
-#define leer 0
-
-#define application 1
-#define Application 1
-#define APPLICATION 1
-#define resource 2
-#define Resource 2
-#define RESOURCE 2
-#define string 3
-#define String 3
-#define STRING 3
-#define icon 4
-#define Icon 4
-#define ICON 4
-#define bitmap 5
-#define Bitmap 5
-#define BITMAP 5
-#define pointer 6
-#define Pointer 6
-#define POINTER 6
-#define brush 7
-#define Brush 7
-#define BRUSH 7
-#define color 8
-#define Color 8
-#define COLOR 8
-#define font 9
-#define Font 9
-#define FONT 9
-#define pen 10
-#define Pen 10
-#define PEN 10
-#define mapmode 11
-#define MapMode 11
-#define MAPMODE 11
-#define accel 12
-#define Accel 12
-#define ACCEL 12
-#define accelitem 13
-#define AccelItem 13
-#define ACCELITEM 13
-#define menu 14
-#define Menu 14
-#define MENU 14
-#define menuitem 15
-#define MenuItem 15
-#define MENUITEM 15
-#define outputdevice 16
-#define OutputDevice 16
-#define OUTPUTDEVICE 16
-#define keycode 17
-#define KeyCode 17
-#define KEYCODE 17
-#define time 18
-#define Time 18
-#define TIME 18
-#define date 19
-#define Date 19
-#define DATE 19
-#define international 20
-#define International 20
-#define INTERNATIONAL 20
-#define image 21
-#define Image 21
-#define IMAGE 21
-#define imagelist 22
-#define ImageList 22
-#define IMAGELIST 22
-#define messbox 23
-#define MessBox 23
-#define MESSBOX 23
-#define infobox 24
-#define InfoBox 24
-#define INFOBOX 24
-#define warningbox 25
-#define WarningBox 25
-#define WARNINGBOX 25
-#define errorbox 26
-#define ErrorBox 26
-#define ERRORBOX 26
-#define querybox 27
-#define QueryBox 27
-#define QUERYBOX 27
-#define window 28
-#define Window 28
-#define WINDOW 28
-#define syswindow 29
-#define SysWindow 29
-#define SYSWINDOW 29
-#define workwin 30
-#define WorkWin 30
-#define WORKWIN 30
-#define mdiwindow 31
-#define MdiWindow 31
-#define MDIWINDOW 31
-#define floatingwindow 32
-#define FloatingWindow 32
-#define FLOATINGWINDOW 32
-#define dialog 33
-#define Dialog 33
-#define DIALOG 33
-#define modelessdialog 34
-#define ModelessDialog 34
-#define MODELESSDIALOG 34
-#define modaldialog 35
-#define ModalDialog 35
-#define MODALDIALOG 35
-#define systemdialog 36
-#define SystemDialog 36
-#define SYSTEMDIALOG 36
-#define pathdialog 37
-#define PathDialog 37
-#define PATHDIALOG 37
-#define filedialog 38
-#define FileDialog 38
-#define FILEDIALOG 38
-#define printersetupdialog 39
-#define PrinterSetupDialog 39
-#define PRINTERSETUPDIALOG 39
-#define printdialog 40
-#define PrintDialog 40
-#define PRINTDIALOG 40
-#define colordialog 41
-#define ColorDialog 41
-#define COLORDIALOG 41
-#define fontdialog 42
-#define FontDialog 42
-#define FONTDIALOG 42
-#define control 43
-#define Control 43
-#define CONTROL 43
-#define button 44
-#define Button 44
-#define BUTTON 44
-#define pushbutton 45
-#define PushButton 45
-#define PUSHBUTTON 45
-#define okbutton 46
-#define OkButton 46
-#define OKButton 46
-#define OKBUTTON 46
-#define cancelbutton 47
-#define CancelButton 47
-#define CANCELBUTTON 47
-#define helpbutton 48
-#define HelpButton 48
-#define HELPBUTTON 48
-#define imagebutton 49
-#define ImageButton 49
-#define IMAGEBUTTON 49
-#define menubutton 50
-#define MenuButton 50
-#define MENUBUTTON 50
-#define morebutton 51
-#define MoreButton 51
-#define MOREBUTTON 51
-#define spinbutton 52
-#define SpinButton 52
-#define SPINBUTTON 52
-#define radiobutton 53
-#define RadioButton 53
-#define RADIOBUTTON 53
-#define checkbox 54
-#define CheckBox 54
-#define CHECKBOX 54
-#define tristatebox 55
-#define TriStateBox 55
-#define TRISTATEBOX 55
-#define edit 56
-#define Edit 56
-#define EDIT 56
-#define multilineedit 57
-#define MultiLineEdit 57
-#define MULTILINEEDIT 57
-#define combobox 58
-#define ComboBox 58
-#define COMBOBOX 58
-#define listbox 59
-#define ListBox 59
-#define LISTBOX 59
-#define multilistbox 60
-#define MultiListBox 60
-#define MULTILISTBOX 60
-#define text 61
-#define Text 61
-#define TEXT 61
-#define fixedline 62
-#define FixedLine 62
-#define FIXEDLINE 62
-#define fixedbitmap 63
-#define FixedBitmap 63
-#define FIXEDBITMAP 63
-#define fixedimage 64
-#define FixedImage 64
-#define FIXEDIMAGE 64
-#define fixedicon 65
-#define FixedIcon 65
-#define FIXEDICON 65
-#define groupBox 66
-#define GroupBox 66
-#define GROUPBOX 66
-#define scrollbar 67
-#define ScrollBar 67
-#define SCROLLBAR 67
-#define scrollbarbox 68
-#define ScrollBarBox 68
-#define SCROLLBARBOX 68
-#define splitter 69
-#define Splitter 69
-#define SPLITTER 69
-#define splitwindow 70
-#define SplitWindow 70
-#define SPLITWINDOW 70
-#define spinfield 71
-#define SpinField 71
-#define SPINFIELD 71
-#define patternfield 72
-#define PatternField 72
-#define PATTERNFIELD 72
-#define numericfield 73
-#define NumericField 73
-#define NUMERICFIELD 73
-#define metricfield 74
-#define MetricField 74
-#define METRICFIELD 74
-#define currencyfield 75
-#define CurrencyField 75
-#define CURRENCYFIELD 75
-#define datefield 76
-#define DateField 76
-#define DATEFIELD 76
-#define timefield 77
-#define TimeField 77
-#define TIMEFIELD 77
-#define patternbox 78
-#define PatternBox 78
-#define PATTERNBOX 78
-#define numericbox 79
-#define NumericBox 79
-#define NUMERICBOX 79
-#define metricbox 80
-#define MetricBox 80
-#define METRICBOX 80
-#define currencybox 81
-#define CurrencyBox 81
-#define CURRENCYBOX 81
-#define datebox 82
-#define DateBox 82
-#define DATEBOX 82
-#define timebox 83
-#define TimeBox 83
-#define TIMEBOX 83
-#define toolboxitem 84
-#define ToolBoxItem 84
-#define TOOLBOXITEM 84
-#define toolbox 85
-#define ToolBox 85
-#define TOOLBOX 85
-#define dockingwindow 86
-#define DockingWindow 86
-#define DOCKINGWINDOW 86
-#define statusbar 87
-#define StatusBar 87
-#define STATUSBAR 87
-#define tabpage 88
-#define TabPage 88
-#define TABPAGE 88
-#define tabcontrol 89
-#define TabControl 89
-#define TABCONTROL 89
-#define tabdialog 90
-#define TabDialog 90
-#define TABDIALOG 90
-#define tabcontrolitem 91
-#define TabControlItem 91
-#define TABCONTROLITEM 91
-#define treelistbox 92
-#define TreeListBox 92
-#define TREELISTBOX 92
-#define stringarray 93
-#define StringArray 93
-#define STRINGARRAY 93
-/* MH and OG */
-#define fixedtext	94
-#define FixedText	94
-#define FIXEDTEXT 94
-#define pageitem	95
-#define PageItem	95
-#define PAGEITEM 95
-#define accelerator	96
-#define Accelerator	96
-#define ACCELERATOR 96
-#define acceleratoritem	97
-#define AcceleratorItem	97
-#define ACCELERATORITEM 97
-
-#define SfxStyleFamilies 98
-#define SfxStyleFamilyItem 99
-#define SfxSlotInfo 100
-
-#define define 127
-
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
deleted file mode 100644
index 4ef0a232a..000000000
--- a/solenv/inc/target.mk
+++ /dev/null
@@ -1,2076 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-MKFILENAME:=TARGET.MK
-
-# ------------------------------------------------------------------
-# INCLUDE-Path
-# ------------------------------------------------------------------
-
-.IF "$(VISIBILITY_HIDDEN)" != ""
-.IF "$(COMNAME)" == "gcc3" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGS += -fvisibility=hidden
-.ELIF "$(COMNAME)" == "sunpro5" && "$(CCNUMVER)" >= "00050005"
-CFLAGS += -xldscope=hidden
-.ENDIF
-.ENDIF
-
-.IF "$(TARGET)"==""
-target_empty=warn_target_empty
-.ENDIF
-
-# all use solarinc
-# no standalone -I flags!!
-INCEXT*=.
-INCPRE*=.
-INCPOST*=.
-.IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
-UNOINCLUDES=$(SOLARINCDIR)/udkapi -I$(SOLARINCDIR)/offapi -I$(SOLARINCDIR)/oovbaapi
-.ENDIF			# "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
-SOLARINC+=$(JDKINCS)
-# make sure INCLUDE isn't set
-INCLUDE:=
-.EXPORT : INCLUDE
-.IF "$(PRJINC)"!=""
-INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
-.ELSE		# "$(PRJINC)"!=""
-INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
-.ENDIF		# "$(PRJINC)"!=""
-INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
-.EXPORT : LIB
-# --- Compiler -----------------------------------------------------
-
-.IF "$(RC_SUBDIRS)"!=""
-SUBDIRS:=$(RC_SUBDIRS)
-SUBDIRSDEPS=$(RC_SUBDIRSDEPS)
-.ENDIF
-
-.INCLUDE : pstrules.mk
-
-.IF "$(YACCTARGET)"!=""
-.INCLUDE : tg_yxx.mk
-.ENDIF			# "$(YACCTARGET)"!=""
-
-.IF "$(nodep)"==""
-
-.IF "$(L10N_framework)"==""
-.IF "$(DEPOBJFILES)"!=""
-DEPCOLLECT_SLO+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(SLO),ttt $i) $(NULL) $(subst,$(SLO)/,not_existing/s_ $(i:s/.obj/.dpcc/))))
-DEPCOLLECT_OBJ+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(OBJ),ttt $i) $(NULL) $(subst,$(OBJ)/,not_existing/o_ $(i:s/.obj/.dpcc/))))
-.ENDIF			# "$(DEPOBJFILES)"!=""
-# point to not existing directory as there is no creation intended anyway and
-# stat call looks faster
-DEPCOLLECT_SLO+:=$(subst,$(SLO)/,not_existing/s_ $(SLOFILES:s/.obj/.dpcc/))
-DEPCOLLECT_OBJ+:=$(subst,$(OBJ)/,not_existing/o_ $(OBJFILES:s/.obj/.dpcc/))
-.ENDIF			# "$(L10N_framework)"==""
-DEPFILESx+:=$(subst,$(PAR),$(MISC) $(ALLPARFILES:s/.par/.dpsc/))
-.IF "$(L10N_framework)"==""
-.IF "$(RCFILES)"!=""
-.IF "$(RESNAME)"!=""
-DEPFILESx+:=$(MISC)/$(RESNAME).dpcc
-.ELSE			# "$(RESNAME)"!=""
-DEPFILESx+:=$(MISC)/$(TARGET).dprc
-.ENDIF			# "$(RESNAME)"!=""
-.ENDIF			# "$(RCFILES)"!=""
-.ENDIF          # "$(L10N_framework)"==""
-DEPFILES:=$(uniq $(DEPFILESx))
-DEPCOLLECT_SLO!:=$(strip $(uniq $(DEPCOLLECT_SLO)))
-.IF "$(DEPCOLLECT_SLO)"!=""
-DEPFILE_SLO+:=$(MISC)/all_$(TARGET).dpslo
-.ENDIF			# "$(DEPCOLLECT_SLO)"!=""
-DEPCOLLECT_OBJ!:=$(strip $(uniq $(DEPCOLLECT_OBJ)))
-.IF "$(DEPCOLLECT_OBJ)"!=""
-DEPFILE_OBJ+:=$(MISC)/all_$(TARGET).dpobj
-.ENDIF			# "$(DEPCOLLECT_OBJ)"!=""
-.ENDIF			# "$(nodep)"==""
-
-.IF "$(depend)" == ""
-
-# -------
-# - ALL -
-# -------
-
-# with VCL no resources are appended to the application
-APP1RES=
-APP2RES=
-APP3RES=
-APP4RES=
-APP5RES=
-APP6RES=
-APP7RES=
-APP8RES=
-APP9RES=
-# unfortunatly there are some applications which don't VCL resources but have
-# resources of their own
-.IF "$(APP1NOSVRES)" != ""
-APP1RES=$(APP1NOSVRES)
-.ENDIF
-.IF "$(APP2NOSVRES)" != ""
-APP2RES=$(APP2NOSVRES)
-.ENDIF
-.IF "$(APP3NOSVRES)" != ""
-APP3RES=$(APP3NOSVRES)
-.ENDIF
-
-.IF "$(NO_APP)"!=""
-APP1TARGET=
-APP2TARGET=
-APP3TARGET=
-APP4TARGET=
-APP5TARGET=
-APP6TARGET=
-APP7TARGET=
-APP8TARGET=
-APP9TARGET=
-.ENDIF
-
-.IF "$(IDLFILES)"!=""
-
-URDFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)/ucr/$(IDLPACKAGE)/$i)
-UNOIDLTARGETS+=$(URDFILES)
-
-.IF "$(URDFILES)"!=""
-LOCALDBTARGET=$(OUT)/ucr/$(TARGET).db
-.ENDIF
-
-.IF "$(URDDOC)" != ""
-URDDOCFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)/ucrdoc/$(IDLPACKAGE)/$i)
-UNOIDLTARGETS+=$(URDDOCFILES)
-
-.IF "$(URDDOCFILES)"!=""
-LOCALDOCDBTARGET=$(OUT)/ucrdoc/$(TARGET).db
-.ENDIF
-
-.ENDIF			# "$(URDDOC)" != ""
-
-.ENDIF		# "$(IDLFILES)"!=""
-
-.IF "$(UNOIDLDBFILES)"!=""
-UNOIDLDBTARGET=$(OUT)/ucr/$(PRJNAME).db
-.IF "$(URDDOC)" != ""
-UNOIDLDBDOCFILES:=$(subst,/ucr/,/ucrdoc/ $(UNOIDLDBFILES))
-UNOIDLDBDOCTARGET=$(OUT)/ucrdoc/$(PRJNAME)_doc.db
-.IF "$(UNOIDLDBREGS)"!=""
-UNOIDLDBDOCREGS=$(foreach,i,$(UNOIDLDBREGS) $(i:d)$(i:b)_doc$(i:e))
-.ENDIF			# "$(UNOIDLDBREGS)"!=""
-.ENDIF			# "$(URDDOC)" != ""
-.ENDIF		# "$(UNOIDLDBFILES)"!=""
-
-.IF "$(IDLFILES)"!=""
-.IF "$(PACKAGE)"!=""
-IDLDIRS=$(SOLARIDLDIR)/$(PACKAGE)
-.ELSE			# "$(PACKAGE)"!=""
-IDLDIRS=$(SOLARIDLDIR)
-.ENDIF			# "$(PACKAGE)"!=""
-
-.IF "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!=""
-.IF "$(EXTERNIDLFILES)"!=""
-DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(IDLDIRS)/$i)
-.ELSE			# "$(EXTERNIDLFILES)"!=""
-DEPIDLFILES:=$(IDLFILES)
-.ENDIF			# "$(EXTERNIDLFILES)"!=""
-.ELSE			# "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!=""
-.IF "$(GUI)"=="WNT"
-DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i) $i $(shell @($(FIND) $(IDLDIRS) -name $(i:f)) | $(SED) s/\//\\/g )))
-.ELSE			# "$(GUI)"=="WNT"
-DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i -print) $i $(shell @$(FIND) $(IDLDIRS) -name $(i:f) -print )  ))
-.ENDIF			# "$(GUI)"=="WNT"
-.ENDIF			# "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!=""
-.ENDIF			# "$(IDLFILES)"!=""
-
-.IF "$(L10N_framework)"==""
-.IF "$(JARFILES)"!=""
-LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)/$i)
-NEWCLASS:=$(LOCALJARS)
-NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARVERSION)$/$(INPATH)$/bin$/$i $(NULL)))
-.ENDIF			# "$(JARFILES)"!=""
-NEWCLASS+=$(EXTRAJARFILES)
-.IF "$(GENJAVACLASSFILES)"!=""
-NEWCLASS+=$(CLASSGENDIR)
-.ENDIF			# "$(GENJAVACLASSFILES)"!=""
-.IF "$(NEWCLASS)"!=""
-# See iz36027 for the reason for the strange $(subst ..) construct
-CLASSPATH:=.$(PATH_SEPERATOR)$(CLASSDIR)$(PATH_SEPERATOR)$(XCLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(NEWCLASS:s/ /%Z*Z%/))}$(PATH_SEPERATOR)$(SOLARLIBDIR)
-.ENDIF			# "$(NEWCLASS)"!=""
-.ENDIF			# "$(L10N_framework)"==""
-
-.IF "$(NOOPTFILES)" != ""
-NOOPTTARGET=do_it_noopt
-.ENDIF
-
-.IF "$(EXCEPTIONSNOOPTFILES)" != ""
-EXCEPTIONSNOOPTTARGET=do_it_exceptions_noopt
-.ENDIF
-
-.IF "$(LIBTARGET)"==""
-.IF "$(OBJFILES)$(IDLOBJFILES)"!=""
-OBJTARGET=$(LB)/$(TARGET).lib
-.ENDIF
-
-.IF "$(SLOFILES)$(IDLSLOFILES)"!=""
-SLOTARGET=$(SLB)/$(TARGET).lib
-.ENDIF
-.ENDIF			# "$(LIBTARGET)"==""
-
-.IF "$(SECOND_BUILD)"!=""
-.IF "$($(SECOND_BUILD)_SLOFILES)"!=""
-.IF "$(LIBTARGET)"==""
-$(SECOND_BUILD)SLOTARGET=$(SLB)/$(SECOND_BUILD)_$(TARGET).lib
-.ENDIF			# "$(LIBTARGET)"==""
-REAL_$(SECOND_BUILD)_SLOFILES=$(foreach,i,$($(SECOND_BUILD)_SLOFILES) $(i:d)$(SECOND_BUILD)_$(i:f))
-.ENDIF
-
-.IF "$($(SECOND_BUILD)_OBJFILES)"!=""
-.IF "$(LIBTARGET)"==""
-$(SECOND_BUILD)OBJTARGET=$(LB)/$(SECOND_BUILD)_$(TARGET).lib
-.ENDIF			# "$(LIBTARGET)"==""
-REAL_$(SECOND_BUILD)_OBJFILES=$(foreach,i,$($(SECOND_BUILD)_OBJFILES) $(i:d)$(SECOND_BUILD)_$(i:f))
-.ENDIF
-.ENDIF			# "$(SECOND_BUILD)"!=""
-
-.IF "$(NOLIBOBJTARGET)$(NOLIBSLOTARGET)"!=""
-dont_set_NOLIBOBJTARGET:
-    @echo --------------------------------------------------
-    @echo setting NOLIBOBJTARGET or NOLIBSLOTARGET in your makefile
-    @echo will cause serious problems!
-    @echo use DEPOBJFILES instead.
-    @echo --------------------------------------------------
-    force_dmake_to_error
-.ENDIF			# "$(NOLIBTARGET)"!=""
-.IF "$(OBJFILES)"!=""
-.IF "$(LIBTARGET)" != ""
-NOLIBOBJTARGET=$(OBJFILES)
-.ENDIF
-.ENDIF
-
-.IF "$(SLOFILES)"!=""
-.IF "$(LIBTARGET)" != ""
-NOLIBSLOTARGET=$(SLOFILES)
-.ENDIF
-.ENDIF
-
-.IF "$(SRC1FILES)"!=""
-SRC1TARGET=$(SRS)/$(SRS1NAME).srs
-DEPSRS1FILE+=$(MISC)/$(TARGET).$(SRS1NAME).dprr
-DEPSRSFILES+=$(DEPSRS1FILE)
-.ENDIF
-
-.IF "$(SRC2FILES)"!=""
-SRC2TARGET=$(SRS)/$(SRS2NAME).srs
-DEPSRS2FILE+=$(MISC)/$(TARGET).$(SRS2NAME).dprr
-DEPSRSFILES+=$(DEPSRS2FILE)
-.ENDIF
-
-.IF "$(SRC3FILES)"!=""
-SRC3TARGET=$(SRS)/$(SRS3NAME).srs
-DEPSRS3FILE+=$(MISC)/$(TARGET).$(SRS3NAME).dprr
-DEPSRSFILES+=$(DEPSRS3FILE)
-.ENDIF
-
-.IF "$(SRC4FILES)"!=""
-SRC4TARGET=$(SRS)/$(SRS4NAME).srs
-DEPSRS4FILE+=$(MISC)/$(TARGET).$(SRS4NAME).dprr
-DEPSRSFILES+=$(DEPSRS4FILE)
-.ENDIF
-
-.IF "$(SRC5FILES)"!=""
-SRC5TARGET=$(SRS)/$(SRS5NAME).srs
-DEPSRS5FILE+=$(MISC)/$(TARGET).$(SRS5NAME).dprr
-DEPSRSFILES+=$(DEPSRS5FILE)
-.ENDIF
-
-.IF "$(SRC6FILES)"!=""
-SRC6TARGET=$(SRS)/$(SRS6NAME).srs
-DEPSRS6FILE+=$(MISC)/$(TARGET).$(SRS6NAME).dprr
-DEPSRSFILES+=$(DEPSRS6FILE)
-.ENDIF
-
-.IF "$(SRC7FILES)"!=""
-SRC7TARGET=$(SRS)/$(SRS7NAME).srs
-DEPSRS7FILE+=$(MISC)/$(TARGET).$(SRS7NAME).dprr
-DEPSRSFILES+=$(DEPSRS7FILE)
-.ENDIF
-
-.IF "$(SRC8FILES)"!=""
-SRC8TARGET=$(SRS)/$(SRS8NAME).srs
-DEPSRS8FILE+=$(MISC)/$(TARGET).$(SRS8NAME).dprr
-DEPSRSFILES+=$(DEPSRS8FILE)
-.ENDIF
-
-.IF "$(SRC9FILES)"!=""
-SRC9TARGET=$(SRS)/$(SRS9NAME).srs
-DEPSRS9FILE+=$(MISC)/$(TARGET).$(SRS9NAME).dprr
-DEPSRSFILES+=$(DEPSRS9FILE)
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!=""
-.IF "$(JAVAFILES)$(JAVACLASSFILES)$(GENJAVAFILES)"!=""
-.IF "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVAFILES)"
-JAVACLASSFILES=	$(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:s/.java//).class)
-.ELSE			# "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVAFILES)"
-.IF "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVACLASSFILES)"
-JAVAFILES=	$(foreach,i,$(JAVACLASSFILES) $(subst,$(CLASSDIR)/$(PACKAGE)/, $(i:s/.class//).java))
-.ENDIF			# "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVACLASSFILES)"
-.ENDIF			# "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVAFILES)"
-JAVATARGET:=$(MISC)/$(TARGET)_dummy.java
-.ENDIF			# "$(JAVAFILES)$(JAVACLASSFILES)$(GENJAVAFILES)"!=""
-
-.IF "$(JARTARGET)"!=""
-JARCLASSDIRS*=.
-JARMANIFEST*=$(CLASSDIR)/$(TARGET)/META-INF/MANIFEST.MF
-JARTARGETN=$(CLASSDIR)/$(JARTARGET)
-.ENDIF			# "$(JARTARGET)"!=""
-.ELSE			# "$(SOLAR_JAVA)"!=""
-JAVACLASSFILES:=
-JAVAFILES:=
-javauno:=
-.ENDIF			# "$(SOLAR_JAVA)"!=""
-
-.IF "$(L10N_framework)"==""
-.IF "$(RCFILES)"!=""
-RESNAME*=$(TARGET)
-.IF "$(RCFILES)" != "verinfo.rc"
-RCTARGET=$(RES)/$(RESNAME).res
-.ELSE           # "$(RCFILES)" != "verinfo.rc"
-RCFILES=
-.ENDIF          # "$(RCFILES)" != "verinfo.rc"
-.ENDIF          # "$(RCFILES)"!=""
-.ENDIF          # "$(L10N_framework)"==""
-
-LOCALIZE_ME_DEST:=$(foreach,i,$(LOCALIZE_ME) $(INCCOM)/$(i:f:s/_tmpl//))
-
-.IF "$(SCP1TARGET)"!=""
-SCP1TARGETN:=$(foreach,i,$(SCP1LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP1TARGET)$(SCPPOST))
-.ENDIF
-
-.IF "$(SCP2TARGET)"!=""
-SCP2TARGETN:=$(foreach,i,$(SCP2LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP2TARGET)$(SCPPOST))
-.ENDIF
-
-.IF "$(SCP3TARGET)"!=""
-SCP3TARGETN:=$(foreach,i,$(SCP3LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP3TARGET)$(SCPPOST))
-.ENDIF
-
-.IF "$(SCP4TARGET)"!=""
-SCP4TARGETN:=$(foreach,i,$(SCP4LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP4TARGET)$(SCPPOST))
-.ENDIF
-
-.IF "$(SCP5TARGET)"!=""
-SCP5TARGETN:=$(foreach,i,$(SCP5LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP5TARGET)$(SCPPOST))
-.ENDIF
-
-.IF "$(SCP6TARGET)"!=""
-SCP6TARGETN:=$(foreach,i,$(SCP6LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP6TARGET)$(SCPPOST))
-.ENDIF
-
-.IF "$(SCP7TARGET)"!=""
-SCP7TARGETN:=$(foreach,i,$(SCP7LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP7TARGET)$(SCPPOST))
-.ENDIF
-
-.IF "$(SCP8TARGET)"!=""
-SCP8TARGETN:=$(foreach,i,$(SCP8LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP8TARGET)$(SCPPOST))
-.ENDIF
-
-.IF "$(SCP9TARGET)"!=""
-SCP9TARGETN:=$(foreach,i,$(SCP9LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP9TARGET)$(SCPPOST))
-.ENDIF
-
-.IF "$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)"!="$(ZIP1LIST:s/LANGDIR//)$(ZIP2LIST:s/LANGDIR//)$(ZIP3LIST:s/LANGDIR//)$(ZIP4LIST:s/LANGDIR//)$(ZIP5LIST:s/LANGDIR//)$(ZIP6LIST:s/LANGDIR//)$(ZIP7LIST:s/LANGDIR//)$(ZIP8LIST:s/LANGDIR//)$(ZIP9LIST:s/LANGDIR//)"
-
-ZIPALL=ZIPALLTARGET
-
-.ENDIF			#
-
-.IF "$(APP1TARGET)"!=""
-APP1TARGETN=$(BIN)/$(APP1TARGET)$(EXECPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP1BASE)"==""
-APP1BASE=$(BASE)
-.ENDIF
-APP1BASEX=/BASE:$(APP1BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(APP2TARGET)"!=""
-APP2TARGETN=$(BIN)/$(APP2TARGET)$(EXECPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP2BASE)"==""
-APP2BASE=$(BASE)
-.ENDIF
-APP2BASEX=/BASE:$(APP2BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(APP3TARGET)"!=""
-APP3TARGETN=$(BIN)/$(APP3TARGET)$(EXECPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP3BASE)"==""
-APP3BASE=$(BASE)
-.ENDIF
-APP3BASEX=/BASE:$(APP3BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(APP4TARGET)"!=""
-APP4TARGETN=$(BIN)/$(APP4TARGET)$(EXECPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP4BASE)"==""
-APP4BASE=$(BASE)
-.ENDIF
-APP4BASEX=/BASE:$(APP4BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(APP5TARGET)"!=""
-APP5TARGETN=$(BIN)/$(APP5TARGET)$(EXECPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP5BASE)"==""
-APP5BASE=$(BASE)
-.ENDIF
-APP5BASEX=/BASE:$(APP5BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(APP6TARGET)"!=""
-APP6TARGETN=$(BIN)/$(APP6TARGET)$(EXECPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP6BASE)"==""
-APP6BASE=$(BASE)
-.ENDIF
-APP6BASEX=/BASE:$(APP6BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(APP7TARGET)"!=""
-APP7TARGETN=$(BIN)/$(APP7TARGET)$(EXECPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP7BASE)"==""
-APP7BASE=$(BASE)
-.ENDIF
-APP7BASEX=/BASE:$(APP7BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(APP8TARGET)"!=""
-APP8TARGETN=$(BIN)/$(APP8TARGET)$(EXECPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP8BASE)"==""
-APP8BASE=$(BASE)
-.ENDIF
-APP8BASEX=/BASE:$(APP8BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(APP9TARGET)"!=""
-APP9TARGETN=$(BIN)/$(APP9TARGET)$(EXECPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP9BASE)"==""
-APP9BASE=$(BASE)
-.ENDIF
-APP9BASEX=/BASE:$(APP9BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(SHL1TARGET)"!=""
-.IF "$(WINVERSIONNAMES)"!=""
-SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR)
-.ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL1DLLPRE*=$(DLLPRE)
-SHL1TARGETN=$(DLLDEST)/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL1BASE)"==""
-SHL1BASE=$(BASE)
-.ENDIF
-SHL1BASEX=/BASE:$(SHL1BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(SHL2TARGET)"!=""
-.IF "$(WINVERSIONNAMES)"!=""
-SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR)
-.ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL2DLLPRE*=$(DLLPRE)
-SHL2TARGETN=$(DLLDEST)/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL2BASE)"==""
-SHL2BASE=$(BASE)
-.ENDIF
-SHL2BASEX=/BASE:$(SHL2BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(SHL3TARGET)"!=""
-.IF "$(WINVERSIONNAMES)"!=""
-SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR)
-.ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL3DLLPRE*=$(DLLPRE)
-SHL3TARGETN=$(DLLDEST)/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL3BASE)"==""
-SHL3BASE=$(BASE)
-.ENDIF
-SHL3BASEX=/BASE:$(SHL3BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(SHL4TARGET)"!=""
-.IF "$(WINVERSIONNAMES)"!=""
-SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR)
-.ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL4DLLPRE*=$(DLLPRE)
-SHL4TARGETN=$(DLLDEST)/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL4BASE)"==""
-SHL4BASE=$(BASE)
-.ENDIF
-SHL4BASEX=/BASE:$(SHL4BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(SHL5TARGET)"!=""
-.IF "$(WINVERSIONNAMES)"!=""
-SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR)
-.ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL5DLLPRE*=$(DLLPRE)
-SHL5TARGETN=$(DLLDEST)/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL5BASE)"==""
-SHL5BASE=$(BASE)
-.ENDIF
-SHL5BASEX=/BASE:$(SHL5BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(SHL6TARGET)"!=""
-.IF "$(WINVERSIONNAMES)"!=""
-SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR)
-.ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL6DLLPRE*=$(DLLPRE)
-SHL6TARGETN=$(DLLDEST)/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL6BASE)"==""
-SHL6BASE=$(BASE)
-.ENDIF
-SHL6BASEX=/BASE:$(SHL6BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(SHL7TARGET)"!=""
-.IF "$(WINVERSIONNAMES)"!=""
-SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR)
-.ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL7DLLPRE*=$(DLLPRE)
-SHL7TARGETN=$(DLLDEST)/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL7BASE)"==""
-SHL7BASE=$(BASE)
-.ENDIF
-SHL7BASEX=/BASE:$(SHL7BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(SHL8TARGET)"!=""
-.IF "$(WINVERSIONNAMES)"!=""
-SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR)
-.ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL8DLLPRE*=$(DLLPRE)
-SHL8TARGETN=$(DLLDEST)/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL8BASE)"==""
-SHL8BASE=$(BASE)
-.ENDIF
-SHL8BASEX=/BASE:$(SHL8BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(SHL9TARGET)"!=""
-.IF "$(WINVERSIONNAMES)"!=""
-SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR)
-.ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL9DLLPRE*=$(DLLPRE)
-SHL9TARGETN=$(DLLDEST)/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST)
-.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL9BASE)"==""
-SHL9BASE=$(BASE)
-.ENDIF
-SHL9BASEX=/BASE:$(SHL9BASE)
-.ENDIF
-.ENDIF
-.ENDIF
-
-.IF "$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!=""
-.IF "$(UNOUCRRDB)"!=""
-COMPRDB*:=$(UNOUCRRDB)
-.ELSE			# "$(UNOUCRRDB)"!=""
-COMPRDB*:=$(SOLARBINDIR)/types.rdb
-.ENDIF			# "$(UNOUCRRDB)"!=""
-.ENDIF          # "$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!=""
-.IF "$(COMP1TYPELIST)"!=""
-UNOTYPES+=$($(COMP1TYPELIST)_XML2CMPTYPES)
-COMP1RDBTARGETN:=$(BIN)/$(COMP1TYPELIST).rdb
-#COMP1TYPELISTN:=$(MISC)/$(COMP1TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP2TYPELIST)"!=""
-UNOTYPES+=$($(COMP2TYPELIST)_XML2CMPTYPES)
-COMP2RDBTARGETN:=$(BIN)/$(COMP2TYPELIST).rdb
-#COMP2TYPELISTN:=$(MISC)/$(COMP2TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP3TYPELIST)"!=""
-UNOTYPES+=$($(COMP3TYPELIST)_XML2CMPTYPES)
-COMP3RDBTARGETN:=$(BIN)/$(COMP3TYPELIST).rdb
-#COMP3TYPELISTN:=$(MISC)/$(COMP3TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP4TYPELIST)"!=""
-UNOTYPES+=$($(COMP4TYPELIST)_XML2CMPTYPES)
-COMP4RDBTARGETN:=$(BIN)/$(COMP4TYPELIST).rdb
-#COMP4TYPELISTN:=$(MISC)/$(COMP4TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP5TYPELIST)"!=""
-UNOTYPES+=$($(COMP5TYPELIST)_XML2CMPTYPES)
-COMP5RDBTARGETN:=$(BIN)/$(COMP5TYPELIST).rdb
-#COMP5TYPELISTN:=$(MISC)/$(COMP5TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP6TYPELIST)"!=""
-UNOTYPES+=$($(COMP6TYPELIST)_XML2CMPTYPES)
-COMP6RDBTARGETN:=$(BIN)/$(COMP6TYPELIST).rdb
-#COMP6TYPELISTN:=$(MISC)/$(COMP6TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP7TYPELIST)"!=""
-UNOTYPES+=$($(COMP7TYPELIST)_XML2CMPTYPES)
-COMP7RDBTARGETN:=$(BIN)/$(COMP7TYPELIST).rdb
-#COMP7TYPELISTN:=$(MISC)/$(COMP7TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP8TYPELIST)"!=""
-UNOTYPES+=$($(COMP8TYPELIST)_XML2CMPTYPES)
-COMP8RDBTARGETN:=$(BIN)/$(COMP8TYPELIST).rdb
-#COMP8TYPELISTN:=$(MISC)/$(COMP8TYPELIST).xml
-.ENDIF
-
-.IF "$(COMP9TYPELIST)"!=""
-UNOTYPES+=$($(COMP9TYPELIST)_XML2CMPTYPES)
-COMP9RDBTARGETN:=$(BIN)/$(COMP9TYPELIST).rdb
-#COMP9TYPELISTN:=$(MISC)/$(COMP9TYPELIST).xml
-.ENDIF
-
-UNOTYPES!:=$(strip $(UNOTYPES))
-
-#moved here to get UNOTYPES from COMPxTYPELIST
-.IF "$(UNOTYPES)" != ""
-UNOUCRHEADER=$(foreach,j,$(subst,.,/ $(UNOTYPES)) $(UNOUCROUT)/$(j:+".hpp"))
-UNOUCRTARGET:=$(INCCOM)/$(TARGET)_headergen.done
-.ENDIF			# "$(UNOTYPES)" != ""
-
-.IF "$(HELPIDFILES)"!=""
-MAKE_HELPIDS=$(MISC)/helpids.don
-.ENDIF
-
-.IF "$(HXXCOPYFILES)" != ""
-HXXCOPYTARGET=	copy_hxxcopyfiles
-.ENDIF
-
-.IF "$(LIB1TARGET)" != ""
-LIB1TARGETN=$(LIB1TARGET)
-.ENDIF
-
-.IF "$(LIB2TARGET)" != ""
-LIB2TARGETN=$(LIB2TARGET)
-.ENDIF
-
-.IF "$(LIB3TARGET)" != ""
-LIB3TARGETN=$(LIB3TARGET)
-.ENDIF
-
-.IF "$(LIB4TARGET)" != ""
-LIB4TARGETN=$(LIB4TARGET)
-.ENDIF
-
-.IF "$(LIB5TARGET)" != ""
-LIB5TARGETN=$(LIB5TARGET)
-.ENDIF
-
-.IF "$(LIB6TARGET)" != ""
-LIB6TARGETN=$(LIB6TARGET)
-.ENDIF
-
-.IF "$(LIB7TARGET)" != ""
-LIB7TARGETN=$(LIB7TARGET)
-.ENDIF
-
-.IF "$(LIB8TARGET)" != ""
-LIB8TARGETN=$(LIB8TARGET)
-.ENDIF
-
-.IF "$(LIB9TARGET)" != ""
-LIB9TARGETN=$(LIB9TARGET)
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-LIB1ARCHIV=
-LIB2ARCHIV=
-LIB3ARCHIV=
-LIB4ARCHIV=
-LIB5ARCHIV=
-LIB6ARCHIV=
-LIB7ARCHIV=
-LIB8ARCHIV=
-LIB9ARCHIV=
-.ENDIF
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(RESLIB1NAME)" != ""
-.IF "$(RESLIB1NOVERSION)"==""
-.ENDIF			# "$(RESLIB1NOVERSION)"==""
-.IF "$(common_build_reslib)"!=""
-RESLIB1TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)LANGEXT.res
-RSC_MULTI1=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB1NAME)
-.ELSE			# "$(common_build_reslib)"!=""
-RESLIB1TARGETN=$(BIN)/$(RESLIB1NAME)LANGEXT.res
-RSC_MULTI1=$(MISC)/rsc_$(RESLIB1NAME)
-.ENDIF			# "$(common_build_reslib)"!=""
-# change to iso if resmgr is changed
-RESLIB1TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB1TARGETN)))
-.ENDIF
-
-.IF "$(RESLIB2NAME)" != ""
-.IF "$(RESLIB2NOVERSION)"==""
-.ENDIF			# "$(RESLIB2NOVERSION)"==""
-.IF "$(common_build_reslib)"!=""
-RESLIB2TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)LANGEXT.res
-RSC_MULTI2=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB2NAME)
-.ELSE			# "$(common_build_reslib)"!=""
-RESLIB2TARGETN=$(BIN)/$(RESLIB2NAME)LANGEXT.res
-RSC_MULTI2=$(MISC)/rsc_$(RESLIB2NAME)
-.ENDIF			# "$(common_build_reslib)"!=""
-RESLIB2TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB2TARGETN)))
-.ENDIF
-
-.IF "$(RESLIB3NAME)" != ""
-.IF "$(RESLIB3NOVERSION)"==""
-.ENDIF			# "$(RESLIB3NOVERSION)"==""
-.IF "$(common_build_reslib)"!=""
-RESLIB3TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)LANGEXT.res
-RSC_MULTI3=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB3NAME)
-.ELSE			# "$(common_build_reslib)"!=""
-RESLIB3TARGETN=$(BIN)/$(RESLIB3NAME)LANGEXT.res
-RSC_MULTI3=$(MISC)/rsc_$(RESLIB3NAME)
-.ENDIF			# "$(common_build_reslib)"!=""
-RESLIB3TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB3TARGETN)))
-.ENDIF
-
-.IF "$(RESLIB4NAME)" != ""
-.IF "$(RESLIB4NOVERSION)"==""
-.ENDIF			# "$(RESLIB4NOVERSION)"==""
-.IF "$(common_build_reslib)"!=""
-RESLIB4TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)LANGEXT.res
-RSC_MULTI4=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB4NAME)
-.ELSE			# "$(common_build_reslib)"!=""
-RESLIB4TARGETN=$(BIN)/$(RESLIB4NAME)LANGEXT.res
-RSC_MULTI4=$(MISC)/rsc_$(RESLIB4NAME)
-.ENDIF			# "$(common_build_reslib)"!=""
-RESLIB4TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB4TARGETN)))
-.ENDIF
-
-.IF "$(RESLIB5NAME)" != ""
-.IF "$(RESLIB5NOVERSION)"==""
-.ENDIF			# "$(RESLIB5NOVERSION)"==""
-.IF "$(common_build_reslib)"!=""
-RESLIB5TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)LANGEXT.res
-RSC_MULTI5=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB5NAME)
-.ELSE			# "$(common_build_reslib)"!=""
-RESLIB5TARGETN=$(BIN)/$(RESLIB5NAME)LANGEXT.res
-RSC_MULTI5=$(MISC)/rsc_$(RESLIB5NAME)
-.ENDIF			# "$(common_build_reslib)"!=""
-RESLIB5TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB5TARGETN)))
-.ENDIF
-
-.IF "$(RESLIB6NAME)" != ""
-.IF "$(RESLIB6NOVERSION)"==""
-.ENDIF			# "$(RESLIB6NOVERSION)"==""
-.IF "$(common_build_reslib)"!=""
-RESLIB6TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)LANGEXT.res
-RSC_MULTI6=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB6NAME)
-.ELSE			# "$(common_build_reslib)"!=""
-RESLIB6TARGETN=$(BIN)/$(RESLIB6NAME)LANGEXT.res
-RSC_MULTI6=$(MISC)/rsc_$(RESLIB6NAME)
-.ENDIF			# "$(common_build_reslib)"!=""
-RESLIB6TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB6TARGETN)))
-.ENDIF
-
-.IF "$(RESLIB7NAME)" != ""
-.IF "$(RESLIB7NOVERSION)"==""
-.ENDIF			# "$(RESLIB7NOVERSION)"==""
-.IF "$(common_build_reslib)"!=""
-RESLIB7TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)LANGEXT.res
-RSC_MULTI7=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB7NAME)
-.ELSE			# "$(common_build_reslib)"!=""
-RESLIB7TARGETN=$(BIN)/$(RESLIB7NAME)LANGEXT.res
-RSC_MULTI7=$(MISC)/rsc_$(RESLIB7NAME)
-.ENDIF			# "$(common_build_reslib)"!=""
-RESLIB7TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB7TARGETN)))
-.ENDIF
-
-.IF "$(RESLIB8NAME)" != ""
-.IF "$(RESLIB8NOVERSION)"==""
-.ENDIF			# "$(RESLIB8NOVERSION)"==""
-.IF "$(common_build_reslib)"!=""
-RESLIB8TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)LANGEXT.res
-RSC_MULTI8=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB8NAME)
-.ELSE			# "$(common_build_reslib)"!=""
-RESLIB8TARGETN=$(BIN)/$(RESLIB8NAME)LANGEXT.res
-RSC_MULTI8=$(MISC)/rsc_$(RESLIB8NAME)
-.ENDIF			# "$(common_build_reslib)"!=""
-RESLIB8TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB8TARGETN)))
-.ENDIF
-
-.IF "$(RESLIB9NAME)" != ""
-.IF "$(RESLIB9NOVERSION)"==""
-.ENDIF			# "$(RESLIB9NOVERSION)"==""
-.IF "$(common_build_reslib)"!=""
-RESLIB9TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)LANGEXT.res
-RSC_MULTI9=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB9NAME)
-.ELSE			# "$(common_build_reslib)"!=""
-RESLIB9TARGETN=$(BIN)/$(RESLIB9NAME)LANGEXT.res
-RSC_MULTI9=$(MISC)/rsc_$(RESLIB9NAME)
-.ENDIF			# "$(common_build_reslib)"!=""
-RESLIB9TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB9TARGETN)))
-.ENDIF
-
-.IF "$(INDPRESLIB1NAME)"!=""
-INDPRESLIB1TARGETN=$(BIN)/$(INDPRESLIB1NAME).dll
-.ENDIF
-
-.IF "$(DEF1NAME)"!=""
-DEF1TARGETN=$(MISC)/$(DEF1NAME).def
-.ENDIF
-
-.IF "$(DEF2NAME)"!=""
-DEF2TARGETN=$(MISC)/$(DEF2NAME).def
-.ENDIF
-
-.IF "$(DEF3NAME)"!=""
-DEF3TARGETN=$(MISC)/$(DEF3NAME).def
-.ENDIF
-
-.IF "$(DEF4NAME)"!=""
-DEF4TARGETN=$(MISC)/$(DEF4NAME).def
-.ENDIF
-
-.IF "$(DEF5NAME)"!=""
-DEF5TARGETN=$(MISC)/$(DEF5NAME).def
-.ENDIF
-
-.IF "$(DEF6NAME)"!=""
-DEF6TARGETN=$(MISC)/$(DEF6NAME).def
-.ENDIF
-
-.IF "$(DEF7NAME)"!=""
-DEF7TARGETN=$(MISC)/$(DEF7NAME).def
-.ENDIF
-
-.IF "$(DEF8NAME)"!=""
-DEF8TARGETN=$(MISC)/$(DEF8NAME).def
-.ENDIF
-
-.IF "$(DEF9NAME)"!=""
-DEF9TARGETN=$(MISC)/$(DEF9NAME).def
-.ENDIF
-
-# IZ65415 - catch obsolete macro. Can be removed later.
-.IF "$(SDINAME)"!=""
-.ERROR : ; @echo Forced error: SDINAME was used! Change your project to use SDIxNAME instead!
-NO_SDINAME_allowed
-.ENDIF
-
-.IF "$(SDI1NAME)"!=""
-.DIRCACHE=no
-SDI1TARGET=$(MISC)/$(SDI1NAME).don
-.ENDIF
-
-.IF "$(SDI2NAME)"!=""
-.DIRCACHE=no
-SDI2TARGET=$(MISC)/$(SDI2NAME).don
-.ENDIF
-
-.IF "$(SDI3NAME)"!=""
-.DIRCACHE=no
-SDI3TARGET=$(MISC)/$(SDI3NAME).don
-.ENDIF
-
-.IF "$(SDI4NAME)"!=""
-.DIRCACHE=no
-SDI4TARGET=$(MISC)/$(SDI4NAME).don
-.ENDIF
-
-.IF "$(SDI5NAME)"!=""
-.DIRCACHE=no
-SDI5TARGET=$(MISC)/$(SDI5NAME).don
-.ENDIF
-
-.IF "$(XMLPROPERTIES)"!=""
-XMLPROPERTIESN:=$(foreach,i,$(XMLPROPERTIES) $(MISC)/$(TARGET)_$(i:s/.xrb/.done/))
-.ENDIF			# "$(XMLPROPERTIES)"!=""
-
-.IF "$(UNIXTEXT)"!=""
-.IF "$(GUI)"=="UNX"
-CONVERTUNIXTEXT:=$(UNIXTEXT)
-.ENDIF			# "$(GUI)"=="UNX"
-.ENDIF			# "$(UNIXTEXT)"!=""
-
-.IF "$(EXTUPDATEINFO_NAME)"!=""
-EXTUPDATEINFO_DEST:=$(MISC)/$(EXTUPDATEINFO_NAME)
-EXTUPDATEINFO_SOURCE*=description.xml
-.ENDIF			# "$(EXTUPDATEINFO_NAME)"!=""
-
-.IF "$(JAVACLASSFILES:s/DEFINED//)"!="" || "$(javauno)"!=""
-.IF "$(L10N_framework)"==""
-TARGETDPJ=$(MISC)/$(TARGET).dpj
-.ENDIF			# "$(L10N_framework)"==""
-.ENDIF
-
-.IF "$(make_srs_deps)"==""
-.IF "$(SRCFILES)" != "" || "$(SRC1FILES)" != "" || "$(SRC2FILES)" != ""
-DPRTARGET= $(MISC)/$(TARGET).dpr
-.ENDIF
-.ENDIF
-
-.IF "$(make_zip_deps)"==""
-.IF "$(ZIP1TARGET)" != "" || "$(ZIP2TARGET)" != "" || "$(ZIP3TARGET)" != ""
-DPZTARGET= $(MISC)/$(TARGET).dpz
-.ENDIF			# "$(ZIP1TARGET)" != "" || "$(ZIP2TARGET)" != "" || "$(ZIP3TARGET)" != ""
-.ENDIF			# "$(make_zip_deps)"==""
-
-.IF "$(SOLAR_JAVA)"!=""
-ALL_JAVA_TARGETS= \
-        $(GENJAVAFILES) \
-        $(JAVACLASSFILES) $(JAVA1CLASSFILES)	\
-        $(JAVA2CLASSFILES)	$(JAVA3CLASSFILES) $(JAVA4CLASSFILES)\
-        $(JAVA5CLASSFILES)	$(JAVA6CLASSFILES) $(JAVA7CLASSFILES)\
-        $(JAVA8CLASSFILES)	$(JAVA9CLASSFILES) $(JAVA10CLASSFILES)\
-        $(JAVA11CLASSFILES)	\
-        $(JAVATARGET)	\
-        $(TARGETDPJ)
-.ENDIF          # "$(SOLAR_JAVA)"!=""
-# -------
-# - DEF -
-# -------
-
-# bei MAKE...DIR die gleiche Reihenfolge wie in settings.mak einhalten!
-
-.IF "$(lintit)"==""
-.IF "$(L10N_framework)"!=""
-ALLTAR:	\
-        "$(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk" \
-        $(SUBDIRS)		\
-        $(DPRTARGET) \
-        $(DPZTARGET) \
-        $(ZIPALL) \
-        $(SDITARGET)	$(SDI1TARGET)	$(SDI2TARGET)		\
-        $(SDI3TARGET)	$(SDI4TARGET)	$(SDI5TARGET)		\
-        $(XMLPROPERTIESN) \
-        $(RCTARGET) \
-        $(SCP_PRODUCT_TYPE) \
-        $(ALLPARFILES) \
-        $(SCP1TARGETN) \
-        $(SCP2TARGETN) \
-        $(SCP3TARGETN) \
-        $(SCP4TARGETN) \
-        $(SCP5TARGETN) \
-        $(SCP6TARGETN) \
-        $(SCP7TARGETN) \
-        $(SCP8TARGETN) \
-        $(SCP9TARGETN) \
-        $(SRC1TARGET)  \
-        $(SRC2TARGET)  \
-        $(SRC3TARGET)  \
-        $(SRC4TARGET)	$(SRC5TARGET)	$(SRC6TARGET)		\
-        $(SRC7TARGET)	$(SRC8TARGET)	$(SRC9TARGET)		\
-        $(SRC10TARGET)	$(SRC11TARGET)	$(SRC12TARGET)		\
-        $(SRC13TARGET)	$(SRC14TARGET)	$(SRC15TARGET)		\
-        $(SRC16TARGET) \
-        $(RSC_MULTI1) \
-        $(RSC_MULTI2) \
-        $(RSC_MULTI3) \
-        $(RSC_MULTI4) \
-        $(RSC_MULTI5) \
-        $(RSC_MULTI6) \
-        $(RSC_MULTI7) \
-        $(RSC_MULTI8) \
-        $(RSC_MULTI9) \
-        $(INDPRESLIB1TARGETN) \
-        $(RESLIB1TARGETN) $(RESLIB2TARGETN) \
-        $(RESLIB3TARGETN) $(RESLIB4TARGETN) \
-        $(RESLIB5TARGETN) $(RESLIB6TARGETN) \
-        $(RESLIB7TARGETN) $(RESLIB8TARGETN) \
-        $(LOCALIZE_ME_DEST)\
-        last_target
-
-.ELSE			# "$(L10N_framework)"!=""
-
-ALLTAR: \
-        "$(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk" \
-        $(MAKEDEMODIR)	$(MAKECOMPDIR) $(MAKEXLDIR)	\
-        $(COMPVERMK) \
-        $(JAVAVERMK) \
-        $(target_empty) \
-        $(SUBDIRS)		\
-        $(ALLMOZ) \
-        $(DELDEFS)		\
-        $(YACCTARGET)	\
-        $(UNOUCRTARGET)	\
-        $(UNOIDLDEPTARGETS) \
-        $(DEPFILES) \
-        $(DPRTARGET) \
-        $(DPZTARGET) \
-        $(ZIPALL) \
-        $(SDITARGET)	\
-        $(LOCALDBTARGET)	\
-        $(LOCALDOCDBTARGET)	\
-        $(UNOIDLDBTARGET)	\
-        $(UNOIDLDBDOCTARGET)	\
-        $(COMP1RDBTARGETN) \
-        $(COMP2RDBTARGETN) \
-        $(COMP3RDBTARGETN) \
-        $(COMP4RDBTARGETN) \
-        $(COMP5RDBTARGETN) \
-        $(COMP6RDBTARGETN) \
-        $(COMP7RDBTARGETN) \
-        $(COMP8RDBTARGETN) \
-        $(COMP9RDBTARGETN) \
-        $(IDL1TARGET)	$(IDL2TARGET)	$(IDL3TARGET)		\
-        $(IDL4TARGET)	$(IDL5TARGET)		\
-        $(SDI1TARGET)	$(SDI2TARGET)	$(SDI3TARGET)		\
-        $(SDI4TARGET)	$(SDI5TARGET)		\
-        $(HXXCOPYTARGET) \
-        $(NOLIBOBJTARGET) \
-        $(NOLIBSLOTARGET) \
-        $(OTHERTARRGET) \
-        $(XMLPROPERTIESN) \
-        $(ALL_JAVA_TARGETS) \
-        $(OBJTARGET)	$(SLOTARGET)	$(SMRSLOTARGET)		\
-        $($(SECOND_BUILD)SLOTARGET) \
-        $($(SECOND_BUILD)OBJTARGET) \
-        $(LIB1TARGET)	$(LIB2TARGET)	$(LIB3TARGET)		\
-        $(LIB4TARGET)	$(LIB5TARGET)	$(LIB6TARGET)		\
-        $(LIB7TARGET)	$(LIB8TARGET)	$(LIB9TARGET)		\
-        $(LIB1ARCHIV)	$(LIB2ARCHIV)	$(LIB3ARCHIV)		\
-        $(LIB4ARCHIV)	$(LIB5ARCHIV)	$(LIB6ARCHIV)		\
-        $(LIB7ARCHIV)	$(LIB8ARCHIV)	$(LIB9ARCHIV)		\
-        $(DEF1TARGETN)	$(DEF2TARGETN)	$(DEF3TARGETN)		\
-        $(DEF4TARGETN)	$(DEF5TARGETN)	$(DEF6TARGETN)		\
-        $(RCTARGET) \
-        $(SHL1TARGETN) \
-        $(SHL2TARGETN) \
-        $(SHL3TARGETN) \
-        $(SHL4TARGETN) \
-        $(SHL5TARGETN) \
-        $(SHL6TARGETN) \
-        $(SHL7TARGETN) \
-        $(SHL8TARGETN) \
-        $(SHL9TARGETN) \
-        $(SCP_PRODUCT_TYPE) \
-        $(ALLPARFILES) \
-        $(SCP1TARGETN) \
-        $(SCP2TARGETN) \
-        $(SCP3TARGETN) \
-        $(SCP4TARGETN) \
-        $(SCP5TARGETN) \
-        $(SCP6TARGETN) \
-        $(SCP7TARGETN) \
-        $(SCP8TARGETN) \
-        $(SCP9TARGETN) \
-        $(APP1TARGETN)	$(APP2TARGETN)	$(APP3TARGETN)		\
-        $(APP4TARGETN)	$(APP5TARGETN)	$(APP6TARGETN)		\
-        $(APP7TARGETN)	$(APP8TARGETN)	$(APP9TARGETN)		\
-        $(JARTARGETN)	\
-        $(JARTARGETDEPN)	\
-        $(SRC1TARGET)	\
-        $(SRC2TARGET)	\
-        $(SRC3TARGET)	\
-        $(SRC4TARGET)	$(SRC5TARGET)	$(SRC6TARGET)		\
-        $(SRC7TARGET)	$(SRC8TARGET)	$(SRC9TARGET)		\
-        $(SRC10TARGET)	$(SRC11TARGET)	$(SRC12TARGET)		\
-        $(SRC13TARGET)	$(SRC14TARGET)	$(SRC15TARGET)		\
-        $(SRC16TARGET) \
-        $(RSC_MULTI1) \
-        $(RSC_MULTI2) \
-        $(RSC_MULTI3) \
-        $(RSC_MULTI4) \
-        $(RSC_MULTI5) \
-        $(RSC_MULTI6) \
-        $(RSC_MULTI7) \
-        $(RSC_MULTI8) \
-        $(RSC_MULTI9) \
-        $(INDPRESLIB1TARGETN) \
-        $(RESLIB1TARGETN) $(RESLIB2TARGETN) \
-        $(RESLIB3TARGETN) $(RESLIB4TARGETN) \
-        $(RESLIB5TARGETN) $(RESLIB6TARGETN) \
-        $(RESLIB7TARGETN) $(RESLIB8TARGETN) \
-        $(RESLIB9TARGETN) \
-                $(SIGNFORNETSCAPE) \
-                $(SIGNFOREXPLORER) \
-                $(SIGNFORJARSIGNER) \
-        $(CONVERTUNIXTEXT) \
-        $(LOCALIZE_ME_DEST)\
-        $(EXTUPDATEINFO_DEST) \
-        last_target
-
-.IF "$(BUILD_X64)"!=""
-ALLTAR : \
-        $(NOLIBOBJTARGET_X64) \
-        $(NOLIBSLOTARGET_X64) \
-        $(OBJTARGET_X64)	$(SLOTARGET_X64) \
-        $(LIB1TARGET_X64)	$(LIB2TARGET_X64)	\
-        $(DEF1TARGETN_X64)	$(DEF2TARGETN_X64)	\
-        $(SHL1TARGETN_X64) 	$(SHL2TARGETN_X64)
-.ENDIF # "$(BUILD_X64)"!=""
-
-ALLTAR : "$(SOLARINCDIR)/$(UPD)minor.mk"
-
-.IF "$(EXCEPTIONSNOOPT_FLAG)"==""
-TARGETDEPS+=$(EXCEPTIONSNOOPTTARGET)
-.ENDIF
-
-.IF "$(NOOPT_FLAG)"==""
-TARGETDEPS+=$(NOOPTTARGET)
-.ENDIF
-
-#don't override .TARGETS when called with targets
-.IF "$(MAKETARGETS)$(TNR)$(EXCEPTIONSNOOPT_FLAG)$(EXCEPTIONS_FLAG)$(NOOPT_FLAG)"==""
-.IF "$(TARGETDEPS)"!=""
-#.TARGETS .SEQUENTIAL :- $(TARGETDEPS) ALLTAR
-.INIT .SEQUENTIAL : $(TARGETDEPS) $(NULLPRQ)
-.ENDIF
-.ENDIF
-
-# -Gc breaks the dependency chain and causes indefinite nummbers of $(CPPUMAKER)
-.IF "$(BOOTSTRAP_SERVICE)"!="TRUE"
-CPPUMAKERFLAGS*=-L
-.ENDIF			# "$(BOOTSTRAP_SERVICE)"!="TRUE"
-
-.IF "$(UNOTYPES)" != ""
-# makeing all in one
-.DIRCACHE=no
-.IF "$(OBJFILES)"!=""
-$(OBJFILES) : $(UNOUCRTARGET)
-.ENDIF			# "$(OBJFILES)"!=""
-.IF "$(SLOFILES)"!=""
-$(SLOFILES) : $(UNOUCRTARGET)
-.ENDIF			# "$(SLOFILES)"!=""
-.IF "$(DEPOBJFILES)"!=""
-$(DEPOBJFILES) : $(UNOUCRTARGET)
-.ENDIF			# "$(SLOFILES)"!=""
-.IF "$(NOOPTTARGET)"!=""
-$(NOOPTTARGET) : $(UNOUCRTARGET)
-.ENDIF			# "$(SLOFILES)"!=""
-.IF "$(NOOPTFILES)"!=""
-$(NOOPTFILES) : $(UNOUCRTARGET)
-.ENDIF			# "$(SLOFILES)"!=""
-.IF "$(EXCEPTIONSFILES)"!=""
-$(EXCEPTIONSFILES) : $(UNOUCRTARGET)
-.ENDIF			# "$(SLOFILES)"!=""
-.IF "$(EXCEPTIONSNOOPTTARGET)"!=""
-$(EXCEPTIONSNOOPTTARGET) : $(UNOUCRTARGET)
-.ENDIF			# "$(SLOFILES)"!=""
-.IF "$(EXCEPTIONSNOOPTFILES)"!=""
-$(EXCEPTIONSNOOPTFILES) : $(UNOUCRTARGET)
-.ENDIF			# "$(SLOFILES)"!=""
-
-$(UNOUCRTARGET) : $(UNOUCRHEADER)
-
-# keep that one to rebuild single misses
-$(UNOUCRHEADER):
-    @noop
-
-$(UNOUCRTARGET) : $(UNOUCRDEP)
-.IF "$(XML2MK_FILES)"!=""
-    @@-$(RM) $(foreach,i,$(XML2MK_FILES) $(MISC)/$(i).mk)
-.ENDIF			# "$(XML2MK_FILES)"!=""
-    @@-$(MKDIRHIER) $(UNOUCROUT)
-    $(COMMAND_ECHO)$(CPPUMAKER) @$(mktmp $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOTYPES:^"-T")  $(UNOUCRRDB)) && $(TOUCH) $@
-.ENDIF			# "$(UNOTYPES)" != ""
-
-.IF "$(COMP1RDBTARGETN)"!=""
-$(COMP1RDBTARGETN) : $(COMPRDB)
-.ENDIF			# "$(COMP1RDBTARGETN)"!=""
-
-.IF "$(COMP2RDBTARGETN)"!=""
-$(COMP2RDBTARGETN) : $(COMPRDB)
-.ENDIF			# "$(COMP2RDBTARGETN)"!=""
-
-.IF "$(COMP3RDBTARGETN)"!=""
-$(COMP3RDBTARGETN) : $(COMPRDB)
-.ENDIF			# "$(COMP3RDBTARGETN)"!=""
-
-.IF "$(COMP4RDBTARGETN)"!=""
-$(COMP4RDBTARGETN) : $(COMPRDB)
-.ENDIF			# "$(COMP4RDBTARGETN)"!=""
-
-.IF "$(COMP5RDBTARGETN)"!=""
-$(COMP5RDBTARGETN) : $(COMPRDB)
-.ENDIF			# "$(COMP5RDBTARGETN)"!=""
-
-.IF "$(COMP6RDBTARGETN)"!=""
-$(COMP6RDBTARGETN) : $(COMPRDB)
-.ENDIF			# "$(COMP6RDBTARGETN)"!=""
-
-.IF "$(COMP7RDBTARGETN)"!=""
-$(COMP7RDBTARGETN) : $(COMPRDB)
-.ENDIF			# "$(COMP7RDBTARGETN)"!=""
-
-.IF "$(COMP8RDBTARGETN)"!=""
-$(COMP8RDBTARGETN) : $(COMPRDB)
-.ENDIF			# "$(COMP8RDBTARGETN)"!=""
-
-.IF "$(COMP9RDBTARGETN)"!=""
-$(COMP9RDBTARGETN) : $(COMPRDB)
-.ENDIF			# "$(COMP9RDBTARGETN)"!=""
-
-.ENDIF			# "$(L10N_framework)"!=""
-.ELSE			# "$(lintit)"==""
-
-ALLTAR: $(OBJFILES) $(SLOFILES)
-
-.ENDIF			# "$(lintit)"==""
-
-.IF "$(SDINAME)"!=""
-$(OBJ)/$(CINTERNAME).obj : $(SDITARGET)
-.ENDIF
-
-.IF "$(SDI1NAME)"!=""
-$(OBJ)/$(CINTER1NAME).obj : $(SDI1TARGET)
-.ENDIF
-
-.IF "$(SDI2NAME)"!=""
-$(OBJ)/$(CINTER2NAME).obj : $(SDI2TARGET)
-.ENDIF
-
-.IF "$(SDI3NAME)"!=""
-$(OBJ)/$(CINTER3NAME).obj : $(SDI3TARGET)
-.ENDIF
-
-.IF "$(SDI4NAME)"!=""
-$(OBJ)/$(CINTER4NAME).obj : $(SDI4TARGET)
-.ENDIF
-
-.IF "$(SDI5NAME)"!=""
-$(OBJ)/$(CINTER5NAME).obj : $(SDI5TARGET)
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!=""
-.IF "$(GENJAVAFILES)"!=""
-$(GENJAVAFILES) : $(RDB)
-$(JAVATARGET) : $(GENJAVAFILES)
-.ENDIF			# "$(GENJAVAFILES)"!=""
-.ENDIF          # "$(SOLAR_JAVA)"!=""
-
-.IF "$(HXXCOPYFILES)" != ""
-$(HXXCOPYTARGET):	$(HXXCOPYFILES)
-    $(COMMAND_ECHO)$(COPY) $(COPYUPDATE) $(HXXCOPYFILES) $(INCCOM) $(CHECKCOPYURESULT)
-.ENDIF
-
-.IF "$(UNIXTEXT)"!=""
-$(UNIXTEXT) : $(UNIXTEXT:f)
-    @echo "Making:   " $@
-    @@-$(RM) -f $@
-    @tr -d "\015" < $(@:f) > $@
-
-.ENDIF			# "$(UNIXTEXT)"!=""
-
-.IF "$(WITH_LANG)"!=""
-.IF "$(LOCALIZESDF)"!=""
-
-# dummy target to keep the build happy if not even the .zip exists. localization tools deal with not existing
-# localize.sdf themself
-"$(LOCALIZESDF)%":
-    @echo $(LOCALIZESDF)
-    @@-$(MKDIRHIER) $(@:d)
-    $(TOUCH) $@
-
-.IF "$(LOCALIZATION_FOUND)"==""
-.IF "$(LOCALSDFFILE)"!="" && "$(LOCALSDFFILE)"=="$(LOCALIZESDF)"
-"$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip
-    @@-$(MKDIRHIER) $(@:d)
-    @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET)
-    @-unzip -o -d $(COMMONMISC)/$(PRJNAME) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(subst,$(COMMONMISC)/$(PRJNAME)/, $@)
-    @@$(TOUCH) $@
-.ENDIF			# "$(LOCALSDFFILE)"!=""
-.ENDIF			# "$(LOCALIZATION_FOUND)"==""
-.ENDIF			# "$(LOCALIZESDF)"!=""
-.ENDIF			# "$(WITH_LANG)"!=""
-
-.IF "$(EXTUPDATEINFO_NAME)"!=""
-$(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE)
-    $(PERL) $(SOLARENV)/bin/make_ext_update_info.pl --out $(EXTUPDATEINFO_DEST) $(foreach,i,$(EXTUPDATEINFO_URLS) --update-url "$i") $(EXTUPDATEINFO_SOURCE)
-.ENDIF			# "$(EXTUPDATEINFO_NAME)"!=""
-
-makedoc:
-        @@-mkdir $(OUT)/ucrdoc
-        $(COMMAND_ECHO)$(IDLC) $(VERBOSITY) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))		
-
-.IF "$(LOCALDBTARGET)"!=""
-$(LOCALDBTARGET) : $(URDFILES) $(DEPIDLFILES)
-    $(COMMAND_ECHO)$(IDLC) $(VERBOSITY) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)/ucr/$(IDLPACKAGE) $(all_outdated_idl))
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
-.ENDIF
-
-.IF "$(LOCALDOCDBTARGET)"!=""
-$(LOCALDOCDBTARGET) : $(URDDOCFILES) $(DEPIDLFILES)
-    $(COMMAND_ECHO)$(IDLC) $(VERBOSITY) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(all_outdated_idl))
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
-.ENDIF
-
-.IF "$(UNOIDLDBTARGET)"!=""
-$(UNOIDLDBTARGET) : $(UNOIDLDBFILES) $(UNOIDLDBREGS)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
-.IF "$(LOCALREGDB)"!=""
-    $(COMMAND_ECHO)$(REGMERGE) $(LOCALREGDB) / $@
-.ENDIF
-.ENDIF			# "$(UNOIDLDBTARGET)"!=""
-
-.IF "$(UNOIDLDBDOCTARGET)"!=""
-$(UNOIDLDBDOCTARGET) : $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
-.IF "$(LOCALREGDB)"!=""
-    $(COMMAND_ECHO)$(REGMERGE) $(LOCALREGDB) / $@
-.ENDIF
-.ENDIF			# "$(UNOIDLDBDOCTARGET)"!=""
-
-.IF "$(SCP_PRODUCT_TYPE)"!=""
-$(SCP_PRODUCT_TYPE):
-    @@-$(MKDIRHIER) $(PAR)/$@
-    @@-$(MKDIRHIER) $(BIN)/$@
-
-.ENDIF			# "$(PARFILES)"!=""
-
-"$(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg" :
-    $(TOUCH) $@
-
-.IF "$(COMPVERMK)"!=""
-.IF "$(UPDATER)"!=""
-.IF "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
-COMPVERMK_PHONY:=.PHONY
-.ENDIF			# "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
-COMPVTMP:=$(mktmp iii)
-"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
-.IF "$(CCNUMVER)"!=""
-    @echo COMNAME:=$(COMNAME) > $(COMPVTMP)
-    @echo COMID:=$(COMID) >> $(COMPVTMP)
-.IF "$(COM)"=="GCC"
-    @echo SHORTSTDCPP3:=$(SHORTSTDCPP3) >> $(COMPVTMP)
-    @echo SHORTSTDC3:=$(SHORTSTDC3) >> $(COMPVTMP)
-.ENDIF
-    @echo CCNUMVER:=$(CCNUMVER) >> $(COMPVTMP)
-    @echo CCVER:=$(CCVER:s/-/ /:1) >> $(COMPVTMP)
-    @echo CDEFS+=-DCPPU_ENV=$(COMNAME) >> $(COMPVTMP)
-    @echo COMPATH_STORED:=$(COMPATH:s!\!/!) >> $(COMPVTMP)
-    @@-$(RM) $(@)_$(COMPVTMP:b)
-    @$(TYPE) $(COMPVTMP) | tr -d "\015" > $(@)_$(COMPVTMP:b)
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI)
-    @-$(RENAME) $(@)_$(COMPVTMP:b) $@
-    @@-$(RM) $(@)_$(COMPVTMP:b)
-.ELSE           # "$(CCNUMVER)"!=""
-    @@-$(RM) $@
-.ENDIF          # "$(CCNUMVER)"!=""
-
-.ENDIF			# "$(COMPVERMK)"!=""
-.ENDIF			# "$(UPDATER)"!=""
-
-.IF "$(JAVAVERMK)"!=""
-.IF "$(JAVALOCATION)"!="$(JAVA_HOME)"
-"$(JAVAVERMK)" .PHONY :
-.ELSE          # "$(JAVALOCATION)"!="$(JAVA_HOME)"
-"$(JAVAVERMK)" : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
-.ENDIF          # "$(JAVALOCATION)"!="$(JAVA_HOME)"
-    @-$(RM) $@
-    @echo JAVAVER:=$(JAVAVER) > $@
-    @echo JAVANUMVER:=$(JAVANUMVER) >> $@
-    @echo JAVALOCATION:=$(JAVA_HOME) >> $@
-
-.ENDIF			# "$(JAVAVERMK)"!=""
-
-# on recursive call there seems to be one blank in TARGETDEP
-# which makes it not empty :-(
-.IF "$(TARGETDEPS:s/ //)"!=""
-$(TARGETDEPS) : $(LOCALIZE_ME_DEST)
-.ENDIF          # "$(TARGETDEPS)"!=""
-
-.IF "$(LOCALIZE_ME_DEST)"!=""
-
-.IF "$(WITH_LANG)"==""
-$(LOCALIZE_ME_DEST) : $(LOCALIZE_ME)
-    $(COMMAND_ECHO)-$(RM) $(INCCOM)/$(TARGET)_lastrun.mk
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(COPY) $(@:b:+"_tmpl")$(@:e) $@
-
-.ELSE			# "$(WITH_LANG)"==""
-#  LASTRUN_MERGED
-.INCLUDE .IGNORE : $(INCCOM)/$(TARGET)_lastrun.mk
-.IF "$(LASTRUN_MERGED)"=="TRUE"
-$(LOCALIZE_ME_DEST) : $(LOCALIZE_ME) $(LOCALIZESDF) 
-.ELSE			# "$(LASTRUN_MERGED)"=="TRUE"
-$(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) $(LOCALIZESDF) 
-    echo LASTRUN_MERGED:=TRUE > $(INCCOM)/$(TARGET)_lastrun.mk
-.ENDIF			# "$(LASTRUN_MERGED)"=="TRUE"
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $(@:d)$(@:b:+"_tmpl")$(@:e).$(INPATH) $@
-
-.ENDIF			# "$(WITH_LANG)"==""
-.ENDIF          # "$(LOCALIZE_ME_DEST)"!=""
-
-.IF "$(XMLPROPERTIES)"!=""
-.IF "$(L10N_framework)"!=""
-XML_ISO_CODE*=-ISO99 $(L10N_framework)
-.ENDIF
-.IF "$(WITH_LANG)"!=""
-$(MISC)/$(TARGET)_%.done : $(COMMONMISC)/$(TARGET)/%.xrb
-.ELSE			# "$(WITH_LANG)"!=""
-$(MISC)/$(TARGET)_%.done : %.xrb
-.ENDIF			# "$(WITH_LANG)"!=""
-    @@-$(RM) $(MISC)/$(<:b).interm$(TARGET)
-    native2ascii -encoding UTF8 $< $(MISC)/$(<:b).interm$(TARGET) && $(XMLEX) -i $(MISC)/$(<:b).interm$(TARGET) -o $(CLASSDIR) $(XML_ISO_CODE) -g -d $@
-    @@$(RM)  $(MISC)/$(<:b).interm$(TARGET)
-.ENDIF			# "$(XMLPROPERTIES)"!=""
-
-.IF "$(SDI1TARGET)$(SDI2TARGET)$(SDI3TARGET)$(SDI4TARGET)$(SDI5TARGET)$(SDI6TARGET)$(SDI7TARGET)$(SDI8TARGET)$(SDI9TARGET)"!=""
-.INCLUDE : _tg_sdi.mk
-.ENDIF			# "$(SDI1TARGET)$(SDI2TARGET)$(SDI3TARGET)$(SDI4TARGET)$(SDI5TARGET)$(SDI6TARGET)$(SDI7TARGET)$(SDI8TARGET)$(SDI9TARGET)"!=""
-
-.IF "$(DEF1NAME)$(DEF2NAME)$(DEF3NAME)$(DEF4NAME)$(DEF5NAME)$(DEF6NAME)$(DEF7NAME)$(DEF8NAME)$(DEF9NAME)"!=""
-.INCLUDE : _tg_def.mk
-.ENDIF
-
-# -------
-# - LIB -
-# -------
-
-.IF "$(OBJTARGET)$($(SECOND_BUILD)OBJTARGET)"!=""
-.INCLUDE : tg_obj.mk
-.ENDIF			# "$(OBJTARGET)$($(SECOND_BUILD)OBJTARGET)"!=""
-
-# -------
-# - SLB -
-# -------
-
-.IF "$(SLOTARGET)$($(SECOND_BUILD)SLOTARGET)"!=""
-.INCLUDE : tg_slo.mk
-.ENDIF			# "$(SLOTARGET)$($(SECOND_BUILD)SLOTARGET)"!=""
-
-# --------
-# - LIBS -
-# --------
-
-.IF "$(LIB1TARGET)$(LIB2TARGET)$(LIB3TARGET)$(LIB4TARGET)$(LIB5TARGET)$(LIB6TARGET)$(LIB7TARGET)$(LIB8TARGET)$(LIB9TARGET)" != ""
-.INCLUDE : _tg_lib.mk
-.ENDIF			# "$(LIB1TARGET)$(LIB2TARGET)$(LIB3TARGET)$(LIB4TARGET)$(LIB5TARGET)$(LIB6TARGET)$(LIB7TARGET)$(LIB8TARGET)$(LIB9TARGET)" != ""
-
-# -------
-# - SRS -
-# -------
-
-.IF "$(SRS1NAME)$(SRS2NAME)$(SRS3NAME)$(SRS4NAME)$(SRS5NAME)$(SRS6NAME)$(SRS7NAME)$(SRS8NAME)$(SRS9NAME)"!=""
-.INCLUDE : _tg_srs.mk
-.ENDIF          # "$(SRS1NAME)$(SRS2NAME)$(SRS3NAME)$(SRS4NAME)$(SRS5NAME)$(SRS6NAME)$(SRS7NAME)$(SRS8NAME)$(SRS9NAME)"!=""
-
-# -------
-# - RES -
-# -------
-
-.IF "$(RCTARGET)"!=""
-.INCLUDE : tg_res.mk
-.ENDIF			# "$(RCTARGET)"!=""
-
-# -------
-# - SHL -
-# -------
-
-.IF "$(SHL1TARGETN)$(SHL2TARGETN)$(SHL3TARGETN)$(SHL4TARGETN)$(SHL5TARGETN)$(SHL6TARGETN)$(SHL7TARGETN)$(SHL8TARGETN)$(SHL9TARGETN)"!=""
-.INCLUDE : _tg_shl.mk
-.ENDIF			# "$(SHL1TARGETN)$(SHL2TARGETN)$(SHL3TARGETN)$(SHL4TARGETN)$(SHL5TARGETN)$(SHL6TARGETN)$(SHL7TARGETN)$(SHL8TARGETN)$(SHL9TARGETN)"!=""
-
-.IF "$(USE_VERSIONH)"!=""
-.INIT .SEQUENTIAL : $(USE_VERSIONH) $(NULLPRQ)
-.ENDIF          # "$(USE_VERSIONH)"!=""
-
-# -------
-# - APP -
-# -------
-
-.IF "$(APP1TARGETN)$(APP2TARGETN)$(APP3TARGETN)$(APP4TARGETN)$(APP5TARGETN)$(APP6TARGETN)$(APP7TARGETN)$(APP8TARGETN)$(APP9TARGETN)"!=""
-.INCLUDE : _tg_app.mk
-.ENDIF
-
-# -------
-# - SCP -
-# -------
-
-.IF "$(SCP1TARGETN)$(SCP2TARGETN)$(SCP3TARGETN)$(SCP4TARGETN)$(SCP5TARGETN)$(SCP6TARGETN)$(SCP7TARGETN)$(SCP8TARGETN)$(SCP9TARGETN)"!=""
-.INCLUDE : _tg_scp.mk
-.ENDIF
-
-# -------
-# - ZIP -
-# -------
-
-.IF "$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)"!=""
-.INCLUDE : _tg_zip.mk
-.ENDIF
-
-# -------
-# - RESLIBTARGET -
-# -------
-
-.IF "$(RESLIB1TARGETN)$(RESLIB2TARGETN)$(RESLIB3TARGETN)$(RESLIB4TARGETN)$(RESLIB5TARGETN)$(RESLIB6TARGETN)$(RESLIB7TARGETN)$(RESLIB8TARGETN)$(RESLIB9TARGETN)"!=""
-.INCLUDE : _tg_rslb.mk
-.ENDIF
-
-# -------
-# - processing config -
-# -------
-
-.IF "$(XCSFILES)$(XCUFILES)"!=""
-.INCLUDE : tg_config.mk
-.ENDIF			# "$(XCSFILES)$(XCUFILES)"!=""
-
-
-# ------------------
-# - INCLUDE DEPEND -
-# ------------------
-
-# same block as in depend build
-.IF "$(MAKEFILERC)"==""
-.IF "$(RCFILES)$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(PARFILES)" != ""
-.IF "$(DEPFILES)" != ""
-.INCLUDE : $(DEPFILES)
-.ENDIF			# "$(DEPFILES)" != ""
-.IF "$(nodep)"==""
-.IF "$(DEPCOLLECT_SLO)" != ""
-.PHONY : $(DEPCOLLECT_SLO)
-.INCLUDE .IGNORE : $(DEPCOLLECT_SLO)
-.INCLUDE : $(DEPFILE_SLO)
-.ENDIF			# "$(DEPCOLLECT_SLO)" != ""
-.IF "$(DEPCOLLECT_OBJ)" != ""
-.PHONY : $(DEPCOLLECT_OBJ)
-.INCLUDE .IGNORE : $(DEPCOLLECT_OBJ)
-.INCLUDE : $(DEPFILE_OBJ)
-.ENDIF			# "$(DEPCOLLECT_OBJ)" != ""
-.ENDIF			# "$(nodep)"==""
-.ENDIF			# "$(RCFILES)$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(PARFILES)" != ""
-.ELSE		# MAKEFILERC
-.ENDIF		# MAKEFILERC
-
-.IF "$(make_srs_deps)"==""
-.IF "$(SRCFILES)" != "" || "$(SRC1FILES)" != "" || "$(SRC2FILES)" != ""
-.IF "$(nodep)"==""
-.INCLUDE : $(MISC)/$(TARGET).dpr
-.ENDIF			# "$(nodep)"==""
-.ENDIF
-.ENDIF
-
-.IF "$(make_zip_deps)"==""
-.IF "$(ZIP1TARGET)" != "" || "$(ZIP2TARGET)" != "" || "$(ZIP3TARGET)" != ""
-.IF "$(nodep)"==""
-.INCLUDE : $(MISC)/$(TARGET).dpz
-# introduce separation char
-missing_zipdep_langs=$(alllangiso:^"+":+"+")
-some_dummy_var:=$(foreach,i,$(zipdep_langs) $(assign missing_zipdep_langs:=$(strip $(subst,+$(i)+, $(missing_zipdep_langs)))))
-.IF "$(missing_zipdep_langs)"!=""
-ZIPDEPPHONY=.PHONY
-.ENDIF			# "$(missing_zipdep_langs)"!=""
-.ENDIF			# "$(nodep)"==""
-.ENDIF
-.ENDIF
-
-last_target:
-    $(NULL)
-
-$(MISC)/$(TARGET)genjava.mk: 	$(IDLFILES)
-
-.IF "$(JAVACLASSFILES:s/DEFINED//)"!=""
-.IF "$(L10N_framework)"==""
-.INCLUDE .IGNORE : $(MISC)/$(TARGET).dpj
-$(TARGETDPJ) : $(JAVAFILES) $(JAVATARGET)
-.ENDIF			# "$(L10N_framework)"==""
-.ENDIF
-
-.IF "$(JARTARGETN)"!=""
-.INCLUDE : tg_jar.mk
-.ENDIF			# "$(JARTARGETN)"!=""
-
-# ----------------------------------
-# - NOOPT - files ohne optimierung -
-# ----------------------------------
-
-.IF "$(NOOPTTARGET)" != ""
-.IF "$(NOOPT_FLAG)" == ""
-
-$(NOOPTTARGET):
-.IF "$(VERBOSE)" == "TRUE"
-    @echo --- NOOPTFILES ---
-.ENDIF
-    @dmake $(MFLAGS) $(MAKEFILE) nopt=true $(NOOPTFILES) NOOPT_FLAG=TRUE $(CALLMACROS)
-.IF "$(VERBOSE)" == "TRUE"
-    @echo --- NOOPTFILES OVER ---
-.ENDIF
-
-$(NOOPTFILES):
-.IF "$(VERBOSE)" == "TRUE"
-    @echo --- NOOPT ---
-.ENDIF
-    @dmake $(MFLAGS) $(MAKEFILE) nopt=true NOOPT_FLAG=TRUE $(CALLMACROS) $@
-.IF "$(VERBOSE)" == "TRUE"
-    @echo --- NOOPT OVER ---
-.ENDIF
-.ENDIF
-.ENDIF
-
-
-# ----------------------------------
-# - EXCEPTIONSNOOPT - files with exceptions, without optimization -
-# ----------------------------------
-
-.IF "$(EXCEPTIONSNOOPTTARGET)" != ""
-.IF "$(EXCEPTIONSNOOPT_FLAG)" == ""
-
-$(EXCEPTIONSNOOPTTARGET):
-.IF "$(VERBOSE)" == "TRUE"
-    @echo --- EXCEPTIONSNOOPTFILES ---
-.ENDIF
-    @dmake $(MFLAGS) $(MAKEFILE) ENABLE_EXCEPTIONS=true $(EXCEPTIONSNOOPTFILES) EXCEPTIONSNOOPT_FLAG=TRUE nopt=true $(CALLMACROS)
-.IF "$(VERBOSE)" == "TRUE"
-    @echo --- EXCEPTIONSNOOPTFILES OVER ---
-.ENDIF
-
-$(EXCEPTIONSNOOPTFILES):
-.IF "$(VERBOSE)" == "TRUE"
-    @echo --- EXCEPTIONSNOOPT ---
-.ENDIF
-    @dmake $(MFLAGS) $(MAKEFILE) ENABLE_EXCEPTIONS=true EXCEPTIONSNOOPT_FLAG=TRUE nopt=true $(CALLMACROS) $@
-.IF "$(VERBOSE)" == "TRUE"
-    @echo --- EXCEPTIONSNOOPT OVER ---
-.ENDIF
-
-
-.ENDIF
-.ENDIF
-
-.IF "$(nodep)"==""
-# recreate dependency files that were removed manually or vanished otherwise...
-forcedeps: $(DEPFILE_SLO) $(DEPFILE_OBJ)
-    @$(null,$(DEPS_MISSING) noop $(eq,$(sort $(DEPS_MISSING)),$(sort $(DEPS_MADE)) noop dmake depend=t $(MFLAGS) $(MAKEMACROS) ALLDEP))
-    @noop $(foreach,i,$($(TARGET)_known_dpcc) $(assign DEPS_MADE:=$(subst,$i, $(DEPS_MADE))))
-    @$(null,$(DEPS_MADE) noop $(null,$(DEPFILE_SLO) noop $(RM) $(DEPFILE_SLO)))
-    @$(null,$(DEPS_MADE) noop $(null,$(DEPFILE_OBJ) noop $(RM) $(DEPFILE_OBJ)))
-
-ALLTAR : forcedeps
-
-.ENDIF			# "$(nodep)"==""
-
-# -------------------------
-# - several kill targets -
-# -------------------------
-
-"$(TMP)/makedt.don":
-    @$(TOUCH) $(TMP)/makedt.don
-
-killbin:
-.IF "$(GUI)"=="WNT"
-    @$(IFEXIST) $(BIN)/$(SHL1TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL1TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)/$(SHL2TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL2TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)/$(SHL3TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL3TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)/$(SHL4TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL4TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)/$(SHL5TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL5TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)/$(SHL6TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL6TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)/$(SHL7TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL7TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)/$(SHL8TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL8TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)/$(SHL9TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL9TARGET).dll $(FI)
-    @$(IFEXIST) $(BIN)/$(APP1TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP1TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)/$(APP2TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP2TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)/$(APP3TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP3TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)/$(APP4TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP4TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)/$(APP5TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP5TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)/$(APP6TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP6TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)/$(APP7TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP7TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)/$(APP8TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP8TARGET)$(EXECPOST) $(FI)
-    @$(IFEXIST) $(BIN)/$(APP9TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP9TARGET)$(EXECPOST) $(FI)
-
-.ELSE			# "$(GUI)"=="WNT"
-.IF "$(SHL1TARGET)"!=""
-    @-$(RM) $(LB)/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST)
-.ENDIF
-.IF "$(SHL2TARGET)"!=""
-    @-$(RM) $(LB)/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST)
-.ENDIF
-.IF "$(SHL3TARGET)"!=""
-    @-$(RM) $(LB)/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST)
-.ENDIF
-.IF "$(SHL4TARGET)"!=""
-    @-$(RM) $(LB)/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST)
-.ENDIF
-.IF "$(SHL5TARGET)"!=""
-    @-$(RM) $(LB)/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST)
-.ENDIF
-.IF "$(SHL6TARGET)"!=""
-    @-$(RM) $(LB)/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST)
-.ENDIF
-.IF "$(SHL7TARGET)"!=""
-    @-$(RM) $(LB)/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST)
-.ENDIF
-.IF "$(SHL8TARGET)"!=""
-    @-$(RM) $(LB)/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST)
-.ENDIF
-.IF "$(SHL9TARGET)"!=""
-    @-$(RM) $(LB)/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST)
-.ENDIF
-.IF "$(APP1TARGET)"!=""
-    @-$(RM) $(BIN)/$(APP1TARGET)$(EXECPOST)
-.ENDIF
-.IF "$(APP2TARGET)"!=""
-    @-$(RM) $(BIN)/$(APP2TARGET)$(EXECPOST)
-.ENDIF
-.IF "$(APP3TARGET)"!=""
-    @-$(RM) $(BIN)/$(APP3TARGET)$(EXECPOST)
-.ENDIF
-.IF "$(APP4TARGET)"!=""
-    @-$(RM) $(BIN)/$(APP4TARGET)$(EXECPOST)
-.ENDIF
-.IF "$(APP5TARGET)"!=""
-    @-$(RM) $(BIN)/$(APP5TARGET)$(EXECPOST)
-.ENDIF
-.IF "$(APP6TARGET)"!=""
-    @-$(RM) $(BIN)/$(APP6TARGET)$(EXECPOST)
-.ENDIF
-.IF "$(APP7TARGET)"!=""
-    @-$(RM) $(BIN)/$(APP7TARGET)$(EXECPOST)
-.ENDIF
-.IF "$(APP8TARGET)"!=""
-    @-$(RM) $(BIN)/$(APP8TARGET)$(EXECPOST)
-.ENDIF
-.IF "$(APP9TARGET)"!=""
-    @-$(RM) $(BIN)/$(APP9TARGET)$(EXECPOST)
-.ENDIF
-.ENDIF			# "$(GUI)"=="WNT"
-
-killobj:
-.IF "$(SLOFILES)" != ""
-    -cd $(SLO) && $(TYPE:s/+//) $(mktmp  $(SLOFILES:f)) | xargs -n 20 rm 
-    -cd $(SLO) && $(TYPE:s/+//) $(mktmp  $(SLOFILES:s/.obj/.o/:f)) | xargs -n 20 rm
-.ENDIF
-.IF "$(OBJFILES)" != ""
-    -cd $(OBJ) && $(TYPE:s/+//) $(mktmp  $(OBJFILES:f)) | xargs -n 20 rm 
-    -cd $(OBJ) && $(TYPE:s/+//) $(mktmp  $(OBJFILES:s/.obj/.o/:f)) | xargs -n 20 rm
-.ENDIF
-
-.IF "$(REAL_$(SECOND_BUILD)_SLOFILES)" != ""
-    -cd $(REAL_$(SECOND_BUILD)_SLO) && $(TYPE:s/+//) $(mktmp  $(REAL_$(SECOND_BUILD)_SLOFILES:f)) | xargs -n 20 rm
-    -cd $(REAL_$(SECOND_BUILD)_SLO) && $(TYPE:s/+//) $(mktmp  $(REAL_$(SECOND_BUILD)_SLOFILES:s/.obj/.o/:f)) | xargs -n 20 rm
-.ENDIF
-.IF "$(REAL_$(SECOND_BUILD)_OBJFILES)" != ""
-    -cd $(REAL_$(SECOND_BUILD)_OBJ) && $(TYPE:s/+//) $(mktmp  $(REAL_$(SECOND_BUILD)_OBJFILES:f)) | xargs -n 20 rm 
-    -cd $(REAL_$(SECOND_BUILD)_OBJ) && $(TYPE:s/+//) $(mktmp  $(REAL_$(SECOND_BUILD)_OBJFILES:s/.obj/.o/:f)) | xargs -n 20 rm
-.ENDIF
-.IF "$(DEPOBJFILES)" != ""
-    -cd $(SLO) && $(TYPE:s/+//) $(mktmp  $(DEPOBJFILES:f)) | xargs -n 20 rm
-    -cd $(SLO) && $(TYPE:s/+//) $(mktmp  $(DEPOBJFILES:s/.obj/.o/:f)) | xargs -n 20 rm
-    -cd $(OBJ) && $(TYPE:s/+//) $(mktmp  $(DEPOBJFILES:f)) | xargs -n 20 rm
-    -cd $(OBJ) && $(TYPE:s/+//) $(mktmp  $(DEPOBJFILES:s/.obj/.o/:f)) | xargs -n 20 rm
-.ENDIF
-    @echo objects weg!
-
-killsrs:
-# doesn't work - fix me!
-.IF "$(SRSFILES)" != ""
-    $(RM) $(SRSFILES)
-.ENDIF
-    @echo srsfiles weg!
-
-killres:
-.IF "$(RESLIB1TARGETN)$(RESLIB2TARGETN)$(RESLIB3TARGETN)$(RESLIB4TARGETN)$(RESLIB5TARGETN)$(RESLIB6TARGETN)$(RESLIB7TARGETN)$(RESLIB8TARGETN)$(RESLIB9TARGETN)"!=""
-    @(COMMAND_ECHO)$(RM) $(RESLIB1TARGETN) $(RESLIB2TARGETN) $(RESLIB3TARGETN) $(RESLIB4TARGETN) $(RESLIB5TARGETN) $(RESLIB6TARGETN) $(RESLIB7TARGETN) $(RESLIB8TARGETN) $(RESLIB9TARGETN)
-    @echo resource files removed!
-.ELSE			# "$(RESLIB1TARGETN)$(RESLIB2TARGETN)$(RESLIB3TARGETN)$(RESLIB4TARGETN)$(RESLIB5TARGETN)$(RESLIB6TARGETN)$(RESLIB7TARGETN)$(RESLIB8TARGETN)$(RESLIB9TARGETN)"!=""
-    @echo no resource files defined!
-.ENDIF			# "$(RESLIB1TARGETN)$(RESLIB2TARGETN)$(RESLIB3TARGETN)$(RESLIB4TARGETN)$(RESLIB5TARGETN)$(RESLIB6TARGETN)$(RESLIB7TARGETN)$(RESLIB8TARGETN)$(RESLIB9TARGETN)"!=""
-
-killdef:
-.IF "$(DEFTARGETN)" != ""
-    @(COMMAND_ECHO)$(RM) $(DEFTARGETN)
-.ENDIF
-    @echo deffiles weg!
-
-killlib:
-.IF "$(LIB1TARGETN)$(LIB2TARGETN)$(LIB3TARGETN)$(LIB4TARGETN)$(LIB5TARGETN)$(LIB6TARGETN)$(LIB7TARGETN)$(LIB8TARGETN)$(LIB9TARGETN)"!=""
-    @(COMMAND_ECHO)$(RM) $(LIB1TARGETN) $(LIB2TARGETN) $(LIB3TARGETN) $(LIB4TARGETN) $(LIB5TARGETN) $(LIB6TARGETN) $(LIB7TARGETN) $(LIB8TARGETN) $(LIB9TARGETN)
-.IF "$(LIB1ARCHIV)$(LIB2ARCHIV)$(LIB3ARCHIV)$(LIB4ARCHIV)$(LIB5ARCHIV)$(LIB6ARCHIV)$(LIB7ARCHIV)$(LIB8ARCHIV)$(LIB9ARCHIV)"!=""
-    @(COMMAND_ECHO)$(RM) $(LIB1ARCHIV) $(LIB2ARCHIV) $(LIB3ARCHIV) $(LIB4ARCHIV) $(LIB5ARCHIV) $(LIB6ARCHIV) $(LIB7ARCHIV) $(LIB8ARCHIV) $(LIB9ARCHIV)
-.ENDIF			# "$(LIB1ARCHIV)$(LIB2ARCHIV)$(LIB3ARCHIV)$(LIB4ARCHIV)$(LIB5ARCHIV)$(LIB6ARCHIV)$(LIB7ARCHIV)$(LIB8ARCHIV)$(LIB9ARCHIV)"!=""
-    @echo lib/archive files removed!
-.ENDIF			# "$(LIB1TARGETN)$(LIB2TARGETN)$(LIB3TARGETN)$(LIB4TARGETN)$(LIB5TARGETN)$(LIB6TARGETN)$(LIB7TARGETN)$(LIB8TARGETN)$(LIB9TARGETN)"!=""
-.IF "$(SLOTARGET)$(OBJTARGET)"!=""
-    @(COMMAND_ECHO)$(RM) $(SLOTARGET) $(OBJTARGET)
-    @echo default lib files removed!
-.ENDIF			# "$(SLOTARGET)$(OBJTARGET)"!=""
-    @echo done!
-
-clean_misc :
-.IF "$(MISC)"!=""
-    rm -rf $(MISC)/*
-    @echo misc is gone!
-.ELSE			# "$(MISC)"!=""
-    @echo can\'t be done! $$(MISC) not defined.
-.ENDIF			# "$(MISC)"!=""
-
-clean_all :
-.IF "$(OUT)"!=""
-    test -f $(PRJ)/prj/build.lst && rm -rf $(OUT)
-    @echo local output tree is gone!
-.ELSE			# "$(OUT)"!=""
-    @echo can\'t be done! $$(OUT) not defined.
-.ENDIF			# "$(OUT)"!=""
-
-
-SRCALLTARGET:	\
-        $(SDITARGET)	$(SDI1TARGET)	$(SDI2TARGET)		\
-        $(SDI3TARGET)	$(SDI4TARGET)	$(SDI5TARGET)		\
-        $(SRC1TARGET)	\
-        $(SRC2TARGET)	\
-        $(SRC3TARGET)	$(RCTARGET)		  \
-        $(SRC4TARGET)	$(SRC5TARGET)	$(SRC6TARGET)		\
-        $(SRC7TARGET)	$(SRC8TARGET)	$(SRC9TARGET)		\
-        $(SRC10TARGET)	$(SRC11TARGET)	$(SRC12TARGET)		\
-        $(SRC13TARGET)	$(SRC14TARGET)	$(SRC15TARGET)		\
-        $(SRC16TARGET)
-
-.IF "$(ZIP1TARGETN)$(ZIP2TARGETN)$(ZIP3TARGETN)$(ZIP4TARGETN)$(ZIP5TARGETN)$(ZIP6TARGETN)$(ZIP7TARGETN)$(ZIP8TARGETN)$(ZIP9TARGETN)"!=""
-ZIPALLTARGET: \
-        $(ZIP1TARGETN) \
-        $(ZIP2TARGETN) \
-        $(ZIP3TARGETN) \
-        $(ZIP4TARGETN) \
-        $(ZIP5TARGETN) \
-        $(ZIP6TARGETN) \
-        $(ZIP7TARGETN) \
-        $(ZIP8TARGETN) \
-        $(ZIP9TARGETN)
-.ELSE
-ZIPALLTARGET:
-.IF "$(VERBOSE)" != "FALSE"
-    @echo ---------------------------------------
-.ENDIF
-    @echo nothing to zip for activated languages!
-.IF "$(VERBOSE)" != "FALSE"
-    @echo ---------------------------------------
-.ENDIF
-.ENDIF
-
-
-#temporary workaround for non-existing delzip in extras
-delzip:
-    @echo
-    @echo ERROR: ZIPnTARGETS need a file named "delzip" to exist beside their makefile.mk
-    @echo ERROR: Create an empty file named delzip and commit it
-    @echo ERROR: for details see #i78434#
-    force_dmake_to_error
-
-.IF "$(make_srs_deps)"==""
-$(MISC)/$(TARGET).dpr : $(SRCFILES) $(SRC1FILES) $(SRC2FILES) $(SRC3FILES)
-.ENDIF
-
-.IF "$(make_zip_deps)"==""
-$(MISC)/$(TARGET).dpz $(ZIPDEPPHONY) : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN)
-.ENDIF
-
-VERSIONTMP:=$(mktmp iii)
-$(INCCOM)/%_version.h : $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
-    @echo $(EMQ)#define _BUILD $(EMQ)"$(BUILD)$(EMQ)" > $(VERSIONTMP)
-    @echo $(EMQ)#define _UPD $(EMQ)"$(UPD)$(EMQ)"                 >> $(VERSIONTMP)
-    @echo $(EMQ)#define _LAST_MINOR $(EMQ)"$(LAST_MINOR)$(EMQ)"   >> $(VERSIONTMP)
-    @echo $(EMQ)#define _RSCREVISION $(EMQ)"$(USQ)$(RSCREVISION)$(USQ)$(EMQ)" >> $(VERSIONTMP)
-    @echo $(EMQ)#define _INPATH $(EMQ)"$(INPATH)$(EMQ)"           >> $(VERSIONTMP)
-    @@-$(RM) $(@)_$(VERSIONTMP:b)
-    @$(TYPE) $(VERSIONTMP) > $(@)_$(VERSIONTMP:b)
-    @@-$(RM) $@
-    @-$(RENAME) $(@)_$(VERSIONTMP:b) $@
-
-.IF "$(MAKEFILERC)"==""
-warn_target_empty:
-    @echo '*'
-    @echo '* error $$(TARGET) is empty - this will cause problems'
-    @echo '*'
-    force_dmake_to_error
-.ELSE
-warn_target_empty:
-    @echo generated makefile.rc detected
-.ENDIF
-
-.IF "$(UNOTYPES)" != ""
-UNOUCRDEPxxx : $(UNOUCRDEP);
-.ENDIF			# "$(UNOTYPES)" != ""
-
-
-##new hid.lst trigger with GEN_HID2=TRUE
-#$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
-#	@echo "Making:   " $@
-#	@echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp
-#	$(COMMAND_ECHO)$(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp 
-#	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-#	@-$(RENAME) $@.$(ROUT).tmp $@
-#	@-mkdir $(@:d)hid
-#	$(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp
-#	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv $(FI)
-#	@-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv
-
-
-.IF "$(SOLAR_JAVA)"!=""
-.IF "$(JAVACLASSFILES:s/DEFINED//)$(javauno)"!=""
-.INCLUDE : tg_java.mk
-.ENDIF			# "$(JAVACLASSFILES:s/DEFINED//)$(javauno)"!=""
-.ENDIF          # "$(SOLAR_JAVA)"!=""
-
-.INCLUDE : tg_merge.mk
-.INCLUDE : tg_propmerge.mk
-.INCLUDE : tg_xmerge.mk
-
-wordcount:
-    wc *.* >> $(TMP)/wc.lst
-
-testt:
-    @echo test
-
-.ELSE			# "$(depend)" == ""
-
-# ----------
-# - DEPEND -
-# ----------
-
-ALLTAR : ALLDEP \
-        $(SUBDIRS)
-
-# same block as in regular build
-.IF "$(MAKEFILERC)"==""
-.IF "$(RCFILES)$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(PARFILES)" != ""
-.IF "$(DEPFILES)" != ""
-.INCLUDE : $(DEPFILES)
-.ENDIF			# "$(DEPFILES)" != ""
-.IF "$(nodep)"==""
-.IF "$(DEPCOLLECT_SLO)" != ""
-.PHONY : $(DEPCOLLECT_SLO)
-.INCLUDE .IGNORE : $(DEPCOLLECT_SLO)
-.INCLUDE : $(DEPFILE_SLO)
-.ENDIF			# "$(DEPCOLLECT_SLO)" != ""
-.IF "$(DEPCOLLECT_OBJ)" != ""
-.PHONY : $(DEPCOLLECT_OBJ)
-.INCLUDE .IGNORE : $(DEPCOLLECT_OBJ)
-.INCLUDE : $(DEPFILE_OBJ)
-.ENDIF			# "$(DEPCOLLECT_OBJ)" != ""
-.ENDIF			# "$(nodep)"==""
-.ENDIF			# "$(RCFILES)$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(PARFILES)" != ""
-.ELSE		# MAKEFILERC
-.ENDIF		# MAKEFILERC
-
-.INCLUDE : tg_dep.mk
-
-.ENDIF			# "$(depend)" == ""
-
-.IF "$(SUBDIRS)"!=""
-
-$(SUBDIRS) : $(SUBDIRSDEPS)
-
-.IF "$(mk_tmp)$(BSCLIENT)"!=""
-$(SUBDIRS)  .PHONY :
-    @echo ignoring SUBDIRS
-
-.ELSE			# "$(mk_tmp)$(BSCLIENT)"!=""
-#.IF "$(PRJNAME)"!="sw"
-.IF "$(GUI)"!="UNX"
-$(SUBDIRS) .PHONY :
-    @[
-        cd $@
-        cd
-        @$(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
-    ]
-.ELSE			# "$(GUI)"!="UNX"
-$(SUBDIRS) .PHONY :
-    cd $@; $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
-.ENDIF			# "$(GUI)"!="UNX"
-#.ENDIF
-.ENDIF			# "$(mk_tmp)$(BSCLIENT)"!=""
-.ENDIF			# "$(SUBDIRS)"!=""
-
-# workaround for strange dmake bug:
-# if the previous block was a rule or a target, "\#" isn't recognized
-# as an escaped "#". if it was an assignment, escaping works...
-some_unique_variable_name:=1
diff --git a/solenv/inc/templates/extension_tmpl.mk b/solenv/inc/templates/extension_tmpl.mk
deleted file mode 100644
index b9ea7db7e..000000000
--- a/solenv/inc/templates/extension_tmpl.mk
+++ /dev/null
@@ -1,153 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-############################################
-#
-# sample makefile for extension packing
-#
-# NOTE: not all of this is required or useful
-# for every specific case
-#
-############################################
-
-PRJ=..$/..
-
-PRJNAME=my_project
-TARGET=some_unique_target
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-# it might be useful to have an extension wide include to set things
-# like the EXTNAME variable (used for configuration processing)
-# .INCLUDE :  $(PRJ)$/source$/<extension name>$/<extension_name>.pmk
-
-# --- Files --------------------------------------------------------
-
-# name for uniq directory
-EXTENSIONNAME:=MyExtension
-EXTENSION_ZIPNAME:=MyExtension
-
-.IF "$(ENABLE_MYEXTENSION)" != "YES"
-@all:
-    @echo "$(EXTENSIONNAME) - extension disabled."
-.ENDIF
-.IF "$(SOLAR_JAVA)"==""
-@all:
-    @echo "$(EXTENSIONNAME) - extension requires java."
-.ENDIF
-
-
-# some other targets to be done
-
-
-
-# --- Extension packaging ------------------------------------------
-
-# these variables are optional and defaulted to the current directory
-
-DESCRIPTION_SRC:=config$/description.xml
-MANIFEST_SRC:=config$/manifest.xml
-COMPONENT_CONFIGDIR:=config
-
-# ------------------------------------------------------------------
-
-# optional: generated list of .xcu files contained in the extension
-COMPONENT_MANIFEST_GENERIC:=TRUE
-COMPONENT_MANIFEST_SEARCHDIR:=registry
-
-
-# variables to trigger predifined targets
-# just copy:
-COMPONENT_FILES= \
-    $(EXTENSIONDIR)$/xMyExtension$(EXECPOST) \
-    $(EXTENSIONDIR)$/some_local.html
-
-# localized configuration files
-COMPONENT_MERGED_XCU= \
-    $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Addons.xcu \
-    $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/extension$/MyExtension.xcu
-
-# other configuration files
-COMPONENT_XCU= \
-    $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Data.xcu
-
-# location of configurationfiles inside extension,
-# "." for flat .xcu files
-#COMPONENT_CONFIGDEST=.
-
-# native libraries
-COMPONENT_LIBRARIES= \
-    $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST)
-
-# jar files
-COMPONENT_JARFILES = \
-    $(EXTENSIONDIR)$/MyExtension.jar
-
-# disable fetching default OOo license text
-#CUSTOM_LICENSE=my_license.txt
-# override default license destination
-#PACKLICS= $(EXTENSIONDIR)$/registration$/$(CUSTOM_LICENSE)
-
-# -------------------------------
-#  variables for own targets specific to this extension; no common
-#  target available...
-#
-CONVERTER_FILE= \
-    $(EXTENSIONDIR)$/xMyExtension$(EXECPOST) \
-
-COMPONENT_DIALOGS= \
-    $(EXTENSIONDIR)$/basic$/Module1.xba \
-    $(EXTENSIONDIR)$/basic$/TargetChooser.xdl \
-    $(EXTENSIONDIR)$/basic$/dialog.xlb \
-    $(EXTENSIONDIR)$/basic$/impress.png \
-    $(EXTENSIONDIR)$/basic$/script.xlb \
-    $(EXTENSIONDIR)$/basic$/writer.png
-
-# add own targets to packing dependencies (need to be done before
-# packing the xtension
-EXTENSION_PACKDEPS=$(CONVERTER_FILE)  $(COMPONENT_DIALOGS) makefile.mk $(CUSTOM_LICENSE)
-
-# global settings for extension packing
-.INCLUDE : extension_pre.mk
-.INCLUDE : target.mk
-# global targets for extension packing
-.INCLUDE : extension_post.mk
-
-# own targets 
-$(CONVERTER_FILE) : $(SOLARBINDIR)$/$$(@:f)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(COMPONENT_DIALOGS) : dialogs$/$$(@:f)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(CUSTOM_LICENSE) : my_license.txt
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
deleted file mode 100644
index c49ee04b3..000000000
--- a/solenv/inc/tg_app.mk
+++ /dev/null
@@ -1,242 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#######################################################
-# instructions for linking
-# unroll begin
-
-.IF "$(APP$(TNR)LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP$(TNR)LINKTYPEFLAG=$(APPLINK$(APP$(TNR)LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP$(TNR)CODETYPE)"=="C"
-APP$(TNR)LINKER=$(LINKC)
-APP$(TNR)STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP$(TNR)LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(APP$(TNR)CODETYPE)"=="C"
-APP$(TNR)LINKER=$(LINK)
-APP$(TNR)STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP$(TNR)LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(APP$(TNR)CODETYPE)"=="C"
-
-APP$(TNR)RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP$(TNR)RPATH)*=/ERROR:/Bad_APP$(TNR)RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP$(TNR)LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP$(TNR)RPATH))
-.ENDIF
-
-.IF "$(APP$(TNR)STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP$(TNR)STACKN=$(LINKFLAGSTACK)$(APP$(TNR)STACK)
-.ENDIF
-.ELSE
-APP$(TNR)STACKN=
-.ENDIF
-
-.IF "$(APP$(TNR)NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP$(TNR)OBJS+= $(STDOBJVCL)
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)$(COM)" == "WNTGCC"
-APP$(TNR)RESO=
-.IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != ""
-APP$(TNR)RESO=$(MISC)/$(APP$(TNR)TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-APP$(TNR)DEPN+:=$(APP$(TNR)DEPNU)
-USE_APP$(TNR)DEF=
-.ENDIF
-
-.IF "$(APP$(TNR)TARGETN)"!=""
-
-.IF "$(APP$(TNR)PRODUCTNAME)"!=""
-APP$(TNR)PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\"
-.ENDIF			# "$(APP$(TNR)PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(APP$(TNR)LIBS)"!=""
-$(MISC)/$(APP$(TNR)TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          #"$(APP$(TNR)LIBS)"!="" 
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP$(TNR)TARGETN:b)_linkinc.ls
-$(APP$(TNR)TARGETN) : $(LINKINCTARGETS)
-.ENDIF          # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP$(TNR)LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
-    $(APP$(TNR)RES) \
-    $(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-    @-$(RM) $(MISC)/$(@:b).strip
-    @echo $(STDSLO) $(APP$(TNR)OBJS:s/.obj/.o/) \
-    `cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
-    $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
-    @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
-    @strip -i -R $(MISC)/$(@:b).strip -X $@
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        app $(APP$(TNR)RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
-    @echo "Making:   " $(@:f).app
-    @macosx-create-bundle $@
-.ENDIF		# "$(TARGETTYPE)"=="GUI"
-.ELSE		# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-    @echo $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-    $(APP$(TNR)OBJS:s/.obj/.o/) '\' >  $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-    @cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-    @echo $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-  .IF "$(VERBOSE)" == "TRUE"
-  .ENDIF
-.ENDIF		# "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(GUI)" == "WNT"
-    @@-$(MKDIR) $(@:d:d)
-.IF "$(APP$(TNR)LINKRES)" != ""
-    @@-$(RM) $(MISC)/$(APP$(TNR)LINKRES:b).rc
-.IF "$(APP$(TNR)ICON)" != ""
-    @-echo 1 ICON $(EMQ)"$(APP$(TNR)ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
-.ENDIF		# "$(APP$(TNR)ICON)" != ""
-.IF "$(APP$(TNR)VERINFO)" != ""
-    @-echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
-    @-echo $(EMQ)#include  $(EMQ)"$(APP$(TNR)VERINFO)$(EMQ)" >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
-.ENDIF		# "$(APP$(TNR)VERINFO)" != ""
-.IF "$(COM)" == "GCC"
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP$(TNR)LINKRES:b).res $(MISC)/$(APP$(TNR)LINKRES:b).rc
-.ELSE
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc
-.ENDIF
-.ENDIF			# "$(APP$(TNR)LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != ""
-    @cat $(APP$(TNR)LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) >  $(MISC)/$(@:b)_all.res
-    $(WINDRES) $(MISC)/$(@:b)_all.res $(APP$(TNR)RESO)
-.ENDIF
-    @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
-        $(APP$(TNR)BASEX) $(APP$(TNR)STACKN) -o $@ $(APP$(TNR)OBJS) \
-        -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP$(TNR)RESO) \
-        `$(TYPE) /dev/null $(APP$(TNR)LIBS) | sed s#$(ROUT)#$(OUT)#g` \
-        $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) \
-        -Wl,--start-group $(APP$(TNR)STDLIBS) -Wl,--end-group $(APP$(TNR)STDLIB) \
-        $(STDLIB$(TNR)) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
-  .IF "$(VERBOSE)" == "TRUE"
-    @$(TYPE)  $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-.ELSE	# "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
-    $(COMMAND_ECHO)$(APP$(TNR)LINKER) @$(mktmp \
-        $(APP$(TNR)LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \
-        $(APP$(TNR)STACKN) \
-        -out:$@ \
-        -map:$(MISC)/{$(subst,/,_ $(APP$(TNR)TARGET)).map} \
-        $(STDOBJ) \
-        $(APP$(TNR)LINKRES) \
-        $(APP$(TNR)RES) \
-        $(APP$(TNR)OBJS) \
-        $(APP$(TNR)LIBS) \
-        $(APP$(TNR)STDLIBS) \
-        $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) \
-        )
-    @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP$(TNR)TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP$(TNR)TARGET).lst
-        $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
-        for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
-    type $(mktmp,$(MISC)\$(APP$(TNR)TARGET).lst
-        $(APP$(TNR)LINKFLAGS) \
-        $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \
-        $(APP$(TNR)STACKN) \
-        -out:$@ \
-        $(STDOBJ) \
-        $(APP$(TNR)LINKRES) \
-        $(APP$(TNR)RES) \
-        $(APP$(TNR)OBJS) \
-        $(APP$(TNR)LIBS) \
-        $(APP$(TNR)STDLIBS) \
-        $(APP$(TNR)STDLIB) $(STDLIB$(TNR)))
-        $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP$(TNR)TARGETN:b)_linkobj.lst >> $(MISC)\$(APP$(TNR)TARGET).lst
-        $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP$(TNR)TARGET).lst $(THEN) type $(MISC)/$(APP$(TNR)TARGET).lst  >> $(MISC)/$(APP$(TNR)TARGET).lnk $(FI)
-        $(COMMAND_ECHO)$(SED)$(APP$(TNR)LINKER) @$(MISC)\$(APP$(TNR)TARGET).lnk
-.ENDIF		# "$(linkinc)" == ""
-.ENDIF		# "$(COM)" == "GCC"
-.IF "$(APP$(TNR)TARGET)" == "loader"
-    $(COMMAND_ECHO)$(PERL) loader.pl $@
-    $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
-    $(COMMAND_ECHO)$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF			# "$(TARGET)" == "setup"
-
-.ENDIF			# "$(GUI)" == "WNT"
-
-.ENDIF			# "$(APP$(TNR)TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll end
-#######################################################
-
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
deleted file mode 100644
index 2eb256d5f..000000000
--- a/solenv/inc/tg_compv.mk
+++ /dev/null
@@ -1,149 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-COMPVERMK:=$(SOLARINCDIR)/comp_ver.mk
-
-.INCLUDE .IGNORE : $(COMPVERMK)
-
-.IF "$(COMNAME)"=="" || "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
-.IF "$(L10N_framework)"==""
-
-COMNAME:=
-
-.IF "$(COM)"=="GCC"
-CFLAGSVERSION=-dumpversion
-CFLAGSVERSION_CMD=-dumpversion
-CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
-#CFLAGSNUMVERSION_CMD=-dumpversion | 2>&1  $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
-.ENDIF
-
-.IF "$(COM)"=="MSC"
-CFLAGSVERSION=
-CFLAGSVERSION_CMD=  $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
-CFLAGSNUMVERSION_CMD=  $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
-.ENDIF
-
-.IF "$(COM)"=="C55" || "$(COM)"=="C54" || "$(COM)"=="C52" || "$(COM)"=="C40" || "$(COM)"=="sunpro"
-CFLAGSVERSION= -V
-CFLAGSVERSION_CMD= -V  $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
-CFLAGSNUMVERSION_CMD= -V  $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
-.ENDIF
-
-# that's the version known by the specific
-# compiler
-CCVER:=$(shell @-$(CXX) $(CFLAGSVERSION_CMD))
-
-# and a computed integer for comparing
-# each point seperated token blown up to 4 digits
-CCNUMVER:=$(shell @-$(CXX) $(CFLAGSNUMVERSION_CMD))
-
-.IF "$(COM)"=="MSC"
-COMID=MSC
-.IF "$(CPU)"=="I"
-COMNAME=msci
-.ELSE
-COMNAME=mscx
-.ENDIF
-.ENDIF
-
-.IF "$(COM)"=="GCC"
-
-SHORTSTDCPP3:=
-SHORTSTDC3:="1"
-
-.IF "$(CCNUMVER)">="000200910000"
-COMID=GCC
-COMNAME=gcc2
-.ENDIF
-
-.IF "$(CCNUMVER)">="000300000001"
-
-COMID=gcc3
-COMNAME=gcc3
-
-.IF "$(CCNUMVER)">="000300000001"
-SHORTSTDCPP3="3"
-.ENDIF
-
-.IF "$(CCNUMVER)">="000300010000"
-SHORTSTDCPP3="4"
-.ENDIF
-
-.IF "$(CCNUMVER)">="000300020000"
-SHORTSTDCPP3="5"
-.ENDIF
-
-.IF "$(CCNUMVER)">="000300040000"
-.IF "$(OS)$(CPU)" == "LINUX6" || "$(OS)$(CPU)" == "LINUXH"
-#for gcc >= 3.4.0 on m68k-linux this is libgcc_s.so.2.
-#for gcc >= 3.4.0 < 4.2.0 on hppa-linux this is libgcc_s.so.2.
-SHORTSTDC3:="2"
-.ENDIF
-SHORTSTDCPP3="6"
-.ENDIF
-
-.IF "$(CCNUMVER)">="000400020000"
-.IF "$(OS)$(CPU)" == "LINUXH"
-#for gcc >= 4.2.0 on hppa-linux this is libgcc_s.so.4.
-SHORTSTDC3:="4"
-.ENDIF
-SHORTSTDCPP3="6"
-.ENDIF
-
-.ENDIF
-.ENDIF
-
-.IF "$(COM)"=="C55" || "$(COM)" == "C54" || "$(COM)"=="C52" || "$(COM)"=="C40" || "$(COM)"=="sunpro"
-.IF "$(CCNUMVER)">="00050002"
-COMID=C52
-COMNAME=sunpro5
-.ENDIF
-.ENDIF
-
-.IF "$(COMNAME)"==""
-
-# "EXCEPTIONSFILES" get compiled before this, but shouldn't
-# appear in the first n modules.
-
-compiler_version_error:
-    @echo ++++++++++++++++++++++++++++++++++++
-    @echo  ERROR!
-    @echo  Could not detect compiler version!
-    @echo  Please extend tg_compv.mk in 
-    @echo  "solenv/inc".
-    @echo ++++++++++++++++++++++++++++++++++++
-    @echo "$(CXX) $(CFLAGSVERSION)" returns
-    @$(CXX) $(CFLAGSVERSION)
-    @echo ++++++++++++++++++++++++++++++++++++
-    force_dmake_to_error
-
-.ENDIF          # "$(COMNAME)"==""
-
-CDEFS+=-DCPPU_ENV=$(COMNAME)
-
-.ENDIF			# "$(L10N_framework)"==""
-.ENDIF			# "$(COMNAME)"==""
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
deleted file mode 100644
index bd3e7bbd9..000000000
--- a/solenv/inc/tg_config.mk
+++ /dev/null
@@ -1,199 +0,0 @@
-#************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PACKAGEDIR*:=$(subst,.,/ $(PACKAGE))
-XSLTPACKAGEDIR*:=$(subst,.,/ $(PACKAGE))
-XCSROOTURL!:=$(ABSXCSROOT)
-.IF $(GUI)==WNT
-XCSROOTURL!:=file:///$(subst,\,/ $(XCSROOTURL))
-.ENDIF
-SYSXSLDIR*:=$(XSLDIR)/
-
-#
-# --- XCS ---
-#
-
-.IF "$(XCSFILES)"!=""
-# remove unnecessary info from the component schemas
-XCS_TRIM=$(PROCESSOUT)/registry/schema/$(PACKAGEDIR)/{$(XCSFILES)}
-
-# transform xcs format to properties format
-# XCS_RESOURCES=$(foreach,i,$(XCSFILES) $(MISC)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/$(i:b).properties)
-
-ALLTAR: \
-    $(XCS_TRIM) 
-.ENDIF			# "$(XCSFILES)"!=""
-
-.IF "$(XCS_TRIM)" != ""
-$(XCS_TRIM) :   $(DTDDIR)/registry/component-schema.dtd \
-                $(XSLDIR)/schema_val.xsl \
-                $(XSLDIR)/sanity.xsl \
-                $(XSLDIR)/schema_trim.xsl 
-.ENDIF
-
-$(PROCESSOUT)/registry/schema/$(PACKAGEDIR)/%.xcs : %.xcs
-    @echo "Making:   " $(@:f)
-.IF "$(VERBOSE)" != "FALSE"
-    @echo --- validating and stripping schema files
-.ENDIF
-    @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \
-                --stringparam componentName $(PACKAGE).$* \
-                $(SYSXSLDIR)schema_val.xsl $<
-    $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.san) \
-                $(SYSXSLDIR)sanity.xsl $<
-    $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
-                $(SYSXSLDIR)schema_trim.xsl $<
-    @+-$(RM) $(@:d)$*.val > $(NULLDEV)
-    @+-$(RM) $(@:d)$*.san > $(NULLDEV)
-
-$(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcs : %.xcs
-# just a copy for now - insert "cfgex" commandline when required
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-# Create properties files for localized <info> contents (Currently not built)
-.IF "$(XCS_RESOURCES)" != ""
-$(XCS_RESOURCES) :   $(XSLDIR)/resource.xsl 
-.ENDIF
-
-$(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.properties :| $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcs
-    @echo "Making:   " $(@:f)
-.IF "$(VERBOSE)" != "FALSE"
-    @echo --- creating locale dependent resource bundles
-.ENDIF
-    @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
-                --stringparam locale {$(subst,/$(PACKAGEDIR)/$(@:f), $(subst,$(PROCESSOUT)/registry/res/, $@))} \
-                $(SYSXSLDIR)resource.xsl $<
-
-# 
-# --- XCU ---
-#
-
-.IF "$(XCUFILES)"!=""
-XCU_DEFAULT =$(PROCESSOUT)/registry/data/$(PACKAGEDIR)/{$(XCUFILES)}
-XCU_MODULES =$(foreach,i,$(MODULEFILES) $(PROCESSOUT)/registry/spool/$(PACKAGEDIR)/$(i))
-XCU_LANG    =$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/$(i))
-.ENDIF			# "$(XCUFILES)"!=""
-
-.IF "$(XCU_DEFAULT)" != ""
-$(XCU_DEFAULT) : $(DTDDIR)/registry/component-update.dtd \
-                 $(XSLDIR)/data_val.xsl \
-                 $(XSLDIR)/alllang.xsl 
-.ENDIF
-
-$(PROCESSOUT)/registry/data/$(PACKAGEDIR)/%.xcu : %.xcu
-    @echo "Making:   " $(@:f)
-.IF "$(VERBOSE)" != "FALSE"
-    @echo --- validating and creating a locale independent file
-.ENDIF
-    @-$(MKDIRHIER) $(@:d) 
-    $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \
-                --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
-                --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
-            --path $(DTDDIR)/registry \
-                $(SYSXSLDIR)data_val.xsl $<
-    $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
-                --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
-                --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
-            --path $(DTDDIR)/registry \
-                $(SYSXSLDIR)alllang.xsl $<
-    @+-$(RM) $(@:d)$*.val > $(NULLDEV)
-
-# --- localizations ---
-.IF "$(WITH_LANG)"!=""
-.IF "$(XCU_LANG)"!=""
-$(XCU_LANG) : $(LOCALIZESDF)
-.ENDIF			# "$(XCU_LANG)"!=""
-
-$(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu : %.xcu
-    @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(CFGEX)  -p $(PRJNAME) -i $(@:f) -o $@ -m $(LOCALIZESDF) -l all
-
-.IF "$(XCU_LANG)" != ""
-$(XCU_LANG) : $(XSLDIR)/alllang.xsl
-.ENDIF
-
-$(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.xcu :| $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu
-.ELSE			# "$(WITH_LANG)"!=""
-$(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.xcu :| %.xcu
-.ENDIF			# "$(WITH_LANG)"!=""
-    @echo "Making:   " $(@:f)
-.IF "$(VERBOSE)" != "FALSE"
-    @echo --- creating locale dependent entries
-.ENDIF
-    @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
-                --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
-                --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
-                --stringparam locale {$(subst,/$(PACKAGEDIR)/$(@:f), $(subst,$(PROCESSOUT)/registry/res/, $@))} \
-                --path $(DTDDIR)/registry \
-                $(SYSXSLDIR)alllang.xsl $<
-
-# --- languagepack tag modules ---
-.IF "$(LANGUAGEPACKS)" != ""
-$(LANGUAGEPACKS) : $(XSLDIR)/delcomment.sed 
-.ENDIF
-
-
-$(PROCESSOUT)/registry/spool/Langpack-%.xcu : Langpack.xcu.tmpl
-.IF "$(VERBOSE)" != "FALSE"
-    @echo --- creating a Langpack module for locale $*
-.ENDIF
-    -$(MKDIRHIER) $(@:d) 
-    $(COMMAND_ECHO)$(SED) -e "s/__LANGUAGE__/$*/" -f $(XSLDIR)/delcomment.sed $< > $@
-
-
-# --- modules ---
-.IF "$(XCU_MODULES)" != ""
-$(XCU_MODULES) : $(XSLDIR)/alllang.xsl 
-.ENDIF
-
-
-$(PROCESSOUT)/registry/spool/$(PACKAGEDIR)/%.xcu :| $$(@:b:s/-/./:b).xcu
-    @echo "Making:   " $(@:f)
-.IF "$(VERBOSE)" != "FALSE"
-    @echo --- creating a module file
-.ENDIF
-    @-$(MKDIRHIER) $(@:d) 
-    $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
-                --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$(<:b).xcs \
-                --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
-                --stringparam module $(subst,$(<:b)-, $(*)) \
-                $(SYSXSLDIR)alllang.xsl $<
-
-.IF "$(XCUFILES)"!=""
-ALLTAR: \
-    $(XCU_DEFAULT) \
-    $(XCU_MODULES) \
-    $(XCU_LANG)
-
-$(XCU_DEFAULT) : $$(@:d:s!$(PROCESSOUT)/registry/data/!$(ABSXCSROOT)/registry/schema/!)$$(@:f:s/.xcu/.xcs/)
-
-.ENDIF			# "$(XCUFILES)"!=""
-
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
deleted file mode 100644
index 0e677e681..000000000
--- a/solenv/inc/tg_def.mk
+++ /dev/null
@@ -1,201 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#######################################################
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(DEF$(TNR)TARGETN)"!=""
-
-#to make intuitiv naming work
-.IF "$(DEF$(TNR)LIBNAME)"!=""
-DEFLIB$(TNR)NAME*=$(DEF$(TNR)LIBNAME)
-.ENDIF			# "$(DEF$(TNR)LIBNAME)"!=""
-
-.IF "$(DEFLIB$(TNR)NAME)"!=""
-DEF$(TNR)DEPN+=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib)
-.ENDIF
-
-.IF "$(SHL$(TNR)VERSIONMAP)"!=""
-.IF "$(DEF$(TNR)EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
-DEF$(TNR)EXPORTFILE=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET).dxp
-.IF "$(COM)"=="GCC"
-$(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS)
-.ENDIF # .IF "$(COM)"=="GCC"
-
-$(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
-    $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
-    $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-    $(COMMAND_ECHO)$(NM) -gP $(SHL$(TNR)OBJS) \
-        `$(TYPE) /dev/null $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-        | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
-.ENDIF # .IF "$(COM)"=="GCC"
-
-.ENDIF			# "$(GUI)"=="WNT"
-
-.ENDIF			# "$(DEF$(TNR)EXPORTFILE)"==""
-.ENDIF			# "$(SHL$(TNR)VERSIONMAP)"!=""
-
-.IF "$(GUI)"=="WNT"
-
-DEF$(TNR)FILTER=$(SOLARENV)/inc/dummy.flt
-
-RMHACK$(TNR):=$(RM)
-
-.IF "$(DEF$(TNR)CEXP)"!=""
-EXPORT_ALL_SWITCH=-A $(DEF$(TNR)CEXP)
-.ENDIF
-
-.IF "$(link_always)"==""
-$(DEF$(TNR)TARGETN) : \
-        $(DEF$(TNR)DEPN) \
-        $(DEF$(TNR)EXPORTFILE)
-.ELSE			# "$(link_always)"==""
-$(DEF$(TNR)TARGETN) .PHONY :
-.ENDIF			# "$(link_always)"==""
-    $(COMMAND_ECHO)-$(RM) $@.tmpfile
-    @echo "Making:    module definition file" $(@:f)
-    $(COMMAND_ECHO)echo LIBRARY	  $(EMQ)"$(SHL$(TNR)TARGETN:f)$(EMQ)" 								 >$@.tmpfile
-.IF "$(COM)"!="GCC"
-    $(COMMAND_ECHO)echo HEAPSIZE	  0 											>>$@.tmpfile
-.ENDIF
-    $(COMMAND_ECHO)echo EXPORTS													>>$@.tmpfile
-.IF "$(VERSIONOBJ)"!=""
-#	getversioninfo fuer alle!!
-    $(COMMAND_ECHO)echo GetVersionInfo		>>$@.tmpfile
-.ENDIF
-.IF "$(DEFLIB$(TNR)NAME)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
-    $(COMMAND_ECHO)$(DLLTOOL) --output-def $(MISC)/$(SHL$(TNR)TARGET).exp --export-all-symbols \
-        `$(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
-    $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL$(TNR)TARGET).exp | sed '/^;/d' >>$@.tmpfile
-    $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
-.ELSE
-.IF "$(SHL$(TNR)USE_EXPORTS)"==""
-    $(COMMAND_ECHO)-$(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp
-    $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL$(TNR)TARGET).exp $(SLB)/$(DEFLIB$(TNR)NAME).lib
-    $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL$(TNR)TARGET).flt $(MISC)/$(SHL$(TNR)TARGET).exp			   >>$@.tmpfile
-    $(COMMAND_ECHO)$(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp
-.ELSE			# "$(SHL$(TNR)USE_EXPORTS)"==""
-    $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL$(TNR)TARGET).direct
-    $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF$(TNR)FILTER) $(MISC)/$(SHL$(TNR)TARGET).direct >>$@.tmpfile
-.ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"==""
-.ENDIF
-.ENDIF				# "$(DEFLIB$(TNR)NAME)"!=""
-.IF "$(DEF$(TNR)EXPORT1)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT1)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT2)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT2)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT3)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT3)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT4)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT4)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT5)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT5)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT6)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT6)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT7)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT7)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT8)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT8)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT9)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT9)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT10)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT10)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT11)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT11)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT12)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT12)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT13)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT13)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT14)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT14)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT15)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT15)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT16)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT16)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT17)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT17)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT18)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT18)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT19)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT19)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORT20)"!=""
-    $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT20)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF$(TNR)EXPORTFILE)"!=""
-.IF "$(COM)"=="GCC"
-    $(COMMAND_ECHO)$(TYPE) $(DEF$(TNR)EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
-.ELSE
-    $(COMMAND_ECHO)$(TYPE) $(DEF$(TNR)EXPORTFILE) >> $@.tmpfile
-.ENDIF
-.ENDIF
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="UNX"
-$(DEF$(TNR)TARGETN): \
-        $(DEF$(TNR)DEPN) \
-        $(DEF$(TNR)EXPORTFILE)
-    $(COMMAND_ECHO)echo just a dummy for UNIX > $@
-.ENDIF
-.ENDIF			# "$(DEF$(TNR)TARGETN)"!=""
-
-
-# Anweisungen fuer das Linken
-# unroll end
-#######################################################
-
diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk
deleted file mode 100644
index 37517e2f1..000000000
--- a/solenv/inc/tg_dep.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(SRCFILES)$(SRC1FILES)$(SRC2FILES)$(SRC3FILES)$(RCFILES)$(HDBDEPNTARGET)$(IDLFILES)$(PARFILES)$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!=""
-ALLDEP .PHONY: 
-    @-$(IFEXIST) $(SRS)/$(TARGET).*.dpr $(THEN) $(RM:s/+//) $(SRS)/$(TARGET).*.dpr >& $(NULLDEV) $(FI)
-    @@-$(RM) $(MISC)/$(TARGET).dpr
-    @@-$(RM) $(MISC)/$(TARGET).*.dprr
-    @@-$(RM) $(MISC)/$(TARGET).dpj
-    @@-$(RM) $(MISC)/$(TARGET).dpz
-    @@-$(RM) $(MISC)/$(COMP1TYPELIST).mk $(MISC)/$(COMP2TYPELIST).mk $(MISC)/$(COMP3TYPELIST).mk $(MISC)/$(COMP4TYPELIST).mk $(MISC)/$(COMP5TYPELIST).mk $(MISC)/$(COMP6TYPELIST).mk $(MISC)/$(COMP7TYPELIST).mk $(MISC)/$(COMP8TYPELIST).mk $(MISC)/$(COMP9TYPELIST).mk
-.IF "$(nodep)"==""
-.IF "$(DEPFILE_SLO)"!=""	
-    @@-$(RM) $(DEPFILE_SLO)
-    $(foreach,i,$(all_local_slo) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) > $(MISC)/s_$(i:b).dpcc ))
-    $(foreach,i,$(all_misc_slo) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) > $(MISC)/s_$(i:b).dpcc ))
-.ENDIF			# "$(DEPFILE_SLO)"!=""	
-.IF "$(DEPFILE_OBJ)"!=""	
-    @@-$(RM) $(DEPFILE_OBJ)
-    $(foreach,i,$(all_local_obj) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $i ) > $(MISC)/o_$(i:b).dpcc ))
-    $(foreach,i,$(all_misc_obj) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $i ) > $(MISC)/o_$(i:b).dpcc ))
-.ENDIF			# "$(DEPFILE_OBJ)"!=""	
-.ENDIF			# "$(nodep)"==""
-.IF "$(DEPFILES)" != ""
-    echo xxx$(DEPFILES)xxx
-    @@-$(RM) $(DEPFILES)
-.ENDIF			# "$(DEPFILES)" != ""
-
-
-ALLDPC: \
-        $(DEPFILES) \
-        $(RCFILES) \
-        $(IDLFILES) \
-        $(HDBDEPNTARGET)
-.IF "$(nodep)"!=""
-    @echo NOT-Making: Depend-Lists
-    @echo ttt: ppp > $(MISC)/$(TARGET).dpc
-.ELSE
-    @echo Making : Dependencies 
-.IF "$(CFILES)$(CXXFILES)"!=""
-.IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)"==""
-    @echo ++++++++++++++++++++++++++++++++++++++++++++++++
-    @echo 		something is wrong!!
-    @echo 		source files but no obj
-    @echo ++++++++++++++++++++++++++++++++++++++++++++++++
-    force_dmake_to_error
-.ENDIF
-.ENDIF
-.IF "$(HDBDEPNTARGET)$(OBJFILES)$(SLOFILES)$(DEPOBJFILES)$(RCFILES)$(PARFILES)"!=""
-    @$(IFEXIST) $(MISC)/$(TARGET).dpj $(THEN) $(RM:s/+//) $(MISC)/$(TARGET).dpj >& $(NULLDEV) $(FI)
-    @$(IFEXIST) $(MISC)/genjava.mk $(THEN) $(RM:s/+//) $(MISC)/genjava.mk >& $(NULLDEV) $(FI)
-    $(TOUCH) $(MISC)/$(TARGET).dpc
-.IF "$($(SECOND_BUILD)_SLOFILES)"!=""
-    @$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)_SLOFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $i )) >> $(MISC)/$(TARGET).dpc
-.ENDIF
-.IF "$($(SECOND_BUILD)_OBJFILES)"!=""
-    @$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)_OBJFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $(i:d:s/obj/slo/)$(i:b).obj )) >> $(MISC)/$(TARGET).dpc
-.ENDIF
-.ELSE			# "$(HDBDEPNTARGET)$(OBJFILES)$(SLOFILES)$(DEPOBJFILES)$(RCFILES)"!=""
-    @echo ttt: ppp > $(MISC)/$(TARGET).dpc
-.ENDIF			# "$(HDBDEPNTARGET)$(OBJFILES)$(SLOFILES)$(DEPOBJFILES)$(RCFILES)"!=""
-.ENDIF			# "$(nodep)"!=""
-.ELSE		# anything requiring dependencies
-
-ALLDPC:
-    @echo $(EMQ)# > $(MISC)/$(TARGET).dpc
-
-ALLDEP:
-    @echo nothing to do here...
-
-.ENDIF
-
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
deleted file mode 100644
index a42177790..000000000
--- a/solenv/inc/tg_ext.mk
+++ /dev/null
@@ -1,355 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.EXPORT : CC CXX
-
-# setup INCLUDE variable for use by VC++
-.IF "$(GUI)$(COM)"=="WNTMSC"
-INCLUDE!:=. $(SOLARINC)
-INCLUDE!:=$(INCLUDE:s/ -I/;/)
-.EXPORT : INCLUDE
-.ENDIF			# "$(GUI)$(COM)"=="WNTMSC"
-
-.IF "$(OS)"=="MACOSX"
-LDFLAGS!:=$(EXTRA_LINKFLAGS) $(LDFLAGS)
-.EXPORT : LDFLAGS
-.ENDIF
-
-.IF "$(GUI_FOR_BUILD)"=="WNT"
-PATH!:=.:$(SOLARBINDIR:^"/cygdrive/":s/://):$(PATH)
-.ELSE           # "$(GUI)"=="WNT"
-PATH!:=.$(PATH_SEPERATOR)$(SOLARBINDIR)$(PATH_SEPERATOR)$(PATH)
-.ENDIF          # "$(GUI)"=="WNT"
-.EXPORT : PATH
-
-#override
-PACKAGE_DIR=$(MISC)/build
-ABS_PACKAGE_DIR:=$(MAKEDIR)/$(MISC)/build
-
-#MUST match with PACKAGE_DIR
-BACK_PATH=../../../
-#MUST match with reference (currently MISC)
-MBACK_PATH=../../
-.IF "$(TARFILE_IS_FLAT)" != ""
-fake_root_dir=/$(TARFILE_NAME)
-#MUST match fake_root_dir in directory levels
-fake_back=../
-.ENDIF "$(TARFILE_IS_FLAT)" != ""
-
-TARFILE_LOCATION*=$(BACK_PATH)$(fake_back)download
-TARFILE_LOCATION2=$(eq,$(BACK_PATH)$(fake_back)download,$(TARFILE_LOCATION) $(PRJ)/download $(TARFILE_LOCATION))
-
-P_CONFIGURE_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(CONFIGURE_DIR)
-P_BUILD_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(BUILD_DIR)
-P_INSTALL_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(BUILD_DIR)
-P_INSTALL_TARGET_DIR=$(MISC)/install
-
-.IF "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
-NEW_PATCH_FILE_NAME:=$(TARFILE_NAME)
-.ELSE			# "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
-NEW_PATCH_FILE_NAME:=$(TARFILE_NAME)-newpatch-rename_me.patch
-PATCH_FILE_DEP:=$(PRJ)/$(PATH_IN_MODULE)/{$(PATCH_FILES)}
-.ENDIF			# "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
-
-unzip_quiet_switch:=-qq
-.IF "$(VERBOSE)"=="TRUE"
-tar_verbose_switch=v
-unzip_quiet_switch:=
-.ENDIF			# "$(VERBOSE)"=="TRUE"
-
-.IF "$(ADDITIONAL_FILES)"!=""
-P_ADDITIONAL_FILES=$(foreach,i,$(ADDITIONAL_FILES) $(MISC)/$(TARFILE_ROOTDIR)/$i)
-T_ADDITIONAL_FILES=$(foreach,i,$(ADDITIONAL_FILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i)
-.ENDIF			# "$(ADDITIONAL_FILES)"!=""
-
-EXTRPATH*=OOO
-
-.IF "$(L10N_framework)"==""
-
-ALLTAR : \
-    $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) \
-    $(PACKAGE_DIR)/$(BUILD_FLAG_FILE) \
-    $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) \
-    $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) \
-    $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) \
-    $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) \
-    $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
-
-clean:
-    $(COMMAND_ECHO)cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) clean
-    $(COMMAND_ECHO)$(RM) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
-
-$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
-    @-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ")
-.ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
-.ENDIF			# "$(GUI)"=="UNX"
-    @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
-    @$(RENAME) $@.$(INPATH) $@
-
-$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z
-    @-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ")
-.ELSE			# "$(GUI)"=="UNX"
-    @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
-.ENDIF			# "$(GUI)"=="UNX"
-    @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
-    @$(RENAME) $@.$(INPATH) $@
-
-$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.gz
-    @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
-    @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
-    @$(RENAME) $@.$(INPATH) $@
-
-$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tgz
-    @-$(RM) $@
-    @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
-    @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
-    @$(RENAME) $@.$(INPATH) $@
-
-$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar
-    @-$(RM) $@
-    @noop $(assign UNPACKCMD := $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar)
-    @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
-    @$(RENAME) $@.$(INPATH) $@
-
-$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip
-    @-$(RM) $@
-    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).zip)
-    @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
-    @$(RENAME) $@.$(INPATH) $@
-
-$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.oxt
-    @-$(RM) $@
-    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).oxt)
-    @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
-    @$(RENAME) $@.$(INPATH) $@
-
-$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar
-    @-$(RM) $@
-.IF "$(OS)"=="SOLARIS"
-    @noop $(assign UNPACKCMD := jar xf $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
-.ELSE			# "$(OS)"=="SOLARIS"
-    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar)
-.ENDIF			# "$(OS)"=="SOLARIS"
-    @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
-    @$(RENAME) $@.$(INPATH) $@
-
-#do unpack
-$(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack $(PATCH_FILE_DEP)
-    $(IFEXIST) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR).exists $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme $(FI)
-    $(COMMAND_ECHO)-rm -rf $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme
-    @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
-    @$(TOUCH) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR).exists # $(IFEXIST) only works with files
-    $(COMMAND_ECHO)cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
-    @echo make writeable...
-    @-cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
-    @-cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -print0 | xargs -0 chmod a+x
-
-#add new files to patch
-$(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) $(T_ADDITIONAL_FILES:+".dummy")
-.IF "$(GUI)"=="WNT"
-    @$(TOUCH) $@
-.ELSE			# "$(GUI)"=="WNT"
-    @$(TOUCH) $@
-.ENDIF			# "$(GUI)"=="WNT"
-
-#patch
-$(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
-.IF "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
-    @echo no patch needed...
-    $(COMMAND_ECHO)$(TOUCH) $@
-.ELSE			# "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
-.IF "$(GUI)"=="WNT"
-    $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
-.ELSE           # "$(GUI)"=="WNT"
-.IF "$(BSCLIENT)"=="TRUE"
-    $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
-.ELSE           # "$(BSCLIENT)"!=""
-    $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
-.ENDIF          # "$(BSCLIENT)"!=""
-.ENDIF          # "$(GUI)"=="WNT"
-.ENDIF			# "$(PATCH_FILES)"=="none" ||	"$(PATCH_FILES)"==""
-.IF "$(T_ADDITIONAL_FILES)"!=""
-.IF "$(GUI_FOR_BUILD)"=="WNT"
-# Native W32 tools generate only filedates with even seconds, cygwin also with odd seconds
-    $(DELAY) 2
-.ENDIF # "$(GUI)"=="WNT"
-    $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
-.ENDIF          # "$(T_ADDITIONAL_FILES)"!=""
-
-.IF "$(CONVERTFILES)"!=""
-$(MISC)/$(TARGET)_convert_unx_flag :  $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE)
-    $(COMMAND_ECHO)$(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) && $(TOUCH) $(MISC)/$(TARGET)_convert_unx_flag
-
-$(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(MISC)/$(TARGET)_convert_unx_flag
-
-$(MISC)/$(TARGET)_convert_dos_flag : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
-    $(COMMAND_ECHO)$(CONVERT) dos  $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) && $(TOUCH) $(MISC)/$(TARGET)_convert_dos_flag
-
-$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(MISC)/$(TARGET)_convert_dos_flag
-
-patch : $(MISC)/$(TARGET)_convert_dos_flag
-
-.ENDIF          # "$(CONVERTFILES)"!=""
-
-$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
-    @@-$(RM) $@
-.IF "$(CONFIGURE_ACTION)" == "none" || "$(CONFIGURE_ACTION)"==""
-    $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
-.ELSE			# "$(CONFIGURE_ACTION)"=="none" || "$(CONFIGURE_ACTION)"==""
-    $(COMMAND_ECHO)-$(MKDIR) $(P_CONFIGURE_DIR)
-    $(COMMAND_ECHO)cd $(P_CONFIGURE_DIR) && $(CONFIGURE_ACTION) $(CONFIGURE_FLAGS) && $(TOUCH) $(CONFIGURE_FLAG_FILE)
-    $(COMMAND_ECHO)mv $(P_CONFIGURE_DIR)/$(CONFIGURE_FLAG_FILE) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
-.ENDIF			# "$(CONFIGURE_ACTION)"=="none" ||	"$(CONFIGURE_ACTION)"==""
-
-
-$(PACKAGE_DIR)/$(BUILD_FLAG_FILE) : $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
-    @@-$(RM) $@
-.IF "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
-    $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
-.ELSE			# "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
-    $(COMMAND_ECHO)-$(MKDIR) $(P_BUILD_DIR)
-    $(COMMAND_ECHO)cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) && $(TOUCH) $(ABS_PACKAGE_DIR)/$(BUILD_FLAG_FILE)
-.ENDIF			# "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
-
-$(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) : $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
-    @@-$(RM) $@
-.IF "$(INSTALL_ACTION)"=="none" ||	"$(INSTALL_ACTION)"==""
-    $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
-.ELSE			# "$(INSTALL_ACTION)"=="none" ||	"$(INSTALL_ACTION)"==""
-    $(COMMAND_ECHO)-$(MKDIR) $(P_INSTALL_DIR)
-    $(COMMAND_ECHO)-$(MKDIR) $(P_INSTALL_TARGET_DIR)
-    $(COMMAND_ECHO)cd $(P_INSTALL_DIR) && $(INSTALL_ACTION) $(INSTALL_FLAGS) && $(TOUCH) $(INSTALL_FLAG_FILE)
-    $(COMMAND_ECHO)mv $(P_INSTALL_DIR)/$(INSTALL_FLAG_FILE) $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
-.ENDIF			# "$(INSTALL_ACTION)"=="none" ||	"$(INSTALL_ACTION)"==""
-
-$(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
-.IF "$(OUT2LIB)"!=""
-    $(COMMAND_ECHO)$(COPY) $(foreach,i,$(OUT2LIB) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(LB)
-.IF "$(OS)"=="MACOSX"
-    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl extshl \
-        $(EXTRPATH) \
-        $(shell ls $(foreach,j,$(OUT2LIB) $(LB)/$(j:f)) | \
-            (grep -v '\.a$$' || test $$? = 1))
-.ENDIF
-.ENDIF			# "$(OUT2LIB)"!=""
-.IF "$(OUT2INC)"!=""
-.IF "$(OUT2INC_SUBDIR)"!=""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(INCCOM)/$(OUT2INC_SUBDIR)
-    $(COMMAND_ECHO)$(COPY) $(foreach,i,$(OUT2INC) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(INCCOM)/$(OUT2INC_SUBDIR)
-.ELSE          # "$(OUT2INC_SUBDIR)"!=""
-    $(COMMAND_ECHO)$(COPY) $(foreach,i,$(OUT2INC) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(INCCOM)
-.ENDIF          # "$(OUT2INC_SUBDIR)"!=""
-.ENDIF			# "$(OUT2INC)"!=""
-.IF "$(OUTDIR2INC)"!=""
-    $(COMMAND_ECHO)$(COPY) $(DEREFERENCE) $(COPYRECURSE) $(foreach,i,$(OUTDIR2INC) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(INCCOM)
-.ENDIF			# "$(OUTDIR2INC)"!=""
-.IF "$(OUT2BIN)"!=""
-    $(COMMAND_ECHO)$(COPY) $(foreach,i,$(OUT2BIN) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(BIN)
-.IF "$(GUI)$(COM)$(COMEX)"=="WNTMSC12"
-    @noop $(foreach,j,$(foreach,k,$(OUT2BIN) \
-        $(shell -ls -1 $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$k | $(GREP) .dll)) \
-        $(shell @$(IFEXIST) $(j).manifest $(THEN) mt.exe \
-        -manifest $(j).manifest -outputresource:$(BIN)/$(j:f)$(EMQ);2 $(FI)))
-.ENDIF          # "$(GUI)$(COM)$(COMEX)"=="WNTMSC12"
-.ENDIF			# "$(OUT2BIN)"!=""
-.IF "$(OUT2CLASS)"!=""
-    $(COMMAND_ECHO)$(COPY) $(foreach,i,$(OUT2CLASS) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(CLASSDIR)
-.ENDIF			# "$(OUT2BIN)"!=""
-    $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
-
-$(MISC)/$(TARFILE_ROOTDIR).done : $(MISC)/$(TARFILE_MD5)-$(TARFILE_NAME).unpack $(PATCH_FILES)
-    @-mv $(MISC)/$(TARFILE_ROOTDIR) $(MISC)/$(TARFILE_ROOTDIR).old
-    @-rm -rf $(MISC)/$(TARFILE_ROOTDIR).old
-    @-$(MKDIRHIER) $(MISC)$(fake_root_dir)
-    $(COMMAND_ECHO)cd $(MISC)$(fake_root_dir) && $(subst,$(BACK_PATH),$(MBACK_PATH) $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack))
-.IF "$(P_ADDITIONAL_FILES)"!=""
-    noop $(foreach,i,$(P_ADDITIONAL_FILES) $(shell echo dummy > $i))
-.ENDIF			 "$(P_ADDITIONAL_FILES)"!=""
-.IF "$(PATCH_FILES)"!="none" &&	"$(PATCH_FILES)"!=""
-.IF "$(CONVERTFILES)"!=""
-    $(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(MISC)/$(TARFILE_ROOTDIR)/$i)
-.ENDIF          # "$(CONVERTFILES)"!=""
-.IF "$(GUI)"=="WNT"
-# hack to make 4nt version 4,01 work and still get propper
-# errorcodes for versions < 3,00
-#.IF "$(my4ver:s/.//:s/,//)" >= "300"
-#	$(COMMAND_ECHO)cd $(MISC) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 )
-#.ELSE			# "$(my4ver:s/.//:s/,//)" >= "300"
-    $(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2
-#.ENDIF			# "$(my4ver:s/.//:s/,//)" >= "300"
-.ELSE           # "$(GUI)"=="WNT"
-.IF "$(BSCLIENT)"=="TRUE"
-    $(COMMAND_ECHO)cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2
-.ELSE           # "$(BSCLIENT)"!=""
-    $(COMMAND_ECHO)cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2
-.ENDIF          # "$(BSCLIENT)"!=""
-.ENDIF          # "$(GUI)"=="WNT"
-.IF "$(CONVERTFILES)"!=""
-    $(COMMAND_ECHO)$(CONVERT) dos  $(foreach,i,$(CONVERTFILES) $(MISC)/$(TARFILE_ROOTDIR)/$i)
-.ENDIF          # "$(CONVERTFILES)"!=""
-.ENDIF			# "$(PATCH_FILES)"!="none" && "$(PATCH_FILES)"!="
-.IF "$(GUI)"=="UNX"	
-    $(COMMAND_ECHO)$(TOUCH) $@
-.ENDIF			# "$(GUI)"=="UNX"
-
-.IF "$(T_ADDITIONAL_FILES)"!=""
-$(T_ADDITIONAL_FILES:+".dummy") : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE)
-    @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)-echo dummy > $@
-    $(COMMAND_ECHO)-$(TOUCH) $@
-    $(COMMAND_ECHO)-echo dummy > $(@:d)$(@:b)
-    $(COMMAND_ECHO)-$(TOUCH) $(@:d)$(@:b)
-.ENDIF			 "$(T_ADDITIONAL_FILES)"!=""
-
-create_patch : $(MISC)/$(TARFILE_ROOTDIR).done $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
-    @@-$(MKDIRHIER) $(PRJ)/$(NEW_PATCH_FILE_NAME:d)
-    @@-$(RM) $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp
-    @@-$(RM) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
-#ignore returncode of 1 (indicates differences...)
-# hard coded again to get the same directory level as before. quite ugly...
-    $(COMMAND_ECHO)-cd $(PRJ)/$(ROUT) && diff -ru misc/$(TARFILE_ROOTDIR) misc/build/$(TARFILE_ROOTDIR) | $(PERL) $(SOLARENV)/bin/cleandiff.pl | tr -d "\015" > misc/$(NEW_PATCH_FILE_NAME:f).tmp
-    $(COMMAND_ECHO)-mv $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
-    $(COMMAND_ECHO)-$(TOUCH) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
-    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/patch_sanitizer.pl $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME)
-    @@-$(RM) $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
-    $(COMMAND_ECHO)$(MAKECMD) $(MAKEMACROS) patch
-    @echo still some problems with win32 generated patches...
-    @echo $(USQ)find your new changes in $(NEW_PATCH_FILE_NAME). don't forget to move/rename that patch and insert it in your makefiles PATCH_FILES to activate.$(USQ)
-
-create_clean : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE)
-    @echo done
-
-patch : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
-    @echo done
-
-.ENDIF			# "$(L10N_framework)"==""
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
deleted file mode 100644
index cce5b9ee6..000000000
--- a/solenv/inc/tg_help.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# to make it usable with special lang selection of
-# helpcontent2
-
-aux_alllangiso*:=$(alllangiso)
-
-SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
-
-.IF "$(XHPDEST)"==""
-XHPDEST*:=$(COMMONMISC)
-HELP_OUT:=$(COMMONMISC)
-.ELSE          # "$(XHPDEST)"==""
-HELP_OUT:=$(MISC)
-.ENDIF          # "$(XHPDEST)"==""
-
-HLANGXHPFILES*:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(XHPDEST)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
-
-ALLTAR : $(HELP_OUT)$/$(TARGET).done $(HELP_OUT)$/xhp_changed.flag optix
-
-$(HLANGXHPFILES) : $$(@:d)thisdir.created
-
-$(XHPDEST)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
-    @$(TOUCH) $@
-# internal dependencies not sufficient to trigger merge?
-#    @$(NULL)
-
-
-$(HELP_OUT)$/$(TARGET).done : $(HLANGXHPFILES)
-.IF "$(WITH_LANG)"!=""
-    $(AUGMENT_LIBRARY_PATH) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(XHPDEST) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
-.ELSE			# "$(WITH_LANG)"!=""
-    cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(XHPDEST)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
-.ENDIF			# "$(WITH_LANG)"!=""
-.IF "$(OS)"=="SOLARIS"
-    @$(ECHONL) " "
-.ELSE			# "$(OS)"=="SOLARIS"
-    @$(ECHONL)
-.ENDIF			# "$(OS)"=="SOLARIS"
-
-$(HELP_OUT)$/xhp_changed.flag : $(HLANGXHPFILES)
-    @$(TOUCH) $@
-
-# urks - dmake mixes up operators and strings :-(
-.IF "$(HLANGXHPFILES:s/defined/xxx/)"!=""
-
-.IF "$(HELPTRANSPHONY)"!=""
-$(HELP_OUT)$/$(TARGET).done .PHONY :
-.ELSE           # "$(HELPTRANSPHONY)"!=""
-
-$(HELP_OUT)$/$(TARGET).done : makefile.mk
-.IF "$(WITH_LANG)"!=""
-$(HELP_OUT)$/$(TARGET).done : $(LOCALIZESDF)
-.ENDIF			# "$(WITH_LANG)"!=""
-.ENDIF          # "$(HELPTRANSPHONY)"!=""
-.ENDIF          # "$(HLANGXHPFILES)"!=""
-
-optix: $(HELP_OUT)$/$(TARGET).done
-    @echo done
-
-%.created :
-    @@-$(MKDIRHIER) $(@:d)
-    @$(TOUCH) $@
-
-
diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk
deleted file mode 100644
index df39ba652..000000000
--- a/solenv/inc/tg_jar.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-.IF "$(VERBOSE)"!="TRUE"
-ZIP_VERBOSITY=-q
-.ENDIF
-
-.IF "$(JARTARGETN)"!=""
-
-.IF "$(JARCOMPRESS)"==""
-JARCOMPRESS_FLAG=0
-.ENDIF
-
-$(JARTARGETN) : $(JARMANIFEST) $(JAVACLASSFILES) $(JAVATARGET)
-
-.IF "$(JARMANIFEST)"!=""
-
-.IF "$(CUSTOMMANIFESTFILE)"!=""
-
-CUSTOMMANIFESTFILEDEP:=$(MISC)/$(TARGET)_$(CUSTOMMANIFESTFILE:f)
-
-$(MISC)/$(TARGET)_$(CUSTOMMANIFESTFILE:f) : $(subst,/,/ $(DMAKE_WORK_DIR))/$(CUSTOMMANIFESTFILE)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(COPY) $< $@
-.ENDIF			# "$(CUSTOMMANIFESTFILE)"!=""
-
-$(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP)
-    @@-$(MKDIRHIER) $(@:d)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)echo Manifest-Version: 1.0 > $@
-.IF "$(JARCLASSPATH)" != ""
-    $(COMMAND_ECHO)echo $(USQ)Class-Path: $(JARCLASSPATH)$(USQ) >> $@
-.ENDIF
-# $(RSCREVISION) contains chars that must be quoted (for *NIX shells)
-    $(COMMAND_ECHO)echo $(USQ)Solar-Version: $(RSCREVISION)$(USQ) >> $@
-.IF "$(CUSTOMMANIFESTFILE)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(MISC)/$(TARGET)_$(CUSTOMMANIFESTFILE:f) >> $@
-.ENDIF			# "$(CUSTOMMANIFESTFILE)"!=""
-.ENDIF			# "$(JARMANIFEST)"!=""
-
-.IF "$(JARCLASSEXCLUDES)" == ""
-ZIPJAR_EXCLUDE=
-.ELSE   # "$(JARCLASSEXCLUDES)" == ""
-ZIPJAR_EXCLUDE=$(foreach,i,$(JARCLASSEXCLUDES) -x "$i")
-# format:
-# JARCLASSEXCLUDES=foo/* bar/*
-.ENDIF  # "$(JARCLASSEXCLUDES)" == ""
-
-#
-# build jar 
-#
-$(JARTARGETN) .PHONY :
-#  $(JARMANIFEST)
-.IF "$(OS)$(CPU)"=="SOLARISS"
-    @-find . -type d -user $(USER) ! -perm -5 -print | xargs test "$$1" != "" && chmod +r $$1 
-.ENDIF
-.IF "$(JARMANIFEST)"!=""
-    $(COMMAND_ECHO)cd $(CLASSDIR)/$(TARGET) && zip $(ZIP_VERBOSITY) -u -rX ../$(@:f) $(subst,$(CLASSDIR)/$(TARGET)/, $(JARMANIFEST)) $(ZIPJAR_EXCLUDE) $(CHECKZIPRESULT)
-.ENDIF			# "$(JARMANIFEST)"!=""
-    $(COMMAND_ECHO)cd $(CLASSDIR) && zip $(ZIP_VERBOSITY) -u -rX $(@:f) $(subst,\,/ $(JARCLASSDIRS)) $(ZIPJAR_EXCLUDE) $(CHECKZIPRESULT)
-.ENDIF
-
diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk
deleted file mode 100644
index 054dcc5fb..000000000
--- a/solenv/inc/tg_java.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-
-$(CLASSDIR)/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.class .PHONY: $(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java 
-
-$(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java .PHONY:
-    @echo "Making:   " $(@:f)
-    @-$(MKDIRHIER) $(MISC)/java/com/sun/star/upd
-.IF "$(GUI)"=="UNX"
-    @echo package com.sun.star.upd\; > $@
-    @echo 'public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(RSCREVISION)";}' >> $@
-.ELSE			# "$(GUI)"=="UNX"
-    @echo package com.sun.star.upd; > $@
-    @echo public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(RSCREVISION)";} >> $@
-.ENDIF			# "$(GUI)"=="UNX"
-
-.IF "$(JAVATARGET)"!=""
-.IF "$(PACKAGE)"!=""
-$(CLASSDIR)/$(PACKAGE)/%.class .NOINFER .IGNORE : %.java
-    $(COMMAND_ECHO)-$(RM) $(JAVATARGET)
-.ELSE			# "$(PACKAGE)"!=""
-$(CLASSDIR)/%.class .NOINFER .IGNORE : %.java
-    $(COMMAND_ECHO)-$(RM) $(JAVATARGET)
-.ENDIF			# "$(PACKAGE)"!=""
-
-$(JAVATARGET) :	$(JAVAFILES) $(JAVACLASSFILES) 
-.IF "$(JAVARESPONSE)"!=""
-    $(COMMAND_ECHO)$(JAVAC) @<<
-    $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES)
-    <<keep
-.ELSE			# "$(JAVARESPONSE)"!=""
-.IF "$(use_jdep)"!=""
-    $(COMMAND_ECHO)$(JAVAC) -depend $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES)
-.ELSE			# "$(use_jdep)"!=""
-.IF "$(javauno)"!=""
-.IF "$(JAVAFILES:d)"==""
-    $(COMMAND_ECHO)$(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES)
-.ELSE			# "$(JAVAFILES:d)"==""
-    @@$(TOUCH) $(INPATH)_$(VCSID)_a_dummy.java
-    $(COMMAND_ECHO)$(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) ./*.java $(uniq $(JAVAFILES:d:+"*.java"))
-    @@-$(RM) $(INPATH)_$(VCSID)_a_dummy.java
-.ENDIF			# "$(JAVAFILES:d)"==""
-.ELSE			# "$(javauno)"!=""
-    $(COMMAND_ECHO)$(JAVAC) $(JAVACPS) "$(CLASSPATH)" -d $(CLASSDIR) $(JAVAFLAGS) @$(mktmp $(strip $(JAVAFILES)))
-.ENDIF			# "$(javauno)"!=""
-.ENDIF			# "$(use_jdep)"!=""
-.ENDIF			# "$(JAVARESPONSE)"!=""
-.IF "$(UPDATER)"!=""
-.IF "$(OS)$(CPU)"=="SOLARISS"
-    @@-find $(CLASSDIR) -type d -user $(USER) \! -perm -5 -print | xargs chmod a+r $$1
-.ENDIF
-.ENDIF
-    @$(TOUCH) $@
-
-.ENDIF			# "$(JAVATARGET)"!=""
diff --git a/solenv/inc/tg_javav.mk b/solenv/inc/tg_javav.mk
deleted file mode 100644
index fe5f7fe17..000000000
--- a/solenv/inc/tg_javav.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-JAVAVERMK:=$(INCCOM)/java_ver.mk
-
-.INCLUDE .IGNORE : $(JAVAVERMK)
-
-.IF "$(JAVAVER)"=="" || "$(JAVALOCATION)"!="$(JAVA_HOME)"
-.IF "$(L10N_framework)"==""
-
-.IF "$(SOLAR_JAVA)"!=""
-JFLAGSVERSION=-version
-JFLAGSVERSION_CMD=-version $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
-JFLAGSNUMVERSION_CMD=-version $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
-
-# that's the version known by the specific
-# java version
-JAVAVER:=$(shell @-$(JAVA_HOME)/bin/java $(JFLAGSVERSION_CMD))
-
-# and a computed integer for comparing
-# each point seperated token blown up to 4 digits
-JAVANUMVER:=$(shell @-$(JAVA_HOME)/bin/java $(JFLAGSNUMVERSION_CMD))
-
-.ELSE          # "$(SOLAR_JAVA)"!=""
-JAVAVER=0.0.0
-JAVANUMVER=000000000000
-.ENDIF          # "$(SOLAR_JAVA)"!=""
-.ENDIF			# "$(L10N_framework)"==""
-.ENDIF			# "$(JAVAVER)"=="" || "$(JAVALOCATION)"!="$(JAVA_HOME)"
diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk
deleted file mode 100644
index a93d6ad56..000000000
--- a/solenv/inc/tg_lib.mk
+++ /dev/null
@@ -1,117 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#######################################################
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(LIB$(TNR)TARGET)" != ""
-.IF "$(LIB$(TNR)ARCHIV)" != ""
-
-$(LIB$(TNR)ARCHIV) :	$(LIB$(TNR)TARGET)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-    @echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-.IF "$(OS)$(COM)"=="NETBSDGCC"
-    @echo  ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-.ENDIF
-.IF "$(OS)" == "MACOSX"
-    @echo  ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-.ENDIF
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
-    @+-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-    @+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-    @+echo $(RANLIB) $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-.IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-.ENDIF
-    @+source $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-.ELSE
-    @echo just a dummy > $@
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF			# "$(GUI)"=="UNX"
-
-.ENDIF			# "$(LIB$(TNR)ARCHIV)" != ""
-
-$(LIB$(TNR)TARGET) :	$(LIB$(TNR)FILES) \
-                        $(LIB$(TNR)OBJFILES) \
-                        $(LIB$(TNR)DEPN)
-.IF "$(VERBOSE)" == "TRUE"
-    @echo ------------------------------
-    @echo using: $(LIB$(TNR)FILES)
-    @echo using: $(LIB$(TNR)TARGET)
-    @echo ------------------------------
-.ENDIF
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $@
-.IF "$(GUI)"=="UNX"
-    @echo $(LIB$(TNR)OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
-    @cat /dev/null $(LIB$(TNR)FILES:s/.obj/.o/) | xargs -n 1 >> $@
-    @$(RM) $(@:d)$(@:b).dump
-.IF "$(OS)"=="MACOSX"
-    @-nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ELSE
-    @nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ENDIF
-
-.ELSE			# "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    +$(ECHONL) $(LIB$(TNR)OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
-    @+cat /dev/null $(LIB$(TNR)FILES) | xargs -n1 >> $@
-.ELSE
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES))
-    @-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB$(TNR)OBJFILES)"!=""    
-    @$(TYPE) $(mktmp $(LIB$(TNR)OBJFILES)) > $(null,$(LIB$(TNR)OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB$(TNR)OBJFILES)"!=""    
-.IF "$(LIB$(TNR)FILES)"!=""    
-    @-$(TYPE) $(foreach,i,$(LIB$(TNR)FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB$(TNR)FILES)"!=""    
-    @$(ECHONL)
-.ENDIF          # "$(LIB$(TNR)FILES)"!=""    
-.ELSE			# "$(GUI)"=="WNT"
-    @-$(RM) $@
-  .IF "$(VERBOSE)" == "TRUE"
-    @echo $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES)
-  .ENDIF
-    $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB$(TNR)OBJFILES) $(LIB$(TNR)FILES) bla.lib
-.ENDIF          # "$(GUI)"=="WNT"
-.ENDIF          # "$(GUI)"=="UNX"
-.ENDIF          # "$(LIB$(TNR)TARGET)" != ""
-
-# Anweisungen fuer das LIBTARGETs
-# unroll end
-#######################################################
-
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk
deleted file mode 100644
index 19f44cb82..000000000
--- a/solenv/inc/tg_merge.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-MKFILENAME:=tg_merge.mk
-
-# look for the according rules in "rules.mk"
-
-.IF "$(WITH_LANG)"!=""
-.IF "$(ULFFILES)"!=""
-$(foreach,i,$(ULFFILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
-.ENDIF
-
-# *.xrb merge
-.IF "$(XMLPROPERTIES)"!=""
-$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
-.ENDIF
-
-# *.xrm merge
-.IF "$(READMEFILES)"!=""
-$(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF)
-.ENDIF
-
-# *.xcu merge
-.IF "$(LOCALIZEDFILES)"!=""
-$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)/merge/{$(subst,.,/ $(PACKAGE))}/$(i:b).xcu) : $$(@:f) $(LOCALIZESDF) 
-.ENDIF
-.ENDIF # "$(WITH_LANG)"!=""
-
-# dependencies from *.ulf to par-files
-.IF "$(ULFPARFILES)"!=""
-$(ULFPARFILES) : $(COMMONMISC)/$(TARGET)/$$(@:b).$(LANGFILEEXT)
-.ENDIF          # "$(ULFPARFILES)"!=""
-
diff --git a/solenv/inc/tg_moz.mk b/solenv/inc/tg_moz.mk
deleted file mode 100644
index 8c1c0dfa3..000000000
--- a/solenv/inc/tg_moz.mk
+++ /dev/null
@@ -1,89 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-.IF "$(EXPORTS)"!=""
-EXPORT_HEADER=export_mozilla_header
-.ENDIF
-
-.IF "$(XPIDLSRCS)"!=""
-XPIDL_TYPELIB_MODULE=$(MISC)/$(XPIDL_MODULE).xpt
-XPIDLHDR:=$(XPIDLSRCS:s/.idl/.h/)
-XPIDLXPT:=$(XPIDLSRCS:s/.idl/.xpt/)
-EXTRA_MOZ_TARGET+= $(foreach,i,$(XPIDLHDR) $(INCCOM)/$i)
-EXTRA_MOZ_TARGET+= $(foreach,i,$(XPIDLXPT) $(MISC)/$i)
-
-EXTRA_MOZ_TARGET+= $(XPIDL_TYPELIB_MODULE)
-.ENDIF
-
-ALLMOZ:=$(EXTRA_MOZ_TARGET) $(DO_XPIDL) $(GEN_PRCPUCFG) $(EXPORT_HEADER)
-
-$(INCCOM)/%.h : %.idl
-    $(COMMAND_ECHO)$(COPY) $< $(INCCOM)
-    $(COMMAND_ECHO)$(XPIDL) -m header -w -I $(SOLARIDLDIR)/mozilla -I$(INCCOM) -I . -o $(INCCOM)/$* $<
-
-$(MISC)/%.xpt : %.idl
-    $(COMMAND_ECHO)$(XPIDL) -m typelib -w -I $(SOLARIDLDIR)/mozilla -I$(INCCOM) -I . -o $(MISC)/$* $<
-
-.INCLUDE : target.mk
-
-.IF "$(GUI)"=="WNT"
-CPUCFG=_winnt.cfg
-.ENDIF
-
-.IF "$(OS)"=="SOLARIS"
-CPUCFG=_solaris32.cfg
-.ENDIF
-
-.IF "$(OS)"=="LINUX"
-CPUCFG=_linux.cfg
-.ENDIF
-
-.IF "$(OS)"=="FREEBSD"
-CPUCFG=_freebsd.cfg
-.ENDIF
-
-.IF "$(OS)"=="NETBSD"
-CPUCFG=_netbsd.cfg
-.ENDIF
-
-.IF "$(GEN_PRCPUCFG)"!=""
-$(GEN_PRCPUCFG): $(PRJ)/pr/include/md/$(CPUCFG) 
-    @$(COPY) $(PRJ)/pr/include/md/$(CPUCFG) $@
-.ENDIF
-
-.IF "$(EXPORTS)"!=""
-$(EXPORT_HEADER):
-    @$(COPY) $(EXPORTS) $(INCCOM)
-.ENDIF
-
-.IF "$(XPIDLSRCS)"!=""
-$(XPIDL_TYPELIB_MODULE): $(foreach,i,$(XPIDLXPT) $(MISC)/$i)
-    $(COMMAND_ECHO)$(XPIDL_LINK) $(MISC)/$(XPIDL_MODULE).xpt $^
-    @-mkdir $(BIN)/components
-    @$(COPY) $@ $(BIN)/components
-.ENDIF
diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk
deleted file mode 100644
index 73fae59d6..000000000
--- a/solenv/inc/tg_obj.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-MKFILENAME:=TG_OBJ.MK
-
-.IF "$(OBJTARGET)"!=""
-$(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
-    @echo "Making:   " $(@:f)
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    $(ECHONL) $(foreach,i,$(OBJFILES:f) $(ROBJ)/$(i)) > $@
-.ELSE			# "$(COM)"=="GCC"
-.IF "$(LIBTARGET)"!="NO"
-    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIBTARGET)"!="NO"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)"=="WNT"
-.IF "$(GUI)"=="UNX"
-    @echo $(foreach,i,$(OBJFILES:f) $(ROBJ)/$(i:s/.obj/.o/)) | xargs -n1 > $@
-.IF "$(OS)"=="MACOSX"
-    @-nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ELSE
-    @nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ENDIF
-.ENDIF			# "$(GUI)"=="UNX"
-.ENDIF			# "$(OBJTARGET)"!=""
-
-
-.IF "$(SECOND_BUILD)"!=""
-.IF "$($(SECOND_BUILD)OBJTARGET)"!=""
-$($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
-    @echo "Making:   " $(@:f)
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-#     $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES)
-    $(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)/$(i)) > $@
-.ELSE
-.IF "$(LIBTARGET)"!="NO"
-    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIBTARGET)"!="NO"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
-.ENDIF
-.ENDIF			# "$(GUI)"=="WNT"
-.IF "$(GUI)"=="UNX"
-    @echo $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)/$(i:s/.obj/.o/)) | xargs -n1 >> $@
-.ENDIF			# "$(GUI)"=="UNX"
-.ENDIF			# "$($(SECOND_BUILD)OBJTARGET)"!=""
-.ENDIF			# "$(SECOND_BUILD)"!=""
diff --git a/solenv/inc/tg_propmerge.mk b/solenv/inc/tg_propmerge.mk
deleted file mode 100755
index 796bca982..000000000
--- a/solenv/inc/tg_propmerge.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(L10NPROPERTYFILES)"!=""
-ALLTAR : $(MISC)/$(TARGET).pmerge.mk $(L10NPROPERTYFILES)
-
-$(MISC)/$(TARGET).pmerge.mk :  $(L10NPROPERTYFILES)
-
-$(L10NPROPERTYFILES) : $(LOCALIZESDF)
-
-.INCLUDE .IGNORE : $(MISC)/$(TARGET).pmerge.mk
-
-.IF "$(alllangiso)"!="$(last_merge)"
-MERGEPHONY:=.PHONY
-.ENDIF          # "$(alllangiso)" != "$(last_merge)"
-
-$(CLASSDIR)/$(PACKAGE)/%.properties $(MERGEPHONY) : %.properties
-    @@-$(MKDIRHIER) $(@:d)
-.IF "$(WITH_LANG)"==""
-    $(COMMAND_ECHO)$(COPY) $< $@
-.ELSE          # "$(WITH_LANG)"==""
-    @@-$(RM) $@
-    $(COMMAND_ECHO)@noop $(assign PMERGELIST+:=$(<:f))
-    $(COMMAND_ECHO)@noop $(assign PDESTDIR:=$(@:d))
-.ENDIF          # "$(WITH_LANG)"==""
-
-$(MISC)/$(TARGET).pmerge.mk : $(PMERGELIST)
-.IF "$(WITH_LANG)"!=""
-# jpropex command file requirements:
-# - one file per line
-# - no spaces
-# - no empty lines
-# $(uniq ...) to workaround $assign adding the value twice...
-    @noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
-    $(COMMAND_ECHO)$(SOLARBINDIR)/jpropex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l all -lf $(alllangiso:s/ /,/) -m $(LOCALIZESDF)
-.ENDIF          # "$(WITH_LANG)"!=""
-    @-$(RM) $@
-    $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
-
-.ENDIF          # "$(L10NPROPERTYFILES)"!=""
-
-
diff --git a/solenv/inc/tg_res.mk b/solenv/inc/tg_res.mk
deleted file mode 100644
index 2a99f6121..000000000
--- a/solenv/inc/tg_res.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-.IF "$(RCTARGET)"!=""
-$(RCTARGET): $(RCFILES) 		\
-             $(RCDEPN)
-    @echo "Making:   " $(@:f)
-.IF "$(COM)"=="MSC"
-.IF "$(MFC_INCLUDE)"!=""
-    $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) -I$(MFC_INCLUDE) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGSOUTRES)$@ $(RCFLAGS)
-.ELSE
-    $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGSOUTRES)$@ $(RCFLAGS)
-.ENDIF
-.ELSE
-    $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS) $@
-.ENDIF
-.ENDIF
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
deleted file mode 100644
index 0b1659a28..000000000
--- a/solenv/inc/tg_rslb.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#######################################################
-# unroll begin
-
-.IF "$(RESLIB$(TNR)TARGETN)"!=""
-
-$(RSC_MULTI$(TNR)) : \
-        $(RESLIB$(TNR)SRSFILES) \
-        $(RESLIB$(TNR)TARGETN) \
-        $(RESLIB$(TNR)BMPS)
-    @echo Compiling: $(@:f)
-.IF "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
-    -ft=$@ \
-    $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
-    ) > $(NULLDEV)
-.ELSE			# "$(common_build_reslib)"!=""
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-    -r -p \
-    $(foreach,i,$(alllangiso) -lg$i \
-    $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-    -fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \
-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-    -lip={$j} ) \
-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
-    -subMODULE=$(SOLARDEFIMG) \
-    -subGLOBALRES=$(SOLARDEFIMG)/res \
-    -oil=$(BIN) \
-    -ft=$@ \
-    $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
-    ) > $(NULLDEV)
-.ENDIF			# "$(common_build_reslib)"!=""
-
-$(RESLIB$(TNR)TARGETN): \
-        $(RESLIB$(TNR)SRSFILES) \
-        $(RESLIB$(TNR)BMPS)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI$(TNR))
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI$(TNR))
-.ENDIF			# "$(common_build_reslib)"!=""
-.ELSE				# "$(GUI)"=="UNX"
-.IF "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI$(TNR))
-.ELSE			# "$(common_build_reslib)"!=""
-    @@-$(RM) $(RSC_MULTI$(TNR))
-.ENDIF			# "$(common_build_reslib)"!=""
-.ENDIF              # "$(GUI)"=="UNX"
-.ENDIF				# "$(RESLIB$(TNR)TARGETN)"!=""
-
-
-# unroll end
-#######################################################
-
diff --git a/solenv/inc/tg_scp.mk b/solenv/inc/tg_scp.mk
deleted file mode 100644
index 0033dd9a7..000000000
--- a/solenv/inc/tg_scp.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#######################################################
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(SCP$(TNR)TARGETN)"!=""
-
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
-    @@-$(MKDIRHIER) $(@:d:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-LOCALSCP$(TNR)FILES+=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
-
-$(SCP$(TNR)TARGETN): $(LOCALSCP$(TNR)FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(MKDIRHIER) $(BIN)/$(SCP$(TNR)LINK_PRODUCT_TYPE)
-    $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP$(TNR)FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
-.ENDIF
-
-# Anweisungen fuer das Linken
-# unroll end
-#######################################################
-
diff --git a/solenv/inc/tg_sdi.mk b/solenv/inc/tg_sdi.mk
deleted file mode 100644
index 66b8c8985..000000000
--- a/solenv/inc/tg_sdi.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#######################################################
-# instructions for ???
-# unroll begin
-
-.IF "$(SDI$(TNR)TARGET)"!=""
-$(SDI$(TNR)TARGET): $(SVSDI$(TNR)DEPEND) $(SDI$(TNR)NAME).sdi
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
-    $(VERBOSITY) \
-    -fs$(INCCOMX)/$(SDI$(TNR)NAME).hxx	\
-    -fd$(INCCOMX)/$(SDI$(TNR)NAME).ilb	\
-    -fm$(MISC)/$(SDI$(TNR)NAME).don	\
-    -fl$(MISC)/$(SDI$(TNR)NAME).lst         \
-    -fx$(SDI$(TNR)EXPORT).sdi		\
-    -fz$(MISC)/$(SDI$(TNR)NAME).sid	\
-    $(SDI$(TNR)NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE))
-.ENDIF # "$(SDI$(TNR)TARGET)"!=""
-
-# Instruction for ???
-# unroll end
-#######################################################
-
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
deleted file mode 100644
index d6bcbc825..000000000
--- a/solenv/inc/tg_shl.mk
+++ /dev/null
@@ -1,586 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#######################################################
-# targets for linking
-# unroll begin
-
-.IF "$(SHL$(TNR)TARGETN)"!=""
-
-.IF "$(SHLLINKARCONLY)" != ""
-SHL$(TNR)STDLIBS=
-STDSHL=
-.ELSE
-SHL$(TNR)ARCHIVES=
-.ENDIF
-
-# decide how to link
-.IF "$(SHL$(TNR)CODETYPE)"=="C"
-SHL$(TNR)LINKER=$(LINKC)
-SHL$(TNR)STDSHL=$(subst,CPPRUNTIME, $(STDSHL))
-SHL$(TNR)LINKFLAGS+=$(LINKCFLAGS)
-.ELSE			# "$(SHL$(TNR)CODETYPE)"=="C"
-SHL$(TNR)LINKER=$(LINK)
-SHL$(TNR)STDSHL=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDSHL))
-SHL$(TNR)LINKFLAGS+=$(LINKFLAGS)
-.ENDIF			# "$(SHL$(TNR)CODETYPE)"=="C"
-
-SHL$(TNR)RPATH*=OOO
-LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH)*=/ERROR:/Bad_SHL$(TNR)RPATH_value
-SHL$(TNR)LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH))
-
-.IF "$(SHL$(TNR)USE_EXPORTS)"==""
-SHL$(TNR)DEF*=$(MISC)/$(SHL$(TNR)TARGET).def
-.ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"==""
-
-EXTRALIBPATHS$(TNR)=$(EXTRALIBPATHS)
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL$(TNR)NOCHECK)"==""
-.IF "$(SOLAR_STLLIBPATH)"!=""
-EXTRALIBPATHS$(TNR)+=-L$(SOLAR_STLLIBPATH)
-.ENDIF
-.ENDIF				# "$(SHL$(TNR)NOCHECK)"!=""
-.ENDIF
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-#+++++++++++    version object      ++++++++++++++++++++++++++++++++++++++++
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-.IF "$(L10N_framework)"==""
-.IF "$(VERSIONOBJ)"!=""
-SHL$(TNR)VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f)
-USE_VERSIONH:=$(INCCOM)/$(SHL$(TNR)VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
-SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE           # "$(GUI)" == "UNX"
-SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f)
-.ENDIF          # "$(GUI)" == "UNX"
-$(MISC)/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL$(TNR)VERSIONOBJ:b).h
-#    $(COPY) $(SOLARENV)/src/version.c $@
-    $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@
-
-.INIT : $(SHL$(TNR)VERSIONOBJDEP)
-.ENDIF			# "$(VERSIONOBJ)"!=""
-.ENDIF
-
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL$(TNR)IMPLIB)" == ""
-SHL$(TNR)IMPLIB=i$(TARGET)_t$(TNR)
-.ENDIF			# "$(SHL$(TNR)IMPLIB)" == ""
-.IF "$(COM)" != "GCC"
-USE_$(TNR)IMPLIB=-implib:$(LB)/$(SHL$(TNR)IMPLIB).lib
-SHL$(TNR)IMPLIBN=$(LB)/$(SHL$(TNR)IMPLIB).lib
-.ELSE
-USE_$(TNR)IMPLIB=-Wl,--out-implib=$(SHL$(TNR)IMPLIBN)
-SHL$(TNR)IMPLIBN=$(LB)/lib$(SHL$(TNR)IMPLIB).dll.a
-.ENDIF			# "$(COM)" != "GCC"
-ALLTAR : $(SHL$(TNR)IMPLIBN)
-
-.IF "$(USE_DEFFILE)"==""
-.IF "$(COM)" != "GCC"
-USE_$(TNR)IMPLIB_DEPS=$(LB)/$(SHL$(TNR)IMPLIB).lib
-.ENDIF
-.ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT"
-USE_SHL$(TNR)DEF=$(SHL$(TNR)DEF)
-.ELSE			# "$(GUI)" != "UNX"
-USE_SHL$(TNR)DEF=
-SHL$(TNR)DEPN+:=$(SHL$(TNR)DEPNU)
-
-.IF "$(SHL$(TNR)VERSIONMAP)"==""
-# to activate vmaps remove "#"
-USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)TARGET).vmap
-.ENDIF			# "$(SHL$(TNR)VERSIONMAP)"==""
-
-.IF "$(USE_SHL$(TNR)VERSIONMAP)"!=""
-
-.IF "$(SHL$(TNR)FILTERFILE)"!=""
-.IF "$(SHL$(TNR)VERSIONMAP)"!=""
-#eine von beiden ist zuviel
-USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)TARGET).vmap
-$(USE_SHL$(TNR)VERSIONMAP) .PHONY:
-    @echo -----------------------------
-    @echo you should only use versionmap OR exportfile
-    @echo -----------------------------
-#	force_dmake_to_error
-
-.ENDIF			# "$(SHL$(TNR)VERSIONMAP)"!=""
-
-.IF "$(OS)" != "AIX"
-SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
-.ENDIF
-
-$(USE_SHL$(TNR)VERSIONMAP): \
-                    $(SHL$(TNR)OBJS)\
-                    $(SHL$(TNR)LIBS)\
-                    $(SHL$(TNR)FILTERFILE)
-    @$(RM) $@.dump
-.IF "$(SHL$(TNR)OBJS)"!=""
-# dump remaining objects on the fly
-.IF "$(OS)"=="MACOSX"
-    @-nm $(SHL$(TNR)OBJS:s/.obj/.o/) > $@.dump
-.ELSE
-    @nm $(SHL$(TNR)OBJS:s/.obj/.o/) > $@.dump
-.ENDIF
-.ENDIF			# "$(SHL$(TNR)OBJS)!"=""
-    @$(TYPE) /dev/null $(SHL$(TNR)LIBS:s/.lib/.dump/) >> $@.dump
-    $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL$(TNR)INTERFACE) -f $(SHL$(TNR)FILTERFILE) -m $@
-
-.ELSE			# "$(SHL$(TNR)FILTERFILE)"!=""
-USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)TARGET).vmap
-$(USE_SHL$(TNR)VERSIONMAP) :
-.IF "$(VERBOSE)" == "TRUE"
-    @echo -----------------------------
-    @echo SHL$(TNR)FILTERFILE not set!
-    @echo -----------------------------
-    @$(TOUCH) $@
-    @echo dummy file to keep the dependencies for later use.
-.ELSE
-    @$(TOUCH) $@
-.ENDIF
-#	force_dmake_to_error
-.ENDIF			# "$(SHL$(TNR)FILTERFILE)"!=""
-.ELSE			# "$(USE_SHL$(TNR)VERSIONMAP)"!=""
-
-#and now for the plain non-generic way...
-.IF "$(SHL$(TNR)VERSIONMAP)"!=""
-USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e)
-.IF "$(OS)" != "AIX"
-SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
-$(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS)
-.ENDIF
-
-# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
-# even if the $(AWK) part fails:
-$(USE_SHL$(TNR)VERSIONMAP) .ERRREMOVE: $(SHL$(TNR)VERSIONMAP)
-    @@-$(RM) -f $@
-# The following files will only be generated and needed on Mac OS X as temporary files
-# in order to generate exported symbols list out of Linux/Solaris map files
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) -f $@.symregexp >& $(NULLDEV)
-    @-$(RM) -f $@.expsymlist >& $(NULLDEV)
-.ENDIF
-# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
-# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
-.ELIF "$(COMNAME)"=="sunpro5"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
-.ELSE           # "$(COMID)"=="gcc3"
-    $(COMMAND_ECHO) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) > $@
-.ENDIF          # "$(COMID)"=="gcc3"
-    @chmod a+w $@
-# Mac OS X post-processing generate an exported symbols list from the generated map file
-# for details on exported symbols list see man ld on Mac OS X
-.IF "$(OS)"=="MACOSX"
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
-    @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
-# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
-# Extract RTTI symbols from all the objects that will be used to build a shared library
-.IF "$(SHL$(TNR)OBJS)"!=""
-    -echo $(foreach,i,$(SHL$(TNR)OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-.IF "$(SHL$(TNR)LIBS)"!=""
-    $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
-.ENDIF
-# overwrite the map file generate into the local output tree with the generated
-# exported symbols list
-    cp $@.exported-symbols $@
-.ENDIF # .IF "$(OS)"=="MACOSX"
-.ENDIF			# "$(SHL$(TNR)VERSIONMAP)"!=""
-.ENDIF			# "$(USE_SHL$(TNR)VERSIONMAP)"!=""
-.ENDIF			# "$(GUI)" != "UNX"
-
-.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
-SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\"
-.ENDIF			# "$(GUI)"!="UNX"
-.ENDIF			# "$(OS)"!="MACOSX"
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-
-.IF "$(SHL$(TNR)RES)"!=""
-SHL$(TNR)ALLRES+=$(SHL$(TNR)RES)
-SHL$(TNR)LINKRES*=$(MISC)/$(SHL$(TNR)TARGET).res
-SHL$(TNR)LINKRESO*=$(MISC)/$(SHL$(TNR)TARGET)_res.o
-.ENDIF			# "$(SHL$(TNR)RES)"!=""
-
-.IF "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!=""
-SHL$(TNR)DEFAULTRES*=$(MISC)/$(SHL$(TNR)TARGET)_def.res
-SHL$(TNR)ALLRES+=$(SHL$(TNR)DEFAULTRES)
-SHL$(TNR)LINKRES*=$(MISC)/$(SHL$(TNR)TARGET).res
-SHL$(TNR)LINKRESO*=$(MISC)/$(SHL$(TNR)TARGET)_res.o
-.ENDIF			# "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!=""
-
-#.IF "$(SHL$(TNR)TARGETN)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-.IF "$(SHL$(TNR)LIBS)"!=""
-$(MISC)/$(SHL$(TNR)TARGET)_linkinc.ls .PHONY:
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL$(TNR)LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(SHL$(TNR)TARGETN:b)_linkinc.ls
-$(SHL$(TNR)TARGETN) : $(LINKINCTARGETS)
-
-.ELSE
-.IF "$(SHL$(TNR)USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-.IF "$(SHL$(TNR)LIBS)"!=""
-SHL$(TNR)LINKLIST=$(MISC)/$(SHL$(TNR)TARGET)_link.lst
-SHL$(TNR)LINKLISTPARAM=@$(SHL$(TNR)LINKLIST)
-$(SHL$(TNR)LINKLIST) : $(SHL$(TNR)LIBS)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF          # "$(SHL$(TNR)LIBS)"!=""
-.ENDIF          # "$(COM)"!="GCC"
-.ENDIF
-.ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"=="name"
-
-$(MISC)/%linkinc.ls:
-    @echo . > $@
-.ENDIF          # "$(linkinc)"!=""
-
-.IF "$(COM)" == "GCC" && "$(SHL$(TNR)IMPLIBN)" != ""
-$(SHL$(TNR)IMPLIBN) : $(SHL$(TNR)TARGETN)
-.ENDIF
-
-$(SHL$(TNR)TARGETN) : \
-                    $(SHL$(TNR)OBJS)\
-                    $(SHL$(TNR)LIBS)\
-                    $(USE_$(TNR)IMPLIB_DEPS)\
-                    $(USE_SHL$(TNR)DEF)\
-                    $(USE_SHL$(TNR)VERSIONMAP)\
-                    $(SHL$(TNR)RES)\
-                    $(SHL$(TNR)DEPN) \
-                    $(SHL$(TNR)LINKLIST)
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-.IF "$(SHL$(TNR)DEFAULTRES)"!=""
-    @@-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.IF "$(SHL$(TNR)ICON)" != ""
-    @echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL$(TNR)ADD_VERINFO)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL$(TNR)ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.ELSE			# "$(SHL$(TNR)ADD_VERINFO)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.ENDIF			# "$(SHL$(TNR)ADD_VERINFO)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-.IF "$(RCFLAGSOUTRES)"!=""
-# rc, takes separate flag naming output file, source .rc file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL$(TNR)DEFAULTRES) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.ELSE
-# windres, just takes output file last
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc $(SHL$(TNR)DEFAULTRES)
-.ENDIF
-.ENDIF			# "$(SHL$(TNR)DEFAULTRES)"!=""
-.IF "$(SHL$(TNR)ALLRES)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)
-.IF "$(COM)"=="GCC"
-    $(WINDRES) $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO)
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(SHL$(TNR)ALLRES)"!=""
-.IF "$(COM)"=="GCC"
-# GNU ld since 2.17 supports @cmdfile syntax
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL$(TNR)LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL$(TNR)DEF) \
-        $(USE_$(TNR)IMPLIB) \
-        $(STDOBJ) \
-        $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL$(TNR)LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL$(TNR)STDLIBS) -Wl,--end-group \
-        $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
-        $(SHL$(TNR)LINKRESO) \
-    ))
-.ELSE
-    @noop $(assign ALL$(TNR)OBJLIST:=$(STDOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) $(shell $(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-.IF "$(DEFLIB$(TNR)NAME)"!=""	# do not have to include objs
-    @noop $(assign DEF$(TNR)OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
-    @noop $(foreach,i,$(DEF$(TNR)OBJLIST) $(assign ALL$(TNR)OBJLIST:=$(ALL$(TNR)OBJLIST:s?$i??)))
-.ENDIF			# "$(DEFLIB$(TNR)NAME)"!=""
-    $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
-        $(SHL$(TNR)LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-	$(SOLARLIB) \
-        $(MINGWSSTDOBJ) \
-        -o $@ \
-        -Wl,-Map,$(MISC)/$(@:b).map \
-        $(SHL$(TNR)DEF) \
-        $(USE_$(TNR)IMPLIB) \
-        $(STDOBJ) \
-        $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \
-        $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL$(TNR)LIBS))) \
-        -Wl,--exclude-libs,ALL,--start-group $(SHL$(TNR)STDLIBS) -Wl,--end-group \
-        $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
-        $(SHL$(TNR)LINKRESO) \
-    ))
-.ENDIF
-.ELSE
-.IF "$(linkinc)"==""
-.IF "$(SHL$(TNR)USE_EXPORTS)"!="name"
-.IF "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL$(TNR)LINKER) @$(mktmp \
-        $(SHL$(TNR)LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL$(TNR)STACK) $(SHL$(TNR)BASEX)	\
-        -out:$@ \
-        -map:$(MISC)/$(@:b).map \
-        -def:$(SHL$(TNR)DEF) \
-        $(USE_$(TNR)IMPLIB) \
-        $(STDOBJ) \
-        $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \
-        $(SHL$(TNR)LIBS) \
-        $(SHL$(TNR)STDLIBS) \
-        $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
-        $(SHL$(TNR)LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE			# "$(USE_DEFFILE)"!=""
-    $(COMMAND_ECHO)$(SHL$(TNR)LINKER) @$(mktmp	$(SHL$(TNR)LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL$(TNR)BASEX)		\
-        $(SHL$(TNR)STACK) -out:$(SHL$(TNR)TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(LB)/$(SHL$(TNR)IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
-        $(SHL$(TNR)LIBS)                         \
-        $(SHL$(TNR)STDLIBS)                      \
-        $(SHL$(TNR)STDSHL) $(STDSHL$(TNR))                           \
-        $(SHL$(TNR)LINKRES) \
-    )
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(USE_DEFFILE)"!=""
-.ELSE			# "$(SHL$(TNR)USE_EXPORTS)"!="name"
-    $(COMMAND_ECHO)$(SHL$(TNR)LINKER) @$(mktmp	$(SHL$(TNR)LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL$(TNR)BASEX)		\
-        $(SHL$(TNR)STACK) -out:$(SHL$(TNR)TARGETN)	\
-        -map:$(MISC)/$(@:B).map				\
-        $(USE_$(TNR)IMPLIB) \
-        $(STDOBJ)							\
-        $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ))   \
-        $(SHL$(TNR)LINKLISTPARAM) \
-        @$(mktmp $(SHL$(TNR)STDLIBS)                      \
-        $(SHL$(TNR)STDSHL) $(STDSHL$(TNR))                           \
-        $(SHL$(TNR)LINKRES) \
-    )
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"!="name"
-.ELSE			# "$(linkinc)"==""
-        $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL$(TNR)TARGET).lnk
-        $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL$(TNR)TARGET).lst
-        $(COMMAND_ECHO)$(TYPE) $(mktmp \
-        $(SHL$(TNR)LINKFLAGS) \
-        $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \
-        $(SHL$(TNR)STACK) $(MAPFILE) \
-        -out:$@ \
-        $(LB)/$(SHL$(TNR)IMPLIB).exp \
-        $(STDOBJ) \
-        $(SHL$(TNR)OBJS) \
-        $(SHL$(TNR)STDLIBS) \
-        $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
-        $(SHL$(TNR)LINKRES) \
-        ) >> $(MISC)/$(SHL$(TNR)TARGET).lnk
-        $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL$(TNR)TARGETN:b)_linkinc.ls  >> $(MISC)/$(SHL$(TNR)TARGET).lnk
-        $(COMMAND_ECHO)$(SHL$(TNR)LINKER) @$(MISC)/$(SHL$(TNR)TARGET).lnk
-        @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-        $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-        $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(linkinc)"==""
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(@:b).list
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-    @echo $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
-    $(SHL$(TNR)VERSIONOBJ) \
-    `cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
-    @/bin/echo -n $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \
-    $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
-        `cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd` \
-        >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-    @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
-        shl $(SHL$(TNR)RPATH) $@
-.IF "$(SHL$(TNR)CREATEJNILIB)"!=""
-    @echo "Making:   " $(@:f).jnilib
-    @macosx-create-bundle $@
-.ENDIF          # "$(SHL$(TNR)CREATEJNILIB)"!=""
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL$(TNR)NOCHECK)"==""
-    $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN)
-.ENDIF				# "$(SHL$(TNR)NOCHECK)"!=""
-.ENDIF
-.ELIF "$(OS)"=="IOS"
-    $(COMMAND_ECHO)$(AR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL$(TNR)OBJS)) $(shell cat /dev/null $(LIB$(TNR)TARGET) $(SHL$(TNR)LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
-    $(COMMAND_ECHO)$(RANLIB) $@
-.ELSE			# "$(OS)"=="MACOSX"
-    @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-    @echo $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)SONAME) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
-    $(SHL$(TNR)VERSIONOBJ) -o $@ \
-    `cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
-    $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-  .IF "$(VERBOSE)" == "TRUE"
-    @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-  .ENDIF
-    @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
-.IF "$(UPDATER)"=="YES"
-.IF "$(SHL$(TNR)NOCHECK)"==""
-    $(COMMAND_ECHO)-$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-    $(COMMAND_ECHO)$(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-.IF "$(VERBOSE)"=="TRUE"
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-.ELSE
-    $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) -- -s $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-.ENDIF
-.ENDIF				# "$(SHL$(TNR)NOCHECK)"!=""
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
-    $(COMMAND_ECHO)$(RM) $(LB)/$(SHL$(TNR)TARGETN:b)
-    $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL$(TNR)TARGETN:f) $(SHL$(TNR)TARGETN:b)
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-.IF "$(VERBOSE)" == "TRUE"
-    @ls -l $@
-.ENDIF
-.ENDIF			# "$(GUI)" == "UNX"
-
-.ENDIF			# "$(SHL$(TNR)TARGETN)"!=""
-
-# unroll end
-#######################################################
-
-#-------------------------------------------------------------------------
-
-#######################################################
-# Anweisungen fuer das Linken
-# unroll begin
-
-.IF "$(SHL$(TNR)IMPLIBN)" != ""
-
-.IF "$(UPDATER)"=="YES"
-USELIB$(TNR)DEPN+=$(SHL$(TNR)LIBS)
-.ELSE
-.ENDIF
-
-.IF "$(USE_DEFFILE)"!=""
-USE_SHL$(TNR)TARGET=$(SHL$(TNR)TARGETN)
-.ENDIF
-
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
-$(SHL$(TNR)IMPLIBN):	\
-                    $(SHL$(TNR)DEF) \
-                    $(USE_SHL$(TNR)TARGET) \
-                    $(USELIB$(TNR)DEPN) \
-                    $(USELIBDEPN)
-.ELSE
-$(SHL$(TNR)IMPLIBN):	\
-                    $(SHL$(TNR)LIBS)
-.ENDIF
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)" == "WNT"
-# bei use_deffile implib von linker erstellt
-.IF "$(USE_DEFFILE)"==""
-    $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL$(TNR)IMPLIBN) \
-    -def:$(SHL$(TNR)DEF) )
-.ELSE			# "$(USE_DEFFILE)==""
-    @echo build of $(SHL$(TNR)TARGETN) creates $@
-    @$(TOUCH) $@
-.ENDIF			# "$(USE_DEFFILE)==""
-
-.ELSE
-    @echo no ImportLibs on Mac and *ix
-    @-$(RM) $@
-    @$(TOUCH) $@
-.ENDIF
-.ENDIF
-.ENDIF
-
-# unroll end
-#######################################################
-
diff --git a/solenv/inc/tg_slo.mk b/solenv/inc/tg_slo.mk
deleted file mode 100644
index 4195ffda1..000000000
--- a/solenv/inc/tg_slo.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-MKFILENAME:=TG_SLO.MK
-
-.IF "$(SLOTARGET)"!=""
-$(SLOTARGET): $(SLOFILES) $(IDLSLOFILES)
-.IF "$(MDB)" != ""
-    @echo $(SLOTARGET)
-    @echo $(&:+"\n")
-.ENDIF
-    @echo "Making:   " $(@:f)
-#	@$(RM) $@
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    +$(ECHONL) $(foreach,i,$(SLOFILES:f) $(RSLO)/$(i)) | xargs -n1 > $@
-.ELSE
-.IF "$(LIBTARGET)"!="NO"
-    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIBTARGET)"!="NO"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="UNX"
-    @echo $(foreach,i,$(SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@
-.IF "$(OS)"=="MACOSX"
-    @-nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ELSE
-    @nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
-.ENDIF
-.ENDIF			# "$(GUI)"=="UNX"
-.ENDIF			# "$(SLOTARGET)"!=""
-
-.IF "$(SECOND_BUILD)"!=""
-.IF "$($(SECOND_BUILD)SLOTARGET)"!=""
-$($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES)
-.IF "$(MDB)" != ""
-    @echo $(REAL_$(SECOND_BUILD)SLOTARGET)
-    @echo $(&:+"\n")
-.ENDIF
-    @echo "Making:   " $(@:f)
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-    +$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)/$(i)) | xargs -n1 > $@
-.ELSE
-.IF "$(LIBTARGET)"!="NO"
-    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIBTARGET)"!="NO"
-    $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
-
-.ENDIF			# "$(COM)"=="GCC"
-.ENDIF			# "$(GUI)"=="WNT"
-
-.IF "$(GUI)"=="UNX"
-    @echo $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@
-.ENDIF			# "$(GUI)"=="UNX"
-.ENDIF			# "$($(SECOND_BUILD)SLOTARGET)"!=""
-.ENDIF			# "$(SECOND_BUILD)"!=""
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
deleted file mode 100644
index a919069cd..000000000
--- a/solenv/inc/tg_srs.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#######################################################
-# unroll begin
-
-.IF "$(SRS$(TNR)NAME)"!=""
-
-$(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST)
-
-$(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES)
-    @echo "Making:   " $(@:f)
-    @@-$(RM) $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr
-    $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
-
-.IF "$(WITH_LANG)"!=""
-
-$(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)  
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)-$(MKDIR) $(@:d)
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-$(SRS)/$(SRS$(TNR)NAME).srs: $(LOCALIZE_ME_DEST)
-
-$(SRS)/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)/$(TARGET)/$i)
-.ELSE			# "$(WITH_LANG)"!=""
-$(SRS)/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
-.ENDIF			# "$(WITH_LANG)"!=""
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
-        $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
-        $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
-        -fp=$@.$(INPATH) \
-        $< \
-    )
-    $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-    $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
-.ENDIF          # "$(SRS$(TNR)NAME)"!=""
-
-# unroll end
-#######################################################
-
-
diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk
deleted file mode 100644
index 05a3155fb..000000000
--- a/solenv/inc/tg_wntx64.mk
+++ /dev/null
@@ -1,509 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-##############################################################################################
-#       Used when building 64-bit Windows code for the 64-bit Explorer shell extension
-#	in an otherwise 32-bit LibreOffice build. Don't confuse with
-#	building a completely 64-bit LibreOffice on Windows, which is unfinished
-#	and highly experimental work.
-##############################################################################################
-
-.IF "$(BUILD_X64)"!=""
-
-.IF "$(SLOTARGET_X64)"!=""
-$(SLOTARGET_X64): $(SLOFILES_X64) $(IDLSLOFILES_X64)
-.IF "$(MDB)" != ""
-    @echo $(SLOTARGET_X64)
-    @echo $(&:+"\n")
-.ENDIF
-    @echo ------------------------------
-    @echo Making: $@
-    @-$(MKDIRHIER) $(SLB_X64)
-.IF "$(LIBTARGET)"!="NO"
-    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIBTARGET)"!="NO"
-    $(LIBMGR_X64) $(LIBFLAGS_X64) /OUT:$@ @$(mktmp $(&:+"\n"))
-.ENDIF			# "$(SLOTARGET_X64)"!=""
-
-
-# decide how to link
-.IF "$(SHL1CODETYPE)"=="C"
-SHL1LINKFLAGS_X64+=$(LINKCFLAGS_X64)
-.ELSE			# "$(SHL1CODETYPE)"=="C"
-SHL1LINKFLAGS_X64+=$(LINKFLAGS_X64)
-.ENDIF			# "$(SHL1CODETYPE)"=="C"
-
-.IF "$(SHL2CODETYPE)"=="C"
-SHL2LINKFLAGS_X64+=$(LINKCFLAGS_X64)
-.ELSE			# "$(SHL2CODETYPE)"=="C"
-SHL2LINKFLAGS_X64+=$(LINKFLAGS_X64)
-.ENDIF			# "$(SHL2CODETYPE)"=="C"
-
-.IF "$(SHL1IMPLIB_X64)" == ""
-SHL1IMPLIB_X64=i$(TARGET)_t1
-.ENDIF			# "$(SHL1IMPLIB_X64)" == ""
-USE_1IMPLIB_X64=-implib:$(LB_X64)/$(SHL1IMPLIB_X64).lib
-.IF "$(SHL1TARGET_X64)"!=""
-SHL1IMPLIBN_X64=$(LB_X64)/$(SHL1IMPLIB_X64).lib
-.ENDIF # "$(SLOFILES_X64)$(OBJFILES_X64)"!=""
-
-make_x64_dirs :
-    $(MKDIRHIER) $(BIN_X64) $(MISC_X64) $(LB_X64) $(SLB_X64)
-
-
-.IF "$(LIBTARGET)" == ""
-ALLTAR : $(SHL1IMPLIBN_X64)
-.ENDIF "$(LIBTARGET)" == ""
-
-# ----------------------------- lib ------------------------------------------
-.IF "$(LIB1TARGET_X64)" != ""
-$(LIB1TARGET_X64) :	$(LIB1FILES_X64) \
-                        $(LIB1OBJFILES_X64) \
-                        $(LIB1DEPN_X64)
-    @echo using: $(LIB1FILES_X64)
-    @echo using: $(LIB1TARGET_X64)
-    @echo ------------------------------
-    @echo Making: $@
-    $(MKDIRHIER) $(SLB_X64)
-    @@-$(RM) $@
-    $(LIBMGR_X64) $(LIBFLAGS_X64) /OUT:$@ @$(mktmp $(LIB1FILES_X64) $(LIB1OBJFILES_X64))
-    @-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB1OBJFILES_X64)"!=""
-    @$(TYPE) $(mktmp $(LIB1OBJFILES_X64)) > $(null,$(LIB1OBJFILES_X64) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB1OBJFILES_X64)"!=""
-.IF "$(LIB1FILES_X64)"!=""
-    @-$(TYPE) $(foreach,i,$(LIB1FILES_X64) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB1FILES_X64)"!=""
-    @$(ECHONL)
-.ENDIF          # "$(LIB1TARGET_X64)" != ""
-
-.IF "$(LIB2TARGET_X64)" != ""
-$(LIB2TARGET_X64) :	$(LIB2FILES_X64) \
-                        $(LIB2OBJFILES_X64) \
-                        $(LIB2DEPN_X64)
-    @echo using: $(LIB2FILES_X64)
-    @echo using: $(LIB2TARGET_X64)
-    @echo ------------------------------
-    @echo Making: $@
-    $(MKDIRHIER) $(SLB_X64)
-    @@-$(RM) $@
-    $(LIBMGR_X64) $(LIBFLAGS_X64) /OUT:$@ @$(mktmp $(LIB2FILES_X64) $(LIB2OBJFILES_X64))
-    @-$(RM) $(@:s/.lib/.lin/)
-.IF "$(LIB2OBJFILES_X64)"!=""
-    @$(TYPE) $(mktmp $(LIB2OBJFILES_X64)) > $(null,$(LIB2OBJFILES_X64) $(NULLDEV) $(@:s/.lib/.lin/))
-.ENDIF          # "$(LIB2OBJFILES_X64)"!=""
-.IF "$(LIB2FILES_X64)"!=""
-    @-$(TYPE) $(foreach,i,$(LIB2FILES_X64) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
-.ENDIF          # "$(LIB2FILES_X64)"!=""
-    @$(ECHONL)
-.ENDIF          # "$(LIB2TARGET_X64)" != ""
-
-# -------------- def ----------------------
-.IF	"$(DEF1TARGETN_X64)"!=""
-$(DEF1TARGETN_X64) : \
-        $(DEF1DEPN_X64) \
-        $(DEF1EXPORTFILE_X64)
-        @-$(MKDIRHIER) $(MISC_X64)
-    @-$(RM) $@.tmpfile
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo LIBRARY	  $(EMQ)"$(SHL1TARGETN:f)$(EMQ)" 								 >$@.tmpfile
-    @echo HEAPSIZE	  0 											>>$@.tmpfile
-    @echo EXPORTS													>>$@.tmpfile
-#	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@.tmpfile
-.IF "$(DEFLIB1NAME_X64)"!=""
-.IF "$(SHL1USE_EXPORTS_X64)"==""
-    @-$(EXPORT1_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL1TARGET_X64).exp
-    @$(EXPORT1_PROTECT) $(LIBMGR_X64) -EXTRACT:/ /OUT:$(MISC_X64)/$(SHL1TARGET_X64).exp $(SLB_X64)/$(DEFLIB1NAME_X64).lib
-    @$(EXPORT1_PROTECT) $(LDUMP2) -E 20 -F $(MISC_X64)/$(SHL1TARGET_X64).flt $(MISC_X64)/$(SHL1TARGET_X64).exp			   >>$@.tmpfile
-    $(EXPORT1_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL1TARGET_X64).exp
-.ELSE			# "$(SHL1USE_EXPORTS_X64)"==""
-    @$(EXPORT1_PROTECT) $(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB1NAME_X64) $(SLB_X64)/$(i).lib) | $(GREP) EXPORT: > $(MISC_X64)/$(SHL1TARGET_X64).direct
-.IF "$(SHL1USE_EXPORTS_X64)"!="name"
-    @$(EXPORT1_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF1FILTER_X64) $(MISC_X64)/$(SHL1TARGET_X64).direct >>$@.tmpfile
-.ELSE			# "$(SHL1USE_EXPORTS_X64)"!="name"
-    @$(EXPORT1_PROTECT) $(LDUMP2) -N -D -E 20 -F $(DEF1FILTER_X64) $(MISC_X64)/$(SHL1TARGET_X64).direct >>$@.tmpfile
-.ENDIF			# "$(SHL1USE_EXPORTS_X64)"!="name"
-.ENDIF			# "$(SHL1USE_EXPORTS)"==""
-.ENDIF				# "$(DEFLIB1NAME)"!=""
-.IF "$(DEF1EXPORT1_X64)"!=""
-    @echo $(DEF1EXPORT1_X64)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF1EXPORTFILE_X64)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(DEF1EXPORTFILE_X64) >> $@.tmpfile
-.ENDIF
-    @-$(RM) $@
-    @$(RENAME) $@.tmpfile $@
-.ENDIF 		# "$(DEF1TARGETN_X64)"!=""
-
-.IF	"$(DEF2TARGETN_X64)"!=""
-$(DEF2TARGETN_X64) : \
-        $(DEF2DEPN_X64) \
-        $(DEF2EXPORTFILE_X64)
-    @-$(MKDIRHIER) $(MISC_X64)
-    @-$(RM) $@.tmpfile
-    @echo Making Module-Definitionfile : $@
-    @echo LIBRARY	  $(EMQ)"$(SHL2TARGETN:f)$(EMQ)" 								 >$@.tmpfile
-    @echo HEAPSIZE	  0 											>>$@.tmpfile
-    @echo EXPORTS													>>$@.tmpfile
-#	getversioninfo fuer alle!!
-    @echo GetVersionInfo		>>$@.tmpfile
-.IF "$(DEFLIB2NAME_X64)"!=""
-.IF "$(SHL2USE_EXPORTS_X64)"==""
-    @-$(EXPORT2_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL2TARGET_X64).exp
-    @$(EXPORT2_PROTECT) $(LIBMGR_X64) -EXTRACT:/ /OUT:$(MISC_X64)/$(SHL2TARGET_X64).exp $(SLB_X64)/$(DEFLIB2NAME_X64).lib
-    @$(EXPORT2_PROTECT) $(LDUMP2) -E 20 -F $(MISC_X64)/$(SHL2TARGET_X64).flt $(MISC_X64)/$(SHL2TARGET_X64).exp			   >>$@.tmpfile
-    $(EXPORT2_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL2TARGET_X64).exp
-.ELSE			# "$(SHL2USE_EXPORTS_X64)"==""
-    @$(EXPORT2_PROTECT) $(DUMPBIN) -DIRECTIVES  $(foreach,i,$(DEFLIB2NAME_X64) $(SLB_X64)/$(i).lib) | $(GREP) EXPORT: > $(MISC_X64)/$(SHL2TARGET_X64).direct
-.IF "$(SHL2USE_EXPORTS_X64)"!="name"
-    @$(EXPORT2_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF2FILTER_X64) $(MISC_X64)/$(SHL2TARGET_X64).direct >>$@.tmpfile
-.ELSE			# "$(SHL2USE_EXPORTS_X64)"!="name"
-    @$(EXPORT2_PROTECT) $(LDUMP2) -N -D -E 20 -F $(DEF2FILTER_X64) $(MISC_X64)/$(SHL2TARGET_X64).direct >>$@.tmpfile
-.ENDIF			# "$(SHL2USE_EXPORTS_X64)"!="name"
-.ENDIF			# "$(SHL2USE_EXPORTS)"==""
-.ENDIF				# "$(DEFLIB1NAME)"!=""
-.IF "$(DEF2EXPORT2_X64)"!=""
-    @echo $(DEF2EXPORT2_X64)										>>$@.tmpfile
-.ENDIF
-.IF "$(DEF2EXPORTFILE_X64)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(DEF2EXPORTFILE_X64) >> $@.tmpfile
-.ENDIF
-    @-$(RM) $@
-    @$(RENAME) $@.tmpfile $@
-.ENDIF 		# "$(DEF2TARGETN_X64)"!=""
-#-----------------------------------------------------------------------------
-
-# -------------------------------- shl -----------------------------------------
-
-.IF "$(SHL1TARGET_X64)"!=""
-.IF "$(VERSIONOBJ_X64)"!=""
-SHL1VERSIONOBJ_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET_X64))}$(VERSIONOBJ_X64:f)
-USE_VERSIONH_X64:=$(INCCOM)/$(SHL1VERSIONOBJ_X64:b).h
-SHL1VERSIONOBJDEP_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET_X64))}$(VERSIONOBJ_X64:f)
-$(MISC_X64)/$(SHL1VERSIONOBJ_X64:b).c : make_x64_dirs $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIONOBJ_X64:b).h
-    $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ_X64:b).h/ > $@
-.INIT : $(SHL1VERSIONOBJDEP_X64)
-.ENDIF
-
-.IF "$(USE_DEFFILE_X64)"==""
-USE_1IMPLIB_DEPS_X64=$(LB_X64)/$(SHL1IMPLIB_X64).lib
-.ENDIF			# "$(USE_DEFFILE_X64)"==""
-
-.IF "$(SHL1RES_X64)"!=""
-SHL1ALLRES_X64+=$(SHL1RES_X64)
-SHL1LINKRES_X64*=$(MISC_X64)/$(SHL1TARGET_X64).res
-SHL1LINKRESO_X64*=$(MISC_X64)/$(SHL1TARGET_X64)_res.o
-.ENDIF			# "$(SHL1RES_X64)"!=""
-
-.IF "$(SHL1DEFAULTRES_X64)$(use_shl_versions)"!=""
-SHL1DEFAULTRES_X64*=$(MISC_X64)/$(SHL1TARGET_X64)_def.res
-SHL1ALLRES_X64+=$(SHL1DEFAULTRES_X64)
-SHL1LINKRES_X64*=$(MISC_X64)/$(SHL1TARGET_X64).res
-SHL1LINKRESO_X64*=$(MISC_X64)/$(SHL1TARGET_X64)_res.o
-.ENDIF			# "$(SHL1DEFAULTRES)$(use_shl_versions)"!=""
-.ENDIF # "$(SHL1TARGET_X64)"=!""
-
-.IF "$(SHL1TARGETN_X64)"!=""
-$(SHL1TARGETN_X64) : \
-                    make_x64_dirs \
-                    $(SHL1OBJS_X64)\
-                    $(SHL1LIBS_X64)\
-                    $(USE_1IMPLIB_DEPS_X64)\
-                    $(USE_SHL1DEF_X64)\
-                    $(USE_SHL1VERSIONMAP_X64)\
-                    $(SHL1RES)\
-                    $(SHL1DEPN_X64) \
-                    $(SHL1LINKLIST_X64)
-    @echo Making: $(SHL1TARGETN_X64)
-.IF "$(SHL1DEFAULTRES_X64)"!=""
-    @@-$(RM) $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL1ADD_VERINFO_X64)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
-.ELSE			# "$(SHL1ADD_VERINFO_X64)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
-.ENDIF			# "$(SHL1ADD_VERINFO_X64)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL1TARGET_X64)$(DLLPOST) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
-.ENDIF # "$(SHL1DEFAULTRES_X64)"!=""
-.IF "$(SHL1ALLRES_X64)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(SHL1ALLRES_X64) > $(SHL1LINKRES_X64)
-.ENDIF			# "$(SHL1ALLRES)"!=""
-.IF "$(USE_DEFFILE_X64)"!=""
-    $(LINK_X64) @$(mktmp \
-        $(SHL1LINKFLAGS_X64) \
-        $(LINKFLAGSSHL_X64) \
-        $(SHL1STACK_X64) $(SHL1BASEX_X64)	\
-        -out:$@ \
-        -map:$(MISC_X64)/$(@:b).map \
-        -def:$(SHL1DEF_X64) \
-        $(USE_1IMPLIB_X64) \
-        $(STDOBJ_X64) \
-        $(SHL1VERSIONOBJ_X64) $(SHL1OBJS_X64) \
-        $(SHL1LIBS_X64) \
-        $(SHL1STDLIBS_X64) \
-        $(SHL1STDSHL_X64) $(STDSHL1_X64) \
-        $(SHL1LINKRES_X64) \
-    ) $(LINKOUTPUTFILTER_X64)
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE			# "$(USE_DEFFILE)"!=""
-    $(LINK_X64) @$(mktmp	$(SHL1LINKFLAGS_X64)			\
-        $(LINKFLAGSSHL_X64) $(SHL1BASEX_X64)		\
-        $(SHL1STACK_X64) -out:$(SHL1TARGETN_X64)	\
-        -map:$(MISC_X64)/$(@:B).map				\
-        $(LB_X64)/$(SHL1IMPLIB_X64).exp				\
-        $(STDOBJ_X64)							\
-        $(SHL1OBJS_X64) $(SHL1VERSIONOBJ_X64) \
-        $(SHL1LIBS_X64)                         \
-        $(SHL1STDLIBS_X64)                      \
-        $(SHL1STDSHL_X64) $(STDSHL1_X64)                           \
-        $(SHL1LINKRES_X64) \
-    ) $(LINKOUTPUTFILTER_X64)
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(USE_DEFFILE)"!=""
-# ------------------------------------------------------------------------------
-$(SHL1IMPLIBN_X64):	\
-                    $(SHL1DEF_X64) \
-                    $(USE_SHL1TARGET_X64) \
-                    $(USELIB1DEPN_X64) \
-                    $(USELIBDEPN_X64)
-    @echo Making: $(SHL1IMPLIBN_X64)
-# bei use_deffile implib von linker erstellt
-    @-$(MKDIRHIER) $(LB_X64)
-.IF "$(USE_DEFFILE_X64)"==""
-    $(IMPLIB_X64) $(IMPLIBFLAGS_X64) @$(mktmp -out:$(SHL1IMPLIBN_X64) \
-    -def:$(SHL1DEF_X64) )
-.ELSE			# "$(USE_DEFFILE_X64)==""
-    @echo build of $(SHL1TARGETN_X64) creates $@
-.ENDIF			# "$(USE_DEFFILE_X64)==""
-
-.ENDIF 			# "$(SHL1TARGETN_X64)"!=""
-
-.IF "$(SHL2IMPLIB_X64)" == ""
-SHL2IMPLIB_X64=i$(TARGET)_t2
-.ENDIF			# "$(SHL2IMPLIB_X64)" == ""
-.IF "$(COM)" != "GCC"
-USE_2IMPLIB_X64=-implib:$(LB_X64)/$(SHL2IMPLIB_X64).lib
-.ENDIF			# "$(COM)" != "GCC"
-.IF "$(SHL2TARGET_X64)"!=""
-SHL2IMPLIBN_X64=$(LB_X64)/$(SHL2IMPLIB_X64).lib
-.ENDIF # "$(SLOFILES_X64)$(OBJFILES_X64)"!=""
-
-.IF "$(LIBTARGET)" == ""
-ALLTAR : $(SHL2IMPLIBN_X64)
-.ENDIF # "$(LIBTARGET)" == ""
-
-.IF "$(SHL2TARGET_X64)"!=""
-.IF "$(VERSIONOBJ_X64)"!=""
-SHL2VERSIONOBJ_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET_X64))}$(VERSIONOBJ_X64:f)
-USE_VERSIONH_X64:=$(INCCOM)/$(SHL2VERSIONOBJ_X64:b).h
-SHL2VERSIONOBJDEP_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET_X64))}$(VERSIONOBJ_X64:f)
-$(MISC_X64)/$(SHL2VERSIONOBJ_X64:b).c : make_x64_dirs $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIONOBJ_X64:b).h
-    $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ_X64:b).h/ > $@
-.INIT : $(SHL2VERSIONOBJDEP_X64)
-.ENDIF
-
-.IF "$(USE_DEFFILE_X64)"==""
-USE_2IMPLIB_DEPS_X64=$(LB_X64)/$(SHL2IMPLIB_X64).lib
-.ENDIF			# "$(USE_DEFFILE_X64)"==""
-
-.IF "$(SHL2RES_X64)"!=""
-SHL2ALLRES_X64+=$(SHL2RES_X64)
-SHL2LINKRES_X64*=$(MISC_X64)/$(SHL2TARGET_X64).res
-SHL2LINKRESO_X64*=$(MISC_X64)/$(SHL2TARGET_X64)_res.o
-.ENDIF			# "$(SHL2RES_X64)"!=""
-
-.IF "$(SHL2DEFAULTRES_X64)$(use_shl_versions)"!=""
-SHL2DEFAULTRES_X64*=$(MISC_X64)/$(SHL2TARGET_X64)_def.res
-SHL2ALLRES_X64+=$(SHL2DEFAULTRES_X64)
-SHL2LINKRES_X64*=$(MISC_X64)/$(SHL2TARGET_X64).res
-SHL2LINKRESO_X64*=$(MISC_X64)/$(SHL2TARGET_X64)_res.o
-.ENDIF			# "$(SHL2DEFAULTRES)$(use_shl_versions)"!=""
-.ENDIF # "$(SHL2TARGET_X64)"=!""
-
-.IF "$(SHL2TARGETN_X64)"!=""
-$(SHL2TARGETN_X64) : \
-                    make_x64_dirs \
-                    $(SHL2OBJS_X64)\
-                    $(SHL2LIBS_X64)\
-                    $(USE_2IMPLIB_DEPS_X64)\
-                    $(USE_SHL2DEF_X64)\
-                    $(USE_SHL2VERSIONMAP_X64)\
-                    $(SHL2RES)\
-                    $(SHL2DEPN_X64) \
-                    $(SHL2LINKLIST_X64)
-    @echo Making: $(SHL2TARGETN_X64)
-.IF "$(SHL2DEFAULTRES_X64)"!=""
-    @@-$(RM) $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL2ADD_VERINFO_X64)"!=""
-    @echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
-.ELSE			# "$(SHL2ADD_VERINFO_X64)"!=""
-    @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
-.ENDIF			# "$(SHL1ADD_VERINFO_X64)"!=""
-    @echo $(EMQ)#define VERVARIANT	$(BUILD) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define ORG_NAME	$(SHL2TARGET_X64)$(DLLPOST) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
-    @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-    $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
-.ENDIF # "$(SHL2DEFAULTRES_X64)"!=""
-.IF "$(SHL2ALLRES_X64)"!=""
-    $(COMMAND_ECHO)$(TYPE) $(SHL2ALLRES_X64) > $(SHL2LINKRES_X64)
-.ENDIF			# "$(SHL2ALLRES)"!=""
-.IF "$(USE_DEFFILE_X64)"!=""
-    $(LINK_X64) @$(mktmp \
-        $(SHL2LINKFLAGS_X64) \
-        $(LINKFLAGSSHL_X64) \
-        $(SHL2STACK_X64) $(SHL2BASEX_X64)	\
-        -out:$@ \
-        -map:$(MISC_X64)/$(@:b).map \
-        -def:$(SHL2DEF_X64) \
-        $(USE_2IMPLIB_X64) \
-        $(STDOBJ_X64) \
-        $(SHL2VERSIONOBJ_X64) $(SHL2OBJS_X64) \
-        $(SHL2LIBS_X64) \
-        $(SHL2STDLIBS_X64) \
-        $(SHL2STDSHL_X64) $(STDSHL2_X64) \
-        $(SHL2LINKRES_X64) \
-    ) $(LINKOUTPUTFILTER_X64)
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE			# "$(USE_DEFFILE)"!=""
-    $(LINK_X64) @$(mktmp	$(SHL2LINKFLAGS_X64)			\
-        $(LINKFLAGSSHL_X64) $(SHL2BASEX_X64)		\
-        $(SHL2STACK_X64) -out:$(SHL2TARGETN_X64)	\
-        -map:$(MISC_X64)/$(@:B).map				\
-        $(LB_X64)/$(SHL2IMPLIB_X64).exp				\
-        $(STDOBJ_X64)							\
-        $(SHL2OBJS_X64) $(SHL2VERSIONOBJ_X64) \
-        $(SHL2LIBS_X64)                         \
-        $(SHL2STDLIBS_X64)                      \
-        $(SHL2STDSHL_X64) $(STDSHL2_X64)                           \
-        $(SHL2LINKRES_X64) \
-    ) $(LINKOUTPUTFILTER_X64)
-# double check if target was really written... still making sense?
-    @@$(LS) $@
-    @echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
-.ELSE
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
-    $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
-    $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ENDIF			# "$(USE_DEFFILE)"!=""
-
-$(SHL2IMPLIBN_X64):	\
-                    $(SHL2DEF_X64) \
-                    $(USE_SHL2TARGET_X64) \
-                    $(USELIB2DEPN_X64) \
-                    $(USELIBDEPN_X64)
-    @echo Making: $(SHL2IMPLIBN_X64)
-# bei use_deffile implib von linker erstellt
-    @-$(MKDIRHIER) $(LB_X64)
-.IF "$(USE_DEFFILE_X64)"==""
-    $(IMPLIB_X64) $(IMPLIBFLAGS_X64) @$(mktmp -out:$(SHL2IMPLIBN_X64) \
-    -def:$(SHL2DEF_X64) )
-.ELSE			# "$(USE_DEFFILE_X64)==""
-    @echo build of $(SHL2TARGETN_X64) creates $@
-.ENDIF			# "$(USE_DEFFILE_X64)==""
-
-.ENDIF 			# "$(SHL2TARGETN_X64)"!=""
-
-
-$(SLO_X64)/%.obj : %.cpp
-    @echo ------------------------------
-    @echo Making: $@
-    @@-$(RM) $@ >& $(NULLDEV)
-    -$(MKDIRHIER) $(@:d)
-    @-$(MKDIRHIER) $(MISC_X64)
-    $(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp $(CAPTURE_OUTPUT)
-
-$(SLO_X64)/%.obj : %.cxx
-    @echo Making: $@
-    @@-$(RM) $@ >& $(NULLDEV)
-    $(COMMAND_ECHO)$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(MISC_X64)
-    $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
-
-$(SLO_X64)/%.obj : $(MISC)/%.c
-    @echo Making: $@
-    $(COMMAND_ECHO)$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(MKDIRHIER) $(MISC_X64)
-    @@-$(RM) $@
-    @$(TYPE) $(mktmp $(CC_X64) $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC)/$*.c )
-    @$(ECHONL)
-    $(COMMAND_ECHO)$(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC)/$*.c )
-
-$(SLO_X64)/%.obj : %.c
-    @echo Making: $@
-    $(COMMAND_ECHO)$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(MKDIRHIER) $(MISC_X64)
-    @@-$(RM) $@
-    $(COMMAND_ECHO)$(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $*.c )
-
-.ENDIF			# "$(BUILD_X64)"!=""
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
deleted file mode 100755
index 6ff412bb0..000000000
--- a/solenv/inc/tg_xmerge.mk
+++ /dev/null
@@ -1,108 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(XTXFILES)"!=""
-
-L10NEXT*=.txt
-XTX_TARGET_PATH*=$(MISC)/$(TARGET)
-
-ALLTAR : $(XTX_TARGET_PATH).xtx.pmerge.mk $(XTXFILES)
-
-$(XTX_TARGET_PATH).xtx.pmerge.mk :  $(XTXFILES)
-
-$(XTXFILES) : $(LOCALIZESDF)
-
-.INCLUDE .IGNORE : $(XTX_TARGET_PATH).xtx.pmerge.mk
-
-.IF "$(alllangiso)"!="$(last_merge)"
-XTXMERGEPHONY:=.PHONY
-.ENDIF          # "$(alllangiso)" != "$(last_merge)"
-
-$(XTX_TARGET_PATH)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
-    @@-$(MKDIRHIER) $(@:d)
-.IF "$(WITH_LANG)"==""
-    $(COMMAND_ECHO)$(COPY) $< $(@:d)$(@:b)_en-US$(L10NEXT)
-.ELSE          # "$(WITH_LANG)"==""
-    @@-$(RM) $@
-    $(COMMAND_ECHO)@noop $(assign XTXMERGELIST+:=$(<:f))
-    $(COMMAND_ECHO)@noop $(assign XTXDESTDIR:=$(@:d))
-.ENDIF          # "$(WITH_LANG)"==""
-
-$(XTX_TARGET_PATH).xtx.pmerge.mk : $(XTXMERGELIST)
-.IF "$(WITH_LANG)"!=""
-# xtxex command file requirements:
-# - one file per line
-# - no spaces
-# - no empty lines
-# $(uniq ...) to workaround $assign adding the value twice...
-    @noop $(assign XTXMERGEFILELIST:=$(uniq $(XTXMERGELIST)))
-    $(COMMAND_ECHO) $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(XTXDESTDIR) -i @$(mktmp $(XTXMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[fileNoExt]_[language]$(L10NEXT)" 
-.ENDIF          # "$(WITH_LANG)"!=""
-
-    @-$(RM) $@
-    $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
-.ENDIF          # "$(XTXFILES)"!=""
-
-.IF "$(TREEFILE)"!=""
-ALLTAR : $(MISC)/$(TARGET).tree.pmerge.mk $(TREEFILE)
-
-$(MISC)/$(TARGET).tree.pmerge.mk :  $(TREEFILE)
-
-$(TREEFILE) : $(LOCALIZESDF)
-
-.INCLUDE .IGNORE : $(MISC)/$(TARGET).tree.pmerge.mk
-
-.IF "$(alllangiso)"!="$(last_merge)"
-TREEMERGEPHONY:=.PHONY
-.ENDIF          # "$(alllangiso)" != "$(last_merge)"
-
-$(OUT_HELP)/en-US/help.tree $(TREEMERGEPHONY) : help.tree
-    @@-$(MKDIRHIER) $(@:d)
-.IF "$(WITH_LANG)"==""
-    $(COMMAND_ECHO)$(COPY) $< $@
-.ELSE          # "$(WITH_LANG)"==""
-    @@-$(RM) $@
-    $(COMMAND_ECHO)@noop $(assign TREEMERGELIST+:=$(<:f))
-    $(COMMAND_ECHO)@noop $(assign TREEDESTDIR:=$(@:d:d:d))
-.ENDIF          # "$(WITH_LANG)"==""
-
-$(MISC)/$(TARGET).tree.pmerge.mk : $(TREEMERGELIST)
-.IF "$(WITH_LANG)"!=""
-# xtxex command file requirements:
-# - one file per line
-# - no spaces
-# - no empty lines
-# $(uniq ...) to workaround $assign adding the value twice...
-    @noop $(assign TREEMERGEFILELIST:=$(uniq $(TREEMERGELIST)))
-# Variables for the pattern filename,fileNoExt,language,extension,pathPrefix,pathPostFix,path
-    $(COMMAND_ECHO) $(SOLARBINDIR)/xhtex -p $(PRJNAME) -r $(PRJ) -o $(TREEDESTDIR) -i @$(mktmp $(TREEMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[language]/[fileNoExt].tree" 
-.ENDIF          # "$(WITH_LANG)"!=""
-    @-$(RM) $@
-    $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
-.ENDIF          # "$(TREEFILE)"!=""
-
-
diff --git a/solenv/inc/tg_yxx.mk b/solenv/inc/tg_yxx.mk
deleted file mode 100644
index 5dfb95e07..000000000
--- a/solenv/inc/tg_yxx.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-$(MISC)/%.cxx : %.y
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)tr -d "\015" < $< > $(MISC)/stripped_$<
-    $(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)/stripped_$<
-# removing -f switch - avoid getting nothing when copying a file to itself
-    @@-$(COPY:s/-f//) $@.h $(INCCOM)/$(@:b).hxx
-    @@-$(COPY:s/-f//) $(@:d)/$(@:b).hxx $(INCCOM)/$(@:b).hxx
-# fail on not existing .hxx
-    $(COMMAND_ECHO)$(TYPE) $(INCCOM)/$(@:b).hxx >& $(NULLDEV)
-
-$(INCCOM)/yy%.cxx : %.y
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)tr -d "\015" < $< > $(MISC)/stripped_$<
-    $(COMMAND_ECHO)$(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)/stripped_$<
-# removing -f switch - avoid getting nothing when copying a file to itself
-    @@-$(COPY:s/-f//) $@.h $(INCCOM)/$(@:b).hxx
-    @@-$(COPY:s/-f//) $(@:d)/$(@:b).hxx $(INCCOM)/$(@:b).hxx
-# fail on not existing .hxx
-    $(COMMAND_ECHO)$(TYPE) $(INCCOM)/$(@:b).hxx >& $(NULLDEV)
-
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk
deleted file mode 100644
index 4468a2139..000000000
--- a/solenv/inc/tg_zip.mk
+++ /dev/null
@@ -1,162 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#######################################################
-# unroll begin
-
-.IF "$(GUI)"=="WNT"
-command_seperator=&&
-#command_seperator=^
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
-.ELSE
-command_seperator=;
-avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
- 
-.ENDIF
-
-.IF "$(ZIP$(TNR)TARGET)"!=""
-
-.IF "$(ZIP$(TNR)STRIPLANGUAGETAGS)" != ""
-CALLXSLTPROC:=$(XSLTPROC)
-.EXPORT: CALLXSLTPROC
-.ENDIF
-
-ZIP$(TNR)EXT*=.zip
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP$(TNR)LIST:s/LANGDIR//)" == "$(ZIP$(TNR)LIST)"
-ZIP$(TNR)TARGETN=$(COMMONBIN)/$(ZIP$(TNR)TARGET)$(ZIP$(TNR)EXT)
-.ELSE
-ZIP$(TNR)TARGETN=$(foreach,i,$(zip$(TNR)alllangiso) $(COMMONBIN)/$(ZIP$(TNR)TARGET)_$i$(ZIP$(TNR)EXT) )
-.ENDIF
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP$(TNR)LIST:s/LANGDIR//)" == "$(ZIP$(TNR)LIST)"
-ZIP$(TNR)TARGETN=$(BIN)/$(ZIP$(TNR)TARGET)$(ZIP$(TNR)EXT)
-.ELSE
-ZIP$(TNR)TARGETN=$(foreach,i,$(zip$(TNR)alllangiso) $(BIN)/$(ZIP$(TNR)TARGET)_$i$(ZIP$(TNR)EXT) )
-.ENDIF
-.ENDIF			# "$(common_build_zip)"!=""
-ZIP$(TNR)DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP$(TNR)TARGETN:s/$(ZIP$(TNR)EXT)/.dpzz/)))
-ZIPDEPFILES+=$(ZIP$(TNR)DEPFILE)
-
-ZIP$(TNR)DIR*=$(ZIPDIR)
-ZIP$(TNR)FLAGS*=$(ZIPFLAGS)
-.IF "$(zip$(TNR)generatedlangs)"!=""
-zip$(TNR)langdirs*=$(alllangiso)
-.ELSE           # "$(zip$(TNR)generatedlangs)"!=""
-zip$(TNR)langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
-.ENDIF          # "$(zip$(TNR)generatedlangs)"!=""
-.IF "$(ZIP$(TNR)FORCEALLLANG)"!=""
-zip$(TNR)alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip$(TNR)langdirs) $(eq,$i,$j  $i $(NULL))))
-.ELSE          # "$(ZIP$(TNR)ALLLANG)" != ""
-zip$(TNR)alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip$(TNR)langdirs) $(eq,$i,$j  $i $(NULL))))
-.ENDIF          # "$(ZIP$(TNR)ALLLANG)" != ""
-.ENDIF			# "$(ZIP$(TNR)TARGET)"!=""
-
-.IF "$(ZIP$(TNR)TARGETN)"!=""
-
-ZIP$(TNR)TMP:=$(mktmp iii)
-
-$(MISC)/$(TARGET).$(PWD:f).$(ZIP$(TNR)TARGET).dpzz : $(ZIP$(TNR)TARGETN)
-
-.IF "$(common_build_zip)"!=""
-ZIP$(TNR)HELPVAR=$(COMMONBIN)/$(ZIP$(TNR)TARGET)
-.ELSE			# "$(common_build_zip)"!=""
-ZIP$(TNR)HELPVAR=$(BIN)/$(ZIP$(TNR)TARGET)
-.ENDIF			# "$(common_build_zip)"!=""
-
-$(ZIP$(TNR)DEPFILE) :
-    @echo # > $(MISC)/$(@:f)
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP$(TNR)DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP$(TNR)DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP$(TNR)DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP$(TNR)DIR)" != ""
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP$(TNR)DIR)" != ""
-    $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP$(TNR)DIR)
-    $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
-.ELSE			# "$(ZIP$(TNR)DIR)" != ""
-    $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
-.ENDIF			# "$(ZIP$(TNR)DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-    @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
-
-
-$(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS)
-    @echo "Making:   " $(@:f)
-    @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
-    @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
-    @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
-.IF "$(common_build_zip)"!=""
-.IF "$(ZIP$(TNR)DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $@.$(INPATH)
-    $(COMMAND_ECHO)$(RM) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
-.ELSE			# "$(ZIP$(TNR)DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP$(TNR)FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
-        $(FI)
-    @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
-    @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
-.ENDIF			# "$(ZIP$(TNR)DIR)" != ""
-    @@-$(RM) $@
-    @$(IFEXIST) $@.$(INPATH) $(THEN) $(RENAME:s/+//) $@.$(INPATH) $@ $(FI)
-#	@$(IFEXIST) $@ $(THEN) $(TOUCH) $@ $(FI)  # even if it's not used...
-.ELSE			# "$(common_build_zip)"!=""
-.IF "$(ZIP$(TNR)DIR)" != ""
-    @@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
-    $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \
-        $(FI)
-    $(COMMAND_ECHO)$(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)  $@ 
-    $(COMMAND_ECHO)$(RM) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
-.ELSE			# "$(ZIP$(TNR)DIR)" != ""
-    $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
-        $(FI)
-.IF "$(ZIP$(TNR)STRIPLANGUAGETAGS)" != ""
-    $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
-        $(SOLARENV)/bin/striplanguagetags.sh $@ \
-        $(FI)
-.ENDIF
-.ENDIF			# "$(ZIP$(TNR)DIR)" != ""
-.ENDIF			# "$(common_build_zip)"!=""
-.ENDIF
-
-# unroll end
-#######################################################
-
diff --git a/solenv/inc/trustedinfo.manifest b/solenv/inc/trustedinfo.manifest
deleted file mode 100644
index 292ed2a30..000000000
--- a/solenv/inc/trustedinfo.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-	<security>
-	<requestedPrivileges>
-		<requestedExecutionLevel level="asInvoker" uiAccess="false">
-		</requestedExecutionLevel>
-	</requestedPrivileges>
-	</security>
-</trustInfo>
-</assembly>
\ No newline at end of file
diff --git a/solenv/inc/udkversion.mk b/solenv/inc/udkversion.mk
deleted file mode 100644
index 18fa3cf45..000000000
--- a/solenv/inc/udkversion.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# major 
-UDK_MAJOR=3
-# minor 
-UDK_MINOR=2
-# micro 
-UDK_MICRO=7
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
deleted file mode 100644
index c07e5c36f..000000000
--- a/solenv/inc/unitools.mk
+++ /dev/null
@@ -1,175 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Common tools - move this to the end / consolidate
-TRANSEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/transex3
-ULFEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfex
-XMLEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xmlex
-XRMEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xrmex
-CFGEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cfgex
-AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/autodoc
-LOCALIZE_SL*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/localize_sl
-GSICHECK*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/gsicheck
-
-.IF "$(SYSTEM_LIBXSLT)"!="YES"
-XSLTPROC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xsltproc
-.ELSE			# "$(SYSTEM_LIBXSLT)"!="YES"
-XSLTPROC*=$(AUGMENT_LIBRARY_PATH) xsltproc
-.ENDIF			# "$(SYSTEM_LIBXSLT)"!="YES"
-
-ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfconv
-
-MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/makedepend
-
-SCP_CHECK_TOOL:=checkscp$E
-
-# iz32110: Calling a cygwin application from a non-cygwin shell requires
-# backslashes to be escaped by another backslash: EES .. extra escape slash
-EES:=
-
-# iz29675: 4nt must not quote special characters, but tcsh has to.
-# *NIX shells needs to use " quotes, but 4nt must not.
-# EMQ .. extra meta quote (\\ at line end is \)
-# USQ .. unix shell  quote
-EMQ:=\\
-USQ:="
-
-NULLDEV:=/dev/null
-
-
-# iz29609 helpmacro to check if file exists
-IFEXIST:=if [ -f 
-IFNOTEXIST:= if ! test -f
-THEN:= ] ; then
-FI:= ; fi
-PIPEERROR=2>&1 |
-
-# iz31658
-CHECKZIPRESULT:=|| ret=$$?; if [[ "$$ret" != "12" && "$$ret" != "1" ]] ; then exit $$ret ; fi && echo "Nothing to update for zip"
-
-# Platform specific
-.IF "$(GUI)"=="WNT"
-AWK*=awk
-SORT*=sort
-SED*=sed
-GNUPATCH*=patch
-# change drive and directory
-CDD=cd
-# expect cygwin tools to exist
-COPY*=cp
-COPYRECURSE=-r
-DEREFERENCE=-L
-COPYUPDATE=-u
-ECHON=echo -n
-ECHONL=echo
-FIND*=find
-.IF "$(OS_FOR_BUILD)"=="WNT"
-FLIPCMD*=$(PERL) $(SOLARENV)/bin/slfl.pl
-.ENDIF
-GNUCOPY*=cp
-GNUMAKE*=make
-GREP*=grep
-LS*=ls
-PERL*:=perl
-.EXPORT : PERL
-RENAME*=mv
-TOUCH*=touch
-TYPE*=cat
-DUMPBIN*=dumpbin
-
-.ELIF "$(GUI)"=="UNX"	# "$(GUI)"=="WNT"
-SED*=sed
-SORT*=sort
-PERL*=perl
-.EXPORT : PERL
-TYPE=cat
-CDD=cd
-COPY=cp -f
-.IF "$(OS_FOR_BUILD)"=="MACOSX" || "$(OS_FOR_BUILD)"=="NETBSD" || "$(OS_FOR_BUILD)"=="OPENBSD" || \
-    "$(OS_FOR_BUILD)"=="DRAGONFLY"
-COPYRECURSE=-R
-.ELSE # Not BSD based ones:
-COPYRECURSE=-r
-.ENDIF
-.IF "$(OS)"=="SOLARIS"
-AWK*=nawk
-GNUCOPY*=/usr/gnu/bin/cp
-GNUPATCH*=/usr/gnu/bin/patch
-GNUTAR*=/usr/sfw/bin/gtar
-GNUMAKE=/usr/sfw/bin/make
-DEREFERENCE=
-.ELIF "$(OS)"=="AIX"
-AWK*=/opt/freeware/bin/awk
-GNUCOPY*=cp
-GNUPATCH*=/opt/freeware/bin/patch
-GNUTAR*=gtar
-DEREFERENCE=-L
-.ELSE			# "$(OS)"=="SOLARIS"
-AWK*=awk
-# this is not true, as BSD does not default to a GNU cp, but BSD cp
-# so in dmake makefiles one should be restricted to use the subset
-# of features that both BSD and GNU make support.
-# as the GNU make build system requires GNUCOPY to really be a GNU copy
-# we work around that for now by not setting GNUCOPY in sdev300.ini
-# for fbsd for now, but for all other platforms it is set.
-GNUCOPY*=cp
-GNUPATCH*=patch
-DEREFERENCE=-L
-.ENDIF			# "$(OS)"=="SOLARIS"
-.IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
-GNUMAKE*=make
-.ELSE			# "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
-GNUMAKE*=gmake
-.ENDIF			# "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
-TOUCH=touch
-RENAME=mv
-GREP=grep
-FIND=find
-LS=ls
-ECHON=echo -n
-ECHONL=echo
-.ENDIF			# "$(GUI)"=="UNX"
-
-# (Global) Set if not set before
-DELAY*=sleep
-MKDIR*=mkdir$E
-MKDIRHIER*=mkdir$E -p
-RMDIR*=rmdir
-XARGS*=xargs
-GNUTAR*:=tar
-
-RM+=$(RMFLAGS)
-ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/adjustvisibility
-CONVERT*:=$(PERL) $(SOLARENV)/bin/leconvert.pl
-EXECTEST := $(PERL) -w $(SOLARENV)/bin/exectest.pl
-GCCINSTLIB:=$(PERL) -w $(SOLARENV)/bin/gccinstlib.pl
-
-# The dmake $(PWD) apparantly produces paths with symlinks resolved, while the
-# bash pwd command by default produces paths with unresolved symlinks, so that
-# computing PATH_IN_MODULE in settings.mk would fail without the -P flag to the
-# bash pwd command:
-PWDFLAGS = -P
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
deleted file mode 100644
index 74ed8d5eb..000000000
--- a/solenv/inc/unx.mk
+++ /dev/null
@@ -1,182 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# --- Unix-Environment ---------------------------------------
-# Used if "$(GUI)" == "UNX"
-
-
-# Dieses Define gilt fuer alle  WNT- Plattformen
-# fuer Compiler, wo kein Java unterstuetzt wird, muss dies ge'undeft werden
-#JAVADEF=-DSOLAR_JAVA
-
-# --- Compiler ---
-
-.IF "$(OS)$(CPU)$(COMEX)" == "SOLARISS4"
-.INCLUDE : unxsols4.mk
-.ENDIF
-
-.IF "$(OS)$(CPU)$(COMEX)" == "SOLARISI4"
-.INCLUDE : unxsoli4.mk
-.ENDIF
-
-.IF "$(OS)$(CPU)$(COMEX)" == "SOLARISU4"
-.INCLUDE : unxsolu4.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCSOLARISS"
-.INCLUDE : unxsogs.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCSOLARISI"
-.INCLUDE : unxsogi.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXS"
-.INCLUDE : unxlngs.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXI"
-.INCLUDE : unxlngi.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXX"
-.INCLUDE : unxlngx.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUXPPOWERPC"
-.INCLUDE : unxlngppc.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUXPPOWERPC64"
-.INCLUDE : unxlngppc64.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCAIXP"
-.INCLUDE : unxaigppc.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390"
-.INCLUDE : unxlngs390.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390X"
-.INCLUDE : unxlngs390x.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXR"
-.INCLUDE : unxlngr.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCANDROIDR"
-.INCLUDE : unxandr.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXA"
-.INCLUDE : unxlnga.mk
-.ENDIF
-
-.IF "$(COM)$(OS)" == "GCCNETBSD"
-.INCLUDE : unxnbsd.mk
-.ENDIF
-
-.IF "$(COM)$(OS)" == "GCCFREEBSD"
-.INCLUDE : unxfbsd.mk
-.ENDIF
-
-.IF "$(COM)$(OS)" == "GCCOPENBSD"
-.INCLUDE : unxobsd.mk
-.ENDIF
-
-.IF "$(COM)$(OS)" == "GCCDRAGONFLY"
-.INCLUDE : unxdfly.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
-.INCLUDE : unxmacxp.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXI"
-.INCLUDE : unxmacxi.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCIOSR"
-.INCLUDE : unxiosr.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXM"
-.INCLUDE : unxlngmips.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUX6"
-.INCLUDE : unxlngm68k.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXH"
-.INCLUDE : unxlnghppa.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXL"
-.INCLUDE : unxlngaxp.mk
-.ENDIF
-
-# --- general *ix settings ---
-HC=hc
-HCFLAGS=
-PATH_SEPERATOR*=:
-CDEFS+=-D__DMAKE
-
-CDEFS+=-DUNIX
-
-# fuer linux: bison -y -d
-YACC*=yacc
-YACCFLAGS*=-d -t
-
-EXECPOST=
-SCPPOST=.ins
-DLLDEST=$(LB)
-SOLARSHAREDBIN=$(SOLARLIBDIR_FOR_BUILD)
-SONAME_SWITCH*=-h
-
-.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="IOS"
-DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR)
-.ENDIF
-.ENDIF			# "$(UNIXVERSIONNAMES)"!=""
-
-# enable building/linking KDE-dependent code in both OOo and SO build environment
-.IF "$(ENABLE_KDE)" != ""
-.IF "$(KDE_ROOT)"!=""
-KDE_CFLAGS:=-I$(KDE_ROOT)/include -DQT_CLEAN_NAMESPACE
-KDE_LIBS:=-lkdeui -lkdecore -lqt-mt
-SOLARLIB+=-L$(KDE_ROOT)/lib
-.IF "$(OS)$(CPU)" == "LINUXX"
-SOLARLIB+=-L$(KDE_ROOT)/lib64
-.ENDIF          # "$(OS)$(CPU)" == "LINUXX"
-.ENDIF          # "$(KDE_ROOT)"!=""
-.ENDIF          # "$(ENABLE_KDE)" != ""
-
-OOO_LIBRARY_PATH_VAR *= LD_LIBRARY_PATH
diff --git a/solenv/inc/unxaigppc.mk b/solenv/inc/unxaigppc.mk
deleted file mode 100644
index 240aa9c03..000000000
--- a/solenv/inc/unxaigppc.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Unix AIX PowerPC using GCC, please make generic modifications to unxlng.mk
-
-LIBSALCPPRT*=-Wl,-bnogc -lsalcpprt -Wl,-bgc
-
-.INCLUDE : unxlngppc.mk
-
-CDEFS+=-D_THREAD_SAFE
-
-.INCLUDE : productversion.mk
-
-COLON=":"
-URELIBDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/ure-link/lib))
-UREBINDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/ure-link/bin))
-BASISPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/program))
-BRANDPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/program))
-
-LINKFLAGSRUNPATH_URELIB:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
-LINKFLAGSRUNPATH_UREBIN:=-Wl,-blibpath:$(URELIBDIRS):$(UREBINDIRS):/usr/lib:/lib
-LINKFLAGSRUNPATH_OOO:=-Wl,-blibpath:$(BASISPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
-LINKFLAGSRUNPATH_SDK:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
-LINKFLAGSRUNPATH_BRAND:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(BASISPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
-LINKFLAGSRUNPATH_BOXT:=-Wl,-blibpath:$(BASISPROGRAMDIRS):/usr/lib:/lib
-LINKFLAGS:=-Wl,-brtl -Wl,-bnolibpath
-
-LINKFLAGSAPPGUI:=
-LINKFLAGSAPPCUI:=
-
-LINKVERSIONMAPFLAG:=
-
-SONAME_SWITCH:=
-
-STDLIBGUIMT:=-ldl -lpthread -lm
-STDLIBCUIMT:=-ldl -lpthread -lm
-STDSHLGUIMT:=-ldl -lpthread -lm
-STDSHLCUIMT:=-ldl -lpthread -lm
-X11LINK_DYNAMIC:=-lXext -lX11
-
-
-CFLAGSDEBUG:=
-
-OOO_LIBRARY_PATH_VAR=LIBPATH
diff --git a/solenv/inc/unxaixp.mk b/solenv/inc/unxaixp.mk
deleted file mode 100644
index be35f4383..000000000
--- a/solenv/inc/unxaixp.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mak file fuer unxaixp
-ASM=
-AFLAGS=
-
-ARCH_FLAGS*=
-
-CXX=				xlC_r
-CC=				xlc_r
-CFLAGS=			-c -qlanglvl=extended -qchars=signed 
-CDEFS+=			-D_PTHREADS
-CDEFS+=			-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
-CFLAGSCC=$(ARCH_FLAGS)
-CFLAGSCXX=$(ARCH_FLAGS)
-CFLAGSOBJGUIMT=
-CFLAGSOBJCUIMT=
-CFLAGSSLOGUIMT=
-CFLAGSSLOCUIMT=
-CFLAGSPROF=
-CFLAGSDEBUG=
-CFLAGSDBGUTIL=
-CFLAGSOPT=		-O
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=	-o
-
-STATIC= 		# -Bstatic
-DYNAMIC= 		# -Bdynamic
-
-#
-# Zu den Linkflags von shared Libraries:
-#
-# -G			Erzeugen eines Shared-Objects
-# -brtl			aktiviert Runtime-Linking, wird von -G mitgesetzt
-# -bsymbolc		loest Symbole innerhalb einer Library zur Linkzeit auf
-# -p0			??? (ENOMANPAGESINSTALLABLEFROMCD)
-# -bnoquiet		verbose
-#
-LINK=
-LINKFLAGS=
-LINKFLAGSAPPCUI=	xlC_r -qlanglvl=extended -qchars=signed -brtl -bnolibpath
-LINKFLAGSAPPGUI=	xlC_r -qlanglvl=extended -qchars=signed -brtl -bnolibpath
-LINKFLAGSSHLCUI=	makeC++SharedLib_r -G -bsymbolic -bdynamic -bnolibpath -p0
-LINKFLAGSSHLGUI=	makeC++SharedLib_r -G -bsymbolic -bdynamic -bnolibpath -p0
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=
-LINKFLAGSOPT=
-
-# Reihenfolge der libs NICHT egal!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-# application
-STDLIBGUIMT=	# -lX11 -ldl
-STDLIBCUIMT=	# -lX11 -ldl
-# shared library
-STDSHLGUIMT=	-lX11 -ldl
-STDSHLCUIMT=	-lX11 -ldl
-THREADLIB=
-
-LIBMGR=			ar
-LIBFLAGS=		-r
-# LIBEXT=		.so
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=		-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPRE=			lib
-DLLPOST=		.so
-
-
-LDUMP=			cppfilt /b /n /o /p
-
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
deleted file mode 100644
index 070db53af..000000000
--- a/solenv/inc/unxandr.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Android Linux ARM using GCC, please make generic modifications to unxgcc.mk
-
-CDEFAULTOPT=-Os
-.INCLUDE : unxgcc.mk
-CDEFS+=-DARM32
-CFLAGS+=-fno-omit-frame-pointer
diff --git a/solenv/inc/unxdfly.mk b/solenv/inc/unxdfly.mk
deleted file mode 100644
index 55b331630..000000000
--- a/solenv/inc/unxdfly.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#         François Tigeot  <ftigeot@wolfpond.org>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-# Makefile for DragonFly BSD
-
-# arch specific defines
-.IF "$(CPUNAME)" == "INTEL"
-CDEFS+=-DX86
-.ENDIF
-
-.IF "$(CPUNAME)" == "X86_64"
-CDEFS+=-DX86_64
-BUILD64=1
-.ENDIF
-
-.INCLUDE : unxgcc.mk
-
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# default linker flags
-LINKFLAGSDEFS:=
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
deleted file mode 100644
index f751384c4..000000000
--- a/solenv/inc/unxfbsd.mk
+++ /dev/null
@@ -1,204 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Makefile for FreeBSD.
-
-ASM=
-AFLAGS=
-
-SOLAR_JAVA*=
-JAVAFLAGSDEBUG=-g
-
-# Include arch specific makefile.
-.IF "$(CPUNAME)" == "INTEL"
-.INCLUDE : unxfbsdi.mk
-.ENDIF
-.IF "$(CPUNAME)" == "X86_64"
-.INCLUDE : unxfbsdx.mk
-.ENDIF
-
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
-
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF          # "$(SYSBASE)"!=""
-CFLAGS+=-fmessage-length=0 -c
-
-# flags to enable build with symbols
-CFLAGSENABLESYMBOLS=-g
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-PICSWITCH:=-fpic
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-    -Wno-non-virtual-dtor
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk): Currently this is not tested on FreeBSD
-#MODULES_WITH_WARNINGS :=
-
-# switches for dynamic and static linking
-STATIC		= -Wl,-Bstatic
-DYNAMIC		= -Wl,-Bdynamic
-
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-# default linker flags
-LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
-    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJVCL=$(L)/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-# libraries for linking applications
-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-# libraries for linking shared libraries
-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-# name of library manager
-LIBMGR=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-# platform specific identifier for shared libs
-DLLPRE=lib
-DLLPOST=.so
diff --git a/solenv/inc/unxfbsdi.mk b/solenv/inc/unxfbsdi.mk
deleted file mode 100644
index c01fc21fb..000000000
--- a/solenv/inc/unxfbsdi.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# FreBSD/i386 specific defines
-#
- 
-CDEFS+=-DX86
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=-mtune=pentiumpro
-
-# Compiler flags for enabling optimizations
-.IF "$(PRODUCT)"!=""
-CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-.ELSE 	# "$(PRODUCT)"!=""
-CFLAGSOPT= 					# no optimizing for non products
-.ENDIF	# "$(PRODUCT)"!=""
diff --git a/solenv/inc/unxfbsdx.mk b/solenv/inc/unxfbsdx.mk
deleted file mode 100644
index 6fb0641d9..000000000
--- a/solenv/inc/unxfbsdx.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# FreBSD/amd64 specific defines
-#
-
-CDEFS+=-DX86_64
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-.IF "$(CPUNAME)" == "X86_64"
-ARCH_FLAGS*=
-.ENDIF
-
-# Compiler flags for enabling optimizations
-.IF "$(PRODUCT)"!=""
-CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
-.ELSE 	# "$(PRODUCT)"!=""
-CFLAGSOPT=   					# no optimizing for non products
-.ENDIF	# "$(PRODUCT)"!=""
-
-BUILD64=1
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
deleted file mode 100644
index 752de80c7..000000000
--- a/solenv/inc/unxgcc.mk
+++ /dev/null
@@ -1,266 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# generic mk file for gcc on unix systems
-
-ASM*=
-AFLAGS*=
-SOLAR_JAVA*=
-# default optimization level for product code
-CDEFAULTOPT*=-O2
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-# position independent code switch
-PICSWITCH*:=-fpic
-JAVAFLAGSDEBUG=-g
-
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
-
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF          # "$(SYSBASE)"!=""
-CFLAGS+=-fmessage-length=0 -c
-
-# flags to enable build with symbols
-CFLAGSENABLESYMBOLS=-g
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" && "$(HAVE_GCC_VISIBILITY_BROKEN)" != "TRUE"
-CFLAGSCXX+=-fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-.IF "$(HAVE_CXX0X)" == "TRUE"
-CFLAGSCXX+=-std=c++0x -Wno-deprecated-declarations
-.ENDIF # "$(HAVE_CXX0X)" == "TRUE"
-
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-
-GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
-GCCNUMVER:=$(shell @-$(CXX) $(GCCNUMVERSION_CMD))
-
-# Compiler flags for enabling optimizations
-.IF "$(PRODUCT)"!=""
-CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products
-.IF "$(GCCNUMVER)" <= "000400050000"
-#At least SLED 10.2 gcc 4.3 overly agressively optimizes
-#uno::Sequence into junk, so only strict-alias on compiler
-#later than 4.5.1
-CFLAGSOPT+=-fno-strict-aliasing
-.ENDIF
-.ELSE 	# "$(PRODUCT)"!=""
-CFLAGSOPT=   							# no optimizing for non products
-.ENDIF	# "$(PRODUCT)"!=""
-
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-    -Wno-non-virtual-dtor -Woverloaded-virtual
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
-
-COMPILER_WARN_ERRORS=TRUE
-
-# switches for dynamic and static linking
-STATIC		= -Wl,-Bstatic
-DYNAMIC		= -Wl,-Bdynamic
-
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-# default linker flags
-.IF "$(SYSBASE)"!=""
-LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBASE)
-.ENDIF          # "$(SYSBASE)"!=""
-#
-# The DT RPATH value is used first, before any other path, specifically before
-# the path defined in the LD_LIBRARY_PATH environment variable. This is
-# problematic since it does not allow the user to overwrite the value.
-# Therefore DT_RPATH is deprecated. The introduction of the new variant,
-# DT_RUNPATH, corrects this oversight by requiring the value is used after the
-# path in LD_LIBRARY_PATH.
-#
-# The linker option --enable-new-dtags must be used to also add DT_RUNPATH
-# entry. This will cause both, DT_RPATH and DT_RUNPATH entries, to be created
-#
-LINKFLAGSDEFS*=-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags
-    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\',--enable-new-dtags
-LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\',--enable-new-dtags
-LINKFLAGSRUNPATH_NONE=
-# flag -Wl,-z,noexecstack sets the NX bit on the stack
-LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
-.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
-LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
-.ENDIF
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic \
-    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
-LINKFLAGSAPPCUI= -Wl,-export-dynamic \
-    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-.IF "$(ALLOC)" == "TCMALLOC"
-STDLIBGUIMT+=-ltcmalloc
-STDLIBCUIMT+=-ltcmalloc
-STDSHLGUIMT+=-ltcmalloc
-STDSHLCUIMT+=-ltcmalloc
-.ENDIF
-
-.IF "$(ALLOC)" == "JEMALLOC"
-STDLIBGUIMT+=-ljemalloc
-STDLIBCUIMT+=-ljemalloc
-STDSHLGUIMT+=-ljemalloc
-STDSHLCUIMT+=-ljemalloc
-.ENDIF
-
-.IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
-LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
-.ELSE
-LINKFLAGS += -Wl,-zdynsort
-.ENDIF
-
-# libraries for linking applications
-STDLIBGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-STDLIBCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-# libraries for linking shared libraries
-STDSHLGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-STDSHLCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-
-X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-# name of library manager
-LIBMGR*=$(AR)
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-# platform specific identifier for shared libs
-DLLPRE=lib
-DLLPOST=.so
-PCHPOST=.gch
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
deleted file mode 100644
index 5532560ce..000000000
--- a/solenv/inc/unxiosr.mk
+++ /dev/null
@@ -1,136 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-##########################################################################
-# Platform MAKEFILE for iOS, both devices and the simulator
-##########################################################################
-
-PROCESSOR_DEFINES=-DARM32
-
-# flags to enable build with symbols
-CFLAGSENABLESYMBOLS=-g
-
-ASM=
-AFLAGS=
-LINKOUTPUT_FILTER=
-
-CFLAGS=-fmessage-length=0 -c $(EXTRA_CFLAGS)
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# ---------------------------------
-#  Compilation flags
-# ---------------------------------
-# Normal C compilation flags
-CFLAGSCC=-pipe -fsigned-char $(ARCH_FLAGS)
-
-# Normal Objective C compilation flags
-OBJCFLAGS=-fexceptions -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
-# -x options generally ignored by ccache, tell it that it can cache
-# the result nevertheless
-CCACHE_SKIP:=$(eq,$(USE_CCACHE),YES --ccache-skip $(NULL))
-OBJCXXFLAGS:=$(CCACHE_SKIP) -x $(CCACHE_SKIP) objective-c++ $(OBJCFLAGS)
-
-# Comp Flags for files that need exceptions enabled (C and C++)
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-
-# Comp Flags for files that do not need exceptions enabled (C and C++)
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# Normal C++ compilation flags
-CFLAGSCXX=-pipe -fsigned-char $(ARCH_FLAGS) -Wno-ctor-dtor-privacy
-
-# No PIC needed as we don't build dynamic objects
-PICSWITCH:=
-# Other flags
-CFLAGSOBJGUIMT=$(PICSWITCH) -fno-common
-CFLAGSOBJCUIMT=$(PICSWITCH) -fno-common
-CFLAGSSLOGUIMT=$(PICSWITCH) -fno-common
-CFLAGSSLOCUIMT=$(PICSWITCH) -fno-common
-
-# Flag for including debugging information in object files
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-
-# Flag to specify output file to compiler/linker
-CFLAGSOUTOBJ=-o
-
-# ---------------------------------
-#  Optimization flags
-# ---------------------------------
-CFLAGSOPT=-O2 -fno-strict-aliasing
-CFLAGSNOOPT=-O0
-
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-# -Wshadow does not work for C++ as /usr/include/c++/4.0.0/ext/hashtable.h
-# l. 717 contains a declaration of __cur2 shadowing the declaration at l. 705,
-# in template code for which a #pragma gcc system_header would not work:
-# -Wextra doesn not work for gcc-3.3
-CFLAGSWARNCC=-Wall -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
-
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
-
-# Tag to identify an output file as a library
-DLLPRE=lib
-# We don't use dynamic shared libraries on iOS
-DLLPOST=.a
-# Precompiled header file extension
-PCHPOST=.gch
-
-STDOBJVCL=$(L)/salmain.o
-
-STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreText -framework CoreGraphics -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
-STDLIBGUIMT=$(STDLIBCUIMT)
-STDSHLCUIMT=
-STDSHLGUIMT=
-
-LIBMGR=ar
-LIBFLAGS=-r
-
-IMPLIB=:
-IMPLIBFLAGS=
-
-MAPSYM=:
-MAPSYMFLAGS=
-
-RC=:
-RCFLAGS=
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-OOO_LIBRARY_PATH_VAR = DYLD_LIBRARY_PATH
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
deleted file mode 100644
index 62746cee4..000000000
--- a/solenv/inc/unxlng.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-CDEFS+=-DGLIBC=2
-PTHREAD_LIBS=-lpthread
-DL_LIB=-ldl
-
-.INCLUDE : unxgcc.mk
diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk
deleted file mode 100644
index e7882f3a9..000000000
--- a/solenv/inc/unxlnga.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Unix Linux Itanium using gcc, please make generic modifications to unxlng.mk
-
-.INCLUDE : unxlng.mk
-CFLAGS+=-DIA64
-BUILD64=1
diff --git a/solenv/inc/unxlngaxp.mk b/solenv/inc/unxlngaxp.mk
deleted file mode 100644
index fdeb932f2..000000000
--- a/solenv/inc/unxlngaxp.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Unix Linux Alpha using gcc, please make generic modifications to unxlng.mk
-
-PICSWITCH:=-fPIC
-.INCLUDE : unxlng.mk
-CFLAGS+=-DAXP
-LINKFLAGS+=-Wl,--no-relax
-BUILD64=1
diff --git a/solenv/inc/unxlnghppa.mk b/solenv/inc/unxlnghppa.mk
deleted file mode 100644
index 41a428e31..000000000
--- a/solenv/inc/unxlnghppa.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Unix Linux HPPA using GCC, please make generic modifications to unxlng.mk
-PICSWITCH:=-fPIC
-.INCLUDE : unxlng.mk
-CDEFS+=-DHPPA
-CFLAGS+=
-CFLAGSCC+=
-CFLAGSCXX+=
diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk
deleted file mode 100644
index 79c255c32..000000000
--- a/solenv/inc/unxlngi.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk
-CDEFAULTOPT=-Os
-.IF "$(GCCNUMVER)" >= "000400050000"
-ARCH_FLAGS*=-mtune=atom
-.ELSE
-ARCH_FLAGS*=-mtune=pentiumpro
-.ENDIF
-.INCLUDE : unxlng.mk
-CDEFS+=-DX86
-DLLPOST=.so
diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
deleted file mode 100644
index b6a018a10..000000000
--- a/solenv/inc/unxlngm68k.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Unix Linux m68k using GCC, please make generic modifications to unxlng.mk
-
-CDEFAULTOPT=-Os
-PICSWITCH:=-fPIC
-.INCLUDE : unxlng.mk
-CDEFS+=-DM68K
-CFLAGS+=-fsigned-char -fno-omit-frame-pointer
-CFLAGSCC+=-fsigned-char
-CFLAGSCXX+=-fsigned-char
diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
deleted file mode 100644
index 783305d6c..000000000
--- a/solenv/inc/unxlngmips.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Unix Linux Mips using GCC, please make generic modifications to unxlng.mk
-
-CDEFAULTOPT=-Os
-.INCLUDE : unxlng.mk
-CDEFS+=-DMIPS
diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
deleted file mode 100644
index af528d96e..000000000
--- a/solenv/inc/unxlngppc.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Unix Linux PowerPC using GCC, please make generic modifications to unxlng.mk
-
-DEFAULTOPT=-Os
-PICSWITCH:=-fPIC
-.INCLUDE : unxlng.mk
-CDEFS+=-DPOWERPC -DPPC
diff --git a/solenv/inc/unxlngppc64.mk b/solenv/inc/unxlngppc64.mk
deleted file mode 100644
index 7ce9f35c4..000000000
--- a/solenv/inc/unxlngppc64.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Unix Linux 64Bit PowerPC using GCC, inherit from ppc and add some flags
-
-.INCLUDE : unxlngppc.mk
-
-CDEFS+=-DPOWERPC64
-CFLAGSCXX+=-mminimal-toc
-BUILD64=1
diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
deleted file mode 100644
index 81ee90ca4..000000000
--- a/solenv/inc/unxlngr.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Unix Linux ARM using GCC, please make generic modifications to unxlng.mk
-
-CDEFAULTOPT=-Os
-.INCLUDE : unxlng.mk
-CDEFS+=-DARM32
-CFLAGS+=-fno-omit-frame-pointer
diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk
deleted file mode 100644
index 390244f31..000000000
--- a/solenv/inc/unxlngs.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Unix Linux Sparc using GCC, please make generic modifications to unxlng.mk
-
-ASM=$(CC)
-AFLAGS=-Wa,-K,PIC -c $(CDEFS)
-CDEFAULTOPT=-Os
-PICSWITCH:=-fPIC
-.INCLUDE : unxlng.mk
-CDEFS+=-DSPARC
diff --git a/solenv/inc/unxlngs390.mk b/solenv/inc/unxlngs390.mk
deleted file mode 100644
index 0eac39af0..000000000
--- a/solenv/inc/unxlngs390.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Unix Linux s390 using GCC, please make generic modifications to unxlng.mk
-
-PICSWITCH:=-fPIC
-.INCLUDE : unxlng.mk
-CDEFS+=-DS390
-CFLAGS+=-fsigned-char -fno-omit-frame-pointer
-CFLAGSCC+=-fsigned-char
-CFLAGSCXX+=-fsigned-char
diff --git a/solenv/inc/unxlngs390x.mk b/solenv/inc/unxlngs390x.mk
deleted file mode 100644
index 108e30b73..000000000
--- a/solenv/inc/unxlngs390x.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Unix Linux 64bit s390x using GCC, inherit from s390 and add some flags
-
-.INCLUDE : unxlngs390.mk
-
-CDEFS+=-DS390X
-BUILD64=1
diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk
deleted file mode 100644
index 9c89eddef..000000000
--- a/solenv/inc/unxlngx.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Linux Unix X86-64 using GCC, please make generic modifications to unxlng.mk
-
-.INCLUDE : unxlng.mk
-CDEFS+=-DX86_64
-BUILD64=1
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
deleted file mode 100644
index cbd30ca1d..000000000
--- a/solenv/inc/unxmacx.mk
+++ /dev/null
@@ -1,257 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-##########################################################################
-# Platform MAKEFILE for Mac OS X and Darwin on both PowerPC and Intel
-##########################################################################
-
-# PROCESSOR_DEFINES is defined in the particular platform file
-
-ASM=
-AFLAGS=
-LINKOUTPUT_FILTER=
-
-# Definitions that we may need on the compile line.
-# -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
-#  compiling STLport sources too, either internally or externally.
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1
-# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
-# build can assume functions/libraries of that version to be available
-# unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk
-# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
-# http://developer.apple.com/technotes/tn2002/tn2064.html
-# done in setsolar/configure now. left here for documentation
-#MACOSX_DEPLOYMENT_TARGET=10.4
-#.EXPORT: MACOSX_DEPLOYMENT_TARGET
-CDEFS+:=-DQUARTZ
-
-EXTRA_CDEFS+:=-isysroot $(MACOSX_SDK_PATH)  -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED)
-
-# Name of library where static data members are initialized
-# STATICLIBNAME=static$(DLLPOSTFIX)
-# STATICLIB=-l$(STATICLIBNAME)
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-
-# MacOS X specific Java compilation/link flags
-SOLAR_JAVA*=TRUE
-.IF "$(SOLAR_JAVA)"!=""
-    JAVADEF=-DSOLAR_JAVA
-    JAVAFLAGSDEBUG=-g
-    JAVA_RUNTIME=-framework JavaVM
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-# Specify the compiler to use.  NOTE:  MacOS X should always specify
-# c++ for C++ compilation as it does certain C++ specific things
-# behind the scenes for us.
-# CC = C++ compiler to use
-# cc = C compiler to use
-# objc = Objective C compiler to use
-# objcpp = Objective C++ compiler to use
-CXX*=g++
-CC*=gcc
-objc*=$(CC)
-objcpp*=$(CXX)
-
-CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS)
-
-.IF "$(DISABLE_DEPRECATION_WARNING)" == "TRUE"
-CFLAGS+=-Wno-deprecated-declarations
-.ENDIF
-# ---------------------------------
-#  Compilation flags
-# ---------------------------------
-# Normal C compilation flags
-CFLAGSCC=-pipe -fsigned-char -malign-natural $(ARCH_FLAGS)
-
-# Normal Objective C compilation flags
-#OBJCFLAGS=-no-precomp
-OBJCFLAGS=-fobjc-exceptions
-# -x options generally ignored by ccache, tell it that it can cache
-# the result nevertheless
-CCACHE_SKIP:=$(eq,$(USE_CCACHE),YES --ccache-skip $(NULL))
-OBJCXXFLAGS:=$(CCACHE_SKIP) -x $(CCACHE_SKIP) objective-c++ -fobjc-exceptions
-
-# Comp Flags for files that need exceptions enabled (C and C++)
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-
-# Comp Flags for files that do not need exceptions enabled (C and C++)
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# Normal C++ compilation flags
-CFLAGSCXX=-pipe -malign-natural -fsigned-char $(ARCH_FLAGS) -Wno-ctor-dtor-privacy
-.IF "$(HAVE_GCC_NO_LONG-DOUBLE)" == "TRUE"
-CFLAGSCXX+= -Wno-long-double
-.ENDIF
-
-PICSWITCH:=-fPIC
-# Other flags
-CFLAGSOBJGUIMT=$(PICSWITCH) -fno-common
-CFLAGSOBJCUIMT=$(PICSWITCH) -fno-common
-CFLAGSSLOGUIMT=$(PICSWITCH) -fno-common
-CFLAGSSLOCUIMT=$(PICSWITCH) -fno-common
-CFLAGSPROF=
-
-# Flag for including debugging information in object files
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-
-# Flag to specify output file to compiler/linker
-CFLAGSOUTOBJ=-o
-
-# Flags to enable precompiled headers
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
-# ---------------------------------
-#  Optimization flags
-# ---------------------------------
-CFLAGSOPT=-O2 -fno-strict-aliasing
-CFLAGSNOOPT=-O0
-
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-# -Wshadow does not work for C++ as /usr/include/c++/4.0.0/ext/hashtable.h
-# l. 717 contains a declaration of __cur2 shadowing the declaration at l. 705,
-# in template code for which a #pragma gcc system_header would not work:
-# -Wextra doesn not work for gcc-3.3
-CFLAGSWARNCC=-Wall -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
-
-# All modules on this platform compile without warnings.
-# If you need to set MODULES_WITH_WARNINGS here, comment
-# COMPILER_WARN_ERRORS=TRUE here (see settings.mk):
-COMPILER_WARN_ERRORS=TRUE
-
-#special settings form environment
-CDEFS+=$(EXTRA_CDEFS)
-
-STDLIBCPP=-lstdc++
-
-# ---------------------------------
-#  Link stage flags
-# ---------------------------------
-# always link with gcc since you may be linking c code and don't want -lstdc++ linked in!
-
-##  ericb 04 mars 2005
-
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
-# assure backwards-compatibility
-EXTRA_LINKFLAGS*:=-Wl,-syslibroot,$(MACOSX_SDK_PATH)
-# Very long install_names are needed so that install_name_tool -change later on
-# does not complain that "larger updated load commands do not fit:"
-LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)'
-LINKFLAGSRUNPATH_UREBIN=
-LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO/$(@:f)'
-LINKFLAGSRUNPATH_SDK=
-LINKFLAGSRUNPATH_BRAND=
-LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=
-LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)'
-LINKFLAGS=$(LINKFLAGSDEFS)
-
-LINKFLAGS+=-lobjc
-# Sometimes we still use files that would be in a GUIBASE="unx" specific directory
-# because they really aren't GUIBASE specific, so we've got to account for that here.
-INCGUI+= -I$(PRJ)/unx/inc
-
-#special settings form environment
-LINKFLAGS+=$(EXTRA_LINKFLAGS)
-
-# Random link flags dealing with different cases of linking
-
-LINKFLAGSAPPGUI=-bind_at_load
-LINKFLAGSSHLGUI=-dynamiclib -single_module
-LINKFLAGSAPPCUI=-bind_at_load
-LINKFLAGSSHLCUI=-dynamiclib -single_module
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-
-# Flag to add debugging information to final products
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# ---------------------------------
-#  MacOS X shared library specifics
-# ---------------------------------
-
-# Tag to identify an output file as a library
-DLLPRE=lib
-# File extension to identify dynamic shared libraries on MacOS X
-DLLPOST=.dylib
-# Precompiled header file extension
-PCHPOST=.gch
-
-# We don't use mapping on MacOS X
-#LINKVERSIONMAPFLAG=-Wl,--version-script
-LINKVERSIONMAPFLAG=-Wl,-exported_symbols_list
-
-SONAME_SWITCH=-Wl,-h
-
-STDLIBCPP=-lstdc++
-
-STDOBJVCL=$(L)/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-STDLIBCUIMT=CPPRUNTIME -lm
-STDLIBGUIMT=-framework Carbon -framework Cocoa -lpthread CPPRUNTIME -lm
-STDSHLCUIMT=-lpthread CPPRUNTIME -lm
-STDSHLGUIMT=-framework Carbon -framework CoreFoundation -framework Cocoa -lpthread CPPRUNTIME -lm
-
-LIBMGR=ar
-LIBFLAGS=-r
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-OOO_LIBRARY_PATH_VAR = DYLD_LIBRARY_PATH
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
deleted file mode 100644
index 1e620f344..000000000
--- a/solenv/inc/unxmacxi.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# Mac OS X/Intel specific defines
-#
-
-PROCESSOR_DEFINES=-DX86
-
-# special for SO build environment
-.IF "$(SYSBASE)"!=""
-.IF "$(EXTRA_CFLAGS)"!=""
-CPP:=gcc -E $(EXTRA_CFLAGS)
-CXXCPP*:=g++ -E $(EXTRA_CFLAGS)
-.EXPORT : CPP CXXCPP
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
-.ENDIF # "$(SYSBASE)"!=""
-
-# flags to enable build with symbols
-CFLAGSENABLESYMBOLS=-g
-
-# Include generic Mac OS X makefile
-.INCLUDE : unxmacx.mk
diff --git a/solenv/inc/unxmacxp.mk b/solenv/inc/unxmacxp.mk
deleted file mode 100644
index 805563a7f..000000000
--- a/solenv/inc/unxmacxp.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-#
-# Mac OS X/PowerPC specific defines
-#
-
-PROCESSOR_DEFINES=-DPOWERPC -DPPC
-
-# Include generic Mac OS X makefile
-.INCLUDE : unxmacx.mk
diff --git a/solenv/inc/unxnbsd.mk b/solenv/inc/unxnbsd.mk
deleted file mode 100644
index b7d5e042e..000000000
--- a/solenv/inc/unxnbsd.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# mk file for NetBSD
-#
-
-# arch specific defines
-.IF "$(CPUNAME)" == "INTEL"
-CDEFS+=-DX86
-.ENDIF
-
-.IF "$(CPUNAME)" == "X86_64"
-CDEFS+=-DX86_64
-BUILD64=1
-.ENDIF
-
-.INCLUDE : unxgcc.mk
-
-# default linker flags
-# NetBSD has no support for using relative paths with $ORIGIN
-LINKFLAGSRUNPATH_UREBIN=
-LINKFLAGSRUNPATH_OOO=
-LINKFLAGSRUNPATH_SDK=
-LINKFLAGSRUNPATH_BRAND=
-
-LINKFLAGSDEFS=-Wl,--ignore-unresolved-symbol,environ
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
diff --git a/solenv/inc/unxobsd.mk b/solenv/inc/unxobsd.mk
deleted file mode 100644
index fd4c744bf..000000000
--- a/solenv/inc/unxobsd.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Makefile for OpenBSD
-
-# arch specific defines
-.IF "$(CPUNAME)" == "INTEL"
-CDEFS+=-DX86
-.ENDIF
-.IF "$(CPUNAME)" == "X86_64"
-CDEFS+=-DX86_64
-ARCH_FLAGS*=
-BUILD64=1
-.ENDIF
-
-.INCLUDE : unxgcc.mk
-
-# disable exceptions in boost
-CFLAGS_NO_EXCEPTIONS+=-DBOOST_NO_EXCEPTIONS
-
-# default linker flags
-LINKFLAGSDEFS:=
diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk
deleted file mode 100644
index 199108970..000000000
--- a/solenv/inc/unxsogi.mk
+++ /dev/null
@@ -1,132 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for unxsogi
-ASM=/usr/ccs/bin/as
-AFLAGS=-P
-
-SOLAR_JAVA=TRUE
-JAVAFLAGSDEBUG=-g
-
-# _PTHREADS is needed for the stl
-CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -D_USE_NAMESPACE=1 
-
-
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF 
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CXX*=g++
-CC*=gcc
-CFLAGS=-c
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-
-CFLAGSEXCEPTIONS=-fexceptions
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-PICSWITCH:=-fPIC
-
-CFLAGSOBJGUIMT=
-CFLAGSOBJCUIMT=
-CFLAGSSLOGUIMT=$(PICSWITCH)
-CFLAGSSLOCUIMT=$(PICSWITCH)
-CFLAGSPROF=
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-CFLAGSOPT=-O2
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=-o
-
-STATIC		= -Wl,-Bstatic
-DYNAMIC		= -Wl,-Bdynamic
-
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-LINKFLAGS=
-LINKFLAGSAPPGUI=-Wl,-export-dynamic
-LINKFLAGSSHLGUI=-shared
-LINKFLAGSAPPCUI=-Wl,-export-dynamic
-LINKFLAGSSHLCUI=-shared
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-LINKVERSIONMAPFLAG=-Wl,--version-script
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# Reihenfolge der libs NICHT egal!
-
-STDLIBCPP=-lstdc++
-
-STDOBJVCL=$(L)/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-STDLIBGUIMT=$(DYNAMIC) -lpthread -lthread -lm
-STDLIBCUIMT=$(DYNAMIC) -lpthread -lthread -lm
-# libraries for linking shared libraries
-STDSHLGUIMT=$(DYNAMIC) -lpthread -lthread -lm
-STDSHLCUIMT=$(DYNAMIC) -lpthread -lthread -lm
-
-STDLIBGUIMT+=-lX11
-
-LIBMGR=ar
-LIBFLAGS=-r
-# LIBEXT=.so
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPRE=lib
-DLLPOST=.so
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk
deleted file mode 100644
index 5400be270..000000000
--- a/solenv/inc/unxsogs.mk
+++ /dev/null
@@ -1,131 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for unxsogs
-ASM=/usr/ccs/bin/as
-AFLAGS=-P
-
-SOLAR_JAVA=TRUE
-JAVAFLAGSDEBUG=-g
-
-# _PTHREADS is needed for the stl
-CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -D_USE_NAMESPACE=1 
-
-
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF 
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CXX*=g++
-CC*=gcc
-CFLAGS=-c
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-
-CFLAGSEXCEPTIONS=-fexceptions
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-PICSWITCH:=-fPIC
-CFLAGSOBJGUIMT=
-CFLAGSOBJCUIMT=
-CFLAGSSLOGUIMT=$(PICSWITCH)
-CFLAGSSLOCUIMT=$(PICSWITCH)
-CFLAGSPROF=
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-CFLAGSOPT=-O2
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=-o
-
-STATIC		= -Wl,-Bstatic
-DYNAMIC		= -Wl,-Bdynamic
-
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-LINKFLAGS=
-LINKFLAGSAPPGUI=-Wl,-export-dynamic
-LINKFLAGSSHLGUI=-shared
-LINKFLAGSAPPCUI=-Wl,-export-dynamic
-LINKFLAGSSHLCUI=-shared
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-LINKVERSIONMAPFLAG=-Wl,--version-script
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# Reihenfolge der libs NICHT egal!
-
-STDLIBCPP=-lstdc++
-
-STDOBJVCL=$(L)/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-STDLIBGUIMT=$(DYNAMIC) -lpthread -lthread -lm
-STDLIBCUIMT=$(DYNAMIC) -lpthread -lthread -lm
-# libraries for linking shared libraries
-STDSHLGUIMT=$(DYNAMIC) -lpthread -lthread -lm
-STDSHLCUIMT=$(DYNAMIC) -lpthread -lthread -lm
-
-STDLIBGUIMT+=-lX11
-
-LIBMGR=ar
-LIBFLAGS=-r
-# LIBEXT=.so
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPRE=lib
-DLLPOST=.so
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
deleted file mode 100644
index a14da5da1..000000000
--- a/solenv/inc/unxsoli4.mk
+++ /dev/null
@@ -1,230 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-ASM=/usr/ccs/bin/as
-AFLAGS=-P
-
-CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
-
-SOLAR_JAVA*=TRUE
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-JAVAFLAGSDEBUG=-g
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CXX*=CC
-CC*=cc
-
-CFLAGS=$(PREENVCFLAGS) -c -temp=/tmp
-CFLAGSCC=-xCC $(ARCH_FLAGS)
-CFLAGSCXX=-features=no%altspell -library=no%Cstd $(ARCH_FLAGS)
-
-# flags to enable build with symbols; required for crashdump feature
-CFLAGSENABLESYMBOLS=-g0 -xs # was temporarily commented out, reenabled before Beta
-CFLAGSENABLESYMBOLS_CC_ONLY=-g -xs # was temporarily commented out, reenabled before Beta
-
-CFLAGSEXCEPTIONS=
-CFLAGS_NO_EXCEPTIONS=-noex
-
-CFLAGSOBJGUIMT=-KPIC -mt
-CFLAGSOBJCUIMT=-KPIC -mt
-CFLAGSSLOGUIMT=-KPIC -mt
-CFLAGSSLOCUIMT=-KPIC -mt
-CFLAGSPROF=-xpg
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-CFLAGSOPT=-xarch=generic -xO3
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=-o
-
-# Warnings switched off for CXX:
-# - doubunder: we have many identifiers containing double underscores, some of
-#   them in the stable UDK API we cannot change
-# - identexpected: Identifier expected instead of "}"
-#   if an enum ends with a comma before the '}'
-#   this warning does not seem to heed #pragma disable_warn, and is not helpful
-# - inllargeuse: "function is too large and will not be expanded inline" is
-#   merely a hint
-# - inllargeint: "function is too large to generate inline, consider writing
-#   it yourself" is merely a hint
-# - notemsource: "could not find source for function" appears to be spurious
-# - reftotemp: warns about calling non-const functions on temporary objects,
-#   something legally done by boost::scoped_array<T>::reset, for example
-#   (this_type(p).swap(*this))
-# - truncwarn: "conversion of 64 bit type value to smaller type causes
-#   truncation" at least with CC 5.8 is reported only at the end of a
-#   compilation unit that uses boost::unordered_map<sal_Int64, sal_Int64> (see
-#   sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be
-#   disabled globally
-# - wnoretvalue: warning about the last statement of a function not
-#   returning a value. Unfortunately triggers on perfectly acceptable
-#   code, for example if the last statement in is a throw statement
-# - anonnotype: Warns if a type is declared in an anonymous union. Temporary
-#   disabled until issue i97325 is fixed. Note: The compiler is actually
-#   right about this warning, the C++ standard is explicit about this.
-CFLAGSWARNCC=
-CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-errwarn=%all
-CFLAGSWERRCXX=-xwe
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk):
-MODULES_WITH_WARNINGS :=
-
-STDOBJVCL=$(L)/salmain.o
-
-THREADLIB=
-.IF "$(PURIFY)"!=""
-LINK=/usr/local/purify-4.2-solaris2/purify CC
-.ELSE
-LINK=$(CXX)
-.ENDIF
-LINKC=$(CC)
-
-# link against set of baseline libraries
-.IF "$(SYSBASE)"!=""
-C_RESTRICTIONFLAGS*=-xc99=none
-#LD_OPTIONS+:=-L$(SYSBASE)/usr/lib
-CDEFS+=-DSYSBASE="$(SYSBASE)"
-CFLAGSCC+=$(C_RESTRICTIONFLAGS)
-#.EXPORT : LD_OPTIONS
-.ENDIF          # "$(SYSBASE)"!=""
-
-# -z combreloc combines multiple relocation sections. Reduces overhead on startup
-# -norunpath prevents the compiler from recording his own libs in the runpath
-LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
-    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
-LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
-LINKCFLAGS=-w -mt -z combreloc -norunpath
-
-# -z text force fatal error if non PIC code is linked into shared library. Such code
-#    would be expensive on startup
-CHECKFORPIC =-z text
-LINKFLAGSSHLGUI=$(CHECKFORPIC) -G
-LINKFLAGSSHLCUI=$(CHECKFORPIC) -G
-
-# switches for dynamic and static linking
-LINKFLAGSDEFS*= -z defs
-STATIC		= -Bstatic
-DIRECT		= -Bdirect $(LINKFLAGSDEFS)
-DYNAMIC		= -Bdynamic
-
-LINKFLAGSAPPGUI+=$(DIRECT)
-LINKFLAGSAPPCUI+=$(DIRECT)
-LINKFLAGSSHLGUI+=$(DIRECT)
-LINKFLAGSSHLCUI+=$(DIRECT)
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=-L$(COMPATH)/WS6U1/lib/libp -xpg -z allextract
-LINKFLAGSDEBUG=
-LINKFLAGSOPT=
-LINKVERSIONMAPFLAG=-M
-
-# mapfile for non-executable stack
-LINKFLAGSNOEXSTK*=$(LINKVERSIONMAPFLAG) $(SOLARENV)/src/solaris_noexstk.map
-LINKFLAGSAPPGUI+=$(LINKFLAGSNOEXSTK)
-LINKFLAGSAPPCUI+=$(LINKFLAGSNOEXSTK)
-
-APPLINKSTATIC=$(STATIC)
-APPLINKSHARED=$(DIRECT)
-APP_LINKTYPE=
-
-STDLIBCPP=-lCrun
-
-# reihenfolge der libs NICHT egal!
-STDOBJGUI=
-.IF "DBG_UTIL" != ""
-STDSLOGUI=#-lpthread
-.ELSE
-STDSLOGUI=
-.ENDIF
-STDOBJCUI=
-STDSLOCUI=
-
-# CPPRUNTIME - define where to place C++ runtime if required
-STDLIBGUIMT=$(DYNAMIC) -lpthread -lm
-STDLIBCUIMT=$(DYNAMIC) -lpthread -lm
-STDSHLGUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
-STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
-
-# libdl.so - no really an GUI library but required in this context
-STDLIBGUIMT+=-ldl
-STDSHLGUIMT+=-ldl
-X11LINK_DYNAMIC = -lXext -lX11
-
-# @@@ interposer needed for -Bdirect @@@
-# LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
-LIBSALCPPRT=
-
-LIBMGR=CC
-LIBFLAGS=-xar -o
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-IGNORE_SYMBOLS=S-LP64
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPRE=lib
-DLLPOST=.so
-
-LDUMP=cppfilt /b /n /o /p
-
-CFLAGSCXXSLO +=
-CFLAGSCXXOBJ +=
-
-LINKFLAGSAPPGUI+=
-LINKFLAGSSHLGUI+=
-LINKFLAGSAPPCUI+=
-LINKFLAGSSHLCUI+=
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
deleted file mode 100644
index 11b6f1547..000000000
--- a/solenv/inc/unxsols4.mk
+++ /dev/null
@@ -1,236 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-ASM=/usr/ccs/bin/as
-# needs -D__sparcv8plus because it's not defined by the assembler with -xarch=v8plus
-AFLAGS=-P -xarch=v8plus -D__sparcv8plus
-
-CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
-
-SOLAR_JAVA*=TRUE
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-JAVAFLAGSDEBUG=-g
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CXX*=CC
-CC*=cc
-
-CFLAGS=$(PREENVCFLAGS) -c -temp=/tmp
-# CC defines __sparcv8plus with -xarch=v8plus, cc does not (sigh)
-CFLAGSCC=-xCC -D__sparcv8plus $(ARCH_FLAGS)
-CFLAGSCXX=-features=no%altspell -library=no%Cstd $(ARCH_FLAGS)
-
-# flags to enable build with symbols; required for crashdump feature
-CFLAGSENABLESYMBOLS=-g0 -xs # was temporarily commented out, reenabled before Beta
-CFLAGSENABLESYMBOLS_CC_ONLY=-g -xs # was temporarily commented out, reenabled before Beta
-
-CFLAGSEXCEPTIONS=
-CFLAGS_NO_EXCEPTIONS=-noex
-
-CFLAGSOBJGUIMT=-KPIC -mt
-CFLAGSOBJCUIMT=-KPIC -mt
-CFLAGSSLOGUIMT=-KPIC -mt
-CFLAGSSLOCUIMT=-KPIC -mt
-CFLAGSPROF=-xpg
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-#  -m32 -xarch=sparc        restrict target to 32 bit sparc 
-#  -xO3                     optimization level 3
-#  -xspace                  don't do optimizations which do increase binary size
-#  -xprefetch=yes           do prefetching (helps on UltraSparc III)
-CFLAGSOPT=-m32 -xarch=sparc -xO3 -xspace -xprefetch=yes
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=-o
-
-# Warnings switched off for CXX:
-# - doubunder: we have many identifiers containing double underscores, some of
-#   them in the stable UDK API we cannot change
-# - identexpected: Identifier expected instead of "}"
-#   if an enum ends with a comma before the '}'
-#   this warning does not seem to heed #pragma disable_warn, and is not helpful
-# - inllargeuse: "function is too large and will not be expanded inline" is
-#   merely a hint
-# - inllargeint: "function is too large to generate inline, consider writing
-#   it yourself" is merely a hint
-# - notemsource: "could not find source for function" appears to be spurious
-# - reftotemp: warns about calling non-const functions on temporary objects,
-#   something legally done by boost::scoped_array<T>::reset, for example
-#   (this_type(p).swap(*this))
-# - truncwarn: "conversion of 64 bit type value to smaller type causes
-#   truncation" at least with CC 5.8 is reported only at the end of a
-#   compilation unit that uses boost::unordered_map<sal_Int64, sal_Int64> (see
-#   sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be
-#   disabled globally
-# - wnoretvalue: warning about the last statement of a function not 
-#   returning a value. Unfortunately triggers on perfectly acceptable
-#   code, for example if the last statement in is a throw statement
-# - anonnotype: Warns if a type is declared in an anonymous union. Temporary
-#   disabled until issue i97325 is fixed. Note: The compiler is actually
-#   right about this warning, the C++ standard is explicit about this.
-CFLAGSWARNCC=
-CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-errwarn=%all
-CFLAGSWERRCXX=-xwe
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk):
-MODULES_WITH_WARNINGS :=
-
-STDOBJVCL=$(L)/salmain.o
-
-THREADLIB=
-.IF "$(PURIFY)"!=""
-LINK=/usr/local/purify-4.2-solaris2/purify CC
-.ELSE
-LINK=$(CXX)
-.ENDIF
-LINKC=$(CC)
-
-# link against set of baseline libraries
-.IF "$(SYSBASE)"!=""
-C_RESTRICTIONFLAGS*=-xc99=none
-#LD_OPTIONS+:=-L$(SYSBASE)/usr/lib
-CDEFS+=-DSYSBASE="$(SYSBASE)"
-CFLAGSCC+=$(C_RESTRICTIONFLAGS)
-#.EXPORT : LD_OPTIONS
-.ENDIF          # "$(SYSBASE)"!=""
-
-# -z combreloc combines multiple relocation sections. Reduces overhead on startup
-# -norunpath prevents the compiler from recording his own libs in the runpath
-LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
-    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
-LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
-LINKCFLAGS=-w -mt -z combreloc -norunpath
-
-# -z text force fatal error if non PIC code is linked into shared library. Such code
-#    would be expensive on startup
-CHECKFORPIC =-z text
-LINKFLAGSSHLGUI=$(CHECKFORPIC) -G
-LINKFLAGSSHLCUI=$(CHECKFORPIC) -G
-
-# switches for dynamic and static linking
-LINKFLAGSDEFS*= -z defs
-STATIC		= -Bstatic
-DIRECT		= -Bdirect $(LINKFLAGSDEFS)
-DYNAMIC		= -Bdynamic
-
-LINKFLAGSAPPGUI+=$(DIRECT)
-LINKFLAGSAPPCUI+=$(DIRECT)
-LINKFLAGSSHLGUI+=$(DIRECT)
-LINKFLAGSSHLCUI+=$(DIRECT)
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=-L$(COMPATH)/WS6U1/lib/libp -xpg -z allextract
-LINKFLAGSDEBUG=
-LINKFLAGSOPT=
-LINKVERSIONMAPFLAG=-M
-
-# mapfile for non-executable stack
-LINKFLAGSNOEXSTK*=$(LINKVERSIONMAPFLAG) $(SOLARENV)/src/solaris_noexstk.map
-LINKFLAGSAPPGUI+=$(LINKFLAGSNOEXSTK)
-LINKFLAGSAPPCUI+=$(LINKFLAGSNOEXSTK)
-
-APPLINKSTATIC=$(STATIC)
-APPLINKSHARED=$(DIRECT)
-APP_LINKTYPE=
-
-STDLIBCPP=-lCrun
-
-# reihenfolge der libs NICHT egal!
-STDOBJGUI=
-.IF "DBG_UTIL" != ""
-STDSLOGUI=#-lpthread
-.ELSE
-STDSLOGUI=
-.ENDIF
-STDOBJCUI=
-STDSLOCUI=
-
-# CPPRUNTIME - define where to place C++ runtime if required
-STDLIBGUIMT=$(DYNAMIC) -lpthread -lm
-STDLIBCUIMT=$(DYNAMIC) -lpthread -lm
-STDSHLGUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
-STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
-
-# libdl.so - no really an GUI library but required in this context
-STDLIBGUIMT+=-ldl
-STDSHLGUIMT+=-ldl
-X11LINK_DYNAMIC = -lXext -lX11
-
-# @@@ interposer needed for -Bdirect @@@
-# LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
-LIBSALCPPRT=
-
-LIBMGR=CC
-LIBFLAGS=-xar -o
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-IGNORE_SYMBOLS=S-LP64
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPRE=lib
-DLLPOST=.so
-
-LDUMP=cppfilt /b /n /o /p
-
-CFLAGSCXXSLO +=
-CFLAGSCXXOBJ +=
-
-LINKFLAGSAPPGUI+=
-LINKFLAGSSHLGUI+=
-LINKFLAGSAPPCUI+=
-LINKFLAGSSHLCUI+=
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
deleted file mode 100644
index 76da31038..000000000
--- a/solenv/inc/unxsolu4.mk
+++ /dev/null
@@ -1,231 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# 64 bit (LP64) platform
-IS_LP64=TRUE
-
-ASM=/usr/ccs/bin/as
-AFLAGS=-P -xarch=v9
-
-
-CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DIS_LP64
-
-SOLAR_JAVA*=TRUE
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-JAVAFLAGSDEBUG=-g
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=-m64
-
-CXX*=CC
-CC*=cc
-
-CFLAGS=$(PREENVCFLAGS) -c -temp=/tmp
-CFLAGSCC=-xCC $(ARCH_FLAGS)
-CFLAGSCXX= -features=no%altspell $(ARCH_FLAGS)
-
-# flags to enable build with symbols; required for crashdump feature
-CFLAGSENABLESYMBOLS=-g0 -xs # was temporarily commented out, reenabled before Beta
-CFLAGSENABLESYMBOLS_CC_ONLY=-g -xs # was temporarily commented out, reenabled before Beta
-
-CFLAGSEXCEPTIONS=
-CFLAGS_NO_EXCEPTIONS=-noex
-
-CFLAGSOBJGUIMT=-KPIC -mt
-CFLAGSOBJCUIMT=-KPIC -mt
-CFLAGSSLOGUIMT=-KPIC -mt
-CFLAGSSLOCUIMT=-KPIC -mt
-CFLAGSPROF=-xpg
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-#  -xO3                     optimization level 3
-CFLAGSOPT= -xO3 -xalias_level=compatible 
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=-o
-
-# Warnings switched off for CXX:
-# - doubunder: we have many identifiers containing double underscores, some of
-#   them in the stable UDK API we cannot change
-# - identexpected: Identifier expected instead of "}"
-#   if an enum ends with a comma before the '}'
-#   this warning does not seem to heed #pragma disable_warn, and is not helpful
-# - inllargeuse: "function is too large and will not be expanded inline" is
-#   merely a hint
-# - inllargeint: "function is too large to generate inline, consider writing
-#   it yourself" is merely a hint
-# - notemsource: "could not find source for function" appears to be spurious
-# - reftotemp: warns about calling non-const functions on temporary objects,
-#   something legally done by boost::scoped_array<T>::reset, for example
-#   (this_type(p).swap(*this))
-# - truncwarn: "conversion of 64 bit type value to smaller type causes
-#   truncation" at least with CC 5.8 is reported only at the end of a
-#   compilation unit that uses boost::unordered_map<sal_Int64, sal_Int64> (see
-#   sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be
-#   disabled globally
-# - wnoretvalue: "The last statement should return a value." 
-#   CC 5.9: the compiler does often not notice that there is no way
-#   to reach the closing brace of a function without either returning a proper 
-#   value or throwing an exception.
-# - hidef:  "d::foo() hides the function b::foo()." We got still some cases of mixed
-#   sal_uInt32 and ULONG usages which needs to be fixed. We can then remove this one
-CFLAGSWARNCC=
-CFLAGSWARNCXX=+w2 -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,hidef,anonnotype,unassigned,badargtype2w
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-errwarn=%all
-CFLAGSWERRCXX=-xwe
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk):
-MODULES_WITH_WARNINGS :=
-
-STDOBJVCL=$(L)/salmain.o
-
-THREADLIB=
-LINK=$(CXX)
-LINKC=$(CC)
-
-# link against set of baseline libraries
-.IF "$(SYSBASE)"!=""
-C_RESTRICTIONFLAGS*=-xc99=none
-LD_OPTIONS+=-L$(SYSBASE)/usr/lib
-CDEFS+=-DSYSBASE="$(SYSBASE)"
-CFLAGSCC+=$(C_RESTRICTIONFLAGS)
-.EXPORT : LD_OPTIONS
-.ENDIF          # "$(SYSBASE)"!=""
-
-# -z combreloc combines multiple relocation sections. Reduces overhead on startup
-# -norunpath prevents the compiler from recording his own libs in the runpath
-LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
-    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
-LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath
-LINKCFLAGS=-m64 -w -mt -z combreloc -norunpath
-
-# -z text force fatal error if non PIC code is linked into shared library. Such code
-#    would be expensive on startup
-CHECKFORPIC =-z text
-LINKFLAGSSHLGUI=$(CHECKFORPIC) -G
-LINKFLAGSSHLCUI=$(CHECKFORPIC) -G
-
-# switches for dynamic and static linking
-LINKFLAGSDEFS*= -z defs
-STATIC		= -Bstatic
-DIRECT		= -Bdirect $(LINKFLAGSDEFS)
-DYNAMIC		= -Bdynamic
-
-LINKFLAGSAPPGUI+=$(DIRECT)
-LINKFLAGSAPPCUI+=$(DIRECT)
-LINKFLAGSSHLGUI+=$(DIRECT)
-LINKFLAGSSHLCUI+=$(DIRECT)
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=
-LINKFLAGSOPT=
-LINKVERSIONMAPFLAG=-M
-
-# mapfile for non-executable stack
-LINKFLAGSNOEXSTK*=$(LINKVERSIONMAPFLAG) $(SOLARENV)/src/solaris_noexstk.map
-LINKFLAGSAPPGUI+=$(LINKFLAGSNOEXSTK)
-LINKFLAGSAPPCUI+=$(LINKFLAGSNOEXSTK)
-
-APPLINKSTATIC=$(STATIC)
-APPLINKSHARED=$(DIRECT)
-APP_LINKTYPE=
-
-STDLIBCPP=-lCrun
-
-# reihenfolge der libs NICHT egal!
-STDOBJGUI=
-.IF "DBG_UTIL" != ""
-STDSLOGUI=#-lpthread
-.ELSE
-STDSLOGUI=
-.ENDIF
-STDOBJCUI=
-STDSLOCUI=
-
-# CPPRUNTIME - define where to place C++ runtime if required
-STDLIBGUIMT=$(DYNAMIC) -lpthread -lm
-STDLIBCUIMT=$(DYNAMIC) -lpthread -lm
-STDSHLGUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
-STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
-
-# libdl.so - no really an GUI library but required in this context
-STDLIBGUIMT+=-lX11 -ldl
-STDSHLGUIMT+=-lX11 -ldl
-
-# @@@ interposer needed for -Bdirect @@@
-# LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
-LIBSALCPPRT=
-
-LIBMGR=CC
-LIBFLAGS=-xar -o
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-IGNORE_SYMBOLS=S-ILP32
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPRE=lib
-DLLPOST=.so
-
-LDUMP=cppfilt /b /n /o /p
-
-CFLAGSCXXSLO +=
-CFLAGSCXXOBJ +=
-
-LINKFLAGSAPPGUI+=
-LINKFLAGSSHLGUI+=
-LINKFLAGSAPPCUI+=
-LINKFLAGSSHLCUI+=
-
-BUILD64=1
diff --git a/solenv/inc/verinfo.hrc b/solenv/inc/verinfo.hrc
deleted file mode 100644
index 5af626c88..000000000
--- a/solenv/inc/verinfo.hrc
+++ /dev/null
@@ -1,201 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _VERINFO_HRC
-#define _VERINFO_HRC
-
-// include ---------------------------------------------------------------
-
-#ifndef WIN32
-#include <ver.h>
-#else
-#include <winver.h>
-#endif
-
-// general preprocessor string management --------------------------------
-
-#ifndef PPSX
-#define PPSX(s) #s
-#endif
-#ifndef PPS
-#define PPS(s) PPSX(s)
-#endif
-
-#ifndef PPCX
-#define PPCX(s1, s2) s1##s2
-#endif
-#ifndef PPCAT
-#define PPCAT(s1, s2) PPCX(s1, s2)
-#endif
-
-// define order of date parts --------------------------------------------
-
-#define VER_YMD
-
-// set VERVARIANT to 0 if not defined ------------------------------------
-
-#if !defined(VERVARIANT)
-  #define VERVARIANT 0
-#endif
-
-// define pre release state ----------------------------------------------
-
-#ifdef VER_CONCEPT
-  #define VER_PREL 1
-  #define VER_COUNT (0+VER_CONCEPT)
-  #define VER1 Concept (Level VER_CONCEPT)
-#endif
-
-#ifdef VER_ALPHA
-  #define VER_PREL 1
-  #define VER_COUNT (100+VER_ALPHA)
-  #define VER1 Alpha (Level VER_ALPHA)
-#endif
-
-#ifdef VER_BETA
-  #define VER_PREL 1
-  #define VER_COUNT (200+VER_BETA)
-  #define VER1 Beta (Level VER_BETA)
-#endif
-
-#ifdef VER_GAMMA
-  #define VER_PREL 1
-  #define VER_COUNT (300+VER_GAMMA)
-  #define VER1 Gamma (Level VER_GAMMA)
-#endif
-
-#ifdef VER_FINAL
-  #define VER_COUNT (500+VER_FINAL)
-  #if VER_FINAL==0
-    #undef VER1
-  #elif VER_FINAL==1
-    #define VER1 1
-  #elif VER_FINAL==2
-    #define VER1 2
-  #elif VER_FINAL==3
-    #define VER1 3
-  #elif VER_FINAL==4
-    #define VER1 4
-  #elif VER_FINAL==5
-    #define VER1 5
-  #elif VER_FINAL==6
-    #define VER1 6
-  #elif VER_FINAL==7
-    #define VER1 7
-  #elif VER_FINAL==8
-    #define VER1 8
-  #elif VER_FINAL==9
-    #define VER1 9
-  #elif VER_FINAL==10
-    #define VER1 a
-  #elif VER_FINAL==11
-    #define VER1 b
-  #elif VER_FINAL==12
-    #define VER1 c
-  #endif
-#endif
-
-#ifdef SUBVERSION
-#if SUBVERSION < 10
-  #define VER4 PPCAT(0, SUBVERSION)
-#else
-  #define VER4 SUBVERSION
-#endif
-#else
-  #define VER4 0.0
-#endif
-
-#ifndef VER1
-#if VERVARIANT > 0
-  #define VER_LEVEL VERSION.VER4.VERVARIANT
-#else
-  #define VER_LEVEL VERSION.VER4
-#endif
-#else
-  #define VERC1(a, b, c) a.b##c
-  #define VERC2(a, b, c) VERC1(a, b, c)
-  #define VER_LEVEL VERC2(VERSION, VER4, VER1)
-#endif
-
-#if !defined(VER_DMY) && VER_DAY < 10
-  #define VER5 PPCAT(0, VER_DAY)
-#else
-  #define VER5 VER_DAY
-#endif
-
-// define month strings --------------------------------------------------
-
-#if VER_MONTH==1
-  #define VER2 Jan
-#elif VER_MONTH==2
-  #define VER2 Feb
-#elif VER_MONTH==3
-  #define VER2 Mar
-#elif VER_MONTH==4
-  #define VER2 Apr
-#elif VER_MONTH==5
-  #define VER2 May
-#elif VER_MONTH==6
-  #define VER2 Jun
-#elif VER_MONTH==7
-  #define VER2 Jul
-#elif VER_MONTH==8
-  #define VER2 Aug
-#elif VER_MONTH==9
-  #define VER2 Sep
-#elif VER_MONTH==10
-  #define VER2 Oct
-#elif VER_MONTH==11
-  #define VER2 Nov
-#elif VER_MONTH==12
-  #define VER2 Dec
-#endif
-
-#define VERC3(a, b, c) c-b-a
-#define VERC4(a, b, c) VERC3(a, b, c)
-#define VER_DATE VERC4(VER5, VER2, VER_YEAR)
-
-#if PPCAT(1, VER_FIRSTYEAR)==PPCAT(1, VER_YEAR)
-  #define VER_YEARRANGE VER_FIRSTYEAR
-#else
-  #define VER_YEARRANGE VER_FIRSTYEAR-VER_YEAR
-#endif
-
-#if VER_FIRSTYEAR > 100
-#define VERC5(a) Copyright \251 a by
-#define VERC6(a) VERC5(a)
-#else
-#define VERC5(a) Copyright \251 20##a by
-#define VERC6(a) VERC5(a)
-#endif
-
-#define S_CRIGHT PPS(VERC6(VER_YEARRANGE))
-
-#define S_VERSION PPS(Version VER_LEVEL of VER_DATE)
-
-#endif	// _VERINFO_HRC
-
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
deleted file mode 100755
index 74dd722dc..000000000
--- a/solenv/inc/version.hrc
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- *************************************************************************/
-
-#include "versionlist.hrc"
-
-//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
-
-#define VER_FINAL       0
-
-#ifndef VER_FIRSTYEAR
-#define VER_FIRSTYEAR   VER_YEAR
-#endif
-
-#include "verinfo.hrc"
-
-#ifdef WIN32
-#define FOR_WIN_X " (32 Bit)"
-#else
-#define FOR_WIN_X ""
-#endif
-
-// -----------------------------------------------------------------------
-//                  language/character set specification table
-// -----------------------------------------------------------------------
-
-RCD_LANGUAGE rcdata
-{
-    "040904B0",     // USA -> Unicode
-    "040904E4",     // USA -> Windows, Multilingual
-    "04090000",     // USA -> 7-Bit-ASCII
-    0               // end of table
-}
-
-
-// version binary entry
-VS_VERSION_INFO rcdata
-{
-    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
-    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-}
diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
deleted file mode 100755
index 200cdf53e..000000000
--- a/solenv/inc/version.lst
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-OOOBASEVERSIONMAJOR=3
-OOOBASEVERSIONMINOR=4
-OOOBASEVERSIONMICRO=0
-
-OOOBASEVERSIONDAY=1
-OOOBASEVERSIONMONTH=10
-OOOBASEVERSIONYEAR=2010
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
deleted file mode 100755
index 2e4db98a2..000000000
--- a/solenv/inc/version_so.hrc
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- *************************************************************************/
-
-#include "versionlist.hrc"
-
-//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
-
-#define VER_FINAL       0
-
-#ifndef VER_FIRSTYEAR
-#define VER_FIRSTYEAR   VER_YEAR
-#endif
-
-#include "verinfo.hrc"
-
-#ifdef WIN32
-#define FOR_WIN_X " (32 Bit)"
-#else
-#define FOR_WIN_X ""
-#endif
-
-// -----------------------------------------------------------------------
-//                  language/character set specification table
-// -----------------------------------------------------------------------
-
-RCD_LANGUAGE rcdata
-{
-    "040904B0",     // USA -> Unicode
-    "040904E4",     // USA -> Windows, Multilingual
-    "04090000",     // USA -> 7-Bit-ASCII
-    0               // end of table
-}
-
-// version binary entry
-VS_VERSION_INFO rcdata
-{
-    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
-    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-};
-
diff --git a/solenv/inc/versionlist.mk b/solenv/inc/versionlist.mk
deleted file mode 100755
index 672df7bd7..000000000
--- a/solenv/inc/versionlist.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.INCLUDE: version.lst
-
-.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO OOOBASEVERSIONDAY OOOBASEVERSIONMONTH OOOBASEVERSIONYEAR
diff --git a/solenv/inc/win32/jni_md.h b/solenv/inc/win32/jni_md.h
deleted file mode 100644
index b7aab253b..000000000
--- a/solenv/inc/win32/jni_md.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- */
-
-/* Fake jni_md.h for use when cross-compiling to Windows */
-
-#ifndef JNI_MD_H_INCLUDED
-#define JNI_MD_H_INCLUDED
-
-#define JNIEXPORT __declspec (dllexport)
-#define JNIIMPORT __declspec (dllimport)
-#define JNICALL   __stdcall
-
-typedef long jint;
-typedef __int64 jlong;
-typedef char jbyte;
-
-#endif /* JNI_MD_H_INCLUDED */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
deleted file mode 100644
index dd3e0c8ce..000000000
--- a/solenv/inc/wnt.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# --- Windows-NT-Environment ---------------------------------------
-# Used if "$(GUI)" == "WNT"
-
-# --- Compiler ---
-
-.IF "$(OS)$(COM)" == "WNTMSC"
-# for wntmsci12, wntmscx12, wntmsci13 and wntmscx13
-# (MSVC 2008 and MSVC 2010, 32- and 64-bit)
-.INCLUDE : wntmsc.mk
-.ENDIF # "$(OS)$(COM)" == "WNTMSC"
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCWNTI"
-.INCLUDE : wntgcci.mk
-.ENDIF
-
-# --- changes for W32-tcsh - should move into settings.mk ---
-JAVAC=javac
-JAVA=java
-JAVAI!:=java
-PATH_SEPERATOR*=:
-
-# --- general WNT settings ---
-
-HC=hc
-HCFLAGS=
-DLLPRE=
-DLLPOST=.dll
-EXECPOST=.exe
-SCPPOST=.inf
-DLLDEST=$(BIN)
-SOLARSHAREDBIN=$(SOLARBINDIR)
-
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=javai.lib
-.ELSE
-JAVA_RUNTIME=javai_g.lib
-.ENDIF
-.ENDIF
-
-.IF "$(CROSS_COMPILING)"!="YES"
-OOO_LIBRARY_PATH_VAR = PATH
-.ELIF "$(OS_FOR_BUILD)"=="MACOSX"
-OOO_LIBRARY_PATH_VAR = DYLD_LIBRARY_PATH
-.ELSE
-OOO_LIBRARY_PATH_VAR = LD_LIBRARY_PATH
-.ENDIF
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
deleted file mode 100644
index 34faf329f..000000000
--- a/solenv/inc/wntgcci.mk
+++ /dev/null
@@ -1,216 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for Window Intel using GCC
-
-SOLAR_JAVA*=
-JAVAFLAGSDEBUG=-g
-
-# SOLAR JAva Unterstuetzung nur fuer wntmsci
-
-ASM=ml
-AFLAGS=/c /Cp /coff
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=-march=pentium
-
-CC*=i686-w64-mingw32-gcc
-CXX*=i686-w64-mingw32-g++
-
-CFLAGS+=-fmessage-length=0 -c
-
-CFLAGSCC=-pipe $(ARCH_FLAGS)
-CFLAGSCXX=-pipe $(ARCH_FLAGS)
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-PICSWITCH:=
-
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
-CFLAGSOBJGUIST=
-CFLAGSOBJCUIST=
-CFLAGSOBJGUIMT=-D_MT
-CFLAGSOBJCUIMT=-D_MT
-CFLAGSSLOGUIMT=-D_MT $(PICSWITCH)
-CFLAGSSLOCUIMT=-D_MT $(PICSWITCH)
-CFLAGSPROF=
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-.IF "$(PRODUCT)"!=""
-CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
-.ELSE 	# "$(PRODUCT)"!=""
-CFLAGSOPT=   							# no optimizing for non products
-.ENDIF	# "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-#plattform hart setzen
-CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_WINNT=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -D_NATIVE_WCHAR_T_DEFINED -D_MSC_EXTENSIONS -D_FORCENAMELESSUNION
-.IF  "$(DYNAMIC_CRT)"!=""
-CDEFS+=-D_DLL
-.ENDIF
-
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-    -Wno-non-virtual-dtor
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
-CFLAGSWERRCXX=-Werror
-
-MODULES_WITH_WARNINGS := \
-    b_server \
-    chart2 \
-    devtools \
-    extensions \
-    lingu \
-    r_tools \
-    starmath \
-    sw \
-    xmlsecurity
-
-STATIC= -static
-DYNAMIC= -dynamic
-
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-CYGLIB=$(LIB:s/;/ -L/)
-LINKFLAGS= -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc-v2 -L$(CYGLIB)
-.IF "$(USE_MINGW)"=="cygwin"
-MINGWLIBDIR=$(COMPATH)$/lib$/mingw
-.ELSE
-MINGWLIBDIR=$(COMPATH)$/lib
-.ENDIF
-MINGWSSTDOBJ=
-MINGWSSTDENDOBJ=
-LINKFLAGSAPPGUI=-mwindows 
-LINKFLAGSSHLGUI=-Wl,--warn-once -mwindows -shared 
-LINKFLAGSAPPCUI=-mconsole 
-LINKFLAGSSHLCUI=-Wl,--warn-once -mconsole -shared
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES" && "$(DYNAMIC_CRT)"!=""
-STDLIBCPP=$(MINGW_SHARED_LIBSTDCPP)
-.ELSE
-STDLIBCPP=-lstdc++
-.ENDIF
-UWINAPILIB*=$(DYNAMIC) -luwinapi
-
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES" && "$(DYNAMIC_CRT)"!=""
-MINGW_LIBGCC=-lgcc_s -lgcc
-LINKFLAGS+=-shared-libgcc
-.ELSE
-.IF "$(MINGW_GCCLIB_EH)"=="YES"
-MINGW_LIBGCC=-lgcc_eh -lgcc
-.ELSE
-MINGW_LIBGCC=-lgcc
-.ENDIF
-.ENDIF
-STDOBJVCL=$(L)$/salmain.obj
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-STDLIBGUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC)
-STDLIBCUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC)
-STDSHLGUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC)
-STDSHLCUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC)
-.IF  "$(DYNAMIC_CRT)"!=""
-STDLIBGUIMT+=-lmingwthrd
-STDLIBCUIMT+=-lmingwthrd
-STDSHLGUIMT+=-lmingwthrd
-STDSHLCUIMT+=-lmingwthrd
-.ENDIF
-STDLIBGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
-STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
-STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
-STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
-
-LIBMGR=$(AR)
-LIBFLAGS=-rsu
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=$(WINDRES)
-RCFLAGS=-D__MINGW32__ -DWIN32 -D_WIN32_IE=0x400 $(RCFILES)
-RCFLAGSOUTRES=
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-PCHPOST=.gch
-
-ADVAPI32LIB=-ladvapi32
-SHELL32LIB=-lshell32
-GDI32LIB=-lgdi32
-OLE32LIB=-lole32
-OLEAUT32LIB=-loleaut32
-UUIDLIB=-luuid
-WINSPOOLLIB=-lwinspool
-IMM32LIB=-limm32
-VERSIONLIB=-lversion
-WINMMLIB=-lwinmm
-MPRLIB=-lmpr
-WS2_32LIB=-lws2_32
-KERNEL32LIB=-lkernel32
-USER32LIB=-luser32
-LIBCMT=-lmsvcrt
-COMDLG32LIB=-lcomdlg32
-COMCTL32LIB=-lcomctl32
-CRYPT32LIB=-lcrypt32
-DDRAWLIB=-lddraw
-SHLWAPILIB=-lshlwapi
-WININETLIB=-lwininet
-OLDNAMESLIB=-lmoldname
-MSIMG32LIB=-lmsimg32
-PROPSYSLIB=-lpropsys
-
-# Libraries for which we use an import library built
-# from Wine's .def file
-MSILIB=-lmsi
-GDIPLUSLIB=-lgdiplus
-URLMONLIB=-lurlmon
-
-# Libraries that mingw-w64 has but mingw.org doesn't. At least the OBS MinGW
-# cross-compiler is based on mingw-w64. When using MinGW natively on Windows
-# (which as such I don't think we want to support) we  use the Windows SDK
-# libraries.
-.IF "$(CROSS_COMPILING)"=="YES"
-DBGHELPLIB=-ldbghelp
-.ELSE
-DBGHELPLIB=$(WINDOWS_SDK_HOME)$/lib$/dbghelp.lib
-.ENDIF
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
deleted file mode 100644
index 9aca574b0..000000000
--- a/solenv/inc/wntmsc.mk
+++ /dev/null
@@ -1,376 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSC[IX]{12,13}
-
-JAVAFLAGSDEBUG=-g
-
-.IF "$(CL_X64)" == ""
-ASM=ml
-AFLAGS=/c /Cp /coff /safeseh
-.ELSE
-ASM=ml64
-AFLAGS=/c /Cp
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CC*:=cl
-.IF "$(bndchk)" != ""
-CXX*=nmcl
-.ELSE
-.IF "$(truetime)" != ""
-CXX*=nmcl /NMttOn
-.ELSE
-CXX*:=cl
-.ENDIF
-.ENDIF # "$(bndchk)" != ""
-
-.IF "$(stoponerror)" != ""
-CXX+= /NMstoponerror
-.ENDIF
-
-.IF "$(nmpass)" != ""
-CXX+= /NMpass
-.ENDIF
-
-.IF "$(ttinlines)" != ""
-CXX+= /NMttInlines
-.ENDIF
-
-.IF "$(ttnolines)" != ""
-CXX+= /NMttNoLines
-.ENDIF
-
-.IF "$(VERBOSE)" != "TRUE"
-NOLOGO*=-nologo
-.ENDIF
-
-.IF "$(VERBOSE)" != "TRUE"
-COMPILE_ECHO_SWITCH=-n
-COMPILE_ECHO_FILE=
-.ENDIF
-
-# Flags for COMEX == 11
-
-# disable "warning C4675: resolved overload was found by argument-dependent
-# lookup":
-# -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800
-CFLAGS+=-Zm500 -Zc:forScope,wchar_t- -GR
-
-# Stack buffer overrun detection.
-CFLAGS+=-GS
-
-CFLAGS+=-c -nologo -Gs $(NOLOGO)
-
-.IF "$(CL_X64)" == ""
-CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS
-.ELSE
-CDEFS+= -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS
-.ENDIF
-
-.IF "$(product)" != ""
-CFLAGS+= -Gy
-.ENDIF # "$(product)" != ""
-
-# flags to enable build with symbols; required for crashdump feature
-#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB
-CFLAGSENABLESYMBOLS=-Z7 -Yd
-
-.IF "$(bndchk)" != ""
-.IF "$(debug)" == ""
-CFLAGS+= -Z7
-.ENDIF
-.ENDIF
-
-.IF "$(truetime)" != ""
-.IF "$(debug)" == ""
-CFLAGS+= -Z7
-.ENDIF
-.ENDIF
-
-CFLAGSEXCEPTIONS=-EHa
-CFLAGS_NO_EXCEPTIONS=
-
-.IF "$(CL_X64)" == ""
-# enable boost support for __cdecl (SAL_CALL) C++-UNO interface methods
-CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL
-.ENDIF
-
-# with the current debug switches PCH won't work
-# anyway. so keep the existing .pch intact and don't
-# touch it
-.IF "$(debug)"!=""
-ENABLE_PCH:=
-.ENDIF "$(debug)"!=""
-
-CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
-.IF "$(CALL_CDECL)"=="TRUE"
-CFLAGSCALL=-Gd
-.ELSE			# "$(CALL_CDECL)"=="TRUE"
-CFLAGSCALL=-Gz
-.ENDIF			# "$(CALL_CDECL)"=="TRUE"
-
-CFLAGSCC=$(ARCH_FLAGS)
-.IF "$(DYNAMIC_CRT)"!=""
-CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
-CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL
-.IF "$(NO_DYNAMIC_OBJ)"==""
-CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
-CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL
-.ELSE
-CDEFSOBJMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
-.ENDIF # "$(NO_DYNAMIC_OBJ)"==""
-.ELSE
-CDEFSSLOMT+=-DWIN32 -D_MT
-CDEFSSLOMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
-CDEFSOBJMT+=-DWIN32 -D_MT
-.ENDIF # "$(DYNAMIC_CRT)"!=""
-
-CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb
-CFLAGSDEBUG=-Zi -Fd$(MISC)/$(@:b).pdb
-CFLAGSDBGUTIL=
-.IF "$(VC_STANDARD)"==""
-CFLAGSOPT=-Oxs -Oy-
-CFLAGSNOOPT=-Od
-.ELSE			#  "$(VC_STANDARD)"==""
-CFLAGSOPT=
-CFLAGSNOOPT=
-.ENDIF			#  "$(VC_STANDARD)"==""
-CFLAGSOUTOBJ=-Fo
-
-# For C and C++, certain warnings are disabled globally, as they result in
-# spurious warnings and are hard or impossible to workaround:
-# - "warning C4061: enumerate in switch of enum is not explicitly handled by a
-#   case label",
-# - "warning C4127: conditional expression is constant",
-# - "warning C4191: unsafe conversion from function type to function type",
-# - "warning C4217: member template functions cannot be used for copy-assignment
-#   or copy-construction",
-# - "warning C4250: 'class1' : inherits 'class2::member' via dominance",
-# - "warning C4355: 'this' used in base member initializer list",
-# - "warning C4511: copy constructor could not be generated",
-# - "warning C4512: assignment operator could not be generated",
-# - "warning C4514: unreferenced inline function has been removed",
-# - "warning C4611: interaction between '_setjmp' and C++ object destruction is
-#   non-portable",
-# - "warning C4625: copy constructor could not be generated because a base class
-#   copy constructor is inaccessible",
-# - "warning C4626: assignment operator could not be generated because a base
-#   class assignment operator is inaccessible",
-# - "warning C4675: resolved overload was found by argument-dependent lookup",
-# - "warning C4710: function not inlined",
-# - "warning C4711: function selected for automatic inline expansion",
-# - "warning C4820: padding added after member".
-# - "warning C4503: 'identifier' : decorated name length exceeded, name was truncated"
-#   (http://msdn2.microsoft.com/en-us/library/074af4b6.aspx)
-# - "warning C4180: qualifier applied to function type has no meaning; ignored"
-#   (frequently seen with a recent boost)
-# For C, certain warnings from system headers (stdlib.h etc.) have to be
-# disabled globally (for C++, this is not necessary, as the system headers are
-# wrapped by STLport):
-# - "warning C4255: no function prototype given: converting
-#   '()' to '(void)'".
-# - "warning C4365: conversion from ... to ... signed/unsigned mismatch"
-
-CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4250 -wd4251 -wd4275 \
-    -wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4611 -wd4625 -wd4626 \
-    -wd4640 -wd4675 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \
-    -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \
-    -wd4180
-CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-WX
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk):
-MODULES_WITH_WARNINGS :=
-
-CDEFS+=-D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
-.IF "$(COMEX)" == "11"
-_VC_MANIFEST_BASENAME=__VC80
-.ELSE
-_VC_MANIFEST_BASENAME=__VC90
-.ENDIF
-
-.IF "$(CL_X64)" == ""
-LINK=link /MACHINE:IX86 /IGNORE:4102 /IGNORE:4197
-.ELSE
-LINK=link /MACHINE:X64
-.ENDIF
-    # do *not* add $(NOLOGO) to LINK or LINKFLAGS. Strangely, the wntmsci12 linker links fine then, but exits with
-    # a return value 1, which makes dmake think it failed
-.IF "$(PRODUCT)"!="full"
-.ELSE
-LINKFLAGS=/MAP /OPT:NOREF
-.ENDIF
-
-# excetion handling protection
-.IF "$(CL_X64)" == ""
-LINKFLAGS+=-safeseh
-.ENDIF
-
-# enable DEP
-LINKFLAGS+=-nxcompat
-
-# enable ASLR
-LINKFLAGS+=-dynamicbase
-
-.IF "$(linkinc)" != ""
-LINKFLAGS+=-NODEFAULTLIB -INCREMENTAL:YES -DEBUG
-MAPFILE=
-_VC_MANIFEST_INC=1
-.ELSE # "$(linkinc)" != ""
-_VC_MANIFEST_INC=0
-.IF "$(PRODUCT)"!="full"
-LINKFLAGS+= -NODEFAULTLIB -DEBUG
-.ELSE # "$(PRODUCT)"!="full"
-LINKFLAGS+= -NODEFAULTLIB -RELEASE -DEBUG -INCREMENTAL:NO
-.ENDIF # "$(PRODUCT)"!="full"
-MAPFILE=-out:$$@
-.ENDIF # "$(linkinc)" != ""
-
-.IF "$(bndchk)" != ""
-LINK=nmlink $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKFLAGS=-NODEFAULTLIB -DEBUG
-.ENDIF
-
-.IF "$(truetime)" != ""
-LINK=nmlink /NMttOn $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86
-LINKFLAGS=-NODEFAULTLIB -DEBUG
-.ENDIF
-
-.IF "$(COMEX)" == "11"
-LINKFLAGSAPPGUI=/SUBSYSTEM:WINDOWS,4.0
-LINKFLAGSSHLGUI=/SUBSYSTEM:WINDOWS,4.0 /DLL
-.ELSE
-LINKFLAGSAPPGUI=/SUBSYSTEM:WINDOWS
-LINKFLAGSSHLGUI=/SUBSYSTEM:WINDOWS /DLL
-.ENDIF # "$(COMEX)" == "11"
-LINKFLAGSAPPCUI=/SUBSYSTEM:CONSOLE /BASE:0x1b000000
-LINKFLAGSSHLCUI=/SUBSYSTEM:CONSOLE /DLL
-LINKFLAGSTACK=/STACK:
-LINKFLAGSPROF=/DEBUG:mapped,partial /DEBUGTYPE:coff cap.lib
-LINKFLAGSWST=/DEBUG:mapped,partial /DEBUGTYPE:coff wst.lib /NODEFAULTLIB
-LINKFLAGSDEBUG=-DEBUG
-LINKFLAGSOPT=
-
-UWINAPILIB*=uwinapi.lib
-.IF "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-LIBCMT=msvcrtd.lib
-LIBCPMT=msvcprtd.lib
-.ELSE  # "$(USE_DEBUG_RUNTIME)" != ""
-LIBCMT=msvcrt.lib
-LIBCPMT=msvcprt.lib
-.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
-.ELSE # "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-LIBCMT=libcmtd.lib
-LIBCPMT=libcpmtd.lib
-CDEFS+=-D_DEBUG
-.ELSE  # "$(USE_DEBUG_RUNTIME)" != ""
-LIBCMT=libcmt.lib
-LIBCPMT=libcpmt.lib
-.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
-.ENDIF # "$(DYNAMIC_CRT)"!=""
-
-STDOBJVCL=$(L)/salmain.obj
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-STDLIBGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDLIBCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDSHLGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDSHLCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-
-LIBMGR=lib $(NOLOGO)
-IMPLIB=lib
-LIBFLAGS=
-
-.IF "$(CL_X64)" == ""
-IMPLIBFLAGS=-machine:IX86
-.ELSE
-IMPLIBFLAGS=-machine:X64
-.ENDIF
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=rc
-RCFLAGS=-r -DWIN32 $(RCFILES)
-RCFLAGSOUTRES=-fo
-RCLINK=rc
-RCLINKFLAGS=
-RCSETVERSION=
-
-MT=mt.exe
-MTFLAGS=$(NOLOGO)
-
-
-PCHPOST=.pch
-
-CSC*=$(FLIPCMD) csc
-VBC*=vbc
-
-ADVAPI32LIB=advapi32.lib
-SHELL32LIB=shell32.lib
-GDI32LIB=gdi32.lib
-OLE32LIB=ole32.lib
-OLEAUT32LIB=oleaut32.lib
-UUIDLIB=uuid.lib
-WINSPOOLLIB=winspool.lib
-IMM32LIB=imm32.lib
-VERSIONLIB=version.lib
-WINMMLIB=winmm.lib
-MPRLIB=mpr.lib
-WS2_32LIB=ws2_32.lib
-KERNEL32LIB=kernel32.lib
-USER32LIB=user32.lib
-COMDLG32LIB=comdlg32.lib
-COMCTL32LIB=comctl32.lib
-CRYPT32LIB=crypt32.lib
-GDIPLUSLIB=gdiplus.lib
-DBGHELPLIB=dbghelp.lib
-MSILIB=msi.lib
-DDRAWLIB=ddraw.lib
-SHLWAPILIB=shlwapi.lib
-URLMONLIB=urlmon.lib
-WININETLIB=wininet.lib
-OLDNAMESLIB=oldnames.lib
-MSIMG32LIB=msimg32.lib
-PROPSYSLIB=propsys.lib
diff --git a/solenv/makefile.mk b/solenv/makefile.mk
deleted file mode 100755
index c4a2d0893..000000000
--- a/solenv/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-PRJNAME=solenv
-TARGET=init
-
-# --- Settings ----------------------------------
-.INCLUDE : settings.mk
-.INCLUDE : target.mk
-.INCLUDE : versionlist.mk
-
-ALLTAR : $(INCCOM)/versionlist.hrc
-
-$(INCCOM)/versionlist.hrc : ./inc/version.lst
-    $(COMMAND_ECHO)echo "#define VERSION $(OOOBASEVERSIONMAJOR)" > $@
-    $(COMMAND_ECHO)echo "#define SUBVERSION $(OOOBASEVERSIONMINOR)" >> $@
-    $(COMMAND_ECHO)echo "#define MICROVERSION $(OOOBASEVERSIONMICRO)" >> $@
-    $(COMMAND_ECHO)echo "#define VER_DAY $(OOOBASEVERSIONDAY)" >> $@
-    $(COMMAND_ECHO)echo "#define VER_MONTH $(OOOBASEVERSIONMONTH)" >> $@
-    $(COMMAND_ECHO)echo "#define VER_YEAR $(OOOBASEVERSIONYEAR)" >> $@
diff --git a/solenv/prj/build.lst b/solenv/prj/build.lst
deleted file mode 100644
index d7a7f36b1..000000000
--- a/solenv/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-sn  solenv : NULL
-sn	solenv									usr1	-	all	sn_mkout NULL
-sn	solenv									nmake	-	all	sn_init NULL
diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst
deleted file mode 100755
index 9972651fb..000000000
--- a/solenv/prj/d.lst
+++ /dev/null
@@ -1,4 +0,0 @@
-mkdir: %_DEST%\bin
-mkdir: %_DEST%\inc
-..\inc\version.lst %_DEST%\bin\version.lst
-..\%__SRC%\inc\versionlist.hrc %_DEST%\inc\versionlist.hrc
diff --git a/solenv/src/component.map b/solenv/src/component.map
deleted file mode 100755
index d31fc6127..000000000
--- a/solenv/src/component.map
+++ /dev/null
@@ -1,6 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/solenv/src/default_description.xml b/solenv/src/default_description.xml
deleted file mode 100644
index 8ea289890..000000000
--- a/solenv/src/default_description.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name> XXX </module-name>
-    <component-description>
-        <author> automatic generated </author>
-        <name> XXX </name>
-        <description> no description yet. </description>
-        <loader-name> com.sun.star.loader.SharedLibrary	</loader-name>
-        <language> c++	</language>
-        <status value="under_construction"/>
-        <supported-service>	XXX </supported-service>
-    </component-description>
-</module-description>
-
diff --git a/solenv/src/reg-component.map b/solenv/src/reg-component.map
deleted file mode 100755
index 264c32a04..000000000
--- a/solenv/src/reg-component.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/solenv/src/solaris_noexstk.map b/solenv/src/solaris_noexstk.map
deleted file mode 100644
index 2608b1b2d..000000000
--- a/solenv/src/solaris_noexstk.map
+++ /dev/null
@@ -1,4 +0,0 @@
-# mapfile for non-executable stack
-# see @ /usr/lib/ld/map.noexstk
-#
-stack = STACK ?RW;
diff --git a/solenv/src/unloadablecomponent.map b/solenv/src/unloadablecomponent.map
deleted file mode 100755
index caeb98c1c..000000000
--- a/solenv/src/unloadablecomponent.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/solenv/src/version.c b/solenv/src/version.c
deleted file mode 100644
index 1c6aad09a..000000000
--- a/solenv/src/version.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-
-#include <_version.h>
-
-
-struct VersionInfo
-{
-    const char*	pTime;
-    const char*	pDate;
-    const char*	pUpd;
-    const char*	pMinor;
-    const char*	pBuild;
-    const char*	pInpath;
-};
-
-static const struct VersionInfo g_aVersionInfo =
-{
-    __TIME__,
-    __DATE__,
-    _UPD,
-    _LAST_MINOR,
-    _BUILD,
-    _INPATH
-};
-
-#if defined(WNT)
-__declspec(dllexport) const struct VersionInfo* GetVersionInfo(void);
-#endif
-
-#if defined(WNT)
-__declspec(dllexport) const struct VersionInfo* GetVersionInfo(void)
-#else
-const struct VersionInfo *GetVersionInfo(void)
-#endif
-{
-    return &g_aVersionInfo;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/unxmacxp/inc/poll.h b/solenv/unxmacxp/inc/poll.h
deleted file mode 100644
index 78dd8f9ba..000000000
--- a/solenv/unxmacxp/inc/poll.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-// poll.h
-// MacOS X does not implement poll().  Therefore, this replacement
-// is required.  It uses select().
-
-#ifndef _FAKE_POLL_H
-#define _FAKE_POLL_H
-
-#include <sys/errno.h>
-#include <string.h>
-#include <limits.h>
-#undef FD_SETSIZE
-#define FD_SETSIZE OPEN_MAX
-#include <sys/types.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-typedef struct pollfd {
-    int fd;                         /* file desc to poll */
-    short events;                   /* events of interest on fd */
-    short revents;                  /* events that occurred on fd */
-} pollfd_t;
-
-
-// poll flags
-#define POLLIN  0x0001
-#define POLLOUT 0x0004
-#define POLLERR 0x0008
-
-// synonyms
-#define POLLNORM POLLIN
-#define POLLPRI POLLIN
-#define POLLRDNORM POLLIN
-#define POLLRDBAND POLLIN
-#define POLLWRNORM POLLOUT
-#define POLLWRBAND POLLOUT
-
-// ignored
-#define POLLHUP 0x0010
-#define POLLNVAL 0x0020
-
-inline int poll(struct pollfd *pollSet, int pollCount, int pollTimeout)
-{
-    struct timeval		tv;
-    struct timeval		*tvp;
-    fd_set			readFDs, writeFDs, exceptFDs;
-    fd_set			*readp, *writep, *exceptp;
-    struct pollfd		*pollEnd, *p;
-    int				selected;
-    int				result;
-    int				maxFD;
-
-    if ( !pollSet )
-    {
-        pollEnd = NULL;
-        readp = NULL;
-        writep = NULL;
-        exceptp = NULL;
-        maxFD = 0;
-    }
-    else
-    {
-        pollEnd = pollSet + pollCount;
-        readp = &readFDs;
-        writep = &writeFDs;
-        exceptp = &exceptFDs;
-
-        FD_ZERO(readp);
-        FD_ZERO(writep);
-        FD_ZERO(exceptp);
-        
-        // Find the biggest fd in the poll set
-        maxFD = 0;
-        for (p = pollSet; p < pollEnd; p++)
-        {
-            if (p->fd > maxFD)
-                maxFD = p->fd;
-        }
-
-        if (maxFD >= FD_SETSIZE)
-        {
-            // At least one fd is too big
-            errno = EINVAL;
-            return -1;
-        }
-        
-        // Transcribe flags from the poll set to the fd sets
-        for (p = pollSet; p < pollEnd; p++)
-        {
-            if (p->fd < 0)
-            {
-                // Negative fd checks nothing and always reports zero
-            }
-            else
-            {
-                if (p->events & POLLIN)
-                    FD_SET(p->fd, readp);
-                if (p->events & POLLOUT)
-                    FD_SET(p->fd, writep);
-                if (p->events != 0)
-                    FD_SET(p->fd, exceptp);
-                // POLLERR is never set coming in; poll() always reports errors
-                // But don't report if we're not listening to anything at all.
-            }
-        }
-    }
-        
-    // poll timeout is in milliseconds. Convert to struct timeval.
-    // poll timeout == -1 : wait forever : select timeout of NULL
-    // poll timeout == 0  : return immediately : select timeout of zero
-    if (pollTimeout >= 0)
-    {
-        tv.tv_sec = pollTimeout / 1000;
-        tv.tv_usec = (pollTimeout % 1000) * 1000;
-        tvp = &tv;
-    }
-    else
-    {
-        tvp = NULL;
-    }
-
-    selected = select(maxFD+1, readp, writep, exceptp, tvp);
-
-    if (selected < 0)
-    {
-        // Error during select
-        result = -1;
-    } 
-    else if (selected > 0)
-    {
-        // Select found something
-        // Transcribe result from fd sets to poll set.
-        // Also count the number of selected fds. poll returns the 
-        // number of ready fds; select returns the number of bits set.
-        int polled = 0;
-        for (p = pollSet; p < pollEnd; p++)
-        {
-            p->revents = 0;
-            if (p->fd < 0) {
-                // Negative fd always reports zero
-            }
-            else
-            {
-                if ( (p->events & POLLIN) && FD_ISSET(p->fd, readp) )
-                    p->revents |= POLLIN;
-                if ( (p->events & POLLOUT) && FD_ISSET(p->fd, writep) )
-                    p->revents |= POLLOUT;
-                if ( (p->events != 0) && FD_ISSET(p->fd, exceptp) )
-                    p->revents |= POLLERR;
-                
-                if (p->revents)
-                    polled++;
-            }
-        }
-        result = polled;
-    }
-    else
-    {
-        // selected == 0, select timed out before anything happened
-        // Clear all result bits and return zero.
-        for (p = pollSet; p < pollEnd; p++)
-            p->revents = 0;
-            
-        result = 0;
-    }
-
-    return result;
-}
-
-
-#undef FD_SETSIZE
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/wntgcci/inc/sehandler.hxx b/solenv/wntgcci/inc/sehandler.hxx
deleted file mode 100644
index 2fabe486a..000000000
--- a/solenv/wntgcci/inc/sehandler.hxx
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-
-// Provenance of this code unclear. From crosswin32-dtrans-mingw.diff,
-// but from where it got there, I don't know.
-
-
-#ifndef _SEHANDLER_HXX
-#define _SEHANDLER_HXX
-
-#ifndef __MINGW32__
-#error This file should be included only in a MinGW compilation
-#endif
-
-#include <windows.h>
-#include <setjmp.h>
-
-#ifndef EH_UNWINDING
-// See _EH_UNWINDING in MSVS9/VC/crt/src/except.inc
-#define EH_UNWINDING 2
-#endif
-
-namespace {
-class __SEHandler
-{
-public:
-    __SEHandler() {}
-    ~__SEHandler() {}
-    typedef int (*PF)(void *, LPEXCEPTION_POINTERS);
-    typedef void (*PH)(void *, LPEXCEPTION_POINTERS);
-    typedef void (*PN)(void *);
-    void Set(jmp_buf jb, void *pdata=NULL, PF pfilter=NULL, PH phandlerbody=NULL, PN pfinal=NULL)
-    {
-        __builtin_memcpy(m_jmpbuf, jb, sizeof(jmp_buf));
-        m_pData=pdata;
-        switch (reinterpret_cast<int>(pfilter))
-            {
-            default:
-                m_filter=pfilter;
-                break;
-            case EXCEPTION_CONTINUE_EXECUTION:
-                m_filter=DefaultFilterContinueExecution;
-                break;
-            case EXCEPTION_EXECUTE_HANDLER:
-                m_filter=DefaultFilterExecuteHandler;
-                break;
-            case EXCEPTION_CONTINUE_SEARCH:
-                m_filter=DefaultFilterContinueSearch;
-                break;
-            }
-        if (phandlerbody)
-            m_handlerbody=phandlerbody;
-        else
-            m_handlerbody=DefaultHandler;
-        if (pfinal)
-            m_final=pfinal;
-        else
-            m_final=DefaultFinal;
-        m_ER.pHandlerClass = this;
-        m_ER.hp = handler;
-        asm("movl %%fs:0, %%eax\n\t"
-            "movl %%eax, %0": : "m" (m_ER.prev): "%eax" );
-        asm("movl %0, %%eax\n\t"
-            "movl %%eax, %%fs:0": : "r" (&m_ER): "%eax" );
-    }
-    void Reset()
-    {
-        m_final(m_pData);
-        asm("movl %0, %%eax \n\t"
-            "movl %%eax, %%fs:0"
-            : : "m" (m_ER.prev): "%eax");
-    }
-private:
-    __SEHandler(const __SEHandler&);
-    __SEHandler& operator=(const __SEHandler&);
-    struct _ER {
-        _ER* prev;
-        PEXCEPTION_HANDLER hp;
-        __SEHandler *pHandlerClass;
-    };
-    static EXCEPTION_DISPOSITION handler(struct _EXCEPTION_RECORD *pExceptionRecord,
-                                         void * EstablisherFrame,
-                                         struct _CONTEXT *ContextRecord,
-                                         void * /*DispatcherContext*/)
-    {
-        __SEHandler* pThis = reinterpret_cast< _ER * >(EstablisherFrame)->pHandlerClass;
-        if  (pExceptionRecord->ExceptionFlags & EH_UNWINDING)
-            {
-                pThis->m_final(pThis->m_pData);
-                return ExceptionContinueSearch;
-            }
-        EXCEPTION_POINTERS ep={pExceptionRecord, ContextRecord};
-        switch (pThis->m_filter(pThis->m_pData, &ep))
-            {
-            case EXCEPTION_EXECUTE_HANDLER:
-                RtlUnwind(EstablisherFrame, &&__set_label, pExceptionRecord, 0);
-            __set_label:
-                pThis->m_handlerbody(pThis->m_pData, &ep);
-                ContextRecord->Ebp = pThis->m_jmpbuf[0];
-                ContextRecord->Eip = pThis->m_jmpbuf[1];
-                ContextRecord->Esp = pThis->m_jmpbuf[2];
-                return ExceptionContinueExecution;
-            case EXCEPTION_CONTINUE_SEARCH:
-                return ExceptionContinueSearch;
-            case EXCEPTION_CONTINUE_EXECUTION:
-                return ExceptionContinueExecution;
-            }
-        return ExceptionContinueExecution;
-    }
-    static int DefaultFilterContinueSearch(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_SEARCH; }
-    static int DefaultFilterContinueExecution(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_CONTINUE_EXECUTION; }
-    static int DefaultFilterExecuteHandler(void *, LPEXCEPTION_POINTERS) { return EXCEPTION_EXECUTE_HANDLER; }
-    static void DefaultHandler(void *, LPEXCEPTION_POINTERS) {}
-    static void DefaultFinal(void *) {}
-    typedef int (*handler_p)(struct _EXCEPTION_RECORD *ExceptionRecord,
-                             void * EstablisherFrame,
-                             struct _CONTEXT *ContextRecord,
-                             void * DispatcherContext);
-    _ER m_ER;
-    void *m_pData;
-    PN m_final;
-    PH m_handlerbody;
-    PF m_filter;
-    jmp_buf m_jmpbuf;
-};
-
-} // namespace {
-
-#endif // _SEHANDLER_HXX
diff --git a/soltools/adjustvisibility/adjustvisibility.cxx b/soltools/adjustvisibility/adjustvisibility.cxx
deleted file mode 100644
index 3e204cb55..000000000
--- a/soltools/adjustvisibility/adjustvisibility.cxx
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-
-/*
- * adjustvisibilty -- a tool to adjust the visibility of the so called 
- *                    'fix and continue' globalized symbols generated by 
- *                    the Sun Studio 8 compiler from 'DEFAULT' to 'HIDDEN'
- *                    
- * References: "Linker and Libraries Guide", Solaris 9 documentation
- *             "Stabs Interface", SunStudio 8 documentation
- */
-
-#include <string>
-#include <iostream>
-#include <exception>
-#include <stdexcept>
-#include <cerrno>
-#include <fcntl.h>
-#include <unistd.h>
-#include <libelf.h>
-#include <gelf.h>
-#include <utime.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <limits>
-#include <stdio.h>
-
-// Note: There is no GELF_ST_VISIBILITY macro in gelf.h, we roll our own.
-#define GELF_ST_VISIBILITY(o)   ((o)&0x3) // See "Linker and Libraries Guide".
-
-// See "Linker and Libraries Guide", ELF object format description.
-static const char* SymbolType[STT_NUM] = {
-    "NOTYPE",
-    "OBJECT",
-    "FUNC  ",
-    "SECT  ",
-    "FILE  ",
-    "COMM  ",
-    "TLS   "
-};
-
-static const char* SymbolBinding[STB_NUM] = {
-    "LOCAL ",
-    "GLOBAL",
-    "WEAK  "
-};
-
-static const char* SymbolVisibility[4] = {   // Note: There is no STV_NUM macro
-    "DEFAULT  ",
-    "INTERNAL ",
-    "HIDDEN   ",
-    "PROTECTED"
-};
-
-class ElfError : public std::exception
-{
-    public:
-        ElfError(const std::string& rFile, const std::string& rMessage);
-        ~ElfError() throw() {};
-        virtual const char* what() const throw() { return m_sMessage.c_str(); }
-
-    private:
-        std::string m_sMessage;
-};
-
-ElfError::ElfError(const std::string& rFile, const std::string& rMessage) 
-{
-    if ( rFile != "" ) {
-        m_sMessage = rFile;
-        m_sMessage += ": ";
-    }
-    m_sMessage += rMessage;
-    const char *pElfMsg = elf_errmsg(0);
-    if ( pElfMsg ) {
-        m_sMessage += ": ";
-        m_sMessage += pElfMsg;
-    }
-}
-    
-void initElfLib()
-{
-    if ( elf_version(EV_CURRENT) == EV_NONE) {
-        throw ElfError("", "elf_version() failed");
-    }
-    return;
-}
-
-bool isFixAndContinueSymbol(const std::string& rSymbol)
-{
-    // The globalized 'fix and continue' symbols have the following
-    // form, see "Stabs interface", page 164:
-    // {.$}X{ABC}uniquepattern[.function_name][EQUIVn][.variable_name]
-    char c0 = rSymbol[0];
-    char c1 = rSymbol[1];
-    char c2 = rSymbol[2];
-    if ( c0 == '.' || c0 == '$' ) {
-        if ( c1 == 'X' ) {
-            if ( c2 == 'A' || c2 == 'B' || c2 == 'C' || c2 == 'D' ) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-void adjustVisibility( const std::string& rFile, int fd, bool bVerbose)
-{
-    if ( bVerbose ) {
-        std::cout << "File: " << rFile << ": adjusting 'fix and continue' symbol visibility\n";
-    }
-
-    try {
-        Elf* pElf;
-        if ((pElf = elf_begin(fd, ELF_C_RDWR, 0)) == NULL) {
-            throw ElfError(rFile, "elf_begin() failed");
-        }
-        // Check if file is ELF file.
-        if ( elf_kind(pElf) != ELF_K_ELF ) {
-            throw ElfError(rFile, "elf_kind() failed, file is not an ELF object file");
-        }
-
-        // Iterate over sections.
-        Elf_Scn* pScn = 0;
-        while ( (pScn = elf_nextscn(pElf, pScn)) != 0 ) {
-            GElf_Shdr aShdr;
-            if ( gelf_getshdr(pScn, &aShdr) == 0 ) {
-                throw ElfError(rFile, "gelf_getshdr() failed");
-            }
-            if ( aShdr.sh_type != SHT_SYMTAB ) {
-                continue;
-            }
-            // Section is a symbol section. Get the assiociated data.
-            Elf_Data* pSymbolData;
-            if ( (pSymbolData = elf_getdata(pScn, 0)) == NULL ) {
-                throw ElfError(rFile, "elf_getdata() failed");
-            }
-            // Iterate over symbol table.
-            GElf_Xword nSymbols = aShdr.sh_size / aShdr.sh_entsize;
-            if ( nSymbols > std::numeric_limits< int >::max() )
-            {
-                throw ElfError(rFile, "too many symbols");
-            }
-            for ( int nIndex = 0; nIndex < nSymbols; ++nIndex) {
-                // Get symbol.
-                GElf_Sym aSymbol;
-                if ( gelf_getsym(pSymbolData, nIndex, &aSymbol) == NULL ) 
-                {
-                    throw ElfError(rFile, "gelf_getsym() failed");
-                }
-                std::string  sSymbolName(elf_strptr(pElf, aShdr.sh_link, aSymbol.st_name));
-                if ( isFixAndContinueSymbol(sSymbolName) ) {
-                    // Get the symbol visibility.
-                    unsigned int nSymbolVisibility = GELF_ST_VISIBILITY(aSymbol.st_other);
-                    if ( bVerbose ) {
-                        // Get the symbol type and binding.
-                        unsigned int nSymbolType       = GELF_ST_TYPE(aSymbol.st_info);
-                        unsigned int nSymbolBind       = GELF_ST_BIND(aSymbol.st_info);
-                        std::cout << "Symbol: " << sSymbolName << ", " 
-                            << "Type: ";
-                            if ( SymbolType[nSymbolType] ) {
-                                std::cout << SymbolType[nSymbolType];
-                            } else {
-                                std::cout << nSymbolType;
-                            }
-                            std::cout << ", Binding: ";
-                            if ( SymbolBinding[nSymbolBind] ) {
-                                std::cout << SymbolBinding[nSymbolBind];
-                            } else {
-                                std::cout << nSymbolBind;
-                            }
-                            std::cout << ", Visibility: ";
-                            if ( SymbolVisibility[nSymbolVisibility] ) {
-                                std::cout << SymbolVisibility[nSymbolVisibility];
-                            } else {
-                                std::cout << nSymbolVisibility;
-                            }
-                            std::cout << "-> " << SymbolVisibility[STV_HIDDEN] << "\n";
-                    }
-                    // Toggle visibility to "hidden".
-                    aSymbol.st_other = GELF_ST_VISIBILITY(STV_HIDDEN);
-                    // Write back symbol data to underlying structure.
-                    if ( gelf_update_sym(pSymbolData, nIndex, &aSymbol) == NULL ) 
-                    {
-                        throw ElfError(rFile, "gelf_update_sym() failed");
-                    }
-                }
-            }
-        }
-        // Write changed object file to disk.
-        if ( elf_update(pElf, ELF_C_WRITE) == -1 ) {
-            throw ElfError(rFile, "elf_update() failed");
-        }
-        elf_end(pElf);
-
-    } catch (ElfError& e) {
-        close(fd);
-        throw;
-    }
-    return;
-}
-
-void processObject(const std::string& rFile, bool bPreserve, bool bVerbose)
-{
-    int fd;
-    struct stat aStatBuf;
-    
-    if ((fd = open(rFile.c_str(), O_RDWR)) == -1) {
-         std::string sMessage("adjustVisibilty() failed: can't open file ");
-         sMessage += rFile;
-         sMessage += ": ";
-         sMessage += std::strerror(errno);
-         throw std::runtime_error(sMessage);
-    }
-
-    if ( bPreserve ) {
-        if ( fstat(fd, &aStatBuf) == -1) {
-            close(fd);
-            std::string sMessage("adjustVisibilty() failed: can't stat file ");
-            sMessage += rFile;
-            sMessage += ": ";
-            sMessage += std::strerror(errno);
-            throw std::runtime_error(sMessage);
-        }
-    }
-    
-    adjustVisibility(rFile, fd, bVerbose);
-    
-    close(fd);
-
-    if ( bPreserve ) {
-        struct utimbuf aUtimBuf = {aStatBuf.st_atime, aStatBuf.st_mtime};
-        if ( utime(rFile.c_str(), &aUtimBuf) == -1 ) {
-             std::string sMessage("adjustVisibilty() failed: can't reset timestamp ");
-             sMessage += rFile;
-             sMessage += ": ";
-             sMessage += std::strerror(errno);
-             throw std::runtime_error(sMessage);
-        }
-    }
-    return;
-}
-
-int main(int argc, char* argv[])
-{
-    int  c;
-    bool bPreserve = false;
-    bool bVerbose  = false;
-
-    while ( (c = getopt(argc, argv, "pv")) != -1 ) {
-        switch(c) {
-            case 'p':
-                bPreserve = true;
-                break;
-            case 'v':
-                bVerbose = true;
-                break;
-            case '?':
-                std::cerr << "Unrecognized option: -" << optopt << "\n";
-                break;
-            default:
-                break;
-        }
-    }
-
-    if ( optind == argc ) {
-        std::cout << "usage: " << argv[0] << " [-pv] <elf-object> ...\n";
-        std::cout << "       -p     preserve time stamps\n";
-        std::cout << "       -v     verbose\n";
-        return 1;
-    }
-
-    try {
-        initElfLib();
-    
-        for ( ; optind < argc; optind++ )  {
-            processObject(std::string(argv[optind]), bPreserve, bVerbose);
-        }
-
-    } catch (std::exception& e) {
-        std::cerr << argv[0] << ": " << e.what() << "\n";
-        return 1;
-    }
-
-    return 0;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk
deleted file mode 100644
index ea0d09c2c..000000000
--- a/soltools/adjustvisibility/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=adjustvisibility
-TARGETTYPE=CUI
-ENABLE_EXCEPTIONS=TRUE
-noadjust=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-# This tool is for Solaris only
-.IF "$(OS)"=="SOLARIS"
-
-APP1TARGET	= 	adjustvisibility
-APP1OBJS	=	$(OBJ)$/adjustvisibility.obj
-DEPOBJFILES	=	$(APP1OBJ)
-APP1STDLIBS =   -lelf
-APP1RPATH   =   NONE
-
-#APP1STDLIBS+=-lstlport
-APP1STDLIBS+=-lCstd
-
-.ENDIF "$(OS)"=="SOLARIS"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/soltools/checkdll/checkdll.c b/soltools/checkdll/checkdll.c
deleted file mode 100644
index 8aaf05358..000000000
--- a/soltools/checkdll/checkdll.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <dlfcn.h>
-
-/* 
- * NOTE: Since no one is really interested in correct unload behavior I've
- * disabled the shared library unload check. If you want to reenable it comment
- * the following line out
- */
-#define NO_UNLOAD_CHECK
-
-static const char *pprog_name 	= "checkdll";
-static const char *psymbol		= "GetVersionInfo";
-
-void usage()
-{
-    fprintf(stderr, "usage: %s [-s] <dllname>\n", pprog_name);
-    return;
-}
-
-int main(int argc, char *argv[])
-{
-    int     silent=0;
-    void	*phandle;	
-    char 	*(*pfun)(void);
-
-    if ( argc < 2 || argc > 4) {
-        usage();
-        return 1;
-    }
-
-    if ( !strcmp(argv[1],"-s") ) {
-        silent = 1;
-        ++argv, --argc;
-    }
-
-    if ( access( argv[1], R_OK ) == -1 ) {
-        fprintf(stderr, "%s: ERROR: %s: %s\n",
-                pprog_name, argv[1], strerror(errno));
-        return 2;
-    }
-
-    if (!silent) printf("Checking DLL %s ...", argv[1]);
-    fflush(stdout);
-
-    if ( (phandle = dlopen(argv[1], RTLD_NOW)) != NULL ) {
-        if  ( (pfun = (char *(*)(void))dlsym(phandle, psymbol)) != NULL ) {
-            if (!silent) printf(": ok\n");
-        }
-        else
-        {
-            printf(": WARNING: %s\n", dlerror());
-        }
-#ifdef NO_UNLOAD_CHECK
-        _exit(0);
-#else
-        dlclose(phandle);
-#endif
-        return 0;
-    }
-
-    printf(": ERROR: %s\n", dlerror());
-    return 3;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk
deleted file mode 100644
index 2b7e71be9..000000000
--- a/soltools/checkdll/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=checkdll
-TARGETTYPE=CUI
-NO_DEFAULT_STL=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-
-.IF "$(GUI)"=="UNX" && "$(CROSS_COMPILING)"!="YES"
-LIBSALCPPRT=$(0)
-APP1TARGET	= 	checkdll
-APP1OBJS	=	$(OBJ)$/checkdll.obj
-DEPOBJFILES	=	$(APP1OBJS) 
-.IF "$(OS)"!="FREEBSD" && "$(OS)"!="MACOSX" && "$(OS)"!="NETBSD" \
-	&& "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
-STDLIB += -ldl
-.ENDIF
-.IF "$(OS)"=="NETBSD"
-APP1STDLIBS	+= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
-.ENDIF
-.ENDIF # "$(GUI)"=="UNX" && "$(CROSS_COMPILING)"!="YES"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/soltools/cpp/Test.txt b/soltools/cpp/Test.txt
deleted file mode 100644
index 62c1ae40f..000000000
--- a/soltools/cpp/Test.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-
-#define ABC \
-		ggg
-
-ABC
-
-/* Standards --------------------------------------------------------------- */
-
-#define NOTHING
-NOTHING
-
-#define SYMBOL symbol
-#undef SYMBOL
-#define SYMBOL _symbol_
-
-< SYMBOL >                      // < _symbol_ >
-xSYMBOLx                        // xSYMBOLx
-+SYMBOL-                        // +_symbol_-
->SYMBOL<                        // >_symbol_<
-<SYMBOL>                        // <_symbol_>
-
-#define FALSE 0
-#define TRUE  !FALSE
-a = x > 0 ? TRUE : FALSE        // a = x > 0 ? !0 : 0
-
-#define A x
-#define B y
-#define MAC(a, b) \
-	T() { a(); return b; }      // T() { x(); return y; }
-MAC(A,B);
-
-#ifdef MAC
-MAC(X,Y)
-#endif // MAC
-
-/* Recursions -------------------------------------------------------------- */
-
-#define y x
-#define x y
-x                               // x
-
-#define Test(a) a
-#define b Test(b)
-a = b;                          // a = b;
-
-#define func abc(func)
-a = func                        // a = abc(func)
-
-#define func1 func(abc)
-a = func1                       // a = abc(func)(abc)
-
-#define args(func, args) func args
-args(t1, (args(t2, (x, y))))    // t1 (t2 (x, y))
-
-#define ARGS(a) a
-#define __ ARGS
-int foo __((int x));            // int foo (int x);
-
-/* Concatinations ---------------------------------------------------------- */
-
-#define tail _Test
-// Txt_##tail                      // Txt_##_Test
-
-#define z(e,f) e##_##f
-z ( abc, xyz )                  // abc_xyz
-
-
-#define CAT( var ) fix##.var
-CAT( a )                        // fix.a
-
-#define CAT3( class, ref ) class##ref::class##ref
-CAT3( a, b )                    // ab::ab
-
-#define CAT2( var ) fix##var::fix##var
-CAT2( a )                       // fixa::fixa
-
-/* Extrems ----------------------------------------------------------------- */
-
-#define MAKE_X( name )  name##_Test
-#define MAKE_Y( name )  MAKE_X( name##_Sym )
-MAKE_Y( Txt );                  // Txt_Sym_Test;
-
-
-/* Extensions -------------------------------------------------------------- */
-
-/*
-#ident "(c)# Test.txt"
-
-#if #machine(i386)
-#   error illegal machine
-#endif
-char machine[6];
-*/
-
-/* Last bug ----------------------------------------------------------------- */
-#define Cfstrcpy		Cstrcpy
-#define Cstrcpy( s1, s2 )	strcpy( s1, s2 )
-
-Cfstrcpy(Par1,Par2 )   		// blub( Par1, Par2 )
-
-/* ---------------------------------------------------------------------- */
diff --git a/soltools/cpp/_cpp.c b/soltools/cpp/_cpp.c
deleted file mode 100644
index 64229f505..000000000
--- a/soltools/cpp/_cpp.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <stdarg.h>             
-#include "cpp.h"
-                    
-#define	OUTS	16384                  
-char outbuf[OUTS];
-char *outptr = outbuf;
-Source *cursource;
-int nerrs;
-struct token nltoken = {NL, 0, 0, 1, (uchar *) "\n", 0};
-char *curtime;
-int incdepth;
-int ifdepth;
-int ifsatisfied[NIF];
-int skipping;
-
-char rcsid[] = "$Version 1.2 $ $Revision: 1.5 $ $Date: 2006-06-20 05:05:46 $";
-
-int
-#ifdef _WIN32
-__cdecl
-#endif // _WIN32
-    main(int argc, char **argv)
-{
-
-    Tokenrow tr;
-    time_t t;
-    char ebuf[BUFSIZ];
-
-    setbuf(stderr, ebuf);
-    t = time(NULL);
-    curtime = ctime(&t);
-    maketokenrow(3, &tr);
-    expandlex();
-    setup(argc, argv);
-    fixlex();
-    if (!Pflag)
-        genline();
-    process(&tr);
-    flushout();
-    fflush(stderr);
-    exit(nerrs > 0);
-}
-
-void
-    process(Tokenrow * trp)
-{
-    int anymacros = 0;
-
-    for (;;)
-    {
-        if (trp->tp >= trp->lp)
-        {
-            trp->tp = trp->lp = trp->bp;
-            outptr = outbuf;
-            anymacros |= gettokens(trp, 1);
-            trp->tp = trp->bp;
-        }
-        if (trp->tp->type == END)
-        {
-            if (--incdepth >= 0)
-            {
-                if (cursource->ifdepth)
-                    error(ERROR,
-                          "Unterminated conditional in #include");
-                unsetsource();
-                cursource->line += cursource->lineinc;
-                trp->tp = trp->lp;
-                if (!Pflag)
-                    genline();
-                continue;
-            }
-            if (ifdepth)
-                error(ERROR, "Unterminated #if/#ifdef/#ifndef");
-            break;
-        }
-        if (trp->tp->type == SHARP)
-        {
-            trp->tp += 1;
-            control(trp);
-        }
-        else
-            if (!skipping && anymacros)
-                expandrow(trp, NULL);
-        if (skipping)
-            setempty(trp);
-        puttokens(trp);
-        anymacros = 0;
-        cursource->line += cursource->lineinc;
-        if (cursource->lineinc > 1)
-        {
-            if (!Pflag)
-                genline();
-        }
-    }
-}
-
-void
-    control(Tokenrow * trp)
-{
-    Nlist *np;
-    Token *tp;
-
-    tp = trp->tp;
-    if (tp->type != NAME)
-    {
-        if (tp->type == NUMBER)
-            goto kline;
-        if (tp->type != NL)
-            error(ERROR, "Unidentifiable control line");
-        return;                         /* else empty line */
-    }
-    if ((np = lookup(tp, 0)) == NULL || ((np->flag & ISKW) == 0 && !skipping))
-    {
-        error(WARNING, "Unknown preprocessor control %t", tp);
-        return;
-    }
-    if (skipping)
-    {
-        switch (np->val)
-        {
-            case KENDIF:
-                if (--ifdepth < skipping)
-                    skipping = 0;
-                --cursource->ifdepth;
-                setempty(trp);
-                return;
-
-            case KIFDEF:
-            case KIFNDEF:
-            case KIF:
-                if (++ifdepth >= NIF)
-                    error(FATAL, "#if too deeply nested");
-                ++cursource->ifdepth;
-                return;
-
-            case KELIF:
-            case KELSE:
-                if (ifdepth <= skipping)
-                    break;
-                return;
-
-            default:
-                return;
-        }
-    }
-    switch (np->val)
-    {
-        case KDEFINE:
-            dodefine(trp);
-            break;
-
-        case KUNDEF:
-            tp += 1;
-            if (tp->type != NAME || trp->lp - trp->bp != 4)
-            {
-                error(ERROR, "Syntax error in #undef");
-                break;
-            }
-            if ((np = lookup(tp, 0)) != NULL)
-            {
-                np->flag &= ~ISDEFINED;
-
-                if (Mflag)
-                {
-                    if (np->ap)
-                        error(INFO, "Macro deletion of %s(%r)", np->name, np->ap);
-                    else
-                        error(INFO, "Macro deletion of %s", np->name);
-                }
-            }
-            break;
-
-        case KPRAGMA:
-        case KIDENT:
-            for (tp = trp->tp - 1; ((tp->type != NL) && (tp < trp->lp)); tp++)
-                tp->type = UNCLASS;
-            return;
-
-        case KIFDEF:
-        case KIFNDEF:
-        case KIF:
-            if (++ifdepth >= NIF)
-                error(FATAL, "#if too deeply nested");
-            ++cursource->ifdepth;
-            ifsatisfied[ifdepth] = 0;
-            if (eval(trp, np->val))
-                ifsatisfied[ifdepth] = 1;
-            else
-                skipping = ifdepth;
-            break;
-
-        case KELIF:
-            if (ifdepth == 0)
-            {
-                error(ERROR, "#elif with no #if");
-                return;
-            }
-            if (ifsatisfied[ifdepth] == 2)
-                error(ERROR, "#elif after #else");
-            if (eval(trp, np->val))
-            {
-                if (ifsatisfied[ifdepth])
-                    skipping = ifdepth;
-                else
-                {
-                    skipping = 0;
-                    ifsatisfied[ifdepth] = 1;
-                }
-            }
-            else
-                skipping = ifdepth;
-            break;
-
-        case KELSE:
-            if (ifdepth == 0 || cursource->ifdepth == 0)
-            {
-                error(ERROR, "#else with no #if");
-                return;
-            }
-            if (ifsatisfied[ifdepth] == 2)
-                error(ERROR, "#else after #else");
-            if (trp->lp - trp->bp != 3)
-                error(ERROR, "Syntax error in #else");
-            skipping = ifsatisfied[ifdepth] ? ifdepth : 0;
-            ifsatisfied[ifdepth] = 2;
-            break;
-
-        case KENDIF:
-            if (ifdepth == 0 || cursource->ifdepth == 0)
-            {
-                error(ERROR, "#endif with no #if");
-                return;
-            }
-            --ifdepth;
-            --cursource->ifdepth;
-            if (trp->lp - trp->bp != 3)
-                error(WARNING, "Syntax error in #endif");
-            break;
-
-        case KERROR:
-            trp->tp = tp + 1;
-            error(WARNING, "#error directive: %r", trp);
-            break;
-
-        case KLINE:
-            trp->tp = tp + 1;
-            expandrow(trp, "<line>");
-            tp = trp->bp + 2;
-    kline:
-            if (tp + 1 >= trp->lp || tp->type != NUMBER || tp + 3 < trp->lp
-                || (tp + 3 == trp->lp
-                    && ((tp + 1)->type != STRING || *(tp + 1)->t == 'L')))
-            {
-                error(ERROR, "Syntax error in #line");
-                return;
-            }
-            cursource->line = atol((char *) tp->t) - 1;
-            if (cursource->line < 0 || cursource->line >= 32768)
-                error(WARNING, "#line specifies number out of range");
-            tp = tp + 1;
-            if (tp + 1 < trp->lp)
-                cursource->filename = (char *) newstring(tp->t + 1, tp->len - 2, 0);
-            return;
-
-        case KDEFINED:
-            error(ERROR, "Bad syntax for control line");
-            break;
-
-        case KIMPORT:
-            doinclude(trp, -1, 1);
-            trp->lp = trp->bp;
-            return;
-
-        case KINCLUDE:
-            doinclude(trp, -1, 0);
-            trp->lp = trp->bp;
-            return;
-
-        case KINCLUDENEXT:
-            doinclude(trp, cursource->pathdepth, 0);
-            trp->lp = trp->bp;
-            return;
-
-        case KEVAL:
-            eval(trp, np->val);
-            break;
-
-        default:
-            error(ERROR, "Preprocessor control `%t' not yet implemented", tp);
-            break;
-    }
-    setempty(trp);
-    return;
-}
-
-void *
-    domalloc(size_t size)
-{
-    void *p = malloc(size);
-
-    if (p == NULL)
-        error(FATAL, "Out of memory from malloc");
-    return p;
-}
-
-void
-    dofree(void *p)
-{
-    free(p);
-}
-
-void
-    error(enum errtype type, char *string,...)
-{
-    va_list ap;
-    char c, *cp, *ep;
-    Token *tp;
-    Tokenrow *trp;
-    Source *s;
-    int i;
-
-    fprintf(stderr, "cpp: ");
-    for (s = cursource; s; s = s->next)
-        if (*s->filename)
-            fprintf(stderr, "%s:%d ", s->filename, s->line);
-    va_start(ap, string);
-    for (ep = string; *ep; ep++)
-    {
-        if (*ep == '%')
-        {
-            switch (*++ep)
-            {
-
-                case 'c':
-                    c = (char) va_arg(ap, int);
-                    fprintf(stderr, "%c", c);
-                    break;
-
-                case 's':
-                    cp = va_arg(ap, char *);
-                    fprintf(stderr, "%s", cp);
-                    break;
-
-                case 'd':
-                    i = va_arg(ap, int);
-                    fprintf(stderr, "%d", i);
-                    break;
-
-                case 't':
-                    tp = va_arg(ap, Token *);
-                    fprintf(stderr, "%.*s", (int)tp->len, tp->t);
-                    break;
-
-                case 'r':
-                    trp = va_arg(ap, Tokenrow *);
-                    for (tp = trp->tp; tp < trp->lp && tp->type != NL; tp++)
-                    {
-                        if (tp > trp->tp && tp->wslen)
-                            fputc(' ', stderr);
-                        fprintf(stderr, "%.*s", (int)tp->len, tp->t);
-                    }
-                    break;
-
-                default:
-                    fputc(*ep, stderr);
-                    break;
-            }
-        }
-        else
-            fputc(*ep, stderr);
-    }
-    va_end(ap);
-    fputc('\n', stderr);
-    if (type == FATAL)
-        exit(1);
-    if (type != WARNING)
-        nerrs = 1;
-    fflush(stderr);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_eval.c b/soltools/cpp/_eval.c
deleted file mode 100644
index c6b6d1ddf..000000000
--- a/soltools/cpp/_eval.c
+++ /dev/null
@@ -1,772 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "cpp.h"
-
-#define	NSTAK	32
-#define	SGN	0
-#define	UNS	1
-#define	UND	2
-
-#define	UNSMARK	0x1000
-
-struct value
-{
-    long val;
-    int type;
-};
-
-/* conversion types */
-#define	RELAT	1
-#define	ARITH	2
-#define	LOGIC	3
-#define	SPCL	4
-#define	SHIFT	5
-#define	UNARY	6
-
-/* operator priority, arity, and conversion type, indexed by tokentype */
-struct pri
-{
-    char pri;
-    char arity;
-    char ctype;
-}   priority[] =
-
-{
-    {
-        0, 0, 0
-    },                                  /* END */
-    {
-        0, 0, 0
-    },                                  /* UNCLASS */
-    {
-        0, 0, 0
-    },                                  /* NAME */
-    {
-        0, 0, 0
-    },                                  /* NUMBER */
-    {
-        0, 0, 0
-    },                                  /* STRING */
-    {
-        0, 0, 0
-    },                                  /* CCON */
-    {
-        0, 0, 0
-    },                                  /* NL */
-    {
-        0, 0, 0
-    },                                  /* WS */
-    {
-        0, 0, 0
-    },                                  /* DSHARP */
-    {
-        11, 2, RELAT
-    },                                  /* EQ */
-    {
-        11, 2, RELAT
-    },                                  /* NEQ */
-    {
-        12, 2, RELAT
-    },                                  /* LEQ */
-    {
-        12, 2, RELAT
-    },                                  /* GEQ */
-    {
-        13, 2, SHIFT
-    },                                  /* LSH */
-    {
-        13, 2, SHIFT
-    },                                  /* RSH */
-    {
-        7, 2, LOGIC
-    },                                  /* LAND */
-    {
-        6, 2, LOGIC
-    },                                  /* LOR */
-    {
-        0, 0, 0
-    },                                  /* PPLUS */
-    {
-        0, 0, 0
-    },                                  /* MMINUS */
-    {
-        0, 0, 0
-    },                                  /* ARROW */
-    {
-        0, 0, 0
-    },                                  /* SBRA */
-    {
-        0, 0, 0
-    },                                  /* SKET */
-    {
-        3, 0, 0
-    },                                  /* LP */
-    {
-        3, 0, 0
-    },                                  /* RP */
-    {
-        0, 0, 0
-    },                                  /* DOT */
-    {
-        10, 2, ARITH
-    },                                  /* AND */
-    {
-        15, 2, ARITH
-    },                                  /* STAR */
-    {
-        14, 2, ARITH
-    },                                  /* PLUS */
-    {
-        14, 2, ARITH
-    },                                  /* MINUS */
-    {
-        16, 1, UNARY
-    },                                  /* TILDE */
-    {
-        16, 1, UNARY
-    },                                  /* NOT */
-    {
-        15, 2, ARITH
-    },                                  /* SLASH */
-    {
-        15, 2, ARITH
-    },                                  /* PCT */
-    {
-        12, 2, RELAT
-    },                                  /* LT */
-    {
-        12, 2, RELAT
-    },                                  /* GT */
-    {
-        9, 2, ARITH
-    },                                  /* CIRC */
-    {
-        8, 2, ARITH
-    },                                  /* OR */
-    {
-        5, 2, SPCL
-    },                                  /* QUEST */
-    {
-        5, 2, SPCL
-    },                                  /* COLON */
-    {
-        0, 0, 0
-    },                                  /* ASGN */
-    {
-        4, 2, 0
-    },                                  /* COMMA */
-    {
-        0, 0, 0
-    },                                  /* SHARP */
-    {
-        0, 0, 0
-    },                                  /* SEMIC */
-    {
-        0, 0, 0
-    },                                  /* CBRA */
-    {
-        0, 0, 0
-    },                                  /* CKET */
-    {
-        0, 0, 0
-    },                                  /* ASPLUS */
-    {
-        0, 0, 0
-    },                                  /* ASMINUS */
-    {
-        0, 0, 0
-    },                                  /* ASSTAR */
-    {
-        0, 0, 0
-    },                                  /* ASSLASH */
-    {
-        0, 0, 0
-    },                                  /* ASPCT */
-    {
-        0, 0, 0
-    },                                  /* ASCIRC */
-    {
-        0, 0, 0
-    },                                  /* ASLSH */
-    {
-        0, 0, 0
-    },                                  /* ASRSH */
-    {
-        0, 0, 0
-    },                                  /* ASOR */
-    {
-        0, 0, 0
-    },                                  /* ASAND */
-    {
-        0, 0, 0
-    },                                  /* ELLIPS */
-    {
-        0, 0, 0
-    },                                  /* DSHARP1 */
-    {
-        0, 0, 0
-    },                                  /* NAME1 */
-    {
-        0, 0, 0
-    },                                  /* NAME2 */
-    {
-        16, 1, UNARY
-    },                                  /* DEFINED */
-    {
-        16, 0, UNARY
-    },                                  /* UMINUS */
-    {
-        16, 1, UNARY
-    },                                  /* ARCHITECTURE */
-};
-
-int evalop(struct pri);
-struct value tokval(Token *);
-struct value vals[NSTAK], *vp;
-enum toktype ops[NSTAK], *op;
-
-/*
- * Evaluate an #if #elif #ifdef #ifndef line.  trp->tp points to the keyword.
- */
-long
-    eval(Tokenrow * trp, int kw)
-{
-    Token *tp;
-    Nlist *np;
-    size_t  ntok;
-    int rnd;
-
-    trp->tp++;
-    if (kw == KIFDEF || kw == KIFNDEF)
-    {
-        if (trp->lp - trp->bp != 4 || trp->tp->type != NAME)
-        {
-            error(ERROR, "Syntax error in #ifdef/#ifndef");
-            return 0;
-        }
-        np = lookup(trp->tp, 0);
-        return (kw == KIFDEF) == (np && np->flag & (ISDEFINED | ISMAC));
-    }
-    ntok = trp->tp - trp->bp;
-    kwdefined->val = KDEFINED;          /* activate special meaning of
-                                         * defined */
-    expandrow(trp, "<if>");
-    kwdefined->val = NAME;
-    vp = vals;
-    op = ops;
-    *op++ = END;
-    for (rnd = 0, tp = trp->bp + ntok; tp < trp->lp; tp++)
-    {
-        switch (tp->type)
-        {
-            case WS:
-            case NL:
-                continue;
-
-                /* nilary */
-            case NAME:
-            case NAME1:
-            case NAME2:
-            case NUMBER:
-            case CCON:
-            case STRING:
-                if (rnd)
-                    goto syntax;
-                *vp++ = tokval(tp);
-                rnd = 1;
-                continue;
-
-                /* unary */
-            case DEFINED:
-            case TILDE:
-            case NOT:
-                if (rnd)
-                    goto syntax;
-                *op++ = tp->type;
-                continue;
-
-                /* unary-binary */
-            case PLUS:
-            case MINUS:
-            case STAR:
-            case AND:
-                if (rnd == 0)
-                {
-                    if (tp->type == MINUS)
-                        *op++ = UMINUS;
-                    if (tp->type == STAR || tp->type == AND)
-                    {
-                        error(ERROR, "Illegal operator * or & in #if/#elsif");
-                        return 0;
-                    }
-                    continue;
-                }
-                /* flow through */
-
-                /* plain binary */
-            case EQ:
-            case NEQ:
-            case LEQ:
-            case GEQ:
-            case LSH:
-            case RSH:
-            case LAND:
-            case LOR:
-            case SLASH:
-            case PCT:
-            case LT:
-            case GT:
-            case CIRC:
-            case OR:
-            case QUEST:
-            case COLON:
-            case COMMA:
-                if (rnd == 0)
-                    goto syntax;
-                if (evalop(priority[tp->type]) != 0)
-                    return 0;
-                *op++ = tp->type;
-                rnd = 0;
-                continue;
-
-            case LP:
-                if (rnd)
-                    goto syntax;
-                *op++ = LP;
-                continue;
-
-            case RP:
-                if (!rnd)
-                    goto syntax;
-                if (evalop(priority[RP]) != 0)
-                    return 0;
-                if (op <= ops || op[-1] != LP)
-                {
-                    goto syntax;
-                }
-                op--;
-                continue;
-
-            case SHARP:
-                if ((tp + 1) < trp->lp)
-                {
-                    np = lookup(tp + 1, 0);
-                    if (np && (np->val == KMACHINE))
-                    {
-                        tp++;
-                        if (rnd)
-                            goto syntax;
-                        *op++ = ARCHITECTURE;
-                        continue;
-                    }
-                }
-                /* fall through */
-
-            default:
-                error(ERROR, "Bad operator (%t) in #if/#elsif", tp);
-                return 0;
-        }
-    }
-    if (rnd == 0)
-        goto syntax;
-    if (evalop(priority[END]) != 0)
-        return 0;
-    if (op != &ops[1] || vp != &vals[1])
-    {
-        error(ERROR, "Botch in #if/#elsif");
-        return 0;
-    }
-    if (vals[0].type == UND)
-        error(ERROR, "Undefined expression value");
-    return vals[0].val;
-syntax:
-    error(ERROR, "Syntax error in #if/#elsif");
-    return 0;
-}
-
-int
-    evalop(struct pri pri)
-{
-    struct value v1;
-    struct value v2 = { 0, UND };
-    long rv1, rv2;
-    int rtype, oper;
-
-    rv2 = 0;
-    rtype = 0;
-    while (pri.pri < priority[op[-1]].pri)
-    {
-        oper = *--op;
-        if (priority[oper].arity == 2)
-        {
-            v2 = *--vp;
-            rv2 = v2.val;
-        }
-        v1 = *--vp;
-        rv1 = v1.val;
-/*lint -e574 -e644 */
-        switch (priority[oper].ctype)
-        {
-            case 0:
-            default:
-                error(WARNING, "Syntax error in #if/#endif");
-                return 1;
-            case ARITH:
-            case RELAT:
-                if (v1.type == UNS || v2.type == UNS)
-                    rtype = UNS;
-                else
-                    rtype = SGN;
-                if (v1.type == UND || v2.type == UND)
-                    rtype = UND;
-                if (priority[oper].ctype == RELAT && rtype == UNS)
-                {
-                    oper |= UNSMARK;
-                    rtype = SGN;
-                }
-                break;
-            case SHIFT:
-                if (v1.type == UND || v2.type == UND)
-                    rtype = UND;
-                else
-                    rtype = v1.type;
-                if (rtype == UNS)
-                    oper |= UNSMARK;
-                break;
-            case UNARY:
-                rtype = v1.type;
-                break;
-            case LOGIC:
-            case SPCL:
-                break;
-        }
-        switch (oper)
-        {
-            case EQ:
-            case EQ | UNSMARK:
-                rv1 = rv1 == rv2;
-                break;
-            case NEQ:
-            case NEQ | UNSMARK:
-                rv1 = rv1 != rv2;
-                break;
-            case LEQ:
-                rv1 = rv1 <= rv2;
-                break;
-            case GEQ:
-                rv1 = rv1 >= rv2;
-                break;
-            case LT:
-                rv1 = rv1 < rv2;
-                break;
-            case GT:
-                rv1 = rv1 > rv2;
-                break;
-            case LEQ | UNSMARK:
-                rv1 = (unsigned long)rv1 <= (unsigned long)rv2;
-                break;
-            case GEQ | UNSMARK:
-                rv1 = (unsigned long)rv1 >= (unsigned long)rv2;
-                break;
-            case LT | UNSMARK:
-                rv1 = (unsigned long)rv1 < (unsigned long)rv2;
-                break;
-            case GT | UNSMARK:
-                rv1 = (unsigned long)rv1 > (unsigned long)rv2;
-                break;
-            case LSH:
-                rv1 <<= rv2;
-                break;
-            case LSH | UNSMARK:
-                rv1 = (unsigned long) rv1 << rv2;
-                break;
-            case RSH:
-                rv1 >>= rv2;
-                break;
-            case RSH | UNSMARK:
-                rv1 = (unsigned long) rv1 >> rv2;
-                break;
-            case LAND:
-                rtype = UND;
-                if (v1.type == UND)
-                    break;
-                if (rv1 != 0)
-                {
-                    if (v2.type == UND)
-                        break;
-                    rv1 = rv2 != 0;
-                }
-                else
-                    rv1 = 0;
-                rtype = SGN;
-                break;
-            case LOR:
-                rtype = UND;
-                if (v1.type == UND)
-                    break;
-                if (rv1 == 0)
-                {
-                    if (v2.type == UND)
-                        break;
-                    rv1 = rv2 != 0;
-                }
-                else
-                    rv1 = 1;
-                rtype = SGN;
-                break;
-            case AND:
-                rv1 &= rv2;
-                break;
-            case STAR:
-                rv1 *= rv2;
-                break;
-            case PLUS:
-                rv1 += rv2;
-                break;
-            case MINUS:
-                rv1 -= rv2;
-                break;
-            case UMINUS:
-                if (v1.type == UND)
-                    rtype = UND;
-                rv1 = -rv1;
-                break;
-            case OR:
-                rv1 |= rv2;
-                break;
-            case CIRC:
-                rv1 ^= rv2;
-                break;
-            case TILDE:
-                rv1 = ~rv1;
-                break;
-            case NOT:
-                rv1 = !rv1;
-                if (rtype != UND)
-                    rtype = SGN;
-                break;
-            case SLASH:
-                if (rv2 == 0)
-                {
-                    rtype = UND;
-                    break;
-                }
-                if (rtype == UNS)
-                    rv1 /= (unsigned long) rv2;
-                else
-                    rv1 /= rv2;
-                break;
-            case PCT:
-                if (rv2 == 0)
-                {
-                    rtype = UND;
-                    break;
-                }
-                if (rtype == UNS)
-                    rv1 %= (unsigned long) rv2;
-                else
-                    rv1 %= rv2;
-                break;
-            case COLON:
-                if (op[-1] != QUEST)
-                    error(ERROR, "Bad ?: in #if/endif");
-                else
-                {
-                    op--;
-                    if ((--vp)->val == 0)
-                        v1 = v2;
-                    rtype = v1.type;
-                    rv1 = v1.val;
-                }
-                break;
-
-            case DEFINED:
-            case ARCHITECTURE:
-                break;
-
-            default:
-                error(ERROR, "Eval botch (unknown operator)");
-                return 1;
-        }
-/*lint +e574 +e644 */
-        v1.val = rv1;
-        v1.type = rtype;
-        *vp++ = v1;
-    }
-    return 0;
-}
-
-struct value
-    tokval(Token * tp)
-{
-    struct value v;
-    Nlist *np;
-    int i, base;
-    unsigned long n;
-    uchar *p, c;
-
-    v.type = SGN;
-    v.val = 0;
-    switch (tp->type)
-    {
-
-        case NAME:
-            v.val = 0;
-            break;
-
-        case NAME1:
-            if ((np = lookup(tp, 0)) != NULL && np->flag & (ISDEFINED | ISMAC))
-                v.val = 1;
-            break;
-
-        case NAME2:
-            if ((np = lookup(tp, 0)) != NULL && np->flag & (ISARCHITECTURE))
-                v.val = 1;
-            break;
-
-        case NUMBER:
-            n = 0;
-            base = 10;
-            p = tp->t;
-            c = p[tp->len];
-            p[tp->len] = '\0';
-            if (*p == '0')
-            {
-                base = 8;
-                if (p[1] == 'x' || p[1] == 'X')
-                {
-                    base = 16;
-                    p++;
-                }
-                p++;
-            }
-            for (;; p++)
-            {
-                if ((i = digit(*p)) < 0)
-                    break;
-                if (i >= base)
-                    error(WARNING,
-                          "Bad digit in number %t", tp);
-                n *= base;
-                n += i;
-            }
-            if (n >= 0x80000000 && base != 10)
-                v.type = UNS;
-            for (; *p; p++)
-            {
-                if (*p == 'u' || *p == 'U')
-                    v.type = UNS;
-                else
-                    if (*p == 'l' || *p == 'L')
-                        ;
-                    else
-                    {
-                        error(ERROR,
-                              "Bad number %t in #if/#elsif", tp);
-                        break;
-                    }
-            }
-            v.val = n;
-            tp->t[tp->len] = c;
-            break;
-
-        case CCON:
-            n = 0;
-            p = tp->t;
-            if (*p == 'L')
-            {
-                p += 1;
-                error(WARNING, "Wide char constant value undefined");
-            }
-            p += 1;
-            if (*p == '\\')
-            {
-                p += 1;
-                if ((i = digit(*p)) >= 0 && i <= 7)
-                {
-                    n = i;
-                    p += 1;
-                    if ((i = digit(*p)) >= 0 && i <= 7)
-                    {
-                        p += 1;
-                        n <<= 3;
-                        n += i;
-                        if ((i = digit(*p)) >= 0 && i <= 7)
-                        {
-                            p += 1;
-                            n <<= 3;
-                            n += i;
-                        }
-                    }
-                }
-                else
-                    if (*p == 'x')
-                    {
-                        p += 1;
-                        while ((i = digit(*p)) >= 0 && i <= 15)
-                        {
-                            p += 1;
-                            n <<= 4;
-                            n += i;
-                        }
-                    }
-                    else
-                    {
-                        static char cvcon[] = "b\bf\fn\nr\rt\tv\v''\"\"??\\\\";
-                        static size_t cvlen = sizeof(cvcon) - 1;
-
-                        size_t j;
-                        for (j = 0; j < cvlen; j += 2)
-                        {
-                            if (*p == cvcon[j])
-                            {
-                                n = cvcon[j + 1];
-                                break;
-                            }
-                        }
-                        p += 1;
-                        if (j >= cvlen)
-                            error(WARNING,
-                               "Undefined escape in character constant");
-                    }
-            }
-            else
-                if (*p == '\'')
-                    error(ERROR, "Empty character constant");
-                else
-                    n = *p++;
-            if (*p != '\'')
-                error(WARNING, "Multibyte character constant undefined");
-            else
-                if (n > 127)
-                    error(WARNING, "Character constant taken as not signed");
-            v.val = n;
-            break;
-
-        case STRING:
-            error(ERROR, "String in #if/#elsif");
-            break;
-    }
-    return v;
-}
-
-int
-    digit(int i)
-{
-    if ('0' <= i && i <= '9')
-        i -= '0';
-    else
-        if ('a' <= i && i <= 'f')
-            i -= 'a' - 10;
-        else
-            if ('A' <= i && i <= 'F')
-                i -= 'A' - 10;
-            else
-                i = -1;
-    return i;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_getopt.c b/soltools/cpp/_getopt.c
deleted file mode 100644
index 458664067..000000000
--- a/soltools/cpp/_getopt.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include    <stdio.h>
-#include    <string.h>
-
-#define EPR                 fprintf(stderr,
-#define ERR(str, chr)       if(opterr) { EPR "%s%c\n", str, chr); }
-
-int opterr = 1;
-int optind = 1;
-int optopt;
-char *optarg;
-
-int
-    stgetopt(int argc, char *const argv[], const char *opts)
-{
-    static int sp = 1;
-    register int c;
-    register char *cp;
-
-    if (sp == 1)
-    {
-        if (optind >= argc ||
-            argv[optind][0] != '-' || argv[optind][1] == '\0')
-            return -1;
-        else if (strcmp(argv[optind], "--") == 0)
-            {
-                optind++;
-                return -1;
-            } 
-        else if (strcmp(argv[optind], "-isysroot") == 0) 
-            {
-                // skip Mac OS X SDK selection flags
-                optind++; optind++;
-            }
-    }
-    optopt = c = argv[optind][sp];
-    if (c == ':' || (cp = strchr(opts, c)) == 0)
-    {
-        ERR(": illegal option -- ", c);
-        if (argv[optind][++sp] == '\0')
-        {
-            optind++;
-            sp = 1;
-        }
-        return '?';
-    }
-    if (*++cp == ':')
-    {
-        if (argv[optind][sp + 1] != '\0')
-            optarg = &argv[optind++][sp + 1];
-        else
-            if (++optind >= argc)
-            {
-                ERR(": option requires an argument -- ", c);
-                sp = 1;
-                return '?';
-            }
-            else
-                optarg = argv[optind++];
-        sp = 1;
-    }
-    else
-    {
-        if (argv[optind][++sp] == '\0')
-        {
-            sp = 1;
-            optind++;
-        }
-        optarg = 0;
-    }
-    return c;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_include.c b/soltools/cpp/_include.c
deleted file mode 100644
index 786457c9d..000000000
--- a/soltools/cpp/_include.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#if (defined(_WIN32) || defined(__IBMC__))
-#	include <io.h>
-#else
-#	include <unistd.h>
-#endif
-
-#ifdef _MSC_VER
-#	define _POSIX_
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-
-#if defined(__IBMC__) || defined(__EMX__)
-#	include <fcntl.h>
-#   define PATH_MAX _MAX_PATH
-#endif
-#include <limits.h>
-
-#include "cpp.h"
-
-Includelist includelist[NINCLUDE];
-Wraplist wraplist[NINCLUDE];
-
-void
-    doinclude(Tokenrow * trp, int depth, int import)
-{
-    char fname[PATH_MAX], iname[PATH_MAX];
-    Includelist *ip;
-    int angled, fd, i;
-    size_t len;
-
-    trp->tp += 1;
-    if (trp->tp >= trp->lp)
-        goto syntax;
-    if (trp->tp->type != STRING && trp->tp->type != LT)
-    {
-        len = trp->tp - trp->bp;
-        expandrow(trp, "<include>");
-        trp->tp = trp->bp + len;
-    }
-    if (trp->tp->type == STRING)
-    {
-        len = trp->tp->len - 2;
-        if (len > sizeof(fname) - 1)
-            len = sizeof(fname) - 1;
-        strncpy(fname, (char *) trp->tp->t + 1, len);
-        angled = 0;
-    }
-    else
-    {
-        if (trp->tp->type == LT)
-        {
-            len = 0;
-            trp->tp++;
-            while (trp->tp->type != GT)
-            {
-                if (trp->tp > trp->lp || len + trp->tp->len + 2 >= sizeof(fname))
-                    goto syntax;
-                strncpy(fname + len, (char *) trp->tp->t, trp->tp->len);
-                len += trp->tp->len;
-                trp->tp++;
-            }
-            angled = 1;
-        }
-        else
-            goto syntax;
-    }
-    trp->tp += 2;
-    if (trp->tp < trp->lp || len == 0)
-        goto syntax;
-    fname[len] = '\0';
-    if (fname[0] == '/')
-    {
-        fd = open(fname, O_RDONLY);
-        strcpy(iname, fname);
-    }
-    else
-    {
-        for (fd = -1, i = (depth < 0) ? (NINCLUDE - 1) : (depth - 1); i >= 0; i--)
-        {
-            ip = &includelist[i];
-            if (ip->file == NULL || ip->deleted || (angled && ip->always == 0))
-                continue;
-            if (strlen(fname) + strlen(ip->file) + 2 > sizeof(iname))
-                continue;
-            strcpy(iname, ip->file);
-            strcat(iname, "/");
-            strcat(iname, fname);
-            if ((fd = open(iname, O_RDONLY)) >= 0)
-                break;
-        }
-    }
-
-    if (fd >= 0)
-    {
-        if (++incdepth > NINC )
-            error(FATAL, "#%s too deeply nested", import ? "import" : "include");
-        if (Xflag)
-            genimport(fname, angled, iname, import);
-         if (Iflag)
-            error(INFO, "Open %s file [%s]", import ? "import" : "include", iname );
-
-        for (i = NINCLUDE - 1; i >= 0; i--)
-        {
-            if ((wraplist[i].file != NULL) &&
-                (strncmp(wraplist[i].file, iname, strlen(wraplist[i].file)) == 0))
-                break;
-        }
-
-        setsource((char *) newstring((uchar *) iname, strlen(iname), 0), i, fd, NULL, (i >= 0) ? 1 : 0);
-
-        if (!Pflag)
-            genline();
-    }
-    else
-    {
-        trp->tp = trp->bp + 2;
-        error(ERROR, "Could not find %s file %r", import ? "import" : "include", trp);
-    }
-    return;
-syntax:
-    error(ERROR, "Syntax error in #%s", import ? "import" : "include");
-    return;
-}
-
-/*
- * Generate a line directive for cursource
- */
-void
-    genline(void)
-{
-    static Token ta = {UNCLASS, 0, 0, 0, NULL, 0};
-    static Tokenrow tr = {&ta, &ta, &ta + 1, 1};
-    uchar *p;
-
-    ta.t = p = (uchar *) outptr;
-    strcpy((char *) p, "#line ");
-    p += sizeof("#line ") - 1;
-    p = (uchar *) outnum((char *) p, cursource->line);
-    *p++ = ' ';
-    *p++ = '"';
-    if (cursource->filename[0] != '/' && wd[0])
-    {
-        strcpy((char *) p, wd);
-        p += strlen(wd);
-        *p++ = '/';
-    }
-    strcpy((char *) p, cursource->filename);
-    p += strlen((char *) p);
-    *p++ = '"';
-    *p++ = '\n';
-    ta.len = (char *) p - outptr;
-    outptr = (char *) p;
-    tr.tp = tr.bp;
-    puttokens(&tr);
-}
-
-/*
- * Generate a pragma import/include directive
- */
-void
-    genimport(char *fname, int angled, char *iname, int import)
-{
-    static Token ta = {UNCLASS, 0, 0, 0, NULL, 0};
-    static Tokenrow tr = {&ta, &ta, &ta + 1, 1};
-    uchar *p;
-
-    ta.t = p = (uchar *) outptr;
-
-    if (import)
-        strcpy((char *) p, "#pragma import");
-    else
-        strcpy((char *) p, "#pragma include");
-
-    p += strlen((char *) p);
-
-    *p++ = '(';
-
-    *p++ = angled ? '<' : '"';
-    strcpy((char *) p, fname);
-    p += strlen(fname);
-    *p++ = angled ? '>' : '"';
-
-    *p++ = ',';
-
-    *p++ = '"';
-    strcpy((char *) p, iname);
-    p += strlen(iname);
-    *p++ = '"';
-
-    *p++ = ')';
-    *p++ = '\n';
-
-    ta.len = (char *) p - outptr;
-    outptr = (char *) p;
-    tr.tp = tr.bp;
-    puttokens(&tr);
-}
-
-/*
- * Generate a extern C directive
- */
-void
-    genwrap(int end)
-{
-    static Token ta = {UNCLASS, 0, 0, 0, NULL, 0};
-    static Tokenrow tr = {&ta, &ta, &ta + 1, 1};
-    uchar *p;
-
-    if (Cplusplus)
-    {
-        ta.t = p = (uchar *) outptr;
-
-        if (! end)
-            strcpy((char *) p, "extern \"C\" {");
-        else
-            strcpy((char *) p, "}");
-
-        p += strlen((char *) p);
-        
-        *p++ = '\n';
-
-        ta.len = (char *) p - outptr;
-        outptr = (char *) p;
-        tr.tp = tr.bp;
-        puttokens(&tr);
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_lex.c b/soltools/cpp/_lex.c
deleted file mode 100644
index 405ae7075..000000000
--- a/soltools/cpp/_lex.c
+++ /dev/null
@@ -1,691 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#if (defined(_WIN32) || defined(__IBMC__))
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-#include "cpp.h"
-/*
- * lexical FSM encoding
- *   when in state state, and one of the characters
- *   in ch arrives, enter nextstate.
- *   States >= S_SELF are either final, or at least require special action.
- *   In 'fsm' there is a line for each state X charset X nextstate.
- *   List chars that overwrite previous entries later (e.g. C_ALPH
- *   can be overridden by '_' by a later entry; and C_XX is the
- *   the universal set, and should always be first.
- *   States above S_SELF are represented in the big table as negative values.
- *   S_SELF and S_SELFB encode the resulting token type in the upper bits.
- *   These actions differ in that S_SELF doesn't have a lookahead char,
- *   S_SELFB does.
- *
- *   The encoding is blown out into a big table for time-efficiency.
- *   Entries have
- *      nextstate: 6 bits; ?\ marker: 1 bit; tokentype: 9 bits.
- */
-
-#define	MAXSTATE		32
-#define	ACT(tok,act)	((tok<<7)+act)
-#define	QBSBIT			0100
-#define	GETACT(st)		((st>>7)&0x1ff)
-
-/* character classes */
-#define	C_WS	1
-#define	C_ALPH	2
-#define	C_NUM	3
-#define	C_EOF	4
-#define	C_XX	5
-
-enum state
-{
-    START = 0, NUM1, NUM2, NUM3, ID1, ST1, ST2, ST3, COM1, COM2, COM3, COM4,
-    CC1, CC2, WS1, PLUS1, MINUS1, STAR1, SLASH1, PCT1, SHARP1,
-    CIRC1, GT1, GT2, LT1, LT2, OR1, AND1, ASG1, NOT1, DOTS1,
-    S_SELF = MAXSTATE, S_SELFB, S_EOF, S_NL, S_EOFSTR,
-    S_STNL, S_COMNL, S_EOFCOM, S_COMMENT, S_EOB, S_WS, S_NAME
-};
-
-int tottok;
-int tokkind[256];
-struct fsm
-{
-    int state;                          /* if in this state */
-    uchar ch[4];                        /* and see one of these characters */
-    int nextstate;                      /* enter this state if +ve */
-};
-
- /*const*/ struct fsm fsm[] = {
-    /* start state */
-         {START, {C_XX}, ACT(UNCLASS, S_SELF)},
-         {START, {' ', '\t', '\v'}, WS1},
-         {START, {C_NUM}, NUM1},
-         {START, {'.'}, NUM3},
-         {START, {C_ALPH}, ID1},
-         {START, {'L'}, ST1},
-         {START, {'"'}, ST2},
-         {START, {'\''}, CC1},
-         {START, {'/'}, COM1},
-         {START, {EOFC}, S_EOF},
-         {START, {'\n'}, S_NL},
-         {START, {'-'}, MINUS1},
-         {START, {'+'}, PLUS1},
-         {START, {'<'}, LT1},
-         {START, {'>'}, GT1},
-         {START, {'='}, ASG1},
-         {START, {'!'}, NOT1},
-         {START, {'&'}, AND1},
-         {START, {'|'}, OR1},
-         {START, {'#'}, SHARP1},
-         {START, {'%'}, PCT1},
-         {START, {'['}, ACT(SBRA, S_SELF)},
-         {START, {']'}, ACT(SKET, S_SELF)},
-         {START, {'('}, ACT(LP, S_SELF)},
-         {START, {')'}, ACT(RP, S_SELF)},
-         {START, {'*'}, STAR1},
-         {START, {','}, ACT(COMMA, S_SELF)},
-         {START, {'?'}, ACT(QUEST, S_SELF)},
-         {START, {':'}, ACT(COLON, S_SELF)},
-         {START, {';'}, ACT(SEMIC, S_SELF)},
-         {START, {'{'}, ACT(CBRA, S_SELF)},
-         {START, {'}'}, ACT(CKET, S_SELF)},
-         {START, {'~'}, ACT(TILDE, S_SELF)},
-         {START, {'^'}, CIRC1},
-
-    /* saw a digit */
-         {NUM1, {C_XX}, ACT(NUMBER, S_SELFB)},
-         {NUM1, {C_NUM, C_ALPH, '.'}, NUM1},
-         {NUM1, {'E', 'e'}, NUM2},
-         {NUM1, {'_'}, ACT(NUMBER, S_SELFB)},
-
-    /* saw possible start of exponent, digits-e */
-         {NUM2, {C_XX}, ACT(NUMBER, S_SELFB)},
-         {NUM2, {'+', '-'}, NUM1},
-         {NUM2, {C_NUM, C_ALPH}, NUM1},
-         {NUM2, {'_'}, ACT(NUMBER, S_SELFB)},
-
-    /* saw a '.', which could be a number or an operator */
-         {NUM3, {C_XX}, ACT(DOT, S_SELFB)},
-         {NUM3, {'.'}, DOTS1},
-         {NUM3, {C_NUM}, NUM1},
-
-         {DOTS1, {C_XX}, ACT(UNCLASS, S_SELFB)},
-         {DOTS1, {C_NUM}, NUM1},
-         {DOTS1, {'.'}, ACT(ELLIPS, S_SELF)},
-
-    /* saw a letter or _ */
-         {ID1, {C_XX}, ACT(NAME, S_NAME)},
-         {ID1, {C_ALPH, C_NUM}, ID1},
-
-    /* saw L (start of wide string?) */
-         {ST1, {C_XX}, ACT(NAME, S_NAME)},
-         {ST1, {C_ALPH, C_NUM}, ID1},
-         {ST1, {'"'}, ST2},
-         {ST1, {'\''}, CC1},
-
-    /* saw " beginning string */
-         {ST2, {C_XX}, ST2},
-         {ST2, {'"'}, ACT(STRING, S_SELF)},
-         {ST2, {'\\'}, ST3},
-         {ST2, {'\n'}, S_STNL},
-         {ST2, {EOFC}, S_EOFSTR},
-
-    /* saw \ in string */
-         {ST3, {C_XX}, ST2},
-         {ST3, {'\n'}, S_STNL},
-         {ST3, {EOFC}, S_EOFSTR},
-
-    /* saw ' beginning character const */
-         {CC1, {C_XX}, CC1},
-         {CC1, {'\''}, ACT(CCON, S_SELF)},
-         {CC1, {'\\'}, CC2},
-         {CC1, {'\n'}, S_STNL},
-         {CC1, {EOFC}, S_EOFSTR},
-
-    /* saw \ in ccon */
-         {CC2, {C_XX}, CC1},
-         {CC2, {'\n'}, S_STNL},
-         {CC2, {EOFC}, S_EOFSTR},
-
-    /* saw /, perhaps start of comment */
-         {COM1, {C_XX}, ACT(SLASH, S_SELFB)},
-         {COM1, {'='}, ACT(ASSLASH, S_SELF)},
-         {COM1, {'*'}, COM2},
-         {COM1, {'/'}, COM4},
-
-    /* saw / followed by *, start of comment */
-         {COM2, {C_XX}, COM2},
-         {COM2, {'\n'}, S_COMNL},
-         {COM2, {'*'}, COM3},
-         {COM2, {EOFC}, S_EOFCOM},
-
-    /* saw the * possibly ending a comment */
-         {COM3, {C_XX}, COM2},
-         {COM3, {'\n'}, S_COMNL},
-         {COM3, {'*'}, COM3},
-         {COM3, {'/'}, S_COMMENT},
-
-    /* // comment */
-         {COM4, {C_XX}, COM4},
-         {COM4, {'\n'}, S_NL},
-         {COM4, {EOFC}, S_EOFCOM},
-
-    /* saw white space, eat it up */
-         {WS1, {C_XX}, S_WS},
-         {WS1, {'\t', '\v', ' '}, WS1},
-
-    /* saw -, check --, -=, -> */
-         {MINUS1, {C_XX}, ACT(MINUS, S_SELFB)},
-         {MINUS1, {'-'}, ACT(MMINUS, S_SELF)},
-         {MINUS1, {'='}, ACT(ASMINUS, S_SELF)},
-         {MINUS1, {'>'}, ACT(ARROW, S_SELF)},
-
-    /* saw +, check ++, += */
-         {PLUS1, {C_XX}, ACT(PLUS, S_SELFB)},
-         {PLUS1, {'+'}, ACT(PPLUS, S_SELF)},
-         {PLUS1, {'='}, ACT(ASPLUS, S_SELF)},
-
-    /* saw <, check <<, <<=, <= */
-         {LT1, {C_XX}, ACT(LT, S_SELFB)},
-         {LT1, {'<'}, LT2},
-         {LT1, {'='}, ACT(LEQ, S_SELF)},
-         {LT2, {C_XX}, ACT(LSH, S_SELFB)},
-         {LT2, {'='}, ACT(ASLSH, S_SELF)},
-
-    /* saw >, check >>, >>=, >= */
-         {GT1, {C_XX}, ACT(GT, S_SELFB)},
-         {GT1, {'>'}, GT2},
-         {GT1, {'='}, ACT(GEQ, S_SELF)},
-         {GT2, {C_XX}, ACT(RSH, S_SELFB)},
-         {GT2, {'='}, ACT(ASRSH, S_SELF)},
-
-    /* = */
-         {ASG1, {C_XX}, ACT(ASGN, S_SELFB)},
-         {ASG1, {'='}, ACT(EQ, S_SELF)},
-
-    /* ! */
-         {NOT1, {C_XX}, ACT(NOT, S_SELFB)},
-         {NOT1, {'='}, ACT(NEQ, S_SELF)},
-
-    /* & */
-         {AND1, {C_XX}, ACT(AND, S_SELFB)},
-         {AND1, {'&'}, ACT(LAND, S_SELF)},
-         {AND1, {'='}, ACT(ASAND, S_SELF)},
-
-    /* | */
-         {OR1, {C_XX}, ACT(OR, S_SELFB)},
-         {OR1, {'|'}, ACT(LOR, S_SELF)},
-         {OR1, {'='}, ACT(ASOR, S_SELF)},
-
-    /* # */
-         {SHARP1, {C_XX}, ACT(SHARP, S_SELFB)},
-         {SHARP1, {'#'}, ACT(DSHARP, S_SELF)},
-
-    /* % */
-         {PCT1, {C_XX}, ACT(PCT, S_SELFB)},
-         {PCT1, {'='}, ACT(ASPCT, S_SELF)},
-
-    /* * */
-         {STAR1, {C_XX}, ACT(STAR, S_SELFB)},
-         {STAR1, {'='}, ACT(ASSTAR, S_SELF)},
-
-    /* ^ */
-         {CIRC1, {C_XX}, ACT(CIRC, S_SELFB)},
-         {CIRC1, {'='}, ACT(ASCIRC, S_SELF)},
-
-         {-1, "", 0}
-};
-
-/* first index is char, second is state */
-/* increase #states to power of 2 to encourage use of shift */
-short bigfsm[256][MAXSTATE];
-
-void
-    expandlex(void)
-{
-     /* const */ struct fsm *fp;
-    int i, j, nstate;
-
-    for (fp = fsm; fp->state >= 0; fp++)
-    {
-        for (i = 0; fp->ch[i]; i++)
-        {
-            nstate = fp->nextstate;
-            if (nstate >= S_SELF)
-                nstate = ~nstate;
-            switch (fp->ch[i])
-            {
-
-                case C_XX:              /* random characters */
-                    for (j = 0; j < 256; j++)
-                        bigfsm[j][fp->state] = (short) nstate;
-                    continue;
-                case C_ALPH:
-                    for (j = 0; j < 256; j++)
-#ifdef S390
-                        if( isalpha( j ) || (j == '_') )
-#else							
-                        if (('a' <= j && j <= 'z') || ('A' <= j && j <= 'Z')
-                            || j == '_')
-#endif
-                            bigfsm[j][fp->state] = (short) nstate;
-                    continue;
-                case C_NUM:
-                    for (j = '0'; j <= '9'; j++)
-                        bigfsm[j][fp->state] = (short) nstate;
-                    continue;
-                default:
-                    bigfsm[fp->ch[i]][fp->state] = (short) nstate;
-            }
-        }
-    }
-
-    /*
-     * install special cases for ? (trigraphs),  \ (splicing), runes, and
-     * EOB
-     */
-    for (i = 0; i < MAXSTATE; i++)
-    {
-        for (j = 0; j < 0xFF; j++)
-            if (j == '?' || j == '\\' || j == '\n' || j == '\r')
-            {
-                if (bigfsm[j][i] > 0)
-                    bigfsm[j][i] = ~bigfsm[j][i];
-                bigfsm[j][i] &= ~QBSBIT;
-            }
-        bigfsm[EOB][i] = ~S_EOB;
-        if (bigfsm[EOFC][i] >= 0)
-            bigfsm[EOFC][i] = ~S_EOF;
-    }
-}
-
-void
-    fixlex(void)
-{
-    /* do C++ comments? */
-    if ((Cplusplus == 0) || (Cflag != 0))
-        bigfsm['/'][COM1] = bigfsm['x'][COM1];
-}
-
-/*
- * fill in a row of tokens from input, terminated by NL or END
- * First token is put at trp->lp.
- * Reset is non-zero when the input buffer can be "rewound."
- * The value is a flag indicating that possible macros have
- * been seen in the row.
- */
-int
-    gettokens(Tokenrow * trp, int reset)
-{
-    register int c, state, oldstate;
-    register uchar *ip;
-    register Token *tp, *maxp;
-    int runelen;
-    Source *s = cursource;
-    int nmac = 0;
-
-    tp = trp->lp;
-    ip = s->inp;
-    if (reset)
-    {
-        s->lineinc = 0;
-        if (ip >= s->inl)
-        {                               /* nothing in buffer */
-            s->inl = s->inb;
-            fillbuf(s);
-            ip = s->inp = s->inb;
-        }
-        else
-            if (ip >= s->inb + (3 * INS / 4))
-            {
-                memmove(s->inb, ip, 4 + s->inl - ip);
-                s->inl = s->inb + (s->inl - ip);
-                ip = s->inp = s->inb;
-            }
-    }
-    maxp = &trp->bp[trp->max];
-    runelen = 1;
-    for (;;)
-    {
-continue2:
-        if (tp >= maxp)
-        {
-            trp->lp = tp;
-            tp = growtokenrow(trp);
-            maxp = &trp->bp[trp->max];
-        }
-        tp->type = UNCLASS;
-        tp->t = ip;
-        tp->wslen = 0;
-        tp->flag = 0;
-        state = START;
-        for (;;)
-        {
-            oldstate = state;
-
-            c = *ip;
-                        
-            if ((state = bigfsm[c][state]) >= 0)
-            {
-                ip += runelen;
-                runelen = 1;
-                continue;
-            }
-            state = ~state;
-    reswitch:
-            switch (state & 0177)
-            {
-                case S_SELF:
-                    ip += runelen;
-                    runelen = 1;
-                case S_SELFB:
-                    tp->type = (unsigned char) GETACT(state);
-                    tp->len = ip - tp->t;
-                    tp++;
-                    goto continue2;
-
-                case S_NAME:            /* like S_SELFB but with nmac check */
-                    tp->type = NAME;
-                    tp->len = ip - tp->t;
-                    nmac |= quicklook(tp->t[0], tp->len > 1 ? tp->t[1] : 0);
-                    tp++;
-                    goto continue2;
-
-                case S_WS:
-                    tp->wslen = ip - tp->t;
-                    tp->t = ip;
-                    state = START;
-                    continue;
-
-                default:
-                    if ((state & QBSBIT) == 0)
-                    {
-                        ip += runelen;
-                        runelen = 1;
-                        continue;
-                    }
-                    state &= ~QBSBIT;
-                    s->inp = ip;
-
-                    if (c == '\n')
-                    {
-                        while (s->inp + 1 >= s->inl && fillbuf(s) != EOF);
-                    
-                        if (s->inp[1] == '\r')
-                        {
-                            memmove(s->inp + 1, s->inp + 2, s->inl - s->inp + 2);
-                            s->inl -= 1;
-                        }
-
-                        goto reswitch;
-                    }
-
-                    if (c == '\r')
-                    {
-                        while (s->inp + 1 >= s->inl && fillbuf(s) != EOF);
-                    
-                        if (s->inp[1] == '\n')
-                        {
-                            memmove(s->inp, s->inp + 1, s->inl - s->inp + 1);
-                            s->inl -= 1;
-                        }
-                        else
-                            *s->inp = '\n';
-
-                        state = oldstate;
-                        continue;
-                    }
-
-                    if (c == '?')
-                    {                   /* check trigraph */
-                        if (trigraph(s))
-                        {
-                            state = oldstate;
-                            continue;
-                        }
-                        goto reswitch;
-                    }
-                    if (c == '\\')
-                    {                   /* line-folding */
-                        if (foldline(s))
-                        {
-                            s->lineinc++;
-                            state = oldstate;
-                            continue;
-                        }
-                        goto reswitch;
-                    }
-                    error(WARNING, "Lexical botch in cpp");
-                    ip += runelen;
-                    runelen = 1;
-                    continue;
-
-                case S_EOB:
-                    s->inp = ip;
-                    fillbuf(cursource);
-                    state = oldstate;
-                    continue;
-
-                case S_EOF:
-                    tp->type = END;
-                    tp->len = 0;
-                    s->inp = ip;
-                    if (tp != trp->bp && (tp - 1)->type != NL && cursource->fd != -1)
-                        error(WARNING, "No newline at end of file");
-                    trp->lp = tp + 1;
-                    return nmac;
-
-                case S_STNL:
-                    error(ERROR, "Unterminated string or char const");
-                case S_NL:
-                    tp->t = ip;
-                    tp->type = NL;
-                    tp->len = 1;
-                    tp->wslen = 0;
-                    s->lineinc++;
-                    s->inp = ip + 1;
-                    trp->lp = tp + 1;
-                    return nmac;
-
-                case S_EOFSTR:
-                    error(FATAL, "EOF in string or char constant");
-                    break;
-
-                case S_COMNL:
-                    s->lineinc++;
-                    state = COM2;
-                    ip += runelen;
-                    runelen = 1;
-                    continue;
-
-                case S_EOFCOM:
-                    error(WARNING, "EOF inside comment");
-                    --ip;
-                case S_COMMENT:
-                    if (!Cflag)
-                    {
-                        tp->t = ++ip;
-                        tp->t[-1] = ' ';
-                        tp->wslen = 1;
-                        state = START;
-                        continue;
-                    }
-                    else
-                    {
-                        runelen = 1;
-                        s->lineinc = 0;;
-                        tp->type = COMMENT;
-                        tp->flag |= XTWS;
-                    }
-            }
-            break;
-        }
-        ip += runelen;
-        runelen = 1;
-        tp->len = ip - tp->t;
-        tp++;
-    }
-}
-
-/* have seen ?; handle the trigraph it starts (if any) else 0 */
-int
-    trigraph(Source * s)
-{
-    uchar c;
-
-    while (s->inp + 2 >= s->inl && fillbuf(s) != EOF);
-    ;
-    if (s->inp[1] != '?')
-        return 0;
-    c = 0;
-    switch (s->inp[2])
-    {
-        case '=':
-            c = '#';
-            break;
-        case '(':
-            c = '[';
-            break;
-        case '/':
-            c = '\\';
-            break;
-        case ')':
-            c = ']';
-            break;
-        case '\'':
-            c = '^';
-            break;
-        case '<':
-            c = '{';
-            break;
-        case '!':
-            c = '|';
-            break;
-        case '>':
-            c = '}';
-            break;
-        case '-':
-            c = '~';
-            break;
-    }
-    if (c)
-    {
-        *s->inp = c;
-        memmove(s->inp + 1, s->inp + 3, s->inl - s->inp + 2);
-        s->inl -= 2;
-    }
-    return c;
-}
-
-int
-    foldline(Source * s)
-{
-    int n = 1;
-
-    /* skip pending wihite spaces */
-    while ((s->inp[n] == ' ') || (s->inp[n] == '\t'))
-    {
-        n++;
-        if ((s->inp + n >= s->inl) && (fillbuf(s) == EOF))
-            break;
-    }
-
-    /* refill buffer */
-    while (s->inp + (n + 1) >= s->inl && fillbuf(s) != EOF);
-
-    /* skip DOS line ends */
-    if (((s->inp[n] == '\r') && (s->inp[n+1] == '\n')) ||
-        ((s->inp[n] == '\n') && (s->inp[n+1] == '\r')))
-        n++;
-
-    if ((s->inp[n] == '\n') || (s->inp[n] == '\r'))
-    {
-        memmove(s->inp, s->inp + n + 1, s->inl - s->inp + n + 2);
-        s->inl -= n + 1;
-        return 1;
-    }
-    return 0;
-}
-
-int
-    fillbuf(Source * s)
-{
-    int n;
-
-    if (s->fd < 0 || (n = read(s->fd, (char *) s->inl, INS / 8)) <= 0)
-        n = 0;
-    s->inl += n;
-    s->inl[0] = s->inl[1] = s->inl[2] = s->inl[3] = EOB;
-    if (n == 0)
-    {
-        s->inl[0] = s->inl[1] = s->inl[2] = s->inl[3] = EOFC;
-        return EOF;
-    }
-    return 0;
-}
-
-/*
- * Push down to new source of characters.
- * If fd>0 and str==NULL, then from a file `name';
- * if fd==-1 and str, then from the string.
- */
-Source *
-    setsource(char *name, int path, int fd, char *str, int wrap)
-{
-    Source *s = new(Source);
-    size_t len;
-
-    s->line = 1;
-    s->lineinc = 0;
-    s->fd = fd;
-    s->filename = name;
-    s->next = cursource;
-    s->ifdepth = 0;
-    s->pathdepth = path;
-    s->wrap = wrap;
-
-    cursource = s;
-
-    if (s->wrap)
-        genwrap(0);
-
-    /* slop at right for EOB */
-    if (str)
-    {
-        len = strlen(str);
-        s->inb = domalloc(len + 4);
-        s->inp = s->inb;
-        strncpy((char *) s->inp, str, len);
-    }
-    else
-    {
-        s->inb = domalloc(INS + 4);
-        s->inp = s->inb;
-        len = 0;
-    }
-    s->inl = s->inp + len;
-    s->inl[0] = s->inl[1] = EOB;
-
-    return s;
-}
-
-void
-    unsetsource(void)
-{
-    Source *s = cursource;
-
-    if (s->wrap)
-        genwrap(1);
-
-    if (s->fd >= 0)
-    {
-        close(s->fd);
-        dofree(s->inb);
-    }
-    cursource = s->next;
-    dofree(s);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
deleted file mode 100644
index 8be4f3f11..000000000
--- a/soltools/cpp/_macro.c
+++ /dev/null
@@ -1,735 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifdef _MSC_VER
-#	define _POSIX_
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#if defined(__IBMC__) || defined(__EMX__)
-#   define PATH_MAX _MAX_PATH
-#endif
-#include <limits.h>
-
-#include "cpp.h"
-
-#define NCONCAT 16384
-
-/*
- * do a macro definition.  tp points to the name being defined in the line
- */
-void
-    dodefine(Tokenrow * trp)
-{
-    Token *tp;
-    Nlist *np;
-    Source *s;
-    Tokenrow *def, *args;
-    static uchar location[(PATH_MAX + 8) * NINC], *cp;
-
-    tp = trp->tp + 1;
-    if (tp >= trp->lp || tp->type != NAME)
-    {
-        error(ERROR, "#defined token is not a name");
-        return;
-    }
-    np = lookup(tp, 1);
-    if (np->flag & ISUNCHANGE)
-    {
-        error(ERROR, "#defined token %t can't be redefined", tp);
-        return;
-    }
-    /* collect arguments */
-    tp += 1;
-    args = NULL;
-    if (tp < trp->lp && tp->type == LP && tp->wslen == 0)
-    {
-        tp += 1;
-        args = new(Tokenrow);
-        maketokenrow(2, args);
-        if (tp->type != RP)
-        {
-            /* macro with args */
-            size_t narg = 0;
-            int err = 0;
-
-            for (;;)
-            {
-                Token *atp;
-
-                if (tp->type != NAME)
-                {
-                    err++;
-                    break;
-                }
-                if (narg >= args->max)
-                    growtokenrow(args);
-                for (atp = args->bp; atp < args->lp; atp++)
-                    if (atp->len == tp->len
-                        && strncmp((char *) atp->t, (char *) tp->t, tp->len) == 0)
-                        error(ERROR, "Duplicate macro argument");
-                *args->lp++ = *tp;
-                narg++;
-                tp += 1;
-                if (tp->type == RP)
-                    break;
-                if (tp->type != COMMA)
-                {
-                    err++;
-                    break;
-                }
-                tp += 1;
-            }
-            if (err)
-            {
-                error(ERROR, "Syntax error in macro parameters");
-                return;
-            }
-        }
-        tp += 1;
-    }
-    trp->tp = tp;
-    if (((trp->lp) - 1)->type == NL)
-        trp->lp -= 1;
-    def = normtokenrow(trp);
-    if (np->flag & ISDEFINED)
-    {
-        if (comparetokens(def, np->vp)
-            || (np->ap == NULL) != (args == NULL)
-            || (np->ap && comparetokens(args, np->ap)))
-        {
-            if ( np->loc )
-                error(ERROR,
-                    "Macro redefinition of %t (already defined at %s)",
-                    trp->bp + 2, np->loc);
-            else
-                error(ERROR,
-                    "Macro redefinition of %t (already defined at %s)",
-                    trp->bp + 2, "commandline" );
-        }
-    }
-    if (args)
-    {
-        Tokenrow *tap;
-
-        tap = normtokenrow(args);
-        dofree(args->bp);
-        args = tap;
-    }
-    np->ap = args;
-    np->vp = def;
-    np->flag |= ISDEFINED;
-
-    /* build location string of macro definition */
-    for (cp = location, s = cursource; s; s = s->next)
-        if (*s->filename)
-        {
-            if (cp != location)
-                *cp++ = ' ';
-            sprintf((char *)cp, "%s:%d", s->filename, s->line);
-            cp += strlen((char *)cp);
-        }
-
-    np->loc = newstring(location, strlen((char *)location), 0);
-
-    if (Mflag)
-    {
-        if (np->ap)
-            error(INFO, "Macro definition of %s(%r) [%r]", np->name, np->ap, np->vp);
-        else
-            error(INFO, "Macro definition of %s [%r]", np->name, np->vp);
-    }
-}
-
-/*
- * Definition received via -D or -U
- */
-void
-    doadefine(Tokenrow * trp, int type)
-{
-    Nlist *np;
-    static uchar onestr[2] = "1";
-    static Token onetoken[1] = {{NUMBER, 0, 0, 1, onestr, 0}};
-    static Tokenrow onetr = {onetoken, onetoken, onetoken + 1, 1};
-
-    trp->tp = trp->bp;
-    if (type == 'U')
-    {
-        if (trp->lp - trp->tp != 2 || trp->tp->type != NAME)
-            goto syntax;
-        if ((np = lookup(trp->tp, 0)) == NULL)
-            return;
-        np->flag &= ~ISDEFINED;
-        return;
-    }
-
-    if (type == 'A')
-    {
-        if (trp->tp >= trp->lp || trp->tp->type != NAME)
-            goto syntax;
-        trp->tp->type = ARCHITECTURE;
-        np = lookup(trp->tp, 1);
-        np->flag |= ISARCHITECTURE;
-        trp->tp += 1;
-        if (trp->tp >= trp->lp || trp->tp->type == END)
-        {
-            np->vp = &onetr;
-            return;
-        }
-        else
-            error(FATAL, "Illegal -A argument %r", trp);
-    }
-
-    if (trp->tp >= trp->lp || trp->tp->type != NAME)
-        goto syntax;
-    np = lookup(trp->tp, 1);
-    np->flag |= ISDEFINED;
-    trp->tp += 1;
-    if (trp->tp >= trp->lp || trp->tp->type == END)
-    {
-        np->vp = &onetr;
-        return;
-    }
-    if (trp->tp->type != ASGN)
-        goto syntax;
-    trp->tp += 1;
-    if ((trp->lp - 1)->type == END)
-        trp->lp -= 1;
-    np->vp = normtokenrow(trp);
-    return;
-syntax:
-    error(FATAL, "Illegal -D or -U argument %r", trp);
-}
-
-
-
-/*
- * Do macro expansion in a row of tokens.
- * Flag is NULL if more input can be gathered.
- */
-void
-    expandrow(Tokenrow * trp, char *flag)
-{
-    Token *	tp;
-    Nlist *	np;
-
-    MacroValidatorList 	validators;
-    mvl_init(&validators);
-    /* Sets all token-identifiers to 0 because tokens may not be initialised (never use C!) */
-    tokenrow_zeroTokenIdentifiers(trp);
-
-    if (flag)
-        setsource(flag, -1, -1, "", 0);
-    for (tp = trp->tp; tp < trp->lp;)
-    {
-        mvl_check(&validators, tp);
-
-        if (tp->type != NAME
-            || quicklook(tp->t[0], tp->len > 1 ? tp->t[1] : 0) == 0
-            || (np = lookup(tp, 0)) == NULL
-            || (np->flag & (ISDEFINED | ISMAC)) == 0
-            || (np->flag & ISACTIVE) != 0)
-        {
-            tp++;
-            continue;
-        }
-        trp->tp = tp;
-        if (np->val == KDEFINED)
-        {
-            tp->type = DEFINED;
-            if ((tp + 1) < trp->lp && (tp + 1)->type == NAME)
-                (tp + 1)->type = NAME1;
-            else
-                if ((tp + 3) < trp->lp && (tp + 1)->type == LP
-                    && (tp + 2)->type == NAME && (tp + 3)->type == RP)
-                    (tp + 2)->type = NAME1;
-                else
-                    error(ERROR, "Incorrect syntax for `defined'");
-            tp++;
-            continue;
-        }
-        else
-            if (np->val == KMACHINE)
-            {
-                if (((tp - 1) >= trp->bp) && ((tp - 1)->type == SHARP))
-                {
-                    tp->type = ARCHITECTURE;
-                    if ((tp + 1) < trp->lp && (tp + 1)->type == NAME)
-                        (tp + 1)->type = NAME2;
-                    else
-                        if ((tp + 3) < trp->lp && (tp + 1)->type == LP
-                            && (tp + 2)->type == NAME && (tp + 3)->type == RP)
-                            (tp + 2)->type = NAME2;
-                        else
-                            error(ERROR, "Incorrect syntax for `#machine'");
-                }
-                tp++;
-                continue;
-            }
-
-        if (np->flag & ISMAC)
-            builtin(trp, np->val);
-        else
-            expand(trp, np, &validators);
-        tp = trp->tp;
-    }	// end for
-    if (flag)
-        unsetsource();
-
-    mvl_destruct(&validators);
-}
-
-/*
- * Expand the macro whose name is np, at token trp->tp, in the tokenrow.
- * Return trp->tp at the first token next to be expanded
- * (ordinarily the beginning of the expansion)
- * I.e.: the same position as before!
- * Only one expansion is performed, then we return to the expandrow()
- * loop and start at same position.
- */
-void
-    expand(Tokenrow * trp, Nlist * np, MacroValidatorList *	pValidators)
-{
-    Tokenrow ntr;
-    int ntokc, narg;
-    Tokenrow *atr[NARG + 1];
-
-    if (Mflag == 2)
-    {
-        if (np->ap)
-            error(INFO, "Macro expansion of %t with %s(%r)", trp->tp, np->name, np->ap);
-        else
-            error(INFO, "Macro expansion of %t with %s", trp->tp, np->name);
-    }
-
-    copytokenrow(&ntr, np->vp);         /* copy macro value */
-    if (np->ap == NULL)                 /* parameterless */
-        ntokc = 1;
-    else
-    {
-        int i;
-
-        ntokc = gatherargs(trp, atr, &narg);
-        if (narg < 0)
-        {                               /* not actually a call (no '(') */
-            trp->tp++;
-            return;
-        }
-        if (narg != rowlen(np->ap))
-        {
-            error(ERROR, "Disagreement in number of macro arguments");
-            trp->tp += ntokc;
-            return;
-        }
-
-        /** If gatherargs passed a macro validating token, this token
-            must become valid here.
-            trp->tp+0 was checked in expandrow(), so we dont need to do it
-            again here:
-        */
-        for (i = 1; i < ntokc; i++)
-        {
-            mvl_check(pValidators,trp->tp+i);
-        }
-
-        substargs(np, &ntr, atr);		/* put args into replacement */
-        for (i = 0; i < narg; i++)
-        {
-            dofree(atr[i]->bp);
-            dofree(atr[i]);
-        }
-    }
-
-    doconcat(&ntr);                     /* execute ## operators */
-    ntr.tp = ntr.bp;
-    makespace(&ntr, trp->tp);
-
-    tokenrow_zeroTokenIdentifiers(&ntr);
-    insertrow(trp, ntokc, &ntr);
-
-        /* add validator for just invalidated macro:
-        */
-    np->flag |= ISACTIVE;
-    if (trp->tp != trp->lp)
-    {  	/* tp is a valid pointer: */
-        mvl_add(pValidators,np,trp->tp);
-    }
-    else
-    {	/* tp is == lp, therefore does not point to valid memory: */
-        mvl_add(pValidators,np,0);
-    }
-        /* reset trp->tp to original position:
-        */
-    trp->tp -= ntr.lp - ntr.bp;			/* so the result will be tested for macros from the same position again */
-
-    dofree(ntr.bp);
-
-    return;
-}
-
-/*
- * Gather an arglist, starting in trp with tp pointing at the macro name.
- * Return total number of tokens passed, stash number of args found.
- * trp->tp is not changed relative to the tokenrow.
- */
-int
-    gatherargs(Tokenrow * trp, Tokenrow ** atr, int *narg)
-{
-    int parens = 1;
-    int ntok = 0;
-    Token *bp, *lp;
-    Tokenrow ttr;
-    int ntokp;
-    int needspace;
-
-    *narg = -1;                         /* means that there is no macro
-                                         * call */
-    /* look for the ( */
-    for (;;)
-    {
-        trp->tp++;
-        ntok++;
-        if (trp->tp >= trp->lp)
-        {
-            gettokens(trp, 0);
-            if ((trp->lp - 1)->type == END)
-            {
-                trp->lp -= 1;
-                trp->tp -= ntok;
-                return ntok;
-            }
-        }
-        if (trp->tp->type == LP)
-            break;
-        if (trp->tp->type != NL)
-            return ntok;
-    }
-    *narg = 0;
-    ntok++;
-    ntokp = ntok;
-    trp->tp++;
-    /* search for the terminating ), possibly extending the row */
-    needspace = 0;
-    while (parens > 0)
-    {
-        if (trp->tp >= trp->lp)
-            gettokens(trp, 0);
-        if (needspace)
-        {
-            needspace = 0;
-            /* makespace(trp); [rh] */
-        }
-        if (trp->tp->type == END)
-        {
-            trp->lp -= 1;
-            trp->tp -= ntok;
-            error(ERROR, "EOF in macro arglist");
-            return ntok;
-        }
-        if (trp->tp->type == NL)
-        {
-            trp->tp += 1;
-            adjustrow(trp, -1);
-            trp->tp -= 1;
-            /* makespace(trp); [rh] */
-            needspace = 1;
-            continue;
-        }
-        if (trp->tp->type == LP)
-            parens++;
-        else
-            if (trp->tp->type == RP)
-                parens--;
-        trp->tp++;
-        ntok++;
-    }
-    trp->tp -= ntok;
-    /* Now trp->tp won't move underneath us */
-    lp = bp = trp->tp + ntokp;
-    for (; parens >= 0; lp++)
-    {
-        if (lp->type == LP)
-        {
-            parens++;
-            continue;
-        }
-        if (lp->type == RP)
-            parens--;
-        if (lp->type == DSHARP)
-            lp->type = DSHARP1;         /* ## not special in arg */
-        if ((lp->type == COMMA && parens == 0) ||
-                ( parens < 0 && ((lp - 1)->type != LP)))
-        {
-            if (*narg >= NARG - 1)
-                error(FATAL, "Sorry, too many macro arguments");
-            ttr.bp = ttr.tp = bp;
-            ttr.lp = lp;
-            atr[(*narg)++] = normtokenrow(&ttr);
-            bp = lp + 1;
-        }
-    }
-    return ntok;
-}
-
-/*
- * substitute the argument list into the replacement string
- *  This would be simple except for ## and #
- */
-void
-    substargs(Nlist * np, Tokenrow * rtr, Tokenrow ** atr)
-{
-    Tokenrow tatr;
-    Token *tp;
-    int ntok, argno;
-
-    for (rtr->tp = rtr->bp; rtr->tp < rtr->lp;)
-    {
-        if (rtr->tp->type == SHARP)
-        {                               /* string operator */
-            tp = rtr->tp;
-            rtr->tp += 1;
-            if ((argno = lookuparg(np, rtr->tp)) < 0)
-            {
-                error(ERROR, "# not followed by macro parameter");
-                continue;
-            }
-            ntok = 1 + (int)(rtr->tp - tp);
-            rtr->tp = tp;
-            insertrow(rtr, ntok, stringify(atr[argno]));
-            continue;
-        }
-        if (rtr->tp->type == NAME
-            && (argno = lookuparg(np, rtr->tp)) >= 0)
-        {
-            if (((rtr->tp + 1) < rtr->lp && (rtr->tp + 1)->type == DSHARP)
-                || (rtr->tp != rtr->bp  && (rtr->tp - 1)->type == DSHARP))
-            {
-                copytokenrow(&tatr, atr[argno]);
-                makespace(&tatr, rtr->tp);
-                insertrow(rtr, 1, &tatr);
-                dofree(tatr.bp);
-            }
-            else
-            {
-                copytokenrow(&tatr, atr[argno]);
-                makespace(&tatr, rtr->tp);
-                expandrow(&tatr, "<macro>");
-                insertrow(rtr, 1, &tatr);
-                dofree(tatr.bp);
-            }
-            continue;
-        }
-        rtr->tp++;
-    }
-}
-
-/*
- * Evaluate the ## operators in a tokenrow
- */
-void
-    doconcat(Tokenrow * trp)
-{
-    Token *ltp, *ntp;
-    Tokenrow ntr;
-    size_t len;
-
-    for (trp->tp = trp->bp; trp->tp < trp->lp; trp->tp++)
-    {
-        if (trp->tp->type == DSHARP1)
-            trp->tp->type = DSHARP;
-        else
-            if (trp->tp->type == DSHARP)
-            {
-                int  i;
-                char tt[NCONCAT];
-
-                ltp = trp->tp - 1;
-                ntp = trp->tp + 1;
-
-                if (ltp < trp->bp || ntp >= trp->lp)
-                {
-                    error(ERROR, "## occurs at border of replacement");
-                    continue;
-                }
-
-                ntp = ltp;
-                i   = 1;
-                len = 0;
-
-                do
-                {
-                    if (len + ntp->len + ntp->wslen > sizeof(tt))
-                    {
-                        error(ERROR, "## string concatination buffer overrun");
-                        break;
-                    }
-
-                    if (ntp != trp->tp + 1)
-                    {
-                        strncpy((char *) tt + len, (char *) ntp->t - ntp->wslen,
-                                ntp->len + ntp->wslen);
-                        len += ntp->len + ntp->wslen;
-                    }
-                    else	// Leerzeichen um ## herum entfernen:
-                    {
-                        strncpy((char *) tt + len, (char *) ntp->t, ntp->len);
-                        len += ntp->len;
-                    }
-                    
-                    ntp = trp->tp + i;
-                    i++;						
-                }
-                while (ntp < trp->lp);
-
-                tt[len] = '\0';
-                setsource("<##>", -1, -1, tt, 0);
-                maketokenrow(3, &ntr);
-                gettokens(&ntr, 1);
-                unsetsource();
-                if (ntr.bp->type == UNCLASS)
-                    error(WARNING, "Bad token %r produced by ##", &ntr);
-                while ((ntr.lp-1)->len == 0 && ntr.lp != ntr.bp)
-                    ntr.lp--;
-
-                doconcat(&ntr);
-                trp->tp = ltp;
-                makespace(&ntr, ltp);
-                insertrow(trp, (int)(ntp - ltp), &ntr);
-                dofree(ntr.bp);
-                trp->tp--;
-            }
-    }
-}
-
-/*
- * tp is a potential parameter name of macro mac;
- * look it up in mac's arglist, and if found, return the
- * corresponding index in the argname array.  Return -1 if not found.
- */
-int
-    lookuparg(Nlist * mac, Token * tp)
-{
-    Token *ap;
-
-    if (tp->type != NAME || mac->ap == NULL)
-        return -1;
-    for (ap = mac->ap->bp; ap < mac->ap->lp; ap++)
-    {
-        if (ap->len == tp->len && strncmp((char *) ap->t, (char *) tp->t, ap->len) == 0)
-            return (int)(ap - mac->ap->bp);
-    }
-    return -1;
-}
-
-/*
- * Return a quoted version of the tokenrow (from # arg)
- */
-#define	STRLEN	512
-Tokenrow *
-    stringify(Tokenrow * vp)
-{
-    static Token t = {STRING, 0, 0, 0, NULL, 0};
-    static Tokenrow tr = {&t, &t, &t + 1, 1};
-    Token *tp;
-    uchar s[STRLEN];
-    uchar *sp = s, *cp;
-    int i, instring;
-
-    *sp++ = '"';
-    for (tp = vp->bp; tp < vp->lp; tp++)
-    {
-        instring = tp->type == STRING || tp->type == CCON;
-        if (sp + 2 * tp->len + tp->wslen  >= &s[STRLEN - 10])
-        {
-            error(ERROR, "Stringified macro arg is too long");
-            break;
-        }
-
-        // Change by np 31.10.2001, #93725 - begin
-        if ( tp->wslen > 0 )
-        *sp++ = ' ';
-        // change end.
-
-        for (i = 0, cp = tp->t; (unsigned int)i < tp->len; i++)
-        {
-            if (instring && (*cp == '"' || *cp == '\\'))
-                *sp++ = '\\';
-            *sp++ = *cp++;
-        }
-    }
-    *sp++ = '"';
-    *sp = '\0';
-    sp = s;
-    t.len = strlen((char *) sp);
-    t.t = newstring(sp, t.len, 0);
-    return &tr;
-}
-
-/*
- * expand a builtin name
- */
-void
-    builtin(Tokenrow * trp, int biname)
-{
-    char *op;
-    Token *tp;
-    Source *s;
-
-    tp = trp->tp;
-    trp->tp++;
-    /* need to find the real source */
-    s = cursource;
-    while (s && s->fd == -1)
-        s = s->next;
-    if (s == NULL)
-        s = cursource;
-    /* most are strings */
-    tp->type = STRING;
-    if (tp->wslen)
-    {
-        *outptr++ = ' ';
-        tp->wslen = 1;
-    }
-    op = outptr;
-    *op++ = '"';
-    switch (biname)
-    {
-
-        case KLINENO:
-            tp->type = NUMBER;
-            op = outnum(op - 1, s->line);
-            break;
-
-        case KFILE:
-            {
-                char *src = s->filename;
-
-                while ((*op++ = *src++) != 0)
-                    if (src[-1] == '\\')
-                        *op++ = '\\';
-                op--;
-                break;
-            }
-
-        case KDATE:
-            strncpy(op, curtime + 4, 7);
-            strncpy(op + 7, curtime + 20, 4);
-            op += 11;
-            break;
-
-        case KTIME:
-            strncpy(op, curtime + 11, 8);
-            op += 8;
-            break;
-
-        default:
-            error(ERROR, "cpp botch: unknown internal macro");
-            return;
-    }
-    if (tp->type == STRING)
-        *op++ = '"';
-    tp->t = (uchar *) outptr;
-    tp->len = op - outptr;
-    outptr = op;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_mcrvalid.c b/soltools/cpp/_mcrvalid.c
deleted file mode 100644
index 6f5e1da23..000000000
--- a/soltools/cpp/_mcrvalid.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "cpp.h"
-
-void
-mvl_init(MacroValidatorList	* out_pValidators)
-{
-    out_pValidators->pFirst = 0;
-    out_pValidators->nextFreeIdentifier = 1;
-}
-
-void
-mvl_destruct(MacroValidatorList	* out_pValidators)
-{
-    MacroValidator * pV = out_pValidators->pFirst;
-    MacroValidator * pDel;
-    for ( pDel = out_pValidators->pFirst;
-          pDel != 0;
-          pDel = pV )
-    {
-        pV = pV->pNext;
-
-        pDel->pMacro->flag &= (~ISACTIVE);
-        dofree(pDel);
-    }
-}
-
-
-#define INVALID_TILL_ENDOFROW 32000
-
-/*	If in_pTokenWhereMacroBecomesValid == 0, the macro is at row end
-    and therefore there does not exist any token, where the macro becomes
-    valid again. It is revalidated, when the row was processed complete.
-*/
-void
-mvl_add( MacroValidatorList *	inout_pValidators,
-         Nlist *            	in_pMacro,
-         Token *				in_pTokenWhereMacroBecomesValid )
-{
-
-    MacroValidator * pNew = new(MacroValidator);
-    pNew->pMacro = in_pMacro;
-
-    if (in_pTokenWhereMacroBecomesValid == 0)
-    {
-        pNew->nTokenWhereMacroBecomesValid = INVALID_TILL_ENDOFROW;
-    }
-    else if (in_pTokenWhereMacroBecomesValid->identifier > 0)
-    {
-        pNew->nTokenWhereMacroBecomesValid = in_pTokenWhereMacroBecomesValid->identifier;
-    }
-    else
-    {
-        pNew->nTokenWhereMacroBecomesValid = inout_pValidators->nextFreeIdentifier;
-        in_pTokenWhereMacroBecomesValid->identifier = inout_pValidators->nextFreeIdentifier;
-        inout_pValidators->nextFreeIdentifier++;
-    }
-
-    pNew->pNext = inout_pValidators->pFirst;
-    inout_pValidators->pFirst = pNew;
-}
-
-void
-mvl_check(	MacroValidatorList * inout_pValidators,
-            Token *			     inout_pTokenToCheck)
-{
-    MacroValidator * pV;			/* Running pointer */
-    MacroValidator * pCheckedOnes;  /* Here new list is built.  */
-    pCheckedOnes = 0;
-
-    for ( pV = inout_pValidators->pFirst;
-          pV != 0;
-          pV = inout_pValidators->pFirst )
-    {
-        inout_pValidators->pFirst = pV->pNext;
-
-        if (pV->nTokenWhereMacroBecomesValid == inout_pTokenToCheck->identifier)
-        {
-            pV->pMacro->flag &= (~ISACTIVE);
-            dofree(pV);
-        }
-        else
-        {
-            pV->pNext = pCheckedOnes;
-            pCheckedOnes = pV;
-        }
-    }	/* end for  */
-
-    /* Assign new built list (too old ones were removed) to
-       original list:
-    */
-    inout_pValidators->pFirst = pCheckedOnes;
-}
-
-
-void
-tokenrow_zeroTokenIdentifiers(Tokenrow* trp)
-{
-    Token * tp;
-    for (tp = trp->bp; tp < trp->lp; tp++)
-    {
-        tp->identifier = 0;
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_nlist.c b/soltools/cpp/_nlist.c
deleted file mode 100644
index fa29fb142..000000000
--- a/soltools/cpp/_nlist.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "cpp.h"
-
-extern int Cplusplus;
-Nlist *kwdefined;
-char wd[128];
-
-/* 
-    ER: Tabelle extra gross gemacht, da es anscheinend ein Problem mit der
-    der Verkettung gibt, irgendwann irgendwo wird mal ein nlist->next
-    ueberschrieben, was in eineme SIGSEGV resultiert.
-    Den GDB mit watchpoint hab ich aber nach 2 Tagen abgebrochen..
-    so loeppt's jedenfalls erstmal..
- */
-#define	NLSIZE 15000
-
-static Nlist *nlist[NLSIZE];
-
-struct kwtab
-{
-    char *kw;
-    int val;
-    int flag;
-}   kwtab[] =
-
-{
-        {"if", KIF, ISKW},
-        {"ifdef", KIFDEF, ISKW},
-        {"ifndef", KIFNDEF, ISKW},
-        {"elif", KELIF, ISKW},
-        {"else", KELSE, ISKW},
-        {"endif", KENDIF, ISKW},
-        {"include", KINCLUDE, ISKW},
-        {"include_next", KINCLUDENEXT, ISKW},
-        {"import", KIMPORT, ISKW},
-        {"define", KDEFINE, ISKW},
-        {"undef", KUNDEF, ISKW},
-        {"line", KLINE, ISKW},
-        {"error", KERROR, ISKW},
-        {"pragma", KPRAGMA, ISKW},
-        {"ident", KIDENT, ISKW},
-        {"eval", KEVAL, ISKW},
-        {"defined", KDEFINED, ISDEFINED + ISUNCHANGE},
-        {"machine", KMACHINE, ISDEFINED + ISUNCHANGE},
-        {"__LINE__", KLINENO, ISMAC + ISUNCHANGE},
-        {"__FILE__", KFILE, ISMAC + ISUNCHANGE},
-        {"__DATE__", KDATE, ISMAC + ISUNCHANGE},
-        {"__TIME__", KTIME, ISMAC + ISUNCHANGE},
-        {"__STDC__", KSTDC, ISUNCHANGE},
-        {NULL, 0, 0}
-};
-
-unsigned long namebit[077 + 1];
-
-void
-    setup_kwtab(void)
-{
-    struct kwtab *kp;
-    Nlist *np;
-    Token t;
-    static Token deftoken[1] = {{NAME, 0, 0, 7, (uchar *) "defined", 0}};
-    static Tokenrow deftr = {deftoken, deftoken, deftoken + 1, 1};
-
-    for (kp = kwtab; kp->kw; kp++)
-    {
-        t.t = (uchar *) kp->kw;
-        t.len = strlen(kp->kw);
-        np = lookup(&t, 1);
-        np->flag = (char) kp->flag;
-        np->val = (char) kp->val;
-        if (np->val == KDEFINED)
-        {
-            kwdefined = np;
-            np->val = NAME;
-            np->vp = &deftr;
-            np->ap = 0;
-        }
-    }
-}
-
-Nlist *
-    lookup(Token * tp, int install)
-{
-    unsigned int h;
-    Nlist *np;
-    uchar *cp, *cpe;
-
-    h = 0;
-    for (cp = tp->t, cpe = cp + tp->len; cp < cpe;)
-        h += *cp++;
-    h %= NLSIZE;
-    np = nlist[h];
-    while (np)
-    {
-        if (*tp->t == *np->name && tp->len == (unsigned int)np->len
-            && strncmp((char *)tp->t, (char *)np->name, tp->len) == 0)
-            return np;
-        np = np->next;
-    }
-    if (install)
-    {
-        np = new(Nlist);
-        np->vp = NULL;
-        np->ap = NULL;
-        np->flag = 0;
-        np->val = 0;
-        np->len = tp->len;
-        np->name = newstring(tp->t, tp->len, 0);
-        np->next = nlist[h];
-        nlist[h] = np;
-        quickset(tp->t[0], tp->len > 1 ? tp->t[1] : 0);
-        return np;
-    }
-    return NULL;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c
deleted file mode 100644
index 9c5289b75..000000000
--- a/soltools/cpp/_tokens.c
+++ /dev/null
@@ -1,536 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#if (defined(_WIN32) || defined(__IBMC__))
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-#include "cpp.h"
-
-
-static char wbuf[4 * OBS];
-static char *wbp = wbuf;
-static int EBCDIC_ExternTokenDetected = 0;
-static int EBCDIC_StartTokenDetected = 0;
-
-unsigned char toLatin1[256] =
-{
-    0x00, 0x01, 0x02, 0x03, 0x9c, 0x09, 0x86, 0x7f, 0x97, 0x8d,
-    0x8e, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13,
-    0x9d, 0x0a, 0x08, 0x87, 0x18, 0x19, 0x92, 0x8f, 0x1c, 0x1d,
-    0x1e, 0x1f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x17, 0x1b,
-    0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x05, 0x06, 0x07, 0x90, 0x91,
-    0x16, 0x93, 0x94, 0x95, 0x96, 0x04, 0x98, 0x99, 0x9a, 0x9b,
-    0x14, 0x15, 0x9e, 0x1a, 0x20, 0xa0, 0xe2, 0xe4, 0xe0, 0xe1,
-    0xe3, 0xe5, 0xe7, 0xf1, 0xa2, 0x2e, 0x3c, 0x28, 0x2b, 0x7c,
-    0x26, 0xe9, 0xea, 0xeb, 0xe8, 0xed, 0xee, 0xef, 0xec, 0xdf,
-    0x21, 0x24, 0x2a, 0x29, 0x3b, 0x5e, 0x2d, 0x2f, 0xc2, 0xc4,
-    0xc0, 0xc1, 0xc3, 0xc5, 0xc7, 0xd1, 0xa6, 0x2c, 0x25, 0x5f,
-    0x3e, 0x3f, 0xf8, 0xc9, 0xca, 0xcb, 0xc8, 0xcd, 0xce, 0xcf,
-    0xcc, 0x60, 0x3a, 0x23, 0x40, 0x27, 0x3d, 0x22,
-    0xd8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
-    0xab, 0xbb, 0xf0, 0xfd, 0xfe, 0xb1, 0xb0, 0x6a, 0x6b, 0x6c,
-    0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0xaa, 0xba, 0xe6, 0xb8,
-    0xc6, 0xa4, 0xb5, 0x7e, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
-    0x79, 0x7a, 0xa1, 0xbf, 0xd0, 0x5b, 0xde, 0xae, 0xac, 0xa3,
-    0xa5, 0xb7, 0xa9, 0xa7, 0xb6, 0xbc, 0xbd, 0xbe, 0xdd, 0xa8,
-    0xaf, 0x5d, 0xb4, 0xd7, 0x7b, 0x41, 0x42, 0x43, 0x44, 0x45,
-    0x46, 0x47, 0x48, 0x49, 0xad, 0xf4, 0xf6, 0xf2, 0xf3, 0xf5,
-    0x7d, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52,
-    0xb9, 0xfb, 0xfc, 0xf9, 0xfa, 0xff, 0x5c, 0xf7, 0x53, 0x54,
-    0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0xb2, 0xd4, 0xd6, 0xd2,
-    0xd3, 0xd5, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-    0x38, 0x39, 0xb3, 0xdb, 0xdc, 0xd9, 0xda, 0x9f
-};
-
-#define MASK    "\\x%x"
-
-int
-    memcpy_EBCDIC( char * pwbuf, uchar *p, int len )
-{
-    int currpos = 0;
-    int processedchars = 0;
-
-    if( len == 0 )
-        return 0;
-
-    if( len == 1 )
-    {
-        *pwbuf = *p;
-        return 1;
-    }
-
-    /* copy spaces until " or ' */
-    while( (p[ processedchars ] != '\"') && (p[ processedchars ] != '\'') )
-        pwbuf[ currpos++ ] = p[ processedchars++ ];
-
-    /* copy first " or ' */
-    pwbuf[ currpos++ ] = p[ processedchars++ ];
-
-    /* convert all characters until " or ' */
-    while( processedchars < (len - 1) )
-    {
-        if( p[ processedchars ] == '\\' )
-        {
-            switch( p[ ++processedchars ] )
-            {
-                case 'n':
-                    currpos += sprintf( &pwbuf[ currpos ], MASK, toLatin1['\n'] );
-                    processedchars++;
-                    break;
-
-                case 't':
-                    currpos += sprintf( &pwbuf[ currpos ], MASK, toLatin1['\t'] );
-                    processedchars++;
-                    break;
-
-                case 'v':
-                    currpos += sprintf( &pwbuf[ currpos ], MASK, toLatin1['\v'] );
-                    processedchars++;
-                    break;
-
-                case 'b':
-                    currpos += sprintf( &pwbuf[ currpos ], MASK, toLatin1['\b'] );
-                    processedchars++;
-                    break;
-
-                case 'r':
-                    currpos += sprintf( &pwbuf[ currpos ], MASK, toLatin1['\r'] );
-                    processedchars++;
-                    break;
-
-                case 'f':
-                    currpos += sprintf( &pwbuf[ currpos ], MASK, toLatin1['\f'] );
-                    processedchars++;
-                    break;
-
-                case 'a':
-                    currpos += sprintf( &pwbuf[ currpos ], MASK, toLatin1['\a'] );
-                    processedchars++;
-                    break;
-
-                case '\\':
-                    currpos += sprintf( &pwbuf[ currpos ], MASK, toLatin1['\\'] );
-                    processedchars++;
-                    break;
-
-                case '?':
-                    currpos += sprintf( &pwbuf[ currpos ], MASK, toLatin1['\?'] );
-                    processedchars++;
-                    break;
-
-                case '\'':
-                    currpos += sprintf( &pwbuf[ currpos ], MASK, toLatin1['\''] );
-                    processedchars++;
-                    break;
-
-                case '"':
-                    currpos += sprintf( &pwbuf[ currpos ], MASK, toLatin1['\"'] );
-                    processedchars++;
-                    break;
-
-                /* octal coded character? -> copy */
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                    {
-                    int startpos = currpos;
-
-                    pwbuf[ currpos++ ] = '\\';
-
-                    while( p[ processedchars ] >= '0' && p[ processedchars ] <= '7' && (currpos < startpos + 4) )
-                          pwbuf[ currpos++ ] = (unsigned char)p[ processedchars++ ];
-                    break;
-                    }
-
-                /* hex coded character? -> copy */
-                case 'x':
-                case 'X':
-                    {
-                    int startpos = currpos;
-
-                    pwbuf[ currpos++ ] = '\\';
-                    pwbuf[ currpos++ ] = 'x';
-                    processedchars++;
-
-                    while( isxdigit( p[ processedchars ] ) && (currpos < startpos + 4) )
-                          pwbuf[ currpos++ ] = (unsigned char)p[ processedchars++ ];
-                    break;
-                    }
-
-            }
-        }
-        else
-            currpos += sprintf( &pwbuf[ currpos ], MASK, toLatin1[p[ processedchars++ ]] );
-
-    }
-
-    /* copy last " or ' */
-    pwbuf[ currpos++ ] = p[ processedchars ];
-
-    return currpos;
-}
-
-void
-    maketokenrow(int size, Tokenrow * trp)
-{
-    trp->max = size;
-    if (size > 0)
-        trp->bp = (Token *) domalloc(size * sizeof(Token));
-    else
-        trp->bp = NULL;
-    trp->tp = trp->bp;
-    trp->lp = trp->bp;
-}
-
-Token *
-    growtokenrow(Tokenrow * trp)
-{
-    size_t ncur = trp->tp - trp->bp;
-    size_t nlast = trp->lp - trp->bp;
-
-    trp->max = 3 * trp->max / 2 + 1;
-    trp->bp = (Token *) realloc(trp->bp, trp->max * sizeof(Token));
-    trp->lp = &trp->bp[nlast];
-    trp->tp = &trp->bp[ncur];
-    return trp->lp;
-}
-
-/*
- * Compare a row of tokens, ignoring the content of WS; return !=0 if different
- */
-int
-    comparetokens(Tokenrow * tr1, Tokenrow * tr2)
-{
-    Token *tp1, *tp2;
-
-    tp1 = tr1->tp;
-    tp2 = tr2->tp;
-    if (tr1->lp - tp1 != tr2->lp - tp2)
-        return 1;
-    for (; tp1 < tr1->lp; tp1++, tp2++)
-    {
-        if (tp1->type != tp2->type
-            || (tp1->wslen == 0) != (tp2->wslen == 0)
-            || tp1->len != tp2->len
-            || strncmp((char *) tp1->t, (char *) tp2->t, tp1->len) != 0)
-            return 1;
-    }
-    return 0;
-}
-
-/*
- * replace ntok tokens starting at dtr->tp with the contents of str.
- * tp ends up pointing just beyond the replacement.
- * Canonical whitespace is assured on each side.
- */
-void
-    insertrow(Tokenrow * dtr, int ntok, Tokenrow * str)
-{
-    int nrtok = (int)rowlen(str);
-
-    dtr->tp += ntok;
-    adjustrow(dtr, nrtok - ntok);
-    dtr->tp -= ntok;
-    movetokenrow(dtr, str);
-    dtr->tp += nrtok;
-}
-
-/*
- * make sure there is WS before trp->tp, if tokens might merge in the output
- */
-void
-    makespace(Tokenrow * trp, Token * ntp)
-{
-    uchar *tt;
-    Token *tp = trp->tp;
-
-    if (tp >= trp->lp)
-        return;
-
-    if (ntp->wslen)
-    {
-        tt = newstring(tp->t, tp->len, ntp->wslen);
-        strncpy((char *)tt, (char *)ntp->t - ntp->wslen, ntp->wslen);
-        tp->t = tt + ntp->wslen;
-        tp->wslen = ntp->wslen;
-        tp->flag |= XPWS;
-    }
-}
-
-/*
- * Copy an entire tokenrow into another, at tp.
- * It is assumed that there is enough space.
- *  Not strictly conforming.
- */
-void
-    movetokenrow(Tokenrow * dtr, Tokenrow * str)
-{
-    size_t nby;
-
-    nby = (char *) str->lp - (char *) str->bp;
-    memmove(dtr->tp, str->bp, nby);
-}
-
-/*
- * Move the tokens in a row, starting at tr->tp, rightward by nt tokens;
- * nt may be negative (left move).
- * The row may need to be grown.
- * Non-strictly conforming because of the (char *), but easily fixed
- */
-void
-    adjustrow(Tokenrow * trp, int nt)
-{
-    size_t nby, size;
-
-    if (nt == 0)
-        return;
-    size = (trp->lp - trp->bp) + nt;
-    while (size > trp->max)
-        growtokenrow(trp);
-    nby = (char *) trp->lp - (char *) trp->tp;
-    if (nby)
-        memmove(trp->tp + nt, trp->tp, nby);
-    trp->lp += nt;
-}
-
-/*
- * Copy a row of tokens into the destination holder, allocating
- * the space for the contents.  Return the destination.
- */
-Tokenrow *
-    copytokenrow(Tokenrow * dtr, Tokenrow * str)
-{
-    int len = (int)rowlen(str);
-
-    maketokenrow(len, dtr);
-    movetokenrow(dtr, str);
-    dtr->lp += len;
-    return dtr;
-}
-
-/*
- * Produce a copy of a row of tokens.  Start at trp->tp.
- * The value strings are copied as well.  The first token
- * has WS available.
- */
-Tokenrow *
-    normtokenrow(Tokenrow * trp)
-{
-    Token *tp;
-    Tokenrow *ntrp = new(Tokenrow);
-    int len;
-
-    len = (int)(trp->lp - trp->tp);
-    if (len <= 0)
-        len = 1;
-    maketokenrow(len, ntrp);
-    for (tp = trp->tp; tp < trp->lp; tp++)
-    {
-        *ntrp->lp = *tp;
-        if (tp->len)
-        {
-            ntrp->lp->t = newstring(tp->t, tp->len, 1);
-            *ntrp->lp->t++ = ' ';
-            if (tp->wslen)
-                ntrp->lp->wslen = 1;
-        }
-        ntrp->lp++;
-    }
-    if (ntrp->lp > ntrp->bp)
-        ntrp->bp->wslen = 0;
-    return ntrp;
-}
-
-/*
- * Debugging
- */
-void
-    peektokens(Tokenrow * trp, char *str)
-{
-    Token *tp;
-
-    tp = trp->tp;
-    flushout();
-    if (str)
-        fprintf(stderr, "%s ", str);
-    if (tp < trp->bp || tp > trp->lp)
-        fprintf(stderr, "(tp offset %ld) ", (long int) (tp - trp->bp));
-    for (tp = trp->bp; tp < trp->lp && tp < trp->bp + 32; tp++)
-    {
-        if (tp->type != NL)
-        {
-            int c = tp->t[tp->len];
-
-            tp->t[tp->len] = 0;
-            fprintf(stderr, "%s", tp->t);
-            tp->t[tp->len] = (uchar) c;
-        }
-        fprintf(stderr, tp == trp->tp ? "{%x*} " : "{%x} ", tp->type);
-    }
-    fprintf(stderr, "\n");
-    fflush(stderr);
-}
-
-void
-    puttokens(Tokenrow * trp)
-{
-    Token *tp;
-    int len;
-    uchar *p;
-
-    if (Vflag)
-        peektokens(trp, "");
-    tp = trp->bp;
-    for (; tp < trp->lp; tp++)
-    {
-        if (tp->type != NL)
-        {
-            len = (int)(tp->len + tp->wslen);
-            p = tp->t - tp->wslen;
-
-            /* add parameter check to delete operator? */
-            if( Dflag )
-            {
-                if( (tp->type == NAME) && (strncmp( (char*)p, "delete", len ) == 0) )
-                {
-                    Token* ntp = tp;
-                    ntp++;
-                    
-                    if( ntp->type == NAME )
-                    {
-                        uchar* np = ntp->t - ntp->wslen;
-                        int nlen = (int)(ntp->len + ntp->wslen);
-                        
-                        memcpy(wbp, "if(", 3 );
-                         wbp += 4;
-                        memcpy(wbp, np, nlen );
-                         wbp += nlen;
-                        memcpy(wbp, ")", 1 );
-                         wbp++;
-                        
-                        memcpy(wbp, p, len);
-                    }	
-                }		
-            }
-
-            /* EBCDIC to ANSI conversion requested? */
-            if( Aflag )
-            {
-                /* keyword __ToLatin1__ found? -> do conversion! */
-                if( EBCDIC_StartTokenDetected )
-                {
-                    /* previous token was 'extern'? -> don't convert current token! */
-                    if( EBCDIC_ExternTokenDetected )
-                    {
-                        EBCDIC_ExternTokenDetected = 0;
-                        memcpy(wbp, p, len);
-                    }
-                    else
-                    {
-                        /* current token is keyword 'extern'? -> don't convert following token! */
-                        if( (tp->wslen == 0) && (strncmp( (char*)p, "extern", len ) == 0) )
-                        {
-                            EBCDIC_ExternTokenDetected = 1;
-                            memcpy(wbp, p, len);
-                        }
-                        else
-                        {
-                            /* token is string or char? -> process EBCDIC to ANSI conversion */
-                            if ((tp->type == STRING) || (tp->type == CCON))
-                                len = memcpy_EBCDIC(wbp,  p, len);
-                            else
-                                memcpy(wbp, p, len);
-                        }
-                    }
-                }
-                else
-                    /* keyword __ToLatin1__ found? -> don't copy keyword and start conversion */
-                    if( (tp->type == NAME) && (strncmp( (char*)p, "__ToLatin1__", len) == 0) )
-                    {
-                        EBCDIC_StartTokenDetected = 1;
-                        len = 0;
-                    }
-                    else
-                        memcpy(wbp, p, len);
-            }
-            else
-                memcpy(wbp, p, len);
-
-            wbp += len;
-        }
-        else
-            *wbp++ = '\n';
-
-        if (wbp >= &wbuf[OBS])
-        {
-            if ( write(1, wbuf, OBS) != -1 ) {
-            if (wbp > &wbuf[OBS])
-                memcpy(wbuf, wbuf + OBS, wbp - &wbuf[OBS]);
-            wbp -= OBS;
-        }
-        else exit(1);
-        }
-    }
-    trp->tp = tp;
-    if (cursource->fd == 0)
-        flushout();
-}
-
-void
-    flushout(void)
-{
-    if (wbp > wbuf)
-    {
-        if ( write(1, wbuf, (int)(wbp - wbuf)) != -1)
-            wbp = wbuf;
-    else 
-        exit(1);
-    }
-}
-
-/*
- * turn a row into just a newline
- */
-void
-    setempty(Tokenrow * trp)
-{
-    trp->tp = trp->bp;
-    trp->lp = trp->bp + 1;
-    *trp->bp = nltoken;
-}
-
-/*
- * generate a number
- */
-char *
-    outnum(char *p, int n)
-{
-    if (n >= 10)
-        p = outnum(p, n / 10);
-    *p++ = (char) (n % 10 + '0');
-    return p;
-}
-
-/*
- * allocate and initialize a new string from s, of length l, at offset o
- * Null terminated.
- */
-uchar *
-    newstring(uchar * s, size_t l, size_t o)
-{
-    uchar *ns = (uchar *) domalloc(l + o + 1);
-
-    ns[l + o] = '\0';
-    return (uchar *) strncpy((char *) ns + o, (char *) s, l) - o;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c
deleted file mode 100644
index d132fdbb3..000000000
--- a/soltools/cpp/_unix.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <fcntl.h>
-#if (defined(_WIN32) || defined(__IBMC__))
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
-#include "cpp.h"
-
-#if defined MACOSX || defined AIX || !defined HAVE_GETOPT
-extern int stgetopt(int, char *const *, const char *);
-extern char *optarg;
-extern int optind;
-#else
-#include <getopt.h>
-#endif
-
-extern char rcsid[];
-
-int Pflag = 0;                          /* print no line information */
-int Iflag = 0;							/* print includes */
-int Mflag = 0;                          /* print macor expansion */
-int Aflag = 0;                          /* translate character sets */
-int Xflag = 0;                          /* print pragma for include/import */
-int Vflag = 0;                          /* verbose flag */
-int Cflag = 0;                          /* do not remove any comments */
-int Dflag = 0;                          /* add parameter check to delete op */
-int Cplusplus = 0;
-
-extern void setup_kwtab(void);
-
-void
-    setup(int argc, char **argv)
-{
-    int c, fd, i, n;
-    char *fp, *dp;
-    Tokenrow tr;
-
-    setup_kwtab();
-#if defined MACOSX || defined(AIX) || !defined HAVE_GETOPT
-    while ((c = stgetopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1)
-#else
-    while ((c = getopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1)
-#endif
-        switch (c)
-        {
-            case 'N':
-                for (i = 0; i < NINCLUDE; i++)
-                    if (includelist[i].always == 1)
-                        includelist[i].deleted = 1;
-                break;
-
-            case 'I':
-                for (i = NINCLUDE - 2; i >= 0; i--)
-                {
-                    if (includelist[i].file == NULL)
-                    {
-                        includelist[i].always = 1;
-                        includelist[i].file = optarg;
-                        break;
-                    }
-                }
-                if (i < 0)
-                    error(FATAL, "Too many -I directives");
-                break;
-
-            case 'D':
-            case 'U':
-            case 'A':
-                setsource("<cmdarg>", -1, -1, optarg, 0);
-                maketokenrow(3, &tr);
-                gettokens(&tr, 1);
-                doadefine(&tr, c);
-                unsetsource();
-                break;
-
-            case 'P':                   /* Lineinfo */
-                Pflag++;
-                break;
-
-            case 'V':
-                for (n = 0; (c = optarg[n]) != '\0'; n++)
-                    switch (c)
-                    {
-                        case 'i':
-                            Iflag++;
-                            break;
-
-                        case 'm':
-                            Mflag = 1;
-                            break;
-
-                        case 'x':
-                            Mflag = 2;
-                            break;
-
-                        case 't':
-                            Vflag++;
-                            break;
-
-                        case 'v':
-                            fprintf(stderr, "%s %s\n", argv[0], rcsid);
-                            break;
-
-                        default:								
-                            error(WARNING, "Unknown verbose option %c", c);
-                    }
-                break;
-
-            case 'X':
-                for (n = 0; (c = optarg[n]) != '\0'; n++)
-                    switch (c)
-                    {
-                        case 'a':
-                            Aflag++;
-                            break;
-
-                        case 'i':
-                            Xflag++;
-                            break;
-
-                        case 'c':
-                            Cflag++;
-                            break;
-
-                        case 'd':
-                            Dflag++;
-                            break;
-
-                        case 'w':
-                            dp = &optarg[n + 1];
-                            n += (int)strlen(dp);
-                            while (isspace(*dp)) dp++;
-
-                            for (i = NINCLUDE - 1; i >= 0; i--)
-                            {
-                                if (wraplist[i].file == NULL)
-                                {
-                                    wraplist[i].file = dp;
-                                    break;
-                                }
-                            }
-                            if (i < 0)
-                                error(WARNING, "Too many -Xw directives");
-                            break;
-
-                        default:								
-                            error(WARNING, "Unknown extension option %c", c);
-                    }
-                break;
-
-            case '+':
-                Cplusplus++;
-                break;
-
-            case 'u':                   /* -undef fuer GCC (dummy) */
-            case 'l':                   /* -lang-c++ fuer GCC (dummy) */
-                break;
-
-            default:
-                break;
-        }
-    dp = ".";
-    fp = "<stdin>";
-    fd = 0;
-    if (optind < argc)
-    {
-        if ((fp = strrchr(argv[optind], '/')) != NULL)
-        {
-            int len = (int)(fp - argv[optind]);
-
-            dp = (char *) newstring((uchar *) argv[optind], len + 1, 0);
-            dp[len] = '\0';
-        }
-        fp = (char *) newstring((uchar *) argv[optind], strlen(argv[optind]), 0);
-        if ((fd = open(fp, O_RDONLY)) <= 0)
-            error(FATAL, "Can't open input file %s", fp);
-    }
-
-    if (optind + 1 < argc)
-    {
-        int fdo = creat(argv[optind + 1], 0666);
-
-        if (fdo < 0)
-            error(FATAL, "Can't open output file %s", argv[optind + 1]);
-
-        dup2(fdo, 1);
-    }
-    includelist[NINCLUDE - 1].always = 0;
-    includelist[NINCLUDE - 1].file = dp;
-    setsource(fp, -1, fd, NULL, 0);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h
deleted file mode 100644
index 5e862740d..000000000
--- a/soltools/cpp/cpp.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* $Id: cpp.h,v 1.4 2006-06-20 05:07:28 hr Exp $ */
-       
-#define	INS			32768	/* input buffer								*/
-#define	OBS			8092    /* outbut buffer							*/
-#define	NARG		32      /* Max number arguments to a macro			*/
-#define	NINCLUDE	48      /* Max number of include directories (-I)	*/
-#define	NIF			64		/* depth of nesting of #if					*/
-#define	NINC		32		/* depth of nesting of #include				*/
-
-#ifndef EOF             
-#define	EOF	(-1)
-#endif                                         
-
-#ifndef NULL               
-#define NULL	0
-#endif
-
-typedef unsigned char uchar;
-
-enum toktype
-{
-    END, UNCLASS, NAME, NUMBER, STRING, CCON, NL, WS, DSHARP,
-    EQ, NEQ, LEQ, GEQ, LSH, RSH, LAND, LOR, PPLUS, MMINUS,
-    ARROW, SBRA, SKET, LP, RP, DOT, AND, STAR, PLUS, MINUS,
-    TILDE, NOT, SLASH, PCT, LT, GT, CIRC, OR, QUEST,
-    COLON, ASGN, COMMA, SHARP, SEMIC, CBRA, CKET,
-    ASPLUS, ASMINUS, ASSTAR, ASSLASH, ASPCT, ASCIRC, ASLSH,
-    ASRSH, ASOR, ASAND, ELLIPS,
-    DSHARP1, NAME1, NAME2, DEFINED, UMINUS, ARCHITECTURE, IDENT,
-    COMMENT
-};
-
-enum kwtype
-{
-    KIF, KIFDEF, KIFNDEF, KELIF, KELSE, KENDIF, KINCLUDE, KINCLUDENEXT,
-    KIMPORT, KDEFINE, KUNDEF, KLINE, KERROR, KPRAGMA, KIDENT, KDEFINED, 
-    KMACHINE, KLINENO, KFILE, KDATE, KTIME, KSTDC, KEVAL
-};
-
-#define	ISDEFINED		0x01            /* has #defined value */
-#define	ISKW			0x02            /* is PP keyword */
-#define	ISUNCHANGE		0x04            /* can't be #defined in PP */
-#define	ISMAC			0x08            /* builtin macro, e.g. __LINE__ */
-#define	ISARCHITECTURE	0x10            /* architecture */
-#define ISACTIVE        0x80            /* is macro currently expanded */
-
-#define	EOB		0xFE                    /* sentinel for end of input buffer */
-#define	EOFC	0xFD                    /* sentinel for end of input file */
-#define	XPWS	1                       /* token flag: white space to assure token sep. */
-#define XTWS	2
-
-typedef struct token
-{
-    unsigned char type;
-    unsigned char flag;
-    size_t wslen;
-    size_t len;
-    uchar *t;
-    unsigned int identifier;			/* used from macro processor to identify where a macro becomes valid again. */
-}   Token;
-
-typedef struct tokenrow
-{
-    Token *tp;                          /* current one to scan */
-    Token *bp;                          /* base (allocated value) */
-    Token *lp;                          /* last+1 token used */
-    size_t max;                         /* number allocated */
-}   Tokenrow;
-
-typedef struct source
-{
-    char *filename;                     /* name of file of the source */
-    int line;                           /* current line number */
-    int lineinc;                        /* adjustment for \\n lines */
-    uchar *inb;                         /* input buffer */
-    uchar *inp;                         /* input pointer */
-    uchar *inl;                         /* end of input */
-    int fd;                             /* input source */
-    int ifdepth;                        /* conditional nesting in include */
-    int pathdepth;
-    int wrap;
-    struct source *next;                /* stack for #include */
-}   Source;
-
-typedef struct nlist
-{
-    struct nlist *next;
-    uchar *name;
-    size_t len;
-    Tokenrow *vp;                       /* value as macro */
-    Tokenrow *ap;                       /* list of argument names, if any */
-    char val;                           /* value as preprocessor name */
-    char flag;                          /* is defined, is pp name */
-    uchar *loc;							/* location of definition */
-}   Nlist;
-
-typedef struct includelist
-{
-    char deleted;
-    char always;
-    char *file;
-}   Includelist;
-
-typedef struct wraplist
-{
-    char *file;
-}   Wraplist;
-
-#define	new(t)	(t *)domalloc(sizeof(t))
-#define	quicklook(a,b)	(namebit[(a)&077] & (1<<((b)&037)))
-#define	quickset(a,b)	namebit[(a)&077] |= (1<<((b)&037))
-extern unsigned long namebit[077 + 1];
-
-enum errtype
-{
-    INFO, WARNING, ERROR, FATAL
-};
-
-
-typedef struct macroValidator
-{
-    Nlist *				pMacro;
-    unsigned int		nTokenWhereMacroBecomesValid;
-    struct macroValidator *
-                        pNext;
-} MacroValidator;
-typedef struct mvl
-{
-    MacroValidator * pFirst;
-    unsigned int	 nextFreeIdentifier;
-} MacroValidatorList;
-
-void		mvl_init(
-                MacroValidatorList *
-                                out_pValidators);
-void		mvl_destruct(
-                MacroValidatorList *
-                                out_pValidators);
-/* 	Adds MacroValidator to the list.
-*/
-void 		mvl_add(
-                MacroValidatorList *
-                                inout_pValidators,
-                Nlist *         in_pMacro,
-                Token *			in_pTokenWhereMacroBecomesValid);
-
-/*	Checks if one of the validators within the list points to
-    the token in_pTokenToCheck. If so, the macro is set valid and
-    the validator is removed.
-*/
-void		mvl_check(
-                MacroValidatorList *
-                                inout_pValidators,
-                Token *			inout_pTokenToCheck);
-
-void tokenrow_zeroTokenIdentifiers(Tokenrow* trp);
-
-void expandlex(void);
-void fixlex(void);
-void setup(int, char **);
-int gettokens(Tokenrow *, int);
-int comparetokens(Tokenrow *, Tokenrow *);
-Source *setsource(char *, int, int, char *, int);
-void unsetsource(void);
-void puttokens(Tokenrow *);
-void process(Tokenrow *);
-void *domalloc(size_t);
-void dofree(void *);
-void error(enum errtype, char *,...);
-void flushout(void);
-int fillbuf(Source *);
-int trigraph(Source *);
-int foldline(Source *);
-Nlist *lookup(Token *, int);
-void control(Tokenrow *);
-void dodefine(Tokenrow *);
-void doadefine(Tokenrow *, int);
-void doinclude(Tokenrow *, int, int);
-void doif(Tokenrow *, enum kwtype);
-void expand(Tokenrow *, Nlist *, MacroValidatorList *);
-void builtin(Tokenrow *, int);
-int gatherargs(Tokenrow *, Tokenrow **, int *);
-void substargs(Nlist *, Tokenrow *, Tokenrow **);
-void expandrow(Tokenrow *, char *);
-void maketokenrow(int, Tokenrow *);
-Tokenrow *copytokenrow(Tokenrow *, Tokenrow *);
-Token *growtokenrow(Tokenrow *);
-Tokenrow *normtokenrow(Tokenrow *);
-void adjustrow(Tokenrow *, int);
-void movetokenrow(Tokenrow *, Tokenrow *);
-void insertrow(Tokenrow *, int, Tokenrow *);
-void peektokens(Tokenrow *, char *);
-void doconcat(Tokenrow *);
-Tokenrow *stringify(Tokenrow *);
-int lookuparg(Nlist *, Token *);
-long eval(Tokenrow *, int);
-void genline(void);
-void genimport(char *, int, char *, int);
-void genwrap(int);
-void setempty(Tokenrow *);
-void makespace(Tokenrow *, Token *);
-char *outnum(char *, int);
-int digit(int);
-uchar *newstring(uchar *, size_t, size_t);
-
-#define	rowlen(tokrow)	((tokrow)->lp - (tokrow)->bp)
-
-extern char *outptr;
-extern Token nltoken;
-extern Source *cursource;
-extern char *curtime;
-extern int incdepth;
-extern int ifdepth;
-extern int ifsatisfied[NIF];
-extern int Mflag;
-extern int Iflag;
-extern int Pflag;
-extern int Aflag;
-extern int Lflag;
-extern int Xflag;
-extern int Vflag;
-extern int Cflag;
-extern int Dflag;
-extern int Cplusplus;
-extern int skipping;
-extern Nlist *kwdefined;
-extern Includelist includelist[NINCLUDE];
-extern Wraplist wraplist[NINCLUDE];
-extern char wd[];
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
deleted file mode 100644
index 5cada33f9..000000000
--- a/soltools/cpp/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=cpp
-TARGETTYPE=CUI
-NO_DEFAULT_STL=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-    @echo Nothing done when cross-compiling
-.ENDIF
-
-UWINAPILIB=$(0)
-LIBSALCPPRT=$(0)
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/_cpp.obj		\
-    $(OBJ)$/_eval.obj 	\
-    $(OBJ)$/_include.obj \
-    $(OBJ)$/_lex.obj 	\
-    $(OBJ)$/_macro.obj 	\
-    $(OBJ)$/_mcrvalid.obj \
-    $(OBJ)$/_nlist.obj 	\
-    $(OBJ)$/_tokens.obj 	\
-    $(OBJ)$/_unix.obj
-
-# nonstandard cpp options needed for Mac (-isysroot),
-# needs the custom stgetopt defined here :/
-.IF "$(OS)" == "MACOSX" || "$(OS)" == "AIX" || "$(HAVE_GETOPT)" != "YES"
-OBJFILES += $(OBJ)$/_getopt.obj
-.ENDIF
-.IF "$(HAVE_GETOPT)" == "YES"
-CDEFS += -DHAVE_GETOPT
-.ENDIF
-
-APP1TARGET	=	$(TARGET)
-APP1STACK	=	1000000
-APP1LIBS	=	$(LB)$/$(TARGET).lib
-APP1DEPN	=   $(LB)$/$(TARGET).lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/soltools/giparser/gen_info.cxx b/soltools/giparser/gen_info.cxx
deleted file mode 100644
index 8cbd820e3..000000000
--- a/soltools/giparser/gen_info.cxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-
-#include <gen_info.hxx>
-#include <gi_list.hxx>
-
-
-GenericInfo::GenericInfo( const Simstr &      i_sKey,
-                          const Simstr &      i_sValue,
-                          const Simstr &      i_sComment )
-    :   sKey(i_sKey),
-        sValue(i_sValue),
-        sComment(i_sComment),
-        dpSubList(0)
-{
-}
-
-GenericInfo::GenericInfo( const GenericInfo & i_rInfo )
-    :   sKey(i_rInfo.sKey),
-        sValue(i_rInfo.sValue),
-        sComment(i_rInfo.sComment),
-        dpSubList(0)
-{
-    if ( i_rInfo.HasSubList() )
-    {
-        dpSubList = new List_GenericInfo(i_rInfo.SubList());
-    }
-}
-
-GenericInfo::~GenericInfo()
-{
-    if ( dpSubList != 0 )
-        delete dpSubList;
-}
-
-GenericInfo &
-GenericInfo::operator=( const GenericInfo & i_rInfo )
-{
-    sKey = i_rInfo.sKey;
-    sValue = i_rInfo.sValue;
-    sComment = i_rInfo.sComment;
-
-    if ( dpSubList != 0 )
-        delete dpSubList;
-    if ( i_rInfo.HasSubList() )
-    {
-        dpSubList = new List_GenericInfo(i_rInfo.SubList());
-    }
-    else
-        dpSubList = 0;
-
-    return *this;
-}
-
-List_GenericInfo &
-GenericInfo::CreateMyList() const
-{
-    return * ( const_cast<GenericInfo&>(*this).dpSubList = new List_GenericInfo);
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/giparser/gi_list.cxx b/soltools/giparser/gi_list.cxx
deleted file mode 100644
index 1f6f70d24..000000000
--- a/soltools/giparser/gi_list.cxx
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-
-
-#include <gi_list.hxx>
-
-
-#include <gen_info.hxx>
-
-
-
-const char C_cKeySeparator = '/';
-
-
-List_GenericInfo::List_GenericInfo()
-{
-}
-
-List_GenericInfo::List_GenericInfo( const List_GenericInfo & i_rList )
-    :   aChildren(i_rList.aChildren)
-{
-}
-
-List_GenericInfo::~List_GenericInfo()
-{
-}
-
-List_GenericInfo &
-List_GenericInfo::operator=( const List_GenericInfo & i_rList )
-{
-    aChildren = i_rList.aChildren;
-    return *this;
-}
-
-const GenericInfo *
-List_GenericInfo::operator[]( KeyPath i_sKeyPath ) const
-{
-    return const_cast< List_GenericInfo& >(*this)[i_sKeyPath];
-}
-
-GenericInfo *
-List_GenericInfo::operator[]( KeyPath i_sKeyPath )
-{
-    bool bExists = false;
-    const char * sNextPathSegment = 0;
-    sub_iterator it = lower_bound(bExists, sNextPathSegment, i_sKeyPath);
-
-    if ( bExists )
-    {
-        if ( sNextPathSegment == 0 )
-            return (*it);
-        else
-            return (*it)->SubList()[sNextPathSegment];
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-bool
-List_GenericInfo::InsertInfo( GenericInfo *       let_dpInfo,
-                              bool                i_bOverwrite )
-{
-    if ( let_dpInfo == 0 )
-        return false;
-
-    bool bExists = false;
-    const char * sNextPathSegment = 0;
-    sub_iterator it = lower_bound(bExists, sNextPathSegment, let_dpInfo->Key() );
-
-    if ( ! bExists )
-    {
-        aChildren.insert( it, let_dpInfo );
-    }
-    else if ( i_bOverwrite )
-    {
-        delete (*it);
-        (*it) = let_dpInfo;
-    }
-    else
-    {
-         delete let_dpInfo;
-        return false;
-    }
-
-    return true;
-}
-
-bool
-List_GenericInfo::InsertInfoByPath( GenericInfo *       let_dpInfo,
-                                    KeyPath             i_sKeyPath,
-                                    bool                i_bCreatePath,
-                                    bool                i_bOverwrite )
-{
-    if ( let_dpInfo == 0 )
-        return false;
-
-    if ( i_sKeyPath == 0 ? true : *i_sKeyPath == 0 )
-         return InsertInfo(let_dpInfo, i_bOverwrite);
-
-    bool bExists = false;
-    const char * sNextPathSegment = 0;
-    sub_iterator it = lower_bound(bExists, sNextPathSegment, i_sKeyPath);
-
-    if ( bExists )
-    {
-        return (*it)->SubList().InsertInfoByPath(
-                                    let_dpInfo,
-                                    sNextPathSegment,
-                                    i_bCreatePath,
-                                    i_bOverwrite );
-    }
-    else if ( i_bCreatePath )
-    {
-        Simstr aKey( i_sKeyPath,
-                     0,
-                     (int)(sNextPathSegment -
-                        ( *sNextPathSegment == 0 ? 0 : 1)
-                           - i_sKeyPath ));
-
-        GenericInfo * pNew = new GenericInfo(aKey);
-        InsertInfo(pNew,false);
-
-        return pNew->SubList().InsertInfoByPath(
-                                    let_dpInfo,
-                                    sNextPathSegment,
-                                    i_bCreatePath,
-                                    i_bOverwrite );
-    }
-    else
-    {
-         delete let_dpInfo;
-        return false;
-    }
-}
-
-GenericInfo *
-List_GenericInfo::ReleaseInfo( KeyPath i_sKeyPath )
-{
-    bool bExists = false;
-    const char * sNextPathSegment = 0;
-    sub_iterator it = lower_bound(bExists, sNextPathSegment, i_sKeyPath );
-
-    if ( bExists )
-    {
-        if ( *sNextPathSegment == 0 )
-            return (*it);
-        else
-            return (*it)->SubList().ReleaseInfo(sNextPathSegment);
-    }
-    else
-    {
-         return 0;
-    }
-}
-
-void
-List_GenericInfo::DeleteInfo( KeyPath i_sKeyPath )
-{
-    bool bExists = false;
-    const char * sNextPathSegment = 0;
-    sub_iterator it = lower_bound(bExists, sNextPathSegment, i_sKeyPath );
-
-    if ( bExists )
-    {
-        if ( *sNextPathSegment == 0 )
-        {
-            aChildren.remove(it);
-        }
-        else
-        {
-            (*it)->SubList().DeleteInfo(sNextPathSegment);
-        }
-    }
-}
-
-List_GenericInfo::sub_iterator
-List_GenericInfo::lower_bound( bool &              o_bExists,
-                               const char * &      o_sNextPathSegment,
-                               KeyPath             i_sKeyPath )
-{
-    o_sNextPathSegment = strchr(i_sKeyPath, '/');
-    Simstr sKey( i_sKeyPath, (int)(o_sNextPathSegment == 0 ? strlen(i_sKeyPath) : o_sNextPathSegment++ - i_sKeyPath) );
-    GenericInfo aSearch(sKey);
-
-    unsigned low = 0;
-    unsigned high = aChildren.size();
-
-    for ( unsigned cur = high / 2; high > low; cur = (low + high) / 2 )
-    {
-        if ( *aChildren[cur] < aSearch )
-        {
-            low = cur+1;
-        }
-        else
-        {
-            high = cur;
-        }
-    }   // end for
-
-    o_bExists = low < aChildren.size()
-                    ? !(aSearch < *aChildren[low] )
-                    : false;
-    return &aChildren[low];
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/giparser/gi_parse.cxx b/soltools/giparser/gi_parse.cxx
deleted file mode 100644
index a7958e006..000000000
--- a/soltools/giparser/gi_parse.cxx
+++ /dev/null
@@ -1,398 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-
-#include <gi_parse.hxx>
-
-#include <stdio.h>
-#include <string.h>
-#include <fstream>
-#include <gilacces.hxx>
-
-
-using namespace std;
-
-
-const char * C_sLineEnd = "\r\n";
-
-
-
-inline void
-WriteStr( ostream & o_rOut, const Simstr & i_rStr )
-{
-    o_rOut.write( i_rStr.str(), i_rStr.l() );
-}
-
-inline void
-WriteStr( ostream & o_rOut, const char * i_rStr )
-{
-    o_rOut.write( i_rStr, strlen(i_rStr) );
-}
-
-inline void
-GenericInfo_Parser::SetError( E_Error i_eError )
-{
-     eErrorCode = i_eError;
-    nErrorLine = nCurLine;
-}
-
-
-GenericInfo_Parser::GenericInfo_Parser()
-    :   sCurParsePosition(""),
-        nCurLine(0),
-        nLevel(0),
-        bGoon(false),
-        eErrorCode(ok),
-        nErrorLine(0),
-        pResult(0),
-        pResource(0)
-{
-}
-
-GenericInfo_Parser::~GenericInfo_Parser()
-{
-}
-
-bool
-GenericInfo_Parser::LoadList( GenericInfoList_Builder &  o_rResult,
-                              const Simstr &             i_sSourceFileName )
-{
-    ifstream  aFile( i_sSourceFileName.str() );
-    if ( aFile.fail() )
-    {
-        SetError(cannot_open);
-        return false;
-    }
-
-    aFile.seekg(0, ios::end);
-    UINT32 nTextSize = aFile.tellg();
-    if ( nTextSize == 0 || nTextSize == UINT32(-1) )
-        return true;
-    dpBuffer = new char[nTextSize+2];
-
-    aFile.seekg(0);
-    aFile.read( dpBuffer, nTextSize );
-    aFile.close();
-
-    sFilePtr = dpBuffer;
-    char * sLastChar = dpBuffer + nTextSize - 1;
-
-    while ( sFilePtr != sLastChar && *sFilePtr <= 32 )
-        ++sCurParsePosition;
-    if ( sFilePtr == sLastChar )
-    {
-        if ( *sFilePtr <= 32 )
-            return true;
-    }
-    else while ( *sLastChar <= 32 )
-    {
-        --sLastChar;
-    }
-
-    *(sLastChar+1) = '\n';
-    *(sLastChar+2) = '\0';
-
-    ResetState(o_rResult);
-
-    for ( ReadLine(); bGoon; ReadLine() )
-    {
-        bool bOk = InterpretLine();
-        if ( !bOk)
-        {
-            SetError(syntax_error);
-            break;
-        }
-    }
-
-    if ( nLevel > 0 && eErrorCode == ok)
-    {
-        SetError(unexpected_eof);
-    }
-    else if ( nLevel < 0 )
-    {
-        SetError(unexpected_list_end);
-    }
-
-    delete [] dpBuffer;
-    dpBuffer = 0;
-    sFilePtr = 0;
-
-    return eErrorCode == ok;
-}
-
-bool
-GenericInfo_Parser::SaveList( const Simstr &            i_rOutputFile,
-                              GenericInfoList_Browser & io_rListBrowser )
-{
-    ofstream  aFile( i_rOutputFile.str() );
-    if ( aFile.fail() )
-    {
-        SetError(cannot_open);
-        return false;
-    }
-
-    ResetState(io_rListBrowser);
-
-    WriteList(aFile);
-
-    aFile.close();
-    return eErrorCode == ok;
-}
-
-void
-GenericInfo_Parser::ResetState( GenericInfoList_Builder & io_rResult )
-{
-    sCurParsePosition = "";
-    nCurLine = 0;
-    nLevel = 0;
-    bGoon = true;
-    sCurComment = "";
-    eErrorCode = ok;
-    nErrorLine = 0;
-    pResult = &io_rResult;
-    pResource = 0;
-}
-
-void
-GenericInfo_Parser::ResetState( GenericInfoList_Browser & io_rSrc )
-{
-    sCurParsePosition = "";
-    nCurLine = 0;
-    nLevel = 0;
-    bGoon = false;
-    sCurComment = "";
-    eErrorCode = ok;
-    nErrorLine = 0;
-    pResult = 0;
-    pResource = &io_rSrc;
-}
-
-
-void
-GenericInfo_Parser::ReadLine()
-{
-    if ( *sFilePtr == '\0' )    // See initialising of dpBuffer and sLastChar in LoadList().
-    {
-        bGoon = false;
-        return;
-    }
-
-    sCurParsePosition = sFilePtr;
-    while ( *sFilePtr != '\n' )
-        ++sFilePtr;
-    nCurLine++;
-
-    // Remove leading and trailing whitespace from line:
-    while ( sCurParsePosition != sFilePtr && *sCurParsePosition <= 32 )
-        ++sCurParsePosition;
-
-    char * sEndOfLine = sFilePtr;
-    while ( sEndOfLine != sCurParsePosition && *sEndOfLine <= 32 )
-          --sEndOfLine;
-    if ( sCurParsePosition != sEndOfLine || *sCurParsePosition > 32 )
-        ++sEndOfLine;
-    *sEndOfLine = '\0';
-
-    ++sFilePtr; // Go beyond line end to first character of next line.
-}
-
-bool
-GenericInfo_Parser::InterpretLine()
-{
-    switch ( ClassifyLine() )
-    {
-        case lt_key:        ReadKey();
-                            break;
-        case lt_open_list:  PushLevel_Read();
-                            break;
-        case lt_close_list: PopLevel_Read();
-                            break;
-        case lt_comment:    AddCurLine2CurComment();
-                            break;
-        case lt_empty:      AddCurLine2CurComment();
-                            break;
-        default:
-                            return false;
-    }
-    return true;
-}
-
-GenericInfo_Parser::E_LineType
-GenericInfo_Parser::ClassifyLine()
-{
-    switch ( *sCurParsePosition )
-    {
-         case '{':   return lt_open_list;
-        case '}':   return lt_close_list;
-        case '#':   return lt_comment;
-        case '\0':   return lt_empty;
-    }
-
-    return lt_key;
-}
-
-void
-GenericInfo_Parser::ReadKey()
-{
-    const char * pSearch = sCurParsePosition;
-
-    for ( ; *pSearch > 32; ++pSearch ) ;
-    UINT32 nKeyLength = pSearch - sCurParsePosition;
-
-    for ( ; *pSearch <= 32 && *pSearch > '\0'; ++pSearch ) ;
-
-    pResult->AddKey( sCurParsePosition,     nKeyLength,
-                     pSearch,               strlen(pSearch),
-                     sCurComment.str(),     sCurComment.l()
-                   );
-    sCurComment = "";
-}
-
-void
-GenericInfo_Parser::PushLevel_Read()
-{
-    nLevel++;
-    pResult->OpenList();
-}
-
-void
-GenericInfo_Parser::PopLevel_Read()
-{
-    nLevel--;
-    pResult->CloseList();
-}
-
-void
-GenericInfo_Parser::AddCurLine2CurComment()
-{
-    sCurComment +=  sCurParsePosition;
-    sCurComment +=  C_sLineEnd;
-}
-
-void
-GenericInfo_Parser::WriteList( ostream & o_rFile )
-{
-    static char sBuffer[32000];
-
-    for ( bGoon = pResource->Start_CurList();
-          bGoon;
-          bGoon = pResource->NextOf_CurList() )
-    {
-        pResource->Get_CurComment(&sBuffer[0]);
-        WriteComment(o_rFile,sBuffer);
-
-        pResource->Get_CurKey(&sBuffer[0]);
-        WriteKey(o_rFile,sBuffer);
-
-        pResource->Get_CurValue(&sBuffer[0]);
-        WriteValue(o_rFile,sBuffer);
-
-        if ( pResource->HasSubList_CurKey() )
-        {
-            PushLevel_Write();
-
-            WriteList(o_rFile);
-
-            PopLevel_Write();
-        }
-    }   // end for
-}
-
-void
-GenericInfo_Parser::PushLevel_Write()
-{
-    nLevel++;
-    pResource->Push_CurList();
-}
-
-void
-GenericInfo_Parser::PopLevel_Write()
-{
-    nLevel--;
-    pResource->Pop_CurList();
-}
-
-void
-GenericInfo_Parser::WriteComment( ostream &    o_rFile,
-                                  const char *  i_sStr )
-{
-    WriteStr( o_rFile, i_sStr );
-    if ( i_sStr[ strlen(i_sStr)-1 ] != '\n' )
-        WriteStr( o_rFile, C_sLineEnd );
-}
-
-void
-GenericInfo_Parser::WriteKey( ostream &    o_rFile,
-                              const char *  i_sStr )
-{
-    WriteIndentation(o_rFile);
-    WriteStr( o_rFile, i_sStr );
-}
-
-void
-GenericInfo_Parser::WriteValue( ostream &    o_rFile,
-                                const char *  i_sStr )
-{
-    if ( i_sStr != 0 ? strlen(i_sStr) > 0 : false )
-    {
-         WriteStr(o_rFile," ");
-         WriteStr(o_rFile,i_sStr);
-    }
-
-    WriteStr(o_rFile,C_sLineEnd);
-}
-
-void
-GenericInfo_Parser::WriteIndentation( ostream &    o_rFile )
-{
-    const int nIndentBound = 60;
-
-    static const char sIndentation[nIndentBound+1] =
-        "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"
-        "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"
-        "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-
-    if ( nLevel == 0 )
-        return;
-
-    if ( nLevel <= nIndentBound )
-        o_rFile.write( sIndentation, nLevel );
-    else
-    {
-        INT16 iLevel = nLevel;
-        for ( ; iLevel > nIndentBound; iLevel-=nIndentBound )
-            o_rFile.write( sIndentation, nIndentBound );
-        o_rFile.write( sIndentation, iLevel );
-    }
-}
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk
deleted file mode 100644
index d7f04dbe8..000000000
--- a/soltools/giparser/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=soltools_giparser
-TARGETTYPE=CUI
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-    @echo Nothing done when cross-compiling
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=\
-    $(OBJ)$/gen_info.obj	\
-    $(OBJ)$/gi_list.obj	    \
-    $(OBJ)$/gi_parse.obj    \
-    $(OBJ)$/st_gilrw.obj
-
-SLOFILES=\
-    $(SLO)$/gen_info.obj	\
-    $(SLO)$/gi_list.obj	    \
-    $(SLO)$/gi_parse.obj    \
-    $(SLO)$/st_gilrw.obj
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :  target.mk
-
diff --git a/soltools/giparser/st_gilrw.cxx b/soltools/giparser/st_gilrw.cxx
deleted file mode 100644
index bd00bae3d..000000000
--- a/soltools/giparser/st_gilrw.cxx
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-
-
-#include <st_gilrw.hxx>
-
-#include <gen_info.hxx>
-#include <gi_list.hxx>
-#include <gi_parse.hxx>
-#include <simstr.hxx>
-#include <st_list.hxx>
-
-
-using namespace std;
-
-
-ST_InfoListReader::ST_InfoListReader()
-{
-    dpParser = new GenericInfo_Parser;
-}
-
-ST_InfoListReader::~ST_InfoListReader()
-{
-    delete dpParser;
-}
-
-
-bool
-ST_InfoListReader::LoadList( List_GenericInfo &  o_rList,
-                             const Simstr &      i_sFileName )
-{
-    aListStack.push_back(&o_rList);
-    return dpParser->LoadList(*this, i_sFileName);
-}
-
-ST_InfoListReader::E_Error
-ST_InfoListReader::GetLastError( UINT32 * o_pErrorLine ) const
-{
-    return dpParser->GetLastError(o_pErrorLine);
-}
-
-void
-ST_InfoListReader::AddKey( const char *        i_sKey,
-                           UINT32              i_nKeyLength,
-                           const char *        i_sValue,
-                           UINT32              i_nValueLength,
-                           const char *        i_sComment,
-                           UINT32              i_nCommentLength )
-{
-    Simstr sKey(i_sKey, i_nKeyLength);
-    Simstr sValue(i_sValue, i_nValueLength);
-    Simstr sComment(i_sComment, i_nCommentLength);
-
-    pCurKey = new GenericInfo(sKey, sValue, sComment);
-    aListStack.back()->InsertInfo( pCurKey );
-}
-
-void
-ST_InfoListReader::OpenList()
-{
-    if ( pCurKey == 0 )
-    {
-         cerr << "error: '{' without key found." << endl;
-        exit(1);
-    }
-
-    aListStack.push_back( & pCurKey->SubList() );
-}
-
-void
-ST_InfoListReader::CloseList()
-{
-    if ( aListStack.size() == 0 )
-    {
-         cerr << "error: '}' without corresponding '}' found." << endl;
-        exit(1);
-    }
-
-    aListStack.pop_back();
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/gen_info.hxx b/soltools/inc/gen_info.hxx
deleted file mode 100644
index 050edc8f5..000000000
--- a/soltools/inc/gen_info.hxx
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef GEN_INFO_HXX
-#define GEN_INFO_HXX
-
-
-#include "simstr.hxx"
-#include <string.h>
-
-
-
-class List_GenericInfo;
-
-
-/** Holds generic informations in a simple hierarchical format.
-*/
-class GenericInfo
-{
-  public:
-    // LIFECFYCLE
-                        GenericInfo(
-                            const Simstr &      i_sKey,
-                            const Simstr &      i_sValue = Simstr::null_(),
-                            const Simstr &      i_sComment = Simstr::null_() );
-                        GenericInfo(
-                            const GenericInfo & i_rInfo );
-                        ~GenericInfo();
-
-    // OPERATORS
-    GenericInfo &       operator=(
-                            const GenericInfo & i_rInfo );
-    bool                operator<(
-                            const GenericInfo & i_rInfo ) const
-#ifdef UNX
-                                                { return strcasecmp(sKey.str(),i_rInfo.sKey.str()) < 0; }
-#else
-                                                { return stricmp(sKey.str(),i_rInfo.sKey.str()) < 0; }
-#endif
-    // INFO
-    const Simstr &      Key() const             { return sKey; }
-    const Simstr &      Value() const           { return sValue; }
-    const Simstr &      Comment() const         { return sComment; }
-    bool                HasSubList() const      { return dpSubList != 0; }
-
-    const List_GenericInfo &
-                        SubList() const         { return HasSubList() ? *dpSubList : CreateMyList(); }
-    // ACCESS
-    List_GenericInfo &
-                        SubList()               { return HasSubList() ? *dpSubList : CreateMyList(); }
-
-  private:
-    /// @precond dpSubList == 0 .
-    List_GenericInfo &  CreateMyList() const;
-
-    // DATA
-    Simstr              sKey;
-    Simstr              sValue;
-    Simstr              sComment;
-    List_GenericInfo *  dpSubList;      /// Owned by this object.
-};
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/gi_list.hxx b/soltools/inc/gi_list.hxx
deleted file mode 100644
index be2b37412..000000000
--- a/soltools/inc/gi_list.hxx
+++ /dev/null
@@ -1,217 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SOLTOOLS_GI_LIST_HXX
-#define SOLTOOLS_GI_LIST_HXX
-
-
-#include "st_list.hxx"
-
-
-class GenericInfo;
-
-/** Holds set of generic informations in a sorted list.
-
-    At different places, methods of this class have a parameter,
-    whose name includes "path". Those are paths like this:
-
-        src370/drives/o:
-
-    which are used to access GenericInfo keys in deep search through
-    the lists and their sublists.
-*/
-class List_GenericInfo
-{
-  public:
-    // TYPES
-    class const_iterator
-    {
-      public:
-        const GenericInfo & operator*() const;
-        const_iterator &    operator++();
-        bool                operator==( const const_iterator & ) const;
-        bool                operator!=( const const_iterator & ) const;
-
-                            const_iterator();
-                            const_iterator( const DynamicList< GenericInfo >::const_iterator & );
-      private: DynamicList< GenericInfo >::const_iterator it;
-    };
-    class iterator
-    { public:
-        GenericInfo &       operator*() const;
-        iterator &          operator++();
-        bool                operator==( const iterator & ) const;
-        bool                operator!=( const iterator & ) const;
-
-                            iterator();
-                            iterator( const DynamicList< GenericInfo >::iterator & );
-      private: DynamicList< GenericInfo >::iterator it;
-    };
-
-    typedef const char *    KeyPath;
-
-    // LIFECYCLE
-                        List_GenericInfo();
-                        List_GenericInfo(
-                            const List_GenericInfo &
-                                                i_rList );
-                        ~List_GenericInfo();
-
-    // OPERATORS
-    List_GenericInfo &  operator=(
-                            const List_GenericInfo &
-                                                i_rList );
-    const GenericInfo * operator[](
-                            KeyPath             i_sKeyPath ) const;
-    GenericInfo *       operator[](
-                            KeyPath             i_sKeyPath );
-
-    // OPERATIONS
-    bool                InsertInfo(
-                            GenericInfo *       let_dpInfo,    /// Will be owned by this object.
-                            bool                i_bOverwrite = true );
-    bool                InsertInfoByPath(
-                            GenericInfo *       let_dpInfo,    /// Will be owned by this object.
-                            KeyPath             i_sKeyPath,
-                            bool                i_bCreatePath,
-                            bool                i_bOverwrite = true );
-
-    GenericInfo *       ReleaseInfo(            /// Removes the GenericInfo from its parent.
-                            KeyPath             i_sKeyPath );
-
-    void                DeleteInfo(
-                            KeyPath             i_sKeyPath );
-
-    // INFO
-    unsigned            Size() const;
-
-    const_iterator      Begin() const;
-    const_iterator      End() const;
-
-    // ACCESS
-    iterator            Begin();
-    iterator            End();
-
-  private:
-    typedef DynamicList< GenericInfo >::iterator  sub_iterator;
-
-    sub_iterator        lower_bound(
-                            bool &              o_bExists,
-                            const char * &      o_sNextPathSegment,
-                            KeyPath             i_sKeyPath );
-
-    DynamicList< GenericInfo >
-                        aChildren;
-};
-
-
-// IMPLEMENTATION
-
-
-inline const GenericInfo &
-List_GenericInfo::
-const_iterator::operator*() const
-    { return *(*it); }
-
-inline List_GenericInfo::const_iterator &
-List_GenericInfo::
-const_iterator::operator++()
-    { ++it; return *this; }
-
-inline bool
-List_GenericInfo::
-const_iterator::operator==( const const_iterator & i_rIter ) const
-    { return it == i_rIter.it; }
-
-inline bool
-List_GenericInfo::
-const_iterator::operator!=( const const_iterator & i_rIter ) const
-    { return it != i_rIter.it; }
-
-inline List_GenericInfo::
-const_iterator::const_iterator()
-    :   it(0) { }
-
-inline List_GenericInfo::
-const_iterator::const_iterator( const DynamicList< GenericInfo >::const_iterator & i_rDynListIter )
-    :   it(i_rDynListIter) { }
-
-
-inline GenericInfo &
-List_GenericInfo::
-iterator::operator*() const
-    { return *(*it); }
-
-inline List_GenericInfo::iterator &
-List_GenericInfo::
-iterator::operator++()
-    { ++it; return *this; }
-
-inline bool
-List_GenericInfo::
-iterator::operator==( const iterator & i_rIter ) const
-    { return it == i_rIter.it; }
-
-inline bool
-List_GenericInfo::
-iterator::operator!=( const iterator & i_rIter ) const
-    { return it != i_rIter.it; }
-
-inline List_GenericInfo::
-iterator::iterator()
-    :   it(0) { }
-
-inline List_GenericInfo::
-iterator::iterator( const DynamicList< GenericInfo >::iterator & i_rDynListIter )
-    :   it(i_rDynListIter) { }
-
-inline unsigned
-List_GenericInfo::Size() const
-    { return aChildren.size(); }
-
-inline List_GenericInfo::const_iterator
-List_GenericInfo::Begin() const
-    { return aChildren.begin(); }
-
-inline List_GenericInfo::const_iterator
-List_GenericInfo::End() const
-    { return aChildren.end(); }
-
-inline List_GenericInfo::iterator
-List_GenericInfo::Begin()
-    { return aChildren.begin(); }
-
-inline List_GenericInfo::iterator
-List_GenericInfo::End()
-    { return aChildren.end(); }
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/gi_parse.hxx b/soltools/inc/gi_parse.hxx
deleted file mode 100644
index 23b145333..000000000
--- a/soltools/inc/gi_parse.hxx
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef SOLTOOLS_GI_PARSE_HXX
-#define SOLTOOLS_GI_PARSE_HXX
-
-#include "simstr.hxx"
-#include "gilacces.hxx"
-#include <fstream>
-
-class GenericInfoList_Builder;
-class GenericInfoList_Browser;
-
-/** Reads generic information files into a simple structure in memory.
-
-Information files used by this parser have the following format:
-
-key [value]
-{
-    key [value]
-    key [value]
-    {
-        key [value]
-        ...
-        ...
-    }
-}
-key [value]
-...
-...
-
-*/
-
-
-class GenericInfo_Parser : public GenericInfoParseTypes
-{
-  public:
-    typedef unsigned long   UINT32;
-    typedef short           INT16;
-
-                        GenericInfo_Parser();
-                        ~GenericInfo_Parser();
-
-    /** reads a information file and stores the data in a
-        List_GenericInfo
-    */
-    bool                LoadList(
-                            GenericInfoList_Builder &
-                                                o_rResult,
-                            const Simstr &      i_sSourceFileName );
-
-    /** save the InformationList to rSourceFile
-        returns false on error
-    */
-    bool                SaveList(
-                            const Simstr &      i_rOutputFile,
-                            GenericInfoList_Browser &
-                                                io_rListBrowser );
-
-    E_Error             GetLastError(
-                            UINT32 *            o_pErrorLine = 0 ) const;
-
-  private:
-    enum E_LineType
-    {
-        lt_empty = 0,
-        lt_key,
-        lt_open_list,
-        lt_close_list,
-        lt_comment
-    };
-
-    void                SetError(
-                            E_Error             i_eError );
-    void                ResetState(             
-                            GenericInfoList_Builder &
-                                                io_rResult );
-    void                ResetState(
-                            GenericInfoList_Browser &
-                                                io_rSrc );
-
-    void                ReadLine();
-    bool                InterpretLine();
-    E_LineType          ClassifyLine();
-
-    void                ReadKey();
-    void                PushLevel_Read();           /// When list is opened by '{':
-    void                PopLevel_Read();            /// When list is closed by '}':
-    void                AddCurLine2CurComment();
-
-    void                WriteList(
-                            std::ostream &      o_rFile );
-
-    void                PushLevel_Write();          /// When SubList is pushed in pResource
-    void                PopLevel_Write();           /// When SubList is popped in pResource
-
-    void                WriteComment(
-                            std::ostream &      o_rFile,
-                            const char *        i_sStr );
-    void                WriteKey(
-                            std::ostream &      o_rFile,
-                            const char *        i_sStr );
-    void                WriteValue(
-                            std::ostream &      o_rFile,
-                            const char *        i_sStr );
-    void                WriteIndentation(
-                            std::ostream &      o_rFile );
-
-    // DATA
-    const char *        sCurParsePosition;
-
-    UINT32              nCurLine;
-    INT16               nLevel;
-    bool                bGoon;
-
-    Simstr              sCurComment;
-
-    E_Error             eErrorCode;
-    UINT32              nErrorLine;
-
-    GenericInfoList_Builder *
-                        pResult;
-    GenericInfoList_Browser *
-                        pResource;
-
-    char *              dpBuffer;
-    char *              sFilePtr;
-};
-
-
-inline GenericInfo_Parser::E_Error
-GenericInfo_Parser::GetLastError( UINT32 * o_pErrorLine ) const
-{
-    if ( o_pErrorLine != 0 )
-        *o_pErrorLine = nErrorLine;
-    return eErrorCode;
-}
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/gilacces.hxx b/soltools/inc/gilacces.hxx
deleted file mode 100644
index 0b76ed7c1..000000000
--- a/soltools/inc/gilacces.hxx
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SOLTOOLS_GILACCES_HXX
-#define SOLTOOLS_GILACCES_HXX
-
-
-
-class GenericInfoParseTypes
-{
-  public:
-    enum E_Error
-    {
-        ok = 0,
-        cannot_open,
-        unexpected_eof,
-        syntax_error,
-        unexpected_list_end
-    };
-};
-
-
-
-/** This class is an abstract interface for a service, which
-    builds a memory structure out of a generic information
-    structure, read from a file or other stream.
-
-    There may be different implementations, which build different kinds
-    of memory structures.
-*/
-class GenericInfoList_Builder
-{
-  public:
-    typedef unsigned long   UINT32;
-
-    virtual             ~GenericInfoList_Builder() {}
-
-    virtual void        AddKey(
-                            const char *        i_sKey,
-                            UINT32              i_nKeyLength,
-                            const char *        i_sValue,
-                            UINT32              i_nValueLength,
-                            const char *        i_sComment,
-                            UINT32              i_nCommentLength ) = 0;
-
-    virtual void        OpenList() = 0;
-    virtual void        CloseList() = 0;
-};
-
-
-/** This class is an abstract interface for a service, which
-    returns the values of a generic information tree out of
-    a memory structure.
-
-    There may be different implementations, which browse different
-    kinds of memory structures.
-*/
-class GenericInfoList_Browser
-{
-  public:
-    virtual             ~GenericInfoList_Browser() {}
-
-    virtual bool        Start_CurList() = 0;
-    virtual bool        NextOf_CurList() = 0;
-
-    virtual void        Get_CurKey(
-                            char *              o_rKey ) const = 0;
-    virtual void        Get_CurValue(
-                            char *              o_rValue ) const = 0;
-    virtual void        Get_CurComment(
-                            char *              o_rComment ) const = 0;
-    virtual bool        HasSubList_CurKey() const = 0;
-
-    virtual void        Push_CurList() = 0;
-    virtual void        Pop_CurList() = 0;
-};
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/pch/precompiled_soltools.cxx b/soltools/inc/pch/precompiled_soltools.cxx
deleted file mode 100644
index 3512522b4..000000000
--- a/soltools/inc/pch/precompiled_soltools.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "precompiled_soltools.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/pch/precompiled_soltools.hxx b/soltools/inc/pch/precompiled_soltools.hxx
deleted file mode 100644
index e77fa163f..000000000
--- a/soltools/inc/pch/precompiled_soltools.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:01.811113
-
-#ifdef PRECOMPILED_HEADERS
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/simstr.hxx b/soltools/inc/simstr.hxx
deleted file mode 100644
index bc3636c0d..000000000
--- a/soltools/inc/simstr.hxx
+++ /dev/null
@@ -1,225 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SOLTOOLS_SIMSTR_HXX
-#define SOLTOOLS_SIMSTR_HXX
-
-
-class  Simstr   /// Simple string class.
-{
-// INTERFACE
-  public:
-    // LIFECYCLE
-                        Simstr(
-                           const char *         str = 0);
-                        Simstr(                 /** Creates Simstr out of a copy of the first
-                                                    'nrOfBytes' bytes of 'anyBytes'.
-                                                    Adds a '\0' at the end.  */
-                           const char *         anybytes,
-                           int                  nrOfBytes);
-                        Simstr(                 /** Creates Simstr out of a copy of the described bytes within 'anyBytes'.
-                                                    Adds a '\0' at the end.  */
-                           const char *         anybytes,
-                           int			        firstBytesPos,
-                           int                  nrOfBytes );
-                        Simstr(                 /// Creates Simstr of 'anzahl' times 'c'.
-                           char                 c,
-                           int                  anzahl);
-                        Simstr(
-                           const Simstr &       S);
-                        ~Simstr();
-
-
-    // OPERATORS
-                        operator const char*() const;
-
-    Simstr &            operator=(
-                           const Simstr &       S );
-
-    Simstr              operator+(
-                           const Simstr &       S ) const;
-    Simstr &            operator+=(
-                           const Simstr &       S );
-    Simstr &            operator+=(
-                           const char *         s );
-
-    bool                operator==(
-                           const Simstr &       S ) const;
-    bool                operator!=(
-                           const Simstr &       S ) const;
-    bool                operator<(
-                           const Simstr &       S ) const;
-    bool                operator>(
-                           const Simstr &       S ) const;
-    bool                operator<=(
-                           const Simstr &       S ) const;
-    bool                operator>=(
-                           const Simstr &       S ) const;
-    // INFO
-    static const Simstr &
-                        null_();
-
-    const char *        str() const;
-    int                 l() const;                    // Length of string without '\0' at end.
-    char *              s();   // ATTENTION !!!       // Only to be used, when a function needs a 'char*' but
-                                                      //   nevertheless THAT WILL BE NOT CHANGED!
-                                                      //   Typecasts to 'const char*' are performed automatically.
-    char                get(
-                            int                 n) const;
-    char                get_front() const;
-    char                get_back() const;
-    Simstr              get(
-                            int                 startPos,
-                            int                 anzahl ) const;
-    Simstr              get_front(
-                            int                 anzahl ) const;
-    Simstr              get_back(
-                            int                 anzahl ) const;
-
-    int                 pos_first(
-                            char                c ) const;
-    int                 pos_first_after(
-                            char                c,
-                            int                 startSearchPos ) const;
-    int                 pos_last(
-                            char                c ) const;
-    int                 pos_first(
-                            const Simstr &      S ) const;
-    int                 pos_last(
-                            const Simstr &      S ) const;
-    int                 count(
-                             char                 c ) const;
-    bool                is_empty() const;                         // Only true if object == "".
-    bool                is_no_text() const;                       // String may contain spaces or tabs.
-
-    Simstr              get_first_token(
-                            char                c ) const;
-    Simstr              get_last_token(
-                           char                 c ) const;
-
-    // ACCESS
-    char &              ch(                     /** Reference to sz[n]. Allows change of this char.
-                                                    !!! No safety, if n is out of the allowed range! */
-                            int                 n );
-
-    // OPERATIONS
-    void                insert(
-                            int                 pos,
-                            char                c );
-    void                push_front(
-                            char                c );
-    void                push_back(
-                            char                c );
-    void                insert(
-                            int                 pos,
-                            const Simstr &      S );
-    void                push_front(
-                            const Simstr &      S );
-    void                push_back(
-                            const Simstr &      S );
-
-    void                remove(
-                              int                 pos,
-                            int                 anzahl = 1 );
-    void			    remove_trailing_blanks();
-    void                pop_front(
-                            int                 anzahl = 1 );
-    void                pop_back(
-                            int                 anzahl = 1 );
-    void                rem_back_from(
-                            int                 removeStartPos );
-    void                remove_all(
-                            char                c );
-    void                remove_all(                             // Starts search left.
-                            const Simstr &      S );
-    void                strip(
-                            char                c );                // Removes all characters == c from front and back.
-                                                             //   c == ' ' removes also TABs !!!
-    void                empty();                                // Changes object to the value "".
-
-    void                replace(
-                            int                 pos,
-                            char                c );
-    void                replace(
-                            int                 startPos,
-                            int                 anzahl,
-                            const Simstr &      S );
-    void                replace_all(
-                            char                oldCh,
-                            char                newCh );
-    void                replace_all(
-                            const Simstr &      oldS,
-                            const Simstr &      newS );
-    void                to_lower();
-
-    Simstr              take_first_token(       /// Token is removed from the Simstr.
-                           char                 c );
-    Simstr              take_last_token(        /// Token is removed from the Simstr.
-                           char                 c );
-  private:
-    // DATA
-    char *              sz;
-    int                 len;
-};
-
-// Simstr - char* / char - concatenations
-Simstr operator+(const char * str, const Simstr & S);
-Simstr operator+(const Simstr & S, const char * str);
-Simstr operator+(char c, const Simstr & S);
-Simstr operator+(const Simstr & S, char c);
-
-// Simstr - char* - comparison operators
-bool  operator==(const Simstr & S, const char * str);
-bool  operator!=(const Simstr & S, const char * str);
-bool  operator<(const Simstr & S, const char * str);
-bool  operator>(const Simstr & S, const char * str);
-bool  operator<=(const Simstr & S, const char * str);
-bool  operator>=(const Simstr & S, const char * str);
-bool  operator==(const char * str, const Simstr & S);
-bool  operator!=(const char * str, const Simstr & S);
-bool  operator<(const char * str, const Simstr & S);
-bool  operator>(const char * str, const Simstr & S);
-bool  operator<=(const char * str, const Simstr & S);
-bool  operator>=(const char * str, const Simstr & S);
-
-
-inline const char *
-Simstr::str() const                    { return sz; }
-inline char *
-Simstr::s()                            { return sz; }
-inline int
-Simstr::l() const                      { return len; }
-inline
-Simstr::operator const char*() const   { return sz; }
-inline bool
-Simstr::is_empty() const               { return len == 0; }
-
-
-#endif 
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/st_gilrw.hxx b/soltools/inc/st_gilrw.hxx
deleted file mode 100644
index e533210ec..000000000
--- a/soltools/inc/st_gilrw.hxx
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SOLTOOLS_ST_GILRW_HXX
-#define SOLTOOLS_ST_GILRW_HXX
-
-
-#include "gilacces.hxx"
-#include "st_list.hxx"
-
-class Simstr;
-class List_GenericInfo;
-class GenericInfo;
-class GenericInfo_Parser;
-
-class ST_InfoListReader : public GenericInfoParseTypes,
-                          private GenericInfoList_Builder
-{
-  public:
-    // LIFECYCLE
-                        ST_InfoListReader();
-                        ~ST_InfoListReader();
-    // OPERATIONS
-    bool                LoadList(
-                            List_GenericInfo &  o_rList,
-                            const Simstr &      i_sFileName );
-    // INFO
-    E_Error             GetLastError(
-                            UINT32 *            o_pErrorLine = 0 ) const;
-  private:
-    // Interface GenericInfoList_Builder
-    virtual void        AddKey(
-                            const char *        i_sKey,
-                            UINT32              i_nKeyLength,
-                            const char *        i_sValue,
-                            UINT32              i_nValueLength,
-                            const char *        i_sComment,
-                            UINT32              i_nCommentLength );
-
-    virtual void        OpenList();
-    virtual void        CloseList();
-
-    // Forbid copies:
-                        ST_InfoListReader( const ST_InfoListReader & );
-    ST_InfoListReader & operator=( const ST_InfoListReader & );
-
-    // DATA
-    GenericInfo_Parser *
-                        dpParser;
-
-    ST_List< List_GenericInfo * >
-                        aListStack;
-    GenericInfo *       pCurKey;
-};
-
-class ST_InfoListWriter : public GenericInfoParseTypes,
-                          private GenericInfoList_Browser
-{
-  public:
-    // LIFECYCLE
-                        ST_InfoListWriter();
-                        ~ST_InfoListWriter();
-    // OPERATIONS
-    bool                SaveList(
-                            const Simstr &      i_sFileName,
-                            List_GenericInfo &  io_rList );
-
-    // INFO
-    E_Error             GetLastError() const;
-
-  private:
-    // Interface GenericInfoList_Browser
-    virtual bool        Start_CurList();
-    virtual bool        NextOf_CurList();
-
-    virtual void        Get_CurKey(
-                            char *              o_rKey ) const;
-    virtual void        Get_CurValue(
-                            char *              o_rValue ) const;
-    virtual void        Get_CurComment(
-                            char *              o_rComment ) const;
-    virtual bool        HasSubList_CurKey() const;
-
-    virtual void        Push_CurList();
-    virtual void        Pop_CurList();
-
-    // Forbid copies:
-                        ST_InfoListWriter( const ST_InfoListWriter & );
-    ST_InfoListWriter & operator=( const ST_InfoListWriter & );
-
-    // DATA
-    GenericInfo_Parser *
-                        dpParser;
-
-    ST_List< List_GenericInfo * >
-                        aListStack;
-    GenericInfo *       pCurKey;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/st_list.hxx b/soltools/inc/st_list.hxx
deleted file mode 100644
index 51f0a32fd..000000000
--- a/soltools/inc/st_list.hxx
+++ /dev/null
@@ -1,332 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SOLTOOLS_ST_LIST_HXX
-#define SOLTOOLS_ST_LIST_HXX
-
-#include <string.h>
-#include <iostream>
-#include <stdlib.h>
-
-template <class XX>
-class ST_List            /// Soltools-List.
-{
-  public :
-    typedef XX * 		iterator;
-    typedef const XX *	const_iterator;
-
-    // LIFECYCLE
-                        ST_List();
-                        ST_List(
-                            const ST_List<XX> & i_rList );
-    virtual				~ST_List() { delete[] inhalt; }
-
-    // OPERATORS
-    ST_List<XX> &       operator=(
-                            const ST_List<XX> & i_rList );
-
-    const XX &        	operator[](
-                            unsigned 			n) const
-                                                { return elem(n); }
-    XX &              	operator[](
-                            unsigned 			n)
-                                                { return elem(n); }
-    // OPERATIONS
-    void	            reserve(
-                            unsigned			i_nSize )
-                                                { alloc(i_nSize,true); }
-    void  	 	        insert(
-                            iterator            i_aPos,
-                            const XX &          elem_ )
-                                                { Insert((unsigned)(i_aPos-begin()), elem_); }
-    virtual	void  	 	Insert(
-                            unsigned 			pos,
-                            const XX &          elem );
-    void              	push_back(
-                            const XX & 			elem_)
-                                                { Insert(size(),elem_); }
-    void  	 	        remove(
-                            iterator            i_aPos )
-                                                { Remove((int)(i_aPos-begin())); }
-    virtual	void  	 	Remove(
-                            unsigned 			pos );
-    void              	pop_back()				{ Remove(size()-1); }
-    void 				erase_all()            	{ while (size()) Remove(size()-1); }
-
-    // INQUIRY
-    const_iterator      begin() const           { return &inhalt[0]; }
-    const_iterator      end() const             { return &inhalt[len]; }
-
-    const XX &          front() const       	{ return elem(0); }
-    const XX &          back() const        	{ return elem(len-1); }
-
-    unsigned			size() const            { return len; }
-    unsigned			space() const           { return allocated; }
-    bool              	is_valid_index(
-                            unsigned			n) const
-                                                { return n < len; }
-    // ACCESS
-    iterator            begin()                 { return &inhalt[0]; }
-    iterator            end()                   { return &inhalt[len]; }
-
-    XX &                front()                 { return elem(0); }
-    XX &                back()                  { return elem(len-1); }
-
-  protected:
-    void  				checkSize(
-                            unsigned 			newLength);
-    void				alloc(
-                            unsigned			newSpace,
-                            bool                re = false );
-
-    const XX &		   	elem(
-                            unsigned 			n ) const
-                                                { return inhalt[n]; }
-    XX &				elem(
-                            unsigned 			n )
-                                                { return inhalt[n]; }
-  // DATA
-    XX *				inhalt;
-    unsigned            len;
-    unsigned			allocated;
-};
-
-
-
-template <class XY>
-class DynamicList : public ST_List< XY* >
-{
-  public:
-                        DynamicList();
-                        DynamicList(
-                            const DynamicList<XY> &
-                                                i_rList );
-    virtual				~DynamicList();         /// Deletes all member pointers
-
-    DynamicList<XY> &   operator=(
-                            const DynamicList<XY> &
-                                                i_rList );
-
-    virtual	void  	 	Insert(
-                            unsigned 			pos,
-                            XY * const &        elem );
-    virtual	void  	 	Remove(
-                            unsigned 			pos );
-};
-
-
-
-template <class XX>
-ST_List<XX>::ST_List()
-    :	inhalt(0),
-        len(0),
-        allocated(0)
-{
-    alloc(1);
-}
-
-template <class XX>
-ST_List<XX>::ST_List( const ST_List<XX> & i_rList )
-    :	inhalt(0),
-        len(0),
-        allocated(0)
-{
-    alloc(i_rList.size());
-
-    for ( const_iterator it = i_rList.begin();
-          it != i_rList.end();
-          ++it )
-    {
-         push_back(*it);
-    }
-}
-
-template <class XX>
-ST_List<XX> &
-ST_List<XX>::operator=( const ST_List<XX> & i_rList )
-{
-    for ( const_iterator it = i_rList.begin();
-          it != i_rList.end();
-          ++it )
-    {
-         push_back(*it);
-    }
-    return *this;
-}
-
-template <class XX>
-void
-ST_List<XX>::Insert(unsigned pos, const XX & elem_)
-{
-    if ( pos > len )
-      return;
-
-    checkSize(len+2);
-    for ( unsigned p = len; p > pos; --p)
-    {
-        inhalt[p] = inhalt[p-1];
-    }
-    inhalt[pos] = elem_;
-    len++;
-}
-
-
-template <class XX>
-void
-ST_List<XX>::Remove(unsigned pos)
-{
-    if ( pos >= len )
-      return;
-    len--;
-    for ( unsigned p = pos; p < len; ++p)
-    {
-        inhalt[p] = inhalt[p+1];
-    }
-}
-
-
-// Protected:
-template <class XX>
-void
-ST_List<XX>::checkSize(unsigned newLength)
-{
-   // neuen Platzbedarf pruefen:
-   unsigned newSpace = space();
-   if (newLength >= newSpace)
-   {
-      if (!newSpace)
-         newSpace = 1;
-      const unsigned nBorder = 2000000000;
-      while(newLength >= newSpace)
-      {
-        if (newSpace < nBorder)
-            newSpace <<= 1;
-        else
-        {
-            std::cerr << "List becomes too big" << std::endl;
-            exit(1);
-        }
-      }
-   }
-
-   // Veraenderung ?:
-   if (newSpace != space())
-      alloc(newSpace,true);
-}
-
-template <class XX>
-void
-ST_List<XX>::alloc( unsigned			newSpace,
-                    bool               re )
-{
-    XX * pNew = new XX[newSpace];
-
-    if (inhalt != 0)
-    {
-        if (re)
-        {
-            for (unsigned i = 0; i < len; ++i)
-            {
-                pNew[i] = inhalt[i];
-            }  // end for
-        }
-        delete [] inhalt;
-    }
-
-    inhalt = pNew;
-    allocated = newSpace;
-}
-
-
-template <class XY>
-DynamicList<XY>::DynamicList()
-{
-}
-
-template <class XY>
-DynamicList<XY>::DynamicList( const DynamicList<XY> & i_rList )
-    :   ST_List< XY* >(i_rList)
-{         
-    for ( typename DynamicList<XY>::iterator it = this->begin();
-          it != DynamicList<XY>::end();
-          ++it )
-    {
-        // Copying the contents the pointers point at:
-         (*it) = new XY( *(*it) );
-    }
-}
-
-template <class XY>
-DynamicList<XY>::~DynamicList()
-{
-    this->erase_all();
-}
-
-template <class XY>
-DynamicList<XY> &
-DynamicList<XY>::operator=( const DynamicList<XY> & i_rList )
-{
-    for ( typename DynamicList<XY>::const_iterator it = i_rList.begin();
-          it != i_rList.end();
-          ++it )
-    {
-         push_back( new XY(*(*it)) );
-    }
-    return *this;
-}
-
-
-template <class XY>
-void
-DynamicList<XY>::Insert(unsigned pos, XY * const & elem_)
-{
-    if ( pos > this->len )
-      return;
-
-    checkSize(DynamicList<XY>::len+2);
-    memmove( DynamicList<XY>::inhalt+pos+1, DynamicList<XY>::inhalt+pos, (DynamicList<XY>::len-pos) * sizeof(XY*) );
-    this->inhalt[pos] = elem_;
-    this->len++;
-}
-
-template <class XY>
-void
-DynamicList<XY>::Remove( unsigned pos )
-{
-    if (!this->is_valid_index(pos) )
-        return;
-    this->len--;
-    delete DynamicList<XY>::inhalt[pos];
-    memmove(DynamicList<XY>::inhalt+pos, DynamicList<XY>::inhalt+pos+1, (DynamicList<XY>::len-pos) * sizeof(XY*) );
-}
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/inc/st_types.hxx b/soltools/inc/st_types.hxx
deleted file mode 100644
index 9320dfd61..000000000
--- a/soltools/inc/st_types.hxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SOLTOOLS_ST_TYPES_HXX
-#define SOLTOOLS_ST_TYPES_HXX
-
-typedef unsigned long   UINT32;
-typedef long            INT32;
-typedef unsigned short  UINT16;
-typedef short           INT16;
-
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c
deleted file mode 100644
index 53b5cf51e..000000000
--- a/soltools/javadep/javadep.c
+++ /dev/null
@@ -1,915 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/* All Java Virtual Machine Specs are from
- * "The Java Virtual Machine Specification", T. Lindholm, F. Yellin
- * (JVMS)
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <limits.h>
-
-#if defined(UNX)
-#include <unistd.h>
-#include <netinet/in.h>     /* ntohl(), ntohs() */
-#elif defined(WNT)
-#include <io.h>
-#define access      _access
-#define vsnprintf   _vsnprintf
-#define CDECL       _cdecl
-#define F_OK        00
-#define PATH_MAX    _MAX_PATH
-#define ntohl(x)    ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
-                        (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))      
-
-#define ntohs(x)    ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) 
-#endif
-
-/* max. length of line in response file */
-#define RES_FILE_BUF    65536
-
-struct file {
-    char *pname;
-    FILE *pfs;
-};
-
-struct growable {
-    int     ncur;
-    int     nmax;
-    char    **parray;
-};
-
-typedef struct file     file_t;
-typedef unsigned char   uint8;
-typedef unsigned short  uint16;
-typedef unsigned int    uint32;
-
-struct utf8 {
-    uint16  nlen;
-    void    *pdata;
-};
-
-typedef struct utf8     utf8_t;
-
-/* The contents of the Constant_pool is described in JVMS p. 93
- */
-enum {
-    CONSTANT_Class              = 7,
-    CONSTANT_Fieldref           = 9,
-    CONSTANT_Methodref          = 10,
-    CONSTANT_InterfaceMethodref = 11,
-    CONSTANT_String             = 8,
-    CONSTANT_Integer            = 3,
-    CONSTANT_Float              = 4,
-    CONSTANT_Long               = 5,
-    CONSTANT_Double             = 6,
-    CONSTANT_NameAndType        = 12,
-    CONSTANT_Utf8               = 1
-};
-
-enum { NGROW_INIT = 10, NGROW = 2 };
-
-static char     *pprogname  = "javadep";
-static char     csep        = ';';
-#if defined (UNX)
-#define CDECL
-static char     cpathsep    = '/';
-#elif defined (WNT)
-static char     cpathsep    = '\\';
-#endif
-static FILE     *pfsout     = NULL;
-static char     *pout_file  = NULL;
-
-
-/* prototypes */
-uint8   read_uint8(const file_t *pfile);
-uint16  read_uint16(const file_t *pfile);
-uint32  read_uint32(const file_t *pfile);
-void    skip_bytes(const file_t *pfile, const long nnum);
-char    *escape_slash(const char *pstr);
-int     is_inner(const char *pstr);
-void    print_dependencies(const struct growable *pdep,
-                           const char* pclass_file);
-void    process_class_file(const char *pfilenamem,
-                           const struct growable *pfilt);
-char    *utf8tolatin1(const utf8_t a_utf8);
-void    *xmalloc(size_t size);
-void    *xcalloc(size_t nmemb, size_t size);
-void    *xrealloc(void *ptr, size_t size);
-void    grow_if_needed (struct growable *pgrow);
-int     append_to_growable(struct growable *, char *);
-struct growable *allocate_growable(void);
-void    free_growable(struct growable *pgrowvoid);
-void    create_filters(struct growable *pfilt, const struct growable *pinc);
-void    usage(void);
-void    err_quit(const char *, ...);
-void    silent_quit(void);
-
-#ifdef WNT
-/* poor man's getopt() */
-int     simple_getopt(char *pargv[], const char *poptstring);
-char    *optarg = NULL;
-int     optind  = 1;
-int     optopt  = 0;
-int     opterr  = 0;
-#endif
-
-uint8
-read_uint8(const file_t *pfile)
-{
-    /* read a byte from classfile */
-    size_t nread;
-    uint8 ndata;
-    nread = fread(&ndata, sizeof(uint8), 1, pfile->pfs);
-    if ( !nread ) {
-        fclose(pfile->pfs);
-        err_quit("%s: truncated class file", pfile->pname);
-    }
-    return ndata;
-}
-
-uint16
-read_uint16(const file_t *pfile)
-{
-    /* read a short from classfile and convert it to host format */
-    size_t nread;
-    uint16 ndata;
-    nread = fread(&ndata, sizeof(uint16), 1, pfile->pfs);
-    if ( !nread ) {
-        fclose(pfile->pfs);
-        err_quit("%s: truncated class file", pfile->pname);
-    }
-    ndata = ntohs(ndata);
-    return ndata;
-}
-
-uint32
-read_uint32(const file_t *pfile)
-{
-    /* read an int from classfile and convert it to host format */
-    size_t nread;
-    uint32 ndata;
-    nread = fread(&ndata, sizeof(uint32), 1, pfile->pfs);
-    if ( !nread ) {
-        fclose(pfile->pfs);
-        err_quit("%s: truncated class file", pfile->pname);
-    }
-    ndata = ntohl(ndata);
-    return ndata;
-}
-
-utf8_t
-read_utf8(const file_t *pfile)
-{
-    /* Read a java utf-8-string with uint16 length prependend
-     * from class file. Returns utf8 struct
-     * with fresh allocated datablock,
-     * caller is responsible for freeing.
-     * Data is still in network byteorder
-     */
-
-    utf8_t  a_utf8;
-    size_t  nread;
-
-    a_utf8.pdata = NULL;
-
-    a_utf8.nlen = read_uint16(pfile);
-    if (a_utf8.nlen > 0) {
-        a_utf8.pdata = xmalloc(a_utf8.nlen*sizeof(char));
-        nread = fread(a_utf8.pdata, a_utf8.nlen*sizeof(char), 1, pfile->pfs);
-        if ( !nread ) {
-            fclose(pfile->pfs);
-            err_quit("%s: truncated class file", pfile->pname);
-        }
-    }
-    
-    return a_utf8;
-}
-
-char *utf8tolatin1(const utf8_t a_utf8)
-{
-    /* function returns fresh allocated zero terminated string,
-     * caller is responsible for freeing
-     */
-    
-    /* JVMS p. 101: the null byte is encoded using a two byte format,
-     * Java Virtual Machine Utf8 strings differ in this respect from
-     * standard UTF-8 strings
-     */
-
-    /* Multibyte data is in network byte order */
-
-    char *p;
-    char *pp;
-    char *pstr;
-
-    pstr = pp = xmalloc((a_utf8.nlen+1) * sizeof(char));
-
-    for ( p = (char*)a_utf8.pdata;
-          p <  (char*)a_utf8.pdata+a_utf8.nlen;
-          p++ ) {
-        if ( *p & 0x80 ) {
-            err_quit("sorry, real UTF8 decoding not yet implemented\n"); 
-        } else {
-            *pp++ = *p;
-        }
-    }
-    *pp = '\0';
-    
-    return pstr;
-}
-
-    
-void
-skip_bytes(const file_t *pfile, const long nnumber)
-{
-    /* skip a nnumber of bytes in classfile */
-    if ( fseek(pfile->pfs, nnumber, SEEK_CUR) == -1 )
-         err_quit("%s: %s", pfile->pname, strerror(errno));
-}
-
-void
-add_to_dependencies(struct growable *pdep,
-                    const struct growable *pfilt,
-                    char *pdepstr,
-                    const char *pclass_file)
-{
-    /* create dependencies */
-    int i;
-    size_t nlen_filt, nlen_str, nlen_pdepstr;
-    char *pstr, *ptrunc;
-    char path[PATH_MAX+1];
-    char cnp_class_file[PATH_MAX+1];
-    char cnp_str[PATH_MAX+1];
-    
-    nlen_pdepstr = strlen(pdepstr);
-    pstr = xmalloc((nlen_pdepstr+6+1)*sizeof(char)); 
-    memcpy(pstr, pdepstr, nlen_pdepstr+1);
-    strncat(pstr, ".class", 6);
-    
-    if ( pfilt->ncur == 0 ) { /* no filters */
-        if ( access(pstr, F_OK) == 0 ) {
-            append_to_growable(pdep, strdup(pstr));
-        }
-    } else {
-        nlen_str    = strlen(pstr);
-        for ( i = 0; i < pfilt->ncur; i++ ) {
-            nlen_filt   = strlen(pfilt->parray[i]);
-            if ( nlen_filt + 1 + nlen_str > PATH_MAX )
-                err_quit("path to long");
-            memcpy(path, pfilt->parray[i], nlen_filt);
-            path[nlen_filt]     = '/';
-            memcpy( path+nlen_filt+1, pstr, nlen_str+1);
-
-            if ( access(path, F_OK) != 0 ) {
-                free(pstr);
-                pstr = NULL;
-                return; /* path doesn't represent a real file, don't bother */
-            }
-
-            /* get the canonical path */
-#if defined (UNX)
-            if ( !(realpath(pclass_file, cnp_class_file)
-                && realpath(path, cnp_str) ) ) {
-                err_quit("can't get the canonical path");
-            }
-#else           
-            if ( !(_fullpath(cnp_class_file, pclass_file, sizeof(cnp_class_file))
-                && _fullpath(cnp_str, path, sizeof(cnp_str)) ) ) {
-                err_quit("can't get the canonical path");
-            }
-#endif          
-
-            /* truncate so that only the package prefix remains */
-            ptrunc = strrchr(cnp_str, cpathsep);
-            *ptrunc = '\0';
-            ptrunc = strrchr(cnp_class_file, cpathsep);
-            *ptrunc = '\0';
-
-            if ( !strcmp(cnp_str, cnp_class_file) ) {
-                free(pstr);
-                pstr = NULL;
-                return; /* identical, don't bother with this one */
-            }
-
-            append_to_growable(pdep, strdup(path));
-        }
-    }
-    free(pstr);
-    return;  
-}
-
-char *
-escape_slash(const char *pstr)
-{
-    /* returns a fresh allocated string with all cpathsep escaped exchanged
-     * with "$/"
-     *
-     * caller is responsible for freeing
-     */
-
-    const char *pp = pstr;
-    char *p, *pnp;
-    char *pnew_str;
-    size_t nlen_pnp, nlen_pp;
-    int i = 0;
-    
-    while ( (p=strchr(pp, cpathsep)) != NULL ) {
-        ++i;
-        pp = ++p;
-    }
-
-    nlen_pnp = strlen(pstr) + i;
-    pnp = pnew_str = xmalloc((nlen_pnp+1) * sizeof(char));
-
-    pp = pstr;
-
-    if ( i > 0 ) {
-        while ( (p=strchr(pp, cpathsep)) != NULL ) {
-            memcpy(pnp, pp, p-pp);
-            pnp += p-pp;
-            *pnp++ = '$';
-            *pnp++ = '/'; 
-            pp = ++p;
-        }
-    }
-    nlen_pp = strlen(pp);
-    memcpy(pnp, pp, nlen_pp+1);
-
-    return pnew_str;
-}
-
-
-void
-print_dependencies(const struct growable *pdep, const char* pclass_file)
-{
-    char *pstr;
-    int i;
-
-    pstr = escape_slash(pclass_file);
-    fprintf(pfsout, "%s:", pstr);
-    free(pstr); 
-
-    for( i=0; i<pdep->ncur; ++i) {
-        fprintf(pfsout, "  \\\n");
-        pstr=escape_slash(pdep->parray[i]);
-        fprintf(pfsout, "\t%s", pstr);
-        free(pstr);
-    }
-
-    fprintf(pfsout,"\n\n");
-    return;
-}
-
-int
-is_inner(const char *pstr)
-{
-    /* return true if character '$' is found in classname */
-
-    /*
-     * note that a '$' in a classname is not an exact indicator
-     * for an inner class. Java identifier may legally contain 
-     * this chararcter, and so may classnames. In the context
-     * of javadep this doesn't matter since the makefile system
-     * can't cope with classfiles with '$'s in the filename 
-     * anyway.
-     *
-     */
-    
-    if ( strchr(pstr, '$') != NULL )
-        return 1;
-
-    return 0;   
-}
-    
-void
-process_class_file(const char *pfilename, const struct growable *pfilt)
-{
-    /* read class file and extract object information
-     * java class files are in bigendian data format
-     * (JVMS, p. 83)
-     */
-    int     i;
-    uint32  nmagic;
-    uint16  nminor, nmajor;
-    uint16  ncnt;
-    uint16  nclass_cnt;
-    utf8_t* pc_pool;
-    uint16* pc_class;
-    file_t  file;
-
-    struct growable *pdepen;
-
-    file.pname = (char*)pfilename;
-
-    file.pfs = fopen(file.pname,"rb");
-    if ( !file.pfs )
-        silent_quit();
-         
-    nmagic = read_uint32(&file);
-
-    if ( nmagic != 0xCAFEBABE ) {
-        fclose(file.pfs);
-        err_quit("%s: invalid magic", file.pname);
-    }
-
-    nminor = read_uint16(&file);
-    nmajor = read_uint16(&file);
-    
-    /* get number of entries in constant pool */
-    ncnt = read_uint16(&file);
-
-#ifdef DEBUG    
-    printf("Magic: %x\n", nmagic);
-    printf("Major %d, Minor %d\n", nmajor, nminor);
-    printf("Const_pool_count %d\n", ncnt);
-#else
-    (void)nmajor;
-    (void)nminor;
-#endif
-
-    /* There can be ncount entries in the constant_pool table
-     * so at most ncount-1 of them can be of type CONSTANT_Class
-     * (at leat one CONSTANT_Utf8 entry must exist).
-     * Usually way less CONSTANT_Class entries exists, of course
-     */
-    
-    pc_pool = xcalloc(ncnt,sizeof(utf8_t));
-    pc_class = xmalloc((ncnt-1)*sizeof(uint16));
-
-    /* pc_pool[0] is reserved to the java virtual machine and does
-     * not exist in the class file
-     */
-
-    nclass_cnt = 0;
-    
-    for (i = 1; i < ncnt; i++) {
-        uint8   ntag;
-        uint16  nindex;
-        utf8_t  a_utf8;
-
-        ntag = read_uint8(&file);
-
-        /* we are only interested in CONSTANT_Class entries and
-         * Utf8 string entries, because they might belong to
-         * CONSTANT_Class entries
-         */
-        switch(ntag) {
-            case CONSTANT_Class:
-                nindex = read_uint16(&file);
-                pc_class[nclass_cnt++] = nindex;
-                break;
-            case CONSTANT_Fieldref:
-            case CONSTANT_Methodref:
-            case CONSTANT_InterfaceMethodref:
-                skip_bytes(&file, 4L);
-                break;
-            case CONSTANT_String:
-                skip_bytes(&file, 2L);
-                break;
-            case CONSTANT_Integer:
-            case CONSTANT_Float:
-                skip_bytes(&file, 4L);
-                break;
-            case CONSTANT_Long:
-            case CONSTANT_Double:
-                skip_bytes(&file, 8L);
-                /* Long and Doubles take 2(!)
-                 * entries in constant_pool_table
-                 */
-                i++;
-                break;
-            case CONSTANT_NameAndType:
-                skip_bytes(&file, 4L);
-                break;
-            case CONSTANT_Utf8:
-                a_utf8 = read_utf8(&file);
-                pc_pool[i] = a_utf8;
-                break;
-            default:
-                /* Unknown Constant_pool entry, this means we are
-                 * in trouble
-                 */
-                err_quit("corrupted class file\n");
-                break;
-                
-        }
-    }
-        
-    fclose(file.pfs);
-
-    pdepen = allocate_growable();
-
-    for (i = 0; i < nclass_cnt; i++) {
-        char *pstr, *ptmpstr;
-        pstr = ptmpstr = utf8tolatin1(pc_pool[pc_class[i]]);
-        /* we are not interested in inner classes */
-        if ( is_inner(pstr) ) {
-            free(pstr);
-            pstr = NULL;
-            continue;
-        }
-        /* strip off evt. array indicators */
-        if ( *ptmpstr == '[' ) {
-            while ( *ptmpstr == '[' )
-                ptmpstr++;
-            /* we only interested in obj. arrays, which are marked with 'L' */
-            if ( *ptmpstr == 'L' ) {
-                char *p = pstr;
-                pstr = strdup(++ptmpstr);
-                /* remove final ';' from object array name */
-                pstr[strlen(pstr)-1] = '\0';
-                free(p);
-            } else {
-                free(pstr);
-                pstr = NULL;
-            }
-        }
-
-        if (pstr) {
-            add_to_dependencies(pdepen, pfilt, pstr, file.pname);
-            free(pstr);
-        }
-    }
-
-    print_dependencies(pdepen, file.pname);
-    free_growable(pdepen);
-    pdepen = NULL;
-
-    for (i = 0; i < ncnt; i++)
-        free(pc_pool[i].pdata);
-    
-    free(pc_class);
-    free(pc_pool);
-}
-
-void *
-xmalloc(size_t size)
-{
-    void *ptr;
-
-    ptr = malloc(size);
-    
-    if ( !ptr )
-        err_quit("out of memory");
-
-    return ptr;
-}
-
-                 
-void *
-xcalloc(size_t nmemb, size_t size)
-{
-    void *ptr;
-
-    ptr = calloc(nmemb, size);
-    
-    if ( !ptr )
-        err_quit("out of memory");
-
-    return ptr;
-}
-
-void *
-xrealloc(void *ptr, size_t size)
-{
-    void *newptr = realloc(ptr, size);
-    
-    if (newptr)
-        ptr = newptr;
-    else
-        err_quit("out of memory");
-
-    return ptr;
-}
-
-void
-err_quit(const char* fmt, ...)
-{
-    /* No dependency file must be generated for any error condition,
-     * just print message and exit.
-     */
-    va_list args;
-    char buffer[PATH_MAX];
-
-    va_start(args, fmt);
-    
-    if ( pprogname )
-        fprintf(stderr, "%s: ", pprogname);
-    vsnprintf(buffer, sizeof(buffer), fmt, args);
-    fputs(buffer, stderr);
-    fputc('\n', stderr);
-
-    va_end(args);
-
-    /* clean up */
-    if ( pfsout && pfsout != stdout ) {
-        fclose(pfsout);
-        unlink(pout_file);
-    }
-    exit(1);
-}
-
-void
-silent_quit()
-{
-    /* In some cases we should just do a silent exit */
-
-    /* clean up */
-    if ( pfsout && pfsout != stdout ) {
-        fclose(pfsout);
-        unlink(pout_file);
-    }
-    exit(0);
-}
-    
-int append_to_growable(struct growable *pgrow, char *pstr) 
-{
-    /* append an element pstr to pgrow, 
-     * return new number of elements 
-     */
-    grow_if_needed(pgrow);
-    pgrow->parray[pgrow->ncur++] = pstr;
-    return pgrow->ncur;
-}
-
-void
-grow_if_needed(struct growable *pgrow)
-{
-    /* grow growable arrays */
-
-    if ( pgrow->ncur >= pgrow->nmax ) {
-        pgrow->parray = xrealloc(pgrow->parray,
-                           (NGROW*pgrow->nmax)*sizeof(char*));
-        pgrow->nmax *= NGROW;
-    }
-    return;
-}
-
-struct growable *allocate_growable(void)
-{
-    /* allocate an growable array, 
-     * initialize with NGROW_INIT elements
-     */
-    
-    struct growable *pgrow;
-
-    pgrow = xmalloc(sizeof(struct growable));
-    pgrow->parray = xmalloc(NGROW_INIT*sizeof(char *));
-    pgrow->nmax = NGROW_INIT;
-    pgrow->ncur = 0;
-    return pgrow;
-}
-        
-void
-free_growable(struct growable *pgrow)
-{
-    int i;
-    for( i = 0; i < pgrow->ncur; i++ )
-        free(pgrow->parray[i]);
-    free(pgrow->parray);
-    free(pgrow);
-}
-
-void
-create_filters(struct growable *pfilt, const struct growable *pinc)
-{
-    char *p, *pp, *pstr;
-    int i;
-    size_t nlen, nlen_pstr;
-    /* break up includes into filter list */
-    for ( i = 0; i < pinc->ncur; i++ ) {
-        pp = pinc->parray[i];
-    
-        while ( (p = strchr(pp, csep)) != NULL) {
-            nlen = p - pp;
-            pstr = xmalloc((nlen+1)*sizeof(char*));
-            memcpy(pstr, pp, nlen);
-            pstr[nlen] = '\0';
-            append_to_growable(pfilt, pstr);
-            pp = p + 1;
-        }
-        nlen_pstr = strlen(pp);
-        pstr = xmalloc((nlen_pstr+1)*sizeof(char*));
-        memcpy(pstr, pp, nlen_pstr+1);
-        append_to_growable(pfilt, pstr);
-    }
-
-}
-    
-void
-usage()
-{
-    fprintf(stderr,
-            "usage: %s [-i|-I includepath ...  -s|-S seperator "
-            "-o|-O outpath -v|-V -h|-H] <file> ....\n",
-            pprogname);
-}
-
-#ifdef WNT
-/* my very simple minded implementation of getopt()
- * it's to sad that getopt() is not available everywhere
- * note: this is not a full POSIX conforming getopt()
- */
-int simple_getopt(char *pargv[], const char *poptstring)
-{
-    char *parg = pargv[optind];
-
-    /* skip all response file arguments */
-    if ( parg ) {
-        while ( *parg == '@' )
-            parg = pargv[++optind];
-        
-        if ( parg[0] == '-' && parg[1] != '\0' ) {
-            char *popt;
-            int c = parg[1];
-            if ( (popt = strchr(poptstring, c)) == NULL ) {
-               optopt = c;
-                if ( opterr )
-                    fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt);
-                return '?';
-            }
-            if ( *(++popt) == ':') {
-                if ( parg[2] != '\0' ) {
-                    optarg = ++parg;
-                } else {
-                    optarg = pargv[++optind];
-                }
-            } else {
-                optarg = NULL;
-            }
-            ++optind;
-            return c;
-        }
-    }
-    return -1;
-}
-#endif
-
-int CDECL
-main(int argc, char *argv[])
-{
-    int     bv_flag = 0;
-    struct  growable *presp, *pincs, *pfilters;
-    int     c, i, nall_argc;
-    char    **pall_argv;
-
-    presp = allocate_growable();
-    
-    /* FIXME: cleanup the option parsing */
-    /* search for response file, read it */
-    for ( i = 1; i < argc; i++ ) {
-        char *parg = argv[i];
-        char buffer[RES_FILE_BUF];
-
-        if ( *parg == '@' ) {
-            FILE *pfile = fopen(++parg, "r");
-            if ( !pfile )
-                err_quit("%s: %s", parg, strerror(errno));
-            while ( !feof(pfile) ) {
-                char *p, *token;
-                
-                if ( fgets(buffer, RES_FILE_BUF, pfile) ) {;
-                    p = buffer;
-                    while ( (token = strtok(p, " \t\n")) != NULL ) {
-                        p = NULL;
-                        append_to_growable(presp, strdup(token));
-                    }
-                }
-            }
-            fclose(pfile);
-        }
-    }
-                
-    /* copy all arguments incl. response file in one array
-     * for parsing with getopt
-     */
-    nall_argc = argc + presp->ncur;
-    pall_argv = xmalloc((nall_argc+1)*sizeof(char *));
-    memcpy(pall_argv, argv, argc*sizeof(char *));
-    memcpy(pall_argv+argc, presp->parray, presp->ncur*sizeof(char *));
-    *(pall_argv+argc+presp->ncur) = '\0'; /* terminate */
-    
-    opterr = 0;
-    pincs = allocate_growable();
-
-#ifdef WNT
-    while( (c = simple_getopt(pall_argv, ":i:I:s:S:o:OhHvV")) != -1 ) {
-#else
-    while( (c = getopt(nall_argc, pall_argv, ":i:I:s:S:o:OhHvV")) != -1 ) {
-#endif
-        switch(c) {
-            case 'i':
-            case 'I':
-                append_to_growable(pincs, strdup(optarg));
-                break;
-            case 's':
-            case 'S':
-                csep = optarg[0];
-                break;
-            case 'o':
-            case 'O':
-                pout_file = optarg;
-                break;
-            case 'h':
-            case 'H':
-                usage();
-                return 0;
-                break;
-            case 'v':
-            case 'V':
-                bv_flag = 1;
-                break;
-            case '?':
-                if (isprint (optopt))
-                    fprintf (stderr,
-                             "Unknown option `-%c'.\n", optopt);
-                else
-                    fprintf (stderr,
-                             "Unknown option character `\\x%x'.\n",
-                             optopt);
-                usage();
-                return 1;
-                break;
-            case ':':
-                fprintf(stderr, "Missing parameter.\n");
-                usage();
-                return 1;
-                break;
-            default:
-                usage();
-                return 1;
-                break;
-        }
-    }
-
-    pfilters = allocate_growable();
-    create_filters(pfilters, pincs);
-    free_growable(pincs);
-    pincs = NULL;
-
-    if ( pout_file ) {
-        pfsout = fopen(pout_file, "w");
-        if ( !pfsout )
-            err_quit("%s: %s", pout_file, strerror(errno));
-    } else {
-        pfsout = stdout;
-    }
-    
-    /* the remaining arguments are either class file
-     * names or response files, ignore response file
-     * since they have already been included
-     */
-    for ( i = optind; i < nall_argc; i++ ) {
-        char *parg = pall_argv[i];
-        if ( *parg != '@' ) {
-            process_class_file(parg, pfilters);
-            if ( pfsout != stdout ) {
-                if ( bv_flag )
-                    printf("Processed %s ...\n", parg);
-            }
-        }
-    }
-    
-    free_growable(pfilters);
-    pfilters = NULL;
-    free(pall_argv);
-    pall_argv = NULL;
-    free_growable(presp);
-    presp = NULL;
-
-    fclose(pfsout);
-    exit(0);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk
deleted file mode 100644
index e6dcf3235..000000000
--- a/soltools/javadep/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=javadep
-TARGETTYPE=CUI
-NO_DEFAULT_STL=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-    @echo Nothing done when cross-compiling
-.ENDIF
-
-UWINAPILIB=$(0)
-LIBSALCPPRT=$(0)
-
-# --- Files --------------------------------------------------------
-
-APP1TARGET	= 	javadep
-APP1OBJS	=	$(OBJ)$/javadep.obj
-DEPOBJFILES	=	$(APP1OBJS)
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/soltools/ldump/hashtbl.cxx b/soltools/ldump/hashtbl.cxx
deleted file mode 100644
index bd8c098de..000000000
--- a/soltools/ldump/hashtbl.cxx
+++ /dev/null
@@ -1,448 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-
-#include "hashtbl.hxx"
-#include <string.h>
-
-// -------------------------------------------------------------
-// class HashItem
-//
-class HashItem
-{
-    enum ETag { TAG_EMPTY, TAG_USED, TAG_DELETED };
-
-    void*   m_pObject;
-    ETag    m_Tag;
-    char*	m_Key;
-
-public:
-    HashItem() { m_Tag = TAG_EMPTY; m_Key = NULL; m_pObject = NULL; }
-    ~HashItem() { delete [] m_Key; }	
- 
-    bool IsDeleted() const
-    {   return m_Tag == TAG_DELETED; }
-
-    bool IsEmpty() const
-    {   return m_Tag == TAG_DELETED || m_Tag == TAG_EMPTY; }
-
-    bool IsFree() const
-    {   return m_Tag == TAG_EMPTY; }
-
-    bool IsUsed() const
-    {   return m_Tag == TAG_USED; }
-
-    void Delete()
-    { m_Tag = TAG_DELETED; delete [] m_Key; m_Key = new char[ 1 ]; m_Key[ 0 ] = 0; m_pObject = NULL; }
-
-    const char *GetKey() const
-    { return m_Key; }
-
-    void* GetObject() const
-    { return m_pObject; }
-
-    void SetObject(const char * Key, void *pObject)
-    { m_Tag = TAG_USED; delete [] m_Key; m_Key = new char[ strlen( Key ) + 1 ]; strcpy( m_Key, Key ); m_pObject = pObject; }
-};
-
-#define MIN(a,b) (a)<(b)?(a):(b)
-#define MAX(a,b) (a)>(b)?(a):(b)
-
-// -------------------------------------------------------------
-// class HashTable
-//
-
-/*static*/ double HashTable::m_defMaxLoadFactor = 0.5;
-/*static*/ double HashTable::m_defDefGrowFactor = 2.0;
-
-HashTable::HashTable(unsigned long lSize, bool bOwner, double dMaxLoadFactor, double dGrowFactor)
-{
-    m_lSize          = lSize;
-    m_bOwner         = bOwner;
-    m_lElem          = 0;
-    m_dMaxLoadFactor = MAX(0.5,MIN(1.0,dMaxLoadFactor));  // 0.5 ... 1.0
-    m_dGrowFactor    = MAX(2.0,MIN(5.0,dGrowFactor));     // 1.3 ... 5.0
-    m_pData          = new HashItem [lSize];
-}
-
-HashTable::~HashTable()
-{
-    // Wenn die HashTable der Owner der Objecte ist,
-    // müssen die Destruktoren separat gerufen werden.
-    // Dies geschieht über die virtuelle Methode OnDeleteObject()
-    //
-    // Problem: Virtuelle Funktionen sind im Destructor nicht virtuell!!
-    //          Der Code muß deshalb ins Macro
-
-    // Speicher für HashItems freigeben
-    delete [] m_pData;
-}
-
-void* HashTable::GetObjectAt(unsigned long lPos) const
-// Gibt Objekt zurück, wenn es eines gibt, sonst NULL;
-{
-    HashItem *pItem = &m_pData[lPos];
-
-    return pItem->IsUsed() ? pItem->GetObject() : NULL;
-}
-
-void HashTable::OnDeleteObject(void*)
-{
-}
-
-unsigned long HashTable::Hash(const char *Key) const
-{
-    // Hashfunktion von P.J. Weinberger
-    // aus dem "Drachenbuch" von Aho/Sethi/Ullman
-    unsigned long i,n;
-    unsigned long h = 0;
-    unsigned long g = 0;
-
-    for (i=0,n=strlen( Key ); i<n; i++)
-    {
-        h = (h<<4) + (unsigned long)(unsigned short)Key[i];
-        g = h & 0xf0000000;
-
-        if (g != 0)
-        {
-            h = h ^ (g >> 24);
-            h = h ^ g;
-        }
-    }
-
-    return h % m_lSize;
-}
-
-unsigned long HashTable::DHash(const char* Key, unsigned long lOldHash) const
-{
-    unsigned long lHash = lOldHash;
-    unsigned long i,n;
-
-    for (i=0,n=strlen( Key ); i<n; i++)
-    {
-        lHash *= 256L;
-        lHash += (unsigned long)(unsigned short)Key[i];
-        lHash %= m_lSize;
-    }
-    return lHash;
-}
-
-unsigned long HashTable::Probe(unsigned long lPos) const
-// gibt den Folgewert von lPos zurück
-{
-    lPos++; if (lPos==m_lSize) lPos=0;
-    return lPos;
-}
-
-bool HashTable::IsFull() const
-{
-    return m_lElem>=m_lSize;
-}
-
-bool HashTable::Insert(const char * Key, void* pObject)
-// pre:  Key ist nicht im Dictionary enthalten, sonst return FALSE
-//       Dictionary ist nicht voll, sonst return FALSE
-// post: pObject ist unter Key im Dictionary; m_nElem wurde erhöht
-{
-    SmartGrow();
-
-    if (IsFull())
-    {
-        return false;
-    }
-
-    if (FindPos(Key) != NULL )
-        return false;
-
-    unsigned long     lPos  = Hash(Key);
-    HashItem *pItem = &m_pData[lPos];
-
-    // first hashing
-    //
-    if (pItem->IsEmpty())
-    {
-        pItem->SetObject(Key, pObject);
-        m_lElem++;
-
-        return true;
-    }
-
-    // double hashing
-    //
-    lPos  = DHash(Key,lPos);
-    pItem = &m_pData[lPos];
-
-    if (pItem->IsEmpty())
-    {
-        pItem->SetObject(Key, pObject);
-        m_lElem++;
-
-        return true;
-    }
-
-    // linear probing
-    //
-    do
-    {
-        lPos  = Probe(lPos);
-        pItem = &m_pData[lPos];
-    }
-    while(!pItem->IsEmpty());
-
-    pItem->SetObject(Key, pObject);
-    m_lElem++;
-    return true;
-}
-
-HashItem* HashTable::FindPos(const char * Key) const
-// sucht den Key; gibt Refrenz auf den Eintrag (gefunden)
-// oder NULL (nicht gefunden) zurück
-//
-// pre:  -
-// post: -
-{
-    // first hashing
-    //
-    unsigned long     lPos  = Hash(Key);
-    HashItem *pItem = &m_pData[lPos];
-
-    if (pItem->IsUsed()
-    &&  !(strcmp( pItem->GetKey(), Key )))
-    {
-        return pItem;
-    }
-
-    // double hashing
-    //
-    if (pItem->IsDeleted() || pItem->IsUsed())
-    {
-        lPos  = DHash(Key,lPos);
-        pItem = &m_pData[lPos];
-
-        if (pItem->IsUsed()
-        &&  (!strcmp( pItem->GetKey(), Key)))
-        {
-            return pItem;
-        }
-
-        // linear probing
-        //
-        if (pItem->IsDeleted() || pItem->IsUsed())
-        {
-            unsigned long n      = 0;
-            bool  bFound = false;
-            bool  bEnd   = false;
-
-            do
-            {
-                n++;
-                lPos   = Probe(lPos);
-                pItem  = &m_pData[lPos];
-
-                bFound =  pItem->IsUsed()
-                       && !( strcmp( pItem->GetKey(), Key ));
-
-                bEnd = !(n<m_lSize || pItem->IsFree());
-            }
-            while(!bFound && !bEnd);
-
-            return bFound ? pItem : NULL;
-        }
-    }
-
-    // nicht gefunden
-    //
-    return NULL;
-}
-
-void* HashTable::Find(const char *Key) const
-// Gibt Verweis des Objektes zurück, das unter Key abgespeichert ist,
-// oder NULL wenn nicht vorhanden.
-//
-// pre:  -
-// post: -
-{
-    HashItem *pItem = FindPos(Key);
-
-    if (pItem != NULL
-    && ( !strcmp( pItem->GetKey(), Key )))
-        return pItem->GetObject();
-    else
-        return NULL;
-}
-
-void* HashTable::Delete( const char * Key)
-// Löscht Objekt, das unter Key abgespeichert ist und gibt Verweis
-// darauf zurück.
-// Gibt NULL zurück, wenn Key nicht vorhanden ist.
-//
-// pre:  -
-// post: Objekt ist nicht mehr enthalten; m_lElem dekrementiert
-//       Wenn die HashTable der Owner ist, wurde das Object gelöscht
-{
-    HashItem *pItem = FindPos(Key);
-
-    if (pItem != NULL
-    &&  ( !strcmp( pItem->GetKey(), Key )))
-    {
-        void* pObject = pItem->GetObject();
-
-        if (m_bOwner)
-            OnDeleteObject(pObject);
-
-        pItem->Delete();
-        m_lElem--;
-        return pObject;
-    }
-    else
-    {
-        return NULL;
-    }
-}
-
-double HashTable::CalcLoadFactor() const
-// prozentuale Belegung der Hashtabelle berechnen
-{
-    return double(m_lElem) / double(m_lSize);
-}
-
-void HashTable::SmartGrow()
-// Achtung: da die Objekte umkopiert werden, darf die OnDeleteObject-Methode
-//          nicht gerufen werden
-{
-    double dLoadFactor = CalcLoadFactor();
-
-    if (dLoadFactor <= m_dMaxLoadFactor)
-        return; // nothing to grow
-
-    unsigned long     lOldSize = m_lSize;              // alte Daten sichern
-    HashItem* pOldData = m_pData;
-
-    m_lSize = (unsigned long) (m_dGrowFactor * m_lSize); // neue Größe
-    m_pData = new HashItem[m_lSize];           // neue Daten holen
-
-    // kein Speicher:
-    // Zustand "Tabelle voll" wird in Insert abgefangen
-    //
-    if (m_pData == NULL)
-    {
-        m_lSize = lOldSize;
-        m_pData = pOldData;
-        return;
-    }
-
-    m_lElem = 0;                               // noch keine neuen Daten
-
-    // Umkopieren der Daten
-    //
-    for (unsigned long i=0; i<lOldSize; i++)
-    {
-        HashItem *pItem = &pOldData[i];
-
-        if (pItem->IsUsed())
-            Insert(pItem->GetKey(),pItem->GetObject());
-    }
-
-    delete [] pOldData;
-}
-
-// Iterator ---------------------------------------------------------
-//
-
-HashTableIterator::HashTableIterator(HashTable const& aTable)
-: m_aTable(aTable)
-{
-    m_lAt = 0;
-}
-
-void* HashTableIterator::GetFirst()
-{
-    m_lAt = 0;
-    return FindValidObject(true /* forward */);
-}
-
-void* HashTableIterator::GetLast()
-{
-    m_lAt = m_aTable.GetSize() -1;
-    return FindValidObject(false /* backward */);
-}
-
-void* HashTableIterator::GetNext()
-{
-    if (m_lAt+1 >= m_aTable.GetSize())
-        return NULL;
-
-    m_lAt++;
-    return FindValidObject(true /* forward */);
-}
-
-void* HashTableIterator::GetPrev()
-{
-    if (m_lAt <= 0)
-        return NULL;
-
-    m_lAt--;
-    return FindValidObject(false /* backward */);
-}
-
-void* HashTableIterator::FindValidObject(bool bForward)
-// Sucht nach einem vorhandenen Objekt ab der aktuellen
-// Position.
-//
-// pre:  ab inkl. m_lAt soll die Suche beginnen
-// post: if not found then
-//			if bForward == TRUE then
-//				m_lAt == m_aTable.GetSize() -1
-//			else
-//				m_lAt == 0
-//		 else
-//			m_lAt ist die gefundene Position
-{
-    void *pObject = m_aTable.GetObjectAt(m_lAt);
-
-    if (pObject != NULL)
-        return pObject;
-
-    while (pObject == NULL
-       && (bForward ? ((m_lAt+1) < m_aTable.GetSize())
-                    :   m_lAt    > 0))
-    {
-        if (bForward)
-            m_lAt++;
-        else
-            m_lAt--;
-
-        pObject = m_aTable.GetObjectAt(m_lAt);
-    }
-
-    return pObject;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/ldump/hashtbl.hxx b/soltools/ldump/hashtbl.hxx
deleted file mode 100644
index b65767147..000000000
--- a/soltools/ldump/hashtbl.hxx
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _HASHTBL_HXX
-#define _HASHTBL_HXX
-
-// ADT hash table
-//
-// Invariante:
-//    1. m_lElem < m_lSize
-//    2. die Elemente in m_Array wurden double-hashed erzeugt
-//
-class HashItem;
-
-class HashTable
-{
-    unsigned long m_lSize;
-    unsigned long m_lElem;
-    HashItem *m_pData;
-    double    m_dMaxLoadFactor;
-    double    m_dGrowFactor;
-    bool      m_bOwner;
-
-    unsigned long Hash(const char *cKey) const;
-    unsigned long DHash(const char *cKey , unsigned long lHash) const;
-    unsigned long Probe(unsigned long lPos) const;
-
-    HashItem* FindPos(const char *cKey) const;
-    void      SmartGrow();
-    double    CalcLoadFactor() const;
-
-protected:
-    friend class HashTableIterator;
-
-    virtual void OnDeleteObject(void* pObject);
-
-    void* GetObjectAt(unsigned long lPos) const;
-
-// Default-Werte
-public:
-    static double m_defMaxLoadFactor;
-    static double m_defDefGrowFactor;
-
-public:
-    HashTable
-    (
-        unsigned long	lSize,
-        bool	bOwner,
-        double	dMaxLoadFactor = HashTable::m_defMaxLoadFactor /* 0.8 */,
-        double	dGrowFactor = HashTable::m_defDefGrowFactor /* 2.0 */
-    );
-
-    virtual ~HashTable();
-
-    bool  IsFull() const;
-    unsigned long GetSize() const { return m_lSize; }
-
-    void* Find   (const char *cKey ) const;
-    bool  Insert (const char *cKey , void* pObject);
-    void* Delete (const char *cKey);
-};
-
-// ADT hash table iterator
-//
-// Invariante: 0 <= m_lAt < m_aTable.GetCount()
-//
-class HashTableIterator
-{
-    unsigned long	 m_lAt;
-    HashTable const& m_aTable;
-
-    void operator =(HashTableIterator &); // not defined
-
-    void* FindValidObject(bool bForward);
-
-protected:
-    void* GetFirst(); // Interation _ohne_ Sortierung
-    void* GetNext();
-    void* GetLast();
-    void* GetPrev();
-
-public:
-    HashTableIterator(HashTable const&);
-};
-
-#endif // _HASHTBL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx
deleted file mode 100644
index 24a6a7aef..000000000
--- a/soltools/ldump/ldump.cxx
+++ /dev/null
@@ -1,756 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-
-#include <string.h>
-#include <direct.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "ldump.hxx"
-#include "hashtbl.hxx"
-
-#define MAXSYM     65536
-#define MAXBASE    98304
-#define MAX_MAN		4096
-
-int	bFilter = 0;
-int bLdump3 = 0;
-int bUseDirectives = 0;
-int bVerbose = 0;
-int bExportByName = 0;
-
-class ExportSet : public HashTable
-{
-public:
-    ExportSet
-    (
-        unsigned long lSize,
-        double	dMaxLoadFactor = HashTable::m_defMaxLoadFactor,
-        double	dGrowFactor = HashTable::m_defDefGrowFactor
-    )
-        : HashTable(lSize,false,dMaxLoadFactor,dGrowFactor) {}
-
-    virtual ~ExportSet() {}
-
-    LibExport *  Find (char * const& Key) const
-    { return (LibExport *) HashTable::Find((char *) Key); }
-
-    bool Insert (char * const& Key, LibExport * Object)
-    { return HashTable::Insert((char *) Key, (void*) Object); }
-
-    LibExport *  Delete (char * const&Key)
-    { return (LibExport *) HashTable::Delete ((char *) Key); }
-};
-
-LibDump::LibDump( char *cFileName, int bExportByName )
-                : cBName( NULL ),
-                cAPrefix( NULL ),
-                cLibName( NULL ),
-                cFilterName( NULL ),
-                cModName( NULL )
-{
-    fprintf( stderr, "LIB-NT File Dumper v4.00 (C) 2000 Sun Microsystems, Inc.\n\n" );
-    fprintf( stderr, "%s ", cFileName );
-
-    bExportName = bExportByName;
-
-    unsigned long nSlots =  0xfffff;
-    pBaseTab = new ExportSet( nSlots );
-    pIndexTab = new ExportSet( nSlots );
-    pFilterLines = new char * [MAXFILT];
-    CheckLibrary(cFileName);
-    bBase = 0;
-    bAll = false;
-    nDefStart = 0;
-    nBaseLines = 0;
-    nFilterLines = 0;
-    bDef = true;
-    cAPrefix = new char[ 1 ];
-    cAPrefix[ 0 ] = 0;
-    if (!bExportName)
-        CheckDataBase();
-}
-
-bool LibDump::Dump()
-{
-    FILE *pList;
-    char  aBuf[MAX_MAN];
-    int   nLen;
-    char  aName[MAX_MAN];
-
-    pList = fopen( cLibName, "rb");
-    if (!pList)
-        DumpError(10);
-
-    // forget about offset when working on linker directives
-    if ( !bUseDirectives )
-    {
-        // calculating offset for name section
-        unsigned char TmpBuffer[4];
-        fread( TmpBuffer, 1, 4, pList);
-        // anzahl bigendian mal laenge + ueberspringen der naechsten laengenangabe
-        unsigned long nOffSet = (unsigned long) ( TmpBuffer[2] * 256 + TmpBuffer[3] ) * 4 + 4;
-        fseek( pList, (long) nOffSet, 0);
-    }
-
-    char aTmpBuf[4096];
-    // reading file containing symbols
-    while( !feof( pList ) )
-    {
-           int i = 0;
-        if ( !bUseDirectives )
-        {
-            // symbol komplett einlesen
-            for (;;)
-            {
-                int c = fgetc( pList );
-                if ( c == '\0' )
-                {
-                    break;
-                }
-                if ( ((c >= 33) && (c <= 126)) && ( c!=40 && c!=41) )
-                    aBuf[i] = static_cast< char >(c);
-                else
-                {
-                    aBuf[0] = '\0';
-                    break;
-                }
-                i++;
-            }
-            // Namen found
-            aBuf[i] = '\0';
-        }
-        else
-        {
-            fgets( aTmpBuf, 4096, pList );
-            char * pEnd = 0;
-            char *pFound = 0;
-            aBuf[0] = '\0';
-            pFound = strchr( aTmpBuf, 'E' );
-            while ( pFound )
-            {
-                if ( strncmp( "EXPORT:", pFound, 7) == 0 )
-                {
-                    pFound += 7;
-                    pEnd = strchr( pFound, ',');
-                    if ( pEnd )
-                        *pEnd = '\0';
-                    strncpy( aBuf, pFound, strlen( pFound));
-                    aBuf[ strlen( pFound) ] = '\0';
-                    break;
-                }
-                else
-                {
-                    pFound++;
-                    pFound = strchr( pFound, 'E' );
-                }
-            }
-        }
-
-        if (aBuf[0] =='?')
-        {
-            nLen = (int) strlen(aBuf);
-            memset( aName, 0, sizeof( aName ) );
-            int nName = 0;
-            for( i = 0; i < nLen; i++ )
-            {
-                if ( (aBuf[i] != '\n') && (aBuf[i] != '\r') )
-                {
-                    aName[nName] = aBuf[i];
-                    nName++;
-                }
-            }
-            // und raus damit
-            PrintSym( aName, bExportByName );
-        }
-        else if ( bAll == true &&
-                  strncmp(aBuf, "__real@", 7) != 0 &&
-                  strncmp(aBuf, "__CT",4) != 0 &&
-                  strncmp(aBuf, "__TI3?", 6) != 0 )
-        {
-            int nPreLen = (int) strlen( cAPrefix );
-
-            nLen = (int) strlen(aBuf);
-            memset( aName, 0, sizeof( aName ) );
-            int nName = 0;
-
-            for( i = 0; i < nLen; i++ )
-            {
-              if ( (aBuf[i] != '\n') && (aBuf[i] != '\r') )
-              {
-                  aName[nName] = aBuf[i];
-                  nName++;
-              }
-            }
-            // den ersten _ raus
-            nLen = (int) strlen(aName);
-#ifndef _WIN64
-            if (aName[0] == '_')
-                strcpy( aBuf , &aName[1] );
-#endif
-            strncpy ( aTmpBuf, aBuf, (size_t) nPreLen );
-            aTmpBuf[nPreLen] = '\0';
-            if ( !strcmp( aTmpBuf, cAPrefix ))
-            {
-                if ( bLdump3 ) {
-                    int nChar = '@';
-                    char *pNeu = strchr( aBuf, nChar );
-                    size_t nPos = pNeu - aBuf + 1;
-                    if ( nPos > 0 )
-                    {
-                        char aOldBuf[MAX_MAN];
-                        strcpy( aOldBuf, aBuf );
-                        char pChar[MAX_MAN];
-                        strncpy( pChar, aBuf, nPos - 1 );
-                        pChar[nPos-1] = '\0';
-                        strcpy( aBuf, pChar );
-                        strcat( aBuf, "=" );
-                        strcat( aBuf, aOldBuf );
-                        strcpy( pChar, "" );
-                    }
-                }
-                // und raus damit
-                PrintSym( aBuf, true );
-            }
-        }
-    }
-    fclose(pList);
-    return true;
-}
-
-bool LibDump::ReadFilter( char * cFilterName )
-{
-    FILE* pfFilter = 0;
-    char  aBuf[MAX_MAN];
-    char* pStr;
-    int   nLen;
-
-    pfFilter = fopen( cFilterName, "r" );
-
-    if ( !pfFilter )
-    {
-        ::bFilter = 0;
-        DumpError( 500 );
-    }
-
-    while( fgets( aBuf, MAX_MAN, pfFilter ) != 0 )
-    {
-        nLen = (int) strlen(aBuf);
-        pStr = new char[(unsigned int) nLen];
-        if ( !pStr )
-            DumpError( 98 );
-        memcpy( pStr, aBuf, (unsigned int) nLen );
-        if ( *(pStr+nLen-1) == '\n' )
-            *(pStr+nLen-1) = '\0';
-        pFilterLines[nFilterLines] = pStr;
-        nFilterLines++;
-        if ( nFilterLines >= MAXFILT )
-                DumpError( 510 );
-    }
-
-    fclose( pfFilter );
-    return true;
-}
-
-bool LibDump::PrintSym(char *pName, bool bName )
-{
-    LibExport *pData;
-
-
-    // Filter auswerten
-    if ( Filter( pName ) )
-    {
-        if ( strlen( pName ) > 3 )
-        {
-            if ( bDef )
-            {
-                if (!bBase)
-                    if (bExportName) {
-                        fprintf( stdout, "\t%s\n", pName );
-                    } else {
-                        fprintf( stdout, "\t%s\t\t@%lu\n", pName, nDefStart );
-                    }
-                else
-                {
-                     pData = pBaseTab->Find( pName );
-                     if ( pData )
-                     {
-                        pData->bExport = true;
-                        if ( bName )
-                            pData->bByName = true;
-                        else
-                            pData->bByName = false;
-                        if ( bVerbose )
-                            fprintf(stderr,".");
-                     }
-                     else
-                     {
-                         // neuen Export eintragen
-                         pData = new LibExport;
-                        pData->cExportName = new char[ strlen( pName ) + 1 ];
-                        strcpy( pData->cExportName, pName );
-                        pData->nOrdinal = nBaseLines++;
-                        pData->bExport = true;
-                        if ( bName )
-                            pData->bByName = true;
-                        else
-                            pData->bByName = false;
-                        pBaseTab->Insert( pData->cExportName, pData );
-                        char *cBuffer = new char[ 30 ];
-                        sprintf( cBuffer, "%lu", pData->nOrdinal );
-                        pIndexTab->Insert( cBuffer, pData );
-                        delete [] cBuffer;
-                        if ( bVerbose )
-                            fprintf(stderr,"n");
-                     }
-                }
-            }
-            else
-                printf( "%s\n", pName );
-            nDefStart++;
-        }
-    }
-    return true;
-}
-
-bool LibDump::IsFromAnonymousNamespace (char *pExportName) {
-    char* pattern1 = "@?A0x";
-
-    if (strstr(pExportName, pattern1)) {
-        return true; 
-    };
-    return false; 
-};
-
-bool LibDump::Filter(char *pExportName)
-{
-    unsigned long i;
-    char pTest[256];
-    
-    // filter out symbols from anonymous namespaces
-    if (IsFromAnonymousNamespace (pExportName))
-        return false;
-    
-    // Kein Filter gesetzt
-    if ( ::bFilter == 0 )
-        return true;
-
-    for ( i=0; i<nFilterLines; i++ )
-    {
-        //Zum vergleichen muá das Plus abgeschnitteb werden
-        if(pFilterLines[i][0] != '+')
-        {
-            if ( strstr( pExportName, pFilterLines[i]))
-                return false;
-        }
-        else
-        {
-            strcpy(pTest,&pFilterLines[i][1]);
-            if ( strstr( pExportName, pTest))
-                return true;
-        }
-    }
-    return true;
-}
-
-bool LibDump::SetFilter(char * cFilterName)
-{
-    ReadFilter( cFilterName );
-    return true;
-}
-
-bool LibDump::CheckLibrary(char * cName)
-{
-    delete [] cLibName;
-    cLibName = new char[ strlen( cName ) + 1 ];
-    strcpy( cLibName, cName );
-    return true;
-}
-
-bool LibDump::ReadDataBase()
-{
-    FILE* pfBase = 0;
-    char  aBuf[MAX_MAN];
-    char* pStr;
-    char  cBuffer[ 30 ];
-    int   nLen;
-    LibExport *pData;
-
-    pfBase = fopen( cBName, "r" );
-
-    if ( !pfBase )
-    {
-        bBase = 0;
-        DumpError( 600 );
-    }
-
-    bool bRet = true;
-    while( fgets( aBuf, MAX_MAN, pfBase ) != 0 )
-    {
-        nLen = (int) strlen(aBuf);
-        pStr = new char[(unsigned int) nLen];
-        if ( !pStr )
-            DumpError( 98 );
-        memcpy( pStr, aBuf, (size_t) nLen );
-        if ( *(pStr+nLen-1) == '\n' )
-            *(pStr+nLen-1) = '\0';
-        pData = new LibExport;
-        pData->cExportName = pStr;
-        pData->nOrdinal = nBaseLines;
-        pData->bExport=false;
-
-        if (pBaseTab->Insert(pData->cExportName, pData ) == NULL)
-            bRet = false;
-        ltoa( (long) pData->nOrdinal, cBuffer, 10 );
-        if (pIndexTab->Insert( cBuffer, pData ) == NULL)
-            bRet = false;
-        nBaseLines++;
-        if ( nBaseLines >= MAXBASE )
-            DumpError( 610 );
-    }
-    fclose( pfBase );
-    return bRet;
-}
-
-class ExportSetIter : public HashTableIterator
-{
-public:
-    ExportSetIter(HashTable const& aTable)
-        : HashTableIterator(aTable)	{}
-
-    LibExport * GetFirst()
-    { return (LibExport *)HashTableIterator::GetFirst(); }
-    LibExport * GetNext()
-    { return (LibExport *)HashTableIterator::GetNext();  }
-    LibExport * GetLast()
-    { return (LibExport *)HashTableIterator::GetLast();  }
-    LibExport * GetPrev()
-    { return (LibExport *)HashTableIterator::GetPrev();  }
-
-private:
-    void operator =(ExportSetIter &); // not defined
-};
-
-bool LibDump::PrintDataBase()
-{
-    if (bExportName) 
-        return true;
-    FILE *pFp;
-    pFp = fopen (cBName,"w+");
-    if (!pFp)
-        fprintf( stderr, "Error opening DataBase File\n" );
-
-    LibExport *pData;
-    for ( unsigned long i=0; i < nBaseLines+10; i++ )
-    {
-        char * cBuffer = new char[ 30 ];
-        sprintf( cBuffer, "%lu", i );
-        pData = pIndexTab->Find( cBuffer );
-        delete [] cBuffer;
-        if ( pData )
-            fprintf(pFp,"%s\n",pData->cExportName);
-    }
-    fclose(pFp);
-    return true;
-}
-
-bool LibDump::PrintDefFile()
-{
-#ifdef FAST
-    ExportSetIter aIterator( *pBaseTab );
-    for ( LibExport *pData = aIterator.GetFirst(); pData != NULL;
-                                        pData = aIterator.GetNext() )
-    {
-        if ( pData->bExport )
-        {
-            if ( pData->bByName )
-            {
-                fprintf(stdout,"\t%s\n",
-                    pData->sExportName.GetBuffer());
-            }
-            else
-            {
-                fprintf(stdout,"\t%s\t\t@%d NONAME\n",
-                    pData->sExportName.GetBuffer(), pData->nOrdinal+nBegin);
-            }
-        }
-    }
-#else
-    // sortiert nach Ordinals;
-    LibExport *pData;
-    for ( unsigned long i=0; i<nBaseLines+1; i++)
-    {
-        char * cBuffer = new char[ 30 ];
-        sprintf( cBuffer, "%lu", i );
-        pData = pIndexTab->Find( cBuffer );
-        delete [] cBuffer;
-        if ( pData )
-            if ( pData->bExport )
-            {
-                if ( pData->bByName )
-                {
-                    if ( strlen( pData->cExportName ))
-                        fprintf(stdout,"\t%s\n",
-                            pData->cExportName);
-                }
-                else
-                {
-                    if ( strlen( pData->cExportName ))
-                        fprintf(stdout,"\t%s\t\t@%d NONAME\n",
-                            pData->cExportName, pData->nOrdinal+nBegin);
-                }
-            }
-    }
-#endif
-    return true;
-}
-
-bool LibDump::CheckDataBase()
-{
-    // existiert eine Datenbasis ?
-    if (!bBase)
-    {
-        cBName = new char[ 2048 ];
-        char *pTmp = "defs\\";
-
-        FILE *fp;
-        _mkdir ("defs");
-        strcpy(cBName,pTmp);
-        strcat(cBName,getenv ("COMP_ENV"));
-
-        fp = fopen (cBName,"r");
-        if (fp)
-        {
-            bBase = true;
-        }
-        else
-        {
-            fp = fopen (cBName,"w+");
-            bBase = true;
-        }
-        fclose (fp);
-    }
-    // lese Datenbasis !
-    if (bBase)
-    {
-        ReadDataBase();
-    }
-    return true;
-}
-
-LibDump::~LibDump()
-{
-    delete [] cBName;
-    delete [] cAPrefix;
-    delete [] cFilterName;
-    delete [] cModName;
-}
-
-void LibDump::SetCExport( char* pName )
-{
-    delete [] cAPrefix;
-    cAPrefix = new char[ strlen( pName ) + 1 ];
-    strcpy( cAPrefix, pName );bAll = true;
-}
-
-//******************************************************************
-//* Error() - Gibt Fehlermeldumg aus
-//******************************************************************
-
-void LibDump::DumpError( unsigned long n )
-{
-    char *p;
-
-    switch (n)
-    {
-        case 1:  p = "Input error in library file"; break;
-        case 2:  p = "Position error in library file (no THEADR set)"; break;
-        case 3:  p = "Overflow of symbol table"; break;
-#ifdef WNT
-        case 10: p = "EXP file not found"; break;
-        case 11: p = "No valid EXP file"; break;
-#else
-        case 10: p = "Library file not found"; break;
-        case 11: p = "No valid library file"; break;
-#endif
-        case 98: p = "Out of memory"; break;
-        case 99: p = "LDUMP [-LD3] [-D] [-N] [-A] [-E nn] [-F name] Filename[.LIB]\n"
-                     "-LD3   : Supports feature set of ldump3 (default: ldump/ldump2)\n"
-                     "-A     : all symbols (default: only C++)\n"
-                     "-E nn  : gerenration of export table beginning with number nn\n"
-                     "-F name: Filter file\n"
-                     "-D     : file contains \"dumpbin\" directives\n"
-                     "-N     : export by name\n"
-                     "-V     : be verbose\n"; break;
-        case 500: p = "Unable to open filter file\n"; break;
-        case 510: p = "Overflow of filter table\n"; break;
-        case 600: p = "Unable to open base database file\n"; break;
-        case 610: p = "Overflow in base database table\n"; break;
-        default: p = "Unspecified error";
-    }
-    fprintf( stdout, "%s\n", p );
-    exit (1);
-}
-
-/*********************************************************************
-        Test Funktionen
-*********************************************************************/
-
-
-void usage()
-{
-    LibDump::DumpError(99);
-}
-
-#define STATE_NON		0x0000
-#define STATE_BEGIN		0x0001
-#define STATE_FILTER	0x0002
-#define STATE_CEXPORT	0x0003
-
-int
-#ifdef WNT
-__cdecl
-#endif
-main( int argc, char **argv )
-{
-    char *pLibName = NULL, *pFilterName = NULL, *pCExport= NULL;
-    unsigned short nBegin=1;
-
-    unsigned short nState = STATE_NON;
-
-    if ( argc == 1 ) {
-        usage();
-    }
-
-    for ( int i = 1; i < argc; i++ ) {
-        if (( !strcmp( argv[ i ], "-H" )) ||
-            ( !strcmp( argv[ i ], "-h" )) ||
-            ( !strcmp( argv[ i ], "-?" )))
-        {
-            usage();
-        }
-        else if (( !strcmp( argv[ i ], "-LD3" )) ||
-            ( !strcmp( argv[ i ], "-Ld3" )) ||
-            ( !strcmp( argv[ i ], "-ld3" )) ||
-            ( !strcmp( argv[ i ], "-lD3" )))
-        {
-            if ( nState != STATE_NON ) {
-                usage();
-            }
-            bLdump3 = 1;
-        }
-        else if (( !strcmp( argv[ i ], "-E" )) || ( !strcmp( argv[ i ], "-e" ))) {
-            if ( nState != STATE_NON ) {
-                usage();
-            }
-            nState = STATE_BEGIN;
-        }
-        else if (( !strcmp( argv[ i ], "-F" )) || ( !strcmp( argv[ i ], "-f" ))) {
-            if ( nState != STATE_NON ) {
-                usage();
-            }
-            nState = STATE_FILTER;
-        }
-        else if (( !strcmp( argv[ i ], "-A" )) || ( !strcmp( argv[ i ], "-a" ))) {
-            if ( nState != STATE_NON ) {
-                usage();
-            }
-            nState = STATE_CEXPORT;
-            pCExport = new char[ 1 ];
-            pCExport[ 0 ] = 0;
-        }
-        else if (( !strcmp( argv[ i ], "-D" )) || ( !strcmp( argv[ i ], "-d" ))) {
-            if ( nState != STATE_NON ) {
-                usage();
-            }
-            bUseDirectives = 1;
-        }
-        else if (( !strcmp( argv[ i ], "-N" )) || ( !strcmp( argv[ i ], "-n" ))) {
-            if ( nState != STATE_NON ) {
-                usage();
-            }
-            bExportByName = 1;
-        }
-        else if (( !strcmp( argv[ i ], "-V" )) || ( !strcmp( argv[ i ], "-v" ))) {
-            if ( nState != STATE_NON ) {
-                usage();
-            }
-            bVerbose = 1;
-        }
-        else {
-            switch ( nState ) {
-                case STATE_BEGIN:
-                    nBegin = static_cast< unsigned short >(atoi( argv[ i ] ));
-                    nState = STATE_NON;
-                break;
-                case STATE_FILTER:
-                    pFilterName = new char[ strlen( argv[ i ] ) + 1 ];
-                    strcpy( pFilterName, argv[ i ] );
-                    bFilter = 1;
-                    nState = STATE_NON;
-                break;
-                case STATE_CEXPORT:
-                    delete [] pCExport;
-                    pCExport = new char[ strlen( argv[ i ] ) + 1 ];
-                    strcpy( pCExport, argv[ i ] );
-                    nState = STATE_NON;
-                break;
-                default:
-                    pLibName = new char[ strlen( argv[ i ] ) + 1 ];
-                    strcpy( pLibName, argv[ i ] );
-                break;
-            }
-        }
-    }
-
-    if ( !pLibName ) {
-        usage();
-    }
-
-    LibDump *pDump = new LibDump( pLibName, bExportByName );
-    pDump->SetBeginExport(nBegin);
-    if ( bFilter != 0 )
-        pDump->SetFilter( pFilterName );
-    if ( pCExport )
-        pDump->SetCExport( pCExport );
-    else {
-        char *pEmpty = "";
-        pDump->SetCExport( pEmpty );
-    }
-    pDump->Dump();
-    pDump->PrintDefFile();
-    pDump->PrintDataBase();
-    delete pDump;
-    delete [] pLibName;
-    return 0;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/ldump/ldump.hxx b/soltools/ldump/ldump.hxx
deleted file mode 100644
index 7d66204bf..000000000
--- a/soltools/ldump/ldump.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "hashtbl.hxx"
-
-#define MAXFILT 200
-
-struct LibExport
-{
-    char			*cExportName;		// zu exportierende Fkt.
-    unsigned long	nOrdinal;			// Nummer der zu export. Fkt.
-    bool 			bByName;			// NONAME anhaengen
-    bool			bExport;			// exportieren oder nicht ?
-};
-
-class ExportSet;
-class LibDump
-{
-    ExportSet		*pBaseTab;			// Zugriff auf gemangelte Namen
-    ExportSet		*pIndexTab;			// Zugriff auf die Ordinals
-    char 			*cBName;			// Name der Datenbasis
-    char 			*cAPrefix;			// Prefix fuer C-Fkts.
-    char 			*cLibName;			// Name der zu untersuchenden Lib
-    char 			*cFilterName;		// Name der Filterdatei
-    char 			*cModName;			// Modulname
-    unsigned short	nBegin;				// Nummer des ersten Exports
-    unsigned long	nBaseLines;			// Line in Datenbasis
-    unsigned long	nFilterLines;		// Line in FilterTabelle
-    char			**pFilterLines;		// Filtertabelle
-    unsigned long	nDefStart;
-    bool			bBase;				// Existenz der DatenBasis;
-    bool			bAll;				// Alle Fkts exportieren
-    bool			bDef;				// DefFile schreiben ( bei -E )
-    int             bExportName;        // 0 - export by ordinal; 1 - export by name
-
-    bool			CheckDataBase();
-    bool			CheckLibrary(char * cName);
-    bool			ReadDataBase();
-    bool			ReadFilter(char *);
-    bool			PrintSym(char *, bool bName = true );
-public:
-                    LibDump( char *cFileName, int bExportByName );
-                    ~LibDump();
-    bool			Dump();
-    bool			SetFilter(char *cFilterName);
-    void			SetBeginExport(unsigned short nVal){nBegin = nVal;}
-    void			SetCExport( char* pName );
-    bool			Filter(char *pName);
-    bool			IsFromAnonymousNamespace(char *pName);
-    bool			PrintDefFile();
-    bool			PrintDataBase();
-    static void		DumpError(unsigned long nError);
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk
deleted file mode 100644
index 6d0eda3bf..000000000
--- a/soltools/ldump/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=ldump
-TARGET=ldump
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-UWINAPILIB=$(0)
-LIBSALCPPRT=$(0)
-
-# --- Files --------------------------------------------------------
-
-# ldump only supports windows environment
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-#ldump4 reimplements feature set of ldump2 and ldump3
-APP1TARGET=	ldump4
-.IF "$(GUI)"=="WNT"
-APP1STACK=	16000
-.ENDIF
-APP1OBJS=   $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj
-
-.ENDIF #"$(COM)"!="GCC"
-.ENDIF #"$(GUI)"=="WNT"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx
deleted file mode 100644
index 884456a38..000000000
--- a/soltools/mkdepend/collectdircontent.cxx
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include  "collectdircontent.hxx"
-
-PathFilePair IncludesCollection::split_path(const string& filePath) {
-    string sepU = "/";
-    string sepW = "\\";
-    string::size_type pos = filePath.rfind (sepU);
-    string::size_type posW = filePath.rfind (sepW);
-    if ((posW != string::npos) && ((posW > pos) || (pos == string::npos))) pos = posW;
-    if (pos != string::npos) {
-        string dirName = filePath.substr(0, pos);
-        return PathFilePair(dirName, filePath.substr(pos + 1, filePath.length()));
-    } else
-        return PathFilePair(".", filePath);
-};
-
-void IncludesCollection::add_to_collection(const string& dirPath) {
-    DirContent dirContent;
-#if defined( WNT )
-    WIN32_FIND_DATA FindFileData;
-    HANDLE hFind;
-    hFind = FindFirstFile((dirPath + "\\*").c_str(), &FindFileData);
-    if (hFind == INVALID_HANDLE_VALUE) {
-        // Invalid File Handle - no need to try it anymore
-        allIncludes.insert(EntriesPair(dirPath, DirContent()));
-        return;
-    };
-    do {
-        string winFileName(FindFileData.cFileName);
-        transform(winFileName.begin(), winFileName.end(), winFileName.begin(), ::tolower);
-        dirContent.insert(winFileName);
-    } while (FindNextFile(hFind, &FindFileData));
-#else
-    DIR *pdir;
-    dirent *pent;
-    pdir = opendir(dirPath.c_str()); //"." refers to the current dir
-    if (!pdir) {
-        // Invalid File Handle - no need to try it anymore
-        allIncludes.insert(EntriesPair(dirPath, DirContent()));
-        return;
-    }
-    while ((pent = readdir(pdir))) {
-        dirContent.insert(pent->d_name);
-    };
-    closedir(pdir);
-#endif // defined( WNT )
-    allIncludes.insert(EntriesPair(dirPath, dirContent));
-};
-
-bool IncludesCollection::exists(string filePath) {
-#if defined( WNT )
-    transform(filePath.begin(), filePath.end(), filePath.begin(), ::tolower);
-#endif // defined( WNT )
-    PathFilePair dirFile = split_path(filePath);
-    string dirPath = dirFile.first;
-    string fileName = dirFile.second;
-    DirMap::iterator mapIter = allIncludes.find(dirPath);
-    if (mapIter == allIncludes.end()) {
-        add_to_collection(dirPath);
-        mapIter = allIncludes.find(dirPath);
-    };
-    DirContent dirContent = (*mapIter).second;
-    DirContent::iterator dirIter = dirContent.find(fileName);
-    if (dirIter == dirContent.end()) {
-        return false;
-    } else {
-        return true;
-    };
-};
-
-extern "C" {
-
-    IncludesCollection * create_IncludesCollection() {
-            return new IncludesCollection;
-    }
-
-    void delete_IncludesCollection(IncludesCollection *m) {
-            delete m;
-    }
-
-    int call_IncludesCollection_exists(IncludesCollection* m, const char * filePath) {
-        return m->exists(filePath);
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx
deleted file mode 100644
index 85428ee03..000000000
--- a/soltools/mkdepend/collectdircontent.hxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef COLLECTDIRCONTENT_H
-#define COLLECTDIRCONTENT_H
-
-#if defined __cplusplus
-
-#include <set>
-#include <map>
-#include <string>
-
-#if defined( WNT )
-#include <windows.h>
-#include <algorithm>
-#else
-#include <dirent.h>
-#endif // defined( WNT )
-
-#include <iostream>
-
-using namespace std;
-
-typedef set<string> DirContent;
-typedef map<string, DirContent> DirMap;
-typedef DirMap::value_type EntriesPair;
-typedef pair<string, string> PathFilePair;
-
-
-struct IncludesCollection {
-    private:
-    DirMap allIncludes;
-    PathFilePair split_path(const string& filePath);
-    void add_to_collection(const string& dirPath);
-    
-    public:
-        bool exists(string filePath); 
-};
-
-#else
-
-struct IncludesCollection;
-
-#endif
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-struct IncludesCollection * create_IncludesCollection(void);
-void delete_IncludesCollection(struct IncludesCollection *);
-
-int call_IncludesCollection_exists(struct IncludesCollection* m, const char* filePath);
-
-#if defined __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/cppsetup.c b/soltools/mkdepend/cppsetup.c
deleted file mode 100644
index 1ec025c5f..000000000
--- a/soltools/mkdepend/cppsetup.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* $XConsortium: cppsetup.c,v 1.13 94/04/17 20:10:32 gildea Exp $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-#include "def.h"
-
-#ifdef	CPP
-/*
- * This file is strictly for the sake of cpy.y and yylex.c (if
- * you indeed have the source for cpp).
- */
-#define IB 1
-#define SB 2
-#define NB 4
-#define CB 8
-#define QB 16
-#define WB 32
-#define SALT '#'
-#if pdp11 | vax | ns16000 | mc68000 | ibm032
-#define COFF 128
-#else
-#define COFF 0
-#endif
-/*
- * These variables used by cpy.y and yylex.c
- */
-extern char	*outp, *inp, *newp, *pend;
-extern char	*ptrtab;
-extern char	fastab[];
-extern char	slotab[];
-
-/*
- * cppsetup
- */
-struct filepointer	*currentfile;
-struct inclist		*currentinc;
-
-cppsetup(line, filep, inc)
-    register char	*line;
-    register struct filepointer	*filep;
-    register struct inclist		*inc;
-{
-    register char *p, savec;
-    static boolean setupdone = FALSE;
-    boolean	value;
-
-    if (!setupdone) {
-        cpp_varsetup();
-        setupdone = TRUE;
-    }
-
-    currentfile = filep;
-    currentinc = inc;
-    inp = newp = line;
-    for (p=newp; *p; p++)
-        ;
-
-    /*
-     * put a newline back on the end, and set up pend, etc.
-     */
-    *p++ = '\n';
-    savec = *p;
-    *p = '\0';
-    pend = p;
-
-    ptrtab = slotab+COFF;
-    *--inp = SALT; 
-    outp=inp; 
-    value = yyparse();
-    *p = savec;
-    return(value);
-}
-
-pperror(tag, x0,x1,x2,x3,x4)
-    int	tag,x0,x1,x2,x3,x4;
-{
-    warning("\"%s\", line %d: ", currentinc->i_file, currentfile->f_line);
-    warning(x0,x1,x2,x3,x4);
-}
-
-
-yyerror(s)
-    register char	*s;
-{
-    fatalerr("Fatal error: %s\n", s);
-}
-#else /* not CPP */
-
-#include "ifparser.h"
-struct _parse_data {
-    struct filepointer *filep;
-    struct inclist *inc;
-    const char *line;
-};
-
-static const char *
-_my_if_errors (ip, cp, expecting)
-    IfParser *ip;
-    const char *cp;
-    const char *expecting;
-{
-#ifdef DEBUG_MKDEPEND
-    struct _parse_data *pd = (struct _parse_data *) ip->data;
-    int lineno = pd->filep->f_line;
-    char *filename = pd->inc->i_file;
-    char prefix[300];
-    int prefixlen;
-    int i;
-
-    sprintf (prefix, "\"%s\":%d", filename, lineno);
-    prefixlen = strlen(prefix);
-    fprintf (stderr, "%s:  %s", prefix, pd->line);
-    i = cp - pd->line;
-    if (i > 0 && pd->line[i-1] != '\n') {
-    putc ('\n', stderr);
-    }
-    for (i += prefixlen + 3; i > 0; i--) {
-    putc (' ', stderr);
-    }
-    fprintf (stderr, "^--- expecting %s\n", expecting);
-#endif /* DEBUG_MKDEPEND */
-    (void)ip;
-    (void)cp;
-    (void)expecting;
-    return NULL;
-}
-
-
-#define MAXNAMELEN 256
-
-char *
-_lookup_variable (var, len)
-    const char *var;
-    int len;
-{
-    char tmpbuf[MAXNAMELEN + 1];
-
-    if (len > MAXNAMELEN)
-    return 0;
-
-    strncpy (tmpbuf, var, len);
-    tmpbuf[len] = '\0';
-    return isdefined(tmpbuf);
-}
-
-
-static int
-_my_eval_defined (ip, var, len)
-    IfParser *ip;
-    const char *var;
-    int len;
-{
-    (void)ip;
-    if (_lookup_variable (var, len))
-    return 1;
-    else
-    return 0;
-}
-
-#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_')
-
-static int
-_my_eval_variable (ip, var, len)
-    IfParser *ip;
-    const char *var;
-    int len;
-{
-    char *s;
-
-    (void)ip;
-
-    s = _lookup_variable (var, len);
-    if (!s)
-    return 0;
-    do {
-    var = s;
-    if (!isvarfirstletter(*var))
-        break;
-    s = _lookup_variable (var, strlen(var));
-    } while (s);
-
-    return atoi(var);
-}
-
-
-int cppsetup(line, filep, inc)
-    register char	*line;
-    register struct filepointer	*filep;
-    register struct inclist		*inc;
-{
-    IfParser ip;
-    struct _parse_data pd;
-    int val = 0;
-
-    pd.filep = filep;
-    pd.inc = inc;
-    pd.line = line;
-    ip.funcs.handle_error = _my_if_errors;
-    ip.funcs.eval_defined = _my_eval_defined;
-    ip.funcs.eval_variable = _my_eval_variable;
-    ip.data = (char *) &pd;
-
-    (void) ParseIfExpression (&ip, line, &val);
-    if (val)
-    return IF;
-    else
-    return IFFALSE;
-}
-#endif /* CPP */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
deleted file mode 100644
index b8a6659cc..000000000
--- a/soltools/mkdepend/def.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* $XConsortium: def.h,v 1.25 94/04/17 20:10:33 gildea Exp $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-#ifndef NO_X11
-#include <X11/Xosdefs.h>
-#ifdef WIN32
-#include <X11/Xw32defs.h>
-#endif
-#ifndef SUNOS4
-#include <X11/Xfuncproto.h>
-#endif /* SUNOS4 */
-#endif /* NO_X11 */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <ctype.h>
-#ifndef X_NOT_POSIX
-#ifndef _POSIX_SOURCE
-#define _POSIX_SOURCE
-#endif
-#endif
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#ifndef S_IFDIR
-#define        S_IFDIR  0040000 
-#endif
-
-#ifndef S_IFREG
-#define        S_IFREG  0100000 
-#endif
-
-#define MAXDEFINES	512
-#define MAXFILES	65536
-
-#define MAXDIRS		64
-#define SYMHASHSEED     131  /* 131 1313 13131 ... */
-#define SYMHASHMEMBERS	64	/* must be 2^x to work right */
-#define	TRUE		1
-#define	FALSE		0
-
-/* the following must match the directives table in main.c */
-#define	IF		0
-#define	IFDEF		1
-#define	IFNDEF		2
-#define	ELSE		3
-#define	ENDIF		4
-#define	DEFINE		5
-#define	UNDEF		6
-#define	INCLUDE		7
-#define	LINE		8
-#define	PRAGMA		9
-#define ERROR           10
-#define IDENT           11
-#define SCCS            12
-#define ELIF            13
-#define EJECT           14
-#define IFFALSE         15     /* pseudo value --- never matched */
-#define ELIFFALSE       16     /* pseudo value --- never matched */
-#define INCLUDEDOT      17     /* pseudo value --- never matched */
-#define IFGUESSFALSE    18     /* pseudo value --- never matched */
-#define ELIFGUESSFALSE  19     /* pseudo value --- never matched */
-
-#ifdef DEBUG
-extern int	_debugmask;
-/*
- * debug levels are:
- * 
- *     0	show ifn*(def)*,endif
- *     1	trace defined/!defined
- *     2	show #include
- *     3	show #include SYMBOL
- *     4-6	unused
- */
-#define debug(level,arg) { if (_debugmask & (1 << level)) warning arg; }
-#else
-#define	debug(level,arg) /**/
-#endif /* DEBUG */
-
-// VG: a C++ class for information about directories
-#include "collectdircontent.hxx"
-
-typedef	unsigned char boolean;
-
-struct pair {
-    char        *p_name;
-    char        *p_value;
-    struct pair *p_next;
-};
-
-struct symhash {
-    struct pair *s_pairs[SYMHASHMEMBERS];
-};
-
-struct	inclist {
-    char		*i_incstring;	/* string from #include line */
-    char		*i_file;	/* path name of the include file */
-    struct inclist	**i_list;	/* list of files it itself includes */
-    int		i_listlen;	/* length of i_list */
-    boolean		i_defchecked;	/* whether defines have been checked */
-    boolean		i_notified;	/* whether we have revealed includes */
-    boolean		i_marked;	/* whether it's in the makefile */
-    boolean		i_searched;	/* whether we have read this */
-    boolean         i_included_sym; /* whether #include SYMBOL was found */
-                    /* Can't use i_list if TRUE */
-};
-
-struct filepointer {
-    char	*f_p;
-    char	*f_base;
-    char	*f_end;
-    long	f_len;
-    long	f_line;
-};
-
-#ifndef X_NOT_STDC_ENV
-#include <stdlib.h>
-#if defined(macII) && !defined(__STDC__)  /* stdlib.h fails to define these */
-char *malloc(), *realloc();
-#endif /* macII */
-#else
-char			*malloc();
-char			*realloc();
-#endif
-
-char			*copy(char *);
-char			*base_name(char *);
-char			*get_line(struct filepointer *);
-char			*isdefined(char *);
-struct filepointer	*getfile(char *);
-struct inclist *newinclude(register char *newfile,
-                           register char *incstring);
-struct inclist		*inc_path(char *, char *, boolean,
-                                  struct IncludesCollection *);
-
-void define( char *def, struct symhash **symbols );
-void hash_define(char *name, char * val, struct symhash **symbols);
-struct symhash *hash_copy( struct symhash *symbols );
-void hash_free( struct symhash *symbols );
-void freefile( struct filepointer * fp );
-int find_includes(struct filepointer *filep, struct inclist *file,
-    struct inclist *file_red, int recursion, boolean failOK, 
-    struct IncludesCollection* incCollection, struct symhash *symbols);
-void included_by(register struct inclist *ip,
-    register struct inclist * newfile);
-int cppsetup(register char *line,
-    register struct filepointer *filep, register struct inclist *inc);
-void add_include(struct filepointer *filep, struct inclist *file,
-    struct inclist *file_red, char *include, boolean dot, boolean failOK,
-    struct IncludesCollection* incCollection, struct symhash *symbols);
-int match(register char *str, register char **list);
-void recursive_pr_include(register struct inclist *head, register char *file,
-    register char *base);
-void inc_clean();
-
-void fatalerr(char *, ...);
-void warning(char *, ...);
-void warning1(char *, ...);
-
-void convert_slashes(char *);
-char *append_slash(char *);
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/ifparser.c b/soltools/mkdepend/ifparser.c
deleted file mode 100644
index c9da34baf..000000000
--- a/soltools/mkdepend/ifparser.c
+++ /dev/null
@@ -1,465 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * $XConsortium: ifparser.c,v 1.8 95/06/03 00:01:41 gildea Exp $
- *
- * Copyright 1992 Network Computing Devices, Inc.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Network Computing Devices may not be
- * used in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission.  Network Computing Devices makes
- * no representations about the suitability of this software for any purpose.
- * It is provided ``as is'' without express or implied warranty.
- * 
- * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- * 
- * Author:  Jim Fulton
- *          Network Computing Devices, Inc.
- * 
- * Simple if statement processor
- *
- * This module can be used to evaluate string representations of C language
- * if constructs.  It accepts the following grammar:
- * 
- *     EXPRESSION	:=	VALUE
- * 			 |	VALUE  BINOP	EXPRESSION
- * 
- *     VALUE		:=	'('  EXPRESSION  ')'
- * 			 |	'!'  VALUE
- * 			 |	'-'  VALUE
- * 			 |	'defined'  '('  variable  ')'
- * 			 |	'defined'  variable
- *			 |	# variable '(' variable-list ')'
- * 			 |	variable
- * 			 |	number
- * 
- *     BINOP		:=	'*'	|  '/'	|  '%'
- * 			 |	'+'	|  '-'
- * 			 |	'<<'	|  '>>'
- * 			 |	'<'	|  '>'	|  '<='  |  '>='
- * 			 |	'=='	|  '!='
- * 			 |	'&'	|  '|'
- * 			 |	'&&'	|  '||'
- * 
- * The normal C order of precidence is supported.
- * 
- * 
- * External Entry Points:
- * 
- *     ParseIfExpression		parse a string for #if
- */
-
-#include "ifparser.h"
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-
-/****************************************************************************
-           Internal Macros and Utilities for Parser
- ****************************************************************************/
-
-#define DO(val) if (!(val)) return NULL
-#define CALLFUNC(ggg,fff) (*((ggg)->funcs.fff))
-#define SKIPSPACE(ccc) while (isspace(*ccc)) ccc++
-#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_')
-
-
-static const char *
-parse_variable (g, cp, varp)
-    IfParser *g;
-    const char *cp;
-    const char **varp;
-{
-    SKIPSPACE (cp);
-
-    if (!isvarfirstletter (*cp))
-    return CALLFUNC(g, handle_error) (g, cp, "variable name");
-
-    *varp = cp;
-    /* EMPTY */
-    for (cp++; isalnum(*cp) || *cp == '_'; cp++) ;
-    return cp;
-}
-
-
-static const char *
-parse_number (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    int *valp;
-{
-    SKIPSPACE (cp);
-
-    if (!isdigit(*cp))
-    return CALLFUNC(g, handle_error) (g, cp, "number");
-
-#ifdef WIN32
-    {
-        char *cp2;
-        *valp = strtol(cp, &cp2, 0);
-    }
-#else
-    *valp = atoi (cp);
-    /* EMPTY */
-    for (cp++; isdigit(*cp); cp++) ;
-#endif
-    return cp;
-}
-
-
-static const char *
-parse_value (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    int *valp;
-{
-    const char *var;
-
-    *valp = 0;
-
-    SKIPSPACE (cp);
-    if (!*cp)
-    return cp;
-
-    switch (*cp) {
-      case '(':
-    DO (cp = ParseIfExpression (g, cp + 1, valp));
-    SKIPSPACE (cp);
-    if (*cp != ')') 
-        return CALLFUNC(g, handle_error) (g, cp, ")");
-
-    return cp + 1;			/* skip the right paren */
-
-      case '!':
-    DO (cp = parse_value (g, cp + 1, valp));
-    *valp = !(*valp);
-    return cp;
-
-      case '-':
-    DO (cp = parse_value (g, cp + 1, valp));
-    *valp = -(*valp);
-    return cp;
-
-      case '#':
-    DO (cp = parse_variable (g, cp + 1, &var));
-    SKIPSPACE (cp);
-    if (*cp != '(')
-        return CALLFUNC(g, handle_error) (g, cp, "(");
-    do {
-        DO (cp = parse_variable (g, cp + 1, &var));
-        SKIPSPACE (cp);
-    } while (*cp && *cp != ')');
-    if (*cp != ')')
-        return CALLFUNC(g, handle_error) (g, cp, ")");
-    *valp = 1; /* XXX */
-    return cp + 1;
-
-      case 'd':
-    if (strncmp (cp, "defined", 7) == 0 && !isalnum(cp[7])) {
-        int paren = 0;
-        int len;
-
-        cp += 7;
-        SKIPSPACE (cp);
-        if (*cp == '(') {
-        paren = 1;
-        cp++;
-        }
-        DO (cp = parse_variable (g, cp, &var));
-        len = (int)(cp - var);
-        SKIPSPACE (cp);
-        if (paren && *cp != ')')
-        return CALLFUNC(g, handle_error) (g, cp, ")");
-        *valp = (*(g->funcs.eval_defined)) (g, var, len);
-        return cp + paren;		/* skip the right paren */
-    }
-    /* fall out */
-    }
-
-    if (isdigit(*cp)) {
-    DO (cp = parse_number (g, cp, valp));
-    } else if (!isvarfirstletter(*cp))
-    return CALLFUNC(g, handle_error) (g, cp, "variable or number");
-    else {
-    DO (cp = parse_variable (g, cp, &var));
-    *valp = (*(g->funcs.eval_variable)) (g, var, cp - var);
-    }
-    
-    return cp;
-}
-
-
-
-static const char *
-parse_product (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    int *valp;
-{
-    int rightval;
-
-    DO (cp = parse_value (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '*':
-    DO (cp = parse_product (g, cp + 1, &rightval));
-    *valp = (*valp * rightval);
-    break;
-
-      case '/':
-    DO (cp = parse_product (g, cp + 1, &rightval));
-
-    /* Do nothing in the divide-by-zero case. */
-    if (rightval) {
-        *valp = (*valp / rightval);
-    }
-    break;
-
-      case '%':
-    DO (cp = parse_product (g, cp + 1, &rightval));
-    *valp = (*valp % rightval);
-    break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_sum (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    int *valp;
-{
-    int rightval;
-
-    DO (cp = parse_product (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '+':
-    DO (cp = parse_sum (g, cp + 1, &rightval));
-    *valp = (*valp + rightval);
-    break;
-
-      case '-':
-    DO (cp = parse_sum (g, cp + 1, &rightval));
-    *valp = (*valp - rightval);
-    break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_shift (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    int *valp;
-{
-    int rightval;
-
-    DO (cp = parse_sum (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '<':
-    if (cp[1] == '<') {
-        DO (cp = parse_shift (g, cp + 2, &rightval));
-        *valp = (*valp << rightval);
-    }
-    break;
-
-      case '>':
-    if (cp[1] == '>') {
-        DO (cp = parse_shift (g, cp + 2, &rightval));
-        *valp = (*valp >> rightval);
-    }
-    break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_inequality (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    int *valp;
-{
-    int rightval;
-
-    DO (cp = parse_shift (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '<':
-    if (cp[1] == '=') {
-        DO (cp = parse_inequality (g, cp + 2, &rightval));
-        *valp = (*valp <= rightval);
-    } else {
-        DO (cp = parse_inequality (g, cp + 1, &rightval));
-        *valp = (*valp < rightval);
-    }
-    break;
-
-      case '>':
-    if (cp[1] == '=') {
-        DO (cp = parse_inequality (g, cp + 2, &rightval));
-        *valp = (*valp >= rightval);
-    } else {
-        DO (cp = parse_inequality (g, cp + 1, &rightval));
-        *valp = (*valp > rightval);
-    }
-    break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_equality (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    int *valp;
-{
-    int rightval;
-
-    DO (cp = parse_inequality (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '=':
-    if (cp[1] == '=')
-        cp++;
-    DO (cp = parse_equality (g, cp + 1, &rightval));
-    *valp = (*valp == rightval);
-    break;
-
-      case '!':
-    if (cp[1] != '=')
-        break;
-    DO (cp = parse_equality (g, cp + 2, &rightval));
-    *valp = (*valp != rightval);
-    break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_band (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    int *valp;
-{
-    int rightval;
-
-    DO (cp = parse_equality (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '&':
-    if (cp[1] != '&') {
-        DO (cp = parse_band (g, cp + 1, &rightval));
-        *valp = (*valp & rightval);
-    }
-    break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_bor (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    int *valp;
-{
-    int rightval;
-
-    DO (cp = parse_band (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '|':
-    if (cp[1] != '|') {
-        DO (cp = parse_bor (g, cp + 1, &rightval));
-        *valp = (*valp | rightval);
-    }
-    break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_land (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    int *valp;
-{
-    int rightval;
-
-    DO (cp = parse_bor (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '&':
-    if (cp[1] != '&')
-        return CALLFUNC(g, handle_error) (g, cp, "&&");
-    DO (cp = parse_land (g, cp + 2, &rightval));
-    *valp = (*valp && rightval);
-    break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_lor (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    int *valp;
-{
-    int rightval;
-
-    DO (cp = parse_land (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '|':
-    if (cp[1] != '|')
-        return CALLFUNC(g, handle_error) (g, cp, "||");
-    DO (cp = parse_lor (g, cp + 2, &rightval));
-    *valp = (*valp || rightval);
-    break;
-    }
-    return cp;
-}
-
-
-/****************************************************************************
-                 External Entry Points
- ****************************************************************************/
-
-const char *
-ParseIfExpression (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    int *valp;
-{
-    return parse_lor (g, cp, valp);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/ifparser.h b/soltools/mkdepend/ifparser.h
deleted file mode 100644
index 936f0ba86..000000000
--- a/soltools/mkdepend/ifparser.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * $XConsortium: ifparser.h,v 1.1 92/08/22 13:05:39 rws Exp $
- *
- * Copyright 1992 Network Computing Devices, Inc.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Network Computing Devices may not be
- * used in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission.  Network Computing Devices makes
- * no representations about the suitability of this software for any purpose.
- * It is provided ``as is'' without express or implied warranty.
- * 
- * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE FOR ANY SPECIAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- * 
- * Author:  Jim Fulton
- *          Network Computing Devices, Inc.
- * 
- * Simple if statement processor
- *
- * This module can be used to evaluate string representations of C language
- * if constructs.  It accepts the following grammar:
- * 
- *     EXPRESSION	:=	VALUE
- * 			 |	VALUE  BINOP	EXPRESSION
- * 
- *     VALUE		:=	'('  EXPRESSION  ')'
- * 			 |	'!'  VALUE
- * 			 |	'-'  VALUE
- * 			 |	'defined'  '('  variable  ')'
- * 			 |	variable
- * 			 |	number
- * 
- *     BINOP		:=	'*'	|  '/'	|  '%'
- * 			 |	'+'	|  '-'
- * 			 |	'<<'	|  '>>'
- * 			 |	'<'	|  '>'	|  '<='  |  '>='
- * 			 |	'=='	|  '!='
- * 			 |	'&'	|  '|'
- * 			 |	'&&'	|  '||'
- * 
- * The normal C order of precidence is supported.
- * 
- * 
- * External Entry Points:
- * 
- *     ParseIfExpression		parse a string for #if
- */
-
-#include <stdio.h>
-
-typedef int Bool;
-#define False 0
-#define True 1
-
-typedef struct _if_parser {
-    struct {				/* functions */
-    const char *(*handle_error) (/* struct _if_parser *, const char *,
-                 const char * */);
-    int (*eval_variable) (/* struct _if_parser *, const char *, int */);
-    int (*eval_defined) (/* struct _if_parser *, const char *, int */);
-    } funcs;
-    char *data;
-} IfParser;
-
-const char *ParseIfExpression (IfParser *, const char *, int *);
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/imakemdep.h b/soltools/mkdepend/imakemdep.h
deleted file mode 100644
index 15b185117..000000000
--- a/soltools/mkdepend/imakemdep.h
+++ /dev/null
@@ -1,702 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-
-/* $XConsortium: imakemdep.h,v 1.83 95/04/07 19:47:46 kaleb Exp $ */
-/* $XFree86: xc/config/imake/imakemdep.h,v 3.12 1995/07/08 10:22:17 dawes Exp $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-
-/* 
- * This file contains machine-dependent constants for the imake utility.
- * When porting imake, read each of the steps below and add in any necessary
- * definitions.  In general you should *not* edit ccimake.c or imake.c!
- */
-
-#ifdef CCIMAKE
-/*
- * Step 1:  imake_ccflags
- *     Define any special flags that will be needed to get imake.c to compile.
- *     These will be passed to the compile along with the contents of the
- *     make variable BOOTSTRAPCFLAGS.
- */
-#if defined(macII) || defined(_AUX_SOURCE)
-#define imake_ccflags "-DmacII -DSYSV"
-#endif
-
-#ifdef stellar
-#define imake_ccflags "-DSYSV"
-#endif
-
-#if defined(USL) || defined(Oki) || defined(NCR)
-#define imake_ccflags "-Xc -DSVR4"
-#endif
-
-#ifdef sony
-#if defined(SYSTYPE_SYSV) || defined(_SYSTYPE_SYSV)
-#define imake_ccflags "-DSVR4"
-#else
-#include <sys/param.h>
-#if NEWSOS < 41
-#define imake_ccflags "-Dbsd43 -DNOSTDHDRS"
-#else
-#if NEWSOS < 42
-#define imake_ccflags "-Dbsd43"
-#endif
-#endif
-#endif
-#endif
-
-#ifdef _CRAY
-#define imake_ccflags "-DSYSV -DUSG"
-#endif
-
-#if defined(_IBMR2) || defined(aix)
-#define imake_ccflags "-Daix -DSYSV"
-#endif
-
-#ifdef Mips
-#  if defined(SYSTYPE_BSD) || defined(BSD) || defined(BSD43)
-#    define imake_ccflags "-DBSD43"
-#  else 
-#    define imake_ccflags "-DSYSV"
-#  endif
-#endif 
-
-#ifdef is68k
-#define imake_ccflags "-Dluna -Duniosb"
-#endif
-
-#ifdef SYSV386
-# ifdef SVR4
-#  define imake_ccflags "-Xc -DSVR4"
-# else
-#  define imake_ccflags "-DSYSV"
-# endif
-#endif
-
-#ifdef SVR4
-# ifdef i386
-#  define imake_ccflags "-Xc -DSVR4"
-# endif
-#endif
-
-#ifdef SYSV
-# ifdef i386
-#  define imake_ccflags "-DSYSV"
-# endif
-#endif
-
-#ifdef __convex__
-#define imake_ccflags "-fn -tm c1"
-#endif
-
-#ifdef apollo
-#define imake_ccflags "-DX_NOT_POSIX"
-#endif
-
-#ifdef WIN32
-#define imake_ccflags "-nologo -batch -D__STDC__"
-#endif
-
-#ifdef __uxp__
-#define imake_ccflags "-DSVR4 -DANSICPP"
-#endif
-
-#ifdef __sxg__
-#define imake_ccflags "-DSYSV -DUSG -DNOSTDHDRS"
-#endif
-
-#if defined(SX) || defined(PC_UX)
-#define imake_ccflags "-DSYSV"
-#endif
-
-#ifdef nec_ews_svr2
-#define imake_ccflags "-DUSG"
-#endif
-
-#if defined(nec_ews_svr4) || defined(_nec_ews_svr4) || defined(_nec_up) || defined(_nec_ft)
-#define imake_ccflags "-DSVR4"
-#endif
-
-#ifdef	MACH
-#define imake_ccflags "-DNOSTDHDRS"
-#endif
-
-/* this is for OS/2 under EMX. This won't work with DOS */
-#if defined(__EMX__) 
-#define imake_ccflags "-DBSD43"
-#endif
-
-#else /* not CCIMAKE */
-#ifndef MAKEDEPEND
-/*
- * Step 2:  dup2
- *     If your OS doesn't have a dup2() system call to duplicate one file
- *     descriptor onto another, define such a mechanism here (if you don't
- *     already fall under the existing category(ies).
- */
-#if defined(SYSV) && !defined(_CRAY) && !defined(Mips)
-#define	dup2(fd1,fd2)	((fd1 == fd2) ? fd1 : (close(fd2), \
-                           fcntl(fd1, F_DUPFD, fd2)))
-#endif
-
-
-/*
- * Step 3:  FIXUP_CPP_WHITESPACE
- *     If your cpp collapses tabs macro expansions into a single space and
- *     replaces escaped newlines with a space, define this symbol.  This will
- *     cause imake to attempt to patch up the generated Makefile by looking
- *     for lines that have colons in them (this is why the rules file escapes
- *     all colons).  One way to tell if you need this is to see whether or not
- *     your Makefiles have no tabs in them and lots of @@ strings.
- */
-#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || (defined(AMOEBA) && defined(CROSS_COMPILE))
-#define FIXUP_CPP_WHITESPACE
-#endif
-#ifdef WIN32
-#define REMOVE_CPP_LEADSPACE
-#define INLINE_SYNTAX
-#define MAGIC_MAKE_VARS
-#endif
-#ifdef __minix_vmd
-#define FIXUP_CPP_WHITESPACE
-#endif
-
-/*
- * Step 4:  USE_CC_E, DEFAULT_CC, DEFAULT_CPP
- *     If you want to use cc -E instead of cpp, define USE_CC_E.
- *     If use cc -E but want a different compiler, define DEFAULT_CC.
- *     If the cpp you need is not in /lib/cpp, define DEFAULT_CPP.
- */
-#ifdef WIN32
-#define USE_CC_E
-#define DEFAULT_CC "cl"
-#endif
-#ifdef apollo
-#define DEFAULT_CPP "/usr/lib/cpp"
-#endif
-#if defined(_IBMR2) && !defined(DEFAULT_CPP)
-#define DEFAULT_CPP "/usr/lpp/X11/Xamples/util/cpp/cpp"
-#endif
-#if defined(sun) && defined(SVR4)
-#define DEFAULT_CPP "/usr/ccs/lib/cpp"
-#endif
-#ifdef __bsdi__
-#define DEFAULT_CPP "/usr/bin/cpp"
-#endif
-#ifdef __uxp__
-#define DEFAULT_CPP "/usr/ccs/lib/cpp"
-#endif
-#ifdef __sxg__
-#define DEFAULT_CPP "/usr/lib/cpp"
-#endif
-#ifdef _CRAY
-#define DEFAULT_CPP "/lib/pcpp"
-#endif
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-#define DEFAULT_CPP "/usr/libexec/cpp"
-#endif
-#ifdef	MACH
-#define USE_CC_E
-#endif
-#ifdef __minix_vmd
-#define DEFAULT_CPP "/usr/lib/cpp"
-#endif
-#if defined(__EMX__)
-/* expects cpp in PATH */
-#define DEFAULT_CPP "cpp"
-#endif
-
-/*
- * Step 5:  cpp_argv
- *     The following table contains the flags that should be passed
- *     whenever a Makefile is being generated.  If your preprocessor 
- *     doesn't predefine any unique symbols, choose one and add it to the
- *     end of this table.  Then, do the following:
- * 
- *         a.  Use this symbol in Imake.tmpl when setting MacroFile.
- *         b.  Put this symbol in the definition of BootstrapCFlags in your
- *             <platform>.cf file.
- *         c.  When doing a make World, always add "BOOTSTRAPCFLAGS=-Dsymbol" 
- *             to the end of the command line.
- * 
- *     Note that you may define more than one symbol (useful for platforms 
- *     that support multiple operating systems).
- */
-
-#define	ARGUMENTS 50	/* number of arguments in various arrays */
-char *cpp_argv[ARGUMENTS] = {
-    "cc",		/* replaced by the actual program to exec */
-    "-I.",		/* add current directory to include path */
-#ifdef unix
-    "-Uunix",	/* remove unix symbol so that filename unix.c okay */
-#endif
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
-    defined(MACH) || defined(DRAGONFLY)
-/* FIXME: strange list of obsolete systems */
-# ifdef __i386__
-    "-D__i386__",
-# endif
-# ifdef __GNUC__
-    "-traditional",
-# endif
-#endif
-#ifdef M4330
-    "-DM4330",	/* Tektronix */
-#endif
-#ifdef M4310
-    "-DM4310",	/* Tektronix */
-#endif
-#if defined(macII) || defined(_AUX_SOURCE)
-    "-DmacII",	/* Apple A/UX */
-#endif
-#ifdef USL
-    "-DUSL",	/* USL */
-#endif
-#ifdef sony
-    "-Dsony",	/* Sony */
-#if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) && NEWSOS < 42
-    "-Dbsd43",
-#endif
-#endif
-#ifdef _IBMR2
-    "-D_IBMR2",	/* IBM RS-6000 (we ensured that aix is defined above */
-#ifndef aix
-#define aix		/* allow BOOTSTRAPCFLAGS="-D_IBMR2" */
-#endif
-#endif /* _IBMR2 */
-#ifdef aix
-    "-Daix",	/* AIX instead of AOS */
-#ifndef ibm
-#define ibm		/* allow BOOTSTRAPCFLAGS="-Daix" */
-#endif
-#endif /* aix */
-#ifdef ibm
-    "-Dibm",	/* IBM PS/2 and RT under both AOS and AIX */
-#endif
-#ifdef luna
-    "-Dluna",	/* OMRON luna 68K and 88K */
-#ifdef luna1
-    "-Dluna1",
-#endif
-#ifdef luna88k		/* need not on UniOS-Mach Vers. 1.13 */
-    "-traditional", /* for some older version            */
-#endif			/* instead of "-DXCOMM=\\#"          */
-#ifdef uniosb
-    "-Duniosb",
-#endif
-#ifdef uniosu
-    "-Duniosu",
-#endif
-#endif /* luna */
-#ifdef _CRAY		/* Cray */
-    "-Ucray",
-#endif
-#ifdef Mips
-    "-DMips",	/* Define and use Mips for Mips Co. OS/mach. */
-# if defined(SYSTYPE_BSD) || defined(BSD) || defined(BSD43)
-    "-DBSD43",	/* Mips RISCOS supports two environments */
-# else
-    "-DSYSV",	/* System V environment is the default */
-# endif
-#endif /* Mips */
-#ifdef MOTOROLA
-    "-DMOTOROLA",    /* Motorola Delta Systems */
-# ifdef SYSV
-    "-DSYSV", 
-# endif
-# ifdef SVR4
-    "-DSVR4",
-# endif
-#endif /* MOTOROLA */
-#ifdef i386
-    "-Di386",
-# ifdef SVR4
-    "-DSVR4",
-# endif
-# ifdef SYSV
-    "-DSYSV",
-#  ifdef ISC
-    "-DISC",
-#   ifdef ISC40
-    "-DISC40",       /* ISC 4.0 */
-#   else
-#    ifdef ISC202
-    "-DISC202",      /* ISC 2.0.2 */
-#    else
-#     ifdef ISC30
-    "-DISC30",       /* ISC 3.0 */
-#     else
-    "-DISC22",       /* ISC 2.2.1 */
-#     endif
-#    endif
-#   endif
-#  endif
-#  ifdef SCO
-    "-DSCO",
-#   ifdef SCO324
-    "-DSCO324",
-#   endif
-#  endif
-# endif
-# ifdef ESIX
-    "-DESIX",
-# endif
-# ifdef ATT
-    "-DATT",
-# endif
-# ifdef DELL
-    "-DDELL",
-# endif
-#endif
-#ifdef SYSV386           /* System V/386 folks, obsolete */
-    "-Di386",
-# ifdef SVR4
-    "-DSVR4",
-# endif
-# ifdef ISC
-    "-DISC",
-#  ifdef ISC40
-    "-DISC40",       /* ISC 4.0 */
-#  else
-#   ifdef ISC202
-    "-DISC202",      /* ISC 2.0.2 */
-#   else
-#    ifdef ISC30
-    "-DISC30",       /* ISC 3.0 */
-#    else
-    "-DISC22",       /* ISC 2.2.1 */
-#    endif
-#   endif
-#  endif
-# endif
-# ifdef SCO
-    "-DSCO",
-#  ifdef SCO324
-    "-DSCO324",
-#  endif
-# endif
-# ifdef ESIX
-    "-DESIX",
-# endif
-# ifdef ATT
-    "-DATT",
-# endif
-# ifdef DELL
-    "-DDELL",
-# endif
-#endif
-#ifdef __osf__
-    "-D__osf__",
-# ifdef __mips__
-    "-D__mips__",
-# endif
-# ifdef __alpha
-    "-D__alpha",
-# endif
-# ifdef __i386__
-    "-D__i386__",
-# endif
-# ifdef __GNUC__
-    "-traditional",
-# endif
-#endif
-#ifdef Oki
-    "-DOki",
-#endif
-#ifdef sun
-#ifdef SVR4
-    "-DSVR4",
-#endif
-#endif
-#ifdef WIN32
-    "-DWIN32",
-    "-nologo",
-    "-batch",
-    "-D__STDC__",
-#endif
-#ifdef NCR
-    "-DNCR",	/* NCR */
-#endif
-#ifdef linux
-        "-traditional",
-        "-Dlinux",
-#endif
-#ifdef __uxp__
-    "-D__uxp__",
-#endif
-#ifdef __sxg__
-    "-D__sxg__",
-#endif
-#ifdef nec_ews_svr2
-    "-Dnec_ews_svr2",
-#endif
-#ifdef AMOEBA
-    "-DAMOEBA",
-# ifdef CROSS_COMPILE
-    "-DCROSS_COMPILE",
-#  ifdef CROSS_i80386
-    "-Di80386",
-#  endif
-#  ifdef CROSS_sparc
-    "-Dsparc",
-#  endif
-#  ifdef CROSS_mc68000
-    "-Dmc68000",
-#  endif
-# else
-#  ifdef i80386
-    "-Di80386",
-#  endif
-#  ifdef sparc
-    "-Dsparc",
-#  endif
-#  ifdef mc68000
-    "-Dmc68000",
-#  endif
-# endif
-#endif
-#ifdef __minix_vmd
-        "-Dminix",
-#endif
-
-#if defined(__EMX__)
-    "-traditional",
-    "-Demxos2",
-#endif
-
-};
-#else /* else MAKEDEPEND */
-/*
- * Step 6:  predefs
- *     If your compiler and/or preprocessor define any specific symbols, add
- *     them to the the following table.  The definition of struct symtab is
- *     in util/makedepend/def.h.
- */
-
-/* FIXME: strange list of obsolete systems */
-struct pair	predefs[] = {
-#ifdef apollo
-    {"apollo", "1", NULL},
-#endif
-#ifdef ibm032
-    {"ibm032", "1", NULL},
-#endif
-#ifdef ibm
-    {"ibm", "1", NULL},
-#endif
-#ifdef aix
-    {"aix", "1", NULL},
-#endif
-#ifdef sun
-    {"sun", "1", NULL},
-#endif
-#ifdef sun2
-    {"sun2", "1", NULL},
-#endif
-#ifdef sun3
-    {"sun3", "1", NULL},
-#endif
-#ifdef sun4
-    {"sun4", "1", NULL},
-#endif
-#ifdef sparc
-    {"sparc", "1", NULL},
-#endif
-#ifdef __sparc__
-    {"__sparc__", "1", NULL},
-#endif
-#ifdef vax
-    {"vax", "1", NULL},
-#endif
-#ifdef VMS
-    {"VMS", "1", NULL},
-#endif
-#ifdef cray
-    {"cray", "1", NULL},
-#endif
-#ifdef CRAY
-    {"CRAY", "1", NULL},
-#endif
-#ifdef _CRAY
-    {"_CRAY", "1", NULL},
-#endif
-#ifdef att
-    {"att", "1", NULL},
-#endif
-#ifdef mips
-    {"mips", "1", NULL},
-#endif
-#ifdef __mips__
-    {"__mips__", "1", NULL},
-#endif
-#ifdef stellar
-    {"stellar", "1", NULL},
-#endif
-#ifdef mc68000
-    {"mc68000", "1", NULL},
-#endif
-#ifdef mc68020
-    {"mc68020", "1", NULL},
-#endif
-#ifdef __GNUC__
-    {"__GNUC__", "1", NULL},
-#endif
-#if __STDC__
-    {"__STDC__", "1", NULL},
-#endif
-#ifdef __HIGHC__
-    {"__HIGHC__", "1", NULL},
-#endif
-#ifdef CMU
-    {"CMU", "1", NULL},
-#endif
-#ifdef luna
-    {"luna", "1", NULL},
-#ifdef luna1
-    {"luna1", "1", NULL},
-#endif
-#ifdef luna2
-    {"luna2", "1", NULL},
-#endif
-#ifdef luna88k
-    {"luna88k", "1", NULL},
-#endif
-#ifdef uniosb
-    {"uniosb", "1", NULL},
-#endif
-#ifdef uniosu
-    {"uniosu", "1", NULL},
-#endif
-#endif
-#ifdef ieeep754
-    {"ieeep754", "1", NULL},
-#endif
-#ifdef is68k
-    {"is68k", "1", NULL},
-#endif
-#ifdef m68k
-        {"m68k", "1", NULL},
-#endif
-#ifdef m88k
-        {"m88k", "1", NULL},
-#endif
-#ifdef __m88k__
-    {"__m88k__", "1", NULL},
-#endif
-#ifdef bsd43
-    {"bsd43", "1", NULL},
-#endif
-#ifdef hcx
-    {"hcx", "1", NULL},
-#endif
-#ifdef sony
-    {"sony", "1", NULL},
-#ifdef SYSTYPE_SYSV
-    {"SYSTYPE_SYSV", "1", NULL},
-#endif
-#ifdef _SYSTYPE_SYSV
-    {"_SYSTYPE_SYSV", "1", NULL},
-#endif
-#endif
-#ifdef __OSF__
-    {"__OSF__", "1", NULL},
-#endif
-#ifdef __osf__
-    {"__osf__", "1", NULL},
-#endif
-#ifdef __alpha
-    {"__alpha", "1", NULL},
-#endif
-#ifdef __DECC
-    {"__DECC",  "1", NULL},
-#endif
-#ifdef __decc
-    {"__decc",  "1", NULL},
-#endif
-#ifdef __uxp__
-    {"__uxp__", "1", NULL},
-#endif
-#ifdef __sxg__
-    {"__sxg__", "1", NULL},
-#endif
-#ifdef __bsdi__
-    {"__bsdi__", "1", NULL},
-#endif
-#ifdef nec_ews_svr2
-    {"nec_ews_svr2", "1", NULL},
-#endif
-#ifdef nec_ews_svr4
-    {"nec_ews_svr4", "1", NULL},
-#endif
-#ifdef _nec_ews_svr4
-    {"_nec_ews_svr4", "1", NULL},
-#endif
-#ifdef _nec_up
-    {"_nec_up", "1", NULL},
-#endif
-#ifdef SX
-    {"SX", "1", NULL},
-#endif
-#ifdef nec
-    {"nec", "1", NULL},
-#endif
-#ifdef _nec_ft
-    {"_nec_ft", "1", NULL},
-#endif
-#ifdef PC_UX
-    {"PC_UX", "1", NULL},
-#endif
-#ifdef sgi
-    {"sgi", "1", NULL},
-#endif
-#ifdef __sgi
-    {"__sgi", "1", NULL},
-#endif
-#ifdef __FreeBSD__
-    {"__FreeBSD__", "1", NULL},
-#endif
-#ifdef __NetBSD__
-    {"__NetBSD__", "1", NULL},
-#endif
-#ifdef __OpenBSD__
-    {"__OpenBSD__", "1", NULL},
-#endif
-#ifdef __DragonFly__
-    {"__DragonFly__", "1", NULL},
-#endif
-#ifdef __EMX__
-    {"__EMX__", "1", NULL},
-#endif
-    /* add any additional symbols before this line */
-    {NULL, NULL, NULL}
-};
-
-#endif /* MAKEDEPEND */
-#endif /* CCIMAKE */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c
deleted file mode 100644
index 844c99b2f..000000000
--- a/soltools/mkdepend/include.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* $XConsortium: include.c,v 1.17 94/12/05 19:33:08 gildea Exp $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-
-#include "def.h"
-#include <string.h>
-
-void remove_dotdot( char * );
-int isdot( char * );
-int isdotdot( char * );
-int issymbolic(char * dir, char * component);
-int exists_path(struct IncludesCollection*, char*);
-
-
-extern struct	inclist	inclist[ MAXFILES ],
-            *inclistp;
-extern char	*includedirs[ ];
-extern char	*notdotdot[ ];
-extern boolean show_where_not;
-extern boolean warn_multiple;
-
-struct inclist *inc_path(file, include, dot, incCollection)
-    register char	*file,
-            *include;
-    boolean	dot;
-    struct IncludesCollection* incCollection;
-{
-    static char	path[ BUFSIZ ];
-    register char		**pp, *p;
-    register struct inclist	*ip;
-    struct stat	st;
-    boolean	found = FALSE;
-    (void)dot;
-
-    /*
-     * Check all previously found include files for a path that
-     * has already been expanded.
-     */
-    for (ip = inclist; ip->i_file; ip++)
-        if ((strcmp(ip->i_incstring, include) == 0) && !ip->i_included_sym)
-        {
-        found = TRUE;
-        break;
-        }
-
-    /*
-     * If the path was surrounded by "" or is an absolute path,
-     * then check the exact path provided.
-     */
-// FIXME: creates duplicates in the dependency files if absolute paths are
-// given, which certainly is not the intended behavior. Also it slows down
-// makedepend performance considerably.
-//	if (!found && (dot || *include == '/')) {
-//        
-//		if ((exists_path(incCollection, include)) && stat(include, &st) == 0 && !( st.st_mode & S_IFDIR)) {
-//			ip = newinclude(include, include);
-//			found = TRUE;
-//		}
-//		else if (show_where_not)
-//			warning1("\tnot in %s\n", include);
-//	}
-
-    /*
-     * See if this include file is in the directory of the
-     * file being compiled.
-     */
-    if (!found) {
-        for (p=file+strlen(file); p>file; p--)
-            if (*p == '/')
-                break;
-        if (p == file)
-            strcpy(path, include);
-        else {
-            strncpy(path, file, (p-file) + 1);
-            path[ (p-file) + 1 ] = '\0';
-            strcpy(path + (p-file) + 1, include);
-        }
-        remove_dotdot(path);
-        if ((exists_path(incCollection, path)) && stat(path, &st) == 0 && !( st.st_mode & S_IFDIR)) {
-            ip = newinclude(path, include);
-            found = TRUE;
-        }
-        else if (show_where_not)
-            warning1("\tnot in %s\n", path);
-    }
-
-    /*
-     * Check the include directories specified. (standard include dir
-     * should be at the end.)
-     */
-    if (!found)
-        for (pp = includedirs; *pp; pp++) {
-            sprintf(path, "%s/%s", *pp, include);
-            remove_dotdot(path);
-            if ((exists_path(incCollection, path)) && stat(path, &st) == 0 && !(st.st_mode & S_IFDIR)) {
-                ip = newinclude(path, include);
-                found = TRUE;
-                break;
-            }
-            else if (show_where_not)
-                warning1("\tnot in %s\n", path);
-        }
-
-    if (!found)
-        ip = NULL;
-    return(ip);
-}
-
-int exists_path(incCollection, path) 
-    struct IncludesCollection* incCollection;
-    char* path; 
-{
-    convert_slashes(path);
-    return call_IncludesCollection_exists(incCollection, path);
-}
-
-/*
- * Occasionally, pathnames are created that look like .../x/../y
- * Any of the 'x/..' sequences within the name can be eliminated.
- * (but only if 'x' is not a symbolic link!!)
- */
-void remove_dotdot(path)
-    char	*path;
-{
-    register char	*end, *from, *to, **cp;
-    char		*components[ MAXFILES ],
-            newpath[ BUFSIZ ];
-    boolean		component_copied;
-
-    /*
-     * slice path up into components.
-     */
-    to = newpath;
-    if (*path == '/')
-        *to++ = '/';
-    *to = '\0';
-    cp = components;
-    for (from=end=path; *end; end++)
-        if (*end == '/') {
-            while (*end == '/')
-                *end++ = '\0';
-            if (*from)
-                *cp++ = from;
-            from = end;
-        }
-    *cp++ = from;
-    *cp = NULL;
-
-    /*
-     * Recursively remove all 'x/..' component pairs.
-     */
-    cp = components;
-    while(*cp) {
-        if (!isdot(*cp) && !isdotdot(*cp) && isdotdot(*(cp+1))
-            && !issymbolic(newpath, *cp))
-        {
-            char **fp = cp + 2;
-            char **tp = cp;
-
-            do 
-            *tp++ = *fp; /* move all the pointers down */
-            while (*fp++);
-            if (cp != components)
-            cp--;	/* go back and check for nested ".." */
-        } else {
-            cp++;
-        }
-    }
-    /*
-     * Concatenate the remaining path elements.
-     */
-    cp = components;
-    component_copied = FALSE;
-    while(*cp) {
-        if (component_copied)
-            *to++ = '/';
-        component_copied = TRUE;
-        for (from = *cp; *from; )
-            *to++ = *from++;
-        *to = '\0';
-        cp++;
-    }
-    *to++ = '\0';
-
-    /*
-     * copy the reconstituted path back to our pointer.
-     */
-    strcpy(path, newpath);
-}
-
-int isdot(p)
-    register char	*p;
-{
-    if(p && p[0] == '.' && p[1] == '\0')
-        return(TRUE);
-    return(FALSE);
-}
-
-int isdotdot(p)
-    register char	*p;
-{
-    if(p && p[0] == '.' && p[1] == '.' && p[2] == '\0')
-        return(TRUE);
-    return(FALSE);
-}
-
-int issymbolic(dir, component)
-    register char	*dir, *component;
-{
-#ifdef S_IFLNK
-    struct stat	st;
-    char	buf[ BUFSIZ ], **pp;
-
-    sprintf(buf, "%s%s%s", dir, *dir ? "/" : "", component);
-    for (pp=notdotdot; *pp; pp++)
-        if (strcmp(*pp, buf) == 0)
-            return (TRUE);
-    if (lstat(buf, &st) == 0
-    && (st.st_mode & S_IFMT) == S_IFLNK) {
-        *pp++ = copy(buf);
-        if (pp >= &notdotdot[ MAXDIRS ])
-            fatalerr("out of .. dirs, increase MAXDIRS\n");
-        return(TRUE);
-    }
-#endif
-    return(FALSE);
-}
-
-/*
- * Add an include file to the list of those included by 'file'.
- */
-struct inclist *newinclude(newfile, incstring)
-    register char	*newfile, *incstring;
-{
-    register struct inclist	*ip;
-
-    /*
-     * First, put this file on the global list of include files.
-     */
-    ip = inclistp++;
-    if (inclistp == inclist + MAXFILES - 1)
-        fatalerr("out of space: increase MAXFILES\n");
-    ip->i_file = copy(newfile);
-    ip->i_included_sym = FALSE;
-    if (incstring == NULL)
-        ip->i_incstring = ip->i_file;
-    else
-        ip->i_incstring = copy(incstring);
-
-    return(ip);
-}
-
-void included_by(ip, newfile)
-    register struct inclist	*ip, *newfile;
-{
-    register int i;
-
-    if (ip == NULL)
-        return;
-    /*
-     * Put this include file (newfile) on the list of files included
-     * by 'file'.  If 'file' is NULL, then it is not an include
-     * file itself (i.e. was probably mentioned on the command line).
-     * If it is already on the list, don't stick it on again.
-     */
-    if (ip->i_list == NULL)
-        ip->i_list = (struct inclist **)
-            malloc(sizeof(struct inclist *) * ++ip->i_listlen);
-    else {
-        for (i=0; i<ip->i_listlen; i++)
-            if (ip->i_list[ i ] == newfile) {
-                i = (int)strlen(newfile->i_file);
-                if (!ip->i_included_sym &&
-                !(i > 2 &&
-                  newfile->i_file[i-1] == 'c' &&
-                  newfile->i_file[i-2] == '.'))
-                {
-                /* only complain if ip has */
-                /* no #include SYMBOL lines  */
-                /* and is not a .c file */
-                if (warn_multiple)
-                {
-                    warning("%s includes %s more than once!\n",
-                        ip->i_file, newfile->i_file);
-                    warning1("Already have\n");
-                    for (i=0; i<ip->i_listlen; i++)
-                        warning1("\t%s\n", ip->i_list[i]->i_file);
-                }
-                }
-                return;
-            }
-        ip->i_list = (struct inclist **) realloc(ip->i_list,
-            sizeof(struct inclist *) * ++ip->i_listlen);
-    }
-    ip->i_list[ ip->i_listlen-1 ] = newfile;
-}
-
-void inc_clean ()
-{
-    register struct inclist *ip;
-
-    for (ip = inclist; ip < inclistp; ip++) {
-        ip->i_marked = FALSE;
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
deleted file mode 100644
index 4aac40019..000000000
--- a/soltools/mkdepend/main.c
+++ /dev/null
@@ -1,803 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* $XConsortium: main.c,v 1.84 94/11/30 16:10:44 kaleb Exp $ */
-/* $XFree86: xc/config/makedepend/main.c,v 3.4 1995/07/15 14:53:49 dawes Exp $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-#if defined(FREEBSD) || defined(MACOSX)
-#include <sys/types.h>
-#include <sys/stat.h>
-#endif
-
-#ifdef _WIN32
-#include <io.h>
-#endif
-
-#ifdef _MSC_VER	    /* Define ssize_t */
-
-#if !defined(_W64)
-#if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-#define _W64 __w64
-#else
-#define _W64
-#endif
-#endif
-
-#ifdef  _WIN64
-typedef __int64    ssize_t;
-#else
-typedef _W64 int   ssize_t;
-#endif
-
-#endif
-
-#include "def.h"
-#include <string.h>
-#ifdef hpux
-#define sigvec sigvector
-#endif /* hpux */
-
-#ifdef X_POSIX_C_SOURCE
-#define _POSIX_C_SOURCE X_POSIX_C_SOURCE
-#include <signal.h>
-#undef _POSIX_C_SOURCE
-#else
-#if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE)
-#include <signal.h>
-#else
-#define _POSIX_SOURCE
-#include <signal.h>
-#undef _POSIX_SOURCE
-#endif
-#endif
-
-#include <stdarg.h>
-
-#ifdef MINIX
-#define USE_CHMOD	1
-#endif
-
-#ifdef DEBUG
-int	_debugmask;
-#endif
-
-char *ProgramName;
-
-#define OBJSUFFIX ".obj"
-#define	INCLUDEDIR "."
-
-char	*directives[] = {
-    "if",
-    "ifdef",
-    "ifndef",
-    "else",
-    "endif",
-    "define",
-    "undef",
-    "include",
-    "line",
-    "pragma",
-    "error",
-    "ident",
-    "sccs",
-    "elif",
-    "eject",
-    NULL
-};
-
-#define MAKEDEPEND
-#include "imakemdep.h"	/* from config sources */
-#undef MAKEDEPEND
-
-/*******   function declarations ********/
-/*******   added by -Wall project *******/
-void redirect(char * line, char * makefile );
-
-struct	inclist inclist[ MAXFILES ],
-        *inclistp = inclist;
-
-struct symhash *maininclist = NULL;
-
-char	*filelist[ MAXFILES ];
-char	*includedirs[ MAXDIRS + 1 ];
-char	*notdotdot[ MAXDIRS ];
-char	*objprefix = "";
-char	*objsuffix = OBJSUFFIX;
-char	*startat = "# DO NOT DELETE";
-int	width = 78;
-boolean	append = FALSE;
-boolean	printed = FALSE;
-boolean	verbose = FALSE;
-boolean	show_where_not = FALSE;
-boolean warn_multiple = FALSE;	/* Warn on multiple includes of same file */
-
-static
-#ifdef SIGNALRETURNSINT
-int
-#else
-void
-#endif
-catch (int sig)
-{
-    fflush (stdout);
-    fatalerr ("got signal %d\n", sig);
-}
-
-#if (defined(i386) && defined(SYSV)) || defined(WIN32)
-#define USGISH
-#endif
-
-#ifndef USGISH
-#ifndef _POSIX_SOURCE
-#define sigaction sigvec
-#define sa_handler sv_handler
-#define sa_mask sv_mask
-#define sa_flags sv_flags
-#endif
-struct sigaction sig_act;
-#endif /* USGISH */
-
-boolean	native_win_slashes = FALSE;
-
-int main(argc, argv)
-    int	argc;
-    char	**argv;
-{
-    register char	**fp = filelist;
-    register char	**incp = includedirs;
-    register char	*p;
-    register struct inclist	*ip;
-    char	*makefile = NULL;
-    struct filepointer	*filecontent;
-    struct pair *psymp = predefs;
-    char *endmarker = NULL;
-    char *defincdir = NULL;
-    struct IncludesCollection* incCollection;
-
-    ProgramName = argv[0];
-
-    while (psymp->p_name)
-    {
-        hash_define(psymp->p_name, psymp->p_value, &maininclist);
-        psymp++;
-    }
-    if (argc == 2 && argv[1][0] == '@') {
-        struct stat ast;
-        int afd;
-        char *args;
-        char **nargv;
-        int nargc;
-        char quotechar = '\0';
-
-        nargc = 1;
-        if ((afd = open(argv[1]+1, O_RDONLY)) < 0)
-        fatalerr("cannot open \"%s\"\n", argv[1]+1);
-        fstat(afd, &ast);
-        args = (char *)malloc(ast.st_size + 1);
-        if ((ast.st_size = read(afd, args, (size_t) ast.st_size)) < 0)
-        fatalerr("failed to read %s\n", argv[1]+1);
-        args[ast.st_size] = '\0';
-        close(afd);
-        for (p = args; *p; p++) {
-        if (quotechar) {
-            if (quotechar == '\\' ||
-            (*p == quotechar && p[-1] != '\\'))
-            quotechar = '\0';
-            continue;
-        }
-        switch (*p) {
-        case '\\':
-        case '"':
-        case '\'':
-            quotechar = *p;
-            break;
-        case ' ':
-        case '\n':
-            *p = '\0';
-            if (p > args && p[-1])
-            nargc++;
-            break;
-        }
-        }
-        if (p[-1])
-        nargc++;
-        nargv = (char **)malloc(nargc * sizeof(char *));
-        nargv[0] = argv[0];
-        argc = 1;
-        for (p = args; argc < nargc; p += strlen(p) + 1)
-        if (*p) nargv[argc++] = p;
-        argv = nargv;
-    }
-    for(argc--, argv++; argc; argc--, argv++) {
-            /* if looking for endmarker then check before parsing */
-        if (endmarker && strcmp (endmarker, *argv) == 0) {
-            endmarker = NULL;
-            continue;
-        }
-        if (**argv != '-') {
-            /* treat +thing as an option for C++ */
-            if (endmarker && **argv == '+')
-                continue;
-            *fp++ = argv[0];
-            continue;
-        }
-        switch(argv[0][1]) {
-        case '-':
-            endmarker = &argv[0][2];
-            if (endmarker[0] == '\0') endmarker = "--";
-            break;
-        case 'D':
-            if (argv[0][2] == '\0') {
-                argv++;
-                argc--;
-            }
-            for (p=argv[0] + 2; *p ; p++)
-                if (*p == '=') {
-                    *p = ' ';
-                    break;
-                }
-            define(argv[0] + 2, &maininclist);
-            break;
-        case 'I':
-            if (incp >= includedirs + MAXDIRS)
-                fatalerr("Too many -I flags.\n");
-            *incp++ = argv[0]+2;
-            if (**(incp-1) == '\0') {
-                *(incp-1) = *(++argv);
-                argc--;
-            }
-            break;
-        case 'Y':
-            defincdir = argv[0]+2;
-            break;
-        /* do not use if endmarker processing */
-        case 'a':
-            if (endmarker) break;
-            append = TRUE;
-            break;
-        case 'w':
-            if (endmarker) break;
-            if (argv[0][2] == '\0') {
-                argv++;
-                argc--;
-                width = atoi(argv[0]);
-            } else
-                width = atoi(argv[0]+2);
-            break;
-        case 'n':
-            // Use "-n" switch to generate dependencies with windows-native slash style 
-            native_win_slashes = TRUE;
-            break;
-        case 'o':
-            if (endmarker) break;
-            if (argv[0][2] == '\0') {
-                argv++;
-                argc--;
-                objsuffix = argv[0];
-            } else
-                objsuffix = argv[0]+2;
-            break;
-        case 'p':
-            if (endmarker) break;
-            if (argv[0][2] == '\0') {
-                argv++;
-                argc--;
-                objprefix = argv[0];
-            } else
-                objprefix = argv[0]+2;
-            break;
-        case 'v':
-            if (endmarker) break;
-            verbose = TRUE;
-#ifdef DEBUG
-            if (argv[0][2])
-                _debugmask = atoi(argv[0]+2);
-#endif
-            break;
-        case 's':
-            if (endmarker) break;
-            startat = argv[0]+2;
-            if (*startat == '\0') {
-                startat = *(++argv);
-                argc--;
-            }
-            if (*startat != '#')
-                fatalerr("-s flag's value should start %s\n",
-                    "with '#'.");
-            break;
-        case 'f':
-            if (endmarker) break;
-            makefile = argv[0]+2;
-            if (*makefile == '\0') {
-                makefile = *(++argv);
-                argc--;
-            }
-            break;
-
-        case 'm':
-            warn_multiple = TRUE;
-            break;
-            
-        /* Ignore -O, -g so we can just pass ${CFLAGS} to
-           makedepend
-         */
-        case 'O':
-        case 'g':
-            break;
-        default:
-            if (endmarker) break;
-            warning("ignoring option %s\n", argv[0]);
-        }
-    }
-    
-    convert_slashes(objprefix);
-    objprefix = append_slash(objprefix);
-    
-    if (!defincdir) {
-#ifdef PREINCDIR
-        if (incp >= includedirs + MAXDIRS)
-        fatalerr("Too many -I flags.\n");
-        *incp++ = PREINCDIR;
-#endif
-        if (incp >= includedirs + MAXDIRS)
-        fatalerr("Too many -I flags.\n");
-        *incp++ = INCLUDEDIR;
-#ifdef POSTINCDIR
-        if (incp >= includedirs + MAXDIRS)
-        fatalerr("Too many -I flags.\n");
-        *incp++ = POSTINCDIR;
-#endif
-    } else if (*defincdir) {
-        if (incp >= includedirs + MAXDIRS)
-        fatalerr("Too many -I flags.\n");
-        *incp++ = defincdir;
-    }
-
-    redirect(startat, makefile);
-
-    /*
-     * catch signals.
-     */
-#ifdef USGISH
-/*  should really reset SIGINT to SIG_IGN if it was.  */
-#ifdef SIGHUP
-    signal (SIGHUP, catch);
-#endif
-    signal (SIGINT, catch);
-#ifdef SIGQUIT
-    signal (SIGQUIT, catch);
-#endif
-    signal (SIGILL, catch);
-#ifdef SIGBUS
-    signal (SIGBUS, catch);
-#endif
-    signal (SIGSEGV, catch);
-#ifdef SIGSYS
-    signal (SIGSYS, catch);
-#endif
-    signal (SIGFPE, catch);
-#else
-    sig_act.sa_handler = catch;
-#ifdef _POSIX_SOURCE
-    sigemptyset(&sig_act.sa_mask);
-    sigaddset(&sig_act.sa_mask, SIGINT);
-    sigaddset(&sig_act.sa_mask, SIGQUIT);
-#ifdef SIGBUS
-    sigaddset(&sig_act.sa_mask, SIGBUS);
-#endif
-    sigaddset(&sig_act.sa_mask, SIGILL);
-    sigaddset(&sig_act.sa_mask, SIGSEGV);
-    sigaddset(&sig_act.sa_mask, SIGHUP);
-    sigaddset(&sig_act.sa_mask, SIGPIPE);
-#ifdef SIGSYS
-    sigaddset(&sig_act.sa_mask, SIGSYS);
-#endif
-#else
-    sig_act.sa_mask = ((1<<(SIGINT -1))
-               |(1<<(SIGQUIT-1))
-#ifdef SIGBUS
-               |(1<<(SIGBUS-1))
-#endif
-               |(1<<(SIGILL-1))
-               |(1<<(SIGSEGV-1))
-               |(1<<(SIGHUP-1))
-               |(1<<(SIGPIPE-1))
-#ifdef SIGSYS
-               |(1<<(SIGSYS-1))
-#endif
-               );
-#endif /* _POSIX_SOURCE */
-    sig_act.sa_flags = 0;
-    sigaction(SIGHUP, &sig_act, (struct sigaction *)0);
-    sigaction(SIGINT, &sig_act, (struct sigaction *)0);
-    sigaction(SIGQUIT, &sig_act, (struct sigaction *)0);
-    sigaction(SIGILL, &sig_act, (struct sigaction *)0);
-#ifdef SIGBUS
-    sigaction(SIGBUS, &sig_act, (struct sigaction *)0);
-#endif
-    sigaction(SIGSEGV, &sig_act, (struct sigaction *)0);
-#ifdef SIGSYS
-    sigaction(SIGSYS, &sig_act, (struct sigaction *)0);
-#endif
-#endif /* USGISH */
-
-    /*
-     * now peruse through the list of files.
-     */
-    incCollection = create_IncludesCollection();
-    
-    for(fp=filelist; *fp; fp++) {
-        struct symhash *includes;
-        filecontent = getfile(*fp);
-        ip = newinclude(*fp, (char *)NULL);
-
-        includes = hash_copy( maininclist );
-        find_includes(filecontent, ip, ip, 0, FALSE, incCollection, includes);
-        hash_free( includes );
-        
-        freefile(filecontent);
-        recursive_pr_include(ip, ip->i_file, base_name(*fp));
-        inc_clean();
-    }
-    if (printed)
-        printf("\n");
-
-    delete_IncludesCollection(incCollection);
-
-    exit(0);
-}
-
-struct filepointer *getfile(file)
-    char	*file;
-{
-    register int	fd;
-    struct filepointer	*content;
-    struct stat	st;
-    off_t		size_backup;
-    ssize_t		bytes_read;
-    size_t		malloc_size;
-
-    content = (struct filepointer *)malloc(sizeof(struct filepointer));
-    if ((fd = open(file, O_RDONLY)) < 0) {
-        warning("makedepend:  Cannot open file \"%s\"\n", file);
-        content->f_p = content->f_base = content->f_end = (char *)malloc(1);
-        *content->f_p = '\0';
-        return(content);
-    }
-    fstat(fd, &st);
-
-    size_backup = st.st_size;
-    malloc_size = size_backup;
-    /* Since off_t is larger than size_t, need to test for
-     * truncation.
-     */
-    if ( (off_t)malloc_size != size_backup )
-    {
-        close( fd );
-        warning("makedepend:  File \"%s\" size larger than can fit in size_t.  Cannot allocate memory for contents.\n", file);
-        content->f_p = content->f_base = content->f_end = (char *)malloc(1);
-        *content->f_p = '\0';
-        return(content);
-    }
-
-    content->f_base = (char *)malloc(malloc_size+1);
-    if (content->f_base == NULL)
-        fatalerr("makedepend:  Cannot allocate memory to process file \"%s\"\n", file);
-    if ((bytes_read = read(fd, content->f_base, malloc_size)) < 0)
-        if ( st.st_mode & S_IFREG )
-            fatalerr("makedepend:  Failed to read file \"%s\"\n", file);
-    
-    close(fd);
-    content->f_len = bytes_read+1;
-    content->f_p = content->f_base;
-    content->f_end = content->f_base + bytes_read;
-    *content->f_end = '\0';
-    content->f_line = 0;
-    return(content);
-}
-
-void freefile(fp)
-    struct filepointer	*fp;
-{
-    free(fp->f_base);
-    free(fp);
-}
-
-char *copy(str)
-    register char	*str;
-{
-    register char	*p = (char *)malloc(strlen(str) + 1);
-
-    strcpy(p, str);
-    return(p);
-}
-
-int match(str, list)
-    register char	*str, **list;
-{
-    register int	i;
-
-    for (i=0; *list; i++, list++)
-        if (strcmp(str, *list) == 0)
-            return(i);
-    return(-1);
-}
-
-/*
- * Get the next line.  We only return lines beginning with '#' since that
- * is all this program is ever interested in.
- */
-char *get_line(filep)
-    register struct filepointer	*filep;
-{
-    register char	*p,	/* walking pointer */
-            *eof,	/* end of file pointer */
-            *bol;	/* beginning of line pointer */
-    register int	lineno;	/* line number */
-
-    p = filep->f_p;
-    eof = filep->f_end;
-    if (p >= eof)
-        return((char *)NULL);
-    lineno = filep->f_line;
-
-    for(bol = p--; ++p < eof; ) {
-        if (*p == '/' && *(p+1) == '*') { /* consume comments */
-            *p++ = ' ', *p++ = ' ';
-            while (*p) {
-                if (*p == '*' && *(p+1) == '/') {
-                    *p++ = ' ', *p = ' ';
-                    break;
-                }
-                else if (*p == '\n')
-                    lineno++;
-                *p++ = ' ';
-            }
-            continue;
-        }
-        else if (*p == '/' && *(p+1) == '/') { /* consume comments */
-            *p++ = ' ', *p++ = ' ';
-            while (*p && *p != '\n')
-                *p++ = ' ';
-            if ( *p == '\n' )
-                p--;
-            lineno++;
-            continue;
-        }
-        else if (*p == '\\') {
-            if (*(p+1) == '\n') {
-                *p = ' ';
-                *(p+1) = ' ';
-                lineno++;
-            }
-        }
-        else if (*p == '\n') {
-            lineno++;
-            if (*bol == '#') {
-                register char *cp;
-
-                *p++ = '\0';
-                /* punt lines with just # (yacc generated) */
-                for (cp = bol+1; 
-                     *cp && (*cp == ' ' || *cp == '\t'); cp++);
-                if (*cp) goto done;
-            }
-            bol = p+1;
-        }
-    }
-    if (*bol != '#')
-        bol = NULL;
-done:
-    filep->f_p = p;
-    filep->f_line = lineno;
-    return(bol);
-}
-
-/*
- * Strip the file name down to what we want to see in the Makefile.
- * It will have objprefix and objsuffix around it.
- */
-char *base_name(file)
-    register char	*file;
-{
-    register char	*p;
-
-    file = copy(file);
-    for(p=file+strlen(file); p>file && *p != '.'; p--) ;
-
-    if (*p == '.')
-        *p = '\0';
-
-    while (p > file) {
-        if ( *p == '/' ||  *p == '\\') {
-            file = p + 1;
-            break;
-        };
-        p--;
-    };
-    return(file);
-}
-
-#if defined(USG) && !defined(CRAY) && !defined(SVR4)
-int rename (from, to)
-    char *from, *to;
-{
-    (void) unlink (to);
-    if (link (from, to) == 0) {
-    unlink (from);
-    return 0;
-    } else {
-    return -1;
-    }
-}
-#endif /* USGISH */
-
-void redirect(line, makefile)
-    char	*line,
-        *makefile;
-{
-    struct stat	st;
-    FILE	*fdin, *fdout;
-    char	backup[ BUFSIZ ],
-        buf[ BUFSIZ ];
-    boolean	found = FALSE;
-    int	len;
-
-    /*
-     * if makefile is "-" then let it pour onto stdout.
-     */
-    if (makefile && *makefile == '-' && *(makefile+1) == '\0')
-        return;
-
-    /*
-     * use a default makefile is not specified.
-     */
-    if (!makefile) {
-        if (stat("Makefile", &st) == 0)
-            makefile = "Makefile";
-        else if (stat("makefile", &st) == 0)
-            makefile = "makefile";
-        else
-            fatalerr("[mM]akefile is not present\n");
-    }
-    else
-        stat(makefile, &st);
-    if ((fdin = fopen(makefile, "r")) == NULL)
-        fatalerr("cannot open \"%s\"\n", makefile);
-    sprintf(backup, "%s.bak", makefile);
-    unlink(backup);
-#if defined(WIN32)
-    fclose(fdin);
-#endif
-    if (rename(makefile, backup) < 0)
-        fatalerr("cannot rename %s to %s\n", makefile, backup);
-#if defined(WIN32)
-    if ((fdin = fopen(backup, "r")) == NULL)
-        fatalerr("cannot open \"%s\"\n", backup);
-#endif
-    if ((fdout = freopen(makefile, "w", stdout)) == NULL)
-        fatalerr("cannot open \"%s\"\n", backup);
-    len = strlen(line);
-    while (!found && fgets(buf, BUFSIZ, fdin)) {
-        if (*buf == '#' && strncmp(line, buf, len) == 0)
-            found = TRUE;
-        fputs(buf, fdout);
-    }
-    if (!found) {
-        if (verbose)
-        warning("Adding new delimiting line \"%s\" and dependencies...\n",
-            line);
-        puts(line); /* same as fputs(fdout); but with newline */
-    } else if (append) {
-        while (fgets(buf, BUFSIZ, fdin)) {
-        fputs(buf, fdout);
-        }
-    }
-    fflush(fdout);
-#if defined(USGISH) || defined(USE_CHMOD)
-    chmod(makefile, st.st_mode);
-#else
-    fchmod(fileno(fdout), st.st_mode);
-#endif /* USGISH */
-    fclose(fdin);
-}
-
-void fatalerr(char *msg, ...)
-{
-    va_list args;
-    fprintf(stderr, "%s: error:  ", ProgramName);
-    va_start(args, msg);
-    vfprintf(stderr, msg, args);
-    va_end(args);
-    exit (1);
-}
-
-void warning(char *msg, ...)
-{
-#ifdef DEBUG_MKDEPEND
-    va_list args;
-    fprintf(stderr, "%s: warning:  ", ProgramName);
-    va_start(args, msg);
-    vfprintf(stderr, msg, args);
-    va_end(args);
-#else
-    (void)msg;
-#endif /* DEBUG_MKDEPEND */
-}
-
-void warning1(char *msg, ...)
-{
-#ifdef DEBUG_MKDEPEND
-    va_list args;
-    va_start(args, msg);
-    vfprintf(stderr, msg, args);
-    va_end(args);
-#else
-    (void)msg;
-#endif /* DEBUG_MKDEPEND */
-}
-
-void convert_slashes(path) 
-    char* path; 
-{
-#if defined (WNT)
-    /*
-     * Convert backslashes to slashes
-     */
-    char *ptr;
-    if (native_win_slashes) {
-        for (ptr = (char*)path; *ptr; ++ptr)
-            if (*ptr == '/')
-                *ptr = '\\';
-    } else {
-        for (ptr = (char*)path; *ptr; ++ptr)
-            if (*ptr == '\\')
-                *ptr = '/';
-    };
-#else
-    (void)path;
-#endif
-}
-
-char* append_slash(path) 
-    char* path; 
-{
-    char *new_string;
-    if ((path[strlen(path) - 1] == '/') || (path[strlen(path) - 1] == '\\')) {
-        new_string = path;
-    } else {
-        new_string = (char*)malloc(sizeof(char) * (strlen(path) + 2));
-        strcpy(new_string, path);
-        if (native_win_slashes)
-            strcat(new_string, "\\");
-        else
-            strcat(new_string, "/");
-    };
-    return new_string;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
deleted file mode 100644
index 9c700ff67..000000000
--- a/soltools/mkdepend/makefile.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJNAME=soltools
-TARGET=make_makedepend
-PRJ=..
-TARGETTYPE=CUI
-LIBTARGET=NO
-# noadjust here to have dependencies over there
-noadjust=TRUE
-nodep=true
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE : settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-    @echo Nothing done when cross-compiling
-.ENDIF
-
-LIBSALCPPRT=
-UWINAPILIB=
-
-CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS  
-
-.IF "$(COM)" == "MSC"
-# C4100: unreferenced formal parameter
-# C4131: uses old-style declarator
-# C4242: conversion from 'int' to 'char', possible loss of data
-# C4706: assignment within conditional expression
-CDEFS+=-wd4100 -wd4131 -wd4242 -wd4706
-.ENDIF
-
-OBJFILES=  \
-        $(OBJ)$/cppsetup.obj \
-        $(OBJ)$/ifparser.obj \
-        $(OBJ)$/include.obj \
-        $(OBJ)$/main.obj \
-        $(OBJ)$/parse.obj \
-        $(OBJ)$/pr.obj \
-        $(OBJ)$/collectdircontent.obj \
-        $(NULL)
-
-APP1TARGET=makedepend
-APP1OBJS=$(OBJFILES)
-APP1RPATH=NONE
-
-.IF "$(COM)"=="MSC"
-.IF "$(dbgutil)"==""
-APP1STDLIBS+=msvcprt.lib
-.ELSE
-APP1STDLIBS+=msvcprtd.lib
-CDEFS+=-D_DEBUG
-.ENDIF                        # "$(DBG_UTIL)"==""
-.ENDIF                        # "$(COM)"=="MSC"
-
-.IF "$(OS)"=="SOLARIS"
-#APP1STDLIBS+=-lstlport
-APP1STDLIBS+=-lCstd
-.ENDIF
-
-
-.INCLUDE : target.mk
-
-
diff --git a/soltools/mkdepend/mkdepend.man b/soltools/mkdepend/mkdepend.man
deleted file mode 100644
index 9c3cdccd9..000000000
--- a/soltools/mkdepend/mkdepend.man
+++ /dev/null
@@ -1,368 +0,0 @@
-.\" $XConsortium: mkdepend.man,v 1.15 94/04/17 20:10:37 gildea Exp $
-.\" Copyright (c) 1993, 1994  X Consortium
-.\" 
-.\" Permission is hereby granted, free of charge, to any person obtaining a
-.\" copy of this software and associated documentation files (the "Software"), 
-.\" to deal in the Software without restriction, including without limitation 
-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-.\" and/or sell copies of the Software, and to permit persons to whom the 
-.\" Software furnished to do so, subject to the following conditions:
-.\" 
-.\" The above copyright notice and this permission notice shall be included in
-.\" all copies or substantial portions of the Software.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
-.\" THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
-.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-.\" SOFTWARE.
-.\" 
-.\" Except as contained in this notice, the name of the X Consortium shall not 
-.\" be used in advertising or otherwise to promote the sale, use or other 
-.\" dealing in this Software without prior written authorization from the 
-.\" X Consortium.
-.TH MAKEDEPEND 1 "Release 6" "X Version 11"
-.UC 4
-.SH NAME
-makedepend \- create dependencies in makefiles
-.SH SYNOPSIS
-.B makedepend
-[
-.B \-Dname=def
-] [
-.B \-Dname
-] [
-.B \-Iincludedir
-] [
-.B \-Yincludedir
-] [
-.B \-a
-] [
-.B \-fmakefile
-] [
-.B \-oobjsuffix
-] [
-.B \-pobjprefix
-] [
-.B \-sstring
-] [
-.B \-wwidth
-] [
-.B \-v
-] [
-.B \-m
-] [
-\-\^\-
-.B otheroptions
-\-\^\-
-]
-sourcefile .\|.\|.
-.br
-.SH DESCRIPTION
-.B Makedepend
-reads each
-.I sourcefile
-in sequence and parses it like a C-preprocessor,
-processing all
-.I #include,
-.I #define,
-.I #undef,
-.I #ifdef,
-.I #ifndef,
-.I #endif,
-.I #if
-and
-.I #else
-directives so that it can correctly tell which
-.I #include,
-directives would be used in a compilation.
-Any
-.I #include,
-directives can reference files having other
-.I #include
-directives, and parsing will occur in these files as well.
-.PP
-Every file that a
-.I sourcefile
-includes,
-directly or indirectly,
-is what
-.B makedepend
-calls a "dependency".
-These dependencies are then written to a
-.I makefile
-in such a way that
-.B make(1)
-will know which object files must be recompiled when a dependency has changed.
-.PP
-By default,
-.B makedepend
-places its output in the file named
-.I makefile
-if it exists, otherwise
-.I Makefile.
-An alternate makefile may be specified with the
-.B \-f
-option.
-It first searches the makefile for
-the line
-.sp
-    # DO NOT DELETE THIS LINE \-\^\- make depend depends on it.
-.sp
-or one provided with the
-.B \-s
-option,
-as a delimiter for the dependency output.
-If it finds it, it will delete everything
-following this to the end of the makefile
-and put the output after this line.
-If it doesn't find it, the program
-will append the string to the end of the makefile
-and place the output following that.
-For each
-.I sourcefile
-appearing on the command line,
-.B makedepend
-puts lines in the makefile of the form
-.sp
-     sourcefile.o:\0dfile .\|.\|.
-.sp
-Where "sourcefile.o" is the name from the command
-line with its suffix replaced with ".o",
-and "dfile" is a dependency discovered in a
-.I #include
-directive while parsing
-.I sourcefile
-or one of the files it included.
-.SH EXAMPLE
-Normally,
-.B makedepend
-will be used in a makefile target so that typing "make depend" will
-bring the dependencies up to date for the makefile.
-For example,
-.nf
-    SRCS\0=\0file1.c\0file2.c\0.\|.\|.
-    CFLAGS\0=\0\-O\0\-DHACK\0\-I\^.\^.\^/foobar\0\-xyz
-    depend:
-            makedepend\0\-\^\-\0$(CFLAGS)\0\-\^\-\0$(SRCS)
-.fi
-.SH OPTIONS
-.B Makedepend
-will ignore any option that it does not understand so that you may use
-the same arguments that you would for
-.B cc(1).
-.TP 5
-.B \-Dname=def or \-Dname
-Define.
-This places a definition for
-.I name
-in
-.B makedepend's
-symbol table.
-Without 
-.I =def
-the symbol becomes defined as "1".
-.TP 5
-.B \-Iincludedir
-Include directory.
-This option tells
-.B makedepend
-to prepend
-.I includedir
-to its list of directories to search when it encounters
-a
-.I #include
-directive.
-By default,
-.B makedepend
-only searches the standard include directories (usually /usr/include
-and possibly a compiler-dependent directory).
-.TP 5
-.B \-Yincludedir
-Replace all of the standard include directories with the single specified
-include directory; you can omit the
-.I includedir
-to simply prevent searching the standard include directories.
-.TP 5
-.B \-a
-Append the dependencies to the end of the file instead of replacing them. 
-.TP 5
-.B \-fmakefile
-Filename.
-This allows you to specify an alternate makefile in which
-.B makedepend
-can place its output.
-.TP 5
-.B \-oobjsuffix
-Object file suffix.
-Some systems may have object files whose suffix is something other
-than ".o".
-This option allows you to specify another suffix, such as
-".b" with
-.I -o.b
-or ":obj"
-with
-.I -o:obj
-and so forth.
-.TP 5
-.B \-pobjprefix
-Object file prefix.
-The prefix is prepended to the name of the object file. This is
-usually used to designate a different directory for the object file.
-The default is the empty string.
-.TP 5
-.B \-sstring
-Starting string delimiter.
-This option permits you to specify
-a different string for
-.B makedepend
-to look for in the makefile.
-.TP 5
-.B \-wwidth
-Line width.
-Normally,
-.B makedepend
-will ensure that every output line that it writes will be no wider than
-78 characters for the sake of readability.
-This option enables you to change this width.
-.TP 5
-.B \-v
-Verbose operation.
-This option causes 
-.B makedepend
-to emit the list of files included by each input file on standard output.
-.TP 5
-.B \-m
-Warn about multiple inclusion.
-This option causes 
-.B makedepend
-to produce a warning if any input file includes another file more than
-once.  In previous versions of 
-.B makedepend
-this was the default behavior; the default has been changed to better
-match the behavior of the C compiler, which does not consider multiple
-inclusion to be an error.  This option is provided for backward 
-compatibility, and to aid in debugging problems related to multiple
-inclusion.
-.TP 5
-.B "\-\^\- options \-\^\-"
-If
-.B makedepend
-encounters a double hyphen (\-\^\-) in the argument list,
-then any unrecognized argument following it
-will be silently ignored; a second double hyphen terminates this
-special treatment.
-In this way,
-.B makedepend
-can be made to safely ignore esoteric compiler arguments that might
-normally be found in a CFLAGS
-.B make
-macro (see the
-.B EXAMPLE
-section above).
-All options that
-.B makedepend
-recognizes and appear between the pair of double hyphens
-are processed normally.
-.SH ALGORITHM
-The approach used in this program enables it to run an order of magnitude
-faster than any other "dependency generator" I have ever seen.
-Central to this performance are two assumptions:
-that all files compiled by a single
-makefile will be compiled with roughly the same
-.I -I
-and
-.I -D
-options;
-and that most files in a single directory will include largely the
-same files.
-.PP
-Given these assumptions,
-.B makedepend
-expects to be called once for each makefile, with
-all source files that are maintained by the
-makefile appearing on the command line.
-It parses each source and include
-file exactly once, maintaining an internal symbol table
-for each.
-Thus, the first file on the command line will take an amount of time
-proportional to the amount of time that a normal C preprocessor takes.
-But on subsequent files, if it encounter's an include file
-that it has already parsed, it does not parse it again.
-.PP
-For example,
-imagine you are compiling two files,
-.I file1.c
-and
-.I file2.c,
-they each include the header file
-.I header.h,
-and the file
-.I header.h
-in turn includes the files
-.I def1.h
-and
-.I def2.h.
-When you run the command
-.sp
-    makedepend\0file1.c\0file2.c
-.sp
-.B makedepend
-will parse
-.I file1.c
-and consequently,
-.I header.h
-and then
-.I def1.h
-and
-.I def2.h.
-It then decides that the dependencies for this file are
-.sp
-    file1.o:\0header.h\0def1.h\0def2.h
-.sp
-But when the program parses
-.I file2.c
-and discovers that it, too, includes
-.I header.h,
-it does not parse the file,
-but simply adds
-.I header.h,
-.I def1.h
-and
-.I def2.h
-to the list of dependencies for
-.I file2.o.
-.SH "SEE ALSO"
-cc(1), make(1)
-.SH BUGS
-.B makedepend
-parses, but does not currently evaluate, the SVR4
-#predicate(token-list) preprocessor expression;
-such expressions are simply assumed to be true.
-This may cause the wrong
-.I #include
-directives to be evaluated.
-.PP
-Imagine you are parsing two files,
-say
-.I file1.c
-and
-.I file2.c,
-each includes the file
-.I def.h.
-The list of files that
-.I def.h
-includes might truly be different when
-.I def.h
-is included by
-.I file1.c
-than when it is included by
-.I file2.c.
-But once
-.B makedepend
-arrives at a list of dependencies for a file,
-it is cast in concrete.
-.SH AUTHOR
-Todd Brunhoff, Tektronix, Inc. and MIT Project Athena
diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c
deleted file mode 100644
index 9214750c6..000000000
--- a/soltools/mkdepend/parse.c
+++ /dev/null
@@ -1,615 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* $XConsortium: parse.c,v 1.30 94/04/17 20:10:38 gildea Exp $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-#include "def.h"
-char *hash_lookup( char *symbol, struct symhash *symbols );
-void hash_undefine( char *symbol, struct symhash *symbols );
-int gobble( register struct filepointer *filep, struct inclist *file,
-    struct inclist *file_red, struct symhash *symbols );
-int deftype ( register char *line, register struct filepointer *filep,
-    register struct inclist *file_red, register struct inclist *file,
-    int parse_it, struct symhash *symbols);
-int zero_value(register char *exp, register struct filepointer *filep,
-    register struct inclist *file_red, register struct symhash *symbols);
-
-extern char	*directives[];
-extern struct symhash *maininclist;
-
-int find_includes(filep, file, file_red, recursion, failOK, incCollection, symbols)
-    struct filepointer	*filep;
-    struct inclist		*file, *file_red;
-    int			recursion;
-    boolean			failOK;
-    struct IncludesCollection* incCollection; 
-    struct symhash		*symbols;
-{
-    register char	*line;
-    register int	type;
-    boolean recfailOK;
-
-    while ((line = get_line(filep))) {
-        switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
-        case IF:
-        doif:
-            type = find_includes(filep, file,
-                file_red, recursion+1, failOK, incCollection, symbols);
-            while ((type == ELIF) || (type == ELIFFALSE) ||
-                   (type == ELIFGUESSFALSE))
-                type = gobble(filep, file, file_red, symbols);
-            if (type == ELSE)
-                gobble(filep, file, file_red, symbols);
-            break;
-        case IFFALSE:
-        case IFGUESSFALSE:
-            doiffalse:
-            if (type == IFGUESSFALSE || type == ELIFGUESSFALSE)
-                recfailOK = TRUE;
-            else
-                recfailOK = failOK;
-            type = gobble(filep, file, file_red, symbols);
-            if (type == ELSE)
-                find_includes(filep, file,
-                      file_red, recursion+1, recfailOK, incCollection, symbols);
-            else
-            if (type == ELIF)
-                goto doif;
-            else
-            if ((type == ELIFFALSE) || (type == ELIFGUESSFALSE))
-                goto doiffalse;
-            break;
-        case IFDEF:
-        case IFNDEF:
-            if ((type == IFDEF && hash_lookup(line, symbols))
-             || (type == IFNDEF && !hash_lookup(line, symbols))) {
-                debug(1,(type == IFNDEF ?
-                    "line %d: %s !def'd in %s via %s%s\n" : "",
-                    filep->f_line, line,
-                    file->i_file, file_red->i_file, ": doit"));
-                type = find_includes(filep, file,
-                    file_red, recursion+1, failOK, incCollection, symbols);
-                while (type == ELIF || type == ELIFFALSE || type == ELIFGUESSFALSE)
-                    type = gobble(filep, file, file_red, symbols);
-                if (type == ELSE)
-                    gobble(filep, file, file_red, symbols);
-            }
-            else {
-                debug(1,(type == IFDEF ?
-                    "line %d: %s !def'd in %s via %s%s\n" : "",
-                    filep->f_line, line,
-                    file->i_file, file_red->i_file, ": gobble"));
-                type = gobble(filep, file, file_red, symbols);
-                if (type == ELSE)
-                    find_includes(filep, file,
-                        file_red, recursion + 1, failOK, incCollection, symbols);
-                else if (type == ELIF)
-                        goto doif;
-                else if (type == ELIFFALSE || type == ELIFGUESSFALSE)
-                        goto doiffalse;
-            }
-            break;
-        case ELSE:
-        case ELIFFALSE:
-        case ELIFGUESSFALSE:
-        case ELIF:
-            if (!recursion)
-                gobble(filep, file, file_red, symbols);
-        case ENDIF:
-            if (recursion)
-                return(type);
-        case DEFINE:
-            define(line, &symbols);
-            break;
-        case UNDEF:
-            if (!*line) {
-                warning("%s, line %d: incomplete undef == \"%s\"\n",
-                file_red->i_file, filep->f_line, line);
-                break;
-            }
-            hash_undefine(line, symbols);
-            break;
-        case INCLUDE:
-            add_include(filep, file, file_red, line, FALSE, failOK, incCollection, symbols);
-            break;
-        case INCLUDEDOT:
-            add_include(filep, file, file_red, line, TRUE, failOK, incCollection, symbols);
-            break;
-        case ERROR:
-                warning("%s: %d: %s\n", file_red->i_file,
-                 filep->f_line, line);
-                break;
-            
-        case PRAGMA:
-        case IDENT:
-        case SCCS:
-        case EJECT:
-            break;
-        case -1:
-            warning("%s", file_red->i_file);
-            if (file_red != file)
-                warning1(" (reading %s)", file->i_file);
-            warning1(", line %d: unknown directive == \"%s\"\n",
-                 filep->f_line, line);
-            break;
-        case -2:
-            warning("%s", file_red->i_file);
-            if (file_red != file)
-                warning1(" (reading %s)", file->i_file);
-            warning1(", line %d: incomplete include == \"%s\"\n",
-                 filep->f_line, line);
-            break;
-        }
-    }
-    return(-1);
-}
-
-int gobble(filep, file, file_red, symbols)
-    register struct filepointer *filep;
-    struct inclist		*file, *file_red;
-    struct symhash		*symbols;
-{
-    register char	*line;
-    register int	type;
-
-    while ((line = get_line(filep))) {
-        switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
-        case IF:
-        case IFFALSE:
-        case IFGUESSFALSE:
-        case IFDEF:
-        case IFNDEF:
-            type = gobble(filep, file, file_red, symbols);
-            while ((type == ELIF) || (type == ELIFFALSE) ||
-                   (type == ELIFGUESSFALSE))
-                type = gobble(filep, file, file_red, symbols);
-            if (type == ELSE)
-                    (void)gobble(filep, file, file_red, symbols);
-            break;
-        case ELSE:
-        case ENDIF:
-            debug(0,("%s, line %d: #%s\n",
-                file->i_file, filep->f_line,
-                directives[type]));
-            return(type);
-        case DEFINE:
-        case UNDEF:
-        case INCLUDE:
-        case INCLUDEDOT:
-        case PRAGMA:
-        case ERROR:
-        case IDENT:
-        case SCCS:
-        case EJECT:
-            break;
-        case ELIF:
-        case ELIFFALSE:
-        case ELIFGUESSFALSE:
-            return(type);
-        case -1:
-            warning("%s, line %d: unknown directive == \"%s\"\n",
-                file_red->i_file, filep->f_line, line);
-            break;
-        }
-    }
-    return(-1);
-}
-
-/*
- * Decide what type of # directive this line is.
- */
-int deftype (line, filep, file_red, file, parse_it, symbols)
-    register char	*line;
-    register struct filepointer *filep;
-    register struct inclist *file_red, *file;
-    int	parse_it;
-    struct symhash	*symbols;
-{
-    register char	*p;
-    char	*directive, savechar;
-    register int	ret;
-
-    /*
-     * Parse the directive...
-     */
-    directive=line+1;
-    while (*directive == ' ' || *directive == '\t')
-        directive++;
-
-    p = directive;
-    while (*p >= 'a' && *p <= 'z')
-        p++;
-    savechar = *p;
-    *p = '\0';
-    ret = match(directive, directives);
-    *p = savechar;
-
-    /* If we don't recognize this compiler directive or we happen to just
-     * be gobbling up text while waiting for an #endif or #elif or #else
-     * in the case of an #elif we must check the zero_value and return an
-     * ELIF or an ELIFFALSE.
-     */
-
-    if (ret == ELIF && !parse_it)
-    {
-        while (*p == ' ' || *p == '\t')
-        p++;
-        /*
-         * parse an expression.
-         */
-        debug(0,("%s, line %d: #elif %s ",
-           file->i_file, filep->f_line, p));
-        ret = zero_value(p, filep, file_red, symbols);
-        if (ret != IF)
-        {
-        debug(0,("false...\n"));
-        if (ret == IFFALSE)
-            return(ELIFFALSE);
-        else
-            return(ELIFGUESSFALSE);
-        }
-        else
-        {
-        debug(0,("true...\n"));
-        return(ELIF);
-        }
-    }
-
-    if (ret < 0 || ! parse_it)
-        return(ret);
-
-    /*
-     * now decide how to parse the directive, and do it.
-     */
-    while (*p == ' ' || *p == '\t')
-        p++;
-    switch (ret) {
-    case IF:
-        /*
-         * parse an expression.
-         */
-        ret = zero_value(p, filep, file_red, symbols);
-        debug(0,("%s, line %d: %s #if %s\n",
-             file->i_file, filep->f_line, ret?"false":"true", p));
-        break;
-    case IFDEF:
-    case IFNDEF:
-        debug(0,("%s, line %d: #%s %s\n",
-            file->i_file, filep->f_line, directives[ret], p));
-    case UNDEF:
-        /*
-         * separate the name of a single symbol.
-         */
-        while (isalnum(*p) || *p == '_')
-            *line++ = *p++;
-        *line = '\0';
-        break;
-    case INCLUDE:
-        debug(2,("%s, line %d: #include %s\n",
-            file->i_file, filep->f_line, p));
-
-        /* Support ANSI macro substitution */
-        {
-            char *sym = hash_lookup(p, symbols);
-            while (sym)
-            {
-                p = sym;
-                debug(3,("%s : #includes SYMBOL %s\n",
-                            file->i_incstring,
-                            sym));
-                /* mark file as having included a 'soft include' */
-                file->i_included_sym = TRUE; 
-                sym = hash_lookup(p, symbols);
-            }
-        }
-
-        /*
-         * Separate the name of the include file.
-         */
-        while (*p && *p != '"' && *p != '<')
-            p++;
-        if (! *p)
-            return(-2);
-        if (*p++ == '"') {
-            ret = INCLUDEDOT;
-            while (*p && *p != '"')
-                *line++ = *p++;
-        } else
-            while (*p && *p != '>')
-                *line++ = *p++;
-        *line = '\0';
-        break;
-    case DEFINE:
-        /*
-         * copy the definition back to the beginning of the line.
-         */
-        memmove (line, p, strlen(p));
-        break;
-    case ELSE:
-    case ENDIF:
-    case ELIF:
-    case PRAGMA:
-    case ERROR:
-    case IDENT:
-    case SCCS:
-    case EJECT:
-        debug(0,("%s, line %d: #%s\n",
-            file->i_file, filep->f_line, directives[ret]));
-        /*
-         * nothing to do.
-         */
-        break;
-    }
-    return(ret);
-}
-
-/*
- * HACK! - so that we do not have to introduce 'symbols' in each cppsetup.c
- * function...  It's safe, functions from cppsetup.c don't return here.
- */
-struct symhash *global_symbols = NULL;
-
-char * isdefined( symbol )
-    register char *symbol;
-{
-    return hash_lookup( symbol, global_symbols );
-}
-
-/*
- * Return type based on if the #if expression evaluates to 0
- */
-int zero_value(exp, filep, file_red, symbols)
-    register char	*exp;
-    register struct filepointer *filep;
-    register struct inclist *file_red;
-    register struct symhash *symbols;
-{
-    global_symbols = symbols; /* HACK! see above */
-    if (cppsetup(exp, filep, file_red))
-        return(IFFALSE);
-    else
-        return(IF);
-}
-
-void define( def, symbols )
-    char	        *def;
-    struct symhash **symbols;
-{
-    char *val;
-
-    /* Separate symbol name and its value */
-    val = def;
-    while (isalnum(*val) || *val == '_')
-    val++;
-    if (*val)
-    *val++ = '\0';
-    while (*val == ' ' || *val == '\t')
-    val++;
-
-    if (!*val)
-    val = "1";
-    hash_define( def, val, symbols );
-}
-
-static int hash( str )
-    register char *str;
-{
-    /* Hash (Kernighan and Ritchie) */
-    register unsigned int hashval = 0;
-
-    for ( ; *str; str++ )
-    {
-        hashval = ( hashval * SYMHASHSEED ) + ( *str );
-    }
-
-    return hashval & ( SYMHASHMEMBERS - 1 );
-}
-
-struct symhash *hash_copy( symbols )
-    struct symhash *symbols;
-{
-    int i;
-    struct symhash *newsym;
-    if ( !symbols )
-        return NULL;
-
-    newsym = (struct symhash *) malloc( sizeof( struct symhash ) );
-    
-    for ( i = 0; i < SYMHASHMEMBERS; ++i )
-    {
-        if ( !symbols->s_pairs[ i ] )
-            newsym->s_pairs[ i ] = NULL;
-        else
-        {
-            struct pair *it = symbols->s_pairs[ i ];
-            struct pair *nw = newsym->s_pairs[ i ] = (struct pair*) malloc( sizeof( struct pair ) );
-            nw->p_name = it->p_name;
-            nw->p_value = it->p_value;
-            nw->p_next = NULL;
-            
-            while ( it->p_next )
-            {
-                nw->p_next = (struct pair*) malloc( sizeof( struct pair ) );
-                it = it->p_next;
-                nw = nw->p_next;
-                nw->p_name = it->p_name;
-                nw->p_value = it->p_value;
-                nw->p_next = NULL;
-            }
-        }
-    }
-    return newsym;
-}
-
-void hash_free( symbols )
-    struct symhash *symbols;
-{
-    int i;
-
-    if ( !symbols )
-        return;
-
-    for ( i = 0; i < SYMHASHMEMBERS; ++i )
-    {
-        struct pair *it = symbols->s_pairs[ i ];
-        struct pair *next;
-        while ( it )
-        {
-            next = it->p_next;
-            free( it );
-            it = next;
-        }
-    }
-    free( symbols->s_pairs );
-}
-
-void hash_define( name, val, symbols )
-    char            *name, *val;
-    struct symhash **symbols;
-{
-    int hashval;
-    struct pair *it;
-
-    if ( !symbols )
-        return;
-
-    /* Make space if it's needed */
-    if ( *symbols == NULL )
-    {
-        int i;
-
-        *symbols = (struct symhash *) malloc( sizeof( struct symhash ) );
-        if ( *symbols == NULL )
-            fatalerr( "malloc()/realloc() failure in insert_defn()\n" );
-
-        for ( i = 0; i < SYMHASHMEMBERS; ++i )
-            (*symbols)->s_pairs[i] = NULL;
-    }
-
-    hashval = hash( name );
-    it = (*symbols)->s_pairs[ hashval ];
-    
-    /* Replace/insert the symbol */
-    if ( it == NULL )
-    {
-        it = (*symbols)->s_pairs[ hashval ] = (struct pair*) malloc( sizeof( struct pair ) );
-        it->p_name = copy( name );
-        it->p_value = copy( val );
-        it->p_next = NULL;
-    }
-    else if ( strcmp( it->p_name, name ) == 0 )
-    {
-        it->p_value = copy( val );
-    }
-    else
-    {
-        while ( it->p_next && ( strcmp( it->p_next->p_name, name ) != 0 ) )
-        {
-            it = it->p_next;
-        }
-        if ( it->p_next )
-            it->p_next->p_name = copy( name );
-        else
-        {
-            it->p_next = (struct pair*) malloc( sizeof( struct pair ) );
-            it->p_next->p_name = copy( name );
-            it->p_next->p_value = copy( val );
-            it->p_next->p_next = NULL;
-        }
-    }
-}
-
-char *hash_lookup( symbol, symbols )
-    char           *symbol;
-    struct symhash *symbols;
-{
-    struct pair *it;
-
-    if ( !symbols )
-        return NULL;
-    
-    it = symbols->s_pairs[ hash( symbol ) ];
-
-    while ( it && ( strcmp( it->p_name, symbol ) != 0 ) )
-    {
-        it = it->p_next;
-    }
-    if ( it )
-        return it->p_value;
-
-    return NULL;
-}
-
-void hash_undefine( symbol, symbols )
-    char           *symbol;
-    struct symhash *symbols;
-{
-    int hashval;
-    struct pair *it;
-
-    if ( !symbols )
-        return;
-    
-    hashval = hash( symbol );
-    it = symbols->s_pairs[ hashval ];
-    
-    /* Replace/insert the symbol */
-    if ( it == NULL )
-        return;
-    else if ( strcmp( it->p_name, symbol ) == 0 )
-    {
-        if ( it->p_next )
-        {
-            struct pair *tmp;
-            it->p_name = it->p_next->p_name;
-            it->p_value = it->p_next->p_value;
-            tmp = it->p_next->p_next;
-            free( it->p_next );
-            it->p_next = tmp;
-        }
-        else
-        {
-            free( it );
-            symbols->s_pairs[ hashval ] = NULL;
-        }
-    }
-    else
-    {
-        while ( it->p_next && ( strcmp( it->p_next->p_name, symbol ) != 0 ) )
-        {
-            it = it->p_next;
-        }
-        if ( it->p_next )
-        {
-            struct pair *tmp = it->p_next;
-            it->p_next = it->p_next->p_next;
-            free( tmp );
-        }
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/mkdepend/pr.c b/soltools/mkdepend/pr.c
deleted file mode 100644
index e0d5ff5cc..000000000
--- a/soltools/mkdepend/pr.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* $XConsortium: pr.c,v 1.17 94/04/17 20:10:38 gildea Exp $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-#include "def.h"
-#include <string.h>
-void pr( struct inclist *ip, char *file,char *base);
-
-extern struct	inclist	inclist[ MAXFILES ],
-            *inclistp;
-extern char	*objprefix;
-extern char	*objsuffix;
-extern int	width;
-extern boolean	printed;
-extern boolean	verbose;
-extern boolean	show_where_not;
-
-void add_include(filep, file, file_red, include, dot, failOK, incCollection, symbols)
-    struct filepointer	*filep;
-    struct inclist	*file, *file_red;
-    char	*include;
-    boolean	dot;
-    boolean	failOK;
-    struct IncludesCollection* incCollection;
-    struct symhash  *symbols;
-{
-    register struct inclist	*newfile;
-    register struct filepointer	*content;
-
-    /*
-     * First decide what the pathname of this include file really is.
-     */
-    newfile = inc_path(file->i_file, include, dot, incCollection);
-    if (newfile == NULL) {
-        if (failOK)
-            return;
-        if (file != file_red)
-            warning("%s (reading %s, line %d): ",
-                file_red->i_file, file->i_file, filep->f_line);
-        else
-            warning("%s, line %d: ", file->i_file, filep->f_line);
-        warning1("cannot find include file \"%s\"\n", include);
-        show_where_not = TRUE;
-        newfile = inc_path(file->i_file, include, dot, incCollection);
-        show_where_not = FALSE;
-    }
-
-    if (newfile) {
-
-        /* Only add new dependency files if they don't have "/usr/include" in them. */
-        if (!(newfile && newfile->i_file && strstr(newfile->i_file, "/usr/"))) {
-            included_by(file, newfile);
-        }
-
-        if (!newfile->i_searched) {
-            newfile->i_searched = TRUE;
-            content = getfile(newfile->i_file);
-            find_includes(content, newfile, file_red, 0, failOK, incCollection, symbols);
-            freefile(content);
-        }
-    }
-}
-
-void recursive_pr_include(head, file, base)
-    register struct inclist	*head;
-    register char	*file, *base;
-{
-    register int	i;
-
-    if (head->i_marked)
-        return;
-    head->i_marked = TRUE;
-    if (head->i_file != file)
-        pr(head, file, base);
-    for (i=0; i<head->i_listlen; i++)
-        recursive_pr_include(head->i_list[ i ], file, base);
-}
-
-void pr(ip, file, base)
-    register struct inclist  *ip;
-    char	*file, *base;
-{
-    static char	*lastfile;
-    static int	current_len;
-    register int	len, i;
-    char	buf[ BUFSIZ ];
-
-    printed = TRUE;
-    len = (int)strlen(ip->i_file)+1;
-    if (current_len + len > width || file != lastfile) {
-        lastfile = file;
-        sprintf(buf, "\n%s%s%s: %s", objprefix, base, objsuffix,
-            ip->i_file);
-        len = current_len = (int)strlen(buf);
-    }
-    else {
-        buf[0] = ' ';
-        strcpy(buf+1, ip->i_file);
-        current_len += len;
-    }
-    fwrite(buf, len, 1, stdout);
-
-    /*
-     * If verbose is set, then print out what this file includes.
-     */
-    if (! verbose || ip->i_list == NULL || ip->i_notified)
-        return;
-    ip->i_notified = TRUE;
-    lastfile = NULL;
-    printf("\n# %s includes:", ip->i_file);
-    for (i=0; i<ip->i_listlen; i++)
-        printf("\n#\t%s", ip->i_list[ i ]->i_incstring);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst
deleted file mode 100644
index 78eb3fc69..000000000
--- a/soltools/prj/build.lst
+++ /dev/null
@@ -1,13 +0,0 @@
-so  soltools :   solenv SUN:so_prereq NULL
-so	soltools								usr1	-	all	so_usr1 NULL
-so	soltools\inc							get	-	all	so_inc NULL
-so	soltools\ldump							nmake	-	w	so_ldump so_mkdep NULL
-so	soltools\winunistd						nmake	-	n	so_wunistd NULL
-so	soltools\mkdepend						nmake	-	all	so_mkdep so_wunistd.n NULL
-so	soltools\checkdll						nmake	-	u	so_chkdl so_adjvis.u so_mkdep NULL
-so	soltools\cpp							nmake	-	all	so_cpp__ so_mkdep so_adjvis.u NULL
-so	soltools\javadep						nmake	-	all	so_jvdep so_mkdep so_adjvis.u NULL
-so	soltools\support						nmake	-	all	so_supp so_mkdep so_adjvis.u NULL
-so	soltools\giparser						nmake	-	all	so_gip so_supp so_adjvis.u NULL
-so	soltools\adjustvisibility				nmake	-	u	so_adjvis so_mkdep NULL
-so  soltools\testhxx                        nmake   -   all so_testhxx so_mkdep NULL
diff --git a/soltools/prj/d.lst b/soltools/prj/d.lst
deleted file mode 100644
index 409b94aa0..000000000
--- a/soltools/prj/d.lst
+++ /dev/null
@@ -1,11 +0,0 @@
-..\%__SRC%\bin\ldump4.exe %_DEST%\bin\ldump4.exe
-..\%__SRC%\bin\makedepend.exe %_DEST%\bin\makedepend.exe
-..\%__SRC%\bin\makedepend %_DEST%\bin\makedepend
-..\%__SRC%\bin\adjustvisibility %_DEST%\bin\adjustvisibility
-..\%__SRC%\bin\javadep.exe %_DEST%\bin\javadep.exe
-..\%__SRC%\bin\javadep %_DEST%\bin\javadep
-..\%__SRC%\bin\checkdll %_DEST%\bin\checkdll
-..\%__SRC%\bin\cpp.exe %_DEST%\bin\cpplcc.exe
-..\%__SRC%\bin\cpp %_DEST%\bin\cpp.lcc
-..\%__SRC%\inc\unistd.h %_DEST%\inc\unistd.h
-..\%__SRC%\bin\testhxx* %_DEST%\bin\testhxx*
diff --git a/soltools/support/makefile.mk b/soltools/support/makefile.mk
deleted file mode 100644
index 8628b5234..000000000
--- a/soltools/support/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=soltools_support
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-    @echo Nothing done when cross-compiling
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/simstr.obj
-
-SLOFILES= \
-    $(SLO)$/simstr.obj
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/soltools/support/simstr.cxx b/soltools/support/simstr.cxx
deleted file mode 100644
index 81212f691..000000000
--- a/soltools/support/simstr.cxx
+++ /dev/null
@@ -1,835 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-
-
-#include <simstr.hxx>
-
-#include <string.h>  // strlen(), memcpy(), memset()
-#include <ctype.h>   // tolower()
-#include <limits.h>  // INT_MAX
-
-const char NULCH = '\0';
-const int  NO_POS = -1;
-
-
-Simstr::Simstr(const char * s_)
-{
-   if (s_ == 0)
-      {
-         len = 0;
-         sz = new char[1];
-         *sz = 0;
-      }
-   else
-      {
-         len = (int)strlen(s_);
-         sz = new char[len+1];
-         memcpy(sz,s_,len+1);
-      }
-}
-
-Simstr::Simstr(const char * anybytes, int  nrOfBytes)
-{
-    if (anybytes == 0)
-    {
-        len = 0;
-        sz = new char[1];
-        *sz = 0;
-        return;
-    }
-
-    int slen = static_cast<int>( strlen(anybytes) );
-
-    len =  slen < nrOfBytes
-                  ? slen
-                  : nrOfBytes;
-    sz = new char[len+1];
-    memcpy( sz, anybytes, len );
-    *( sz + len ) = 0;
-}
-
-Simstr::Simstr(char c, int anzahl)
-{
-   if (anzahl < 1)
-      {
-         len = 0;
-         sz = new char[1];
-         *sz = 0;
-      }
-   else
-      {
-         len = anzahl;
-         sz = new char[len+1];
-         memset(sz,c,anzahl);
-         sz[len] = 0;
-      }
-}
-
-Simstr::Simstr( const char *   anybytes,
-                int            firstBytesPos,
-                int            nrOfBytes)
-{
-   unsigned slen = (unsigned)strlen(anybytes);
-   if (anybytes == 0 || slen <= unsigned(firstBytesPos))
-      {
-         len = 0;
-         sz = new char[1];
-         *sz = 0;
-      }
-   else
-      {
-         int maxLen = slen - unsigned(firstBytesPos);
-         len =  maxLen < nrOfBytes
-                  ? maxLen
-                  : nrOfBytes;
-         sz = new char[len+1];
-         memcpy(sz,anybytes+firstBytesPos,len);
-         *(sz+len) = 0;
-      }
-}
-
-
-Simstr::Simstr(const Simstr & S)
-{
-   len = S.len;
-   sz = new char[len+1];
-   memcpy(sz,S.sz,len+1);
-}
-
-Simstr & Simstr::operator=(const Simstr & S)
-{
-   if (sz == S.sz)
-      return *this;
-
-   delete [] sz;
-
-   len = S.len;
-   sz = new char[len+1];
-   memcpy(sz,S.sz,len+1);
-
-   return *this;
-}
-
-Simstr::~Simstr()
-{
-   delete [] sz;
-}
-
-char &
-Simstr::ch(int  n)
-{
-   static char nullCh = NULCH;
-   nullCh = NULCH;
-   if (n >= long(len) || n < 0)
-      return nullCh;
-   else
-      return sz[unsigned(n)];
-}
-
-const Simstr &
-Simstr::null_()
-{
-    static Simstr aNull_;
-    return aNull_;
-}
-
-
-Simstr
-Simstr::operator+(const Simstr & S) const
-{
-   Simstr ret = sz;
-   ret.push_back(S);                                         
-   return ret;
-}
-
-Simstr &     
-Simstr::operator+=(const Simstr & S)
-{
-   push_back(S);
-   return *this;
-}
-
-Simstr &
-Simstr::operator+=(const char * s_)
-{
-    Simstr a(s_);
-    push_back(a);
-    return *this;
-}
-
-
-// REL
-
-bool
-Simstr::operator==(const Simstr & S) const
-{ return !strcmp(sz,S.sz) ? true : false; }
-
-bool
-Simstr::operator!=(const Simstr & S) const
-{ return strcmp(sz,S.sz) ? true : false; }
-
-bool  
-Simstr::operator<(const Simstr & S) const 
-{ return (strcmp(sz,S.sz) < 0) ? true : false; }
-
-bool  
-Simstr::operator>(const Simstr & S) const 
-{ return (strcmp(sz,S.sz) > 0) ? true : false; }
-
-bool
-Simstr::operator<=(const Simstr & S) const 
-{ return (strcmp(sz,S.sz) <= 0) ? true : false; }
-
-bool  
-Simstr::operator>=(const Simstr & S) const 
-{ return (strcmp(sz,S.sz) >= 0) ? true : false; }
-
-
-
-
-// **************          LIST - Funktionen        *****************
-
-   
-// Einzelzugriff
-
-char
-Simstr::get(int  n) const     { return (n >= len || n < 0) ? 0 : sz[n]; }
-
-char 
-Simstr::get_front() const        { return sz[0]; }
-
-char 
-Simstr::get_back() const        { return  len ? sz[len-1] : 0; }
-
-Simstr 
-Simstr::get(int  startPos, int  anzahl) const
-{
-   if (startPos >= len || startPos < 0 || anzahl < 1)
-      return "";
-
-   int anz = len - startPos < anzahl ? len - startPos : anzahl;
-
-   Simstr ret(' ',anz);
-   memcpy(ret.sz, sz+startPos, anz);
-   return ret;
-}
-
-Simstr
-Simstr::get_front(int  anzahl) const
-{
-   int anz = len < anzahl ? len : anzahl;
-   if (anz < 1)
-      return "";
-
-   Simstr ret(' ',anz);
-   memcpy(ret.sz, sz, anz);
-   return ret;
-}
-
-Simstr
-Simstr::get_back(int  anzahl) const
-{
-   int anz = len < anzahl ? len : anzahl;
-   if (anz < 1)
-      return "";
-   int start = len-anz;
-
-   Simstr ret(' ',anz);
-   memcpy(ret.sz, sz+start, anz);
-   return ret;
-}
-
-Simstr 
-Simstr::get_first_token(char c) const
-{
-   int posc = pos_first(c);
-   if (posc != NO_POS)
-      return get_front(posc);
-   else
-      return sz;
-}
-
-Simstr
-Simstr::get_last_token(char c) const
-{
-   int posc = pos_last(c);
-   if (posc != NO_POS)
-      return get_back(len-posc-1);
-   else
-      return sz;
-}
-
-
-
-// Insert
-
-void
-Simstr::insert(int  pos, char c)
-{
-   if (pos < 0 || pos > len)
-      return;
-
-   char * result = new char[len+2];
-
-   memcpy(result,sz,pos);
-   result[pos] = c;
-   memcpy(result+pos+1,sz+pos,len-pos+1);
-
-   delete [] sz;
-   sz = result;
-   len++;
-}
-
-void
-Simstr::push_front(char c)
-{
-   char * result = new char[len+2];
-
-   result[0] = c;
-   memcpy(result+1,sz,len+1);
-
-   delete [] sz;
-   sz = result;
-   len++;
-}
-
-void 
-Simstr::push_back(char c)
-{
-   char * result = new char[len+2];
-
-   memcpy(result,sz,len);
-   result[len] = c;
-   result[len+1] = 0;
-
-   delete [] sz;
-   sz = result;
-   len++;
-}
-
-void 
-Simstr::insert(int  pos, const Simstr & S)
-{
-   if (pos < 0 || pos > len)
-      return;
-
-   char * result = new char[len+1+S.len];
-
-   memcpy(result,sz,pos);
-   memcpy(result+pos,S.sz,S.len);
-   memcpy(result+pos+S.len,sz+pos,len-pos+1);
-
-   delete [] sz;
-   sz = result;
-   len += S.len;
-}
-
-void
-Simstr::push_front(const Simstr & S)
-{
-   char * result = new char[len+1+S.len];
-
-   memcpy(result,S.sz,S.len);
-   memcpy(result+S.len,sz,len+1);
-
-   delete [] sz;
-   sz = result;
-   len += S.len;
-}
-
-void
-Simstr::push_back(const Simstr & S)
-{
-   char * result = new char[len+1+S.len];
-
-   memcpy(result,sz,len);
-   memcpy(result+len,S.sz,S.len+1);
-
-   delete [] sz;
-   sz = result;
-   len += S.len;
-}
-
-
-// Remove
-
-void 
-Simstr::remove(int  pos, int  anzahl)
-{
-   if (pos >= len || pos < 0 || anzahl < 1)
-      return;
-
-    int anz = len - pos < anzahl ? len - pos : anzahl;
-
-    char * result = new char[len-anz+1];
-
-    memcpy(result,sz,pos);
-   memcpy(result+pos,sz+pos+anz,len-pos-anz+1);
-
-   delete [] sz;
-   sz = result;
-   len -= anz;
-}
-
-void
-Simstr::remove_trailing_blanks()
-{
-    int newlen = len-1;
-    for ( ; newlen > 1 && sz[newlen] <= 32; --newlen ) {}
-
-    if (newlen < len-1)
-        remove ( newlen+1, len-newlen);
-}
-
-void
-Simstr::pop_front(int  anzahl)
-{
-   if (anzahl < 1)
-      return;
-   int anz = len < anzahl ? len : anzahl;
-
-   char * result = new char[len-anz+1];
-
-   memcpy(result,sz+anz,len-anz+1);
-
-   delete [] sz;
-   sz = result;
-   len -= anz;
-}
-
-void
-Simstr::pop_back(int  anzahl)
-{
-   if (anzahl < 1)
-      return;
-
-   int anz = len < anzahl ? len : anzahl;
-
-   char * result = new char[len-anz+1];
-
-   memcpy(result,sz,len-anz);
-   result[len-anz] = 0;
-
-   delete [] sz;
-   sz = result;
-   len -= anz;
-}
-
-void
-Simstr::rem_back_from(int  removeStartPos)
-{
-   if (removeStartPos != NO_POS)
-      pop_back(len-removeStartPos);
-}
-
-void
-Simstr::remove_all(char c)
-{
-   if (!len)
-      return;
-   char * result = new char[len];
-   int i,j=0;
-   for (i = 0; i < len; i++)
-       if (sz[i] != c)
-          result[j++] = sz[i];
-
-   delete [] sz;
-   sz = new char[j+1];
-   memcpy(sz,result,j);
-   sz[j] = 0;
-   len = j;
-   delete [] result;
-}
-
-void 
-Simstr::remove_all(const Simstr & S)
-{
-   int  pos;
-   while ( (pos=pos_first(S)) != NO_POS )  
-      remove(pos,S.len);
-}
-
-void
-Simstr::strip(char c)
-{
-    int start = 0;
-   if (c == ' ')
-   {  // Sonderbehandlung: SPC entfernt auch TABs:
-       while ( start < len
-                 ?  sz[start] == ' '
-                    || sz[start] == '\t'
-                 :  false )
-           start++;
-   }
-   else
-   {
-       while (start < len && sz[start] == c)
-           start++;
-   }
-
-    int ende = len-1;
-   if (c == ' ')
-   {  // Sonderbehandlung: SPC entfernt auch TABs:
-       while ( ende >= start
-                 ?  sz[ende] == ' '
-                    || sz[ende] == '\t'
-                 :  false  )
-           ende--;
-   }
-   else
-   {
-       while (ende >= start && sz[ende] == c)
-           ende--;
-   }
-    *this = get(start,ende-start+1);
-}
-
-void
-Simstr::empty()
-{
-   if (len > 0)
-   {
-      delete [] sz;
-      sz = new char[1];
-      *sz = 0;
-      len = 0;
-   }
-}
-
-Simstr
-Simstr::take_first_token(char c)
-{
-   Simstr ret;
-   int pos = pos_first(c);
-   if (pos != NO_POS)
-      {
-         ret = get_front(pos);
-         pop_front(pos+1);
-      }
-   else
-      {
-         ret = sz;
-         delete [] sz;
-         sz = new char[1];
-         *sz = NULCH;
-         len = 0;
-      }
-
-   return ret;
-}
-
-Simstr
-Simstr::take_last_token(char c)
-{
-   Simstr ret;
-   int pos = pos_last(c);
-   if (pos != NO_POS)
-      {
-         ret = get_back(len-pos-1);
-         pop_back(len-pos);
-      }
-   else
-      {
-         ret = sz;
-         delete [] sz;
-         sz = new char[1];
-         *sz = NULCH;
-         len = 0;
-      }
-
-   return ret;
-}
-
-
-
-// Find
-
-int
-Simstr::pos_first(char c) const
-{
-   int i = 0;
-   for (i = 0; i < len ? sz[i] != c : false; i++) ;
-   if (i >= len)
-      return NO_POS;
-   else
-      return i;
-}
-
-int
-Simstr::pos_first_after( char           c,
-                         int            startSearchPos) const
-{
-   int i = 0;
-   if (startSearchPos >= i)
-      i = startSearchPos+1;
-   for (; i < len ? sz[i] != c : false; i++) ;
-   if (i >= len)
-      return NO_POS;
-   else
-      return i;
-}
-
-
-int
-Simstr::pos_last(char c) const
-{
-   int i = 0;
-   for (i = len-1; i >= 0 ? sz[i] != c : false; i--) ;
-   if (i < 0)
-      return NO_POS;
-   else
-      return i;
-}
-
-int
-Simstr::pos_first(const Simstr & S) const
-{
-   char * ptr = strstr(sz,S.sz);
-   if (ptr)
-      return int(ptr-sz);
-   else
-      return NO_POS;
-}
-
-int
-Simstr::pos_last(const Simstr & S) const
-{
-   Simstr vgl;
-   int i;
-   for (i = len-S.len; i >= 0 ; i--)
-      {
-         vgl = get(i,S.len);
-         if (vgl == S)
-            break;
-      }
-   if (i >= 0)
-      return i;
-   else
-      return NO_POS;
-}
-
-int
-Simstr::count(char c) const
-{
-   int ret = 0;
-   for (int i =0; i < len; i++)
-      if (sz[i] == c)
-         ret++;
-   return ret;
-}
-
-bool
-Simstr::is_no_text() const
-{ 
-   if (!len)
-      return true;
-
-   int i;
-   for (i = 0; sz[i] <= 32 && i < len; i++) ;
-   if (i < len)
-        return false;
-    return true;
-}
-
-// Change
-
-void 
-Simstr::replace(int  pos, char c)
-{
-    if (pos < 0 || pos >= len)
-      return;
-   else
-      sz[unsigned(pos)] = c;
-}
-
-void
-Simstr::replace(int  startPos, int  anzahl, const Simstr & S)
-{
-   if (startPos >= len || startPos < 0 || anzahl < 1)
-      return;
-
-   int anz = len - startPos < anzahl ? len - startPos : anzahl;
-
-   char * result = new char[len-anz+S.len+1];
-
-   memcpy(result,sz,startPos);
-   memcpy(result+startPos, S.sz, S.len);
-   memcpy(result+startPos+S.len, sz+startPos+anz, len-startPos-anz+1);
-
-   delete [] sz;
-   sz = result;
-   len = len-anz+S.len;
-}
-
-void
-Simstr::replace_all(char oldCh, char newCh)
-{
-   for (int i=0; i < len; i++)
-      if (sz[i] == oldCh)
-         sz[i] = newCh;
-}
-
-void
-Simstr::replace_all(const Simstr & oldS, const Simstr & newS)
-{
-   Simstr vgl;
-   int i = 0;
-    while (i <= len-oldS.len)
-        {
-         vgl = get(i,oldS.len);
-         if (strcmp(vgl.sz,oldS.sz) == 0)
-            {
-               replace(i,oldS.len,newS);
-               i += newS.len;
-            }
-         else
-            i++;
-      }
-}
-
-void
-Simstr::to_lower()
-{
-    for (int i = 0; i < len; i++)
-       sz[i] = (char) tolower(sz[i]);
-}
-
-
-
-//   Simstr addition
-Simstr
-operator+(const char * str, const Simstr & S)
-{
-   Simstr ret = S;
-   ret.push_front(str);
-   return ret;
-}
-
-Simstr
-operator+(const Simstr & S, const char * str)
-{
-   Simstr ret = S;
-   ret.push_back(str);
-   return ret;
-}
-
-Simstr
-operator+(char c, const Simstr & S)
-{
-   Simstr ret = S;
-   ret.push_front(c);
-   return ret;
-}
-
-Simstr
-operator+(const Simstr & S, char c)
-{
-   Simstr ret = S;
-   ret.push_back(c);
-   return ret;
-}
-
-
-// Simstr-Vergleiche mit char *
-bool
-operator==(const Simstr & S, const char * str)
-{
-   return strcmp(S,str) == 0;
-}
-
-bool
-operator!=(const Simstr & S, const char * str)
-{
-   return strcmp(S,str) != 0;
-}
-
-bool
-operator<(const Simstr & S, const char * str)
-{
-   return strcmp(S,str) < 0;
-}
-
-bool
-operator>(const Simstr & S, const char * str)
-{
-   return strcmp(S,str) > 0;
-}
-
-bool
-operator<=(const Simstr & S, const char * str)
-{
-   return strcmp(S,str) <= 0;
-}
-
-bool
-operator>=(const Simstr & S, const char * str)
-{
-   return strcmp(S,str) >= 0;
-}
-
-bool
-operator==(const char * str, const Simstr & S)
-{
-   return strcmp(str,S) == 0;
-}
-
-bool
-operator!=(const char * str, const Simstr & S)
-{
-   return strcmp(str,S) != 0;
-}
-
-bool
-operator<(const char * str, const Simstr & S)
-{
-   return strcmp(str,S) < 0;
-}
-
-bool
-operator>(const char * str, const Simstr & S)
-{
-   return strcmp(str,S) > 0;
-}
-
-bool
-operator<=(const char * str, const Simstr & S)
-{
-   return strcmp(str,S) <= 0;
-}
-
-bool
-operator>=(const char * str, const Simstr & S)
-{
-   return strcmp(str,S) >= 0;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/inc/tlog.hxx b/soltools/testSHL/inc/tlog.hxx
deleted file mode 100644
index a00cacd15..000000000
--- a/soltools/testSHL/inc/tlog.hxx
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SOLTOOLS_TESTSHL_TLOG_HXX__
-#define _SOLTOOLS_TESTSHL_TLOG_HXX__
-
-#include    <osl/file.hxx>
-#include <rtl/tres.hxx>
-
-#include "tutil.hxx"
-
-#include <iostream>
-
-using namespace std;
-
-namespace tstutl {
-
-class tLog {
-
-    // <private_members>
-    ::osl::File*    m_logfile;              // fileobject
-    ::rtl::OUString m_logname;              // name of log
-    // </private_members>
-
-    // <private_methods>
-    void initialize( const ::rtl::OString& name );
-    // </private_methods>
-
-public:
-
-    // <public_ctors>
-    tLog() : m_logfile( 0 ) {
-    }
-
-    tLog( const sal_Char* name ) {
-        if( name ) {
-            initialize( name );
-        }
-        else  {
-            m_logfile = 0;
-        }
-
-    }
-    // </public_ctors>
-
-    // <dtor>
-    virtual ~tLog() {
-        if ( m_logfile ) {
-            m_logfile->close();
-            delete( m_logfile );
-        }
-    } // </dtor>
-
-    // <public_methods>
-    inline ::rtl::OUString& getName() { return m_logname; }
-    inline ::osl::File* getFile() { return m_logfile; }
-
-    // open logfile for overwrite (default) or append
-    ::osl::FileBase::RC open( sal_Bool append = sal_False );
-    ::osl::FileBase::RC close();
-
-    ::osl::FileBase::RC writeRes( ::rtl::TestResult& oRes, sal_Bool v = sal_False ,
-                                                  sal_Bool xml = sal_False );
-
-    // write methods without (default) or with echo on display
-    ::osl::FileBase::RC write( const sal_Char* buf, sal_Bool v = sal_False );
-    // </public_methods>
-
-}; // </class_tLog>
-
-} // </namespace_tstutl>
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/inc/tstMgr.hxx b/soltools/testSHL/inc/tstMgr.hxx
deleted file mode 100644
index d3c86873c..000000000
--- a/soltools/testSHL/inc/tstMgr.hxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SOLTOOLS_TESTSHL_TSTMGR_HXX__
-#define _SOLTOOLS_TESTSHL_TSTMGR_HXX__
-
-#include    <sal/types.h>
-
-#include <vector>
-
-using namespace std;
-
-// <namespace_tstutl>
-namespace tstutl {
-
-// <class_tstMgr>
-class tstMgr {
-
-    // <private_members>
-    struct tstMgr_Impl;
-    tstMgr_Impl* pImpl;
-    // </private_members>
-
-    // <private_methods>
-    void cleanup();
-    // </private_methods>
-
-public:
-    tstMgr() : pImpl(0) {}
-    // <dtor>
-    ~tstMgr(){
-        cleanup();
-    } // </dtor>
-
-
-    // <public_methods>
-    sal_Bool initialize( sal_Char* moduleName, sal_Bool boom = sal_False );
-    sal_Bool test_Entry( sal_Char* entry, sal_Char* logName = 0 );
-    sal_Bool test_Entries( vector< sal_Char* > entries, sal_Char* logName = 0 );
-    sal_Bool test_EntriesFromFile( sal_Char* fName, sal_Char* logName = 0 );
-    // </public_methods>
-
-}; // </class_tstMgr>
-
-} // </namespace_tstutl>
-
-#endif
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/inc/tutil.hxx b/soltools/testSHL/inc/tutil.hxx
deleted file mode 100644
index 06d5b30cc..000000000
--- a/soltools/testSHL/inc/tutil.hxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SOLTOOLS_TESTSHL_TUTIL_HXX_
-#define _SOLTOOLS_TESTSHL_TUTIL_HXX__
-
-#include    <osl/file.hxx>
-
-using namespace std;
-
-#include <vector>
-
-// <namespace_tstutl>
-namespace tstutl {
-
-sal_uInt32 getEntriesFromFile( sal_Char* fName, vector< sal_Char* >& entries );
-::rtl::OUString cnvrtPth( ::rtl::OString sysPth );
-
-// string copy, cat, len methods
-sal_Char* cpy( sal_Char** dest, const sal_Char* src );
-sal_Char* cat( const sal_Char* str1, const sal_Char* str2 );
-sal_uInt32 ln( const sal_Char* str );
-
-} // </namespace_tstutl>
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/makefile.mk b/soltools/testSHL/makefile.mk
deleted file mode 100644
index 0377137b2..000000000
--- a/soltools/testSHL/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=soltools
-TARGET=testshl
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-UWINAPILIB=$(0)
-LIBSALCPPRT=$(0)
-
-# ------------------------------------------------------------------
-
-APP1TARGET= $(TARGET)
-APP1OBJS=   $(OBJ)$/$(TARGET).obj
-APP1STDLIBS=$(SALLIB)\
-            $(SALHELPERLIB)
-APP1DEPN= $(LB)$/tstutil.lib
-APP1LIBS= $(LB)$/tstutil.lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/soltools/testSHL/testshl.cxx b/soltools/testSHL/testshl.cxx
deleted file mode 100644
index 120bddbab..000000000
--- a/soltools/testSHL/testshl.cxx
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-
-#include <stdio.h>
-
-#include "inc/tlog.hxx"
-
-#include "inc/tstMgr.hxx"
-
-using namespace tstutl;
-
-void usage();
-void test_shl( vector< sal_Char* > cmdln, sal_Bool boom );
-
-#if (defined UNX)
-int main( int argc, char* argv[] )
-#else
-int _cdecl main( int argc, char* argv[] )
-#endif
-{
-    if ( argc < 3 ) {
-        usage();
-    }
-    sal_Bool boom = sal_False;
-    vector< sal_Char* > cmdln;
-
-    sal_Int32 i;
-    for ( i = 1; i < argc; i++ ) {
-        sal_Char* ptr = argv[i];
-        if ( ptr[0] == '-' ) {
-            boom = sal_True;
-        }
-        else  {
-            cmdln.push_back( ptr );
-        }
-    }
-    if ( cmdln.size() < 3 ) {
-        cmdln.push_back( 0 );
-    }
-    if ( ! cmdln[0] || ! cmdln[1] ) {
-        usage();
-    }
-
-    test_shl( cmdln, boom );
-
-    return(0);
-}
-
-void test_shl( vector< sal_Char*> cmdln, sal_Bool boom ) {
-
-    tstMgr tst;
-
-    if ( tst.initialize( cmdln[0], boom )) {
-        tst.test_EntriesFromFile( cmdln[1], cmdln[2] );
-    }
-    else {
-        sal_Char* msg = "could not find module\n";
-        fprintf( stdout, "%s\n", msg );
-    }
-}
-
-void usage(){
-    fprintf( stdout,
-            "USAGE: testSHL shlname scename [logname] [-boom]\n" );
-    exit(0);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/util/makefile.mk b/soltools/testSHL/util/makefile.mk
deleted file mode 100644
index a2582f9c1..000000000
--- a/soltools/testSHL/util/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=soltools
-TARGET=tstutil
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-OBJFILES =\
-                $(OBJ)$/tlog.obj  \
-                $(OBJ)$/tutil.obj \
-                $(OBJ)$/tstMgr.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/soltools/testSHL/util/tlog.cxx b/soltools/testSHL/util/tlog.cxx
deleted file mode 100644
index 9f73fc56b..000000000
--- a/soltools/testSHL/util/tlog.cxx
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-
-#include    "tlog.hxx"
-
-using namespace std;
-
-// <namespace_tstutl>
-namespace tstutl {
-
-// <method_initialize>
-void tLog::initialize( const ::rtl::OString& name ) {
-    m_logname = cnvrtPth( name );
-    m_logfile = new ::osl::File( m_logname );
-} // </method_initialize>
-
-// <method_open>
-::osl::FileBase::RC tLog::open( sal_Bool append ) {
-
-    if ( m_logfile ) {
-        ::osl::FileBase::RC ret;
-
-        if ( ! append ) {
-            ret = ::osl::File::remove( m_logname );
-        }
-
-    if( m_logfile->open( osl_File_OpenFlag_Write ) == ::osl::FileBase::E_NOENT ) {
-            ret = m_logfile->open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
-        }
-        else  {
-            ret = m_logfile->setPos( osl_Pos_End, 0 );
-        }
-        return ret;
-    }
-    return ( ::osl::FileBase::E_INVAL );
-} // </method_open>
-
-// <method_close>
-::osl::FileBase::RC tLog::close() {
-    if ( m_logfile ) {
-        return m_logfile->close();
-    }
-    return ( ::osl::FileBase::E_INVAL );
-} // </method_close>
-
-// <method_writeRes>
-::osl::FileBase::RC tLog::writeRes( ::rtl::TestResult& oRes, sal_Bool v, sal_Bool xml ) {
-    ::osl::FileBase::RC ret;
-
-    sal_Char* ptr = oRes.getName();
-    ptr = cat( ptr, ";" );
-    ptr = cat( ptr, oRes.getResult() );
-    ret = write( cat( ptr, "\n" ), v );
-    delete [] ptr;
-
-    return( ret );
-} // </method_writeRes>
-
-// <method_write>
-::osl::FileBase::RC tLog::write( const sal_Char* buf, sal_Bool v ) {
-
-    if ( ! m_logfile ) {
-        fprintf( stderr, "%s", buf );
-        return ( ::osl::FileBase::E_NOENT );
-    }
-    sal_uInt64 uBytes=0;
-    sal_uInt32 len = ln( buf );
-
-    if ( v ) {
-        fprintf( stderr, "%s", buf );
-    }
-    return m_logfile->write( buf, len , uBytes );
-} // </method_write>
-
-} // </namespace_tstutl>
-
-
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/util/tstMgr.cxx b/soltools/testSHL/util/tstMgr.cxx
deleted file mode 100644
index aea1926f2..000000000
--- a/soltools/testSHL/util/tstMgr.cxx
+++ /dev/null
@@ -1,163 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-#include "tstMgr.hxx"
-#include <osl/module.hxx>
-#include <rtl/tres.hxx>
-
-#include "tlog.hxx"
-
-#include "tutil.hxx"
-
-using namespace rtl;
-
-// <namespace_tstutl>
-namespace tstutl {
-
-typedef void* ( tstFunc )( TestResult* );
-void test_Entry_Impl( ::osl::Module& oMod, TestResult* oRes );
-
-// <private_members>
-struct tstMgr::tstMgr_Impl {
-    ::osl::Module m_tstmodule;
-    sal_Bool m_boom;
-};
-// </private_members>
-
-// <method_initialize>
-sal_Bool tstMgr::initialize( sal_Char* modName, sal_Bool boom ) {
-
-    ::rtl::OUString tstMod( ::rtl::OUString::createFromAscii( modName ) );
-    pImpl = new tstMgr_Impl;
-    pImpl->m_boom = boom;
-    return ( pImpl->m_tstmodule.load( tstMod ) );
-} // <method_initialize>
-
-// <method_test_Entries>
-sal_Bool tstMgr::test_Entries( vector< sal_Char* > entries,
-                                                        sal_Char* logName ) {
-
-    sal_Bool bOK = sal_False;
-    if ( ! entries.empty() ) {
-
-        bOK = sal_True;
-        vector< sal_Char* >::iterator iter = entries.begin();
-
-        tLog log( logName );
-        // open testLog
-        log.open();
-            while ( iter != entries.end() ) {
-                if ( *iter[0] != '#' ) {
-                    ::rtl::TestResult oRes( *iter, pImpl->m_boom );
-                    test_Entry_Impl( pImpl->m_tstmodule, &oRes );
-                    bOK &= oRes.getState();
-                    log.writeRes( oRes );
-                }
-                ++iter;
-            }
-        log.close();
-    }
-    return ( bOK );
-} // </method_test_Entries>
-
-// <method_test_Entry>
-sal_Bool tstMgr::test_Entry( sal_Char* entry, sal_Char* logName ) {
-
-    tLog log( logName );
-    // open testLog
-    log.open();
-    ::rtl::TestResult oRes( entry, pImpl->m_boom );
-    test_Entry_Impl( pImpl->m_tstmodule, &oRes );
-    log.writeRes( oRes, sal_True );
-    log.close();
-    return ( oRes.getState() );
-} // </method_test_Entry>
-
-// <method_test_EntriesFromFile>
-sal_Bool tstMgr::test_EntriesFromFile( sal_Char* fName, sal_Char* logName ) {
-
-    sal_Bool bOK = sal_False;
-    vector< sal_Char* > entries;
-
-    if ( getEntriesFromFile( fName, entries ) ) {
-        sal_Bool bOK = test_Entries( entries, logName );
-
-        vector< sal_Char* >::iterator iter =  entries.begin();
-        while ( iter != entries.end() ) {
-            if ( *iter ) {
-                delete [] *iter;
-            }
-            ++iter;
-        }
-    }
-    else  {
-        bOK = test_Entry( fName );
-    }
-    return ( bOK );
-
-} // </method_test_EntriesFromFile>
-
-// <method_cleanup>
-void tstMgr::cleanup() {
-    if ( pImpl ) {
-        delete pImpl;
-    }
-} // </method_cleanup>
-
-
-// <function_test_Entry_Impl>
-void test_Entry_Impl( ::osl::Module& oMod, ::rtl::TestResult* oRes ) {
-
-    tstFunc* pFunc;                             // entry pointer
-    ::rtl::OString entryName( "test_" );        // entryname prefix
-
-    // prefix entryname
-    entryName += oRes->getName();
-
-    // get entry pointer
-    pFunc = (tstFunc*) oMod.getSymbol(
-                    ::rtl::OUString::createFromAscii( entryName.getStr() ) );
-
-    if ( pFunc ) {
-        // call entry
-        pFunc( oRes );
-        oRes->end();
-    }
-    else  {
-        oRes->end("symbol not found");
-    }
-    // return
-    return;
-
-} // </function_test_Entry_Impl>
-
-} // </namespace_tstutl>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testSHL/util/tutil.cxx b/soltools/testSHL/util/tutil.cxx
deleted file mode 100644
index 0cf734f31..000000000
--- a/soltools/testSHL/util/tutil.cxx
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-#include "tutil.hxx"
-
-// <namespace_tstutl>
-namespace tstutl {
-
-// getcwd hack is deprecated as soon as normalizePath works as intend
-#ifdef WNT
-#define _getcwd getcwd
-#include <direct.h>                         // _getcwd
-#else
-#include <unistd.h>							// getcwd
-#endif
-
-// <function_cnvrtPth>
-::rtl::OUString cnvrtPth( ::rtl::OString sysPth ) {
-
-    using ::osl::FileBase;
-    using ::rtl::OUString;
-    using ::rtl::OString;
-
-    ::rtl::OUString ret;
-    sysPth = sysPth.replace( '\\','/' );
-    OUString pth( OUString::createFromAscii( sysPth.getStr() ) );
-
-    if ( sysPth.indexOf("..") != -1 ) {
-
-        // <hack> for osl_normalizePath() can't handle relatives
-            char buffer[256];
-            OString curPth(getcwd(buffer,256));
-        // </hack>
-        OUString nrmCurPth;
-        FileBase::normalizePath( OUString::createFromAscii( curPth ) ,
-                                                                nrmCurPth );
-        FileBase::getAbsolutePath( nrmCurPth, pth, ret );
-    }
-    else  {
-        FileBase::normalizePath( pth, ret );
-    }
-    return ret;
-
-} // </function_cnvrtPth>
-
-// <function_getEntriesFromFile>
-sal_uInt32 getEntriesFromFile( sal_Char* fName,
-                                            vector< sal_Char* >& entries ) {
-
-    ::osl::File inFile( cnvrtPth( fName ) );
-    if ( inFile.open( osl_File_OpenFlag_Read ) == ::osl::FileBase::E_None) {
-        ::rtl::ByteSequence byteSeq;
-        inFile.readLine( byteSeq );
-        while ( byteSeq.getLength() ) {
-            sal_uInt32 len = byteSeq.getLength();
-            sal_uInt32 i;
-            sal_Char* pEnt = new sal_Char[ len+1 ];
-            sal_Char* bsPtr = (sal_Char*)byteSeq.getArray();
-            for ( i=0; i<len; i++ ) {
-                pEnt[i] = bsPtr[i];
-            }
-            pEnt[len] = '\0';
-            entries.push_back( pEnt );
-
-            inFile.readLine( byteSeq );
-        }
-    }
-    return ( entries.size() );
-
-} // </function_getEntriesFromFile>
-
-// <function_cpy>
-sal_Char* cpy( sal_Char** dest, const sal_Char* src ) {
-
-    *dest = new sal_Char[ ln(src)+1 ];
-    // set pointer
-    sal_Char* pdest = *dest;
-    const sal_Char* psrc = src;
-
-    // copy string by char
-    while( *pdest++ = *psrc++ );
-
-    return ( *dest );
-
-} // </function_cpy>
-
-// <function_cat>
-sal_Char* cat( const sal_Char* str1, const sal_Char* str2 ) {
-
-    // allocate memory for destination string
-    sal_Char* dest = new sal_Char[ ln(str1)+ln(str2)+1 ];
-
-    // set pointers
-    sal_Char* pdest = dest;
-    const sal_Char* psrc = str1;
-
-    // copy string1 by char to dest
-    while( *pdest++ = *psrc++ );
-    pdest--;
-    psrc = str2;
-    while( *pdest++ = *psrc++ );
-
-    return ( dest );
-
-} // </function_cat>
-
-// <function_ln>
-sal_uInt32 ln( const sal_Char* str ) {
-
-    sal_uInt32 len = 0;
-    const sal_Char* ptr = str;
-
-    if( ptr ) {
-        while( *ptr++ ) len++;
-    }
-
-    return(len);
-} // <function_ln>
-
-} // </namespace_tstutl>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/testhxx/create.pl b/soltools/testhxx/create.pl
deleted file mode 100644
index 4360f0d3e..000000000
--- a/soltools/testhxx/create.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$solarversion = $ENV{SOLARVERSION};
-$solarversion =~ s![^0-9A-Za-z]!\\$&!g;
-$in = <> || die 'no input';
-chomp $in;
-if ($ENV{OS} eq 'LINUX') {
-    1 while $in =~ s!\s+-I\s*[^/]\S*\s*! !g; # discard relative includes
-    $in =~ s!(\s+-I\s*)$solarversion(\S*)!$1\${SOLARVERSION}$2!og;
-        # macrofy includes to solver
-    $in =~ s!\s+-o\s*\S+! -o /dev/null! || die 'bad input: no -o';
-    $in =~ s!\S+/testhxx.cxx!-x c++ /proc/self/fd/0!
-        || die 'bad input: no source file';
-    print STDOUT '#!/bin/bash', "\n";
-    print STDOUT $in,
-        ' <<<"#include \\"`echo $(if [ ${1%/*} != $1 ];then cd ${1%/*};fi;',
-        '/bin/pwd)/${1##*/}`\\""', "\n";
-} elsif ($ENV{OS} eq 'SOLARIS') {
-    1 while $in =~ s!\s+-I\s*[^/]\S*\s*! !g; # discard relative includes
-    $in =~ s!(\s+-I\s*)$solarversion(\S*)!$1\${SOLARVERSION}$2!og;
-        # macrofy includes to solver
-    $in =~ s!\s+-o\s*\S+! -o /dev/null! || die 'bad input: no -o';
-    $in =~ s!\S+/testhxx.cxx!\${my_tmp}!
-        || die 'bad input: no source file';
-    print STDOUT '#!/bin/sh', "\n";
-    print STDOUT
-        'my_tmp=${TMPDIR:-/tmp}/`/usr/xpg4/bin/id -u`_$$_include.cc', "\n";
-    print STDOUT 'my_pat=`dirname $1`', "\n";
-    print STDOUT 'my_fil=`basename $1`', "\n";
-    print STDOUT 'my_org=${PWD}', "\n";
-    print STDOUT 'cd $my_pat || exit 1', "\n";
-    print STDOUT 'my_pat=`pwd`', "\n";
-    print STDOUT 'cd $my_org || exit 1', "\n";
-    print STDOUT
-        'echo "#include \\"${my_pat}/${my_fil}\\"" > ${my_tmp} || exit 1', "\n";
-    print STDOUT $in, ' > ${my_tmp}.out 2>&1', "\n";
-    print STDOUT 'my_ret=$?', "\n";
-    print STDOUT
-        'if [ ${my_ret} -ne 0 ] ; then echo $1 >&2 ; cat ${my_tmp}.out >&2 ;',
-        ' fi', "\n";
-    print STDOUT 'unlink ${my_tmp} || exit 1', "\n";
-    print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n";
-    print STDOUT 'exit ${my_ret}', "\n";
-} elsif ($ENV{OS} eq 'WNT') {
-  if ($ENV{COM} eq 'GCC') {
-    1 while $in =~ s!\s+-I\s*\.\S*\s*! !g; # discard relative includes
-    $in =~ s!(\s+-I\s*)(?i:$solarversion)(\S*)!$1\${SOLARVERSION}$2!og;
-        # macrofy includes to solver
-    $in =~ s!\s+-o\s*\S+! -o /dev/null! || die 'bad input: no -o';
-    $in =~ s!\S+/testhxx.cxx!\${my_tmp}!
-        || die 'bad input: no source file';
-    print STDOUT '#!/bin/sh', "\n";
-    print STDOUT
-        'my_tmp=${TMPDIR:-/tmp}/`id -u`_$$_include.cc', "\n";
-    print STDOUT 'my_pat=`dirname $1`', "\n";
-    print STDOUT 'my_fil=`basename $1`', "\n";
-    print STDOUT 'my_org=${PWD}', "\n";
-    print STDOUT 'cd $my_pat || exit 1', "\n";
-    print STDOUT 'my_pat=`cygpath -m \`pwd\``', "\n";
-    print STDOUT 'cd $my_org || exit 1', "\n";
-    print STDOUT
-        'echo "#include \\"${my_pat}/${my_fil}\\"" > ${my_tmp} || exit 1', "\n";
-    print STDOUT $in, ' > ${my_tmp}.out 2>&1', "\n";
-    print STDOUT 'my_ret=$?', "\n";
-    print STDOUT
-        'if [ ${my_ret} -ne 0 ] ; then echo $1 >&2 ; cat ${my_tmp}.out >&2 ;',
-        ' fi', "\n";
-    print STDOUT 'unlink ${my_tmp} || exit 1', "\n";
-    print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n";
-    print STDOUT 'exit ${my_ret}', "\n";
-  } else {
-    1 while $in =~ s!\s+-I\s*\.\S*\s*! !g; # discard relative includes
-    $in =~ s!(\s+-I\s*)(?i:$solarversion)(\S*)!$1\${SOLARVERSION}$2!og;
-        # macrofy includes to solver
-    $in =~ s!\s+-Fo\s*\S+! -Fo$[my_tmp}obj! || die 'bad input: no -Fo';
-    $in =~ s!\s+-Zi\s! !;
-    $in =~ s!\s+-Fd\s*\S+!!;
-    print STDOUT '#!/bin/sh', "\n";
-    print STDOUT
-        'my_tmp=${TMPDIR:-/tmp}/`id -u`_$$_include.cc', "\n";
-    print STDOUT 'my_pat=`dirname $1`', "\n";
-    print STDOUT 'my_fil=`basename $1`', "\n";
-    print STDOUT 'my_org=${PWD}', "\n";
-    print STDOUT 'cd $my_pat || exit 1', "\n";
-    print STDOUT 'my_pat=`pwd`', "\n";
-    print STDOUT 'cd $my_org || exit 1', "\n";
-    print STDOUT
-        'echo "#include \\"${my_pat}/${my_fil}\\"" > ${my_tmp} || exit 1', "\n";
-    print STDOUT $in, ' > ${my_tmp}.out 2>&1', "\n";
-    print STDOUT 'my_ret=$?', "\n";
-    print STDOUT
-        'if [ ${my_ret} -ne 0 ] ; then echo $1 >&2 ; cat ${my_tmp}.out >&2 ;',
-        ' fi', "\n";
-    print STDOUT 'unlink ${my_tmp} || exit 1', "\n";
-    print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n";
-    print STDOUT 'exit ${my_ret}', "\n";
-  }
-} else {
-    print STDOUT 'echo \'no testhxx on this platform\'', "\n";
-}
diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk
deleted file mode 100644
index e71d8f116..000000000
--- a/soltools/testhxx/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ := ..
-PRJNAME := soltools
-TARGET := testhxx
-LIBTARGET := NO
-ENABLE_EXCEPTIONS := TRUE
-
-CAPTURE_COMMAND = echo
-CAPTURE_OUTPUT = > $(MISC)$/testhxx.output && $(TOUCH) $(SLO)$/testhxx.obj
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-.INCLUDE: settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-    @echo Nothing done when cross-compiling
-.ENDIF
-
-SLOFILES = $(SLO)$/testhxx.obj
-
-.INCLUDE: target.mk
-
-ALLTAR: $(BIN)$/$(TARGET)
-
-$(BIN)$/$(TARGET) .ERRREMOVE : $(MISC)$/testhxx.output create.pl
-    $(PERL) -w create.pl < $(MISC)$/testhxx.output > $@
-    chmod +x $@
-
-$(MISC)$/testhxx.output: $(SLO)$/testhxx.obj
-    $(TOUCH) $<
-    $(TOUCH) $@
diff --git a/soltools/testhxx/testhxx.cxx b/soltools/testhxx/testhxx.cxx
deleted file mode 100644
index 2f6e06759..000000000
--- a/soltools/testhxx/testhxx.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// NO PCH here - breaks the purpose of this file
-// MARKER(update_precomp.py): autogen include statement, do not remove
-//#include "precompiled_soltools.hxx"
-
-// This is just a dummy file; see the makefile.mk for the real work.
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
deleted file mode 100755
index f00c98c10..000000000
--- a/soltools/util/makefile.pmk
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# find 'makedepend' in own output tree
-MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend
-
-# find 'adjustvisibility' in own output tree
-ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility
-
-.IF "$(OS)"=="SOLARIS"
-# hack due to #i53089#
-.IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)"
-HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x"))
-.ELSE			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
-HELP_COMPATH:=$(COMPATH)
-.ENDIF			# "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
-.IF "$(COM)"!="GCC"
-SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd
-.ENDIF
-.ENDIF
diff --git a/soltools/winunistd/makefile.mk b/soltools/winunistd/makefile.mk
deleted file mode 100644
index 9fb4f512c..000000000
--- a/soltools/winunistd/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=winunistd
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"!="GCC"
-# provide dummy header for generated sources
-$(INCCOM)$/unistd.h : unistd.h
-    @$(COPY) $< $@
-
-.ENDIF # "$(COM)"!="GCC"
-.ENDIF # "$(GUI)"=="WNT"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/soltools/winunistd/unistd.h b/soltools/winunistd/unistd.h
deleted file mode 100644
index c3343f5f5..000000000
--- a/soltools/winunistd/unistd.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* Dummy unistd.h for the wntmsci3 environment. Required because flex 
- * generates a lexical scanner which includes <unistd.h>
- */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/splitbuild/base.lst b/splitbuild/base.lst
deleted file mode 100644
index cda4527f3..000000000
--- a/splitbuild/base.lst
+++ /dev/null
@@ -1 +0,0 @@
-reportdesign dbaccess
diff --git a/splitbuild/binfilter.lst b/splitbuild/binfilter.lst
deleted file mode 100644
index 1baa90b76..000000000
--- a/splitbuild/binfilter.lst
+++ /dev/null
@@ -1 +0,0 @@
-binfilter
diff --git a/splitbuild/bm b/splitbuild/bm
deleted file mode 100755
index 16872f141..000000000
--- a/splitbuild/bm
+++ /dev/null
@@ -1,4 +0,0 @@
-build --genconf --clear
-build --genconf --add `cat $1`
-build --all $2 $3 $4 
-
diff --git a/splitbuild/build.lst b/splitbuild/build.lst
deleted file mode 100644
index e19d9cebe..000000000
--- a/splitbuild/build.lst
+++ /dev/null
@@ -1 +0,0 @@
-crashrep javainstaller2 packimages postprocess scp2 testtools instsetoo_native
diff --git a/splitbuild/calc.lst b/splitbuild/calc.lst
deleted file mode 100644
index d9e4a9f18..000000000
--- a/splitbuild/calc.lst
+++ /dev/null
@@ -1 +0,0 @@
-chart2 scaddins sccomp sc
diff --git a/splitbuild/common.lst b/splitbuild/common.lst
deleted file mode 100644
index 2b92492af..000000000
--- a/splitbuild/common.lst
+++ /dev/null
@@ -1 +0,0 @@
-basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml xmlhelp xmloff xmlscript wizards
diff --git a/splitbuild/content.lst b/splitbuild/content.lst
deleted file mode 100644
index dd8d40c75..000000000
--- a/splitbuild/content.lst
+++ /dev/null
@@ -1 +0,0 @@
-dictionaries extras helpcontent2
diff --git a/splitbuild/draw.lst b/splitbuild/draw.lst
deleted file mode 100644
index 6f83eca00..000000000
--- a/splitbuild/draw.lst
+++ /dev/null
@@ -1 +0,0 @@
-animations sd slideshow
diff --git a/splitbuild/extensions.lst b/splitbuild/extensions.lst
deleted file mode 100644
index 86fe24b88..000000000
--- a/splitbuild/extensions.lst
+++ /dev/null
@@ -1 +0,0 @@
-migrationanalysis reportbuilder sdext swext
diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst
deleted file mode 100644
index 9876dd734..000000000
--- a/splitbuild/extern.lst
+++ /dev/null
@@ -1 +0,0 @@
-afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz mythes neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib 
diff --git a/splitbuild/filter.lst b/splitbuild/filter.lst
deleted file mode 100755
index 9659e019d..000000000
--- a/splitbuild/filter.lst
+++ /dev/null
@@ -1 +0,0 @@
-filter hwpfilter oox writerfilter writerperfect xmerge
\ No newline at end of file
diff --git a/splitbuild/framework.lst b/splitbuild/framework.lst
deleted file mode 100644
index 1333e7dc7..000000000
--- a/splitbuild/framework.lst
+++ /dev/null
@@ -1 +0,0 @@
-automation avmedia basic basctl cui desktop drawinglayer extensions forms formula framework idl scripting sfx2 svx xmlsecurity vbahelper
diff --git a/splitbuild/gui.lst b/splitbuild/gui.lst
deleted file mode 100644
index d64284379..000000000
--- a/splitbuild/gui.lst
+++ /dev/null
@@ -1 +0,0 @@
-accessibility canvas cppcanvas dtrans editeng fpicker padmin psprint_config setup_native svtools sysui toolkit UnoControls uui vcl
diff --git a/splitbuild/prj/build.lst b/splitbuild/prj/build.lst
deleted file mode 100644
index 0356e8b8d..000000000
--- a/splitbuild/prj/build.lst
+++ /dev/null
@@ -1 +0,0 @@
-spl      splitbuild     ::      postprocess NULL
diff --git a/splitbuild/prj/d.lst b/splitbuild/prj/d.lst
deleted file mode 100644
index b87dd52c7..000000000
--- a/splitbuild/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-#dummy d.lst file
diff --git a/splitbuild/start.lst b/splitbuild/start.lst
deleted file mode 100644
index 3838044a8..000000000
--- a/splitbuild/start.lst
+++ /dev/null
@@ -1 +0,0 @@
-soltools
diff --git a/splitbuild/uno.lst b/splitbuild/uno.lst
deleted file mode 100644
index 31ee78756..000000000
--- a/splitbuild/uno.lst
+++ /dev/null
@@ -1 +0,0 @@
-autodoc bridges cli_ure codemaker cosv cppu cppuhelper cpputools idlc io javaunohelper jurt jvmaccess jvmfwk odk offapi offuh qadevOOo rdbmaker readlicense_oo registry remotebridges ridljar sal salhelper stoc store testshl2 udkapi udm unodevtools unoil ure xml2cmp
diff --git a/splitbuild/writer.lst b/splitbuild/writer.lst
deleted file mode 100644
index 28bd99c63..000000000
--- a/splitbuild/writer.lst
+++ /dev/null
@@ -1 +0,0 @@
-hwpfilter starmath sw writerfilter writerperfect
diff --git a/stlport/STLport-4.0-sunstudio12u1.patch b/stlport/STLport-4.0-sunstudio12u1.patch
deleted file mode 100644
index 49d76abbd..000000000
--- a/stlport/STLport-4.0-sunstudio12u1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- misc/STLport-4.0/stlport/config/stl_sunpro.h	Mon Jul  6 13:43:35 2009
-+++ misc/build/STLport-4.0/stlport/config/stl_sunpro.h	Mon Jul  6 13:56:56 2009
-@@ -31,7 +31,8 @@
- #  endif
- # endif
- 
--# if (__SUNPRO_CC < 0x600)
-+// support SunStudio compiler 12u1 version 5.10 (which results in 0x5100)
-+# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000))
- // those are tested and proved not to work...
- #  define __STL_STATIC_ARRAY_BUG 1
- #  define __STL_STATIC_CONST_INIT_BUG 1
-@@ -57,7 +58,7 @@
- #  define __STL_NO_FRIEND_TEMPLATES 1
- #endif
- 
--# if (__SUNPRO_CC < 0x600)
-+# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000))
- #  define __STL_HAS_NO_NEW_C_HEADERS 1 
- #  define __STL_NO_EXPLICIT_FUNCTION_TMPL_ARGS
- #  define __STL_NON_TYPE_TMPL_PARAM_BUG 1
diff --git a/stlport/STLport-4.0.patch b/stlport/STLport-4.0.patch
deleted file mode 100644
index ea21ff931..000000000
--- a/stlport/STLport-4.0.patch
+++ /dev/null
@@ -1,4943 +0,0 @@
-*** misc/STLport-4.0/src/gcc.mak	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/src/gcc.mak	Tue Sep  6 18:38:04 2005
-***************
-*** 5,12 ****
-  #
-  # compiler
-  #
-! CC = gcc
-! CXX = c++
-  
-  #
-  # Basename for libraries
---- 5,12 ----
-  #
-  # compiler
-  #
-! CC *= gcc
-! CXX *= c++
-  
-  #
-  # Basename for libraries
-***************
-*** 19,25 ****
-  #
-  LINK=ar cr
-  # 2.95 flag
-! DYN_LINK=gcc -shared -o
-  
-  OBJEXT=o
-  DYNEXT=so
---- 19,25 ----
-  #
-  LINK=ar cr
-  # 2.95 flag
-! DYN_LINK=$(CC) -shared -o
-  
-  OBJEXT=o
-  DYNEXT=so
-*** misc/STLport-4.0/src/sunpro.mak	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/src/sunpro.mak	Tue Sep  6 18:38:04 2005
-***************
-*** 30,35 ****
---- 30,40 ----
-  
-  include common_macros.mak
-  
-+ # override because STLDEBUG breaks...
-+ ALL_STATIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB)
-+ 
-+ ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB)
-+ 
-  CXXFLAGS_COMMON = -mt -pta +w2 -features=rtti -xildoff ${STL_INCL} -D__SGI_STL_OWN_IOSTREAMS
-  
-  SHCXXFLAGS = -PIC
-***************
-*** 70,75 ****
---- 75,88 ----
-  LDFLAGS_STLDEBUG_static = ${CXXFLAGS_STLDEBUG_static}
-  LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic}
-  
-+ LDLIBS_RELEASE_dynamic = -lm
-+ LDLIBS_DEBUG_dynamic = -lm
-+ LDLIBS_STLDEBUG_dynamic = -lm
-+ 
-+ LDFLAGS_RELEASE_dynamic += -norunpath
-+ LDFLAGS_DEBUG_dynamic += -norunpath
-+ LDFLAGS_STLDEBUG_dynamic += -norunpath
-+ 
-  include common_percent_rules.mak
-  include common_rules.mak
-  
-*** misc/STLport-4.0/src/sunpro11.mak	Mon Dec  5 17:22:32 2005
---- misc/build/STLport-4.0/src/sunpro11.mak	Mon Dec  5 17:25:03 2005
-***************
-*** 1 ****
-! dummy
---- 1,82 ----
-!  #
-!  # Basename for libraries
-!  #
-!  LIB_BASENAME = libstlport_sunpro
-!  
-!  STL_INCL= -I. -I${PWD}/../stlport/SC5 -I${SYSBASE}/usr/include
-!  # STL_INCL= -I. -I${PWD}/../stlport
-!  
-!  CC = CC
-!  CXX = CC
-!  
-!  #
-!  # guts for common stuff
-!  #
-!  #
-!  LINK=$(CC) -mt -xar -o
-!  DYN_LINK=$(CC) -mt -G -o
-!  
-!  OBJEXT=o
-!  DYNEXT=so
-!  STEXT=a
-!  RM=rm -rf
-!  PATH_SEP=/
-!  MKDIR=mkdir -p
-!  COMP=SUN
-!  
-!  # LINK_OUT=-xar -o  
-!  # DYNLINK_OUT=-o 
-!  
-!  all: all_static all_dynamic
-!  
-!  include common_macros.mak
-! 
-! # override because STLDEBUG breaks...
-! ALL_STATIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB)
-! 
-! ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB)
-!  
-!  CXXFLAGS_COMMON = -mt -library=%none,Crun ${STL_INCL} -D__SGI_STL_OWN_IOSTREAMS
-!  
-!  SHCXXFLAGS = -KPIC
-!  
-!  #
-!  # Try those flags to see if they help to get maximum efficiency :
-!  # -Qoption iropt -R,-Ml30,-Ms30,-Mi1000000,-Mm1000000,-Mr1000000,-Ma1000000,-Mc1000000,-Mt1000000
-!  # Note, these flags don't work anymore with the SunStudio 11 compiler. Let the compiler
-!  # decide how to optimize
-!  RELEASE_FLAGS = -O3
-!  
-!  
-!  # install: $(TARGETS)
-!  #	cp -p $(TARGETS) ${INSTALLDIR}
-!  
-!  CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS}
-!  CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS} $(SHCXXFLAGS)
-!  
-!  CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-!  CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g $(SHCXXFLAGS)
-!  
-!  CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_COMMON) -g -D__STL_DEBUG
-!  CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_COMMON) -g -D__STL_DEBUG $(SHCXXFLAGS)
-!  
-!  LDFLAGS_RELEASE_static = ${CXXFLAGS_RELEASE_static}
-!  LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic}
-!  
-!  LDFLAGS_DEBUG_static = ${CXXFLAGS_DEBUG_static}
-!  LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic}
-!  
-!  LDFLAGS_STLDEBUG_static = ${CXXFLAGS_STLDEBUG_static}
-!  LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic}
-!  
-!  LDLIBS_RELEASE_dynamic = -lm
-!  LDLIBS_DEBUG_dynamic = -lm
-!  LDLIBS_STLDEBUG_dynamic = -lm
-! 
-!  LDFLAGS_RELEASE_dynamic += -norunpath
-!  LDFLAGS_DEBUG_dynamic += -norunpath
-!  LDFLAGS_STLDEBUG_dynamic += -norunpath
-! 
-!  include common_percent_rules.mak
-!  include common_rules.mak
-!  
-*** misc/STLport-4.0/src/sunpro6.mak	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/src/sunpro6.mak	Tue Sep  6 18:38:04 2005
-***************
-*** 3,10 ****
-   #
-   LIB_BASENAME = libstlport_sunpro
-   
-!  # STL_INCL= -I. -I${PWD}/../stlport/SC5
-!  STL_INCL= -I. -I${PWD}/../stlport
-   
-   CC = CC
-   CXX = CC
---- 3,10 ----
-   #
-   LIB_BASENAME = libstlport_sunpro
-   
-!  STL_INCL= -I. -I${PWD}/../stlport/SC5
-!  # STL_INCL= -I. -I${PWD}/../stlport
-   
-   CC = CC
-   CXX = CC
-***************
-*** 30,35 ****
---- 30,40 ----
-   all: all_static all_dynamic
-   
-   include common_macros.mak
-+ 
-+ # override because STLDEBUG breaks...
-+ ALL_STATIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB)
-+ 
-+ ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB)
-   
-   CXXFLAGS_COMMON = -mt -library=%none,Crun -template=wholeclass ${STL_INCL} -D__SGI_STL_OWN_IOSTREAMS
-   
-***************
-*** 62,67 ****
---- 67,80 ----
-   LDFLAGS_STLDEBUG_static = ${CXXFLAGS_STLDEBUG_static}
-   LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic}
-   
-+  LDLIBS_RELEASE_dynamic = -lm
-+  LDLIBS_DEBUG_dynamic = -lm
-+  LDLIBS_STLDEBUG_dynamic = -lm
-+ 
-+  LDFLAGS_RELEASE_dynamic += -norunpath
-+  LDFLAGS_DEBUG_dynamic += -norunpath
-+  LDFLAGS_STLDEBUG_dynamic += -norunpath
-+ 
-   include common_percent_rules.mak
-   include common_rules.mak
-   
-*** misc/STLport-4.0/src/sunpro8.mak	Tue Sep  6 19:11:15 2005
---- misc/build/STLport-4.0/src/sunpro8.mak	Tue Sep  6 19:10:31 2005
-***************
-*** 1 ****
-! dummy
---- 1,80 ----
-!  #
-!  # Basename for libraries
-!  #
-!  LIB_BASENAME = libstlport_sunpro
-!  
-!  STL_INCL= -I. -I${PWD}/../stlport/SC5 -I${SYSBASE}/usr/include
-!  # STL_INCL= -I. -I${PWD}/../stlport
-!  
-!  CC = CC
-!  CXX = CC
-!  
-!  #
-!  # guts for common stuff
-!  #
-!  #
-!  LINK=$(CC) -mt -xar -o
-!  DYN_LINK=$(CC) -mt -G -o
-!  
-!  OBJEXT=o
-!  DYNEXT=so
-!  STEXT=a
-!  RM=rm -rf
-!  PATH_SEP=/
-!  MKDIR=mkdir -p
-!  COMP=SUN
-!  
-!  # LINK_OUT=-xar -o  
-!  # DYNLINK_OUT=-o 
-!  
-!  all: all_static all_dynamic
-!  
-!  include common_macros.mak
-! 
-! # override because STLDEBUG breaks...
-! ALL_STATIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB)
-! 
-! ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB)
-!  
-!  CXXFLAGS_COMMON = -DSYSBASE="$(SYSBASE)" -mt -library=%none,Crun ${STL_INCL} -D__SGI_STL_OWN_IOSTREAMS
-!  
-!  SHCXXFLAGS = -KPIC
-!  
-!  #
-!  # Try those flags to see if they help to get maximum efficiency :
-!  # -Qoption iropt -R,-Ml30,-Ms30,-Mi1000000,-Mm1000000,-Mr1000000,-Ma1000000,-Mc1000000,-Mt1000000
-!  RELEASE_FLAGS = -O2 -Qoption iropt -R,-Ml30,-Ms30,-Mi1000000,-Mm1000000,-Mr1000000,-Ma1000000,-Mc1000000,-Mt1000000
-!  
-!  
-!  # install: $(TARGETS)
-!  #	cp -p $(TARGETS) ${INSTALLDIR}
-!  
-!  CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS}
-!  CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS} $(SHCXXFLAGS)
-!  
-!  CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-!  CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g $(SHCXXFLAGS)
-!  
-!  CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_COMMON) -g -D__STL_DEBUG
-!  CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_COMMON) -g -D__STL_DEBUG $(SHCXXFLAGS)
-!  
-!  LDFLAGS_RELEASE_static = ${CXXFLAGS_RELEASE_static}
-!  LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} -L$(SYSBASE)/usr/lib
-!  
-!  LDFLAGS_DEBUG_static = ${CXXFLAGS_DEBUG_static}
-!  LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} -L$(SYSBASE)/usr/lib
-!  
-!  LDFLAGS_STLDEBUG_static = ${CXXFLAGS_STLDEBUG_static}
-!  LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} -L$(SYSBASE)/usr/lib
-!  
-!  LDLIBS_RELEASE_dynamic = -lm
-!  LDLIBS_DEBUG_dynamic = -lm
-!  LDLIBS_STLDEBUG_dynamic = -lm
-! 
-!  LDFLAGS_RELEASE_dynamic += -norunpath
-!  LDFLAGS_DEBUG_dynamic += -norunpath
-!  LDFLAGS_STLDEBUG_dynamic += -norunpath
-! 
-!  include common_percent_rules.mak
-!  include common_rules.mak
-!  
-*** misc/STLport-4.0/src/vc6.mak	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/src/vc6.mak	Tue Sep  6 18:38:04 2005
-***************
-*** 8,14 ****
-  LIB_BASENAME=stlport_vc6
-  COMP=VC6
-  
-! EXTRA_COMMON_FLAGS=/D "_MBCS"
-  
-  all: platform all_static all_dynamic 
-  
---- 8,14 ----
-  LIB_BASENAME=stlport_vc6
-  COMP=VC6
-  
-! EXTRA_COMMON_FLAGS=/D "_MBCS" /D "_NTSDK"
-  
-  all: platform all_static all_dynamic 
-  
-*** misc/STLport-4.0/stlport/SC5/config/stl_sunpro.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/SC5/config/stl_sunpro.h	Wed Oct 10 16:11:29 2007
-***************
-*** 42,53 ****
-  
-  #  define __STL_NO_QUALIFIED_FRIENDS 1
-  
-- // <locale> constructor problem
-- #  define __STL_NO_MEMBER_TEMPLATES 1
-- #  define __STL_NO_MEMBER_TEMPLATE_KEYWORD 1
-- #  define __STL_NO_MEMBER_TEMPLATE_CLASSES 1
-- #  define __STL_NO_FRIEND_TEMPLATES 1
-- 
-  // ambiguity problems
-  #  define __STL_NO_CLASS_PARTIAL_SPECIALIZATION 1
-  #  define __STL_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
---- 42,47 ----
-***************
-*** 55,62 ****
-  # endif
-  
-  
-  # if (__SUNPRO_CC < 0x600)
-- #  define __STL_NO_TYPENAME_ON_RETURN_TYPE 1 
-  #  define __STL_HAS_NO_NEW_C_HEADERS 1 
-  #  define __STL_NO_EXPLICIT_FUNCTION_TMPL_ARGS
-  #  define __STL_NON_TYPE_TMPL_PARAM_BUG 1
---- 49,63 ----
-  # endif
-  
-  
-+ # if (__SUNPRO_CC < 0x530)
-+ // <locale> constructor problem
-+ #  define __STL_NO_MEMBER_TEMPLATES 1
-+ #  define __STL_NO_MEMBER_TEMPLATE_KEYWORD 1
-+ #  define __STL_NO_MEMBER_TEMPLATE_CLASSES 1
-+ #  define __STL_NO_FRIEND_TEMPLATES 1
-+ #endif
-+ 
-  # if (__SUNPRO_CC < 0x600)
-  #  define __STL_HAS_NO_NEW_C_HEADERS 1 
-  #  define __STL_NO_EXPLICIT_FUNCTION_TMPL_ARGS
-  #  define __STL_NON_TYPE_TMPL_PARAM_BUG 1
-***************
-*** 63,68 ****
---- 64,73 ----
-  #  define __STL_NONTEMPL_BASE_MATCH_BUG 1
-  # endif
-  
-+ # if (__SUNPRO_CC < 0x510)
-+ #  define __STL_NO_TYPENAME_ON_RETURN_TYPE 1 
-+ # endif
-+ 
-  // Features that depend on compatibility switch
-  # if ( __SUNPRO_CC < 0x500 ) || (defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT < 5))
-  #  define __STL_HAS_NO_NEW_IOSTREAMS 1
-***************
-*** 73,84 ****
-  #  define __STL_NO_BAD_ALLOC 1
-  #  define __STL_NO_EXCEPTION_HEADER 1
-  #  define __STL_NATIVE_C_INCLUDE_PATH ../include
-! # elif (__SUNPRO_CC < 0x600)  
-  #  define __STL_NATIVE_C_HEADER(header) <../CC/##header##.SUNWCCh>
-  #  define __STL_NATIVE_CPP_C_HEADER(header) <../CC/##header##.SUNWCCh>
-  # else
-! #  define __STL_NATIVE_C_INCLUDE_PATH ../CC/std
-! #  define __STL_NATIVE_CPP_C_INCLUDE_PATH ../CC/std
-  # endif
-  
-  #  if ( __SUNPRO_CC < 0x500 )
---- 78,94 ----
-  #  define __STL_NO_BAD_ALLOC 1
-  #  define __STL_NO_EXCEPTION_HEADER 1
-  #  define __STL_NATIVE_C_INCLUDE_PATH ../include
-! # elif (__SUNPRO_CC < 0x520)  
-  #  define __STL_NATIVE_C_HEADER(header) <../CC/##header##.SUNWCCh>
-  #  define __STL_NATIVE_CPP_C_HEADER(header) <../CC/##header##.SUNWCCh>
-  # else
-! #  if defined SYSBASE
-! #   define __STL_NATIVE_C_INCLUDE_PATH SYSBASE/usr/include
-! #   define __STL_NATIVE_CPP_C_INCLUDE_PATH SYSBASE/usr/include
-! #  else
-! #   define __STL_NATIVE_C_INCLUDE_PATH /usr/include
-! #   define __STL_NATIVE_CPP_C_INCLUDE_PATH /usr/include
-! #  endif
-  # endif
-  
-  #  if ( __SUNPRO_CC < 0x500 )
-*** misc/STLport-4.0/stlport/cctype	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cctype	Thu Aug 25 15:54:53 2005
-***************
-*** 48,53 ****
---- 48,56 ----
-  
-  # if ! defined (__STL_NO_CSTD_FUNCTION_IMPORTS)
-  #  if defined ( __STL_IMPORT_VENDOR_CSTD )
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  using __STL_VENDOR_CSTD::isalnum;
-  using __STL_VENDOR_CSTD::isalpha;
-***************
-*** 63,68 ****
---- 66,74 ----
-  using __STL_VENDOR_CSTD::tolower;
-  using __STL_VENDOR_CSTD::toupper;
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #   endif /* __STL_IMPORT_VENDOR_CSTD*/
-  #  endif /* __STL_NO_CSTD_FUNCTION_IMPORTS */
-  
-*** misc/STLport-4.0/stlport/cerrno	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cerrno	Thu Aug 25 15:54:53 2005
-***************
-*** 30,38 ****
---- 30,44 ----
-  #ifndef errno
-  
-  # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  using __STL_VENDOR_CSTD::errno;
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif /* __STL_IMPORT_VENDOR_CSTD */
-  
-  #endif
-*** misc/STLport-4.0/stlport/clocale	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/clocale	Thu Aug 25 15:54:53 2005
-***************
-*** 28,33 ****
---- 28,36 ----
-  # endif
-  
-  # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  using __STL_VENDOR_CSTD::lconv;
-  #  if ! defined (__STL_NO_CSTD_FUNCTION_IMPORTS)
-***************
-*** 35,40 ****
---- 38,46 ----
-  using __STL_VENDOR_CSTD::setlocale;
-  #  endif
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif /* __STL_IMPORT_VENDOR_CSTD */
-  
-  # if (__STL_OUTERMOST_HEADER_ID ==  0x108 )
-*** misc/STLport-4.0/stlport/cmath	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cmath	Thu Aug 25 15:54:53 2005
-***************
-*** 40,45 ****
---- 40,48 ----
-  #  endif
-  
-  #  ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  # if ! defined (__STL_NO_CSTD_FUNCTION_IMPORTS)
-  using __STL_VENDOR_CSTD::acos;
-***************
-*** 66,73 ****
---- 69,82 ----
-  using __STL_VENDOR_CSTD::tanh;
-  # endif /* BUG */
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #  endif /* __STL_IMPORT_VENDOR_CSTD */
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # ifdef __STL_SAME_FUNCTION_NAME_RESOLUTION_BUG
-***************
-*** 135,140 ****
---- 144,152 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if (__STL_OUTERMOST_HEADER_ID ==  0x109 )
-  #  include <stl/_epilog.h>
-*** misc/STLport-4.0/stlport/csetjmp	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/csetjmp	Thu Aug 25 15:54:54 2005
-***************
-*** 31,36 ****
---- 31,39 ----
-  # endif
-  
-  # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  using __STL_VENDOR_CSTD::jmp_buf;
-  # ifndef __STL_NO_CSTD_FUNCTION_IMPORTS
-***************
-*** 40,45 ****
---- 43,51 ----
-  using __STL_VENDOR_CSTD::longjmp;
-  # endif
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __STL_IMPORT_VENDOR_CSTD */
-  
-  # if (__STL_OUTERMOST_HEADER_ID == 0x111 )
-*** misc/STLport-4.0/stlport/csignal	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/csignal	Thu Aug 25 15:54:54 2005
-***************
-*** 28,33 ****
---- 28,36 ----
-  # endif
-  
-  #  ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  # ifndef __STL_NO_CSTD_FUNCTION_IMPORTS
-  using __STL_VENDOR_CSTD::signal;
-***************
-*** 35,40 ****
---- 38,46 ----
-  # endif /* __STL_NO_CSTD_FUNCTION_IMPORTS */
-  using __STL_VENDOR_CSTD::sig_atomic_t;
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #  endif /* __STL_IMPORT_VENDOR_CSTD */
-  
-  # if (__STL_OUTERMOST_HEADER_ID == 0x112 )
-*** misc/STLport-4.0/stlport/cstdarg	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cstdarg	Thu Aug 25 15:54:54 2005
-***************
-*** 28,36 ****
---- 28,42 ----
-  # endif
-  
-  # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  using __STL_VENDOR_CSTD::va_list;
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __STL_IMPORT_VENDOR_CSTD */
-  
-  # if (__STL_OUTERMOST_HEADER_ID == 0x113 )
-*** misc/STLport-4.0/stlport/cstddef	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cstddef	Thu Aug 25 15:54:54 2005
-***************
-*** 30,39 ****
---- 30,45 ----
-  # endif
-  
-  # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE  
-  using __STL_VENDOR_CSTD::ptrdiff_t;
-  using __STL_VENDOR_CSTD::size_t;
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __STL_IMPORT_VENDOR_CSTD */
-  
-  # if (__STL_OUTERMOST_HEADER_ID == 0x114 )
-*** misc/STLport-4.0/stlport/cstdio	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cstdio	Thu Aug 25 15:54:54 2005
-***************
-*** 47,52 ****
---- 47,55 ----
-  #  endif
-  
-  # ifdef __STL_IMPORT_VENDOR_CSTD 
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  using __STL_VENDOR_CSTD::FILE;
-  using __STL_VENDOR_CSTD::fpos_t;
-***************
-*** 108,113 ****
---- 111,119 ----
-  #   endif
-  #  endif /* __STL_NO_CSTD_FUNCTION_IMPORTS */
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif /* __STL_IMPORT_VENDOR_CSTD */
-  
-  # if (__STL_OUTERMOST_HEADER_ID == 15)
-*** misc/STLport-4.0/stlport/cstdlib	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cstdlib	Thu Aug 25 15:54:54 2005
-***************
-*** 42,47 ****
---- 42,50 ----
-  # endif
-  
-  # ifdef __STL_IMPORT_VENDOR_CSTD 
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  using __STL_VENDOR_CSTD::div_t;
-  using __STL_VENDOR_CSTD::ldiv_t;
-***************
-*** 83,88 ****
---- 86,94 ----
-  using __STL_VENDOR_CSTD::srand;
-  #  endif /* __STL_NO_CSTD_FUNCTION_IMPORTS */
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __STL_IMPORT_VENDOR_CSTD */
-  
-  # if (__STL_OUTERMOST_HEADER_ID == 0x116)
-*** misc/STLport-4.0/stlport/cstring	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cstring	Thu Aug 25 15:54:54 2005
-***************
-*** 28,36 ****
---- 28,42 ----
-  # endif
-  
-  # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #  include <using/cstring>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __STL_IMPORT_VENDOR_CSTD */
-  
-  # if (__STL_OUTERMOST_HEADER_ID == 0x117)
-*** misc/STLport-4.0/stlport/ctime	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/ctime	Thu Aug 25 15:54:54 2005
-***************
-*** 28,33 ****
---- 28,36 ----
-  # endif
-  
-  # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  using __STL_VENDOR_CSTD::size_t;
-  using __STL_VENDOR_CSTD::clock_t;
-***************
-*** 45,50 ****
---- 48,56 ----
-  using __STL_VENDOR_CSTD::time;
-  #  endif /* __STL_NO_CSTD_FUNCTION_IMPORTS */
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __STL_IMPORT_VENDOR_CSTD */
-  
-  # if (__STL_OUTERMOST_HEADER_ID == 0x118)
-*** misc/STLport-4.0/stlport/cwchar	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cwchar	Thu Aug 25 15:54:54 2005
-***************
-*** 79,84 ****
---- 79,87 ----
-  
-  # ifdef __STL_USE_OWN_MBSTATE_T
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  struct __stl_mbstate_t { 
-***************
-*** 109,114 ****
---- 112,120 ----
-  typedef __stl_mbstate_t mbstate_t;
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # endif
-  
-***************
-*** 119,124 ****
---- 125,133 ----
-  
-  
-  # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  using __STL_VENDOR_CSTD::wint_t;
-  using __STL_VENDOR_CSTD::size_t;
-***************
-*** 230,235 ****
---- 239,247 ----
-  
-  # endif /* __STL_NO_NATIVE_WIDE_FUNCTIONS */
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif /* __STL_IMPORT_VENDOR_CSTD */
-  
-  # undef __STL_WCHAR_SUNPRO_EXCLUDE
-*** misc/STLport-4.0/stlport/cwctype	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cwctype	Thu Aug 25 15:54:54 2005
-***************
-*** 39,44 ****
---- 39,47 ----
-  # endif
-  
-  # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  using __STL_VENDOR_CSTD::wctype_t;
-  using __STL_VENDOR_CSTD::wint_t;
-***************
-*** 67,72 ****
---- 70,78 ----
-  using __STL_VENDOR_CSTD::towupper;
-  #  endif /* __STL_NO_CSTD_FUNCTION_IMPORTS */
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __STL_IMPORT_VENDOR_CSTD */
-  
-  # if (__STL_OUTERMOST_HEADER_ID == 0x121)
-*** misc/STLport-4.0/stlport/exception	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/exception	Thu Aug 25 15:54:54 2005
-***************
-*** 60,65 ****
---- 60,68 ----
-  
-  #  ifdef __STL_USE_OWN_NAMESPACE
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  using __STL_VENDOR_EXCEPT_STD::exception;
-***************
-*** 90,95 ****
---- 93,101 ----
-  #  endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #  endif /* __STL_OWN_NAMESPACE */
-  
-***************
-*** 98,103 ****
---- 104,112 ----
-  # ifndef __SGI_STL_EXCEPTION_H
-  #  define __SGI_STL_EXCEPTION_H
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // section 18.6
-***************
-*** 140,152 ****
---- 149,170 ----
-  # define __STL_EXCEPTION_BASE exception
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __STL_NO_EXCEPTION_HEADER */
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  // forward declaration
-  class __Named_exception;
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __SGI_STL_EXCEPTION_H */
-  
-  # if (__STL_OUTERMOST_HEADER_ID == 0x423)
-*** misc/STLport-4.0/stlport/iomanip	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/iomanip	Thu Aug 25 15:54:54 2005
-***************
-*** 32,37 ****
---- 32,40 ----
-  
-  #  include <istream>              // Includes <ostream> and <ios>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //----------------------------------------------------------------------
-***************
-*** 177,182 ****
---- 180,188 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # elif !defined (__STL_USE_NO_IOSTREAMS)
-  #  include <wrap_std/iomanip>
-*** misc/STLport-4.0/stlport/iomanip.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/iomanip.h	Thu Aug 25 15:54:54 2005
-***************
-*** 43,51 ****
---- 43,57 ----
-  # include __STL_NATIVE_OLD_STREAMS_HEADER(iomanip.h)
-  
-  # if defined  (__STL_USE_NAMESPACES) && ! defined (__STL_BROKEN_USING_DIRECTIVE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  # include <using/h/iomanip.h>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #  endif /* __STL_USE_NAMESPACES */
-  
-  # endif
-*** misc/STLport-4.0/stlport/ios.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/ios.h	Thu Aug 25 15:54:54 2005
-***************
-*** 33,41 ****
---- 33,47 ----
-  
-  # include __STL_NATIVE_OLD_STREAMS_HEADER(ios.h)
-  # if defined (__STL_USE_NAMESPACES) && !defined (__STL_BROKEN_USING_DIRECTIVE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  using __STL_OLD_IO_NAMESPACE::ios;
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif /* __STL_USE_OWN_NAMESPACE */
-  
-  # endif
-*** misc/STLport-4.0/stlport/iosfwd	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/iosfwd	Thu Aug 25 15:54:54 2005
-***************
-*** 38,46 ****
---- 38,52 ----
-  
-  # else
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  template <class _Tp> class allocator;
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #  include <wrap_std/iosfwd>
-  
-*** misc/STLport-4.0/stlport/iostream	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/iostream	Thu Aug 25 15:54:54 2005
-***************
-*** 34,39 ****
---- 34,42 ----
-  #include <istream>
-  #include <ostream>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // Note: cin and wcin are both associated with stdio.  The C standard
-***************
-*** 62,67 ****
---- 65,73 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # elif defined ( __STL_USE_NO_IOSTREAMS )
-  #  include <stl/_null_stream.h>
-*** misc/STLport-4.0/stlport/istream.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/istream.h	Thu Aug 25 15:54:54 2005
-***************
-*** 46,54 ****
---- 46,60 ----
-  # include __STL_NATIVE_OLD_STREAMS_HEADER(istream.h)
-  
-  # if defined (__STL_USE_NAMESPACES) && !defined (__STL_BROKEN_USING_DIRECTIVE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  using __STL_OLD_IO_NAMESPACE::istream;
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif /* __STL_USE_OWN_NAMESPACE */
-  
-  # endif /* __SGI_STL_OWN_IOSTREAMS */
-*** misc/STLport-4.0/stlport/locale	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/locale	Thu Aug 25 15:54:54 2005
-***************
-*** 59,64 ****
---- 59,67 ----
-  #undef toupper
-  #undef tolower
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _CharT> 
-***************
-*** 133,138 ****
---- 136,144 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # elif !defined (__STL_USE_NO_IOSTREAMS)
-  #  include <wrap_std/locale> 
-*** misc/STLport-4.0/stlport/math.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/math.h	Thu Aug 25 15:55:17 2005
-***************
-*** 24,30 ****
---- 24,36 ----
-  #  define exception __math_exception
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  # include __STL_NATIVE_C_HEADER(math.h)
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if defined (__STL_HAS_NO_NAMESPACES)
-  #  undef exception
-*** misc/STLport-4.0/stlport/memory	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/memory	Thu Aug 25 15:54:55 2005
-***************
-*** 51,56 ****
---- 51,59 ----
-  
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  // implementation primitive
-  class __ptr_base {
-***************
-*** 188,193 ****
---- 191,199 ----
-  	
-  };
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if (__STL_OUTERMOST_HEADER_ID == 0x46)
-  #  include <stl/_epilog.h>
-*** misc/STLport-4.0/stlport/memory.new	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/memory.new	Thu Aug 25 15:54:55 2005
-***************
-*** 58,63 ****
---- 58,66 ----
-  
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // implementation primitive
-***************
-*** 223,228 ****
---- 226,234 ----
-  };
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_MEMORY */
-  
-*** misc/STLport-4.0/stlport/new	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/new	Thu Aug 25 15:54:55 2005
-***************
-*** 58,63 ****
---- 58,66 ----
-  
-  # ifndef __STL_NO_BAD_ALLOC
-  #  ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-      __STL_BEGIN_NAMESPACE
-      using __STL_VENDOR_EXCEPT_STD::bad_alloc;
-      using __STL_VENDOR_EXCEPT_STD::nothrow_t;
-***************
-*** 72,77 ****
---- 75,83 ----
-  #  endif
-      
-      __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #  endif /* __STL_OWN_NAMESPACE */
-  # else /* __STL_NO_BAD_ALLOC */
-***************
-*** 78,83 ****
---- 84,92 ----
-  
-  #  include <exception>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  class nothrow_t {};
-***************
-*** 98,106 ****
---- 107,121 ----
-  };
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __STL_NO_BAD_ALLOC */
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  inline void*  __STL_CALL __stl_new(size_t __n) {
-  #if (( defined(__IBMCPP__)|| defined(__OS400__) || defined (__xlC__) || defined (qTidyHeap)) && defined(__DEBUG_ALLOC__) )
-***************
-*** 118,123 ****
---- 133,141 ----
-  #endif
-  }
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* WINCE */
-  
-*** misc/STLport-4.0/stlport/ostream.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/ostream.h	Thu Aug 25 15:54:56 2005
-***************
-*** 33,41 ****
---- 33,47 ----
-  
-  #  include __STL_NATIVE_OLD_STREAMS_HEADER(ostream.h)
-  #  if defined (__STL_USE_NAMESPACES) && !defined (__STL_BROKEN_USING_DIRECTIVE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #   include <using/h/ostream.h>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #  endif /* __STL_USE_NAMESPACES */
-  
-  # endif /* __STL_USE_NO_IOSTREAMS */
-*** misc/STLport-4.0/stlport/pthread_alloc	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/pthread_alloc	Thu Aug 25 15:54:56 2005
-***************
-*** 51,56 ****
---- 51,59 ----
-  #  define __RESTRICT
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  #define __STL_DATA_ALIGNMENT 8
-***************
-*** 516,521 ****
---- 519,527 ----
-  #endif /* __STL_MEMBER_TEMPLATE_CLASSES */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if (__STL_OUTERMOST_HEADER_ID == 0x52)
-  #  include <stl/_epilog.h>
-*** misc/STLport-4.0/stlport/stdexcept	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stdexcept	Thu Aug 25 15:54:56 2005
-***************
-*** 45,50 ****
---- 45,53 ----
-  # include <stl/_string_fwd.h>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  class __STL_CLASS_DECLSPEC __Named_exception : public __STL_EXCEPTION_BASE {
-***************
-*** 106,111 ****
---- 109,117 ----
-  };
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* Not o32, and no exceptions */
-  # endif /* __STL_STDEXCEPT_SEEN */
-*** misc/STLport-4.0/stlport/typeinfo	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/typeinfo	Thu Aug 25 15:55:00 2005
-***************
-*** 35,40 ****
---- 35,43 ----
-  
-  # if defined  (__STL_USE_NAMESPACES) \
-     && ( defined (__STL_VENDOR_GLOBAL_EXCEPT_STD) || defined (__STL_USE_OWN_NAMESPACE) || defined (__STL_DEBUG))
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // VC++ 6 has only this guy in ::
-***************
-*** 48,61 ****
---- 51,73 ----
-  
-  using __STL_VENDOR_EXCEPT_STD::bad_cast;
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __STL_OWN_NAMESPACE */
-  
-  #else
-  
-  # include <exception>
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  struct bad_cast : exception {};
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif  /* NO_TYPEINFO */
-  
-  # if (__STL_OUTERMOST_HEADER_ID == 0x473)
-*** misc/STLport-4.0/stlport/typeinfo.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/typeinfo.h	Thu Aug 25 15:55:00 2005
-***************
-*** 31,36 ****
---- 31,39 ----
-  
-  # if defined  (__STL_USE_OWN_NAMESPACE)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  using /* __STL_VENDOR_EXCEPT_STD */ ::type_info;
-***************
-*** 38,43 ****
---- 41,49 ----
-  using /* __STL_VENDOR_EXCEPT_STD */ ::bad_cast;
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __STL_OWN_NAMESPACE */
-  
-*** misc/STLport-4.0/stlport/old_hp/alloc.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/old_hp/alloc.h	Thu Aug 25 15:54:55 2005
-***************
-*** 49,54 ****
---- 49,57 ----
-  #endif
-  
-  // Old SGI names
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  typedef __sgi_alloc alloc;
-***************
-*** 62,67 ****
---- 65,73 ----
-  typedef __multithreaded_alloc  multithreaded_alloc; 
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #ifdef __STL_USE_NAMESPACES
-  # ifdef __STL_BROKEN_USING_DIRECTIVE
-*** misc/STLport-4.0/stlport/old_hp/iterator.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/old_hp/iterator.h	Thu Aug 25 15:54:55 2005
-***************
-*** 82,87 ****
---- 82,90 ----
-  
-  # if 0 // defined (__STL_USE_OWN_NAMESPACE) && defined (__STL_IMPORT_VENDOR_STD) && !defined (__STL_BROKEN_USING_DIRECTIVE)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  using __STL_VENDOR_STD::istream_iterator;
-***************
-*** 88,93 ****
---- 91,99 ----
-  using __STL_VENDOR_STD::ostream_iterator;
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # endif
-  
-*** misc/STLport-4.0/stlport/stl/_algo.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_algo.c	Thu Aug 25 15:54:57 2005
-***************
-*** 26,31 ****
---- 26,34 ----
-  #ifndef __STL_ALGO_C
-  # define __STL_ALGO_C
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _BidirectionalIter, class _Distance>
-***************
-*** 2663,2668 ****
---- 2666,2674 ----
-  # endif /* __STL_NO_EXTENSIONS */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef __stl_threshold
-  
-*** misc/STLport-4.0/stlport/stl/_algo.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_algo.h	Thu Aug 25 15:54:57 2005
-***************
-*** 51,56 ****
---- 51,59 ----
-  #  include <cstdio>
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // for_each.  Apply a function to every element of a range.
-***************
-*** 1039,1044 ****
---- 1042,1050 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_algo.c>
-*** misc/STLport-4.0/stlport/stl/_algobase.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_algobase.c	Thu Aug 25 15:54:57 2005
-***************
-*** 25,30 ****
---- 25,33 ----
-  #ifndef __SGI_STL_ALGOBASE_C
-  #define __SGI_STL_ALGOBASE_C
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _InputIter1, class _InputIter2>
-***************
-*** 89,94 ****
---- 92,100 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_ALGOBASE_C */
-  
-*** misc/STLport-4.0/stlport/stl/_algobase.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_algobase.h	Thu Aug 25 15:54:57 2005
-***************
-*** 67,72 ****
---- 67,75 ----
-  # include <stl/_iterator_base.h>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  // swap and iter_swap
-  template <class _Tp>
-***************
-*** 679,684 ****
---- 682,690 ----
-                                   _InputIter2 __first2, _InputIter2 __last2);
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_algobase.c>
-*** misc/STLport-4.0/stlport/stl/_alloc.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_alloc.c	Thu Aug 25 15:54:57 2005
-***************
-*** 40,45 ****
---- 40,48 ----
-  
-  #define _S_FREELIST_INDEX(__bytes) ((__bytes-size_t(1))>>(int)_ALIGN_SHIFT)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <int __inst>
-***************
-*** 355,360 ****
---- 358,366 ----
-  #  endif /* __STL_STATIC_TEMPLATE_DATA */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef _S_FREELIST_INDEX
-  
-*** misc/STLport-4.0/stlport/stl/_alloc.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_alloc.h	Thu Aug 25 15:54:57 2005
-***************
-*** 115,120 ****
---- 115,123 ----
-  // conformance.
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Tp, class _Alloc>
-***************
-*** 893,898 ****
---- 896,904 ----
-  # endif /* __STL_USE_TEMPLATE_EXPORT */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_alloc.c>
-*** misc/STLport-4.0/stlport/stl/_bitset.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_bitset.c	Thu Aug 25 15:54:57 2005
-***************
-*** 26,31 ****
---- 26,34 ----
-  #  define bitset __bitset
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //
-***************
-*** 396,401 ****
---- 399,407 ----
-  }; // end _First_one
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #  undef __BITS_PER_WORD
-  #  undef __BITSET_WORDS
-*** misc/STLport-4.0/stlport/stl/_bitset.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_bitset.h	Thu Aug 25 15:54:57 2005
-***************
-*** 67,72 ****
---- 67,75 ----
-  #define __BITS_PER_WORD (CHAR_BIT*sizeof(unsigned long))
-  #define __BITSET_WORDS(__n) ((__n) < 1 ? 1 : ((__n) + __BITS_PER_WORD - 1)/__BITS_PER_WORD)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // structure to aid in counting bits
-***************
-*** 753,758 ****
---- 756,764 ----
-  #  undef  bitset
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #  undef __BITS_PER_WORD
-  #  undef __BITSET_WORDS
-*** misc/STLport-4.0/stlport/stl/_bvector.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_bvector.h	Thu Aug 25 15:54:57 2005
-***************
-*** 44,49 ****
---- 44,52 ----
-  # include <stl/_range_errors.h>
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE 
-  
-  struct _Bit_reference {
-***************
-*** 72,77 ****
---- 75,83 ----
-  };
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if defined (__SGI_STL_NO_ARROW_OPERATOR) && ! defined (__STL_NO_PROXY_ARROW_OPERATOR)
-  
-***************
-*** 87,92 ****
---- 93,101 ----
-  
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  inline void swap(_Bit_reference __x, _Bit_reference __y)
-***************
-*** 827,832 ****
---- 836,844 ----
-  #endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #undef _Alloc
-  #undef __SGI_STL_VECBOOL_TEMPLATE
-*** misc/STLport-4.0/stlport/stl/_codecvt.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_codecvt.h	Thu Aug 25 15:54:57 2005
-***************
-*** 26,31 ****
---- 26,34 ----
-  #include <stl/c_locale.h>
-  #include <stl/_locale.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  class __STL_CLASS_DECLSPEC codecvt_base {
-***************
-*** 295,300 ****
---- 298,306 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_CODECVT_H */
-  
-*** misc/STLport-4.0/stlport/stl/_collate.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_collate.h	Thu Aug 25 15:54:57 2005
-***************
-*** 26,31 ****
---- 26,34 ----
-  #include <stl/_string_fwd.h>
-  #include <stl/_locale.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  
-***************
-*** 154,159 ****
---- 157,165 ----
-  
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_COLLATE_H */
-  
-*** misc/STLport-4.0/stlport/stl/_complex.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_complex.c	Thu Aug 25 15:54:57 2005
-***************
-*** 18,23 ****
---- 18,26 ----
-  #ifndef __STL_COMPLEX_C
-  #define __STL_COMPLEX_C
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // Non-inline member functions.
-***************
-*** 154,158 ****
---- 157,164 ----
-  #endif /* __STL_USE_NEW_IOSTREAMS */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __STL_COMPLEX_C */
-*** misc/STLport-4.0/stlport/stl/_complex.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_complex.h	Thu Aug 25 15:54:57 2005
-***************
-*** 52,57 ****
---- 52,60 ----
-  #include <istream>
-  #include <sstream>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  #if !defined(__STL_NO_COMPLEX_SPECIALIZATIONS)		//*TY 02/25/2000 - added for MPW compiler workaround
-***************
-*** 656,661 ****
---- 659,667 ----
-  # endif /* SPECIALIZATIONS */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  
-  #if defined (__sgi) && !defined(__GNUC__)
-***************
-*** 721,726 ****
---- 727,735 ----
-  # define __STL_HYPOT    __STL_DO_HYPOT(double)
-  
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // Unary non-member arithmetic operators.
-***************
-*** 1051,1056 ****
---- 1060,1068 ----
-  __STL_DECLSPEC complex<long double> __STL_CALL tanh(const complex<long double>&);
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  
-  # ifndef __STL_LINK_TIME_INSTANTIATION
-*** misc/STLport-4.0/stlport/stl/_config.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_config.h	Thu Aug 25 15:55:22 2005
-***************
-*** 540,547 ****
---- 540,553 ----
-  
-  #  define  __STL_USING_NAMESPACE(x) using namespace x ;
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  namespace std { }
-  namespace __std_alias = std;
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  /* assume std:: namespace for C++ std library if not being told otherwise */
-  #  ifdef __STL_VENDOR_GLOBAL_STD
-*** misc/STLport-4.0/stlport/stl/_construct.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_construct.h	Thu Aug 25 15:54:57 2005
-***************
-*** 46,51 ****
---- 46,54 ----
-  # include <stl/_iterator_base.h>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # ifdef __STL_TRIVIAL_DESTRUCTOR_BUG
-***************
-*** 159,164 ****
---- 162,170 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_CONSTRUCT_H */
-  
-*** misc/STLport-4.0/stlport/stl/_ctraits_fns.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ctraits_fns.h	Thu Aug 25 15:54:57 2005
-***************
-*** 25,30 ****
---- 25,33 ----
-  // This file contains a few small adapters that allow a character
-  // traits class to be used as a function object.
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Traits>
-***************
-*** 61,66 ****
---- 64,72 ----
-  };
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_CTRAITS_FUNCTIONS_H */
-  
-*** misc/STLport-4.0/stlport/stl/_ctype.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ctype.h	Thu Aug 25 15:54:57 2005
-***************
-*** 28,33 ****
---- 28,36 ----
-  #  include <stl/_algobase.h>
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  class __STL_CLASS_DECLSPEC ctype_base {
-***************
-*** 264,269 ****
---- 267,275 ----
-  
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_CTYPE_H */
-  
-*** misc/STLport-4.0/stlport/stl/_deque.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_deque.c	Thu Aug 25 15:54:57 2005
-***************
-*** 26,31 ****
---- 26,34 ----
-  #ifndef __STL_DEQUE_C
-  #define __STL_DEQUE_C
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // Non-inline member functions from _Deque_base.
-***************
-*** 778,783 ****
---- 781,789 ----
-  # endif /* __STL_MEMBER_TEMPLATES */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef __iterator__
-  # undef iterator
-*** misc/STLport-4.0/stlport/stl/_deque.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_deque.h	Thu Aug 25 15:54:57 2005
-***************
-*** 96,101 ****
---- 96,104 ----
-  # undef deque
-  # define deque __WORKAROUND_DBG_RENAME(deque)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # if defined ( __STL_USE_ABBREVS )
-***************
-*** 1058,1063 ****
---- 1061,1069 ----
-  # endif
-  
-  __STL_END_NAMESPACE 
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  // do a cleanup
-  # undef deque
-*** misc/STLport-4.0/stlport/stl/_fstream.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_fstream.c	Thu Aug 25 15:54:57 2005
-***************
-*** 20,25 ****
---- 20,28 ----
-  
-  # if defined (__STL_DESIGNATED_DLL) || ! defined (__STL_NO_CUSTOM_IO)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # if defined ( __STL_NESTED_TYPE_PARAM_BUG )
-***************
-*** 732,737 ****
---- 735,743 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef __BF_int_type__
-  # undef __BF_pos_type__
-*** misc/STLport-4.0/stlport/stl/_fstream.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_fstream.h	Thu Aug 25 15:54:57 2005
-***************
-*** 61,66 ****
---- 61,69 ----
-  #endif
-  
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //----------------------------------------------------------------------
-***************
-*** 644,654 ****
---- 647,663 ----
-  };
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_fstream.c>
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # if defined (__STL_USE_TEMPLATE_EXPORT)
-***************
-*** 663,668 ****
---- 672,680 ----
-  # endif /* __STL_USE_TEMPLATE_EXPORT */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_FSTREAM */
-  
-*** misc/STLport-4.0/stlport/stl/_function.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_function.h	Thu Aug 25 15:54:57 2005
-***************
-*** 30,35 ****
---- 30,38 ----
-  #ifndef __SGI_STL_INTERNAL_FUNCTION_H
-  #define __SGI_STL_INTERNAL_FUNCTION_H
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Arg, class _Result>
-***************
-*** 805,810 ****
---- 808,816 ----
-  # endif /* __STL_MEMBER_POINTER_PARAM_BUG */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_FUNCTION_H */
-  
-*** misc/STLport-4.0/stlport/stl/_hash_fun.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_hash_fun.h	Thu Aug 25 15:54:58 2005
-***************
-*** 35,40 ****
---- 35,43 ----
-  #  include <cstddef>
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Key> struct hash { };
-***************
-*** 99,104 ****
---- 102,110 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_HASH_FUN_H */
-  
-*** misc/STLport-4.0/stlport/stl/_hash_map.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_hash_map.h	Thu Aug 25 15:54:58 2005
-***************
-*** 30,35 ****
---- 30,38 ----
-  #ifndef __SGI_STL_INTERNAL_HASH_MAP_H
-  #define __SGI_STL_INTERNAL_HASH_MAP_H
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # define  hash_map      __WORKAROUND_RENAME(hash_map)
-***************
-*** 489,494 ****
---- 492,500 ----
-  
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if defined (__STL_USE_WRAPPER_FOR_ALLOC_PARAM) 
-  #  include <stl/wrappers/_hash_map.h>
-*** misc/STLport-4.0/stlport/stl/_hash_set.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_hash_set.h	Thu Aug 25 15:54:58 2005
-***************
-*** 33,38 ****
---- 33,41 ----
-  # define  hash_set      __WORKAROUND_RENAME(hash_set)
-  # define  hash_multiset __WORKAROUND_RENAME(hash_multiset)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Value, __DFL_TMPL_PARAM(_HashFcn,hash<_Value>),
-***************
-*** 468,473 ****
---- 471,479 ----
-  
-  #endif /* __STL_CLASS_PARTIAL_SPECIALIZATION */
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  // do a cleanup
-  #  undef hash_set
-*** misc/STLport-4.0/stlport/stl/_hashtable.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_hashtable.c	Thu Aug 25 15:54:58 2005
-***************
-*** 30,35 ****
---- 30,38 ----
-  #  define hashtable __WORKAROUND_DBG_RENAME(hashtable)
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # define __PRIME_LIST_BODY { \
-***************
-*** 441,446 ****
---- 444,452 ----
-  # undef hashtable
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /*  __STL_HASHTABLE_C */
-  
-*** misc/STLport-4.0/stlport/stl/_hashtable.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_hashtable.h	Thu Aug 25 15:54:58 2005
-***************
-*** 57,62 ****
---- 57,65 ----
-  #  define hashtable __WORKAROUND_DBG_RENAME(hashtable)
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # if defined ( __STL_USE_ABBREVS )
-***************
-*** 606,611 ****
---- 609,617 ----
-  #endif /* __STL_USE_SEPARATE_RELOPS_NAMESPACE */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef __stl_prime_list
-  # undef hashtable
-*** misc/STLport-4.0/stlport/stl/_heap.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_heap.c	Thu Aug 25 15:54:58 2005
-***************
-*** 30,35 ****
---- 30,38 ----
-  # include <stl/_iterator_base.h>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _RandomAccessIterator, class _Distance, class _Tp>
-***************
-*** 234,239 ****
---- 237,245 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /*  __STL_HEAP_C */
-  
-*** misc/STLport-4.0/stlport/stl/_heap.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_heap.h	Thu Aug 25 15:54:58 2005
-***************
-*** 34,39 ****
---- 34,42 ----
-  #include <stl/_config.h>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // Heap-manipulation functions: push_heap, pop_heap, make_heap, sort_heap.
-***************
-*** 117,122 ****
---- 120,128 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_heap.c>
-*** misc/STLport-4.0/stlport/stl/_ios.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ios.c	Thu Aug 25 15:54:58 2005
-***************
-*** 20,25 ****
---- 20,28 ----
-  
-  # include <stl/_streambuf.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // basic_ios<>'s non-inline member functions
-***************
-*** 107,111 ****
---- 110,117 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __STL_IOS_C */
-*** misc/STLport-4.0/stlport/stl/_ios.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ios.h	Thu Aug 25 15:54:58 2005
-***************
-*** 26,31 ****
---- 26,34 ----
-  #include <stl/_locale.h>
-  #include <stl/_ctype.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // ----------------------------------------------------------------------
-***************
-*** 171,176 ****
---- 174,182 ----
-  
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_ios.c>
-*** misc/STLport-4.0/stlport/stl/_ios_base.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ios_base.h	Thu Aug 25 15:54:58 2005
-***************
-*** 24,29 ****
---- 24,32 ----
-  #include <iosfwd>
-  #include <stl/_locale.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // ----------------------------------------------------------------------
-***************
-*** 365,370 ****
---- 368,376 ----
-    { __s.setf(ios_base::scientific, ios_base::floatfield); return __s; }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_IOS_BASE */
-  
-*** misc/STLport-4.0/stlport/stl/_iosfwd.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_iosfwd.h	Thu Aug 25 15:54:58 2005
-***************
-*** 28,33 ****
---- 28,36 ----
-  #endif /* __unix */
-  
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Tp> class allocator;
-***************
-*** 110,118 ****
---- 113,127 ----
-  typedef fpos<mbstate_t> wstreampos;
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #include <stl/char_traits.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  class __STL_CLASS_DECLSPEC ios_base;
-***************
-*** 245,250 ****
---- 254,262 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif
-  
-*** misc/STLport-4.0/stlport/stl/_istream.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_istream.c	Thu Aug 25 15:54:58 2005
-***************
-*** 32,37 ****
---- 32,40 ----
-  # define __BIS_off_type__ __STL_TYPENAME_ON_RETURN_TYPE basic_istream<_CharT, _Traits>::off_type
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  
-***************
-*** 1269,1274 ****
---- 1272,1280 ----
-  {}
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef __BIS_int_type__
-  # undef __BIS_pos_type__
-*** misc/STLport-4.0/stlport/stl/_istream.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_istream.h	Thu Aug 25 15:54:58 2005
-***************
-*** 27,32 ****
---- 27,35 ----
-  #include <stl/_ctraits_fns.h>    // Helper functions that allow char traits
-                                  // to be used as function objects.
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _CharT, class _Traits, class _Number> 
-***************
-*** 470,475 ****
---- 473,481 ----
-  # endif /* __STL_USE_TEMPLATE_EXPORT */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_istream.c>
-*** misc/STLport-4.0/stlport/stl/_iterator.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_iterator.h	Thu Aug 25 15:54:58 2005
-***************
-*** 34,39 ****
---- 34,42 ----
-  # include <stl/_iterator_base.h>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # if defined (__STL_NO_CLASS_PARTIAL_SPECIALIZATION) || ! defined (__STL_NO_ANACHRONISMS)
-***************
-*** 574,579 ****
---- 577,585 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_ITERATOR_H */
-  
-*** misc/STLport-4.0/stlport/stl/_iterator_base.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_iterator_base.h	Thu Aug 25 15:54:58 2005
-***************
-*** 57,62 ****
---- 57,65 ----
-  #  define _Nonconst_traits _N_Tr
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  struct input_iterator_tag {};
-***************
-*** 143,149 ****
---- 146,158 ----
-  #  define __STL_POINTERS_SPECIALIZE( _TpP )
-  # else 
-     __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #  include <stl/_ptrs_specialize.h>
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-     __STL_BEGIN_NAMESPACE
-  # endif
-  
-***************
-*** 421,426 ****
---- 430,438 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if defined (__STL_DEBUG) && ! defined (__STLPORT_DEBUG_H)
-  #  include <stl/debug/_debug.h>
-*** misc/STLport-4.0/stlport/stl/_limits.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_limits.c	Thu Aug 25 15:54:58 2005
-***************
-*** 24,29 ****
---- 24,32 ----
-  //  numeric_limits static members
-  //==========================================================
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # ifdef __STL_NO_STATIC_TEMPLATE_DATA
-***************
-*** 362,366 ****
---- 365,372 ----
-  # undef __STL_LDOUBLE_SNAN_REP
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __STLPORT_LIMITS_C_INCLUDED */
-*** misc/STLport-4.0/stlport/stl/_limits.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_limits.h	Thu Aug 25 15:54:58 2005
-***************
-*** 26,31 ****
---- 26,34 ----
-  
-  #define __SGI_CPP_LIMITS
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  enum float_round_style {
-***************
-*** 379,384 ****
---- 382,390 ----
-  // We write special values (Inf and NaN) as bit patterns and 
-  // cast the the appropriate floating-point types. 
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_limits.c>
-*** misc/STLport-4.0/stlport/stl/_list.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_list.c	Thu Aug 25 15:54:58 2005
-***************
-*** 34,39 ****
---- 34,42 ----
-  # undef list
-  # define  list  __WORKAROUND_DBG_RENAME(list)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Dummy>
-***************
-*** 334,339 ****
---- 337,345 ----
-  # undef __iterator__
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /*  __STL_LIST_C */
-  
-*** misc/STLport-4.0/stlport/stl/_list.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_list.h	Thu Aug 25 15:54:58 2005
-***************
-*** 46,51 ****
---- 46,54 ----
-  #  include <stl/_construct.h>
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # undef list
-***************
-*** 268,274 ****
-  
-    reference front() { return *begin(); }
-    const_reference front() const { return *begin(); }
-!   reference back() { return *(--end()); }
-    const_reference back() const { return *(--end()); }
-  
-    void swap(list<_Tp, _Alloc>& __x) {
---- 271,277 ----
-  
-    reference front() { return *begin(); }
-    const_reference front() const { return *begin(); }
-!   reference back() { iterator i(end()); --i; return *i; }
-    const_reference back() const { return *(--end()); }
-  
-    void swap(list<_Tp, _Alloc>& __x) {
-***************
-*** 588,593 ****
---- 591,599 ----
-  #endif /* __STL_USE_SEPARATE_RELOPS_NAMESPACE */
-  
-  __STL_END_NAMESPACE 
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_list.c>
-*** misc/STLport-4.0/stlport/stl/_locale.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_locale.c	Thu Aug 25 15:54:58 2005
-***************
-*** 23,28 ****
---- 23,31 ----
-  #include <stl/_string.h>
-  #include <stl/_collate.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //----------------------------------------------------------------------
-***************
-*** 66,70 ****
---- 69,76 ----
-  # endif /* MEMBER_TEMPLATES */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif
-*** misc/STLport-4.0/stlport/stl/_locale.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_locale.h	Thu Aug 25 15:54:58 2005
-***************
-*** 28,33 ****
---- 28,36 ----
-  #include <stl/_threads.h>
-  #include <stl/_string_fwd.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  class __STL_CLASS_DECLSPEC _Locale_impl;             // Forward declaration of opaque type.
-***************
-*** 212,217 ****
---- 215,223 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # ifndef __STL_LINK_TIME_INSTANTIATION
-  #  include <stl/_locale.c>
-*** misc/STLport-4.0/stlport/stl/_map.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_map.h	Thu Aug 25 15:54:58 2005
-***************
-*** 33,38 ****
---- 33,41 ----
-  #define map __WORKAROUND_RENAME(map)
-  #define multimap __WORKAROUND_RENAME(multimap)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Key, class _Tp, __DFL_TMPL_PARAM(_Compare, less<_Key> ), 
-***************
-*** 384,389 ****
---- 387,395 ----
-  # undef  __STL_TEMPLATE_HEADER
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  // do a cleanup
-  #  undef map
-*** misc/STLport-4.0/stlport/stl/_messages_facets.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_messages_facets.h	Thu Aug 25 15:54:58 2005
-***************
-*** 24,29 ****
---- 24,32 ----
-  #ifndef __SGI_STL_INTERNAL_MESSAGES_H
-  #define __SGI_STL_INTERNAL_MESSAGES_H
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // Forward declaration of an opaque type.
-***************
-*** 150,155 ****
---- 153,161 ----
-  # endif /* WCHAR_T */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_MESSAGES_H */
-  
-*** misc/STLport-4.0/stlport/stl/_monetary.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_monetary.c	Thu Aug 25 15:54:58 2005
-***************
-*** 18,23 ****
---- 18,26 ----
-  #ifndef __STL_MONETARY_C
-  #define __STL_MONETARY_C
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _CharT, class _InputIterator>
-***************
-*** 557,561 ****
---- 560,567 ----
-  # endif /* defined (__STL_NO_CUSTOM_IO) && ! defined (__STL_DESIGNATED_DLL) */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __STL_MONETARY_C */
-*** misc/STLport-4.0/stlport/stl/_monetary.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_monetary.h	Thu Aug 25 15:54:58 2005
-***************
-*** 25,30 ****
---- 25,33 ----
-  
-  # include <stl/_numeric_facets.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  class money_base {
-***************
-*** 441,446 ****
---- 444,452 ----
-  };
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_monetary.c>
-*** misc/STLport-4.0/stlport/stl/_null_stream.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_null_stream.h	Thu Aug 25 15:54:58 2005
-***************
-*** 16,21 ****
---- 16,24 ----
-  #ifndef __STL_NULL_STREAM_H
-  # define __STL_NULL_STREAM_H
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  struct __null_stream 
-***************
-*** 38,42 ****
---- 41,48 ----
-  extern __null_stream cin, cout, cerr, endl, ws, hex, dec;
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # endif
-*** misc/STLport-4.0/stlport/stl/_numeric.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_numeric.c	Thu Aug 25 15:54:58 2005
-***************
-*** 34,39 ****
---- 34,42 ----
-  # include <stl/_iterator_base.h>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _InputIterator, class _OutputIterator, class _Tp>
-***************
-*** 181,186 ****
---- 184,192 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /*  __STL_NUMERIC_C */
-  
-*** misc/STLport-4.0/stlport/stl/_numeric.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_numeric.h	Thu Aug 25 15:54:58 2005
-***************
-*** 36,41 ****
---- 36,44 ----
-  #  include <stl/debug/_debug.h>
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _InputIterator, class _Tp>
-***************
-*** 141,146 ****
---- 144,152 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_numeric.c>
-*** misc/STLport-4.0/stlport/stl/_numeric_facets.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_numeric_facets.c	Thu Aug 25 15:54:58 2005
-***************
-*** 21,26 ****
---- 21,29 ----
-  #include  <stl/_pair.h>
-  # include <stl/_stream_iterator.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  
-***************
-*** 1083,1088 ****
---- 1086,1094 ----
-  # endif /* __STL_NO_CUSTOM_IO */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  
-  #endif /* __STL_NUMERIC_FACETS_C */
-*** misc/STLport-4.0/stlport/stl/_numeric_facets.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_numeric_facets.h	Thu Aug 25 15:54:58 2005
-***************
-*** 27,32 ****
---- 27,35 ----
-  # include <stl/_locale.h>
-  # include <stl/_string.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //----------------------------------------------------------------------
-***************
-*** 524,529 ****
---- 527,535 ----
-  # endif /* CUSTOM_IO */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # ifndef __STL_LINK_TIME_INSTANTIATION
-  #  include <stl/_numeric_facets.c>
-*** misc/STLport-4.0/stlport/stl/_ostream.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ostream.c	Thu Aug 25 15:54:58 2005
-***************
-*** 20,25 ****
---- 20,28 ----
-  
-  #include <stl/_numeric_facets.h> // For num_put<>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //----------------------------------------------------------------------
-***************
-*** 346,351 ****
---- 349,357 ----
-  
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  
-  #endif /* __STL_OSTREAM_C */
-*** misc/STLport-4.0/stlport/stl/_ostream.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ostream.h	Thu Aug 25 15:54:58 2005
-***************
-*** 24,29 ****
---- 24,32 ----
-  #include <limits>               // Needed for class numeric_limits<>.
-  #include <streambuf>            // For basic_streambuf.
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _CharT, class _Traits, class _Number> 
-***************
-*** 309,314 ****
---- 312,320 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #  undef __STL_MANIP_INLINE
-  
-*** misc/STLport-4.0/stlport/stl/_pair.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_pair.h	Thu Aug 25 15:54:58 2005
-***************
-*** 32,37 ****
---- 32,40 ----
-  #define __SGI_STL_INTERNAL_PAIR_H
-  
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _T1, class _T2>
-***************
-*** 127,132 ****
---- 130,138 ----
-  
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_PAIR_H */
-  
-*** misc/STLport-4.0/stlport/stl/_ptrs_specialize.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ptrs_specialize.h	Thu Aug 25 15:54:58 2005
-***************
-*** 107,112 ****
---- 107,115 ----
-  __STL_ITERATOR_TRAITS_SPECIALIZE(_Type**, _Type**) \
-  __STL_ITERATOR_TRAITS_SPECIALIZE(_Type** const, _Type** const) \
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif
-  
-  # define __STL_TYPE_TRAITS_POD_SPECIALIZE_V(_Type) \
-*** misc/STLport-4.0/stlport/stl/_queue.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_queue.h	Thu Aug 25 15:54:58 2005
-***************
-*** 46,51 ****
---- 46,54 ----
-  # include <stl/_function.h>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # if ! defined ( __STL_LIMITED_DEFAULT_TEMPLATES )
-***************
-*** 197,202 ****
---- 200,208 ----
-  };
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #  undef __STL_QUEUE_ARGS
-  #  undef __STL_QUEUE_HEADER_ARGS
-*** misc/STLport-4.0/stlport/stl/_range_errors.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_range_errors.h	Thu Aug 25 15:54:59 2005
-***************
-*** 37,47 ****
---- 37,53 ----
-  
-  #if defined (__STL_EXTERN_RANGE_ERRORS)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  void  __STL_DECLSPEC __STL_CALL __stl_throw_range_error(const char* __msg);
-  void  __STL_DECLSPEC __STL_CALL __stl_throw_out_of_range(const char* __msg);
-  void  __STL_DECLSPEC __STL_CALL __stl_throw_length_error(const char* __msg);
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  // For other compilers where we're throwing range errors, include the
-  // stdexcept header and throw the appropriate exceptions directly.
-***************
-*** 55,60 ****
---- 61,69 ----
-  #  include <string>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  inline void __STL_DECLSPEC __STL_CALL __stl_throw_range_error(const char* __msg) { 
-***************
-*** 70,75 ****
---- 79,87 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  // Otherwise, define inline functions that do nothing.
-  #else 
-***************
-*** 76,81 ****
---- 88,96 ----
-  
-  # include <cstdlib>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  inline void __STL_DECLSPEC __STL_CALL __stl_throw_range_error(const char*) { abort(); }
-***************
-*** 82,87 ****
---- 97,105 ----
-  inline void __STL_DECLSPEC __STL_CALL __stl_throw_length_error(const char*) { abort();}
-  inline void __STL_DECLSPEC __STL_CALL __stl_throw_out_of_range(const char*) { abort(); }
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif
-  
-*** misc/STLport-4.0/stlport/stl/_raw_storage_iter.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_raw_storage_iter.h	Thu Aug 25 15:54:59 2005
-***************
-*** 30,35 ****
---- 30,38 ----
-  #ifndef __SGI_STL_INTERNAL_RAW_STORAGE_ITERATOR_H
-  #define __SGI_STL_INTERNAL_RAW_STORAGE_ITERATOR_H
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _ForwardIterator, class _Tp>
-***************
-*** 70,75 ****
---- 73,81 ----
-  inline output_iterator_tag __ITERATOR_CATEGORY(const raw_storage_iterator<_ForwardIterator, _Tp>&) { return output_iterator_tag(); }
-  #endif
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_RAW_STORAGE_ITERATOR_H */
-  
-*** misc/STLport-4.0/stlport/stl/_rope.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_rope.c	Thu Aug 25 15:54:59 2005
-***************
-*** 37,42 ****
---- 37,45 ----
-  
-  # include <stl/_range_errors.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # if defined ( __STL_NESTED_TYPE_PARAM_BUG )
-***************
-*** 1529,1534 ****
---- 1532,1540 ----
-  #   undef size_type
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif /* ROPEIMPL_H */
-  
-  // Local Variables:
-*** misc/STLport-4.0/stlport/stl/_rope.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_rope.h	Thu Aug 25 15:54:59 2005
-***************
-*** 75,80 ****
---- 75,83 ----
-  #    include <mutex.h>
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  
-***************
-*** 2491,2496 ****
---- 2494,2502 ----
-    }
-  }
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_rope.c>
-*** misc/STLport-4.0/stlport/stl/_set.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_set.h	Thu Aug 25 15:54:59 2005
-***************
-*** 37,42 ****
---- 37,45 ----
-  #define set __WORKAROUND_RENAME(set)
-  #define multiset __WORKAROUND_RENAME(multiset)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Key, __DFL_TMPL_PARAM(_Compare,less<_Key>), 
-***************
-*** 341,346 ****
---- 344,352 ----
-  # undef  __STL_TEMPLATE_HEADER
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  // do a cleanup
-  # undef set
-*** misc/STLport-4.0/stlport/stl/_slist.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_slist.c	Thu Aug 25 15:54:59 2005
-***************
-*** 25,30 ****
---- 25,33 ----
-  #  define size_type          size_t
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Tp, class _Alloc> 
-***************
-*** 255,260 ****
---- 258,266 ----
-  # undef size_type
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /*  __STL_SLIST_C */
-  
-*** misc/STLport-4.0/stlport/stl/_slist.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_slist.h	Thu Aug 25 15:54:59 2005
-***************
-*** 55,60 ****
---- 55,63 ----
-  # undef slist
-  # define  slist  __WORKAROUND_DBG_RENAME(slist)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE 
-  
-  template <class _Tp>
-***************
-*** 730,735 ****
---- 733,741 ----
-  #endif /* __STL_FUNCTION_TMPL_PARTIAL_ORDER */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_slist.c>
-***************
-*** 742,747 ****
---- 748,756 ----
-  # include <stl/debug/_slist.h>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  // Specialization of insert_iterator so that insertions will be constant
-  // time rather than linear time.
-***************
-*** 783,788 ****
---- 792,800 ----
-  #endif /* __STL_CLASS_PARTIAL_SPECIALIZATION */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  
-  # if defined ( __STL_USE_WRAPPER_FOR_ALLOC_PARAM )
-*** misc/STLport-4.0/stlport/stl/_slist_base.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_slist_base.c	Thu Aug 25 15:54:59 2005
-***************
-*** 26,31 ****
---- 26,34 ----
-  #ifndef __STL_SLIST_BASE_C
-  #define __STL_SLIST_BASE_C
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Dummy>
-***************
-*** 92,97 ****
---- 95,103 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /*  __STL_SLIST_BASE_C */
-  
-*** misc/STLport-4.0/stlport/stl/_slist_base.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_slist_base.h	Thu Aug 25 15:54:59 2005
-***************
-*** 31,36 ****
---- 31,39 ----
-  #include <cstddef>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE 
-  
-  struct _Slist_node_base
-***************
-*** 71,76 ****
---- 74,82 ----
-  typedef _Sl_global<bool> _Sl_global_inst;
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_slist_base.c>
-*** misc/STLport-4.0/stlport/stl/_sstream.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_sstream.c	Thu Aug 25 15:54:59 2005
-***************
-*** 29,34 ****
---- 29,37 ----
-  # define __BSB_pos_type__ __STL_TYPENAME_ON_RETURN_TYPE basic_stringbuf<_CharT, _Traits, _Alloc>::pos_type
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //----------------------------------------------------------------------
-***************
-*** 529,534 ****
---- 532,540 ----
-  {}
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  
-  # undef __BSB_int_type__
-*** misc/STLport-4.0/stlport/stl/_sstream.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_sstream.h	Thu Aug 25 15:54:59 2005
-***************
-*** 28,33 ****
---- 28,36 ----
-  #include <istream>              // Includes <ostream>, <ios>, <iosfwd>
-  #include <string>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //----------------------------------------------------------------------
-***************
-*** 230,235 ****
---- 233,241 ----
-  # endif /* __STL_USE_TEMPLATE_EXPORT */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_sstream.c>
-*** misc/STLport-4.0/stlport/stl/_stack.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_stack.h	Thu Aug 25 15:54:59 2005
-***************
-*** 30,35 ****
---- 30,38 ----
-  #ifndef __SGI_STL_INTERNAL_STACK_H
-  #define __SGI_STL_INTERNAL_STACK_H
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # if !defined ( __STL_LIMITED_DEFAULT_TEMPLATES )
-***************
-*** 90,95 ****
---- 93,101 ----
-  __STL_RELOPS_OPERATORS(template < __STL_STACK_HEADER_ARGS >, stack< __STL_STACK_ARGS >)
-      
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #  undef __STL_STACK_ARGS
-  #  undef __STL_STACK_HEADER_ARGS
-*** misc/STLport-4.0/stlport/stl/_stdio_file.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_stdio_file.h	Thu Aug 25 15:54:59 2005
-***************
-*** 71,76 ****
---- 71,79 ----
-  # include <unix.h>	// get the definition of fileno
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //----------------------------------------------------------------------
-***************
-*** 89,95 ****
-  typedef  unsigned char* _File_ptr_type;
-  #endif
-  
-! inline int   _FILE_fd(const FILE& __f) { return __f._file; }
-  inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
-  inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }  
-  inline char* _FILE_I_end(const FILE& __f)
---- 92,98 ----
-  typedef  unsigned char* _File_ptr_type;
-  #endif
-  
-! inline int   _FILE_fd(const FILE& __f) { return fileno(__CONST_CAST(FILE*,&__f)); }
-  inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
-  inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }  
-  inline char* _FILE_I_end(const FILE& __f)
-***************
-*** 92,98 ****
-  typedef  unsigned char* _File_ptr_type;
-  #endif
-
-! inline int   _FILE_fd(const FILE& __f) { return __f._file; }
-  inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
-  inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
-  inline char* _FILE_I_end(const FILE& __f)
---- 92,98 ----
-  typedef  unsigned char* _File_ptr_type;
-  #endif
-
-! inline int   _FILE_fd(const FILE& __f) { return fileno(__CONST_CAST(FILE*,&__f)); }
-  inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
-  inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
-  inline char* _FILE_I_end(const FILE& __f)
-***************
-*** 377,382 ****
---- 380,388 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_STDIO_FILE_H */
-  
-*** misc/STLport-4.0/stlport/stl/_stream_iterator.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_stream_iterator.h	Thu Aug 25 15:54:59 2005
-***************
-*** 46,51 ****
---- 46,54 ----
-  
-  # include <streambuf>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // We do not read any characters until operator* is called.  The first
-***************
-*** 214,222 ****
---- 217,231 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #  include <stl/_istream.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _CharT, class _Traits>
-***************
-*** 242,247 ****
---- 251,259 ----
-  : _M_buf(__o.rdbuf()), _M_ok(__o.rdbuf()!=0) {}
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # endif /* SGI_OWN_IOSTREAMS */
-  
-***************
-*** 251,256 ****
---- 263,271 ----
-  
-  # if defined (__STL_USE_NEW_IOSTREAMS) 
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  #  ifndef __STL_LIMITED_DEFAULT_TEMPLATES
-***************
-*** 388,397 ****
---- 403,418 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  
-  # elif ! defined(__STL_USE_NO_IOSTREAMS)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  #  if defined (__STL_MINIMUM_DEFAULT_TEMPLATE_PARAMS) && ! defined (__STL_DEFAULT_TYPE_PARAM)
-***************
-*** 479,488 ****
---- 500,515 ----
-  #endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __STL_USE_NEW_IOSTREAMS */
-  
-  // form-independent definiotion of stream iterators
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template < __ISI_TMPL_HEADER_ARGUMENTS >
-***************
-*** 525,530 ****
---- 552,560 ----
-  # endif 
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #  undef __ISI_TMPL_HEADER_ARGUMENTS
-  #  undef __ISI_TMPL_ARGUMENTS
-*** misc/STLport-4.0/stlport/stl/_streambuf.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_streambuf.c	Thu Aug 25 15:54:59 2005
-***************
-*** 24,29 ****
---- 24,32 ----
-  
-  # if defined (__STL_DESIGNATED_DLL) || ! defined (__STL_NO_CUSTOM_IO)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  //----------------------------------------------------------------------
-  // Non-inline basic_streambuf<> member functions.
-***************
-*** 210,215 ****
---- 213,221 ----
-  # endif /* __STL_USE_TEMPLATE_EXPORT */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # endif /* NO_CUSTOM_IO */
-  
-*** misc/STLport-4.0/stlport/stl/_streambuf.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_streambuf.h	Thu Aug 25 15:54:59 2005
-***************
-*** 23,28 ****
---- 23,31 ----
-  #include <stl/_stdio_file.h>     // Declaration of struct FILE, and of
-                                  // functions to manipulate it.
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //----------------------------------------------------------------------
-***************
-*** 479,484 ****
---- 482,490 ----
-  # endif
-  };
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_streambuf.c>
-*** misc/STLport-4.0/stlport/stl/_string.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string.c	Thu Aug 25 15:54:59 2005
-***************
-*** 42,47 ****
---- 42,50 ----
-  #  define __iterator__  __STL_TYPENAME_ON_RETURN_TYPE basic_string<_CharT,_Traits,_Alloc>::iterator
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  #if defined (__STL_MEMBER_TEMPLATES) && ! defined (__STL_INLINE_MEMBER_TEMPLATES)
-***************
-*** 664,669 ****
---- 667,675 ----
-    }
-  }
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  // _string_fwd has to see clean basic_string
-  # undef basic_string
-***************
-*** 678,683 ****
---- 684,692 ----
-  
-  # include <stl/_range_errors.h>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // _String_base methods
-***************
-*** 692,697 ****
---- 701,709 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef basic_string
-  # undef __size_type__
-*** misc/STLport-4.0/stlport/stl/_string.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string.h	Thu Aug 25 15:54:59 2005
-***************
-*** 78,83 ****
---- 78,86 ----
-  // a user-defined non-POD type.  However, _CharT must still have a
-  // default constructor.
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # ifdef __STL_DEBUG
-***************
-*** 1520,1525 ****
---- 1523,1531 ----
-  # undef basic_string
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # ifdef __STL_DEBUG
-  #  include <stl/debug/_string.h>
-*** misc/STLport-4.0/stlport/stl/_string_fwd.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string_fwd.c	Thu Aug 25 15:54:59 2005
-***************
-*** 26,31 ****
---- 26,34 ----
-  #if !defined ( __STL_STRING_FWD_C) && ! defined (__SGI_STL_OWN_IOSTREAMS)
-  #define __STL_STRING_FWD_C
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _CharT, class _Traits, class _Alloc>
-***************
-*** 35,40 ****
---- 38,46 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /*  __STL_STRING_FWD_C */
-  
-*** misc/STLport-4.0/stlport/stl/_string_fwd.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string_fwd.h	Thu Aug 25 15:54:59 2005
-***************
-*** 21,26 ****
---- 21,29 ----
-  
-  # include <iosfwd>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # if !defined (__STL_LIMITED_DEFAULT_TEMPLATES)
-***************
-*** 51,56 ****
---- 54,62 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_STRING_FWD_H */
-  
-*** misc/STLport-4.0/stlport/stl/_string_hash.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string_hash.h	Thu Aug 25 15:54:59 2005
-***************
-*** 23,28 ****
---- 23,31 ----
-  # include <stl/_hash_fun.h>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _CharT, class _Traits, class _Alloc>
-***************
-*** 62,66 ****
---- 65,72 ----
-  #endif /* __STL_CLASS_PARTIAL_SPECIALIZATION */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif
-*** misc/STLport-4.0/stlport/stl/_string_io.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string_io.c	Thu Aug 25 15:54:59 2005
-***************
-*** 5,10 ****
---- 5,13 ----
-  #  define basic_string _Nondebug_string
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  #if defined (__STL_USE_NEW_IOSTREAMS)
-***************
-*** 322,327 ****
---- 325,333 ----
-  # endif /* __STL_NEW_IOSTREAMS */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef basic_string
-  
-*** misc/STLport-4.0/stlport/stl/_string_io.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string_io.h	Thu Aug 25 15:54:59 2005
-***************
-*** 29,34 ****
---- 29,37 ----
-  # endif
-  
-  // I/O.  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  #if defined (__STL_USE_NEW_IOSTREAMS)
-***************
-*** 108,113 ****
---- 111,119 ----
-  #endif /* __STL_USE_NEW_IOSTREAMS */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef basic_string
-  
-*** misc/STLport-4.0/stlport/stl/_strstream.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_strstream.h	Thu Aug 25 15:54:59 2005
-***************
-*** 6,11 ****
---- 6,14 ----
-  #include <istream>              // Includes <ostream>, <ios>, <iosfwd>
-  #include <string>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //----------------------------------------------------------------------
-***************
-*** 129,131 ****
---- 132,137 ----
-  };
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-*** misc/STLport-4.0/stlport/stl/_tempbuf.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_tempbuf.c	Thu Aug 25 15:54:59 2005
-***************
-*** 26,31 ****
---- 26,34 ----
-  #ifndef __STL_TEMPBUF_C
-  #define __STL_TEMPBUF_C
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Tp>
-***************
-*** 45,50 ****
---- 48,56 ----
-    return pair<_Tp*, ptrdiff_t>((_Tp*)0, 0);
-  }
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /*  __STL_TEMPBUF_C */
-  
-*** misc/STLport-4.0/stlport/stl/_tempbuf.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_tempbuf.h	Thu Aug 25 15:54:59 2005
-***************
-*** 40,45 ****
---- 40,48 ----
-  #  include <stl/_uninitialized.h>
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Tp>
-***************
-*** 157,162 ****
---- 160,168 ----
-  # endif /* __STL_NO_EXTENSIONS */
-      
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # ifndef __STL_LINK_TIME_INSTANTIATION
-  #  include <stl/_tempbuf.c>
-*** misc/STLport-4.0/stlport/stl/_threads.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_threads.c	Thu Aug 25 15:54:59 2005
-***************
-*** 28,33 ****
---- 28,36 ----
-  
-  # if defined (__BUILDING_STLPORT) || ! defined (__SGI_STL_OWN_IOSTREAMS)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # if ( __STL_STATIC_TEMPLATE_DATA > 0 )
-***************
-*** 127,132 ****
---- 130,138 ----
-  # endif /* if SGI or WIN */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # endif /* BUILDING_STLPORT */
-  #endif /*  __STL_THREADS_C */
-*** misc/STLport-4.0/stlport/stl/_threads.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_threads.h	Thu Aug 25 15:54:59 2005
-***************
-*** 124,129 ****
---- 124,132 ----
-  #  define __STL_MUTEX_INITIALIZER
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  
-***************
-*** 406,411 ****
---- 409,417 ----
-  };
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_threads.c>
-*** misc/STLport-4.0/stlport/stl/_time_facets.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_time_facets.c	Thu Aug 25 15:54:59 2005
-***************
-*** 18,23 ****
---- 18,26 ----
-  #ifndef __STL_TIME_FACETS_C
-  #define __STL_TIME_FACETS_C
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //----------------------------------------------------------------------
-***************
-*** 452,456 ****
---- 455,462 ----
-  # endif /* CUSTOM_IO */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __STL_TIME_FACETS_C */
-*** misc/STLport-4.0/stlport/stl/_time_facets.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_time_facets.h	Thu Aug 25 15:54:59 2005
-***************
-*** 23,28 ****
---- 23,31 ----
-  #ifndef __SGI_STL_INTERNAL_TIME_FACETS_H
-  #define __SGI_STL_INTERNAL_TIME_FACETS_H
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  _Locale_time* __STL_CALL __acquire_time(const char* __name);
-***************
-*** 288,293 ****
---- 291,299 ----
-  };
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_time_facets.c>
-*** misc/STLport-4.0/stlport/stl/_tree.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_tree.c	Thu Aug 25 15:55:00 2005
-***************
-*** 42,47 ****
---- 42,50 ----
-  #  define _Rb_tree __WORKAROUND_DBG_RENAME(Rb_tree)
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  inline void 
-***************
-*** 728,733 ****
---- 731,739 ----
-    return true;
-  }
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef __iterator__        
-  # undef __const_iterator__  
-*** misc/STLport-4.0/stlport/stl/_tree.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_tree.h	Thu Aug 25 15:55:00 2005
-***************
-*** 83,88 ****
---- 83,91 ----
-  #  define _Rb_tree __WORKAROUND_DBG_RENAME(Rb_tree)
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  typedef bool _Rb_tree_Color_type;
-***************
-*** 557,562 ****
---- 560,568 ----
-  #endif /* __STL_FUNCTION_TMPL_PARTIAL_ORDER */
-           
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_tree.c>
-***************
-*** 568,573 ****
---- 574,582 ----
-  # include <stl/debug/_tree.h>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  // Class rb_tree is not part of the C++ standard.  It is provided for
-  // compatibility with the HP STL.
-***************
-*** 587,592 ****
---- 596,604 ----
-    ~rb_tree() {}
-  };
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_TREE_H */
-  
-*** misc/STLport-4.0/stlport/stl/_uninitialized.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_uninitialized.h	Thu Aug 25 15:55:00 2005
-***************
-*** 46,51 ****
---- 46,54 ----
-  #  include <stl/_algobase.h>
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // uninitialized_copy
-***************
-*** 324,329 ****
---- 327,335 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_UNINITIALIZED_H */
-  
-*** misc/STLport-4.0/stlport/stl/_valarray.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_valarray.c	Thu Aug 25 15:55:00 2005
-***************
-*** 26,31 ****
---- 26,34 ----
-  #ifndef __STL_VALARRAY_C
-  #define __STL_VALARRAY_C
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // Behavior is undefined if __x and *this have different sizes
-***************
-*** 177,182 ****
---- 180,188 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /*  __STL_VALARRAY_C */
-  
-*** misc/STLport-4.0/stlport/stl/_valarray.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_valarray.h	Thu Aug 25 15:55:00 2005
-***************
-*** 42,47 ****
---- 42,50 ----
-  #endif
-  
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  class slice;
-***************
-*** 1655,1660 ****
---- 1658,1666 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_valarray.c>
-*** misc/STLport-4.0/stlport/stl/_vector.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_vector.c	Thu Aug 25 15:55:00 2005
-***************
-*** 44,49 ****
---- 44,52 ----
-  #  undef  vector
-  #  define vector __WORKAROUND_DBG_RENAME(vector)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Tp, class _Alloc>
-***************
-*** 266,271 ****
---- 269,277 ----
-  
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef __pointer__
-  # undef __const_pointer__
-*** misc/STLport-4.0/stlport/stl/_vector.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_vector.h	Thu Aug 25 15:55:00 2005
-***************
-*** 53,58 ****
---- 53,61 ----
-  #  undef  vector
-  #  define vector __WORKAROUND_DBG_RENAME(vector)
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE 
-  
-  // The vector base class serves two purposes.  First, its constructor
-***************
-*** 562,567 ****
---- 565,573 ----
-  #  define __vector__ __WORKAROUND_RENAME(vector)
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # if !defined (__STL_LINK_TIME_INSTANTIATION)
-  #  include <stl/_vector.c>
-*** misc/STLport-4.0/stlport/stl/c_locale.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/c_locale.h	Thu Aug 25 15:54:56 2005
-***************
-*** 115,120 ****
---- 115,123 ----
-  struct _Locale_messages;
-  
-  #ifdef __cplusplus
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  extern "C" {
-  #endif
-***************
-*** 652,657 ****
---- 655,663 ----
-  # ifdef __cplusplus
-  }
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif
-  
-  # endif /* __STL_C_LOCALE_H */
-*** misc/STLport-4.0/stlport/stl/char_traits.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/char_traits.h	Thu Aug 25 15:54:56 2005
-***************
-*** 40,45 ****
---- 40,48 ----
-  # include <stl/type_traits.h>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // Class __char_traits_base.
-***************
-*** 178,183 ****
---- 181,189 ----
-  # endif
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # else /* OWN_IOSTREAMS */
-  
-*** misc/STLport-4.0/stlport/stl/concept_checks.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/concept_checks.h	Thu Aug 25 15:54:56 2005
-***************
-*** 490,498 ****
---- 490,504 ----
-  
-  /* Associated Type Requirements */
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  template <class _Iterator> struct iterator_traits;
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  template <class _Iter> 
-  struct __value_type_type_definition_requirement_violation {
-*** misc/STLport-4.0/stlport/stl/type_traits.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/type_traits.h	Thu Aug 25 15:55:29 2005
-***************
-*** 56,61 ****
---- 56,64 ----
-  */
-  
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  struct __true_type {
-  };
-  
-***************
-*** 88,93 ****
---- 91,99 ----
-     typedef __false_type    has_trivial_destructor;
-     typedef __false_type    is_POD_type;
-  };
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  // Provide some specializations.  This is harmless for compilers that
-  //  have built-in __types_traits support, and essential for compilers
-*** misc/STLport-4.0/stlport/stl/debug/_debug.c	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_debug.c	Thu Aug 25 15:54:56 2005
-***************
-*** 56,61 ****
---- 56,64 ----
-      extern  void __stl_debug_terminate(void);
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # ifndef __STL_STRING_LITERAL
-***************
-*** 101,106 ****
---- 104,112 ----
-  
-  # endif
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  // abort()
-  #    include <cstdlib>
-***************
-*** 110,115 ****
---- 116,124 ----
-  #    include <cstdarg>
-  #    include <cstdio>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  template <class _Dummy>
-***************
-*** 141,149 ****
---- 150,164 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #  endif /* __STL_DEBUG_MESSAGE */
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  
-***************
-*** 191,201 ****
---- 206,222 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # endif /* __STL_ASSERTIONS */
-  
-  #ifdef __STL_DEBUG
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # ifdef __STL_THREADS
-***************
-*** 447,452 ****
---- 468,476 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __STL_DEBUG */
-  
-*** misc/STLport-4.0/stlport/stl/debug/_debug.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_debug.h	Thu Aug 25 15:54:56 2005
-***************
-*** 69,74 ****
---- 69,77 ----
-  /* have to hardcode that ;() */
-  # define _StlMsg_MAX 27
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // This class is unique (not inherited from exception),
-***************
-*** 136,141 ****
---- 139,147 ----
-  typedef __stl_debug_engine<bool> __stl_debugger;
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #  ifndef __STL_ASSERT
-  #   define __STL_ASSERT(expr) \
-***************
-*** 179,184 ****
---- 185,193 ----
-  # include <stl/_iterator_base.h>
-  #endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //=============================================================
-***************
-*** 384,389 ****
---- 393,401 ----
-  }
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # endif /* __STL_DEBUG */
-  
-*** misc/STLport-4.0/stlport/stl/debug/_deque.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_deque.h	Thu Aug 25 15:54:56 2005
-***************
-*** 41,46 ****
---- 41,49 ----
-  
-  # define __STL_DEQUE_SUPER   __WORKAROUND_DBG_RENAME(deque) <_Tp,_Alloc>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 314,319 ****
---- 317,325 ----
-  #endif
-  
-  __STL_END_NAMESPACE 
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef _DBG_deque
-  # undef __STL_DEQUE_SUPER
-*** misc/STLport-4.0/stlport/stl/debug/_hashtable.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_hashtable.h	Thu Aug 25 15:54:56 2005
-***************
-*** 42,47 ****
---- 42,50 ----
-  #  define __STL_DBG_HT_SUPER \
-  __WORKAROUND_DBG_RENAME(hashtable) <_Val, _Key, _HF, _ExK, _EqK, _All>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 245,250 ****
---- 248,256 ----
-  }
-  #endif
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #  undef  hashtable
-  
-  #endif /* __SGI_STL_INTERNAL_HASHTABLE_H */
-*** misc/STLport-4.0/stlport/stl/debug/_iterator.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_iterator.h	Thu Aug 25 15:54:56 2005
-***************
-*** 31,36 ****
---- 31,39 ----
-  #  define __STL_DBG_IDENTITY( __base ) 
-  # endif
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  //============================================================
-***************
-*** 409,414 ****
---- 412,420 ----
-  };
-  # endif
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* INTERNAL_H */
-  
-*** misc/STLport-4.0/stlport/stl/debug/_list.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_list.h	Thu Aug 25 15:54:56 2005
-***************
-*** 40,45 ****
---- 40,48 ----
-  #  define __STL_DBG_LIST_BASE \
-  __WORKAROUND_DBG_RENAME(list) <_Tp, _Alloc>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 267,272 ****
---- 270,278 ----
-  #endif /* __STL_USE_SEPARATE_RELOPS_NAMESPACE */
-  
-  __STL_END_NAMESPACE 
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_LIST_H */
-  
-*** misc/STLport-4.0/stlport/stl/debug/_slist.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_slist.h	Thu Aug 25 15:54:56 2005
-***************
-*** 36,41 ****
---- 36,44 ----
-  
-  #  define __STL_DBG_SLIST_BASE __WORKAROUND_DBG_RENAME(slist) <_Tp, _Alloc>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 423,428 ****
---- 426,434 ----
-  #endif /* __STL_FUNCTION_TMPL_PARTIAL_ORDER */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_INTERNAL_DBG_SLIST_H */
-  
-*** misc/STLport-4.0/stlport/stl/debug/_string.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_string.h	Thu Aug 25 15:54:56 2005
-***************
-*** 23,28 ****
---- 23,31 ----
-  
-  # define __STL_DBG_STRING_BASE _Nondebug_string <_CharT, _Traits, _Alloc>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 727,732 ****
---- 730,738 ----
-  
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  #endif /* __SGI_STL_DBG_STRING */
-  
-*** misc/STLport-4.0/stlport/stl/debug/_tree.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_tree.h	Thu Aug 25 15:54:56 2005
-***************
-*** 39,44 ****
---- 39,47 ----
-  
-  # define __STL_DBG_TREE_SUPER __WORKAROUND_DBG_RENAME(Rb_tree) <_Key, _Value, _KeyOfValue, _Compare, _Alloc>
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 288,293 ****
---- 291,299 ----
-  #endif /* __STL_FUNCTION_TMPL_PARTIAL_ORDER */
-           
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef  __STL_DBG_TREE_SUPER
-  
-*** misc/STLport-4.0/stlport/stl/debug/_vector.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_vector.h	Thu Aug 25 15:54:56 2005
-***************
-*** 40,45 ****
---- 40,48 ----
-  #  define __STL_DBG_VECTOR_BASE __WORKAROUND_DBG_RENAME(vector) <_Tp, _Alloc>
-  
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 335,340 ****
---- 338,346 ----
-  #  endif /* __STL_USE_TEMPLATE_EXPORT */
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  # undef __STL_DBG_VECTOR_BASE
-  # undef _DBG_vector
-*** misc/STLport-4.0/stlport/stl/wrappers/_deque.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/wrappers/_deque.h	Thu Aug 25 15:54:57 2005
-***************
-*** 35,40 ****
---- 35,43 ----
-  
-  # define _DEQUE_SUPER   _DEQUE_SUPER_NAME<_Tp, __STL_DEFAULT_ALLOCATOR(_Tp) >
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  // provide a "default" deque adaptor
-***************
-*** 70,75 ****
---- 73,81 ----
-  # undef _DEQUE_SUPER
-  
-  __STL_END_NAMESPACE  
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  // Local Variables:
-  // mode:C++
-*** misc/STLport-4.0/stlport/wrap_std/complex	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/complex	Thu Aug 25 15:55:01 2005
-***************
-*** 16,21 ****
---- 16,24 ----
-  # include __STL_NATIVE_HEADER(complex)
-  
-  # if defined (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  
-  using __STL_COMPLEX_NAMESPACE::complex;
-***************
-*** 42,47 ****
---- 45,53 ----
-  using __STL_COMPLEX_NAMESPACE::tanh;
-  
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif /* USE_OWN_NAMESPACE */
-  
-  // Local Variables:
-*** misc/STLport-4.0/stlport/wrap_std/fstream	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/fstream	Thu Aug 25 15:55:01 2005
-***************
-*** 16,24 ****
---- 16,30 ----
-  # if defined (__STL_USE_NEW_IOSTREAMS)
-  # include __STL_NATIVE_HEADER(fstream)
-  # if defined (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  # include <using/fstream>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif /* __STL_OWN_NAMESPACE */
-  # else
-  # include <wrap_std/h/fstream.h>
-*** misc/STLport-4.0/stlport/wrap_std/iomanip	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/iomanip	Thu Aug 25 15:55:01 2005
-***************
-*** 18,26 ****
---- 18,32 ----
-  #  include __STL_NATIVE_HEADER(iomanip)
-  
-  #  ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #   include <using/iomanip>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #  endif /* __STL_OWN_NAMESPACE */
-  
-  # else
-***************
-*** 28,36 ****
---- 34,48 ----
-  #  include __STL_NATIVE_HEADER(iomanip.h)
-  
-  # if defined  (__STL_USE_NAMESPACES) && ! defined (__STL_BROKEN_USING_DIRECTIVE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #   include <using/h/iomanip.h>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #  endif /* __STL_USE_OWN_NAMESPACE */
-  
-  # endif /* __STL_USE_NEW_IOSTREAMS */
-*** misc/STLport-4.0/stlport/wrap_std/ios	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/ios	Thu Aug 25 15:55:01 2005
-***************
-*** 16,24 ****
---- 16,30 ----
-  # if defined (__STL_USE_NEW_IOSTREAMS)
-  #  include __STL_NATIVE_HEADER(ios)
-  # ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #  include <using/ios>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __STL_OWN_NAMESPACE */
-  # else
-  #  include <wrap_std/h/iostream.h>
-*** misc/STLport-4.0/stlport/wrap_std/iosfwd	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/iosfwd	Thu Aug 25 15:55:01 2005
-***************
-*** 56,64 ****
---- 56,70 ----
-  
-  # else 
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  template <class _Tp> class allocator;
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  
-  // use old-style iostreams
-  #  include <iostream.h>
-***************
-*** 77,85 ****
---- 83,97 ----
-  # endif
-  
-  # if  defined (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #  include <using/iosfwd>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif 
-  
-  // Local Variables:
-*** misc/STLport-4.0/stlport/wrap_std/iostream	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/iostream	Thu Aug 25 15:55:01 2005
-***************
-*** 22,30 ****
---- 22,36 ----
-  # if defined (__STL_USE_NEW_IOSTREAMS)
-  #  include __STL_NATIVE_HEADER(iostream)
-  #   if defined  (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #    include <using/iostream>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #  endif
-  # else
-  #  include <wrap_std/h/iostream.h>
-*** misc/STLport-4.0/stlport/wrap_std/istream	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/istream	Thu Aug 25 15:55:01 2005
-***************
-*** 24,32 ****
---- 24,38 ----
-  # include __STL_NATIVE_HEADER(istream)
-  
-  # if defined  (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #  include <using/istream>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #  endif /* __STL_OWN_NAMESPACE */
-  
-  # else
-***************
-*** 33,42 ****
---- 39,54 ----
-  
-  # include __STL_NATIVE_OLD_STREAMS_HEADER(iostream.h)
-  # if defined  (__STL_USE_NAMESPACES)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  using ::istream;
-  // using ::ws;
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif /* NAMESPACES */
-  
-  # endif /* if defined (__STL_USE_NEW_IOSTREAMS) */
-*** misc/STLport-4.0/stlport/wrap_std/locale	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/locale	Thu Aug 25 15:55:01 2005
-***************
-*** 20,28 ****
---- 20,34 ----
-  # include __STL_NATIVE_HEADER(locale)
-  
-  # ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #  include <using/locale>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __STL_OWN_NAMESPACE */
-  
-  // Local Variables:
-*** misc/STLport-4.0/stlport/wrap_std/ostream	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/ostream	Thu Aug 25 15:55:01 2005
-***************
-*** 24,32 ****
---- 24,38 ----
-  #  include __STL_NATIVE_HEADER(ostream)
-  
-  #  if defined (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  # include <using/ostream>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #   endif /* __STL_OWN_NAMESPACE */
-  
-  # else
-***************
-*** 34,42 ****
---- 40,54 ----
-  #  include __STL_NATIVE_OLD_STREAMS_HEADER(iostream.h)
-  
-  # if defined  (__STL_USE_NAMESPACES) && ! defined (__STL_BROKEN_USING_DIRECTIVE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  # include <using/h/ostream.h>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #   endif /* __STL_NAMESPACE */
-  # endif /* if defined (__STL_USE_NEW_IOSTREAMS) */
-  // Local Variables:
-*** misc/STLport-4.0/stlport/wrap_std/sstream	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/sstream	Thu Aug 25 15:55:01 2005
-***************
-*** 15,23 ****
---- 15,29 ----
-  
-  # include __STL_NATIVE_HEADER(sstream)
-  # ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #  include <using/sstream>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __STL_OWN_NAMESPACE */
-  
-  // Local Variables:
-*** misc/STLport-4.0/stlport/wrap_std/streambuf	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/streambuf	Thu Aug 25 15:55:01 2005
-***************
-*** 20,28 ****
---- 20,34 ----
-  # endif
-  
-  # if defined (__STL_USE_OWN_NAMESPACE) && defined (__STL_USE_NEW_IOSTREAMS)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #  include <using/streambuf> 
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif /* __STL_OWN_NAMESPACE */
-  
-  // Local Variables:
-*** misc/STLport-4.0/stlport/wrap_std/strstream	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/strstream	Thu Aug 25 15:55:01 2005
-***************
-*** 16,24 ****
---- 16,30 ----
-  # include __STL_NATIVE_HEADER(strstream)
-  
-  # ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #  include <using/strstream>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __STL_OWN_NAMESPACE */
-  
-  
-*** misc/STLport-4.0/stlport/wrap_std/h/fstream.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/h/fstream.h	Thu Aug 25 15:55:01 2005
-***************
-*** 1,7 ****
---- 1,13 ----
-  # include __STL_NATIVE_OLD_STREAMS_HEADER(fstream.h)
-  # if defined  (__STL_USE_NAMESPACES) && ! defined (__STL_BROKEN_USING_DIRECTIVE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #  include <using/h/fstream.h>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif /* __STL_OWN_NAMESPACE */
-  
-*** misc/STLport-4.0/stlport/wrap_std/h/iostream.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/h/iostream.h	Thu Aug 25 15:55:01 2005
-***************
-*** 1,7 ****
---- 1,13 ----
-  # include __STL_NATIVE_OLD_STREAMS_HEADER(iostream.h)
-  
-  # if defined (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  # include <using/h/iostream.h>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  # endif /* __STL_USE_OWN_NAMESPACE */
-*** misc/STLport-4.0/stlport/wrap_std/h/strstream.h	Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/h/strstream.h	Thu Aug 25 15:55:01 2005
-***************
-*** 20,28 ****
---- 20,34 ----
-  #  endif
-  
-  # ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-  __STL_BEGIN_NAMESPACE
-  #  include <using/h/strstream.h>
-  __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-  #endif /* __STL_OWN_NAMESPACE */
-  
-  
diff --git a/stlport/STLport-4.5-0119.patch b/stlport/STLport-4.5-0119.patch
deleted file mode 100644
index bb17a11a6..000000000
--- a/stlport/STLport-4.5-0119.patch
+++ /dev/null
@@ -1,1348 +0,0 @@
---- misc/STLport-4.5-0119/src/vc7.mak	Sun Jul 29 22:02:16 2001
-+++ misc/build/STLport-4.5-0119/src/vc7.mak	Mon Jun  2 10:32:02 2008
-@@ -1,5 +1,5 @@
- #
--# STLport makefile for VC++ 7 (.NET)
-+# STLport makefile for VC++ 7/8/9 (.NET)
- #
- 
- CXX=cl.exe
-@@ -6,15 +6,16 @@
- CC=cl.exe
- RC=rc
- 
--LIB_BASENAME=stlport_vc7
-+LIB_BASENAME=stlport_vc71
-+
- COMP=VC7
- 
- # EXTRA_COMMON_FLAGS=/D "_MBCS"
--EXTRA_COMMON_FLAGS=/FI "vc_warning_disable.h" /D "_MBCS"
-+EXTRA_COMMON_FLAGS=/TP /FI "vc_warning_disable.h" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
- EXTRA_DEBUG_FLAGS=
- EXTRA_NDEBUG_FLAGS=
- 
--all: platform all_static all_dynamic 
-+all: platform all_static all_dynamic
- 
- !INCLUDE vc_common.mak
- 
---- misc/STLport-4.5-0119/src/vc_common.mak	Wed Apr 10 05:55:31 2002
-+++ misc/build/STLport-4.5-0119/src/vc_common.mak	Mon Jun  2 10:32:02 2008
-@@ -27,7 +27,7 @@
- DYNEXT=dll
- STEXT=lib
- 
--PATH_SEP=\\
-+PATH_SEP=\ 
- 
- MKDIR=-mkdir
- LINK_OUT=/out:
-@@ -51,15 +51,15 @@
- #
- 
- # FLAGS_COMMON =/nologo /c /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
--FLAGS_COMMON =/nologo /c /Zi /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
-+FLAGS_COMMON =/nologo /c /Zi /W3 /GR $(EXFLAGS) /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
- FLAGS_COMMON_static = $(FLAGS_COMMON) /FD  /D "_STLP_NO_FORCE_INSTANTIATE"
- FLAGS_COMMON_dynamic = $(FLAGS_COMMON)
- 
- FLAGS_DEBUG=/Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
- # FLAGS_DEBUG=/Zi /Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
- FLAGS_NDEBUG=/O2 /DNDEBUG  $(EXTRA_NDEBUG_FLAGS)
- 
--LDFLAGS_COMMON=/nologo /machine:I386 /debugtype:cv
-+LDFLAGS_COMMON=/nologo
- LDFLAGS_DEBUG=/debug
- LDFLAGS_RELEASE=/opt:ref
- 
---- misc/STLport-4.5-0119/stlport/config/_epilog.h	Thu Sep  6 00:11:36 2001
-+++ misc/build/STLport-4.5-0119/stlport/config/_epilog.h	Mon Jun  2 10:32:02 2008
-@@ -4,6 +4,7 @@
- #  pragma option pop
- #  pragma option -w-8062
- # else
-+#  pragma pack(push,8)
- #  if !(defined (_STLP_MSVC) && (_STLP_MSVC < 1200))
- #   pragma warning (pop)
- #  endif
---- misc/STLport-4.5-0119/stlport/config/_prolog.h	Sun Oct 28 21:26:44 2001
-+++ misc/build/STLport-4.5-0119/stlport/config/_prolog.h	Mon Jun  2 10:32:02 2008
-@@ -7,10 +7,17 @@
- #  endif
- # else
- # if !(defined (_STLP_MSVC) && (_STLP_MSVC < 1200))
--#  pragma warning(push)
-+   // Disable "warning C4702: unreachable code" and "warning C4710: function not
-+   // inlined" globally, as they are only issued at the end of the compilation
-+   // unit.  Then locally disable as many warnings as possible, plus "warning
-+   // C4555: expression has no effect; expected expression with side-effect":
-+#  pragma warning(disable:4702 4710)
-+#  pragma warning(push,1)
-+#  pragma warning(disable:4555)
- # endif
- # pragma pack(push,8)
- # include <config/_msvc_warnings_off.h>
-+# pragma pack(pop)
- # endif
- 
- 
---- misc/STLport-4.5-0119/stlport/config/stl_msvc.h	Sat Dec 28 07:12:58 2002
-+++ misc/build/STLport-4.5-0119/stlport/config/stl_msvc.h	Mon Jun  2 10:34:54 2008
-@@ -66,10 +66,15 @@
- #   define _STLP_DEFAULTCHAR __stl_char
- #  endif /* (_STLP_MSVC < 1100 ) */
- 
--#  define _STLP_NO_TYPENAME_ON_RETURN_TYPE 1 
-+# if (_STLP_MSVC <= 1300)
-+#  define _STLP_NO_TYPENAME_ON_RETURN_TYPE 1
-+# endif
-+# if (_STLP_MSVC > 1300)
-+#    define _STLP_NO_METHOD_SPECIALIZATION 1
-+# endif
- //  using ::func_name results in ambiguity
- 
--# if (_STLP_MSVC <= 1300) 
-+# if (_STLP_MSVC <= 1310)
- 
- // boris : not defining this macro for SP5 causes other problems
- // #  if !defined (_MSC_FULL_VER) || (_MSC_FULL_VER < 12008804 )
-@@ -94,7 +99,7 @@
- # endif /* _STLP_MSVC */
- 
- 
--# if (_MSC_VER <= 1300) 
-+# if (_MSC_VER <= 1500)
- 
- #  define _STLP_VENDOR_GLOBAL_CSTD
- // They included the necessary coding,
-@@ -129,7 +134,7 @@
- # if defined (_STLP_MSVC) && ( _STLP_MSVC < 1200 ) /* VC++ 6.0 */
- // #  define _STLP_NO_MEMBER_TEMPLATES 1
- // #  define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
--#  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1 
-+#  define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
- #  define _STLP_THROW_RETURN_BUG 1
- # endif
- 
-@@ -178,8 +183,8 @@
- # ifdef __ICL
- #  define _STLP_LIB_BASENAME "stlport_icl"
- # else
--# if (_MSC_VER >= 1300) 
--#   define _STLP_LIB_BASENAME "stlport_vc7"
-+# if (_MSC_VER > 1300)
-+#   define _STLP_LIB_BASENAME "stlport_vc71"
- # elif (_MSC_VER >= 1200)
- //#   ifdef _UNICODE
- //#    define _STLP_LIB_BASENAME "stlport_vc6_unicode"
---- misc/STLport-4.5-0119/stlport/cstdio	Sun Dec  2 23:17:40 2001
-+++ misc/build/STLport-4.5-0119/stlport/cstdio	Mon Jun  2 10:32:02 2008
-@@ -42,7 +42,7 @@
- #  define stderr	(&_STLP_VENDOR_CSTD::__files[2])
- # endif
- 
--#  if defined (_STLP_MSVC) || defined (__ICL)
-+#  if defined (_STLP_MSVC) && (_MSC_VER <= 1310) || defined (__ICL)
- inline
- int vsnprintf(char *s1, size_t n, const char *s2, va_list v)
- {
-@@ -110,7 +110,7 @@
- using _STLP_VENDOR_CSTD::vfprintf;
- using _STLP_VENDOR_CSTD::vprintf;
- using _STLP_VENDOR_CSTD::vsprintf;
--#   if (defined (__MWERKS__) || defined (_STLP_MSVC) || defined (__ICL) || \
-+#   if (defined (__MWERKS__) || (defined (_STLP_MSVC) && (_MSC_VER <= 1310)) || defined (__ICL) || \
- ( defined (__BORLANDC__) && __BORLANDC__ > 0x530))
- using _STLP_VENDOR_CSTD::vsnprintf;
- #   endif
---- misc/STLport-4.5-0119/stlport/list	Wed Apr 10 05:55:34 2002
-+++ misc/build/STLport-4.5-0119/stlport/list	Mon Jun  2 10:32:02 2008
-@@ -37,7 +37,14 @@
- 
- #ifndef _STLP_INTERNAL_LIST_H
- # include <stl/_list.h>
-+#if ( _MSC_VER > 1200 )
-+_STLP_BEGIN_NAMESPACE
-+# if defined (_STLP_USE_TEMPLATE_EXPORT)
-+_STLP_EXPORT_TEMPLATE_CLASS allocator<void*>;
-+# endif
-+_STLP_END_NAMESPACE
- #endif
-+#endif
- 
- #if defined (_STLP_WHOLE_VENDOR_STD)
- # include _STLP_NATIVE_HEADER(list)
---- misc/STLport-4.5-0119/stlport/stl/_cmath.h	Mon Oct 28 17:18:49 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_cmath.h	Mon Jun  2 10:32:02 2008
-@@ -50,7 +50,7 @@
-   static inline _Tp _do_tan(const _Tp& __x)     { return _STLP_VENDOR_CSTD::tan(__x); } 
-   static inline _Tp _do_tanh(const _Tp& __x)    { return _STLP_VENDOR_CSTD::tanh(__x); } 
-   static inline _Tp _do_exp(const _Tp& __x)     { return _STLP_VENDOR_CSTD::exp(__x); } 
--  static inline _Tp _do_hypot(const _Tp& __x, const _Tp& __y)   { return _STLP_VENDOR_CSTD::hypot(__x, __y); } 
-+  static inline _Tp _do_hypot(const _Tp& __x, const _Tp& __y)   { return hypot(__x, __y); } 
- };
- 
- #  define _STLP_DO_ABS(_Tp)   _STL_math_proxy<_Tp>::_do_abs
---- misc/STLport-4.5-0119/stlport/stl/_deque.c	Thu Sep 12 22:46:59 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_deque.c	Mon Jun  2 10:32:02 2008
-@@ -26,6 +26,10 @@
- #ifndef _STLP_DEQUE_C
- # define _STLP_DEQUE_C
- 
-+#if defined(_MSC_VER) && (_MSC_VER > 1310)
-+#pragma warning(disable:4701)
-+#endif
-+
- # ifndef _STLP_INTERNAL_DEQUE_H
- #  include <stl/_deque.h>
- # endif
---- misc/STLport-4.5-0119/stlport/stl/_hashtable.h	Thu Sep 12 22:46:59 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_hashtable.h	Mon Jun  2 10:32:02 2008
-@@ -9,13 +9,13 @@
-  * Copyright (c) 1997
-  * Moscow Center for SPARC Technology
-  *
-- * Copyright (c) 1999 
-+ * Copyright (c) 1999
-  * Boris Fomitchev
-  *
-  * This material is provided "as is", with absolutely no warranty expressed
-  * or implied. Any use is at your own risk.
-  *
-- * Permission to use or copy this software for any purpose is hereby granted 
-+ * Permission to use or copy this software for any purpose is hereby granted
-  * without fee, provided the above notices are retained on all copies.
-  * Permission to modify the code and to distribute modified code is granted,
-  * provided the above notices are retained, and a notice that the code was
-@@ -66,7 +66,7 @@
-   _Self* _M_next;
-   _Val _M_val;
-   __TRIVIAL_STUFF(_Hashtable_node)
--};  
-+};
- 
- // some compilers require the names of template parameters to be the same
- template <class _Val, class _Key, class _HF,
-@@ -84,7 +84,7 @@
-   _Node* _M_cur;
-   _Hashtable* _M_ht;
- 
--  _Hashtable_iterator(_Node* __n, _Hashtable* __tab) 
-+  _Hashtable_iterator(_Node* __n, _Hashtable* __tab)
-     : _M_cur(__n), _M_ht(__tab) {}
-   _Hashtable_iterator() {}
- 
-@@ -96,7 +96,7 @@
-           class _ExK, class _EqK, class _All>
- struct _Ht_iterator : public _Hashtable_iterator< _Val, _Key,_HF, _ExK,_EqK,_All>
- {
--  
-+
-   typedef _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All> _Base;
- 
-   //  typedef _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All> iterator;
-@@ -116,11 +116,11 @@
-   _Ht_iterator(const _Node* __n, const _Hashtable* __tab) :
-     _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>((_Node*)__n, (_Hashtable*)__tab) {}
-   _Ht_iterator() {}
--  _Ht_iterator(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __it) : 
-+  _Ht_iterator(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __it) :
-     _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>(__it) {}
- 
--  reference operator*() const { 
--      return this->_M_cur->_M_val; 
-+  reference operator*() const {
-+      return this->_M_cur->_M_val;
-   }
-   _STLP_DEFINE_ARROW_OPERATOR
- 
-@@ -138,19 +138,19 @@
- 
- template <class _Val, class _Traits, class _Traits1, class _Key, class _HF,
-           class _ExK, class _EqK, class _All>
--inline bool 
--operator==(const _Ht_iterator<_Val, _Traits,_Key,_HF,_ExK,_EqK,_All>& __x, 
--	   const _Ht_iterator<_Val, _Traits1,_Key,_HF,_ExK,_EqK,_All>& __y) { 
--  return __x._M_cur == __y._M_cur; 
-+inline bool
-+operator==(const _Ht_iterator<_Val, _Traits,_Key,_HF,_ExK,_EqK,_All>& __x,
-+	   const _Ht_iterator<_Val, _Traits1,_Key,_HF,_ExK,_EqK,_All>& __y) {
-+  return __x._M_cur == __y._M_cur;
- }
- 
- #ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
- template <class _Val, class _Key, class _HF,
-           class _ExK, class _EqK, class _All>
--inline bool 
--operator!=(const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __x, 
--	   const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __y) { 
--  return __x._M_cur != __y._M_cur; 
-+inline bool
-+operator!=(const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __x,
-+	   const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __y) {
-+  return __x._M_cur != __y._M_cur;
- }
- #else
- 
-@@ -166,10 +166,10 @@
- 
- template <class _Val, class _Key, class _HF,
-           class _ExK, class _EqK, class _All>
--inline bool 
--operator!=(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __x, 
--	   const _Ht_iterator<_Val, _Const_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __y) { 
--  return __x._M_cur != __y._M_cur; 
-+inline bool
-+operator!=(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __x,
-+	   const _Ht_iterator<_Val, _Const_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __y) {
-+  return __x._M_cur != __y._M_cur;
- }
- #endif
- 
-@@ -189,8 +189,10 @@
-   static const size_t _M_list[__stl_num_primes];
- };
- 
--# if defined (_STLP_USE_TEMPLATE_EXPORT) 
-+# if defined (_STLP_USE_TEMPLATE_EXPORT)
-+#if ( _MSC_VER < 1300 )
- _STLP_EXPORT_TEMPLATE_CLASS _Stl_prime<bool>;
-+#endif
- # endif
- 
- typedef _Stl_prime<bool> _Stl_prime_type;
-@@ -200,8 +202,8 @@
- //  do.  If we're using standard-conforming allocators, then a hashtable
- //  unconditionally has a member variable to hold its allocator, even if
- //  it so happens that all instances of the allocator type are identical.
--// This is because, for hashtables, this extra storage is negligible.  
--//  Additionally, a base class wouldn't serve any other purposes; it 
-+// This is because, for hashtables, this extra storage is negligible.
-+//  Additionally, a base class wouldn't serve any other purposes; it
- //  wouldn't, for example, simplify the exception-handling code.
- template <class _Val, class _Key, class _HF,
-           class _ExK, class _EqK, class _All>
---- misc/STLport-4.5-0119/stlport/stl/_istream.h	Sun Apr  7 04:35:42 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_istream.h	Mon Jun  2 10:32:02 2008
-@@ -257,44 +257,44 @@
- 
- template <class _CharT, class _Traits>
- inline basic_istream<_CharT, _Traits>& _STLP_CALL  
--operator>>(basic_istream<_CharT, _Traits>& __in, _CharT& __c) {
--  __in._M_formatted_get(__c);
--  return __in;
-+operator>>(basic_istream<_CharT, _Traits>& ___in, _CharT& __c) {
-+  ___in._M_formatted_get(__c);
-+  return ___in;
- }
- 
- template <class _Traits>
- inline basic_istream<char, _Traits>& _STLP_CALL  
--operator>>(basic_istream<char, _Traits>& __in, unsigned char& __c) {
--  __in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
--  return __in;
-+operator>>(basic_istream<char, _Traits>& ___in, unsigned char& __c) {
-+  ___in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
-+  return ___in;
- }
- 
- template <class _Traits>
- inline basic_istream<char, _Traits>& _STLP_CALL 
--operator>>(basic_istream<char, _Traits>& __in, signed char& __c) {
--  __in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
--  return __in;
-+operator>>(basic_istream<char, _Traits>& ___in, signed char& __c) {
-+  ___in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
-+  return ___in;
- }
- 
- template <class _CharT, class _Traits>
- inline basic_istream<_CharT, _Traits>& _STLP_CALL 
--operator>>(basic_istream<_CharT, _Traits>& __in, _CharT* __s) {
--  __in._M_formatted_get(__s);
--  return __in;
-+operator>>(basic_istream<_CharT, _Traits>& ___in, _CharT* __s) {
-+  ___in._M_formatted_get(__s);
-+  return ___in;
- }
- 
- template <class _Traits>
- inline basic_istream<char, _Traits>& _STLP_CALL 
--operator>>(basic_istream<char, _Traits>& __in, unsigned char* __s) {
--  __in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
--  return __in;
-+operator>>(basic_istream<char, _Traits>& ___in, unsigned char* __s) {
-+  ___in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
-+  return ___in;
- }
- 
- template <class _Traits>
- inline basic_istream<char, _Traits>& _STLP_CALL 
--operator>>(basic_istream<char, _Traits>& __in, signed char* __s) {
--  __in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
--  return __in;
-+operator>>(basic_istream<char, _Traits>& ___in, signed char* __s) {
-+  ___in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
-+  return ___in;
- }
- 
- //----------------------------------------------------------------------
---- misc/STLport-4.5-0119/stlport/stl/_monetary.c	Thu Sep 12 22:47:00 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_monetary.c	Mon Jun  2 10:32:02 2008
-@@ -86,7 +86,7 @@
- 
- template <class _InIt, class _OuIt, class _CharT>
- bool
--__get_monetary_value(_InIt& __first, _InIt __last, _OuIt __out,
-+__get_monetary_value(_InIt& __first, _InIt __last, _OuIt ___out,
-                      const ctype<_CharT>& _c_type,
-                      _CharT   __point,
-                      int      __frac_digits,
-@@ -104,7 +104,7 @@
-   while (__first != __last) {
-     if (_c_type.is(ctype_base::digit, *__first)) {
-       ++__current_group_size;
--      *__out++ = *__first++;
-+      *___out++ = *__first++;
-     }
-     else if (__group_sizes_end) {
-       if (*__first == __sep) {
-@@ -129,7 +129,7 @@
-     
-     if (__first == __last || *__first != __point) {
-       for (int __digits = 0; __digits != __frac_digits; ++__digits)
--        *__out++ = _CharT('0');
-+        *___out++ = _CharT('0');
-       return true; // OK not to have decimal point
-     }
-   }
-@@ -139,7 +139,7 @@
-   size_t __digits = 0;
- 
-   while (__first != __last && _c_type.is(ctype_base::digit, *__first)) {
--      *__out++ = *__first++;
-+      *___out++ = *__first++;
-      ++__digits;
-   }
- 
-@@ -202,7 +202,7 @@
-   bool __is_positive = true;
-   bool __symbol_required = (__str.flags() & ios_base::showbase) !=0;
-   string_type __buf;
--  back_insert_iterator<string_type> __out(__buf);
-+  back_insert_iterator<string_type> ___out(__buf);
- //  pair<iter_type, bool> __result;
- 
-   for (__i = 0; __i < 4; ++__i) {
-@@ -293,7 +293,7 @@
-       _CharT __sep = __grouping.size() == 0 ? _CharT() : 
- 	__intl ? __punct_intl.thousands_sep() : __punct.thousands_sep();
- 
--      __result = __get_monetary_value(__s, __end, __out, __c_type,
-+      __result = __get_monetary_value(__s, __end, ___out, __c_type,
-                                       __point, __frac_digits,
-                                       __sep,
-                                       __grouping, __syntax_ok);      
---- misc/STLport-4.5-0119/stlport/stl/_num_get.c	Thu Sep 12 22:47:00 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_num_get.c	Mon Jun  2 10:32:02 2008
-@@ -60,7 +60,7 @@
- 
- template <class _InputIter, class _CharT>
- int 
--_M_get_base_or_zero(_InputIter& __in, _InputIter& __end, ios_base& __str, _CharT*)
-+_M_get_base_or_zero(_InputIter& ___in, _InputIter& __end, ios_base& __str, _CharT*)
- {
-   _CharT __atoms[5];
-   const ctype<_CharT>& __c_type = *(const ctype<_CharT>*)__str._M_ctype_facet();
-@@ -68,14 +68,14 @@
-   __c_type.widen(__narrow_atoms, __narrow_atoms + 5, __atoms);
- 
-   bool __negative = false;
--  _CharT __c = *__in;
-+  _CharT __c = *___in;
- 
-   if (__c == __atoms[1] /* __xminus_char */ ) {
-     __negative = true;
--    ++__in;
-+    ++___in;
-   }
-   else if (__c == __atoms[0] /* __xplus_char */ ) 
--    ++__in;
-+    ++___in;
- 
- 
-   int __base;
-@@ -92,21 +92,21 @@
-     break;
-   case ios_base::hex:
-     __base = 16;
--    if (__in != __end && *__in == __atoms[2] /* __zero_char */ ) {
--      ++__in;
--      if (__in != __end &&
--          (*__in == __atoms[3] /* __x_char */ || *__in == __atoms[4] /* __X_char */ ))
--        ++__in;
-+    if (___in != __end && *___in == __atoms[2] /* __zero_char */ ) {
-+      ++___in;
-+      if (___in != __end &&
-+          (*___in == __atoms[3] /* __x_char */ || *___in == __atoms[4] /* __X_char */ ))
-+        ++___in;
-       else
-         __valid_zero = 1; // That zero is valid by itself.
-     }
-     break;
-   default:
--    if (__in != __end && *__in == __atoms[2] /* __zero_char */ ) {
--      ++__in;
--      if (__in != __end &&
--          (*__in == __atoms[3] /* __x_char */ || *__in == __atoms[4] /* __X_char */ )) {
--        ++__in;
-+    if (___in != __end && *___in == __atoms[2] /* __zero_char */ ) {
-+      ++___in;
-+      if (___in != __end &&
-+          (*___in == __atoms[3] /* __x_char */ || *___in == __atoms[4] /* __X_char */ )) {
-+        ++___in;
-         __base = 16;
-       }
-       else
-@@ -252,7 +252,7 @@
- 
- template <class _InputIter, class _Integer, class _CharT>
- _InputIter _STLP_CALL
--_M_do_get_integer(_InputIter& __in, _InputIter& __end, ios_base& __str,
-+_M_do_get_integer(_InputIter& ___in, _InputIter& __end, ios_base& __str,
-                   ios_base::iostate& __err, _Integer& __val, _CharT* __pc) 
- {
- 
-@@ -265,12 +265,12 @@
-   const numpunct<_CharT>& __numpunct = *(const numpunct<_CharT>*)__str._M_numpunct_facet();
-   const string& __grouping = __str._M_grouping(); // cached copy
- 
--  const int __base_or_zero = _M_get_base_or_zero(__in, __end, __str, __pc);
-+  const int __base_or_zero = _M_get_base_or_zero(___in, __end, __str, __pc);
-   int  __got = __base_or_zero & 1;
- 
-   bool __result;
- 
--  if (__in == __end) {      // We may have already read a 0.  If so,
-+  if (___in == __end) {      // We may have already read a 0.  If so,
- 
-     if (__got > 0) {       // the result is 0 even if we're at eof.
-       __val = 0;
-@@ -285,19 +285,19 @@
- 
- #if defined(__HP_aCC) && (__HP_aCC == 1)
-      if (_IsSigned)
--       __result = __get_integer(__in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __true_type() );
-+       __result = __get_integer(___in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __true_type() );
-      else
--      __result = __get_integer(__in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __false_type() );
-+      __result = __get_integer(___in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __false_type() );
- #else
--    __result = __get_integer(__in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, _IsSigned());
-+    __result = __get_integer(___in, __end, __base,  __val, __got, __negative, __numpunct.thousands_sep(), __grouping, _IsSigned());
- # endif
-   }
- 
-   __err = __STATIC_CAST(ios_base::iostate, __result ? ios_base::goodbit : ios_base::failbit);
- 
--  if (__in == __end)
-+  if (___in == __end)
-     __err |= ios_base::eofbit;
--  return __in;
-+  return ___in;
- }
- 
- // _M_read_float and its helper functions.
-@@ -376,7 +376,7 @@
- 
- template <class _InputIter, class _CharT>
- bool _STLP_CALL
--_M_read_float(string& __buf, _InputIter& __in, _InputIter& __end, ios_base& __s, _CharT*)
-+_M_read_float(string& __buf, _InputIter& ___in, _InputIter& __end, ios_base& __s, _CharT*)
- {
-   // Create a string, copying characters of the form 
-   // [+-]? [0-9]* .? [0-9]* ([eE] [+-]? [0-9]+)?
-@@ -404,20 +404,20 @@
-   _Initialize_get_float(__ct, __xplus, __xminus, __pow_e, __pow_E, __digits);
- 
-   // Get an optional sign
--  __in = __copy_sign(__in, __end, __buf, __xplus, __xminus);
-+  ___in = __copy_sign(___in, __end, __buf, __xplus, __xminus);
- 
-   // Get an optional string of digits.
-   if (__grouping.size() != 0)
--    __digits_before_dot = __copy_grouped_digits(__in, __end, __buf, __digits,
-+    __digits_before_dot = __copy_grouped_digits(___in, __end, __buf, __digits,
- 						__sep, __grouping, __grouping_ok);
-   else
--    __digits_before_dot = __copy_digits(__in, __end, __buf, __digits);
-+    __digits_before_dot = __copy_digits(___in, __end, __buf, __digits);
- 
-   // Get an optional decimal point, and an optional string of digits.
--  if (__in != __end && *__in == __dot) {
-+  if (___in != __end && *___in == __dot) {
-     __buf.push_back('.');
--    ++__in;
--    __digits_after_dot = __copy_digits(__in, __end, __buf, __digits);
-+    ++___in;
-+    __digits_after_dot = __copy_digits(___in, __end, __buf, __digits);
-   }
- 
-   // There have to be some digits, somewhere.
-@@ -424,11 +424,11 @@
-   __ok = __digits_before_dot || __digits_after_dot;
-   
-   // Get an optional exponent.
--  if (__ok && __in != __end && (*__in == __pow_e || *__in == __pow_E)) {
-+  if (__ok && ___in != __end && (*___in == __pow_e || *___in == __pow_E)) {
-     __buf.push_back('e');
--    ++__in;
--    __in = __copy_sign(__in, __end, __buf, __xplus, __xminus);
--    __ok = __copy_digits(__in, __end, __buf, __digits);
-+    ++___in;
-+    ___in = __copy_sign(___in, __end, __buf, __xplus, __xminus);
-+    __ok = __copy_digits(___in, __end, __buf, __digits);
-     // If we have an exponent then the sign 
-     // is optional but the digits aren't.
-   }
-@@ -466,7 +466,7 @@
- # ifndef _STLP_NO_BOOL
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end,
-                                     ios_base& __s,
-                                     ios_base::iostate& __err, bool& __x) const
- {
-@@ -482,8 +482,8 @@
-     bool __false_ok = true;
- 
-     size_t __n = 0;
--    for ( ; __in != __end; ++__in) {
--      _CharT __c = *__in;
-+    for ( ; ___in != __end; ++___in) {
-+      _CharT __c = *___in;
-       __true_ok  = __true_ok  && (__c == __truename[__n]);
-       __false_ok = __false_ok && (__c == __falsename[__n]);
-       ++__n;
-@@ -491,7 +491,7 @@
-       if ((!__true_ok && !__false_ok) ||
-           (__true_ok  && __n >= __truename.size()) ||
-           (__false_ok && __n >= __falsename.size())) {
--	++__in;
-+	++___in;
-         break;
-       }
-     }
-@@ -505,15 +505,15 @@
-     else
-       __err = ios_base::failbit;
- 
--    if (__in == __end)
-+    if (___in == __end)
-       __err |= ios_base::eofbit;
- 
--    return __in;
-+    return ___in;
-   }
- 
-   else {
-     long __lx;
--    _InputIter __tmp = this->do_get(__in, __end, __s, __err, __lx);
-+    _InputIter __tmp = this->do_get(___in, __end, __s, __err, __lx);
-     if (!(__err & ios_base::failbit)) {
-       if (__lx == 0)
-         __x = false;
-@@ -531,16 +531,16 @@
- # ifdef _STLP_FIX_LIBRARY_ISSUES
- template <class _CharT, class _InputIter>  
- _InputIter 
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                                     ios_base::iostate& __err, short& __val) const {
--  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
- 
- template <class _CharT, class _InputIter>  
- _InputIter 
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                                     ios_base::iostate& __err, int& __val) const {
--  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
- 
- # endif
-@@ -547,83 +547,83 @@
- 
- template <class _CharT, class _InputIter>  
- _InputIter 
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                                     ios_base::iostate& __err, long& __val) const {
--  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
- 
- template <class _CharT, class _InputIter>  
- _InputIter 
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                                     ios_base::iostate& __err,
-                                     unsigned short& __val) const {
--  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
- 
- template <class _CharT, class _InputIter>  
- _InputIter 
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                                     ios_base::iostate& __err, 
-                                     unsigned int& __val) const {
--  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
- 
- template <class _CharT, class _InputIter>  
- _InputIter 
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                                     ios_base::iostate& __err,
-                                     unsigned long& __val) const {
--  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
- 
- 
- template <class _CharT, class _InputIter>  
- _InputIter 
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                                     ios_base::iostate& __err,
-                                     float& __val) const {
-   string __buf ;
--  bool __ok = _M_read_float(__buf, __in, __end, __str, (_CharT*)0 );
-+  bool __ok = _M_read_float(__buf, ___in, __end, __str, (_CharT*)0 );
-   __string_to_float(__buf, __val);  
-   __err = __STATIC_CAST(ios_base::iostate, __ok ? ios_base::goodbit : ios_base::failbit);
--  if (__in == __end)
-+  if (___in == __end)
-     __err |= ios_base::eofbit;
--  return __in;
-+  return ___in;
- }
- 
- template <class _CharT, class _InputIter>  
- _InputIter 
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                                     ios_base::iostate& __err, 
-                                     double& __val) const {
-   string __buf ;
--  bool __ok = _M_read_float(__buf, __in, __end, __str, (_CharT*)0 );
-+  bool __ok = _M_read_float(__buf, ___in, __end, __str, (_CharT*)0 );
-   __string_to_float(__buf, __val);
-   __err = __STATIC_CAST(ios_base::iostate, __ok ? ios_base::goodbit : ios_base::failbit);
--  if (__in == __end)
-+  if (___in == __end)
-     __err |= ios_base::eofbit;
--  return __in;
-+  return ___in;
- }
- 
- #ifndef _STLP_NO_LONG_DOUBLE
- template <class _CharT, class _InputIter>  
- _InputIter 
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- 				    ios_base::iostate& __err,
-                                     long double& __val) const {
-   string __buf ;
--  bool __ok = _M_read_float(__buf, __in, __end, __str, (_CharT*)0 );
-+  bool __ok = _M_read_float(__buf, ___in, __end, __str, (_CharT*)0 );
-   __string_to_float(__buf, __val);
-   __err = __STATIC_CAST(ios_base::iostate, __ok ? ios_base::goodbit : ios_base::failbit);
--  if (__in == __end)
-+  if (___in == __end)
-     __err |= ios_base::eofbit;
--  return __in;
-+  return ___in;
- }
- #endif /* _STLP_LONG_DOUBLE */
- 
- template <class _CharT, class _InputIter>  
- _InputIter 
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                            ios_base::iostate& __err,
-                            void*& __p) const {
- # if defined(_STLP_LONG_LONG)&&!defined(__MRC__)		//*ty 12/07/2001 - MrCpp can not cast from long long to void*
-@@ -631,7 +631,7 @@
- # else
-   unsigned long __val;
- # endif
--    iter_type __tmp = _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+    iter_type __tmp = _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
-     if (!(__err & ios_base::failbit))
-       __p = __REINTERPRET_CAST(void*,__val);
-     return __tmp;
-@@ -642,18 +642,18 @@
- 
- template <class _CharT, class _InputIter>  
- _InputIter 
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                                     ios_base::iostate& __err,
-                                     _STLP_LONG_LONG& __val) const {
--  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
- 
- template <class _CharT, class _InputIter>  
- _InputIter 
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                                     ios_base::iostate& __err,
-                                     unsigned _STLP_LONG_LONG& __val) const {
--  return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+  return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
- 
- #endif /* _STLP_LONG_LONG */
---- misc/STLport-4.5-0119/stlport/stl/_num_get.h	Mon Nov 26 19:37:00 2001
-+++ misc/build/STLport-4.5-0119/stlport/stl/_num_get.h	Mon Jun  2 10:32:02 2008
-@@ -58,79 +58,79 @@
-   explicit num_get(size_t __refs = 0): locale::facet(__refs) {}
-     
- # ifndef _STLP_NO_BOOL
--  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                 ios_base::iostate& __err, bool& __val) const {
--    return do_get(__in, __end, __str, __err, __val);
-+    return do_get(___in, __end, __str, __err, __val);
-   }
- # endif
- 
- # ifdef _STLP_FIX_LIBRARY_ISSUES
--  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                 ios_base::iostate& __err, short& __val) const {
--    return do_get(__in, __end, __str, __err, __val);
-+    return do_get(___in, __end, __str, __err, __val);
-   }
- 
--  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                 ios_base::iostate& __err, int& __val) const {
--    return do_get(__in, __end, __str, __err, __val);
-+    return do_get(___in, __end, __str, __err, __val);
-   }
- # endif
- 
--  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                 ios_base::iostate& __err, long& __val) const {
--    return do_get(__in, __end, __str, __err, __val);
-+    return do_get(___in, __end, __str, __err, __val);
-   }
- 
--  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                 ios_base::iostate& __err, unsigned short& __val) const {
--    return do_get(__in, __end, __str, __err, __val);
-+    return do_get(___in, __end, __str, __err, __val);
-   }
- 
--  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                 ios_base::iostate& __err, unsigned int& __val) const {
--    return do_get(__in, __end, __str, __err, __val);
-+    return do_get(___in, __end, __str, __err, __val);
-   }
- 
--  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                 ios_base::iostate& __err, unsigned long& __val) const {
--    return do_get(__in, __end, __str, __err, __val);
-+    return do_get(___in, __end, __str, __err, __val);
-   }
- 
- #ifdef _STLP_LONG_LONG
- 
--  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                 ios_base::iostate& __err, _STLP_LONG_LONG& __val) const {
--    return do_get(__in, __end, __str, __err, __val);
-+    return do_get(___in, __end, __str, __err, __val);
-   }
- 
--  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                 ios_base::iostate& __err, unsigned _STLP_LONG_LONG& __val) const {
--    return do_get(__in, __end, __str, __err, __val);
-+    return do_get(___in, __end, __str, __err, __val);
-   }
- 
- #endif /* _STLP_LONG_LONG */
- 
--  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                  ios_base::iostate& __err, float& __val) const {
--    return do_get(__in, __end, __str, __err, __val);
-+    return do_get(___in, __end, __str, __err, __val);
-   }
- 
--  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                 ios_base::iostate& __err, double& __val) const {
--    return do_get(__in, __end, __str, __err, __val);
-+    return do_get(___in, __end, __str, __err, __val);
-   }
- 
- # ifndef _STLP_NO_LONG_DOUBLE
- 
--  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                 ios_base::iostate& __err, long double& __val) const {
--    return do_get(__in, __end, __str, __err, __val);
-+    return do_get(___in, __end, __str, __err, __val);
-   }
- # endif
- 
--  _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                 ios_base::iostate& __err, void*& __val) const {
--    return do_get(__in, __end, __str, __err, __val);
-+    return do_get(___in, __end, __str, __err, __val);
-   }
- 
-   _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
-@@ -143,43 +143,43 @@
-   typedef numpunct<_CharT>     _Numpunct;
- 
- # ifndef _STLP_NO_BOOL
--  virtual _InputIter do_get(_InputIter __in, _InputIter __end,
-+  virtual _InputIter do_get(_InputIter ___in, _InputIter __end,
-                            ios_base& __str, ios_base::iostate& __err, bool& __val) const;
- # endif
- 
--  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                            ios_base::iostate& __err, long& __val) const;
--  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                            ios_base::iostate& __err, unsigned short& __val) const;
--  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                            ios_base::iostate& __err, unsigned int& __val) const;
--  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                            ios_base::iostate& __err, unsigned long& __val) const;
- # ifdef _STLP_FIX_LIBRARY_ISSUES
-   // issue 118 : those are actually not supposed to be here
--  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                            ios_base::iostate& __err, short& __val) const;
--  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                            ios_base::iostate& __err, int& __val) const;
- # endif
--  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                           ios_base::iostate& __err, float& __val) const;
--  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                            ios_base::iostate& __err, double& __val) const;
--  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                            ios_base::iostate& __err,
-                            void*& __p) const;
- 
- #ifndef _STLP_NO_LONG_DOUBLE
--  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                            ios_base::iostate& __err, long double& __val) const;
- #endif /* _STLP_LONG_DOUBLE */
- 
- #ifdef _STLP_LONG_LONG
- 
--  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                             ios_base::iostate& __err, _STLP_LONG_LONG& __val) const;
--  virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+  virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
-                            ios_base::iostate& __err, unsigned _STLP_LONG_LONG& __val) const;
- #endif /* _STLP_LONG_LONG */
- 
---- misc/STLport-4.5-0119/stlport/stl/_num_put.c	Thu Sep 12 22:47:01 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_num_put.c	Mon Jun  2 10:32:02 2008
-@@ -45,29 +45,29 @@
- template <class _CharT, class _OutputIter>
- _OutputIter  _STLP_CALL
- __copy_float_and_fill(const _CharT* __first, const _CharT* __last,
--                      _OutputIter __out,
-+                      _OutputIter ___out,
-                       ios_base::fmtflags __flags,
-                       streamsize __width, _CharT __fill,
-                       _CharT __xplus, _CharT __xminus) {
-   if (__width <= __last - __first)
--    return copy(__first, __last, __out);
-+    return copy(__first, __last, ___out);
-   else {
-     streamsize __pad = __width - (__last - __first);
-     ios_base::fmtflags __dir = __flags & ios_base::adjustfield;
- 
-     if (__dir == ios_base::left) {
--      __out = copy(__first, __last, __out);
--      return fill_n(__out, __pad, __fill);
-+      ___out = copy(__first, __last, ___out);
-+      return fill_n(___out, __pad, __fill);
-     }
-     else if (__dir == ios_base::internal && __first != __last &&
-              (*__first == __xplus || *__first == __xminus)) {
--      *__out++ = *__first++;
--      __out = fill_n(__out, __pad, __fill);
--      return copy(__first, __last, __out);
-+      *___out++ = *__first++;
-+      ___out = fill_n(___out, __pad, __fill);
-+      return copy(__first, __last, ___out);
-     }
-     else {
--      __out = fill_n(__out, __pad, __fill);
--      return copy(__first, __last, __out);
-+      ___out = fill_n(___out, __pad, __fill);
-+      return copy(__first, __last, ___out);
-     }
-   }
- }
-@@ -76,7 +76,7 @@
- // Helper routine for wchar_t
- template <class _OutputIter>
- _OutputIter  _STLP_CALL
--__put_float(char* __ibuf, char* __iend, _OutputIter __out,
-+__put_float(char* __ibuf, char* __iend, _OutputIter ___out,
-             ios_base& __f, wchar_t __fill,
-             wchar_t __decimal_point,
-             wchar_t __sep, const string& __grouping)
-@@ -107,7 +107,7 @@
-     __eend = __wbuf + __len;
-   }
- 
--  return __copy_float_and_fill(__wbuf, __eend, __out,
-+  return __copy_float_and_fill(__wbuf, __eend, ___out,
-                                __f.flags(), __f.width(0), __fill,
-                                __ct.widen('+'), __ct.widen('-')); 
- }
-@@ -116,7 +116,7 @@
- // Helper routine for char
- template <class _OutputIter>
- _OutputIter  _STLP_CALL
--__put_float(char* __ibuf, char* __iend, _OutputIter __out,
-+__put_float(char* __ibuf, char* __iend, _OutputIter ___out,
-             ios_base& __f, char __fill,
-             char __decimal_point,
-             char __sep, const string& __grouping)
-@@ -133,7 +133,7 @@
-     __iend = __ibuf + __len;
-   }
- 
--  return __copy_float_and_fill(__ibuf, __iend, __out,
-+  return __copy_float_and_fill(__ibuf, __iend, ___out,
-                                __f.flags(), __f.width(0), __fill, '+', '-');
- }
- 
-@@ -158,37 +158,37 @@
- template <class _CharT, class _OutputIter>
- _OutputIter _STLP_CALL
- __copy_integer_and_fill(const _CharT* __buf, ptrdiff_t __len,
--                        _OutputIter __out,
-+                        _OutputIter ___out,
-                         ios_base::fmtflags __flg, streamsize __wid, _CharT __fill,
-                         _CharT __xplus, _CharT __xminus)
- {
-   if (__len >= __wid)
--    return copy(__buf, __buf + __len, __out);
-+    return copy(__buf, __buf + __len, ___out);
-   else {
-     ptrdiff_t __pad = __wid - __len;
-     ios_base::fmtflags __dir = __flg & ios_base::adjustfield;
- 
-     if (__dir == ios_base::left) {
--      __out = copy(__buf, __buf + __len, __out);
--      return fill_n(__out, __pad, __fill);
-+      ___out = copy(__buf, __buf + __len, ___out);
-+      return fill_n(___out, __pad, __fill);
-     }
-     else if (__dir == ios_base::internal && __len != 0 &&
-              (__buf[0] == __xplus || __buf[0] == __xminus)) {
--      *__out++ = __buf[0];
--      __out = fill_n(__out, __pad, __fill);
--      return copy(__buf + 1, __buf + __len, __out);
-+      *___out++ = __buf[0];
-+      ___out = fill_n(___out, __pad, __fill);
-+      return copy(__buf + 1, __buf + __len, ___out);
-     }
-     else if (__dir == ios_base::internal && __len >= 2 &&
-              (__flg & ios_base::showbase) &&
-              (__flg & ios_base::basefield) == ios_base::hex) {
--      *__out++ = __buf[0];
--      *__out++ = __buf[1];
--      __out = fill_n(__out, __pad, __fill);
--      return copy(__buf + 2, __buf + __len, __out);
-+      *___out++ = __buf[0];
-+      *___out++ = __buf[1];
-+      ___out = fill_n(___out, __pad, __fill);
-+      return copy(__buf + 2, __buf + __len, ___out);
-     }
-     else {
--      __out = fill_n(__out, __pad, __fill);
--      return copy(__buf, __buf + __len, __out);
-+      ___out = fill_n(___out, __pad, __fill);
-+      return copy(__buf, __buf + __len, ___out);
-     }
-   }
- }
---- misc/STLport-4.5-0119/stlport/stl/_sstream.c	Thu Sep 12 22:47:04 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_sstream.c	Mon Jun  2 10:32:02 2008
-@@ -337,22 +337,22 @@
-             ios_base::seekdir __dir,
-             ios_base::openmode __mode)
- {
--  bool __in  = false;
--  bool __out = false;
-+  bool ___in  = false;
-+  bool ___out = false;
-   
-   if ((__mode & (ios_base::in | ios_base::out)) == (ios_base::in | ios_base::out) ) {
-     if (__dir == ios_base::beg || __dir == ios_base::end)
--      __in = __out = true;
-+      ___in = ___out = true;
-   }
-   else if (__mode & ios_base::in)
--    __in = true;
-+    ___in = true;
-   else if (__mode & ios_base::out)
--    __out = true;
-+    ___out = true;
- 
--  if (!__in && !__out)
-+  if (!___in && !___out)
-     return pos_type(off_type(-1));
--  else if ((__in  && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
--           (__out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
-+  else if ((___in  && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
-+           (___out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
-     return pos_type(off_type(-1));
- 
-   if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
-@@ -367,7 +367,7 @@
-     __newoff = _M_str.size();
-     break;
-   case ios_base::cur:
--    __newoff = __in ? this->gptr() - this->eback() 
-+    __newoff = ___in ? this->gptr() - this->eback() 
-                     : this->pptr() - this->pbase();
-     break;
-   default:
-@@ -376,7 +376,7 @@
- 
-   __off += __newoff;
- 
--  if (__in) {
-+  if (___in) {
-     ptrdiff_t __n = this->egptr() - this->eback();
- 
-     if (__off < 0 || __off > __n)
-@@ -385,7 +385,7 @@
-       this->setg(this->eback(), this->eback() + __off, this->eback() + __n);
-   }
- 
--  if (__out) {
-+  if (___out) {
-     ptrdiff_t __n = this->epptr() - this->pbase();
- 
-     if (__off < 0 || __off > __n)
-@@ -404,11 +404,11 @@
- basic_stringbuf<_CharT, _Traits, _Alloc>
-   ::seekpos(pos_type __pos, ios_base::openmode __mode)
- {
--  bool __in  = (__mode & ios_base::in) != 0;
--  bool __out = (__mode & ios_base::out) != 0;
-+  bool ___in  = (__mode & ios_base::in) != 0;
-+  bool ___out = (__mode & ios_base::out) != 0;
- 
--  if ((__in  && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
--      (__out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
-+  if ((___in  && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
-+      (___out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
-     return pos_type(off_type(-1));
- 
-   const off_type __n = __pos - pos_type(off_type(0));
-@@ -415,13 +415,13 @@
-   if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
-     _M_append_buffer();
- 
--  if (__in) {
-+  if (___in) {
-     if (__n < 0 || __n > this->egptr() - this->eback())
-       return pos_type(off_type(-1));
-     this->setg(this->eback(), this->eback() + __n, this->egptr());
-   }
- 
--  if (__out) {
-+  if (___out) {
-     if (__n < 0 || size_t(__n) > _M_str.size())
-       return pos_type(off_type(-1));
- 
---- misc/STLport-4.5-0119/stlport/stl/_time_facets.c	Thu Sep 12 22:47:07 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_time_facets.c	Mon Jun  2 10:32:02 2008
-@@ -328,7 +328,7 @@
- # ifndef _STLP_NO_WCHAR_T
- template <class _OuIt>
- _OuIt _STLP_CALL
--__put_time(char * __first, char * __last, _OuIt __out,
-+__put_time(char * __first, char * __last, _OuIt ___out,
-            const ios_base& __s, wchar_t) {
-     const ctype<wchar_t>& __ct = *(ctype<wchar_t>*)__s._M_ctype_facet();
-     wchar_t __wbuf[64];
-@@ -335,7 +335,7 @@
-     __ct.widen(__first, __last, __wbuf);
-     ptrdiff_t __len = __last - __first;
-     wchar_t * __eend = __wbuf + __len;
--    return copy((wchar_t*)__wbuf, __eend, __out);
-+    return copy((wchar_t*)__wbuf, __eend, ___out);
- }
- # endif
- 
---- misc/STLport-4.5-0119/stlport/stl/_time_facets.h	Wed Aug 29 00:55:47 2001
-+++ misc/build/STLport-4.5-0119/stlport/stl/_time_facets.h	Mon Jun  2 10:32:02 2008
-@@ -198,14 +198,14 @@
-                        const _Time_Info& __table, const tm* __t);
- 
- template <class _OuIt>
--inline _OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt __out,
-+inline _OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt ___out,
-                                    const ios_base& /* __loc */, char) {
--    return copy(__first, __last, __out);
-+    return copy(__first, __last, ___out);
- }
- 
- # ifndef _STLP_NO_WCHAR_T
- template <class _OuIt>
--_OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt __out,
-+_OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt ___out,
-                             const ios_base& __s, wchar_t);
- # endif
- 
---- misc/STLport-4.5-0119/stlport/stl/debug/_debug.c	Thu Sep 12 22:47:08 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/debug/_debug.c	Mon Jun  2 10:32:02 2008
-@@ -82,7 +82,7 @@
- template <class _Iterator>
- bool _STLP_CALL  __check_range(const _Iterator& __it, 
-                                const _Iterator& __start, const _Iterator& __finish) {
--    _STLP_VERBOSE_RETURN(__in_range(__it,__start, __finish), 
-+    _STLP_VERBOSE_RETURN(___in_range(__it,__start, __finish), 
-                          _StlMsg_NOT_IN_RANGE_1)
-     return true;
- }
-@@ -90,7 +90,7 @@
- template <class _Iterator>
- bool _STLP_CALL  __check_range(const _Iterator& __first, const _Iterator& __last, 
-                                const _Iterator& __start, const _Iterator& __finish) {
--    _STLP_VERBOSE_RETURN(__in_range(__first, __last, __start, __finish), 
-+    _STLP_VERBOSE_RETURN(___in_range(__first, __last, __start, __finish), 
-                          _StlMsg_NOT_IN_RANGE_2)
-     return true;
- }
---- misc/STLport-4.5-0119/stlport/stl/debug/_debug.h	Thu Sep 12 22:47:09 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/debug/_debug.h	Mon Jun  2 10:32:03 2008
-@@ -227,7 +227,7 @@
- 
- // Note : that means in range [i1, i2].
- template <class _Iterator>
--inline bool  _STLP_CALL __in_range(const _Iterator& _It, const _Iterator& __i1,
-+inline bool  _STLP_CALL ___in_range(const _Iterator& _It, const _Iterator& __i1,
-                                    const _Iterator& __i2) { 
-     return __valid_range(__i1,_It,_STLP_ITERATOR_CATEGORY(__i1, _Iterator)) && 
-         __valid_range(_It,__i2,_STLP_ITERATOR_CATEGORY(_It, _Iterator));
-@@ -234,7 +234,7 @@
- }
- 
- template <class _Iterator>
--inline bool  _STLP_CALL __in_range(const _Iterator& __first, const _Iterator& __last, 
-+inline bool  _STLP_CALL ___in_range(const _Iterator& __first, const _Iterator& __last, 
-                                    const _Iterator& __start, const _Iterator& __finish) { 
-     return __valid_range(__first,__last,_STLP_ITERATOR_CATEGORY(__first, _Iterator)) &&
-         __valid_range(__start,__first,_STLP_ITERATOR_CATEGORY(__first, _Iterator)) && 
---- misc/STLport-4.5-0119/stlport/stl/debug/_deque.h	Fri May  4 04:11:54 2001
-+++ misc/build/STLport-4.5-0119/stlport/stl/debug/_deque.h	Mon Jun  2 10:32:03 2008
-@@ -121,9 +121,9 @@
-   explicit _DBG_deque(const allocator_type& __a = allocator_type()) :
-     _STLP_DEQUE_SUPER(__a), _M_iter_list(_Get_base()) {}
-   _DBG_deque(const _Self& __x) : _STLP_DEQUE_SUPER(__x), _M_iter_list(_Get_base()) {}
--  _DBG_deque(size_type __n, const value_type& __value,
-+  _DBG_deque(size_type __n, const value_type& ___value,
-         const allocator_type& __a = allocator_type()) : 
--    _STLP_DEQUE_SUPER(__n, __value, __a), _M_iter_list(_Get_base()) {}
-+    _STLP_DEQUE_SUPER(__n, ___value, __a), _M_iter_list(_Get_base()) {}
-   explicit _DBG_deque(size_type __n) : _STLP_DEQUE_SUPER(__n), _M_iter_list(_Get_base()) {}
- 
- #ifdef _STLP_MEMBER_TEMPLATES
---- misc/STLport-4.5-0119/stlport/stl/debug/_list.h	Wed May 30 05:45:43 2001
-+++ misc/build/STLport-4.5-0119/stlport/stl/debug/_list.h	Mon Jun  2 10:32:03 2008
-@@ -79,9 +79,9 @@
-   _Base* _Get_base() { return (_Base*)this; }
-   explicit _DBG_list(const allocator_type& __a = allocator_type()) :
-     _STLP_DBG_LIST_BASE(__a), _M_iter_list(_Get_base()) {}
--  _DBG_list(size_type __n, const _Tp& __value,
-+  _DBG_list(size_type __n, const _Tp& ___value,
- 	    const allocator_type& __a = allocator_type())
--    : _STLP_DBG_LIST_BASE(__n, __value, __a), _M_iter_list(_Get_base()) {}
-+    : _STLP_DBG_LIST_BASE(__n, ___value, __a), _M_iter_list(_Get_base()) {}
-   explicit _DBG_list(size_type __n)
-     : _STLP_DBG_LIST_BASE(__n), _M_iter_list(_Get_base()) {}
-   
-@@ -219,13 +219,13 @@
- 
-   void resize(size_type __new_size) { this->resize(__new_size, _Tp()); }
- 
--  void remove(const _Tp& __value) {
-+  void remove(const _Tp& ___value) {
-     typename _Base::iterator __first = _Base::begin();
-     typename _Base::iterator __last = _Base::end();
-     while (__first != __last) {
-       typename _Base::iterator __next = __first;
-       ++__next;
--      if (__value == *__first) erase(iterator(&_M_iter_list,__first));
-+      if (___value == *__first) erase(iterator(&_M_iter_list,__first));
-       __first = __next;
-     }
-   }
---- misc/STLport-4.5-0119/stlport/stl/debug/_vector.h	Mon Oct 28 16:09:32 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/debug/_vector.h	Mon Jun  2 10:32:03 2008
-@@ -141,9 +141,9 @@
-   explicit _DBG_vector(const allocator_type& __a = allocator_type())
-     : _STLP_DBG_VECTOR_BASE(__a), _M_iter_list((const _Base*)this)  {}
- 
--  _DBG_vector(size_type __n, const _Tp& __value,
-+  _DBG_vector(size_type __n, const _Tp& ___value,
-          const allocator_type& __a = allocator_type()) 
--    : _STLP_DBG_VECTOR_BASE(__n, __value, __a), _M_iter_list((const _Base*)this) {}
-+    : _STLP_DBG_VECTOR_BASE(__n, ___value, __a), _M_iter_list((const _Base*)this) {}
- 
-   explicit _DBG_vector(size_type __n)
-     : _STLP_DBG_VECTOR_BASE(__n), _M_iter_list((const _Base*)this) {}
---- misc/build/STLport-4.5-0119/stlport/stl/_threads.h
-+++ misc/build/STLport-4.5-0119/stlport/stl/_threads.h
-@@ -99,7 +99,7 @@
- #   else 
- // This section serves as a replacement for windows.h header for Visual C++
- extern "C" {
--#   if (defined(_M_MRX000) || defined(_M_ALPHA) \
-+#   if (defined(_M_MRX000) || defined(_M_ALPHA) ||  defined(_M_AMD64) \
-        || (defined(_M_PPC) && (_MSC_VER >= 1000))) && !defined(RC_INVOKED)
- #    define InterlockedIncrement       _InterlockedIncrement
- #    define InterlockedDecrement       _InterlockedDecrement
diff --git a/stlport/STLport-4.5-cxx0x.patch b/stlport/STLport-4.5-cxx0x.patch
deleted file mode 100644
index 88d96d0df..000000000
--- a/stlport/STLport-4.5-cxx0x.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- misc/STLport-4.5/stlport/config/stl_gcc.h
-+++ misc/build/STLport-4.5/stlport/config/stl_gcc.h
-@@ -239,10 +239,10 @@
- 
- 
- /* strict ANSI prohibits "long long" ( gcc) */
--#  if defined ( __STRICT_ANSI__ )
--#    undef _STLP_LONG_LONG
--// #    define _STLP_STRICT_ANSI 1
--#  endif
-+//#  if defined ( __STRICT_ANSI__ )
-+//#    undef _STLP_LONG_LONG
-+//// #    define _STLP_STRICT_ANSI 1
-+//#  endif
- 
- //# if !defined (__STRICT_ANSI__) || defined (__BUILDING_STLPORT)
- //#    define _STLP_USE_TEMPLATE_EXPORT
diff --git a/stlport/STLport-4.5-gcc43_warnings.patch b/stlport/STLport-4.5-gcc43_warnings.patch
deleted file mode 100644
index f5e1d4b5c..000000000
--- a/stlport/STLport-4.5-gcc43_warnings.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- misc/STLport-4.5/src/num_get_float.cpp	2001-05-03 09:40:43.000000000 +0200
-+++ misc/build/STLport-4.5/src/num_get_float.cpp	2009-03-22 17:31:30.000000000 +0100
-@@ -484,7 +484,7 @@
-   else {                        /* not zero or denorm */
-     /* Round to 53 bits */
- 
--    rest = value & (1<<10)-1;
-+    rest = value & ((1<<10)-1);
-     value >>= 10;
- #if !defined(__SC__)
-     guard = (uint32) value & 1;
---- misc/STLport-4.5/src/strstream.cpp	2001-01-27 02:39:29.000000000 +0100
-+++ misc/build/STLport-4.5/src/strstream.cpp	2009-03-22 17:26:32.000000000 +0100
-@@ -284,11 +284,12 @@
- 
- void strstreambuf::_M_free(char* p)
- {
--  if (p)
-+  if (p) {
-     if (_M_free_fun)
-       _M_free_fun(p);
-     else
-       delete[] p;
-+  }
- }
- 
- void strstreambuf::_M_setup(char* get, char* put, streamsize n)
---- misc/STLport-4.5/stlport/stl/_list.c	2001-05-11 04:20:07.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_list.c	2009-03-22 17:26:32.000000000 +0100
-@@ -82,7 +82,7 @@
- {
-   iterator __i = begin();
-   size_type __len = 0;
--  for ( ; __i != end() && __len < __new_size; ++__i, ++__len);
-+  for ( ; __i != end() && __len < __new_size; ++__i, ++__len) ;
- 
-   if (__len == __new_size)
-     erase(__i, end());
---- misc/STLport-4.5/stlport/stl/_time_facets.c	2001-03-19 08:01:09.000000000 +0100
-+++ misc/build/STLport-4.5/stlport/stl/_time_facets.c	2009-03-22 17:26:32.000000000 +0100
-@@ -101,7 +101,7 @@
- 
-   while (__first != __last) {
-     for (__i = 0; __i < __n; ++__i)
--      if (__do_check[__i])
-+      if (__do_check[__i]) {
-         if (*__first == __name[__i][__pos]) {
-           if (__pos == _DiffType(__name[__i].size()) - 1) {
-             __do_check[__i] = 0;
-@@ -119,6 +119,7 @@
-           if (__check_count == 0) 
-             return __matching_name[__pos];
-         }
-+      }
- 
-     ++__first; ++__pos;
-   }
---- misc/STLport-4.5/stlport/stl/_tree.c	2009-03-22 17:04:36.000000000 +0100
-+++ misc/build/STLport-4.5/stlport/stl/_tree.c	2009-03-22 17:26:32.000000000 +0100
-@@ -186,18 +186,20 @@
-         __z->_M_parent->_M_left = __x;
-       else
-         __z->_M_parent->_M_right = __x;
--    if (__leftmost == __z) 
-+    if (__leftmost == __z)  {
-       if (__z->_M_right == 0)        // __z->_M_left must be null also
-         __leftmost = __z->_M_parent;
-     // makes __leftmost == _M_header if __z == __root
-       else
-         __leftmost = _Rb_tree_node_base::_S_minimum(__x);
--    if (__rightmost == __z)  
-+    }
-+    if (__rightmost == __z) {
-       if (__z->_M_left == 0)         // __z->_M_right must be null also
-         __rightmost = __z->_M_parent;  
-     // makes __rightmost == _M_header if __z == __root
-       else                      // __x == __z->_M_left
-         __rightmost = _Rb_tree_node_base::_S_maximum(__x);
-+    }
-   }
-   if (__y->_M_color != _S_rb_tree_red) { 
-     while (__x != __root && (__x == 0 || __x->_M_color == _S_rb_tree_black))
---- misc/STLport-4.5/stlport/stl/debug/_debug.c	2001-05-30 05:45:43.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/debug/_debug.c	2009-03-22 17:26:32.000000000 +0100
-@@ -58,7 +58,7 @@
- # endif
-                                        const _Iterator& __last, const forward_iterator_tag &) {
-     _Iterator1 __i(__first);
--    for (;  __i != __last && __i != __it; ++__i);
-+    for (;  __i != __last && __i != __it; ++__i) ;
-     return (__i!=__last);
- }
- 
-@@ -68,7 +68,7 @@
- __in_range_aux(const _Iterator1& __it, const _Iterator& __first,
-                const _Iterator& __last, const bidirectional_iterator_tag &) {
-     _Iterator1 __i(__first);
--    for (;  __i != __last && __i != __it; ++__i);
-+    for (;  __i != __last && __i != __it; ++__i) ;
-     return (__i !=__last);
- }
- # endif
---- misc/STLport-4.5/stlport/stl/debug/_list.h	2001-05-30 05:45:43.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/debug/_list.h	2009-03-22 17:26:32.000000000 +0100
-@@ -209,7 +209,7 @@
-   void resize(size_type __new_size, const _Tp& __x) {
-     typename _Base::iterator __i = _Base::begin();
-     size_type __len = 0;
--    for ( ; __i != _Base::end() && __len < __new_size; ++__i, ++__len);
-+    for ( ; __i != _Base::end() && __len < __new_size; ++__i, ++__len) ;
-     
-     if (__len == __new_size)
-       erase(iterator(&_M_iter_list,__i), end());
diff --git a/stlport/STLport-4.5.patch b/stlport/STLport-4.5.patch
deleted file mode 100644
index 0a0027594..000000000
--- a/stlport/STLport-4.5.patch
+++ /dev/null
@@ -1,1047 +0,0 @@
---- misc/STLport-4.5/src/common_macros_os2.mak	2008-07-18 14:14:27.000000000 +0200
-+++ misc/build/STLport-4.5/src/common_macros_os2.mak	2008-07-18 14:14:05.000000000 +0200
-@@ -1 +1,37 @@
--dummy
-+SHELL=/bin/sh
-+
-+# INSTALLDIR=/usr/local
-+# INSTALLDIR_INC=$(INSTALLDIR)/include/stlport
-+# INSTALLDIR_LIB=$(INSTALLDIR)/lib
-+
-+# RM = rm -fr
-+
-+# INSTALL = ./install.sh -c
-+# INSTALL_LIB = $(INSTALL)
-+# INSTALL_H = $(INSTALL) -m 444
-+
-+#
-+#
-+# Targets
-+#
-+
-+VERSION_SUFFIX= $(VERSION_MAJOR)$(VERSION_MINOR)$(BETA_SUFFIX)
-+DYNAMIC_SUFFIX= $(VERSION_SUFFIX)$(PATCH_SUFFIX)
-+DYNAMIC_SUFFIX= $(VERSION_SUFFIX)$(PATCH_SUFFIX)
-+
-+# those are defined "Unix way" in common_macros.mak; redefine them here
-+RELEASE_DYNLIB=$(RELEASE_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
-+DEBUG_DYNLIB=$(DEBUG_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
-+STLDEBUG_DYNLIB=$(STLDEBUG_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
-+
-+RELEASE_DYNLIB_SONAME=$(RELEASE_NAME)$(VERSION_SUFFIX).$(DYNEXT)
-+DEBUG_DYNLIB_SONAME=$(DEBUG_NAME)$(VERSION_SUFFIX).$(DYNEXT)
-+STLDEBUG_DYNLIB_SONAME=$(STLDEBUG_NAME)$(VERSION_SUFFIX).$(DYNEXT)
-+
-+ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
-+ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB)
-+DEBUG_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
-+
-+RELEASE_LIB=$(RELEASE_NAME)$(STATIC_SUFFIX).$(STEXT)
-+DEBUG_LIB=$(DEBUG_NAME)$(STATIC_SUFFIX).$(STEXT)
-+STLDEBUG_LIB=$(STLDEBUG_NAME)$(STATIC_SUFFIX).$(STEXT)
---- misc/STLport-4.5/src/common_percent_rules.mak	2001-05-19 05:04:20.000000000 +0200
-+++ misc/build/STLport-4.5/src/common_percent_rules.mak	2008-07-18 14:13:49.000000000 +0200
-@@ -1,45 +1,52 @@
- 
- .SUFFIXES: .cpp .c .o .so .a
- 
-+CFLAGS_RELEASE_static*= $(CXXFLAGS_RELEASE_static)
-+CFLAGS_RELEASE_dynamic*= $(CXXFLAGS_RELEASE_dynamic)
-+CFLAGS_DEBUG_static*= $(CXXFLAGS_DEBUG_static)
-+CFLAGS_DEBUG_dynamic*= $(CXXFLAGS_DEBUG_dynamic)
-+CFLAGS_STLDEBUG_static*= $(CXXFLAGS_STLDEBUG_static)
-+CFLAGS_STLDEBUG_dynamic*= $(CXXFLAGS_STLDEBUG_dynamic)
-+
- $(RELEASE_OBJDIR_static)/%.o: %.cpp
- 	$(CXX) $(CXXFLAGS_RELEASE_static) $< -c -o $@
- $(RELEASE_OBJDIR_static)/%.o: %.c
--	$(CC) $(CXXFLAGS_RELEASE_static) $< -c -o $@
-+	$(CC) $(CFLAGS_RELEASE_static) $< -c -o $@
- $(RELEASE_OBJDIR_static)/%.i : %.cpp
- 	$(CXX) $(CXXFLAGS_RELEASE_static) $< -E  $@
- 
- $(RELEASE_OBJDIR_dynamic)/%.o : %.cpp
- 	$(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
- $(RELEASE_OBJDIR_dynamic)/%.o : %.c
--	$(CC) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
-+	$(CC) $(CFLAGS_RELEASE_dynamic) $< -c -o $@
- $(RELEASE_OBJDIR_dynamic)/%.i : %.cpp
- 	$(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -E  $@
- 
- $(DEBUG_OBJDIR_static)/%.o : %.cpp
- 	$(CXX) $(CXXFLAGS_DEBUG_static) $< -c -o $@
- $(DEBUG_OBJDIR_static)/%.o : %.c
--	$(CC) $(CXXFLAGS_DEBUG_static) $< -c -o $@
-+	$(CC) $(CFLAGS_DEBUG_static) $< -c -o $@
- $(DEBUG_OBJDIR_static)/%.i : %.cpp
- 	$(CXX) $(CXXFLAGS_DEBUG_static) $< -E  $@
- 
- $(DEBUG_OBJDIR_dynamic)/%.o : %.cpp
- 	$(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
- $(DEBUG_OBJDIR_dynamic)/%.o : %.c
--	$(CC) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
-+	$(CC) $(CFLAGS_DEBUG_dynamic) $< -c -o $@
- $(DEBUG_OBJDIR_dynamic)/%.i : %.cpp
- 	$(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -E  $@
- 
- $(STLDEBUG_OBJDIR_static)/%.o : %.cpp
- 	$(CXX) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
- $(STLDEBUG_OBJDIR_static)/%.o : %.c
--	$(CC) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
-+	$(CC) $(CFLAGS_STLDEBUG_static) $< -c -o $@
- $(STLDEBUG_OBJDIR_static)/%.i : %.cpp
- 	$(CXX) $(CXXFLAGS_STLDEBUG_static) $< -E  $@
- 
- $(STLDEBUG_OBJDIR_dynamic)/%.o : %.cpp
- 	$(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
- $(STLDEBUG_OBJDIR_dynamic)/%.o : %.c
--	$(CC) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
-+	$(CC) $(CFLAGS_STLDEBUG_dynamic) $< -c -o $@
- $(STLDEBUG_OBJDIR_dynamic)/%.i : %.cpp
- 	$(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -E  $@
- 
---- misc/STLport-4.5/src/dll_main.cpp	2001-08-25 03:14:19.000000000 +0200
-+++ misc/build/STLport-4.5/src/dll_main.cpp	2008-07-18 14:13:49.000000000 +0200
-@@ -147,6 +147,10 @@
- template struct _STLP_CLASS_DECLSPEC __stl_debug_engine<bool>;
- # endif
- 
-+#ifdef __APPLE__
-+template class _STLP_CLASS_DECLSPEC _Node_Alloc_Lock<false,0>;
-+template class _STLP_CLASS_DECLSPEC _Node_Alloc_Lock<true,0>;
-+#endif
- template class _STLP_CLASS_DECLSPEC __node_alloc<false,0>;
- template class _STLP_CLASS_DECLSPEC __node_alloc<true,0>;
- template class _STLP_CLASS_DECLSPEC __debug_alloc< __node_alloc<true,0> >;
---- misc/STLport-4.5/src/gcc-3.0-freebsd.mak	2008-07-18 14:14:26.000000000 +0200
-+++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak	2008-07-18 14:13:49.000000000 +0200
-@@ -1 +1,69 @@
--dummy
-+#
-+# Note : this makefile is for gcc-3 !
-+#
-+
-+#
-+# compiler
-+# take these from the OOo build environment
-+CC*= gcc 
-+CXX*= g++
-+
-+#
-+# Basename for libraries
-+#
-+LIB_BASENAME = libstlport_gcc
-+
-+#
-+# guts for common stuff
-+#
-+#
-+LINK=ar cr
-+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} -fexceptions -shared -o
-+
-+OBJEXT=o
-+DYNEXT=so
-+STEXT=a
-+RM=rm -rf
-+PATH_SEP=/
-+MKDIR=mkdir -p
-+COMP=GCC$(ARCH)
-+INSTALL_STEP = install_unix 
-+
-+all:  all_dynamic all_static symbolic_links 
-+
-+include common_macros.mak
-+
-+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
-+
-+CXXFLAGS_COMMON = ${PTHREAD_CFLAGS} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+CFLAGS_COMMON = ${PTHREAD_CFLAGS} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+
-+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+
-+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
-+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
-+
-+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
-+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
-+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+include common_percent_rules.mak
-+include common_rules.mak
-+
-+
-+#install: all
-+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+
-+#%.s: %.cpp
-+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-+
-+
---- misc/STLport-4.5/src/gcc-3.0-mingw.mak	2008-07-18 14:14:26.000000000 +0200
-+++ misc/build/STLport-4.5/src/gcc-3.0-mingw.mak	2008-07-18 14:13:49.000000000 +0200
-@@ -1 +1,108 @@
--dummy
-+#
-+# Note : this makefile is for gcc-3 !
-+#
-+
-+#
-+# compiler
-+# take these from the OOo build environment
-+CC*= gcc 
-+CXX*= g++
-+
-+#
-+# Basename for libraries
-+#
-+LIB_BASENAME = libstlport_gcc
-+
-+#
-+# guts for common stuff
-+#
-+#
-+LINK=ar crv
-+DYN_LINK=$(CXX) -fexceptions -shared -o
-+
-+OBJEXT=o
-+DYNEXT=dll
-+STEXT=a
-+RM=rm -rf
-+PATH_SEP=/
-+MKDIR=mkdir -p
-+COMP=MINGW32
-+STATIC_SUFFIX=_static
-+
-+
-+all:  all_dynamic debug_dynamic all_static debug_static
-+
-+include common_macros.mak
-+
-+# those are defined "Unix way" in common_macros.mak; redefine them here
-+RELEASE_DYNLIB=$(RELEASE_NAME).$(DYNEXT)
-+DEBUG_DYNLIB=$(DEBUG_NAME).$(DYNEXT)
-+STLDEBUG_DYNLIB=$(STLDEBUG_NAME).$(DYNEXT)
-+
-+RELEASE_DYNLIB_SONAME=$(RELEASE_DYNLIB)
-+DEBUG_DYNLIB_SONAME=$(DEBUG_DYNLIB)
-+STLDEBUG_DYNLIB_SONAME=$(STLDEBUG_DYNLIB)
-+
-+ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
-+DEBUG_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
-+
-+RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o
-+RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o
-+RESFILE_stldebug=$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o
-+
-+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
-+
-+CXXFLAGS_COMMON =  -mthreads -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS}
-+CFLAGS_COMMON =  -mthreads -fexceptions -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS}
-+
-+LDFLAGS_COMMON_dynamic+= -enable-runtime-pseudo-reloc -Wl,--export-all-symbols -Wl,-d -mthreads
-+
-+CXXFLAGS_RELEASE_static =  $(CXXFLAGS_COMMON) -O2
-+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -shared -O2 -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
-+
-+CXXFLAGS_DEBUG_static =  $(CXXFLAGS_COMMON) -g
-+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
-+
-+CXXFLAGS_STLDEBUG_static =  $(CXXFLAGS_DEBUG_static)  -D_DEBUG_RUNTIME
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+CFLAGS_RELEASE_static =  $(CFLAGS_COMMON) -O2
-+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -shared -O2 -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
-+
-+CFLAGS_DEBUG_static =  $(CFLAGS_COMMON) -g
-+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
-+
-+CFLAGS_STLDEBUG_static =  $(CFLAGS_DEBUG_static)  -D_DEBUG_RUNTIME
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+LDLIBS_RELEASE_dynamic = ${LDLIBS_COMMON_dynamic}
-+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} ${LDFLAGS_COMMON_dynamic} -Wl,-Map,${OUTDIR}/${RELEASE_NAME}.map -Wl,--out-implib,${OUTDIR}/${RELEASE_NAME}.a
-+
-+LDLIBS_DEBUG_dynamic = ${LDLIBS_COMMON_dynamic}
-+LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} ${LDFLAGS_COMMON_dynamic} -Wl,-Map,${OUTDIR}/${DEBUG_NAME}.map -Wl,--out-implib,${OUTDIR}/${DEBUG_NAME}.a
-+
-+LDLIBS_STLDEBUG_dynamic = ${LDLIBS_COMMON_dynamic}
-+LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} ${LDFLAGS_COMMON_dynamic} -Wl,-Map,${OUTDIR}/${STLDEBUG_NAME}.map -Wl,--out-implib,${OUTDIR}/${STLDEBUG_NAME}.a
-+
-+
-+include common_percent_rules.mak
-+include common_rules.mak
-+
-+
-+
-+${RESFILE}: stlport.rc
-+	windres -O coff --define COMP=${COMP} --define BUILD= -o $(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc
-+
-+${RESFILE_debug}: stlport.rc
-+	windres -O coff --define COMP=${COMP} --define BUILD=_DEBUG -o $(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc
-+
-+${RESFILE_stldebug}: stlport.rc
-+	windres -O coff --define COMP=${COMP} --define BUILD=_STLDEBUG -o $(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc
-+
-+#install: all
-+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+
-+#%.s: %.cpp
-+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-+
-+ 
---- misc/STLport-4.5/src/gcc-3.0-os2.def	2008-11-26 12:40:40.000000000 +0100
-+++ misc/build/STLport-4.5/src/gcc-3.0-os2.def	2008-10-10 15:05:36.000000000 +0200
-@@ -1 +1,40 @@
--dummy
-+LIBRARY stlp45 INITINSTANCE TERMINSTANCE
-+DATA MULTIPLE
-+EXPORTS
-+;exports manually added for transex3 project
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE10_M_xsputncEci
-+__ZN4_STL8numpunctIcE2idE
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE6xsgetnEPci
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEEC2Ev
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE8pubimbueERKNS_6localeE
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE6xsputnEPKci
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE5uflowEv
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEED2Ev
-+__ZN4_STL7codecvtIcc15__stl_mbstate_tE2idE
-+__ZN4_STL5ctypeIcE2idE
-+__ZN4_STL5_LimGIbE6_D_infE
-+;hwpfilter
-+ __ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE4syncEv
-+ __ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE9showmanycEv
-+ __ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE5imbueERKNS_6localeE
-+;testshl2
-+__ZNK4_STL5ctypeIcE8scan_notENS_10ctype_base4maskEPKcS5_
-+;xml2cmp
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE13_M_snextc_auxEv
-+__ZNK4_STL5ctypeIcE7scan_isENS_10ctype_base4maskEPKcS5_
-+__ZN4_STL10_UnderflowIcNS_11char_traitsIcEEE7_M_doitEPNS_13basic_filebufIcS2_EE
-+__ZN4_STL13_Filebuf_base12_M_page_sizeE
-+
-+;cppu
-+__ZN4_STL12__node_allocILb1ELi0EE11_M_allocateEj
-+__ZN4_STL12__node_allocILb1ELi0EE13_M_deallocateEPvj
-+__ZN4_STL10_Rb_globalIbE12_M_decrementEPNS_18_Rb_tree_node_baseE
-+__ZN4_STL10_Rb_globalIbE10_RebalanceEPNS_18_Rb_tree_node_baseERS3_
-+__ZN4_STL10_Rb_globalIbE12_M_incrementEPNS_18_Rb_tree_node_baseE
-+__ZN4_STL10_Rb_globalIbE20_Rebalance_for_eraseEPNS_18_Rb_tree_node_baseERS3_S4_S4_
-+
-+;vcl
-+__ZN4_STL12_List_globalIbE9_TransferEPNS_15_List_node_baseES3_S3_
-+
-+;comphelper
-+__ZTVN4_STL13runtime_errorE
---- misc/STLport-4.5/src/gcc-3.0-os2.mak	2008-11-26 12:40:40.000000000 +0100
-+++ misc/build/STLport-4.5/src/gcc-3.0-os2.mak	2008-11-03 15:56:24.000000000 +0100
-@@ -1 +1,79 @@
--dummy
-+#
-+# Note : this makefile is for gcc-3 !
-+#
-+
-+#
-+# compiler
-+# take these from the OOo build environment
-+CC*= gcc 
-+CXX*= g++
-+
-+#
-+# Basename for libraries
-+#
-+LIB_BASENAME = stlp
-+STATIC_SUFFIX=_s
-+
-+#
-+# guts for common stuff
-+#
-+#
-+LINK=emxomfar cr
-+DYN_LINK=$(CXX) -Zlinker "DISABLE 1121" -Zomf -Zmap -Zhigh-mem -Zbin-files -Zdll gcc-3.0-os2.def -o
-+
-+OBJEXT=o
-+DYNEXT=so
-+DYNEXT=dll
-+STEXT=a
-+RM=rm -rf
-+PATH_SEP=/
-+MKDIR=mkdir -p
-+COMP=GCC$(ARCH)
-+INSTALL_STEP = install_unix 
-+LN_S = cp
-+LDLIBS_RELEASE_dynamic = -lgcc_eh
-+LDLIBS_RELEASE_static = -lgcc_eh
-+
-+#all_static symbolic_links 
-+all: all_dynamic all_import
-+
-+include common_macros.mak
-+include common_macros_os2.mak
-+
-+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-+
-+CXXFLAGS_COMMON = -Zomf -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+CFLAGS_COMMON = -Zomf -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+
-+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
-+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
-+
-+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
-+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+CFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
-+CFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
-+
-+CFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+CFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
-+
-+CFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+include common_percent_rules.mak
-+include common_rules.mak
-+
-+all_import:
-+	emximp -o ..\lib\$(RELEASE_NAME)$(DYNAMIC_SUFFIX).a   ..\lib\$(RELEASE_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
-+	emximp -o ..\lib\$(RELEASE_NAME)$(DYNAMIC_SUFFIX).lib ..\lib\$(RELEASE_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
-+
-+#install: all
-+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+
-+#%.s: %.cpp
-+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-+
-+
---- misc/STLport-4.5/src/gcc-3.0.mak	2008-07-18 14:14:26.000000000 +0200
-+++ misc/build/STLport-4.5/src/gcc-3.0.mak	2008-07-18 14:13:49.000000000 +0200
-@@ -1 +1,69 @@
--dummy
-+#
-+# Note : this makefile is for gcc-3 !
-+#
-+
-+#
-+# compiler
-+# take these from the OOo build environment
-+CC*= gcc 
-+CXX*= g++
-+
-+#
-+# Basename for libraries
-+#
-+LIB_BASENAME = libstlport_gcc
-+
-+#
-+# guts for common stuff
-+#
-+#
-+LINK=ar cr
-+DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' -fexceptions -shared -o
-+
-+OBJEXT=o
-+DYNEXT=so
-+STEXT=a
-+RM=rm -rf
-+PATH_SEP=/
-+MKDIR=mkdir -p
-+COMP=GCC$(ARCH)
-+INSTALL_STEP = install_unix 
-+
-+all:  all_dynamic all_static symbolic_links 
-+
-+include common_macros.mak
-+
-+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
-+
-+CXXFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+CFLAGS_COMMON =  -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+
-+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+
-+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
-+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
-+
-+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
-+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
-+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+include common_percent_rules.mak
-+include common_rules.mak
-+
-+
-+#install: all
-+#	cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+
-+#%.s: %.cpp
-+#	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
-+
-+
---- misc/STLport-4.5/src/gcc-freebsd.mak	2001-07-29 05:36:25.000000000 +0200
-+++ misc/build/STLport-4.5/src/gcc-freebsd.mak	2008-07-18 14:13:49.000000000 +0200
-@@ -5,8 +5,8 @@
- #
- # compiler
- #
--CC = gcc -pthread
--CXX = c++ -pthread -fexceptions
-+CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-+CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
- 
- #
- # Basename for libraries
-@@ -19,7 +19,7 @@
- #
- LINK=ar cr
- # 2.95 flag
--DYN_LINK=c++ -pthread -fexceptions -shared -o
-+DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
- 
- OBJEXT=o
- DYNEXT=so
-@@ -39,10 +39,10 @@
- 
- WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
- 
--CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+CXXFLAGS_COMMON = -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS} ${ARCH_FLAGS}
- 
--CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
--CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
- 
- CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
- CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
---- misc/STLport-4.5/stlport/config/stl_gcc.h	2001-09-04 19:10:16.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/config/stl_gcc.h	2008-11-14 17:23:02.000000000 +0100
-@@ -7,7 +7,9 @@
- # define _STLP_USE_GLIBC
- #endif
- 
-+# if (__GNUC_MINOR__ < 4)  && (__GNUC__ == 3)
- #   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
-+# endif
- 
- # if defined(__FreeBSD__) || defined (__hpux)
- #  define _STLP_NO_WCHAR_T
-@@ -51,13 +53,42 @@
- #  define _STLP_CLASS_EXPORT_DECLSPEC __attribute__((dllexport))
- #  define _STLP_CALL
- 
--#  if defined (_STLP_USE_DYNAMIC_LIB)
--#   define _STLP_USE_DECLSPEC 1
--#   define _STLP_USE_TEMPLATE_EXPORT 1
--#  endif
-+#  if !defined (_STLP_NO_OWN_IOSTREAMS)
-+
-+#    if ( defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) \
-+     || defined(_AFXDLL) || defined (_STLP_USE_DYNAMIC_LIB) ) \
-+       && ! defined (_STLP_USE_STATIC_LIB)
-+#      undef  _STLP_USE_DECLSPEC
-+#      define _STLP_USE_DECLSPEC 1
-+/*     Using dynamic library in MinGW requires _STLP_NO_CUSTOM_IO */
-+#      define _STLP_NO_CUSTOM_IO
-+#    endif
-+
-+#    ifndef _STLP_IMPORT_TEMPLATE_KEYWORD
-+#     define _STLP_IMPORT_TEMPLATE_KEYWORD  extern
-+#    endif
-+#    define _STLP_EXPORT_TEMPLATE_KEYWORD
-+
-+#  endif /* _STLP_OWN_IOSTREAMS */
- 
- # endif
- 
-+# if defined(__EMX__)
-+#  define _STLP_EXPORT_DECLSPEC __declspec(dllexport)
-+#  define _STLP_IMPORT_DECLSPEC __declspec(dllimport)
-+#  define _STLP_CLASS_IMPORT_DECLSPEC __declspec(dllimport)
-+#  define _STLP_CLASS_EXPORT_DECLSPEC __declspec(dllexport)
-+#  define _STLP_CALL
-+//YD 29/03/2006 disable automatic export (generate too many exports/imports)
-+//YD 13/04/2006 back again
-+//#  define _STLP_EXPORT_DECLSPEC
-+//#  define _STLP_IMPORT_DECLSPEC
-+//#  define _STLP_CLASS_IMPORT_DECLSPEC
-+//#  define _STLP_CLASS_EXPORT_DECLSPEC
-+//#  define _STLP_CALL
-+#  define _STLP_USE_DECLSPEC 1
-+# endif
-+
- #if (defined(__linux__) /* && ! defined (_GNU_SOURCE) */ ) || \
-     defined (__CYGWIN__) || defined (__MINGW32__) || !(defined (_STLP_USE_GLIBC) || defined (__sun)) 
- #   define _STLP_NO_NATIVE_MBSTATE_T      1
-@@ -226,8 +257,45 @@
- 
- # if (__GNUC__ >= 3)
- 
--#  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
--#  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+/* properly determine the STLP_NATIVE_INCLUDE_PATH */
-+#ifdef i386
-+#undef i386
-+#define i386 i386
-+#endif
-+
-+#ifdef linux
-+#undef linux
-+#define linux linux
-+#endif
-+
-+#ifdef mips
-+#undef mips
-+#define mips mips
-+#endif
-+
-+#ifdef sgi
-+#undef sgi
-+#define sgi sgi
-+#endif
-+
-+#ifdef sun
-+#undef sun
-+#define sun sun
-+#endif
-+
-+#ifdef sparc
-+#undef sparc
-+#define sparc sparc
-+#endif
-+
-+#ifdef powerpc
-+#undef powerpc
-+#define powerpc powerpc
-+#endif
-+
-+#  define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
-+#  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
-+          GXX_INCLUDE_PATH/backward
- 
- # elif (__GNUC_MINOR__ < 8)
- 
-@@ -312,6 +380,7 @@
- #   define _STLP_STATIC_TEMPLATE_DATA 1
- # endif
- 
--
--
--
-+#if defined(__sun__) && defined(__GNUC__)
-+#    undef _STLP_HAS_NATIVE_FLOAT_ABS
-+#    define _STLP_VENDOR_GLOBAL_CSTD       1
-+#endif
---- misc/STLport-4.5/stlport/cwchar	2001-01-27 02:39:42.000000000 +0100
-+++ misc/build/STLport-4.5/stlport/cwchar	2008-07-18 14:13:49.000000000 +0200
-@@ -21,6 +21,9 @@
- #  include <stl/_prolog.h>
- # endif
- 
-+#ifdef __FreeBSD__
-+#include _STLP_NATIVE_C_HEADER(wchar.h)
-+#endif
- # include <stl/_cwchar.h>
- 
- # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
---- misc/STLport-4.5/stlport/stdexcept	2001-05-22 02:50:21.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stdexcept	2008-07-18 14:13:49.000000000 +0200
-@@ -49,6 +49,13 @@
- 
- _STLP_BEGIN_NAMESPACE
- 
-+
-+#if defined( __GNUC__)
-+#undef _STLP_NOTHROW_INHERENTLY
-+#define _STLP_NOTHROW_INHERENTLY throw()
-+#endif
-+ 
-+
- class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
- public:
-   __Named_exception(const string& __str) 
---- misc/STLport-4.5/stlport/stl/_bvector.h	2001-05-30 05:45:41.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_bvector.h	2008-07-18 14:13:49.000000000 +0200
-@@ -34,7 +34,7 @@
- # include <stl/_vector.h>
- # endif
- 
--#define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
-+#define ___WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
- 
- _STLP_BEGIN_NAMESPACE 
- 
-@@ -80,7 +80,7 @@
-   unsigned int  _M_offset;
- 
-   void _M_bump_up() {
--    if (_M_offset++ == __WORD_BIT - 1) {
-+    if (_M_offset++ == ___WORD_BIT - 1) {
-       _M_offset = 0;
-       ++_M_p;
-     }
-@@ -88,7 +88,7 @@
- 
-   void _M_bump_down() {
-     if (_M_offset-- == 0) {
--      _M_offset = __WORD_BIT - 1;
-+      _M_offset = ___WORD_BIT - 1;
-       --_M_p;
-     }
-   }
-@@ -100,17 +100,17 @@
- 
-   void _M_advance (difference_type __i) {
-     difference_type __n = __i + _M_offset;
--    _M_p += __n / __WORD_BIT;
--    __n = __n % __WORD_BIT;
-+    _M_p += __n / ___WORD_BIT;
-+    __n = __n % ___WORD_BIT;
-     if (__n < 0) {
--      _M_offset = (unsigned int) __n + __WORD_BIT;
-+      _M_offset = (unsigned int) __n + ___WORD_BIT;
-       --_M_p;
-     } else
-       _M_offset = (unsigned int) __n;
-   }
- 
-   difference_type _M_subtract(const _Bit_iterator_base& __x) const {
--    return __WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
-+    return ___WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
-   }
- };
- 
-@@ -242,7 +242,7 @@
- protected:
- 
-   unsigned int* _M_bit_alloc(size_t __n) 
--    { return _M_end_of_storage.allocate((__n + __WORD_BIT - 1)/__WORD_BIT); }
-+    { return _M_end_of_storage.allocate((__n + ___WORD_BIT - 1)/___WORD_BIT); }
-   void _M_deallocate() {
-     if (_M_start._M_p)
-       _M_end_of_storage.deallocate(_M_start._M_p,
-@@ -341,7 +341,7 @@
- 
-   void _M_initialize(size_type __n) {
-     unsigned int* __q = this->_M_bit_alloc(__n);
--    this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
-+    this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
-     this->_M_start = iterator(__q, 0);
-     this->_M_finish = this->_M_start + difference_type(__n);
-   }
-@@ -352,13 +352,13 @@
-       ++this->_M_finish;
-     }
-     else {
--      size_type __len = size() ? 2 * size() : __WORD_BIT;
-+      size_type __len = size() ? 2 * size() : ___WORD_BIT;
-       unsigned int* __q = this->_M_bit_alloc(__len);
-       iterator __i = copy(begin(), __position, iterator(__q, 0));
-       *__i++ = __x;
-       this->_M_finish = copy(__position, end(), __i);
-       this->_M_deallocate();
--      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-       this->_M_start = iterator(__q, 0);
-     }
-   }
-@@ -411,7 +411,7 @@
-         __i = copy(__first, __last, __i);
-         this->_M_finish = copy(__position, end(), __i);
-         this->_M_deallocate();
--        this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+        this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-         this->_M_start = iterator(__q, 0);
-       }
-     }
-@@ -609,7 +609,7 @@
-       this->_M_finish = copy(begin(), end(), __z);
-       this->_M_deallocate();
-       this->_M_start = iterator(__q, 0);
--      this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
-     }
-   }
- 
-@@ -681,7 +681,7 @@
-       __i = copy(__first, __last, __i);
-       this->_M_finish = copy(__position, end(), __i);
-       this->_M_deallocate();
--      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-       this->_M_start = iterator(__q, 0);
-     }
-   }
-@@ -702,7 +702,7 @@
-       __i = copy(__first, __last, __i);
-       this->_M_finish = copy(__position, end(), __i);
-       this->_M_deallocate();
--      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-       this->_M_start = iterator(__q, 0);
-     }
-   }
-@@ -722,7 +722,7 @@
-       fill_n(__i, __n, __x);
-       this->_M_finish = copy(__position, end(), __i + difference_type(__n));
-       this->_M_deallocate();
--      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-       this->_M_start = iterator(__q, 0);
-     }
-   }
-@@ -799,7 +799,7 @@
- #undef __BVECTOR_QUALIFIED
- #undef __BVEC_TMPL_HEADER
- 
--# undef __WORD_BIT
-+# undef ___WORD_BIT
- 
- #endif /* _STLP_INTERNAL_BVECTOR_H */
- 
---- misc/STLport-4.5/stlport/stl/_complex.h	2001-07-06 06:16:17.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_complex.h	2008-07-18 14:13:49.000000000 +0200
-@@ -18,6 +18,10 @@
- #ifndef _STLP_internal_complex_h
- #define _STLP_internal_complex_h
- 
-+#if defined __GNUC__
-+#pragma GCC system_header
-+#endif
-+
- // This header declares the template class complex, as described in 
- // in the draft C++ standard.  Single-precision complex numbers
- // are complex<float>, double-precision are complex<double>, and
---- misc/STLport-4.5/stlport/stl/_config.h	2001-09-04 19:10:18.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_config.h	2008-07-18 14:14:05.000000000 +0200
-@@ -938,7 +938,7 @@
- 
- #  define _STLP_EXPORT_TEMPLATE_CLASS _STLP_EXPORT template class _STLP_CLASS_DECLSPEC
- 
--#  if defined (_STLP_MSVC) || defined (__ICL) 
-+#  if defined (_STLP_MSVC) || defined (__ICL)  || defined (__EMX__) 
- #   define _STLP_STATIC_MEMBER_DECLSPEC
- #  else
- #   define _STLP_STATIC_MEMBER_DECLSPEC _STLP_DECLSPEC
---- misc/STLport-4.5/stlport/stl/_fstream.h	2001-05-29 01:29:41.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_fstream.h	2008-07-18 14:14:05.000000000 +0200
-@@ -45,7 +45,7 @@
- #if !defined (_STLP_USE_UNIX_IO) && !defined(_STLP_USE_WIN32_IO) \
-     && ! defined (_STLP_USE_UNIX_EMULATION_IO) && !defined (_STLP_USE_STDIO_IO)
- 
--# if defined (_STLP_UNIX)  || defined (__CYGWIN__) 
-+# if defined (_STLP_UNIX)  || defined (__CYGWIN__)  || defined (__EMX__)
- // open/close/read/write
- #  define _STLP_USE_UNIX_IO
- # elif defined (_STLP_WIN32)  && ! defined (__CYGWIN__)
-@@ -107,7 +107,7 @@
-   streamoff _M_get_offset(char* __first, char* __last) {
- #if defined (_STLP_UNIX) || defined (_STLP_MAC)
-     return __last - __first;
--#else // defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS)
-+#else // defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS) || defined (__EMX__)
-     return ( (_M_openmode & ios_base::binary) != 0 )
-       ? (__last - __first)
-       : count(__first, __last, '\n') + (__last - __first);
-@@ -119,7 +119,7 @@
-   bool _M_in_binary_mode() const {
- # if defined (_STLP_UNIX) || defined (_STLP_MAC)  || defined(__BEOS__)
-     return true;
--# elif defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS) || defined (_STLP_VM)
-+# elif defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS) || defined (_STLP_VM) || defined (__EMX__)
-     return (_M_openmode & ios_base::binary) != 0;
- # else 
- #   error "Port!"
---- misc/STLport-4.5/stlport/stl/_ios_base.h	2001-09-04 19:10:18.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_ios_base.h	2008-07-18 14:13:49.000000000 +0200
-@@ -291,7 +291,7 @@
- template <class Facet>
- locale::facet* _M_get_facet(ios_base& __i, Facet*)
- {
--
-+    return NULL;
- }
- 
- // ----------------------------------------------------------------------
---- misc/STLport-4.5/stlport/stl/_rope.h	2001-08-06 04:21:25.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_rope.h	2008-07-18 14:13:49.000000000 +0200
-@@ -1470,7 +1470,7 @@
-     rope<_CharT,_Alloc> __remainder_rope;
- 	    
-     // gcc-2.7.2 bugs
--    typedef _Rope_Concat_fn<_CharT,_Alloc> _Concat_fn;
-+    typedef _Rope_Concat_fn<_CharT,_Alloc> __Concat_fn;
- 	    
-     if (0 == __n)
-       return;
-@@ -1510,7 +1510,7 @@
- 		// One each for base_rope and __result
- #         endif
-       } else {
--		__result = power(__base_rope, __exponent, _Concat_fn());
-+		__result = power(__base_rope, __exponent, __Concat_fn());
-       }
-       if (0 != __remainder) {
- 		__result += __remainder_rope;
---- misc/STLport-4.5/stlport/stl/_stdio_file.h	2001-03-19 08:01:09.000000000 +0100
-+++ misc/build/STLport-4.5/stlport/stl/_stdio_file.h	2008-07-18 14:14:05.000000000 +0200
-@@ -154,8 +154,45 @@
- 
- # define _STLP_FILE_I_O_IDENTICAL
- 
-+#elif defined(__EMX__)
-+
-+inline int   _FILE_fd(const FILE& __f) { return __f._handle; }
-+inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._buffer; }
-+inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
-+inline char* _FILE_I_end(const FILE& __f) { return (char *) __f._ptr + __f._rcount; }
-+inline ptrdiff_t _FILE_I_avail(const FILE& __f) { return __f._rcount; }
-+inline char& _FILE_I_preincr(FILE& __f) { --__f._rcount; return *(char*) (++__f._ptr); }
-+inline char& _FILE_I_postincr(FILE& __f) { --__f._rcount; return *(char*) (__f._ptr++); }
-+inline char& _FILE_I_predecr(FILE& __f) { ++__f._rcount; return *(char*) (--__f._ptr); }
-+inline char& _FILE_I_postdecr(FILE& __f) { ++__f._rcount; return *(char*) (__f._ptr--); }
-+inline void  _FILE_I_bump(FILE& __f, int __n) { __f._ptr += __n; __f._rcount -= __n; }
-+inline void _FILE_I_set(FILE& __f, char* __begin, char* __next, char* __end) {
-+  __f._buffer = __begin;
-+  __f._ptr  = __next;
-+  __f._rcount  = __end - __next;
-+}
-+
-+inline char* _FILE_O_begin(const FILE& __f) { return (char*) __f._buffer; }
-+inline char* _FILE_O_next(const FILE& __f) { return (char*) __f._ptr; }
-+inline char* _FILE_O_end(const FILE& __f) { return (char*) __f._ptr + __f._wcount; }
-+inline ptrdiff_t _FILE_O_avail(const FILE& __f) { return __f._wcount; }
-+inline char& _FILE_O_preincr(FILE& __f) { --__f._wcount; return *(char*) (++__f._ptr); }
-+inline char& _FILE_O_postincr(FILE& __f) { --__f._wcount; return *(char*) (__f._ptr++); }
-+inline char& _FILE_O_predecr(FILE& __f) { ++__f._wcount; return *(char*) (--__f._ptr); }
-+inline char& _FILE_O_postdecr(FILE& __f) { ++__f._wcount; return *(char*) (__f._ptr--); }
-+inline void _FILE_O_bump(FILE& __f, int __n) { __f._ptr += __n; __f._wcount -= __n; }
-+inline void _FILE_O_set(FILE& __f, char* __begin, char* __next, char* __end) {
-+  __f._buffer = __begin;
-+  __f._ptr  = __next;
-+  __f._wcount  = __end - __next;
-+}
-+
-+
-+# undef _STLP_FILE_I_O_IDENTICAL
-+
- #elif defined (__CYGWIN__) || defined(__FreeBSD__)  || defined(__NetBSD__) || ( defined(__GNUC__) && defined(__APPLE__) )
- 
-+#include <stdio.h>
- # if 0
- inline int   _FILE_fd(const FILE& __f) { return __f._file; }
- inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._bf._base; }
---- misc/STLport-4.5/stlport/stl/_threads.h	2001-09-04 19:10:20.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_threads.h	2008-07-18 14:14:05.000000000 +0200
-@@ -164,6 +164,15 @@
- #include <stdio.h>
- #  define _STLP_MUTEX_INITIALIZER = { 0 }
- #elif defined(_STLP_OS2THREADS)
-+
-+#define INCL_DOSSEMAPHORES
-+#ifndef STL_OS2_BUILDING
-+#include <svpm.h>
-+#else
-+#include <os2.h>
-+#endif
-+
-+#if 0 // YD
-   // This section serves to replace os2.h for VisualAge C++
-   typedef unsigned long ULONG;
-   #ifndef __HEV__  /* INCL_SEMAPHORE may also define HEV */
-@@ -181,6 +190,8 @@
-   APIRET _System DosRequestMutexSem(HMTX hmtx, ULONG ulTimeout);
-   APIRET _System DosReleaseMutexSem(HMTX hmtx);
-   APIRET _System DosCloseMutexSem(HMTX hmtx);
-+#endif
-+
- # define _STLP_MUTEX_INITIALIZER = { 0 };
- 
- # endif
-@@ -296,7 +307,7 @@
-   inline void _M_destroy() { DosCloseMutexSem(_M_lock); }
-   inline void _M_acquire_lock() {
-     if(!_M_lock) _M_initialize();
--    DosRequestMutexSem(_M_lock, -1);
-+    DosRequestMutexSem(_M_lock, ((ULONG)-1));
-   }
-   inline void _M_release_lock() { DosReleaseMutexSem(_M_lock); }
- #elif defined(_STLP_BETHREADS)
-@@ -372,7 +383,7 @@
-   }
-   inline void _M_acquire_lock() {
-     if(!_M_lock) _M_initialize();
--    DosRequestMutexSem(*(HMTX*)_M_lock, -1);
-+    DosRequestMutexSem(*(HMTX*)_M_lock, ((ULONG)-1));
-   }
-   inline void _M_release_lock() { DosReleaseMutexSem(*(HMTX*)_M_lock); }
- # else /* No threads */
---- misc/STLport-4.5/stlport/stl/_tree.c	2001-08-25 03:14:30.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_tree.c	2008-12-02 17:14:29.035425872 +0100
-@@ -404,10 +404,12 @@
-   }
-   iterator __j = iterator(__y);   
-   if (__comp)
-+  {
-     if (__j == begin())     
-       return pair<iterator,bool>(_M_insert(__x, __y, __v), true);
-     else
-       --__j;
-+  }
-   if (_M_key_compare(_S_key(__j._M_node), _KeyOfValue()(__v)))
-     return pair<iterator,bool>(_M_insert(__x, __y, __v), true);
-   return pair<iterator,bool>(__j, false);
---- misc/STLport-4.5/stlport/stl/_valarray.h	2001-05-30 05:45:42.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_valarray.h	2008-07-18 14:13:49.000000000 +0200
-@@ -19,6 +19,10 @@
- #ifndef _STLP_VALARRAY_H
- #define _STLP_VALARRAY_H
- 
-+#if defined __GNUC__
-+#pragma GCC system_header
-+#endif
-+
- #ifndef _STLP_CMATH
- #include <cmath>
- #endif
---- misc/STLport-4.5/stlport/stl/c_locale.h	2001-05-31 05:24:41.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/c_locale.h	2008-07-18 14:14:05.000000000 +0200
-@@ -167,6 +167,18 @@
- #  define _Locale_ALPHA  (_Locale_UPPER | _Locale_LOWER)
- #  define _Locale_PRINT  (_Locale_ALPHA | _Locale_DIGIT | _Locale_PUNCT | 0200 )
- 
-+# elif defined (__EMX__) // YD
-+
-+# define _Locale_CNTRL __CT_CNTRL
-+# define _Locale_UPPER __CT_UPPER
-+# define _Locale_LOWER __CT_LOWER
-+# define _Locale_DIGIT __CT_DIGIT
-+# define _Locale_XDIGIT __CT_XDIGIT
-+# define _Locale_PUNCT __CT_PUNCT
-+# define _Locale_SPACE __CT_SPACE
-+# define _Locale_PRINT __CT_PRINT
-+# define _Locale_ALPHA __CT_ALPHA
-+
- # elif defined (__FreeBSD__)
- 
- # define _Locale_CNTRL _CTYPE_C
diff --git a/stlport/dos_lineends.patch b/stlport/dos_lineends.patch
deleted file mode 100644
index 572c158c4..000000000
--- a/stlport/dos_lineends.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-*** ./unxsols3.pro/misc/STLport-4.0/src/vc_common.mak	Fri Jul 14 03:53:26 2000

---- build/unxsols3.pro/STLport-4.0/src/vc_common.mak	Fri Oct  5 15:34:10 2001

-***************

-*** 42,48 ****

-  

-  

-  LDFLAGS_COMMON_static=/nologo /machine:I386

-! LDFLAGS_COMMON_dynamic=/nologo /dll /incremental:no /machine:I386

-  

-  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od  /D "_DEBUG"  /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch /c

-  

---- 42,48 ----

-  

-  

-  LDFLAGS_COMMON_static=/nologo /machine:I386

-! LDFLAGS_COMMON_dynamic=/nologo /nodefaultlib oldnames.lib kernel32.lib /dll /incremental:no /machine:I386

-  

-  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od  /D "_DEBUG"  /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch /c

-  

-***************

-*** 53,62 ****

-  CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od  /D "_DEBUG"  /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\"  /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_dynamic)\stlport.pch /c 

-  

-  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV

-! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 

-  

-  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV

-! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 

-  

-  CXXFLAGS_RELEASE_static=$(FLAGS_COMMON_static) /O2 /MT /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_static)\\" /Fd"$(RELEASE_OBJDIR_static)\\"  /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_static)\stlport.pch /c 

-  

---- 53,62 ----

-  CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od  /D "_DEBUG"  /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\"  /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_dynamic)\stlport.pch /c 

-  

-  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV

-! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 

-  

-  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV

-! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 

-  

-  CXXFLAGS_RELEASE_static=$(FLAGS_COMMON_static) /O2 /MT /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_static)\\" /Fd"$(RELEASE_OBJDIR_static)\\"  /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_static)\stlport.pch /c 

-  

-***************

-*** 63,69 ****

-  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /O2 /MD /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch /c 

-  

-  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)

-! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 

-  

-  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res

-  RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res

---- 63,69 ----

-  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /O2 /MD /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch /c 

-  

-  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)

-! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrt.lib /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 

-  

-  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res

-  RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res

-

diff --git a/stlport/makefile.mk b/stlport/makefile.mk
deleted file mode 100644
index 9211a5e11..000000000
--- a/stlport/makefile.mk
+++ /dev/null
@@ -1,178 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=so_stlport
-TARGET=so_stlport
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(WITH_STLPORT)"!="YES"
-
-all:
-    @echo "Nothing to do"
-
-.ELSE # "$(WITH_STLPORT)"!="YES"
-
-# --- Files --------------------------------------------------------
-.EXPORT : CC CXX
-.IF "$(COMID)"=="gcc3"
-    TARFILE_NAME=STLport-4.5
-    TARFILE_MD5=18f577b374d60b3c760a3a3350407632
-    PATCH_FILES=\
-                STLport-4.5.patch \
-                STLport-4.5-gcc43_warnings.patch \
-                STLport-4.5-cxx0x.patch
-.ELIF "$(GUI)"=="WNT"
-    TARFILE_NAME=STLport-4.5-0119
-    TARFILE_MD5=7376930b0d3f3d77a685d94c4a3acda8
-    PATCH_FILES=STLport-4.5-0119.patch
-.ELSE
-    TARFILE_NAME=STLport-4.0
-    TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16
-    PATCH_FILES=STLport-4.0.patch STLport-4.0-sunstudio12u1.patch
-        # To disable warnings from within STLport headers on unxsoli4 and
-        # unxsols4, STLport-4.0.patch had to be extended mechanically by
-        #
-        #   cd unxsol.../misc/build/STLport-4.0/stlport && \
-        #   find . -type f -exec sed -i \
-        #     -e 's/^\([ \t]*__STL_BEGIN_NAMESPACE[ \t]*\)$/#if defined \
-        #       __SUNPRO_CC\n#pragma disable_warn\n#endif\n&/' \
-        #     -e 's/^\([ \t]*__STL_END_NAMESPACE[ \t]*\)$/&\n#if defined \
-        #       __SUNPRO_CC\n#pragma enable_warn\n#endif/' {} \;
-        #
-        # (causing lots of files to become modified) and by additionally
-        # changing unxsol.../misc/build/STLport-4.0/stlport/math.h,
-        # unxsol.../misc/build/STLport-4.0/stlport/stl/_config.h,
-        # unxsol.../misc/build/STLport-4.0/stlport/stl/_list.h, and
-        # unxsol.../misc/build/STLport-4.0/stlport/stl/type_traits.h manually.
-        # (Obviously due to the way the C++ compiler generates code for
-        # instantiations of inline function templates from STLport headers, it
-        # does not work to simply add "#pragma disable_warn" to stl/_prolog.h
-        # and "#pragma enable_warn" to stl/_epilog.h, as seemingly some internal
-        # STLport headers are read in by the compiler only at the end of a
-        # compilation unit, outside the scope of stl/_prolog.h and
-        # stl/_epilog.h.)
-.ENDIF
-
-ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak \
-    src$/gcc-3.0-os2.mak src$/gcc-3.0-os2.def src$/common_macros_os2.mak
-
-
-CONFIGURE_ACTION=none
-CONFIGURE_FLAGS=
-
-BUILD_DIR=src
-
-.IF "$(COM)"=="MSC"
-BUILD_ACTION=nmake
-BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER)
-.ENDIF
-
-.IF "$(COM)"=="GCC"
-    .IF "$(COMID)"=="gcc3"
-        # FreeBSD needs a special makefile
-        .IF "$(OS)"=="FREEBSD"
-            BUILD_FLAGS=-f gcc-3.0-freebsd.mak
-        .ELIF "$(GUI)"=="WNT"
-            BUILD_FLAGS=-f gcc-3.0-mingw.mak
-        .ELSE
-            BUILD_FLAGS=-f gcc-3.0.mak
-        .ENDIF
-    .ELSE # "$(COMID)"=="gcc3"
-        .IF "$(OS)"=="FREEBSD"
-            BUILD_FLAGS=-f gcc-freebsd.mak
-        .ELSE
-            BUILD_FLAGS=-f gcc.mak
-        .ENDIF
-    .ENDIF # "$(COMID)"=="gcc3"
-    BUILD_ACTION=$(GNUMAKE)
-    # build in parallel
-    BUILD_FLAGS+= -j$(MAXPROCESS)
-.ENDIF
-.IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
-CXX+= -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
-.ENDIF
-
-.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
-CXX+= -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
-.ENDIF
-
-.IF "$(COM)"=="C52"
-BUILD_ACTION=make
-.IF "$(CCNUMVER)">="00050008"
-BUILD_FLAGS=-f sunpro11.mak
-.ELIF "$(CCNUMVER)">="00050005"
-BUILD_FLAGS=-f sunpro8.mak
-.ELSE
-BUILD_FLAGS=-f sunpro6.mak
-.ENDIF # "$(CCNUMVER)">="00050008"
-
-OUT2INC= \
-    stlport$/SC5$/*.SUNWCCh
-.ENDIF
-
-OUTDIR2INC= \
-    stlport
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-
-OUT2LIB= \
-    lib$/lib*_static.a
-
-OUT2BIN= \
-    lib$/*.dll
-
-.ELSE
-
-OUT2LIB= \
-    lib$/*.lib
-
-OUT2BIN= \
-    lib$/*.dll \
-    lib$/*.pdb
-
-.ENDIF # "$(COM)"=="GCC"
-
-.ELSE          # "$(GUI)"=="WNT"
-
-OUT2LIB= \
-    lib$/lib*
-
-.ENDIF          # "$(GUI)"=="WNT"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : 	set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
-
-.ENDIF # "$(WITH_STLPORT)"!="YES"
diff --git a/stlport/prj/build.lst b/stlport/prj/build.lst
deleted file mode 100644
index 2a6ec0dda..000000000
--- a/stlport/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-sl	stlport	:   solenv NULL
-sl	stlport						nmake	-	all	sl_mkout NULL
diff --git a/stlport/prj/d.lst b/stlport/prj/d.lst
deleted file mode 100644
index 88478cef7..000000000
--- a/stlport/prj/d.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-
diff --git a/stlport/win32_custom.bat b/stlport/win32_custom.bat
deleted file mode 100644
index 83a430de7..000000000
--- a/stlport/win32_custom.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-rem parameters in order of their apearance:
-rem - path to unpacked tarball
-rem - relative path back to module root
-
-setlocal
-
-cd %1
-
-rem type %2\dos_lineends.patch | patch -b -p2
-patch -i %2\dos_lineends.patch -b -p2
-
diff --git a/stlport/win32_custom.sh b/stlport/win32_custom.sh
deleted file mode 100755
index 5c125481b..000000000
--- a/stlport/win32_custom.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#rem parameters in order of their apearance:
-#rem - path to unpacked tarball
-#rem - relative path back to module root
-
-cd $1
-
-patch -i $2/dos_lineends.patch -b -p2
-
diff --git a/stlport/win32_sdk.bat b/stlport/win32_sdk.bat
deleted file mode 100755
index cfaf6c029..000000000
--- a/stlport/win32_sdk.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-rem parameters in order of their apearance:
-rem - path to unpacked tarball
-rem - relative path back to module root
-
-setlocal
-
-cd %1
-
-rem type %2\dos_lineends.patch | patch -b -p2
-patch -i %2\STLport-4.0_SDK.patch -b -p2
-
diff --git a/stlport/win32_sdk.sh b/stlport/win32_sdk.sh
deleted file mode 100644
index 434890730..000000000
--- a/stlport/win32_sdk.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#rem parameters in order of their apearance:
-#rem - path to unpacked tarball
-#rem - relative path back to module root
-
-cd $1
-
-patch -i $2/STLport-4.0_SDK.patch -b -p2
-
diff --git a/tail_build/Makefile b/tail_build/Makefile
deleted file mode 100644
index ffea455a0..000000000
--- a/tail_build/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2009 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# if no environment is set, try to find one, source it and re-exec
-ifeq ($(strip $(SOLARENV)),)
-
-all:
-	if test -f ./Env.Host.sh; then . ./Env.Host.sh; fi && \
-	if test -z "$${SOLARENV}"; then echo "No environment set!"; exit 1; fi && \
-	$(MAKE)
-
-else # SOLARENV
-
-GBUILDDIR := $(SOLARENV)/gbuild
-include $(GBUILDDIR)/gbuild.mk
-
-$(eval $(call gb_Module_make_global_targets,$(SRC_ROOT)/Module_tail_build.mk))
-
-endif # SOLARENV
-
-# vim: set noet sw=4 ts=4:
diff --git a/tail_build/README b/tail_build/README
deleted file mode 100644
index 4e29fb139..000000000
--- a/tail_build/README
+++ /dev/null
@@ -1,17 +0,0 @@
-This module exist only to take advantage of the ability of gbuild to build
-multiple modules in one single Makefile.
-
-A few module that normally get built at the end of the build process
-are already converted. this 'pseudo-module' build them all as one.
-
-As module get converted to gbuild they can be added to this module
-if they fix the neceesary pre-requisite. that is:
-
-To qualify a module must not be the dependant of any other module,
-except postprocess or if the other module itself is under tail_build
-
-To migrate a module <foo> under tail_build, one should:
-* merge the dependencies declared in <foo>/prj/build.lst into tail_build/prj/build.lst
-* remove the module <foo> from postprocess/prj/build.lst dependencies
-* remove the module <foo> from tail_build/prj/build.lst dependencies
-* add the module name in Module_tail_build.mk at the root of bootstrap
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
deleted file mode 100644
index a53ec585c..000000000
--- a/tail_build/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-tb      tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter forms offapi oovbaapi oox package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure uui vbahelper vcl writerperfect xmlscript  NULL
-tb tail_build\prj nmake - all tb_prj   NULL
diff --git a/tail_build/prj/d.lst b/tail_build/prj/d.lst
deleted file mode 100644
index e69de29bb..000000000
--- a/tail_build/prj/d.lst
+++ /dev/null
diff --git a/tail_build/prj/makefile.mk b/tail_build/prj/makefile.mk
deleted file mode 100644
index e312a7cca..000000000
--- a/tail_build/prj/makefile.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-TARGET=prj
-
-.INCLUDE : settings.mk
-
-.IF "$(VERBOSE)"!=""
-VERBOSEFLAG :=
-.ELSE
-VERBOSEFLAG := -s
-.ENDIF
-
-all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/unusedcode.easy b/unusedcode.easy
deleted file mode 100644
index dacf1c74b..000000000
--- a/unusedcode.easy
+++ /dev/null
@@ -1,4110 +0,0 @@
-(anonymous namespace)::getState(std::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&)
-(anonymous namespace)::writeInfo(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&, rtl::OUString const&)
-Application::PostUserEvent(unsigned long, void*)
-BasicIDEDLL::Exit()
-BasicLibs::Last()
-BasicLibs::Prev()
-BasicManager::BasicManager()
-BasicManager::ClearErrors()
-BasicPrinter::BasicPrinter()
-BitSet::BitSet(Range const&)
-BitSet::BitSet(unsigned short*, unsigned short)
-BitmapEx::Draw(OutputDevice*, Point const&, Size const&, Point const&, Size const&) const
-BitmapLB::SelectEntryByList(XBitmapList const*, String const&, Bitmap const&)
-BitmapPalette::IsGreyPalette() const
-BreakPointList::clear()
-BreakPointList::push_back(BreakPoint*)
-BreakpointWindow::FindBreakpoint(Point const&)
-BreakpointWindow::FindBreakpoint(unsigned int)
-BreakpointWindow::Reset()
-BreakpointWindow::SetMarkerPos(unsigned int, bool)
-BufferNode::childAt(int) const
-Button::Button(Window*, ResId const&)
-Button::Button(Window*, long)
-Button::GetFocusRect() const
-Button::GetModeBitmap() const
-Button::IsImageDisplayEnabled()
-Button::IsTextDisplayEnabled()
-Button::SetModeBitmap(BitmapEx const&)
-ButtonDialog::AddButton(PushButton*, unsigned short, unsigned short, long)
-ButtonDialog::ButtonDialog(Window*, ResId const&)
-ButtonDialog::GetButtonHelpId(unsigned short) const
-ButtonDialog::GetButtonHelpText(unsigned short) const
-ButtonDialog::GetButtonText(unsigned short) const
-ButtonDialog::SetButtonHelpId(unsigned short, rtl::OString const&)
-ByteArr::Append(char)
-ByteArr::ByteArr(unsigned char, unsigned char)
-ByteArr::Contains(char) const
-ByteArr::Insert(unsigned short, char)
-ByteArr::Remove(char)
-ByteArr::~ByteArr()
-CAT::Inverse() const
-CAT::makeChromaticAdaptationTag() const
-CIccCmm::FromInternalEncoding(icColorSpaceSignature, unsigned char*, float const*)
-CIccCmm::FromInternalEncoding(icColorSpaceSignature, unsigned short*, float const*)
-CIccCmm::GetFloatColorEncoding(char const*)
-CIccCmm::GetFloatColorEncoding(icFloatColorEncoding)
-CIccCmm::IsInGamut(float*)
-CIccCmm::ToInternalEncoding(icColorSpaceSignature, float*, unsigned char const*)
-CIccCmm::ToInternalEncoding(icColorSpaceSignature, float*, unsigned short const*)
-CIccFormulaCurveSegment::SetFunction(unsigned short, unsigned char, float*)
-CIccIO::ReadLine(void*, long)
-CIccInfo::GetSpotShapeName(icSpotShape)
-CIccMBB::NewCLUT(unsigned char*, unsigned char)
-CIccMemIO::Alloc(unsigned long, bool)
-CIccMpeCLUT::SetCLUT(CIccCLUT*)
-CIccMpeCreator::DoGetElementSigName(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, icElemTypeSignature)
-CIccMpeCurveSet::SetCurve(int, CIccCurveSetCurve*)
-CIccMruCmm::Attach(CIccCmm*, unsigned char)
-CIccNamedColorCmm::CIccNamedColorCmm(icColorSpaceSignature, icColorSpaceSignature, bool)
-CIccNamedColorCmm::SetLastXformDest(icColorSpaceSignature)
-CIccProfile::DeleteTag(unsigned long)
-CIccProfile::GetSpaceSamples() const
-CIccProfileIdDesc::CIccProfileIdDesc(CIccProfile&)
-CIccProfileIdDesc::CIccProfileIdDesc(icProfileID, CIccTagMultiLocalizedUnicode)
-CIccSegmentedCurve::Insert(CIccCurveSegment*)
-CIccTagCurve::SetGamma(float)
-CIccTagFixedNum<long, (icTagTypeSignature)1936077618>::GetSize() const
-CIccTagFixedNum<unsigned long, (icTagTypeSignature)1969632050>::GetSize() const
-CIccTagMultiLocalizedUnicode::SetText(unsigned short const*, unsigned short, unsigned short)
-CIccTagMultiProcessElement::GetElement(int)
-CIccTagNamedColor2::FindRootColor(char const*)
-CIccTagNamedColor2::Lab4ToLab2(float*, float const*)
-CIccTagNamedColor2::NegClip(float)
-CIccTagNum<unsigned char, (icTagTypeSignature)1969827896>::GetSize() const
-CIccTagNum<unsigned long long, (icTagTypeSignature)1969829428>::GetSize() const
-CIccTagNum<unsigned long, (icTagTypeSignature)1969828658>::GetSize() const
-CIccTagNum<unsigned short, (icTagTypeSignature)1969828150>::GetSize() const
-CIccTagProfileSequenceId::AddProfileDescription(CIccProfileIdDesc const&)
-CIccTagProfileSequenceId::GetFirst()
-CIccTagProfileSequenceId::GetLast()
-CIccTagProfileSequenceId::ParseMem(unsigned char*, unsigned long)
-CIccTagResponseCurveSet16::GetFirstCurves()
-CIccTagResponseCurveSet16::GetNextCurves()
-CIccTagResponseCurveSet16::NewResponseCurves(icMeasurementUnitSig)
-CIccTagResponseCurveSet16::SetNumChannels(unsigned short)
-CIccXform::Create(CIccProfile&, bool, icRenderingIntent, icXformInterp, icXformLutType, bool)
-CIccXformMpe::Create(CIccProfile*, bool, icRenderingIntent, icXformInterp, icXformLutType)
-CLUT::Iterate(IIccCLUTExec*)
-CLUT::adaptedXYZToMeasuredXYZ(float*, float const*, float const*, float, CAT const*)
-CLUT::makeAToBxTag(unsigned int, float const*, float const*, float const*, CAT const*, float, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, float const*, bool)
-CNames::Insert(CNames const*, unsigned short, unsigned short)
-CNames::Insert(ControlItem const*&, unsigned short&)
-CNames::Insert(ControlItem const**, unsigned short)
-CNames::Remove(ControlItem const*&, unsigned short)
-CNames::Remove(unsigned short, unsigned short)
-Calendar::AddDateInfo(Date const&, String const&, Color const*, Color const*, unsigned short)
-Calendar::Calendar(Window*, ResId const&)
-Calendar::ClearDateInfo()
-Calendar::GetDateInfoText(Date const&)
-Calendar::GetDropDate(Date&) const
-Calendar::GetSelectDateCount() const
-Calendar::RemoveDateInfo(Date const&)
-Calendar::SelectDateRange(Date const&, Date const&, unsigned char)
-Calendar::SetMinimumNumberOfDaysInWeek(short)
-Calendar::SetSaturdayColor(Color const&)
-Calendar::SetStandardColor(Color const&)
-Calendar::SetSundayColor(Color const&)
-Calendar::SetWeekStart(short)
-Calendar::ShowDropPos(Point const&, Date&)
-CalendarField::CalendarField(Window*, ResId const&)
-CalendarWrapper::getMinimumNumberOfDaysForFirstWeek() const
-CertificateContainer::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
-CfgStack::Push(CfgStackData*)
-CharAttribList::DbgCheckAttribs()
-CharAttribList::HasAttrib(unsigned short) const
-CharClass::isAlpha(String const&) const
-CharClass::isAlphaNumeric(String const&) const
-CharClass::isAsciiAlphaNumeric(String const&)
-CharPosArray::Insert(CharPosArray const*, unsigned short, unsigned short, unsigned short)
-CharPosArray::Replace(int const&, unsigned short)
-CharPosArray::Replace(int const*, unsigned short, unsigned short)
-CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
-CloneList::Count() const
-CmdBaseStream::GenReturn(unsigned short, rtl::OString*, unsigned short, unsigned char)
-CntContentTypeItem::CntContentTypeItem(unsigned short, INetContentType)
-CntContentTypeItem::SetPresentation(String const&)
-CollatorWrapper::compareSubstring(rtl::OUString const&, int, int, rtl::OUString const&, int, int) const
-CollatorWrapper::listCollatorOptions(rtl::OUString const&) const
-CollatorWrapper::loadCollatorAlgorithmWithEndUserOption(rtl::OUString const&, com::sun::star::lang::Locale const&, com::sun::star::uno::Sequence<int> const&)
-Color::IncreaseContrast(unsigned char)
-ComboBox::GetEntryPos(void const*) const
-ComboBox::GetListPosSizePixel() const
-ComboBox::GetProminentEntryType() const
-ComboBox::GetSeparatorPos() const
-ComboBox::GetUserItemSize() const
-ComboBox::IsDDAutoWidthEnabled() const
-ComboBox::IsUserDrawEnabled() const
-ComboBox::SetSeparatorPos()
-ComboBox::ShowProminentEntry(unsigned short)
-CommandExtTextInputData::CommandExtTextInputData()
-CommandLine::get_arg(unsigned long) const
-CommandLine::get_arg_count() const
-CommandLine::get_arg_names() const
-CommandLine::set_arg_prefix(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
-CommunicationLinkList::DeleteAndDestroy(unsigned short, unsigned short)
-CommunicationLinkList::Insert(CommunicationLink const*&, unsigned short&)
-CommunicationLinkList::Insert(CommunicationLink const**, unsigned short)
-CommunicationLinkList::Insert(CommunicationLinkList const*, unsigned short, unsigned short)
-CommunicationLinkList::Remove(CommunicationLink const*&, unsigned short)
-Container::GetObjectPtr(unsigned long)
-Container::GetPos(void const*, unsigned long, unsigned char) const
-Container::Insert(void*, void*)
-Container::Replace(void*)
-Control::GetLineCount() const
-ControlItem::ControlItem(ControlData*)
-CurrencyBox::CurrencyBox(Window*, ResId const&)
-CurrencyBox::GetValue(unsigned short) const
-CurrencyBox::GetValuePos(long) const
-CurrencyBox::InsertValue(long, unsigned short)
-CurrencyBox::RemoveValue(long)
-CurrencyField::CurrencyField(Window*, ResId const&)
-CurrencyFormatter::SetCurrencySymbol(String const&)
-CustomPropertiesControl::Initialize()
-CustomPropertiesWindow::DoesCustomPropertyExist(String const&) const
-CustomToolBarImportHelper::showToolbar(rtl::OUString const&)
-DateBox::GetDate(unsigned short) const
-DateBox::GetDatePos(Date const&) const
-DateBox::InsertDate(Date const&, unsigned short)
-DateBox::RemoveDate(Date const&)
-DateFormatter::GetRealDate() const
-DateFormatter::IsDateModified() const
-DateTime::MakeDateTimeFromSec(Date const&, unsigned long)
-DbGridControl::IsForceHideScrollbars() const
-DbGridControl::SetMultiSelection(unsigned char)
-DbGridControl::forceROController(unsigned char)
-DbGridControl::forceSyncDisplay()
-DdeGetPutItem::DdeGetPutItem(DdeItem const&)
-DdeTopic::RemoveItem(DdeItem const&)
-DffPropSet::SetPropertyValue(unsigned int, unsigned int) const
-Dialog::Dialog(Window*, ResId const&)
-Dialog::ImplCenterDialog()
-Dialog::IsStartedModal() const
-DirEntry::GetDevice() const
-DlgEdObj::LinkStubOnCreate(void*, void*)
-DropListBox_Impl::LinkStubOnAsyncExecuteError(void*, void*)
-EECharAttribArray::Insert(EECharAttribArray const*, unsigned short, unsigned short, unsigned short)
-EECharAttribArray::Replace(EECharAttrib const&, unsigned short)
-EECharAttribArray::Replace(EECharAttrib const*, unsigned short, unsigned short)
-EECharAttribArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(EECharAttrib const&, void*), void*)
-EditDbg::GetTextPortionInfo(TextPortionList&)
-EditDbg::ShowPortionData(ParaPortion*)
-EditEngine::CreateFontFromItemSet(SfxItemSet const&)
-EditEngine::CursorLeft(ESelection const&, unsigned short) const
-EditEngine::CursorRight(ESelection const&, unsigned short) const
-EditEngine::EnableIdleFormatter(unsigned char)
-EditEngine::EnablePasteSpecial(unsigned char)
-EditEngine::GetAvailableSearchOptions()
-EditEngine::GetGroupChars() const
-EditEngine::ImportBulletItem(SvxNumBulletItem&, unsigned short, SvxBulletItem const*, SvxLRSpaceItem const*)
-EditEngine::IsFirstWordCapitalization() const
-EditEngine::IsIdleFormatterEnabled() const
-EditEngine::IsParagraphVisible(unsigned short)
-EditEngine::IsPasteSpecialEnabled() const
-EditEngine::RegisterClipboardFormatName()
-EditEngine::SelectSentence(ESelection const&) const
-EditEngine::SetActiveView(EditView*)
-EditEngine::SetGroupChars(String const&)
-EditEngine::SetText(unsigned short, EditTextObject const&)
-EditEngine::StopSelectionMode()
-EditEngine::WordLeft(ESelection const&, unsigned short) const
-EditEngine::WordRight(ESelection const&, unsigned short) const
-EditSelectionEngine::GetCurView()
-EditTextObject::Skip(SvStream&)
-EditView::Drop(DropEvent const&)
-EditView::GetDropPos()
-EditView::GetSelectionMode() const
-EditView::GetWordUnderMousePointer() const
-EditView::IndentBlock()
-EditView::IsPasteEnabled() const
-EditView::MatchGroup()
-EditView::QueryDrop(DropEvent&)
-EditView::SetCursor(Cursor const&)
-EditView::SetParaAttribs(SfxItemSet const&, unsigned short)
-EditView::SetPointer(Pointer const&)
-EditView::UnindentBlock()
-ElementCollector::isAbleToNotify() const
-ElementCollector::setSecurityId(int)
-EnhWMFReader::ReadGDIComment()
-ExtraKernInfo::HasKernPairs() const
-FieldEntry::GetBookmarkType()
-FileControl::ResetButtonText()
-FileControl::SetButtonText(String const&)
-FileCopier::GetError() const
-FileCopier::GetErrorHdl() const
-FileCopier::GetErrorSource() const
-FileCopier::GetErrorTarget() const
-FileCopier::SetErrorHdl(Link const&)
-FileList::GetFormat()
-FileStat::FileStat(void const*, void const*)
-FileStat::SetDateTime(String const&, DateTime const&)
-FileStream::FileStream(rtl::OString const&, FileAccessMode)
-FillAttrLB::FillAttrLB(Window*, ResId)
-FillAttrLB::SelectEntryByList(XBitmapList const*, String const&, Bitmap const&)
-FilterConfigCache::FilterConfigCacheEntry::IsValid()
-FilterConfigCache::IsImportDialog(unsigned short)
-FilterConfigItem::ReadSize(rtl::OUString const&, com::sun::star::awt::Size const&)
-FilterConfigItem::WriteSize(rtl::OUString const&, com::sun::star::awt::Size const&)
-FilterConfigItem::WriteString(rtl::OUString const&, rtl::OUString const&)
-FixedBitmap::GetModeBitmap() const
-FixedBitmap::SetModeBitmap(Bitmap const&)
-FixedBorder::FixedBorder(Window*, long)
-FixedBorder::SetBorderType(unsigned short)
-FixedBorder::SetTransparent(unsigned char)
-FixedImage::CalcImagePos(Point const&, Size const&, Size const&)
-FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
-FmEntryDataArray::Insert(FmEntryData* const&, unsigned short&)
-FmEntryDataArray::Insert(FmEntryData* const*, unsigned short)
-FmEntryDataArray::Insert(FmEntryDataArray const*, unsigned short, unsigned short)
-FmEntryDataArray::Remove(FmEntryData* const&, unsigned short)
-FmFieldWinMgr::GetChildWindowId()
-FmFormModel::FmFormModel(SfxItemPool*, SfxObjectShell*, bool)
-FmFormObj::getType() const
-FmGridControl::restored(com::sun::star::lang::EventObject const&)
-FmPropBrwMgr::GetChildWindowId()
-FmXFilterCell::getImplementation(com::sun::star::uno::Reference<com::sun::star::awt::XControl> const&)
-FmXFormShell::clearFilter()
-FontCharMap::GetLastChar() const
-FontSizeBox::GetValue(unsigned short, FieldUnit) const
-FontSizeBox::SetUserValue(long, FieldUnit)
-FontStyleBox::FontStyleBox(Window*, long)
-FontStyleMenu::Fill(String const&, FontList const*)
-FontStyleMenu::FontStyleMenu()
-FormattedField::SetValidateText(String const&, String const*)
-FormatterBase::SetFieldText(String const&, unsigned char)
-Fraction::Fraction(long, long, long, long)
-GDIMetaFile::CopyAction(unsigned long) const
-GDIMetaFile::GetActionPos(String const&)
-GDIMetaFile::GetLabel(unsigned long)
-GDIMetaFile::GetLabelCount() const
-GDIMetaFile::InsertLabel(String const&, unsigned long)
-GDIMetaFile::IsEqual(GDIMetaFile const&) const
-GDIMetaFile::RemoveLabel(String const&)
-GDIMetaFile::RenameLabel(String const&, String const&)
-GDIMetaFile::ReplaceColors(Color const&, Color const&, unsigned long)
-GDIMetaFile::SaveStatus()
-GDIMetaFile::Wind(unsigned long)
-GDIMetaFile::WindEnd()
-GDIMetaFile::WindNext()
-GalleryExplorer::DrawCentered(OutputDevice*, FmFormModel const&)
-GalleryExplorer::GetObjCount(unsigned long)
-GalleryExplorer::GetVCDrawModel(FmFormModel&) const
-GalleryExplorer::InsertGraphicObj(unsigned long, Graphic const&)
-GalleryExplorer::InsertSdrObj(unsigned long, FmFormModel&)
-GalleryTheme::ImplRead()
-GlobalEventConfig::EstablishFrameCallback(com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&)
-GlobalEventConfig_Impl::getEvents()
-GradientLB::GradientLB(Window*, long, unsigned char)
-GraphCtrl::GraphCtrl(Window*, long)
-Graphic::Draw(OutputDevice*, String const&, Font&, Bitmap const&, Point const&, Size const&)
-Graphic::StartAnimation(OutputDevice*, Point const&, long, OutputDevice*)
-GraphicConverter::ImplConvert(unsigned long, void*, unsigned long, void**, unsigned long)
-GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Point const&) const
-GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Size const&) const
-GraphicHelper::getDeviceInfo() const
-GraphicManager::ClearCache()
-GraphicManager::GetCacheTimeout() const
-GraphicManager::GetFreeCacheSize() const
-GraphicManager::GetMaxCacheSize() const
-GraphicManager::GetMaxObjCacheSize() const
-GraphicManager::GetUsedCacheSize() const
-GraphicObject::GetChecksum() const
-GraphicObject::GetSwapStreamHdl() const
-GraphicObject::GraphicObject(Graphic const&, String const&, GraphicManager const*)
-GraphicObject::ResetAnimationLoopCount()
-GraphicObject::SetAnimationNotifyHdl(Link const&)
-GraphicObject::SetGraphicManager(GraphicManager const&)
-GraphicReader::IsPreviewModeEnabled() const
-GroupTable::SkipCurrentGroup()
-HTMLControls::Insert(HTMLControl const*&, unsigned short&)
-HTMLControls::Insert(HTMLControl const**, unsigned short)
-HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short)
-HTMLControls::Remove(HTMLControl const*&, unsigned short)
-HTMLControls::Remove(unsigned short, unsigned short)
-Hatch::SetStyle(HatchStyle)
-HatchingLB::HatchingLB(Window*, long, unsigned char)
-HatchingLB::SelectEntryByList(XHatchList const*, String const&, XHatch const&, unsigned short)
-HeaderBar::GetItemData(unsigned short) const
-HeaderBar::GetItemImage(unsigned short) const
-HeaderBar::InsertItem(unsigned short, Image const&, String const&, long, unsigned short, unsigned short)
-HeaderBar::InsertItem(unsigned short, Image const&, long, unsigned short, unsigned short)
-HeaderBar::SetHelpId(unsigned short, rtl::OString const&)
-HeaderBar::SetHelpText(unsigned short, String const&)
-HeaderBar::SetItemData(unsigned short, void*)
-HeaderBar::SetItemImage(unsigned short, Image const&)
-HelpTextWindow::RegisterAccessibleParent()
-HelpTextWindow::RevokeAccessibleParent()
-IMapWindow::GetSdrObj(IMapObject const*) const
-INetURLObject::hasPassword() const
-IconChoiceDialog::RemoveResetButton()
-IconChoiceDialog::RemoveTabPage(unsigned short)
-ImageAryData::ImageAryData()
-ImageButton::ImageButton(unsigned short)
-ImageList::Clear()
-ImageList::GetImageIds(std::vector<unsigned short, std::allocator<unsigned short> >&) const
-ImageList::RemoveImage(rtl::OUString const&)
-ImageList::ReplaceImage(rtl::OUString const&, rtl::OUString const&)
-ImageList::ReplaceImage(unsigned short, Image const&)
-ImageMap::GetBoundRect() const
-ImpBitmap::ImplDestroy()
-ImpDefaultMapper::ImpDefaultMapper(com::sun::star::uno::Reference<com::sun::star::beans::XPropertyState>&)
-ImpEditEngine::ImplFillTextMarkingVector(com::sun::star::lang::Locale const&, std::vector<EEngineData::TextMarkingClass, std::allocator<EEngineData::TextMarkingClass> >&, String const&, unsigned short, unsigned short) const
-ImpEditEngine::Repeat(EditView*)
-ImpEditView::CalcSelectedRegion()
-ImpLabelList::ImplFirst()
-ImpLabelList::ImplNext()
-ImpSvMEdit::SetInsertMode(unsigned char)
-ImpSvMEdit::SetTextWindowOffset(Point const&)
-ImpSvlData::~ImpSvlData()
-ImpSvtData::~ImpSvtData()
-ImplBorderWindow::ImplBorderWindow(Window*, long, unsigned short, com::sun::star::uno::Any const&)
-ImplBorderWindow::SetHelpButton(unsigned char)
-ImplDevFontList::ImplFindByLocale(com::sun::star::lang::Locale&) const
-ImplDockingWindowWrapper::GetFloatingPos() const
-ImplDockingWindowWrapper::GetMaxOutputSizePixel() const
-ImplDockingWindowWrapper::GetMinOutputSizePixel() const
-ImplDockingWindowWrapper::GetOutputSizePixel() const
-ImplDockingWindowWrapper::GetRollUpOutputSizePixel() const
-ImplDockingWindowWrapper::IsPined() const
-ImplDockingWindowWrapper::IsRollUp() const
-ImplDockingWindowWrapper::IsTitleButtonVisible(unsigned short) const
-ImplDockingWindowWrapper::RollDown()
-ImplDockingWindowWrapper::RollUp()
-ImplDockingWindowWrapper::SetFloatingPos(Point const&)
-ImplDockingWindowWrapper::SetOutputSizePixel(Size const&)
-ImplDockingWindowWrapper::SetPin(unsigned char)
-ImplDockingWindowWrapper::SetRollUpOutputSizePixel(Size const&)
-ImplEntryList::IsEntrySelected(String const&) const
-ImplFontSelectData::ImplFontSelectData(ImplFontData const&, Size const&, float, int, bool)
-ImplImageList::GetImageCount() const
-ImplListBox::GetEntryFlags(unsigned short) const
-ImplRegionBand::IsInside(long, long)
-ImplRegionBand::IsOver(long, long)
-ImplTaskBarFloat::ImplTaskBarFloat(TaskBar*)
-ImplWin::GetModeImage() const
-ImplWin::SetModeImage(Image const&)
-IniParser::Dump()
-InsCapOptArr::Insert(InsCapOptArr const*, unsigned short, unsigned short)
-InsCapOptArr::Insert(InsCaptionOpt* const&, unsigned short&)
-InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short)
-InsCapOptArr::Remove(InsCaptionOpt* const&, unsigned short)
-InsCapOptArr::Remove(unsigned short, unsigned short)
-IntlWrapper::ImplNewCalendar() const
-IntlWrapper::ImplNewCharClass() const
-IntroWindow::SetBackgroundBitmap(Bitmap const&)
-ItemList::FindAttrib(unsigned short)
-KeyCode::GetSymbolName(String const&, Window*) const
-KeyEvent::InitKeyEvent(com::sun::star::awt::KeyEvent&) const
-KeyEvent::KeyEvent(com::sun::star::awt::KeyEvent const&)
-KeyboardSettings::CopyData()
-LWPFilterImportFilter::getSupportedServiceNames_Static()
-Line::Enum(Link const&)
-Line::NearestPoint(Point const&) const
-LineInfo::isDashDotOrFatLineUsed() const
-LineLB::SelectEntryByList(XDashList const*, String const&, XDash const&, unsigned short)
-LineListBox::GetEntryDistance(unsigned short) const
-LineListBox::GetEntryLine1(unsigned short) const
-LineListBox::GetEntryLine2(unsigned short) const
-LinguMgr::UpdateAll()
-LinguOptions::GetValue(com::sun::star::uno::Any&, int) const
-LinguOptions::SetValue(com::sun::star::uno::Any&, com::sun::star::uno::Any const&, int)
-LinkStructArr::DeleteAndDestroy(unsigned short, unsigned short)
-ListBox::CalcWindowSizePixel(unsigned short) const
-ListBox::GetMRUEntries(unsigned short) const
-ListBox::GetMaxMRUCount() const
-ListBox::GetProminentEntryType() const
-ListBox::GetUserItemSize() const
-ListBox::IsDDAutoWidthEnabled() const
-ListBox::IsUserDrawEnabled() const
-ListBox::SetMRUEntries(String const&, unsigned short)
-ListBox::SetMaxMRUCount(unsigned short)
-ListBox::SetProminentEntryType(ProminentEntry)
-ListBox::SetSeparatorPos()
-ListBox::ShowProminentEntry(unsigned short)
-LngSvcMgr::RemoveLngSvcEvtBroadcaster(com::sun::star::uno::Reference<com::sun::star::linguistic2::XLinguServiceEventBroadcaster> const&)
-LocaleDataWrapper::getCollatorImplementations() const
-LocaleDataWrapper::getTransliterations() const
-LongCurrencyBox::GetValue(unsigned short) const
-LongCurrencyBox::GetValuePos(BigInt) const
-LongCurrencyBox::InsertValue(BigInt, unsigned short)
-LongCurrencyBox::LongCurrencyBox(Window*, ResId const&)
-LongCurrencyBox::RemoveValue(BigInt)
-LongCurrencyField::ImplLoadRes(ResId const&)
-LongCurrencyField::LongCurrencyField(Window*, ResId const&)
-LongCurrencyFormatter::Denormalize(BigInt) const
-LongCurrencyFormatter::IsValueModified() const
-LongCurrencyFormatter::Normalize(BigInt) const
-LongCurrencyFormatter::SetEmptyValue()
-LotAttrCache::ENTRY::ENTRY(ScPatternAttr const&)
-LotAttrCol::Clear()
-LwpBulletStyleMgr::GetSectionName(LwpPara*)
-LwpCHBlkMarker::ProcessPageNumber(XFContentContainer*, unsigned char)
-LwpCellLayout::GetLeaderChar()
-LwpChangeMgr::ConvertFribContent(XFContentContainer*, LwpFrib*)
-LwpCharacterBorderOverride::Override(LwpCharacterBorderOverride*)
-LwpDLList::LwpDLList(LwpDLList*, LwpDLList*)
-LwpDocData::SkipAtomHandler(LwpSvStream*)
-LwpDocData::SkipExtra(LwpSvStream*)
-LwpDocument::GetMaxNumberOfPages()
-LwpDocument::ParseMasterDoc(IXFStream*)
-LwpFootnote::FindFootnoteTable()
-LwpFootnote::GetEnSuperTableLayout()
-LwpFoundry::FindBookMarkByName(rtl::OUString)
-LwpFribTable::Parse(IXFStream*)
-LwpGraphicObject::GetRectIn100thMM()
-LwpGraphicObject::GetRectInCM()
-LwpMiddleLayout::SetScaleCenter(unsigned short)
-LwpMiddleLayout::SetScaleHeight(double)
-LwpMiddleLayout::SetScaleMode(unsigned short)
-LwpMiddleLayout::SetScalePercentage(unsigned int)
-LwpMiddleLayout::SetScaleTile(unsigned short)
-LwpMiddleLayout::SetScaleWidth(double)
-LwpNumberingOverride::Override(LwpNumberingOverride*)
-LwpObject::LwpObject()
-LwpObjectID::GetBuffer(char*)
-LwpObjectID::ReadCompressed(LwpSvStream*, LwpObjectID&)
-LwpObjectStream::QuickReadInt8(bool*)
-LwpOlePres::Read(SvStream&)
-LwpPara::GetLayoutWithMyStory()
-LwpPara::IsNumberRight()
-LwpPara::OverrideTab(LwpTabOverride*, LwpTabOverride*, XFParaStyle*)
-LwpPlacableLayout::GetRelativeDistance()
-LwpPlacableLayout::GetRelativeFromWhere()
-LwpPlacableLayout::GetTetherType()
-LwpPlacableLayout::GetTetherWhere()
-LwpRowHeadingLayout::GetRowLayout()
-LwpSortOption::Skip(LwpObjectStream*)
-LwpStory::XFConvertFrame(XFContentContainer*)
-LwpSuperTableLayout::ParseFrame(XFFrame*)
-LwpTableHint::LwpTableHint(LwpObjectHeader&, LwpSvStream*)
-LwpUIDocument::LwpUIDocument()
-LwpVerDocument::GetTabSpacing()
-MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
-MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
-MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
-MSDffImportRecords::Remove(SvxMSDffImportRec* const&, unsigned short)
-MSDffImportRecords::Remove(unsigned short, unsigned short)
-MSFilterTracer::EndElement(rtl::OUString const&)
-MSFilterTracer::SetProperty(rtl::OUString const&, com::sun::star::uno::Any const&)
-MSFilterTracer::StartElement(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>)
-MachineSettings::CopyData()
-MailDispatcher::removeListener(rtl::Reference<IMailDispatcherListener>)
-MaskSet::MaskSet(SvxBmpMask*, long)
-Matrix3d::Inverse() const
-Matrix3d::Matrix3d()
-MergeData::~MergeData()
-MergeDataFile::Dump()
-MessBox::GetModeImage() const
-MessBox::MessBox(unsigned short)
-MessBox::SetDefaultCheckBoxText()
-MessBox::SetModeImage(Image const&)
-MetaCommentAction::MetaCommentAction(unsigned char const*, unsigned int)
-MetricBox::RemoveValue(long, FieldUnit)
-MetricField::ConvertValue(long, unsigned short, FieldUnit, MapUnit)
-MiscSettings::SetDisablePrinting(unsigned char)
-MiscSettings::SetEnableATToolSupport(unsigned char)
-ModulWindow::LinkStubBasicErrorHdl(void*, void*)
-MoreButton::RemoveWindow(Window*)
-MouseEvent::InitMouseEvent(com::sun::star::awt::MouseEvent&) const
-MultiLineEdit::GetHScrollBar() const
-MultiLineEdit::GetLeftMargin() const
-MultiLineEdit::GetTextLines() const
-MultiLineEdit::IsFocusSelectionHideEnabled() const
-MultiLineEdit::IsRightToLeft() const
-MultiLineEditSyntaxHighlight::EnableBracketHilight(bool)
-MultiLineEditSyntaxHighlight::IsBracketHilight()
-MultiPropertySetHelper::MultiPropertySetHelper(rtl::OUString const*)
-MultiSelection::Append(long)
-MultiSelection::PrevSelected()
-NameNode::IsOrderTree() const
-NativeNumberWrapper::isValidNatNum(com::sun::star::lang::Locale const&, short) const
-NfCurrencyEntry::ApplyVariableInformation(NfCurrencyEntry const&)
-NfCurrencyEntry::IsEuro() const
-NfCurrencyEntry::NfCurrencyEntry()
-NfCurrencyEntry::SetEuro()
-NfShCurrencyEntries::DeleteAndDestroy(unsigned short, unsigned short)
-NotificationSettings::CopyData()
-NotifyBrokenPackage::isAborted()
-NumberFormatCodeWrapper::getDefault(short, short) const
-NumericBox::GetValue(unsigned short) const
-NumericBox::GetValuePos(long) const
-NumericBox::RemoveValue(long)
-NumericFormatter::ConvertToFraction(long)
-NumericFormatter::ConvertToLong(Fraction const&)
-OLEObjCache::SetSize(unsigned long)
-ORegKey::acquireKey(void*)
-OUStringsSort_Impl::DeleteAndDestroy(unsigned short, unsigned short)
-OUStringsSort_Impl::Insert(OUStringsSort_Impl const*, unsigned short, unsigned short)
-OUStringsSort_Impl::Insert(rtl::OUString* const&)
-OUStringsSort_Impl::Insert(rtl::OUString* const&, unsigned short&)
-OUStringsSort_Impl::Insert(rtl::OUString* const*, unsigned short)
-OUStringsSort_Impl::Remove(rtl::OUString* const&, unsigned short)
-OUStringsSort_Impl::Remove(unsigned short, unsigned short)
-Octree::AddColor(BitmapColor const&)
-Octree::Octree(unsigned long)
-OdtGeneratorPrivate::_writeBegin()
-OpenStormBento::AswEntry::SetClassId(OpenStormBento::ClsId const&)
-OpenStormBento::AswEntry::SetName(String const&)
-OpenStormBento::AswEntry::Store(void*)
-OpenStormBento::CBenObject::DeleteProperty(OpenStormBento::CBenProperty*)
-OpenStormBento::CBenObject::GetNextProperty(OpenStormBento::CBenProperty*)
-OpenStormBento::CBenObject::UseSingleValue()
-OpenStormBento::CBenObject::UseValueWithPropertyName(char const*)
-OpenStormBento::CBenTOCReader::GetWord(unsigned short*)
-OpenStormBento::CBenValue::GetReferencedListID()
-OpenStormBento::CBenValue::GetReferencedObject(OpenStormBento::CBenReference*)
-OpenStormBento::CBenValue::NewReference(unsigned long, OpenStormBento::CBenReference*)
-OpenStormBento::CBenValue::ReadValueDataKnownSize(void*, unsigned long, unsigned long)
-OpenStormBento::CBenValue::TruncateValueSize(unsigned long)
-OpenStormBento::CBenValue::WriteImmediateValueData(void const*, unsigned short)
-OpenStormBento::CUtList::CircularGetNext(OpenStormBento::CUtListElmt const*)
-OpenStormBento::CUtList::CircularGetPrev(OpenStormBento::CUtListElmt const*)
-OpenStormBento::CUtList::GetCount()
-OpenStormBento::CUtList::GetIndex(OpenStormBento::CUtListElmt*)
-OpenStormBento::CUtList::GetIndex(int)
-OpenStormBento::CUtList::GetPrevOrNULL(OpenStormBento::CUtListElmt*)
-OpenStormBento::LtcBenContainer::CreateGraphicStreams(std::vector<SvStream*, std::allocator<SvStream*> >*)
-OpenStormBento::LtcBenContainer::GetPosition(unsigned long*)
-OpenStormBento::LtcBenContainer::RegisterTypeName(char const*, OpenStormBento::CBenTypeName**)
-OpenStormBento::LtcBenContainer::Release()
-Options::getExtraInputFile(unsigned short) const
-Options::getInputFile(unsigned short)
-Options::getOptions()
-Outliner::Draw(OutputDevice*, Rectangle const&, Point const&)
-Outliner::EndSpelling()
-Outliner::GetAsianCompressionMode() const
-Outliner::GetBeginDropHdl() const
-Outliner::GetBigTextObjectStart() const
-Outliner::GetDefTab() const
-Outliner::GetDocPos(Paragraph*)
-Outliner::GetEndDropHdl() const
-Outliner::GetFirstLineOffset(unsigned long)
-Outliner::GetForbiddenCharsTable() const
-Outliner::GetHyphenator() const
-Outliner::GetNotifyHdl() const
-Outliner::GetPolygon()
-Outliner::HasOnlineSpellErrors() const
-Outliner::IsAddExtLeading() const
-Outliner::IsAutoColorEnabled() const
-Outliner::IsFixedCellHeight() const
-Outliner::IsKernAsianPunctuation() const
-Outliner::RemoveParaFlag(Paragraph*, unsigned short)
-Outliner::SetBigTextObjectStart(unsigned short)
-Outliner::SetVisible(Paragraph*, unsigned char)
-OutlinerView::AdjustDepth(Paragraph*, short, unsigned char)
-OutlinerView::AdjustHeight(Paragraph*, long, unsigned char)
-OutlinerView::Collapse(Paragraph*)
-OutlinerView::CompleteAutoCorrect()
-OutlinerView::EnablePaste(unsigned char)
-OutlinerView::Expand(Paragraph*)
-OutlinerView::GetFieldUnderMousePointer(unsigned short&, unsigned short&) const
-OutlinerView::ImpDragScroll(Point const&)
-OutlinerView::ImpGetDocPos(Point const&)
-OutlinerView::ImpGetInsertionPara(Point const&)
-OutlinerView::ImpShowDDCursor()
-OutlinerView::Redo()
-OutlinerView::RemoveCharAttribs(unsigned long, unsigned short)
-OutlinerView::SetOutliner(Outliner*)
-OutlinerView::SetStyleSheet(SfxStyleSheet*)
-OutlinerView::SpellIgnoreWord()
-OutlinerView::Undo()
-OutputDevice::DrawNativeControlText(unsigned int, unsigned int, Rectangle const&, unsigned int, ImplControlValue const&, rtl::OUString)
-OutputDevice::GetFontSubstitute(unsigned short, String&, String&, unsigned short&)
-OutputDevice::GetMinKashida(Font const&) const
-OutputDevice::GetPixel(Polygon const&) const
-OutputDevice::ImplFloatDevicePixelToLogicHeight(float) const
-OutputDevice::ImplFloatDevicePixelToLogicWidth(float) const
-OutputDevice::ImplFloatLogicWidthToDevicePixel(float) const
-OutputDevice::ImplGetTextWidth(SalLayout const&) const
-OutputDevice::IsTextUnderlineAbove(Font const&)
-OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, MapMode const&)
-OutputDevice::LogicToLogic(long*, unsigned short, MapMode const*, MapMode const*) const
-OutputDevice::LogicToPixel(Region const&, MapMode const&) const
-OutputDevice::LogicToPixel(basegfx::B2DPolyPolygon const&) const
-OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const
-OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const
-OutputDevice::PixelToLogic(Region const&, MapMode const&) const
-OutputDevice::PixelToLogic(basegfx::B2DPolyPolygon const&) const
-OutputDevice::PixelToLogic(basegfx::B2DPolygon const&) const
-PageSpan::getMarginLeft() const
-PageSpan::getMarginRight() const
-ParaPortion::DbgCheckTextPortions()
-ParaPortionList::DbgCheck(EditDoc&)
-ParagraphList::GetVisPos(Paragraph*) const
-ParagraphList::PrevVisible(Paragraph*) const
-ParagraphObj::ImplMapSize(com::sun::star::awt::Size const&)
-ParagraphObj::ParagraphObj(ParagraphObj&)
-PathDialog::SetPath(Edit const&)
-PatternBox::GetString(unsigned short) const
-PatternBox::GetStringPos(String const&) const
-PatternBox::InsertString(String const&, unsigned short)
-PatternBox::PatternBox(Window*, ResId const&)
-PatternBox::RemoveString(String const&)
-PatternField::PatternField(Window*, ResId const&)
-PatternFormatter::SelectFixedFont()
-PluginConnector::getInstance(_NPP*)
-PluginConnector::getInstanceById(unsigned int)
-PopupMenu::SetSelectedEntry(unsigned short)
-PropBrwMgr::GetChildWindowId()
-ProposalList::Remove(rtl::OUString const&)
-PushButton::GetSymbolAlign() const
-REResourceList::REResourceList()
-REResourceList::~REResourceList()
-ResData::Dump()
-Ruler::GetArrowCount() const
-Ruler::GetArrows() const
-Ruler::GetBorderCount() const
-Ruler::GetBorders() const
-Ruler::GetDocType(Point const&, RulerType, unsigned short*) const
-Ruler::GetIndentCount() const
-Ruler::GetIndents() const
-Ruler::GetLineCount() const
-Ruler::GetLines() const
-Ruler::GetMargin1Style() const
-Ruler::GetMargin2Style() const
-Ruler::GetPageWidth() const
-Ruler::SetArrows(unsigned short, RulerArrow const*)
-SVGExport::GetGlyphPlacement() const
-SVGExport::IsUseGradient() const
-SVGExport::popClip()
-SVGExport::pushClip(basegfx::B2DPolyPolygon const&)
-SVGFilter::implImport(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
-SVTXGridControl::ImplGetPropertyIds(std::list<unsigned short, std::allocator<unsigned short> >&)
-SalColormap::SalColormap(BitmapPalette const&)
-SalColormap::SetPalette(BitmapPalette const&)
-SalDisplay::IsLocal()
-SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const&, unsigned int, OutputDevice const*)
-SalGraphics::drawAlphaBitmap(SalTwoRect const&, SalBitmap const&, SalBitmap const&)
-SalGraphics::drawPolyLine(basegfx::B2DPolygon const&, double, basegfx::B2DVector const&, basegfx::B2DLineJoin)
-SalGraphics::drawPolyPolygon(basegfx::B2DPolyPolygon const&, double)
-SalI18N_InputContext::CommitStringCallback(unsigned short*, unsigned long)
-SalI18N_InputContext::SetPreeditState(int)
-SanExtensionImpl::extractCertExt()
-SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
-SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
-SbMethod::GetLocals()
-SbPropertyContainer::SbPropertyContainer()
-SbPropertySetInfo::SbPropertySetInfo()
-SbTextPortions::Insert(SbTextPortions const*, unsigned short, unsigned short, unsigned short)
-SbTextPortions::Replace(SbTextPortion const&, unsigned short)
-SbTextPortions::Replace(SbTextPortion const*, unsigned short, unsigned short)
-SbTextPortions::_ForEach(unsigned short, unsigned short, unsigned char (*)(SbTextPortion const&, void*), void*)
-SbiBuffer::Add(void const*, unsigned short)
-SbiBuffer::Align(int)
-SbiDisas::Disas(SvStream&)
-SbiDisas::PromptOp(String&)
-SbiExprNode::IsString()
-SbiExpression::SbiExpression(SbiParser*, SbiToken)
-SbiExpression::SbiExpression(SbiParser*, String const&)
-SbiExpression::VBA_Imp()
-SbiImage::Load(SvStream&)
-SbiIoSystem::NextChannel()
-SbiRuntime::GetParams()
-SbiSymPool::Clear()
-SbxAlias::SbxAlias(String const&, SbxVariable*)
-SbxAppData::~SbxAppData()
-SbxBase::StaticEnableBroadcasting(unsigned char)
-SbxDecimal::SbxDecimal()
-SbxDecimal::getByte(unsigned char&)
-SbxDecimal::getChar(unsigned short&)
-SbxDecimal::getInt(int&)
-SbxDecimal::getLong(int&)
-SbxDecimal::getShort(short&)
-SbxDecimal::getString(rtl::OUString&)
-SbxDecimal::getUInt(unsigned int&)
-SbxDecimal::getULong(unsigned int&)
-SbxDecimal::getUShort(unsigned short&)
-SbxDecimal::setShort(short)
-SbxDecimal::setString(rtl::OUString*)
-SbxDecimal::setUShort(unsigned short)
-SbxDimArray::GetRef(SbxArray*)
-SbxDimArray::GetRef(short const*)
-SbxDimArray::GetRef32(int const*)
-SbxDimArray::Offset(SbxArray*)
-SbxDimArray::Put(SbxVariable*, SbxArray*)
-SbxInfo::AddParam(SbxParamInfo const&)
-SbxObject::GarbageCollection(unsigned long)
-SbxObject::SetPos(SbxVariable*, unsigned short)
-SbxObject::VCPtrInsert(SbxVariable*)
-SbxObject::VCPtrRemove(SbxVariable*)
-SbxValue::GetData() const
-SbxValue::GetErr() const
-SbxValue::GetInt() const
-SbxValue::GetNoBroadcast(SbxValues&)
-SbxValue::HasObject() const
-SbxValue::PutData(void*)
-SbxValue::PutDecimal(SbxDecimal*)
-SbxValue::PutInt(int)
-SbxValue::PutString(unsigned short const*)
-SbxValue::PutpChar(unsigned short const*)
-ScAddInAsyncs::Insert(ScAddInAsync* const&, unsigned short&)
-ScAddInAsyncs::Insert(ScAddInAsync* const*, unsigned short)
-ScAddInAsyncs::Insert(ScAddInAsyncs const*, unsigned short, unsigned short)
-ScAddInDocs::DeleteAndDestroy(unsigned short, unsigned short)
-ScAddInDocs::Insert(ScAddInDocs const*, unsigned short, unsigned short)
-ScAddInDocs::Insert(ScDocument* const&, unsigned short&)
-ScAddInDocs::Insert(ScDocument* const*, unsigned short)
-ScAddInDocs::Remove(ScDocument* const&, unsigned short)
-ScAreaLinkSaveCollection::clear()
-ScAttrArray::HasLines(int, int, Rectangle&, unsigned char, unsigned char) const
-ScCellMergeOption::ScCellMergeOption()
-ScChangeActionContent::SetNewValue(String const&, ScDocument*)
-ScColumn::GetSimpleTextNeededSize(unsigned long, OutputDevice*, bool)
-ScCompressedArray<int, unsigned char>::GetEntryCount() const
-ScCompressedArray<int, unsigned short>::CopyFrom(ScCompressedArray<int, unsigned short> const&, int, int, long)
-ScCompressedArray<int, unsigned short>::GetValue(int) const
-ScCompressedArray<int, unsigned short>::Insert(int, unsigned long)
-ScCompressedArray<int, unsigned short>::Remove(int, unsigned long)
-ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short const&, unsigned long)
-ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short const*, unsigned long)
-ScCompressedArray<int, unsigned short>::SetValue(int, unsigned short const&)
-ScConditionalFormatList::MarkUsedExternalReferences() const
-ScConditionalFormats_Impl::Insert(ScConditionalFormat* const&, unsigned short&)
-ScConditionalFormats_Impl::Insert(ScConditionalFormat* const*, unsigned short)
-ScConditionalFormats_Impl::Insert(ScConditionalFormats_Impl const*, unsigned short, unsigned short)
-ScConditionalFormats_Impl::Remove(ScConditionalFormat* const&, unsigned short)
-ScConditionalFormats_Impl::Remove(unsigned short, unsigned short)
-ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const&, long)
-ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_cxx::__normal_iterator<void**, std::vector<void*, std::allocator<void*> > >, ScDBData>)
-ScDBCollection::AnonDBs::size() const
-ScDLL::Exit()
-ScDPCache::GetAdditionalItemID(String const&) const
-ScDPCache::GetDimNumType(short) const
-ScDPCache::GetSortedItemData(short, int) const
-ScDPCache::IsEmptyMember(int, unsigned short) const
-ScDPFieldControlBase::GetParentDlg() const
-ScDPFieldControlBase::ModifySelectionOffset(long)
-ScDPFieldControlBase::SetSelectedField(unsigned long)
-ScDPItemData::CreateTypeString()
-ScDPItemData::GetNumFormat() const
-ScDPSaveData::Refresh(com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> const&)
-ScDdeLink::ResetValue()
-ScDocRowHeightUpdater::TabRanges::TabRanges()
-ScDocument::HasControl(short, Rectangle const&)
-ScDocument::InvalidateControls(Window*, short, Rectangle const&)
-ScDocument::IsLoadingMedium() const
-ScDocument::ValidNewTabName(std::vector<String, std::allocator<String> > const&) const
-ScExternalRefManager::setCacheTableReferencedPermanently(unsigned short, rtl::OUString const&, unsigned long)
-ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-ScFormulaCell::ScFormulaCell()
-ScGridWindow::InvertSimple(short, int, short, int, unsigned char, unsigned char)
-ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
-ScHTMLColOffset::Insert(unsigned long const&, unsigned short&)
-ScHTMLColOffset::Insert(unsigned long const*, unsigned short)
-ScHTMLColOffset::Remove(unsigned long const&, unsigned short)
-ScHTMLColOffset_SAR::Replace(unsigned long const&, unsigned short)
-ScHTMLColOffset_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
-ScHTMLColOffset_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
-ScInputBarGroup::GainFocus()
-ScJobSetup::ScJobSetup(SfxPrinter*)
-ScLeftFooterEditPage::GetRanges()
-ScLeftHeaderEditPage::GetRanges()
-ScMatrix::CalcOffset(unsigned long, unsigned long) const
-ScMyCellInfo::ScMyCellInfo()
-ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport&)
-ScMyStyleRanges::SetStylesToRanges(ScRangeListRef, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport&)
-ScNamedRangeObj::SetContentWithGrammar(rtl::OUString const&, formula::FormulaGrammar::Grammar)
-ScNamedRangeObj::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-ScOutputData::DrawEditAsianVertical(ScOutputData::DrawEditParam&)
-ScOutputData::DrawEditParam::getEngineWidth(ScFieldEditEngine*) const
-ScPivotParam::ClearPivotArrays()
-ScRTFColTwips::Insert(ScRTFColTwips const*, unsigned short, unsigned short)
-ScRTFColTwips::Insert(unsigned long const&, unsigned short&)
-ScRTFColTwips::Insert(unsigned long const*, unsigned short)
-ScRTFColTwips::Remove(unsigned long const&, unsigned short)
-ScRTFColTwips_SAR::Replace(unsigned long const&, unsigned short)
-ScRTFColTwips_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
-ScRTFColTwips_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
-ScRangeData::ScRangeData(unsigned short)
-ScRightFooterEditPage::GetRanges()
-ScRightHeaderEditPage::GetRanges()
-ScSheetSourceDesc::GetCacheId() const
-ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const&) const
-ScStringCell::ScStringCell()
-ScSubTotalDescriptorBase::GetData(ScSubTotalParam&) const
-ScSubTotalDescriptorBase::PutData(ScSubTotalParam const&)
-ScTabPageSortFields::GetRanges()
-ScTabPageSortOptions::GetRanges()
-ScTabViewShell::LinkStubHtmlOptionsHdl(void*, void*)
-ScTable::IsRangeNameInUse(short, int, short, int, unsigned short) const
-ScTable::SetColFlags(short, unsigned char)
-ScTpCalcOptions::GetRanges()
-ScTpPrintOptions::GetRanges()
-ScTpSubTotalGroup::GetRanges()
-ScTpUserLists::GetRanges()
-ScUserList::end()
-ScUserList::end() const
-ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&)
-ScValidationEntries_Impl::Insert(ScValidationData* const*, unsigned short)
-ScValidationEntries_Impl::Insert(ScValidationEntries_Impl const*, unsigned short, unsigned short)
-ScValidationEntries_Impl::Remove(ScValidationData* const&, unsigned short)
-ScValidationEntries_Impl::Remove(unsigned short, unsigned short)
-ScValueCell::ScValueCell()
-ScVbaChart::areIndicesValid(int, int)
-ScVbaColorFormat::setColorFormat(short)
-ScVbaCommandBarControl::ScVbaCommandBarControl(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, boost::shared_ptr<VbaCommandBarHelper>, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, rtl::OUString const&, int, unsigned char)
-ScVbaCommentShape::ScVbaCommentShape(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&, com::sun::star::uno::Reference<ooo::vba::excel::XComment> const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, int)
-ScVbaFormat<ooo::vba::excel::XRange>::getXServiceInfo()
-ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
-ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
-ScVbaFormat<ooo::vba::excel::XStyle>::getXServiceInfo()
-ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
-ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
-ScVbaLineFormat::calculateArrowheadSize() const
-ScVbaShape::ScVbaShape(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
-ScVbaShapes::AddShape(rtl::OUString const&, rtl::OUString const&, int, int, int, int)
-ScVbaWindows::ScVbaWindows(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&)
-ScVbaWorksheet::ScVbaWorksheet(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
-ScXMLExportDDELinks::CellsEqual(unsigned char, unsigned char, String const&, double const&, unsigned char, unsigned char, String const&, double const&) const
-ScXMLExportDatabaseRanges::WriteFilterDescriptor(com::sun::star::uno::Reference<com::sun::star::sheet::XSheetFilterDescriptor2> const&, rtl::OUString)
-ScXMLExportDatabaseRanges::WriteImportDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>)
-ScXMLExportDatabaseRanges::WriteSortDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>)
-ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(com::sun::star::uno::Reference<com::sun::star::sheet::XSubTotalDescriptor>, rtl::OUString)
-ScaList::Insert(void*, unsigned int)
-SchXMLExport::SetProgress(int)
-SchXMLExportHelper_Impl::getCellAddress(int, int)
-SchXMLImport::SchXMLImport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel>, com::sun::star::uno::Reference<com::sun::star::document::XGraphicObjectResolver>&, unsigned char, unsigned char)
-SchXMLImportHelper::GetAutoStyleAttrTokenMap()
-SchXMLImportHelper::GetNewLabeledDataSequence()
-SchXMLPositonAttributesHelper::getPosition() const
-SchXMLPositonAttributesHelper::getSize() const
-SchXMLSeriesHelper::getFirstCandleStickSeries(com::sun::star::uno::Reference<com::sun::star::chart2::XDiagram> const&)
-ScrollBarBox::ScrollBarBox(Window*, ResId const&)
-ScrollableWindow::MakeVisible(Rectangle const&, unsigned char)
-ScrollableWindow::ScrollLines(long, long)
-ScrollableWindow::ScrollPages(long, unsigned long, long, unsigned long)
-ScrollableWindow::ScrollableWindow(Window*, ResId const&, unsigned short)
-ScrollableWindow::SetLineSize(unsigned long, unsigned long)
-ScrollableWindow::SetVisibleSize(Size const&)
-SdFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-SdTpOptionsMisc::LinkStubModifyOriginalScaleHdl(void*, void*)
-SdTpOptionsMisc::LinkStubModifyScaleHdl(void*, void*)
-SdrCaptionObj::SdrCaptionObj(Rectangle const&)
-SdrCreateView::ImpDelCreateAttr()
-SdrCustomShapeDataItem::SdrCustomShapeDataItem(String const&)
-SdrCustomShapeEngineItem::SdrCustomShapeEngineItem(String const&)
-SdrCustomShapeGeometryItem::ClearPropertyValue(rtl::OUString const&, rtl::OUString const&)
-SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem(String const&)
-SdrDragView::SetDetailedEdgeDragging(unsigned char)
-SdrDragView::SetDetailedEdgeDraggingLimit(unsigned short)
-SdrDragView::SetRubberEdgeDragging(unsigned char)
-SdrDragView::SetRubberEdgeDraggingLimit(unsigned short)
-SdrEditView::ImpBundleVirtObjOfMarkList()
-SdrEditView::MoveLayer(String const&, unsigned short)
-SdrEngineDefaults::LanguageHasChanged()
-SdrEscherImport::CheckMonotypeSorts() const
-SdrEscherImport::CheckTimesNewRoman() const
-SdrEscherImport::CheckWingdings() const
-SdrEscherImport::GetCharSet(unsigned int) const
-SdrEscherImport::IsFontAvailable(unsigned int) const
-SdrExchangeView::CutMarked(unsigned long)
-SdrExchangeView::GetPastePos(SdrObjList*, OutputDevice*)
-SdrExchangeView::IsExchangeFormatSupported(unsigned long) const
-SdrExchangeView::Paste(Bitmap const&, Point const&, SdrObjList*, unsigned int)
-SdrExchangeView::Paste(GDIMetaFile const&, Point const&, SdrObjList*, unsigned int)
-SdrExchangeView::YankMarked(unsigned long)
-SdrGlobalData::GetCharClass()
-SdrGlobalData::~SdrGlobalData()
-SdrGlueEditView::IsDeleteMarkedGluePointsPossible() const
-SdrGluePoint::Draw(OutputDevice&, SdrObject const*) const
-SdrGluePoint::Mirror(Point const&, Point const&, SdrObject const*)
-SdrGrafObj::GetGDIMetaFile() const
-SdrGrafObj::ImpSetGrafInfoToAttr()
-SdrGrafObj::IsGrafAnimationAllowed() const
-SdrGrafObj::SetFileName(String const&)
-SdrGrafObj::SetFilterName(String const&)
-SdrGrafObj::StopAnimation(OutputDevice*, long)
-SdrHdl::isMouseOver() const
-SdrHelpLine::IsVisibleEqual(SdrHelpLine const&, OutputDevice const&) const
-SdrHint::GetObjList() const
-SdrHint::GetRect() const
-SdrHint::SdrHint()
-SdrHint::SdrHint(SdrObject const&, Rectangle const&)
-SdrHint::SetObjList(SdrObjList const*)
-SdrHint::SetRect(Rectangle const&)
-SdrLayerAdmin::MoveLayer(SdrLayer*, unsigned short)
-SdrMark::GetObjList() const
-SdrMark::GetPage() const
-SdrMarkView::IsMoveOutside() const
-SdrMarkView::PickSomething(Point const&, short) const
-SdrMarkView::UnmarkGluePoint(SdrHdl const&)
-SdrMediaObj::getGraphic() const
-SdrMediaObj::hasPreferredSize() const
-SdrModel::BegUndo(SdrUndoGroup*)
-SdrModel::CheckConsistence() const
-SdrModel::GetNumberFormatter() const
-SdrModel::HasTransparentObjects(bool) const
-SdrModel::IsAllowShapePropertyChangeListener() const
-SdrObjEditView::AddTextEditOfs(MouseEvent&) const
-SdrObjEditView::Cut(unsigned long)
-SdrObjEditView::IsTextEditFrame() const
-SdrObjEditView::Paste(Window*, unsigned long)
-SdrObjEditView::Yank(unsigned long)
-SdrObjFactory::MakeNewObjUserData(unsigned int, unsigned short, SdrObject*)
-SdrObject::ClearObjectItem(unsigned short)
-SdrObject::ForceAutoTimer()
-SdrObject::FreeGlobalDrawObjectItemPool()
-SdrObject::GetHTMLName() const
-SdrObject::SetHTMLName(String const&)
-SdrOle2Obj::SdrOle2Obj(svt::EmbeddedObjectRef const&, String const&, bool)
-SdrOle2Obj::SdrOle2Obj(svt::EmbeddedObjectRef const&, bool)
-SdrPage::AddComment(sdr::Comment const&)
-SdrPage::GetBitmap(SetOfByte const&, bool) const
-SdrPage::GetCommentByIndex(unsigned int)
-SdrPage::GetMetaFile(SetOfByte const&, bool)
-SdrPage::ReplaceCommentByIndex(unsigned int, sdr::Comment const&)
-SdrPage::isHandoutMasterPage() const
-SdrPageView::GetActualGroupName() const
-SdrPageView::GetActualPathName(unsigned short) const
-SdrPageView::InvalidateAllWin(Rectangle const&, unsigned char)
-SdrPageView::RemovePageWindow(unsigned int)
-SdrPaintView::BegEncirclement(Point const&)
-SdrPaintView::PostPaint()
-SdrPaintView::SetAllLayersLocked(unsigned char)
-SdrPaintView::SetAllLayersPrintable(unsigned char)
-SdrPaintView::SetAllLayersVisible(unsigned char)
-SdrPaintView::getColorConfig() const
-SdrPaintWindow::HideOverlay(Region const&)
-SdrPolyEditView::ShutMarkedObjects()
-SdrSnapView::SnapRect(Rectangle const&, SdrPageView const*, long&, long&) const
-SdrTextObj::CreateDrawOutliner()
-SdrTextObj::GetTextHidden() const
-SdrTextObj::IsTextAnimationAllowed() const
-SdrTextObj::NbcResizeTextAttributes(Fraction const&, Fraction const&)
-SdrTextObj::NbcSetAutoGrowHeight(bool)
-SdrTextObj::NbcSetAutoGrowWidth(bool)
-SdrTextObj::NbcSetFitToSize(SdrFitToSizeType)
-SdrTextObj::NbcSetMaxTextFrameHeight(long)
-SdrTextObj::NbcSetMaxTextFrameWidth(long)
-SdrTextObj::NbcSetTextHidden(unsigned char)
-SdrTextObj::StartTextAnimation(OutputDevice*, Point const&, long)
-SdrTextObj::StopTextAnimation(OutputDevice*, long)
-SdrUndoAttrObj::SetRepeatAttr(SfxItemSet const&)
-SdrUndoGroup::SdrUndoGroup(SdrModel&, String const&)
-SdrUndoGroup::push_front(SdrUndoAction*)
-SdrView::IsAllMarkPrevNextPossible() const
-SdrView::IsAllMarked() const
-SdrView::IsDeleteMarkedPossible() const
-SdrView::IsMarkPossible() const
-SdrView::MarkNext(Point const&, unsigned char)
-SdrView::MarkNext(unsigned char)
-SdrView::SetMarkedRect(Rectangle const&)
-SdrViewIter::FirstOutDev()
-SdrViewIter::FirstPageView()
-SdrViewIter::FirstWindow()
-SdrViewIter::NextOutDev()
-SdrViewIter::NextPageView()
-SdrViewIter::NextWindow()
-SdrViewIter::SdrViewIter(SdrModel const*)
-SdrVirtObj::SdrVirtObj(SdrObject&, Point const&)
-SdwRectangle::GetOriginalRect(Point const&, long, long)
-SectReprArr::Insert(SectRepr* const&, unsigned short&)
-SectReprArr::Insert(SectRepr* const*, unsigned short)
-SectReprArr::Insert(SectReprArr const*, unsigned short, unsigned short)
-SectReprArr::Remove(SectRepr* const&, unsigned short)
-SectReprArr::Remove(unsigned short, unsigned short)
-SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-SelectionEngine::ActivateDragMode()
-ServerFont::TransformPoint(Point const&) const
-SetOfByte::GetClearBit(unsigned short) const
-SetOfByte::GetClearCount() const
-SetOfByte::GetSetBit(unsigned short) const
-SetOfByte::IsFull() const
-SfxAllEnumItem::RemoveAllValues()
-SfxAllEnumItem::SfxAllEnumItem(unsigned short, unsigned short, String const&)
-SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
-SfxApplication::DdeGetData(String const&, String const&, com::sun::star::uno::Any&)
-SfxApplication::DdeSetData(String const&, String const&, com::sun::star::uno::Any const&)
-SfxApplication::EnterAsynchronCall_Impl()
-SfxApplication::GetResourceManager() const
-SfxApplication::GetStatusIndicator() const
-SfxApplication::InitializeDde()
-SfxApplication::LeaveAsynchronCall_Impl()
-SfxApplication::Main()
-SfxBasicManagerHolder::isAnyContainerModified() const
-SfxBrushItemLink::Set(SfxBrushItemLink*)
-SfxChildWindow::SetPosSizePixel(Point const&, Size&)
-SfxChildWindowContext::GetAlignment() const
-SfxColumnDateTimeItem::SfxColumnDateTimeItem(SfxDateTimeItem const&)
-SfxColumnDateTimeItem::SfxColumnDateTimeItem(unsigned short)
-SfxColumnDateTimeItem::SfxColumnDateTimeItem(unsigned short, DateTime const&)
-SfxControllerItem::GetCoreMetric() const
-SfxControllerItem::UpdateSlot()
-SfxDispatcher::DebugOutput_Impl() const
-SfxDispatcher::Execute(SfxExecuteItem const&)
-SfxDispatcher::ExecutePopup(unsigned short, Window*, Point const*, SfxPoolItem const*, ...)
-SfxDispatcher::GetSlotId(String const&)
-SfxDispatcher::HasSlot_Impl(unsigned short)
-SfxDispatcher::ResetObjectBars_Impl()
-SfxDispatcher::SetModalMode_Impl(unsigned char)
-SfxDispatcher::_Execute(SfxSlotServer const&)
-SfxDocTemplate_Impl::GetTemplates(ucbhelper::Content&, ucbhelper::Content&, RegionData_Impl*)
-SfxDockingWrapper::GetChildWindowId()
-SfxDocumentTemplateDlg::GetTemplatePath()
-SfxDocumentTemplateDlg::NewTemplate(String const&)
-SfxDocumentTemplates::GetCount(String const&) const
-SfxDocumentTemplates::GetRegionNo(String const&) const
-SfxDocumentTemplates::SaveDir()
-SfxEnumMenu::SfxEnumMenu(unsigned short, SfxBindings*, SfxEnumItem const&)
-SfxExecuteItem::SfxExecuteItem(unsigned short, unsigned short, unsigned short)
-SfxExecuteItem::SfxExecuteItem(unsigned short, unsigned short, unsigned short, SfxPoolItem const*, ...)
-SfxFilterContainer::GetFilter4ClipBoardId(unsigned int, unsigned long, unsigned long) const
-SfxFilterContainer::GetFilter4Mime(String const&, unsigned long, unsigned long) const
-SfxFilterContainer::GetFilter4UIName(String const&, unsigned long, unsigned long) const
-SfxFilterPtrArr::DeleteAndDestroy(unsigned short, unsigned short)
-SfxFlagItem::SetFlag(unsigned char, int)
-SfxFoundCacheArr_Impl::Insert(SfxFoundCacheArr_Impl const*, unsigned short, unsigned short)
-SfxFoundCacheArr_Impl::Insert(SfxFoundCache_Impl const*&, unsigned short&)
-SfxFoundCacheArr_Impl::Insert(SfxFoundCache_Impl const**, unsigned short)
-SfxFoundCacheArr_Impl::Remove(SfxFoundCache_Impl const*&, unsigned short)
-SfxFoundCacheArr_Impl::Remove(unsigned short, unsigned short)
-SfxFrame::GetBroadcaster() const
-SfxFrame::IsTop() const
-SfxFrame::SetDescriptor(SfxFrameDescriptor*)
-SfxFrame::SetWorkWindow_Impl(SfxWorkWindow*)
-SfxFrameDescriptor::CheckContent() const
-SfxFrameDescriptor::GetItemPos() const
-SfxFrameDescriptor::GetSize() const
-SfxFrameDescriptor::GetWallpaper() const
-SfxFrameDescriptor::GetWinBits() const
-SfxFrameDescriptor::SetURL(INetURLObject const&)
-SfxFrameDescriptor::TakeProperties(SfxFrameProperties const&)
-SfxFrameHTMLWriter::CreateURL(SfxFrame*)
-SfxFrameProperties::SfxFrameProperties(SfxFrameDescriptor const*)
-SfxFrameWindow_Impl::LinkStubCloserHdl(void*, void*)
-SfxHTMLParser::FileDownloadDone(SfxHTMLParser*, void*)
-SfxHintPoster::SfxHintPoster()
-SfxImageItem::GetURL() const
-SfxImageItem::SfxImageItem(unsigned short, String const&)
-SfxImageManager::SetImages(ToolBox&)
-SfxImageManager::SetImages(ToolBox&, bool)
-SfxInPlaceClient::GetActiveWindow(SfxObjectShell*, com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&)
-SfxInPlaceClient::IsObjectActive() const
-SfxItemPropertySetInfo::getMap() const
-SfxItemSetHint::SfxItemSetHint(SfxItemSet*)
-SfxListener::EndListening(unsigned short)
-SfxLockBytesItem::SfxLockBytesItem(unsigned short, SvLockBytes*)
-SfxMacro::GenerateSource() const
-SfxMacro::GetLastStatement() const
-SfxMacro::GetMode() const
-SfxMacro::Record(SfxMacroStatement*)
-SfxMacro::Remove()
-SfxMacro::Replace(SfxMacroStatement*)
-SfxMacro::SfxMacro(SfxMacroMode)
-SfxMacroStatement::SfxMacroStatement(SfxShell const&, String const&, unsigned char, SfxSlot const&, unsigned char, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
-SfxMacroStatement::SfxMacroStatement(String const&)
-SfxMacroStatement::SfxMacroStatement(String const&, SfxSlot const&, unsigned char, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
-SfxMailModel::GetCount() const
-SfxMedium::Exists(unsigned char)
-SfxMedium::GetDoneLink() const
-SfxMedium::GetHdl()
-SfxMedium::GetReferer() const
-SfxMedium::StartDownload()
-SfxMenuControl::CreateControl(String const&, unsigned short, Menu&, SfxBindings&, SfxVirtualMenu*)
-SfxMenuControl::IsSpecialControl(unsigned short, SfxModule*)
-SfxMenuControl::RemovePopup()
-SfxMenuControl::SetOwnMenu(SfxVirtualMenu*)
-SfxMenuManager::Construct_Impl(Menu*, unsigned char)
-SfxMenuManager::UseDefault()
-SfxModelessDialog::SfxModelessDialog(SfxBindings*, SfxChildWindow*, Window*, long)
-SfxModule::IsActive() const
-SfxModule::RegisterChildWindowContext(unsigned short, SfxChildWinContextFactory*)
-SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short)
-SfxNavigatorWrapper::GetChildWindowId()
-SfxNewFileDialog::GetTemplateName() const
-SfxNewFileDialog::GetTemplateRegion() const
-SfxNewFileDialog_Impl::LinkStubTemplateSelect(void*, void*)
-SfxObjectList::GetFileName(unsigned short) const
-SfxObjectShell::Count()
-SfxObjectShell::CreateAndLoadObject(SfxItemSet const&, SfxFrame*)
-SfxObjectShell::DisconnectFromShared()
-SfxObjectShell::HasModalViews() const
-SfxObjectShell::IsSecure()
-SfxObjectShell::LockAutoLoad(unsigned char)
-SfxObjectShell::SetFlags(unsigned int)
-SfxObjectShell::SetTemplate(unsigned char)
-SfxObjectVerbsControl::RegisterControl(unsigned short, SfxModule*)
-SfxOfficeDispatch::IsMasterUnoCommand() const
-SfxOleString16Property::SfxOleString16Property(int, String const&)
-SfxOrganizeDlg_Impl::OkHdl(Button*)
-SfxPartChildWnd_Impl::GetChildWindowId()
-SfxPasswordDialog::SetMaxLen(unsigned short)
-SfxPickList::GetMenuEntryTitle(unsigned int)
-SfxPopupMenuManager::AddClipboardFunctions()
-SfxPopupMenuManager::CheckItem(unsigned short, unsigned char)
-SfxPopupMenuManager::EndInsert()
-SfxPopupMenuManager::Execute(Point const&, Window*, SfxPoolItem const*, ...)
-SfxPopupMenuManager::InsertItem(unsigned short, String const&, unsigned short, rtl::OString const&, unsigned short)
-SfxPopupMenuManager::InsertSeparator(unsigned short)
-SfxPopupMenuManager::RemoveItem(unsigned short)
-SfxPopupMenuManager::SfxPopupMenuManager(ResId const&, SfxBindings&)
-SfxPopupMenuManager::StartInsert()
-SfxPopupWindow::EndCascading()
-SfxPopupWindow::LinkStubDelete(void*, void*)
-SfxPopupWindow::RemoveStatusListener(rtl::OUString const&)
-SfxPopupWindow::SfxPopupWindow(unsigned short, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, Window*, ResId const&)
-SfxPopupWindow::UpdateStatus(rtl::OUString const&)
-SfxPreviewWin::SfxPreviewWin(Window*, ResId const&, SfxObjectShellLock&)
-SfxProgress::GetWaitMode() const
-SfxProgress::Lock()
-SfxProgress::SetWaitMode(unsigned char)
-SfxPtrArr::Replace(void*, void*)
-SfxRangeItem::SfxRangeItem(unsigned short, SvStream&)
-SfxRecordingFloatWrapper_Impl::GetChildWindowId()
-SfxRectangleItem::SfxRectangleItem(unsigned short, SvStream&)
-SfxRequest::IsRecording() const
-SfxRequest::SetTarget(String const&)
-SfxScriptOrganizerItem::SfxScriptOrganizerItem(String const&)
-SfxShell::GetBroadcaster()
-SfxShell::RemoveItem(unsigned short)
-SfxSingleTabDialog::GetInputRanges(SfxItemPool const&)
-SfxSizeItem::SfxSizeItem(unsigned short, SvStream&)
-SfxSlotPool::NextInterface()
-SfxStatusListener::Bind()
-SfxStatusListener::Bind(unsigned short, rtl::OUString const&)
-SfxStringListItem::Sort(unsigned char)
-SfxStyleSheet::SfxStyleSheet()
-SfxStyleSheetBasePool::GetStreamName()
-SfxStyleSheetBasePool::Load(SvStream&)
-SfxStyleSheetBasePool::Store(SvStream&, unsigned char)
-SfxStyleSheetHintExtended::SfxStyleSheetHintExtended(unsigned short, String const&)
-SfxTabDialog::FillOutputItemSet()
-SfxTabDialog::GetApplyButton()
-SfxTabDialog::GetApplyButton() const
-SfxTabDialog::GetApplyHandler() const
-SfxTabDialog::GetOutputItemSet(unsigned short) const
-SfxTabDialog::SfxTabDialog(Window*, ResId const&, unsigned short, SfxBindings&, unsigned char, String const*)
-SfxTabPage::GetExchangeItem(SfxItemSet const&, unsigned short)
-SfxTabPage::SfxTabPage(Window*, long, SfxItemSet const&)
-SfxThesSubMenuControl::RegisterControl(unsigned short, SfxModule*)
-SfxToDoStack_Implarr_::Contains(SfxToDo_Impl const&) const
-SfxToDoStack_Implarr_::Insert(unsigned short, SfxToDo_Impl const&, unsigned short)
-SfxToDoStack_Implarr_::Remove(SfxToDo_Impl const&)
-SfxUINT32s::Insert(SfxUINT32s const*, unsigned short, unsigned short, unsigned short)
-SfxUINT32s::Remove(unsigned short, unsigned short)
-SfxUINT32s::Replace(unsigned int const&, unsigned short)
-SfxUINT32s::Replace(unsigned int const*, unsigned short, unsigned short)
-SfxUINT32s::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
-SfxULongRangeItem::SfxULongRangeItem(unsigned short, SvStream&)
-SfxULongRanges::Contains(unsigned long) const
-SfxULongRanges::Intersects(SfxULongRanges const&) const
-SfxULongRanges::SfxULongRanges(int, int, int, ...)
-SfxULongRanges::SfxULongRanges(unsigned long const*)
-SfxULongRanges::SfxULongRanges(unsigned long, unsigned long)
-SfxULongRangesItem::SfxULongRangesItem(unsigned short, unsigned int const*)
-SfxURLToolBoxControl_Impl::LinkStubWindowEventListener(void*, void*)
-SfxUShortRanges::Contains(unsigned short) const
-SfxUShortRanges::Intersects(SfxUShortRanges const&) const
-SfxUShortRanges::SfxUShortRanges(int, int, int, ...)
-SfxUShortRangesItem::SfxUShortRangesItem(unsigned short, unsigned short const*)
-SfxUnoMenuControl::Select()
-SfxUnoStyleSheet::SfxUnoStyleSheet(SfxStyleSheet const&)
-SfxVersionTableDtor::GetVersions() const
-SfxViewFactory::InitFactory()
-SfxViewFactory::~SfxViewFactory()
-SfxViewFrame::Count()
-SfxViewFrame::DoAdjustPosSize(SfxViewShell*, Point, Size const&)
-SfxViewFrame::ExecReload_Impl(SfxRequest&, unsigned char)
-SfxViewFrame::ForceInnerResize_Impl(unsigned char)
-SfxViewFrame::Hide()
-SfxViewShell::AdjustVisArea(Rectangle const&)
-SfxViewShell::CheckOwnerShip_Impl()
-SfxViewShell::GetContextMenuInterceptors() const
-SfxViewShell::IsPrinterLocked() const
-SfxViewShell::LockPrinter(unsigned char)
-SfxViewShell::PlugInsActive() const
-SfxViewShell::SetAdditionalPrintOptions(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
-SfxViewShell::SetScrollingMode(SfxScrollingMode)
-SfxViewShell::SetSubShell(SfxShell*)
-SfxVirtualMenu::GetItemText(unsigned short) const
-SfxVirtualMenu::GetPopupMenu(unsigned short) const
-SfxVirtualMenu::SetHelpIds(ResMgr*)
-SfxVirtualMenu::UpdateImages()
-SfxWhichIter::LastWhich()
-SimpleResMgr::FreeBlob(void*)
-SimpleResMgr::GetLocale() const
-SimpleResMgr::ReadBlob(unsigned int, void**)
-Slider::SetRangeMax(long)
-Slider::SetRangeMin(long)
-Slider::Slider(Window*, ResId const&)
-SmFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-SmSymbolManager::Exit()
-SmSymbolManager::Init()
-SortedPositions::Insert(SortedPositions const*, unsigned short, unsigned short)
-SortedPositions::Insert(unsigned int const&, unsigned short&)
-SortedPositions::Insert(unsigned int const*, unsigned short)
-SortedPositions::Remove(unsigned int const&, unsigned short)
-SortedPositions::Remove(unsigned short, unsigned short)
-SortedPositions_SAR::Replace(unsigned int const&, unsigned short)
-SortedPositions_SAR::Replace(unsigned int const*, unsigned short, unsigned short)
-SortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
-SotExchange::GetExchangeAction(com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> const&, unsigned short, unsigned short, unsigned short, unsigned long&, unsigned short&, unsigned long)
-SotFactory::TestInvariant()
-SotObject::RemoveOwnerLock()
-SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&)
-SotStorage::OpenOLEStorage(String const&, unsigned short, short)
-SotStorage::SotStorage(ucbhelper::Content const&, String const&, unsigned short, short)
-SourceTreeIterator::EndExecute()
-SpinButton::SpinButton(Window*, ResId const&)
-SplitWindow::CalcWindowSizePixel(Size const&, WindowAlign, long, unsigned char)
-SplitWindow::GetItemWindow(unsigned short) const
-SplitWindow::SetItemBackground(unsigned short, Wallpaper const&)
-Splitter::GetKeyboardStepSize() const
-SrchAttrItemList::Replace(SearchAttrItem const&, unsigned short)
-SrchAttrItemList::Replace(SearchAttrItem const*, unsigned short, unsigned short)
-SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(SearchAttrItem const&, void*), void*)
-StackWindow::LinkStubButtonHdl(void*, void*)
-StandardErrorInfo::StandardErrorInfo(unsigned long, unsigned long, unsigned short)
-StatusBar::CopyItems(StatusBar const&)
-StatusBar::GetItemBits(unsigned short) const
-StatusBar::GetItemData(unsigned short) const
-StatusBar::GetItemWidth(unsigned short) const
-StatusBar::HideItem(unsigned short)
-StatusBar::HideItems()
-StatusBar::ResetProgressMode()
-StatusBar::SetBottomBorder(unsigned char)
-StatusBar::SetTopBorder(unsigned char)
-StatusBar::ShowItem(unsigned short)
-StatusBar::ShowItems()
-StatusBar::StatusBar(Window*, ResId const&)
-StgAvlIterator::Last()
-StgCache::Pos2Page(int)
-StgDirEntry::Copy(StgDirEntry&)
-StgEntry::GetTime(StgEntryTime) const
-StgEntry::SetTime(StgEntryTime, int*)
-StgHeader::SetClassId(ClsId const&)
-StorageStream::ValidateMode(unsigned short, StgDirEntry*) const
-SvBasicPropertyDataControl::GetData()
-SvBasicPropertyDataControl::GetName() const
-SvBasicPropertyDataControl::GetProperty() const
-SvBorder::SvBorder(Rectangle const&, Rectangle const&)
-SvByteStrings::DeleteAndDestroy(unsigned short, unsigned short)
-SvByteStringsSortDtor::Insert(ByteString* const&)
-SvByteStringsSortDtor::Insert(ByteString* const*, unsigned short)
-SvByteStringsSortDtor::Insert(SvByteStringsSortDtor const*, unsigned short, unsigned short)
-SvByteStringsSortDtor::Remove(ByteString* const&, unsigned short)
-SvByteStringsSortDtor::Remove(unsigned short, unsigned short)
-SvFileStream::UnlockFile()
-SvI18NMap_Impl::Insert(SvI18NMapEntry_Impl* const&, unsigned short&)
-SvI18NMap_Impl::Insert(SvI18NMapEntry_Impl* const*, unsigned short)
-SvI18NMap_Impl::Insert(SvI18NMap_Impl const*, unsigned short, unsigned short)
-SvI18NMap_Impl::Remove(SvI18NMapEntry_Impl* const&, unsigned short)
-SvI18NMap_Impl::Remove(unsigned short, unsigned short)
-SvInplaceEdit::StopEditing(unsigned char)
-SvInplaceEdit::SvInplaceEdit(Window*, Point const&, Size const&, String const&, Link const&, Selection const&)
-SvInsertAppletDialog::SvInsertAppletDialog(Window*, com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&)
-SvInsertAppletDialog::SvInsertAppletDialog(Window*, com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&)
-SvLBoxBmp::SvLBoxBmp(SvLBoxEntry*, unsigned short, Image)
-SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char)
-SvLBoxButtonData::SvLBoxButtonData()
-SvLBoxEntryArr::DeleteAndDestroy(unsigned short, unsigned short)
-SvLBoxItem::GetSize(SvLBoxEntry*, SvViewDataEntry*)
-SvListBoxForProperties::SvListBoxForProperties(Window*, ResId const&)
-SvListView::SvListView(SvTreeList*)
-SvNumberFormatter::HasTextFormat(unsigned int) const
-SvNumberFormatter::PrepareSave()
-SvNumberFormatter::SetFormatUsed(unsigned int)
-SvNumberFormatter::SvNumberFormatter(unsigned short)
-SvNumberNatNum::MapNatNumToDBNum(unsigned char, unsigned short, unsigned char)
-SvNumberformat::EraseComment(String&)
-SvNumberformat::ImpSwitchToSpecifiedCalendar(String&, double&, ImpSvNumFor const&) const
-SvNumberformat::SetComment(String const&, String&, String&)
-SvPersistBaseMemberList::SvPersistBaseMemberList(unsigned short, unsigned short)
-SvPersistStream::InsertObj(SvPersistBase*)
-SvPersistStream::RemoveObj(SvPersistBase*)
-SvPersistStream::SvPersistStream(SvClassManager&, SvStream*, SvPersistStream const&)
-SvPropertyBox::SvPropertyBox(Window*, ResId const&)
-SvPropertyBox::SvPropertyBox(Window*, long)
-SvPropertyLine::GetName() const
-SvPropertyLine::IsLineLocked()
-SvPropertyLine::IsShownAsHyperlink()
-SvPropertyLine::IsVisibleXButton()
-SvPropertyLine::SvPropertyLine(Window*, ResId const&)
-SvPtrarr::Replace(void* const*, unsigned short, unsigned short)
-SvStringsISort::DeleteAndDestroy(unsigned short, unsigned short)
-SvStringsISort::Insert(String* const&)
-SvStringsISort::Insert(String* const&, unsigned short&)
-SvStringsISort::Insert(String* const*, unsigned short)
-SvStringsISort::Insert(SvStringsISort const*, unsigned short, unsigned short)
-SvStringsISort::Remove(String* const&, unsigned short)
-SvStringsISort::Remove(unsigned short, unsigned short)
-SvStringsISortDtor::Insert(String* const*, unsigned short)
-SvStringsSort::DeleteAndDestroy(unsigned short, unsigned short)
-SvStringsSort::Insert(String* const&, unsigned short&)
-SvStringsSort::Insert(String* const*, unsigned short)
-SvStringsSort::Insert(SvStringsSort const*, unsigned short, unsigned short)
-SvStringsSort::Remove(String* const&, unsigned short)
-SvStringsSortDtor::Insert(String* const*, unsigned short)
-SvStringsSortDtor::Insert(SvStringsSortDtor const*, unsigned short, unsigned short)
-SvStringsSortDtor::Remove(String* const&, unsigned short)
-SvStringsSortDtor::Remove(unsigned short, unsigned short)
-SvTabListBox::GetTabJustify(unsigned short) const
-SvULongs::Replace(unsigned long const&, unsigned short)
-SvULongs::Replace(unsigned long const*, unsigned short, unsigned short)
-SvULongs::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
-SvUShorts::Replace(unsigned short const&, unsigned short)
-SvUShorts::Replace(unsigned short const*, unsigned short, unsigned short)
-SvUShorts::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned short const&, void*), void*)
-SvUnoAttributeContainer::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-SvXMLAttributeList::SetAttributeList(com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&)
-SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const
-SvXMLAutoStylePoolNamesP_Impl::Remove(rtl::OUString*)
-SvXMLAutoStylePoolP::Add(rtl::OUString&, int, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&)
-SvXMLAutoStylePoolP::AddAndCache(int, rtl::OUString const&)
-SvXMLAutoStylePoolP::AddAndCache(int, rtl::OUString const&, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&)
-SvXMLAutoStylePoolP::AddAndCache(int, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&)
-SvXMLAutoStylePoolP::Find(int, std::vector<XMLPropertyState, std::allocator<XMLPropertyState> > const&) const
-SvXMLAutoStylePoolP::FindAndRemoveCached(int) const
-SvXMLAutoStylePoolP::SvXMLAutoStylePoolP()
-SvXMLAutoStylePoolParentsP_Impl::GetPos(SvXMLAutoStylePoolParentP_Impl const*) const
-SvXMLAutoStylePoolParentsP_Impl::Remove(SvXMLAutoStylePoolParentP_Impl*)
-SvXMLElementExport::SvXMLElementExport(SvXMLExport&, unsigned char, unsigned short, char const*, unsigned char, unsigned char)
-SvXMLElementExport::SvXMLElementExport(SvXMLExport&, unsigned char, unsigned short, rtl::OUString const&, unsigned char, unsigned char)
-SvXMLEmbeddedElementArr::Insert(SvXMLEmbeddedElement* const&, unsigned short&)
-SvXMLEmbeddedElementArr::Insert(SvXMLEmbeddedElement* const*, unsigned short)
-SvXMLEmbeddedElementArr::Insert(SvXMLEmbeddedElementArr const*, unsigned short, unsigned short)
-SvXMLEmbeddedElementArr::Remove(SvXMLEmbeddedElement* const&, unsigned short)
-SvXMLEmbeddedElementArr::Remove(unsigned short, unsigned short)
-SvXMLExport::GetErrors()
-SvXMLExport::SvXMLExport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, com::sun::star::uno::Reference<com::sun::star::document::XGraphicObjectResolver> const&, short)
-SvXMLExportHelper::AddPercentage(int, rtl::OUStringBuffer&)
-SvXMLExportPropertyMapper::exportXML(SvXMLAttributeList&, XMLPropertyState const&, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned short) const
-SvXMLImport::GetErrors()
-SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
-SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
-SvXMLImport::SvXMLImport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
-SvXMLImport::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-SvXMLImportContexts_Impl::DeleteAndDestroy(unsigned short, unsigned short)
-SvXMLImportPropertyMapper::importXML(std::vector<XMLPropertyState, std::allocator<XMLPropertyState> >&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned int) const
-SvXMLNamespaceMap::AddAtIndex(unsigned short, char const*, char const*, unsigned short)
-SvXMLNamespaceMap::GetKeyByIndex(unsigned short) const
-SvXMLNumFormatContext::AddCondition(int, rtl::OUString const&, LocaleDataWrapper const&)
-SvXMLStyleIndices_Impl::GetPos(SvXMLStyleIndex_Impl const*) const
-SvXMLStyleIndices_Impl::Remove(SvXMLStyleIndex_Impl*)
-SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const&, unsigned short&)
-SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const*, unsigned short)
-SvXMLTokenMap_Impl::Insert(SvXMLTokenMap_Impl const*, unsigned short, unsigned short)
-SvXMLTokenMap_Impl::Remove(SvXMLTokenMapEntry_Impl* const&, unsigned short)
-SvXMLTokenMap_Impl::Remove(unsigned short, unsigned short)
-SvXMLUnitConverter::clearUndefinedChars(rtl::OUString&, rtl::OUString const&)
-SvXMLUnitConverter::convertAny(com::sun::star::uno::Any&, rtl::OUString const&, rtl::OUString const&)
-SvXMLUnitConverter::convertEnum(rtl::OUStringBuffer&, unsigned short, SvXMLEnumStringMapEntry const*, char*)
-SvXMLUnitConverter::convertMeasure(rtl::OUStringBuffer&, int, MapUnit) const
-SvXMLUnitConverter::convertNumber64(rtl::OUStringBuffer&, long)
-SvXPropEvListener::GetKeyCode() const
-SvXPropertyComboBox::SvXPropertyComboBox(Window*, ResId const&)
-SvXPropertyEdit::SvXPropertyEdit(Window*, ResId const&)
-SvXPropertyListBox::SvXPropertyListBox(Window*, ResId const&)
-SvXPropertyListBox::SvXPropertyListBox(Window*, long)
-SvpSalInstance::CancelEvent(SalFrame const*, void*, unsigned short)
-SvtAcceleratorConfiguration::GetCommand(com::sun::star::awt::KeyEvent const&)
-SvtAcceleratorConfiguration::GetItems()
-SvtAcceleratorConfiguration::SetItems(std::list<SvtAcceleratorConfigItem, std::allocator<SvtAcceleratorConfigItem> > const&, bool)
-SvtAccessibilityOptions::GetIsForDrawings() const
-SvtBroadcaster::Forward(SvtBroadcaster&, SfxHint const&)
-SvtCommandOptions::AddCommand(SvtCommandOptions::CmdOption, rtl::OUString const&)
-SvtCommandOptions::Clear(SvtCommandOptions::CmdOption)
-SvtCommandOptions::GetList(SvtCommandOptions::CmdOption) const
-SvtDynamicMenuOptions::AppendItem(EDynamicMenuType, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
-SvtDynamicMenuOptions::Clear(EDynamicMenuType)
-SvtExtendedSecurityOptions::GetSecureExtensionList() const
-SvtExtendedSecurityOptions::IsOpenHyperlinkModeReadOnly() const
-SvtExtendedSecurityOptions::IsSecureHyperlink(rtl::OUString const&) const
-SvtExtendedSecurityOptions::SetOpenHyperlinkMode(SvtExtendedSecurityOptions::OpenHyperlinkMode)
-SvtFileView::OpenFolder(com::sun::star::uno::Sequence<rtl::OUString> const&)
-SvtFileView::ResetCursor()
-SvtFilterOptions::SetUseEnhancedFields(unsigned char)
-SvtFontOptions::EnableReplacementTable(unsigned char)
-SvtFontOptions::IsReplacementTableEnabled() const
-SvtFrameWindow_Impl::ExecuteHdl_Impl(SvtFrameWindow_Impl*, SvtFrameWindow_Impl::SvtExecuteInfo*)
-SvtGraphicFill::setFillColor(Color)
-SvtGraphicFill::setFillRule(SvtGraphicFill::FillRule)
-SvtGraphicFill::setFillType(SvtGraphicFill::FillType)
-SvtGraphicFill::setGraphic(Graphic const&)
-SvtGraphicFill::setHatchColor(Color)
-SvtGraphicFill::setHatchType(SvtGraphicFill::HatchType)
-SvtGraphicFill::setTiling(bool)
-SvtGraphicFill::setTransform(SvtGraphicFill::Transform const&)
-SvtGraphicFill::setTransparency(double)
-SvtGraphicFill::toString() const
-SvtGraphicStroke::setCapType(SvtGraphicStroke::CapType)
-SvtGraphicStroke::setDashArray(std::vector<double, std::allocator<double> > const&)
-SvtGraphicStroke::setEndArrow(PolyPolygon const&)
-SvtGraphicStroke::setJoinType(SvtGraphicStroke::JoinType)
-SvtGraphicStroke::setMiterLimit(double)
-SvtGraphicStroke::setStartArrow(PolyPolygon const&)
-SvtGraphicStroke::setStrokeWidth(double)
-SvtGraphicStroke::setTransparency(double)
-SvtHelpOptions::GetLocale() const
-SvtHistoryOptions::SetSize(EHistoryType, unsigned int)
-SvtIconChoiceCtrl::Clear()
-SvtIconChoiceCtrl::Flush()
-SvtIconChoiceCtrl::GetEntryTextMode(SvxIconChoiceCtrlEntry const*) const
-SvtIconChoiceCtrl::GetLogicPos(Point const&) const
-SvtIconChoiceCtrl::GetNextEntry(Point const&, SvxIconChoiceCtrlEntry*, unsigned char) const
-SvtIconChoiceCtrl::HandleShortCutKey(KeyEvent const&)
-SvtIconChoiceCtrl::InsertEntry(unsigned long, Point const*, unsigned short)
-SvtIconChoiceCtrl::SetUpdateMode(unsigned char)
-SvtIconChoiceCtrl::SvtIconChoiceCtrl(Window*, ResId const&)
-SvtIconWindow_Impl::GetSelectedIconText() const
-SvtInetOptions::addPropertiesChangeListener(com::sun::star::uno::Sequence<rtl::OUString> const&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertiesChangeListener> const&)
-SvtInetOptions::removePropertiesChangeListener(com::sun::star::uno::Sequence<rtl::OUString> const&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertiesChangeListener> const&)
-SvtInternalOptions::CrashMailEnabled() const
-SvtInternalOptions::IsRemoveMenuEntryBackToWebtop() const
-SvtInternalOptions::IsRemoveMenuEntryClose() const
-SvtInternalOptions::IsRemoveMenuEntryLogout() const
-SvtInternalOptions::IsRemoveMenuEntryNewWebtop() const
-SvtLanguageOptions::IsCTLSequenceChecking() const
-SvtLanguageOptions::IsCTLSequenceCheckingRestricted() const
-SvtLanguageOptions::IsCTLSequenceCheckingTypeAndReplace() const
-SvtLanguageOptions::IsChangeCaseMapEnabled() const
-SvtLanguageOptions::IsDoubleLinesEnabled() const
-SvtLanguageOptions::IsEmphasisMarksEnabled() const
-SvtLanguageOptions::IsRubyEnabled() const
-SvtLanguageOptions::IsVerticalCallOutEnabled() const
-SvtLinguConfig::IsReadOnly(int) const
-SvtLinguConfig::SetOptions(SvtLinguOptions const&)
-SvtListenerIter::First(void* (*)())
-SvtListenerIter::GoEnd()
-SvtListenerIter::GoPrev()
-SvtListenerIter::GoRoot()
-SvtListenerIter::Next()
-SvtLocalisationOptions::SetAutoMnemonic(unsigned char)
-SvtLocalisationOptions::SetDialogScale(int)
-SvtMenuOptions::IsFollowMouseEnabled() const
-SvtMenuOptions::SetEntryHidingState(unsigned char)
-SvtMenuOptions::SetFollowMouseState(unsigned char)
-SvtMiscOptions::GetCurrentSymbolsStyleName() const
-SvtMiscOptions::IsGetSymbolsSizeReadOnly() const
-SvtMiscOptions::IsGetSymbolsStyleReadOnly() const
-SvtMiscOptions::IsGetToolboxStyleReadOnly() const
-SvtMiscOptions::IsPluginsEnabledReadOnly() const
-SvtMiscOptions::IsTryUseODMADialogReadOnly() const
-SvtMiscOptions::SetPluginsEnabled(unsigned char)
-SvtModuleOptions::GetFactoryWindowAttributes(SvtModuleOptions::EFactory) const
-SvtModuleOptions::GetFeatures() const
-SvtModuleOptions::GetModuleName(SvtModuleOptions::EFactory) const
-SvtModuleOptions::SetFactoryWindowAttributes(SvtModuleOptions::EFactory, rtl::OUString const&)
-SvtOptionsDrawinglayer_Impl::SetMaximumPaperBottomMargin(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetMaximumPaperHeight(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetMaximumPaperLeftMargin(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetMaximumPaperRightMargin(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetMaximumPaperTopMargin(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetMaximumPaperWidth(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetOverlayBuffer(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetOverlayBuffer_Calc(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetOverlayBuffer_DrawImpress(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetOverlayBuffer_Writer(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetPaintBuffer(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetPaintBuffer_Calc(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetPaintBuffer_DrawImpress(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetPaintBuffer_Writer(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetQuadratic3DRenderLimit(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetQuadraticFormControlRenderLimit(unsigned int)
-SvtOptionsDrawinglayer_Impl::SetRenderDecoratedTextDirect(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetRenderSimpleTextDirect(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetSelectionMaximumLuminancePercent(unsigned short)
-SvtOptionsDrawinglayer_Impl::SetSnapHorVerLinesToDiscrete(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetSolidDragCreate(unsigned char)
-SvtOptionsDrawinglayer_Impl::SetStripeColorA(Color)
-SvtOptionsDrawinglayer_Impl::SetStripeColorB(Color)
-SvtOptionsDrawinglayer_Impl::SetStripeLength(unsigned short)
-SvtPathOptions::GetPath(SvtPathOptions::Pathes) const
-SvtPathOptions::IsPathReadonly(SvtPathOptions::Pathes) const
-SvtPathOptions::SetPath(SvtPathOptions::Pathes, String const&)
-SvtPrintWarningOptions::IsNotFound() const
-SvtPrintWarningOptions::SetNotFound(unsigned char)
-SvtResId::SvtResId(unsigned short, com::sun::star::lang::Locale)
-SvtSaveOptions::SetSaveUnpacked(unsigned char)
-SvtSaveOptions::SetUseBlowfishInODF12(unsigned char)
-SvtSaveOptions::SetUseSHA1InODF12(unsigned char)
-SvtScriptedTextHelper::GetText() const
-SvtScriptedTextHelper::GetTextHeight() const
-SvtScriptedTextHelper::GetTextWidth() const
-SvtSearchOptions::IsSearchForStyles() const
-SvtSecurityOptions::IsTrustedAuthorsEnabled()
-SvtStartOptions::EnableIntro(unsigned char)
-SvtStartOptions::IsIntroEnabled() const
-SvtStartOptions::SetConnectionURL(rtl::OUString const&)
-SvtSysLocaleOptions::GetUILocale() const
-SvtTabAppearanceCfg::SetDragMode(unsigned short)
-SvtUserOptions::GetLocale() const
-SvtWorkingSetOptions::GetWindowList() const
-SvtWorkingSetOptions::SetWindowList(com::sun::star::uno::Sequence<rtl::OUString> const&)
-Svx3DLightControl::Svx3DLightControl(Window*, ResId const&)
-Svx3DWin::LinkStubClickLightHdl(void*, void*)
-Svx3DWin::LinkStubDoubleClickHdl(void*, void*)
-SvxAcceptChgCtr::IsFilterPageVisible()
-SvxAcceptChgCtr::IsViewPageVisible()
-SvxAcceptChgCtr::SvxAcceptChgCtr(Window*, long)
-SvxAccessibleTextIndex::IsEditable() const
-SvxAccessibleTextPropertySet::getServiceName()
-SvxAngleCtl::SvxAngleCtl(Window*, ResId const&)
-SvxAngleCtl::SvxAngleCtl(Window*, ResId const&, Size)
-SvxAreaTabPage::LinkStubClickBitmapHdl_Impl(void*, void*)
-SvxAreaTabPage::LinkStubClickColorHdl_Impl(void*, void*)
-SvxAreaTabPage::LinkStubClickGradientHdl_Impl(void*, void*)
-SvxAreaTabPage::LinkStubClickHatchingHdl_Impl(void*, void*)
-SvxAreaTabPage::LinkStubClickInvisibleHdl_Impl(void*, void*)
-SvxAutoCorrect::SetShareAutoCorrFileName(String const&)
-SvxAutoCorrect::SetUserAutoCorrFileName(String const&)
-SvxAutocorrWordList::Insert(SvxAutocorrWord* const&, unsigned short&)
-SvxAutocorrWordList::Insert(SvxAutocorrWord* const*, unsigned short)
-SvxAutocorrWordList::Insert(SvxAutocorrWordList const*, unsigned short, unsigned short)
-SvxAutocorrWordList::Remove(SvxAutocorrWord* const&, unsigned short)
-SvxAutocorrWordList::Remove(unsigned short, unsigned short)
-SvxBmpMask::ImpMask(BitmapEx const&)
-SvxBulletItem::GetBitmap() const
-SvxBulletItem::SetBitmap(Bitmap const&)
-SvxBulletItem::SvxBulletItem(Bitmap const&, unsigned short)
-SvxBulletItem::SvxBulletItem(Font const&, unsigned short, unsigned short)
-SvxBulletItem::SvxBulletItem(GraphicObject const&, unsigned short)
-SvxBulletItem::SvxBulletItem(unsigned char, Font const&, unsigned short, unsigned short)
-SvxCharMapData::LinkStubAssignHdl(void*, void*)
-SvxChartDataDescrItem::SvxChartDataDescrItem(SvxChartDataDescr, unsigned short)
-SvxChartTextOrientItem::SvxChartTextOrientItem(SvxChartTextOrient, unsigned short)
-SvxColorBox::LinkStubDelayHdl_Impl(void*, void*)
-SvxColorValueSet::SvxColorValueSet(Window*, long)
-SvxColumnItem::GetVisibleRight() const
-SvxContourDlg::ScaleContour(PolyPolygon&, Graphic const&, MapUnit, Size const&)
-SvxContourDlg::SetEditingObject(void*)
-SvxContourDlg::SetExecState(unsigned char)
-SvxContourDlg::SetGraphic(Graphic const&)
-SvxContourDlg::SetGraphicLinked(unsigned char)
-SvxContourDlg::SetPolyPolygon(PolyPolygon const&)
-SvxContourDlgChildWindow::UpdateContourDlg(Graphic const&, unsigned char, PolyPolygon const*, void*)
-SvxDashListItem::SetDashList(XDashList*)
-SvxDoCapitals::Do(String const&, unsigned short, unsigned short, unsigned char)
-SvxDrawOutlinerViewForwarder::SetShapePos(Point const&)
-SvxDrawPage::GetPageForSdrPage(SdrPage*)
-SvxDrawPage::SvxDrawPage()
-SvxEditEngineViewForwarder::SvxEditEngineViewForwarder(EditView&)
-SvxEditSourceHelper::UserSpaceToEE(Rectangle const&, Size const&, bool)
-SvxEditSourceHint::SetEndValue(unsigned long)
-SvxEditSourceHint::SetStartValue(unsigned long)
-SvxEditSourceHint::SetValue(unsigned long)
-SvxFont::DrawText(OutputDevice*, Point const&, String const&, unsigned short, unsigned short) const
-SvxFontPrevWindow::IsTwoLines() const
-SvxFontPrevWindow::SetCJKFont(SvxFont const&)
-SvxFontPrevWindow::SetCTLFont(SvxFont const&)
-SvxFontPrevWindow::SetNoLines(unsigned char)
-SvxFontPrevWindow::SetPreviewBackgroundToCharacter(unsigned char)
-SvxFontPrevWindow::SvxFontPrevWindow(Window*)
-SvxFrameDirectionItem::SvxFrameDirectionItem(unsigned short)
-SvxGrafToolBoxControl::RegisterControl(unsigned short, SfxModule*)
-SvxGraphCtrlAccessibleContext::checkChildIndex(long)
-SvxGraphCtrlAccessibleContext::setDescription(rtl::OUString const&)
-SvxGraphCtrlAccessibleContext::setName(rtl::OUString const&)
-SvxHtmlOptions::AddListenerLink(Link const&)
-SvxHtmlOptions::RemoveListenerLink(Link const&)
-SvxHyperlinkTabPageBase::FileExists(INetURLObject const&)
-SvxIMapDlg::GetTargetList() const
-SvxIconChoiceCtrlEntry::LockPos(unsigned char)
-SvxIconChoiceCtrlEntry::SetMoved(unsigned char)
-SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx&, long)
-SvxImportMSVBasic::Import(String const&, String const&, unsigned char, unsigned char)
-SvxInsertStatusBarControl::GetDefItemWidth(StatusBar const&)
-SvxJustifyMethodItem::SvxJustifyMethodItem(unsigned short)
-SvxLanguageBox::SvxLanguageBox(Window*, long, unsigned char)
-SvxLightCtl3D::SvxLightCtl3D(Window*, long)
-SvxLineColorItem::SvxLineColorItem(Color const&, unsigned short)
-SvxListBoxControl::RegisterControl(unsigned short, SfxModule*)
-SvxMSConvertOCXControls::OCX_Factory(String const&)
-SvxMSConvertOCXControls::WriteOCXExcelKludgeStream(SotStorageStreamRef&, com::sun::star::uno::Reference<com::sun::star::awt::XControlModel> const&, com::sun::star::awt::Size const&, String&)
-SvxMSDffManager::GetAutoForm(MSO_SPT) const
-SvxMSDffManager::ImportFontWork(SvStream&, SfxItemSet&, Rectangle&) const
-SvxMSDffManager::ReadObjText(SvStream&, SdrObject*) const
-SvxMSDffManager::Scale(PolyPolygon&) const
-SvxMSDffManager::Scale(Rectangle&) const
-SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const&, unsigned short&)
-SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const*, unsigned short)
-SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfos const*, unsigned short, unsigned short)
-SvxMSDffShapeInfos::Remove(SvxMSDffShapeInfo* const&, unsigned short)
-SvxMSDffShapeTxBxSort::DeleteAndDestroy(unsigned short, unsigned short)
-SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder* const&, unsigned short&)
-SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder* const*, unsigned short)
-SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeTxBxSort const*, unsigned short, unsigned short)
-SvxMSDffShapeTxBxSort::Remove(SvxMSDffShapeOrder* const&, unsigned short)
-SvxMSDffShapeTxBxSort::Remove(unsigned short, unsigned short)
-SvxModifyControl::GetDefItemWidth(StatusBar const&)
-SvxNumRule::SetLevel(unsigned short, SvxNumberFormat const*)
-SvxNumberFormatShell::GetCurCurrencyEntry()
-SvxNumberFormatShell::GetCurrencyFormats(SvStrings&)
-SvxNumberFormatShell::IsBankingSymbol(unsigned short)
-SvxNumberInfoItem::SetDoubleValue(double const&)
-SvxNumberInfoItem::SetNumberFormatter(SvNumberFormatter*)
-SvxNumberInfoItem::SetStringValue(String const&)
-SvxOpenGraphicDialog::SetControlHelpIds(short const*, char const**)
-SvxParaPrevWindow::OutputSizeChanged()
-SvxPixelCtl::GetBitmapPixel(unsigned short)
-SvxPluginFileDlg::IsAvailable(unsigned short)
-SvxPopupWindowListBox::StartSelection()
-SvxPosSizeStatusBarControl::GetDefItemWidth(StatusBar const&)
-SvxPositionSizeTabPage::LinkStubChangePosXHdl(void*, void*)
-SvxPositionSizeTabPage::LinkStubChangePosYHdl(void*, void*)
-SvxRectCtlAccessibleContext::setDescription(rtl::OUString const&)
-SvxRectCtlAccessibleContext::setName(rtl::OUString const&)
-SvxRedlinTable::IsValidCalcEntry(String const&, RedlinData*)
-SvxRedlinTable::IsValidWriterEntry(String const&, RedlinData*)
-SvxRedlinTable::SvxRedlinTable(SvxSimpleTableContainer&, ResId const&)
-SvxRelativeField::SvxRelativeField(Window*, long)
-SvxReloadControllerItem::RegisterControl(unsigned short, SfxModule*)
-SvxRubyChildWindow::GetChildWindowId()
-SvxRuler::GetDefTabDist() const
-SvxScriptOrgDialog::LinkStubMacroDoubleClickHdl(void*, void*)
-SvxSearchDialog::GetReplaceItems(SfxItemSet&)
-SvxSearchDialog::GetSearchItems(SfxItemSet&)
-SvxSearchDialog::SvxSearchDialog(Window*, SfxBindings&)
-SvxSearchItem::GetFromDescriptor(com::sun::star::uno::Reference<com::sun::star::util::XSearchDescriptor> const&)
-SvxSearchItem::SetToDescriptor(com::sun::star::uno::Reference<com::sun::star::util::XSearchDescriptor>&)
-SvxSelectionModeControl::GetDefItemWidth(StatusBar const&)
-SvxShape::GetShapeForSdrObj(SdrObject*)
-SvxShape::getMaster()
-SvxShape::getMaster() const
-SvxShapePolyPolygonBezier::GetPolygonKind() const
-SvxShapeText::SvxShapeText()
-SvxShowCharSet::ImplFireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
-SvxSimpleTable::ClearAll()
-SvxSimpleTable::TableToTop()
-SvxSimpleTableContainer::SvxSimpleTableContainer(Window*, long)
-SvxStringArray::GetStringByType(long) const
-SvxStringArray::GetValueByStr(String const&) const
-SvxSuperContourDlg::DoAutoCreate()
-SvxSuperContourDlg::ReducePoints(long)
-SvxTPFilter::DisableRange(unsigned char)
-SvxTPFilter::GetSelectedAuthorPos()
-SvxTPFilter::HideClocks(unsigned char)
-SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&)
-SvxTabStopArr::Insert(SvxTabStop const*, unsigned short)
-SvxTabStopArr::Remove(SvxTabStop const&, unsigned short)
-SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short)
-SvxTabStopArr_SAR::Replace(SvxTabStop const*, unsigned short, unsigned short)
-SvxTabStopArr_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(SvxTabStop const&, void*), void*)
-SvxTextEditSource::GetSdrObject() const
-SvxTextEncodingBox::IsTextEncodingSelected(unsigned short) const
-SvxTextEncodingBox::RemoveTextEncoding(unsigned short)
-SvxUnoFontDescriptor::getPropertyState(SfxItemSet const&)
-SvxUnoTextBase::InsertField(SvxFieldItem const&)
-SvxUnoTextBase::SvxUnoTextBase(SvxEditSource const*, SvxItemPropertySet const*)
-SvxUnoTextContent::SvxUnoTextContent()
-SvxZoomStatusBarControl::GetDefItemWidth(StatusBar const&)
-SwBlinkList::Insert(SwBlinkList const*, unsigned short, unsigned short)
-SwBlinkList::Insert(SwBlinkPortion* const&, unsigned short&)
-SwBlinkList::Insert(SwBlinkPortion* const*, unsigned short)
-SwBlinkList::Remove(SwBlinkPortion* const&, unsigned short)
-SwBlockNames::Insert(SwBlockName const*&, unsigned short&)
-SwBlockNames::Insert(SwBlockName const**, unsigned short)
-SwBlockNames::Insert(SwBlockNames const*, unsigned short, unsigned short)
-SwBlockNames::Remove(SwBlockName const*&, unsigned short)
-SwBlockNames::Remove(unsigned short, unsigned short)
-SwCellFrms::DeleteAndDestroy(unsigned short, unsigned short)
-SwChartBoxes::DeleteAndDestroy(unsigned short, unsigned short)
-SwColumnPage::LinkStubTimeout(void*, void*)
-SwContentArr::Insert(SwContent* const&, unsigned short&)
-SwContentArr::Insert(SwContent* const*, unsigned short)
-SwContentArr::Insert(SwContentArr const*, unsigned short, unsigned short)
-SwContentArr::Remove(SwContent* const&, unsigned short)
-SwContentArr::Remove(unsigned short, unsigned short)
-SwCrsrShell::GoPrevSentence()
-SwCurrShells::DeleteAndDestroy(unsigned short, unsigned short)
-SwCurrShells::Insert(CurrShell* const&, unsigned short&)
-SwCurrShells::Insert(CurrShell* const*, unsigned short)
-SwCurrShells::Insert(SwCurrShells const*, unsigned short, unsigned short)
-SwCurrShells::Remove(unsigned short, unsigned short)
-SwDependentFields::DeleteAndDestroy(unsigned short, unsigned short)
-SwDestroyList::DeleteAndDestroy(unsigned short, unsigned short)
-SwDestroyList::Insert(SwDestroyList const*, unsigned short, unsigned short)
-SwDestroyList::Insert(SwSectionFrm* const&, unsigned short&)
-SwDestroyList::Insert(SwSectionFrm* const*, unsigned short)
-SwDestroyList::Remove(SwSectionFrm* const&, unsigned short)
-SwDoc::LinkStubDoUpdateAllCharts(void*, void*)
-SwEditShell::SetFixFields(unsigned char, DateTime const*)
-SwFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-SwFldDataOnlyDlgWrapper::GetChildWindowId()
-SwFormatTablePage::LinkStubRightModifyHdl(void*, void*)
-SwGlblDocContents::Insert(SwGlblDocContent* const&, unsigned short&)
-SwGlblDocContents::Insert(SwGlblDocContent* const*, unsigned short)
-SwGlblDocContents::Insert(SwGlblDocContents const*, unsigned short, unsigned short)
-SwGlblDocContents::Remove(SwGlblDocContent* const&, unsigned short)
-SwHTMLFmtInfos::Insert(SwHTMLFmtInfo const*&, unsigned short&)
-SwHTMLFmtInfos::Insert(SwHTMLFmtInfo const**, unsigned short)
-SwHTMLFmtInfos::Insert(SwHTMLFmtInfos const*, unsigned short, unsigned short)
-SwHTMLFmtInfos::Remove(SwHTMLFmtInfo const*&, unsigned short)
-SwHTMLFmtInfos::Remove(unsigned short, unsigned short)
-SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrm* const&, unsigned short&)
-SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrm* const*, unsigned short)
-SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrms const*, unsigned short, unsigned short)
-SwHTMLPosFlyFrms::Remove(SwHTMLPosFlyFrm* const&, unsigned short)
-SwHyphWrapper::LinkStubSpellError(void*, void*)
-SwInsDBColumns::Insert(SwInsDBColumn* const&, unsigned short&)
-SwInsDBColumns::Insert(SwInsDBColumn* const*, unsigned short)
-SwInsDBColumns::Insert(SwInsDBColumns const*, unsigned short, unsigned short)
-SwInsDBColumns::Remove(SwInsDBColumn* const&, unsigned short)
-SwInsDBColumns::Remove(unsigned short, unsigned short)
-SwLRects::Insert(SwLRects const*, unsigned short, unsigned short, unsigned short)
-SwLRects::Replace(SwLineRect const&, unsigned short)
-SwLRects::Replace(SwLineRect const*, unsigned short, unsigned short)
-SwLRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwLineRect const&, void*), void*)
-SwLoadOptPage::LinkStubCaptionHdl(void*, void*)
-SwMailMergeChildWindow::GetChildWindowId()
-SwModify::GetClientCount() const
-SwOutlineNodes::Insert(SwNode* const&, unsigned short&)
-SwOutlineNodes::Insert(SwNode* const*, unsigned short)
-SwOutlineNodes::Insert(SwOutlineNodes const*, unsigned short, unsigned short)
-SwPaM::LessThan(SwPaM const&, SwPaM const&)
-SwPaM::Overlap(SwPaM const&, SwPaM const&)
-SwPageFrm::AddSidebarBorders(Rectangle&, ViewShell*, bool, bool)
-SwPageFrm::AddSidebarBorders(SwRect&, ViewShell*, bool, bool)
-SwPosFlyFrms::DeleteAndDestroy(unsigned short, unsigned short)
-SwPosFlyFrms::Insert(SwPosFlyFrm* const&, unsigned short&)
-SwPosFlyFrms::Insert(SwPosFlyFrm* const*, unsigned short)
-SwPosFlyFrms::Insert(SwPosFlyFrms const*, unsigned short, unsigned short)
-SwPosFlyFrms::Remove(SwPosFlyFrm* const&, unsigned short)
-SwPosFlyFrms::Remove(unsigned short, unsigned short)
-SwRects::Replace(SwRect const&, unsigned short)
-SwRects::Replace(SwRect const*, unsigned short, unsigned short)
-SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwRect const&, void*), void*)
-SwRedlineDataParentSortArr::DeleteAndDestroy(unsigned short, unsigned short)
-SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const&)
-SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const*, unsigned short)
-SwRedlineDataParentSortArr::Insert(SwRedlineDataParentSortArr const*, unsigned short, unsigned short)
-SwSections::DeleteAndDestroy(unsigned short, unsigned short)
-SwSelBoxes::Insert(SwTableBox* const&, unsigned short&)
-SwSelBoxes::Remove(SwTableBox* const&, unsigned short)
-SwSortElements::Insert(SwSortElement* const&, unsigned short&)
-SwSortElements::Insert(SwSortElement* const*, unsigned short)
-SwSortElements::Insert(SwSortElements const*, unsigned short, unsigned short)
-SwSortElements::Remove(SwSortElement* const&, unsigned short)
-SwSortElements::Remove(unsigned short, unsigned short)
-SwSortTableLines::DeleteAndDestroy(unsigned short, unsigned short)
-SwSortTableLines::Insert(SwTableLine* const&)
-SwSortTableLines::Insert(SwTableLine* const&, unsigned short&)
-SwSortTableLines::Insert(SwTableLine* const*, unsigned short)
-SwSortTableLines::Remove(SwTableLine* const&, unsigned short)
-SwSortTableLines::Remove(unsigned short, unsigned short)
-SwSyncChildWin::GetChildWindowId()
-SwTOXMarks::DeleteAndDestroy(unsigned short, unsigned short)
-SwTOXSelectTabPage::LinkStubTOXAreaHdl(void*, void*)
-SwTOXSources::Insert(SwTOXSources const*, unsigned short, unsigned short, unsigned short)
-SwTOXSources::Remove(unsigned short, unsigned short)
-SwTOXSources::Replace(SwTOXSource const&, unsigned short)
-SwTOXSources::Replace(SwTOXSource const*, unsigned short, unsigned short)
-SwTOXSources::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwTOXSource const&, void*), void*)
-SwTOXStylesTabPage::LinkStubModifyHdl(void*, void*)
-SwTabFrm::GetLeaf(MakePageType, unsigned char)
-SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short)
-SwTableSortBoxes::Insert(SwTableBox* const&, unsigned short&)
-SwTableSortBoxes::Insert(SwTableBox* const*, unsigned short)
-SwVbaColumn::calculateAbsoluteColumnWidth(int, com::sun::star::uno::Sequence<com::sun::star::text::TableColumnSeparator> const&, double*)
-SwVbaColumn::calculateRelativeColumnWidth(double const*, double*, int)
-SwVbaStyle::getOOoStyleTypeFromMSWord(int)
-SwVbaTableHelper::setTableWidth(int)
-SwView::LinkStubHtmlOptionsHdl(void*, void*)
-SwView::LinkStubSpellError(void*, void*)
-SwViewImp::LinkStubSetStopPrt(void*, void*)
-SwWW8Writer::InsUInt32(std::vector<unsigned char, std::allocator<unsigned char> >&, unsigned int)
-SwWriteTableCols::Insert(SwWriteTableCol* const&, unsigned short&)
-SwWriteTableCols::Insert(SwWriteTableCol* const*, unsigned short)
-SwWriteTableCols::Insert(SwWriteTableCols const*, unsigned short, unsigned short)
-SwWriteTableCols::Remove(SwWriteTableCol* const&, unsigned short)
-SwWriteTableCols::Remove(unsigned short, unsigned short)
-SwWriteTableRows::Insert(SwWriteTableRow* const&, unsigned short&)
-SwWriteTableRows::Insert(SwWriteTableRow* const*, unsigned short)
-SwWriteTableRows::Insert(SwWriteTableRows const*, unsigned short, unsigned short)
-SwWriteTableRows::Remove(SwWriteTableRow* const&, unsigned short)
-SwWriteTableRows::Remove(unsigned short, unsigned short)
-SwXMLTableColumnsSortByWidth_Impl::GetPos(SwXMLTableColumn_Impl const*) const
-SwXMLTableColumnsSortByWidth_Impl::Remove(SwXMLTableColumn_Impl*)
-SwXMLTableColumns_Impl::Insert(SwXMLTableColumn_Impl* const&, unsigned short&)
-SwXMLTableColumns_Impl::Insert(SwXMLTableColumn_Impl* const*, unsigned short)
-SwXMLTableColumns_Impl::Insert(SwXMLTableColumns_Impl const*, unsigned short, unsigned short)
-SwXMLTableColumns_Impl::Remove(SwXMLTableColumn_Impl* const&, unsigned short)
-SwXMLTableColumns_Impl::Remove(unsigned short, unsigned short)
-SwpFmts::DeleteAndDestroy(unsigned short, unsigned short)
-SwpFmts::Insert(SwFmt const*&, unsigned short&)
-SwpFmts::Insert(SwFmt const**, unsigned short)
-SwpFmts::Insert(SwpFmts const*, unsigned short, unsigned short)
-SwpFmts::Remove(SwFmt const*&, unsigned short)
-SwpFmts::Remove(unsigned short, unsigned short)
-SwpHtEnd::Insert(SwTxtAttr const*&, unsigned short&)
-SwpHtEnd::Insert(SwTxtAttr const**, unsigned short)
-SwpHtEnd::Insert(SwpHtEnd const*, unsigned short, unsigned short)
-SwpHtEnd::Remove(SwTxtAttr const*&, unsigned short)
-SwpHtStart::Insert(SwTxtAttr const*&, unsigned short&)
-SwpHtStart::Insert(SwTxtAttr const**, unsigned short)
-SwpHtStart::Insert(SwpHtStart const*, unsigned short, unsigned short)
-SwpHtStart::Remove(SwTxtAttr const*&, unsigned short)
-SymCharConverter::Convert(Font&, String&, OutputDevice*)
-SystemChildWindow::SystemChildWindow(Window*, ResId const&)
-TB::NeedsPositioning()
-TESortedPositions::Insert(TESortedPositions const*, unsigned short, unsigned short)
-TESortedPositions::Insert(unsigned long const&, unsigned short&)
-TESortedPositions::Insert(unsigned long const*, unsigned short)
-TESortedPositions::Remove(unsigned long const&, unsigned short)
-TESortedPositions::Remove(unsigned short, unsigned short)
-TESortedPositions_SAR::Replace(unsigned long const&, unsigned short)
-TESortedPositions_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
-TESortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
-TEWritingDirectionInfos::Insert(TEWritingDirectionInfos const*, unsigned short, unsigned short, unsigned short)
-TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const&, unsigned short)
-TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const*, unsigned short, unsigned short)
-TEWritingDirectionInfos::_ForEach(unsigned short, unsigned short, unsigned char (*)(TEWritingDirectionInfo const&, void*), void*)
-TPGalleryThemeProperties::LinkStubClickCloseBrowserHdl(void*, void*)
-TTProfiler::Dec(unsigned long)
-TTProperties::Img(Bitmap*)
-TaskStatusBar::ImplGetFieldItem(unsigned short) const
-TaskStatusFieldItem::TaskStatusFieldItem()
-TempFile::IsValid() const
-TestToolObj::TestToolObj(String, String)
-TextObj::TextObj(TextObj&)
-TextObj::Write(SvStream*)
-TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&)
-TypeName::TypeName(char*, unsigned int, unsigned int, unsigned short, int, int)
-UCBStorage::IsStorageFile(String const&)
-UCBStream::UCBStream(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>&)
-UNOStorageHolder::GetStorageName()
-UNOStorageHolder::UNOStorageHolder(SotStorage&, SotStorage&, com::sun::star::uno::Reference<com::sun::star::embed::XStorage>, utl::TempFile*)
-UShortCont::Sort()
-UniqueIndex::Replace(unsigned long, void*)
-UnoComboBoxControl::getActionListeners()
-UnoComboBoxControl::getItemListeners()
-UnoControlBase::UnoControlBase()
-UnoControlModel::Clone() const
-UnoControlModel::GetImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)
-UnoControlModel::UnoControlModel()
-UnoControlModel::getInfoHelper()
-UnoDialog::getMapsFromPixels(int) const
-UnoDialog::isHighContrast()
-UnoListBoxControl::getActionListeners()
-UnoListBoxControl::getItemListeners()
-UnoMemoryStream::UnoMemoryStream(unsigned int, unsigned int)
-VCLUnoHelper::ConvertToMeasurementUnit(MapUnit)
-VCLUnoHelper::CreatePointer()
-VCLXDevice::IsCreatedWithToolkit() const
-VCLXPrinterServer::getImplementationId()
-VCLXPrinterServer::getTypes()
-ValueSet::CopyItems(ValueSet const&)
-ValueSet::GetHighlightHdl() const
-ValueSet::GetItemBits(unsigned short) const
-ValueSet::HideDropPos()
-ValueSet::InsertSpace(unsigned short, unsigned long)
-ValueSet::IsRTLActive()
-ValueSet::SetFirstLine(unsigned short)
-ValueSet::SetItemBits(unsigned short, unsigned short)
-ValueSet::ShowDropPos(Point const&)
-ValueSetAcc::IsDisposed()
-ValueSetItem::ClearAccessible()
-VbaFontBase::getUnderline()
-VbaFontBase::setUnderline(com::sun::star::uno::Any const&)
-VbaFoundFilesEnum::SetFileList(com::sun::star::uno::Sequence<rtl::OUString>&)
-VbaFoundFilesEnum::VbaFoundFilesEnum()
-VclEventListeners2::~VclEventListeners2()
-ViewShell::getIDocumentFieldsAccess() const
-WP1FixedLengthGroup::isGroupConsistent(WPXInputStream*, WPXEncryption*, unsigned char)
-WP3Resource::getResourceTypeString() const
-WP3ResourceFork::getResourcesByID(unsigned int) const
-WP3ResourceFork::getResourcesByType(unsigned int) const
-WP3StylesListener::insertCell()
-WP3StylesListener::insertRow()
-WP3SubDocument::WP3SubDocument(unsigned char*, unsigned int)
-WP42SubDocument::WP42SubDocument(unsigned char*, unsigned int)
-WP6SubDocument::WP6SubDocument(WPXInputStream*, WPXEncryption*, unsigned int)
-WPGTextDataHandler::endSubDocument()
-WPS8Parser::readText(WPXInputStream*, WPS8ContentListener*)
-WPXPropertyList::Iter::last()
-WPXPropertyListVector::Iter::last()
-WPXString::Iter::last()
-WPXSubDocument::WPXSubDocument()
-WW8Bytes::Replace(unsigned char const&, unsigned short)
-WW8Bytes::Replace(unsigned char const*, unsigned short, unsigned short)
-WW8Bytes::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
-WW8OleMaps::Insert(WW8OleMap* const&, unsigned short&)
-WW8OleMaps::Insert(WW8OleMap* const*, unsigned short)
-WW8OleMaps::Insert(WW8OleMaps const*, unsigned short, unsigned short)
-WW8OleMaps::Remove(WW8OleMap* const&, unsigned short)
-WW8OleMaps::Remove(unsigned short, unsigned short)
-WinMtfOutput::DrawLine(Point const&, Point const&)
-WinMtfOutput::GetTextLayoutMode() const
-WinMtfOutput::SetFont(Font const&)
-Window::PostUserEvent(unsigned long&, unsigned long, void*)
-WizardDialog::IsButtonFixedLineVisible()
-WordArr::Remove(short)
-WrongRanges::Insert(WrongRanges const*, unsigned short, unsigned short, unsigned short)
-WrongRanges::Replace(WrongRange const&, unsigned short)
-WrongRanges::Replace(WrongRange const*, unsigned short, unsigned short)
-WrongRanges::_ForEach(unsigned short, unsigned short, unsigned char (*)(WrongRange const&, void*), void*)
-X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned int&, int&, int&, unsigned long)
-X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-XBitmapList::Replace(XBitmapEntry*, long)
-XBitmapTable::Remove(long)
-XBitmapTable::Replace(long, XBitmapEntry*)
-XBitmapTable::XBitmapTable(String const&, XOutdevItemPool*, unsigned short, unsigned short)
-XDashTable::Remove(long)
-XDashTable::Replace(long, XDashEntry*)
-XDashTable::XDashTable(String const&, XOutdevItemPool*, unsigned short, unsigned short)
-XEditAttribute::XEditAttribute(SfxPoolItem const&)
-XFBookmarkRef::XFBookmarkRef()
-XFCell::SetCurrency(rtl::OUString)
-XFCell::SetDate(rtl::OUString)
-XFCell::SetDisplay(rtl::OUString)
-XFCell::SetPercent(double)
-XFCell::SetString(rtl::OUString)
-XFCell::SetTime(rtl::OUString)
-XFCellStyle::SetFont(XFFont*)
-XFCellStyle::SetIndent(double)
-XFCellStyle::SetMargins(double, double, double, double)
-XFCellStyle::SetParentStyle(rtl::OUString)
-XFCellStyle::SetShadow(enumXFShadowPos, double, XFColor&)
-XFColumn::GetMarginLeft()
-XFColumn::GetMarginRight()
-XFColumn::GetRelWidth()
-XFColumns::GetCount()
-XFColumns::SetSeperator(int, double, XFColor, enumXFAlignType)
-XFDrawCircle::XFDrawCircle()
-XFDrawCircle::XFDrawCircle(XFPoint, double)
-XFDrawEllipse::XFDrawEllipse()
-XFDrawPath::CalcViewBox()
-XFDrawPath::SmoothCurveTo(XFPoint, XFPoint, unsigned char)
-XFFileStream::XFFileStream(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)
-XFFloatFrame::XFFloatFrame(int)
-XFFontDecl::SetFontFamily(rtl::OUString)
-XFFontDecl::SetFontName(rtl::OUString)
-XFFontDecl::SetFontPitchFixed(unsigned char)
-XFFontDecl::XFFontDecl()
-XFGlobal::GenGraphName()
-XFGlobal::GenObjName()
-XFHeaderStyle::SetPadding(double, double, double, double)
-XFIndex::AddEntry(rtl::OUString, rtl::OUString)
-XFIndex::AddTemplate(unsigned int, rtl::OUString, enumXFIndexTemplate, enumXFIndexTemplate, enumXFIndexTemplate, enumXFIndexTemplate)
-XFIndex::GetEntryCount()
-XFIndex::SetDefaultAlphaIndex(rtl::OUString, unsigned char, unsigned char)
-XFIndex::SetSectionStyle(rtl::OUString)
-XFIndex::SetTitle(rtl::OUString, rtl::OUString)
-XFList::AddItem(rtl::OUString)
-XFList::SetHeader(XFListItem*)
-XFList::XFList(unsigned char)
-XFMasterPage::SetPageMaster(XFPageMaster*)
-XFNumberStyle::XFNumberStyle(enumXFNumberType)
-XFOfficeMeta::SetGenerator(rtl::OUString)
-XFOfficeMeta::SetTitle(rtl::OUString)
-XFOleObject::SetOleData(unsigned char*, int)
-XFOleObject::XFOleObject()
-XFOutlineStyle::XFOutlineStyle()
-XFParaStyle::XFParaStyle(XFParaStyle&)
-XFParagraph::ClearContents()
-XFParagraph::XFParagraph(rtl::OUString&, rtl::OUString&)
-XFRow::GetRowName()
-XFRowStyle::SetbackImage(XFBGImage*)
-XFSection::SetHiden(unsigned char)
-XFSection::SetProtected(unsigned char)
-XFSection::SetSectionName(rtl::OUString)
-XFSectionStyle::SetBackColor(XFColor const&)
-XFSectionStyle::SetBackImage(XFBGImage*)
-XFShadow::Reset()
-XFStyleManager::AddFontDecl(rtl::OUString, rtl::OUString, unsigned char)
-XFSvgPathEntry::XFSvgPathEntry(rtl::OUString)
-XFTable::GetColumnStyle(int)
-XFTextHeading::SetLevel(short)
-XFTextHeading::SetText(rtl::OUString)
-XFTextHeading::XFTextHeading()
-XFTextSpan::GetText()
-XFTextSpan::SetText(rtl::OUString&)
-XFTime::XFTime()
-XFillBitmapItem::XFillBitmapItem(SfxItemPool*)
-XFillBitmapItem::XFillBitmapItem(long, XOBitmap const&)
-XFillExchangeData::RegisterClipboardFormatName()
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool*)
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(int, XGradient const&, unsigned char)
-XFillGradientItem::XFillGradientItem(SfxItemPool*)
-XFillHatchItem::XFillHatchItem(SfxItemPool*)
-XFillHatchItem::XFillHatchItem(int, XHatch const&)
-XFormTextShadowColorItem::XFormTextShadowColorItem(int, Color const&)
-XGradientTable::Remove(long)
-XGradientTable::Replace(long, XGradientEntry*)
-XGradientTable::XGradientTable(String const&, XOutdevItemPool*, unsigned short, unsigned short)
-XHatchTable::Remove(long)
-XHatchTable::Replace(long, XHatchEntry*)
-XHatchTable::XHatchTable(String const&, XOutdevItemPool*, unsigned short, unsigned short)
-XLineDashItem::XLineDashItem(SfxItemPool*)
-XLineDashItem::XLineDashItem(int, XDash const&)
-XLineEndItem::XLineEndItem(SfxItemPool*)
-XLineEndList::Replace(XLineEndEntry*, long)
-XLineEndTable::Remove(long)
-XLineEndTable::Replace(long, XLineEndEntry*)
-XLineEndTable::XLineEndTable(String const&, XOutdevItemPool*, unsigned short, unsigned short)
-XLineStartItem::XLineStartItem(SfxItemPool*)
-XMLAutoTextEventExport::XMLAutoTextEventExport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> const&, unsigned short)
-XMLElement::Equals(rtl::OUString)
-XMLEmbeddedObjectExportFilter::XMLEmbeddedObjectExportFilter()
-XMLErrors::AddRecord(int, com::sun::star::uno::Sequence<rtl::OUString> const&)
-XMLErrors::AddRecord(int, com::sun::star::uno::Sequence<rtl::OUString> const&, rtl::OUString const&)
-XMLFamilyDataList_Impl::GetPos(XMLFamilyData_Impl const*) const
-XMLFamilyDataList_Impl::Remove(XMLFamilyData_Impl*)
-XMLFile::View()
-XMLFile::showType(XMLParentNode*)
-XMLFilterListBox::LinkStubHeaderSelect_Impl(void*, void*)
-XMLFilterTabDialog::LinkStubCancelHdl(void*, void*)
-XMLFontAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
-XMLFontAutoStylePoolNames_Impl::Remove(rtl::OUString*)
-XMLFontAutoStylePool_Impl::GetPos(XMLFontAutoStylePoolEntry_Impl const*) const
-XMLFontAutoStylePool_Impl::Remove(XMLFontAutoStylePoolEntry_Impl*)
-XMLFormsContext::XMLFormsContext(SvXMLImport&, unsigned short, rtl::OUString const&)
-XMLPagePropertySetMapper::XMLPagePropertySetMapper(UniReference<XMLPropertyHandlerFactory> const&)
-XMLParentNode::AddChild(XMLChildNode*, unsigned long)
-XMLParentNode::GetChildElement(XMLElement*)
-XMLParentNode::RemoveChild(XMLElement*)
-XMLPropertyBackpatcher<rtl::OUString>::XMLPropertyBackpatcher(char const*)
-XMLPropertyBackpatcher<rtl::OUString>::XMLPropertyBackpatcher(char const*, char const*, unsigned char, rtl::OUString)
-XMLPropertyBackpatcher<rtl::OUString>::XMLPropertyBackpatcher(rtl::OUString const&, rtl::OUString const&, unsigned char, rtl::OUString)
-XMLPropertyBackpatcher<short>::XMLPropertyBackpatcher(char const*)
-XMLPropertyBackpatcher<short>::XMLPropertyBackpatcher(char const*, char const*, unsigned char, short)
-XMLPropertyBackpatcher<short>::XMLPropertyBackpatcher(rtl::OUString const&, rtl::OUString const&, unsigned char, short)
-XMLShapeImportHelper::CreateExternalShapePropMapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, SvXMLImport&)
-XMLShapeImportHelper::Get3DSceneShapeAttrTokenMap()
-XMLShapeImportHelper::GetPathShapeAttrTokenMap()
-XMLShapeImportHelper::GetPolygonShapeAttrTokenMap()
-XMLSignatureHelper::CreateAndWriteSignature(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&)
-XMLSignatureHelper::GetSecurityEnvironmentByIndex(int)
-XMLSignatureHelper::GetSecurityEnvironmentNumber()
-XMLSignatureHelper::GetUriBinding() const
-XMLSignatureHelper::SetUriBinding(com::sun::star::uno::Reference<com::sun::star::xml::crypto::XUriBinding>&)
-XMLSignatureHelper::SetX509Certificate(int, int, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
-XMLTextFieldExport::ProcessDate(xmloff::token::XMLTokenEnum, com::sun::star::util::Date const&, unsigned short)
-XMLTextFrameContext::CreateIfNotThere()
-XMLTextImportHelper::CreateCharExtPropMapper(SvXMLImport&, XMLFontStylesContext*)
-XMLTextImportHelper::GetFrameImportPropertySetMapper() const
-XMLTextImportHelper::GetRangeFor(rtl::OUString&)
-XMLTextImportHelper::HasDrawNameAttribute(com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&, SvXMLNamespaceMap&)
-XMLTextImportHelper::getCurrentFieldName()
-XMLTextListAutoStylePool::HasName(rtl::OUString const&) const
-XMLTextListAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
-XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*)
-XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl const*) const
-XMLTextListAutoStylePool_Impl::Remove(XMLTextListAutoStylePoolEntry_Impl*)
-XMLTextParagraphExport::FindTextStyle(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, unsigned char&) const
-XMLTextParagraphExport::GetHeadingLevel(rtl::OUString const&)
-XMLVisAreaContext::XMLVisAreaContext(SvXMLImport&, unsigned short, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&, Rectangle&, MapUnit)
-XOutBitmap::CreateQuickDrawBitmapEx(Graphic const&, OutputDevice const&, MapMode const&, Size const&, Point const&, Size const&)
-XOutBitmap::DrawQuickDrawBitmapEx(OutputDevice*, Point const&, Size const&, BitmapEx const&)
-XOutBitmap::DrawTiledBitmapEx(OutputDevice*, Point const&, Size const&, Rectangle const&, BitmapEx const&)
-XPropertyList::Clear()
-XPropertyTable::Clear()
-XPropertyTable::GetBitmap(long) const
-XSecController::collectToSign(int, rtl::OUString const&)
-XSecController::getErrorMessage()
-XSecController::setSAXChainConnector(com::sun::star::uno::Reference<com::sun::star::xml::sax::XParser> const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler> const&, com::sun::star::uno::Reference<com::sun::star::xml::crypto::sax::XElementStackKeeper> const&)
-XSecondaryFillColorItem::XSecondaryFillColorItem(int, Color const&)
-XWindowItem::XWindowItem(unsigned short, Window*)
-XWindowItem::XWindowItem(unsigned short, com::sun::star::uno::Reference<com::sun::star::awt::XWindow>&)
-XclExpFontBuffer::Insert(ScPatternAttr const&, short, XclExpColorType, bool)
-XclExpName::IsHidden() const
-XclExpPivotCache::GetFieldAcc(String const&)
-XclExpString::SetFormats(std::vector<XclFormatRun, std::allocator<XclFormatRun> > const&)
-XclImpPTItem::GetVisItemName() const
-XclImpPalette::CreateColorSequence() const
-XclObjId::XclObjId()
-XclObjId::XclObjId(short, unsigned short)
-XclRoot::GetDatabaseRanges() const
-XclRoot::GetPixelXFromHmm(int) const
-XclRoot::GetPixelYFromHmm(int) const
-XclTokenArray::XclTokenArray(std::vector<unsigned char, std::allocator<unsigned char> >&, bool)
-XclTokenArrayIterator::Init()
-XclTools::GetBuiltInStyleName(String const&)
-XclTools::GetSbMacroUrl(String const&, String const&, SfxObjectShell*)
-XmlSec::GetDateTimeString(rtl::OUString const&, rtl::OUString const&)
-XmlSecStatusBarControl::GetDefItemWidth(StatusBar&)
-ZipPackageStream::SetBaseEncryptionData(rtl::Reference<BaseEncryptionData> const&)
-_CpyTabFrms::Insert(_CpyTabFrm const&, unsigned short&)
-_CpyTabFrms::Insert(_CpyTabFrm const*, unsigned short)
-_CpyTabFrms::Insert(_CpyTabFrms const*, unsigned short, unsigned short)
-_CpyTabFrms::Remove(_CpyTabFrm const&, unsigned short)
-_CpyTabFrms_SAR::Replace(_CpyTabFrm const&, unsigned short)
-_CpyTabFrms_SAR::Replace(_CpyTabFrm const*, unsigned short, unsigned short)
-_CpyTabFrms_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_CpyTabFrm const&, void*), void*)
-_MapTblFrmFmts::Insert(_MapTblFrmFmts const*, unsigned short, unsigned short, unsigned short)
-_MapTblFrmFmts::Remove(unsigned short, unsigned short)
-_MapTblFrmFmts::Replace(_MapTblFrmFmt const&, unsigned short)
-_MapTblFrmFmts::Replace(_MapTblFrmFmt const*, unsigned short, unsigned short)
-_MergePos::Insert(_CmpLPt const&, unsigned short&)
-_MergePos::Insert(_CmpLPt const*, unsigned short)
-_MergePos::Insert(_MergePos const*, unsigned short, unsigned short)
-_MergePos::Remove(_CmpLPt const&, unsigned short)
-_MergePos_SAR::Replace(_CmpLPt const&, unsigned short)
-_MergePos_SAR::Replace(_CmpLPt const*, unsigned short, unsigned short)
-_MergePos_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_CmpLPt const&, void*), void*)
-_SaveFlyArr::Insert(_SaveFlyArr const*, unsigned short, unsigned short, unsigned short)
-_SaveFlyArr::Remove(unsigned short, unsigned short)
-_SaveFlyArr::Replace(_SaveFly const&, unsigned short)
-_SaveFlyArr::Replace(_SaveFly const*, unsigned short, unsigned short)
-_SaveFlyArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(_SaveFly const&, void*), void*)
-_SetGetExpFlds::Insert(_SetGetExpFld* const&, unsigned short&)
-_SetGetExpFlds::Insert(_SetGetExpFld* const*, unsigned short)
-_SetGetExpFlds::Insert(_SetGetExpFlds const*, unsigned short, unsigned short)
-_SetGetExpFlds::Remove(_SetGetExpFld* const&, unsigned short)
-_SfxObjectList::Insert(_FileListEntry const*&, unsigned short&)
-_SfxObjectList::Insert(_FileListEntry const**, unsigned short)
-_SfxObjectList::Insert(_SfxObjectList const*, unsigned short, unsigned short)
-_SfxObjectList::Remove(_FileListEntry const*&, unsigned short)
-_SfxObjectList::Remove(unsigned short, unsigned short)
-_SfxPoolItems::DeleteAndDestroy(unsigned short, unsigned short)
-_SwFtnIdxs::Insert(SwTxtFtn* const&, unsigned short&)
-_SwFtnIdxs::Insert(SwTxtFtn* const*, unsigned short)
-_SwFtnIdxs::Remove(SwTxtFtn* const&, unsigned short)
-_SwPamRanges::Insert(SwPamRange const&, unsigned short&)
-_SwPamRanges::Insert(SwPamRange const*, unsigned short)
-_SwPamRanges::Insert(_SwPamRanges const*, unsigned short, unsigned short)
-_SwPamRanges::Remove(SwPamRange const&, unsigned short)
-_SwPamRanges_SAR::Replace(SwPamRange const&, unsigned short)
-_SwPamRanges_SAR::Replace(SwPamRange const*, unsigned short, unsigned short)
-_SwPamRanges_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwPamRange const&, void*), void*)
-_SwRedlineTbl::Insert(SwRedline* const*, unsigned short)
-_SwRedlineTbl::Insert(_SwRedlineTbl const*, unsigned short, unsigned short)
-_SwRedlineTbl::Remove(SwRedline* const&, unsigned short)
-_WPXTabStop::_WPXTabStop(double, WPXTabAlignment, unsigned short, unsigned char)
-_ZSortFlys::Insert(_ZSortFly const&, unsigned short&)
-_ZSortFlys::Insert(_ZSortFly const*, unsigned short)
-_ZSortFlys::Insert(_ZSortFlys const*, unsigned short, unsigned short)
-_ZSortFlys::Remove(_ZSortFly const&, unsigned short)
-_ZSortFlys_SAR::Replace(_ZSortFly const&, unsigned short)
-_ZSortFlys_SAR::Replace(_ZSortFly const*, unsigned short, unsigned short)
-_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_ZSortFly const&, void*), void*)
-accessibility::AccessibleCell::GetState(short)
-accessibility::AccessibleEditableTextPara::GetParaInterface(int)
-accessibility::AccessibleEditableTextPara::GetText(int)
-accessibility::AccessibleEditableTextPara::HasState(short)
-accessibility::AccessibleEditableTextPara::IsActive() const
-accessibility::AccessibleEditableTextPara::IsVisible() const
-accessibility::AccessibleImageBullet::GetIndexInParent() const
-accessibility::AccessibleParaManager::SetEditSource(SvxEditSourceAdapter*)
-accessibility::AccessibleShapeTreeInfo::AccessibleShapeTreeInfo(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleComponent> const&, com::sun::star::uno::Reference<com::sun::star::document::XEventBroadcaster> const&)
-accessibility::AccessibleShapeTreeInfo::GetDocumentWindow() const
-accessibility::AccessibleStaticTextBase::GetLineCount(int) const
-accessibility::AccessibleStaticTextBase::GetParagraphCount() const
-accessibility::AccessibleStaticTextBase::GetParagraphIndex() const
-accessibility::AccessibleTextEventQueue::Append(SfxHint const&)
-accessibility::AccessibleTextEventQueue::Append(SfxSimpleHint const&)
-accessibility::AccessibleTextHelper::GetAdditionalChildStates() const
-accessibility::ChildrenManagerImpl::GetChild(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&)
-accessibility::ChildrenManagerImpl::GetChildIndex(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> const&) const
-accessibility::DGColorNameLookUp::~DGColorNameLookUp()
-accessibility::DbgName_AccessibleGridControl()
-accessibility::DbgName_AccessibleGridControlAccess()
-accessibility::DbgName_AccessibleGridControlBase()
-accessibility::DbgName_AccessibleGridControlHeader()
-accessibility::DbgName_AccessibleGridControlTable()
-accessibility::DbgName_AccessibleGridControlTableBase()
-accessibility::DescriptionGenerator::AddPropertyNames()
-accessibility::DescriptionGenerator::AddUnknown(rtl::OUString const&, rtl::OUString const&)
-accessibility::ShapeTypeHandler::GetServiceName(int) const
-basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&)
-basegfx::B1DRange::B1DRange(basegfx::B1IRange const&)
-basegfx::B2DCubicBezier::B2DCubicBezier(basegfx::B2DPoint const&, basegfx::B2DPoint const&)
-basegfx::B2DEllipse::B2DEllipse()
-basegfx::B2DEllipse::setB2DEllipseCenter(basegfx::B2DPoint const&)
-basegfx::B2DEllipse::setB2DEllipseRadius(basegfx::B2DTuple const&)
-basegfx::B2DEllipse::transform(basegfx::B2DHomMatrix const&)
-basegfx::B2DHomMatrix::determinant() const
-basegfx::B2DHomMatrix::isNormalized() const
-basegfx::B2DHomMatrix::makeUnique()
-basegfx::B2DHomMatrix::normalize()
-basegfx::B2DHomMatrix::trace() const
-basegfx::B2DHomMatrix::transpose()
-basegfx::B2DHomPoint::getB2DPoint() const
-basegfx::B2DHomPoint::setX(double)
-basegfx::B2DHomPoint::setY(double)
-basegfx::B2DPolyPolygonRasterConverter::B2DPolyPolygonRasterConverter(basegfx::B2DPolyPolygon const&)
-basegfx::B2DPolyPolygonRasterConverter::B2DPolyPolygonRasterConverter(basegfx::B2DPolyPolygon const&, basegfx::B2DRange const&)
-basegfx::B2DPolyPolygonRasterConverter::rasterConvert(basegfx::FillRule)
-basegfx::B2DPolyRange::B2DPolyRange(basegfx::B2DRange const&, basegfx::B2VectorOrientation)
-basegfx::B2DPolyRange::B2DPolyRange(boost::tuples::tuple<basegfx::B2DRange, basegfx::B2VectorOrientation, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type> const&)
-basegfx::B2DPolyRange::appendElement(boost::tuples::tuple<basegfx::B2DRange, basegfx::B2VectorOrientation, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type> const&, unsigned int)
-basegfx::B2DPolyRange::begin()
-basegfx::B2DPolyRange::begin() const
-basegfx::B2DPolyRange::end()
-basegfx::B2DPolyRange::end() const
-basegfx::B2DPolyRange::flip()
-basegfx::B2DPolyRange::getBounds() const
-basegfx::B2DPolyRange::insertElement(unsigned int, basegfx::B2DRange const&, basegfx::B2VectorOrientation, unsigned int)
-basegfx::B2DPolyRange::insertElement(unsigned int, boost::tuples::tuple<basegfx::B2DRange, basegfx::B2VectorOrientation, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type> const&, unsigned int)
-basegfx::B2DPolyRange::insertPolyRange(unsigned int, basegfx::B2DPolyRange const&)
-basegfx::B2DPolyRange::isInside(basegfx::B2DRange const&) const
-basegfx::B2DPolyRange::isInside(basegfx::B2DTuple const&) const
-basegfx::B2DPolyRange::makeUnique()
-basegfx::B2DPolyRange::remove(unsigned int, unsigned int)
-basegfx::B2DPolyRange::setElement(unsigned int, basegfx::B2DRange const&, basegfx::B2VectorOrientation)
-basegfx::B2DPolyRange::setElement(unsigned int, boost::tuples::tuple<basegfx::B2DRange, basegfx::B2VectorOrientation, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type, boost::tuples::null_type> const&)
-basegfx::B2DPolygon::insert(unsigned int, basegfx::B2DPolygon const&, unsigned int, unsigned int)
-basegfx::B2DPolygon::isBezierSegment(unsigned int) const
-basegfx::B2DPolygon::resetControlPoints(unsigned int)
-basegfx::B2DQuadraticBezier::B2DQuadraticBezier()
-basegfx::B2DQuadraticBezier::B2DQuadraticBezier(basegfx::B2DPoint const&, basegfx::B2DPoint const&)
-basegfx::B2DQuadraticBezier::B2DQuadraticBezier(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&)
-basegfx::B2DQuadraticBezier::isBezier() const
-basegfx::B2DQuadraticBezier::~B2DQuadraticBezier()
-basegfx::B2DTuple::correctValues(double)
-basegfx::B2DVector::isNormalized() const
-basegfx::B2I64Tuple::getEmptyTuple()
-basegfx::B2IVector::angle(basegfx::B2IVector const&) const
-basegfx::B2IVector::cross(basegfx::B2IVector const&) const
-basegfx::B2IVector::getEmptyVector()
-basegfx::B2IVector::getLength() const
-basegfx::B3DPolyPolygon::insert(unsigned int, basegfx::B3DPolyPolygon const&)
-basegfx::B3DPolyPolygon::insert(unsigned int, basegfx::B3DPolygon const&, unsigned int)
-basegfx::B3DPolyPolygon::makeUnique()
-basegfx::B3DPolyPolygon::setClosed(bool)
-basegfx::B3DPolygon::B3DPolygon(basegfx::B3DPolygon const&, unsigned int, unsigned int)
-basegfx::B3DPolygon::insert(unsigned int, basegfx::B3DPoint const&, unsigned int)
-basegfx::B3DPolygon::insert(unsigned int, basegfx::B3DPolygon const&, unsigned int, unsigned int)
-basegfx::B3DRange::B3DRange(basegfx::B3IRange const&)
-basegfx::B3DTuple::B3DTuple(basegfx::B3ITuple const&)
-basegfx::B3I64Tuple::getEmptyTuple()
-basegfx::B3ITuple::getEmptyTuple()
-basegfx::DebugPlotter::DebugPlotter(char const*)
-basegfx::DebugPlotter::DebugPlotter(char const*, std::basic_ostream<char, std::char_traits<char> >&)
-basegfx::DebugPlotter::plot(basegfx::B2DCubicBezier const&, char const*)
-basegfx::DebugPlotter::plot(basegfx::B2DPoint const&, char const*)
-basegfx::DebugPlotter::plot(basegfx::B2DPolyPolygon const&, char const*)
-basegfx::DebugPlotter::plot(basegfx::B2DPolygon const&, char const*)
-basegfx::DebugPlotter::plot(basegfx::B2DRange const&, char const*)
-basegfx::DebugPlotter::plot(basegfx::B2DVector const&, char const*)
-basegfx::DebugPlotter::~DebugPlotter()
-basegfx::absolute(basegfx::B2DHomPoint const&)
-basegfx::absolute(basegfx::B2ITuple const&)
-basegfx::average(basegfx::B2DHomPoint&, basegfx::B2DHomPoint&)
-basegfx::average(basegfx::B2DHomPoint&, basegfx::B2DHomPoint&, basegfx::B2DHomPoint&)
-basegfx::average(basegfx::B2ITuple const&, basegfx::B2ITuple const&)
-basegfx::average(basegfx::B2ITuple const&, basegfx::B2ITuple const&, basegfx::B2ITuple const&)
-basegfx::computeSetDifference(std::vector<basegfx::B2IBox, std::allocator<basegfx::B2IBox> >&, basegfx::B2IBox const&, basegfx::B2IBox const&)
-basegfx::exportToSvg(basegfx::B2DHomMatrix const&)
-basegfx::fround(basegfx::B1DRange const&)
-basegfx::fround(basegfx::B3DRange const&)
-basegfx::getContinuity(basegfx::B2IVector const&, basegfx::B2IVector const&)
-basegfx::getOrientation(basegfx::B2IVector const&, basegfx::B2IVector const&)
-basegfx::getPerpendicular(basegfx::B2IVector const&)
-basegfx::interpolate(basegfx::B2DHomPoint&, basegfx::B2DHomPoint&, double)
-basegfx::interpolate(basegfx::B2ITuple const&, basegfx::B2ITuple const&, double)
-basegfx::maximum(basegfx::B2DHomPoint const&, basegfx::B2DHomPoint const&)
-basegfx::maximum(basegfx::B2ITuple const&, basegfx::B2ITuple const&)
-basegfx::minimum(basegfx::B2DHomPoint const&, basegfx::B2DHomPoint const&)
-basegfx::minimum(basegfx::B2ITuple const&, basegfx::B2ITuple const&)
-basegfx::testtools::Plotter::Plotter(std::basic_ostream<char, std::char_traits<char> >&)
-basegfx::testtools::Plotter::plot(basegfx::B2DPolyPolygon const&)
-basegfx::testtools::Plotter::plot(basegfx::B2DRange const&)
-basegfx::testtools::Plotter::~Plotter()
-basegfx::tools::(anonymous namespace)::lcl_skipDoubleAndSpacesAndCommas(int&, rtl::OUString const&, int)
-basegfx::tools::(anonymous namespace)::lcl_skipNumberAndSpacesAndCommas(int&, rtl::OUString const&, int)
-basegfx::tools::B2DClipState::B2DClipState(basegfx::B2DPolygon const&)
-basegfx::tools::B2DClipState::B2DClipState(basegfx::B2DRange const&)
-basegfx::tools::B2DClipState::intersectClipState(basegfx::tools::B2DClipState const&)
-basegfx::tools::B2DClipState::intersectPolygon(basegfx::B2DPolygon const&)
-basegfx::tools::B2DClipState::isNull() const
-basegfx::tools::B2DClipState::makeClear()
-basegfx::tools::B2DClipState::makeUnique()
-basegfx::tools::B2DClipState::subtractClipState(basegfx::tools::B2DClipState const&)
-basegfx::tools::B2DClipState::subtractPolygon(basegfx::B2DPolygon const&)
-basegfx::tools::B2DClipState::unionClipState(basegfx::tools::B2DClipState const&)
-basegfx::tools::B2DClipState::unionPolygon(basegfx::B2DPolygon const&)
-basegfx::tools::B2DClipState::xorClipState(basegfx::tools::B2DClipState const&)
-basegfx::tools::B2DClipState::xorPolygon(basegfx::B2DPolygon const&)
-basegfx::tools::addPointsAtCuts(basegfx::B2DPolyPolygon const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&)
-basegfx::tools::addPointsAtCuts(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&)
-basegfx::tools::addPointsAtCuts(basegfx::B2DPolyPolygon const&, bool)
-basegfx::tools::addPointsAtCutsAndTouches(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&)
-basegfx::tools::applyLineDashing(basegfx::B3DPolyPolygon const&, std::vector<double, std::allocator<double> > const&, basegfx::B3DPolyPolygon*, basegfx::B3DPolyPolygon*, double)
-basegfx::tools::ciexyz2rgb(basegfx::BColor const&)
-basegfx::tools::clipPolyPolygonOnEdge(basegfx::B2DPolyPolygon const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, bool, bool)
-basegfx::tools::clipPolyPolygonOnPlane(basegfx::B3DPolyPolygon const&, basegfx::B3DPoint const&, basegfx::B3DVector const&, bool, bool)
-basegfx::tools::clipPolyPolygonOnRange(basegfx::B3DPolyPolygon const&, basegfx::B2DRange const&, bool, bool)
-basegfx::tools::clipPolyPolygonOnRange(basegfx::B3DPolyPolygon const&, basegfx::B3DRange const&, bool, bool)
-basegfx::tools::clipPolygonOnEdge(basegfx::B2DPolygon const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, bool, bool)
-basegfx::tools::clipPolygonOnPlane(basegfx::B3DPolygon const&, basegfx::B3DPoint const&, basegfx::B3DVector const&, bool, bool)
-basegfx::tools::createPolygonFromRect(basegfx::B2DRange const&, double)
-basegfx::tools::createShearXB2DHomMatrix(double)
-basegfx::tools::createShearYB2DHomMatrix(double)
-basegfx::tools::createSimplifiedPolygon(basegfx::B2DPolygon const&)
-basegfx::tools::equal(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&)
-basegfx::tools::equal(basegfx::B2DPolygon const&, basegfx::B2DPolygon const&)
-basegfx::tools::equal(basegfx::B3DPolyPolygon const&, basegfx::B3DPolyPolygon const&)
-basegfx::tools::equal(basegfx::B3DPolygon const&, basegfx::B3DPolygon const&)
-basegfx::tools::findCut(basegfx::B2DPolygon const&, unsigned int, basegfx::B2DPolygon const&, unsigned int, unsigned short, double*, double*)
-basegfx::tools::findCut(basegfx::B2DPolygon const&, unsigned int, unsigned int, unsigned short, double*, double*)
-basegfx::tools::getArea(basegfx::B3DPolygon const&)
-basegfx::tools::getCutBetweenLineAndPolygon(basegfx::B3DPolygon const&, basegfx::B3DPoint const&, basegfx::B3DPoint const&, double&)
-basegfx::tools::getDistancePointToEndlessRay(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, double&)
-basegfx::tools::getIndexOfPredecessor(unsigned int, basegfx::B3DPolygon const&)
-basegfx::tools::getPositionRelative(basegfx::B3DPolygon const&, double, double)
-basegfx::tools::getPositiveOrientedNormal(basegfx::B3DPolygon const&)
-basegfx::tools::getRangeWithControlPoints(basegfx::B2DPolyPolygon const&)
-basegfx::tools::getSnippetRelative(basegfx::B2DPolygon const&, double, double, double)
-basegfx::tools::isInEpsilonRange(basegfx::B3DPolygon const&, basegfx::B3DPoint const&, double)
-basegfx::tools::isInside(basegfx::B3DPolygon const&, basegfx::B3DPolygon const&, bool)
-basegfx::tools::isPolyPolygonEqualRectangle(basegfx::B2DPolyPolygon const&, basegfx::B2DRange const&)
-basegfx::tools::liangBarskyClip2D(basegfx::B2DPoint&, basegfx::B2DPoint&, basegfx::B2DRange const&)
-basegfx::tools::reSegmentPolyPolygonEdges(basegfx::B2DPolyPolygon const&, unsigned int, bool, bool)
-basegfx::tools::rgb2yiq(basegfx::BColor const&)
-basegfx::tools::rgb2ypbpr(basegfx::BColor const&)
-basegfx::tools::rotateAroundPoint(basegfx::B2DPolyPolygon const&, basegfx::B2DPoint const&, double)
-basegfx::tools::setContinuity(basegfx::B2DPolyPolygon const&, basegfx::B2VectorContinuity)
-basegfx::tools::solveCrossovers(basegfx::B2DPolygon const&)
-basegfx::tools::yiq2rgb(basegfx::BColor const&)
-basegfx::tools::ypbpr2rgb(basegfx::BColor const&)
-basegfx::unotools::AffineMatrix2DAreEqual(com::sun::star::geometry::AffineMatrix2D const&, com::sun::star::geometry::AffineMatrix2D const&)
-basegfx::unotools::IntegerPoint2DAreEqual(com::sun::star::geometry::IntegerPoint2D const&, com::sun::star::geometry::IntegerPoint2D const&)
-basegfx::unotools::IntegerRectangle2DAreEqual(com::sun::star::geometry::IntegerRectangle2D const&, com::sun::star::geometry::IntegerRectangle2D const&)
-basegfx::unotools::IntegerSize2DAreEqual(com::sun::star::geometry::IntegerSize2D const&, com::sun::star::geometry::IntegerSize2D const&)
-basegfx::unotools::RealPoint2DAreEqual(com::sun::star::geometry::RealPoint2D const&, com::sun::star::geometry::RealPoint2D const&)
-basegfx::unotools::RealRectangle2DAreEqual(com::sun::star::geometry::RealRectangle2D const&, com::sun::star::geometry::RealRectangle2D const&)
-basegfx::unotools::RealRectangle3DAreEqual(com::sun::star::geometry::RealRectangle3D const&, com::sun::star::geometry::RealRectangle3D const&)
-basegfx::unotools::RealSize2DAreEqual(com::sun::star::geometry::RealSize2D const&, com::sun::star::geometry::RealSize2D const&)
-basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const
-basegfx::unotools::awtPointAreEqual(com::sun::star::awt::Point const&, com::sun::star::awt::Point const&)
-basegfx::unotools::awtPointFromB2IPoint(basegfx::B2IPoint const&)
-basegfx::unotools::awtRectangleAreEqual(com::sun::star::awt::Rectangle const&, com::sun::star::awt::Rectangle const&)
-basegfx::unotools::awtRectangleFromB2IRectangle(basegfx::B2IRange const&)
-basegfx::unotools::awtSizeAreEqual(com::sun::star::awt::Size const&, com::sun::star::awt::Size const&)
-basegfx::unotools::awtSizeFromB2ISize(basegfx::B2IVector const&)
-basegfx::unotools::b2DSizeFromRealSize2D(com::sun::star::geometry::RealSize2D const&)
-basegfx::unotools::b2IPointFromAwtPoint(com::sun::star::awt::Point const&)
-basegfx::unotools::b2IPointFromIntegerPoint2D(com::sun::star::geometry::IntegerPoint2D const&)
-basegfx::unotools::b2ISizeFromAwtSize(com::sun::star::awt::Size const&)
-basegfx::unotools::homMatrixFromAffineMatrix(com::sun::star::geometry::AffineMatrix2D const&)
-basegfx::unotools::integerPoint2DFromB2IPoint(basegfx::B2IPoint const&)
-basegfx::unotools::integerRectangle2DFromB2IRectangle(basegfx::B2IRange const&)
-basic::ScriptExtensionIterator::implGetScriptPackageFromPackage(com::sun::star::uno::Reference<com::sun::star::deployment::XPackage>, bool&)
-basic::vba::createDocumentsEnumeration(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
-basic::vba::getCurrentDirectory(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
-binaryurp::(anonymous namespace)::isProtocolPropertyMessage(rtl::OUString const&)
-binfilter::B3dEdgeEntryBucketMemArr::Insert(binfilter::B3dEdgeEntryBucketMemArr const*, unsigned short, unsigned short, unsigned short)
-binfilter::B3dEdgeEntryBucketMemArr::Replace(char const*&, unsigned short)
-binfilter::B3dEdgeEntryBucketMemArr::Replace(char const**, unsigned short, unsigned short)
-binfilter::B3dEdgeEntryBucketMemArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(char const*&, void*), void*)
-binfilter::B3dEdgeListBucketMemArr::Insert(binfilter::B3dEdgeListBucketMemArr const*, unsigned short, unsigned short, unsigned short)
-binfilter::B3dEdgeListBucketMemArr::Replace(char const*&, unsigned short)
-binfilter::B3dEdgeListBucketMemArr::Replace(char const**, unsigned short, unsigned short)
-binfilter::B3dEdgeListBucketMemArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(char const*&, void*), void*)
-binfilter::B3dEntityBucketMemArr::Insert(binfilter::B3dEntityBucketMemArr const*, unsigned short, unsigned short, unsigned short)
-binfilter::B3dEntityBucketMemArr::Replace(char const*&, unsigned short)
-binfilter::B3dEntityBucketMemArr::Replace(char const**, unsigned short, unsigned short)
-binfilter::B3dEntityBucketMemArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(char const*&, void*), void*)
-binfilter::BasicErrorManager::GetFirstError()
-binfilter::BasicErrorManager::GetNextError()
-binfilter::BasicManager::ClearErrors()
-binfilter::BasicManager::HasErrors()
-binfilter::CharPosArray::Insert(binfilter::CharPosArray const*, unsigned short, unsigned short, unsigned short)
-binfilter::CharPosArray::Replace(int const&, unsigned short)
-binfilter::CharPosArray::Replace(int const*, unsigned short, unsigned short)
-binfilter::CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
-binfilter::ContainerSorter::DoSort(unsigned long, unsigned long) const
-binfilter::DbgName_CntBoolItem()
-binfilter::DbgName_CntEnumItem()
-binfilter::DbgName_SfxEnumItemInterface()
-binfilter::DbgName_SfxFilter()
-binfilter::DbgName_SfxFrameSetDescriptor()
-binfilter::DbgName_SfxStringListItem()
-binfilter::DbgName_SvxMacroItem()
-binfilter::Dictionary::~Dictionary()
-binfilter::E3dDistantLight::E3dDistantLight(binfilter::Vector3D const&, binfilter::Vector3D const&, Color const&, double)
-binfilter::E3dPointLight::E3dPointLight(binfilter::Vector3D const&, Color const&, double)
-binfilter::EECharAttribArray::Insert(binfilter::EECharAttrib const&, unsigned short)
-binfilter::EECharAttribArray::Insert(binfilter::EECharAttribArray const*, unsigned short, unsigned short, unsigned short)
-binfilter::EECharAttribArray::Remove(unsigned short, unsigned short)
-binfilter::EECharAttribArray::Replace(binfilter::EECharAttrib const&, unsigned short)
-binfilter::EECharAttribArray::Replace(binfilter::EECharAttrib const*, unsigned short, unsigned short)
-binfilter::EECharAttribArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::EECharAttrib const&, void*), void*)
-binfilter::EditEngine::IsModified() const
-binfilter::FmFormPageImpl::write(com::sun::star::uno::Reference<com::sun::star::io::XObjectOutputStream> const&) const
-binfilter::GeometryIndexValueBucketMemArr::Insert(binfilter::GeometryIndexValueBucketMemArr const*, unsigned short, unsigned short, unsigned short)
-binfilter::GeometryIndexValueBucketMemArr::Replace(char const*&, unsigned short)
-binfilter::GeometryIndexValueBucketMemArr::Replace(char const**, unsigned short, unsigned short)
-binfilter::GeometryIndexValueBucketMemArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(char const*&, void*), void*)
-binfilter::GetLangName(unsigned short)
-binfilter::GetPortionName(unsigned short)
-binfilter::GetPrepName(binfilter::PrepareHint)
-binfilter::ImpSvtData::~ImpSvtData()
-binfilter::InsCapOptArr::Insert(binfilter::InsCapOptArr const*, unsigned short, unsigned short)
-binfilter::InsCapOptArr::Insert(binfilter::InsCaptionOpt* const&, unsigned short&)
-binfilter::InsCapOptArr::Insert(binfilter::InsCaptionOpt* const*, unsigned short)
-binfilter::InsCapOptArr::Remove(binfilter::InsCaptionOpt* const&, unsigned short)
-binfilter::InsCapOptArr::Remove(unsigned short, unsigned short)
-binfilter::IsDbg(binfilter::SwTxtFrm const*)
-binfilter::OUStringsSort_Impl::Insert(binfilter::OUStringsSort_Impl const*, unsigned short, unsigned short)
-binfilter::OUStringsSort_Impl::Insert(rtl::OUString* const&, unsigned short&)
-binfilter::OUStringsSort_Impl::Insert(rtl::OUString* const*, unsigned short)
-binfilter::OUStringsSort_Impl::Remove(rtl::OUString* const&, unsigned short)
-binfilter::OUStringsSort_Impl::Remove(unsigned short, unsigned short)
-binfilter::Outliner::LinkStubEditEngineNotifyHdl(void*, void*)
-binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetBuffer()
-binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetSize()
-binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::PCodeBuffConvertor(unsigned char*, unsigned int)
-binfilter::PaddWithBlanks_Impl(SvStream&, unsigned short)
-binfilter::ReadThroughComponent(binfilter::SvStorage*, com::sun::star::uno::Reference<com::sun::star::lang::XComponent>, char const*, char const*, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>&, char const*, com::sun::star::uno::Sequence<com::sun::star::uno::Any>, rtl::OUString const&, unsigned char)
-binfilter::Registration::~Registration()
-binfilter::SaveBookmarks::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SbiGlobals::~SbiGlobals()
-binfilter::SbxFacs::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SbxValue::GetCoreString() const
-binfilter::ScAddInAsyncs::Insert(binfilter::ScAddInAsync* const&, unsigned short&)
-binfilter::ScAddInAsyncs::Insert(binfilter::ScAddInAsync* const*, unsigned short)
-binfilter::ScAddInAsyncs::Insert(binfilter::ScAddInAsyncs const*, unsigned short, unsigned short)
-binfilter::ScAddInAsyncs::Remove(binfilter::ScAddInAsync* const&, unsigned short)
-binfilter::ScAddInDocs::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::ScAddInDocs::Insert(binfilter::ScAddInDocs const*, unsigned short, unsigned short)
-binfilter::ScAddInDocs::Insert(binfilter::ScDocument* const&, unsigned short&)
-binfilter::ScAddInDocs::Insert(binfilter::ScDocument* const*, unsigned short)
-binfilter::ScAddInDocs::Remove(binfilter::ScDocument* const&, unsigned short)
-binfilter::ScBroadcastAreas::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::ScBroadcastAreas::Insert(binfilter::ScBroadcastArea* const&, unsigned short&)
-binfilter::ScBroadcastAreas::Insert(binfilter::ScBroadcastArea* const*, unsigned short)
-binfilter::ScBroadcastAreas::Insert(binfilter::ScBroadcastAreas const*, unsigned short, unsigned short)
-binfilter::ScBroadcastAreas::Remove(binfilter::ScBroadcastArea* const&, unsigned short)
-binfilter::ScChangeTrack::Remove(binfilter::ScChangeAction*)
-binfilter::ScConditionalFormatList::ResetUsed()
-binfilter::ScConditionalFormats_Impl::Insert(binfilter::ScConditionalFormat* const&, unsigned short&)
-binfilter::ScConditionalFormats_Impl::Insert(binfilter::ScConditionalFormat* const*, unsigned short)
-binfilter::ScConditionalFormats_Impl::Insert(binfilter::ScConditionalFormats_Impl const*, unsigned short, unsigned short)
-binfilter::ScConditionalFormats_Impl::Remove(binfilter::ScConditionalFormat* const&, unsigned short)
-binfilter::ScConditionalFormats_Impl::Remove(unsigned short, unsigned short)
-binfilter::ScDBData::IsBeyond(unsigned short) const
-binfilter::ScDocument::GetWeightedCount() const
-binfilter::ScDocument::SetConditionalUsed(unsigned long)
-binfilter::ScDocument::SetValidationUsed(unsigned long)
-binfilter::ScFieldChangerEditEngine::ConvertFields()
-binfilter::ScFieldChangerEditEngine::ScFieldChangerEditEngine(binfilter::SfxItemPool*, unsigned char)
-binfilter::ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream&, unsigned int)
-binfilter::ScMultipleWriteHeader::~ScMultipleWriteHeader()
-binfilter::ScMyContentAction::~ScMyContentAction()
-binfilter::ScMyDelAction::~ScMyDelAction()
-binfilter::ScMyMoveAction::~ScMyMoveAction()
-binfilter::ScRangeData::IsBeyond(unsigned short) const
-binfilter::ScRangeFindList::~ScRangeFindList()
-binfilter::ScStyleSheetPool::SetForceStdName(String const*)
-binfilter::ScTokenArray::ExportRecalcMode40() const
-binfilter::ScValidationDataList::ResetUsed()
-binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationData* const&, unsigned short&)
-binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationData* const*, unsigned short)
-binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationEntries_Impl const*, unsigned short, unsigned short)
-binfilter::ScValidationEntries_Impl::Remove(binfilter::ScValidationData* const&, unsigned short)
-binfilter::ScValidationEntries_Impl::Remove(unsigned short, unsigned short)
-binfilter::ScViewData::ReadUserDataSequence(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
-binfilter::ScViewData::WriteUserData(String&)
-binfilter::ScXMLImportWrapper::Export(unsigned char)
-binfilter::ScXMLImportWrapper::Import(unsigned char)
-binfilter::ScXMLImportWrapper::ScXMLImportWrapper(binfilter::ScDocument&, binfilter::SfxMedium*, binfilter::SvStorage*)
-binfilter::SchXMLWrapper::Export()
-binfilter::SchXMLWrapper::SchXMLWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, binfilter::SvStorage&, unsigned char)
-binfilter::ScriptTypePosInfos::Insert(binfilter::ScriptTypePosInfos const*, unsigned short, unsigned short, unsigned short)
-binfilter::ScriptTypePosInfos::Replace(binfilter::ScriptTypePosInfo const&, unsigned short)
-binfilter::ScriptTypePosInfos::Replace(binfilter::ScriptTypePosInfo const*, unsigned short, unsigned short)
-binfilter::ScriptTypePosInfos::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::ScriptTypePosInfo const&, void*), void*)
-binfilter::SdXMLFilter::SdXMLFilter(binfilter::SfxMedium&, binfilter::SdDrawDocShell&, unsigned char, binfilter::SdXMLFilterMode)
-binfilter::SdrObjSurrogate::SdrObjSurrogate(binfilter::SdrObject*, binfilter::SdrObject const*)
-binfilter::SdrPageView::IsLayer(String const&, binfilter::SetOfByte const&) const
-binfilter::SdrUnoControlAccessArr::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const&, unsigned short&)
-binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const*, unsigned short)
-binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccessArr const*, unsigned short, unsigned short)
-binfilter::SdrUnoControlAccessArr::Remove(binfilter::SdrUnoControlAccess* const&, unsigned short)
-binfilter::SfxConfigManagerImExport_Impl::Export(SotStorage*, SotStorage*)
-binfilter::SfxDocumentInfo::SavePropertySet(binfilter::SvStorage*) const
-binfilter::SfxHintPoster::LinkStubDoEvent_Impl(void*, void*)
-binfilter::SfxItemModifyArr_Impl::Insert(binfilter::SfxItemModifyArr_Impl const*, unsigned short, unsigned short, unsigned short)
-binfilter::SfxItemModifyArr_Impl::Remove(unsigned short, unsigned short)
-binfilter::SfxItemModifyArr_Impl::Replace(binfilter::SfxItemModifyImpl const&, unsigned short)
-binfilter::SfxItemModifyArr_Impl::Replace(binfilter::SfxItemModifyImpl const*, unsigned short, unsigned short)
-binfilter::SfxItemModifyArr_Impl::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SfxItemModifyImpl const&, void*), void*)
-binfilter::SfxMacroConfig::LinkStubCallbackHdl_Impl(void*, void*)
-binfilter::SfxMacroConfig::LinkStubEventHdl_Impl(void*, void*)
-binfilter::SfxMultiMixRecordWriter::NewContent(unsigned short, unsigned char)
-binfilter::SfxMultiVarRecordWriter::NewContent()
-binfilter::SfxMultiVarRecordWriter::SfxMultiVarRecordWriter(SvStream*, unsigned short, unsigned char)
-binfilter::SfxMultiVarRecordWriter::SfxMultiVarRecordWriter(unsigned char, SvStream*, unsigned short, unsigned char)
-binfilter::SfxObjectShell::GetBaseURL() const
-binfilter::SfxPtrArr::Insert(unsigned short, void*)
-binfilter::SfxPtrArr::Remove(void*)
-binfilter::SfxPtrArr::Replace(void*, void*)
-binfilter::SfxSingleRecordWriter::SfxSingleRecordWriter(SvStream*, unsigned short, unsigned char)
-binfilter::SfxUINT32s::Insert(binfilter::SfxUINT32s const*, unsigned short, unsigned short, unsigned short)
-binfilter::SfxUINT32s::Remove(unsigned short, unsigned short)
-binfilter::SfxUINT32s::Replace(unsigned int const&, unsigned short)
-binfilter::SfxUINT32s::Replace(unsigned int const*, unsigned short, unsigned short)
-binfilter::SfxUINT32s::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
-binfilter::ShellResource::~ShellResource()
-binfilter::SmFntFmtListEntryArr::Insert(binfilter::SmFntFmtListEntryArr const*, unsigned short, unsigned short, unsigned short)
-binfilter::SmFntFmtListEntryArr::Remove(unsigned short, unsigned short)
-binfilter::SmFntFmtListEntryArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SmFntFmtListEntry const&, void*), void*)
-binfilter::SmXMLWrapper::WriteThroughComponent(binfilter::SvStorage*, com::sun::star::uno::Reference<com::sun::star::lang::XComponent>, char const*, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>&, char const*, unsigned char)
-binfilter::SoDll::~SoDll()
-binfilter::SortedPositions::Insert(binfilter::SortedPositions const*, unsigned short, unsigned short)
-binfilter::SortedPositions::Insert(unsigned int const&, unsigned short&)
-binfilter::SortedPositions::Insert(unsigned int const*, unsigned short)
-binfilter::SortedPositions::Remove(unsigned int const&, unsigned short)
-binfilter::SortedPositions::Remove(unsigned short, unsigned short)
-binfilter::SortedPositions_SAR::Replace(unsigned int const&, unsigned short)
-binfilter::SortedPositions_SAR::Replace(unsigned int const*, unsigned short, unsigned short)
-binfilter::SortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
-binfilter::SvBindStatusCallback::SetProgressCallback(Link const&)
-binfilter::SvBools::Insert(binfilter::SvBools const*, unsigned short, unsigned short, unsigned short)
-binfilter::SvBools::Replace(unsigned char const&, unsigned short)
-binfilter::SvBools::Replace(unsigned char const*, unsigned short, unsigned short)
-binfilter::SvBools::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
-binfilter::SvByteStrings::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SvByteStringsSortDtor::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SvByteStringsSortDtor::Insert(ByteString* const&)
-binfilter::SvByteStringsSortDtor::Insert(ByteString* const&, unsigned short&)
-binfilter::SvByteStringsSortDtor::Insert(ByteString* const*, unsigned short)
-binfilter::SvByteStringsSortDtor::Insert(binfilter::SvByteStringsSortDtor const*, unsigned short, unsigned short)
-binfilter::SvByteStringsSortDtor::Remove(ByteString* const&, unsigned short)
-binfilter::SvByteStringsSortDtor::Remove(unsigned short, unsigned short)
-binfilter::SvBytes::Insert(binfilter::SvBytes const*, unsigned short, unsigned short, unsigned short)
-binfilter::SvBytes::Replace(unsigned char const&, unsigned short)
-binfilter::SvBytes::Replace(unsigned char const*, unsigned short, unsigned short)
-binfilter::SvBytes::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
-binfilter::SvDataPipe_Impl::addMark(unsigned int)
-binfilter::SvDataPipe_Impl::removeMark(unsigned int)
-binfilter::SvFactory::GetSvClass(int, SvGlobalName const&)
-binfilter::SvFactory::IsIntern31(SvGlobalName const&)
-binfilter::SvI18NMap_Impl::Insert(binfilter::SvI18NMapEntry_Impl* const&, unsigned short&)
-binfilter::SvI18NMap_Impl::Insert(binfilter::SvI18NMapEntry_Impl* const*, unsigned short)
-binfilter::SvI18NMap_Impl::Insert(binfilter::SvI18NMap_Impl const*, unsigned short, unsigned short)
-binfilter::SvI18NMap_Impl::Remove(binfilter::SvI18NMapEntry_Impl* const&, unsigned short)
-binfilter::SvI18NMap_Impl::Remove(unsigned short, unsigned short)
-binfilter::SvLongs::Replace(long const&, unsigned short)
-binfilter::SvLongs::Replace(long const*, unsigned short, unsigned short)
-binfilter::SvLongs::_ForEach(unsigned short, unsigned short, unsigned char (*)(long const&, void*), void*)
-binfilter::SvObjectServerList::Remove(SvGlobalName const&)
-binfilter::SvOutPlaceObject::MakeWorkStorageWrap_Impl(binfilter::SvStorage*)
-binfilter::SvPersist::DoSaveContent(binfilter::SvStorage*, unsigned char)
-binfilter::SvPtrarr::Replace(void* const*, unsigned short, unsigned short)
-binfilter::SvShorts::Insert(binfilter::SvShorts const*, unsigned short, unsigned short, unsigned short)
-binfilter::SvShorts::Remove(unsigned short, unsigned short)
-binfilter::SvShorts::Replace(short const&, unsigned short)
-binfilter::SvShorts::Replace(short const*, unsigned short, unsigned short)
-binfilter::SvShorts::_ForEach(unsigned short, unsigned short, unsigned char (*)(short const&, void*), void*)
-binfilter::SvStringsISort::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SvStringsISort::Insert(String* const&)
-binfilter::SvStringsISort::Insert(String* const&, unsigned short&)
-binfilter::SvStringsISort::Insert(String* const*, unsigned short)
-binfilter::SvStringsISort::Insert(binfilter::SvStringsISort const*, unsigned short, unsigned short)
-binfilter::SvStringsISort::Remove(String* const&, unsigned short)
-binfilter::SvStringsISort::Remove(unsigned short, unsigned short)
-binfilter::SvStringsISortDtor::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SvStringsISortDtor::Insert(String* const&)
-binfilter::SvStringsISortDtor::Insert(String* const&, unsigned short&)
-binfilter::SvStringsISortDtor::Insert(String* const*, unsigned short)
-binfilter::SvStringsISortDtor::Insert(binfilter::SvStringsISortDtor const*, unsigned short, unsigned short)
-binfilter::SvStringsISortDtor::Remove(String* const&, unsigned short)
-binfilter::SvStringsISortDtor::Remove(unsigned short, unsigned short)
-binfilter::SvStringsSort::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SvStringsSort::Insert(String* const&, unsigned short&)
-binfilter::SvStringsSort::Insert(String* const*, unsigned short)
-binfilter::SvStringsSort::Insert(binfilter::SvStringsSort const*, unsigned short, unsigned short)
-binfilter::SvStringsSort::Remove(String* const&, unsigned short)
-binfilter::SvStringsSortDtor::Insert(String* const&, unsigned short&)
-binfilter::SvStringsSortDtor::Insert(String* const*, unsigned short)
-binfilter::SvStringsSortDtor::Insert(binfilter::SvStringsSortDtor const*, unsigned short, unsigned short)
-binfilter::SvStringsSortDtor::Remove(String* const&, unsigned short)
-binfilter::SvStringsSortDtor::Remove(unsigned short, unsigned short)
-binfilter::SvULongs::Replace(unsigned long const&, unsigned short)
-binfilter::SvULongs::Replace(unsigned long const*, unsigned short, unsigned short)
-binfilter::SvULongs::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
-binfilter::SvUShorts::Replace(unsigned short const*, unsigned short, unsigned short)
-binfilter::SvUShorts::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned short const&, void*), void*)
-binfilter::SvUShortsSort::Insert(binfilter::SvUShortsSort const*, unsigned short, unsigned short)
-binfilter::SvUShortsSort::Insert(unsigned short const*, unsigned short)
-binfilter::SvUShortsSort::Insert(unsigned short, unsigned short&)
-binfilter::SvUShortsSort::Remove(unsigned short, unsigned short)
-binfilter::SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const
-binfilter::SvXMLAutoStylePoolNamesP_Impl::Remove(rtl::OUString*)
-binfilter::SvXMLAutoStylePoolParentsP_Impl::GetPos(binfilter::SvXMLAutoStylePoolParentP_Impl const*) const
-binfilter::SvXMLAutoStylePoolParentsP_Impl::Remove(binfilter::SvXMLAutoStylePoolParentP_Impl*)
-binfilter::SvXMLEmbeddedElementArr::Insert(binfilter::SvXMLEmbeddedElement* const&, unsigned short&)
-binfilter::SvXMLEmbeddedElementArr::Insert(binfilter::SvXMLEmbeddedElement* const*, unsigned short)
-binfilter::SvXMLEmbeddedElementArr::Insert(binfilter::SvXMLEmbeddedElementArr const*, unsigned short, unsigned short)
-binfilter::SvXMLEmbeddedElementArr::Remove(binfilter::SvXMLEmbeddedElement* const&, unsigned short)
-binfilter::SvXMLEmbeddedElementArr::Remove(unsigned short, unsigned short)
-binfilter::SvXMLImportContexts_Impl::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SvXMLStyleIndices_Impl::GetPos(binfilter::SvXMLStyleIndex_Impl const*) const
-binfilter::SvXMLStyleIndices_Impl::Remove(binfilter::SvXMLStyleIndex_Impl*)
-binfilter::SvXMLTokenMap_Impl::Insert(binfilter::SvXMLTokenMapEntry_Impl* const&, unsigned short&)
-binfilter::SvXMLTokenMap_Impl::Insert(binfilter::SvXMLTokenMapEntry_Impl* const*, unsigned short)
-binfilter::SvXMLTokenMap_Impl::Insert(binfilter::SvXMLTokenMap_Impl const*, unsigned short, unsigned short)
-binfilter::SvXMLTokenMap_Impl::Remove(binfilter::SvXMLTokenMapEntry_Impl* const&, unsigned short)
-binfilter::SvXMLTokenMap_Impl::Remove(unsigned short, unsigned short)
-binfilter::SvXub_StrLens::Insert(binfilter::SvXub_StrLens const*, unsigned short, unsigned short, unsigned short)
-binfilter::SvXub_StrLens::Replace(unsigned short const&, unsigned short)
-binfilter::SvXub_StrLens::Replace(unsigned short const*, unsigned short, unsigned short)
-binfilter::SvXub_StrLens::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned short const&, void*), void*)
-binfilter::SvxTabStopArr::Insert(binfilter::SvxTabStop const&, unsigned short&)
-binfilter::SvxTabStopArr::Remove(binfilter::SvxTabStop const&, unsigned short)
-binfilter::SvxTabStopArr_SAR::Replace(binfilter::SvxTabStop const&, unsigned short)
-binfilter::SvxTabStopArr_SAR::Replace(binfilter::SvxTabStop const*, unsigned short, unsigned short)
-binfilter::SvxTabStopArr_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SvxTabStop const&, void*), void*)
-binfilter::Sw3Bytes::Insert(binfilter::Sw3Bytes const*, unsigned short, unsigned short, unsigned short)
-binfilter::Sw3Bytes::Replace(unsigned char const&, unsigned short)
-binfilter::Sw3Bytes::Replace(unsigned char const*, unsigned short, unsigned short)
-binfilter::Sw3Bytes::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
-binfilter::Sw3IoImp::OutRedline(binfilter::SwRedline const&)
-binfilter::Sw3Marks::GetPos(binfilter::Sw3Mark const*) const
-binfilter::Sw3Marks::Insert(binfilter::Sw3Mark*)
-binfilter::Sw3Marks::Remove(binfilter::Sw3Mark*)
-binfilter::Sw3NumRuleInfos::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::Sw3NumRuleInfos::Insert(binfilter::Sw3NumRuleInfo* const&, unsigned short&)
-binfilter::Sw3NumRuleInfos::Insert(binfilter::Sw3NumRuleInfo* const*, unsigned short)
-binfilter::Sw3NumRuleInfos::Insert(binfilter::Sw3NumRuleInfos const*, unsigned short, unsigned short)
-binfilter::Sw3NumRuleInfos::Remove(binfilter::Sw3NumRuleInfo* const&, unsigned short)
-binfilter::Sw3SortFmts::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::Sw3SortFmts::Insert(binfilter::Sw3SortFmts const*, unsigned short, unsigned short)
-binfilter::Sw3SortFmts::Insert(binfilter::SwFmt* const&)
-binfilter::Sw3SortFmts::Insert(binfilter::SwFmt* const*, unsigned short)
-binfilter::Sw3SortFmts::Remove(binfilter::SwFmt* const&, unsigned short)
-binfilter::Sw3SortFmts::Remove(unsigned short, unsigned short)
-binfilter::Sw3StringPool::Setup(binfilter::SwDoc&, binfilter::SwFmt const&, unsigned short)
-binfilter::Sw3ULongs::Insert(binfilter::Sw3ULongs const*, unsigned short, unsigned short, unsigned short)
-binfilter::Sw3ULongs::Replace(unsigned int const&, unsigned short)
-binfilter::Sw3ULongs::Replace(unsigned int const*, unsigned short, unsigned short)
-binfilter::Sw3ULongs::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
-binfilter::SwAuthorityField::GetHandlePosition() const
-binfilter::SwBookmarks::Insert(binfilter::SwBookmark* const&, unsigned short&)
-binfilter::SwBookmarks::Insert(binfilter::SwBookmark* const*, unsigned short)
-binfilter::SwBookmarks::Insert(binfilter::SwBookmarks const*, unsigned short, unsigned short)
-binfilter::SwBookmarks::Remove(binfilter::SwBookmark* const&, unsigned short)
-binfilter::SwChartBoxes::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SwCurrShells::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SwCurrShells::Insert(binfilter::CurrShell* const&, unsigned short&)
-binfilter::SwCurrShells::Insert(binfilter::CurrShell* const*, unsigned short)
-binfilter::SwCurrShells::Insert(binfilter::SwCurrShells const*, unsigned short, unsigned short)
-binfilter::SwCurrShells::Remove(unsigned short, unsigned short)
-binfilter::SwDependentFields::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SwDestroyList::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SwDestroyList::Insert(binfilter::SwDestroyList const*, unsigned short, unsigned short)
-binfilter::SwDestroyList::Insert(binfilter::SwSectionFrm* const&, unsigned short&)
-binfilter::SwDestroyList::Insert(binfilter::SwSectionFrm* const*, unsigned short)
-binfilter::SwDestroyList::Remove(binfilter::SwSectionFrm* const&, unsigned short)
-binfilter::SwDoc::Replace(binfilter::SwPaM&, String const&, unsigned char)
-binfilter::SwGrfNode::SaveCompleted(unsigned char)
-binfilter::SwOLELRUCache::Remove(binfilter::SwOLEObj&)
-binfilter::SwOutlineNodes::Insert(binfilter::SwNode* const&, unsigned short&)
-binfilter::SwOutlineNodes::Insert(binfilter::SwNode* const*, unsigned short)
-binfilter::SwOutlineNodes::Insert(binfilter::SwOutlineNodes const*, unsigned short, unsigned short)
-binfilter::SwPageIter::GetPageDesc() const
-binfilter::SwPageIter::GetPosition(binfilter::SwPosition&) const
-binfilter::SwPageIter::NextPage()
-binfilter::SwPageIter::SwPageIter(binfilter::SwDoc const&, binfilter::SwPosition const&)
-binfilter::SwPosFlyFrm::SwPosFlyFrm(binfilter::SwNodeIndex const&, binfilter::SwFrmFmt const*, unsigned short)
-binfilter::SwPosFlyFrms::Insert(binfilter::SwPosFlyFrm* const&)
-binfilter::SwPosFlyFrms::Insert(binfilter::SwPosFlyFrm* const&, unsigned short&)
-binfilter::SwPosFlyFrms::Insert(binfilter::SwPosFlyFrm* const*, unsigned short)
-binfilter::SwPosFlyFrms::Insert(binfilter::SwPosFlyFrms const*, unsigned short, unsigned short)
-binfilter::SwPosFlyFrms::Remove(binfilter::SwPosFlyFrm* const&, unsigned short)
-binfilter::SwPosFlyFrms::Remove(unsigned short, unsigned short)
-binfilter::SwRects::Replace(binfilter::SwRect const&, unsigned short)
-binfilter::SwRects::Replace(binfilter::SwRect const*, unsigned short, unsigned short)
-binfilter::SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SwRect const&, void*), void*)
-binfilter::SwRubyList::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SwSelBoxes::Insert(binfilter::SwTableBox* const&, unsigned short&)
-binfilter::SwSelBoxes::Remove(binfilter::SwTableBox* const&, unsigned short)
-binfilter::SwSortDrawObjs::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SwSortDrawObjs::Insert(binfilter::SdrObject* const&, unsigned short&)
-binfilter::SwSortDrawObjs::Insert(binfilter::SdrObject* const*, unsigned short)
-binfilter::SwSortDrawObjs::Insert(binfilter::SwSortDrawObjs const*, unsigned short, unsigned short)
-binfilter::SwSortDrawObjs::Remove(unsigned short, unsigned short)
-binfilter::SwStyleSheetPool::Add(binfilter::SwFmt const&, SfxStyleFamily)
-binfilter::SwTOXSources::Insert(binfilter::SwTOXSources const*, unsigned short, unsigned short, unsigned short)
-binfilter::SwTOXSources::Remove(unsigned short, unsigned short)
-binfilter::SwTOXSources::Replace(binfilter::SwTOXSource const&, unsigned short)
-binfilter::SwTOXSources::Replace(binfilter::SwTOXSource const*, unsigned short, unsigned short)
-binfilter::SwTOXSources::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SwTOXSource const&, void*), void*)
-binfilter::SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SwTableSortBoxes::Insert(binfilter::SwTableBox* const&, unsigned short&)
-binfilter::SwTableSortBoxes::Insert(binfilter::SwTableBox* const*, unsigned short)
-binfilter::SwTableSortBoxes::Insert(binfilter::SwTableSortBoxes const*, unsigned short, unsigned short)
-binfilter::SwTblBoxFormula::GetTableBox()
-binfilter::SwViewImp::Init(binfilter::SwViewOption const*)
-binfilter::SwXBookmarkPortionArr::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortionArr const*, unsigned short, unsigned short)
-binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortion_Impl* const&, unsigned short&)
-binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortion_Impl* const*, unsigned short)
-binfilter::SwXBookmarkPortionArr::Remove(binfilter::SwXBookmarkPortion_Impl* const&, unsigned short)
-binfilter::SwXMLSectionList::SwXMLSectionList(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>, binfilter::SvStrings&)
-binfilter::SwXMLTableColumnsSortByWidth_Impl::GetPos(binfilter::SwXMLTableColumn_Impl const*) const
-binfilter::SwXMLTableColumnsSortByWidth_Impl::Remove(binfilter::SwXMLTableColumn_Impl*)
-binfilter::SwXMLTableColumns_Impl::Insert(binfilter::SwXMLTableColumn_Impl* const&, unsigned short&)
-binfilter::SwXMLTableColumns_Impl::Insert(binfilter::SwXMLTableColumn_Impl* const*, unsigned short)
-binfilter::SwXMLTableColumns_Impl::Insert(binfilter::SwXMLTableColumns_Impl const*, unsigned short, unsigned short)
-binfilter::SwXMLTableColumns_Impl::Remove(binfilter::SwXMLTableColumn_Impl* const&, unsigned short)
-binfilter::SwXMLTableColumns_Impl::Remove(unsigned short, unsigned short)
-binfilter::SwXRedlinePortionArr::DeleteAndDestroy(unsigned short, unsigned short)
-binfilter::SwXRedlinePortionArr::Insert(binfilter::SwXRedlinePortionArr const*, unsigned short, unsigned short)
-binfilter::SwXRedlinePortionArr::Insert(binfilter::SwXRedlinePortion_Impl* const&, unsigned short&)
-binfilter::SwXRedlinePortionArr::Insert(binfilter::SwXRedlinePortion_Impl* const*, unsigned short)
-binfilter::SwXRedlinePortionArr::Remove(binfilter::SwXRedlinePortion_Impl* const&, unsigned short)
-binfilter::SwpHtEnd::Insert(binfilter::SwTxtAttr const*&, unsigned short&)
-binfilter::SwpHtEnd::Insert(binfilter::SwTxtAttr const**, unsigned short)
-binfilter::SwpHtEnd::Insert(binfilter::SwpHtEnd const*, unsigned short, unsigned short)
-binfilter::SwpHtEnd::Remove(binfilter::SwTxtAttr const*&, unsigned short)
-binfilter::SwpHtStart::Insert(binfilter::SwTxtAttr const*&, unsigned short&)
-binfilter::SwpHtStart::Insert(binfilter::SwTxtAttr const**, unsigned short)
-binfilter::SwpHtStart::Insert(binfilter::SwpHtStart const*, unsigned short, unsigned short)
-binfilter::SwpHtStart::Remove(binfilter::SwTxtAttr const*&, unsigned short)
-binfilter::ViewShell::Init(binfilter::SwViewOption const*)
-binfilter::W4WStyleIdTab::Insert(binfilter::W4WStyleIdTab const*, unsigned short, unsigned short)
-binfilter::W4WStyleIdTab::Insert(binfilter::W4WStyleIdTabEntry* const&, unsigned short&)
-binfilter::W4WStyleIdTab::Insert(binfilter::W4WStyleIdTabEntry* const*, unsigned short)
-binfilter::W4WStyleIdTab::Remove(binfilter::W4WStyleIdTabEntry* const&, unsigned short)
-binfilter::W4WStyleIdTab::Remove(unsigned short, unsigned short)
-binfilter::WritingDirectionInfos::Insert(binfilter::WritingDirectionInfos const*, unsigned short, unsigned short, unsigned short)
-binfilter::WritingDirectionInfos::Replace(binfilter::WritingDirectionInfo const&, unsigned short)
-binfilter::WritingDirectionInfos::Replace(binfilter::WritingDirectionInfo const*, unsigned short, unsigned short)
-binfilter::WritingDirectionInfos::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::WritingDirectionInfo const&, void*), void*)
-binfilter::XBitmapList::Remove(long)
-binfilter::XBitmapList::Replace(binfilter::XBitmapEntry*, long)
-binfilter::XBitmapTable::Remove(long)
-binfilter::XBitmapTable::Replace(long, binfilter::XBitmapEntry*)
-binfilter::XColorTable::Remove(long)
-binfilter::XDashList::Remove(long)
-binfilter::XDashList::Replace(binfilter::XDashEntry*, long)
-binfilter::XDashTable::Remove(long)
-binfilter::XDashTable::Replace(long, binfilter::XDashEntry*)
-binfilter::XGradientList::Remove(long)
-binfilter::XGradientList::Replace(binfilter::XGradientEntry*, long)
-binfilter::XGradientTable::Remove(long)
-binfilter::XGradientTable::Replace(long, binfilter::XGradientEntry*)
-binfilter::XHatchList::Remove(long)
-binfilter::XHatchList::Replace(binfilter::XHatchEntry*, long)
-binfilter::XHatchTable::Remove(long)
-binfilter::XHatchTable::Replace(long, binfilter::XHatchEntry*)
-binfilter::XLineEndList::Remove(long)
-binfilter::XLineEndList::Replace(binfilter::XLineEndEntry*, long)
-binfilter::XLineEndTable::Remove(long)
-binfilter::XLineEndTable::Replace(long, binfilter::XLineEndEntry*)
-binfilter::XMLFamilyDataList_Impl::GetPos(binfilter::XMLFamilyData_Impl const*) const
-binfilter::XMLFamilyDataList_Impl::Remove(binfilter::XMLFamilyData_Impl*)
-binfilter::XMLFontAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
-binfilter::XMLFontAutoStylePoolNames_Impl::Remove(rtl::OUString*)
-binfilter::XMLFontAutoStylePool_Impl::GetPos(binfilter::XMLFontAutoStylePoolEntry_Impl const*) const
-binfilter::XMLFontAutoStylePool_Impl::Remove(binfilter::XMLFontAutoStylePoolEntry_Impl*)
-binfilter::XMLTextListAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
-binfilter::XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*)
-binfilter::XMLTextListAutoStylePool_Impl::GetPos(binfilter::XMLTextListAutoStylePoolEntry_Impl const*) const
-binfilter::XMLTextListAutoStylePool_Impl::Remove(binfilter::XMLTextListAutoStylePoolEntry_Impl*)
-binfilter::XTextAttrSetItem::XTextAttrSetItem(binfilter::SfxItemPool*)
-binfilter::_MapTblFrmFmts::Insert(binfilter::_MapTblFrmFmts const*, unsigned short, unsigned short, unsigned short)
-binfilter::_MapTblFrmFmts::Remove(unsigned short, unsigned short)
-binfilter::_MapTblFrmFmts::Replace(binfilter::_MapTblFrmFmt const&, unsigned short)
-binfilter::_MapTblFrmFmts::Replace(binfilter::_MapTblFrmFmt const*, unsigned short, unsigned short)
-binfilter::_SetGetExpFlds::Insert(binfilter::_SetGetExpFld* const&, unsigned short&)
-binfilter::_SetGetExpFlds::Insert(binfilter::_SetGetExpFld* const*, unsigned short)
-binfilter::_SetGetExpFlds::Insert(binfilter::_SetGetExpFlds const*, unsigned short, unsigned short)
-binfilter::_SetGetExpFlds::Remove(binfilter::_SetGetExpFld* const&, unsigned short)
-binfilter::_SetGetExpFlds::Remove(unsigned short, unsigned short)
-binfilter::_Sort_CellFrms::Insert(binfilter::_Sort_CellFrms const*, unsigned short, unsigned short, unsigned short)
-binfilter::_Sort_CellFrms::Remove(unsigned short, unsigned short)
-binfilter::_Sort_CellFrms::Replace(binfilter::_Sort_CellFrm const&, unsigned short)
-binfilter::_Sort_CellFrms::Replace(binfilter::_Sort_CellFrm const*, unsigned short, unsigned short)
-binfilter::_Sort_CellFrms::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::_Sort_CellFrm const&, void*), void*)
-binfilter::_SwFtnIdxs::Insert(binfilter::SwTxtFtn* const&, unsigned short&)
-binfilter::_SwFtnIdxs::Insert(binfilter::SwTxtFtn* const*, unsigned short)
-binfilter::_SwFtnIdxs::Insert(binfilter::_SwFtnIdxs const*, unsigned short, unsigned short)
-binfilter::_SwFtnIdxs::Remove(binfilter::SwTxtFtn* const&, unsigned short)
-binfilter::_SwPamRanges::Insert(binfilter::SwPamRange const&)
-binfilter::_SwPamRanges::Insert(binfilter::SwPamRange const&, unsigned short&)
-binfilter::_SwPamRanges::Insert(binfilter::SwPamRange const*, unsigned short)
-binfilter::_SwPamRanges::Insert(binfilter::_SwPamRanges const*, unsigned short, unsigned short)
-binfilter::_SwPamRanges::Remove(binfilter::SwPamRange const&, unsigned short)
-binfilter::_SwPamRanges::Remove(unsigned short, unsigned short)
-binfilter::_SwPamRanges_SAR::Replace(binfilter::SwPamRange const&, unsigned short)
-binfilter::_SwPamRanges_SAR::Replace(binfilter::SwPamRange const*, unsigned short, unsigned short)
-binfilter::_SwPamRanges_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SwPamRange const&, void*), void*)
-binfilter::_SwRedlineTbl::Insert(binfilter::SwRedline* const*, unsigned short)
-binfilter::_SwRedlineTbl::Insert(binfilter::_SwRedlineTbl const*, unsigned short, unsigned short)
-binfilter::_SwRedlineTbl::Remove(binfilter::SwRedline* const&, unsigned short)
-binfilter::_ZSortFlys::Insert(binfilter::_ZSortFly const&, unsigned short&)
-binfilter::_ZSortFlys::Insert(binfilter::_ZSortFly const*, unsigned short)
-binfilter::_ZSortFlys::Insert(binfilter::_ZSortFlys const*, unsigned short, unsigned short)
-binfilter::_ZSortFlys::Remove(binfilter::_ZSortFly const&, unsigned short)
-binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const&, unsigned short)
-binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const*, unsigned short, unsigned short)
-binfilter::_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::_ZSortFly const&, void*), void*)
-binfilter::bf_OfficeWrapper::impl_createInstance(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-binfilter::frm::OErrorBroadcaster::onError(com::sun::star::sdbc::SQLException const&, rtl::OUString const&)
-cairocanvas::CanvasHelper::flush() const
-cairocanvas::CanvasHelper::getPalette()
-cairocanvas::SpriteDeviceHelper::getSurface()
-cairocanvas::TextLayout::draw(_cairo*)
-canvas::ParametricPolyPolygon::ParametricPolyPolygon(com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&, basegfx::B2DPolygon const&, canvas::ParametricPolyPolygon::GradientType, com::sun::star::uno::Sequence<com::sun::star::uno::Sequence<double> > const&, com::sun::star::uno::Sequence<double> const&)
-canvas::PropertySetHelper::PropertySetHelper(std::vector<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry, std::allocator<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry> > const&)
-canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
-canvas::tools::ElapsedTime::getTimeBase() const
-canvas::tools::PriorityBooster::PriorityBooster(int)
-canvas::tools::PriorityBooster::~PriorityBooster()
-canvas::tools::appendToViewState(com::sun::star::rendering::ViewState&, basegfx::B2DHomMatrix const&)
-canvas::tools::calcRectToRectTransform(basegfx::B2DHomMatrix&, basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DHomMatrix const&)
-canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRange const&, basegfx::B2IRange const&)
-canvas::tools::mergeViewAndRenderState(com::sun::star::rendering::ViewState&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> const&)
-canvas::tools::prependToViewState(com::sun::star::rendering::ViewState&, basegfx::B2DHomMatrix const&)
-canvas::tools::verifyInput(com::sun::star::geometry::RealSize2D const&, char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, short)
-canvas::tools::verifyInput(com::sun::star::rendering::FloatingPointBitmapLayout const&, char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, short)
-chart::DateHelper::GetMonthsBetweenDates(Date, Date)
-chart::EquidistantTickIter::getCurrentIndex() const
-chart::EquidistantTickIter::getMaxIndex() const
-chart::EquidistantTickIter::gotoIndex(int)
-chart::UndoContext::UndoContext(com::sun::star::uno::Reference<com::sun::star::document::XUndoManager> const&, rtl::OUString const&)
-chart::UndoContext::~UndoContext()
-chelp::Databases::getInstallPathAsSystemPath()
-codemaker::cpp::typeToPrefix(TypeManager const&, rtl::OString const&)
-comphelper::AccessibleEventBuffer::AccessibleEventBuffer()
-comphelper::AccessibleEventBuffer::sendEvents() const
-comphelper::AccessibleEventBuffer::~AccessibleEventBuffer()
-comphelper::AttributeList::RemoveAttribute(rtl::OUString)
-comphelper::AttributeList::SetAttributeList(com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&)
-comphelper::ChainablePropertySet::lockMutex()
-comphelper::ChainablePropertySet::unlockMutex()
-comphelper::ChainablePropertySetInfo::ChainablePropertySetInfo()
-comphelper::DocPasswordHelper::GetWordHashAsSequence(rtl::OUString const&)
-comphelper::DocPasswordRequest::isAbort() const
-comphelper::EmbeddedObjectContainer::CopyEmbeddedObject(comphelper::EmbeddedObjectContainer&, com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&, rtl::OUString&)
-comphelper::EventLogger::addLogHandler(com::sun::star::uno::Reference<com::sun::star::logging::XLogHandler> const&)
-comphelper::EventLogger::getLogLevel() const
-comphelper::EventLogger::getName() const
-comphelper::EventLogger::removeLogHandler(com::sun::star::uno::Reference<com::sun::star::logging::XLogHandler> const&)
-comphelper::EventLogger::setLogLevel(int) const
-comphelper::FastPropertySetInfo::FastPropertySetInfo()
-comphelper::FastPropertySetInfo::addProperty(com::sun::star::beans::Property const&)
-comphelper::MasterPropertySet::lockMutex()
-comphelper::MasterPropertySet::unlockMutex()
-comphelper::MasterPropertySetInfo::MasterPropertySetInfo()
-comphelper::MasterPropertySetInfo::remove(rtl::OUString const&)
-comphelper::MediaDescriptor::MediaDescriptor(com::sun::star::uno::Any const&)
-comphelper::MediaDescriptor::MediaDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::NamedValue> const&)
-comphelper::MediaDescriptor::PROP_CHARACTERSET()
-comphelper::MediaDescriptor::PROP_DEEPDETECTION()
-comphelper::MediaDescriptor::PROP_DETECTSERVICE()
-comphelper::MediaDescriptor::PROP_EXTENSION()
-comphelper::MediaDescriptor::PROP_FORMAT()
-comphelper::MediaDescriptor::PROP_PATTERN()
-comphelper::MediaDescriptor::PROP_POSSIZE()
-comphelper::MediaDescriptor::PROP_POSTSTRING()
-comphelper::MediaDescriptor::PROP_REPAIRPACKAGE()
-comphelper::MediaDescriptor::PROP_SILENT()
-comphelper::MediaDescriptor::PROP_TEMPLATEREGIONNAME()
-comphelper::MediaDescriptor::PROP_VIEWCONTROLLERNAME()
-comphelper::MediaDescriptor::PROP_VIEWID()
-comphelper::MimeConfigurationHelper::AddFilterNameCheckOwnFile(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
-comphelper::MimeConfigurationHelper::GetSequenceClassIDFromObjectName(rtl::OUString const&)
-comphelper::OAccessibleImplementationAccess::setForeignControlledState(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleContext> const&, short, unsigned char)
-comphelper::OAccessibleSelectionHelper::OAccessibleSelectionHelper()
-comphelper::OAccessibleTextHelper::OAccessibleTextHelper()
-comphelper::OComposedPropertySet::OComposedPropertySet(com::sun::star::uno::Sequence<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> > const&, comphelper::IPropertySetComposerCallback const*)
-comphelper::OContainerListenerAdapter::lock()
-comphelper::OContainerListenerAdapter::unlock()
-comphelper::OInteractionRequest::clearContinuations()
-comphelper::OModuleImpl::~OModuleImpl()
-comphelper::OPropertyContainerHelper::modifyAttributes(int, int, int)
-comphelper::OSelectionChangeListener::disposeAdapter()
-comphelper::OStreamSection::available()
-comphelper::OTruncatedTransactedFileStream::OTruncatedTransactedFileStream(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-comphelper::OTruncatedTransactedFileStream::OTruncatedTransactedFileStream(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::ucb::XSimpleFileAccess> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-comphelper::OTruncatedTransactedFileStream::OTruncatedTransactedFileStream(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::ucb::XSimpleFileAccess> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, unsigned char)
-comphelper::OfficeResourceBundle::OfficeResourceBundle(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&)
-comphelper::PropertySetHelper::PropertySetHelper()
-comphelper::PropertySetHelper::setInfo(comphelper::PropertySetInfo*)
-comphelper::ResourceBasedEventLogger::ResourceBasedEventLogger(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&, rtl::OUString const&)
-comphelper::SequenceAsHashMap::getAsConstAnyList(unsigned char) const
-comphelper::ServiceInfoHelper::concatSequences(com::sun::star::uno::Sequence<rtl::OUString> const&, com::sun::star::uno::Sequence<rtl::OUString> const&)
-comphelper::SimplePasswordRequest::isAbort() const
-comphelper::createEventAttacherManager(com::sun::star::uno::Reference<com::sun::star::beans::XIntrospection> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-comphelper::findProperty(com::sun::star::beans::Property&, com::sun::star::uno::Sequence<com::sun::star::beans::Property>&, rtl::OUString const&)
-comphelper::getPathToSystemRegistry()
-comphelper::getPathToUserRegistry()
-comphelper::string::searchAndReplaceAllAsciiWithAscii(rtl::OUString const&, char const*, char const*, int)
-comphelper::string::searchAndReplaceAsciiL(rtl::OUString const&, char const*, int, rtl::OUString const&, int, int*)
-connectivity::OKeyValue::OKeyValue()
-connectivity::OParseContext::setDefaultLocale(com::sun::star::lang::Locale const&)
-connectivity::ORowSetValue::setFromDouble(double const&, int)
-connectivity::OSQLInternalNode::OSQLInternalNode(unsigned short const*, connectivity::SQLNodeType, unsigned int)
-connectivity::OSQLParseNode::remove(connectivity::OSQLParseNode*)
-connectivity::OSQLParseNode::replaceAt(unsigned int, connectivity::OSQLParseNode*)
-connectivity::OSQLParseNodesContainer::empty() const
-connectivity::OSQLScanner::GetCurrentRule() const
-connectivity::OSortIndex::GetValue(int) const
-connectivity::SQLError::getSQLState(int) const
-connectivity::evoab::OCommonStatement::reset()
-connectivity::evoab::getFieldCount()
-connectivity::file::OSQLAnalyzer::clean()
-connectivity::file::OSQLAnalyzer::describeParam(rtl::Reference<connectivity::ORefVector<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> > >)
-connectivity::file::OStatement_Base::reset()
-connectivity::file::OStatement_Base::setWarning(com::sun::star::sdbc::SQLWarning const&)
-connectivity::mozab::MQuery::getAddressbook() const
-connectivity::mozab::MQuery::getMaxNrOfReturns() const
-connectivity::mozab::MQuery::getQuerySubDirs() const
-connectivity::mozab::MQuery::setQuerySubDirs(unsigned char&)
-connectivity::mozab::MQueryHelper::atEnd() const
-connectivity::mozab::MQueryHelper::hasMore() const
-connectivity::mozab::MQueryHelper::next()
-connectivity::mozab::MQueryHelper::rewind()
-connectivity::mozab::MTypeConverter::asciiOUStringToNsACString(rtl::OUString const&, nsACString_internal&)
-connectivity::mozab::MTypeConverter::nsACStringToOUString(nsACString_internal const&)
-connectivity::mozab::MTypeConverter::nsStringToCCharStringAscii(nsString const&)
-connectivity::mozab::MTypeConverter::ouStringToCCharStringUtf8(rtl::OUString const&)
-connectivity::mozab::MTypeConverter::ouStringToStlString(rtl::OUString const&)
-connectivity::mozab::OCatalog::getDot()
-connectivity::mozab::OPreparedStatement::checkParameterIndex(int)
-connectivity::mozab::OResultSet::initializeRow(rtl::Reference<connectivity::ODeleteVector<connectivity::ORowSetValue> >&, int)
-connectivity::mozab::OTable::OTable(connectivity::sdbcx::OCollection*, connectivity::mozab::OConnection*)
-connectivity::odbc::ODatabaseMetaDataResultSet::openTablesTypes()
-connectivity::odbc::OPreparedStatement::getDataBuf(int)
-connectivity::odbc::OPreparedStatement::getParamLength(int)
-connectivity::odbc::OPreparedStatement::getPrecision(int)
-connectivity::toString(com::sun::star::uno::Any const&)
-cppcanvas::BaseGfxFactory::createPolyPolygon(boost::shared_ptr<cppcanvas::Canvas> const&, basegfx::B2DPolyPolygon const&) const
-cppcanvas::BaseGfxFactory::createText(boost::shared_ptr<cppcanvas::Canvas> const&, rtl::OUString const&) const
-cppcanvas::BaseGfxFactory::~BaseGfxFactory()
-cppcanvas::VCLFactory::createAlphaBitmap(boost::shared_ptr<cppcanvas::Canvas> const&, Size const&) const
-cppcanvas::VCLFactory::createAnimatedSprite(boost::shared_ptr<cppcanvas::SpriteCanvas> const&, Animation const&) const
-cppcanvas::VCLFactory::createBitmap(boost::shared_ptr<cppcanvas::Canvas> const&, Bitmap const&) const
-cppcanvas::VCLFactory::createBitmap(boost::shared_ptr<cppcanvas::Canvas> const&, Size const&) const
-cppcanvas::VCLFactory::createCanvas(Window const&)
-cppcanvas::VCLFactory::createFullscreenSpriteCanvas(Window const&, Size const&) const
-cppcanvas::VCLFactory::createPolyPolygon(boost::shared_ptr<cppcanvas::Canvas> const&, PolyPolygon const&) const
-cppcanvas::VCLFactory::createPolyPolygon(boost::shared_ptr<cppcanvas::Canvas> const&, Polygon const&) const
-cppcanvas::VCLFactory::createRenderer(boost::shared_ptr<cppcanvas::Canvas> const&, Graphic const&, cppcanvas::Renderer::Parameters const&) const
-cppcanvas::VCLFactory::createText(boost::shared_ptr<cppcanvas::Canvas> const&, rtl::OUString const&) const
-cppcanvas::VCLFactory::~VCLFactory()
-cppcanvas::internal::EMFPBrush::~EMFPBrush()
-cppcanvas::internal::ImplRenderer::Map(basegfx::B2DPoint&)
-cppcanvas::internal::ImplRenderer::MapRectangle(double, double, double, double)
-cppcanvas::internal::ImplSprite::getGraphicDevice() const
-cppcanvas::internal::TransparencyGroupActionFactory::createTransparencyGroupAction(std::auto_ptr<GDIMetaFile>&, cppcanvas::Renderer::Parameters const&, basegfx::B2DPoint const&, basegfx::B2DVector const&, double, boost::shared_ptr<cppcanvas::Canvas> const&, cppcanvas::internal::OutDevState const&)
-cppcanvas::tools::modifyClip(com::sun::star::rendering::RenderState&, cppcanvas::internal::OutDevState const&, boost::shared_ptr<cppcanvas::Canvas> const&, Point const&, basegfx::B2DVector const*, double const*)
-cppcanvas::tools::modifyClip(com::sun::star::rendering::RenderState&, cppcanvas::internal::OutDevState const&, boost::shared_ptr<cppcanvas::Canvas> const&, basegfx::B2DHomMatrix const&)
-cppu::AccessControl::AccessControl(com::sun::star::uno::Reference<com::sun::star::security::XAccessController> const&)
-cppu::AccessControl::checkRuntimePermission(rtl::OUString const&)
-cppu::AccessControl::checkSocketPermission(rtl::OUString const&, rtl::OUString const&)
-cppu::BootstrapException::BootstrapException()
-cppu::BootstrapException::getMessage() const
-cppu::ClassDataBase::ClassDataBase()
-cppu::OMultiTypeInterfaceContainerHelper::clear()
-cppu::OMultiTypeInterfaceContainerHelperInt32::clear()
-cppu::OMultiTypeInterfaceContainerHelperInt32::getContainedTypes() const
-cppu::OPropertySetHelper::OPropertySetHelper(cppu::OBroadcastHelperVar<cppu::OMultiTypeInterfaceContainerHelper, com::sun::star::uno::Type>&, bool)
-cppu::createFactoryProxy(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::lang::XSingleServiceFactory> const&)
-cppu::createOneInstanceRegistryFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&)
-dbaccess::ORowSetNotifier::getChangedBookmarks() const
-dbaccess::OptimisticSet::getComposedTableName(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
-dbaui::LoadFormHelper::LoadFormHelper(com::sun::star::uno::Reference<com::sun::star::sdbc::XRowSet> const&)
-dbaui::LoadFormHelper::cancel()
-dbaui::OApplicationController::LinkStubOnInvalidateClipboard(void*, void*)
-dbaui::OFieldDescControl::LinkStubDelayedGrabFocus(void*, void*)
-dbaui::OTableDesignView::LinkStubSwitchHdl(void*, void*)
-dbaui::OTableEditorCtrl::LinkStubEntryNotFound(void*, void*)
-dbaui::getKeyColumns(com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, int)
-dbtools::CharsetIteratorDerefHelper::CharsetIteratorDerefHelper()
-dbtools::DBTypeConversion::toINT64(com::sun::star::util::DateTime const&)
-dbtools::SQLExceptionInfo::SQLExceptionInfo(com::sun::star::sdb::SQLErrorEvent const&)
-dbtools::SQLExceptionIteratorHelper::SQLExceptionIteratorHelper(com::sun::star::sdb::SQLContext const&)
-dbtools::SQLExceptionIteratorHelper::SQLExceptionIteratorHelper(com::sun::star::sdbc::SQLWarning const&)
-dbtools::StatementComposer::getDisposeComposer() const
-dbtools::getComposedRowSetStatement(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, unsigned char, unsigned char)
-dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-dbtools::throwFunctionNotSupportedException(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, com::sun::star::uno::Any const&)
-desktop::CommandLineArgs::IsEmptyOrAcceptOnly() const
-desktop::Lockfile::clean()
-dlgprov::DialogProviderImpl::createControlModel()
-dp_info::singleton_entries(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&)
-dp_manager::factory::singleton_entries(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&)
-drawinglayer::attribute::FillBitmapAttribute::FillBitmapAttribute()
-drawinglayer::attribute::Sdr3DLightAttribute::Sdr3DLightAttribute()
-drawinglayer::attribute::Sdr3DObjectAttribute::Sdr3DObjectAttribute()
-drawinglayer::attribute::SdrFillBitmapAttribute::getLogSize() const
-drawinglayer::attribute::SdrFillTextAttribute::isDefault() const
-drawinglayer::attribute::SdrFormTextAttribute::getFormTextShdwTransp() const
-drawinglayer::attribute::SdrLightingAttribute::getAmbientLight() const
-drawinglayer::attribute::SdrLineAttribute::isDashed() const
-drawinglayer::attribute::SdrLineFillShadowAttribute3D::isDefault() const
-drawinglayer::attribute::SdrSceneAttribute::getDistance() const
-drawinglayer::attribute::SdrTextAttribute::getPropertiesVersion() const
-drawinglayer::attribute::SdrTextAttribute::isWrongSpell() const
-drawinglayer::primitive2d::GraphicPrimitive2D::GraphicPrimitive2D(basegfx::B2DHomMatrix const&, GraphicObject const&)
-drawinglayer::primitive2d::PolyPolygonStrokeArrowPrimitive2D::PolyPolygonStrokeArrowPrimitive2D(basegfx::B2DPolyPolygon const&, drawinglayer::attribute::LineAttribute const&, drawinglayer::attribute::LineStartEndAttribute const&, drawinglayer::attribute::LineStartEndAttribute const&)
-drawinglayer::primitive2d::PolyPolygonStrokeArrowPrimitive2D::PolyPolygonStrokeArrowPrimitive2D(basegfx::B2DPolyPolygon const&, drawinglayer::attribute::LineAttribute const&, drawinglayer::attribute::StrokeAttribute const&, drawinglayer::attribute::LineStartEndAttribute const&, drawinglayer::attribute::LineStartEndAttribute const&)
-drawinglayer::primitive2d::PolygonStrokeArrowPrimitive2D::PolygonStrokeArrowPrimitive2D(basegfx::B2DPolygon const&, drawinglayer::attribute::LineAttribute const&, drawinglayer::attribute::LineStartEndAttribute const&, drawinglayer::attribute::LineStartEndAttribute const&)
-drawinglayer::primitive2d::RenderGraphicPrimitive2D::setCurrentRasterizer() const
-drawinglayer::primitive2d::RenderGraphicPrimitive2D::setCurrentRasterizer(vcl::RenderGraphicRasterizer const&) const
-drawinglayer::primitive3d::PolygonStrokePrimitive3D::PolygonStrokePrimitive3D(basegfx::B3DPolygon const&, drawinglayer::attribute::LineAttribute const&)
-drawinglayer::processor3d::CollectingProcessor3D::CollectingProcessor3D(drawinglayer::geometry::ViewInformation3D const&)
-formula::ArgInput::GetArgSelection()
-formula::ArgInput::ReplaceSelOfArg(String const&)
-formula::EditBox::EditBox(Window*, long)
-formula::FormEditData::RestoreValues()
-formula::FormulaDlg::FindFocusWin(Window*)
-formula::FormulaDlg::HighlightFunctionParas(String const&)
-formula::FormulaDlg_Impl::EditFuncParas(unsigned short)
-formula::FormulaDlg_Impl::UpdateFunctionDesc()
-formula::FormulaListBox::FormulaListBox(Window*, long)
-formula::FormulaModalDialog::CheckMatrix()
-formula::FormulaModalDialog::DoEnter(unsigned char)
-formula::FormulaModalDialog::FindFocusWin(Window*)
-formula::FormulaModalDialog::GetActiveEdit()
-formula::FormulaModalDialog::GetFormulaHelper() const
-formula::FormulaModalDialog::GetMeText() const
-formula::FormulaModalDialog::HighlightFunctionParas(String const&)
-formula::FormulaModalDialog::SetEdSelection()
-formula::FormulaModalDialog::SetMeText(String const&, unsigned short, unsigned short, unsigned char, unsigned char, unsigned char)
-formula::FormulaModalDialog::UpdateParaWin(Selection const&, String const&)
-formula::FormulaModalDialog::UpdateParaWin(Selection&)
-formula::FormulaModalDialog::disableOk()
-formula::FormulaModalDialog::getCurrentFunctionDescription() const
-formula::FormulaModalDialog::isUserMatrix() const
-formula::FormulaSubroutineToken::GetTokenArray() const
-formula::FormulaToken::IsMatrixFunction() const
-formula::FormulaTokenArray::AddName(unsigned short)
-formula::FormulaTokenArray::GetNextDBArea()
-formula::FormulaTokenIterator::First()
-formula::RefEdit::SilentGrabFocus()
-formula::ResourceManager::loadString(unsigned short, char const*, rtl::OUString const&)
-formula::StructPage::GetSelectedEntryText()
-formula::StructPage::GetSelectedToken()
-framework::AddonMenuManager::HasAddonHelpMenuElements()
-framework::AddonsToolBarManager::LinkStubHighlight(void*, void*)
-framework::BmkMenu::BmkMenu(com::sun::star::uno::Reference<com::sun::star::frame::XFrame>&, framework::BmkMenu::BmkMenuType, framework::BmkMenu*)
-framework::ConstItemContainer::ConstItemContainer(framework::RootItemContainer const&, unsigned char)
-framework::FwkTabWindow::LinkStubCloseHdl(void*, void*)
-framework::HandlerCache::exists(rtl::OUString const&) const
-framework::ImagesConfiguration::LoadImages(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, SvStream&, framework::ImageListsDescriptor&)
-framework::ImagesConfiguration::StoreImages(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, SvStream&, framework::ImageListsDescriptor const&)
-framework::ItemContainer::getSomething(com::sun::star::uno::Sequence<signed char> const&)
-framework::MenuConfiguration::IsPickListItemId(unsigned short)
-framework::MenuConfiguration::IsWindowListItemId(unsigned short)
-framework::MenuDispatcher::LinkStubClose_Impl(void*, void*)
-framework::OReadMenuBarHandler::getServiceFactory()
-framework::Panel::Panel(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&, framework::PanelPosition)
-framework::PanelWindow::PanelWindow(Window*, long)
-framework::RootActionTriggerContainer::GetMenu()
-framework::RootActionTriggerContainer::GetUnoTunnelId() const
-framework::RootItemContainer::RootItemContainer(framework::ConstItemContainer const&)
-framework::SetMenuExtensionSupplier(MenuExtensionItem (*)())
-framework::ShareableMutex::getShareableOslMutex()
-framework::StatusBarDescriptor::DeleteAndDestroy(unsigned short, unsigned short)
-framework::TabWindow::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-framework::TitleHelper::impl_getSubTitle()
-framework::ToolBarManager::LinkStubHighlight(void*, void*)
-framework::ToolbarLayoutManager::implts_writeNewWindowStateData(rtl::OUString, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&)
-framework::UIConfigElementWrapperBase::dispose()
-framework::UIElementWrapperBase::dispose()
-gcc3::RTTI::~RTTI()
-graphite2::Segment::append(graphite2::Segment const&)
-graphite2::Slot::update(int, int, graphite2::Position&)
-graphite2::TtfUtil::FontAscent(void const*)
-graphite2::TtfUtil::FontDescent(void const*)
-graphite2::TtfUtil::FontOs2Style(void const*, bool&, bool&)
-graphite2::TtfUtil::Get30EngFamilyInfo(void const*, unsigned long&, unsigned long&)
-graphite2::TtfUtil::Get30EngFullFontInfo(void const*, unsigned long&, unsigned long&)
-graphite2::TtfUtil::Get31EngFamilyInfo(void const*, unsigned long&, unsigned long&)
-graphite2::TtfUtil::Get31EngFullFontInfo(void const*, unsigned long&, unsigned long&)
-graphite2::TtfUtil::GetLangsForNames(void const*, int, int, int*, int, short*)
-graphite2::TtfUtil::GlyfBox(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, int&, int&, int&, int&)
-graphite2::TtfUtil::GlyfContourCount(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, unsigned long&)
-graphite2::TtfUtil::GlyfContourEndPoints(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, int*, unsigned long)
-graphite2::TtfUtil::GlyfPoints(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, int const*, unsigned long, int*, int*, bool*, unsigned long)
-graphite2::TtfUtil::HeadTableCheckSum(void const*)
-graphite2::TtfUtil::HeadTableCreateTime(void const*, unsigned int*, unsigned int*)
-graphite2::TtfUtil::HeadTableModifyTime(void const*, unsigned int*, unsigned int*)
-graphite2::TtfUtil::IsDeepComposite(unsigned short, void const*, void const*, unsigned long, long, void const*)
-graphite2::TtfUtil::IsItalic(void const*)
-graphite2::TtfUtil::LocaGlyphCount(unsigned long, void const*)
-graphite2::TtfUtil::MaxCompositeComponentCount(void const*)
-graphite2::TtfUtil::MaxCompositeLevelCount(void const*)
-graphite2::TtfUtil::PostLookup(void const*, unsigned long, void const*, char const*)
-graphite2::TtfUtil::SwapWString(void*, unsigned long)
-graphite2::TtfUtil::TableIdTag(graphite2::TtfUtil::TableId)
-jfw_plugin::VendorBase::createInstance()
-jfw_plugin::VendorBase::getJavaExePaths(int*)
-jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&)
-layout::AdvancedButton::AddAdvanced(layout::Window*)
-layout::AdvancedButton::AddSimple(layout::Window*)
-layout::AdvancedButton::AdvancedButton(layout::Context*, char const*, unsigned int)
-layout::AdvancedButton::AdvancedButton(layout::Window*, ResId const&)
-layout::AdvancedButton::AdvancedButton(layout::Window*, long)
-layout::AdvancedButton::RemoveAdvanced(layout::Window*)
-layout::AdvancedButton::RemoveSimple(layout::Window*)
-layout::AdvancedButton::SetDelta(int)
-layout::ApplyButton::ApplyButton(layout::Context*, char const*, unsigned int)
-layout::ApplyButton::ApplyButton(layout::Window*, ResId const&)
-layout::ApplyButton::ApplyButton(layout::Window*, long)
-layout::Box::Add(layout::Container*, bool, bool, int)
-layout::Box::Add(layout::Window*, bool, bool, int)
-layout::Button::Button(layout::Context*, char const*, unsigned int)
-layout::Button::Button(layout::Window*, ResId const&)
-layout::Button::Button(layout::Window*, long)
-layout::Button::GetClickHdl()
-layout::Button::SetClickHdl(Link const&)
-layout::Button::SetImageAlign(ImageAlign)
-layout::Button::SetModeImage(Image const&)
-layout::Button::SetModeImage(layout::Image const&)
-layout::CancelButton::CancelButton(layout::Window*, ResId const&)
-layout::CancelButton::CancelButton(layout::Window*, long)
-layout::CheckBox::Check(bool)
-layout::CheckBox::CheckBox(layout::Context*, char const*, unsigned int)
-layout::CheckBox::CheckBox(layout::Window*, ResId const&)
-layout::CheckBox::CheckBox(layout::Window*, long)
-layout::CheckBox::IsChecked() const
-layout::ComboBox::Clear()
-layout::ComboBox::ComboBox(layout::Context*, char const*, unsigned int)
-layout::ComboBox::ComboBox(layout::Window*, ResId const&)
-layout::ComboBox::ComboBox(layout::Window*, long)
-layout::ComboBox::EnableAutocomplete(bool, bool)
-layout::ComboBox::GetEntry(unsigned short) const
-layout::ComboBox::GetEntryCount() const
-layout::ComboBox::InsertEntry(String const&, unsigned short)
-layout::ComboBox::RemoveEntry(String const&)
-layout::ComboBox::RemoveEntry(unsigned short)
-layout::ComboBox::SetClickHdl(Link const&)
-layout::ComboBox::SetSelectHdl(Link const&)
-layout::Container::Add(layout::Container*)
-layout::Container::Add(layout::Window*)
-layout::Container::Clear()
-layout::Container::Hide()
-layout::Container::Remove(layout::Container*)
-layout::Container::Remove(layout::Window*)
-layout::Container::Show()
-layout::Context::getRoot()
-layout::Context::getToplevel()
-layout::Context::setToplevel(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-layout::Control::GetGetFocusHdl()
-layout::Control::GetLoseFocusHdl()
-layout::Dialog::Close()
-layout::Dialog::Dialog(layout::Window*, char const*, char const*, unsigned int)
-layout::Dialog::Initialize(SfxChildWinInfo*)
-layout::Dialog::Notify(NotifyEvent&)
-layout::Dialog::SetText(rtl::OUString const&)
-layout::Edit::Edit(layout::Context*, char const*, unsigned int)
-layout::Edit::Edit(layout::Window*, ResId const&)
-layout::Edit::Edit(layout::Window*, long)
-layout::Edit::GetText() const
-layout::Edit::SetSelection(Selection const&)
-layout::Edit::SetText(rtl::OUString const&)
-layout::ErrorBox::ErrorBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
-layout::ErrorBox::ErrorBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
-layout::ErrorBox::ErrorBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
-layout::ErrorBox::ErrorBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
-layout::FixedImage::FixedImage(layout::Window*, ResId const&)
-layout::FixedImage::FixedImage(layout::Window*, long)
-layout::FixedImage::setImage(Image const&)
-layout::FixedInfo::FixedInfo(layout::Context*, char const*, unsigned int)
-layout::FixedInfo::FixedInfo(layout::Window*, ResId const&)
-layout::FixedInfo::FixedInfo(layout::Window*, long)
-layout::FixedLine::FixedLine(layout::Context*, char const*, unsigned int)
-layout::FixedLine::FixedLine(layout::Window*, ResId const&)
-layout::FixedLine::FixedLine(layout::Window*, long)
-layout::FixedLine::IsEnabled() const
-layout::FixedText::FixedText(layout::Window*, ResId const&)
-layout::FixedText::FixedText(layout::Window*, long)
-layout::HBox::HBox(int, bool)
-layout::HBox::HBox(layout::Context const*, char const*)
-layout::HelpButton::HelpButton(layout::Window*, ResId const&)
-layout::HelpButton::HelpButton(layout::Window*, long)
-layout::IgnoreButton::IgnoreButton(layout::Window*, ResId const&)
-layout::IgnoreButton::IgnoreButton(layout::Window*, long)
-layout::Image::Image(char const*)
-layout::Image::~Image()
-layout::ImageButton::ImageButton(layout::Context*, char const*, unsigned int)
-layout::ImageButton::ImageButton(layout::Window*, ResId const&)
-layout::ImageButton::ImageButton(layout::Window*, long)
-layout::InPlug::InPlug(Window*, char const*, char const*, unsigned int)
-layout::InPlug::InPlug(layout::Window*, char const*, char const*, unsigned int)
-layout::InfoBox::InfoBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
-layout::InfoBox::InfoBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
-layout::InfoBox::InfoBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
-layout::InfoBox::InfoBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
-layout::ListBox::Clear()
-layout::ListBox::GetClickHdl()
-layout::ListBox::GetDoubleClickHdl()
-layout::ListBox::GetEntryCount() const
-layout::ListBox::GetEntryData(unsigned short) const
-layout::ListBox::GetSelectEntry(unsigned short) const
-layout::ListBox::GetSelectEntryCount() const
-layout::ListBox::GetSelectHdl()
-layout::ListBox::InsertEntry(String const&, unsigned short)
-layout::ListBox::ListBox(layout::Context*, char const*, unsigned int)
-layout::ListBox::ListBox(layout::Window*, ResId const&)
-layout::ListBox::ListBox(layout::Window*, long)
-layout::ListBox::RemoveEntry(String const&)
-layout::ListBox::RemoveEntry(unsigned short)
-layout::ListBox::SelectEntry(String const&, bool)
-layout::ListBox::SetClickHdl(Link const&)
-layout::ListBox::SetDoubleClickHdl(Link const&)
-layout::ListBox::SetEntryData(unsigned short, void*)
-layout::ListBox::SetSelectHdl(Link const&)
-layout::LocalizedString::GetToken(unsigned short, char)
-layout::LocalizedString::LocalizedString(layout::Context*, char const*)
-layout::MetricField::MetricField(layout::Context*, char const*, unsigned int)
-layout::MetricField::MetricField(layout::Window*, long)
-layout::MetricFormatter::GetValue(FieldUnit) const
-layout::MetricFormatter::SetFirst(long, FieldUnit)
-layout::MetricFormatter::SetLast(long, FieldUnit)
-layout::MetricFormatter::SetMax(long, FieldUnit)
-layout::MetricFormatter::SetMin(long, FieldUnit)
-layout::MetricFormatter::SetSpinSize(long)
-layout::MetricFormatter::SetValue(long, FieldUnit)
-layout::MoreButton::AddWindow(layout::Window*)
-layout::MoreButton::GetLessText() const
-layout::MoreButton::GetMoreText() const
-layout::MoreButton::MoreButton(layout::Context*, char const*, unsigned int)
-layout::MoreButton::MoreButton(layout::Window*, ResId const&)
-layout::MoreButton::MoreButton(layout::Window*, long)
-layout::MoreButton::RemoveWindow(layout::Window*)
-layout::MoreButton::SetLessText(rtl::OUString const&)
-layout::MoreButton::SetMoreText(rtl::OUString const&)
-layout::MultiLineEdit::MultiLineEdit(layout::Context*, char const*, unsigned int)
-layout::MultiLineEdit::MultiLineEdit(layout::Window*, ResId const&)
-layout::MultiLineEdit::MultiLineEdit(layout::Window*, long)
-layout::MultiListBox::MultiListBox(layout::Context*, char const*, unsigned int)
-layout::MultiListBox::MultiListBox(layout::Window*, ResId const&)
-layout::MultiListBox::MultiListBox(layout::Window*, long)
-layout::NoButton::NoButton(layout::Window*, ResId const&)
-layout::NoButton::NoButton(layout::Window*, long)
-layout::NumericField::NumericField(layout::Context*, char const*, unsigned int)
-layout::NumericField::NumericField(layout::Window*, long)
-layout::NumericFormatter::GetValue() const
-layout::NumericFormatter::SetFirst(long)
-layout::NumericFormatter::SetLast(long)
-layout::NumericFormatter::SetMax(long)
-layout::NumericFormatter::SetMin(long)
-layout::NumericFormatter::SetSpinSize(long)
-layout::NumericFormatter::SetValue(long)
-layout::OKButton::OKButton(layout::Context*, char const*, unsigned int)
-layout::OKButton::OKButton(layout::Window*, ResId const&)
-layout::OKButton::OKButton(layout::Window*, long)
-layout::Plugin::Plugin(layout::Context*, char const*, Control*)
-layout::ProgressBar::GetValue()
-layout::ProgressBar::ProgressBar(layout::Context*, char const*, unsigned int)
-layout::ProgressBar::ProgressBar(layout::Window*, ResId const&)
-layout::ProgressBar::ProgressBar(layout::Window*, long)
-layout::ProgressBar::SetBackgroundColor(int)
-layout::ProgressBar::SetForegroundColor(int)
-layout::ProgressBar::SetRange(int, int)
-layout::ProgressBar::SetValue(int)
-layout::PushButton::IsChecked() const
-layout::PushButton::PushButton(layout::Context*, char const*, unsigned int)
-layout::PushButton::PushButton(layout::Window*, ResId const&)
-layout::PushButton::PushButton(layout::Window*, long)
-layout::PushButton::Toggle()
-layout::QueryBox::QueryBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
-layout::QueryBox::QueryBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
-layout::QueryBox::QueryBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
-layout::QueryBox::QueryBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
-layout::RadioButton::Check(bool)
-layout::RadioButton::GetVCLXRadioButton() const
-layout::RadioButton::IsChecked() const
-layout::RadioButton::RadioButton(layout::Context*, char const*, unsigned int)
-layout::RadioButton::RadioButton(layout::Window*, ResId const&)
-layout::RadioButton::RadioButton(layout::Window*, long)
-layout::ResetButton::ResetButton(layout::Context*, char const*, unsigned int)
-layout::ResetButton::ResetButton(layout::Window*, ResId const&)
-layout::ResetButton::ResetButton(layout::Window*, long)
-layout::RetryButton::RetryButton(layout::Window*, ResId const&)
-layout::RetryButton::RetryButton(layout::Window*, long)
-layout::SpinField::SpinField(layout::Context*, char const*, unsigned int)
-layout::SpinField::SpinField(layout::Window*, ResId const&)
-layout::SpinField::SpinField(layout::Window*, long)
-layout::TabControl::GetActivatePageHdl() const
-layout::TabControl::GetCurPageId() const
-layout::TabControl::GetDeactivatePageHdl() const
-layout::TabControl::GetPageCount() const
-layout::TabControl::GetPageId(unsigned short) const
-layout::TabControl::GetPagePos(unsigned short) const
-layout::TabControl::GetTabPage(unsigned short) const
-layout::TabControl::GetTabPageSizePixel() const
-layout::TabControl::GetVCLXTabControl() const
-layout::TabControl::InsertPage(unsigned short, rtl::OUString const&, unsigned short)
-layout::TabControl::RemovePage(unsigned short)
-layout::TabControl::SetTabPage(unsigned short, TabPage*)
-layout::TabControl::SetTabPageSizePixel(Size const&)
-layout::TabControl::TabControl(layout::Context*, char const*, unsigned int)
-layout::TabControl::TabControl(layout::Window*, ResId const&)
-layout::TabControl::TabControl(layout::Window*, long)
-layout::TabPage::TabPage(Window*, char const*, char const*, unsigned int)
-layout::TabPage::TabPage(layout::Window*, char const*, char const*, unsigned int)
-layout::Table::Add(layout::Container*, bool, bool, int, int)
-layout::Table::Add(layout::Window*, bool, bool, int, int)
-layout::Table::Table(int, int)
-layout::Table::Table(layout::Context const*, char const*)
-layout::VBox::VBox(int, bool)
-layout::VBox::VBox(layout::Context const*, char const*)
-layout::WarningBox::WarningBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
-layout::WarningBox::WarningBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
-layout::WarningBox::WarningBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
-layout::WarningBox::WarningBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
-layout::YesButton::YesButton(layout::Window*, ResId const&)
-layout::YesButton::YesButton(layout::Window*, long)
-layoutimpl::LayoutRoot::addItem(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains> const&)
-layoutimpl::VCLXTabControl::AddChild(com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains> const&)
-layoutimpl::WidgetFactory::sfx2CreateWindow(VCLXWindow**, Window*, rtl::OUString const&, long&)
-layoutimpl::getParent(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-layoutimpl::prophlp::getProperty(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, rtl::OUString const&)
-libvisio::VSDXOutputElementList::addEndLayer()
-libvisio::VSDXOutputElementList::addStartLayer(WPXPropertyList const&)
-libvisio::VSDXOutputElementList::clear()
-libvisio::VisioDocument::generateSVG(WPXInputStream*, WPXString&)
-libwpg::WPGDashArray::at(unsigned int) const
-libwpg::WPGDashArray::count() const
-libwpg::WPGraphics::generateSVG(unsigned char const*, unsigned long, WPXString&, libwpg::WPGFileFormat)
-libwpg::WPGraphics::parse(unsigned char const*, unsigned long, libwpg::WPGPaintInterface*, libwpg::WPGFileFormat)
-linguistic::IsLower(String const&, unsigned short, unsigned short, short)
-linguistic::SpellAlternatives::SpellAlternatives(rtl::OUString const&, short, short, rtl::OUString const&)
-linguistic::ThesaurusMeaning::ThesaurusMeaning(rtl::OUString const&, rtl::OUString const&, short)
-linguistic::ToLower(unsigned short, short)
-linguistic::ToTitle(String const&, short)
-linguistic::ToUpper(String const&, short)
-linguistic::ToUpper(unsigned short, short)
-migration::AutocorrectionMigration_create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
-nullcanvas::CanvasFont::getFontMatrix() const
-nullcanvas::CanvasHelper::flush() const
-nullcanvas::CanvasHelper::getPalette()
-nullcanvas::SpriteCanvasHelper::backgroundPaint(basegfx::B2DRange const&)
-nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
-nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
-nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
-o3tltests::cow_wrapper_client2::queryUnmodified() const
-o3tltests::cow_wrapper_client3::queryUnmodified() const
-ooo::vba::Millimeter::get()
-ooo::vba::Millimeter::getInPoints()
-ooo::vba::Millimeter::set(double)
-ooo::vba::Millimeter::setInHundredthsOfOneMillimeter(double)
-ooo::vba::createVBAUnoAPIService(SfxObjectShell*, char const*)
-ooo::vba::excel::getViewFrame(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
-ooo::vba::excel::isInPrintPreview(SfxViewFrame*)
-ooo::vba::extractBoolFromAny(com::sun::star::uno::Any const&, bool)
-ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&, int)
-oox::(anonymous namespace)::GenericPropertySet::GenericPropertySet()
-oox::AttributeList::getHyperHex(int, long) const
-oox::AttributeList::getUnsignedHex(int, unsigned int) const
-oox::BinaryInputStream::readNulCharArrayUC(unsigned short)
-oox::ContainerHelper::insertByIndex(com::sun::star::uno::Reference<com::sun::star::container::XIndexContainer> const&, int, com::sun::star::uno::Any const&)
-oox::GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Point const&) const
-oox::GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Size const&) const
-oox::ObjectContainer::getObject(rtl::OUString const&) const
-oox::PropertyMap::dump()
-oox::PropertyMap::dumpCode()
-oox::PropertyMap::getProperty(int) const
-oox::PropertySet::getProperties(com::sun::star::uno::Sequence<com::sun::star::uno::Any>&, com::sun::star::uno::Sequence<rtl::OUString> const&) const
-oox::core::FilterBase::getComponentFactory() const
-oox::core::FilterBase::getInteractionHandler() const
-oox::core::PowerPointExport::WriteAnimationNodeCommonPropsEnd(boost::shared_ptr<sax_fastparser::FastSerializerHelper>)
-oox::core::PowerPointExport::WriteTextStyles(boost::shared_ptr<sax_fastparser::FastSerializerHelper>)
-oox::core::Relations::getExternalTargetFromFirstType(rtl::OUString const&) const
-oox::drawingml::ChartExport::GetXmlNamespace() const
-oox::drawingml::ChartExport::SetXmlNamespace(int)
-oox::drawingml::ChartExport::exportDataSeq(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, int)
-oox::drawingml::ChartExport::exportXAxis(oox::drawingml::AxisIdPair)
-oox::drawingml::ChartExport::exportYAxis(oox::drawingml::AxisIdPair)
-oox::drawingml::ColorPropertySet::getColor()
-oox::drawingml::ColorPropertySet::setColor(int)
-oox::drawingml::CustomShapeProperties::apply(boost::shared_ptr<oox::drawingml::CustomShapeProperties> const&)
-oox::drawingml::CustomShapeProperties::getValue(std::vector<oox::drawingml::CustomShapeGuide, std::allocator<oox::drawingml::CustomShapeGuide> > const&, unsigned int) const
-oox::drawingml::Diagram::getLayoutId() const
-oox::drawingml::GetPoint2D(com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&)
-oox::drawingml::GetTextMargin(rtl::OUString const&)
-oox::drawingml::GetTextVerticalAdjust(int)
-oox::drawingml::GraphicProperties::assignUsed(oox::drawingml::GraphicProperties const&)
-oox::drawingml::ShapeExport::GetXmlNamespace() const
-oox::drawingml::ShapeExport::SetXmlNamespace(int)
-oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const
-oox::drawingml::TextParagraphProperties::dump() const
-oox::drawingml::Theme::getEffectStyle(int) const
-oox::drawingml::addMissingProperties(oox::PropertyMap const&, oox::PropertyMap&)
-oox::drawingml::chart::ObjectFormatter::convertAutomaticLine(oox::PropertySet&, oox::drawingml::chart::ObjectType, int)
-oox::drawingml::chart::ObjectFormatter::isAutomaticLine(oox::drawingml::chart::ModelRef<oox::drawingml::Shape> const&)
-oox::drawingml::lcl_SequenceHasUnhiddenData(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&)
-oox::drawingml::lcl_dump_pset(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
-oox::drawingml::lcl_getSequenceLengthByRole(com::sun::star::uno::Sequence<com::sun::star::uno::Reference<com::sun::star::chart2::data::XLabeledDataSequence> > const&, rtl::OUString const&)
-oox::drawingml::lcl_getValueFromSequence(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, int)
-oox::drawingml::table::TableProperties::apply(boost::shared_ptr<oox::drawingml::table::TableProperties> const&)
-oox::dump::AxPropertyObjectBase::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, bool)
-oox::dump::BinaryStreamObject::BinaryStreamObject(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&)
-oox::dump::Config::setNameList(oox::dump::String const&, boost::shared_ptr<oox::dump::NameListBase> const&)
-oox::dump::Config::setStringOption(oox::dump::String const&, oox::dump::String const&)
-oox::dump::ConfigItemBase::readConfigLine(oox::TextInputStream&) const
-oox::dump::DffStreamObject::construct(oox::dump::ObjectBase const&, oox::dump::BinaryInputStreamRef const&, rtl::OUString const&)
-oox::dump::DffStreamObject::dumpDffColor(oox::dump::String const&)
-oox::dump::ItemFormat::set(oox::dump::DataType, oox::dump::FormatType, rtl::OUString const&, rtl::OUString const&)
-oox::dump::Output::resetIndent()
-oox::dump::Output::writeAddress(oox::dump::Address const&)
-oox::dump::Output::writeRange(oox::dump::Range const&)
-oox::dump::Output::writeRangeList(std::vector<oox::dump::Range, std::allocator<oox::dump::Range> > const&)
-oox::dump::OutputObjectBase::writeBoolItem(oox::dump::String const&, bool)
-oox::dump::StorageIterator::getElementCount() const
-oox::dump::StringHelper::prependToken(rtl::OUStringBuffer&, long, unsigned short)
-oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const&, unsigned short)
-oox::dump::XmlStreamObject::XmlStreamObject(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&)
-oox::dump::biff::BiffObjectBase::dumpRowRange(oox::dump::String const&, bool)
-oox::dump::biff::FormulaObject::dumpCellFormula(oox::dump::String const&, unsigned short)
-oox::ole::VbaHelper::getBasicScriptUrl(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
-oox::ole::VbaProject::hasDialog(rtl::OUString const&) const
-oox::ole::VbaProject::hasDialogs() const
-oox::ole::VbaProject::hasModule(rtl::OUString const&) const
-oox::ole::VbaProject::hasModules() const
-oox::ole::VbaSiteModel::isVisible() const
-oox::ppt::PPTShape::findPlaceholder(int, int, std::vector<boost::shared_ptr<oox::drawingml::Shape>, std::allocator<boost::shared_ptr<oox::drawingml::Shape> > >&)
-oox::ppt::lclDebugSubType(int)
-oox::vml::(anonymous namespace)::lclInsertTextFrame(oox::core::XmlFilterBase const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&)
-oox::vml::(anonymous namespace)::lclSetXShapeRect(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&, com::sun::star::awt::Rectangle const&)
-oox::xls::(anonymous namespace)::lclCalcEmu(oox::xls::UnitConverter const&, long, oox::xls::Unit)
-oox::xls::(anonymous namespace)::lclGetBuiltInStyleName(rtl::OUString const&)
-oox::xls::(anonymous namespace)::lclGetBuiltinStyleId(int&, int&, rtl::OUString const&)
-oox::xls::(anonymous namespace)::lclGetThickerLine(com::sun::star::table::BorderLine2 const&, unsigned char, com::sun::star::table::BorderLine2 const&, unsigned char)
-oox::xls::AddressConverter::checkCellRangeList(oox::xls::ApiCellRangeList const&, bool, bool)
-oox::xls::ApiTokenIterator::ApiTokenIterator(oox::xls::ApiTokenIterator const&, bool)
-oox::xls::BiffDrawingBase::appendRawObject(boost::shared_ptr<oox::xls::BiffDrawingObjectBase> const&)
-oox::xls::BiffDrawingBase::setSkipObj(unsigned short)
-oox::xls::BiffDrawingObjectBase::importObjBiff8(oox::xls::WorksheetHelper const&, oox::xls::BiffInputStream&)
-oox::xls::BiffHelper::calcCodePageFromTextEncoding(unsigned short)
-oox::xls::BiffHelper::calcRkFromDouble(int&, double)
-oox::xls::BiffInputStream::sizeBase() const
-oox::xls::BiffInputStream::skipByteString(bool)
-oox::xls::BiffInputStream::skipUniString()
-oox::xls::BiffObjLineModel::isVisible() const
-oox::xls::BiffObjTextModel::BiffObjTextModel()
-oox::xls::BiffObjTextModel::getHorAlign() const
-oox::xls::BiffObjTextModel::getVerAlign() const
-oox::xls::BiffObjTextModel::readObj3(oox::xls::BiffInputStream&)
-oox::xls::BiffObjTextModel::readObj5(oox::xls::BiffInputStream&)
-oox::xls::BiffObjTextModel::readTxo8(oox::xls::BiffInputStream&)
-oox::xls::BiffOutputStream::BiffOutputStream(oox::BinaryOutputStream&, unsigned short)
-oox::xls::BiffOutputStream::endRecord()
-oox::xls::BiffOutputStream::fill(unsigned char, int, unsigned long)
-oox::xls::BiffOutputStream::sizeBase() const
-oox::xls::BiffOutputStream::startRecord(unsigned short)
-oox::xls::BiffOutputStream::tellBase() const
-oox::xls::BinAddress::write(oox::xls::BiffOutputStream&, bool, bool) const
-oox::xls::BinRange::contains(oox::xls::BinAddress const&) const
-oox::xls::BinRangeList::getEnclosingRange() const
-oox::xls::BinRangeList::write(oox::xls::BiffOutputStream&, bool, bool) const
-oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int)
-oox::xls::CellBlock::isBefore(oox::ValueRange const&) const
-oox::xls::CellBlock::isExpandable(oox::ValueRange const&) const
-oox::xls::CellBlock::startNextRow()
-oox::xls::Color::importColorRgb(oox::SequenceInputStream&)
-oox::xls::Comment::importAnchor(bool, int, rtl::OUString const&)
-oox::xls::Dxf::importAlignment(oox::AttributeList const&)
-oox::xls::Dxf::importProtection(oox::AttributeList const&)
-oox::xls::ExternalLinkBuffer::importExternalName(oox::xls::BiffInputStream&)
-oox::xls::FormulaParser::convertNumberToHyperlink(rtl::OUString const&, double) const
-oox::xls::FormulaParser::importOleTargetLink(oox::xls::BiffInputStream&, unsigned short const*) const
-oox::xls::FormulaParserImpl::pushParenthesesOperand()
-oox::xls::FormulaParserImpl::removeLastOperands(unsigned long)
-oox::xls::FormulaProcessorBase::extractCellAddress(com::sun::star::table::CellAddress&, com::sun::star::uno::Sequence<com::sun::star::sheet::FormulaToken> const&, bool) const
-oox::xls::FormulaProcessorBase::generateApiAddressString(com::sun::star::table::CellAddress const&) const
-oox::xls::FunctionParamInfoIterator::getParamInfo() const
-oox::xls::FunctionProvider::getFuncInfoFromOdfFuncName(rtl::OUString const&) const
-oox::xls::OOXMLFormulaPrinterImpl::OOXMLFormulaPrinterImpl(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-oox::xls::SheetDataBuffer::XfIdRange::set(com::sun::star::table::CellAddress const&, int, int)
-oox::xls::SheetDataBuffer::XfIdRange::tryExpand(com::sun::star::table::CellAddress const&, int, int)
-oox::xls::SheetDataBuffer::XfIdRange::tryMerge(oox::xls::SheetDataBuffer::XfIdRange const&)
-oox::xls::SheetDataBuffer::XfIdRowRange::intersects(com::sun::star::table::CellRangeAddress const&) const
-oox::xls::StylesBuffer::getDxf(int) const
-oox::xls::StylesBuffer::writeStyleXfToPropertyMap(oox::PropertyMap&, int) const
-oox::xls::UnitConverter::calcOoxErrorCode(unsigned char) const
-oox::xls::WorkbookHelper::createDatabaseRangeObject(rtl::OUString&, com::sun::star::table::CellRangeAddress const&) const
-oox::xls::WorkbookHelper::getBiffFilter() const
-oox::xls::WorkbookHelper::setTextEncoding(unsigned short)
-oox::xls::WorksheetHelper::getCellAddress(com::sun::star::uno::Reference<com::sun::star::table::XCell> const&)
-oox::xls::WorksheetHelper::getColumn(int) const
-oox::xls::WorksheetHelper::getColumns(oox::ValueRange const&) const
-oox::xls::WorksheetHelper::getRangeAddress(com::sun::star::uno::Reference<com::sun::star::table::XCellRange> const&)
-oox::xls::WorksheetHelper::getRow(int) const
-oox::xls::WorksheetHelper::getRows(oox::ValueRange const&) const
-oox::xls::WorksheetHelper::putFormulaString(com::sun::star::table::CellAddress const&, rtl::OUString const&) const
-oox::xls::Xf::hasAnyUsedFlags() const
-osl_test_file::oldtestfile::test_file_003()
-pdfi::DrawXmlEmitter::GetBreakIterator()
-pdfi::PDFIProcessor::sortDocument(bool)
-pdfi::PDFIRawAdaptor::odfConvert(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&, com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const&)
-pdfparse::PDFReader::read(char const*, unsigned int)
-psp::ConverterFactory::~ConverterFactory()
-psp::GetCommandLineTokenCount(rtl::OString const&)
-psp::GlyphSet::GlyphSet()
-psp::GlyphSet::SetFont(int, unsigned char)
-psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&)
-psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&)
-psp::PrinterGfx::GetGlyphBoundRect(unsigned short, Rectangle&)
-psp::PrinterGfx::GetGlyphOutline(unsigned short, unsigned short**, Point**, unsigned char**)
-psp::PrinterGfx::GetResolution(int&, int&) const
-psp::PrinterGfx::PSRMoveTo(int, int)
-psp::PrinterGfx::SetFallbackFont(int)
-psp::PrinterJob::GetDocumentHeader()
-psp::PrinterJob::GetDocumentTrailer()
-psp::PrinterJob::GetErrorCode()
-psp::appendStr(char const*, char*, int)
-psp::existsTmpDir(char const*)
-pyuno::Runtime::finalize()
-pyuno::importToGlobal(_object*, _object*, _object*)
-rptui::OFieldExpressionControl::LinkStubAsynchActivate(void*, void*)
-rptui::OFieldExpressionControl::LinkStubAsynchDeactivate(void*, void*)
-rptui::OReportController::LinkStubOnInvalidateClipboard(void*, void*)
-rtl_cipher::createHex(unsigned char*, unsigned int)
-salhelper::ORealDynamicLoader::acquire()
-salhelper::ORealDynamicLoader::getApi() const
-salhelper::ORealDynamicLoader::newInstance(salhelper::ORealDynamicLoader**, rtl::OUString const&, rtl::OUString const&)
-salhelper::ORealDynamicLoader::release()
-salhelper::Timer::addTime(salhelper::TTimeValue const&)
-salhelper::Timer::setAbsoluteTime(salhelper::TTimeValue const&)
-salhelper::Timer::setRemainingTime(salhelper::TTimeValue const&, salhelper::TTimeValue const&)
-sax::Converter::clearUndefinedChars(rtl::OUString&, rtl::OUString const&)
-sax::Converter::convertDouble(double&, rtl::OUString const&, short)
-sax::Converter::convertDouble(rtl::OUStringBuffer&, double, bool, short, short)
-sax::Converter::convertDuration(double&, rtl::OUString const&)
-sax::Converter::convertDuration(rtl::OUStringBuffer&, double)
-sax::Converter::convertMeasure(rtl::OUStringBuffer&, int, short, short)
-sax::Converter::convertMeasurePx(int&, rtl::OUString const&)
-sax::Converter::convertMeasurePx(rtl::OUStringBuffer&, int)
-sax::Converter::convertPercent(int&, rtl::OUString const&)
-sax::Converter::convertPercent(rtl::OUStringBuffer&, int)
-sax::Converter::decodeBase64(com::sun::star::uno::Sequence<signed char>&, rtl::OUString const&)
-sax::Converter::encodeBase64(rtl::OUStringBuffer&, com::sun::star::uno::Sequence<signed char> const&)
-sax::Converter::indexOfComma(rtl::OUString const&, int)
-sax_fastparser::FastSaxSerializer::getImplementationName_Static()
-sax_fastparser::FastSerializerHelper::endElement(char const*)
-sax_fastparser::FastSerializerHelper::singleElement(char const*, ...)
-sax_fastparser::FastSerializerHelper::singleElement(char const*, com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList>)
-sax_fastparser::FastSerializerHelper::startElement(char const*, ...)
-sax_fastparser::FastSerializerHelper::write(float)
-sd::CopyDlg::LinkStubReset(void*, void*)
-sd::FuText::LinkStubSpellError(void*, void*)
-sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
-sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
-sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
-sd::UpdateLockManager::IsLocked() const
-sd::UpdateLockManager::Lock()
-sd::UpdateLockManager::Unlock()
-sd::View::LockRedraw(unsigned char)
-sd::ViewShellBase::RegisterFactory(unsigned short)
-sd::framework::ConfigurationClassifier::GetC1andC2() const
-sd::framework::ConfigurationClassifier::TraceResourceIdVector(char const*, std::vector<com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>, std::allocator<com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> > > const&) const
-sd::framework::ConfigurationTracer::TraceConfiguration(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfiguration> const&, char const*)
-sd::slidesorter::cache::BitmapCache::CacheEntry::HasMarkedPreview() const
-sd::slidesorter::cache::PageCache::ReleasePreviewBitmap(SdrPage const*)
-sd::slidesorter::controller::AnimationBezierFunction::AnimationBezierFunction(double, double, double, double)
-sd::slidesorter::controller::AnimationFunction::ApplyLocationOffsetChange(boost::shared_ptr<sd::slidesorter::model::PageDescriptor> const&, sd::slidesorter::view::SlideSorterView&, Point)
-sd::slidesorter::controller::AnimationFunction::ApplyVisualStateChange(boost::shared_ptr<sd::slidesorter::model::PageDescriptor> const&, sd::slidesorter::view::SlideSorterView&, double)
-sd::slidesorter::controller::AnimationFunction::FastInSlowOut_Root(double)
-sd::slidesorter::controller::AnimationFunction::FastInSlowOut_Sine(double)
-sd::slidesorter::controller::AnimationFunction::ScalePoint(Point const&, double)
-sd::slidesorter::controller::AnimationFunction::SlowInSlowOut_0to0_Sine(double)
-sd::slidesorter::controller::AnimationFunction::Vibrate_Sine(double)
-sd::slidesorter::controller::Animator::AddInfiniteAnimation(boost::function1<void, double> const&, double)
-sd::slidesorter::controller::Clipboard::SelectPages()
-sd::slidesorter::controller::DragAndDropContext::GetPagesFromBookmarks(std::vector<SdPage const*, std::allocator<SdPage const*> >&, int&, sd::DrawDocShell*, List const&) const
-sd::slidesorter::controller::DragAndDropContext::GetPagesFromSelection(std::vector<SdPage const*, std::allocator<SdPage const*> >&, int&, sd::slidesorter::model::PageEnumeration&) const
-sd::slidesorter::controller::FocusManager::SetFocusToToolBox()
-sd::slidesorter::controller::PageSelector::DeselectPage(SdPage const*, bool)
-sd::slidesorter::controller::Properties::SetOnlyPreviewTriggersMouseOver(bool)
-sd::slidesorter::controller::ScrollBarManager::GetLeft() const
-sd::slidesorter::controller::ScrollBarManager::GetTop() const
-sd::slidesorter::controller::SelectionCommand::AddSlide(unsigned short)
-sd::slidesorter::controller::SelectionCommand::SelectionCommand(sd::slidesorter::controller::PageSelector&, boost::shared_ptr<sd::slidesorter::controller::CurrentSlideManager> const&, sd::slidesorter::model::SlideSorterModel const&)
-sd::slidesorter::controller::SelectionFunction::EventDescriptor::SetDragMode(sd::slidesorter::controller::InsertionIndicatorHandler::Mode)
-sd::slidesorter::controller::SelectionFunction::ProcessKeyEvent(KeyEvent const&)
-sd::slidesorter::controller::SlideSorterController::IsContextMenuOpen() const
-sd::slidesorter::controller::SlotManager::ExecuteCommandAsynchronously(std::auto_ptr<sd::slidesorter::controller::Command>)
-sd::slidesorter::model::VisualState::GetCurrentVisualState() const
-sd::slidesorter::model::VisualState::GetLocationAnimationId() const
-sd::slidesorter::model::VisualState::GetOldVisualState() const
-sd::slidesorter::model::VisualState::GetStateAnimationId() const
-sd::slidesorter::model::VisualState::GetVisualStateBlend() const
-sd::slidesorter::model::VisualState::SetLocationAnimationId(int)
-sd::slidesorter::model::VisualState::SetStateAnimationId(int)
-sd::slidesorter::view::(anonymous namespace)::Blend(unsigned char, unsigned char, double)
-sd::slidesorter::view::(anonymous namespace)::CalculateColorChannel(double, double, double, double, double)
-sd::slidesorter::view::(anonymous namespace)::PageObjectRun::GetInnerBoundingBox(sd::slidesorter::view::Layouter const&, int) const
-sd::slidesorter::view::(anonymous namespace)::RectangleBackgroundTheme::RectangleBackgroundTheme(boost::shared_ptr<sd::slidesorter::view::Theme> const&, std::vector<boost::shared_ptr<sd::slidesorter::view::Button>, std::allocator<boost::shared_ptr<sd::slidesorter::view::Button> > > const&)
-sd::slidesorter::view::Button::GetIconSize() const
-sd::slidesorter::view::Button::GetState() const
-sd::slidesorter::view::ButtonBar::GetButton(bool, int) const
-sd::slidesorter::view::ButtonBar::GetButtonCount(bool) const
-sd::slidesorter::view::ButtonBar::RequestLayout()
-sd::slidesorter::view::FontProvider::GetFont(OutputDevice const&)
-sd::slidesorter::view::HorizontalImplementation::HorizontalImplementation(boost::shared_ptr<sd::Window> const&, boost::shared_ptr<sd::slidesorter::view::Theme> const&)
-sd::slidesorter::view::InsertionIndicatorOverlay::SelectRepresentatives(sd::slidesorter::model::PageEnumeration&, std::vector<boost::shared_ptr<sd::slidesorter::model::PageDescriptor>, std::allocator<boost::shared_ptr<sd::slidesorter::model::PageDescriptor> > >&) const
-sd::slidesorter::view::LayeredDevice::HasPainter(int)
-sd::slidesorter::view::Layouter::GetColumn(int) const
-sd::slidesorter::view::Layouter::GetRow(int) const
-sd::slidesorter::view::Layouter::GetRowCount() const
-sd::slidesorter::view::Layouter::SetBorders(int, int, int, int)
-sd::slidesorter::view::Layouter::_SetZoom(double)
-sd::slidesorter::view::SlideSorterView::DrawLock::DrawLock(sd::slidesorter::view::SlideSorterView&, boost::shared_ptr<sd::Window> const&)
-sd::slidesorter::view::SlideSorterView::LocalModelHasChanged()
-sd::slidesorter::view::TextButton::TextButton(sd::slidesorter::SlideSorter&, rtl::OUString const&, rtl::OUString const&)
-sd::slidesorter::view::Theme::GetGradientBrightnessOverride(sd::slidesorter::view::Theme::GradientColorType)
-sd::slidesorter::view::Theme::GetGradientOffset(sd::slidesorter::view::Theme::GradientColorType, sd::slidesorter::view::Theme::GradientColorClass)
-sd::slidesorter::view::Theme::GetGradientSaturationOverride(sd::slidesorter::view::Theme::GradientColorType)
-sd::slidesorter::view::Theme::SetColor(sd::slidesorter::view::Theme::ColorType, unsigned int)
-sd::slidesorter::view::Theme::SetGradientBrightnessOverride(sd::slidesorter::view::Theme::GradientColorType, int)
-sd::slidesorter::view::Theme::SetGradientSaturationOverride(sd::slidesorter::view::Theme::GradientColorType, int)
-sd::slidesorter::view::Theme::SetIntegerValue(sd::slidesorter::view::Theme::IntegerValueType, int)
-sd::slidesorter::view::ToolTip::ShowDefaultHelpText(rtl::OUString const&)
-sd::slidesorter::view::VerticalImplementation::VerticalImplementation(boost::shared_ptr<sd::Window> const&, boost::shared_ptr<sd::slidesorter::view::Theme> const&)
-sdext::presenter::(anonymous namespace)::Element::SetEnabledState(bool)
-sdext::presenter::(anonymous namespace)::ModeChangeAnimationStarter::ModeChangeAnimationStarter(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfigurationController> const&, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&, com::sun::star::uno::Reference<com::sun::star::rendering::XSpriteCanvas> const&, boost::shared_ptr<sdext::presenter::PresenterAnimator> const&)
-sdext::presenter::(anonymous namespace)::ProgressLabel::ProgressLabel(rtl::Reference<sdext::presenter::PresenterToolBar> const&)
-sdext::presenter::CreateMoveInFromBottomAnimator(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, rtl::Reference<sdext::presenter::PresenterController> const&, bool, std::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&, std::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&)
-sdext::presenter::CreateTransparentOverlay(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, rtl::Reference<sdext::presenter::PresenterController> const&, bool, std::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&, std::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&)
-sdext::presenter::CreateUnfoldInCenterAnimator(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, rtl::Reference<sdext::presenter::PresenterController> const&, bool, std::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&, std::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&)
-sdext::presenter::PresenterAccessible::IsAccessibilityActive() const
-sdext::presenter::PresenterAnimation::AddStartCallback(boost::function<void ()> const&)
-sdext::presenter::PresenterClockTimer::GetTimeDifference(_oslDateTime const&, _oslDateTime const&)
-sdext::presenter::PresenterConfigurationAccess::FillList(com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> const&, rtl::OUString const&, std::vector<rtl::OUString, std::allocator<rtl::OUString> >&)
-sdext::presenter::PresenterConfigurationAccess::GetNodeProperties(rtl::OUString const&)
-sdext::presenter::PresenterConfigurationAccess::GetValue(rtl::OUString const&)
-sdext::presenter::PresenterController::GetAccessible() const
-sdext::presenter::PresenterController::IsViewVisible(rtl::OUString const&) const
-sdext::presenter::PresenterFrameworkObserver::False()
-sdext::presenter::PresenterFrameworkObserver::RunOnResourceActivation(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfigurationController> const&, com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, boost::function<void (bool)> const&)
-sdext::presenter::PresenterHorizontalScrollBar::PresenterHorizontalScrollBar(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&, boost::shared_ptr<sdext::presenter::PresenterPaintManager> const&, boost::function<void (double)> const&)
-sdext::presenter::PresenterPaneBase::GetTextViewForTitle()
-sdext::presenter::PresenterPaneBorderPainter::HasTheme() const
-sdext::presenter::PresenterScrollBar::GetTotalSize() const
-sdext::presenter::PresenterSprite::GetAlpha() const
-sdext::presenter::PresenterSprite::GetPriority() const
-sdext::presenter::PresenterSprite::GetTransform() const
-sdext::presenter::PresenterSprite::IsVisible() const
-sdext::presenter::PresenterTextParagraph::GetCharacterOffset() const
-sdext::presenter::PresenterTextParagraph::GetParagraphIndex() const
-sdext::presenter::PresenterTextParagraph::Line::GetLength() const
-sdext::presenter::PresenterTextView::GetCharacterOffset(int) const
-sdext::presenter::PresenterTheme::FontDescriptor::FontDescriptor()
-sdext::presenter::PresenterTheme::GetThemeName() const
-sdext::presenter::PresenterTheme::disposing()
-sdext::presenter::PresenterTimer::ScheduleSingleTaskRelative(boost::function<void (TimeValue const&)> const&, long)
-sdext::presenter::PresenterToolBar::GetSize()
-sdext::presenter::PresenterToolBar::GetWindow() const
-sdext::presenter::PresenterToolBarView::ThrowIfDisposed() const
-sdext::presenter::PresenterWindowManager::GetLayoutMode() const
-sdext::presenter::PresenterWindowManager::IsHelpViewActive() const
-sdext::presenter::PresenterWindowManager::IsSlideSorterActive() const
-sdext::presenter::PresenterWindowManager::LayoutUnknownMode()
-sdext::presenter::PresenterWindowManager::NotifyPaneCreation(boost::shared_ptr<sdext::presenter::PresenterPaneContainer::PaneDescriptor> const&)
-sdext::presenter::PresenterWindowManager::SetPanePosSizeRelative(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, double, double, double, double)
-sdr::Comment::Comment(unsigned int, Date, rtl::OUString const&, rtl::OUString const&, basegfx::B2DPoint const&)
-sdr::Comment::SetCreationDate(Date)
-sdr::Comment::SetPosition(basegfx::B2DPoint const&)
-sdr::Comment::SetText(rtl::OUString const&)
-sdr::Comment::SetUserName(rtl::OUString const&)
-sdr::animation::Scheduler::Reset(unsigned int)
-sdr::contact::ViewContactOfE3d::impCreateFallbackLineAttribute(basegfx::BColor const&) const
-sdr::contact::ViewContactOfPageObj::GetReferencedPage() const
-sdr::contact::ViewObjectContactOfUnoControl::isControlVisible() const
-sdr::overlay::OverlayAnimatedBitmapEx::setBitmapEx1(BitmapEx const&)
-sdr::overlay::OverlayAnimatedBitmapEx::setBitmapEx2(BitmapEx const&)
-sdr::overlay::OverlayAnimatedBitmapEx::setBlinkTime(unsigned int)
-sdr::overlay::OverlayAnimatedBitmapEx::setCenterXY1(unsigned short, unsigned short)
-sdr::overlay::OverlayAnimatedBitmapEx::setCenterXY2(unsigned short, unsigned short)
-sdr::overlay::OverlayBitmapEx::setBitmapEx(BitmapEx const&)
-sdr::overlay::OverlayBitmapEx::setCenterXY(unsigned short, unsigned short)
-sdr::overlay::OverlayHatchRect::setSecondPosition(basegfx::B2DPoint const&)
-sdr::overlay::OverlayLineStriped::setSecondPosition(basegfx::B2DPoint const&)
-sdr::overlay::OverlayManagerBuffered::SetRefreshWithPreRendering(bool)
-sdr::overlay::OverlayObjectList::remove(sdr::overlay::OverlayObject&)
-sdr::overlay::OverlayPolyPolygonStriped::setPolyPolygon(basegfx::B2DPolyPolygon const&)
-sdr::overlay::OverlayRollingRectangleStriped::setExtendedLines(bool)
-sdr::overlay::OverlayRollingRectangleStriped::setShowBounds(bool)
-sdr::overlay::OverlayTriangle::setSecondPosition(basegfx::B2DPoint const&)
-sdr::overlay::OverlayTriangle::setThirdPosition(basegfx::B2DPoint const&)
-sdr::table::CellEditSource::CellEditSource(rtl::Reference<sdr::table::Cell> const&)
-sdr::table::CellEditSource::CellEditSource(rtl::Reference<sdr::table::Cell> const&, SdrView&, Window const&)
-sdr::table::CellEditSource::ChangeModel(SdrModel*)
-sdr::table::CellEditSource::lock()
-sdr::table::CellEditSource::unlock()
-sdr::table::CellEditSourceImpl::UpdateOutliner()
-sdr::table::SdrTableObj::DeleteColumns(int, int)
-sdr::table::SdrTableObj::DeleteRows(int, int)
-sdr::table::SdrTableObj::FitFrameToTextSize()
-sdr::table::SdrTableObj::GetCellTextEditOutliner(sdr::table::CellPos const&) const
-sdr::table::SdrTableObj::InsertColumns(int, int)
-sdr::table::SdrTableObj::InsertRows(int, int)
-sdr::table::SdrTableObj::getColumnCount() const
-sdr::table::SdrTableObj::getRowCount() const
-sdr::table::SdrTableObjImpl::GetCellItem(sdr::table::CellPos const&, unsigned short) const
-sdr::table::SvxTableController::DeleteTable()
-sdr::table::SvxTableController::getSelectionCursor()
-sdr::table::TableLayouter::getColumnStart(int) const
-sdr::table::TableLayouter::getRowStart(int) const
-sdr::table::TableLayouter::setColumnWidth(int, int)
-sdr::table::TableLayouter::setRowHeight(int, int)
-sfx2::IFrameWindow_Impl::SetBorder(unsigned char)
-sfx2::LinkManager::InsertFileLink(sfx2::SvBaseLink&)
-sfx2::ModuleTaskPane::ModuleHasToolPanels(rtl::OUString const&)
-sfx2::SvBaseLink::GetName() const
-sfx2::TaskPaneController::SetDefaultTitle(String const&)
-sfx2::TaskPaneWrapper::GetChildWindowId()
-sfx2::TitledDockingWindow::GetTitle() const
-sfx::EditWrapper::EditWrapper(Edit&)
-sfx::ItemConnectionBase::Activate(bool)
-slideshow::internal::AnimatedSprite::getPixelOffset() const
-slideshow::internal::AnimatedSprite::setPriority(double)
-slideshow::internal::DrawShapeSubsetting::DrawShapeSubsetting(boost::shared_ptr<GDIMetaFile> const&)
-slideshow::internal::EffectRewinder::skipSomeMainSequenceEffects(int)
-slideshow::internal::EventMultiplexer::addShapeCursorHandler(boost::shared_ptr<slideshow::internal::ShapeCursorEventHandler> const&)
-slideshow::internal::EventMultiplexer::removeShapeCursorHandler(boost::shared_ptr<slideshow::internal::ShapeCursorEventHandler> const&)
-slideshow::internal::EventMultiplexer::removeUserPaintHandler(boost::shared_ptr<slideshow::internal::UserPaintEventHandler> const&)
-slideshow::internal::ExpressionNodeFactory::createComposedExpression(boost::shared_ptr<slideshow::internal::ExpressionNode> const&, boost::shared_ptr<slideshow::internal::ExpressionNode> const&)
-slideshow::internal::HSLColor::HSLColor(unsigned int)
-slideshow::internal::Layer::viewChanged(boost::shared_ptr<slideshow::internal::View> const&)
-slideshow::internal::Layer::viewsChanged()
-slideshow::internal::LayerManager::removeShape(boost::shared_ptr<slideshow::internal::Shape> const&)
-slideshow::internal::SlideChangeBase::getLeavingSlideSizePixel(boost::shared_ptr<slideshow::internal::UnoView> const&) const
-slideshow::internal::UnoViewContainer::removeView(boost::shared_ptr<slideshow::internal::UnoView> const&)
-slideshow::internal::UserEventQueue::isEmpty() const
-slideshow::internal::UserEventQueue::registerDoubleClickEvent(boost::shared_ptr<slideshow::internal::Event> const&)
-slideshow::internal::UserEventQueue::registerSlideEndEvent(boost::shared_ptr<slideshow::internal::Event> const&)
-slideshow::internal::UserEventQueue::registerSlideStartEvent(boost::shared_ptr<slideshow::internal::Event> const&)
-slideshow::internal::UserPaintOverlay::update_settings(bool, slideshow::internal::RGBColor const&, double)
-slideshow::internal::getNodeType(short&, com::sun::star::uno::Sequence<com::sun::star::beans::NamedValue> const&)
-slideshow::internal::removeTextActions(GDIMetaFile&)
-svgi::(anonymous namespace)::appendChar(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, char)
-svgi::getTokenName(int)
-svt::ContextMenuHelper::create(rtl::OUString const&)
-svt::ContextMenuHelper::createAndExecute(Point const&, rtl::OUString const&)
-svt::ControlDependencyManager::enableOnCheckMark(CheckBox&, Window&, Window&, Window&)
-svt::ControlDependencyManager::enableOnCheckMark(CheckBox&, Window&, Window&, Window&, Window&, Window&)
-svt::ControlDependencyManager::enableOnCheckMark(CheckBox&, Window&, Window&, Window&, Window&, Window&, Window&)
-svt::ControlDependencyManager::enableOnRadioCheck(RadioButton&, Window&, Window&)
-svt::ControlDependencyManager::enableOnRadioCheck(RadioButton&, Window&, Window&, Window&, Window&)
-svt::ControlDependencyManager::enableOnRadioCheck(RadioButton&, Window&, Window&, Window&, Window&, Window&, Window&)
-svt::DialogClosedListener::DialogClosedListener(Link const&)
-svt::EditCellController::EditCellController(svt::MultiLineTextCell*)
-svt::EmbeddedObjectRef::GetMapUnit() const
-svt::EmbeddedObjectRef::GetPersistName() const
-svt::EmbeddedObjectRef::ObjectIsModified(com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&)
-svt::EmbeddedObjectRef::TryRunningState()
-svt::FileURLBox::FileURLBox(Window*)
-svt::FileURLBox::FileURLBox(Window*, ResId const&)
-svt::FrameStatusListener::getFrameInterface() const
-svt::FrameStatusListener::getServiceManager() const
-svt::FrameStatusListener::statusChanged(com::sun::star::frame::FeatureStateEvent const&)
-svt::HyperLabel::GetLabel()
-svt::HyperLabel::GetLogicWidth()
-svt::HyperLabel::HyperLabel(Window*, ResId const&)
-svt::OFileURLControl::OFileURLControl(Window*)
-svt::OGenericUnoDialog::getImplementationId()
-svt::ORoadmap::ORoadmap(Window*, ResId const&)
-svt::OWizardMachine::calcRightHelpOffset(unsigned int)
-svt::OWizardMachine::getTitleBase() const
-svt::OWizardPage::OWizardPage(Window*, long)
-svt::RoadmapItem::GetClickHdl() const
-svt::RoadmapItem::SetLabel(rtl::OUString const&)
-svt::RoadmapItem::SetZOrder(svt::RoadmapItem*, unsigned short)
-svt::RoadmapWizard::GetRoadmapBitmap() const
-svt::RoadmapWizard::GetRoadmapHelpId() const
-svt::RoadmapWizard::IsRoadmapInteractive()
-svt::RoadmapWizard::SetRoadmapBitmap(BitmapEx const&)
-svt::SelectableFixedText::SelectableFixedText(Window*, long)
-svt::StatusbarController::getLayoutManager() const
-svt::StatusbarController::getServiceManager() const
-svt::StatusbarController::isBound() const
-svt::StatusbarController::removeStatusListener(rtl::OUString const&)
-svt::StatusbarController::unbindListener()
-svt::StatusbarController::updateStatus()
-svt::StatusbarController::updateStatus(rtl::OUString)
-svt::TabDeckLayouter::FocusPanelItem(unsigned long)
-svt::TabDeckLayouter::GetFocusedPanelItem() const
-svt::TabDeckLayouter::GetItemScreenRect(unsigned long) const
-svt::TabDeckLayouter::IsPanelSelectorEnabled() const
-svt::TabDeckLayouter::IsPanelSelectorVisible() const
-svt::TemplateContent::TemplateContent()
-svt::TemplateContent::TemplateContent(INetURLObject const&, com::sun::star::util::DateTime const&)
-svt::table::GridTableRenderer::getCurrentRow() const
-svt::table::TableControl::GetSelectHdl() const
-svt::table::TableControl::GetTopRow() const
-svt::table::TableControl::SetSelectHdl(Link const&)
-svt::table::TableControl::SetTopRow(int)
-svt::table::TableDataWindow::SetBackground()
-svtools::EditableExtendedColorConfig::GetColorValue(rtl::OUString const&, rtl::OUString const&) const
-svtools::EditableExtendedColorConfig::GetComponentDisplayName(rtl::OUString const&) const
-svtools::EditableExtendedColorConfig::GetCurrentSchemeName() const
-svtools::EditableExtendedColorConfig::GetSchemeNames() const
-svtools::ODocumentInfoPreview::InsertEntry(String const&, String const&)
-svtools::ToolTipListBox::ToolTipListBox(Window*, ResId const&)
-svtools::ToolTipListBox::ToolTipListBox(Window*, long)
-svtools::ToolTipMultiListBox::ToolTipMultiListBox(Window*, long)
-svtools::ToolbarMenu::GetFrame() const
-svtools::ToolbarMenu::GetSelectHdl() const
-svtools::ToolbarMenu::RemoveStatusListener(rtl::OUString const&)
-svtools::ToolbarMenu::UpdateStatus(rtl::OUString const&)
-svtools::ToolbarMenu::appendEntry(int, Image const&, unsigned short)
-svtools::ToolbarMenu::getEntryImage(int) const
-svtools::ToolbarMenu::getEntryText(int) const
-svtools::ToolbarMenu::isEntryChecked(int) const
-svtools::ToolbarMenu::isEntryEnabled(int) const
-svtools::ToolbarMenuEntryAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
-svx::ControllerFeatures::ControllerFeatures(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::form::XForm> const&, svx::IControllerFeatureInvalidation*)
-svx::DialControl::DialControl(Window*, Size const&, Font const&, long)
-svx::DialControl::DialControl(Window*, Size const&, long)
-svx::DialControl::GetLinkedField() const
-svx::DialControl::GetModifyHdl() const
-svx::DialControl::SetModifyHdl(Link const&)
-svx::DocRecovery::PluginProgress::getPlugWindow()
-svx::DocRecovery::RecoveryDialog::impl_refreshDocList()
-svx::FontWorkGalleryDialog::changeText(SdrTextObj*)
-svx::FormControllerHelper::moveLeft() const
-svx::FormControllerHelper::moveRight() const
-svx::FrameBorder::MergeClickAreaToPolyPolygon(PolyPolygon&) const
-svx::FrameDirectionListBox::FrameDirectionListBox(Window*, long)
-svx::NamespaceMap_createInstance(unsigned short*, SfxItemPool*, SfxItemPool*)
-svx::OComponentTransferable::extractComponentDescriptor(TransferableDataHelper const&, unsigned char, rtl::OUString&, com::sun::star::uno::Reference<com::sun::star::ucb::XContent>&)
-svx::ODataAccessDescriptor::createAnySequence()
-svx::ODataAccessDescriptor::createPropertySet()
-svx::ODataAccessDescriptor::initializeFrom(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, unsigned char)
-svx::OMultiColumnTransferable::push_back(svx::ODataAccessDescriptor&)
-svx::OSingleFeatureDispatcher::dispose()
-svx::OXFormsTransferable::getDescriptorFormatId()
-svx::OrientationHelper::OrientationHelper(svx::DialControl&, CheckBox&)
-svx::SearchToolbarControllersManager::~SearchToolbarControllersManager()
-svx::SvxShowCharSetItem::~SvxShowCharSetItem()
-svx::ToolboxButtonColorUpdater::DrawChar(VirtualDevice&, Color const&)
-svx::WrapField::WrapField(Window*, long)
-svx::frame::(anonymous namespace)::lclCreatePolygon(Point const&, Point const&, Point const&, Point const&)
-svx::frame::Array::Array(unsigned long, unsigned long)
-svx::frame::Array::Clear()
-svx::frame::Array::DrawCell(OutputDevice&, unsigned long, unsigned long, Color const*) const
-svx::frame::Array::GetColFromIndex(unsigned long) const
-svx::frame::Array::GetColWidth(unsigned long) const
-svx::frame::Array::GetMergedSize(unsigned long&, unsigned long&, unsigned long, unsigned long) const
-svx::frame::Array::GetRowFromIndex(unsigned long) const
-svx::frame::Array::GetRowHeight(unsigned long) const
-svx::frame::Array::GetUseDiagDoubleClipping() const
-svx::frame::Array::IsInClipRange(unsigned long, unsigned long) const
-svx::frame::Array::IsMergedOrigin(unsigned long, unsigned long) const
-svx::frame::Array::IsMergedOverlapped(unsigned long, unsigned long) const
-svx::frame::Array::IsMergedOverlappedBottom(unsigned long, unsigned long) const
-svx::frame::Array::IsMergedOverlappedTop(unsigned long, unsigned long) const
-svx::frame::Array::MirrorSelfY(bool, bool)
-svx::frame::Array::RemoveClipRange()
-svx::frame::Array::RemoveMergedRange(unsigned long, unsigned long)
-svx::frame::ArrayImpl::GetMergedOriginCellAcc(unsigned long, unsigned long)
-svx::frame::DrawHorFrameBorder(OutputDevice&, Point const&, Point const&, svx::frame::Style const&, Color const*)
-svx::frame::DrawHorFrameBorder(OutputDevice&, Point const&, Point const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, Color const*)
-svx::frame::DrawVerFrameBorder(OutputDevice&, Point const&, Point const&, svx::frame::Style const&, Color const*)
-svx::frame::DrawVerFrameBorder(OutputDevice&, Point const&, Point const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, svx::frame::Style const&, Color const*)
-svx::frame::Style::Scale(double, unsigned short) const
-svxform::DataNavigatorManager::GetChildWindowId()
-svxform::FmFilterNavigator::Clear()
-svxform::FmFilterNavigatorWinMgr::GetChildWindowId()
-svxform::FmSearchParams::setIgnoreWidthCJK(unsigned char)
-svxform::NavigatorFrameManager::GetChildWindowId()
-svxform::NavigatorTree::IsDeleteAllowed()
-svxform::NavigatorTreeModel::CheckEntry(FmEntryData*)
-svxform::NavigatorTreeModel::GetSdrObj(FmControlData*)
-svxform::NavigatorTreeModel::IsNameAlreadyDefined(rtl::OUString const&, FmFormData*)
-svxform::OStaticDataAccessTools::canDelete(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&) const
-svxform::OStaticDataAccessTools::getFieldNamesByCommandDescriptor(com::sun::star::uno::Reference<com::sun::star::sdbc::XConnection> const&, int, rtl::OUString const&, dbtools::SQLExceptionInfo*)
-svxform::OStaticDataAccessTools::prependContextInfo(com::sun::star::sdbc::SQLException&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, rtl::OUString const&, rtl::OUString const&) const
-svxform::OSystemParseContext::getNumDecimalSep() const
-svxform::OSystemParseContext::getNumThousandSep() const
-svxform::SvLBoxEntrySortedArray::DeleteAndDestroy(unsigned short, unsigned short)
-svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* const&, unsigned short&)
-svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* const*, unsigned short)
-svxform::SvLBoxEntrySortedArray::Insert(svxform::SvLBoxEntrySortedArray const*, unsigned short, unsigned short)
-svxform::SvLBoxEntrySortedArray::Remove(SvLBoxEntry* const&, unsigned short)
-svxform::isModelShapeMarked(FmEntryData*, std::map<com::sun::star::uno::Reference<com::sun::star::uno::XInterface>, SdrObject*, comphelper::OInterfaceCompare<com::sun::star::uno::XInterface>, std::allocator<std::pair<com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const, SdrObject*> > > const&, SdrMarkView*)
-sw::util::AuthorInfos::Insert(sw::util::AuthorInfo* const&, unsigned short&)
-sw::util::AuthorInfos::Insert(sw::util::AuthorInfo* const*, unsigned short)
-sw::util::AuthorInfos::Insert(sw::util::AuthorInfos const*, unsigned short, unsigned short)
-sw::util::AuthorInfos::Remove(sw::util::AuthorInfo* const&, unsigned short)
-sw::util::AuthorInfos::Remove(unsigned short, unsigned short)
-test::OfficeConnection::OfficeConnection()
-test::OfficeConnection::getComponentContext() const
-test::OfficeConnection::setUp()
-test::OfficeConnection::tearDown()
-test::OfficeConnection::~OfficeConnection()
-test::getTestArgument(rtl::OUString const&, rtl::OUString*)
-toolkit::registerServices(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, char const*, char const*, char const*)
-tools::SolarMutex::GetSolarMutex()
-ucbhelper::CommandEnvironmentProxy::CommandEnvironmentProxy(com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&)
-ucbhelper::Content::Content(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&)
-ucbhelper::Content::abortCommand()
-ucbhelper::Content::create(com::sun::star::uno::Reference<com::sun::star::ucb::XContent> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, ucbhelper::Content&)
-ucbhelper::Content::create(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, ucbhelper::Content&)
-ucbhelper::Content::createCursor(com::sun::star::uno::Sequence<int> const&, ucbhelper::ResultSetInclude)
-ucbhelper::Content::createSortedCursor(com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::ucb::NumberedSortingInfo> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XAnyCompareFactory>, ucbhelper::ResultSetInclude)
-ucbhelper::Content::createSortedDynamicCursor(com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::ucb::NumberedSortingInfo> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XAnyCompareFactory>, ucbhelper::ResultSetInclude)
-ucbhelper::Content::createSortedDynamicCursor(com::sun::star::uno::Sequence<rtl::OUString> const&, com::sun::star::uno::Sequence<com::sun::star::ucb::NumberedSortingInfo> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XAnyCompareFactory>, ucbhelper::ResultSetInclude)
-ucbhelper::Content::executeCommand(int, com::sun::star::uno::Any const&)
-ucbhelper::Content::getPropertyValue(int)
-ucbhelper::Content::insertNewContent(rtl::OUString const&, com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&, ucbhelper::Content&)
-ucbhelper::Content::setPropertyValue(int, com::sun::star::uno::Any const&)
-ucbhelper::ContentBroker::initialize(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, std::vector<ucbhelper::ContentProviderData, std::allocator<ucbhelper::ContentProviderData> > const&)
-ucbhelper::ContentImplHelper::notifyCommandInfoChange(com::sun::star::ucb::CommandInfoChangeEvent const&) const
-ucbhelper::PropertyValueSet::PropertyValueSet(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
-ucbhelper::PropertyValueSet::appendArray(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::sdbc::XArray> const&)
-ucbhelper::PropertyValueSet::appendBinaryStream(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&)
-ucbhelper::PropertyValueSet::appendBlob(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::sdbc::XBlob> const&)
-ucbhelper::PropertyValueSet::appendByte(rtl::OUString const&, signed char)
-ucbhelper::PropertyValueSet::appendBytes(rtl::OUString const&, com::sun::star::uno::Sequence<signed char> const&)
-ucbhelper::PropertyValueSet::appendCharacterStream(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&)
-ucbhelper::PropertyValueSet::appendClob(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::sdbc::XClob> const&)
-ucbhelper::PropertyValueSet::appendDate(rtl::OUString const&, com::sun::star::util::Date const&)
-ucbhelper::PropertyValueSet::appendDouble(rtl::OUString const&, double)
-ucbhelper::PropertyValueSet::appendFloat(rtl::OUString const&, float)
-ucbhelper::PropertyValueSet::appendInt(rtl::OUString const&, int)
-ucbhelper::PropertyValueSet::appendRef(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::sdbc::XRef> const&)
-ucbhelper::PropertyValueSet::appendShort(rtl::OUString const&, short)
-ucbhelper::PropertyValueSet::appendTime(rtl::OUString const&, com::sun::star::util::Time const&)
-ucbhelper::PropertyValueSet::getLength() const
-ucbhelper::ResultSetImplHelper::ResultSetImplHelper(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-ucbhelper::SimpleAuthenticationRequest::SimpleAuthenticationRequest(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
-ucbhelper::SimpleAuthenticationRequest::SimpleAuthenticationRequest(rtl::OUString const&, rtl::OUString const&, ucbhelper::SimpleAuthenticationRequest::EntityType, rtl::OUString const&, ucbhelper::SimpleAuthenticationRequest::EntityType, rtl::OUString const&, ucbhelper::SimpleAuthenticationRequest::EntityType, rtl::OUString const&, ucbhelper::SimpleAuthenticationRequest::EntityType, rtl::OUString const&, unsigned char, unsigned char)
-ucbhelper::handleInteractionRequest(rtl::Reference<ucbhelper::SimpleAuthenticationRequest> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, bool)
-ucbhelper::handleInteractionRequest(rtl::Reference<ucbhelper::SimpleCertificateValidationRequest> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, bool)
-ucbhelper::handleInteractionRequest(rtl::Reference<ucbhelper::SimpleInteractionRequest> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, bool)
-unicode::getCharType(unsigned short)
-unicode::isBase(unsigned short)
-unicode::isPunctuation(unsigned short)
-unicode::isTitle(unsigned short)
-unicode::isUnicodeScriptType(unsigned short, short)
-unnamed_svl_inettype::Registration::~Registration()
-unographic::GraphicDescriptor::isValid() const
-utl::AccessibleStateSetHelper::Compare(utl::AccessibleStateSetHelper const&, utl::AccessibleStateSetHelper&, utl::AccessibleStateSetHelper&)
-utl::AtomClient::AtomClient(com::sun::star::uno::Reference<com::sun::star::util::XAtomServer> const&)
-utl::AtomClient::getAtom(int, rtl::OUString const&, unsigned char)
-utl::AtomClient::getString(int, int)
-utl::AtomClient::updateAtomClasses(com::sun::star::uno::Sequence<int> const&)
-utl::AtomClient::~AtomClient()
-utl::AtomServer::AtomServer()
-utl::Bootstrap::checkBootstrapStatus(rtl::OUString&)
-utl::Bootstrap::getAllUsersValue(rtl::OUString const&)
-utl::ConfigItem::ConfigItem(utl::ConfigManager&, rtl::OUString)
-utl::ConfigItem::LockTree()
-utl::ConfigItem::UnlockTree()
-utl::ConfigManager::ConfigManager(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>)
-utl::MultiAtomProvider::insertAtomClass(int)
-utl::OConfigurationNode::appendNode(rtl::OUString const&, utl::OConfigurationNode const&) const
-utl::OConfigurationTreeRoot::OConfigurationTreeRoot(com::sun::star::uno::Reference<com::sun::star::util::XChangesBatch> const&)
-utl::OConfigurationTreeRoot::OConfigurationTreeRoot(comphelper::ComponentContext const&, char const*, bool)
-utl::OConfigurationValueContainer::OConfigurationValueContainer(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, osl::Mutex&, rtl::OUString const&, unsigned short, int)
-utl::OConfigurationValueContainer::getServiceFactory() const
-utl::OConfigurationValueContainer::registerNullValueExchangeLocation(char const*, com::sun::star::uno::Any*)
-utl::PropertySetHelper::PropertySetHelper(utl::PropertySetInfo*)
-utl::PropertySetInfo::PropertySetInfo()
-utl::PropertySetInfo::add(utl::PropertyMapEntry*)
-utl::PropertySetInfo::remove(rtl::OUString const&)
-utl::RegOptions::allowMenu() const
-utl::RegOptions::removeReminder()
-utl::TransliterationWrapper::compareSubstring(String const&, int, int, String const&, int, int) const
-utl::UCBContentHelper::CanMakeFolder(String const&)
-utl::UCBContentHelper::CopyTo(String const&, String const&)
-utl::UCBContentHelper::FindInPath(String const&, String const&, String&, char, unsigned char)
-utl::UCBContentHelper::GetResultSet(String const&)
-utl::UCBContentHelper::HasParentFolder(String const&)
-utl::UCBContentHelper::MoveTo(String const&, String const&, int)
-utl::UcbLockBytes::getStream()
-utl::typeConvert(Time const&, com::sun::star::util::Time&)
-utl::typeConvert(com::sun::star::util::Time const&, Time&)
-vbahelper::CollectionBase::CollectionBase(com::sun::star::uno::Type const&)
-vbahelper::CollectionBase::getAnyItemOrThis(com::sun::star::uno::Any const&)
-vbahelper::CollectionBase::initElements(std::vector<com::sun::star::beans::NamedValue, std::allocator<com::sun::star::beans::NamedValue> > const&, vbahelper::CollectionBase::ContainerType)
-vbahelper::CollectionBase::initElements(std::vector<com::sun::star::uno::Reference<com::sun::star::container::XNamed>, std::allocator<com::sun::star::uno::Reference<com::sun::star::container::XNamed> > > const&, vbahelper::CollectionBase::ContainerType)
-vcl::Clipboard_getSupportedServiceNames()
-vcl::I18NStatus::addChoice(String const&, void*)
-vcl::I18NStatus::clearChoices()
-vcl::I18NStatus::getStatusText() const
-vcl::I18NStatus::toTop() const
-vcl::I18nHelper::GetDate(Date const&) const
-vcl::I18nHelper::getLocale() const
-vcl::LabeledElement::setLabel(boost::shared_ptr<vcl::WindowArranger> const&)
-vcl::LazyDeletor<Menu>::is_less(Menu*, Menu*)
-vcl::MatrixArranger::addChild(boost::shared_ptr<vcl::WindowArranger> const&, unsigned int, unsigned int, int)
-vcl::MatrixArranger::addWindow(Window*, unsigned int, unsigned int, int, Size const&)
-vcl::MatrixArranger::remove(Window*)
-vcl::MatrixArranger::remove(boost::shared_ptr<vcl::WindowArranger> const&)
-vcl::PDFExtOutDevData::EndGroup()
-vcl::PDFExtOutDevData::GetFormsFormat() const
-vcl::PDFExtOutDevData::SetAutoAdvanceTime(unsigned int, int)
-vcl::PDFExtOutDevData::SetOutlineItemDest(int, int)
-vcl::PDFExtOutDevData::SetOutlineItemParent(int, int)
-vcl::PDFExtOutDevData::SetOutlineItemText(int, rtl::OUString const&)
-vcl::PDFWriter::BeginPattern(Rectangle const&)
-vcl::PDFWriter::DrawBitmap(Point const&, Bitmap const&)
-vcl::PDFWriter::DrawBitmap(Point const&, Size const&, Point const&, Size const&, Bitmap const&)
-vcl::PDFWriter::DrawBitmapEx(Point const&, BitmapEx const&)
-vcl::PDFWriter::DrawBitmapEx(Point const&, Size const&, Point const&, Size const&, BitmapEx const&)
-vcl::PDFWriter::DrawGradient(PolyPolygon const&, Gradient const&)
-vcl::PDFWriter::DrawGradient(Rectangle const&, Gradient const&)
-vcl::PDFWriter::DrawMask(Point const&, Bitmap const&, Color const&)
-vcl::PDFWriter::DrawMask(Point const&, Size const&, Bitmap const&, Color const&)
-vcl::PDFWriter::DrawMask(Point const&, Size const&, Point const&, Size const&, Bitmap const&, Color const&)
-vcl::PDFWriter::DrawPixel(Polygon const&, Color const*)
-vcl::PDFWriter::DrawPolyPolygon(PolyPolygon const&, int, bool)
-vcl::PDFWriter::EndPattern(SvtGraphicFill::Transform const&)
-vcl::PDFWriter::EndTransparencyGroup(Rectangle const&, Bitmap const&)
-vcl::PDFWriter::GetCurrentStructureElement()
-vcl::PDFWriter::GetVersion() const
-vcl::PDFWriter::SetAntialiasing(unsigned short)
-vcl::PDFWriter::SetMapMode()
-vcl::PDFWriterImpl::beginControlAppearance(int)
-vcl::PDFWriterImpl::drawWaveLine(Point const&, Point const&, int, int)
-vcl::PDFWriterImpl::endControlAppearance(vcl::PDFWriter::WidgetState)
-vcl::PrintDialog::getCopyCount()
-vcl::PrinterController::PrinterController()
-vcl::PrinterController::enableUIOption(rtl::OUString const&, bool)
-vcl::PrinterController::getValues(com::sun::star::uno::Sequence<rtl::OUString> const&) const
-vcl::PrinterOptionsHelper::hasProperty(rtl::OUString const&) const
-vcl::PrinterOptionsHelper::setValue(rtl::OUString const&, com::sun::star::uno::Any const&)
-vcl::RenderGraphic::RenderGraphic(boost::shared_array<unsigned char> const&, unsigned int, rtl::OUString const&)
-vcl::RowOrColumn::remove(Window*)
-vcl::RowOrColumn::remove(boost::shared_ptr<vcl::WindowArranger> const&)
-vcl::WindowPropertySet::WindowPropertySet(Window*, bool)
-vcl::WindowPropertySet::getPropertySet() const
-vcl::WindowPropertySet::~WindowPropertySet()
-vcl::unotools::b2IPointFromPoint(Point const&)
-vcl::unotools::b2IRectangleFromRectangle(Rectangle const&)
-vcl::unotools::b2ISizeFromSize(Size const&)
-vcl::unotools::colorToStdColorSpaceSequence(Color const&)
-vcl::unotools::integerPoint2DFromPoint(Point const&)
-vcl::unotools::integerRectangle2DFromRectangle(Rectangle const&)
-vcl::unotools::point2DFromPoint(Point const&)
-vcl::unotools::polyPolygonFromBezier2DSequenceSequence(com::sun::star::uno::Sequence<com::sun::star::uno::Sequence<com::sun::star::geometry::RealBezierSegment2D> > const&)
-vcl::unotools::polyPolygonFromPoint2DSequenceSequence(com::sun::star::uno::Sequence<com::sun::star::uno::Sequence<com::sun::star::geometry::RealPoint2D> > const&)
-vcl::unotools::polygonFromBezier2DSequence(com::sun::star::uno::Sequence<com::sun::star::geometry::RealBezierSegment2D> const&)
-vcl::unotools::rectangle2DFromRectangle(Rectangle const&)
-vcl::unotools::rectangleFromRealRectangle2D(com::sun::star::geometry::RealRectangle2D const&)
-vcl::unotools::sizeFromB2ISize(basegfx::B2IVector const&)
-void ScCompressedArrayIterator<int, unsigned short>::Follow<unsigned char>(ScCompressedArrayIterator<int, unsigned char> const&)
-webdav_ucp::ContentProperties::addProperties(std::vector<webdav_ucp::DAVPropertyValue, std::allocator<webdav_ucp::DAVPropertyValue> > const&)
-webdav_ucp::ContentProperties::addProperties(webdav_ucp::ContentProperties const&)
-writerfilter::LoggedResourcesHelper::attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
-writerfilter::LoggedResourcesHelper::attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int)
-writerfilter::LoggedResourcesHelper::chars(rtl::OUString const&)
-writerfilter::LoggedResourcesHelper::chars(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
-writerfilter::LoggedResourcesHelper::endElement(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
-writerfilter::LoggedResourcesHelper::setPrefix(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
-writerfilter::LoggedResourcesHelper::startElement(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
-writerfilter::TagLogger::element(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
-writerfilter::TagLogger::propertySet(boost::shared_ptr<writerfilter::Reference<writerfilter::Properties> >, boost::shared_ptr<writerfilter::IdToString>)
-writerfilter::TagLogger::setFileName(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
-writerfilter::TagLogger::startDocument()
-writerfilter::TagLogger::unoPropertySet(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
-writerfilter::TagLogger::~TagLogger()
-writerfilter::XPathLogger::XPathLogger()
-writerfilter::XPathLogger::endElement()
-writerfilter::XPathLogger::getXPath() const
-writerfilter::XPathLogger::startElement(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)
-writerfilter::dmapper::FIB::GetData(unsigned int)
-writerfilter::dmapper::MeasureHandler::isAutoWidth() const
-writerfilter::dmapper::SectionPropertyMap::GetPageStyleName(bool)
-writerfilter::dmapper::SectionPropertyMap::SetPageStyleName(bool, rtl::OUString const&)
-writerfilter::dmapper::StyleSheetTable::resolveSprmProps(writerfilter::Sprm&)
-writerfilter::doctok::WW8DocumentImpl::fc2cp(writerfilter::doctok::Fc const&) const
-writerfilter::doctoktest::ScannerTestService_supportsService(rtl::OUString const&)
-writerfilter::ooxml::OOXMLFastContextHandler::getResourceString() const
-writerfilter::ooxmltest::ScannerTestService_supportsService(rtl::OUString const&)
-writerfilter::resourcemodel::Fraction::Fraction(writerfilter::resourcemodel::Fraction const&, writerfilter::resourcemodel::Fraction const&)
-ww8::WW8TableNodeInfo::getTable() const
-ww8::WW8TableNodeInfo::toString() const
-xmloff::OControlStyleContext::OControlStyleContext(SvXMLImport&, unsigned short, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&, SvXMLStylesContext&, unsigned short, unsigned char)
-xmloff::OFormLayerXMLExport::exportControlNumberStyles()
-xmloff::OFormLayerXMLExport::initialize()
-xmloff::OFormLayerXMLImport::seekPage(com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> const&)
-xmloff::chart::ColorPropertySet::getColor()
-xmloff::chart::ColorPropertySet::setColor(int)